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

2011-02-21 Sergio Martin <sergio.martin@artica.es> 

* include/functions_networkmap.php: Fixed the group maps
	when the root group has not agents. Bug: 3152679



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3956 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
zarzuelo 2011-02-21 16:47:08 +00:00
parent fd5018734f
commit 19d6291855
2 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_console/ChangeLog
View File

@ -1,3 +1,8 @@
2011-02-21 Sergio Martin <sergio.martin@artica.es>
* include/functions_networkmap.php: Fixed the group maps
when the root group has not agents. Bug: 3152679
2011-02-21 Miguel de Dios <miguel.dedios@artica.es> 2011-02-21 Miguel de Dios <miguel.dedios@artica.es>
* godmode/reporting/visual_console_builder.elements.php: fixed the show * godmode/reporting/visual_console_builder.elements.php: fixed the show

27
pandora_console/include/functions_networkmap.php
View File

@ -117,7 +117,6 @@ function generate_dot ($pandora_name, $group = 0, $simple = 0, $font_size = 12,
// Generate a dot graph definition for graphviz with groups // Generate a dot graph definition for graphviz with groups
function generate_dot_groups ($pandora_name, $group = 0, $simple = 0, $font_size = 12, $layout = 'radial', $nooverlap = 0, $zoom = 1, $ranksep = 2.5, $center = 0, $regen = 1, $pure = 0, $modwithalerts = 0, $module_group = 0, $hidepolicymodules = 0, $depth = 'all', $id_networkmap = 0) { function generate_dot_groups ($pandora_name, $group = 0, $simple = 0, $font_size = 12, $layout = 'radial', $nooverlap = 0, $zoom = 1, $ranksep = 2.5, $center = 0, $regen = 1, $pure = 0, $modwithalerts = 0, $module_group = 0, $hidepolicymodules = 0, $depth = 'all', $id_networkmap = 0) {
global $config; global $config;
$parents = array(); $parents = array();
@ -128,14 +127,21 @@ function generate_dot_groups ($pandora_name, $group = 0, $simple = 0, $font_size
// Get groups data // Get groups data
if ($group > 0) { if ($group > 0) {
$filter['id_grupo'] = $group; $groups = array();
$groups[0] = get_db_row ('tgrupo', 'id_grupo', $group); $id_groups = get_id_groups_recursive($group, true);
foreach($id_groups as $id_group) {
if(check_acl($config["id_user"], $id_group, 'AR')) {
$groups[] = get_db_row ('tgrupo', 'id_grupo', $id_group);
}
}
$filter['id_grupo'] = $id_groups;
} }
else { else {
$groups = get_db_all_rows_in_table ('tgrupo'); $groups = get_db_all_rows_in_table ('tgrupo');
} }
// Open Graph // Open Graph
$graph = open_graph ($layout, $nooverlap, $pure, $zoom, $ranksep, $font_size); $graph = open_graph ($layout, $nooverlap, $pure, $zoom, $ranksep, $font_size);
@ -144,13 +150,13 @@ function generate_dot_groups ($pandora_name, $group = 0, $simple = 0, $font_size
// Parse groups // Parse groups
$nodes = array (); $nodes = array ();
$nodes_groups = array(); $nodes_groups = array();
foreach ($groups as $group) { foreach ($groups as $group2) {
$node_count ++; $node_count ++;
$group['type'] = 'group'; $group2['type'] = 'group';
$group['id_node'] = $node_count; $group2['id_node'] = $node_count;
// Add node // Add node
$nodes_groups[$group['id_grupo']] = $group; $nodes_groups[$group2['id_grupo']] = $group2;
} }
$node_count = 0; $node_count = 0;
@ -160,7 +166,7 @@ function generate_dot_groups ($pandora_name, $group = 0, $simple = 0, $font_size
$node_count++; $node_count++;
// Save node parent information to define edges later // Save node parent information to define edges later
if ($node_group['parent'] != "0") { if ($node_group['parent'] != "0" && $node_group['id_grupo'] != $group) {
$parents[$node_count] = $nodes_groups[$node_group['parent']]['id_node']; $parents[$node_count] = $nodes_groups[$node_group['parent']]['id_node'];
} else { } else {
$orphans[$node_count] = 1; $orphans[$node_count] = 1;
@ -173,8 +179,9 @@ function generate_dot_groups ($pandora_name, $group = 0, $simple = 0, $font_size
// Get agents data // Get agents data
$agents = get_agents ($filter, $agents = get_agents ($filter,
array ('id_grupo, nombre, id_os, id_agente')); array ('id_grupo, nombre, id_os, id_agente'));
if ($agents === false) if ($agents === false)
return false; $agents = array();
// Parse agents // Parse agents
$nodes_agents = array(); $nodes_agents = array();