(legacy) restructure requires/includes, move globals.inc

src/etc/inc/auth.inc

@@ -36,9 +36,6 @@
  * file courtesy of Michael Retterklieber.
  */
 
-// previous in config.gui.inc
-require_once("globals.inc");
-
 /* include globals from notices.inc /utility/XML parser files */
 require_once('config.lib.inc');
 require_once("util.inc");

src/etc/inc/authgui.inc

@@ -33,7 +33,6 @@
 require_once("auth.inc");
 require_once("filter.inc");
 require_once("functions.inc");
-require_once("globals.inc");
 
 // provided via legacy_bindings.inc 
 global $priv_list;

src/etc/inc/config.inc

@@ -44,7 +44,6 @@ require_once("util.inc");
 require_once("IPv6.inc");
 require_once("xmlparse.inc");
 require_once("crypt.inc");
-require_once("globals.inc");
 
 $config = parse_config();
 

src/etc/inc/interfaces.inc

@@ -30,9 +30,12 @@
 */
 
 require_once("interfaces.lib.inc");
-require_once("globals.inc");
 require_once("util.inc");
 require_once("gwlb.inc");
+require_once('services.inc');
+require_once('openvpn.inc');
+require_once("services.inc");
+
 
 /*
  * converts a string like "a,b,c,d"
@@ -1346,8 +1349,6 @@ function interface_bring_down($interface = "wan", $destroy = false, $ifacecfg =
 	}
 
 	if (!empty($track6) && is_array($track6)) {
-		if (!function_exists('services_dhcp_configure'))
-			require_once('services.inc');
 		/* Bring down radvd and dhcp6 on these interfaces */
 		services_dhcpd_configure('inet6', $track6);
 	}
@@ -2839,8 +2840,6 @@ function interface_virtual_create($interface) {
 		if (is_array($config['openvpn']) && is_array($config['openvpn']['openvpn-server'])) {
 			foreach ($config['openvpn']['openvpn-server'] as $server) {
 				if ($interface == "ovpns{$server['vpnid']}") {
-					if (!function_exists('openvpn_resync'))
-						require_once('openvpn.inc');
 					log_error("OpenVPN: Resync server {$server['description']}");
 					openvpn_resync('server', $server);
 				}
@@ -2851,8 +2850,6 @@ function interface_virtual_create($interface) {
 		if (is_array($config['openvpn']) && is_array($config['openvpn']['openvpn-client'])) {
 			foreach ($config['openvpn']['openvpn-client'] as $client) {
 				if ($interface == "ovpnc{$client['vpnid']}") {
-					if (!function_exists('openvpn_resync'))
-						require_once('openvpn.inc');
 					log_error("OpenVPN: Resync server {$client['description']}");
 					openvpn_resync('client', $client);
 				}
@@ -3219,9 +3216,6 @@ function interface_track6_configure($interface = 'lan', $wancfg, $linkupevent =
 	}
 
 	if (!file_exists("/var/run/booting") && $linkupevent == false) {
-		if (!function_exists('services_dhcpd_configure'))
-			require_once("services.inc");
-
 		services_dhcpd_configure("inet6");
 	}
 

src/etc/inc/ipsec.auth-user.php

@@ -34,7 +34,6 @@
  * in our config.xml file and check the credentials.
  */
 
-require_once("globals.inc");
 require_once("config.inc");
 require_once("radius.inc");
 require_once("auth.inc");

src/etc/inc/notices.inc

@@ -28,7 +28,6 @@
  *
  */
 
-require_once("globals.inc");
 require_once("led.inc");
 require_once("util.inc");
 require_once("notices.growl.class");
@@ -90,8 +89,6 @@ function file_notice($id, $notice, $category = "General", $url = "", $priority =
  ******/
 function get_notices($category = 'all')
 {
-	global $g;
-
 	if (file_exists('/tmp/notices')) {
 		$queue = unserialize(file_get_contents('/tmp/notices'));
 		if(!$queue) return false;
@@ -218,7 +215,7 @@ function are_notices_pending($category = 'all')
  *   returns true if message was sent
  ******/
 function notify_via_smtp($message, $force = false) {
-	global $config, $g;
+	global $config;
 	if(file_exists("/var/run/booting"))
 		return;
 
@@ -242,7 +239,7 @@ function notify_via_smtp($message, $force = false) {
 }
 
 function send_smtp_message($message, $subject = "(no subject)") {
-	global $config, $g;
+	global $config;
 
 	if(!$config['notifications']['smtp']['ipaddress'])
 		return;

src/etc/inc/openvpn-client-export.inc

@@ -29,7 +29,6 @@
 	POSSIBILITY OF SUCH DAMAGE.
 */
 
-require_once("globals.inc");
 require_once("openvpn.inc");
 require_once("filter.inc");
 require_once("util.inc");

src/etc/inc/openvpn.auth-user.php

@@ -34,7 +34,6 @@
  * in our config.xml file and check the credentials.
  */
 
-require_once("globals.inc");
 require_once("config.inc");
 require_once("radius.inc");
 require_once("auth.inc");

src/etc/inc/openvpn.tls-verify.php

@@ -35,7 +35,6 @@
  *  intermediates.
  */
 
-require_once("globals.inc");
 require_once("config.inc");
 require_once("interfaces.inc");
 

src/etc/rc.bootup

@@ -103,8 +103,6 @@ echo " done.\n";
 
 echo "Initializing...";
 echo ".";
-require_once("globals.inc");
-echo ".";
 require_once("led.inc");
 led_normalize();
 echo ".";

src/etc/rc.filter_configure_xmlrpc

@@ -32,7 +32,6 @@
 
 */
 
-require_once("globals.inc");
 require_once("config.inc");
 require_once("functions.inc");
 require_once("filter.inc");

src/etc/rc.filter_synchronize

@@ -31,7 +31,6 @@
         POSSIBILITY OF SUCH DAMAGE.
 */
 
-require_once("globals.inc");
 require_once("config.inc");
 require_once("functions.inc");
 require_once("filter.inc");

src/etc/rc.kill_states

@@ -27,7 +27,6 @@
 */
 
 /* parse the configuration and include all functions used below */
-require_once("globals.inc");
 require_once("config.inc");
 require_once("interfaces.inc");
 require_once("util.inc");

src/etc/rc.linkup

@@ -28,7 +28,6 @@
 */
 
 /* parse the configuration and include all functions used below */
-require_once("globals.inc");
 require_once("config.inc");
 require_once("filter.inc");
 require_once("interfaces.inc");

src/etc/rc.newwanip

@@ -29,7 +29,6 @@
 */
 
 /* parse the configuration and include all functions used below */
-require_once("globals.inc");
 require_once("config.inc");
 require_once("functions.inc");
 require_once("filter.inc");

src/etc/rc.newwanipv6

@@ -29,7 +29,6 @@
 */
 
 /* parse the configuration and include all functions used below */
-require_once("globals.inc");
 require_once("config.inc");
 require_once("functions.inc");
 require_once("filter.inc");

src/etc/rc.php_test_run

@@ -7,7 +7,6 @@
      small tests to ensure the php environment is sane.
 */
 
-require_once('globals.inc');
 require_once('util.inc');
 require_once('xmlparse.inc');
 require_once('config.lib.inc');

src/etc/rc.resolv_conf_generate

@@ -27,7 +27,6 @@
         POSSIBILITY OF SUCH DAMAGE.
 */
 
-require_once("globals.inc");
 require_once("config.inc");
 require_once("functions.inc");
 

src/etc/rc.sshd

@@ -29,7 +29,6 @@
 	POSSIBILITY OF SUCH DAMAGE.
 */
 
-require_once('globals.inc');
 require_once('config.inc');
 require_once('functions.inc');
 

src/sbin/gmirror_status_check.php

@@ -27,7 +27,6 @@
 */
 
 require_once("config.inc");
-require_once("globals.inc");
 require_once("gmirror.inc");
 
 global $g;

src/www/carp_status.php

@@ -28,7 +28,6 @@
 */
 
 require_once("guiconfig.inc");
-require_once("globals.inc");
 
 function interfaces_carp_set_maintenancemode($carp_maintenancemode){
 	global $config;

src/www/fbegin.inc

@@ -28,7 +28,6 @@
 	POSSIBILITY OF SUCH DAMAGE.
 */
 
-require_once("globals.inc");
 require_once("functions.inc");
 require_once("shortcuts.inc");
 require_once("services.inc");

src/www/graph.php

@@ -28,7 +28,6 @@
 	POSSIBILITY OF SUCH DAMAGE.
 */
 
-require_once("globals.inc");
 require_once("guiconfig.inc");
 
 header("Last-Modified: " . gmdate( "D, j M Y H:i:s" ) . " GMT" );

src/www/services_dhcp_edit.php

@@ -27,6 +27,8 @@
 	POSSIBILITY OF SUCH DAMAGE.
 */
 
+require_once("guiconfig.inc");
+
 function staticmapcmp($a, $b) {
 	return ipcmp($a['ipaddr'], $b['ipaddr']);
 }
@@ -37,9 +39,6 @@ function staticmaps_sort($ifgui) {
 	usort($config['dhcpd'][$ifgui]['staticmap'], "staticmapcmp");
 }
 
-require_once('globals.inc');
-require_once("guiconfig.inc");
-
 $referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/services_dhcp.php');
 
 $if = $_GET['if'];

src/www/services_dhcpv6_edit.php

@@ -27,6 +27,7 @@
 	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 	POSSIBILITY OF SUCH DAMAGE.
 */
+require_once("guiconfig.inc");
 
 function staticmapcmp($a, $b) {
         return ipcmp($a['ipaddrv6'], $b['ipaddrv6']);
@@ -38,8 +39,6 @@ function staticmaps_sort($ifgui) {
         usort($config['dhcpdv6'][$ifgui]['staticmap'], "staticmapcmp");
 }
 
-require_once('globals.inc');
-require_once("guiconfig.inc");
 
 $referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/services_dhcpv6.php');
 

src/www/status_filter_reload.php

@@ -26,7 +26,6 @@
 	POSSIBILITY OF SUCH DAMAGE.
 */
 
-require_once("globals.inc");
 require_once("guiconfig.inc");
 require_once("functions.inc");
 

src/www/status_rrd_graph_img.php

@@ -27,7 +27,6 @@
 	POSSIBILITY OF SUCH DAMAGE.
 */
 
-require_once("globals.inc");
 require_once("guiconfig.inc");
 require_once("filter.inc");
 require_once("rrd.inc");

src/www/system_gateways_edit.php

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

src/www/vpn_openvpn_export.php

@@ -30,7 +30,6 @@
 	DISABLE_PHP_LINT_CHECKING
 */
 
-require_once("globals.inc");
 require_once("guiconfig.inc");
 require("openvpn-client-export.inc");
 

src/www/vpn_openvpn_export_shared.php

@@ -27,7 +27,6 @@
 	POSSIBILITY OF SUCH DAMAGE.
 */
 
-require_once("globals.inc");
 require_once("guiconfig.inc");
 require_once("openvpn-client-export.inc");
 

src/www/widgets/widgets/captive_portal_status.widget.php

@@ -30,7 +30,6 @@
 
 $nocsrf = true;
 
-require_once("globals.inc");
 require_once("guiconfig.inc");
 require_once("pfsense-utils.inc");
 require_once("functions.inc");

src/www/wizard.php

@@ -28,7 +28,6 @@
 	POSSIBILITY OF SUCH DAMAGE.
 */
 
-require_once("globals.inc");
 require_once("guiconfig.inc");
 require_once("functions.inc");
 require_once("filter.inc");