Improved Log view in Monitor.

Till Brehm · Till Brehm · commit a8177a49c5de · 2016-01-31T18:37:30.000+01:00
diff --git 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
@@ -16,6 +16,6 @@ <h1><tmpl_var name="list_head_txt"></h1>
   
     <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>

Original file line number	Diff line number	Diff line change
`@@ -127,8 +127,9 @@`
`127`	`127`
`128`	`128`	`$logData = explode("\n", htmlspecialchars($data));`
`129`	`129`	`$logDataHtml = '';`
	`130`	`+`
`130`	`131`	`/* set css class for each line of log, depending on key words in each line */`
`131`		`- foreach($logData as $val) {`
	`132`	`+ foreach($logData as $line => $val) {`
`132`	`133`	`if (strpos($val, 'ERROR') !== FALSE) {`
`133`	`134`	`$logDataHtml .= "<div class='logerror'>$val</div>";`
`134`	`135`	`} elseif (strpos($val, 'WARN') !== FALSE) {`
`@@ -140,7 +141,7 @@`
`140`	`141`	`}`
`141`	`142`	`}`
`142`	`143`
`143`		`- $app->tpl->setVar("log_data", $logData);`
	`144`	`+ $app->tpl->setVar("log_data", $logDataHtml);`
`144`	`145`	`} else {`
`145`	`146`	`$app->tpl->setVar("log_data", $app->lng("no_logdata_txt"));`
`146`	`147`	`}`