From e278578f42154d71b9781cca443a3c9f3913aa1e Mon Sep 17 00:00:00 2001
From: ramonn <noreply@pandorafms.org>
Date: Fri, 5 Apr 2013 12:24:36 +0000
Subject: [PATCH] 2013-04-05  Ramon Novoa  <rnovoa@artica.es>

	* include/functions_events.php: Display the event text properly.
	  Fixes bug #3609638.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7935 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
---
 pandora_console/ChangeLog                    |  5 +++
 pandora_console/include/functions_events.php | 37 ++++++++++----------
 2 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 03efd77947..e5c739ec94 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,8 @@
+2013-04-05  Ramon Novoa  <rnovoa@artica.es>
+
+	* include/functions_events.php: Display the event text properly.
+	  Fixes bug #3609638.
+
 2013-04-05  Mario Pulido <mario.pulido@artica.es>
 
 	* godmode/events/event_edit_filter.php: Added help tip in event editor.
diff --git a/pandora_console/include/functions_events.php b/pandora_console/include/functions_events.php
index 836deab63e..5d4837ef22 100644
--- a/pandora_console/include/functions_events.php
+++ b/pandora_console/include/functions_events.php
@@ -867,25 +867,26 @@ function events_print_event_table ($filter = "", $limit = 10, $width = 440, $ret
 			/* Event type */
 			$data[2] = events_print_type_img ($event["event_type"], true);
 			
-			if($agent_id == 0) {
-				$data[3] = ui_print_string_substr (io_safe_output($event["evento"]), 75, true, '9');
-			}
+			/* Event text */
+			$data[3] = ui_print_string_substr (io_safe_output($event["evento"]), 75, true, '9');
 			
-			if ($event["id_agente"] > 0) {
-				// Agent name
-				// Get class name, for the link color...
-				$myclass =  get_priority_class ($event["criticity"]);
-				
-				$data[4] = "<a class='$myclass' href='index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente=".$event["id_agente"]."'>".agents_get_name ($event["id_agente"]). "</A>";
-				
-			// ui_print_agent_name ($event["id_agente"], true, 25, '', true);
-			// for System or SNMP generated alerts
-			}
-			elseif ($event["event_type"] == "system") {
-				$data[4] = __('System');
-			}
-			else {
-				$data[4] = __('Alert')."SNMP";
+			if($agent_id == 0) {
+				if ($event["id_agente"] > 0) {
+					// Agent name
+					// Get class name, for the link color...
+					$myclass =  get_priority_class ($event["criticity"]);
+					
+					$data[4] = "<a class='$myclass' href='index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente=".$event["id_agente"]."'>".agents_get_name ($event["id_agente"]). "</A>";
+					
+				// ui_print_agent_name ($event["id_agente"], true, 25, '', true);
+				// for System or SNMP generated alerts
+				}
+				elseif ($event["event_type"] == "system") {
+					$data[4] = __('System');
+				}
+				else {
+					$data[4] = __('Alert')."SNMP";
+				}
 			}
 			
 			// Timestamp