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

2014-04-03 Miguel de Dios <miguel.dedios@artica.es> 

* include/functions_networkmap.php: fixed the PHP warning.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9717 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2014-04-03 16:29:51 +00:00
parent e9610d5e1a
commit ca29c0e9ec
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pandora_console/ChangeLog
View File

@ -1,3 +1,7 @@
2014-04-03 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_networkmap.php: fixed the PHP warning.
2014-04-03 Miguel de Dios <miguel.dedios@artica.es> 2014-04-03 Miguel de Dios <miguel.dedios@artica.es>
* godmode/agentes/module_manager_editor.php, * godmode/agentes/module_manager_editor.php,

20
pandora_console/include/functions_networkmap.php
View File

@ -316,19 +316,19 @@ function networkmap_generate_dot ($pandora_name, $group = 0,
$modules = agents_get_modules ($agent['id_agente'], '*', $filter, true, false); $modules = agents_get_modules ($agent['id_agente'], '*', $filter, true, false);
if ($modules === false) if ($modules === false)
$modules = array(); $modules = array();
// Parse modules // Parse modules
foreach ($modules as $key => $module) { foreach ($modules as $key => $module) {
if ($module['id_tipo_modulo'] != 18 && (!$l2_network || $module['id_tipo_modulo'] != 6)) { if ($module['id_tipo_modulo'] != 18 && (!$l2_network || $module['id_tipo_modulo'] != 6)) {
continue; continue;
} }
$node_count ++; $node_count ++;
$modules_node_ref[$module['id_agente_modulo']] = $node_count; $modules_node_ref[$module['id_agente_modulo']] = $node_count;
$module['id_node'] = $node_count; $module['id_node'] = $node_count;
$module['type'] = 'module'; $module['type'] = 'module';
// Try to get the interface name // Try to get the interface name
if (preg_match ("/_(.+)$/" , (string)$module['nombre'], $matches)) { if (preg_match ("/_(.+)$/" , (string)$module['nombre'], $matches)) {
if ($matches[1]) { if ($matches[1]) {
@ -354,19 +354,21 @@ function networkmap_generate_dot ($pandora_name, $group = 0,
$module_type = modules_get_agentmodule_type($id_module); $module_type = modules_get_agentmodule_type($id_module);
if ($module_type != 18) { if ($module_type != 18) {
unset($nodes[$node_count]); unset($nodes[$node_count]);
unset($orphans[$node_id]); unset($orphans[$node_count]);
unset($parents[$node_count]); unset($parents[$node_count]);
} }
} else { }
else {
unset($nodes[$node_count]); unset($nodes[$node_count]);
unset($orphans[$node_id]); unset($orphans[$node_count]);
unset($parents[$node_count]); unset($parents[$node_count]);
} }
} else { }
else {
$module_type = modules_get_agentmodule_type($id_module); $module_type = modules_get_agentmodule_type($id_module);
if ($module_type != 18) { if ($module_type != 18) {
unset($nodes[$node_count]); unset($nodes[$node_count]);
unset($orphans[$node_id]); unset($orphans[$node_count]);
unset($parents[$node_count]); unset($parents[$node_count]);
} }
} }