Project

General

Profile

« Previous | Next » 

Revision aceaf18c

Added by Phil Davis about 9 years ago

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().

View differences:

src/etc/inc/authgui.inc
323 323
		//]]>
324 324
		</script>
325 325
<?php
326
require('foot.inc');
326
require_once('foot.inc');
327 327

  
328 328
} // end function
src/etc/inc/upgrade_config.inc
54 54
 */
55 55

  
56 56
if (!function_exists("dump_rrd_to_xml")) {
57
	require("rrd.inc");
57
	require_once("rrd.inc");
58 58
}
59 59
if (!function_exists("read_altq_config")) {
60
	require("shaper.inc");
60
	require_once("shaper.inc");
61 61
}
62 62

  
63 63
/* Upgrade functions must be named:
src/etc/inc/vpn.inc
1272 1272

  
1273 1273
								if (!empty($ealg_kl) && $ealg_kl == "auto") {
1274 1274
									if (empty($p2_ealgos) || !is_array($p2_ealgos)) {
1275
										require("ipsec.inc");
1275
										require_once("ipsec.inc");
1276 1276
									}
1277 1277
									$key_hi = $p2_ealgos[$ealg_id]['keysel']['hi'];
1278 1278
									$key_lo = $p2_ealgos[$ealg_id]['keysel']['lo'];
src/etc/rc.captiveportal_configure
28 28
	POSSIBILITY OF SUCH DAMAGE.
29 29
*/
30 30

  
31
require("config.inc");
32
require("functions.inc");
31
require_once("config.inc");
32
require_once("functions.inc");
33 33
require_once("filter.inc");
34
require("shaper.inc");
35
require("captiveportal.inc");
34
require_once("shaper.inc");
35
require_once("captiveportal.inc");
36 36

  
37 37
captiveportal_configure();
38 38

  
src/etc/rc.captiveportal_configure_mac
28 28
	POSSIBILITY OF SUCH DAMAGE.
29 29
*/
30 30

  
31
require("config.inc");
32
require("functions.inc");
31
require_once("config.inc");
32
require_once("functions.inc");
33 33
require_once("filter.inc");
34
require("shaper.inc");
35
require("captiveportal.inc");
34
require_once("shaper.inc");
35
require_once("captiveportal.inc");
36 36

  
37 37
global $cpzone;
38 38

  
src/etc/rc.initial.password
32 32
	/* parse the configuration and include all functions used below */
33 33

  
34 34
	require_once("config.inc");
35
	require("auth.inc");
35
	require_once("auth.inc");
36 36
	require_once("functions.inc");
37 37
	require_once("shaper.inc");
38 38

  
src/etc/rc.restart_webgui
2 2

  
3 3
<?php
4 4

  
5
require("config.inc");
6
require("functions.inc");
7
require("shaper.inc");
8
require("captiveportal.inc");
5
require_once("config.inc");
6
require_once("functions.inc");
7
require_once("shaper.inc");
8
require_once("captiveportal.inc");
9 9
require_once("rrd.inc");
10 10

  
11 11
echo "Restarting webConfigurator...";
src/usr/local/bin/dhcpd_gather_stats.php
25 25
*/
26 26

  
27 27
require_once("config.inc");
28
require("interfaces.inc");
28
require_once("interfaces.inc");
29 29
/* echo the rrd required syntax */
30 30
echo "N:";
31 31
$result = array();
src/usr/local/www/crash_reporter.php
60 60
##|*MATCH=crash_reporter.php*
61 61
##|-PRIV
62 62

  
63
require("guiconfig.inc");
64
require("functions.inc");
65
require("captiveportal.inc");
63
require_once("guiconfig.inc");
64
require_once("functions.inc");
65
require_once("captiveportal.inc");
66 66

  
67 67
define("FILE_SIZE", 450000);
68 68

  
src/usr/local/www/diag_arp.php
66 66
@ini_set('zlib.output_compression', 0);
67 67
@ini_set('implicit_flush', 1);
68 68

  
69
require("guiconfig.inc");
69
require_once("guiconfig.inc");
70 70

  
71 71
// delete arp entry
72 72
if (isset($_GET['deleteentry'])) {
src/usr/local/www/diag_authentication.php
60 60
##|*MATCH=diag_authentication.php*
61 61
##|-PRIV
62 62

  
63
require("guiconfig.inc");
63
require_once("guiconfig.inc");
64 64
require_once("radius.inc");
65 65

  
66 66
if ($_POST) {
src/usr/local/www/diag_backup.php
69 69

  
70 70
/* omit no-cache headers because it confuses IE with file downloads */
71 71
$omit_nocacheheaders = true;
72
require("guiconfig.inc");
72
require_once("guiconfig.inc");
73 73
require_once("functions.inc");
74 74
require_once("filter.inc");
75 75
require_once("shaper.inc");
src/usr/local/www/diag_command.php
69 69

  
70 70
$allowautocomplete = true;
71 71

  
72
require("guiconfig.inc");
72
require_once("guiconfig.inc");
73 73

  
74 74
if ($_POST['submit'] == "DOWNLOAD" && file_exists($_POST['dlPath'])) {
75 75
	session_cache_limiter('public');
src/usr/local/www/diag_confbak.php
61 61
##|*MATCH=diag_confbak.php*
62 62
##|-PRIV
63 63

  
64
require("guiconfig.inc");
64
require_once("guiconfig.inc");
65 65

  
66 66
if (isset($_POST['backupcount'])) {
67 67
	if (is_numericint($_POST['backupcount'])) {
src/usr/local/www/diag_defaults.php
63 63
##|*MATCH=diag_defaults.php*
64 64
##|-PRIV
65 65

  
66
require("guiconfig.inc");
66
require_once("guiconfig.inc");
67 67

  
68 68
if ($_POST['Submit'] == " " . gettext("No") . " ") {
69 69
	header("Location: index.php");
src/usr/local/www/diag_dns.php
61 61
##|-PRIV
62 62

  
63 63
$pgtitle = array(gettext("Diagnostics"), gettext("DNS Lookup"));
64
require("guiconfig.inc");
64
require_once("guiconfig.inc");
65 65

  
66 66
$host = trim($_REQUEST['host'], " \t\n\r\0\x0B[];\"'");
67 67
$host_esc = escapeshellarg($host);
src/usr/local/www/diag_edit.php
63 63
##|-PRIV
64 64

  
65 65
$pgtitle = array(gettext("Diagnostics"), gettext("Edit File"));
66
require("guiconfig.inc");
66
require_once("guiconfig.inc");
67 67

  
68 68
if ($_POST['action']) {
69 69
	switch ($_POST['action']) {
......
128 128
	exit;
129 129
}
130 130

  
131
require("head.inc");
131
require_once("head.inc");
132 132

  
133 133
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'));
134 134

  
src/usr/local/www/diag_gmirror.php
403 403
</form>
404 404

  
405 405
<?php
406
require("foot.inc");
406
require_once("foot.inc");
src/usr/local/www/diag_halt.php
66 66
// Set DEBUG to true to prevent the system_halt() function from being called
67 67
define("DEBUG", false);
68 68

  
69
require("guiconfig.inc");
70
require("functions.inc");
71
require("captiveportal.inc");
69
require_once("guiconfig.inc");
70
require_once("functions.inc");
71
require_once("captiveportal.inc");
72 72

  
73 73
if ($_POST['save'] == 'No') {
74 74
	header("Location: index.php");
src/usr/local/www/diag_limiter_info.php
60 60
##|*MATCH=diag_limiter_info.php*
61 61
##|-PRIV
62 62

  
63
require("guiconfig.inc");
63
require_once("guiconfig.inc");
64 64

  
65 65
$pgtitle = array(gettext("Diagnostics"), gettext("Limiter Info"));
66 66
$shortcut_section = "trafficshaper-limiters";
src/usr/local/www/diag_nanobsd.php
283 283
	</div>
284 284
<?php
285 285
}
286
require("foot.inc");
286
require_once("foot.inc");
src/usr/local/www/diag_ndp.php
67 67
@ini_set('zlib.output_compression', 0);
68 68
@ini_set('implicit_flush', 1);
69 69

  
70
require("guiconfig.inc");
70
require_once("guiconfig.inc");
71 71

  
72 72
exec("/usr/sbin/ndp -na", $rawdata);
73 73

  
src/usr/local/www/diag_pf_info.php
60 60
##|*MATCH=diag_pf_info.php*
61 61
##|-PRIV
62 62

  
63
require("guiconfig.inc");
63
require_once("guiconfig.inc");
64 64

  
65 65
$pgtitle = array(gettext("Diagnostics"), gettext("pfInfo"));
66 66

  
src/usr/local/www/diag_pftop.php
60 60
##|*MATCH=diag_pftop.php*
61 61
##|-PRIV
62 62

  
63
require("guiconfig.inc");
63
require_once("guiconfig.inc");
64 64

  
65 65
$pgtitle = array(gettext("Diagnostics"), gettext("pfTop"));
66 66

  
src/usr/local/www/diag_reboot.php
66 66
// Set DEBUG to true to prevent the system_reboot() function from being called
67 67
define("DEBUG", false);
68 68

  
69
require("guiconfig.inc");
70
require("functions.inc");
71
require("captiveportal.inc");
69
require_once("guiconfig.inc");
70
require_once("functions.inc");
71
require_once("captiveportal.inc");
72 72

  
73 73
$guitimeout = 90;	// Seconds to wait before reloading the page after reboot
74 74
$guiretry = 20;		// Seconds to try again if $guitimeout was not long enough
src/usr/local/www/diag_resetstate.php
63 63
##|*MATCH=diag_resetstate.php*
64 64
##|-PRIV
65 65

  
66
require("guiconfig.inc");
66
require_once("guiconfig.inc");
67 67
require_once("filter.inc");
68 68

  
69 69
if ($_POST) {
src/usr/local/www/diag_smart.php
61 61
##|*MATCH=diag_smart.php*
62 62
##|-PRIV
63 63

  
64
require("guiconfig.inc");
64
require_once("guiconfig.inc");
65 65

  
66 66
// What page, aka. action is being wanted
67 67
// If they "get" a page but don't pass all arguments, smartctl will throw an error
src/usr/local/www/diag_system_activity.php
60 60
##|*MATCH=diag_system_activity.php*
61 61
##|-PRIV
62 62

  
63
require("guiconfig.inc");
63
require_once("guiconfig.inc");
64 64

  
65 65
$pgtitle = array(gettext("Diagnostics"), gettext("System Activity"));
66 66

  
src/usr/local/www/diag_testport.php
69 69
$allowautocomplete = true;
70 70

  
71 71
$pgtitle = array(gettext("Diagnostics"), gettext("Test Port"));
72
require("guiconfig.inc");
72
require_once("guiconfig.inc");
73 73

  
74 74
include("head.inc");
75 75

  
src/usr/local/www/diag_traceroute.php
64 64
##|*MATCH=diag_traceroute.php*
65 65
##|-PRIV
66 66

  
67
require("guiconfig.inc");
67
require_once("guiconfig.inc");
68 68

  
69 69
$allowautocomplete = true;
70 70
$pgtitle = array(gettext("Diagnostics"), gettext("Traceroute"));
src/usr/local/www/firewall_aliases.php
63 63
##|*MATCH=firewall_aliases.php*
64 64
##|-PRIV
65 65

  
66
require("guiconfig.inc");
66
require_once("guiconfig.inc");
67 67
require_once("functions.inc");
68 68
require_once("filter.inc");
69 69
require_once("shaper.inc");
src/usr/local/www/firewall_aliases_edit.php
63 63
##|*MATCH=firewall_aliases_edit.php*
64 64
##|-PRIV
65 65

  
66
require("guiconfig.inc");
66
require_once("guiconfig.inc");
67 67
require_once("functions.inc");
68 68
require_once("filter.inc");
69 69
require_once("shaper.inc");
src/usr/local/www/firewall_aliases_import.php
64 64
// Keywords not allowed in names
65 65
$reserved_keywords = array("all", "pass", "block", "out", "queue", "max", "min", "pptp", "pppoe", "L2TP", "OpenVPN", "IPsec");
66 66

  
67
require("guiconfig.inc");
67
require_once("guiconfig.inc");
68 68
require_once("util.inc");
69 69
require_once("filter.inc");
70
require("shaper.inc");
70
require_once("shaper.inc");
71 71

  
72 72
$pgtitle = array(gettext("Firewall"), gettext("Aliases"), gettext("Bulk import"));
73 73

  
src/usr/local/www/firewall_nat.php
63 63
##|*MATCH=firewall_nat.php*
64 64
##|-PRIV
65 65

  
66
require("guiconfig.inc");
66
require_once("guiconfig.inc");
67 67
require_once("functions.inc");
68 68
require_once("filter.inc");
69 69
require_once("shaper.inc");
src/usr/local/www/firewall_nat_1to1.php
63 63
##|*MATCH=firewall_nat_1to1.php*
64 64
##|-PRIV
65 65

  
66
require("guiconfig.inc");
66
require_once("guiconfig.inc");
67 67
require_once("functions.inc");
68 68
require_once("filter.inc");
69 69
require_once("shaper.inc");
src/usr/local/www/firewall_nat_1to1_edit.php
63 63
##|*MATCH=firewall_nat_1to1_edit.php*
64 64
##|-PRIV
65 65

  
66
require("guiconfig.inc");
66
require_once("guiconfig.inc");
67 67
require_once("interfaces.inc");
68 68
require_once("filter.inc");
69 69
require_once("ipsec.inc");
70
require("shaper.inc");
70
require_once("shaper.inc");
71 71

  
72 72
$referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/firewall_nat_1to1.php');
73 73

  
src/usr/local/www/firewall_nat_edit.php
63 63
##|*MATCH=firewall_nat_edit.php*
64 64
##|-PRIV
65 65

  
66
require("guiconfig.inc");
66
require_once("guiconfig.inc");
67 67
require_once("itemid.inc");
68 68
require_once("ipsec.inc");
69 69
require_once("filter.inc");
70
require("shaper.inc");
70
require_once("shaper.inc");
71 71

  
72 72
$referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/firewall_nat.php');
73 73

  
src/usr/local/www/firewall_nat_npt.php
64 64
##|*MATCH=firewall_nat_npt.php*
65 65
##|-PRIV
66 66

  
67
require("guiconfig.inc");
67
require_once("guiconfig.inc");
68 68
require_once("functions.inc");
69 69
require_once("filter.inc");
70 70
require_once("shaper.inc");
src/usr/local/www/firewall_nat_npt_edit.php
63 63

  
64 64
require_once("ipsec.inc");
65 65

  
66
require("guiconfig.inc");
66
require_once("guiconfig.inc");
67 67
require_once("interfaces.inc");
68 68
require_once("filter.inc");
69
require("shaper.inc");
69
require_once("shaper.inc");
70 70

  
71 71
$ifdisp = get_configured_interface_with_descr();
72 72

  
src/usr/local/www/firewall_nat_out.php
63 63
##|*MATCH=firewall_nat_out.php*
64 64
##|-PRIV
65 65

  
66
require("guiconfig.inc");
66
require_once("guiconfig.inc");
67 67
require_once("functions.inc");
68 68
require_once("filter.inc");
69 69
require_once("shaper.inc");
src/usr/local/www/firewall_nat_out_edit.php
63 63
##|*MATCH=firewall_nat_out_edit.php*
64 64
##|-PRIV
65 65

  
66
require("guiconfig.inc");
66
require_once("guiconfig.inc");
67 67
require_once("ipsec.inc");
68 68
require_once("filter.inc");
69
require("shaper.inc");
69
require_once("shaper.inc");
70 70

  
71 71
if (!is_array($config['nat']['outbound'])) {
72 72
	$config['nat']['outbound'] = array();
src/usr/local/www/firewall_rules.php
63 63
##|*MATCH=firewall_rules.php*
64 64
##|-PRIV
65 65

  
66
require("guiconfig.inc");
66
require_once("guiconfig.inc");
67 67
require_once("functions.inc");
68 68
require_once("filter.inc");
69 69
require_once("ipsec.inc");
src/usr/local/www/firewall_rules_edit.php
63 63
##|*MATCH=firewall_rules_edit.php*
64 64
##|-PRIV
65 65

  
66
require("guiconfig.inc");
66
require_once("guiconfig.inc");
67 67
require_once("ipsec.inc");
68 68
require_once("filter.inc");
69
require("shaper.inc");
69
require_once("shaper.inc");
70 70

  
71 71
if (isset($_POST['referer'])) {
72 72
	$referer = $_POST['referer'];
src/usr/local/www/firewall_schedule.php
68 68
$dayArray = array (gettext('Mon'), gettext('Tues'), gettext('Wed'), gettext('Thur'), gettext('Fri'), gettext('Sat'), gettext('Sun'));
69 69
$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'));
70 70

  
71
require("guiconfig.inc");
71
require_once("guiconfig.inc");
72 72
require_once("filter.inc");
73
require("shaper.inc");
73
require_once("shaper.inc");
74 74

  
75 75
$pgtitle = array(gettext("Firewall"), gettext("Schedules"));
76 76

  
src/usr/local/www/firewall_schedule_edit.php
77 77
	usort($config['schedules']['schedule'], "schedulecmp");
78 78
}
79 79

  
80
require("guiconfig.inc");
80
require_once("guiconfig.inc");
81 81
require_once("functions.inc");
82 82
require_once("filter.inc");
83 83
require_once("shaper.inc");
src/usr/local/www/firewall_shaper.php
60 60
##|*MATCH=firewall_shaper.php*
61 61
##|-PRIV
62 62

  
63
require("guiconfig.inc");
63
require_once("guiconfig.inc");
64 64
require_once("functions.inc");
65 65
require_once("filter.inc");
66 66
require_once("shaper.inc");
src/usr/local/www/firewall_shaper_queues.php
60 60
##|*MATCH=firewall_shaper_queues.php*
61 61
##|-PRIV
62 62

  
63
require("guiconfig.inc");
63
require_once("guiconfig.inc");
64 64
require_once("functions.inc");
65 65
require_once("filter.inc");
66 66
require_once("shaper.inc");
src/usr/local/www/firewall_shaper_vinterface.php
60 60
##|*MATCH=firewall_shaper_vinterface.php*
61 61
##|-PRIV
62 62

  
63
require("guiconfig.inc");
63
require_once("guiconfig.inc");
64 64
require_once("functions.inc");
65 65
require_once("filter.inc");
66 66
require_once("shaper.inc");
src/usr/local/www/firewall_shaper_wizards.php
60 60
##|*MATCH=firewall_shaper_wizards.php*
61 61
##|-PRIV
62 62

  
63
require("guiconfig.inc");
63
require_once("guiconfig.inc");
64 64
require_once("functions.inc");
65 65
require_once("filter.inc");
66 66
require_once("shaper.inc");
src/usr/local/www/firewall_virtual_ip.php
64 64
##|*MATCH=firewall_virtual_ip.php*
65 65
##|-PRIV
66 66

  
67
require("guiconfig.inc");
67
require_once("guiconfig.inc");
68 68
require_once("functions.inc");
69 69
require_once("filter.inc");
70 70
require_once("shaper.inc");
src/usr/local/www/firewall_virtual_ip_edit.php
64 64
##|*MATCH=firewall_virtual_ip_edit.php*
65 65
##|-PRIV
66 66

  
67
require("guiconfig.inc");
67
require_once("guiconfig.inc");
68 68
require_once("filter.inc");
69
require("shaper.inc");
69
require_once("shaper.inc");
70 70

  
71 71
if (!is_array($config['virtualip']['vip'])) {
72 72
		$config['virtualip']['vip'] = array();
src/usr/local/www/graph.php
65 65
##|*MATCH=graph.php*
66 66
##|-PRIV
67 67

  
68
require("globals.inc");
69
require("guiconfig.inc");
68
require_once("globals.inc");
69
require_once("guiconfig.inc");
70 70

  
71 71
header("Last-Modified: " . gmdate("D, j M Y H:i:s") . " GMT");
72 72
header("Expires: " . gmdate("D, j M Y H:i:s", time()) . " GMT");
src/usr/local/www/interfaces_assign.php
67 67
$pgtitle = array(gettext("Interfaces"), gettext("Interface Assignments"));
68 68
$shortcut_section = "interfaces";
69 69

  
70
require("guiconfig.inc");
71
require("functions.inc");
70
require_once("guiconfig.inc");
71
require_once("functions.inc");
72 72
require_once("filter.inc");
73
require("shaper.inc");
74
require("ipsec.inc");
75
require("vpn.inc");
76
require("captiveportal.inc");
73
require_once("shaper.inc");
74
require_once("ipsec.inc");
75
require_once("vpn.inc");
76
require_once("captiveportal.inc");
77 77
require_once("rrd.inc");
78 78

  
79 79
function interface_assign_description($portinfo, $portname) {
src/usr/local/www/interfaces_bridge.php
60 60
##|*MATCH=interfaces_bridge.php*
61 61
##|-PRIV
62 62

  
63
require("guiconfig.inc");
63
require_once("guiconfig.inc");
64 64

  
65 65
if (!is_array($config['bridges']['bridged'])) {
66 66
	$config['bridges']['bridged'] = array();
src/usr/local/www/interfaces_bridge_edit.php
60 60
##|*MATCH=interfaces_bridge_edit.php*
61 61
##|-PRIV
62 62

  
63
require("guiconfig.inc");
63
require_once("guiconfig.inc");
64 64

  
65 65
if (!is_array($config['bridges']['bridged'])) {
66 66
	$config['bridges']['bridged'] = array();
src/usr/local/www/interfaces_gif.php
60 60
##|*MATCH=interfaces_gif.php*
61 61
##|-PRIV
62 62

  
63
require("guiconfig.inc");
63
require_once("guiconfig.inc");
64 64

  
65 65
if (!is_array($config['gifs']['gif'])) {
66 66
	$config['gifs']['gif'] = array();
src/usr/local/www/interfaces_gif_edit.php
60 60
##|*MATCH=interfaces_gif_edit.php*
61 61
##|-PRIV
62 62

  
63
require("guiconfig.inc");
63
require_once("guiconfig.inc");
64 64

  
65 65
if (!is_array($config['gifs']['gif'])) {
66 66
	$config['gifs']['gif'] = array();
src/usr/local/www/interfaces_gre.php
60 60
##|*MATCH=interfaces_gre.php*
61 61
##|-PRIV
62 62

  
63
require("guiconfig.inc");
63
require_once("guiconfig.inc");
64 64
require_once("functions.inc");
65 65

  
66 66
if (!is_array($config['gres']['gre'])) {
src/usr/local/www/interfaces_gre_edit.php
60 60
##|*MATCH=interfaces_gre_edit.php*
61 61
##|-PRIV
62 62

  
63
require("guiconfig.inc");
63
require_once("guiconfig.inc");
64 64
require_once("functions.inc");
65 65

  
66 66
if (!is_array($config['gres']['gre'])) {
src/usr/local/www/interfaces_groups.php
60 60
##|*MATCH=interfaces_groups.php*
61 61
##|-PRIV
62 62

  
63
require("guiconfig.inc");
63
require_once("guiconfig.inc");
64 64
require_once("functions.inc");
65 65

  
66 66
if (!is_array($config['ifgroups']['ifgroupentry'])) {
src/usr/local/www/interfaces_groups_edit.php
61 61
##|-PRIV
62 62

  
63 63

  
64
require("guiconfig.inc");
64
require_once("guiconfig.inc");
65 65
require_once("functions.inc");
66 66

  
67 67
$pgtitle = array(gettext("Interfaces"), gettext("Interface Groups"), gettext("Edit"));
src/usr/local/www/interfaces_lagg.php
60 60
##|*MATCH=interfaces_lagg.php*
61 61
##|-PRIV
62 62

  
63
require("guiconfig.inc");
63
require_once("guiconfig.inc");
64 64

  
65 65
if (!is_array($config['laggs']['lagg'])) {
66 66
	$config['laggs']['lagg'] = array();
src/usr/local/www/interfaces_lagg_edit.php
60 60
##|*MATCH=interfaces_lagg_edit.php*
61 61
##|-PRIV
62 62

  
63
require("guiconfig.inc");
63
require_once("guiconfig.inc");
64 64

  
65 65
if (!is_array($config['laggs']['lagg'])) {
66 66
	$config['laggs']['lagg'] = array();
src/usr/local/www/interfaces_ppps.php
63 63
##|*MATCH=interfaces_ppps.php*
64 64
##|-PRIV
65 65

  
66
require("guiconfig.inc");
66
require_once("guiconfig.inc");
67 67
require_once("functions.inc");
68 68

  
69 69
function ppp_inuse($num) {
src/usr/local/www/interfaces_ppps_edit.php
65 65
##|*MATCH=interfaces_ppps_edit.php*
66 66
##|-PRIV
67 67

  
68
require("guiconfig.inc");
69
require("functions.inc");
68
require_once("guiconfig.inc");
69
require_once("functions.inc");
70 70

  
71 71
define("CRON_MONTHLY_PATTERN", "0 0 1 * *");
72 72
define("CRON_WEEKLY_PATTERN", "0 0 * * 0");
src/usr/local/www/interfaces_qinq.php
60 60
##|*MATCH=interfaces_qinq.php*
61 61
##|-PRIV
62 62

  
63
require("guiconfig.inc");
63
require_once("guiconfig.inc");
64 64
require_once("functions.inc");
65 65

  
66 66
if (!is_array($config['qinqs']['qinqentry'])) {
src/usr/local/www/interfaces_qinq_edit.php
63 63
$pgtitle = array(gettext("Interfaces"), gettext("QinQs"), gettext("Edit"));
64 64
$shortcut_section = "interfaces";
65 65

  
66
require("guiconfig.inc");
66
require_once("guiconfig.inc");
67 67

  
68 68
if (!is_array($config['qinqs']['qinqentry'])) {
69 69
	$config['qinqs']['qinqentry'] = array();
src/usr/local/www/interfaces_vlan.php
63 63
##|*MATCH=interfaces_vlan.php*
64 64
##|-PRIV
65 65

  
66
require("guiconfig.inc");
66
require_once("guiconfig.inc");
67 67

  
68 68
if (!is_array($config['vlans']['vlan'])) {
69 69
	$config['vlans']['vlan'] = array();
src/usr/local/www/interfaces_vlan_edit.php
63 63
##|*MATCH=interfaces_vlan_edit.php*
64 64
##|-PRIV
65 65

  
66
require("guiconfig.inc");
66
require_once("guiconfig.inc");
67 67

  
68 68
if (!is_array($config['vlans']['vlan'])) {
69 69
	$config['vlans']['vlan'] = array();
src/usr/local/www/interfaces_wireless.php
61 61
##|*MATCH=interfaces_wireless.php*
62 62
##|-PRIV
63 63

  
64
require("guiconfig.inc");
64
require_once("guiconfig.inc");
65 65

  
66 66
if (!is_array($config['wireless'])) {
67 67
	$config['wireless'] = array();
src/usr/local/www/interfaces_wireless_edit.php
61 61
##|*MATCH=interfaces_wireless_edit.php*
62 62
##|-PRIV
63 63

  
64
require("guiconfig.inc");
64
require_once("guiconfig.inc");
65 65

  
66 66
if (!is_array($config['wireless'])) {
67 67
	$config['wireless'] = array();
src/usr/local/www/license.php
60 60
##|*MATCH=license.php*
61 61
##|-PRIV
62 62

  
63
require("guiconfig.inc");
63
require_once("guiconfig.inc");
64 64
include("head.inc");
65 65
?>
66 66
<div class="panel panel-default">
src/usr/local/www/load_balancer_monitor_edit.php
61 61
##|*MATCH=load_balancer_monitor_edit.php*
62 62
##|-PRIV
63 63

  
64
require("guiconfig.inc");
64
require_once("guiconfig.inc");
65 65

  
66 66
$referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/load_balancer_monitor.php');
67 67

  
src/usr/local/www/load_balancer_pool_edit.php
61 61
##|*MATCH=load_balancer_pool_edit.php*
62 62
##|-PRIV
63 63

  
64
require("guiconfig.inc");
64
require_once("guiconfig.inc");
65 65
require_once("filter.inc");
66 66
require_once("util.inc");
67 67

  
src/usr/local/www/load_balancer_virtual_server_edit.php
61 61
##|*MATCH=load_balancer_virtual_server_edit.php*
62 62
##|-PRIV
63 63

  
64
require("guiconfig.inc");
64
require_once("guiconfig.inc");
65 65

  
66 66
if (isset($_POST['referer'])) {
67 67
	$referer = $_POST['referer'];
src/usr/local/www/pkg_edit.php
62 62

  
63 63
ini_set('max_execution_time', '0');
64 64

  
65
require("guiconfig.inc");
65
require_once("guiconfig.inc");
66 66
require_once("functions.inc");
67 67
require_once("filter.inc");
68 68
require_once("shaper.inc");
src/usr/local/www/pkg_mgr_install.php
63 63

  
64 64
ini_set('max_execution_time', '0');
65 65

  
66
require("guiconfig.inc");
66
require_once("guiconfig.inc");
67 67
require_once("functions.inc");
68 68
require_once("filter.inc");
69 69
require_once("shaper.inc");
src/usr/local/www/services_captiveportal_filemanager.php
75 75
	usort($config['captiveportal'][$cpzone]['element'], "cpelementscmp");
76 76
}
77 77

  
78
require("guiconfig.inc");
79
require("functions.inc");
78
require_once("guiconfig.inc");
79
require_once("functions.inc");
80 80
require_once("filter.inc");
81
require("shaper.inc");
82
require("captiveportal.inc");
81
require_once("shaper.inc");
82
require_once("captiveportal.inc");
83 83

  
84 84
$cpzone = $_GET['zone'];
85 85
if (isset($_POST['zone'])) {
src/usr/local/www/services_captiveportal_hostname.php
67 67
	'This can be used for a web server serving images for the portal page, or a DNS server on another network, for example. ' .
68 68
	'By specifying <em>from</em> addresses, it may be used to always allow pass-through access from a client behind the captive portal.');
69 69

  
70
require("guiconfig.inc");
71
require("functions.inc");
70
require_once("guiconfig.inc");
71
require_once("functions.inc");
72 72
require_once("filter.inc");
73
require("shaper.inc");
74
require("captiveportal.inc");
73
require_once("shaper.inc");
74
require_once("captiveportal.inc");
75 75

  
76 76
$cpzone = $_GET['zone'];
77 77
if (isset($_POST['zone'])) {
src/usr/local/www/services_captiveportal_hostname_edit.php
69 69
	usort($config['captiveportal'][$cpzone]['allowedhostname'], "allowedhostnamescmp");
70 70
}
71 71

  
72
require("guiconfig.inc");
73
require("functions.inc");
72
require_once("guiconfig.inc");
73
require_once("functions.inc");
74 74
require_once("filter.inc");
75
require("shaper.inc");
76
require("captiveportal.inc");
75
require_once("shaper.inc");
76
require_once("captiveportal.inc");
77 77

  
78 78
global $cpzone, $cpzoneid;
79 79

  
src/usr/local/www/services_captiveportal_ip.php
66 66

  
67 67
$directionicons = array('to' => '&#x2192;', 'from' => '&#x2190;', 'both' => '&#x21c4;');
68 68

  
69
require("guiconfig.inc");
70
require("functions.inc");
69
require_once("guiconfig.inc");
70
require_once("functions.inc");
71 71
require_once("filter.inc");
72
require("shaper.inc");
73
require("captiveportal.inc");
72
require_once("shaper.inc");
73
require_once("captiveportal.inc");
74 74

  
75 75
$cpzone = $_GET['zone'];
76 76
if (isset($_POST['zone'])) {
src/usr/local/www/services_captiveportal_ip_edit.php
74 74
	usort($config['captiveportal'][$cpzone]['allowedip'], "allowedipscmp");
75 75
}
76 76

  
77
require("guiconfig.inc");
78
require("functions.inc");
77
require_once("guiconfig.inc");
78
require_once("functions.inc");
79 79
require_once("filter.inc");
80
require("shaper.inc");
81
require("captiveportal.inc");
80
require_once("shaper.inc");
81
require_once("captiveportal.inc");
82 82

  
83 83
$cpzone = $_GET['zone'];
84 84
if (isset($_POST['zone'])) {
src/usr/local/www/services_captiveportal_mac.php
64 64
##|*MATCH=services_captiveportal_mac.php*
65 65
##|-PRIV
66 66

  
67
require("guiconfig.inc");
68
require("functions.inc");
67
require_once("guiconfig.inc");
68
require_once("functions.inc");
69 69
require_once("filter.inc");
70
require("shaper.inc");
71
require("captiveportal.inc");
70
require_once("shaper.inc");
71
require_once("captiveportal.inc");
72 72

  
73 73
global $cpzone;
74 74
global $cpzoneid;
src/usr/local/www/services_captiveportal_mac_edit.php
74 74
	usort($config['captiveportal'][$cpzone]['passthrumac'], "passthrumacscmp");
75 75
}
76 76

  
77
require("guiconfig.inc");
78
require("functions.inc");
77
require_once("guiconfig.inc");
78
require_once("functions.inc");
79 79
require_once("filter.inc");
80
require("shaper.inc");
81
require("captiveportal.inc");
80
require_once("shaper.inc");
81
require_once("captiveportal.inc");
82 82

  
83 83
global $cpzone;
84 84
global $cpzoneid;
src/usr/local/www/services_captiveportal_vouchers.php
65 65
	$nocsrf= true;
66 66
}
67 67

  
68
require("guiconfig.inc");
69
require("functions.inc");
68
require_once("guiconfig.inc");
69
require_once("functions.inc");
70 70
require_once("filter.inc");
71
require("shaper.inc");
72
require("captiveportal.inc");
71
require_once("shaper.inc");
72
require_once("captiveportal.inc");
73 73
require_once("voucher.inc");
74 74

  
75 75
$cpzone = $_GET['zone'];
src/usr/local/www/services_captiveportal_vouchers_edit.php
61 61
##|*MATCH=services_captiveportal_vouchers_edit.php*
62 62
##|-PRIV
63 63

  
64
require("guiconfig.inc");
65
require("functions.inc");
64
require_once("guiconfig.inc");
65
require_once("functions.inc");
66 66
require_once("filter.inc");
67
require("shaper.inc");
68
require("captiveportal.inc");
67
require_once("shaper.inc");
68
require_once("captiveportal.inc");
69 69
require_once("voucher.inc");
70 70

  
71 71
$cpzone = $_GET['zone'];
src/usr/local/www/services_captiveportal_zones.php
60 60
##|*MATCH=services_captiveportal_zones.php*
61 61
##|-PRIV
62 62

  
63
require("guiconfig.inc");
64
require("functions.inc");
63
require_once("guiconfig.inc");
64
require_once("functions.inc");
65 65
require_once("filter.inc");
66
require("shaper.inc");
67
require("captiveportal.inc");
66
require_once("shaper.inc");
67
require_once("captiveportal.inc");
68 68

  
69 69
global $cpzone;
70 70
global $cpzoneid;
src/usr/local/www/services_captiveportal_zones_edit.php
60 60
##|*MATCH=services_captiveportal_zones_edit.php*
61 61
##|-PRIV
62 62

  
63
require("guiconfig.inc");
64
require("functions.inc");
63
require_once("guiconfig.inc");
64
require_once("functions.inc");
65 65
require_once("filter.inc");
66
require("shaper.inc");
67
require("captiveportal.inc");
66
require_once("shaper.inc");
67
require_once("captiveportal.inc");
68 68

  
69 69
$pgtitle = array(gettext("Services"), gettext("Captive Portal"), gettext("Add Zone"));
70 70
$shortcut_section = "captiveportal";
src/usr/local/www/services_dhcp.php
63 63
##|*MATCH=services_dhcp.php*
64 64
##|-PRIV
65 65

  
66
require("guiconfig.inc");
66
require_once("guiconfig.inc");
67 67
require_once("filter.inc");
68 68
require_once('rrd.inc');
69 69
require_once("shaper.inc");
src/usr/local/www/services_dhcp_edit.php
80 80
	exit;
81 81
}
82 82

  
83
require("guiconfig.inc");
83
require_once("guiconfig.inc");
84 84

  
85 85
$if = $_GET['if'];
86 86

  
src/usr/local/www/services_dhcp_relay.php
61 61
##|*MATCH=services_dhcp_relay.php*
62 62
##|-PRIV
63 63

  
64
require("guiconfig.inc");
64
require_once("guiconfig.inc");
65 65
require_once("filter.inc");
66 66
$pconfig['enable'] = isset($config['dhcrelay']['enable']);
67 67

  
src/usr/local/www/services_dhcpv6.php
64 64
##|*MATCH=services_dhcpv6.php*
65 65
##|-PRIV
66 66

  
67
require("guiconfig.inc");
67
require_once("guiconfig.inc");
68 68
require_once("filter.inc");
69 69

  
70 70
function dhcpv6_apply_changes($dhcpdv6_enable_changed) {
src/usr/local/www/services_dhcpv6_edit.php
81 81
	exit;
82 82
}
83 83

  
84
require("guiconfig.inc");
84
require_once("guiconfig.inc");
85 85

  
86 86
$if = $_GET['if'];
87 87
if ($_POST['if']) {
src/usr/local/www/services_dhcpv6_relay.php
62 62
##|*MATCH=services_dhcpv6_relay.php*
63 63
##|-PRIV
64 64

  
65
require("guiconfig.inc");
65
require_once("guiconfig.inc");
66 66

  
67 67
$pconfig['enable'] = isset($config['dhcrelay6']['enable']);
68 68

  
src/usr/local/www/services_dnsmasq.php
64 64
##|*MATCH=services_dnsmasq.php*
65 65
##|-PRIV
66 66

  
67
require("guiconfig.inc");
67
require_once("guiconfig.inc");
68 68
require_once("functions.inc");
69 69
require_once("filter.inc");
70 70
require_once("shaper.inc");
src/usr/local/www/services_dnsmasq_domainoverride_edit.php
64 64
##|*MATCH=services_dnsmasq_domainoverride_edit.php*
65 65
##|-PRIV
66 66

  
67
require("guiconfig.inc");
67
require_once("guiconfig.inc");
68 68

  
69 69
if (!is_array($config['dnsmasq']['domainoverrides'])) {
70 70
	   $config['dnsmasq']['domainoverrides'] = array();
src/usr/local/www/services_dnsmasq_edit.php
78 78
	usort($config['dnsmasq']['hosts'], "hostcmp");
79 79
}
80 80

  
81
require("guiconfig.inc");
81
require_once("guiconfig.inc");
82 82

  
83 83
if (!is_array($config['dnsmasq']['hosts'])) {
84 84
	$config['dnsmasq']['hosts'] = array();
src/usr/local/www/services_dyndns.php
60 60
##|*MATCH=services_dyndns.php*
61 61
##|-PRIV
62 62

  
63
require("guiconfig.inc");
63
require_once("guiconfig.inc");
64 64

  
65 65
if (!is_array($config['dyndnses']['dyndns'])) {
66 66
	$config['dyndnses']['dyndns'] = array();
src/usr/local/www/services_dyndns_edit.php
73 73
	}
74 74
}
75 75

  
76
require("guiconfig.inc");
76
require_once("guiconfig.inc");
77 77

  
78 78
if (!is_array($config['dyndnses']['dyndns'])) {
79 79
	$config['dyndnses']['dyndns'] = array();
src/usr/local/www/services_igmpproxy.php
63 63
##|*MATCH=services_igmpproxy.php*
64 64
##|-PRIV
65 65

  
66
require("guiconfig.inc");
66
require_once("guiconfig.inc");
67 67

  
68 68
if (!is_array($config['igmpproxy']['igmpentry'])) {
69 69
	$config['igmpproxy']['igmpentry'] = array();
src/usr/local/www/services_igmpproxy_edit.php
65 65

  
66 66
$pgtitle = array(gettext("Services"), gettext("IGMP Proxy"), gettext("Edit"));
67 67

  
68
require("guiconfig.inc");
68
require_once("guiconfig.inc");
69 69

  
70 70
if (!is_array($config['igmpproxy']['igmpentry'])) {
71 71
	$config['igmpproxy']['igmpentry'] = array();
src/usr/local/www/services_ntpd.php
62 62
##|-PRIV
63 63

  
64 64
define('NUMTIMESERVERS', 10);		// The maximum number of configurable time servers
65
require("guiconfig.inc");
65
require_once("guiconfig.inc");
66 66
require_once('rrd.inc');
67 67
require_once("shaper.inc");
68 68

  
... This diff was truncated because it exceeds the maximum size that can be displayed.

Also available in: Unified diff