From fbc70c7313545d40e656a286e6708a7626b57a31 Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Mon, 10 Oct 2016 12:29:51 +0200
Subject: [PATCH] New networkmaps in progress... (Trying to fix mi moguer
 level)

---
 pandora_console/include/functions_networkmap.php |  1 -
 .../include/functions_pandora_networkmap.php     | 16 +++-------------
 2 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/pandora_console/include/functions_networkmap.php b/pandora_console/include/functions_networkmap.php
index d011b38dba..62e38e81b4 100644
--- a/pandora_console/include/functions_networkmap.php
+++ b/pandora_console/include/functions_networkmap.php
@@ -327,7 +327,6 @@ function networkmap_generate_dot ($pandora_name, $group = 0,
 					unknown_count, total_count, notinit_count'), 'AR',
 					array('field' => 'id_parent', 'order' => 'ASC'));
 		}
-		
 	}
 	else if ($group == -666) {
 		$agents = false;
diff --git a/pandora_console/include/functions_pandora_networkmap.php b/pandora_console/include/functions_pandora_networkmap.php
index 1f743ef4dc..4542d23077 100644
--- a/pandora_console/include/functions_pandora_networkmap.php
+++ b/pandora_console/include/functions_pandora_networkmap.php
@@ -137,9 +137,11 @@ function networkmap_process_networkmap($id = 0) {
 
 		system ($cmd);
 		
+		unlink($filename_dot);
+		
 		$nodes = networkmap_loadfile($id, $filename_plain,
 			$relation_nodes, $graph);
-			
+		
 		//Set the position of modules
 		foreach ($nodes as $key => $node) {
 			if ($node['type'] == 'module') {
@@ -242,7 +244,6 @@ function networkmap_process_networkmap($id = 0) {
 			array('id' => $id));
 			
 		unlink($filename_plain);
-		unlink($filename_dot);
 	}
 	
 	return $nodes_and_relations;
@@ -577,14 +578,6 @@ function networkmap_links_to_js_links($relations, $nodes_graph) {
 					$item['source'] = $node['id'];
 				}
 			}
-			else if ($node['id_agent'] == 0 && $node['text'] == "") {
-				if ($node['id'] == $relation['id_parent']) {
-					$item['target'] = $node['id'];
-				}
-				else if($node['id'] == $relation['id_child']) {
-					$item['source'] = $node['id'];
-				}
-			}
 			else {
 				if ($node['id_agent'] == $agent) {
 					$item['target'] = $node['id'];
@@ -850,9 +843,6 @@ function networkmap_loadfile($id = 0, $file = '',
 			if (strpos($node_id, "transp_") !== false) {
 				//removed the transparent nodes
 			}
-			else if ($data['text'] == "" && $data['image'] == "" && $data['id_agent'] == 0) {
-				//removed weird nodes
-			}
 			else {
 				$networkmap_nodes[$node_id] = $data;
 			}