From 77d8ea31eb3f581ef6ee269bec1b079fff48d7eb Mon Sep 17 00:00:00 2001 From: zarzuelo Date: Thu, 13 Dec 2012 17:18:49 +0000 Subject: [PATCH] 2012-12-13 Sergio Martin * include/functions_config.php: Changed parameter names of some replication event options of the setup git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7279 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 5 +++ pandora_console/include/functions_config.php | 34 +++++++++++++------- 2 files changed, 27 insertions(+), 12 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 93aa60954e..04fa2c9056 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,8 @@ +2012-12-13 Sergio Martin + + * include/functions_config.php: Changed parameter names of + some replication event options of the setup + 2012-12-13 Miguel de Dios * godmode/agentes/module_manager_editor.php, diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php index dad75e74de..2616fa5746 100644 --- a/pandora_console/include/functions_config.php +++ b/pandora_console/include/functions_config.php @@ -129,10 +129,12 @@ function config_update_config () { config_update_value ('activate_netflow', (bool) get_parameter ('activate_netflow')); config_update_value ('event_replication', (int)get_parameter('event_replication')); config_update_value ('replication_interval', (int)get_parameter('replication_interval')); - config_update_value ('replication_host', (string)get_parameter('replication_host')); - config_update_value ('replication_database', (string)get_parameter('replication_database')); - config_update_value ('replication_user', (string)get_parameter('replication_user')); - config_update_value ('replication_password', (string)get_parameter('replication_password')); + config_update_value ('replication_dbhost', (string)get_parameter('replication_dbhost')); + config_update_value ('replication_dbname', (string)get_parameter('replication_dbname')); + config_update_value ('replication_dbuser', (string)get_parameter('replication_dbuser')); + config_update_value ('replication_dbpass', (string)get_parameter('replication_dbpass')); + config_update_value ('replication_dbport', (string)get_parameter('replication_dbport')); + config_update_value ('replication_mode', (string)get_parameter('replication_mode')); config_update_value ('public_url', get_parameter('public_url')); config_update_value ('referer_security', get_parameter('referer_security')); @@ -443,20 +445,28 @@ function config_process_config () { config_update_value ('replication_interval', 120); } - if (!isset ($config["replication_host"])) { - config_update_value ('replication_host', ""); + if (!isset ($config["replication_dbhost"])) { + config_update_value ('replication_dbhost', ""); } - if (!isset ($config["replication_database"])) { - config_update_value ('replication_database', ""); + if (!isset ($config["replication_dbname"])) { + config_update_value ('replication_dbname', ""); } - if (!isset ($config["replication_user"])) { - config_update_value ('replication_user', ""); + if (!isset ($config["replication_dbuser"])) { + config_update_value ('replication_dbuser', ""); } - if (!isset ($config["replication_password"])) { - config_update_value ('replication_password', ""); + if (!isset ($config["replication_dbpass"])) { + config_update_value ('replication_dbpass', ""); + } + + if (!isset ($config["replication_dbport"])) { + config_update_value ('replication_dbport', ""); + } + + if (!isset ($config["replication_mode"])) { + config_update_value ('replication_mode', "only_validated"); } if (!isset ($config["font_size"])) {