From b3c1caa65da9da7a15202d979c45f6cc6bf002ae Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Thu, 13 Nov 2008 13:37:48 -0500
Subject: [PATCH] Fixed a few php warnings in the log module which appeared when no log data is available.
---
interface/web/monitor/lib/lang/en.lng | 6 +
interface/web/monitor/show_data.php | 180 ++++++++++++++++++++++++++-------------------
interface/web/monitor/show_log.php | 14 ++-
3 files changed, 120 insertions(+), 80 deletions(-)
diff --git a/interface/web/monitor/lib/lang/en.lng b/interface/web/monitor/lib/lang/en.lng
index 46ffc59..d9a4916 100644
--- a/interface/web/monitor/lib/lang/en.lng
+++ b/interface/web/monitor/lib/lang/en.lng
@@ -18,5 +18,11 @@
$wb['Freshclam'] = 'Freshclam';
$wb['Clamav'] = 'Clamav';
$wb['ISPConfig'] = 'ISPConfig';
+$wb['no_data_serverload_txt'] = 'No data about the server load available at the moment. Please check again later.';
+$wb['no_data_memusage_txt'] = 'No data about the memory usage available at the moment. Please check again later.';
+$wb['no_data_diskusage_txt'] = 'No data about the disk usage available at the moment. Please check again later.';
+$wb['no_data_cpuinfo_txt'] = 'No data about the CPU available at the moment. Please check again later.';
+$wb['no_data_services_txt'] = 'No data about the services available at the moment. Please check again later.';
+$wb['no_logdata_txt'] = 'No log data available at the moment. Please check again later.';
?>
\ No newline at end of file
diff --git a/interface/web/monitor/show_data.php b/interface/web/monitor/show_data.php
index a280bc1..845b0df 100644
--- a/interface/web/monitor/show_data.php
+++ b/interface/web/monitor/show_data.php
@@ -114,12 +114,14 @@
/* fetch the Data from the DB */
$record = $app->db->queryOneRecord("SELECT data, state FROM monitor_data WHERE type = 'server_load' and server_id = " . $_SESSION['monitor']['server_id'] . " order by created desc");
- $data = unserialize($record['data']);
- /*
- Format the data
- */
- $html .=
+ if(isset($record['data'])) {
+ $data = unserialize($record['data']);
+
+ /*
+ Format the data
+ */
+ $html .=
'<table id="system_load">
<tr>
<td>' . $app->lng("Server online since").':</td>
@@ -142,6 +144,10 @@
<td>' . $data['load_15'] . '</td>
</tr>
</table>';
+ } else {
+ $html = '<p>'.$app->lng("no_data_serverload_txt").'</p>';
+ }
+
return $html;
}
@@ -150,20 +156,26 @@
/* fetch the Data from the DB */
$record = $app->db->queryOneRecord("SELECT data, state FROM monitor_data WHERE type = 'disk_usage' and server_id = " . $_SESSION['monitor']['server_id'] . " order by created desc");
- $data = unserialize($record['data']);
- /*
- Format the data
- */
- $html .= '<table id="system_disk">';
- foreach($data as $line) {
- $html .= '<tr>';
- foreach ($line as $item) {
- $html .= '<td>' . $item . '</td>';
+ if(isset($record['data'])) {
+ $data = unserialize($record['data']);
+
+ /*
+ Format the data
+ */
+ $html .= '<table id="system_disk">';
+ foreach($data as $line) {
+ $html .= '<tr>';
+ foreach ($line as $item) {
+ $html .= '<td>' . $item . '</td>';
+ }
+ $html .= '</tr>';
}
- $html .= '</tr>';
+ $html .= '</table>';
+ } else {
+ $html = '<p>'.$app->lng("no_data_diskusage_txt").'</p>';
}
- $html .= '</table>';
+
return $html;
}
@@ -175,22 +187,28 @@
/* fetch the Data from the DB */
$record = $app->db->queryOneRecord("SELECT data, state FROM monitor_data WHERE type = 'mem_usage' and server_id = " . $_SESSION['monitor']['server_id'] . " order by created desc");
- $data = unserialize($record['data']);
- /*
- Format the data
- */
- $html .= '<table id="system_memusage">';
+ if(isset($record['data'])) {
+ $data = unserialize($record['data']);
- foreach($data as $key => $value){
- if ($key != '') {
- $html .= '<tr>
+ /*
+ Format the data
+ */
+ $html .= '<table id="system_memusage">';
+
+ foreach($data as $key => $value){
+ if ($key != '') {
+ $html .= '<tr>
<td>' . $key . ':</td>
<td>' . $value . '</td>
</tr>';
+ }
}
+ $html .= '</table>';
+ } else {
+ $html = '<p>'.$app->lng("no_data_memusage_txt").'</p>';
}
- $html .= '</table>';
+
return $html;
}
@@ -200,21 +218,26 @@
/* fetch the Data from the DB */
$record = $app->db->queryOneRecord("SELECT data, state FROM monitor_data WHERE type = 'cpu_info' and server_id = " . $_SESSION['monitor']['server_id'] . " order by created desc");
- $data = unserialize($record['data']);
- /*
- Format the data
- */
- $html .= '<table id="system_cpu">';
- foreach($data as $key => $value){
- if ($key != '') {
- $html .= '<tr>
+ if(isset($record['data'])) {
+ $data = unserialize($record['data']);
+
+ /*
+ Format the data
+ */
+ $html .= '<table id="system_cpu">';
+ foreach($data as $key => $value){
+ if ($key != '') {
+ $html .= '<tr>
<td>' . $key . ':</td>
<td>' . $value . '</td>
</tr>';
+ }
}
+ $html .= '</table>';
+ } else {
+ $html = '<p>'.$app->lng("no_data_cpuinfo_txt").'</p>';
}
- $html .= '</table>';
return $html;
}
@@ -225,76 +248,81 @@
/* fetch the Data from the DB */
$record = $app->db->queryOneRecord("SELECT data, state FROM monitor_data WHERE type = 'services' and server_id = " . $_SESSION['monitor']['server_id'] . " order by created desc");
- $data = unserialize($record['data']);
- /*
- Format the data
- */
- $html .= '<table id="system_services">';
+ if(isset($record['data'])) {
+ $data = unserialize($record['data']);
- if($data['webserver'] == true) {
- $status = '<span class="online">Online</span>';
- } else {
- $status = '<span class="offline">Offline</span>';
- }
- $html .= '<tr>
+ /*
+ Format the data
+ */
+ $html .= '<table id="system_services">';
+
+ if($data['webserver'] == true) {
+ $status = '<span class="online">Online</span>';
+ } else {
+ $status = '<span class="offline">Offline</span>';
+ }
+ $html .= '<tr>
<td>Web-Server:</td>
<td>'.$status.'</td>
</tr>';
- if($data['ftpserver'] == true) {
- $status = '<span class="online">Online</span>';
- } else {
- $status = '<span class="offline">Offline</span>';
- }
- $html .= '<tr>
+ if($data['ftpserver'] == true) {
+ $status = '<span class="online">Online</span>';
+ } else {
+ $status = '<span class="offline">Offline</span>';
+ }
+ $html .= '<tr>
<td>FTP-Server:</td>
<td>'.$status.'</td>
</tr>';
- if($data['smtpserver'] == true) {
- $status = '<span class="online">Online</span>';
- } else {
- $status = '<span class="offline">Offline</span>';
- }
- $html .= '<tr>
+ if($data['smtpserver'] == true) {
+ $status = '<span class="online">Online</span>';
+ } else {
+ $status = '<span class="offline">Offline</span>';
+ }
+ $html .= '<tr>
<td>SMTP-Server:</td>
<td>'.$status.'</td>
</tr>';
- if($data['pop3server'] == true) {
- $status = '<span class="online">Online</span>';
- } else {
- $status = '<span class="offline">Offline</span>';
- }
- $html .= '<tr>
+ if($data['pop3server'] == true) {
+ $status = '<span class="online">Online</span>';
+ } else {
+ $status = '<span class="offline">Offline</span>';
+ }
+ $html .= '<tr>
<td>POP3-Server:</td>
<td>'.$status.'</td>
</tr>';
- if($data['bindserver'] == true) {
- $status = '<span class="online">Online</span>';
- } else {
- $status = '<span class="offline">Offline</span>';
- }
- $html .= '<tr>
+ if($data['bindserver'] == true) {
+ $status = '<span class="online">Online</span>';
+ } else {
+ $status = '<span class="offline">Offline</span>';
+ }
+ $html .= '<tr>
<td>DNS-Server:</td>
<td>'.$status.'</td>
</tr>';
- if($data['mysqlserver'] == true) {
- $status = '<span class="online">Online</span>';
- } else {
- $status = '<span class="offline">Offline</span>';
- }
- $html .= '<tr>
+ if($data['mysqlserver'] == true) {
+ $status = '<span class="online">Online</span>';
+ } else {
+ $status = '<span class="offline">Offline</span>';
+ }
+ $html .= '<tr>
<td>mySQL-Server:</td>
<td>'.$status.'</td>
</tr>';
- $html .= '</table></div>';
+ $html .= '</table></div>';
+ } else {
+ $html = '<p>'.$app->lng("no_data_services_txt").'</p>';
+ }
return $html;
diff --git a/interface/web/monitor/show_log.php b/interface/web/monitor/show_log.php
index a64c786..ff0fb0b 100644
--- a/interface/web/monitor/show_log.php
+++ b/interface/web/monitor/show_log.php
@@ -40,7 +40,7 @@
$app->tpl->setInclude('content_tpl','templates/show_log.htm');
// Importing the GET values
-$refresh = intval($_GET["refresh"]);
+$refresh = (isset($_GET["refresh"]))?intval($_GET["refresh"]):0;
$logParam = $_GET["log"];
@@ -102,11 +102,17 @@
/* fetch the Data from the DB */
$record = $app->db->queryOneRecord("SELECT data, state FROM monitor_data WHERE type = '" . $app->db->quote($logId) . "' and server_id = " . $_SESSION['monitor']['server_id'] . " order by created desc");
-$data = unserialize($record['data']);
-$logData = nl2br($data);
+if(isset($record['data'])) {
+ $data = unserialize($record['data']);
-$app->tpl->setVar("log_data", $logData);
+ $logData = nl2br($data);
+
+ $app->tpl->setVar("log_data", $logData);
+} else {
+ $app->tpl->setVar("log_data", $app->lng("no_logdata_txt"));
+}
+
$app->tpl->setVar("title", $title);
$app->tpl->setVar("log_id",$logId);
--
Gitblit v1.9.1