From bda05841319aca618005ff32af47f5daffb605ca Mon Sep 17 00:00:00 2001 From: Arturo Gonzalez Date: Mon, 3 Oct 2016 16:38:18 +0200 Subject: [PATCH] New networkmaps in progress... (Fixed other types of generation) --- pandora_console/include/functions_networkmap.php | 1 - pandora_console/include/functions_pandora_networkmap.php | 7 +++---- pandora_console/operation/agentes/pandora_networkmap.php | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/pandora_console/include/functions_networkmap.php b/pandora_console/include/functions_networkmap.php index 2cb381b793..dcf738310f 100644 --- a/pandora_console/include/functions_networkmap.php +++ b/pandora_console/include/functions_networkmap.php @@ -257,7 +257,6 @@ function networkmap_generate_dot ($pandora_name, $group = 0, $old_mode = false) { global $config; - $nooverlap = 1; $parents = array(); diff --git a/pandora_console/include/functions_pandora_networkmap.php b/pandora_console/include/functions_pandora_networkmap.php index 88a82b09ae..8a82316c25 100644 --- a/pandora_console/include/functions_pandora_networkmap.php +++ b/pandora_console/include/functions_pandora_networkmap.php @@ -75,15 +75,14 @@ function networkmap_process_networkmap($id = 0) { $show_snmp_modules = false; $dont_show_subgroups = false; - $id_group = -666; + $id_group = $networkmap['id_group'];; $ip_mask = ""; switch ($networkmap['source']) { - case 0: - $id_group = $networkmap['id_group']; - break; case 1: $recon_task = db_get_row_filter('trecon_task', array('id_rt' => $networkmap['source_data'])); + + $ip_mask = $recon_task['field1']; break; case 2: $ip_mask = $networkmap['source_data']; diff --git a/pandora_console/operation/agentes/pandora_networkmap.php b/pandora_console/operation/agentes/pandora_networkmap.php index b07a3d2ef0..dac681f9aa 100644 --- a/pandora_console/operation/agentes/pandora_networkmap.php +++ b/pandora_console/operation/agentes/pandora_networkmap.php @@ -233,7 +233,7 @@ else if ($update_networkmap || $copy_networkmap || $delete) { $filter['node_radius'] = $node_radius; $values['filter'] = json_encode($filter); - html_debug($values); + $result = false; if (!empty($name)) { $result = db_process_sql_update('tmap',