dani
/
pfsense-zabbix
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fallback to empty array when null

This commit is contained in:
Ely Deckers 2022-02-21 12:26:43 +01:00
parent dd578c70c8
commit 32a42bcad4
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pfsense_zbx.php
View File

@ -199,12 +199,12 @@ class PfEnv
public static function get_services() public static function get_services()
{ {
return self::call_pfsense_method_with_same_name_and_arguments(func_get_args()); return self::call_pfsense_method_with_same_name_and_arguments(func_get_args()) ?: [];
} }
public static function get_smart_drive_list() public static function get_smart_drive_list()
{ {
return self::call_pfsense_method_with_same_name_and_arguments(func_get_args()); return self::call_pfsense_method_with_same_name_and_arguments(func_get_args()) ?: [];
} }
public static function get_ipsecifnum() public static function get_ipsecifnum()
@ -244,7 +244,7 @@ class PfEnv
public static function ipsec_list_sa() public static function ipsec_list_sa()
{ {
return self::call_pfsense_method_with_same_name_and_arguments(func_get_args()); return self::call_pfsense_method_with_same_name_and_arguments(func_get_args()) ?: [];
} }
public static function is_service_enabled() public static function is_service_enabled()
@ -254,12 +254,12 @@ class PfEnv
public static function openvpn_get_active_clients() public static function openvpn_get_active_clients()
{ {
return self::call_pfsense_method_with_same_name_and_arguments(func_get_args()); return self::call_pfsense_method_with_same_name_and_arguments(func_get_args()) ?: [];
} }
public static function openvpn_get_active_servers() public static function openvpn_get_active_servers()
{ {
return self::call_pfsense_method_with_same_name_and_arguments(func_get_args()); return self::call_pfsense_method_with_same_name_and_arguments(func_get_args()) ?: [];
} }
public static function return_gateways_status() public static function return_gateways_status()
@ -862,9 +862,9 @@ class Command
{ {
// Get Value from IPsec Phase 1 Configuration // Get Value from IPsec Phase 1 Configuration
// If Getting "disabled" value only check item presence in config array // If Getting "disabled" value only check item presence in config array
PfEnv::init_config_arr(["ipsec", "phase1"]);
$config = PfEnv::cfg(); $config = PfEnv::cfg();
PfEnv::init_config_arr(["ipsec", "phase1"]);
$a_phase2 = $config["ipsec"]["phase1"] ?: [];
if ($value_key == "status") { if ($value_key == "status") {
return Util::result(Command::get_ipsec_status($ike_id)); return Util::result(Command::get_ipsec_status($ike_id));
@ -874,7 +874,7 @@ class Command
return Util::result(FALLBACK_VALUE); return Util::result(FALLBACK_VALUE);
} }
$maybe_ike_match = Util::array_first(fn($d) => $d["ikeid"] == $ike_id, $config["ipsec"]["phase1"]); $maybe_ike_match = Util::array_first(fn($d) => $d["ikeid"] == $ike_id, $a_phase2);
if (empty($maybe_ike_match)) { if (empty($maybe_ike_match)) {
return Util::result(FALLBACK_VALUE); return Util::result(FALLBACK_VALUE);
} }
@ -890,7 +890,7 @@ class Command
{ {
$config = PfEnv::cfg(); $config = PfEnv::cfg();
PfEnv::init_config_arr(array("ipsec", "phase2")); PfEnv::init_config_arr(array("ipsec", "phase2"));
$a_phase2 = &$config["ipsec"]["phase2"]; $a_phase2 = $config["ipsec"]["phase2"] ?: [];
$valuecfr = explode(".", $value_key); $valuecfr = explode(".", $value_key);
@ -1072,7 +1072,7 @@ class Command
return $default; return $default;
} }
$maybe_conn = Util::array_first(fn($conn) => ($conn["common_name"] == $user_id), $maybe_server["conns"]); $maybe_conn = Util::array_first(fn($conn) => ($conn["common_name"] == $user_id), $maybe_server["conns"] ?: []);
return $maybe_conn[$value_key] ?: $default; return $maybe_conn[$value_key] ?: $default;
} }