diff options
| author | NOYB <Al_Stu@Frontier.com> | 2015-12-06 22:28:36 -0800 |
|---|---|---|
| committer | Stephen Beaver <sbeaver@netgate.com> | 2015-12-11 16:48:55 -0500 |
| commit | 76af8cdbfde205704b5c5d46fa9da206a2e1be73 (patch) | |
| tree | 4b379526df76f00bc583c420565d86ed51d77faa /src/etc | |
| parent | 2d724ce20cd1b55a25e25c59a402e5fe4d7ec4cc (diff) | |
| download | pfsense-76af8cdbfde205704b5c5d46fa9da206a2e1be73.zip pfsense-76af8cdbfde205704b5c5d46fa9da206a2e1be73.tar.gz | |
Status - System Logs - Manage Log
Build up th manage log section with options to override the "General Logging Options" settings on an individual log basis.
Remove over exuberant gettext's.
Set/adjust filter form field widths to be better fitting for the field types.
Open/Close filter form based on filtering state.
Diffstat (limited to 'src/etc')
| -rw-r--r-- | src/etc/inc/filter_log.inc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/etc/inc/filter_log.inc b/src/etc/inc/filter_log.inc index 848ff1d..22296cb 100644 --- a/src/etc/inc/filter_log.inc +++ b/src/etc/inc/filter_log.inc @@ -159,7 +159,13 @@ function conv_log_filter($logfile, $nentries, $tail = 50, $filtertext = "", $fil } } /* Since the lines are in reverse order, flip them around if needed based on the user's preference */ - return isset($config['syslog']['reverse']) ? $filterlog : array_reverse($filterlog); + # First get the "General Logging Options" (global) chronological order setting. Then apply specific log override if set. + $reverse = isset($config['syslog']['reverse']); + $specific_log = basename($logfile, '.log') . '_settings'; + if ($config['syslog'][$specific_log]['cronorder'] == 'forward') $reverse = false; + if ($config['syslog'][$specific_log]['cronorder'] == 'reverse') $reverse = true; + + return ($reverse) ? $filterlog : array_reverse($filterlog); } function escape_filter_regex($filtertext) { |
