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

Fixed module type in map relations, again, and now its true.

This commit is contained in:
Arturo Gonzalez 2017-03-09 11:06:51 +01:00
parent 7dd279b902
commit 65fcfd7f4c
2 changed files with 69 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

151
pandora_console/include/functions_networkmap.php
View File

@ -426,11 +426,6 @@ function networkmap_generate_dot ($pandora_name, $group = 0,
foreach ($modules_node_ref as $id_module => $node_count) { foreach ($modules_node_ref as $id_module => $node_count) {
$module_type = modules_get_agentmodule_type($id_module); $module_type = modules_get_agentmodule_type($id_module);
if ($module_type != 18) {
unset($nodes[$node_count]);
unset($orphans[$node_count]);
unset($parents[$node_count]);
}
} }
// Addded the relationship of parents of agents // Addded the relationship of parents of agents
@ -529,91 +524,81 @@ function networkmap_generate_dot ($pandora_name, $group = 0,
$relations = array(); $relations = array();
foreach ($relations as $key => $relation) { foreach ($relations as $key => $relation) {
$module_a = $relation['module_a']; $module_a = $relation['module_a'];
$module_a_type = modules_get_agentmodule_type($module_a);
$agent_a = modules_get_agentmodule_agent($module_a); $agent_a = modules_get_agentmodule_agent($module_a);
$module_b = $relation['module_b']; $module_b = $relation['module_b'];
$module_b_type = modules_get_agentmodule_type($module_b);
$agent_b = modules_get_agentmodule_agent($module_b); $agent_b = modules_get_agentmodule_agent($module_b);
if ($module_a_type == 18 && $module_b_type == 18) { if (isset($modules_node_ref[$module_a]) &&
if (isset($modules_node_ref[$module_a]) && isset($modules_node_ref[$module_b])) {
isset($modules_node_ref[$module_b])) { $graph .= networkmap_create_edge(
$graph .= networkmap_create_edge( $modules_node_ref[$module_a],
$modules_node_ref[$module_a], $modules_node_ref[$module_b],
$modules_node_ref[$module_b], $layout,
$layout, $nooverlap,
$nooverlap, $pure,
$pure, $zoom,
$zoom, $ranksep,
$ranksep, $simple,
$simple, $regen,
$regen, $font_size,
$font_size, $group,
$group, 'operation/agentes/networkmap',
'operation/agentes/networkmap', 'topology',
'topology', $id_networkmap);
$id_networkmap);
}
} }
elseif ($module_a_type == 6 && $module_b_type == 6) { elseif (isset($node_ref[$agent_a]) &&
if (isset($node_ref[$agent_a]) && isset($modules_node_ref[$module_b])) {
isset($node_ref[$agent_b])) { $graph .= networkmap_create_edge(
$graph .= networkmap_create_edge( $node_ref[$agent_a],
$node_ref[$agent_a], $modules_node_ref[$module_b],
$node_ref[$agent_b], $layout,
$layout, $nooverlap,
$nooverlap, $pure,
$pure, $zoom,
$zoom, $ranksep,
$ranksep, $simple,
$simple, $regen,
$regen, $font_size,
$font_size, $group,
$group, 'operation/agentes/networkmap',
'operation/agentes/networkmap', 'topology',
'topology', $id_networkmap);
$id_networkmap);
}
} }
elseif ($module_a_type == 6 && $module_b_type == 18) { elseif (isset($node_ref[$agent_b]) &&
if (isset($node_ref[$agent_a]) && isset($modules_node_ref[$module_a])) {
isset($modules_node_ref[$module_b])) { $graph .= networkmap_create_edge(
$graph .= networkmap_create_edge( $node_ref[$agent_b],
$node_ref[$agent_a], $modules_node_ref[$module_a],
$modules_node_ref[$module_b], $layout,
$layout, $nooverlap,
$nooverlap, $pure,
$pure, $zoom,
$zoom, $ranksep,
$ranksep, $simple,
$simple, $regen,
$regen, $font_size,
$font_size, $group,
$group, 'operation/agentes/networkmap',
'operation/agentes/networkmap', 'topology',
'topology', $id_networkmap);
$id_networkmap);
}
} }
elseif ($module_b_type == 6 && $module_a_type == 18) { elseif (isset($node_ref[$agent_a]) &&
if (isset($node_ref[$agent_b]) && isset($node_ref[$agent_b])) {
isset($modules_node_ref[$module_a])) { $graph .= networkmap_create_edge(
$graph .= networkmap_create_edge( $node_ref[$agent_a],
$node_ref[$agent_b], $node_ref[$agent_b],
$modules_node_ref[$module_a], $layout,
$layout, $nooverlap,
$nooverlap, $pure,
$pure, $zoom,
$zoom, $ranksep,
$ranksep, $simple,
$simple, $regen,
$regen, $font_size,
$font_size, $group,
$group, 'operation/agentes/networkmap',
'operation/agentes/networkmap', 'topology',
'topology', $id_networkmap);
$id_networkmap);
}
} }
} }

2
pandora_console/include/functions_pandora_networkmap.php
View File

@ -703,7 +703,7 @@ function networkmap_write_js_array($id, $nodes_and_relations = array(), $map_das
continue; continue;
if ($link_js['source'] == -1) if ($link_js['source'] == -1)
continue; continue;
if ($link_js['target'] == $link_js['source']) if ($link_js['target'] == $link_js['source'])
continue; continue;
echo "networkmap.links.push(" . json_encode($link_js) . ");\n"; echo "networkmap.links.push(" . json_encode($link_js) . ");\n";
} }