From 045beddf0eab55fe0cf94c43f9d146a1f3ad1e45 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Sun, 25 Jan 2009 06:30:01 -0500
Subject: [PATCH] Fixed: FS#474 - serial not updated for domain after changes
---
interface/web/monitor/tools.inc.php | 159 +++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 124 insertions(+), 35 deletions(-)
diff --git a/interface/web/monitor/tools.inc.php b/interface/web/monitor/tools.inc.php
index 5780a25..8a36587 100644
--- a/interface/web/monitor/tools.inc.php
+++ b/interface/web/monitor/tools.inc.php
@@ -39,7 +39,9 @@
Format the data
*/
$html =
- '<table id="system_load">
+ '<div class="systemmonitor-state state-'.$record['state'].'">
+ <div class="systemmonitor-content icons32 ico-'.$record['state'].'">
+ <table>
<tr>
<td>' . $app->lng("Server online since").':</td>
<td>' . $data['up_days'] . ' days, ' . $data['up_hours'] . ':' . $data['up_minutes'] . ' hours</center></td>
@@ -60,7 +62,9 @@
<td>'.$app->lng("System load 15 minutes").':</td>
<td>' . $data['load_15'] . '</td>
</tr>
- </table>';
+ </table>
+ </div>
+ </div>';
} else {
$html = '<p>'.$app->lng("no_data_serverload_txt").'</p>';
}
@@ -80,7 +84,19 @@
/*
Format the data
*/
- $html = '<table id="system_disk">';
+ $html =
+ '<div class="systemmonitor-state state-'.$record['state'].'">
+ <div class="systemmonitor-content icons32 ico-'.$record['state'].'">
+ <table>
+ <tr>
+ <td>'.$app->lng("monitor_diskusage_filesystem_txt").'</td>
+ <td>'.$app->lng("monitor_diskusage_type_txt").'</td>
+ <td>'.$app->lng("monitor_diskusage_size_txt").'</td>
+ <td>'.$app->lng("monitor_diskusage_used_txt").'</td>
+ <td>'.$app->lng("monitor_diskusage_available_txt").'</td>
+ <td>'.$app->lng("monitor_diskusage_usage_txt").'</td>
+ <td>'.$app->lng("monitor_diskusage_mounted_txt").'</td>
+ </tr>';
foreach($data as $line) {
$html .= '<tr>';
foreach ($line as $item) {
@@ -89,6 +105,7 @@
$html .= '</tr>';
}
$html .= '</table>';
+ $html .= '</div></div>';
} else {
$html = '<p>'.$app->lng("no_data_diskusage_txt").'</p>';
}
@@ -111,7 +128,10 @@
/*
Format the data
*/
- $html = '<table id="system_memusage">';
+ $html =
+ '<div class="systemmonitor-state state-'.$record['state'].'">
+ <div class="systemmonitor-content icons32 ico-'.$record['state'].'">
+ <table>';
foreach($data as $key => $value){
if ($key != '') {
@@ -122,6 +142,8 @@
}
}
$html .= '</table>';
+ $html .= '</div></div>';
+
} else {
$html = '<p>'.$app->lng("no_data_memusage_txt").'</p>';
}
@@ -142,7 +164,10 @@
/*
Format the data
*/
- $html = '<table id="system_cpu">';
+ $html =
+ '<div class="systemmonitor-state state-'.$record['state'].'">
+ <div class="systemmonitor-content icons32 ico-'.$record['state'].'">
+ <table>';
foreach($data as $key => $value){
if ($key != '') {
$html .= '<tr>
@@ -152,6 +177,7 @@
}
}
$html .= '</table>';
+ $html .= '</div></div>';
} else {
$html = '<p>'.$app->lng("no_data_cpuinfo_txt").'</p>';
}
@@ -172,16 +198,19 @@
/*
Format the data
*/
- $html = '<table id="system_services">';
+ $html =
+ '<div class="systemmonitor-state state-'.$record['state'].'">
+ <div class="systemmonitor-content icons32 ico-'.$record['state'].'">
+ <table>';
if($data['webserver'] != -1) {
if($data['webserver'] == 1) {
- $status = '<span class="online">Online</span>';
+ $status = '<span class="online">'.$app->lng("monitor_services_online_txt").'</span>';
} else {
- $status = '<span class="offline">Offline</span>';
+ $status = '<span class="offline">'.$app->lng("monitor_services_offline_txt").'</span>';
}
$html .= '<tr>
- <td>Web-Server:</td>
+ <td>'.$app->lng("monitor_services_web_txt").'</td>
<td>'.$status.'</td>
</tr>';
}
@@ -189,78 +218,78 @@
if($data['ftpserver'] != -1) {
if($data['ftpserver'] == 1) {
- $status = '<span class="online">Online</span>';
+ $status = '<span class="online">'.$app->lng("monitor_services_online_txt").'</span>';
} else {
- $status = '<span class="offline">Offline</span>';
+ $status = '<span class="offline">'.$app->lng("monitor_services_offline_txt").'</span>';
}
$html .= '<tr>
- <td>FTP-Server:</td>
+ <td>'.$app->lng("monitor_services_ftp_txt").'</td>
<td>'.$status.'</td>
</tr>';
}
if($data['smtpserver'] != -1) {
if($data['smtpserver'] == 1) {
- $status = '<span class="online">Online</span>';
+ $status = '<span class="online">'.$app->lng("monitor_services_online_txt").'</span>';
} else {
- $status = '<span class="offline">Offline</span>';
+ $status = '<span class="offline">'.$app->lng("monitor_services_offline_txt").'</span>';
}
$html .= '<tr>
- <td>SMTP-Server:</td>
+ <td>'.$app->lng("monitor_services_smtp_txt").'</td>
<td>'.$status.'</td>
</tr>';
}
if($data['pop3server'] != -1) {
if($data['pop3server'] == 1) {
- $status = '<span class="online">Online</span>';
+ $status = '<span class="online">'.$app->lng("monitor_services_online_txt").'</span>';
} else {
- $status = '<span class="offline">Offline</span>';
+ $status = '<span class="offline">'.$app->lng("monitor_services_offline_txt").'</span>';
}
$html .= '<tr>
- <td>POP3-Server:</td>
+ <td>'.$app->lng("monitor_services_pop_txt").'</td>
<td>'.$status.'</td>
</tr>';
}
if($data['imapserver'] != -1) {
if($data['imapserver'] == 1) {
- $status = '<span class="online">Online</span>';
+ $status = '<span class="online">'.$app->lng("monitor_services_online_txt").'</span>';
} else {
- $status = '<span class="offline">Offline</span>';
+ $status = '<span class="offline">'.$app->lng("monitor_services_offline_txt").'</span>';
}
$html .= '<tr>
- <td>IMAP-Server:</td>
+ <td>'.$app->lng("monitor_services_imap_txt").'</td>
<td>'.$status.'</td>
</tr>';
}
if($data['bindserver'] != -1) {
if($data['bindserver'] == 1) {
- $status = '<span class="online">Online</span>';
+ $status = '<span class="online">'.$app->lng("monitor_services_online_txt").'</span>';
} else {
- $status = '<span class="offline">Offline</span>';
+ $status = '<span class="offline">'.$app->lng("monitor_services_offline_txt").'</span>';
}
$html .= '<tr>
- <td>DNS-Server:</td>
+ <td>'.$app->lng("monitor_services_mydns_txt").'</td>
<td>'.$status.'</td>
</tr>';
}
if($data['mysqlserver'] != -1) {
if($data['mysqlserver'] == 1) {
- $status = '<span class="online">Online</span>';
+ $status = '<span class="online">'.$app->lng("monitor_services_online_txt").'</span>';
} else {
- $status = '<span class="offline">Offline</span>';
+ $status = '<span class="offline">'.$app->lng("monitor_services_offline_txt").'</span>';
}
$html .= '<tr>
- <td>mySQL-Server:</td>
+ <td>'.$app->lng("monitor_services_mysql_txt").'</td>
<td>'.$status.'</td>
</tr>';
}
- $html .= '</table></div>';
+ $html .= '</table></div></div>';
} else {
$html = '<p>'.$app->lng("no_data_services_txt").'</p>';
}
@@ -277,19 +306,23 @@
$record = $app->db->queryOneRecord("SELECT data, state FROM monitor_data WHERE type = 'system_update' and server_id = " . $_SESSION['monitor']['server_id'] . " order by created desc");
if(isset($record['data'])) {
+ $html =
+ '<div class="systemmonitor-state state-'.$record['state'].'">
+ <div class="systemmonitor-content icons32 ico-'.$record['state'].'">';
/*
* First, we have to detect, if there is any monitoring-data.
* If not (because the destribution is not supported) show this.
*/
if ($record['state'] == 'no_state'){
- $html = '<p>' . "Your distribution is not supported for this monitoring" . '</p>';
+ $html .= '<p>'.$app->lng("monitor_updates_nosupport_txt").'</p>';
}
else {
$data = unserialize($record['data']);
- $html = nl2br($data['output']);
+ $html .= nl2br($data['output']);
}
+ $html .= '</div></div>';
} else {
- $html = '<p>' . "No Update-Data available" . '</p>';
+ $html = '<p>'.$app->lng("no_data_updates_txt").'</p>';
}
return $html;
@@ -303,19 +336,57 @@
$record = $app->db->queryOneRecord("SELECT data, state FROM monitor_data WHERE type = 'raid_state' and server_id = " . $_SESSION['monitor']['server_id'] . " order by created desc");
if(isset($record['data'])) {
+ $html =
+ '<div class="systemmonitor-state state-'.$record['state'].'">
+ <div class="systemmonitor-content icons32 ico-'.$record['state'].'">';
+
/*
* First, we have to detect, if there is any monitoring-data.
* If not (because the destribution is not supported) show this.
*/
if ($record['state'] == 'no_state'){
- $html = '<p>' . "mdadm ist not installed or your Server has no supported RAID" . '</p>';
+ $html .= '<p>'.$app->lng("monitor_nomdadm_txt").'</p>';
}
else {
$data = unserialize($record['data']);
- $html = nl2br($data['output']);
+ $html .= nl2br($data['output']);
}
+ $html .= '</div></div>';
+
} else {
- $html = '<p>' . "No RAID-Data available" . '</p>';
+ $html = '<p>'.$app->lng("no_data_raid_txt").'</p>';
+ }
+
+ return $html;
+}
+
+function showRKHunter()
+{
+ global $app;
+
+ /* fetch the Data from the DB */
+ $record = $app->db->queryOneRecord("SELECT data, state FROM monitor_data WHERE type = 'rkhunter' and server_id = " . $_SESSION['monitor']['server_id'] . " order by created desc");
+
+ if(isset($record['data'])) {
+ $html =
+ '<div class="systemmonitor-state state-'.$record['state'].'">
+ <div class="systemmonitor-content icons32 ico-'.$record['state'].'">';
+
+ /*
+ * First, we have to detect, if there is any monitoring-data.
+ * If not (because the destribution is not supported) show this.
+ */
+ $data = unserialize($record['data']);
+ if ($data['output'] == ''){
+ $html .= '<p>'.$app->lng("monitor_norkhunter_txt").'</p>';
+ }
+ else {
+ $html .= nl2br($data['output']);
+ }
+ $html .= '</div></div>';
+
+ } else {
+ $html = '<p>'.$app->lng("no_data_rkhunter_txt").'</p>';
}
return $html;
@@ -332,9 +403,27 @@
$data = unserialize($record['data']);
$html = nl2br($data['output']);
} else {
- $html = '<p>' . "No Mailq-Data available" . '</p>';
+ $html = '<p>'.$app->lng("no_data_mailq_txt").'</p>';
}
return $html;
}
+
+function getDataTime($type) {
+ global $app;
+
+ /* fetch the Data from the DB */
+ $record = $app->db->queryOneRecord("SELECT created FROM monitor_data WHERE type = '" . $type . "' and server_id = " . $_SESSION['monitor']['server_id'] . " order by created desc");
+
+ /* TODO: datetimeformat should be set somewhat other way */
+ $dateTimeFormat = $app->lng("monitor_settings_datetimeformat_txt");
+
+ if(isset($record['created'])) {
+// $res = date('Y-m-d H:i', $record['created']);
+ $res = date($dateTimeFormat, $record['created']);
+ } else {
+ $res = '????-??-?? ??:??';
+ }
+ return $res;
+}
?>
--
Gitblit v1.9.1