From 1139530fbf3fb0fdce1bf5cfee311cd6f0fbf816 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Mon, 14 Oct 2013 10:04:06 -0400
Subject: [PATCH] Merge remote-tracking branch 'origin/stable-3.0.5'
---
interface/web/monitor/show_log.php | 15 +--------------
1 files changed, 1 insertions(+), 14 deletions(-)
diff --git a/interface/web/monitor/show_log.php b/interface/web/monitor/show_log.php
index cb9e4c1..ec10a98 100644
--- a/interface/web/monitor/show_log.php
+++ b/interface/web/monitor/show_log.php
@@ -125,20 +125,7 @@
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) {
- 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>";
- }
- }
+ $logData = nl2br(htmlspecialchars($data));
$app->tpl->setVar("log_data", $logData);
} else {
--
Gitblit v1.9.1