Use 0 as fallback value for ipsec_ph

This commit is contained in:
Ely Deckers 2022-02-21 09:11:42 +01:00
parent 9d46326dbb
commit 0d8d75a08b
1 changed files with 5 additions and 5 deletions

View File

@ -811,16 +811,16 @@ class Command
} }
if ($value_key == "disabled") { if ($value_key == "disabled") {
return Util::result("0"); return Util::result(0);
} }
$maybe_ike_match = Util::array_first($config["ipsec"]["phase1"], fn($d) => $d["ikeid"] == $ike_id); $maybe_ike_match = Util::array_first($config["ipsec"]["phase1"], fn($d) => $d["ikeid"] == $ike_id);
if (empty($maybe_ike_match)) { if (empty($maybe_ike_match)) {
return Util::result(""); return Util::result(0);
} }
if (!array_key_exists($value_key, $maybe_ike_match)) { if (!array_key_exists($value_key, $maybe_ike_match)) {
return Util::result(""); return Util::result(0);
} }
return Util::result(self::get_value_mapping("ipsec.$value_key", $maybe_ike_match[$value_key])); return Util::result(self::get_value_mapping("ipsec.$value_key", $maybe_ike_match[$value_key]));
@ -834,7 +834,7 @@ class Command
$valuecfr = explode(".", $value_key); $valuecfr = explode(".", $value_key);
$value = "0"; $value = 0;
if ($valuecfr[0] == "status") { if ($valuecfr[0] == "status") {
$ids = explode(".", $uniqid); $ids = explode(".", $uniqid);
$status_key = (isset($valuecfr[1])) ? $valuecfr[1] : "state"; $status_key = (isset($valuecfr[1])) ? $valuecfr[1] : "state";
@ -848,7 +848,7 @@ class Command
$result = ($value_key != "disabled") ? $result = ($value_key != "disabled") ?
self::get_value_mapping("ipsec_ph2." . $value_key, $maybe_data[$value_key]) : self::get_value_mapping("ipsec_ph2." . $value_key, $maybe_data[$value_key]) :
"1"; 1;
return Util::result($result); return Util::result($result);
} }