From 7f9910ee72b7aa5dd151a282c1937f3a8ca9efb2 Mon Sep 17 00:00:00 2001 From: Ad Schellevis Date: Wed, 22 Jul 2015 08:19:00 +0000 Subject: [PATCH] (legacy) move util.inc requires around --- src/etc/rc.backup_captiveportal | 1 + src/etc/rc.dyndns.update | 1 + src/etc/rc.filter_configure_sync | 1 + src/etc/rc.filter_configure_xmlrpc | 1 + src/etc/rc.filter_synchronize | 1 + src/etc/rc.initial.reboot | 1 + src/etc/rc.initial.setlanip | 1 + src/etc/rc.initial.setports | 1 + src/etc/rc.interfaces_wan_configure | 1 + src/etc/rc.reload_interfaces | 1 + src/www/bandwidth_by_ip.php | 1 - src/www/diag_backup.php | 1 - src/www/diag_logs_filter.php | 1 - src/www/firewall_aliases_import.php | 1 - src/www/load_balancer_monitor.php | 1 - src/www/load_balancer_pool_edit.php | 1 - src/www/load_balancer_setting.php | 1 - src/www/system_routes_edit.php | 1 - 18 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/etc/rc.backup_captiveportal b/src/etc/rc.backup_captiveportal index e5cc9417f..c8caa1895 100755 --- a/src/etc/rc.backup_captiveportal +++ b/src/etc/rc.backup_captiveportal @@ -29,6 +29,7 @@ require_once("config.inc"); require_once("functions.inc"); +require_once("util.inc"); require_once("filter.inc"); require_once("captiveportal.inc"); require_once("voucher.inc"); diff --git a/src/etc/rc.dyndns.update b/src/etc/rc.dyndns.update index 1bcdaa356..3d922d6ec 100755 --- a/src/etc/rc.dyndns.update +++ b/src/etc/rc.dyndns.update @@ -30,6 +30,7 @@ require_once("config.inc"); require_once("gwlb.inc"); require_once("functions.inc"); +require_once("util.inc"); require_once("filter.inc"); /* Interface IP address has changed */ diff --git a/src/etc/rc.filter_configure_sync b/src/etc/rc.filter_configure_sync index d96cdfd64..595a138ee 100755 --- a/src/etc/rc.filter_configure_sync +++ b/src/etc/rc.filter_configure_sync @@ -29,6 +29,7 @@ require_once("config.inc"); require_once("functions.inc"); +require_once("util.inc"); require_once("filter.inc"); require_once("ipsec.inc"); require_once("vpn.inc"); diff --git a/src/etc/rc.filter_configure_xmlrpc b/src/etc/rc.filter_configure_xmlrpc index 42b5baae1..956468e6b 100755 --- a/src/etc/rc.filter_configure_xmlrpc +++ b/src/etc/rc.filter_configure_xmlrpc @@ -35,6 +35,7 @@ require_once("config.inc"); require_once("functions.inc"); require_once("filter.inc"); +require_once("util.inc"); require_once("xmlrpc.inc"); require_once("interfaces.inc"); require_once("openvpn.inc"); diff --git a/src/etc/rc.filter_synchronize b/src/etc/rc.filter_synchronize index 29220fd09..9ad83a7f1 100755 --- a/src/etc/rc.filter_synchronize +++ b/src/etc/rc.filter_synchronize @@ -34,6 +34,7 @@ require_once("config.inc"); require_once("functions.inc"); require_once("filter.inc"); +require_once("util.inc"); require_once("interfaces.inc"); require_once("XMLRPC_Client.inc") ; require_once("util.inc"); diff --git a/src/etc/rc.initial.reboot b/src/etc/rc.initial.reboot index f2e48455d..95249fc98 100755 --- a/src/etc/rc.initial.reboot +++ b/src/etc/rc.initial.reboot @@ -29,6 +29,7 @@ require_once('config.inc'); require_once('functions.inc'); +require_once("util.inc"); require_once('filter.inc'); require_once('captiveportal.inc'); diff --git a/src/etc/rc.initial.setlanip b/src/etc/rc.initial.setlanip index 4d28a9866..c4a48e4db 100755 --- a/src/etc/rc.initial.setlanip +++ b/src/etc/rc.initial.setlanip @@ -30,6 +30,7 @@ /* parse the configuration and include all functions used below */ require_once("config.inc"); require_once("functions.inc"); +require_once("util.inc"); require_once("filter.inc"); require_once("rrd.inc"); require_once("util.inc"); diff --git a/src/etc/rc.initial.setports b/src/etc/rc.initial.setports index 7920b037a..08edbb9c3 100755 --- a/src/etc/rc.initial.setports +++ b/src/etc/rc.initial.setports @@ -32,6 +32,7 @@ require_once("config.inc"); require_once("config.console.inc"); require_once("functions.inc"); require_once("filter.inc"); +require_once("util.inc"); require_once("ipsec.inc"); require_once("vpn.inc"); require_once("captiveportal.inc"); diff --git a/src/etc/rc.interfaces_wan_configure b/src/etc/rc.interfaces_wan_configure index a5cfb596e..d893a3dea 100755 --- a/src/etc/rc.interfaces_wan_configure +++ b/src/etc/rc.interfaces_wan_configure @@ -29,6 +29,7 @@ require_once("config.inc"); require_once("functions.inc"); +require_once("util.inc"); require_once("filter.inc"); if (!empty($argv[1])) { diff --git a/src/etc/rc.reload_interfaces b/src/etc/rc.reload_interfaces index 2c6841b3d..8f4e28800 100755 --- a/src/etc/rc.reload_interfaces +++ b/src/etc/rc.reload_interfaces @@ -30,6 +30,7 @@ require_once("config.inc"); require_once("functions.inc"); require_once("filter.inc"); +require_once("util.inc"); require_once("openvpn.inc"); require_once("vpn.inc"); require_once("captiveportal.inc"); diff --git a/src/www/bandwidth_by_ip.php b/src/www/bandwidth_by_ip.php index 1e00a555f..2f67be3b3 100644 --- a/src/www/bandwidth_by_ip.php +++ b/src/www/bandwidth_by_ip.php @@ -36,7 +36,6 @@ require_once('guiconfig.inc'); require_once('interfaces.inc'); require_once('pfsense-utils.inc'); -require_once('util.inc'); $listedIPs = ""; diff --git a/src/www/diag_backup.php b/src/www/diag_backup.php index d0835365b..05579f77c 100644 --- a/src/www/diag_backup.php +++ b/src/www/diag_backup.php @@ -40,7 +40,6 @@ require_once("guiconfig.inc"); require_once("functions.inc"); require_once("filter.inc"); require_once("services.inc"); -require_once("util.inc"); require_once("rrd.inc"); /** diff --git a/src/www/diag_logs_filter.php b/src/www/diag_logs_filter.php index 26e98b3e0..7bafcbd19 100644 --- a/src/www/diag_logs_filter.php +++ b/src/www/diag_logs_filter.php @@ -39,7 +39,6 @@ require_once("filter_log.inc"); * imported from easyrule.inc/php ********************************************************************************************************************/ require_once("functions.inc"); -require_once("util.inc"); function easyrule_find_rule_interface($int) { global $config; diff --git a/src/www/firewall_aliases_import.php b/src/www/firewall_aliases_import.php index afeb8ae51..beedba955 100644 --- a/src/www/firewall_aliases_import.php +++ b/src/www/firewall_aliases_import.php @@ -31,7 +31,6 @@ $reserved_keywords = array("all", "pass", "block", "out", "queue", "max", "min", "pptp", "pppoe", "L2TP", "OpenVPN", "IPsec"); require_once("guiconfig.inc"); -require_once("util.inc"); $pgtitle = array(gettext("Firewall"),gettext("Aliases"),gettext("Bulk import")); diff --git a/src/www/load_balancer_monitor.php b/src/www/load_balancer_monitor.php index 3960f56d5..dcf20cd21 100644 --- a/src/www/load_balancer_monitor.php +++ b/src/www/load_balancer_monitor.php @@ -30,7 +30,6 @@ require_once("guiconfig.inc"); require_once("functions.inc"); require_once("filter.inc"); -require_once("util.inc"); require_once("load_balancer_maintable.inc"); if (!is_array($config['load_balancer']['monitor_type'])) { diff --git a/src/www/load_balancer_pool_edit.php b/src/www/load_balancer_pool_edit.php index d0f94e775..f5ff5b0b9 100644 --- a/src/www/load_balancer_pool_edit.php +++ b/src/www/load_balancer_pool_edit.php @@ -28,7 +28,6 @@ */ require_once("guiconfig.inc"); -require_once("util.inc"); $referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/load_balancer_pool.php'); diff --git a/src/www/load_balancer_setting.php b/src/www/load_balancer_setting.php index ea3e0b7e9..a6703bac4 100644 --- a/src/www/load_balancer_setting.php +++ b/src/www/load_balancer_setting.php @@ -30,7 +30,6 @@ require_once("guiconfig.inc"); require_once("functions.inc"); require_once("filter.inc"); -require_once("util.inc"); if (!is_array($config['load_balancer']['setting'])) { $config['load_balancer']['setting'] = array(); diff --git a/src/www/system_routes_edit.php b/src/www/system_routes_edit.php index cfdb3e7b4..c016d45ff 100644 --- a/src/www/system_routes_edit.php +++ b/src/www/system_routes_edit.php @@ -30,7 +30,6 @@ require_once("guiconfig.inc"); require_once("filter.inc"); -require_once("util.inc"); require_once("gwlb.inc"); $referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/system_routes.php');