diff options
| author | Phil Davis <phil.davis@inf.org> | 2016-06-27 14:30:14 +0930 |
|---|---|---|
| committer | Phil Davis <phil.davis@inf.org> | 2016-06-27 14:30:14 +0930 |
| commit | c81ef6e25d9d5f7c3a1899a21f9987dae079deca (patch) | |
| tree | d4e2fb374fd16e1cef0bc22215ef7e78ed009342 /src/usr | |
| parent | 2208be8b2d7dfcd884db9013fb8347d6856fa43c (diff) | |
| download | pfsense-c81ef6e25d9d5f7c3a1899a21f9987dae079deca.zip pfsense-c81ef6e25d9d5f7c3a1899a21f9987dae079deca.tar.gz | |
Always use require_once
The usage of require() and require_once() throughout the system is
inconsistent, and "bugs" come up now and then when the order of
"requires" is a bit different and some require() happens after the
include file is already included/required.
It seems to me that there is no harm at all in always using
require_once().
Diffstat (limited to 'src/usr')
165 files changed, 259 insertions, 259 deletions
diff --git a/src/usr/local/bin/dhcpd_gather_stats.php b/src/usr/local/bin/dhcpd_gather_stats.php index e0fae95..e3bd159 100644 --- a/src/usr/local/bin/dhcpd_gather_stats.php +++ b/src/usr/local/bin/dhcpd_gather_stats.php @@ -25,7 +25,7 @@ */ require_once("config.inc"); -require("interfaces.inc"); +require_once("interfaces.inc"); /* echo the rrd required syntax */ echo "N:"; $result = array(); diff --git a/src/usr/local/www/crash_reporter.php b/src/usr/local/www/crash_reporter.php index e8918b3..1305d83 100644 --- a/src/usr/local/www/crash_reporter.php +++ b/src/usr/local/www/crash_reporter.php @@ -60,9 +60,9 @@ ##|*MATCH=crash_reporter.php* ##|-PRIV -require("guiconfig.inc"); -require("functions.inc"); -require("captiveportal.inc"); +require_once("guiconfig.inc"); +require_once("functions.inc"); +require_once("captiveportal.inc"); define("FILE_SIZE", 450000); diff --git a/src/usr/local/www/diag_arp.php b/src/usr/local/www/diag_arp.php index f7bdff4..66ba5cd 100644 --- a/src/usr/local/www/diag_arp.php +++ b/src/usr/local/www/diag_arp.php @@ -66,7 +66,7 @@ @ini_set('zlib.output_compression', 0); @ini_set('implicit_flush', 1); -require("guiconfig.inc"); +require_once("guiconfig.inc"); // delete arp entry if (isset($_GET['deleteentry'])) { diff --git a/src/usr/local/www/diag_authentication.php b/src/usr/local/www/diag_authentication.php index 1cfe158..c5aabdd 100644 --- a/src/usr/local/www/diag_authentication.php +++ b/src/usr/local/www/diag_authentication.php @@ -60,7 +60,7 @@ ##|*MATCH=diag_authentication.php* ##|-PRIV -require("guiconfig.inc"); +require_once("guiconfig.inc"); require_once("radius.inc"); if ($_POST) { diff --git a/src/usr/local/www/diag_backup.php b/src/usr/local/www/diag_backup.php index 38a0281..001d65f 100644 --- a/src/usr/local/www/diag_backup.php +++ b/src/usr/local/www/diag_backup.php @@ -69,7 +69,7 @@ ini_set('max_input_time', '0'); /* omit no-cache headers because it confuses IE with file downloads */ $omit_nocacheheaders = true; -require("guiconfig.inc"); +require_once("guiconfig.inc"); require_once("functions.inc"); require_once("filter.inc"); require_once("shaper.inc"); diff --git a/src/usr/local/www/diag_command.php b/src/usr/local/www/diag_command.php index 2562e9c..b3b5ab7 100644 --- a/src/usr/local/www/diag_command.php +++ b/src/usr/local/www/diag_command.php @@ -69,7 +69,7 @@ $allowautocomplete = true; -require("guiconfig.inc"); +require_once("guiconfig.inc"); if ($_POST['submit'] == "DOWNLOAD" && file_exists($_POST['dlPath'])) { session_cache_limiter('public'); diff --git a/src/usr/local/www/diag_confbak.php b/src/usr/local/www/diag_confbak.php index f17210e..18271ec 100644 --- a/src/usr/local/www/diag_confbak.php +++ b/src/usr/local/www/diag_confbak.php @@ -61,7 +61,7 @@ ##|*MATCH=diag_confbak.php* ##|-PRIV -require("guiconfig.inc"); +require_once("guiconfig.inc"); if (isset($_POST['backupcount'])) { if (is_numericint($_POST['backupcount'])) { diff --git a/src/usr/local/www/diag_defaults.php b/src/usr/local/www/diag_defaults.php index f59f161..7f7a0fc 100755 --- a/src/usr/local/www/diag_defaults.php +++ b/src/usr/local/www/diag_defaults.php @@ -63,7 +63,7 @@ ##|*MATCH=diag_defaults.php* ##|-PRIV -require("guiconfig.inc"); +require_once("guiconfig.inc"); if ($_POST['Submit'] == " " . gettext("No") . " ") { header("Location: index.php"); diff --git a/src/usr/local/www/diag_dns.php b/src/usr/local/www/diag_dns.php index 18cc1bf..2df22c8 100755 --- a/src/usr/local/www/diag_dns.php +++ b/src/usr/local/www/diag_dns.php @@ -61,7 +61,7 @@ ##|-PRIV $pgtitle = array(gettext("Diagnostics"), gettext("DNS Lookup")); -require("guiconfig.inc"); +require_once("guiconfig.inc"); $host = trim($_REQUEST['host'], " \t\n\r\0\x0B[];\"'"); $host_esc = escapeshellarg($host); diff --git a/src/usr/local/www/diag_edit.php b/src/usr/local/www/diag_edit.php index fd6b8d4..81b347d 100644 --- a/src/usr/local/www/diag_edit.php +++ b/src/usr/local/www/diag_edit.php @@ -63,7 +63,7 @@ ##|-PRIV $pgtitle = array(gettext("Diagnostics"), gettext("Edit File")); -require("guiconfig.inc"); +require_once("guiconfig.inc"); if ($_POST['action']) { switch ($_POST['action']) { @@ -128,7 +128,7 @@ if ($_POST['action']) { exit; } -require("head.inc"); +require_once("head.inc"); print_callout(gettext("The capabilities offered here can be dangerous. No support is available. Use them at your own risk!"), 'danger', gettext('Advanced Users Only')); diff --git a/src/usr/local/www/diag_gmirror.php b/src/usr/local/www/diag_gmirror.php index 0978d33..e8660b1 100644 --- a/src/usr/local/www/diag_gmirror.php +++ b/src/usr/local/www/diag_gmirror.php @@ -403,4 +403,4 @@ endif; ?> </form> <?php -require("foot.inc"); +require_once("foot.inc"); diff --git a/src/usr/local/www/diag_halt.php b/src/usr/local/www/diag_halt.php index 39cdb55..be938d0 100755 --- a/src/usr/local/www/diag_halt.php +++ b/src/usr/local/www/diag_halt.php @@ -66,9 +66,9 @@ // Set DEBUG to true to prevent the system_halt() function from being called define("DEBUG", false); -require("guiconfig.inc"); -require("functions.inc"); -require("captiveportal.inc"); +require_once("guiconfig.inc"); +require_once("functions.inc"); +require_once("captiveportal.inc"); if ($_POST['save'] == 'No') { header("Location: index.php"); diff --git a/src/usr/local/www/diag_limiter_info.php b/src/usr/local/www/diag_limiter_info.php index 8295117..0953cb6 100644 --- a/src/usr/local/www/diag_limiter_info.php +++ b/src/usr/local/www/diag_limiter_info.php @@ -60,7 +60,7 @@ ##|*MATCH=diag_limiter_info.php* ##|-PRIV -require("guiconfig.inc"); +require_once("guiconfig.inc"); $pgtitle = array(gettext("Diagnostics"), gettext("Limiter Info")); $shortcut_section = "trafficshaper-limiters"; diff --git a/src/usr/local/www/diag_nanobsd.php b/src/usr/local/www/diag_nanobsd.php index 4627e79..e887dff 100644 --- a/src/usr/local/www/diag_nanobsd.php +++ b/src/usr/local/www/diag_nanobsd.php @@ -283,4 +283,4 @@ if (file_exists("/conf/upgrade_log.txt") && $_POST['viewupgradelog']) { </div> <?php } -require("foot.inc"); +require_once("foot.inc"); diff --git a/src/usr/local/www/diag_ndp.php b/src/usr/local/www/diag_ndp.php index 1cda0d7..0944ba3 100644 --- a/src/usr/local/www/diag_ndp.php +++ b/src/usr/local/www/diag_ndp.php @@ -67,7 +67,7 @@ @ini_set('zlib.output_compression', 0); @ini_set('implicit_flush', 1); -require("guiconfig.inc"); +require_once("guiconfig.inc"); exec("/usr/sbin/ndp -na", $rawdata); diff --git a/src/usr/local/www/diag_pf_info.php b/src/usr/local/www/diag_pf_info.php index 3de6ee5..1d5a5ba 100644 --- a/src/usr/local/www/diag_pf_info.php +++ b/src/usr/local/www/diag_pf_info.php @@ -60,7 +60,7 @@ ##|*MATCH=diag_pf_info.php* ##|-PRIV -require("guiconfig.inc"); +require_once("guiconfig.inc"); $pgtitle = array(gettext("Diagnostics"), gettext("pfInfo")); diff --git a/src/usr/local/www/diag_pftop.php b/src/usr/local/www/diag_pftop.php index b7604d6..0a4ea7e 100644 --- a/src/usr/local/www/diag_pftop.php +++ b/src/usr/local/www/diag_pftop.php @@ -60,7 +60,7 @@ ##|*MATCH=diag_pftop.php* ##|-PRIV -require("guiconfig.inc"); +require_once("guiconfig.inc"); $pgtitle = array(gettext("Diagnostics"), gettext("pfTop")); diff --git a/src/usr/local/www/diag_reboot.php b/src/usr/local/www/diag_reboot.php index 88fc82b..8b3f137 100755 --- a/src/usr/local/www/diag_reboot.php +++ b/src/usr/local/www/diag_reboot.php @@ -66,9 +66,9 @@ // Set DEBUG to true to prevent the system_reboot() function from being called define("DEBUG", false); -require("guiconfig.inc"); -require("functions.inc"); -require("captiveportal.inc"); +require_once("guiconfig.inc"); +require_once("functions.inc"); +require_once("captiveportal.inc"); $guitimeout = 90; // Seconds to wait before reloading the page after reboot $guiretry = 20; // Seconds to try again if $guitimeout was not long enough diff --git a/src/usr/local/www/diag_resetstate.php b/src/usr/local/www/diag_resetstate.php index a62ef67..ebb066b 100644 --- a/src/usr/local/www/diag_resetstate.php +++ b/src/usr/local/www/diag_resetstate.php @@ -63,7 +63,7 @@ ##|*MATCH=diag_resetstate.php* ##|-PRIV -require("guiconfig.inc"); +require_once("guiconfig.inc"); require_once("filter.inc"); if ($_POST) { diff --git a/src/usr/local/www/diag_smart.php b/src/usr/local/www/diag_smart.php index e7be8de..abb7b2b 100644 --- a/src/usr/local/www/diag_smart.php +++ b/src/usr/local/www/diag_smart.php @@ -61,7 +61,7 @@ ##|*MATCH=diag_smart.php* ##|-PRIV -require("guiconfig.inc"); +require_once("guiconfig.inc"); // What page, aka. action is being wanted // If they "get" a page but don't pass all arguments, smartctl will throw an error diff --git a/src/usr/local/www/diag_system_activity.php b/src/usr/local/www/diag_system_activity.php index 8885855..08f9388 100644 --- a/src/usr/local/www/diag_system_activity.php +++ b/src/usr/local/www/diag_system_activity.php @@ -60,7 +60,7 @@ ##|*MATCH=diag_system_activity.php* ##|-PRIV -require("guiconfig.inc"); +require_once("guiconfig.inc"); $pgtitle = array(gettext("Diagnostics"), gettext("System Activity")); diff --git a/src/usr/local/www/diag_testport.php b/src/usr/local/www/diag_testport.php index f247b4e..0d3290f 100644 --- a/src/usr/local/www/diag_testport.php +++ b/src/usr/local/www/diag_testport.php @@ -69,7 +69,7 @@ $allowautocomplete = true; $pgtitle = array(gettext("Diagnostics"), gettext("Test Port")); -require("guiconfig.inc"); +require_once("guiconfig.inc"); include("head.inc"); diff --git a/src/usr/local/www/diag_traceroute.php b/src/usr/local/www/diag_traceroute.php index 342a723..74d3817 100644 --- a/src/usr/local/www/diag_traceroute.php +++ b/src/usr/local/www/diag_traceroute.php @@ -64,7 +64,7 @@ ##|*MATCH=diag_traceroute.php* ##|-PRIV -require("guiconfig.inc"); +require_once("guiconfig.inc"); $allowautocomplete = true; $pgtitle = array(gettext("Diagnostics"), gettext("Traceroute")); diff --git a/src/usr/local/www/firewall_aliases.php b/src/usr/local/www/firewall_aliases.php index 71d3fce..f5afe68 100644 --- a/src/usr/local/www/firewall_aliases.php +++ b/src/usr/local/www/firewall_aliases.php @@ -63,7 +63,7 @@ ##|*MATCH=firewall_aliases.php* ##|-PRIV -require("guiconfig.inc"); +require_once("guiconfig.inc"); require_once("functions.inc"); require_once("filter.inc"); require_once("shaper.inc"); diff --git a/src/usr/local/www/firewall_aliases_edit.php b/src/usr/local/www/firewall_aliases_edit.php index 92a6ae0..6d98f4a 100755 --- a/src/usr/local/www/firewall_aliases_edit.php +++ b/src/usr/local/www/firewall_aliases_edit.php @@ -63,7 +63,7 @@ ##|*MATCH=firewall_aliases_edit.php* ##|-PRIV -require("guiconfig.inc"); +require_once("guiconfig.inc"); require_once("functions.inc"); require_once("filter.inc"); require_once("shaper.inc"); diff --git a/src/usr/local/www/firewall_aliases_import.php b/src/usr/local/www/firewall_aliases_import.php index 9912948..202a98f 100755 --- a/src/usr/local/www/firewall_aliases_import.php +++ b/src/usr/local/www/firewall_aliases_import.php @@ -64,10 +64,10 @@ // Keywords not allowed in names $reserved_keywords = array("all", "pass", "block", "out", "queue", "max", "min", "pptp", "pppoe", "L2TP", "OpenVPN", "IPsec"); -require("guiconfig.inc"); +require_once("guiconfig.inc"); require_once("util.inc"); require_once("filter.inc"); -require("shaper.inc"); +require_once("shaper.inc"); $pgtitle = array(gettext("Firewall"), gettext("Aliases"), gettext("Bulk import")); diff --git a/src/usr/local/www/firewall_nat.php b/src/usr/local/www/firewall_nat.php index 6158c02..a67ee31 100644 --- a/src/usr/local/www/firewall_nat.php +++ b/src/usr/local/www/firewall_nat.php @@ -63,7 +63,7 @@ ##|*MATCH=firewall_nat.php* ##|-PRIV -require("guiconfig.inc"); +require_once("guiconfig.inc"); require_once("functions.inc"); require_once("filter.inc"); require_once("shaper.inc"); diff --git a/src/usr/local/www/firewall_nat_1to1.php b/src/usr/local/www/firewall_nat_1to1.php index 4ec0a24..0342771 100644 --- a/src/usr/local/www/firewall_nat_1to1.php +++ b/src/usr/local/www/firewall_nat_1to1.php @@ -63,7 +63,7 @@ ##|*MATCH=firewall_nat_1to1.php* ##|-PRIV -require("guiconfig.inc"); +require_once("guiconfig.inc"); require_once("functions.inc"); require_once("filter.inc"); require_once("shaper.inc"); diff --git a/src/usr/local/www/firewall_nat_1to1_edit.php b/src/usr/local/www/firewall_nat_1to1_edit.php index 3bda4c2..cd86e60 100644 --- a/src/usr/local/www/firewall_nat_1to1_edit.php +++ b/src/usr/local/www/firewall_nat_1to1_edit.php @@ -63,11 +63,11 @@ ##|*MATCH=firewall_nat_1to1_edit.php* ##|-PRIV -require("guiconfig.inc"); +require_once("guiconfig.inc"); require_once("interfaces.inc"); require_once("filter.inc"); require_once("ipsec.inc"); -require("shaper.inc"); +require_once("shaper.inc"); $referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/firewall_nat_1to1.php'); diff --git a/src/usr/local/www/firewall_nat_edit.php b/src/usr/local/www/firewall_nat_edit.php index e36e33b..eb4d212 100644 --- a/src/usr/local/www/firewall_nat_edit.php +++ b/src/usr/local/www/firewall_nat_edit.php @@ -63,11 +63,11 @@ ##|*MATCH=firewall_nat_edit.php* ##|-PRIV -require("guiconfig.inc"); +require_once("guiconfig.inc"); require_once("itemid.inc"); require_once("ipsec.inc"); require_once("filter.inc"); -require("shaper.inc"); +require_once("shaper.inc"); $referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/firewall_nat.php'); diff --git a/src/usr/local/www/firewall_nat_npt.php b/src/usr/local/www/firewall_nat_npt.php index 0a1e0f8..c3c6ae9 100644 --- a/src/usr/local/www/firewall_nat_npt.php +++ b/src/usr/local/www/firewall_nat_npt.php @@ -64,7 +64,7 @@ ##|*MATCH=firewall_nat_npt.php* ##|-PRIV -require("guiconfig.inc"); +require_once("guiconfig.inc"); require_once("functions.inc"); require_once("filter.inc"); require_once("shaper.inc"); diff --git a/src/usr/local/www/firewall_nat_npt_edit.php b/src/usr/local/www/firewall_nat_npt_edit.php index 4ce89be..7d4b381 100644 --- a/src/usr/local/www/firewall_nat_npt_edit.php +++ b/src/usr/local/www/firewall_nat_npt_edit.php @@ -63,10 +63,10 @@ require_once("ipsec.inc"); -require("guiconfig.inc"); +require_once("guiconfig.inc"); require_once("interfaces.inc"); require_once("filter.inc"); -require("shaper.inc"); +require_once("shaper.inc"); $ifdisp = get_configured_interface_with_descr(); diff --git a/src/usr/local/www/firewall_nat_out.php b/src/usr/local/www/firewall_nat_out.php index ff63fec..9ac664c 100644 --- a/src/usr/local/www/firewall_nat_out.php +++ b/src/usr/local/www/firewall_nat_out.php @@ -63,7 +63,7 @@ ##|*MATCH=firewall_nat_out.php* ##|-PRIV -require("guiconfig.inc"); +require_once("guiconfig.inc"); require_once("functions.inc"); require_once("filter.inc"); require_once("shaper.inc"); diff --git a/src/usr/local/www/firewall_nat_out_edit.php b/src/usr/local/www/firewall_nat_out_edit.php index c0c448a..2cdef28 100644 --- a/src/usr/local/www/firewall_nat_out_edit.php +++ b/src/usr/local/www/firewall_nat_out_edit.php @@ -63,10 +63,10 @@ ##|*MATCH=firewall_nat_out_edit.php* ##|-PRIV -require("guiconfig.inc"); +require_once("guiconfig.inc"); require_once("ipsec.inc"); require_once("filter.inc"); -require("shaper.inc"); +require_once("shaper.inc"); if (!is_array($config['nat']['outbound'])) { $config['nat']['outbound'] = array(); diff --git a/src/usr/local/www/firewall_rules.php b/src/usr/local/www/firewall_rules.php index 4b24d6b..21291b7 100644 --- a/src/usr/local/www/firewall_rules.php +++ b/src/usr/local/www/firewall_rules.php @@ -63,7 +63,7 @@ ##|*MATCH=firewall_rules.php* ##|-PRIV -require("guiconfig.inc"); +require_once("guiconfig.inc"); require_once("functions.inc"); require_once("filter.inc"); require_once("ipsec.inc"); diff --git a/src/usr/local/www/firewall_rules_edit.php b/src/usr/local/www/firewall_rules_edit.php index 39cc9f0..3c51c49 100644 --- a/src/usr/local/www/firewall_rules_edit.php +++ b/src/usr/local/www/firewall_rules_edit.php @@ -63,10 +63,10 @@ ##|*MATCH=firewall_rules_edit.php* ##|-PRIV -require("guiconfig.inc"); +require_once("guiconfig.inc"); require_once("ipsec.inc"); require_once("filter.inc"); -require("shaper.inc"); +require_once("shaper.inc"); if (isset($_POST['referer'])) { $referer = $_POST['referer']; diff --git a/src/usr/local/www/firewall_schedule.php b/src/usr/local/www/firewall_schedule.php index b69a090..6e3fca8 100644 --- a/src/usr/local/www/firewall_schedule.php +++ b/src/usr/local/www/firewall_schedule.php @@ -68,9 +68,9 @@ define('CLOCK', '<i class="fa fa-clock-o icon-black"></i>'); $dayArray = array (gettext('Mon'), gettext('Tues'), gettext('Wed'), gettext('Thur'), gettext('Fri'), gettext('Sat'), gettext('Sun')); $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_once("guiconfig.inc"); require_once("filter.inc"); -require("shaper.inc"); +require_once("shaper.inc"); $pgtitle = array(gettext("Firewall"), gettext("Schedules")); diff --git a/src/usr/local/www/firewall_schedule_edit.php b/src/usr/local/www/firewall_schedule_edit.php index 2a81be7..b862d29 100644 --- a/src/usr/local/www/firewall_schedule_edit.php +++ b/src/usr/local/www/firewall_schedule_edit.php @@ -77,7 +77,7 @@ function schedule_sort() { usort($config['schedules']['schedule'], "schedulecmp"); } -require("guiconfig.inc"); +require_once("guiconfig.inc"); require_once("functions.inc"); require_once("filter.inc"); require_once("shaper.inc"); diff --git a/src/usr/local/www/firewall_shaper.php b/src/usr/local/www/firewall_shaper.php index 37d3754..e6a0be0 100644 --- a/src/usr/local/www/firewall_shaper.php +++ b/src/usr/local/www/firewall_shaper.php @@ -60,7 +60,7 @@ ##|*MATCH=firewall_shaper.php* ##|-PRIV -require("guiconfig.inc"); +require_once("guiconfig.inc"); require_once("functions.inc"); require_once("filter.inc"); require_once("shaper.inc"); diff --git a/src/usr/local/www/firewall_shaper_queues.php b/src/usr/local/www/firewall_shaper_queues.php index 1c6964b..07abe2c 100644 --- a/src/usr/local/www/firewall_shaper_queues.php +++ b/src/usr/local/www/firewall_shaper_queues.php @@ -60,7 +60,7 @@ ##|*MATCH=firewall_shaper_queues.php* ##|-PRIV -require("guiconfig.inc"); +require_once("guiconfig.inc"); require_once("functions.inc"); require_once("filter.inc"); require_once("shaper.inc"); diff --git a/src/usr/local/www/firewall_shaper_vinterface.php b/src/usr/local/www/firewall_shaper_vinterface.php index 6a87e75..5d6245f 100644 --- a/src/usr/local/www/firewall_shaper_vinterface.php +++ b/src/usr/local/www/firewall_shaper_vinterface.php @@ -60,7 +60,7 @@ ##|*MATCH=firewall_shaper_vinterface.php* ##|-PRIV -require("guiconfig.inc"); +require_once("guiconfig.inc"); require_once("functions.inc"); require_once("filter.inc"); require_once("shaper.inc"); diff --git a/src/usr/local/www/firewall_shaper_wizards.php b/src/usr/local/www/firewall_shaper_wizards.php index 662351a..2b4fcff 100644 --- a/src/usr/local/www/firewall_shaper_wizards.php +++ b/src/usr/local/www/firewall_shaper_wizards.php @@ -60,7 +60,7 @@ ##|*MATCH=firewall_shaper_wizards.php* ##|-PRIV -require("guiconfig.inc"); +require_once("guiconfig.inc"); require_once("functions.inc"); require_once("filter.inc"); require_once("shaper.inc"); diff --git a/src/usr/local/www/firewall_virtual_ip.php b/src/usr/local/www/firewall_virtual_ip.php index adf55df..d9bf9ae 100644 --- a/src/usr/local/www/firewall_virtual_ip.php +++ b/src/usr/local/www/firewall_virtual_ip.php @@ -64,7 +64,7 @@ ##|*MATCH=firewall_virtual_ip.php* ##|-PRIV -require("guiconfig.inc"); +require_once("guiconfig.inc"); require_once("functions.inc"); require_once("filter.inc"); require_once("shaper.inc"); diff --git a/src/usr/local/www/firewall_virtual_ip_edit.php b/src/usr/local/www/firewall_virtual_ip_edit.php index e928d8f..fa6c9e8 100644 --- a/src/usr/local/www/firewall_virtual_ip_edit.php +++ b/src/usr/local/www/firewall_virtual_ip_edit.php @@ -64,9 +64,9 @@ ##|*MATCH=firewall_virtual_ip_edit.php* ##|-PRIV -require("guiconfig.inc"); +require_once("guiconfig.inc"); require_once("filter.inc"); -require("shaper.inc"); +require_once("shaper.inc"); if (!is_array($config['virtualip']['vip'])) { $config['virtualip']['vip'] = array(); diff --git a/src/usr/local/www/graph.php b/src/usr/local/www/graph.php index 4853114..eee8c81 100755 --- a/src/usr/local/www/graph.php +++ b/src/usr/local/www/graph.php @@ -65,8 +65,8 @@ ##|*MATCH=graph.php* ##|-PRIV -require("globals.inc"); -require("guiconfig.inc"); +require_once("globals.inc"); +require_once("guiconfig.inc"); header("Last-Modified: " . gmdate("D, j M Y H:i:s") . " GMT"); header("Expires: " . gmdate("D, j M Y H:i:s", time()) . " GMT"); diff --git a/src/usr/local/www/interfaces_assign.php b/src/usr/local/www/interfaces_assign.php index 73d4839..1989b54 100644 --- a/src/usr/local/www/interfaces_assign.php +++ b/src/usr/local/www/interfaces_assign.php @@ -67,13 +67,13 @@ $pgtitle = array(gettext("Interfaces"), gettext("Interface Assignments")); $shortcut_section = "interfaces"; -require("guiconfig.inc"); -require("functions.inc"); +require_once("guiconfig.inc"); +require_once("functions.inc"); require_once("filter.inc"); -require("shaper.inc"); -require("ipsec.inc"); -require("vpn.inc"); -require("captiveportal.inc"); +require_once("shaper.inc"); +require_once("ipsec.inc"); +require_once("vpn.inc"); +require_once("captiveportal.inc"); require_once("rrd.inc"); function interface_assign_description($portinfo, $portname) { diff --git a/src/usr/local/www/interfaces_bridge.php b/src/usr/local/www/interfaces_bridge.php index f4ba575..c8f4f39 100644 --- a/src/usr/local/www/interfaces_bridge.php +++ b/src/usr/local/www/interfaces_bridge.php @@ -60,7 +60,7 @@ ##|*MATCH=interfaces_bridge.php* ##|-PRIV -require("guiconfig.inc"); +require_once("guiconfig.inc"); if (!is_array($config['bridges']['bridged'])) { $config['bridges']['bridged'] = array(); diff --git a/src/usr/local/www/interfaces_bridge_edit.php b/src/usr/local/www/interfaces_bridge_edit.php index 438c930..271ed6e 100644 --- a/src/usr/local/www/interfaces_bridge_edit.php +++ b/src/usr/local/www/interfaces_bridge_edit.php @@ -60,7 +60,7 @@ ##|*MATCH=interfaces_bridge_edit.php* ##|-PRIV -require("guiconfig.inc"); +require_once("guiconfig.inc"); if (!is_array($config['bridges']['bridged'])) { $config['bridges']['bridged'] = array(); diff --git a/src/usr/local/www/interfaces_gif.php b/src/usr/local/www/interfaces_gif.php index ff12a8e..8d57075 100644 --- a/src/usr/local/www/interfaces_gif.php +++ b/src/usr/local/www/interfaces_gif.php @@ -60,7 +60,7 @@ ##|*MATCH=interfaces_gif.php* ##|-PRIV -require("guiconfig.inc"); +require_once("guiconfig.inc"); if (!is_array($config['gifs']['gif'])) { $config['gifs']['gif'] = array(); diff --git a/src/usr/local/www/interfaces_gif_edit.php b/src/usr/local/www/interfaces_gif_edit.php index 43d3a4b..53c5219 100644 --- a/src/usr/local/www/interfaces_gif_edit.php +++ b/src/usr/local/www/interfaces_gif_edit.php @@ -60,7 +60,7 @@ ##|*MATCH=interfaces_gif_edit.php* ##|-PRIV -require("guiconfig.inc"); +require_once("guiconfig.inc"); if (!is_array($config['gifs']['gif'])) { $config['gifs']['gif'] = array(); diff --git a/src/usr/local/www/interfaces_gre.php b/src/usr/local/www/interfaces_gre.php index cfde1b7..a385683 100644 --- a/src/usr/local/www/interfaces_gre.php +++ b/src/usr/local/www/interfaces_gre.php @@ -60,7 +60,7 @@ ##|*MATCH=interfaces_gre.php* ##|-PRIV -require("guiconfig.inc"); +require_once("guiconfig.inc"); require_once("functions.inc"); if (!is_array($config['gres']['gre'])) { diff --git a/src/usr/local/www/interfaces_gre_edit.php b/src/usr/local/www/interfaces_gre_edit.php index 637f806..b1bcebd 100644 --- a/src/usr/local/www/interfaces_gre_edit.php +++ b/src/usr/local/www/interfaces_gre_edit.php @@ -60,7 +60,7 @@ ##|*MATCH=interfaces_gre_edit.php* ##|-PRIV -require("guiconfig.inc"); +require_once("guiconfig.inc"); require_once("functions.inc"); if (!is_array($config['gres']['gre'])) { diff --git a/src/usr/local/www/interfaces_groups.php b/src/usr/local/www/interfaces_groups.php index 4e51ede..52bef7a 100644 --- a/src/usr/local/www/interfaces_groups.php +++ b/src/usr/local/www/interfaces_groups.php @@ -60,7 +60,7 @@ ##|*MATCH=interfaces_groups.php* ##|-PRIV -require("guiconfig.inc"); +require_once("guiconfig.inc"); require_once("functions.inc"); if (!is_array($config['ifgroups']['ifgroupentry'])) { diff --git a/src/usr/local/www/interfaces_groups_edit.php b/src/usr/local/www/interfaces_groups_edit.php index cae5fb8..925289d 100644 --- a/src/usr/local/www/interfaces_groups_edit.php +++ b/src/usr/local/www/interfaces_groups_edit.php @@ -61,7 +61,7 @@ ##|-PRIV -require("guiconfig.inc"); +require_once("guiconfig.inc"); require_once("functions.inc"); $pgtitle = array(gettext("Interfaces"), gettext("Interface Groups"), gettext("Edit")); diff --git a/src/usr/local/www/interfaces_lagg.php b/src/usr/local/www/interfaces_lagg.php index 40cbe84..02fc169 100644 --- a/src/usr/local/www/interfaces_lagg.php +++ b/src/usr/local/www/interfaces_lagg.php @@ -60,7 +60,7 @@ ##|*MATCH=interfaces_lagg.php* ##|-PRIV -require("guiconfig.inc"); +require_once("guiconfig.inc"); if (!is_array($config['laggs']['lagg'])) { $config['laggs']['lagg'] = array(); diff --git a/src/usr/local/www/interfaces_lagg_edit.php b/src/usr/local/www/interfaces_lagg_edit.php index f82d99f..f3469c2 100644 --- a/src/usr/local/www/interfaces_lagg_edit.php +++ b/src/usr/local/www/interfaces_lagg_edit.php @@ -60,7 +60,7 @@ ##|*MATCH=interfaces_lagg_edit.php* ##|-PRIV -require("guiconfig.inc"); +require_once("guiconfig.inc"); if (!is_array($config['laggs']['lagg'])) { $config['laggs']['lagg'] = array(); diff --git a/src/usr/local/www/interfaces_ppps.php b/src/usr/local/www/interfaces_ppps.php index f45ec5f..08c257c 100644 --- a/src/usr/local/www/interfaces_ppps.php +++ b/src/usr/local/www/interfaces_ppps.php @@ -63,7 +63,7 @@ ##|*MATCH=interfaces_ppps.php* ##|-PRIV -require("guiconfig.inc"); +require_once("guiconfig.inc"); require_once("functions.inc"); function ppp_inuse($num) { diff --git a/src/usr/local/www/interfaces_ppps_edit.php b/src/usr/local/www/interfaces_ppps_edit.php index a451e80..12169af 100644 --- a/src/usr/local/www/interfaces_ppps_edit.php +++ b/src/usr/local/www/interfaces_ppps_edit.php @@ -65,8 +65,8 @@ ##|*MATCH=interfaces_ppps_edit.php* ##|-PRIV -require("guiconfig.inc"); -require("functions.inc"); +require_once("guiconfig.inc"); +require_once("functions.inc"); define("CRON_MONTHLY_PATTERN", "0 0 1 * *"); define("CRON_WEEKLY_PATTERN", "0 0 * * 0"); diff --git a/src/usr/local/www/interfaces_qinq.php b/src/usr/local/www/interfaces_qinq.php index 2687e1a..76c273b 100644 --- a/src/usr/local/www/interfaces_qinq.php +++ b/src/usr/local/www/interfaces_qinq.php @@ -60,7 +60,7 @@ ##|*MATCH=interfaces_qinq.php* ##|-PRIV -require("guiconfig.inc"); +require_once("guiconfig.inc"); require_once("functions.inc"); if (!is_array($config['qinqs']['qinqentry'])) { diff --git a/src/usr/local/www/interfaces_qinq_edit.php b/src/usr/local/www/interfaces_qinq_edit.php index ae98a76..666b41d 100644 --- a/src/usr/local/www/interfaces_qinq_edit.php +++ b/src/usr/local/www/interfaces_qinq_edit.php @@ -63,7 +63,7 @@ $pgtitle = array(gettext("Interfaces"), gettext("QinQs"), gettext("Edit")); $shortcut_section = "interfaces"; -require("guiconfig.inc"); +require_once("guiconfig.inc"); if (!is_array($config['qinqs']['qinqentry'])) { $config['qinqs']['qinqentry'] = array(); diff --git a/src/usr/local/www/interfaces_vlan.php b/src/usr/local/www/interfaces_vlan.php index a78bc55..935e82e 100644 --- a/src/usr/local/www/interfaces_vlan.php +++ b/src/usr/local/www/interfaces_vlan.php @@ -63,7 +63,7 @@ ##|*MATCH=interfaces_vlan.php* ##|-PRIV -require("guiconfig.inc"); +require_once("guiconfig.inc"); if (!is_array($config['vlans']['vlan'])) { $config['vlans']['vlan'] = array(); diff --git a/src/usr/local/www/interfaces_vlan_edit.php b/src/usr/local/www/interfaces_vlan_edit.php index ab0b0b9..3a72104 100644 --- a/src/usr/local/www/interfaces_vlan_edit.php +++ b/src/usr/local/www/interfaces_vlan_edit.php @@ -63,7 +63,7 @@ ##|*MATCH=interfaces_vlan_edit.php* ##|-PRIV -require("guiconfig.inc"); +require_once("guiconfig.inc"); if (!is_array($config['vlans']['vlan'])) { $config['vlans']['vlan'] = array(); diff --git a/src/usr/local/www/interfaces_wireless.php b/src/usr/local/www/interfaces_wireless.php index d1434dd..55df349 100644 --- a/src/usr/local/www/interfaces_wireless.php +++ b/src/usr/local/www/interfaces_wireless.php @@ -61,7 +61,7 @@ ##|*MATCH=interfaces_wireless.php* ##|-PRIV -require("guiconfig.inc"); +require_once("guiconfig.inc"); if (!is_array($config['wireless'])) { $config['wireless'] = array(); diff --git a/src/usr/local/www/interfaces_wireless_edit.php b/src/usr/local/www/interfaces_wireless_edit.php index 7d060ae..d99ebe5 100644 --- a/src/usr/local/www/interfaces_wireless_edit.php +++ b/src/usr/local/www/interfaces_wireless_edit.php @@ -61,7 +61,7 @@ ##|*MATCH=interfaces_wireless_edit.php* ##|-PRIV -require("guiconfig.inc"); +require_once("guiconfig.inc"); if (!is_array($config['wireless'])) { $config['wireless'] = array(); diff --git a/src/usr/local/www/license.php b/src/usr/local/www/license.php index 1ac1e06..985d2cc 100644 --- a/src/usr/local/www/license.php +++ b/src/usr/local/www/license.php @@ -60,7 +60,7 @@ ##|*MATCH=license.php* ##|-PRIV -require("guiconfig.inc"); +require_once("guiconfig.inc"); include("head.inc"); ?> <div class="panel panel-default"> diff --git a/src/usr/local/www/load_balancer_monitor_edit.php b/src/usr/local/www/load_balancer_monitor_edit.php index 8078cbb..9a6bd1d 100644 --- a/src/usr/local/www/load_balancer_monitor_edit.php +++ b/src/usr/local/www/load_balancer_monitor_edit.php @@ -61,7 +61,7 @@ ##|*MATCH=load_balancer_monitor_edit.php* ##|-PRIV -require("guiconfig.inc"); +require_once("guiconfig.inc"); $referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/load_balancer_monitor.php'); diff --git a/src/usr/local/www/load_balancer_pool_edit.php b/src/usr/local/www/load_balancer_pool_edit.php index e403885..8e479ca 100644 --- a/src/usr/local/www/load_balancer_pool_edit.php +++ b/src/usr/local/www/load_balancer_pool_edit.php @@ -61,7 +61,7 @@ ##|*MATCH=load_balancer_pool_edit.php* ##|-PRIV -require("guiconfig.inc"); +require_once("guiconfig.inc"); require_once("filter.inc"); require_once("util.inc"); diff --git a/src/usr/local/www/load_balancer_virtual_server_edit.php b/src/usr/local/www/load_balancer_virtual_server_edit.php index 97ea70b..ff0dab4 100644 --- a/src/usr/local/www/load_balancer_virtual_server_edit.php +++ b/src/usr/local/www/load_balancer_virtual_server_edit.php @@ -61,7 +61,7 @@ ##|*MATCH=load_balancer_virtual_server_edit.php* ##|-PRIV -require("guiconfig.inc"); +require_once("guiconfig.inc"); if (isset($_POST['referer'])) { $referer = $_POST['referer']; diff --git a/src/usr/local/www/pkg_edit.php b/src/usr/local/www/pkg_edit.php index 1048f34..20df922 100644 --- a/src/usr/local/www/pkg_edit.php +++ b/src/usr/local/www/pkg_edit.php @@ -62,7 +62,7 @@ ini_set('max_execution_time', '0'); -require("guiconfig.inc"); +require_once("guiconfig.inc"); require_once("functions.inc"); require_once("filter.inc"); require_once("shaper.inc"); diff --git a/src/usr/local/www/pkg_mgr_install.php b/src/usr/local/www/pkg_mgr_install.php index f032adc..6d266d4 100644 --- a/src/usr/local/www/pkg_mgr_install.php +++ b/src/usr/local/www/pkg_mgr_install.php @@ -63,7 +63,7 @@ ini_set('max_execution_time', '0'); -require("guiconfig.inc"); +require_once("guiconfig.inc"); require_once("functions.inc"); require_once("filter.inc"); require_once("shaper.inc"); diff --git a/src/usr/local/www/services_captiveportal_filemanager.php b/src/usr/local/www/services_captiveportal_filemanager.php index 7e9737d..d9f4c16 100644 --- a/src/usr/local/www/services_captiveportal_filemanager.php +++ b/src/usr/local/www/services_captiveportal_filemanager.php @@ -75,11 +75,11 @@ function cpelements_sort() { usort($config['captiveportal'][$cpzone]['element'], "cpelementscmp"); } -require("guiconfig.inc"); -require("functions.inc"); +require_once("guiconfig.inc"); +require_once("functions.inc"); require_once("filter.inc"); -require("shaper.inc"); -require("captiveportal.inc"); +require_once("shaper.inc"); +require_once("captiveportal.inc"); $cpzone = $_GET['zone']; if (isset($_POST['zone'])) { diff --git a/src/usr/local/www/services_captiveportal_hostname.php b/src/usr/local/www/services_captiveportal_hostname.php index 1834f03..0847cee 100644 --- a/src/usr/local/www/services_captiveportal_hostname.php +++ b/src/usr/local/www/services_captiveportal_hostname.php @@ -67,11 +67,11 @@ $notestr = 'This can be used for a web server serving images for the portal page, or a DNS server on another network, for example. ' . 'By specifying <em>from</em> addresses, it may be used to always allow pass-through access from a client behind the captive portal.'); -require("guiconfig.inc"); -require("functions.inc"); +require_once("guiconfig.inc"); +require_once("functions.inc"); require_once("filter.inc"); -require("shaper.inc"); -require("captiveportal.inc"); +require_once("shaper.inc"); +require_once("captiveportal.inc"); $cpzone = $_GET['zone']; if (isset($_POST['zone'])) { diff --git a/src/usr/local/www/services_captiveportal_hostname_edit.php b/src/usr/local/www/services_captiveportal_hostname_edit.php index 1e623a0..7dff448 100644 --- a/src/usr/local/www/services_captiveportal_hostname_edit.php +++ b/src/usr/local/www/services_captiveportal_hostname_edit.php @@ -69,11 +69,11 @@ function allowedhostnames_sort() { usort($config['captiveportal'][$cpzone]['allowedhostname'], "allowedhostnamescmp"); } -require("guiconfig.inc"); -require("functions.inc"); +require_once("guiconfig.inc"); +require_once("functions.inc"); require_once("filter.inc"); -require("shaper.inc"); -require("captiveportal.inc"); +require_once("shaper.inc"); +require_once("captiveportal.inc"); global $cpzone, $cpzoneid; diff --git a/src/usr/local/www/services_captiveportal_ip.php b/src/usr/local/www/services_captiveportal_ip.php index b3f8198..f738b31 100644 --- a/src/usr/local/www/services_captiveportal_ip.php +++ b/src/usr/local/www/services_captiveportal_ip.php @@ -66,11 +66,11 @@ $directionicons = array('to' => '→', 'from' => '←', 'both' => '⇄'); -require("guiconfig.inc"); -require("functions.inc"); +require_once("guiconfig.inc"); +require_once("functions.inc"); require_once("filter.inc"); -require("shaper.inc"); -require("captiveportal.inc"); +require_once("shaper.inc"); +require_once("captiveportal.inc"); $cpzone = $_GET['zone']; if (isset($_POST['zone'])) { diff --git a/src/usr/local/www/services_captiveportal_ip_edit.php b/src/usr/local/www/services_captiveportal_ip_edit.php index e32b82b..39cbe02 100644 --- a/src/usr/local/www/services_captiveportal_ip_edit.php +++ b/src/usr/local/www/services_captiveportal_ip_edit.php @@ -74,11 +74,11 @@ function allowedips_sort() { usort($config['captiveportal'][$cpzone]['allowedip'], "allowedipscmp"); } -require("guiconfig.inc"); -require("functions.inc"); +require_once("guiconfig.inc"); +require_once("functions.inc"); require_once("filter.inc"); -require("shaper.inc"); -require("captiveportal.inc"); +require_once("shaper.inc"); +require_once("captiveportal.inc"); $cpzone = $_GET['zone']; if (isset($_POST['zone'])) { diff --git a/src/usr/local/www/services_captiveportal_mac.php b/src/usr/local/www/services_captiveportal_mac.php index aee5d72..670ab60 100644 --- a/src/usr/local/www/services_captiveportal_mac.php +++ b/src/usr/local/www/services_captiveportal_mac.php @@ -64,11 +64,11 @@ ##|*MATCH=services_captiveportal_mac.php* ##|-PRIV -require("guiconfig.inc"); -require("functions.inc"); +require_once("guiconfig.inc"); +require_once("functions.inc"); require_once("filter.inc"); -require("shaper.inc"); -require("captiveportal.inc"); +require_once("shaper.inc"); +require_once("captiveportal.inc"); global $cpzone; global $cpzoneid; diff --git a/src/usr/local/www/services_captiveportal_mac_edit.php b/src/usr/local/www/services_captiveportal_mac_edit.php index 20ad744..891e435 100644 --- a/src/usr/local/www/services_captiveportal_mac_edit.php +++ b/src/usr/local/www/services_captiveportal_mac_edit.php @@ -74,11 +74,11 @@ function passthrumacs_sort() { usort($config['captiveportal'][$cpzone]['passthrumac'], "passthrumacscmp"); } -require("guiconfig.inc"); -require("functions.inc"); +require_once("guiconfig.inc"); +require_once("functions.inc"); require_once("filter.inc"); -require("shaper.inc"); -require("captiveportal.inc"); +require_once("shaper.inc"); +require_once("captiveportal.inc"); global $cpzone; global $cpzoneid; diff --git a/src/usr/local/www/services_captiveportal_vouchers.php b/src/usr/local/www/services_captiveportal_vouchers.php index 237c527..d166129 100644 --- a/src/usr/local/www/services_captiveportal_vouchers.php +++ b/src/usr/local/www/services_captiveportal_vouchers.php @@ -65,11 +65,11 @@ if ($_POST['postafterlogin']) { $nocsrf= true; } -require("guiconfig.inc"); -require("functions.inc"); +require_once("guiconfig.inc"); +require_once("functions.inc"); require_once("filter.inc"); -require("shaper.inc"); -require("captiveportal.inc"); +require_once("shaper.inc"); +require_once("captiveportal.inc"); require_once("voucher.inc"); $cpzone = $_GET['zone']; diff --git a/src/usr/local/www/services_captiveportal_vouchers_edit.php b/src/usr/local/www/services_captiveportal_vouchers_edit.php index de96c32..2e4b1bb 100644 --- a/src/usr/local/www/services_captiveportal_vouchers_edit.php +++ b/src/usr/local/www/services_captiveportal_vouchers_edit.php @@ -61,11 +61,11 @@ ##|*MATCH=services_captiveportal_vouchers_edit.php* ##|-PRIV -require("guiconfig.inc"); -require("functions.inc"); +require_once("guiconfig.inc"); +require_once("functions.inc"); require_once("filter.inc"); -require("shaper.inc"); -require("captiveportal.inc"); +require_once("shaper.inc"); +require_once("captiveportal.inc"); require_once("voucher.inc"); $cpzone = $_GET['zone']; diff --git a/src/usr/local/www/services_captiveportal_zones.php b/src/usr/local/www/services_captiveportal_zones.php index 334ac18..58b2c01 100644 --- a/src/usr/local/www/services_captiveportal_zones.php +++ b/src/usr/local/www/services_captiveportal_zones.php @@ -60,11 +60,11 @@ ##|*MATCH=services_captiveportal_zones.php* ##|-PRIV -require("guiconfig.inc"); -require("functions.inc"); +require_once("guiconfig.inc"); +require_once("functions.inc"); require_once("filter.inc"); -require("shaper.inc"); -require("captiveportal.inc"); +require_once("shaper.inc"); +require_once("captiveportal.inc"); global $cpzone; global $cpzoneid; diff --git a/src/usr/local/www/services_captiveportal_zones_edit.php b/src/usr/local/www/services_captiveportal_zones_edit.php index 8f19000..853c89e 100644 --- a/src/usr/local/www/services_captiveportal_zones_edit.php +++ b/src/usr/local/www/services_captiveportal_zones_edit.php @@ -60,11 +60,11 @@ ##|*MATCH=services_captiveportal_zones_edit.php* ##|-PRIV -require("guiconfig.inc"); -require("functions.inc"); +require_once("guiconfig.inc"); +require_once("functions.inc"); require_once("filter.inc"); -require("shaper.inc"); -require("captiveportal.inc"); +require_once("shaper.inc"); +require_once("captiveportal.inc"); $pgtitle = array(gettext("Services"), gettext("Captive Portal"), gettext("Add Zone")); $shortcut_section = "captiveportal"; diff --git a/src/usr/local/www/services_dhcp.php b/src/usr/local/www/services_dhcp.php index 401f2f5..6bff118 100644 --- a/src/usr/local/www/services_dhcp.php +++ b/src/usr/local/www/services_dhcp.php @@ -63,7 +63,7 @@ ##|*MATCH=services_dhcp.php* ##|-PRIV -require("guiconfig.inc"); +require_once("guiconfig.inc"); require_once("filter.inc"); require_once('rrd.inc'); require_once("shaper.inc"); diff --git a/src/usr/local/www/services_dhcp_edit.php b/src/usr/local/www/services_dhcp_edit.php index a162149..24d0d98 100644 --- a/src/usr/local/www/services_dhcp_edit.php +++ b/src/usr/local/www/services_dhcp_edit.php @@ -80,7 +80,7 @@ if (!$g['services_dhcp_server_enable']) { exit; } -require("guiconfig.inc"); +require_once("guiconfig.inc"); $if = $_GET['if']; diff --git a/src/usr/local/www/services_dhcp_relay.php b/src/usr/local/www/services_dhcp_relay.php index acca7a9..93b950d 100644 --- a/src/usr/local/www/services_dhcp_relay.php +++ b/src/usr/local/www/services_dhcp_relay.php @@ -61,7 +61,7 @@ ##|*MATCH=services_dhcp_relay.php* ##|-PRIV -require("guiconfig.inc"); +require_once("guiconfig.inc"); require_once("filter.inc"); $pconfig['enable'] = isset($config['dhcrelay']['enable']); diff --git a/src/usr/local/www/services_dhcpv6.php b/src/usr/local/www/services_dhcpv6.php index f63fcf7..28a7ab8 100644 --- a/src/usr/local/www/services_dhcpv6.php +++ b/src/usr/local/www/services_dhcpv6.php @@ -64,7 +64,7 @@ ##|*MATCH=services_dhcpv6.php* ##|-PRIV -require("guiconfig.inc"); +require_once("guiconfig.inc"); require_once("filter.inc"); function dhcpv6_apply_changes($dhcpdv6_enable_changed) { diff --git a/src/usr/local/www/services_dhcpv6_edit.php b/src/usr/local/www/services_dhcpv6_edit.php index 747388d..7ecfac5 100644 --- a/src/usr/local/www/services_dhcpv6_edit.php +++ b/src/usr/local/www/services_dhcpv6_edit.php @@ -81,7 +81,7 @@ if (!$g['services_dhcp_server_enable']) { exit; } -require("guiconfig.inc"); +require_once("guiconfig.inc"); $if = $_GET['if']; if ($_POST['if']) { diff --git a/src/usr/local/www/services_dhcpv6_relay.php b/src/usr/local/www/services_dhcpv6_relay.php index ba83197..87bb1e9 100644 --- a/src/usr/local/www/services_dhcpv6_relay.php +++ b/src/usr/local/www/services_dhcpv6_relay.php @@ -62,7 +62,7 @@ ##|*MATCH=services_dhcpv6_relay.php* ##|-PRIV -require("guiconfig.inc"); +require_once("guiconfig.inc"); $pconfig['enable'] = isset($config['dhcrelay6']['enable']); diff --git a/src/usr/local/www/services_dnsmasq.php b/src/usr/local/www/services_dnsmasq.php index f850023..09a21cd 100644 --- a/src/usr/local/www/services_dnsmasq.php +++ b/src/usr/local/www/services_dnsmasq.php @@ -64,7 +64,7 @@ ##|*MATCH=services_dnsmasq.php* ##|-PRIV -require("guiconfig.inc"); +require_once("guiconfig.inc"); require_once("functions.inc"); require_once("filter.inc"); require_once("shaper.inc"); diff --git a/src/usr/local/www/services_dnsmasq_domainoverride_edit.php b/src/usr/local/www/services_dnsmasq_domainoverride_edit.php index 9e4670a..f813bfb 100644 --- a/src/usr/local/www/services_dnsmasq_domainoverride_edit.php +++ b/src/usr/local/www/services_dnsmasq_domainoverride_edit.php @@ -64,7 +64,7 @@ ##|*MATCH=services_dnsmasq_domainoverride_edit.php* ##|-PRIV -require("guiconfig.inc"); +require_once("guiconfig.inc"); if (!is_array($config['dnsmasq']['domainoverrides'])) { $config['dnsmasq']['domainoverrides'] = array(); diff --git a/src/usr/local/www/services_dnsmasq_edit.php b/src/usr/local/www/services_dnsmasq_edit.php index bbebb02..e9018e3 100644 --- a/src/usr/local/www/services_dnsmasq_edit.php +++ b/src/usr/local/www/services_dnsmasq_edit.php @@ -78,7 +78,7 @@ function hosts_sort() { usort($config['dnsmasq']['hosts'], "hostcmp"); } -require("guiconfig.inc"); +require_once("guiconfig.inc"); if (!is_array($config['dnsmasq']['hosts'])) { $config['dnsmasq']['hosts'] = array(); diff --git a/src/usr/local/www/services_dyndns.php b/src/usr/local/www/services_dyndns.php index f0de114..f1759bc 100644 --- a/src/usr/local/www/services_dyndns.php +++ b/src/usr/local/www/services_dyndns.php @@ -60,7 +60,7 @@ ##|*MATCH=services_dyndns.php* ##|-PRIV -require("guiconfig.inc"); +require_once("guiconfig.inc"); if (!is_array($config['dyndnses']['dyndns'])) { $config['dyndnses']['dyndns'] = array(); diff --git a/src/usr/local/www/services_dyndns_edit.php b/src/usr/local/www/services_dyndns_edit.php index 03130ec..b683167 100644 --- a/src/usr/local/www/services_dyndns_edit.php +++ b/src/usr/local/www/services_dyndns_edit.php @@ -73,7 +73,7 @@ function is_dyndns_username($uname) { } } -require("guiconfig.inc"); +require_once("guiconfig.inc"); if (!is_array($config['dyndnses']['dyndns'])) { $config['dyndnses']['dyndns'] = array(); diff --git a/src/usr/local/www/services_igmpproxy.php b/src/usr/local/www/services_igmpproxy.php index 40344b3..125cee9 100644 --- a/src/usr/local/www/services_igmpproxy.php +++ b/src/usr/local/www/services_igmpproxy.php @@ -63,7 +63,7 @@ ##|*MATCH=services_igmpproxy.php* ##|-PRIV -require("guiconfig.inc"); +require_once("guiconfig.inc"); if (!is_array($config['igmpproxy']['igmpentry'])) { $config['igmpproxy']['igmpentry'] = array(); diff --git a/src/usr/local/www/services_igmpproxy_edit.php b/src/usr/local/www/services_igmpproxy_edit.php index a6770ab..14048ef 100644 --- a/src/usr/local/www/services_igmpproxy_edit.php +++ b/src/usr/local/www/services_igmpproxy_edit.php @@ -65,7 +65,7 @@ $pgtitle = array(gettext("Services"), gettext("IGMP Proxy"), gettext("Edit")); -require("guiconfig.inc"); +require_once("guiconfig.inc"); if (!is_array($config['igmpproxy']['igmpentry'])) { $config['igmpproxy']['igmpentry'] = array(); diff --git a/src/usr/local/www/services_ntpd.php b/src/usr/local/www/services_ntpd.php index fc790f1..1a54ffe 100644 --- a/src/usr/local/www/services_ntpd.php +++ b/src/usr/local/www/services_ntpd.php @@ -62,7 +62,7 @@ ##|-PRIV define('NUMTIMESERVERS', 10); // The maximum number of configurable time servers -require("guiconfig.inc"); +require_once("guiconfig.inc"); require_once('rrd.inc'); require_once("shaper.inc"); diff --git a/src/usr/local/www/services_ntpd_acls.php b/src/usr/local/www/services_ntpd_acls.php index 0866743..1ac7498 100644 --- a/src/usr/local/www/services_ntpd_acls.php +++ b/src/usr/local/www/services_ntpd_acls.php @@ -62,7 +62,7 @@ ##|-PRIV define('NUMACLS', 50); // The maximum number of configurable ACLs -require("guiconfig.inc"); +require_once("guiconfig.inc"); require_once('rrd.inc'); require_once("shaper.inc"); diff --git a/src/usr/local/www/services_pppoe_edit.php b/src/usr/local/www/services_pppoe_edit.php index a29c516..0273866 100644 --- a/src/usr/local/www/services_pppoe_edit.php +++ b/src/usr/local/www/services_pppoe_edit.php @@ -60,7 +60,7 @@ ##|*MATCH=services_pppoe_edit.php* ##|-PRIV -require("guiconfig.inc"); +require_once("guiconfig.inc"); require_once("vpn.inc"); function vpn_pppoe_get_id() { diff --git a/src/usr/local/www/services_rfc2136.php b/src/usr/local/www/services_rfc2136.php index f321949..7faacd5 100644 --- a/src/usr/local/www/services_rfc2136.php +++ b/src/usr/local/www/services_rfc2136.php @@ -60,7 +60,7 @@ ##|*MATCH=services_rfc2136.php* ##|-PRIV -require("guiconfig.inc"); +require_once("guiconfig.inc"); if (!is_array($config['dnsupdates']['dnsupdate'])) { $config['dnsupdates']['dnsupdate'] = array(); diff --git a/src/usr/local/www/services_rfc2136_edit.php b/src/usr/local/www/services_rfc2136_edit.php index 5a37730..ba6e8ba 100644 --- a/src/usr/local/www/services_rfc2136_edit.php +++ b/src/usr/local/www/services_rfc2136_edit.php @@ -60,7 +60,7 @@ ##|*MATCH=services_rfc2136_edit.php* ##|-PRIV -require("guiconfig.inc"); +require_once("guiconfig.inc"); if (!is_array($config['dnsupdates']['dnsupdate'])) { $config['dnsupdates']['dnsupdate'] = array(); diff --git a/src/usr/local/www/services_router_advertisements.php b/src/usr/local/www/services_router_advertisements.php index 921b299..017a1e2 100644 --- a/src/usr/local/www/services_router_advertisements.php +++ b/src/usr/local/www/services_router_advertisements.php @@ -64,7 +64,7 @@ ##|*MATCH=services_router_advertisements.php* ##|-PRIV -require("guiconfig.inc"); +require_once("guiconfig.inc"); if (!$g['services_dhcp_server_enable']) { header("Location: /"); diff --git a/src/usr/local/www/services_snmp.php b/src/usr/local/www/services_snmp.php index 51766c0..3586b92 100644 --- a/src/usr/local/www/services_snmp.php +++ b/src/usr/local/www/services_snmp.php @@ -63,7 +63,7 @@ ##|*MATCH=services_snmp.php* ##|-PRIV -require("guiconfig.inc"); +require_once("guiconfig.inc"); require_once("functions.inc"); if (!is_array($config['snmpd'])) { diff --git a/src/usr/local/www/services_unbound_acls.php b/src/usr/local/www/services_unbound_acls.php index c8233b4..1ddd340 100644 --- a/src/usr/local/www/services_unbound_acls.php +++ b/src/usr/local/www/services_unbound_acls.php @@ -61,8 +61,8 @@ ##|*MATCH=services_unbound_acls.php* ##|-PRIV -require("guiconfig.inc"); -require("unbound.inc"); +require_once("guiconfig.inc"); +require_once("unbound.inc"); if (!is_array($config['unbound']['acls'])) { $config['unbound']['acls'] = array(); diff --git a/src/usr/local/www/services_unbound_domainoverride_edit.php b/src/usr/local/www/services_unbound_domainoverride_edit.php index ed64580..de5e016 100644 --- a/src/usr/local/www/services_unbound_domainoverride_edit.php +++ b/src/usr/local/www/services_unbound_domainoverride_edit.php @@ -65,7 +65,7 @@ ##|*MATCH=services_unbound_domainoverride_edit.php* ##|-PRIV -require("guiconfig.inc"); +require_once("guiconfig.inc"); if (!is_array($config['unbound']['domainoverrides'])) { $config['unbound']['domainoverrides'] = array(); diff --git a/src/usr/local/www/services_unbound_host_edit.php b/src/usr/local/www/services_unbound_host_edit.php index fadc451..63c3ecc 100644 --- a/src/usr/local/www/services_unbound_host_edit.php +++ b/src/usr/local/www/services_unbound_host_edit.php @@ -79,7 +79,7 @@ function hosts_sort() { usort($config['unbound']['hosts'], "hostcmp"); } -require("guiconfig.inc"); +require_once("guiconfig.inc"); if (!is_array($config['unbound']['hosts'])) { $config['unbound']['hosts'] = array(); diff --git a/src/usr/local/www/services_wol.php b/src/usr/local/www/services_wol.php index 394d52b..90796c8 100644 --- a/src/usr/local/www/services_wol.php +++ b/src/usr/local/www/services_wol.php @@ -63,7 +63,7 @@ ##|*MATCH=services_wol.php* ##|-PRIV -require("guiconfig.inc"); +require_once("guiconfig.inc"); if (!is_array($config['wol']['wolentry'])) { $config['wol']['wolentry'] = array(); } diff --git a/src/usr/local/www/services_wol_edit.php b/src/usr/local/www/services_wol_edit.php index 8071159..f0ac400 100644 --- a/src/usr/local/www/services_wol_edit.php +++ b/src/usr/local/www/services_wol_edit.php @@ -73,7 +73,7 @@ function wol_sort() { usort($config['wol']['wolentry'], "wolcmp"); } -require("guiconfig.inc"); +require_once("guiconfig.inc"); if (!is_array($config['wol']['wolentry'])) { $config['wol']['wolentry'] = array(); } diff --git a/src/usr/local/www/status_captiveportal.php b/src/usr/local/www/status_captiveportal.php index f1e0b94..b61ed05 100644 --- a/src/usr/local/www/status_captiveportal.php +++ b/src/usr/local/www/status_captiveportal.php @@ -63,11 +63,11 @@ ##|*MATCH=status_captiveportal.php* ##|-PRIV -require("guiconfig.inc"); -require("functions.inc"); +require_once("guiconfig.inc"); +require_once("functions.inc"); require_once("filter.inc"); -require("shaper.inc"); -require("captiveportal.inc"); +require_once("shaper.inc"); +require_once("captiveportal.inc"); $cpzone = $_GET['zone']; if (isset($_POST['zone'])) { diff --git a/src/usr/local/www/status_captiveportal_expire.php b/src/usr/local/www/status_captiveportal_expire.php index ba57a93..598631f 100644 --- a/src/usr/local/www/status_captiveportal_expire.php +++ b/src/usr/local/www/status_captiveportal_expire.php @@ -61,11 +61,11 @@ ##|*MATCH=status_captiveportal_expire.php* ##|-PRIV -require("guiconfig.inc"); -require("functions.inc"); +require_once("guiconfig.inc"); +require_once("functions.inc"); require_once("filter.inc"); -require("shaper.inc"); -require("captiveportal.inc"); +require_once("shaper.inc"); +require_once("captiveportal.inc"); require_once("voucher.inc"); $cpzone = $_GET['zone']; diff --git a/src/usr/local/www/status_captiveportal_test.php b/src/usr/local/www/status_captiveportal_test.php index 9fb614b..8dcc855 100644 --- a/src/usr/local/www/status_captiveportal_test.php +++ b/src/usr/local/www/status_captiveportal_test.php @@ -61,11 +61,11 @@ ##|*MATCH=status_captiveportal_test.php* ##|-PRIV -require("guiconfig.inc"); -require("functions.inc"); +require_once("guiconfig.inc"); +require_once("functions.inc"); require_once("filter.inc"); -require("shaper.inc"); -require("captiveportal.inc"); +require_once("shaper.inc"); +require_once("captiveportal.inc"); require_once("voucher.inc"); $cpzone = $_GET['zone']; diff --git a/src/usr/local/www/status_captiveportal_voucher_rolls.php b/src/usr/local/www/status_captiveportal_voucher_rolls.php index d1c869d..747d66e 100644 --- a/src/usr/local/www/status_captiveportal_voucher_rolls.php +++ b/src/usr/local/www/status_captiveportal_voucher_rolls.php @@ -61,11 +61,11 @@ ##|*MATCH=status_captiveportal_voucher_rolls.php* ##|-PRIV -require("guiconfig.inc"); -require("functions.inc"); +require_once("guiconfig.inc"); +require_once("functions.inc"); require_once("filter.inc"); -require("shaper.inc"); -require("captiveportal.inc"); +require_once("shaper.inc"); +require_once("captiveportal.inc"); require_once("voucher.inc"); $cpzone = $_GET['zone']; diff --git a/src/usr/local/www/status_captiveportal_vouchers.php b/src/usr/local/www/status_captiveportal_vouchers.php index cf311d1..7dfaf63 100644 --- a/src/usr/local/www/status_captiveportal_vouchers.php +++ b/src/usr/local/www/status_captiveportal_vouchers.php @@ -61,11 +61,11 @@ ##|*MATCH=status_captiveportal_vouchers.php* ##|-PRIV -require("guiconfig.inc"); -require("functions.inc"); +require_once("guiconfig.inc"); +require_once("functions.inc"); require_once("filter.inc"); -require("shaper.inc"); -require("captiveportal.inc"); +require_once("shaper.inc"); +require_once("captiveportal.inc"); require_once("voucher.inc"); $cpzone = $_GET['zone']; diff --git a/src/usr/local/www/status_dhcp_leases.php b/src/usr/local/www/status_dhcp_leases.php index 1bff34e..28517ef 100644 --- a/src/usr/local/www/status_dhcp_leases.php +++ b/src/usr/local/www/status_dhcp_leases.php @@ -63,7 +63,7 @@ ##|*MATCH=status_dhcp_leases.php* ##|-PRIV -require("guiconfig.inc"); +require_once("guiconfig.inc"); require_once("config.inc"); $pgtitle = array(gettext("Status"), gettext("DHCP Leases")); diff --git a/src/usr/local/www/status_dhcpv6_leases.php b/src/usr/local/www/status_dhcpv6_leases.php index 48b14c1..2392f48 100644 --- a/src/usr/local/www/status_dhcpv6_leases.php +++ b/src/usr/local/www/status_dhcpv6_leases.php @@ -64,7 +64,7 @@ ##|*MATCH=status_dhcpv6_leases.php* ##|-PRIV -require("guiconfig.inc"); +require_once("guiconfig.inc"); require_once("config.inc"); $pgtitle = array(gettext("Status"), gettext("DHCPv6 Leases")); diff --git a/src/usr/local/www/status_gateway_groups.php b/src/usr/local/www/status_gateway_groups.php index abc8148..7cd10e7 100755 --- a/src/usr/local/www/status_gateway_groups.php +++ b/src/usr/local/www/status_gateway_groups.php @@ -66,7 +66,7 @@ define('COLOR', true); -require("guiconfig.inc"); +require_once("guiconfig.inc"); if (!is_array($config['gateways']['gateway_group'])) { $config['gateways']['gateway_group'] = array(); diff --git a/src/usr/local/www/status_gateways.php b/src/usr/local/www/status_gateways.php index cf1de75..afc71da 100644 --- a/src/usr/local/www/status_gateways.php +++ b/src/usr/local/www/status_gateways.php @@ -61,7 +61,7 @@ ##|*MATCH=status_gateways.php* ##|-PRIV -require("guiconfig.inc"); +require_once("guiconfig.inc"); define('COLOR', true); diff --git a/src/usr/local/www/status_graph.php b/src/usr/local/www/status_graph.php index d83574b..c1cb7e7 100644 --- a/src/usr/local/www/status_graph.php +++ b/src/usr/local/www/status_graph.php @@ -66,7 +66,7 @@ ##|*MATCH=ifstats.php* ##|-PRIV -require("guiconfig.inc"); +require_once("guiconfig.inc"); require_once("ipsec.inc"); if ($_POST['width']) { diff --git a/src/usr/local/www/status_graph_cpu.php b/src/usr/local/www/status_graph_cpu.php index a7e0250..388e514 100644 --- a/src/usr/local/www/status_graph_cpu.php +++ b/src/usr/local/www/status_graph_cpu.php @@ -64,7 +64,7 @@ ##|-PRIV $pgtitle = array(gettext("Status"), gettext("CPU Load Graph")); -require("guiconfig.inc"); +require_once("guiconfig.inc"); include("head.inc"); ?> diff --git a/src/usr/local/www/status_ipsec.php b/src/usr/local/www/status_ipsec.php index cc4acfe..34d6f58 100644 --- a/src/usr/local/www/status_ipsec.php +++ b/src/usr/local/www/status_ipsec.php @@ -64,7 +64,7 @@ ##|*MATCH=status_ipsec.php* ##|-PRIV -require("guiconfig.inc"); +require_once("guiconfig.inc"); require_once("ipsec.inc"); global $g; diff --git a/src/usr/local/www/status_ipsec_leases.php b/src/usr/local/www/status_ipsec_leases.php index 09b1d06..39a624f 100644 --- a/src/usr/local/www/status_ipsec_leases.php +++ b/src/usr/local/www/status_ipsec_leases.php @@ -60,8 +60,8 @@ ##|*MATCH=status_ipsec_leases.php* ##|-PRIV -require("guiconfig.inc"); -require("ipsec.inc"); +require_once("guiconfig.inc"); +require_once("ipsec.inc"); $pgtitle = array(gettext("Status"), gettext("IPsec"), gettext("Leases")); $shortcut_section = "ipsec"; diff --git a/src/usr/local/www/status_ipsec_sad.php b/src/usr/local/www/status_ipsec_sad.php index 828f862..953b562 100644 --- a/src/usr/local/www/status_ipsec_sad.php +++ b/src/usr/local/www/status_ipsec_sad.php @@ -63,8 +63,8 @@ ##|*MATCH=status_ipsec_sad.php* ##|-PRIV -require("guiconfig.inc"); -require("ipsec.inc"); +require_once("guiconfig.inc"); +require_once("ipsec.inc"); $pgtitle = array(gettext("Status"), gettext("IPsec"), gettext("SADs")); $shortcut_section = "ipsec"; diff --git a/src/usr/local/www/status_ipsec_spd.php b/src/usr/local/www/status_ipsec_spd.php index b10d61b..c4b4ccc 100644 --- a/src/usr/local/www/status_ipsec_spd.php +++ b/src/usr/local/www/status_ipsec_spd.php @@ -66,8 +66,8 @@ define('RIGHTARROW', '►'); define('LEFTARROW', '◄'); -require("guiconfig.inc"); -require("ipsec.inc"); +require_once("guiconfig.inc"); +require_once("ipsec.inc"); $pgtitle = array(gettext("Status"), gettext("IPsec"), gettext("SPDs")); $shortcut_section = "ipsec"; diff --git a/src/usr/local/www/status_logs_settings.php b/src/usr/local/www/status_logs_settings.php index 155f527..5ad1098 100644 --- a/src/usr/local/www/status_logs_settings.php +++ b/src/usr/local/www/status_logs_settings.php @@ -63,7 +63,7 @@ ##|*MATCH=status_logs_settings.php* ##|-PRIV -require("guiconfig.inc"); +require_once("guiconfig.inc"); require_once("functions.inc"); require_once("filter.inc"); require_once("shaper.inc"); diff --git a/src/usr/local/www/status_openvpn.php b/src/usr/local/www/status_openvpn.php index 8bf81cb..4d3e557 100644 --- a/src/usr/local/www/status_openvpn.php +++ b/src/usr/local/www/status_openvpn.php @@ -64,7 +64,7 @@ $pgtitle = array(gettext("Status"), gettext("OpenVPN")); $shortcut_section = "openvpn"; -require("guiconfig.inc"); +require_once("guiconfig.inc"); require_once("openvpn.inc"); require_once("shortcuts.inc"); require_once("service-utils.inc"); diff --git a/src/usr/local/www/status_pkglogs.php b/src/usr/local/www/status_pkglogs.php index 651e078..77ba21e 100755 --- a/src/usr/local/www/status_pkglogs.php +++ b/src/usr/local/www/status_pkglogs.php @@ -71,8 +71,8 @@ ##|*MATCH=status_pkglogs.php* ##|-PRIV -require("guiconfig.inc"); -require("pkg-utils.inc"); +require_once("guiconfig.inc"); +require_once("pkg-utils.inc"); if (!($nentries = $config['syslog']['nentries'])) { $nentries = 50; diff --git a/src/usr/local/www/status_queues.php b/src/usr/local/www/status_queues.php index 52d6773..9362163 100644 --- a/src/usr/local/www/status_queues.php +++ b/src/usr/local/www/status_queues.php @@ -66,7 +66,7 @@ header("Cache-Control: no-cache, no-store, must-revalidate"); // HTTP/1.1 header("Pragma: no-cache"); // HTTP/1.0 */ -require("guiconfig.inc"); +require_once("guiconfig.inc"); class QueueStats { public $queuename; public $queuelength; diff --git a/src/usr/local/www/status_upnp.php b/src/usr/local/www/status_upnp.php index 961f29b..630ac4c 100644 --- a/src/usr/local/www/status_upnp.php +++ b/src/usr/local/www/status_upnp.php @@ -61,7 +61,7 @@ ##|*MATCH=status_upnp.php* ##|-PRIV -require("guiconfig.inc"); +require_once("guiconfig.inc"); if ($_POST) { if ($_POST['clear']) { diff --git a/src/usr/local/www/system.php b/src/usr/local/www/system.php index ea251f5..cd40c49 100644 --- a/src/usr/local/www/system.php +++ b/src/usr/local/www/system.php @@ -63,7 +63,7 @@ ##|*MATCH=system.php* ##|-PRIV -require("guiconfig.inc"); +require_once("guiconfig.inc"); require_once("functions.inc"); require_once("filter.inc"); require_once("shaper.inc"); diff --git a/src/usr/local/www/system_advanced_admin.php b/src/usr/local/www/system_advanced_admin.php index 820fa47..4af0c12 100644 --- a/src/usr/local/www/system_advanced_admin.php +++ b/src/usr/local/www/system_advanced_admin.php @@ -64,7 +64,7 @@ ##|*MATCH=system_advanced_admin.php* ##|-PRIV -require("guiconfig.inc"); +require_once("guiconfig.inc"); require_once("functions.inc"); require_once("filter.inc"); require_once("shaper.inc"); diff --git a/src/usr/local/www/system_advanced_firewall.php b/src/usr/local/www/system_advanced_firewall.php index 67ceed5..5c13629 100644 --- a/src/usr/local/www/system_advanced_firewall.php +++ b/src/usr/local/www/system_advanced_firewall.php @@ -64,7 +64,7 @@ ##|*MATCH=system_advanced_firewall.php* ##|-PRIV -require("guiconfig.inc"); +require_once("guiconfig.inc"); require_once("functions.inc"); require_once("filter.inc"); require_once("shaper.inc"); diff --git a/src/usr/local/www/system_advanced_misc.php b/src/usr/local/www/system_advanced_misc.php index 897418d..4248b87 100644 --- a/src/usr/local/www/system_advanced_misc.php +++ b/src/usr/local/www/system_advanced_misc.php @@ -64,7 +64,7 @@ ##|*MATCH=system_advanced_misc.php* ##|-PRIV -require("guiconfig.inc"); +require_once("guiconfig.inc"); require_once("functions.inc"); require_once("filter.inc"); require_once("shaper.inc"); diff --git a/src/usr/local/www/system_advanced_network.php b/src/usr/local/www/system_advanced_network.php index 459974d..78533b0 100644 --- a/src/usr/local/www/system_advanced_network.php +++ b/src/usr/local/www/system_advanced_network.php @@ -64,7 +64,7 @@ ##|*MATCH=system_advanced_network.php* ##|-PRIV -require("guiconfig.inc"); +require_once("guiconfig.inc"); require_once("functions.inc"); require_once("filter.inc"); require_once("shaper.inc"); diff --git a/src/usr/local/www/system_advanced_notifications.php b/src/usr/local/www/system_advanced_notifications.php index 6f82b44..b9dc4d9 100644 --- a/src/usr/local/www/system_advanced_notifications.php +++ b/src/usr/local/www/system_advanced_notifications.php @@ -60,7 +60,7 @@ ##|*MATCH=system_advanced_notifications.php* ##|-PRIV -require("guiconfig.inc"); +require_once("guiconfig.inc"); require_once("notices.inc"); // Growl diff --git a/src/usr/local/www/system_advanced_sysctl.php b/src/usr/local/www/system_advanced_sysctl.php index c069079..6b03686 100644 --- a/src/usr/local/www/system_advanced_sysctl.php +++ b/src/usr/local/www/system_advanced_sysctl.php @@ -64,7 +64,7 @@ ##|*MATCH=system_advanced_sysctl.php* ##|-PRIV -require("guiconfig.inc"); +require_once("guiconfig.inc"); if (!is_array($config['sysctl'])) { $config['sysctl'] = array(); diff --git a/src/usr/local/www/system_authservers.php b/src/usr/local/www/system_authservers.php index 654a61f..c16a384 100644 --- a/src/usr/local/www/system_authservers.php +++ b/src/usr/local/www/system_authservers.php @@ -61,7 +61,7 @@ ##|*MATCH=system_authservers.php* ##|-PRIV -require("guiconfig.inc"); +require_once("guiconfig.inc"); require_once("auth.inc"); // Have we been called to populate the "Select a container" modal? diff --git a/src/usr/local/www/system_camanager.php b/src/usr/local/www/system_camanager.php index 3f91fd2..ec83fb7 100644 --- a/src/usr/local/www/system_camanager.php +++ b/src/usr/local/www/system_camanager.php @@ -61,7 +61,7 @@ ##|*MATCH=system_camanager.php* ##|-PRIV -require("guiconfig.inc"); +require_once("guiconfig.inc"); require_once("certs.inc"); $ca_methods = array( diff --git a/src/usr/local/www/system_certmanager.php b/src/usr/local/www/system_certmanager.php index 51d3ed6..e717c48 100644 --- a/src/usr/local/www/system_certmanager.php +++ b/src/usr/local/www/system_certmanager.php @@ -61,7 +61,7 @@ ##|*MATCH=system_certmanager.php* ##|-PRIV -require("guiconfig.inc"); +require_once("guiconfig.inc"); require_once("certs.inc"); $cert_methods = array( diff --git a/src/usr/local/www/system_crlmanager.php b/src/usr/local/www/system_crlmanager.php index c396446..ff0f7ad 100644 --- a/src/usr/local/www/system_crlmanager.php +++ b/src/usr/local/www/system_crlmanager.php @@ -60,7 +60,7 @@ ##|*MATCH=system_crlmanager.php* ##|-PRIV -require("guiconfig.inc"); +require_once("guiconfig.inc"); require_once("certs.inc"); require_once("openvpn.inc"); require_once("vpn.inc"); diff --git a/src/usr/local/www/system_gateway_groups.php b/src/usr/local/www/system_gateway_groups.php index 9ce2b21..80a5fdf 100644 --- a/src/usr/local/www/system_gateway_groups.php +++ b/src/usr/local/www/system_gateway_groups.php @@ -61,7 +61,7 @@ ##|*MATCH=system_gateway_groups.php* ##|-PRIV -require("guiconfig.inc"); +require_once("guiconfig.inc"); require_once("functions.inc"); require_once("filter.inc"); require_once("shaper.inc"); diff --git a/src/usr/local/www/system_gateway_groups_edit.php b/src/usr/local/www/system_gateway_groups_edit.php index f1a3045..ead55f3 100644 --- a/src/usr/local/www/system_gateway_groups_edit.php +++ b/src/usr/local/www/system_gateway_groups_edit.php @@ -61,7 +61,7 @@ ##|*MATCH=system_gateway_groups_edit.php* ##|-PRIV -require("guiconfig.inc"); +require_once("guiconfig.inc"); require_once("ipsec.inc"); require_once("vpn.inc"); diff --git a/src/usr/local/www/system_gateways.php b/src/usr/local/www/system_gateways.php index 8b7c3b9..17ea0ea 100644 --- a/src/usr/local/www/system_gateways.php +++ b/src/usr/local/www/system_gateways.php @@ -61,7 +61,7 @@ ##|*MATCH=system_gateways.php* ##|-PRIV -require("guiconfig.inc"); +require_once("guiconfig.inc"); require_once("functions.inc"); require_once("filter.inc"); require_once("shaper.inc"); diff --git a/src/usr/local/www/system_gateways_edit.php b/src/usr/local/www/system_gateways_edit.php index f6042a3..25c21d3 100644 --- a/src/usr/local/www/system_gateways_edit.php +++ b/src/usr/local/www/system_gateways_edit.php @@ -60,8 +60,8 @@ ##|*MATCH=system_gateways_edit.php* ##|-PRIV -require("guiconfig.inc"); -require("pkg-utils.inc"); +require_once("guiconfig.inc"); +require_once("pkg-utils.inc"); if (isset($_POST['referer'])) { $referer = $_POST['referer']; diff --git a/src/usr/local/www/system_groupmanager.php b/src/usr/local/www/system_groupmanager.php index 8e0d253..5ebaa54 100644 --- a/src/usr/local/www/system_groupmanager.php +++ b/src/usr/local/www/system_groupmanager.php @@ -65,7 +65,7 @@ ##|*MATCH=system_groupmanager.php* ##|-PRIV -require("guiconfig.inc"); +require_once("guiconfig.inc"); if (!is_array($config['system']['group'])) { $config['system']['group'] = array(); diff --git a/src/usr/local/www/system_groupmanager_addprivs.php b/src/usr/local/www/system_groupmanager_addprivs.php index 534dcb7..5ce9ce9 100644 --- a/src/usr/local/www/system_groupmanager_addprivs.php +++ b/src/usr/local/www/system_groupmanager_addprivs.php @@ -64,7 +64,7 @@ ##|*MATCH=system_groupmanager_addprivs.php* ##|-PRIV -require("guiconfig.inc"); +require_once("guiconfig.inc"); $pgtitle = array(gettext("System"), gettext("User Manager"), gettext("Groups"), gettext("Edit"), gettext("Add Privileges")); diff --git a/src/usr/local/www/system_hasync.php b/src/usr/local/www/system_hasync.php index 4ccdbef..9913819 100755 --- a/src/usr/local/www/system_hasync.php +++ b/src/usr/local/www/system_hasync.php @@ -61,7 +61,7 @@ ##|*MATCH=system_hasync.php* ##|-PRIV -require("guiconfig.inc"); +require_once("guiconfig.inc"); if (!is_array($config['hasync'])) { $config['hasync'] = array(); diff --git a/src/usr/local/www/system_routes.php b/src/usr/local/www/system_routes.php index 40ec957..1c5d775 100644 --- a/src/usr/local/www/system_routes.php +++ b/src/usr/local/www/system_routes.php @@ -63,7 +63,7 @@ ##|*MATCH=system_routes.php* ##|-PRIV -require("guiconfig.inc"); +require_once("guiconfig.inc"); require_once("functions.inc"); require_once("filter.inc"); require_once("shaper.inc"); diff --git a/src/usr/local/www/system_update_settings.php b/src/usr/local/www/system_update_settings.php index 79a9b00..1a99964 100644 --- a/src/usr/local/www/system_update_settings.php +++ b/src/usr/local/www/system_update_settings.php @@ -61,8 +61,8 @@ ##|*MATCH=system_update_settings.php* ##|-PRIV -require("guiconfig.inc"); -require("pkg-utils.inc"); +require_once("guiconfig.inc"); +require_once("pkg-utils.inc"); $repos = pkg_list_repos(); diff --git a/src/usr/local/www/system_usermanager.php b/src/usr/local/www/system_usermanager.php index 13b405d..8f14128 100644 --- a/src/usr/local/www/system_usermanager.php +++ b/src/usr/local/www/system_usermanager.php @@ -65,8 +65,8 @@ ##|*MATCH=system_usermanager.php* ##|-PRIV -require("certs.inc"); -require("guiconfig.inc"); +require_once("certs.inc"); +require_once("guiconfig.inc"); // start admin user code if (isset($_POST['userid']) && is_numericint($_POST['userid'])) { diff --git a/src/usr/local/www/system_usermanager_addprivs.php b/src/usr/local/www/system_usermanager_addprivs.php index b0f4400..f363e3c 100644 --- a/src/usr/local/www/system_usermanager_addprivs.php +++ b/src/usr/local/www/system_usermanager_addprivs.php @@ -65,7 +65,7 @@ function admusercmp($a, $b) { return strcasecmp($a['name'], $b['name']); } -require("guiconfig.inc"); +require_once("guiconfig.inc"); $pgtitle = array(gettext("System"), gettext("User Manager"), gettext("Users"), gettext("Edit"), gettext("Add Privileges")); diff --git a/src/usr/local/www/system_usermanager_settings.php b/src/usr/local/www/system_usermanager_settings.php index fb1a0bd..288e525 100644 --- a/src/usr/local/www/system_usermanager_settings.php +++ b/src/usr/local/www/system_usermanager_settings.php @@ -61,7 +61,7 @@ ##|*MATCH=system_usermanager_settings.php* ##|-PRIV -require("guiconfig.inc"); +require_once("guiconfig.inc"); require_once("auth.inc"); // Test LDAP settings in response to an AJAX request from this page. diff --git a/src/usr/local/www/uploadconfig.php b/src/usr/local/www/uploadconfig.php index cd2a0b7..0332a40 100644 --- a/src/usr/local/www/uploadconfig.php +++ b/src/usr/local/www/uploadconfig.php @@ -65,7 +65,7 @@ ##|-PRIV -require("guiconfig.inc"); +require_once("guiconfig.inc"); header("Content-Type: text/plain"); diff --git a/src/usr/local/www/vpn_ipsec.php b/src/usr/local/www/vpn_ipsec.php index e26d1d7..65fd7ac 100644 --- a/src/usr/local/www/vpn_ipsec.php +++ b/src/usr/local/www/vpn_ipsec.php @@ -63,7 +63,7 @@ ##|*MATCH=vpn_ipsec.php* ##|-PRIV -require("guiconfig.inc"); +require_once("guiconfig.inc"); require_once("functions.inc"); require_once("filter.inc"); require_once("shaper.inc"); diff --git a/src/usr/local/www/vpn_ipsec_keys.php b/src/usr/local/www/vpn_ipsec_keys.php index fd773b4..498f7fd 100644 --- a/src/usr/local/www/vpn_ipsec_keys.php +++ b/src/usr/local/www/vpn_ipsec_keys.php @@ -63,8 +63,8 @@ ##|*MATCH=vpn_ipsec_keys.php* ##|-PRIV -require("functions.inc"); -require("guiconfig.inc"); +require_once("functions.inc"); +require_once("guiconfig.inc"); require_once("ipsec.inc"); require_once("vpn.inc"); require_once("filter.inc"); diff --git a/src/usr/local/www/vpn_ipsec_keys_edit.php b/src/usr/local/www/vpn_ipsec_keys_edit.php index 05fb97d..b07d434 100644 --- a/src/usr/local/www/vpn_ipsec_keys_edit.php +++ b/src/usr/local/www/vpn_ipsec_keys_edit.php @@ -63,8 +63,8 @@ ##|*MATCH=vpn_ipsec_keys_edit.php* ##|-PRIV -require("functions.inc"); -require("guiconfig.inc"); +require_once("functions.inc"); +require_once("guiconfig.inc"); require_once("ipsec.inc"); require_once("vpn.inc"); diff --git a/src/usr/local/www/vpn_ipsec_mobile.php b/src/usr/local/www/vpn_ipsec_mobile.php index 6b03e17..2ea4fb4 100644 --- a/src/usr/local/www/vpn_ipsec_mobile.php +++ b/src/usr/local/www/vpn_ipsec_mobile.php @@ -64,8 +64,8 @@ ##|*MATCH=vpn_ipsec_mobile.php* ##|-PRIV -require("functions.inc"); -require("guiconfig.inc"); +require_once("functions.inc"); +require_once("guiconfig.inc"); require_once("ipsec.inc"); require_once("vpn.inc"); require_once("filter.inc"); diff --git a/src/usr/local/www/vpn_ipsec_phase1.php b/src/usr/local/www/vpn_ipsec_phase1.php index 92a6c48..3a48995 100644 --- a/src/usr/local/www/vpn_ipsec_phase1.php +++ b/src/usr/local/www/vpn_ipsec_phase1.php @@ -64,8 +64,8 @@ ##|*MATCH=vpn_ipsec_phase1.php* ##|-PRIV -require("functions.inc"); -require("guiconfig.inc"); +require_once("functions.inc"); +require_once("guiconfig.inc"); require_once("ipsec.inc"); require_once("vpn.inc"); require_once("filter.inc"); diff --git a/src/usr/local/www/vpn_ipsec_phase2.php b/src/usr/local/www/vpn_ipsec_phase2.php index ec7b96d..f644aa5 100644 --- a/src/usr/local/www/vpn_ipsec_phase2.php +++ b/src/usr/local/www/vpn_ipsec_phase2.php @@ -64,8 +64,8 @@ ##|*MATCH=vpn_ipsec_phase2.php* ##|-PRIV -require("functions.inc"); -require("guiconfig.inc"); +require_once("functions.inc"); +require_once("guiconfig.inc"); require_once("ipsec.inc"); require_once("vpn.inc"); diff --git a/src/usr/local/www/vpn_ipsec_settings.php b/src/usr/local/www/vpn_ipsec_settings.php index d256de8..1c5d78c 100644 --- a/src/usr/local/www/vpn_ipsec_settings.php +++ b/src/usr/local/www/vpn_ipsec_settings.php @@ -60,8 +60,8 @@ ##|*MATCH=vpn_ipsec_settings.php* ##|-PRIV -require("functions.inc"); -require("guiconfig.inc"); +require_once("functions.inc"); +require_once("guiconfig.inc"); require_once("filter.inc"); require_once("shaper.inc"); require_once("ipsec.inc"); diff --git a/src/usr/local/www/vpn_l2tp.php b/src/usr/local/www/vpn_l2tp.php index ec1a4d9..bc13378 100644 --- a/src/usr/local/www/vpn_l2tp.php +++ b/src/usr/local/www/vpn_l2tp.php @@ -60,7 +60,7 @@ ##|*MATCH=vpn_l2tp.php* ##|-PRIV -require("guiconfig.inc"); +require_once("guiconfig.inc"); require_once("vpn.inc"); if (!is_array($config['l2tp']['radius'])) { diff --git a/src/usr/local/www/vpn_l2tp_users.php b/src/usr/local/www/vpn_l2tp_users.php index 3d8d877..49f6fa9 100644 --- a/src/usr/local/www/vpn_l2tp_users.php +++ b/src/usr/local/www/vpn_l2tp_users.php @@ -63,7 +63,7 @@ $pgtitle = array(gettext("VPN"), gettext("L2TP"), gettext("Users")); $shortcut_section = "l2tps"; -require("guiconfig.inc"); +require_once("guiconfig.inc"); require_once("vpn.inc"); if (!is_array($config['l2tp']['user'])) { diff --git a/src/usr/local/www/vpn_l2tp_users_edit.php b/src/usr/local/www/vpn_l2tp_users_edit.php index e457461..c1f49bd 100644 --- a/src/usr/local/www/vpn_l2tp_users_edit.php +++ b/src/usr/local/www/vpn_l2tp_users_edit.php @@ -77,7 +77,7 @@ function l2tp_users_sort() { usort($config['l2tp']['user'], "l2tpusercmp"); } -require("guiconfig.inc"); +require_once("guiconfig.inc"); require_once("vpn.inc"); if (!is_array($config['l2tp']['user'])) { diff --git a/src/usr/local/www/vpn_openvpn_client.php b/src/usr/local/www/vpn_openvpn_client.php index 58f6c63..8ea66cd 100644 --- a/src/usr/local/www/vpn_openvpn_client.php +++ b/src/usr/local/www/vpn_openvpn_client.php @@ -61,7 +61,7 @@ ##|*MATCH=vpn_openvpn_client.php* ##|-PRIV -require("guiconfig.inc"); +require_once("guiconfig.inc"); require_once("openvpn.inc"); require_once("pkg-utils.inc"); diff --git a/src/usr/local/www/vpn_openvpn_csc.php b/src/usr/local/www/vpn_openvpn_csc.php index 0ad064d..26a1d71 100644 --- a/src/usr/local/www/vpn_openvpn_csc.php +++ b/src/usr/local/www/vpn_openvpn_csc.php @@ -61,7 +61,7 @@ ##|*MATCH=vpn_openvpn_csc.php* ##|-PRIV -require("guiconfig.inc"); +require_once("guiconfig.inc"); require_once("openvpn.inc"); require_once("pkg-utils.inc"); diff --git a/src/usr/local/www/vpn_openvpn_server.php b/src/usr/local/www/vpn_openvpn_server.php index 6d44b5d..0135639 100644 --- a/src/usr/local/www/vpn_openvpn_server.php +++ b/src/usr/local/www/vpn_openvpn_server.php @@ -61,7 +61,7 @@ ##|*MATCH=vpn_openvpn_server.php* ##|-PRIV -require("guiconfig.inc"); +require_once("guiconfig.inc"); require_once("openvpn.inc"); require_once("pkg-utils.inc"); diff --git a/src/usr/local/www/wizard.php b/src/usr/local/www/wizard.php index efc8cbd..fefcdf0 100644 --- a/src/usr/local/www/wizard.php +++ b/src/usr/local/www/wizard.php @@ -60,11 +60,11 @@ ##|*MATCH=wizard.php* ##|-PRIV -require("globals.inc"); -require("guiconfig.inc"); -require("functions.inc"); +require_once("globals.inc"); +require_once("guiconfig.inc"); +require_once("functions.inc"); require_once("filter.inc"); -require("shaper.inc"); +require_once("shaper.inc"); require_once("rrd.inc"); require_once("system.inc"); diff --git a/src/usr/local/www/xmlrpc.php b/src/usr/local/www/xmlrpc.php index c516c54..66d4997 100755 --- a/src/usr/local/www/xmlrpc.php +++ b/src/usr/local/www/xmlrpc.php @@ -61,14 +61,14 @@ ##|*MATCH=xmlrpc.php* ##|-PRIV -require("config.inc"); -require("functions.inc"); +require_once("config.inc"); +require_once("functions.inc"); require_once("filter.inc"); -require("ipsec.inc"); -require("vpn.inc"); -require("shaper.inc"); -require("xmlrpc_server.inc"); -require("xmlrpc.inc"); +require_once("ipsec.inc"); +require_once("vpn.inc"); +require_once("shaper.inc"); +require_once("xmlrpc_server.inc"); +require_once("xmlrpc.inc"); function xmlrpc_loop_detect() { global $config; @@ -532,7 +532,7 @@ function get_notices_xmlrpc($raw_params) { return $xmlrpc_g['return']['authfail']; } if (!function_exists("get_notices")) { - require("notices.inc"); + require_once("notices.inc"); } if (!$params) { $toreturn = get_notices(); |
