From a8177a49c5de5a8bf3dad975cfa85aa798e203fa Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Sun, 31 Jan 2016 12:37:30 -0500
Subject: [PATCH] Improved Log view in Monitor.
---
interface/web/monitor/templates/show_log.htm | 2 +-
interface/web/monitor/show_log.php | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/interface/web/monitor/show_log.php b/interface/web/monitor/show_log.php
index e8f3acc..4889e83 100644
--- a/interface/web/monitor/show_log.php
+++ b/interface/web/monitor/show_log.php
@@ -127,8 +127,9 @@
$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"));
}
diff --git a/interface/web/monitor/templates/show_log.htm b/interface/web/monitor/templates/show_log.htm
index 800bfa3..959f324 100644
--- a/interface/web/monitor/templates/show_log.htm
+++ b/interface/web/monitor/templates/show_log.htm
@@ -16,6 +16,6 @@
<div class="pnl_formarea">
<p class="fieldset-legend"><tmpl_var name="monTransDate"><tmpl_var name="time"></p>
- <div class="codeview"><tmpl_var name="log_data"></div>
+ <div class="codeview"><pre><tmpl_var name="log_data"></pre></div>
</div>
\ No newline at end of file
--
Gitblit v1.9.1