From 129150fbbce30caaab55d03b3fe58c29f499567f Mon Sep 17 00:00:00 2001 From: kim-fitness <47587743+kim-fitness@users.noreply.github.com> Date: Tue, 15 Sep 2020 20:26:54 +0800 Subject: [PATCH] Fix issue #3793 (#3803) * Update CHANGELOG * Update functions.php --- CHANGELOG | 1 + lib/functions.php | 36 +++++++++++++++++++++--------------- 2 files changed, 22 insertions(+), 15 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index c4bd71d6be..65ca8fa86d 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -24,6 +24,7 @@ Cacti CHANGELOG -issue#3781: Cacti V1.2.14 php backtraces on Auth.php errors upon login -issue#3786: Cacti 1.2.12 Realtime index errors -issue#3790: Error Upgrading Cacti from Pre 1.x from Recent MariaDB version +-issue#3793: Calling function read_config_option in plugin's setup.php leads to error -feature: Update FontAwesome to Version 5.14 1.2.14 diff --git a/lib/functions.php b/lib/functions.php index b49d4a75de..74f231e064 100644 --- a/lib/functions.php +++ b/lib/functions.php @@ -385,19 +385,23 @@ function config_value_exists($config_name) { function read_default_config_option($config_name) { global $config, $settings; - if (is_array($settings)) { - foreach ($settings as $tab_array) { - if (isset($tab_array[$config_name]) && isset($tab_array[$config_name]['default'])) { - return $tab_array[$config_name]['default']; - } else { - foreach ($tab_array as $field_array) { - if (isset($field_array['items']) && isset($field_array['items'][$config_name]) && isset($field_array['items'][$config_name]['default'])) { - return $field_array['items'][$config_name]['default']; + if (isset($settings)) { + if (is_array($settings)) { + foreach ($settings as $tab_array) { + if (isset($tab_array[$config_name]) && isset($tab_array[$config_name]['default'])) { + return $tab_array[$config_name]['default']; + } else { + foreach ($tab_array as $field_array) { + if (isset($field_array['items']) && isset($field_array['items'][$config_name]) && isset($field_array['items'][$config_name]['default'])) { + return $field_array['items'][$config_name]['default']; + } } } } } } + + return null; } /* read_config_option - finds the current value of a Cacti configuration setting @@ -457,14 +461,16 @@ function read_config_option($config_name, $force = false) { $value = $db_setting['value']; } - // Store whatever value we have in the array - $config_array[$config_name] = $value; + if ($value != null) { + // Store whatever value we have in the array + $config_array[$config_name] = $value; - // Store the array back for later retrieval - if (isset($_SESSION)) { - $_SESSION['sess_config_array'] = $config_array; - } else { - $config['config_options_array'] = $config_array; + // Store the array back for later retrieval + if (isset($_SESSION)) { + $_SESSION['sess_config_array'] = $config_array; + } else { + $config['config_options_array'] = $config_array; + } } } } else {