From 5c22b6b9625543e050de0a41e6a4f7f733afee1a Mon Sep 17 00:00:00 2001 From: vgilc Date: Wed, 20 Jun 2012 10:56:40 +0000 Subject: [PATCH] 2012-06-20 Vanessa Gil * godmode/agentes/module_manager.php operation/agentes/estado_agente.php operation/agentes/status_monitor: Changed interval format. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6618 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 6 ++++++ pandora_console/godmode/agentes/module_manager.php | 4 ++-- pandora_console/operation/agentes/estado_agente.php | 2 +- pandora_console/operation/agentes/status_monitor.php | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 20315fb99b..a45832b96a 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,9 @@ +2012-06-20 Vanessa Gil + + * godmode/agentes/module_manager.php + operation/agentes/estado_agente.php + operation/agentes/status_monitor: Changed interval format. + 2012-06-20 Sergio Martin * include/functions_agents.php diff --git a/pandora_console/godmode/agentes/module_manager.php b/pandora_console/godmode/agentes/module_manager.php index 30791e3dbb..1bc87f295f 100644 --- a/pandora_console/godmode/agentes/module_manager.php +++ b/pandora_console/godmode/agentes/module_manager.php @@ -529,10 +529,10 @@ foreach ($modules as $module) { // Module interval if ($module['module_interval']) { - $data[4] = $module['module_interval']; + $data[4] = human_time_description_raw($module['module_interval']); } else { - $data[4] = $agent_interval; + $data[4] = human_time_description_raw($agent_interval); } $data[5] = ui_print_truncate_text($module['descripcion'], 'description', false); diff --git a/pandora_console/operation/agentes/estado_agente.php b/pandora_console/operation/agentes/estado_agente.php index f5b39c4b89..e221ecfab7 100644 --- a/pandora_console/operation/agentes/estado_agente.php +++ b/pandora_console/operation/agentes/estado_agente.php @@ -487,7 +487,7 @@ foreach ($agents as $agent) { // } else { // $data[2] = $agent["intervalo"]; // } - $data[3] = $agent["intervalo"]; + $data[3] = human_time_description_raw($agent["intervalo"]); $data[4] = ui_print_group_icon ($agent["id_grupo"], true); diff --git a/pandora_console/operation/agentes/status_monitor.php b/pandora_console/operation/agentes/status_monitor.php index 8b5146c9a0..01e215909c 100644 --- a/pandora_console/operation/agentes/status_monitor.php +++ b/pandora_console/operation/agentes/status_monitor.php @@ -584,7 +584,7 @@ foreach ($result as $row) { $data[3] .= ui_print_help_tip ($row["extended_info"], true, '/images/comments.png'); } - $data[4] = ($row['module_interval'] == 0) ? $row['agent_interval'] : $row['module_interval']; + $data[4] = ($row['module_interval'] == 0) ? human_time_description_raw($row['agent_interval']) : human_time_description_raw($row['module_interval']); if($row['utimestamp'] == 0 && (($row['module_type'] < 21 || $row['module_type'] > 23) && $row['module_type'] != 100)){ $data[5] = ui_print_status_image(STATUS_MODULE_NO_DATA, __('NOT INIT'), true);