From a7796bec1be01b51f400e9a3a698535b12b636aa Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Thu, 11 Feb 2016 13:44:27 -0500
Subject: [PATCH] Merge branch 'stable-3.1'
---
interface/web/monitor/show_log.php | 129 ++++++++++++++++++++++++-------------------
1 files changed, 72 insertions(+), 57 deletions(-)
diff --git a/interface/web/monitor/show_log.php b/interface/web/monitor/show_log.php
index 10abacd..4889e83 100644
--- a/interface/web/monitor/show_log.php
+++ b/interface/web/monitor/show_log.php
@@ -28,20 +28,21 @@
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-require_once('../../lib/config.inc.php');
-require_once('../../lib/app.inc.php');
-require_once('tools.inc.php');
+require_once '../../lib/config.inc.php';
+require_once '../../lib/app.inc.php';
//* Check permissions for module
$app->auth->check_module_permissions('monitor');
+$app->uses('tools_monitor');
+
// Loading the template
$app->uses('tpl');
$app->tpl->newTemplate("form.tpl.htm");
-$app->tpl->setInclude('content_tpl','templates/show_log.htm');
+$app->tpl->setInclude('content_tpl', 'templates/show_log.htm');
// Importing the GET values
-$refresh = (isset($_GET["refresh"]))?intval($_GET["refresh"]):0;
+$refresh = (isset($_GET["refresh"]))?$app->functions->intval($_GET["refresh"]):0;
$logParam = $_GET["log"];
/* Get some translations */
@@ -53,51 +54,51 @@
Setting the db-type and the caption
*/
switch($logParam) {
- case 'log_mail':
- $logId = 'log_mail';
- $title = $app->lng("monitor_logs_mail_txt").' ('. $monTransSrv .' : ' . $_SESSION['monitor']['server_name'] . ')';
- $description = '';
- break;
- case 'log_mail_warn':
- $logId = 'log_mail_warn';
- $title = $app->lng("monitor_logs_mailwarn_txt").' ('. $monTransSrv .' : ' . $_SESSION['monitor']['server_name'] . ')';
- $description = '';
- break;
- case 'log_mail_err':
- $logId = 'log_mail_err';
- $title = $app->lng("monitor_logs_mailerr_txt").' ('. $monTransSrv .' : ' . $_SESSION['monitor']['server_name'] . ')';
- $description = '';
- break;
- case 'log_messages':
- $logId = 'log_messages';
- $title = $app->lng("monitor_logs_messages_txt").' ('. $monTransSrv .' : ' . $_SESSION['monitor']['server_name'] . ')';
- $description = '';
- break;
- case 'log_ispc_cron':
- $logId = 'log_ispc_cron';
- $title = $app->lng("monitor_logs_ispccron_txt").' ('. $monTransSrv .' : ' . $_SESSION['monitor']['server_name'] . ')';
- $description = '';
- break;
- case 'log_freshclam':
- $logId = 'log_freshclam';
- $title = $app->lng("monitor_logs_freshclam_txt").' ('. $monTransSrv .' : ' . $_SESSION['monitor']['server_name'] . ')';
- $description = '';
- break;
- case 'log_clamav':
- $logId = 'log_clamav';
- $title = $app->lng("monitor_logs_clamav_txt").' ('. $monTransSrv .' : ' . $_SESSION['monitor']['server_name'] . ')';
- $description = '';
- break;
- case 'log_ispconfig':
- $logId = 'log_ispconfig';
- $title = $app->lng("monitor_logs_ispc_txt").' ('. $monTransSrv .' : ' . $_SESSION['monitor']['server_name'] . ')';
- $description = '';
- break;
- default:
- $logId = '???';
- $title = '???';
- $description = '';
- break;
+case 'log_mail':
+ $logId = 'log_mail';
+ $title = $app->lng("monitor_logs_mail_txt").' ('. $monTransSrv .' : ' . $_SESSION['monitor']['server_name'] . ')';
+ $description = '';
+ break;
+case 'log_mail_warn':
+ $logId = 'log_mail_warn';
+ $title = $app->lng("monitor_logs_mailwarn_txt").' ('. $monTransSrv .' : ' . $_SESSION['monitor']['server_name'] . ')';
+ $description = '';
+ break;
+case 'log_mail_err':
+ $logId = 'log_mail_err';
+ $title = $app->lng("monitor_logs_mailerr_txt").' ('. $monTransSrv .' : ' . $_SESSION['monitor']['server_name'] . ')';
+ $description = '';
+ break;
+case 'log_messages':
+ $logId = 'log_messages';
+ $title = $app->lng("monitor_logs_messages_txt").' ('. $monTransSrv .' : ' . $_SESSION['monitor']['server_name'] . ')';
+ $description = '';
+ break;
+case 'log_ispc_cron':
+ $logId = 'log_ispc_cron';
+ $title = $app->lng("monitor_logs_ispccron_txt").' ('. $monTransSrv .' : ' . $_SESSION['monitor']['server_name'] . ')';
+ $description = '';
+ break;
+case 'log_freshclam':
+ $logId = 'log_freshclam';
+ $title = $app->lng("monitor_logs_freshclam_txt").' ('. $monTransSrv .' : ' . $_SESSION['monitor']['server_name'] . ')';
+ $description = '';
+ break;
+case 'log_clamav':
+ $logId = 'log_clamav';
+ $title = $app->lng("monitor_logs_clamav_txt").' ('. $monTransSrv .' : ' . $_SESSION['monitor']['server_name'] . ')';
+ $description = '';
+ break;
+case 'log_ispconfig':
+ $logId = 'log_ispconfig';
+ $title = $app->lng("monitor_logs_ispc_txt").' ('. $monTransSrv .' : ' . $_SESSION['monitor']['server_name'] . ')';
+ $description = '';
+ break;
+default:
+ $logId = '???';
+ $title = '???';
+ $description = '';
+ break;
}
@@ -106,7 +107,7 @@
Attention: the core-moule ist triggered every 5 minutes,
so reload every 2 minutes is impossible!
*/
-$refresh_values = array('0' => '- '.$app->lng("No Refresh").' -','5' => '5 '.$app->lng("minutes"),'10' => '10 '.$app->lng("minutes"),'15' => '15 '.$app->lng("minutes"),'30' => '30 '.$app->lng("minutes"),'60' => '60 '.$app->lng("minutes"));
+$refresh_values = array('0' => '- '.$app->lng("No Refresh").' -', '5' => '5 '.$app->lng("minutes"), '10' => '10 '.$app->lng("minutes"), '15' => '15 '.$app->lng("minutes"), '30' => '30 '.$app->lng("minutes"), '60' => '60 '.$app->lng("minutes"));
$tmp = '';
foreach($refresh_values as $key => $val) {
if($key == $refresh) {
@@ -115,26 +116,40 @@
$tmp .= "<option value='$key'>$val</option>";
}
}
-$app->tpl->setVar("refresh",$tmp);
+$app->tpl->setVar("refresh", $tmp);
/* 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");
+$record = $app->db->queryOneRecord("SELECT data, state FROM monitor_data WHERE type = ? and server_id = ? order by created desc", $logId, $_SESSION['monitor']['server_id']);
if(isset($record['data'])) {
$data = unserialize($record['data']);
- $logData = nl2br(htmlspecialchars($data));
+ $logData = explode("\n", htmlspecialchars($data));
+ $logDataHtml = '';
+
+ /* set css class for each line of log, depending on key words in each line */
+ foreach($logData as $line => $val) {
+ if (strpos($val, 'ERROR') !== FALSE) {
+ $logDataHtml .= "<div class='logerror'>$val</div>";
+ } elseif (strpos($val, 'WARN') !== FALSE) {
+ $logDataHtml .= "<div class='logwarn'>$val</div>";
+ } elseif (strpos($val, 'INFO') !== FALSE) {
+ $logDataHtml .= "<div class='loginfo'>$val</div>";
+ } else {
+ $logDataHtml .= "<div class='log'>$val</div>";
+ }
+ }
- $app->tpl->setVar("log_data", $logData);
+ $app->tpl->setVar("log_data", $logDataHtml);
} else {
$app->tpl->setVar("log_data", $app->lng("no_logdata_txt"));
}
$app->tpl->setVar("list_head_txt", $title);
-$app->tpl->setVar("log_id",$logId);
+$app->tpl->setVar("log_id", $logId);
$app->tpl->setVar("list_desc_txt", $description);
-$app->tpl->setVar("time", getDataTime($logId));
+$app->tpl->setVar("time", $app->tools_monitor->getDataTime($logId));
$app->tpl->setVar("monTransDate", $monTransDate);
$app->tpl->setVar("monTransRefreshsq", $monTransRefreshsq);
--
Gitblit v1.9.1