diff options
| author | NOYB <Al_Stu@Frontier.com> | 2016-01-23 15:31:31 -0800 |
|---|---|---|
| committer | NOYB <Al_Stu@Frontier.com> | 2016-01-23 15:31:31 -0800 |
| commit | b49fc5ee3d2d775f61a36760298f746ddf5443c6 (patch) | |
| tree | 1cb3099e869e594e2de76bd16d67bc53727c0b57 /src/usr/local/www/status_logs_common.inc | |
| parent | dc14d2b09d60d4600a86fc36d7d4775c2c32ac60 (diff) | |
| download | pfsense-b49fc5ee3d2d775f61a36760298f746ddf5443c6.zip pfsense-b49fc5ee3d2d775f61a36760298f746ddf5443c6.tar.gz | |
Fix a couple consolidation issues.
Force firewall dynamic view to use the raw mode table header so it gets updated.
Add a couple missing variables.
Diffstat (limited to 'src/usr/local/www/status_logs_common.inc')
| -rw-r--r-- | src/usr/local/www/status_logs_common.inc | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/usr/local/www/status_logs_common.inc b/src/usr/local/www/status_logs_common.inc index 4841129..84d0dcd 100644 --- a/src/usr/local/www/status_logs_common.inc +++ b/src/usr/local/www/status_logs_common.inc @@ -155,18 +155,19 @@ function tab_array_logs_common() { // Log Table header function system_log_table_header() { - global $rawfilter, $filtersubmit, $filterlogentries_submit, $filterlog, $allowed_logs, $logfile, $nentries; + global $rawfilter, $filtersubmit, $filterlogentries_submit, $filterlog, $nentries; + global $allowed_logs, $logfile; $rtnstr = ''; if ($rawfilter) { - if ($filtersubmit) { + if (($filtersubmit) || ($filterlogentries_submit)) { $rtnstr .= sprintf(gettext("%s matched %s log entries."), "<span id='count'>_ _</span>", gettext($allowed_logs[$logfile]["name"])); } else { $rtnstr .= sprintf(gettext("Last %s %s log entries."), "<span id='count'>_ _</span>", gettext($allowed_logs[$logfile]["name"])); } } else { - if ($filterlogentries_submit) { + if (($filtersubmit) || ($filterlogentries_submit)) { $rtnstr .= sprintf(gettext("%d matched %s log entries."), count($filterlog), gettext($allowed_logs[$logfile]["name"])); } else { $rtnstr .= sprintf(gettext("Last %d %s log entries."), count($filterlog), gettext($allowed_logs[$logfile]["name"])); @@ -181,17 +182,17 @@ function system_log_table_header() { // Log Filter function system_log_filter() { - global $rawfilter, $filtertext, $filterlogentries_submit, $logfile_path, $nentries, $filterfieldsarray, $filtertext, $interfacefilter; - global $filterlog, $rows, $inverse; + global $rawfilter, $filtersubmit, $filterlogentries_submit, $filterlog, $nentries; + global $logfile_path, $filtertext, $filterfieldsarray, $interfacefilter, $inverse, $rows; if ($rawfilter) { - if ($filtertext) { + if (($filtersubmit) || ($filterlogentries_submit)) { $rows = dump_clog($logfile_path, $nentries, true, array("$filtertext"), $inverse); } else { $rows = dump_clog($logfile_path, $nentries, true, array(), $inverse); } } else { - if ($filterlogentries_submit) { + if (($filtersubmit) || ($filterlogentries_submit)) { $filterlog = conv_log_filter($logfile_path, $nentries, $nentries + 100, $filterfieldsarray); } else { $filterlog = conv_log_filter($logfile_path, $nentries, $nentries + 100, $filtertext, $interfacefilter); |
