From e1ceb050e19c7574bca146a8da7047ee4ff456b5 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Sun, 10 Jul 2016 05:02:35 -0400
Subject: [PATCH] Merge branch 'stable-3.1'
---
interface/web/monitor/show_log.php | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/interface/web/monitor/show_log.php b/interface/web/monitor/show_log.php
index 96217da..4889e83 100644
--- a/interface/web/monitor/show_log.php
+++ b/interface/web/monitor/show_log.php
@@ -120,15 +120,16 @@
/* 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 = explode("\n", htmlspecialchars($data));
$logDataHtml = '';
+
/* set css class for each line of log, depending on key words in each line */
- foreach($logData as $val) {
+ foreach($logData as $line => $val) {
if (strpos($val, 'ERROR') !== FALSE) {
$logDataHtml .= "<div class='logerror'>$val</div>";
} elseif (strpos($val, 'WARN') !== FALSE) {
@@ -140,7 +141,7 @@
}
}
- $app->tpl->setVar("log_data", $logData);
+ $app->tpl->setVar("log_data", $logDataHtml);
} else {
$app->tpl->setVar("log_data", $app->lng("no_logdata_txt"));
}
--
Gitblit v1.9.1