From e500529d05d9045073b4ab0668fefacc33630af7 Mon Sep 17 00:00:00 2001
From: marostegui <noreply@pandorafms.org>
Date: Thu, 27 Sep 2007 15:12:49 +0000
Subject: [PATCH] 2007-09-27  Manuel Arostegui <marostegui@artica.es>

       * operation/events/events.php: Fixed some problems
         similar to bug #1801301.

       * godmode/agentes/modificar_agente.php: Fixed some problems
         similar to bug #180130.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@661 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
---
 pandora_console/ChangeLog                       |  7 +++++++
 .../godmode/agentes/modificar_agente.php        | 14 +++++++++++++-
 pandora_console/operation/events/events.php     | 17 +++++++++++++----
 3 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index f48e528bd2..58ea8b23d6 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,10 @@
+2007-09-27  Manuel Arostegui <marostegui@artica.es>
+
+       * operation/events/events.php: Fixed some problems
+	 similar to bug #1801301.
+
+       * godmode/agentes/modificar_agente.php: Fixed some problems
+         similar to bug #180130.
 
 2007-09-24  Sancho Lerena <slerena@gmail.com>
 
diff --git a/pandora_console/godmode/agentes/modificar_agente.php b/pandora_console/godmode/agentes/modificar_agente.php
index 6348c50b0f..7000e5c6ee 100644
--- a/pandora_console/godmode/agentes/modificar_agente.php
+++ b/pandora_console/godmode/agentes/modificar_agente.php
@@ -37,6 +37,18 @@ if (isset($_GET["offset"]))
 else
 	$offset = 0;
 
+if (isset($_GET["group_id"]))
+                $group_id = entrada_limpia($_GET["group_id"]);
+        else
+                $group_id = 0;
+
+        if (isset($_POST["ag_group"]))
+                        $ag_group = $_POST["ag_group"];
+                elseif (isset($_GET["group_id"]))
+                $ag_group = $_GET["group_id"];
+        else
+                $ag_group = -1;
+
 if (isset($_GET["borrar_agente"])){ // if delete agent
 	$id_agente = entrada_limpia($_GET["borrar_agente"]);
 	$agent_name = dame_nombre_agente($id_agente);
@@ -146,7 +158,7 @@ $row2=mysql_fetch_array($result2);
 $total_events = $row2[0];
 
 // Prepare pagination
-pagination ($total_events, "index.php?sec=gagente&sec2=godmode/agentes/modificar_agente", $offset);
+pagination ($total_events, "index.php?sec=gagente&sec2=godmode/agentes/modificar_agente&group_id=$ag_group", $offset);
 echo "<div style='height: 20px'> </div>";
 
 if (mysql_num_rows($result)){
diff --git a/pandora_console/operation/events/events.php b/pandora_console/operation/events/events.php
index 85129dbf1d..ec3b7b54d1 100644
--- a/pandora_console/operation/events/events.php
+++ b/pandora_console/operation/events/events.php
@@ -151,9 +151,18 @@ $offset=0;
 if (isset($_GET["offset"]))
 	$offset=$_GET["offset"];
 
-$ev_group = -1;
+if (isset($_GET["group_id"]))
+                $group_id = entrada_limpia($_GET["group_id"]);
+        else
+                $group_id = 0;
+
 if (isset($_POST["ev_group"]))
-	$ev_group = $_POST["ev_group"];
+                        $ev_group = $_POST["ev_group"];
+                elseif (isset($_GET["group_id"]))
+                $ev_group = $_GET["group_id"];
+        else
+                $ev_group = -1;
+
 
 $event="All";
 if (isset($_POST["event"]))
@@ -227,7 +236,7 @@ $total_events = $row3[0];
 // Show pagination header
 
 if ($total_events > 0){
-	pagination($total_events, "index.php?sec=eventos&sec2=operation/events/events", $offset);		
+	pagination ($total_events, "index.php?sec=eventos&sec2=operation/events/events&group_id=$ev_group&refr=60", $offset);		
 	// Show data.
 		
 	echo "<br>";
@@ -338,4 +347,4 @@ echo "<br>";
 echo "<img src='images/page_lightning.png'> - ".$lang_label["create_incident"];
 echo "</td></tr></table>";
 } // no events to show
-?>
\ No newline at end of file
+?>