Commit c55a7c50 authored by Ad Schellevis's avatar Ad Schellevis

(legacy) remove services.inc dependency from interfaces.inc

parent f4facb21
...@@ -31,11 +31,9 @@ ...@@ -31,11 +31,9 @@
require_once("interfaces.lib.inc"); require_once("interfaces.lib.inc");
require_once("gwlb.inc"); require_once("gwlb.inc");
require_once('services.inc');
require_once('openvpn.inc'); require_once('openvpn.inc');
require_once("services.inc"); require_once("services.inc");
/* /*
* converts a string like "a,b,c,d" * converts a string like "a,b,c,d"
* into an array like array("a" => "b", "c" => "d") * into an array like array("a" => "b", "c" => "d")
......
...@@ -31,6 +31,7 @@ require_once("config.inc"); ...@@ -31,6 +31,7 @@ require_once("config.inc");
require_once("interfaces.inc"); require_once("interfaces.inc");
require_once("util.inc"); require_once("util.inc");
require_once("filter.inc"); require_once("filter.inc");
require_once("services.inc");
/* Interface IP address has changed */ /* Interface IP address has changed */
......
...@@ -35,5 +35,7 @@ require_once("vpn.inc"); ...@@ -35,5 +35,7 @@ require_once("vpn.inc");
require_once("system.inc"); require_once("system.inc");
require_once("pfsense-utils.inc"); require_once("pfsense-utils.inc");
require_once("interfaces.inc"); require_once("interfaces.inc");
require_once("services.inc");
filter_configure_sync(); filter_configure_sync();
...@@ -41,6 +41,7 @@ require_once("openvpn.inc"); ...@@ -41,6 +41,7 @@ require_once("openvpn.inc");
require_once("vslb.inc"); require_once("vslb.inc");
require_once("system.inc"); require_once("system.inc");
require_once("pfsense-utils.inc"); require_once("pfsense-utils.inc");
require_once("services.inc");
system_routing_configure(); system_routing_configure();
setup_gateways_monitor(); setup_gateways_monitor();
......
...@@ -36,6 +36,7 @@ require_once("filter.inc"); ...@@ -36,6 +36,7 @@ require_once("filter.inc");
require_once("rrd.inc"); require_once("rrd.inc");
require_once("util.inc"); require_once("util.inc");
require_once("pfsense-utils.inc"); require_once("pfsense-utils.inc");
require_once("services.inc");
$options = getopt("hn", array("dry-run", "help")); $options = getopt("hn", array("dry-run", "help"));
......
...@@ -39,6 +39,7 @@ require_once("util.inc"); ...@@ -39,6 +39,7 @@ require_once("util.inc");
require_once("system.inc"); require_once("system.inc");
require_once("interfaces.inc"); require_once("interfaces.inc");
require_once("pfsense-utils.inc"); require_once("pfsense-utils.inc");
require_once("services.inc");
// Do not process while booting // Do not process while booting
if (file_exists('/var/run/booting')) { if (file_exists('/var/run/booting')) {
......
...@@ -37,6 +37,7 @@ require_once("util.inc"); ...@@ -37,6 +37,7 @@ require_once("util.inc");
require_once("system.inc"); require_once("system.inc");
require_once("certs.inc"); require_once("certs.inc");
require_once("pfsense-utils.inc"); require_once("pfsense-utils.inc");
require_once("services.inc");
/****f* legacy/reload_all_sync /****f* legacy/reload_all_sync
* NAME * NAME
......
...@@ -37,6 +37,7 @@ require_once("system.inc"); ...@@ -37,6 +37,7 @@ require_once("system.inc");
require_once("interfaces.inc"); require_once("interfaces.inc");
require_once("pfsense-utils.inc"); require_once("pfsense-utils.inc");
require_once("ipsec.inc"); require_once("ipsec.inc");
require_once("services.inc");
system_routing_enable(); system_routing_enable();
interfaces_configure(); interfaces_configure();
......
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
require_once("config.inc"); require_once("config.inc");
require_once("system.inc"); require_once("system.inc");
require_once("services.inc");
require_once("pfsense-utils.inc"); require_once("pfsense-utils.inc");
system_resolvconf_generate(true); system_resolvconf_generate(true);
...@@ -32,6 +32,7 @@ require_once("interfaces.inc"); ...@@ -32,6 +32,7 @@ require_once("interfaces.inc");
require_once("filter.inc"); require_once("filter.inc");
require_once("system.inc"); require_once("system.inc");
require_once("pfsense-utils.inc"); require_once("pfsense-utils.inc");
require_once("services.inc");
function clear_all_log_files() function clear_all_log_files()
{ {
......
...@@ -40,6 +40,7 @@ require_once("vpn.inc"); ...@@ -40,6 +40,7 @@ require_once("vpn.inc");
require_once("system.inc"); require_once("system.inc");
require_once("interfaces.inc"); require_once("interfaces.inc");
require_once("pfsense-utils.inc"); require_once("pfsense-utils.inc");
require_once("services.inc");
/*************************************************************************************************************** /***************************************************************************************************************
* imported from xmlparse_attr.inc * imported from xmlparse_attr.inc
......
...@@ -40,6 +40,7 @@ require_once("rrd.inc"); ...@@ -40,6 +40,7 @@ require_once("rrd.inc");
require_once("system.inc"); require_once("system.inc");
require_once("interfaces.inc"); require_once("interfaces.inc");
require_once("pfsense-utils.inc"); require_once("pfsense-utils.inc");
require_once("services.inc");
function interface_assign_description($portinfo, $portname) { function interface_assign_description($portinfo, $portname) {
if ($portinfo['isvlan']) { if ($portinfo['isvlan']) {
......
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
require_once("guiconfig.inc"); require_once("guiconfig.inc");
require_once("interfaces.inc"); require_once("interfaces.inc");
require_once("services.inc");
$referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/interfaces_ppps.php'); $referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/interfaces_ppps.php');
......
...@@ -34,6 +34,7 @@ require_once("system.inc"); ...@@ -34,6 +34,7 @@ require_once("system.inc");
require_once("unbound.inc"); require_once("unbound.inc");
require_once("pfsense-utils.inc"); require_once("pfsense-utils.inc");
require_once("interfaces.inc"); require_once("interfaces.inc");
require_once("services.inc");
/* Fix failover DHCP problem /* Fix failover DHCP problem
* http://article.gmane.org/gmane.comp.security.firewalls.pfsense.support/18749 * http://article.gmane.org/gmane.comp.security.firewalls.pfsense.support/18749
......
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
require_once("guiconfig.inc"); require_once("guiconfig.inc");
require_once("interfaces.inc"); require_once("interfaces.inc");
require_once("services.inc");
$pconfig['enable'] = isset($config['dhcrelay6']['enable']); $pconfig['enable'] = isset($config['dhcrelay6']['enable']);
if (empty($config['dhcrelay6']['interface'])) if (empty($config['dhcrelay6']['interface']))
......
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
require_once("guiconfig.inc"); require_once("guiconfig.inc");
require_once("interfaces.inc"); require_once("interfaces.inc");
require_once("services.inc");
if (!is_array($config['dyndnses']['dyndns'])) if (!is_array($config['dyndnses']['dyndns']))
$config['dyndnses']['dyndns'] = array(); $config['dyndnses']['dyndns'] = array();
......
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
require_once("guiconfig.inc"); require_once("guiconfig.inc");
require_once("interfaces.inc"); require_once("interfaces.inc");
require_once("services.inc");
if (!is_array($config['igmpproxy']['igmpentry'])) if (!is_array($config['igmpproxy']['igmpentry']))
$config['igmpproxy']['igmpentry'] = array(); $config['igmpproxy']['igmpentry'] = array();
......
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
require_once("guiconfig.inc"); require_once("guiconfig.inc");
require_once("system.inc"); require_once("system.inc");
require_once("pfsense-utils.inc"); require_once("pfsense-utils.inc");
require_once("services.inc");
if (!is_array($config['opendns'])) { if (!is_array($config['opendns'])) {
$config['opendns'] = array(); $config['opendns'] = array();
......
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
require_once("guiconfig.inc"); require_once("guiconfig.inc");
require_once("interfaces.inc"); require_once("interfaces.inc");
require_once("services.inc");
if (!is_array($config['dnsupdates']['dnsupdate'])) if (!is_array($config['dnsupdates']['dnsupdate']))
$config['dnsupdates']['dnsupdate'] = array(); $config['dnsupdates']['dnsupdate'] = array();
......
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
*/ */
require_once("guiconfig.inc"); require_once("guiconfig.inc");
require_once("services.inc");
if (!is_array($config['dnsupdates']['dnsupdate'])) { if (!is_array($config['dnsupdates']['dnsupdate'])) {
$config['dnsupdates']['dnsupdate'] = array(); $config['dnsupdates']['dnsupdate'] = array();
......
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
*/ */
require_once("guiconfig.inc"); require_once("guiconfig.inc");
require_once("services.inc");
/* Fix failover DHCP problem /* Fix failover DHCP problem
* http://article.gmane.org/gmane.comp.security.firewalls.pfsense.support/18749 * http://article.gmane.org/gmane.comp.security.firewalls.pfsense.support/18749
......
...@@ -30,6 +30,7 @@ require_once("guiconfig.inc"); ...@@ -30,6 +30,7 @@ require_once("guiconfig.inc");
require_once("unbound.inc"); require_once("unbound.inc");
require_once("system.inc"); require_once("system.inc");
require_once("pfsense-utils.inc"); require_once("pfsense-utils.inc");
require_once("services.inc");
function unbound_acl_id_used($id) { function unbound_acl_id_used($id) {
global $config; global $config;
......
...@@ -30,6 +30,7 @@ require_once("guiconfig.inc"); ...@@ -30,6 +30,7 @@ require_once("guiconfig.inc");
require_once("unbound.inc"); require_once("unbound.inc");
require_once("system.inc"); require_once("system.inc");
require_once("pfsense-utils.inc"); require_once("pfsense-utils.inc");
require_once("services.inc");
if(!is_array($config['unbound'])) if(!is_array($config['unbound']))
$config['unbound'] = array(); $config['unbound'] = array();
......
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
require_once("guiconfig.inc"); require_once("guiconfig.inc");
require_once("pfsense-utils.inc"); require_once("pfsense-utils.inc");
require_once("interfaces.inc"); require_once("interfaces.inc");
require_once("services.inc");
$pgtitle = array(gettext("Status"),gettext("DHCPv6 leases")); $pgtitle = array(gettext("Status"),gettext("DHCPv6 leases"));
$shortcut_section = "dhcp6"; $shortcut_section = "dhcp6";
......
...@@ -34,6 +34,7 @@ require_once("filter.inc"); ...@@ -34,6 +34,7 @@ require_once("filter.inc");
require_once("system.inc"); require_once("system.inc");
require_once("unbound.inc"); require_once("unbound.inc");
require_once("pfsense-utils.inc"); require_once("pfsense-utils.inc");
require_once("services.inc");
$pconfig['webguiproto'] = $config['system']['webgui']['protocol']; $pconfig['webguiproto'] = $config['system']['webgui']['protocol'];
$pconfig['webguiport'] = $config['system']['webgui']['port']; $pconfig['webguiport'] = $config['system']['webgui']['port'];
......
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
require_once("guiconfig.inc"); require_once("guiconfig.inc");
require_once("filter.inc"); require_once("filter.inc");
require_once("services.inc");
function default_table_entries_size() function default_table_entries_size()
{ {
......
...@@ -35,6 +35,7 @@ require_once("vpn.inc"); ...@@ -35,6 +35,7 @@ require_once("vpn.inc");
require_once("vslb.inc"); require_once("vslb.inc");
require_once("system.inc"); require_once("system.inc");
require_once("pfsense-utils.inc"); require_once("pfsense-utils.inc");
require_once("services.inc");
$pconfig['proxyurl'] = $config['system']['proxyurl']; $pconfig['proxyurl'] = $config['system']['proxyurl'];
$pconfig['proxyport'] = $config['system']['proxyport']; $pconfig['proxyport'] = $config['system']['proxyport'];
......
...@@ -33,6 +33,7 @@ require_once("system.inc"); ...@@ -33,6 +33,7 @@ require_once("system.inc");
require_once("unbound.inc"); require_once("unbound.inc");
require_once("pfsense-utils.inc"); require_once("pfsense-utils.inc");
require_once("interfaces.inc"); require_once("interfaces.inc");
require_once("services.inc");
function get_locale_list() function get_locale_list()
{ {
......
...@@ -33,6 +33,7 @@ $nocsrf = true; ...@@ -33,6 +33,7 @@ $nocsrf = true;
require_once("guiconfig.inc"); require_once("guiconfig.inc");
require_once("pfsense-utils.inc"); require_once("pfsense-utils.inc");
require_once("widgets/include/dyn_dns_status.inc"); require_once("widgets/include/dyn_dns_status.inc");
require_once("services.inc");
if (!is_array($config['dyndnses']['dyndns'])) { if (!is_array($config['dyndnses']['dyndns'])) {
$config['dyndnses']['dyndns'] = array(); $config['dyndnses']['dyndns'] = array();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment