From 2d68e76b00e0694422e6d4a480398ea1123729a7 Mon Sep 17 00:00:00 2001 From: zarzuelo Date: Tue, 13 Jul 2010 13:02:40 +0000 Subject: [PATCH] 2010-07-13 Sergio Martin * operation/agentes/datos_agente.php: Putted back data range filter into raw data of the modules for bug: 3023769 git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3001 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 5 +++++ .../operation/agentes/datos_agente.php | 17 +++++++++++++++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 2898c566b5..7a138dddca 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,8 @@ +2010-07-13 Sergio Martin + + * operation/agentes/datos_agente.php: Putted back data range + filter into raw data of the modules for bug: 3023769 + 2010-07-13 Darío Rodríguez * include/help/en/help_reporting_main_tab.php: Added help for report diff --git a/pandora_console/operation/agentes/datos_agente.php b/pandora_console/operation/agentes/datos_agente.php index edeb6e1cd6..43e6b35e4e 100644 --- a/pandora_console/operation/agentes/datos_agente.php +++ b/pandora_console/operation/agentes/datos_agente.php @@ -21,8 +21,10 @@ global $config; check_login(); $module_id = get_parameter_get ("id", 0); -$period = get_parameter_get ("period", 86400); +$period = get_parameter ("period", 86400); $group = get_agentmodule_group ($module_id); +$agentId = get_parameter("id_agente"); + if (! give_acl ($config['id_user'], $group, "AR") || $module_id == 0) { audit_db ($config['id_user'], $_SERVER['REMOTE_ADDR'], "ACL Violation", @@ -101,10 +103,21 @@ if ($result === false) { $result = array (); } -$header_title = __('Received data from')." ".get_agentmodule_agent_name ($module_id)." / ".get_agentmodule_name ($module_id). " - " . human_time_description ($period); +$header_title = __('Received data from')." ".get_agentmodule_agent_name ($module_id)." / ".get_agentmodule_name ($module_id); +$header_title .= "

" . __("From the last") . " " . human_time_description ($period); echo "

".$header_title. "

"; +echo "
"; +echo __("Choose a time from now") . ": "; +$intervals = array (); +$intervals[3600] = human_time_description_raw (3600); // 1 hour +$intervals[86400] = human_time_description_raw (86400); // 1 day +$intervals[604800] = human_time_description_raw (604800); // 1 week +$intervals[2592000] = human_time_description_raw (2592000); // 1 month +echo print_extended_select_for_time ($intervals, 'period', $period, 'this.form.submit();', '', '0', 10) . __(" seconds."); +echo "

"; + // $index = 0; foreach($columns as $col => $attr){