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

2013-10-24 Sergio Martin <sergio.martin@artica.es> 

* godmode/agentes/module_manager_editor_common.php: Store the 
	interval factor in modules edition when is policy form and other
	improvements. Incident #303



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8955 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
zarzuelo 2013-10-24 15:53:07 +00:00
parent 2125245841
commit 3859e2fdf8
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/ChangeLog
View File

@ -1,3 +1,9 @@
2013-10-24 Sergio Martin <sergio.martin@artica.es>
* godmode/agentes/module_manager_editor_common.php: Store the
interval factor in modules edition when is policy form and other
improvements. Incident #303
2013-10-23 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_api.php: fixed the get events filtered by the

14
pandora_console/godmode/agentes/module_manager_editor_common.php
View File

@ -311,8 +311,20 @@ if ($moduletype == MODULE_DATA) {
if (isset($id_agente)) {
$agent_interval = agents_get_interval ($id_agente);
$interval_factor = $interval / $agent_interval;
$table_advanced->data[2][1] = human_time_description_raw($interval) . ' (' . sprintf(__('Agent interval x %s'), $interval_factor) . ') ' . ui_print_help_icon ('module_interval_factor', true);
}
$table_advanced->data[2][1] = human_time_description_raw($interval) . ' (' . sprintf(__('Agent interval x %s'), $interval_factor) . ') ' . ui_print_help_icon ('module_interval_factor', true);
else {
$table_advanced->data[2][1] = sprintf(__('Agent interval x %s'), $interval_factor) . ui_print_help_icon ('module_interval_factor', true);
}
if ($__code_from == 'policies') {
// If is the policy form, module_interval will store the factor (not the seconds).
// So server will transform it to interval in seconds
$table_advanced->data[2][1] .= html_print_input_hidden('module_interval', $interval_factor, true);
}
// If it is a non policy form, the module_interval will not provided and will
// be taken the agent interval (this code is at configurar_agente.php)
}
else {
$table_advanced->data[2][0] = __('Interval') . ui_print_help_icon ('module_interval', true);