From e446399edb36ff34ecf6324e1355f67691c87c6a Mon Sep 17 00:00:00 2001
From: Alejandro Gallardo Escobar <alex@artica.es>
Date: Mon, 7 Sep 2015 12:06:30 +0200
Subject: [PATCH 1/4] Added the 'right_align' class

---
 pandora_console/include/styles/pandora.css | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index 11a79de117..00502ae9ff 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -2858,6 +2858,10 @@ table#policy_modules td * {
 	text-align: left;
 }
 
+.right_align {
+	text-align: right;
+}
+
 .status_tactical{
 	width: 100%;
 	margin-left: auto;

From 398348f33a9280ea01111a6a66eaf66378a2b50a Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez Diaz <arturo.gonzalez@artica.es>
Date: Mon, 7 Sep 2015 12:10:41 +0200
Subject: [PATCH 2/4] Now recon tasks is created enabled in oracle. Ticket
 #2646

---
 pandora_console/pandoradb.oracle.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pandora_console/pandoradb.oracle.sql b/pandora_console/pandoradb.oracle.sql
index f3cfb1c5da..4b5baa13ed 100755
--- a/pandora_console/pandoradb.oracle.sql
+++ b/pandora_console/pandoradb.oracle.sql
@@ -776,7 +776,7 @@ CREATE TABLE trecon_task (
 	resolve_names NUMBER(5, 0) DEFAULT 1,
 	parent_detection NUMBER(5, 0) DEFAULT 1,
 	parent_recursion NUMBER(5, 0) DEFAULT 1,
-	disabled NUMBER(5, 0) DEFAULT 1,
+	disabled NUMBER(5, 0) DEFAULT 0,
 	macros CLOB DEFAULT ''
 );
 CREATE INDEX trecon_task_id_rec_serv_idx ON trecon_task(id_recon_server);

From e6fb5a8af15ae35a1d4745afd1093780347ff51c Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez Diaz <arturo.gonzalez@artica.es>
Date: Mon, 7 Sep 2015 13:42:55 +0200
Subject: [PATCH 3/4] fixed visual error in group view. Ticket #2621

---
 .../operation/agentes/group_view.php          | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/pandora_console/operation/agentes/group_view.php b/pandora_console/operation/agentes/group_view.php
index ffbcf83691..3d65ef31d6 100644
--- a/pandora_console/operation/agentes/group_view.php
+++ b/pandora_console/operation/agentes/group_view.php
@@ -137,7 +137,9 @@ if (!empty($result_groups)) {
 		echo "</tr>";
 		
 		foreach ($result_groups as $data) {
-			
+
+			$groups_id = $data["_id_"];
+
 			// Calculate entire row color
 			if ($data["_monitors_alerts_fired_"] > 0) {
 				$color_class = 'group_view_alrm';
@@ -218,8 +220,9 @@ if (!empty($result_groups)) {
 				$link = "<a class='group_view_data $color_class' style='font-weight: bold; font-size: 18px; text-align: center;' 
 				href='index.php?sec=estado&sec2=operation/agentes/estado_agente&group_id=".$data['_id_']."'>";
 			}
+			$agent_counter = agents_get_group_agents($groups_id);
 			if ($data["_total_agents_"] > 0) {
-				echo $link . $data["_total_agents_"] . "</a>";
+				echo $link . count($agent_counter) . "</a>";
 			}
 			echo "</td>";
 			
@@ -232,8 +235,12 @@ if (!empty($result_groups)) {
 				$link = "<a class='group_view_data $color_class' style='font-weight: bold; font-size: 18px; text-align: center;' 
 				href='index.php?sec=estado&sec2=operation/agentes/estado_agente&group_id=".$data['_id_']."&status=" . AGENT_STATUS_UNKNOWN ."'>";
 			}
+			$search = array(
+				'status' => AGENT_STATUS_UNKNOWN
+			);
+			$agent_counter_unknown = agents_get_group_agents($groups_id, $search);
 			if ($data["_agents_unknown_"] > 0) {
-				echo $link . $data["_agents_unknown_"] . "</a>";
+				echo $link . count($agent_counter_unknown) . "</a>";
 			}
 			echo "</td>";
 			
@@ -246,8 +253,12 @@ if (!empty($result_groups)) {
 				$link = "<a class='group_view_data $color_class' style='font-weight: bold; font-size: 18px; text-align: center;' 
 				href='index.php?sec=estado&sec2=operation/agentes/estado_agente&group_id=".$data['_id_']."&status=" . AGENT_STATUS_NOT_INIT ."'>";
 			}
+			$search = array(
+				'status' => AGENT_STATUS_NOT_INIT
+			);
+			$agent_counter_not_init = agents_get_group_agents($groups_id, $search);
 			if ($data["_agents_not_init_"] > 0) {
-				echo $link . $data["_agents_not_init_"] . "</a>";
+				echo $link . count($agent_counter_not_init) . "</a>";
 			}
 			echo "</td>";
 			

From 7f3632d098c006e00808097ce1c7b647ad3f298e Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez Diaz <arturo.gonzalez@artica.es>
Date: Mon, 7 Sep 2015 14:47:14 +0200
Subject: [PATCH 4/4] Updated update message. Ticket #2167

---
 pandora_console/include/languages/en_GB.po | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pandora_console/include/languages/en_GB.po b/pandora_console/include/languages/en_GB.po
index 7e25a18e81..2e6a55c719 100644
--- a/pandora_console/include/languages/en_GB.po
+++ b/pandora_console/include/languages/en_GB.po
@@ -32174,10 +32174,8 @@ msgstr "Error on first setup open update"
 
 #: ../../include/functions_config_bk.php:1436
 msgid ""
-"There is a new update please go to menu Administration and into extensions "
-"<a style=\"font-weight:bold;\" "
-"href=\"index.php?sec=gsetup&sec2=godmode/update_manager/update_manager&tab=on"
-"line\">go to Update Manager</a> for more details."
+"There is a new update. Please go to menu Administration/Update manager
+for more details."
 msgstr ""
 
 #: ../../include/functions_config_bk.php:1437