From d485ef310e3db0e2e5129fd02a4a150a162ff58e Mon Sep 17 00:00:00 2001 From: Ad Schellevis Date: Wed, 22 Jul 2015 10:34:49 +0000 Subject: [PATCH] (legacy) cleanup vslb.inc dependencies --- src/etc/inc/functions.inc | 1 - src/etc/rc.filter_configure_xmlrpc | 1 + src/www/load_balancer_monitor.php | 1 + src/www/load_balancer_pool.php | 1 + src/www/load_balancer_relay_action.php | 1 + src/www/load_balancer_relay_protocol.php | 1 + src/www/load_balancer_setting.php | 2 ++ src/www/load_balancer_virtual_server_edit.php | 2 ++ src/www/status_services.php | 1 + 9 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/etc/inc/functions.inc b/src/etc/inc/functions.inc index be9b4a961..8ccacdfb3 100644 --- a/src/etc/inc/functions.inc +++ b/src/etc/inc/functions.inc @@ -32,4 +32,3 @@ require_once("interfaces.inc"); require_once("services.inc"); require_once("pfsense-utils.inc"); require_once("system.inc"); -require_once("vslb.inc"); diff --git a/src/etc/rc.filter_configure_xmlrpc b/src/etc/rc.filter_configure_xmlrpc index 956468e6b..b22b9dca8 100755 --- a/src/etc/rc.filter_configure_xmlrpc +++ b/src/etc/rc.filter_configure_xmlrpc @@ -39,6 +39,7 @@ require_once("util.inc"); require_once("xmlrpc.inc"); require_once("interfaces.inc"); require_once("openvpn.inc"); +require_once("vslb.inc"); system_routing_configure(); setup_gateways_monitor(); diff --git a/src/www/load_balancer_monitor.php b/src/www/load_balancer_monitor.php index 4f6bdf41c..e625d1f26 100644 --- a/src/www/load_balancer_monitor.php +++ b/src/www/load_balancer_monitor.php @@ -32,6 +32,7 @@ require_once("functions.inc"); require_once("filter.inc"); require_once("load_balancer_maintable.inc"); require_once("services.inc"); +require_once("vslb.inc"); if (!is_array($config['load_balancer']['monitor_type'])) { diff --git a/src/www/load_balancer_pool.php b/src/www/load_balancer_pool.php index 903e21845..47b2a9dbc 100644 --- a/src/www/load_balancer_pool.php +++ b/src/www/load_balancer_pool.php @@ -32,6 +32,7 @@ require_once("functions.inc"); require_once("filter.inc"); require_once("load_balancer_maintable.inc"); require_once("services.inc"); +require_once("vslb.inc"); if (!is_array($config['load_balancer']['lbpool'])) { diff --git a/src/www/load_balancer_relay_action.php b/src/www/load_balancer_relay_action.php index e52c10caf..d44e4d594 100644 --- a/src/www/load_balancer_relay_action.php +++ b/src/www/load_balancer_relay_action.php @@ -32,6 +32,7 @@ require_once("functions.inc"); require_once("filter.inc"); require_once("load_balancer_maintable.inc"); require_once("services.inc"); +require_once("vslb.inc"); if (!is_array($config['load_balancer']['lbaction'])) { diff --git a/src/www/load_balancer_relay_protocol.php b/src/www/load_balancer_relay_protocol.php index 71ae693c1..03ea69fc3 100644 --- a/src/www/load_balancer_relay_protocol.php +++ b/src/www/load_balancer_relay_protocol.php @@ -32,6 +32,7 @@ require_once("functions.inc"); require_once("filter.inc"); require_once("load_balancer_maintable.inc"); require_once("services.inc"); +require_once("vslb.inc"); if (!is_array($config['load_balancer']['lbprotocol'])) { diff --git a/src/www/load_balancer_setting.php b/src/www/load_balancer_setting.php index e3f759148..6afa29a50 100644 --- a/src/www/load_balancer_setting.php +++ b/src/www/load_balancer_setting.php @@ -31,6 +31,8 @@ require_once("guiconfig.inc"); require_once("functions.inc"); require_once("filter.inc"); require_once("services.inc"); +require_once("vslb.inc"); + if (!is_array($config['load_balancer']['setting'])) { $config['load_balancer']['setting'] = array(); diff --git a/src/www/load_balancer_virtual_server_edit.php b/src/www/load_balancer_virtual_server_edit.php index f3e213211..29c914709 100644 --- a/src/www/load_balancer_virtual_server_edit.php +++ b/src/www/load_balancer_virtual_server_edit.php @@ -28,6 +28,8 @@ require_once("guiconfig.inc"); require_once("services.inc"); +require_once("vslb.inc"); + $referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/load_balancer_virtual_server.php'); diff --git a/src/www/status_services.php b/src/www/status_services.php index e7d24d536..f5a6b6dc6 100644 --- a/src/www/status_services.php +++ b/src/www/status_services.php @@ -29,6 +29,7 @@ require_once("guiconfig.inc"); require_once("services.inc"); +require_once("vslb.inc"); function openvpn_restart_by_vpnid($mode, $vpnid) { $settings = openvpn_get_settings($mode, $vpnid);