From 82fd0c13cd7b90acb995f608db610b3202c0ca57 Mon Sep 17 00:00:00 2001
From: mdtrooper <tres.14159@gmail.com>
Date: Mon, 24 Jun 2013 13:43:49 +0000
Subject: [PATCH] 2013-06-24 Miguel de Dios <miguel.dedios@artica.es>

	* include/functions_visual_map.php,
	operation/agentes/status_monitor.php: fixed the links to the items
	that represents modules.

	MERGED FROM THE BRANCH PANDORA_4.0




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8385 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
---
 pandora_console/ChangeLog                          |  8 ++++++++
 pandora_console/include/functions_visual_map.php   | 14 ++++++++++----
 .../operation/agentes/status_monitor.php           | 14 +++++++++++---
 3 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 6b5f25b1fd..ab4e7943a7 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,11 @@
+2013-06-24 Miguel de Dios <miguel.dedios@artica.es>
+
+	* include/functions_visual_map.php,
+	operation/agentes/status_monitor.php: fixed the links to the items
+	that represents modules.
+	
+	MERGED FROM THE BRANCH PANDORA_4.0
+
 2013-06-24 Miguel de Dios <miguel.dedios@artica.es>
 
 	* godmode/reporting/visual_console_builder.editor.js: fixed the
diff --git a/pandora_console/include/functions_visual_map.php b/pandora_console/include/functions_visual_map.php
index bf4de642fd..a3d9948dc4 100644
--- a/pandora_console/include/functions_visual_map.php
+++ b/pandora_console/include/functions_visual_map.php
@@ -1049,6 +1049,10 @@ function visual_map_print_visual_map ($id_layout, $show_links = true, $draw_line
 								echo '<a href="'.$config['homeurl'].'index.php?sec=services&sec2=enterprise/operation/services/services&id_service=' . 
 									$id_service . '&offset=0">';
 							}
+							else if ($layout_data['id_agente_modulo'] != 0) {
+								// Link to an module
+								echo '<a href="'.$config['homeurl'].'/index.php?sec=estado&amp;sec2=operation/agentes/status_monitor&amp;id_module=' . $layout_data['id_agente_modulo'] . '">';
+							}
 							else {
 								if (empty($layout_data['id_metaconsole'])) {
 									$url = $config['homeurl'] . 'index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;id_agente=' . $layout_data['id_agent'];
@@ -1514,6 +1518,11 @@ function visual_map_print_visual_map ($id_layout, $show_links = true, $draw_line
 									$id_service . '&offset=0">';
 								$endTagA = true;
 							}
+							
+							else if ($layout_data['id_agente_modulo'] != 0) {
+								// Link to an module
+								echo '<a href="'.$config['homeurl'].'/index.php?sec=estado&amp;sec2=operation/agentes/status_monitor&amp;id_module=' . $layout_data['id_agente_modulo'] . '">';
+							}
 							else {
 								// Link to an agent
 								if (empty($layout_data['id_metaconsole'])) {
@@ -1622,10 +1631,7 @@ function visual_map_print_visual_map ($id_layout, $show_links = true, $draw_line
 							}
 							else {
 								if (empty($layout_data['id_metaconsole'])) {
-									$url = $config['homeurl'] . 
-										'index.php?' .
-										'sec=estado&amp;'.
-										'sec2=operation/agentes/ver_agente&amp;id_agente='.$layout_data["id_agent"].'&amp;tab=data';
+									echo '<a href="index.php?sec=estado&amp;sec2=operation/agentes/status_monitor&amp;id_module=' . $layout_data['id_agente_modulo'] . '">';
 								}
 								else {
 									$url = ui_meta_get_url_console_child(
diff --git a/pandora_console/operation/agentes/status_monitor.php b/pandora_console/operation/agentes/status_monitor.php
index 76492fc4bd..26f479d00e 100644
--- a/pandora_console/operation/agentes/status_monitor.php
+++ b/pandora_console/operation/agentes/status_monitor.php
@@ -47,17 +47,25 @@ else {
 
 $ag_freestring = get_parameter ('ag_freestring');
 $ag_modulename = (string) get_parameter ('ag_modulename');
-$ag_group = get_parameter ('ag_group', 0);
+$ag_group = (int) get_parameter ('ag_group', 0);
 $offset = (int) get_parameter ('offset', 0);
 $status = (int) get_parameter ('status', 4);
-$modulegroup = get_parameter ('modulegroup', -1);
-$tag_filter = get_parameter('tag_filter', 0);
+$modulegroup = (int) get_parameter ('modulegroup', -1);
+$tag_filter = (int) get_parameter('tag_filter', 0);
 $refr = get_parameter('refr', 0);
 // Sort functionality
 
 $sortField = get_parameter('sort_field');
 $sort = get_parameter('sort', 'none');
 
+//When the previous page was a visualmap and show only one module
+$id_module = (int)get_parameter('id_module', 0);
+if ($id_module) {
+	$status = -1;
+	$ag_modulename = modules_get_agentmodule_name($id_module);
+	$ag_freestring = modules_get_agentmodule_agent_name($id_module);
+}
+
 echo '<form method="post" action="index.php?sec=estado&amp;sec2=operation/agentes/status_monitor&amp;refr=' . $refr . '&amp;offset=' . $offset . '&amp;ag_group=' . $ag_group . '&amp;ag_freestring=' . $ag_freestring . '&amp;ag_modulename=' . $ag_modulename . '&amp;status=' . $status . '&amp;sort_field=' . $sortField . '&amp;sort=' . $sort .'&amp;pure=' . $config['pure'] . '">';
 
 enterprise_hook('open_meta_frame');