diff options
| author | jim-p <jimp@pfsense.org> | 2010-08-04 16:24:01 -0400 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2010-08-04 16:24:01 -0400 |
| commit | 3b3170d094510f8cdde36a9f24b9ca10b4ea24f4 (patch) | |
| tree | 7ac57edd2b32401a8250b921fc9267c858405ac5 /etc/inc/filter_log.inc | |
| parent | bca84296275708a7c1e2467082e94ed5b5d9cb50 (diff) | |
| download | pfsense-3b3170d094510f8cdde36a9f24b9ca10b4ea24f4.zip pfsense-3b3170d094510f8cdde36a9f24b9ca10b4ea24f4.tar.gz | |
Don't split the date/time when forming a line's timestamp, use both. Otherwise it can lead to oddities when crossing a date border. Fixes #478
Diffstat (limited to 'etc/inc/filter_log.inc')
| -rw-r--r-- | etc/inc/filter_log.inc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/etc/inc/filter_log.inc b/etc/inc/filter_log.inc index f5eb3af..ed4b311 100644 --- a/etc/inc/filter_log.inc +++ b/etc/inc/filter_log.inc @@ -264,11 +264,8 @@ function handle_ajax($nentries, $tail = 50) { /* We need this to always be in forward order for the AJAX update to work properly */ $filterlog = isset($config['syslog']['reverse']) ? array_reverse($filterlog) : $filterlog; foreach($filterlog as $log_row) { - $time_regex = ""; - preg_match("/.*([0-9][0-9]:[0-9][0-9]:[0-9][0-9])/", $log_row['time'], $time_regex); - $row_time = strtotime($time_regex[1]); + $row_time = strtotime($log_row['time']); $img = "<img border='0' src='" . find_action_image($log_row['act']) . "' alt={$log_row['act']} title={$log_row['act']} />"; - //echo "{$time_regex[1]} - $row_time > $lastsawtime<p>"; if($row_time > $lastsawtime) { if ($log_row['proto'] == "TCP") $log_row['proto'] .= ":{$log_row['tcpflags']}"; |
