From 8458c06490287857da6e7c693fdfaac9747967d6 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Mon, 19 Sep 2011 13:48:31 +0000
Subject: [PATCH] - Added missing texts for rescue tab in server config
 settings. - Removed ufw firewall tab.

---
 interface/web/admin/form/server_config.tform.php  | 3 ++-
 interface/web/admin/lib/lang/en_server_config.lng | 5 +++++
 interface/web/admin/lib/module.conf.php           | 4 ++--
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/interface/web/admin/form/server_config.tform.php b/interface/web/admin/form/server_config.tform.php
index dbd8521b4..3f574af87 100644
--- a/interface/web/admin/form/server_config.tform.php
+++ b/interface/web/admin/form/server_config.tform.php
@@ -876,6 +876,7 @@ $form["tabs"]['jailkit'] = array(
 	)
 );
 
+/*
 $form["tabs"]['ufw_firewall'] = array (
 	'title' 	=> "UFW Firewall",
 	'width' 	=> 80,
@@ -937,7 +938,7 @@ $form["tabs"]['ufw_firewall'] = array (
 	##################################
 	)
 );
-
+*/
 
 $form["tabs"]['vlogger'] = array(
 	'title' => "vlogger",
diff --git a/interface/web/admin/lib/lang/en_server_config.lng b/interface/web/admin/lib/lang/en_server_config.lng
index d5a834a71..745e3a60a 100644
--- a/interface/web/admin/lib/lang/en_server_config.lng
+++ b/interface/web/admin/lib/lang/en_server_config.lng
@@ -141,5 +141,10 @@ $wb["php_fpm_pool_dir_txt"] = 'PHP-FPM pool directory';
 $wb["php_fpm_pool_dir_error_empty"] = 'PHP-FPM pool directory is empty.';
 $wb["php_fpm_start_port_txt"] = 'PHP-FPM start port';
 $wb["php_fpm_start_port_error_empty"] = 'PHP-FPM start port is empty.';
+$wb["try_rescue_txt"] = 'Enable service monitoring and restart on failure';
+$wb["do_not_try_rescue_apache_txt"] = 'Disable apache monitoring';
+$wb["do_not_try_rescue_mysql_txt"] = 'Disable MySQL monitoring';
+$wb["do_not_try_rescue_mail_txt"] = 'Disable Email monitoring';
+$wb["rescue_description_txt"] = '<b>Information:</b> If you want to shut down mysql you have to select the "Disable MySQL monitor" checkbox and then wait 2-3 minutes.<br>if you do not wait 2-3 minutes, rescue will try to restart mysql!';
 
 ?>
\ No newline at end of file
diff --git a/interface/web/admin/lib/module.conf.php b/interface/web/admin/lib/module.conf.php
index d4575d0ba..4a0b48eee 100644
--- a/interface/web/admin/lib/module.conf.php
+++ b/interface/web/admin/lib/module.conf.php
@@ -97,7 +97,7 @@ $items[] = array( 'title' 	=> 'Firewall',
 $items[] = array( 'title' 	=> 'Basic',
 				  'target' 	=> 'content',
 				  'link'	=> 'admin/firewall_list.php');				  
-
+/*
 $items[] = array( 'title' 	=> 'Packet Filter',
 				  'target' 	=> 'content',
 				  'link'	=> 'admin/firewall_filter_list.php');				  
@@ -105,7 +105,7 @@ $items[] = array( 'title' 	=> 'Packet Filter',
 $items[] = array( 'title' 	=> 'Port Forward',
 				  'target' 	=> 'content',
 				  'link'	=> 'admin/firewall_forward_list.php');				  
-
+*/
 $module['nav'][] = array(	'title'	=> 'Firewall',
 							'open' 	=> "1",
 							'items'	=> $items);
-- 
GitLab