(legacy) move util.inc requires around

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");

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 */

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");

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");

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");

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

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");

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");

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])) {

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");

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 = "";
 

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");
 
 /**

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;

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"));
 

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'])) {

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

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

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