From b17cc67ee9cf6f83c2360da16fb53231203ada8a Mon Sep 17 00:00:00 2001 From: ftimme <ft@falkotimme.com> Date: Wed, 23 May 2012 12:41:54 -0400 Subject: [PATCH] - Added group (we call groups "circles" so that users don't mix them up with user groups) feature to client messaging section so that messages can be sent to either all clients/resellers or to groups of clients/resellers. TODO: add circle access control so that 1) a reseller can create circles that contain only his clients, not all clients, and 2) a reseller can send messages only to his own circles instead of all circles. --- interface/web/admin/lib/module.conf.php | 158 ++++++++++++++++++++++++++++++---------------------- 1 files changed, 90 insertions(+), 68 deletions(-) diff --git a/interface/web/admin/lib/module.conf.php b/interface/web/admin/lib/module.conf.php index 0846b9b..833c8c5 100644 --- a/interface/web/admin/lib/module.conf.php +++ b/interface/web/admin/lib/module.conf.php @@ -3,21 +3,23 @@ global $conf; $module['name'] = 'admin'; -$module['title'] = 'System'; +$module['title'] = 'top_menu_system'; $module['template'] = 'module.tpl.htm'; -$module['startpage'] = 'admin/users_list.php'; +$module['startpage'] = 'admin/server_list.php'; $module['tab_width'] = '60'; $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); @@ -25,16 +27,18 @@ // cleanup unset($items); - +/* $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); @@ -42,50 +46,73 @@ // cleanup unset($items); +*/ /* $items[] = array( 'title' => 'Add server', 'target' => 'content', - 'link' => 'admin/server_edit.php'); + 'link' => 'admin/server_edit.php', + 'html_id'=> 'server_add'); */ -$items[] = array( 'title' => 'Edit server', +$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' => 'Jobqueue', + +$items[] = array( 'title' => 'Interface Config', 'target' => 'content', - 'link' => 'admin/datalog_list.php'); - -$items[] = array( 'title' => 'Log', + 'link' => 'admin/system_config_edit.php?id=1'); + +$items[] = array( 'title' => 'Additional PHP Versions', 'target' => 'content', - 'link' => 'admin/log_list.php'); + 'link' => 'admin/server_php_list.php', + 'html_id'=> 'server_php_list'); -$module['nav'][] = array( 'title' => 'Servers', +$module['nav'][] = array( 'title' => 'System', 'open' => 1, '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); @@ -95,15 +122,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,53 +143,30 @@ // cleanup unset($items); - - - -/* -$items[] = array( 'title' => 'Add user', - 'target' => 'content', - 'link' => 'admin/dbsync_edit.php'); - -$items[] = array( 'title' => 'Edit user', - 'target' => 'content', - 'link' => 'admin/dbsync_list.php'); - - -$items[] = array( 'title' => 'Sync. Now', - 'target' => 'content', - 'link' => 'admin/dbsync_cron.php'); - -$module['nav'][] = array( 'title' => 'DB Sync.', - 'open' => 1, - 'items' => $items); - - -// cleanup -unset($items); -*/ - - - $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, @@ -169,24 +176,39 @@ // cleanup unset($items); -/* $items[] = array( 'title' => 'Add user', 'target' => 'content', - 'link' => 'admin/filesync_edit.php'); + 'link' => 'admin/remote_user_edit.php', + 'html_id'=> 'remote_user_add'); $items[] = array( 'title' => 'Edit user', 'target' => 'content', - 'link' => 'admin/filesync_list.php'); + 'link' => 'admin/remote_user_list.php', + 'html_id'=> 'remote_user_list'); - -$module['nav'][] = array( 'title' => 'File Sync.', + +$module['nav'][] = array( 'title' => 'Remote Users', 'open' => 1, 'items' => $items); - // cleanup unset($items); -*/ + +$items[] = array( 'title' => 'Do OS-Update', + 'target' => 'content', + '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); // Getting the admin options from other modules -- Gitblit v1.9.1