From 378935a8a92592cf1ef164b4d969c376c46a78c6 Mon Sep 17 00:00:00 2001 From: nveid <nveid@ispconfig3> Date: Fri, 09 Dec 2011 02:35:24 -0500 Subject: [PATCH] Fixed mysql error when switching from "Options" tab to "Ftp User" edit tab, the onUpdate thought we were trying to change the Website because the Options Datalog didn't have the parent_domain_id and the Ftp User tab did. --- interface/web/admin/lib/module.conf.php | 96 +++++++++++++++++++++++++++++++++-------------- 1 files changed, 67 insertions(+), 29 deletions(-) diff --git a/interface/web/admin/lib/module.conf.php b/interface/web/admin/lib/module.conf.php index e238dfd..20fb322 100644 --- a/interface/web/admin/lib/module.conf.php +++ b/interface/web/admin/lib/module.conf.php @@ -11,13 +11,15 @@ $items[] = array( 'title' => 'Add user', 'target' => 'content', - 'link' => 'admin/users_edit.php'); + 'link' => 'admin/users_edit.php', + 'html_id'=> 'user_add'); $items[] = array( 'title' => 'Edit user', 'target' => 'content', - 'link' => 'admin/users_list.php'); + 'link' => 'admin/users_list.php', + 'html_id'=> 'user_list'); - + $module['nav'][] = array( 'title' => 'CP Users', 'open' => 1, 'items' => $items); @@ -28,13 +30,15 @@ /* $items[] = array( 'title' => 'Add group', 'target' => 'content', - 'link' => 'admin/groups_edit.php'); + 'link' => 'admin/groups_edit.php', + 'html_id'=> 'group_add'); $items[] = array( 'title' => 'Edit group', 'target' => 'content', - 'link' => 'admin/groups_list.php'); + 'link' => 'admin/groups_list.php', + 'html_id'=> 'group_list'); - + $module['nav'][] = array( 'title' => 'Groups', 'open' => 1, 'items' => $items); @@ -46,24 +50,29 @@ /* $items[] = array( 'title' => 'Add server', 'target' => 'content', - 'link' => 'admin/server_edit.php'); + 'link' => 'admin/server_edit.php', + 'html_id'=> 'server_add'); */ $items[] = array( 'title' => 'Server Services', 'target' => 'content', - 'link' => 'admin/server_list.php'); + 'link' => 'admin/server_list.php', + 'html_id'=> 'server_list'); $items[] = array( 'title' => 'Server Config', 'target' => 'content', - 'link' => 'admin/server_config_list.php'); + 'link' => 'admin/server_config_list.php', + 'html_id'=> 'server_config_list'); /* $items[] = array( 'title' => 'Add Server IP', 'target' => 'content', - 'link' => 'admin/server_ip_edit.php'); + 'link' => 'admin/server_ip_edit.php', + 'html_id'=> 'server_ip_edit'); */ $items[] = array( 'title' => 'Edit Server IP', 'target' => 'content', - 'link' => 'admin/server_ip_list.php'); + 'link' => 'admin/server_ip_list.php', + 'html_id'=> 'server_ip_list'); $items[] = array( 'title' => 'Interface Config', @@ -75,15 +84,30 @@ 'items' => $items); // cleanup unset($items); - +/* +$items[] = array( 'title' => 'Firewall IPTables', + 'target' => 'content', + 'link' => 'admin/iptables_list.php'); $items[] = array( 'title' => 'Firewall', 'target' => 'content', + 'link' => 'admin/firewall_list.php', + 'html_id'=> 'firewall_list');*/ + +$items[] = array( 'title' => 'Basic', + 'target' => 'content', 'link' => 'admin/firewall_list.php'); +/* +$items[] = array( 'title' => 'Packet Filter', + 'target' => 'content', + 'link' => 'admin/firewall_filter_list.php'); - +$items[] = array( 'title' => 'Port Forward', + 'target' => 'content', + 'link' => 'admin/firewall_forward_list.php'); +*/ $module['nav'][] = array( 'title' => 'Firewall', - 'open' => 1, + 'open' => "1", 'items' => $items); @@ -93,15 +117,18 @@ $items[] = array( 'title' => 'Repositories', 'target' => 'content', - 'link' => 'admin/software_repo_list.php'); + 'link' => 'admin/software_repo_list.php', + 'html_id'=> 'software_repo_list'); $items[] = array( 'title' => 'Packages', 'target' => 'content', - 'link' => 'admin/software_package_list.php'); + 'link' => 'admin/software_package_list.php', + 'html_id'=> 'software_package_list'); $items[] = array( 'title' => 'Updates', 'target' => 'content', - 'link' => 'admin/software_update_list.php'); + 'link' => 'admin/software_update_list.php', + 'html_id'=> 'software_update_list'); $module['nav'][] = array( 'title' => 'Software', 'open' => 1, @@ -113,23 +140,28 @@ $items[] = array( 'title' => 'Languages', 'target' => 'content', - 'link' => 'admin/language_list.php'); + 'link' => 'admin/language_list.php', + 'html_id'=> 'language_list'); $items[] = array( 'title' => 'New Language', 'target' => 'content', - 'link' => 'admin/language_add.php'); - + 'link' => 'admin/language_add.php', + 'html_id'=> 'language_add'); + $items[] = array( 'title' => 'Merge', 'target' => 'content', - 'link' => 'admin/language_complete.php'); + 'link' => 'admin/language_complete.php', + 'html_id'=> 'language_complete'); $items[] = array( 'title' => 'Export', 'target' => 'content', - 'link' => 'admin/language_export.php'); + 'link' => 'admin/language_export.php', + 'html_id'=> 'language_export'); $items[] = array( 'title' => 'Import', 'target' => 'content', - 'link' => 'admin/language_import.php'); + 'link' => 'admin/language_import.php', + 'html_id'=> 'language_import'); $module['nav'][] = array( 'title' => 'Language Editor', 'open' => 1, @@ -141,13 +173,15 @@ $items[] = array( 'title' => 'Add user', 'target' => 'content', - 'link' => 'admin/remote_user_edit.php'); + 'link' => 'admin/remote_user_edit.php', + 'html_id'=> 'remote_user_add'); $items[] = array( 'title' => 'Edit user', 'target' => 'content', - 'link' => 'admin/remote_user_list.php'); + 'link' => 'admin/remote_user_list.php', + 'html_id'=> 'remote_user_list'); - + $module['nav'][] = array( 'title' => 'Remote Users', 'open' => 1, 'items' => $items); @@ -157,11 +191,15 @@ $items[] = array( 'title' => 'Do OS-Update', 'target' => 'content', - 'link' => 'admin/remote_action_osupdate.php'); - + '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'); + 'link' => 'admin/remote_action_ispcupdate.php', + 'html_id'=> 'ispcupdate'); +*/ $module['nav'][] = array( 'title' => 'Remote Actions', 'open' => 1, -- Gitblit v1.9.1