(legacy) work in progress require/include cleanup

src/captiveportal/index.php

@@ -31,6 +31,7 @@ require_once("config.inc");
 require_once("auth.inc");
 require_once("functions.inc");
 require_once("captiveportal.inc");
+require_once("util.inc");
 
 $errormsg = "Invalid credentials specified.";
 

src/etc/inc/certs.inc

@@ -29,8 +29,6 @@
 
 define("OPEN_SSL_CONF_PATH", "/etc/ssl/openssl.cnf");
 
-require_once("functions.inc");
-
 global $openssl_digest_algs;
 $openssl_digest_algs = array("sha1", "sha224", "sha256", "sha384", "sha512");
 

src/etc/inc/interfaces.inc

@@ -30,7 +30,6 @@
 */
 
 require_once("interfaces.lib.inc");
-require_once("util.inc");
 require_once("gwlb.inc");
 require_once('services.inc');
 require_once('openvpn.inc');

src/etc/inc/ipsec.attributes.php

@@ -25,6 +25,7 @@
         ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
         POSSIBILITY OF SUCH DAMAGE.
 */
+require_once("util.inc");
 
 if (empty($common_name)) {
 	$common_name = getenv("common_name");

src/etc/inc/miniupnpd.inc

 <?php
 
-require_once("util.inc");
 require_once("functions.inc");
 
 /* MiniUPnPd */

src/etc/inc/openvpn.inc

@@ -30,7 +30,6 @@
 */
 
 require_once('pfsense-utils.inc');
-require_once('util.inc');
 
 global $openvpn_prots;
 $openvpn_prots = array("UDP", "UDP6", "TCP", "TCP6");

src/etc/inc/unbound.inc

@@ -28,7 +28,6 @@
 
 /* include all configuration functions */
 require_once("functions.inc");
-require_once("util.inc");
 
 /* Optimize Unbound for environment */
 function unbound_optimization() {

src/etc/inc/util.inc

@@ -25,7 +25,6 @@
 	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 	POSSIBILITY OF SUCH DAMAGE.
 */
-require_once("interfaces.inc");
 require_once("IPv6.inc");
 
 function killbyname($procname, $sig = 'TERM')

src/etc/rc.bootup

@@ -120,6 +120,7 @@ require_once("config.console.inc");
 echo ".";
 require_once("auth.inc");
 echo ".";
+require_once("util.inc");
 require_once("interfaces.inc");
 require_once("services.inc");
 require_once("pfsense-utils.inc");

src/etc/rc.carpbackup

@@ -31,6 +31,7 @@ require_once("functions.inc");
 require_once("config.inc");
 require_once("openvpn.inc");
 require_once("interfaces.inc");
+require_once("util.inc");
 
 $argument = str_replace("\n", "", $argv[1]);
 if (!strstr($argument, "@"))

src/etc/rc.carpmaster

@@ -31,6 +31,7 @@ require_once("functions.inc");
 require_once("config.inc");
 require_once("openvpn.inc");
 require_once("interfaces.inc");
+require_once("util.inc");
 
 $argument = str_replace("\n", "", $argv[1]);
 if (!strstr($argument, "@"))

src/etc/rc.filter_synchronize

@@ -36,6 +36,7 @@ require_once("functions.inc");
 require_once("filter.inc");
 require_once("interfaces.inc");
 require_once("XMLRPC_Client.inc") ;
+require_once("util.inc");
 
 /*
  *  backup_vip_config_section($section): returns as an xml file string of

src/etc/rc.initial.banner

@@ -32,6 +32,7 @@
 require_once("config.inc");
 require_once("gwlb.inc");
 require_once("interfaces.inc");
+require_once("util.inc");
 
 $version = strtok(file_get_contents('/usr/local/opnsense/version/opnsense'), '-');
 $hostname = $config['system']['hostname'];

src/etc/rc.initial.ping

@@ -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");
 
 $fp = fopen('php://stdin', 'r');
 

src/etc/rc.initial.setlanip

@@ -27,6 +27,13 @@
 	POSSIBILITY OF SUCH DAMAGE.
 */
 
+/* parse the configuration and include all functions used below */
+require_once("config.inc");
+require_once("functions.inc");
+require_once("filter.inc");
+require_once("rrd.inc");
+require_once("util.inc");
+
 $options = getopt("hn", array("dry-run", "help"));
 
 if (isset($options["h"]) || isset($options["help"])) {
@@ -41,11 +48,6 @@ if ($dry_run) {
 	echo "DRY RUN MODE IS ON\n";
 }
 
-/* parse the configuration and include all functions used below */
-require_once("config.inc");
-require_once("functions.inc");
-require_once("filter.inc");
-require_once("rrd.inc");
 
 function console_prompt_for_yn ($prompt_text) {
 	global $fp;

src/etc/rc.linkup

@@ -31,6 +31,7 @@
 require_once("config.inc");
 require_once("filter.inc");
 require_once("interfaces.inc");
+require_once("util.inc");
 
 function handle_argument_group($iface, $argument2) {
 	global $config;

src/etc/rc.newwanip

@@ -36,6 +36,7 @@ require_once("ipsec.inc");
 require_once("vpn.inc");
 require_once("openvpn.inc");
 require_once("rrd.inc");
+require_once("util.inc");
 
 // Do not process while booting
 if (file_exists('/var/run/booting')) {

src/etc/rc.newwanipv6

@@ -37,6 +37,7 @@ require_once("vpn.inc");
 require_once("openvpn.inc");
 require_once("services.inc");
 require_once("rrd.inc");
+require_once("util.inc");
 
 /* Interface IP address has changed */
 $argument = trim($argv[1], " \n\t");

src/etc/rc.prunecaptiveportal

@@ -31,6 +31,7 @@ require_once("config.inc");
 require_once("functions.inc");
 require_once("filter.inc");
 require_once("captiveportal.inc");
+require_once("util.inc");
 
 global $g;
 global $cpzone;

src/etc/rc.reload_all

@@ -33,6 +33,7 @@ require_once("filter.inc");
 require_once("ipsec.inc");
 require_once("vpn.inc");
 require_once("captiveportal.inc");
+require_once("util.inc");
 
 log_error("rc.reload_all: Reloading all configuration settings.");
 reload_all_sync();

src/etc/rc.restart_webgui

@@ -5,6 +5,7 @@ require_once('config.inc');
 require_once('functions.inc');
 require_once('captiveportal.inc');
 require_once('rrd.inc');
+require_once("util.inc");
 
 if (count($argv) > 1 && is_numeric($argv[1])) {
     // starting delayed.

src/etc/rc.sshd

@@ -31,6 +31,7 @@
 
 require_once('config.inc');
 require_once('functions.inc');
+require_once("util.inc");
 
 $bin_ssh_keygen = '/usr/local/bin/ssh-keygen';
 $sbin_sshd = '/usr/local/sbin/sshd';

src/etc/rc.update_alias_url_data

@@ -29,6 +29,7 @@
 
 require_once("config.inc");
 require_once("functions.inc");
+require_once("util.inc");
 
 function update_alias_url_data()
 {

src/www/getstats.php

@@ -33,6 +33,7 @@ header("Cache-Control: post-check=0, pre-check=0", FALSE );
 header("Pragma: no-cache"); // HTTP/1.0
 
 require_once("guiconfig.inc");
+require_once("system.inc");
 include_once("includes/functions.inc.php");
 
 echo get_stats();

src/www/guiconfig.inc

@@ -29,6 +29,7 @@
 */
 require_once("config.inc");
 require_once("csrf/csrf-magic.php");
+require_once("util.inc");
  
 /* Include authentication routines */
 /* THIS MUST BE ABOVE ALL OTHER CODE */