Working in the networkmap nodes.

This commit is contained in:
mdtrooper 2016-04-05 13:19:02 +02:00
parent 7229b5ecd9
commit 8bb0e5e194
4 changed files with 18 additions and 6 deletions

View File

@ -244,6 +244,8 @@ abstract class Map {
$contants["AGENT_MODULE_STATUS_UNKNOWN"] = AGENT_MODULE_STATUS_UNKNOWN; $contants["AGENT_MODULE_STATUS_UNKNOWN"] = AGENT_MODULE_STATUS_UNKNOWN;
$contants["AGENT_MODULE_STATUS_NOT_INIT"] = AGENT_MODULE_STATUS_NOT_INIT; $contants["AGENT_MODULE_STATUS_NOT_INIT"] = AGENT_MODULE_STATUS_NOT_INIT;
$contants["NODE_IMAGE_PADDING"] = NODE_IMAGE_PADDING;
?> ?>
<script type="text/javascript"> <script type="text/javascript">
<?php <?php

View File

@ -106,6 +106,7 @@ class Networkmap extends Map {
$height = DEFAULT_NODE_HEIGHT; $height = DEFAULT_NODE_HEIGHT;
$shape = DEFAULT_NODE_SHAPE; $shape = DEFAULT_NODE_SHAPE;
$color = DEFAULT_NODE_COLOR; $color = DEFAULT_NODE_COLOR;
$image = DEFAULT_NODE_IMAGE;
if (strstr($chunks[1], "&id_module=") !== false) { if (strstr($chunks[1], "&id_module=") !== false) {
// MODULE // MODULE
preg_match("/id_module=([0-9]*)/", $chunks[1], $matches); preg_match("/id_module=([0-9]*)/", $chunks[1], $matches);
@ -122,8 +123,13 @@ class Networkmap extends Map {
$status = agents_get_status($id); $status = agents_get_status($id);
$title = agents_get_name($id); $title = agents_get_name($id);
$type = ITEM_TYPE_AGENT_NETWORKMAP; $type = ITEM_TYPE_AGENT_NETWORKMAP;
preg_match("/<img src=\"(.*)\" \/>/", $chunks[0], $matches);
$image = $matches[1];
} }
$nodes[] = array('graph_id' => $graphviz_id, $nodes[] = array('graph_id' => $graphviz_id,
'id' => $id, 'id' => $id,
'id_agent' => $id_agent, 'id_agent' => $id_agent,
@ -133,7 +139,8 @@ class Networkmap extends Map {
'width' => $width, 'width' => $width,
'height' => $height, 'height' => $height,
'shape' => $shape, 'shape' => $shape,
'color' => $color); 'color' => $color,
'image' => $image);
if ($last_graph_id < $graphviz_id) if ($last_graph_id < $graphviz_id)
$last_graph_id = $graphviz_id; $last_graph_id = $graphviz_id;

View File

@ -509,4 +509,7 @@ define("DEFAULT_NODE_WIDTH", 30);
define("DEFAULT_NODE_HEIGHT", 30); define("DEFAULT_NODE_HEIGHT", 30);
define("DEFAULT_NODE_SHAPE", "circle"); define("DEFAULT_NODE_SHAPE", "circle");
define("DEFAULT_NODE_COLOR", COL_NOTINIT); define("DEFAULT_NODE_COLOR", COL_NOTINIT);
define("DEFAULT_NODE_IMAGE", "images/networkmap/unknown.png");
define("NODE_IMAGE_PADDING", 5);
?> ?>

View File

@ -442,11 +442,11 @@ NetworkmapController.prototype.paint_node = function(g_node, node) {
d3_node d3_node
.append("image") .append("image")
.attr("xlink:href", "http://192.168.70.147/pandora_console/images/networkmap/so_linux.png") .attr("xlink:href", node['image'])
.attr("x", 0) .attr("x", NODE_IMAGE_PADDING)
.attr("y", 0) .attr("y", NODE_IMAGE_PADDING)
.attr("height", node['height']) .attr("height", node['height'] - NODE_IMAGE_PADDING * 2)
.attr("width", node['width']); .attr("width", node['width'] - NODE_IMAGE_PADDING * 2);
} }
/** /**