From 2d1463ee0c5d9496277c240a4b527aae0c6f2bd6 Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Tue, 26 Mar 2019 16:46:32 +0100
Subject: [PATCH] minor fixes networkmaps

Former-commit-id: 85dda0470280e1f0cf142f7393f1492c61f42c6b
---
 pandora_console/include/class/NetworkMap.class.php  | 13 +++++++------
 .../javascript/functions_pandora_networkmap.js      |  4 ++++
 .../operation/agentes/pandora_networkmap.editor.php | 10 ++++++++--
 .../operation/agentes/pandora_networkmap.php        |  5 ++++-
 4 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/pandora_console/include/class/NetworkMap.class.php b/pandora_console/include/class/NetworkMap.class.php
index 4d166e9e0c..6598f309e8 100644
--- a/pandora_console/include/class/NetworkMap.class.php
+++ b/pandora_console/include/class/NetworkMap.class.php
@@ -585,10 +585,6 @@ class NetworkMap
             $this->idGroup = $this->map['id_group'];
 
             switch ($this->map['source']) {
-                case SOURCE_GROUP:
-                    $this->idGroup = $this->map['source_data'];
-                break;
-
                 case SOURCE_TASK:
                     $this->idTask = $this->map['source_data'];
                 break;
@@ -597,6 +593,8 @@ class NetworkMap
                     $this->network = $this->map['source_data'];
                 break;
 
+                case SOURCE_GROUP:
+                    // Already load.
                 default:
                     // Ignore.
                 break;
@@ -753,7 +751,9 @@ class NetworkMap
             // Empty map returns no data.
             $nodes = [];
         } else {
-            if ($this->mapOptions['map_filter']['dont_show_subgroups'] == 'true') {
+            if ($this->mapOptions['map_filter']['dont_show_subgroups'] == 'true'
+                || $this->mapOptions['map_filter']['dont_show_subgroups'] == 1
+            ) {
                 // Show only current selected group.
                 $filter['id_grupo'] = $this->idGroup;
             } else {
@@ -3226,7 +3226,8 @@ class NetworkMap
             enterprise_installed: enterprise_installed,
             node_radius: node_radius,
             holding_area_dimensions: networkmap_holding_area_dimensions,
-            url_background_grid: url_background_grid
+            url_background_grid: url_background_grid,
+            font_size: '.$this->mapOptions['font_size'].'
         });
         init_drag_and_drop();
         init_minimap();
diff --git a/pandora_console/include/javascript/functions_pandora_networkmap.js b/pandora_console/include/javascript/functions_pandora_networkmap.js
index aa51275444..596dc2e299 100644
--- a/pandora_console/include/javascript/functions_pandora_networkmap.js
+++ b/pandora_console/include/javascript/functions_pandora_networkmap.js
@@ -3968,6 +3968,10 @@ function draw_elements_graph() {
 
   var font_size = node_radius / 1.5;
 
+  if (self.font_size) {
+    font_size = self.font_size;
+  }
+
   node_temp
     .append("text")
     .attr("class", "node_text")
diff --git a/pandora_console/operation/agentes/pandora_networkmap.editor.php b/pandora_console/operation/agentes/pandora_networkmap.editor.php
index 0633f19070..d0bdbd57ca 100644
--- a/pandora_console/operation/agentes/pandora_networkmap.editor.php
+++ b/pandora_console/operation/agentes/pandora_networkmap.editor.php
@@ -53,7 +53,7 @@ if ($new_networkmap) {
     $recon_task_id = 0;
     $source = 'group';
     $ip_mask = '';
-    $dont_show_subgroups = false;
+    $dont_show_subgroups = 0;
     $offset_x = '';
     $offset_y = '';
     $scale_z = 0.5;
@@ -330,7 +330,13 @@ if ($not_found) {
     $table->data['source_data_ip_mask'][1] = html_print_input_text('ip_mask', $ip_mask, '', 20, 255, true, $disabled_source);
 
     $table->data['source_data_dont_show_subgroups'][0] = __('Don\'t show subgroups:');
-    $table->data['source_data_dont_show_subgroups'][1] = html_print_checkbox('dont_show_subgroups', '1', $dont_show_subgroups, true, $disabled_source);
+    $table->data['source_data_dont_show_subgroups'][1] = html_print_checkbox(
+        'dont_show_subgroups',
+        '1',
+        $dont_show_subgroups,
+        true,
+        $disabled_source
+    );
 
     $methods = [
         'twopi'          => 'radial',
diff --git a/pandora_console/operation/agentes/pandora_networkmap.php b/pandora_console/operation/agentes/pandora_networkmap.php
index 53d6278c00..9efde3fa6f 100644
--- a/pandora_console/operation/agentes/pandora_networkmap.php
+++ b/pandora_console/operation/agentes/pandora_networkmap.php
@@ -76,7 +76,10 @@ if (enterprise_installed()) {
 
         $method = (string) get_parameter('method', 'fdp');
 
-        $dont_show_subgroups = 0;
+        $dont_show_subgroups = (int) get_parameter_checkbox(
+            'dont_show_subgroups',
+            0
+        );
         $node_radius = (int) get_parameter('node_radius', 40);
         $description = get_parameter('description', '');