(legacy) more dependency moves, slowly pouring functions.inc empty....

src/etc/inc/functions.inc

@@ -31,4 +31,3 @@
 require_once("interfaces.inc");
 require_once("services.inc");
 require_once("pfsense-utils.inc");
-require_once("system.inc");

src/etc/rc.bootup

@@ -117,6 +117,8 @@ require_once("config.console.inc");
 echo ".";
 require_once("auth.inc");
 echo ".";
+require_once("certs.inc");
+echo ".";
 require_once("util.inc");
 echo ".";
 require_once("interfaces.inc");

src/etc/rc.filter_configure_xmlrpc

@@ -40,6 +40,7 @@ require_once("xmlrpc.inc");
 require_once("interfaces.inc");
 require_once("openvpn.inc");
 require_once("vslb.inc");
+require_once("system.inc");
 
 system_routing_configure();
 setup_gateways_monitor();

src/etc/rc.initial.halt

@@ -28,8 +28,7 @@
 	POSSIBILITY OF SUCH DAMAGE.
 */
 
-require_once('config.inc');
-require_once('functions.inc');
+require_once("system.inc");
 
 $fp = fopen('php://stdin', 'r');
 

src/etc/rc.initial.reboot

@@ -27,11 +27,7 @@
 	POSSIBILITY OF SUCH DAMAGE.
 */
 
-require_once('config.inc');
-require_once('functions.inc');
-require_once("util.inc");
-require_once('filter.inc');
-require_once('captiveportal.inc');
+require_once("system.inc");
 
 $fp = fopen('php://stdin', 'r');
 

src/etc/rc.interfaces_wan_configure

@@ -31,6 +31,8 @@ require_once("config.inc");
 require_once("functions.inc");
 require_once("util.inc");
 require_once("filter.inc");
+require_once("system.inc");
+require_once("interfaces.inc");
 
 if (!empty($argv[1])) {
 	$argument = str_replace("\n", "", $argv[1]);

src/etc/rc.linkup

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

src/etc/rc.newwanip

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

src/etc/rc.newwanipv6

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

src/etc/rc.resolv_conf_generate

@@ -29,5 +29,6 @@
 
 require_once("config.inc");
 require_once("functions.inc");
+require_once("system.inc");
 
 system_resolvconf_generate(true);

src/etc/rc.restart_webgui

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

src/www/diag_backup.php

@@ -41,6 +41,7 @@ require_once("functions.inc");
 require_once("filter.inc");
 require_once("services.inc");
 require_once("rrd.inc");
+require_once("system.inc");
 
 /**
  * check if cron exists

src/www/diag_halt.php

@@ -28,8 +28,7 @@
 */
 
 require_once("guiconfig.inc");
-require_once("functions.inc");
-require_once("captiveportal.inc");
+require_once("system.inc");
 
 
 $pgtitle = array(gettext("Diagnostics"),gettext("Halt system"));
@@ -44,7 +43,7 @@ include('head.inc');
 		<div class="row">
 		    <section class="col-xs-12">
 
-			<?php if ($_POST['Submit'] == gettext("Yes")):
+			<?php if (isset($_POST['Submit']) && $_POST['Submit'] == gettext("Yes")):
 				print_info_box(gettext("The system is halting now. This may take one minute.")); ?>
 			<pre>
 			<?php	system_halt(); ?>

src/www/diag_logs_settings.php

@@ -30,6 +30,7 @@
 require_once("guiconfig.inc");
 require_once("functions.inc");
 require_once("filter.inc");
+require_once("system.inc");
 
 $pconfig['reverse'] = isset($config['syslog']['reverse']);
 $pconfig['nentries'] = $config['syslog']['nentries'];

src/www/diag_ping.php

@@ -28,7 +28,7 @@
 
 $pgtitle = array(gettext("Diagnostics"), gettext("Ping"));
 require_once("guiconfig.inc");
-
+require_once("system.inc");
 
 define('MAX_COUNT', 10);
 define('DEFAULT_COUNT', 3);

src/www/diag_testport.php

@@ -29,6 +29,7 @@
 
 $pgtitle = array(gettext("Diagnostics"), gettext("Test Port"));
 require_once("guiconfig.inc");
+require_once("system.inc");
 
 define('NC_TIMEOUT', 10);
 $do_testport = false;

src/www/diag_traceroute.php

@@ -27,6 +27,7 @@
 */
 
 require_once("guiconfig.inc");
+require_once("system.inc");
 
 $pgtitle = array(gettext("Diagnostics"),gettext("Traceroute"));
 include("head.inc");

src/www/getserviceproviders.php

@@ -30,6 +30,7 @@
 require_once("guiconfig.inc");
 require_once("services.inc");
 require_once("pfsense-utils.inc");
+require_once("system.inc");
 
 $serviceproviders_xml = "/usr/local/share/mobile-broadband-provider-info/serviceproviders.xml";
 $serviceproviders_contents = file_get_contents($serviceproviders_xml);

src/www/interfaces.php

@@ -37,6 +37,8 @@ require_once("captiveportal.inc");
 require_once("filter.inc");
 require_once("rrd.inc");
 require_once("vpn.inc");
+require_once("system.inc");
+require_once("interfaces.inc");
 
 /***************************************************************************************************************
  * imported from xmlparse_attr.inc

src/www/interfaces_assign.php

@@ -38,6 +38,8 @@ require_once("ipsec.inc");
 require_once("vpn.inc");
 require_once("captiveportal.inc");
 require_once("rrd.inc");
+require_once("system.inc");
+require_once("interfaces.inc");
 
 function interface_assign_description($portinfo, $portname) {
 	if ($portinfo['isvlan']) {

src/www/interfaces_bridge_edit.php

@@ -28,6 +28,8 @@
 */
 
 require_once("guiconfig.inc");
+require_once("system.inc");
+require_once("interfaces.inc");
 
 $referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/interfaces_bridge.php');
 

src/www/interfaces_gif_edit.php

@@ -27,6 +27,8 @@
 */
 
 require_once("guiconfig.inc");
+require_once("system.inc");
+require_once("interfaces.inc");
 
 $referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/interfaces_gif.php');
 

src/www/interfaces_gre_edit.php

@@ -28,6 +28,8 @@
 
 require_once("guiconfig.inc");
 require_once("functions.inc");
+require_once("system.inc");
+require_once("interfaces.inc");
 
 $referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/interfaces_gre.php');
 

src/www/interfaces_lagg_edit.php

@@ -27,6 +27,8 @@
 */
 
 require_once("guiconfig.inc");
+require_once("system.inc");
+require_once("interfaces.inc");
 
 $referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/interfaces_lagg.php');
 

src/www/interfaces_vlan_edit.php

@@ -28,6 +28,8 @@
 */
 
 require_once("guiconfig.inc");
+require_once("system.inc");
+require_once("interfaces.inc");
 
 $referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/interfaces_vlan.php');
 

src/www/reboot.php

@@ -29,7 +29,7 @@
 require_once("guiconfig.inc");
 require_once("functions.inc");
 require_once("captiveportal.inc");
-
+require_once("system.inc");
 
 $pgtitle = array(gettext("Diagnostics"),gettext("Reboot System"));
 include("head.inc");

src/www/services_captiveportal.php

@@ -32,6 +32,7 @@ require_once("functions.inc");
 require_once("captiveportal.inc");
 require_once("filter.inc");
 require_once("services.inc");
+require_once("system.inc");
 
 if (substr($_GET['act'], 0, 3) == "get")
 	$nocsrf = true;

src/www/services_captiveportal_zones.php

@@ -29,6 +29,7 @@ require_once("guiconfig.inc");
 require_once("functions.inc");
 require_once("captiveportal.inc");
 require_once("services.inc");
+require_once("system.inc");
 
 global $cpzone;
 global $cpzoneid;

src/www/services_dhcp.php

@@ -30,6 +30,8 @@
 require_once("guiconfig.inc");
 require_once("filter.inc");
 require_once("services.inc");
+require_once("system.inc");
+require_once("unbound.inc");
 
 /* This function will remove entries from dhcpd.leases that would otherwise
  * overlap with static DHCP reservations. If we don't clean these out,

src/www/services_dhcpv6.php

@@ -30,6 +30,8 @@
 
 require_once("guiconfig.inc");
 require_once("filter.inc");
+require_once("system.inc");
+require_once("unbound.inc");
 
 /*  Fix failover DHCP problem
  *  http://article.gmane.org/gmane.comp.security.firewalls.pfsense.support/18749

src/www/services_dnsmasq.php

@@ -31,6 +31,7 @@ require_once("guiconfig.inc");
 require_once("functions.inc");
 require_once("filter.inc");
 require_once("services.inc");
+require_once("system.inc");
 
 $pconfig['enable'] = isset($config['dnsmasq']['enable']);
 $pconfig['regdhcp'] = isset($config['dnsmasq']['regdhcp']);

src/www/services_ntpd.php

@@ -30,6 +30,7 @@
 require_once("guiconfig.inc");
 require_once('rrd.inc');
 require_once("services.inc");
+require_once("system.inc");
 
 if (!is_array($config['ntpd']))
 	$config['ntpd'] = array();

src/www/services_ntpd_gps.php

@@ -29,6 +29,7 @@
 
 require_once("guiconfig.inc");
 require_once("services.inc");
+require_once("system.inc");
 
 function set_default_gps() {
 	global $config;

src/www/services_ntpd_pps.php

@@ -28,6 +28,7 @@
 
 require_once("guiconfig.inc");
 require_once("services.inc");
+require_once("system.inc");
 
 if (!is_array($config['ntpd']))
 	$config['ntpd'] = array();

src/www/services_opendns.php

@@ -27,7 +27,8 @@
 	POSSIBILITY OF SUCH DAMAGE.
 */
 
-require_once 'guiconfig.inc';
+require_once("guiconfig.inc");
+require_once("system.inc");
 
 if (!is_array($config['opendns'])) {
 	$config['opendns'] = array();

src/www/services_snmp.php

@@ -30,6 +30,7 @@
 require_once("guiconfig.inc");
 require_once("functions.inc");
 require_once("services.inc");
+require_once("system.inc");
 
 if (!is_array($config['snmpd'])) {
 	$config['snmpd'] = array();

src/www/services_unbound.php

@@ -30,6 +30,7 @@
 require_once("guiconfig.inc");
 require_once("unbound.inc");
 require_once("services.inc");
+require_once("system.inc");
 
 
 if (!is_array($config['unbound']))

src/www/services_unbound_acls.php

@@ -28,6 +28,7 @@
 
 require_once("guiconfig.inc");
 require_once("unbound.inc");
+require_once("system.inc");
 
 function unbound_acl_id_used($id) {
     global $config;

src/www/services_unbound_advanced.php

@@ -28,6 +28,7 @@
 
 require_once("guiconfig.inc");
 require_once("unbound.inc");
+require_once("system.inc");
 
 if(!is_array($config['unbound']))
 	$config['unbound'] = array();

src/www/status_interfaces.php

@@ -29,6 +29,8 @@
 */
 
 require_once("guiconfig.inc");
+require_once("system.inc");
+require_once("interfaces.inc");
 
 if ($_POST['if'] && $_POST['submit']) {
 	$interface = $_POST['if'];

src/www/status_services.php

@@ -31,6 +31,9 @@
 require_once("guiconfig.inc");
 require_once("services.inc");
 require_once("vslb.inc");
+require_once("system.inc");
+require_once("unbound.inc");
+require_once("captiveportal.inc");
 
 function openvpn_restart_by_vpnid($mode, $vpnid) {
 	$settings = openvpn_get_settings($mode, $vpnid);

src/www/system_advanced_admin.php

@@ -32,6 +32,8 @@
 require_once("guiconfig.inc");
 require_once("functions.inc");
 require_once("filter.inc");
+require_once("system.inc");
+require_once("unbound.inc");
 
 $pconfig['webguiproto'] = $config['system']['webgui']['protocol'];
 $pconfig['webguiport'] = $config['system']['webgui']['port'];

src/www/system_advanced_misc.php

@@ -34,6 +34,8 @@ require_once("functions.inc");
 require_once("filter.inc");
 require_once("vpn.inc");
 require_once("vslb.inc");
+require_once("system.inc");
+
 
 $pconfig['proxyurl'] = $config['system']['proxyurl'];
 $pconfig['proxyport'] = $config['system']['proxyport'];

src/www/system_advanced_network.php

@@ -32,6 +32,7 @@
 require_once("guiconfig.inc");
 require_once("functions.inc");
 require_once("filter.inc");
+require_once("system.inc");
 
 function system_enable_arp_wrong_if()
 {

src/www/system_advanced_notifications.php

@@ -27,6 +27,7 @@
 */
 
 require_once("guiconfig.inc");
+require_once("system.inc");
 
 // Growl
 $pconfig['disable_growl'] = isset($config['notifications']['growl']['disable']);

src/www/system_advanced_sysctl.php

@@ -30,6 +30,7 @@
 */
 
 require_once("guiconfig.inc");
+require_once("system.inc");
 
 $referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/system_advanced_sysctl.php');
 

src/www/system_camanager.php

@@ -28,6 +28,7 @@
 */
 
 require_once('guiconfig.inc');
+require_once("system.inc");
 
 function ca_import(& $ca, $str, $key="", $serial=0) {
 	global $config;

src/www/system_certmanager.php

@@ -28,6 +28,7 @@
 */
 
 require_once('guiconfig.inc');
+require_once("system.inc");
 
 function csr_generate(& $cert, $keylen, $dn, $digest_alg = "sha256") {
 

src/www/system_gateway_groups.php

@@ -30,6 +30,7 @@
 require_once("guiconfig.inc");
 require_once("functions.inc");
 require_once("openvpn.inc");
+require_once("system.inc");
 
 // Resync and restart all VPNs using a gateway group.
 function openvpn_resync_gwgroup($gwgroupname = "") {

src/www/system_gateways.php

@@ -31,6 +31,7 @@ require_once("guiconfig.inc");
 require_once("functions.inc");
 require_once("filter.inc");
 require_once("services.inc");
+require_once("system.inc");
 
 $a_gateways = return_gateways_array(true, false, true);
 $a_gateways_arr = array();

src/www/system_general.php

@@ -30,6 +30,8 @@
 require_once("guiconfig.inc");
 require_once("functions.inc");
 require_once("filter.inc");
+require_once("system.inc");
+require_once("unbound.inc");
 
 function get_locale_list()
 {

src/www/system_routes.php

@@ -30,6 +30,7 @@
 require_once("guiconfig.inc");
 require_once("functions.inc");
 require_once("filter.inc");
+require_once("system.inc");
 
 if (!is_array($config['staticroutes'])) {
     $config['staticroutes'] = array();

src/www/wizard.php

@@ -32,6 +32,7 @@ require_once("guiconfig.inc");
 require_once("functions.inc");
 require_once("filter.inc");
 require_once("rrd.inc");
+require_once("system.inc");
 
 /*
  * find_ip_interface($ip): return the interface where an ip is defined