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

2013-09-13 Ramon Novoa <rnovoa@artica.es> 

* 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
This commit is contained in:
Ramon Novoa 2013-09-13 14:21:22 +00:00
parent 3ad7b105eb
commit 9b85c6630c
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pandora_console/ChangeLog
View File

@ -1,3 +1,12 @@
2013-09-13 Ramon Novoa <rnovoa@artica.es>
* 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 <rnovoa@artica.es>
* godmode/snmpconsole/snmp_alert.php: Fixed pagination (was not working

3
pandora_console/godmode/setup/setup_netflow.php
View File

@ -43,7 +43,8 @@ $table->data = array ();
$table->data[0][0] = '<b>' . __('Data storage path') . '</b>' .
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] = '<b>' . __('Daemon interval') . '</b>';
$table->data[1][0] = '<b>' . __('Daemon interval') . '</b>' .
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] = '<b>' . __('Daemon binary path') . '</b>';
$table->data[2][1] = html_print_input_text ('netflow_daemon', $config['netflow_daemon'], false, 50, 200, true);

2
pandora_console/include/functions_agents.php
View File

@ -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);