tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

New networkmaps in progress... (Trying to fix mi moguer level)

This commit is contained in:
Arturo Gonzalez 2016-10-10 12:29:51 +02:00
parent 0b5631663b
commit fbc70c7313
2 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pandora_console/include/functions_networkmap.php
View File

@ -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;

16
pandora_console/include/functions_pandora_networkmap.php
View File

@ -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;
}