diff --git a/src/etc/inc/plugins.inc.d/ipsec.inc b/src/etc/inc/plugins.inc.d/ipsec.inc index adcd01237..95357d158 100644 --- a/src/etc/inc/plugins.inc.d/ipsec.inc +++ b/src/etc/inc/plugins.inc.d/ipsec.inc @@ -351,8 +351,6 @@ function ipsec_get_phase1_src(&$ph1ent) */ function ipsec_idinfo_to_cidr(&$idinfo, $addrbits = false, $mode = '') { - global $config; - switch ($idinfo['type']) { case "address": if ($addrbits) { @@ -558,8 +556,10 @@ function ipsec_mobilekey_sort() function ipsec_get_number_of_phase2($ikeid) { global $config; + $a_phase2 = $config['ipsec']['phase2']; - $nbph2=0; + $nbph2 = 0; + if (is_array($a_phase2) && count($a_phase2)) { foreach ($a_phase2 as $ph2tmp) { if ($ph2tmp['ikeid'] == $ikeid) { @@ -567,6 +567,7 @@ function ipsec_get_number_of_phase2($ikeid) } } } + return $nbph2; } diff --git a/src/etc/inc/plugins.inc.d/openssh.inc b/src/etc/inc/plugins.inc.d/openssh.inc index 44b8b1e92..a21fa2319 100644 --- a/src/etc/inc/plugins.inc.d/openssh.inc +++ b/src/etc/inc/plugins.inc.d/openssh.inc @@ -47,8 +47,6 @@ function openssh_configure() function openssh_services() { - global $config; - $services = array(); if (openssh_enabled()) { diff --git a/src/etc/inc/plugins.inc.d/openvpn.inc b/src/etc/inc/plugins.inc.d/openvpn.inc index 5e179ccae..2f04b1d81 100644 --- a/src/etc/inc/plugins.inc.d/openvpn.inc +++ b/src/etc/inc/plugins.inc.d/openvpn.inc @@ -468,8 +468,6 @@ function openvpn_add_keyfile($data, &$conf, $mode_id, $directive, $opt = '') function openvpn_reconfigure($mode, $settings, $device_only = false) { - global $config; - if (empty($settings)) { return; } @@ -914,8 +912,6 @@ function openvpn_reconfigure($mode, $settings, $device_only = false) function openvpn_restart($mode, $settings) { - global $config; - $vpnid = $settings['vpnid']; $mode_id = $mode.$vpnid; @@ -953,8 +949,6 @@ function openvpn_restart($mode, $settings) function openvpn_delete($mode, &$settings) { - global $config; - $vpnid = $settings['vpnid']; $mode_id = $mode.$vpnid; diff --git a/src/etc/inc/plugins.inc.d/unbound.inc b/src/etc/inc/plugins.inc.d/unbound.inc index b79907a6c..c622c878e 100644 --- a/src/etc/inc/plugins.inc.d/unbound.inc +++ b/src/etc/inc/plugins.inc.d/unbound.inc @@ -79,8 +79,6 @@ function unbound_xmlrpc_sync() function unbound_optimization() { - global $config; - $optimization_settings = array(); /*