From 8bb0e5e19428bcc2b2d5fe03078fe0c8c0a78082 Mon Sep 17 00:00:00 2001
From: mdtrooper <tres.14159@gmail.com>
Date: Tue, 5 Apr 2016 13:19:02 +0200
Subject: [PATCH] Working in the networkmap nodes.

---
 pandora_console/include/class/Map.class.php            |  2 ++
 pandora_console/include/class/Networkmap.class.php     |  9 ++++++++-
 pandora_console/include/constants.php                  |  3 +++
 .../include/javascript/map/NetworkmapController.js     | 10 +++++-----
 4 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/pandora_console/include/class/Map.class.php b/pandora_console/include/class/Map.class.php
index bd99e1cafa..fce6b47bf9 100644
--- a/pandora_console/include/class/Map.class.php
+++ b/pandora_console/include/class/Map.class.php
@@ -244,6 +244,8 @@ abstract class Map {
 		$contants["AGENT_MODULE_STATUS_UNKNOWN"] = AGENT_MODULE_STATUS_UNKNOWN;
 		$contants["AGENT_MODULE_STATUS_NOT_INIT"] = AGENT_MODULE_STATUS_NOT_INIT;
 		
+		$contants["NODE_IMAGE_PADDING"] = NODE_IMAGE_PADDING;
+		
 		?>
 		<script type="text/javascript">
 			<?php
diff --git a/pandora_console/include/class/Networkmap.class.php b/pandora_console/include/class/Networkmap.class.php
index fabb03f58e..fbf6eeb351 100644
--- a/pandora_console/include/class/Networkmap.class.php
+++ b/pandora_console/include/class/Networkmap.class.php
@@ -106,6 +106,7 @@ class Networkmap extends Map {
 				$height = DEFAULT_NODE_HEIGHT;
 				$shape = DEFAULT_NODE_SHAPE;
 				$color = DEFAULT_NODE_COLOR;
+				$image = DEFAULT_NODE_IMAGE;
 				if (strstr($chunks[1], "&id_module=") !== false) {
 					// MODULE
 					preg_match("/id_module=([0-9]*)/", $chunks[1], $matches);
@@ -122,8 +123,13 @@ class Networkmap extends Map {
 					$status = agents_get_status($id);
 					$title = agents_get_name($id);
 					$type = ITEM_TYPE_AGENT_NETWORKMAP;
+					
+					preg_match("/<img src=\"(.*)\" \/>/", $chunks[0], $matches);
+					$image = $matches[1];
 				}
 				
+				
+				
 				$nodes[] = array('graph_id' => $graphviz_id,
 					'id' => $id,
 					'id_agent' => $id_agent,
@@ -133,7 +139,8 @@ class Networkmap extends Map {
 					'width' => $width,
 					'height' => $height,
 					'shape' => $shape,
-					'color' => $color);
+					'color' => $color,
+					'image' => $image);
 				
 				if ($last_graph_id < $graphviz_id)
 					$last_graph_id = $graphviz_id;
diff --git a/pandora_console/include/constants.php b/pandora_console/include/constants.php
index 260482e419..0a6cabdacc 100644
--- a/pandora_console/include/constants.php
+++ b/pandora_console/include/constants.php
@@ -509,4 +509,7 @@ define("DEFAULT_NODE_WIDTH", 30);
 define("DEFAULT_NODE_HEIGHT", 30);
 define("DEFAULT_NODE_SHAPE", "circle");
 define("DEFAULT_NODE_COLOR", COL_NOTINIT);
+define("DEFAULT_NODE_IMAGE", "images/networkmap/unknown.png");
+
+define("NODE_IMAGE_PADDING", 5);
 ?>
diff --git a/pandora_console/include/javascript/map/NetworkmapController.js b/pandora_console/include/javascript/map/NetworkmapController.js
index 01ee28253d..3d575ad5ff 100644
--- a/pandora_console/include/javascript/map/NetworkmapController.js
+++ b/pandora_console/include/javascript/map/NetworkmapController.js
@@ -442,11 +442,11 @@ NetworkmapController.prototype.paint_node = function(g_node, node) {
 	
 	d3_node
 		.append("image")
-		.attr("xlink:href", "http://192.168.70.147/pandora_console/images/networkmap/so_linux.png")
-		.attr("x", 0)
-		.attr("y", 0)
-		.attr("height", node['height'])
-		.attr("width", node['width']);
+		.attr("xlink:href", node['image'])
+		.attr("x", NODE_IMAGE_PADDING)
+		.attr("y", NODE_IMAGE_PADDING)
+		.attr("height", node['height'] - NODE_IMAGE_PADDING * 2)
+		.attr("width", node['width'] - NODE_IMAGE_PADDING * 2);
 }
 
 /**