diff options
| author | NOYB <Al_Stu@Frontier.com> | 2015-12-11 02:35:13 -0800 |
|---|---|---|
| committer | Stephen Beaver <sbeaver@netgate.com> | 2015-12-11 16:48:55 -0500 |
| commit | e00df6598920a78da34698cf77ef4d4b2198a387 (patch) | |
| tree | 15805eb2c81d4c80e1d3de6f4c6cabb4f27dcc18 /src | |
| parent | 95acc8906156871623c0d371accb875e97651bc4 (diff) | |
| download | pfsense-e00df6598920a78da34698cf77ef4d4b2198a387.zip pfsense-e00df6598920a78da34698cf77ef4d4b2198a387.tar.gz | |
Don't allow log specific setting to override grepreverse option.
Diffstat (limited to 'src')
| -rw-r--r-- | src/usr/local/www/guiconfig.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/usr/local/www/guiconfig.inc b/src/usr/local/www/guiconfig.inc index e796fee..d9d3def 100644 --- a/src/usr/local/www/guiconfig.inc +++ b/src/usr/local/www/guiconfig.inc @@ -710,8 +710,8 @@ function return_clog($logfile, $tail, $withorig = true, $grepfor = "", $grepinve global $g, $config; $sor = (isset($config['syslog']['reverse']) || $grepreverse) ? "-r" : ""; $specific_log = basename($logfile, '.log') . '_settings'; - if ($config['syslog'][$specific_log]['cronorder'] == 'forward') $sor = ""; - if ($config['syslog'][$specific_log]['cronorder'] == 'reverse') $sor = "-r"; + if (($config['syslog'][$specific_log]['cronorder'] == 'forward') && !$grepreverse) $sor = ""; + if (($config['syslog'][$specific_log]['cronorder'] == 'reverse') || $grepreverse) $sor = "-r"; $logarr = ""; $grepline = " "; if (is_array($grepfor)) { |
