tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-31 01:35:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-9631-14357-No-se-guardan-los-cambios-en-Setup-Setup-Performance' into 'develop'

Browse Source 
fix several problems in history db settings

See merge request artica/pandorafms!5188
This commit is contained in:
Daniel Rodriguez 2022-10-20 07:21:11 +00:00
commit 6657052308
2 changed files with 27 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pandora_console/include/functions_config.php
View File

@ -1580,9 +1580,10 @@ function config_update_config()
} }
$history_db_string_days = get_parameter('history_db_string_days'); $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 || $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'); $error_update[] = __('String Days');
} }
@ -1846,7 +1847,7 @@ function config_update_config()
$config['error_config_update_config']['correct'] = false; $config['error_config_update_config']['correct'] = false;
$values = implode('<br> -', $error_update); $values = implode('<br> -', $error_update);
$config['error_config_update_config']['message'] = sprintf( $config['error_config_update_config']['message'] = sprintf(
__('Failed updated: the next values cannot update: <br> -%s'), __('Update failed. The next values could not be updated: <br> -%s'),
$values $values
); );

44
pandora_console/include/lib/Core/Config.php
View File

@ -69,7 +69,7 @@ final class Config
$link->options(MYSQLI_OPT_CONNECT_TIMEOUT, 2); $link->options(MYSQLI_OPT_CONNECT_TIMEOUT, 2);
$rc = mysqli_real_connect( $rc = mysqli_real_connect(
$link, $link,
$$config['history_db_host'], $config['history_db_host'],
$config['history_db_user'], $config['history_db_user'],
io_output_password($config['history_db_pass']), io_output_password($config['history_db_pass']),
$config['history_db_name'], $config['history_db_name'],
@ -90,29 +90,31 @@ final class Config
} }
ob_get_clean(); ob_get_clean();
}
if ($config['history_db_connection'] !== false) { if (isset($config['history_db_connection']) === true
$data = \db_get_all_rows_sql( && $config['history_db_connection'] !== false
'SELECT * FROM `tconfig`', ) {
false, $data = \db_get_all_rows_sql(
false, 'SELECT * FROM `tconfig`',
$config['history_db_connection'] 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 (is_array($data) !== true) {
return [];
}
self::$settings = array_reduce(
$data,
function ($carry, $item) {
$carry[$item['token']] = $item['value'];
return $carry;
},
[]
);
} }