diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php index 958261274a..95b9c3c30f 100644 --- a/pandora_console/include/functions_config.php +++ b/pandora_console/include/functions_config.php @@ -1580,9 +1580,10 @@ function config_update_config() } $history_db_string_days = get_parameter('history_db_string_days'); - if (is_numeric($history_db_string_days) === false + if ((is_numeric($history_db_string_days) === false || $history_db_string_days <= 0 - || config_update_value('history_db_string_days', $history_db_string_days) === false + || config_update_value('history_db_string_days', $history_db_string_days) === false) + && get_parameter_switch('history_db_adv', 0) === 1 ) { $error_update[] = __('String Days'); } @@ -1846,7 +1847,7 @@ function config_update_config() $config['error_config_update_config']['correct'] = false; $values = implode('
-', $error_update); $config['error_config_update_config']['message'] = sprintf( - __('Failed updated: the next values cannot update:
-%s'), + __('Update failed. The next values could not be updated:
-%s'), $values ); diff --git a/pandora_console/include/lib/Core/Config.php b/pandora_console/include/lib/Core/Config.php index dbed566598..656d68f9f2 100644 --- a/pandora_console/include/lib/Core/Config.php +++ b/pandora_console/include/lib/Core/Config.php @@ -69,7 +69,7 @@ final class Config $link->options(MYSQLI_OPT_CONNECT_TIMEOUT, 2); $rc = mysqli_real_connect( $link, - $$config['history_db_host'], + $config['history_db_host'], $config['history_db_user'], io_output_password($config['history_db_pass']), $config['history_db_name'], @@ -90,29 +90,31 @@ final class Config } ob_get_clean(); + } - if ($config['history_db_connection'] !== false) { - $data = \db_get_all_rows_sql( - 'SELECT * FROM `tconfig`', - false, - false, - $config['history_db_connection'] - ); - } - - if (is_array($data) !== true) { - return []; - } - - self::$settings = array_reduce( - $data, - function ($carry, $item) { - $carry[$item['token']] = $item['value']; - return $carry; - }, - [] + if (isset($config['history_db_connection']) === true + && $config['history_db_connection'] !== false + ) { + $data = \db_get_all_rows_sql( + 'SELECT * FROM `tconfig`', + false, + false, + $config['history_db_connection'] ); } + + if (is_array($data) !== true) { + return []; + } + + self::$settings = array_reduce( + $data, + function ($carry, $item) { + $carry[$item['token']] = $item['value']; + return $carry; + }, + [] + ); }