From f801b1bc751f86e3015b1101fc40d12d5f99eeea Mon Sep 17 00:00:00 2001
From: zarzuelo <noreply@pandorafms.org>
Date: Tue, 18 Dec 2012 12:16:26 +0000
Subject: [PATCH] 2012-12-18  Sergio Martin <sergio.martin@artica.es>

	* operation/events/events_list.php
	godmode/events/custom_events.php: Fixed
	a couple of bugs of style and event viewer
	normal



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7301 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
---
 pandora_console/ChangeLog                        | 7 +++++++
 pandora_console/godmode/events/custom_events.php | 2 +-
 pandora_console/operation/events/events_list.php | 4 ++--
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index c8ec59aaf5..ad3670906f 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,10 @@
+2012-12-18  Sergio Martin <sergio.martin@artica.es>
+
+	* operation/events/events_list.php
+	godmode/events/custom_events.php: Fixed
+	a couple of bugs of style and event viewer
+	normal
+
 2012-12-18 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
 
 	* include/functions_reporting.php: Resize URL item report to make it
diff --git a/pandora_console/godmode/events/custom_events.php b/pandora_console/godmode/events/custom_events.php
index 38efe80271..5ab4f20d8d 100644
--- a/pandora_console/godmode/events/custom_events.php
+++ b/pandora_console/godmode/events/custom_events.php
@@ -113,7 +113,7 @@ if ($fields_selected[0]!='') {
 				$result = __('ACK Timestamp');
 				break;
 			case 'server_name':
-				$result = __('Server');
+				$result = __('Server name');
 				break;
 		}
 		$result_selected[$field_selected] = $result;
diff --git a/pandora_console/operation/events/events_list.php b/pandora_console/operation/events/events_list.php
index fc246d82ac..6139c3025f 100644
--- a/pandora_console/operation/events/events_list.php
+++ b/pandora_console/operation/events/events_list.php
@@ -797,7 +797,7 @@ foreach ($result as $event) {
 			$data[$i] = db_get_value('server_name','tmetaconsole_setup','id',$event["server_id"]);
 		}
 		else {
-			$data[$i] = db_get_value('name','tserver','id_server',$event["server_id"]);
+			$data[$i] = db_get_value('name','tserver');
 		}
 		$i++;
 	}
@@ -850,7 +850,7 @@ foreach ($result as $event) {
 	}
 	
 	if (in_array('id_agente', $show_fields)) {
-		$data[$i] = '<span style="color: #000000">';
+		$data[$i] = '<span class="'.$myclass.'">';
 		
 		if ($event["id_agente"] > 0) {
 			// Agent name