summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNOYB <Al_Stu@Frontier.com>2015-12-22 05:06:27 -0800
committerNOYB <Al_Stu@Frontier.com>2016-01-04 10:44:08 -0800
commit0039dab02d2f44a7d2d654d5cdd5b7e5b50621ef (patch)
treec02caeffdb41935c991a4b846bcca0a1a81c4001
parent2f777695711849a2ae84f329257b644019761636 (diff)
downloadpfsense-0039dab02d2f44a7d2d654d5cdd5b7e5b50621ef.zip
pfsense-0039dab02d2f44a7d2d654d5cdd5b7e5b50621ef.tar.gz
Rename functions per Phil suggestions.
s/miscellaneous_common_code/status_logs_common_code/ s/build_if_list/status_logs_build_if_list/ As for getGETPOSTsettingvalue I'm open to it going anywhere that makes sense. Would be nice not to need too many additional inc's to get it though. Anything in guiconfig.inc or filter_logs.inc hierarchy shouldn't require anything additional.
-rwxr-xr-xsrc/usr/local/www/status_logs.php4
-rw-r--r--src/usr/local/www/status_logs_common.inc8
-rw-r--r--src/usr/local/www/status_logs_filter.php4
-rwxr-xr-xsrc/usr/local/www/status_logs_filter_dynamic.php4
-rw-r--r--src/usr/local/www/status_logs_filter_summary.php4
5 files changed, 12 insertions, 12 deletions
diff --git a/src/usr/local/www/status_logs.php b/src/usr/local/www/status_logs.php
index a25d4a8..963932e 100755
--- a/src/usr/local/www/status_logs.php
+++ b/src/usr/local/www/status_logs.php
@@ -117,8 +117,8 @@ log_filter_form_system_submit();
manage_log_code();
-// Miscellaneous Common - Code
-miscellaneous_common_code();
+// Status Logs Common - Code
+status_logs_common_code();
if ($filtertext) {
diff --git a/src/usr/local/www/status_logs_common.inc b/src/usr/local/www/status_logs_common.inc
index 91ace4a..681f2ea 100644
--- a/src/usr/local/www/status_logs_common.inc
+++ b/src/usr/local/www/status_logs_common.inc
@@ -73,8 +73,8 @@ function getGETPOSTsettingvalue($settingname, $default) {
}
-// Miscellaneous Common - Code
-function miscellaneous_common_code() {
+// Status Logs Common - Code
+function status_logs_common_code() {
global $g, $config, $specific_log, $nentries, $filterlogentries_qty, $logfile_path, $shortcut_section, $allowed_logs, $logfile;
$logfile_path = "{$g['varlog_path']}/" . basename($logfile) . ".log";
@@ -452,7 +452,7 @@ function filter_form_firewall() {
'interface',
'Interface',
$interfacefilter,
- build_if_list()
+ status_logs_build_if_list()
))->setWidth(2)->setHelp('Interface');
$group->add(new Form_Input(
@@ -496,7 +496,7 @@ function filter_form_firewall() {
}
-function build_if_list() {
+function status_logs_build_if_list() {
$iflist = get_configured_interface_with_descr(false, true);
//$iflist = get_interface_list();
// Allow extending of the firewall edit interfaces
diff --git a/src/usr/local/www/status_logs_filter.php b/src/usr/local/www/status_logs_filter.php
index 6fbbee1..2a28239 100644
--- a/src/usr/local/www/status_logs_filter.php
+++ b/src/usr/local/www/status_logs_filter.php
@@ -128,8 +128,8 @@ log_filter_form_firewall_submit();
manage_log_code();
-// Miscellaneous Common - Code
-miscellaneous_common_code();
+// Status Logs Common - Code
+status_logs_common_code();
$pgtitle = array(gettext("Status"), gettext("System logs"), gettext($allowed_logs[$logfile]["name"]), $view_title);
diff --git a/src/usr/local/www/status_logs_filter_dynamic.php b/src/usr/local/www/status_logs_filter_dynamic.php
index d7b3494..41bd67d 100755
--- a/src/usr/local/www/status_logs_filter_dynamic.php
+++ b/src/usr/local/www/status_logs_filter_dynamic.php
@@ -108,8 +108,8 @@ log_filter_form_firewall_submit();
manage_log_code();
-// Miscellaneous Common - Code
-miscellaneous_common_code();
+// Status Logs Common - Code
+status_logs_common_code();
$pgtitle = array(gettext("Status"), gettext("System logs"), gettext($allowed_logs[$logfile]["name"]), $view_title);
diff --git a/src/usr/local/www/status_logs_filter_summary.php b/src/usr/local/www/status_logs_filter_summary.php
index d26cb00..f6d76d8 100644
--- a/src/usr/local/www/status_logs_filter_summary.php
+++ b/src/usr/local/www/status_logs_filter_summary.php
@@ -94,8 +94,8 @@ if ($view == 'dynamic') { $view_title = gettext("Dynamic View"); }
if ($view == 'summary') { $view_title = gettext("Summary View"); }
-// Miscellaneous Common - Code
-miscellaneous_common_code();
+// Status Logs Common - Code
+status_logs_common_code();
$pgtitle = array(gettext("Status"), gettext("System logs"), gettext($allowed_logs[$logfile]["name"]), $view_title);
OpenPOWER on IntegriCloud