From 3cd79bd2a171002913db988763149940987a0fa8 Mon Sep 17 00:00:00 2001 From: Ad Schellevis Date: Mon, 20 Jul 2015 16:16:28 +0000 Subject: [PATCH] (legacy) restructure requires/includes, move globals.inc --- src/etc/inc/auth.inc | 3 --- src/etc/inc/authgui.inc | 1 - src/etc/inc/config.inc | 1 - src/etc/inc/interfaces.inc | 14 ++++---------- src/etc/inc/ipsec.auth-user.php | 1 - src/etc/inc/notices.inc | 7 ++----- src/etc/inc/openvpn-client-export.inc | 1 - src/etc/inc/openvpn.auth-user.php | 1 - src/etc/inc/openvpn.tls-verify.php | 1 - src/etc/rc.bootup | 2 -- src/etc/rc.filter_configure_xmlrpc | 1 - src/etc/rc.filter_synchronize | 1 - src/etc/rc.kill_states | 1 - src/etc/rc.linkup | 1 - src/etc/rc.newwanip | 1 - src/etc/rc.newwanipv6 | 1 - src/etc/rc.php_test_run | 1 - src/etc/rc.resolv_conf_generate | 1 - src/etc/rc.sshd | 1 - src/sbin/gmirror_status_check.php | 1 - src/www/carp_status.php | 1 - src/www/fbegin.inc | 1 - src/www/graph.php | 1 - src/www/services_dhcp_edit.php | 5 ++--- src/www/services_dhcpv6_edit.php | 3 +-- src/www/status_filter_reload.php | 1 - src/www/status_rrd_graph_img.php | 1 - src/www/system_gateways_edit.php | 1 + src/www/vpn_openvpn_export.php | 1 - src/www/vpn_openvpn_export_shared.php | 1 - .../widgets/captive_portal_status.widget.php | 1 - src/www/wizard.php | 1 - 32 files changed, 10 insertions(+), 50 deletions(-) diff --git a/src/etc/inc/auth.inc b/src/etc/inc/auth.inc index 67c4a2fdc..24f0057c3 100644 --- a/src/etc/inc/auth.inc +++ b/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"); diff --git a/src/etc/inc/authgui.inc b/src/etc/inc/authgui.inc index ab0eb2a6d..8a5f509ab 100644 --- a/src/etc/inc/authgui.inc +++ b/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; diff --git a/src/etc/inc/config.inc b/src/etc/inc/config.inc index 8c549b7f8..a26a4807b 100644 --- a/src/etc/inc/config.inc +++ b/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(); diff --git a/src/etc/inc/interfaces.inc b/src/etc/inc/interfaces.inc index fb37bcec8..9342c7283 100644 --- a/src/etc/inc/interfaces.inc +++ b/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" @@ -1343,8 +1346,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); } @@ -2833,8 +2834,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); } @@ -2845,8 +2844,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); } @@ -3213,9 +3210,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"); } diff --git a/src/etc/inc/ipsec.auth-user.php b/src/etc/inc/ipsec.auth-user.php index c9435eaae..8a5bd38cd 100755 --- a/src/etc/inc/ipsec.auth-user.php +++ b/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"); diff --git a/src/etc/inc/notices.inc b/src/etc/inc/notices.inc index 495d00511..8b9dd0035 100644 --- a/src/etc/inc/notices.inc +++ b/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; diff --git a/src/etc/inc/openvpn-client-export.inc b/src/etc/inc/openvpn-client-export.inc index ba9a40aca..2f6efbff9 100644 --- a/src/etc/inc/openvpn-client-export.inc +++ b/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"); diff --git a/src/etc/inc/openvpn.auth-user.php b/src/etc/inc/openvpn.auth-user.php index 17da3aa58..f5cbf9bec 100644 --- a/src/etc/inc/openvpn.auth-user.php +++ b/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"); diff --git a/src/etc/inc/openvpn.tls-verify.php b/src/etc/inc/openvpn.tls-verify.php index a673d8796..c779c9db5 100644 --- a/src/etc/inc/openvpn.tls-verify.php +++ b/src/etc/inc/openvpn.tls-verify.php @@ -35,7 +35,6 @@ * intermediates. */ -require_once("globals.inc"); require_once("config.inc"); require_once("interfaces.inc"); diff --git a/src/etc/rc.bootup b/src/etc/rc.bootup index b7b25732f..b0ccdc370 100755 --- a/src/etc/rc.bootup +++ b/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 "."; diff --git a/src/etc/rc.filter_configure_xmlrpc b/src/etc/rc.filter_configure_xmlrpc index 964584261..42b5baae1 100755 --- a/src/etc/rc.filter_configure_xmlrpc +++ b/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"); diff --git a/src/etc/rc.filter_synchronize b/src/etc/rc.filter_synchronize index 82b5e826d..323bcbcff 100755 --- a/src/etc/rc.filter_synchronize +++ b/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"); diff --git a/src/etc/rc.kill_states b/src/etc/rc.kill_states index e86d792a4..d0f36da29 100755 --- a/src/etc/rc.kill_states +++ b/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"); diff --git a/src/etc/rc.linkup b/src/etc/rc.linkup index dfa7d996c..f62116c98 100755 --- a/src/etc/rc.linkup +++ b/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"); diff --git a/src/etc/rc.newwanip b/src/etc/rc.newwanip index 41a580bbe..6e7309723 100755 --- a/src/etc/rc.newwanip +++ b/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"); diff --git a/src/etc/rc.newwanipv6 b/src/etc/rc.newwanipv6 index fd2f9e815..9f56c2f90 100755 --- a/src/etc/rc.newwanipv6 +++ b/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"); diff --git a/src/etc/rc.php_test_run b/src/etc/rc.php_test_run index c0bd60147..6a404c042 100755 --- a/src/etc/rc.php_test_run +++ b/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'); diff --git a/src/etc/rc.resolv_conf_generate b/src/etc/rc.resolv_conf_generate index d1b547d05..6174d93af 100755 --- a/src/etc/rc.resolv_conf_generate +++ b/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"); diff --git a/src/etc/rc.sshd b/src/etc/rc.sshd index b4fe0c98b..77ccaf5c8 100755 --- a/src/etc/rc.sshd +++ b/src/etc/rc.sshd @@ -29,7 +29,6 @@ POSSIBILITY OF SUCH DAMAGE. */ -require_once('globals.inc'); require_once('config.inc'); require_once('functions.inc'); diff --git a/src/sbin/gmirror_status_check.php b/src/sbin/gmirror_status_check.php index 45858c604..d83f96acf 100644 --- a/src/sbin/gmirror_status_check.php +++ b/src/sbin/gmirror_status_check.php @@ -27,7 +27,6 @@ */ require_once("config.inc"); -require_once("globals.inc"); require_once("gmirror.inc"); global $g; diff --git a/src/www/carp_status.php b/src/www/carp_status.php index cd7dbcf20..955740f1d 100644 --- a/src/www/carp_status.php +++ b/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; diff --git a/src/www/fbegin.inc b/src/www/fbegin.inc index f411e4e13..8a60ecbc0 100644 --- a/src/www/fbegin.inc +++ b/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"); diff --git a/src/www/graph.php b/src/www/graph.php index 163d03683..b93dbea94 100644 --- a/src/www/graph.php +++ b/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" ); diff --git a/src/www/services_dhcp_edit.php b/src/www/services_dhcp_edit.php index c4168856d..957129077 100644 --- a/src/www/services_dhcp_edit.php +++ b/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']; diff --git a/src/www/services_dhcpv6_edit.php b/src/www/services_dhcpv6_edit.php index 4234bc9f2..efda2d15c 100644 --- a/src/www/services_dhcpv6_edit.php +++ b/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'); diff --git a/src/www/status_filter_reload.php b/src/www/status_filter_reload.php index c340f87b7..245000d48 100644 --- a/src/www/status_filter_reload.php +++ b/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"); diff --git a/src/www/status_rrd_graph_img.php b/src/www/status_rrd_graph_img.php index 9306b55af..34f627502 100644 --- a/src/www/status_rrd_graph_img.php +++ b/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"); diff --git a/src/www/system_gateways_edit.php b/src/www/system_gateways_edit.php index 9285d45ae..1efdb9e92 100644 --- a/src/www/system_gateways_edit.php +++ b/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'); diff --git a/src/www/vpn_openvpn_export.php b/src/www/vpn_openvpn_export.php index e9a84c9ea..d2fb3b254 100644 --- a/src/www/vpn_openvpn_export.php +++ b/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"); diff --git a/src/www/vpn_openvpn_export_shared.php b/src/www/vpn_openvpn_export_shared.php index f64077b9c..64b8c66aa 100644 --- a/src/www/vpn_openvpn_export_shared.php +++ b/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"); diff --git a/src/www/widgets/widgets/captive_portal_status.widget.php b/src/www/widgets/widgets/captive_portal_status.widget.php index b1bb26f1e..159ec79e4 100644 --- a/src/www/widgets/widgets/captive_portal_status.widget.php +++ b/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"); diff --git a/src/www/wizard.php b/src/www/wizard.php index b1cd66215..d86ffab63 100644 --- a/src/www/wizard.php +++ b/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");