diff --git a/plugins/dynamix/Syslog.page b/plugins/dynamix/Syslog.page index c3aa79b7e..4b948936f 100644 --- a/plugins/dynamix/Syslog.page +++ b/plugins/dynamix/Syslog.page @@ -4,8 +4,8 @@ Icon="icon-log" Tag="list" --- -$zip = htmlspecialchars(str_replace(' ','_',strtolower($var['NAME']))); -$log = '/var/log/syslog'; -$cfg = '/boot/config/rsyslog.cfg'; -$select = ''; +$zip = htmlspecialchars(str_replace(' ','_',strtolower($var['NAME']))); +$log = '/var/log/syslog'; +$cfg = '/boot/config/rsyslog.cfg'; +$select = []; if (file_exists($cfg)) { $syslog = parse_ini_file($cfg); if ($syslog['local_server'] && $logs = glob($syslog['server_folder'].'/syslog-*.log',GLOB_NOSORT)) { - $select = ""; + $select[] = ""; } } +$select = implode($select); ?> +
- + diff --git a/plugins/dynamix/include/Syslog.php b/plugins/dynamix/include/Syslog.php index ef619a76f..cd4138302 100644 --- a/plugins/dynamix/include/Syslog.php +++ b/plugins/dynamix/include/Syslog.php @@ -1,6 +1,6 @@ '; + foreach ($match as $type) foreach ($type['text'] as $text) if (preg_match("/$text/i",$line)) { + $span = ''; + break 2; } - $span = "span class='text'"; - foreach ($match as $type) foreach ($type['text'] as $text) if (preg_match("/$text/i",$line)) {$span = "span class='{$type['class']}'"; break 2;} - echo "<$span>".htmlspecialchars($line).""; + echo $span,htmlspecialchars(rtrim($line,"\n")),""; } fclose($fh); }