From 663c1e0841c4c28647845a8cca2c3b70c099f1f7 Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Tue, 12 Mar 2019 18:32:55 +0100
Subject: [PATCH] NetworkMap class rc1

Former-commit-id: 871da4e80cd5909f6bb1da567e3fbe55709690a5
---
 .../include/ajax/task_list.ajax.php           |  5 +-
 .../include/class/NetworkMap.class.php        |  9 +++-
 .../include/functions_networkmap.php          | 52 ++++++++++++++++---
 3 files changed, 57 insertions(+), 9 deletions(-)

diff --git a/pandora_console/include/ajax/task_list.ajax.php b/pandora_console/include/ajax/task_list.ajax.php
index dd4221a05d..ec5066c7f8 100644
--- a/pandora_console/include/ajax/task_list.ajax.php
+++ b/pandora_console/include/ajax/task_list.ajax.php
@@ -79,7 +79,10 @@ if ($showmap) {
     $id_task = get_parameter('id', 0);
 
     $map = new NetworkMap(
-        ['id_task' => $id_task]
+        [
+            'id_task' => $id_task,
+            'pure'    => 1,
+        ]
     );
     $map->printMap();
 }
diff --git a/pandora_console/include/class/NetworkMap.class.php b/pandora_console/include/class/NetworkMap.class.php
index 2abca6dc75..f88e797fc9 100644
--- a/pandora_console/include/class/NetworkMap.class.php
+++ b/pandora_console/include/class/NetworkMap.class.php
@@ -148,10 +148,10 @@ class NetworkMap
         $this->mapOptions['font_size'] = 12;
         $this->mapOptions['nooverlap'] = 1;
         $this->mapOptions['z_dash'] = 0.5;
-        $this->mapOptions['ranksep'] = 0.5;
+        $this->mapOptions['ranksep'] = 3;
         $this->mapOptions['center'] = 0;
         $this->mapOptions['regen'] = 0;
-        $this->mapOptions['pure'] = 1;
+        $this->mapOptions['pure'] = 0;
         $this->mapOptions['show_snmp_modules'] = false;
         $this->mapOptions['cut_names'] = false;
         $this->mapOptions['relative'] = true;
@@ -198,6 +198,11 @@ class NetworkMap
                 $this->mode = $options['mode'];
             }
 
+            // Show interface elements or dashboard style.
+            if (isset($options['pure'])) {
+                $this->mapOptions['pure'] = $options['pure'];
+            }
+
             // Map options, check default values above.
             // This is only used while generating new maps using
             // (generateDotGraph).
diff --git a/pandora_console/include/functions_networkmap.php b/pandora_console/include/functions_networkmap.php
index b5443ae8b6..c35d865a15 100644
--- a/pandora_console/include/functions_networkmap.php
+++ b/pandora_console/include/functions_networkmap.php
@@ -679,17 +679,57 @@ function networkmap_generate_dot(
 }
 
 
-// Returns an edge definition
-function networkmap_create_edge($head, $tail, $layout, $nooverlap, $pure, $zoom, $ranksep, $simple, $regen, $font_size, $group, $sec2='operation/agentes/networkmap', $tab='topology', $id_networkmap=0)
-{
+/**
+ * Returns an edge definition.
+ *
+ * @param mixed   $head          Head.
+ * @param mixed   $tail          Tail.
+ * @param string  $layout        Layout.
+ * @param string  $nooverlap     Nooverlap.
+ * @param integer $pure          Pure.
+ * @param float   $zoom          Zoom.
+ * @param float   $ranksep       Ranksep.
+ * @param integer $simple        Simple.
+ * @param integer $regen         Regen.
+ * @param integer $font_size     Font_size.
+ * @param integer $group         Group.
+ * @param string  $sec2          Sec2.
+ * @param string  $tab           Tab.
+ * @param integer $id_networkmap Id_networkmap.
+ *
+ * @return string Dot string.
+ */
+function networkmap_create_edge(
+    $head,
+    $tail,
+    $layout,
+    $nooverlap,
+    $pure,
+    $zoom,
+    $ranksep,
+    $simple,
+    $regen,
+    $font_size,
+    $group,
+    $sec2='operation/agentes/networkmap',
+    $tab='topology',
+    $id_networkmap=0
+) {
     if (defined('METACONSOLE')) {
         $url = '';
     } else {
-        $url = 'index.php?sec=estado&'.'sec2='.$sec2.'&'.'tab='.$tab.'&'.'recenter_networkmap=1&'.'center='.$head.'&'.'layout='.$layout.'&'.'nooverlap='.$nooverlap.'&'.'pure='.$pure.'&'.'zoom='.$zoom.'&'.'ranksep='.$ranksep.'&'.'simple='.$simple.'&'.'regen=1'.'&'.'font_size='.$font_size.'&'.'group='.$group.'&'.'id_networkmap='.$id_networkmap;
+        $url = 'index.php?sec=estado&sec2='.$sec2.'&tab='.$tab.'&';
+        $url .= 'recenter_networkmap=1&center='.$head.'&';
+        $url .= 'layout='.$layout.'&nooverlap='.$nooverlap.'&';
+        $url .= 'pure='.$pure.'&zoom='.$zoom.'&ranksep='.$ranksep.'&';
+        $url .= 'simple='.$simple.'&regen=1&font_size='.$font_size.'&';
+        $url .= 'group='.$group.'&id_networkmap='.$id_networkmap;
     }
 
-    // edgeURL allows node navigation
-    $edge = "\n".$head.' -- '.$tail.'[len=3, color="#BDBDBD", headclip=false, tailclip=false, edgeURL=""];'."\n";
+    // Option edgeURL allows node navigation.
+    $edge = "\n".$head.' -- '.$tail.'[len='.$ranksep;
+    $edge .= ', color="#BDBDBD", headclip=false, tailclip=false, edgeURL=""];';
+    $edge .= "\n";
 
     return $edge;
 }