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
This commit is contained in:
marostegui 2007-09-27 15:12:49 +00:00
parent c206e7231d
commit e500529d05
3 changed files with 33 additions and 5 deletions

View File

@ -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>

View File

@ -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)){

View File

@ -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
?>
?>