diff options
author | NOYB <Al_Stu@Frontier.com> | 2016-01-23 07:13:02 -0800 |
---|---|---|
committer | NOYB <Al_Stu@Frontier.com> | 2016-01-23 07:13:02 -0800 |
commit | dc14d2b09d60d4600a86fc36d7d4775c2c32ac60 (patch) | |
tree | 3dbaf023e994560966ea7225b0c4edf0db3b97bc /src/usr/local/www/status_logs_common.inc | |
parent | 98bf911e939fe8f46974e8f86dbc556d0feeb360 (diff) | |
download | pfsense-dc14d2b09d60d4600a86fc36d7d4775c2c32ac60.zip pfsense-dc14d2b09d60d4600a86fc36d7d4775c2c32ac60.tar.gz |
Consolidate log filter code and log table header code in to common functions.
Diffstat (limited to 'src/usr/local/www/status_logs_common.inc')
-rw-r--r-- | src/usr/local/www/status_logs_common.inc | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/src/usr/local/www/status_logs_common.inc b/src/usr/local/www/status_logs_common.inc index efeeaf5..4841129 100644 --- a/src/usr/local/www/status_logs_common.inc +++ b/src/usr/local/www/status_logs_common.inc @@ -153,6 +153,53 @@ function tab_array_logs_common() { } +// Log Table header +function system_log_table_header() { + global $rawfilter, $filtersubmit, $filterlogentries_submit, $filterlog, $allowed_logs, $logfile, $nentries; + + $rtnstr = ''; + + if ($rawfilter) { + if ($filtersubmit) { + $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) { + $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"])); + } + } + + $rtnstr .= sprintf(" (" . gettext("Maximum %d") . ")", $nentries); + + return $rtnstr; +} + + +// Log Filter +function system_log_filter() { + global $rawfilter, $filtertext, $filterlogentries_submit, $logfile_path, $nentries, $filterfieldsarray, $filtertext, $interfacefilter; + global $filterlog, $rows, $inverse; + + if ($rawfilter) { + if ($filtertext) { + $rows = dump_clog($logfile_path, $nentries, true, array("$filtertext"), $inverse); + } else { + $rows = dump_clog($logfile_path, $nentries, true, array(), $inverse); + } + } else { + if ($filterlogentries_submit) { + $filterlog = conv_log_filter($logfile_path, $nentries, $nentries + 100, $filterfieldsarray); + } else { + $filterlog = conv_log_filter($logfile_path, $nentries, $nentries + 100, $filtertext, $interfacefilter); + } + } +} + + // Log Filter Submit - System function log_filter_form_system_submit() { |