From c3695d6345750e80922868a55b9f00fae32dc91b Mon Sep 17 00:00:00 2001 From: Ely Deckers Date: Sun, 20 Feb 2022 15:09:28 +0100 Subject: [PATCH] Simplify and fix Command::system --- pfsense_zbx.php | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/pfsense_zbx.php b/pfsense_zbx.php index dbadc90..5f43bf4 100644 --- a/pfsense_zbx.php +++ b/pfsense_zbx.php @@ -804,18 +804,15 @@ class Commands } $system_pkg_version = PfEnv::get_system_pkg_version(); - $version = $system_pkg_version["version"]; - $installed_version = $system_pkg_version["installed_version"]; - if ($section === "new_version_available") { - return Util::result(Util::b2int($version != $installed_version), true); + return Util::result( + Util::b2int($system_pkg_version["version"] != $system_pkg_version["installed_version"]), + true); } - if (array_key_exists($section, $system_pkg_version)) { - return Util::result($system_pkg_version[$section], true); - } + $is_known_section = array_key_exists($section, $system_pkg_version); - return Util::result("version", true); + return Util::result($is_known_section ? $system_pkg_version[$section] : "", true); } public static function ipsec_ph1($ike_id, $value_key)