From a5b276444c1e2fa9c960131723ffd6955fb92f48 Mon Sep 17 00:00:00 2001
From: karailiev <karailiev@ispconfig3>
Date: Tue, 11 Aug 2009 15:20:21 -0400
Subject: [PATCH] ticket 827 For some reason till has made the version number not to load when no user is logged in. Due to ajax login the version number remains not loaded even after login until the whole page is reloaded. I didn't find any comment why is this done, so I revert it.
---
interface/web/monitor/lib/module.conf.php | 49 +++++++++++++++++++++++++++++++++----------------
1 files changed, 33 insertions(+), 16 deletions(-)
diff --git a/interface/web/monitor/lib/module.conf.php b/interface/web/monitor/lib/module.conf.php
index 9320046..58d849b 100644
--- a/interface/web/monitor/lib/module.conf.php
+++ b/interface/web/monitor/lib/module.conf.php
@@ -10,9 +10,17 @@
$module["startpage"] = "monitor/show_sys_state.php?state=system";
unset($items);
-$items[] = array( 'title' => "Show System State",
+$items[] = array( 'title' => "Show Overview",
'target' => 'content',
'link' => 'monitor/show_sys_state.php?state=system');
+
+$items[] = array( 'title' => "Show System-Log",
+ 'target' => 'content',
+ 'link' => 'monitor/log_list.php');
+
+$items[] = array( 'title' => 'Show Jobqueue',
+ 'target' => 'content',
+ 'link' => 'monitor/datalog_list.php');
$module["nav"][] = array( 'title' => 'System State (All Servers)',
'open' => 1,
@@ -23,6 +31,7 @@
We need all the available servers on the left navigation.
So fetch them from the database and add then to the navigation as dropdown-list
*/
+
$servers = $app->db->queryAllRecords("SELECT server_id, server_name FROM server order by server_name");
$dropDown = "<select id='server_id' onchange=\"loadContent('monitor/show_sys_state.php?state=server&server=' + document.getElementById('server_id').value);\">";
@@ -59,7 +68,7 @@
'target' => 'content',
'link' => 'monitor/show_data.php?type=cpu_info');
-$module["nav"][] = array( 'title' => 'System-Information',
+$module["nav"][] = array( 'title' => 'Hardware-Information',
'open' => 1,
'items' => $items);
@@ -67,19 +76,19 @@
* Clear and set the Navigation-Items
*/
unset($items);
-$items[] = array( 'title' => "Show Server State",
+$items[] = array( 'title' => "Show Overview",
'target' => 'content',
'link' => 'monitor/show_sys_state.php?state=server');
-/*
- * The next menu is only available at debian or Ubuntu
- */
-if(file_exists('/etc/debian_version')){
+
$items[] = array( 'title' => "Show Update State",
'target' => 'content',
'link' => 'monitor/show_data.php?type=system_update');
-}
-$items[] = array( 'title' => "Show Server Load",
+$items[] = array( 'title' => "Show RAID state",
+ 'target' => 'content',
+ 'link' => 'monitor/show_data.php?type=raid_state');
+
+$items[] = array( 'title' => "Show Server load",
'target' => 'content',
'link' => 'monitor/show_data.php?type=server_load');
@@ -95,11 +104,8 @@
'target' => 'content',
'link' => 'monitor/show_data.php?type=services');
-$items[] = array( 'title' => "Show Mailq",
- 'target' => 'content',
- 'link' => 'monitor/show_data.php?type=mailq');
-$module["nav"][] = array( 'title' => 'Monitoring',
+$module["nav"][] = array( 'title' => 'Server State',
'open' => 1,
'items' => $items);
@@ -107,6 +113,10 @@
* 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-Log",
'target' => 'content',
@@ -120,9 +130,13 @@
'target' => 'content',
'link' => 'monitor/show_log.php?log=log_mail_err');
-$items[] = array( 'title' => "Show Messages-Log",
+$items[] = array( 'title' => "Show System-Log",
'target' => 'content',
'link' => 'monitor/show_log.php?log=log_messages');
+
+$items[] = array( 'title' => "Show ISPC Cron-Log",
+ 'target' => 'content',
+ 'link' => 'monitor/show_log.php?log=log_ispc_cron');
$items[] = array( 'title' => "Show Freshclam-Log",
'target' => 'content',
@@ -132,10 +146,13 @@
'target' => 'content',
'link' => 'monitor/show_log.php?log=log_clamav');
-$items[] = array( 'title' => "Show ISPConfig-Log",
+$items[] = array( 'title' => "Show RKHunter-Log",
'target' => 'content',
- 'link' => 'monitor/show_log.php?log=log_ispconfig');
+ 'link' => 'monitor/show_data.php?type=rkhunter');
+$items[] = array( 'title' => "Show fail2ban-Log",
+ 'target' => 'content',
+ 'link' => 'monitor/show_data.php?type=fail2ban');
$module["nav"][] = array( 'title' => 'Logfiles',
'open' => 1,
--
Gitblit v1.9.1