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 | |
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')
-rwxr-xr-x | src/usr/local/www/status_logs.php | 28 | ||||
-rw-r--r-- | src/usr/local/www/status_logs_common.inc | 47 | ||||
-rw-r--r-- | src/usr/local/www/status_logs_filter.php | 28 | ||||
-rwxr-xr-x | src/usr/local/www/status_logs_filter_dynamic.php | 14 | ||||
-rw-r--r-- | src/usr/local/www/status_logs_vpn.php | 22 |
5 files changed, 60 insertions, 79 deletions
diff --git a/src/usr/local/www/status_logs.php b/src/usr/local/www/status_logs.php index bdab7bf..20b5c4f 100755 --- a/src/usr/local/www/status_logs.php +++ b/src/usr/local/www/status_logs.php @@ -149,24 +149,14 @@ filter_form_system(); // Now the forms are complete we can draw the log table and its controls if (!$rawfilter) { - if ($filterlogentries_submit) { - $filterlog = conv_log_filter($logfile_path, $nentries, $nentries + 100, $filterfieldsarray); - } else { - $filterlog = conv_log_filter($logfile_path, $nentries, $nentries + 100, $filtertext); - } + system_log_filter(); ?> <div class="panel panel-default"> <div class="panel-heading"> <h2 class="panel-title"> <?php - if (($filtersubmit) || ($filterlogentries_submit)) { - printf(gettext("%d matched %s log entries."), count($filterlog), gettext($allowed_logs[$logfile]["name"])); - } else { - printf(gettext("Last %d %s log entries."), count($filterlog), gettext($allowed_logs[$logfile]["name"])); - } - - printf(" (" . gettext("Maximum %d") . ")", $nentries); + print(system_log_table_header()); ?> </h2> </div> @@ -219,13 +209,7 @@ if (!$rawfilter) { <div class="panel-heading"> <h2 class="panel-title"> <?php - if (($filtersubmit) || ($filterlogentries_submit)) { - printf(gettext("%s matched %s log entries."), "<span id='count'>_ _</span>", gettext($allowed_logs[$logfile]["name"])); - } else { - printf(gettext("Last %s %s log entries."), "<span id='count'>_ _</span>", gettext($allowed_logs[$logfile]["name"])); - } - - printf(" (" . gettext("Maximum %d") . ")", $nentries); + print(system_log_table_header()); ?> </h2> </div> @@ -245,11 +229,7 @@ if (!$rawfilter) { $inverse = null; } - if ($filtertext) { - $rows = dump_clog($logfile_path, $nentries, true, array("$filtertext"), $inverse); - } else { - $rows = dump_clog($logfile_path, $nentries, true, array(), $inverse); - } + system_log_filter(); ?> </tbody> </table> 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() { diff --git a/src/usr/local/www/status_logs_filter.php b/src/usr/local/www/status_logs_filter.php index dff8641..d8f5424 100644 --- a/src/usr/local/www/status_logs_filter.php +++ b/src/usr/local/www/status_logs_filter.php @@ -163,24 +163,14 @@ if (!$rawfilter) { $interfacefilter = $iflist[$interfacefilter]; } - 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); - } + system_log_filter(); ?> <div class="panel panel-default"> <div class="panel-heading"> <h2 class="panel-title"> <?php - if (($filtersubmit) || ($filterlogentries_submit)) { - printf(gettext("%d matched %s log entries."), count($filterlog), gettext($allowed_logs[$logfile]["name"])); - } else { - printf(gettext("Last %d %s log entries."), count($filterlog), gettext($allowed_logs[$logfile]["name"])); - } - - printf(" (" . gettext("Maximum %d") . ")", $nentries); + print(system_log_table_header()); ?> </h2> </div> @@ -328,13 +318,7 @@ if (!$rawfilter) { <div class="panel-heading"> <h2 class="panel-title"> <?php - if (($filtersubmit) || ($filterlogentries_submit)) { - printf(gettext("%s matched %s log entries."), "<span id='count'>_ _</span>", gettext($allowed_logs[$logfile]["name"])); - } else { - printf(gettext("Last %s %s log entries."), "<span id='count'>_ _</span>", gettext($allowed_logs[$logfile]["name"])); - } - - printf(" (" . gettext("Maximum %d") . ")", $nentries); + print(system_log_table_header()); ?> </h2> </div> @@ -348,11 +332,7 @@ if (!$rawfilter) { </thead> <tbody> <?php - if ($filtertext) { - $rows = dump_clog($logfile_path, $nentries, true, array("$filtertext")); - } else { - $rows = dump_clog($logfile_path, $nentries, true, array()); - } + system_log_filter(); ?> </tbody> </table> diff --git a/src/usr/local/www/status_logs_filter_dynamic.php b/src/usr/local/www/status_logs_filter_dynamic.php index 838578a..6f5098f 100755 --- a/src/usr/local/www/status_logs_filter_dynamic.php +++ b/src/usr/local/www/status_logs_filter_dynamic.php @@ -137,11 +137,7 @@ filter_form_firewall(); // Now the forms are complete we can draw the log table and its controls -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); -} +system_log_filter(); ?> <script type="text/javascript"> @@ -408,13 +404,7 @@ function toggleListDescriptions() { <div class="panel-heading"> <h2 class="panel-title"> <?php - if (($filtersubmit) || ($filterlogentries_submit)) { - printf(gettext("%s matched %s log entries."), "<span id='count'>_ _</span>", gettext($allowed_logs[$logfile]["name"])); - } else { - printf(gettext("Last %s %s log entries."), "<span id='count'>_ _</span>", gettext($allowed_logs[$logfile]["name"])); - } - - printf(" (" . gettext("Maximum %d") . ")", $nentries); + print(system_log_table_header()); ?> <?=" " . gettext('Pause') . " "?><input type="checkbox" onclick="javascript:toggle_pause();" /> </h2> diff --git a/src/usr/local/www/status_logs_vpn.php b/src/usr/local/www/status_logs_vpn.php index ee2344f..4cde629 100644 --- a/src/usr/local/www/status_logs_vpn.php +++ b/src/usr/local/www/status_logs_vpn.php @@ -139,11 +139,7 @@ filter_form_vpn(); // Now the forms are complete we can draw the log table and its controls if (!$rawfilter) { - if ($filterlogentries_submit) { - $filterlog = conv_log_filter($logfile_path, $nentries, $nentries + 100, $filterfieldsarray); - } else { - $filterlog = conv_log_filter($logfile_path, $nentries, $nentries + 100, $filtertext); - } + system_log_filter(); // Remove those not of the selected vpn type (poes / l2tp). if ($logfile == "vpn") { @@ -159,13 +155,7 @@ if (!$rawfilter) { <div class="panel-heading"> <h2 class="panel-title"> <?php - if (($filtersubmit) || ($filterlogentries_submit)) { - printf(gettext("%d matched %s log entries."), count($filterlog), gettext($allowed_logs[$logfile]["name"])); - } else { - printf(gettext("Last %d %s log entries."), count($filterlog), gettext($allowed_logs[$logfile]["name"])); - } - - printf(" (" . gettext("Maximum %d") . ")", $nentries); + print(system_log_table_header()); ?> </h2> </div> @@ -263,13 +253,7 @@ if (!$rawfilter) { <div class="panel-heading"> <h2 class="panel-title"> <?php - if (($filtersubmit) || ($filterlogentries_submit)) { - printf(gettext("%s matched %s log entries."), "<span id='count'>_ _</span>", gettext($allowed_logs[$logfile]["name"])); - } else { - printf(gettext("Last %s %s log entries."), "<span id='count'>_ _</span>", gettext($allowed_logs[$logfile]["name"])); - } - - printf(" (" . gettext("Maximum %d") . ")", $nentries); + print(system_log_table_header()); ?> </h2> </div> |