From 7d7acae3ed394d15eb3d6081d7165e4c871f9bdd Mon Sep 17 00:00:00 2001
From: juanmanuelr <noreply@pandorafms.org>
Date: Tue, 29 Nov 2011 11:10:20 +0000
Subject: [PATCH] 2011-11-29 Juan Manuel Ramon <juanmanuel.ramon@artica.es>

	* operation/snmpconsole/snmp_view.php: Fixed trap validation when
	the trap has Id equal to 1.

	Fixes: #3439289



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5195 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
---
 pandora_console/ChangeLog                           | 7 +++++++
 pandora_console/operation/snmpconsole/snmp_view.php | 5 +++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index a97994f377..f43c144304 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,10 @@
+2011-11-29 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
+
+	* operation/snmpconsole/snmp_view.php: Fixed trap validation when
+	the trap has Id equal to 1.
+	
+	Fixes: #3439289
+
 2011-11-29 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
 
 	godmode/agentes/modificar_agente.php: Changed style in description
diff --git a/pandora_console/operation/snmpconsole/snmp_view.php b/pandora_console/operation/snmpconsole/snmp_view.php
index 6b67cb7485..22a29a05d3 100644
--- a/pandora_console/operation/snmpconsole/snmp_view.php
+++ b/pandora_console/operation/snmpconsole/snmp_view.php
@@ -76,7 +76,7 @@ if (isset ($_GET["delete"])){
 // Check Event (only incident write access).
 if (isset ($_GET["check"])) {
 	$id_trap = (int) get_parameter_get ("check", 0);
-	if ($id_trap > 1 && check_acl ($config['id_user'], 0, "IW")) {
+	if (check_acl ($config['id_user'], 0, "IW")) {
 		$values = array(
 			'status' => 1,
 			'id_usuario' => $config["id_user"]);
@@ -474,7 +474,8 @@ if ($traps !== false) {
 		//User
 		if (!empty ($trap["status"])) {
 			$data[5] = '<a href="index.php?sec=usuarios&sec2=operation/users/user_edit&ver='.$trap["id_usuario"].'">'.substr ($trap["id_usuario"], 0, 8).'</a>';
-			$data[5] .= ui_print_help_tip(get_user_fullname($trap["id_usuario"]), true);
+			if (!empty($trap["id_usuario"]))
+				$data[5] .= ui_print_help_tip(get_user_fullname($trap["id_usuario"]), true);
 		} else {
 			$data[5] = '--';
 		}