From e94a9fb5e4b6a2bc07e0bb4cf8ea35fc70c4bbf0 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Thu, 10 May 2012 12:31:27 -0400
Subject: [PATCH] Merged revisions 3049-3051,3053-3054,3058,3070,3074-3077,3082,3086-3088,3091-3092,3094-3095 from stable branch.

---
 interface/web/admin/lib/module.conf.php |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/interface/web/admin/lib/module.conf.php b/interface/web/admin/lib/module.conf.php
index d4575d0..833c8c5 100644
--- a/interface/web/admin/lib/module.conf.php
+++ b/interface/web/admin/lib/module.conf.php
@@ -78,6 +78,11 @@
 $items[] = array( 'title' 	=> 'Interface Config',
 				  'target' 	=> 'content',
 				  'link'	=> 'admin/system_config_edit.php?id=1');
+				  
+$items[] = array( 'title' 	=> 'Additional PHP Versions',
+				  'target' 	=> 'content',
+				  'link'	=> 'admin/server_php_list.php',
+				  'html_id'=> 'server_php_list');
 
 $module['nav'][] = array(	'title'	=> 'System',
 							'open' 	=> 1,
@@ -97,7 +102,7 @@
 $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 +110,7 @@
 $items[] = array( 'title' 	=> 'Port Forward',
 				  'target' 	=> 'content',
 				  'link'	=> 'admin/firewall_forward_list.php');				  
-
+*/
 $module['nav'][] = array(	'title'	=> 'Firewall',
 							'open' 	=> "1",
 							'items'	=> $items);
@@ -194,11 +199,13 @@
 				  'link'	=> 'admin/remote_action_osupdate.php',
 				  'html_id'=> 'osupdate');
 
+// ISPConfig interface update has been removed. Please use ispconfig_update.sh on the shell instead.
 $items[] = array( 'title' 	=> 'Do ISPConfig-Update',
 				  'target' 	=> 'content',
 				  'link'	=> 'admin/remote_action_ispcupdate.php',
 				  'html_id'=> 'ispcupdate');
 
+
 $module['nav'][] = array(	'title'	=> 'Remote Actions',
 							'open' 	=> 1,
 							'items'	=> $items);

--
Gitblit v1.9.1