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 progess... (Added central node and fixed some things)

This commit is contained in:
Arturo Gonzalez 2016-09-16 11:56:18 +02:00
parent 53d94843b9
commit 67a4d5e75e
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pandora_console/include/functions_networkmap.php
View File

@ -1212,7 +1212,6 @@ function networkmap_generate_dot ($pandora_name, $group = 0,
}
}
// Close graph
$graph .= networkmap_close_graph ();
@ -1494,7 +1493,6 @@ function networkmap_generate_dot_groups ($pandora_name, $group = 0,
// Returns an edge definition
function networkmap_create_edge ($head, $tail, $layout, $nooverlap, $pure, $zoom, $ranksep, $simple, $regen, $font_size, $group, $sec2 = 'operation/agentes/networkmap', $tab = 'topology', $id_networkmap = 0) {
if (defined("METACONSOLE")) {
$url = '';
}
@ -1971,7 +1969,7 @@ function networkmap_create_pandora_node ($name, $font_size = 10, $simple = 0, $s
}
else {
$image = html_print_image("images/networkmap/pandora_node.png", true, false, false, true);
$image = str_replace('"',"'",$image);
//$image = str_replace('"',"'",$image);
$img = '<TR><TD>' . $image . '</TD></TR>';
}
$name = "<TR><TD BGCOLOR='#FFFFFF'>" . $name . '</TD></TR>';

8
pandora_console/include/functions_pandora_networkmap.php
View File

@ -267,8 +267,8 @@ function networkmap_process_networkmap($id = 0) {
$values = array();
$values['id_map'] = $id;
$values['id_parent'] = $array_key_to_db_id[$relation['parent']];
$values['id_child'] = $array_key_to_db_id[$relation['child']];
$values['id_parent'] = $array_key_to_db_id[$relation['id_parent']];
$values['id_child'] = $array_key_to_db_id[$relation['id_child']];
$values['parent_type'] = $relation['parent_type'];
$values['child_type'] = $relation['child_type'];
db_process_sql_insert('trel_item', $values);
@ -809,9 +809,9 @@ function networkmap_loadfile($id = 0, $file = '',
}
$row = array(
'child' => $rel['orig'],
'id_child' => $rel['orig'],
'child_type' => $networkmap_nodes[$rel['orig']]['type'],
'parent' => $rel['dest'],
'id_parent' => $rel['dest'],
'parent_type' => $networkmap_nodes[$rel['dest']]['type']);
$relations_param[] = $row;
}