From 898945d47f439f64c4434f5eac9d4de8a00d0688 Mon Sep 17 00:00:00 2001
From: Tatiana Llorente <tatiana.llorente@artica.es>
Date: Tue, 29 Oct 2019 13:26:36 +0100
Subject: [PATCH 1/4] Added icon for gis maps connections in tabs of setup

---
 pandora_console/godmode/menu.php             |  2 +-
 pandora_console/godmode/setup/gis.php        | 11 +----------
 pandora_console/godmode/setup/gis_step_2.php | 10 ++++++++--
 pandora_console/godmode/setup/setup.php      | 14 ++++++++++++++
 4 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/pandora_console/godmode/menu.php b/pandora_console/godmode/menu.php
index 7175081912..f7e50863d3 100644
--- a/pandora_console/godmode/menu.php
+++ b/pandora_console/godmode/menu.php
@@ -317,7 +317,7 @@ if (check_acl($config['id_user'], 0, 'PM')) {
     $sub2['godmode/setup/setup&amp;section=notifications']['refr'] = 0;
 
     if ($config['activate_gis']) {
-        $sub2['godmode/setup/gis']['text'] = __('Map conections GIS');
+        $sub2['godmode/setup/setup&amp;section=gis']['text'] = __('Map conections GIS');
     }
 
     $sub['general']['sub2'] = $sub2;
diff --git a/pandora_console/godmode/setup/gis.php b/pandora_console/godmode/setup/gis.php
index 526abc0b0a..43e6ed71fd 100755
--- a/pandora_console/godmode/setup/gis.php
+++ b/pandora_console/godmode/setup/gis.php
@@ -28,15 +28,6 @@ require_once 'include/functions_gis.php';
 
 ui_require_javascript_file('openlayers.pandora');
 
-// Header.
-ui_print_page_header(
-    __('Map conections GIS'),
-    '',
-    false,
-    '',
-    true
-);
-
 $action = get_parameter('action');
 
 switch ($action) {
@@ -88,7 +79,7 @@ if ($mapsConnections !== false) {
         $table->data[] = [
             '<a href="index.php?sec=gsetup&sec2=godmode/setup/gis_step_2&amp;action=edit_connection_map&amp;id_connection_map='.$mapsConnection['id_tmap_connection'].'">'.$mapsConnection['conection_name'].'</a>',
             ui_print_group_icon($mapsConnection['group_id'], true),
-            '<a href="index.php?sec=gsetup&sec2=godmode/setup/gis&amp;id_connection_map='.$mapsConnection['id_tmap_connection'].'&amp;action=delete_connection"
+            '<a href="index.php?sec=gsetup&sec2=godmode/setup/setup&amp;section=gis&amp;id_connection_map='.$mapsConnection['id_tmap_connection'].'&amp;action=delete_connection"
 				onClick="javascript: if (!confirm(\''.__('Do you wan delete this connection?').'\')) return false;">'.html_print_image('images/cross.png', true).'</a>',
         ];
         $table->cellclass[][2] = 'action_buttons';
diff --git a/pandora_console/godmode/setup/gis_step_2.php b/pandora_console/godmode/setup/gis_step_2.php
index 133b4fdeaa..001baed40f 100644
--- a/pandora_console/godmode/setup/gis_step_2.php
+++ b/pandora_console/godmode/setup/gis_step_2.php
@@ -26,6 +26,10 @@ if (! check_acl($config['id_user'], 0, 'PM') && ! is_user_admin($config['id_user
 
 require_once 'include/functions_gis.php';
 
+$buttons['gis'] = [
+    'text' => '<a href="'.ui_get_full_url('index.php?sec=general&sec2=godmode/setup/setup&section=gis').'">'.html_print_image('images/list.png', true, ['title' => __('GIS Maps connections')]).'</a>',
+];
+
 $action = get_parameter('action', 'create_connection_map');
 
 if (is_ajax()) {
@@ -41,7 +45,8 @@ switch ($action) {
             '',
             false,
             '',
-            true
+            true,
+            $buttons
         );
 
         $mapConnection_name = '';
@@ -67,7 +72,8 @@ switch ($action) {
             '',
             false,
             '',
-            true
+            true,
+            $buttons
         );
 
         $idConnectionMap = get_parameter('id_connection_map');
diff --git a/pandora_console/godmode/setup/setup.php b/pandora_console/godmode/setup/setup.php
index a46d7bc832..48e6966c7b 100644
--- a/pandora_console/godmode/setup/setup.php
+++ b/pandora_console/godmode/setup/setup.php
@@ -133,6 +133,11 @@ $buttons['notifications'] = [
     'text'   => '<a href="'.ui_get_full_url('index.php?sec=gsetup&sec2=godmode/setup/setup&section=notifications').'">'.html_print_image('images/alerts_template.png', true, ['title' => __('Notifications')]).'</a>',
 ];
 
+$buttons['gis'] = [
+    'active' => false,
+    'text'   => '<a href="'.ui_get_full_url('index.php?sec=general&sec2=godmode/setup/setup&section=gis').'">'.html_print_image('images/gis_tab.png', true, ['title' => __('GIS Map connection')]).'</a>',
+];
+
 $help_header = '';
 if (enterprise_installed()) {
     $subpage = setup_enterprise_add_subsection_main($section, $buttons, $help_header);
@@ -178,6 +183,11 @@ switch ($section) {
         $help_header = 'setup_integria_tab';
     break;
 
+    case 'gis':
+        $buttons['gis']['active'] = true;
+        $subpage = ' &raquo '.__('Map conections GIS');
+    break;
+
     case 'notifications':
         $buttons['notifications']['active'] = true;
         $subpage = ' &raquo '.__('Notifications');
@@ -243,6 +253,10 @@ switch ($section) {
         include_once $config['homedir'].'/godmode/setup/setup_integria.php';
     break;
 
+    case 'gis':
+        include_once $config['homedir'].'/godmode/setup/gis.php';
+    break;
+
     case 'notifications':
         include_once $config['homedir'].'/godmode/setup/setup_notifications.php';
     break;

From 7701ff7ad188c1c5624993acddd8f201dba3aeb7 Mon Sep 17 00:00:00 2001
From: Tatiana Llorente <tatiana.llorente@artica.es>
Date: Wed, 8 Jan 2020 15:44:59 +0100
Subject: [PATCH 2/4] Resolve conflicts

---
 pandora_console/godmode/setup/setup.php | 245 +++++++++++-------------
 1 file changed, 116 insertions(+), 129 deletions(-)

diff --git a/pandora_console/godmode/setup/setup.php b/pandora_console/godmode/setup/setup.php
index b93a38fb37..e9b8160fdd 100644
--- a/pandora_console/godmode/setup/setup.php
+++ b/pandora_console/godmode/setup/setup.php
@@ -133,149 +133,136 @@ $buttons['notifications'] = [
     'text'   => '<a href="'.ui_get_full_url('index.php?sec=gsetup&sec2=godmode/setup/setup&section=notifications').'">'.html_print_image('images/alerts_template.png', true, ['title' => __('Notifications')]).'</a>',
 ];
 
-$buttons['gis'] = [
-    'active' => false,
-    'text'   => '<a href="'.ui_get_full_url('index.php?sec=general&sec2=godmode/setup/setup&section=gis').'">'.html_print_image('images/gis_tab.png', true, ['title' => __('GIS Map connection')]).'</a>',
-
 $buttons['websocket_engine'] = [
     'active' => false,
     'text'   => '<a href="'.ui_get_full_url('index.php?sec=gsetup&sec2=godmode/setup/setup&section=websocket_engine').'">'.html_print_image('images/websocket_small.png', true, ['title' => __('Websocket engine')]).'</a>',
 ];
 
-    $help_header = '';
-    if (enterprise_installed()) {
-        $subpage = setup_enterprise_add_subsection_main($section, $buttons, $help_header);
+$help_header = '';
+if (enterprise_installed()) {
+    $subpage = setup_enterprise_add_subsection_main($section, $buttons, $help_header);
+}
+
+switch ($section) {
+    case 'general':
+        $buttons['general']['active'] = true;
+        $subpage = ' &raquo '.__('General');
+        $help_header = 'setup_general_tab';
+    break;
+
+    case 'auth':
+        $buttons['auth']['active'] = true;
+        $subpage = ' &raquo '.__('Authentication');
+    break;
+
+    case 'perf':
+        $buttons['perf']['active'] = true;
+        $subpage = ' &raquo '.__('Performance');
+        $help_header = '';
+    break;
+
+    case 'vis':
+        $buttons['vis']['active'] = true;
+        $subpage = ' &raquo '.__('Visual styles');
+    break;
+
+    case 'net':
+        $buttons['net']['active'] = true;
+        $subpage = ' &raquo '.__('Netflow');
+    break;
+
+    case 'ehorus':
+        $buttons['ehorus']['active'] = true;
+        $subpage = ' &raquo '.__('eHorus');
+        $help_header = 'setup_ehorus_tab';
+    break;
+
+    case 'integria':
+        $buttons['integria']['active'] = true;
+        $subpage = ' &raquo '.__('Integria IMS');
+        $help_header = 'setup_integria_tab';
+    break;
+
+    case 'notifications':
+        $buttons['notifications']['active'] = true;
+        $subpage = ' &raquo '.__('Notifications');
+    break;
+
+    case 'websocket_engine':
+        $buttons['websocket_engine']['active'] = true;
+        $subpage = ' &raquo '.__('Pandora Websocket Engine');
+        $help_header = 'quickshell_settings';
+    break;
+
+    case 'enterprise':
+        $buttons['enterprise']['active'] = true;
+        $subpage = ' &raquo '.__('Enterprise');
+        $help_header = 'setup_enterprise_tab';
+    break;
+
+    default:
+        // Default.
+    break;
+}
+
+// Header.
+ui_print_page_header(
+    __('Configuration').$subpage,
+    '',
+    false,
+    $help_header,
+    true,
+    $buttons
+);
+
+if (isset($config['error_config_update_config'])) {
+    if ($config['error_config_update_config']['correct'] == false) {
+        ui_print_error_message($config['error_config_update_config']['message']);
+    } else {
+        ui_print_success_message(__('Correct update the setup options'));
     }
 
-    switch ($section) {
-        case 'general':
-            $buttons['general']['active'] = true;
-            $subpage = ' &raquo '.__('General');
-            $help_header = 'setup_general_tab';
-        break;
+    unset($config['error_config_update_config']);
+}
 
-        case 'auth':
-            $buttons['auth']['active'] = true;
-            $subpage = ' &raquo '.__('Authentication');
-        break;
+switch ($section) {
+    case 'general':
+        include_once $config['homedir'].'/godmode/setup/setup_general.php';
+    break;
 
-        case 'perf':
-            $buttons['perf']['active'] = true;
-            $subpage = ' &raquo '.__('Performance');
-            $help_header = '';
-        break;
+    case 'auth':
+        include_once $config['homedir'].'/godmode/setup/setup_auth.php';
+    break;
 
-        case 'vis':
-            $buttons['vis']['active'] = true;
-            $subpage = ' &raquo '.__('Visual styles');
-        break;
+    case 'perf':
+        include_once $config['homedir'].'/godmode/setup/performance.php';
+    break;
 
-        case 'net':
-            $buttons['net']['active'] = true;
-            $subpage = ' &raquo '.__('Netflow');
-        break;
+    case 'net':
+        include_once $config['homedir'].'/godmode/setup/setup_netflow.php';
+    break;
 
-        case 'ehorus':
-            $buttons['ehorus']['active'] = true;
-            $subpage = ' &raquo '.__('eHorus');
-            $help_header = 'setup_ehorus_tab';
-        break;
+    case 'vis':
+        include_once $config['homedir'].'/godmode/setup/setup_visuals.php';
+    break;
 
-        case 'integria':
-            $buttons['integria']['active'] = true;
-            $subpage = ' &raquo '.__('Integria IMS');
-            $help_header = 'setup_integria_tab';
-        break;
+    case 'ehorus':
+        include_once $config['homedir'].'/godmode/setup/setup_ehorus.php';
+    break;
 
-        case 'gis':
-            $buttons['gis']['active'] = true;
-            $subpage = ' &raquo '.__('Map conections GIS');
-        break;
+    case 'integria':
+        include_once $config['homedir'].'/godmode/setup/setup_integria.php';
+    break;
 
-        case 'notifications':
-            $buttons['notifications']['active'] = true;
-            $subpage = ' &raquo '.__('Notifications');
-        break;
+    case 'notifications':
+        include_once $config['homedir'].'/godmode/setup/setup_notifications.php';
+    break;
 
-        case 'websocket_engine':
-            $buttons['websocket_engine']['active'] = true;
-            $subpage = ' &raquo '.__('Pandora Websocket Engine');
-            $help_header = 'quickshell_settings';
-        break;
+    case 'websocket_engine':
+        include_once $config['homedir'].'/godmode/setup/setup_websocket_engine.php';
+    break;
 
-        case 'enterprise':
-            $buttons['enterprise']['active'] = true;
-            $subpage = ' &raquo '.__('Enterprise');
-            $help_header = 'setup_enterprise_tab';
-        break;
-
-        default:
-            // Default.
-        break;
-    }
-
-    // Header.
-    ui_print_page_header(
-        __('Configuration').$subpage,
-        '',
-        false,
-        $help_header,
-        true,
-        $buttons
-    );
-
-    if (isset($config['error_config_update_config'])) {
-        if ($config['error_config_update_config']['correct'] == false) {
-            ui_print_error_message($config['error_config_update_config']['message']);
-        } else {
-            ui_print_success_message(__('Correct update the setup options'));
-        }
-
-        unset($config['error_config_update_config']);
-    }
-
-    switch ($section) {
-        case 'general':
-            include_once $config['homedir'].'/godmode/setup/setup_general.php';
-        break;
-
-        case 'auth':
-            include_once $config['homedir'].'/godmode/setup/setup_auth.php';
-        break;
-
-        case 'perf':
-            include_once $config['homedir'].'/godmode/setup/performance.php';
-        break;
-
-        case 'net':
-            include_once $config['homedir'].'/godmode/setup/setup_netflow.php';
-        break;
-
-        case 'vis':
-            include_once $config['homedir'].'/godmode/setup/setup_visuals.php';
-        break;
-
-        case 'ehorus':
-            include_once $config['homedir'].'/godmode/setup/setup_ehorus.php';
-        break;
-
-        case 'integria':
-            include_once $config['homedir'].'/godmode/setup/setup_integria.php';
-        break;
-
-        case 'gis':
-            include_once $config['homedir'].'/godmode/setup/gis.php';
-        break;
-
-        case 'notifications':
-            include_once $config['homedir'].'/godmode/setup/setup_notifications.php';
-        break;
-
-        case 'websocket_engine':
-            include_once $config['homedir'].'/godmode/setup/setup_websocket_engine.php';
-        break;
-
-        default:
-            enterprise_hook('setup_enterprise_select_tab', [$section]);
-        break;
-    }
+    default:
+        enterprise_hook('setup_enterprise_select_tab', [$section]);
+    break;
+}

From f61ba42dd7aa139a5dd62e2180603281d2d89867 Mon Sep 17 00:00:00 2001
From: Tatiana Llorente <tatiana.llorente@artica.es>
Date: Wed, 8 Jan 2020 15:48:07 +0100
Subject: [PATCH 3/4] Resolve conflicts

---
 pandora_console/godmode/setup/setup.php | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/pandora_console/godmode/setup/setup.php b/pandora_console/godmode/setup/setup.php
index e9b8160fdd..3aa66351b9 100644
--- a/pandora_console/godmode/setup/setup.php
+++ b/pandora_console/godmode/setup/setup.php
@@ -133,6 +133,11 @@ $buttons['notifications'] = [
     'text'   => '<a href="'.ui_get_full_url('index.php?sec=gsetup&sec2=godmode/setup/setup&section=notifications').'">'.html_print_image('images/alerts_template.png', true, ['title' => __('Notifications')]).'</a>',
 ];
 
+$buttons['gis'] = [
+    'active' => false,
+    'text'   => '<a href="'.ui_get_full_url('index.php?sec=general&sec2=godmode/setup/setup&section=gis').'">'.html_print_image('images/gis_tab.png', true, ['title' => __('GIS Map connection')]).'</a>',
+];
+
 $buttons['websocket_engine'] = [
     'active' => false,
     'text'   => '<a href="'.ui_get_full_url('index.php?sec=gsetup&sec2=godmode/setup/setup&section=websocket_engine').'">'.html_print_image('images/websocket_small.png', true, ['title' => __('Websocket engine')]).'</a>',
@@ -183,6 +188,11 @@ switch ($section) {
         $help_header = 'setup_integria_tab';
     break;
 
+    case 'gis':
+        $buttons['gis']['active'] = true;
+        $subpage = ' &raquo '.__('Map conections GIS');
+    break;
+
     case 'notifications':
         $buttons['notifications']['active'] = true;
         $subpage = ' &raquo '.__('Notifications');
@@ -254,6 +264,10 @@ switch ($section) {
         include_once $config['homedir'].'/godmode/setup/setup_integria.php';
     break;
 
+    case 'gis':
+        include_once $config['homedir'].'/godmode/setup/gis.php';
+    break;
+
     case 'notifications':
         include_once $config['homedir'].'/godmode/setup/setup_notifications.php';
     break;

From 665e9e4c98f9c98259d81ebc56c9f7e43f392245 Mon Sep 17 00:00:00 2001
From: Tatiana Llorente <tatiana.llorente@artica.es>
Date: Wed, 8 Jan 2020 15:57:18 +0100
Subject: [PATCH 4/4] Show gis icon only if enabled gis

---
 pandora_console/godmode/setup/setup.php | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pandora_console/godmode/setup/setup.php b/pandora_console/godmode/setup/setup.php
index 3aa66351b9..a5f41ed999 100644
--- a/pandora_console/godmode/setup/setup.php
+++ b/pandora_console/godmode/setup/setup.php
@@ -133,16 +133,18 @@ $buttons['notifications'] = [
     'text'   => '<a href="'.ui_get_full_url('index.php?sec=gsetup&sec2=godmode/setup/setup&section=notifications').'">'.html_print_image('images/alerts_template.png', true, ['title' => __('Notifications')]).'</a>',
 ];
 
-$buttons['gis'] = [
-    'active' => false,
-    'text'   => '<a href="'.ui_get_full_url('index.php?sec=general&sec2=godmode/setup/setup&section=gis').'">'.html_print_image('images/gis_tab.png', true, ['title' => __('GIS Map connection')]).'</a>',
-];
-
 $buttons['websocket_engine'] = [
     'active' => false,
     'text'   => '<a href="'.ui_get_full_url('index.php?sec=gsetup&sec2=godmode/setup/setup&section=websocket_engine').'">'.html_print_image('images/websocket_small.png', true, ['title' => __('Websocket engine')]).'</a>',
 ];
 
+if ($config['activate_gis']) {
+    $buttons['gis'] = [
+        'active' => false,
+        'text'   => '<a href="'.ui_get_full_url('index.php?sec=general&sec2=godmode/setup/setup&section=gis').'">'.html_print_image('images/gis_tab.png', true, ['title' => __('GIS Map connection')]).'</a>',
+    ];
+}
+
 $help_header = '';
 if (enterprise_installed()) {
     $subpage = setup_enterprise_add_subsection_main($section, $buttons, $help_header);