From 8a4d7782697723a7c608f3c40dcbe3ea184c3e65 Mon Sep 17 00:00:00 2001
From: ramonn <noreply@pandorafms.org>
Date: Tue, 11 May 2010 18:29:19 +0000
Subject: [PATCH] 2010-05-11  Ramon Novoa  <rnovoa@artica.es>

	* operation/agentes/stat_win.php: Pass the start date to min, max and
          avg functions.

        * godmode/alerts/configure_alert_action.php: Fixed a typo.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2702 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
---
 pandora_console/ChangeLog                                 | 7 +++++++
 pandora_console/godmode/alerts/configure_alert_action.php | 2 +-
 pandora_console/operation/agentes/stat_win.php            | 6 +++---
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index a1abb2ee84..695a1ad512 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,10 @@
+2010-05-11  Ramon Novoa  <rnovoa@artica.es>
+
+	* operation/agentes/stat_win.php: Pass the start date to min, max and
+          avg functions.
+
+        * godmode/alerts/configure_alert_action.php: Fixed a typo.
+
 2010-05-11 Raúl Mateos <raulofpandora@gmail.com>
 
 	* godmode/gis_maps/configure_gis_map.php: Updated year. Clean code.
diff --git a/pandora_console/godmode/alerts/configure_alert_action.php b/pandora_console/godmode/alerts/configure_alert_action.php
index 106d588e4e..0762e1d654 100644
--- a/pandora_console/godmode/alerts/configure_alert_action.php
+++ b/pandora_console/godmode/alerts/configure_alert_action.php
@@ -43,7 +43,7 @@ if ($id) {
 	$field1 = $action['field1'];
 	$field2 = $action['field2'];
 	$field3 = $action['field3'];
-	$group = $action ['group'];
+	$group = $action ['id_group'];
 }
 // Header
 print_page_header (__('Alerts').' &raquo; '.__('Configure alert action'), "images/god2.png", false, "", true);
diff --git a/pandora_console/operation/agentes/stat_win.php b/pandora_console/operation/agentes/stat_win.php
index a2ed81c0cb..357ac38e46 100644
--- a/pandora_console/operation/agentes/stat_win.php
+++ b/pandora_console/operation/agentes/stat_win.php
@@ -168,9 +168,9 @@ else {
 
 if ($graph_type != "log4x") {
 	echo '<table width="450" cellspacing="1" cellpadding="1" class="databox" style="margin-left: 20px">';
-	echo '<tr><td><b>'.__('Max. Value').'</b>: '.format_for_graph (get_agentmodule_data_max ($id, $period));
-	echo '</td><td><b>'.__('Avg. Value').'</b>: '.format_for_graph (get_agentmodule_data_average ($id, $period));
-	echo '</td><td><b>'.__('Min. Value').'</b>: '.format_for_graph (get_agentmodule_data_min ($id, $period));
+	echo '<tr><td><b>'.__('Max. Value').'</b>: '.format_for_graph (get_agentmodule_data_max ($id, $period, $date));
+	echo '</td><td><b>'.__('Avg. Value').'</b>: '.format_for_graph (get_agentmodule_data_average ($id, $period, $date));
+	echo '</td><td><b>'.__('Min. Value').'</b>: '.format_for_graph (get_agentmodule_data_min ($id, $period, $date));
 	echo '</td></tr></table>';
 }