diff options
| author | jim-p <jim@pingle.org> | 2009-04-01 10:45:00 -0400 |
|---|---|---|
| committer | jim-p <jim@pingle.org> | 2009-04-01 10:45:00 -0400 |
| commit | ed8fab526b0f39ae43feff8a2126bd5b57141eeb (patch) | |
| tree | 0e96d9c3b16ee21870b8ff8b62cdd3026209fa6e /usr | |
| parent | 8274afc77bfdefa6893472ae486f8e2c6b06291a (diff) | |
| download | pfsense-ed8fab526b0f39ae43feff8a2126bd5b57141eeb.zip pfsense-ed8fab526b0f39ae43feff8a2126bd5b57141eeb.tar.gz | |
Fix dump_clog to handle fifolog and clog timestamps and entries.
Diffstat (limited to 'usr')
| -rwxr-xr-x | usr/local/www/guiconfig.inc | 40 |
1 files changed, 23 insertions, 17 deletions
diff --git a/usr/local/www/guiconfig.inc b/usr/local/www/guiconfig.inc index 2e5bf14..34965ed 100755 --- a/usr/local/www/guiconfig.inc +++ b/usr/local/www/guiconfig.inc @@ -758,8 +758,8 @@ function clear_log_file($logfile = "/var/log/system.log") { function dump_clog($logfile, $tail, $withorig = true, $grepfor = "", $grepinvert = "") { global $g, $config; - $sor = isset($config['syslog']['reverse']) ? "-r" : ""; - $logarr = ""; + $sor = isset($config['syslog']['reverse']) ? "-r" : ""; + $logarr = ""; $grepline = " "; if(is_array($grepfor)) foreach($grepfor as $agrep) @@ -773,25 +773,31 @@ function dump_clog($logfile, $tail, $withorig = true, $grepfor = "", $grepinvert if($config['system']['disablesyslogclog']) { exec("cat {$logfile}{$grepline} | /usr/bin/tail {$sor} -n {$tail}", $logarr); } else { - if(isset($config['system']['usefifolog'])) - exec("/usr/sbin/fifolog_reader {$logfile}{$grepline} | /usr/bin/tail {$sor} -n {$tail}", $logarr); + if(isset($config['system']['usefifolog'])) + exec("/usr/sbin/fifolog_reader {$logfile}{$grepline} | /usr/bin/tail {$sor} -n {$tail}", $logarr); else exec("/usr/sbin/clog {$logfile}{$grepline}| grep -v \"CLOG\" | grep -v \"\033\" | /usr/bin/tail {$sor} -n {$tail}", $logarr); } } - foreach ($logarr as $logent) { - $logent = preg_split("/\s+/", $logent, 6); - echo "<tr valign=\"top\">\n"; - if ($withorig) { - $logent[1] = date("F j, Y, g:i a","" . $logent[1] . ""); - $entry_date_time = htmlspecialchars($logent[1]); - echo "<td class=\"listlr\" nowrap>" . $entry_date_time . "</td>\n"; - echo "<td class=\"listr\">" . htmlspecialchars($logent[5]) . "</td>\n"; - } else { - echo "<td class=\"listlr\" colspan=\"2\">" . htmlspecialchars($logent[5]) . "</td>\n"; - } - echo "</tr>\n"; - } + foreach ($logarr as $logent) { + $logent = preg_split("/\s+/", $logent, 6); + echo "<tr valign=\"top\">\n"; + if ($withorig) { + if(isset($config['system']['usefifolog'])) { + $entry_date_time = htmlspecialchars(date("F j, Y, g:i a","" . $logent[1] . "")); + $entry_text = htmlspecialchars($logent[5]); + } else { + $entry_date_time = htmlspecialchars(join(" ", array_slice($logent, 0, 3))); + $entry_text = htmlspecialchars($logent[4] . " " . $logent[5]); + } + echo "<td class=\"listlr\" nowrap>{$entry_date_time}</td>\n"; + echo "<td class=\"listr\">{$entry_text}</td>\n"; + + } else { + echo "<td class=\"listlr\" colspan=\"2\">" . htmlspecialchars($logent[5]) . "</td>\n"; + } + echo "</tr>\n"; + } } function return_clog($logfile, $tail, $withorig = true, $grepfor = "", $grepinvert = "", $grepreverse = false) { |
