tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2012-12-13 Sergio Martin <sergio.martin@artica.es> 

* 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
This commit is contained in:
zarzuelo 2012-12-13 17:18:49 +00:00
parent 53162b4e9a
commit 77d8ea31eb
2 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_console/ChangeLog
View File

@ -1,3 +1,8 @@
2012-12-13 Sergio Martin <sergio.martin@artica.es>
* include/functions_config.php: Changed parameter names of
some replication event options of the setup
2012-12-13 Miguel de Dios <miguel.dedios@artica.es> 2012-12-13 Miguel de Dios <miguel.dedios@artica.es>
* godmode/agentes/module_manager_editor.php, * godmode/agentes/module_manager_editor.php,

34
pandora_console/include/functions_config.php
View File

@ -129,10 +129,12 @@ function config_update_config () {
config_update_value ('activate_netflow', (bool) get_parameter ('activate_netflow')); config_update_value ('activate_netflow', (bool) get_parameter ('activate_netflow'));
config_update_value ('event_replication', (int)get_parameter('event_replication')); config_update_value ('event_replication', (int)get_parameter('event_replication'));
config_update_value ('replication_interval', (int)get_parameter('replication_interval')); config_update_value ('replication_interval', (int)get_parameter('replication_interval'));
config_update_value ('replication_host', (string)get_parameter('replication_host')); config_update_value ('replication_dbhost', (string)get_parameter('replication_dbhost'));
config_update_value ('replication_database', (string)get_parameter('replication_database')); config_update_value ('replication_dbname', (string)get_parameter('replication_dbname'));
config_update_value ('replication_user', (string)get_parameter('replication_user')); config_update_value ('replication_dbuser', (string)get_parameter('replication_dbuser'));
config_update_value ('replication_password', (string)get_parameter('replication_password')); 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 ('public_url', get_parameter('public_url'));
config_update_value ('referer_security', get_parameter('referer_security')); config_update_value ('referer_security', get_parameter('referer_security'));
@ -443,20 +445,28 @@ function config_process_config () {
config_update_value ('replication_interval', 120); config_update_value ('replication_interval', 120);
} }
if (!isset ($config["replication_host"])) { if (!isset ($config["replication_dbhost"])) {
config_update_value ('replication_host', ""); config_update_value ('replication_dbhost', "");
} }
if (!isset ($config["replication_database"])) { if (!isset ($config["replication_dbname"])) {
config_update_value ('replication_database', ""); config_update_value ('replication_dbname', "");
} }
if (!isset ($config["replication_user"])) { if (!isset ($config["replication_dbuser"])) {
config_update_value ('replication_user', ""); config_update_value ('replication_dbuser', "");
} }
if (!isset ($config["replication_password"])) { if (!isset ($config["replication_dbpass"])) {
config_update_value ('replication_password', ""); 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"])) { if (!isset ($config["font_size"])) {