From b3f5e76009ef8238fb60e0469083eee9e3b68493 Mon Sep 17 00:00:00 2001
From: Ramon Novoa <rnovoa@artica.es>
Date: Tue, 24 Mar 2015 12:59:23 +0100
Subject: [PATCH] Show the translated enterprise string by default on the SNMP
 console.

---
 .../operation/snmpconsole/snmp_view.php         | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/pandora_console/operation/snmpconsole/snmp_view.php b/pandora_console/operation/snmpconsole/snmp_view.php
index 425cbe879a..1b6a9829a3 100755
--- a/pandora_console/operation/snmpconsole/snmp_view.php
+++ b/pandora_console/operation/snmpconsole/snmp_view.php
@@ -477,7 +477,15 @@ if ($traps !== false) {
 		
 		//OID
 		$table->cellclass[$idx][2] = get_priority_class ($severity);
-		$data[2] = '<a href="javascript: toggleVisibleExtendedInfo(' . $trap["id_trap"] . ');">' . (empty($trap["oid"]) ? __('N/A') : $trap["oid"]) .'</a>';
+		if (! empty($trap["text"])) {
+			$enterprise_string = $trap["text"];
+		} else if (! empty($trap["oid"])) {
+			$enterprise_string = $trap["oid"];
+		} else {
+			$enterprise_string = __('N/A');
+		}
+
+		$data[2] = '<a href="javascript: toggleVisibleExtendedInfo(' . $trap["id_trap"] . ');">' . $enterprise_string .'</a>';
 		
 		//Count
 		if ($group_by) {
@@ -591,13 +599,6 @@ if ($traps !== false) {
 				</tr>';
 		}
 		
-		if ($trap["text"] != "") {
-			$string .= '<tr>
-					<td align="left" valign="top">' . '<b>' . __('Text:') . '</td>
-					<td align="left">' . $trap['text'] . '</td>
-				</tr>';
-		}
-		
 		if ($trap["type"] != "") {
 			$trap_types = array(-1 => __('None'), 0 => __('Cold start (0)'), 1 => __('Warm start (1)'), 2 => __('Link down (2)'), 3 => __('Link up (3)'), 4 => __('Authentication failure (4)'), 5 => __('Other'));