From 2fa1fb5ea3b45dcc6188f2c4a157d15e08c15bed Mon Sep 17 00:00:00 2001 From: Fermin Date: Mon, 21 May 2018 09:49:44 +0200 Subject: [PATCH] [Rebranding] Fixed double safe input in product name and copyright notice --- pandora_console/include/functions_config.php | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php index 7a54b60679..fd27a72723 100644 --- a/pandora_console/include/functions_config.php +++ b/pandora_console/include/functions_config.php @@ -247,9 +247,9 @@ function config_update_config () { $error_update[] = __('Metaconsole agent cache'); if (!config_update_value ('log_collector', (bool)get_parameter('log_collector'))) $error_update[] = __('Activate Log Collector'); - if (!config_update_value ('rb_product_name', (string)get_parameter('rb_product_name'))) + if (!config_update_value ('rb_product_name', get_parameter('rb_product_name'))) $error_update[] = __('Product name'); - if (!config_update_value ('rb_copyright_notice', (string)get_parameter('rb_copyright_notice'))) + if (!config_update_value ('rb_copyright_notice', get_parameter('rb_copyright_notice'))) $error_update[] = __('Copyright notice'); $inventory_changes_blacklist = get_parameter('inventory_changes_blacklist', array()); @@ -1051,6 +1051,14 @@ function config_process_config () { config_update_value ('log_collector', 0); } + if (!isset ($config['rb_product_name'])) { + config_update_value('rb_product_name', get_product_name()); + } + + if (!isset ($config['rb_copyright_notice'])) { + config_update_value('rb_copyright_notice', get_copyright_notice()); + } + if (!isset ($config["reset_pass_option"])) { config_update_value ('reset_pass_option', 0); }