From 65fcfd7f4cc89de79583a551763729c951d111c7 Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Thu, 9 Mar 2017 11:06:51 +0100
Subject: [PATCH] Fixed module type in map relations, again, and now its true.

---
 .../include/functions_networkmap.php          | 151 ++++++++----------
 .../include/functions_pandora_networkmap.php  |   2 +-
 2 files changed, 69 insertions(+), 84 deletions(-)

diff --git a/pandora_console/include/functions_networkmap.php b/pandora_console/include/functions_networkmap.php
index 4b62ec61aa..a2df28fb0f 100644
--- a/pandora_console/include/functions_networkmap.php
+++ b/pandora_console/include/functions_networkmap.php
@@ -426,11 +426,6 @@ function networkmap_generate_dot ($pandora_name, $group = 0,
 	
 	foreach ($modules_node_ref as $id_module => $node_count) {
 		$module_type = modules_get_agentmodule_type($id_module);
-		if ($module_type != 18) {
-			unset($nodes[$node_count]);
-			unset($orphans[$node_count]);
-			unset($parents[$node_count]);
-		}
 	}
 	
 	// Addded the relationship of parents of agents
@@ -529,91 +524,81 @@ function networkmap_generate_dot ($pandora_name, $group = 0,
 		$relations = array();
 	foreach ($relations as $key => $relation) {
 		$module_a = $relation['module_a'];
-		$module_a_type = modules_get_agentmodule_type($module_a);
 		$agent_a = modules_get_agentmodule_agent($module_a);
 		$module_b = $relation['module_b'];
-		$module_b_type = modules_get_agentmodule_type($module_b);
 		$agent_b = modules_get_agentmodule_agent($module_b);
 		
-		if ($module_a_type == 18 && $module_b_type == 18) {
-			if (isset($modules_node_ref[$module_a]) &&
-				isset($modules_node_ref[$module_b])) {
-				$graph .= networkmap_create_edge(
-					$modules_node_ref[$module_a],
-					$modules_node_ref[$module_b],
-					$layout,
-					$nooverlap,
-					$pure,
-					$zoom,
-					$ranksep,
-					$simple,
-					$regen,
-					$font_size,
-					$group,
-					'operation/agentes/networkmap',
-					'topology',
-					$id_networkmap);
-			}
+		if (isset($modules_node_ref[$module_a]) &&
+			isset($modules_node_ref[$module_b])) {
+			$graph .= networkmap_create_edge(
+				$modules_node_ref[$module_a],
+				$modules_node_ref[$module_b],
+				$layout,
+				$nooverlap,
+				$pure,
+				$zoom,
+				$ranksep,
+				$simple,
+				$regen,
+				$font_size,
+				$group,
+				'operation/agentes/networkmap',
+				'topology',
+				$id_networkmap);
 		}
-		elseif ($module_a_type == 6 && $module_b_type == 6) {
-			if (isset($node_ref[$agent_a]) &&
-				isset($node_ref[$agent_b])) {
-				$graph .= networkmap_create_edge(
-					$node_ref[$agent_a],
-					$node_ref[$agent_b],
-					$layout,
-					$nooverlap,
-					$pure,
-					$zoom,
-					$ranksep,
-					$simple,
-					$regen,
-					$font_size,
-					$group,
-					'operation/agentes/networkmap',
-					'topology',
-					$id_networkmap);
-			}
+		elseif (isset($node_ref[$agent_a]) &&
+			isset($modules_node_ref[$module_b])) {
+			$graph .= networkmap_create_edge(
+				$node_ref[$agent_a],
+				$modules_node_ref[$module_b],
+				$layout,
+				$nooverlap,
+				$pure,
+				$zoom,
+				$ranksep,
+				$simple,
+				$regen,
+				$font_size,
+				$group,
+				'operation/agentes/networkmap',
+				'topology',
+				$id_networkmap);
 		}
-		elseif ($module_a_type == 6 && $module_b_type == 18) {
-			if (isset($node_ref[$agent_a]) &&
-				isset($modules_node_ref[$module_b])) {
-				$graph .= networkmap_create_edge(
-					$node_ref[$agent_a],
-					$modules_node_ref[$module_b],
-					$layout,
-					$nooverlap,
-					$pure,
-					$zoom,
-					$ranksep,
-					$simple,
-					$regen,
-					$font_size,
-					$group,
-					'operation/agentes/networkmap',
-					'topology',
-					$id_networkmap);
-			}
+		elseif (isset($node_ref[$agent_b]) &&
+			isset($modules_node_ref[$module_a])) {
+			$graph .= networkmap_create_edge(
+				$node_ref[$agent_b],
+				$modules_node_ref[$module_a],
+				$layout,
+				$nooverlap,
+				$pure,
+				$zoom,
+				$ranksep,
+				$simple,
+				$regen,
+				$font_size,
+				$group,
+				'operation/agentes/networkmap',
+				'topology',
+				$id_networkmap);
 		}
-		elseif ($module_b_type == 6 && $module_a_type == 18) {
-			if (isset($node_ref[$agent_b]) &&
-				isset($modules_node_ref[$module_a])) {
-				$graph .= networkmap_create_edge(
-					$node_ref[$agent_b],
-					$modules_node_ref[$module_a],
-					$layout,
-					$nooverlap,
-					$pure,
-					$zoom,
-					$ranksep,
-					$simple,
-					$regen,
-					$font_size,
-					$group,
-					'operation/agentes/networkmap',
-					'topology',
-					$id_networkmap);
-			}
+		elseif (isset($node_ref[$agent_a]) &&
+			isset($node_ref[$agent_b])) {
+			$graph .= networkmap_create_edge(
+				$node_ref[$agent_a],
+				$node_ref[$agent_b],
+				$layout,
+				$nooverlap,
+				$pure,
+				$zoom,
+				$ranksep,
+				$simple,
+				$regen,
+				$font_size,
+				$group,
+				'operation/agentes/networkmap',
+				'topology',
+				$id_networkmap);
 		}
 	}
 	
diff --git a/pandora_console/include/functions_pandora_networkmap.php b/pandora_console/include/functions_pandora_networkmap.php
index fde4a78a3d..bf4078fc40 100644
--- a/pandora_console/include/functions_pandora_networkmap.php
+++ b/pandora_console/include/functions_pandora_networkmap.php
@@ -703,7 +703,7 @@ function networkmap_write_js_array($id, $nodes_and_relations = array(), $map_das
 			continue;
 		if ($link_js['source'] == -1)
 			continue;
-		if ($link_js['target'] == $link_js['source']) 
+		if ($link_js['target'] == $link_js['source'])
 			continue;
 		echo "networkmap.links.push(" . json_encode($link_js) . ");\n";
 	}