From 7efed2db66e865a389d252f8419a7ac842c62027 Mon Sep 17 00:00:00 2001 From: ramonn Date: Fri, 13 Sep 2013 14:21:22 +0000 Subject: [PATCH] 2013-09-13 Ramon Novoa * godmode/setup/setup_netflow.php: Added a help tip to the configuration token "Daemon interval". * include/functions_agents.php: Fixed an invalid call to config_agents_has_remote_configuration. Remote configuration files were not being deleted. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8767 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 9 +++++++++ pandora_console/godmode/setup/setup_netflow.php | 3 ++- pandora_console/include/functions_agents.php | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 71f358b3ff..cb02b198f3 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,12 @@ +2013-09-13 Ramon Novoa + + * godmode/setup/setup_netflow.php: Added a help tip to the + configuration token "Daemon interval". + + * include/functions_agents.php: Fixed an invalid call to + config_agents_has_remote_configuration. Remote configuration + files were not being deleted. + 2013-09-12 Ramon Novoa * godmode/snmpconsole/snmp_alert.php: Fixed pagination (was not working diff --git a/pandora_console/godmode/setup/setup_netflow.php b/pandora_console/godmode/setup/setup_netflow.php index 39b4cc75c5..a2def2f8ad 100644 --- a/pandora_console/godmode/setup/setup_netflow.php +++ b/pandora_console/godmode/setup/setup_netflow.php @@ -43,7 +43,8 @@ $table->data = array (); $table->data[0][0] = '' . __('Data storage path') . '' . ui_print_help_tip (__("Directory where netflow data will be stored."), true); $table->data[0][1] = html_print_input_text ('netflow_path', $config['netflow_path'], false, 50, 200, true); -$table->data[1][0] = '' . __('Daemon interval') . ''; +$table->data[1][0] = '' . __('Daemon interval') . '' . + ui_print_help_tip (__("Specifies the time interval in seconds to rotate netflow data files."), true); $table->data[1][1] = html_print_input_text ('netflow_interval', $config['netflow_interval'], false, 50, 200, true); $table->data[2][0] = '' . __('Daemon binary path') . ''; $table->data[2][1] = html_print_input_text ('netflow_daemon', $config['netflow_daemon'], false, 50, 200, true); diff --git a/pandora_console/include/functions_agents.php b/pandora_console/include/functions_agents.php index 84c33d08bb..72c25ba233 100644 --- a/pandora_console/include/functions_agents.php +++ b/pandora_console/include/functions_agents.php @@ -1671,7 +1671,7 @@ function agents_delete_agent ($id_agents, $disableACL = false) { if (enterprise_installed()) { if (isset ($config["remote_config"])) { enterprise_include_once('include/functions_config_agents.php'); - if (enterprise_hook('config_agents_has_remote_configuration', $id_agent)) { + if (enterprise_hook('config_agents_has_remote_configuration', array($id_agent))) { $agent_name = agents_get_name($id_agent); $agent_name = io_safe_output($agent_name); $agent_md5 = md5 ($agent_name, false);