From 9edea9976bd605071e0694a90d704266c0b7e0f9 Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Thu, 14 Aug 2014 11:30:03 -0400
Subject: [PATCH] - Added warning in the interface when a path for a shelluser is set that is outside of the website docroot. - Added security settings feature to allow the root user of a server to control most aspects of whet the admin user of the controlpanel is allowed to do in system settings. This is especially useful for managed severs where the ispconfig admin user and the root user of the server are different persons.
---
interface/web/monitor/lib/module.conf.php | 209 ++++++++++++++++++++++++++++++++-------------------
1 files changed, 131 insertions(+), 78 deletions(-)
diff --git a/interface/web/monitor/lib/module.conf.php b/interface/web/monitor/lib/module.conf.php
index cfff3e6..3e63ebc 100644
--- a/interface/web/monitor/lib/module.conf.php
+++ b/interface/web/monitor/lib/module.conf.php
@@ -3,20 +3,31 @@
/*
Config of the Module
*/
-$module["name"] = "monitor";
-$module["title"] = "Monitor";
-$module["template"] = "module.tpl.htm";
+$module["name"] = "monitor";
+$module["title"] = "top_menu_monitor";
+$module["template"] = "module.tpl.htm";
$module["tab_width"] = '';
-$module["startpage"] = "monitor/show_sys_state.php?state=system";
+$module["startpage"] = "monitor/show_sys_state.php?state=system";
unset($items);
-$items[] = array( 'title' => "Show Overview",
- 'target' => 'content',
- 'link' => 'monitor/show_sys_state.php?state=system');
+$items[] = array( 'title' => "Show Overview",
+ 'target' => 'content',
+ 'link' => 'monitor/show_sys_state.php?state=system',
+ 'html_id' => 'system');
-$module["nav"][] = array( 'title' => 'System State (All Servers)',
- 'open' => 1,
- 'items' => $items);
+$items[] = array( 'title' => "Show System-Log",
+ 'target' => 'content',
+ 'link' => 'monitor/log_list.php',
+ 'html_id' => 'system_log');
+
+$items[] = array( 'title' => 'Show Jobqueue',
+ 'target' => 'content',
+ 'link' => 'monitor/datalog_list.php',
+ 'html_id' => 'jobqueue');
+
+$module["nav"][] = array( 'title' => 'System State (All Servers)',
+ 'open' => 1,
+ 'items' => $items);
/*
@@ -29,7 +40,7 @@
$dropDown = "<select id='server_id' onchange=\"loadContent('monitor/show_sys_state.php?state=server&server=' + document.getElementById('server_id').value);\">";
foreach ($servers as $server)
{
- $dropDown .= "<option value='" . $server['server_id'] . "|" . $server['server_name'] . "'>" . $server['server_name'] . "</option>";
+ $dropDown .= "<option value='" . $server['server_id'] . "|" . $server['server_name'] . "'>" . $server['server_name'] . "</option>";
}
$dropDown .= "</select>";
@@ -37,13 +48,14 @@
Now add them as dropdown to the navigation
*/
unset($items);
-$items[] = array( 'title' => $dropDown,
- 'target' => '', // no action!
- 'link' => ''); // no action!
+$items[] = array( 'title' => $dropDown,
+ 'target' => '', // no action!
+ 'link' => '', // no action!
+ 'html_id' => 'select_server');
-$module["nav"][] = array( 'title' => 'Server to Monitor',
- 'open' => 1,
- 'items' => $items);
+$module["nav"][] = array( 'title' => 'Server to Monitor',
+ 'open' => 1,
+ 'items' => $items);
/*
The first Server at the list is the server first selected
@@ -56,93 +68,134 @@
*/
unset($items);
-$items[] = array( 'title' => "Show CPU info",
- 'target' => 'content',
- 'link' => 'monitor/show_data.php?type=cpu_info');
+$items[] = array( 'title' => "Show CPU info",
+ 'target' => 'content',
+ 'link' => 'monitor/show_data.php?type=cpu_info',
+ 'html_id' => 'cpu_info');
-$module["nav"][] = array( 'title' => 'Hardware-Information',
- 'open' => 1,
- 'items' => $items);
+$module["nav"][] = array( 'title' => 'Hardware-Information',
+ 'open' => 1,
+ 'items' => $items);
/*
* Clear and set the Navigation-Items
*/
unset($items);
-$items[] = array( 'title' => "Show Overview",
- 'target' => 'content',
- 'link' => 'monitor/show_sys_state.php?state=server');
+$items[] = array( 'title' => "Show Overview",
+ 'target' => 'content',
+ 'link' => 'monitor/show_sys_state.php?state=server',
+ 'html_id' => 'server');
-$items[] = array( 'title' => "Show Update State",
- 'target' => 'content',
- 'link' => 'monitor/show_data.php?type=system_update');
+$items[] = array( 'title' => "Show Update State",
+ 'target' => 'content',
+ 'link' => 'monitor/show_data.php?type=system_update',
+ 'html_id' => 'system_update');
-$items[] = array( 'title' => "Show RAID state",
- 'target' => 'content',
- 'link' => 'monitor/show_data.php?type=raid_state');
+$items[] = array( 'title' => "Show RAID state",
+ 'target' => 'content',
+ 'link' => 'monitor/show_data.php?type=raid_state',
+ 'html_id' => 'raid_state');
-$items[] = array( 'title' => "Show Server load",
- 'target' => 'content',
- 'link' => 'monitor/show_data.php?type=server_load');
+$items[] = array( 'title' => "Show Server load",
+ 'target' => 'content',
+ 'link' => 'monitor/show_data.php?type=server_load',
+ 'html_id' => 'serverload');
-$items[] = array( 'title' => "Show Disk usage",
- 'target' => 'content',
- 'link' => 'monitor/show_data.php?type=disk_usage');
+$items[] = array( 'title' => "Show Disk usage",
+ 'target' => 'content',
+ 'link' => 'monitor/show_data.php?type=disk_usage',
+ 'html_id' => 'disk_usage');
-$items[] = array( 'title' => "Show Memory usage",
- 'target' => 'content',
- 'link' => 'monitor/show_data.php?type=mem_usage');
+$items[] = array( 'title' => "Show Memory usage",
+ 'target' => 'content',
+ 'link' => 'monitor/show_data.php?type=mem_usage',
+ 'html_id' => 'mem_usage');
-$items[] = array( 'title' => "Show Services",
- 'target' => 'content',
- 'link' => 'monitor/show_data.php?type=services');
+$items[] = array( 'title' => "Show Services",
+ 'target' => 'content',
+ 'link' => 'monitor/show_data.php?type=services',
+ 'html_id' => 'services');
+$items[] = array( 'title' => "Show Monit",
+ 'target' => 'content',
+ 'link' => 'monitor/show_monit.php',
+ 'html_id' => 'monit');
-$module["nav"][] = array( 'title' => 'Server State',
- 'open' => 1,
- 'items' => $items);
+$items[] = array( 'title' => "Show OpenVz VE BeanCounter",
+ 'target' => 'content',
+ 'link' => 'monitor/show_data.php?type=openvz_beancounter',
+ 'html_id' => 'openvz_beancounter');
+
+$items[] = array( 'title' => "Show Munin",
+ 'target' => 'content',
+ 'link' => 'monitor/show_munin.php',
+ 'html_id' => 'monit');
+
+$module["nav"][] = array( 'title' => 'Server State',
+ 'open' => 1,
+ 'items' => $items);
/*
* Clear and set the Navigation-Items
*/
unset($items);
-$items[] = array( 'title' => "Show Mail-Queue",
- 'target' => 'content',
- 'link' => 'monitor/show_data.php?type=mailq');
+$items[] = array( 'title' => "Show Mail-Queue",
+ 'target' => 'content',
+ 'link' => 'monitor/show_data.php?type=mailq',
+ 'html_id' => 'mailq');
-$items[] = array( 'title' => "Show Mail-Log",
- 'target' => 'content',
- 'link' => 'monitor/show_log.php?log=log_mail');
+$items[] = array( 'title' => "Show Mail-Log",
+ 'target' => 'content',
+ 'link' => 'monitor/show_log.php?log=log_mail',
+ 'html_id' => 'log_mail');
-$items[] = array( 'title' => "Show Mail warn-Log",
- 'target' => 'content',
- 'link' => 'monitor/show_log.php?log=log_mail_warn');
+$items[] = array( 'title' => "Show Mail warn-Log",
+ 'target' => 'content',
+ 'link' => 'monitor/show_log.php?log=log_mail_warn',
+ 'html_id' => 'log_mail_warn');
-$items[] = array( 'title' => "Show Mail err-Log",
- 'target' => 'content',
- 'link' => 'monitor/show_log.php?log=log_mail_err');
+$items[] = array( 'title' => "Show Mail err-Log",
+ 'target' => 'content',
+ 'link' => 'monitor/show_log.php?log=log_mail_err',
+ 'html_id' => 'log_mail_err');
-$items[] = array( 'title' => "Show System-Log",
- 'target' => 'content',
- 'link' => 'monitor/show_log.php?log=log_messages');
+$items[] = array( 'title' => "Show System-Log",
+ 'target' => 'content',
+ 'link' => 'monitor/show_log.php?log=log_messages',
+ 'html_id' => 'log_messages');
-$items[] = array( 'title' => "Show Freshclam-Log",
- 'target' => 'content',
- 'link' => 'monitor/show_log.php?log=log_freshclam');
+$items[] = array( 'title' => "Show ISPC Cron-Log",
+ 'target' => 'content',
+ 'link' => 'monitor/show_log.php?log=log_ispc_cron',
+ 'html_id' => 'log_ispc_cron');
-$items[] = array( 'title' => "Show Clamav-Log",
- 'target' => 'content',
- 'link' => 'monitor/show_log.php?log=log_clamav');
+$items[] = array( 'title' => "Show Freshclam-Log",
+ 'target' => 'content',
+ 'link' => 'monitor/show_log.php?log=log_freshclam',
+ 'html_id' => 'log_freshclam');
-$items[] = array( 'title' => "Show RKHunter-Log",
- 'target' => 'content',
- 'link' => 'monitor/show_data.php?type=rkhunter');
+$items[] = array( 'title' => "Show Clamav-Log",
+ 'target' => 'content',
+ 'link' => 'monitor/show_log.php?log=log_clamav',
+ 'html_id' => 'log_clamav');
-$items[] = array( 'title' => "Show ISPConfig-Log",
- 'target' => 'content',
- 'link' => 'monitor/show_log.php?log=log_ispconfig');
+$items[] = array( 'title' => "Show RKHunter-Log",
+ 'target' => 'content',
+ 'link' => 'monitor/show_data.php?type=rkhunter',
+ 'html_id' => 'rkhunter');
-$module["nav"][] = array( 'title' => 'Logfiles',
- 'open' => 1,
- 'items' => $items);
-?>
\ No newline at end of file
+$items[] = array( 'title' => "Show fail2ban-Log",
+ 'target' => 'content',
+ 'link' => 'monitor/show_data.php?type=fail2ban',
+ 'html_id' => 'fai2ban');
+
+$items[] = array( 'title' => "Show IPTables",
+ 'target' => 'content',
+ 'link' => 'monitor/show_data.php?type=iptables',
+ 'html_id' => 'iptables');
+
+$module["nav"][] = array( 'title' => 'Logfiles',
+ 'open' => 1,
+ 'items' => $items);
+?>
--
Gitblit v1.9.1