From bd68aae78a5d696e4ccb9c0d267486c283a6d9d2 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Fri, 18 Oct 2013 08:49:59 -0400
Subject: [PATCH] Resolved differences from svn merge to trunk and git master
---
interface/web/monitor/show_log.php | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/interface/web/monitor/show_log.php b/interface/web/monitor/show_log.php
index ec10a98..cb9e4c1 100644
--- a/interface/web/monitor/show_log.php
+++ b/interface/web/monitor/show_log.php
@@ -125,7 +125,20 @@
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 $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);
} else {
--
Gitblit v1.9.1