From f6339216b7e0c0a6a39a857ddba0c9c0a7e36237 Mon Sep 17 00:00:00 2001 From: jim-p Date: Wed, 28 Aug 2013 13:53:49 -0400 Subject: s/require/require_once/g for filter.inc to avoid redeclaration errors in some rare cases. --- usr/local/www/firewall_aliases_import.php | 2 +- usr/local/www/firewall_nat_1to1_edit.php | 2 +- usr/local/www/firewall_nat_edit.php | 2 +- usr/local/www/firewall_nat_npt_edit.php | 2 +- usr/local/www/firewall_nat_out_edit.php | 2 +- usr/local/www/firewall_rules_edit.php | 2 +- usr/local/www/firewall_schedule.php | 2 +- usr/local/www/firewall_virtual_ip_edit.php | 2 +- usr/local/www/interfaces_assign.php | 2 +- usr/local/www/services_captiveportal_filemanager.php | 2 +- usr/local/www/services_captiveportal_hostname.php | 2 +- usr/local/www/services_captiveportal_hostname_edit.php | 2 +- usr/local/www/services_captiveportal_ip.php | 2 +- usr/local/www/services_captiveportal_ip_edit.php | 2 +- usr/local/www/services_captiveportal_mac.php | 2 +- usr/local/www/services_captiveportal_mac_edit.php | 2 +- usr/local/www/services_captiveportal_vouchers.php | 2 +- usr/local/www/services_captiveportal_vouchers_edit.php | 2 +- usr/local/www/services_captiveportal_zones.php | 2 +- usr/local/www/services_captiveportal_zones_edit.php | 2 +- usr/local/www/status_captiveportal.php | 2 +- usr/local/www/status_captiveportal_expire.php | 2 +- usr/local/www/status_captiveportal_test.php | 2 +- usr/local/www/status_captiveportal_voucher_rolls.php | 2 +- usr/local/www/status_captiveportal_vouchers.php | 2 +- usr/local/www/wizard.php | 2 +- usr/local/www/xmlrpc.php | 2 +- 27 files changed, 27 insertions(+), 27 deletions(-) (limited to 'usr/local/www') diff --git a/usr/local/www/firewall_aliases_import.php b/usr/local/www/firewall_aliases_import.php index 776b348..9b9d735 100755 --- a/usr/local/www/firewall_aliases_import.php +++ b/usr/local/www/firewall_aliases_import.php @@ -42,7 +42,7 @@ $reserved_keywords = array("pass", "out", "queue", "max", "min", "pptp", "pppoe" require("guiconfig.inc"); require_once("util.inc"); -require("filter.inc"); +require_once("filter.inc"); require("shaper.inc"); $pgtitle = array(gettext("Firewall"),gettext("Aliases"),gettext("Bulk import")); diff --git a/usr/local/www/firewall_nat_1to1_edit.php b/usr/local/www/firewall_nat_1to1_edit.php index b0bdbb8..50c0fa9 100755 --- a/usr/local/www/firewall_nat_1to1_edit.php +++ b/usr/local/www/firewall_nat_1to1_edit.php @@ -55,7 +55,7 @@ function nat_1to1_rules_sort() { require("guiconfig.inc"); require_once("interfaces.inc"); -require("filter.inc"); +require_once("filter.inc"); require("shaper.inc"); $specialsrcdst = explode(" ", "any pptp pppoe l2tp openvpn"); diff --git a/usr/local/www/firewall_nat_edit.php b/usr/local/www/firewall_nat_edit.php index d435d80..574822c 100755 --- a/usr/local/www/firewall_nat_edit.php +++ b/usr/local/www/firewall_nat_edit.php @@ -41,7 +41,7 @@ require("guiconfig.inc"); require_once("itemid.inc"); -require("filter.inc"); +require_once("filter.inc"); require("shaper.inc"); $specialsrcdst = explode(" ", "any pptp pppoe l2tp openvpn"); diff --git a/usr/local/www/firewall_nat_npt_edit.php b/usr/local/www/firewall_nat_npt_edit.php index 5ab2b53..f0ffbab 100644 --- a/usr/local/www/firewall_nat_npt_edit.php +++ b/usr/local/www/firewall_nat_npt_edit.php @@ -55,7 +55,7 @@ function nat_npt_rules_sort() { require("guiconfig.inc"); require_once("interfaces.inc"); -require("filter.inc"); +require_once("filter.inc"); require("shaper.inc"); $ifdisp = get_configured_interface_with_descr(); diff --git a/usr/local/www/firewall_nat_out_edit.php b/usr/local/www/firewall_nat_out_edit.php index 46139c9..fadf896 100755 --- a/usr/local/www/firewall_nat_out_edit.php +++ b/usr/local/www/firewall_nat_out_edit.php @@ -42,7 +42,7 @@ ##|-PRIV require("guiconfig.inc"); -require("filter.inc"); +require_once("filter.inc"); require("shaper.inc"); if (!is_array($config['nat']['advancedoutbound'])) diff --git a/usr/local/www/firewall_rules_edit.php b/usr/local/www/firewall_rules_edit.php index d3541a4..381b3a8 100755 --- a/usr/local/www/firewall_rules_edit.php +++ b/usr/local/www/firewall_rules_edit.php @@ -42,7 +42,7 @@ ##|-PRIV require("guiconfig.inc"); -require("filter.inc"); +require_once("filter.inc"); require("shaper.inc"); $specialsrcdst = explode(" ", "any pptp pppoe l2tp openvpn"); diff --git a/usr/local/www/firewall_schedule.php b/usr/local/www/firewall_schedule.php index 850eb7c..4c45778 100644 --- a/usr/local/www/firewall_schedule.php +++ b/usr/local/www/firewall_schedule.php @@ -44,7 +44,7 @@ $dayArray = array (gettext('Mon'),gettext('Tues'),gettext('Wed'),gettext('Thur') $monthArray = array (gettext('January'),gettext('February'),gettext('March'),gettext('April'),gettext('May'),gettext('June'),gettext('July'),gettext('August'),gettext('September'),gettext('October'),gettext('November'),gettext('December')); require("guiconfig.inc"); -require("filter.inc"); +require_once("filter.inc"); require("shaper.inc"); $pgtitle = array(gettext("Firewall"),gettext("Schedules")); diff --git a/usr/local/www/firewall_virtual_ip_edit.php b/usr/local/www/firewall_virtual_ip_edit.php index 0dc6ceb..b9993d4 100755 --- a/usr/local/www/firewall_virtual_ip_edit.php +++ b/usr/local/www/firewall_virtual_ip_edit.php @@ -50,7 +50,7 @@ ##|-PRIV require("guiconfig.inc"); -require("filter.inc"); +require_once("filter.inc"); require("shaper.inc"); if (!is_array($config['virtualip']['vip'])) { diff --git a/usr/local/www/interfaces_assign.php b/usr/local/www/interfaces_assign.php index 58a2b89..f7ee2f5 100755 --- a/usr/local/www/interfaces_assign.php +++ b/usr/local/www/interfaces_assign.php @@ -45,7 +45,7 @@ $shortcut_section = "interfaces"; require("guiconfig.inc"); require("functions.inc"); -require("filter.inc"); +require_once("filter.inc"); require("shaper.inc"); require("ipsec.inc"); require("vpn.inc"); diff --git a/usr/local/www/services_captiveportal_filemanager.php b/usr/local/www/services_captiveportal_filemanager.php index 2c673a0..285fd36 100755 --- a/usr/local/www/services_captiveportal_filemanager.php +++ b/usr/local/www/services_captiveportal_filemanager.php @@ -51,7 +51,7 @@ function cpelements_sort() { require("guiconfig.inc"); require("functions.inc"); -require("filter.inc"); +require_once("filter.inc"); require("shaper.inc"); require("captiveportal.inc"); diff --git a/usr/local/www/services_captiveportal_hostname.php b/usr/local/www/services_captiveportal_hostname.php index 6720430..a177656 100755 --- a/usr/local/www/services_captiveportal_hostname.php +++ b/usr/local/www/services_captiveportal_hostname.php @@ -43,7 +43,7 @@ require("guiconfig.inc"); require("functions.inc"); -require("filter.inc"); +require_once("filter.inc"); require("shaper.inc"); require("captiveportal.inc"); diff --git a/usr/local/www/services_captiveportal_hostname_edit.php b/usr/local/www/services_captiveportal_hostname_edit.php index 5fd6168..c1b6c25 100755 --- a/usr/local/www/services_captiveportal_hostname_edit.php +++ b/usr/local/www/services_captiveportal_hostname_edit.php @@ -52,7 +52,7 @@ function allowedhostnames_sort() { require("guiconfig.inc"); require("functions.inc"); -require("filter.inc"); +require_once("filter.inc"); require("shaper.inc"); require("captiveportal.inc"); diff --git a/usr/local/www/services_captiveportal_ip.php b/usr/local/www/services_captiveportal_ip.php index 2fb2cf5..2a3d50f 100755 --- a/usr/local/www/services_captiveportal_ip.php +++ b/usr/local/www/services_captiveportal_ip.php @@ -41,7 +41,7 @@ require("guiconfig.inc"); require("functions.inc"); -require("filter.inc"); +require_once("filter.inc"); require("shaper.inc"); require("captiveportal.inc"); diff --git a/usr/local/www/services_captiveportal_ip_edit.php b/usr/local/www/services_captiveportal_ip_edit.php index 9aadb9e..f16532c 100755 --- a/usr/local/www/services_captiveportal_ip_edit.php +++ b/usr/local/www/services_captiveportal_ip_edit.php @@ -53,7 +53,7 @@ function allowedips_sort() { require("guiconfig.inc"); require("functions.inc"); -require("filter.inc"); +require_once("filter.inc"); require("shaper.inc"); require("captiveportal.inc"); diff --git a/usr/local/www/services_captiveportal_mac.php b/usr/local/www/services_captiveportal_mac.php index bb68a36..1cc625b 100755 --- a/usr/local/www/services_captiveportal_mac.php +++ b/usr/local/www/services_captiveportal_mac.php @@ -40,7 +40,7 @@ require("guiconfig.inc"); require("functions.inc"); -require("filter.inc"); +require_once("filter.inc"); require("shaper.inc"); require("captiveportal.inc"); diff --git a/usr/local/www/services_captiveportal_mac_edit.php b/usr/local/www/services_captiveportal_mac_edit.php index d87408e..bb36500 100755 --- a/usr/local/www/services_captiveportal_mac_edit.php +++ b/usr/local/www/services_captiveportal_mac_edit.php @@ -50,7 +50,7 @@ function passthrumacs_sort() { require("guiconfig.inc"); require("functions.inc"); -require("filter.inc"); +require_once("filter.inc"); require("shaper.inc"); require("captiveportal.inc"); diff --git a/usr/local/www/services_captiveportal_vouchers.php b/usr/local/www/services_captiveportal_vouchers.php index 4490b1b..bd1b2f3 100644 --- a/usr/local/www/services_captiveportal_vouchers.php +++ b/usr/local/www/services_captiveportal_vouchers.php @@ -41,7 +41,7 @@ if ($_POST['postafterlogin']) require("guiconfig.inc"); require("functions.inc"); -require("filter.inc"); +require_once("filter.inc"); require("shaper.inc"); require("captiveportal.inc"); require_once("voucher.inc"); diff --git a/usr/local/www/services_captiveportal_vouchers_edit.php b/usr/local/www/services_captiveportal_vouchers_edit.php index 851d57c..9cd85e8 100644 --- a/usr/local/www/services_captiveportal_vouchers_edit.php +++ b/usr/local/www/services_captiveportal_vouchers_edit.php @@ -37,7 +37,7 @@ require("guiconfig.inc"); require("functions.inc"); -require("filter.inc"); +require_once("filter.inc"); require("shaper.inc"); require("captiveportal.inc"); require_once("voucher.inc"); diff --git a/usr/local/www/services_captiveportal_zones.php b/usr/local/www/services_captiveportal_zones.php index 27af686..049e03f 100644 --- a/usr/local/www/services_captiveportal_zones.php +++ b/usr/local/www/services_captiveportal_zones.php @@ -12,7 +12,7 @@ require("guiconfig.inc"); require("functions.inc"); -require("filter.inc"); +require_once("filter.inc"); require("shaper.inc"); require("captiveportal.inc"); diff --git a/usr/local/www/services_captiveportal_zones_edit.php b/usr/local/www/services_captiveportal_zones_edit.php index 1e8b861..b011352 100644 --- a/usr/local/www/services_captiveportal_zones_edit.php +++ b/usr/local/www/services_captiveportal_zones_edit.php @@ -38,7 +38,7 @@ require("guiconfig.inc"); require("functions.inc"); -require("filter.inc"); +require_once("filter.inc"); require("shaper.inc"); require("captiveportal.inc"); diff --git a/usr/local/www/status_captiveportal.php b/usr/local/www/status_captiveportal.php index 2aec4f0..2325b3c 100755 --- a/usr/local/www/status_captiveportal.php +++ b/usr/local/www/status_captiveportal.php @@ -41,7 +41,7 @@ require("guiconfig.inc"); require("functions.inc"); -require("filter.inc"); +require_once("filter.inc"); require("shaper.inc"); require("captiveportal.inc"); diff --git a/usr/local/www/status_captiveportal_expire.php b/usr/local/www/status_captiveportal_expire.php index 5b54db7..048df4d 100644 --- a/usr/local/www/status_captiveportal_expire.php +++ b/usr/local/www/status_captiveportal_expire.php @@ -37,7 +37,7 @@ require("guiconfig.inc"); require("functions.inc"); -require("filter.inc"); +require_once("filter.inc"); require("shaper.inc"); require("captiveportal.inc"); require_once("voucher.inc"); diff --git a/usr/local/www/status_captiveportal_test.php b/usr/local/www/status_captiveportal_test.php index 1a80446..8e7ece7 100644 --- a/usr/local/www/status_captiveportal_test.php +++ b/usr/local/www/status_captiveportal_test.php @@ -37,7 +37,7 @@ require("guiconfig.inc"); require("functions.inc"); -require("filter.inc"); +require_once("filter.inc"); require("shaper.inc"); require("captiveportal.inc"); require_once("voucher.inc"); diff --git a/usr/local/www/status_captiveportal_voucher_rolls.php b/usr/local/www/status_captiveportal_voucher_rolls.php index 742964d..216ecb4 100644 --- a/usr/local/www/status_captiveportal_voucher_rolls.php +++ b/usr/local/www/status_captiveportal_voucher_rolls.php @@ -37,7 +37,7 @@ require("guiconfig.inc"); require("functions.inc"); -require("filter.inc"); +require_once("filter.inc"); require("shaper.inc"); require("captiveportal.inc"); require_once("voucher.inc"); diff --git a/usr/local/www/status_captiveportal_vouchers.php b/usr/local/www/status_captiveportal_vouchers.php index 3bee04d..b52e1c8 100644 --- a/usr/local/www/status_captiveportal_vouchers.php +++ b/usr/local/www/status_captiveportal_vouchers.php @@ -37,7 +37,7 @@ require("guiconfig.inc"); require("functions.inc"); -require("filter.inc"); +require_once("filter.inc"); require("shaper.inc"); require("captiveportal.inc"); require_once("voucher.inc"); diff --git a/usr/local/www/wizard.php b/usr/local/www/wizard.php index 62de7db..bcfe95b 100755 --- a/usr/local/www/wizard.php +++ b/usr/local/www/wizard.php @@ -39,7 +39,7 @@ require("globals.inc"); require("guiconfig.inc"); require("functions.inc"); -require("filter.inc"); +require_once("filter.inc"); require("shaper.inc"); require("rrd.inc"); diff --git a/usr/local/www/xmlrpc.php b/usr/local/www/xmlrpc.php index 586133b..7c0d519 100755 --- a/usr/local/www/xmlrpc.php +++ b/usr/local/www/xmlrpc.php @@ -38,7 +38,7 @@ require("config.inc"); require("functions.inc"); -require("filter.inc"); +require_once("filter.inc"); require("ipsec.inc"); require("vpn.inc"); require("shaper.inc"); -- cgit v1.1