Merge remote-tracking branch 'origin/develop' into ent-3498-Anadir_parametros_manualmente_en_respuestas_de_eventos_masiva

Former-commit-id: 76e5afc943bd05e89a82efbe091db42d1e0a4e8d

pandora_agents/pc/AIX/pandora_agent.conf

@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.731, AIX version
+# Version 7.0NG.732, AIX version
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2010 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com

pandora_agents/pc/FreeBSD/pandora_agent.conf

@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.731, FreeBSD Version
+# Version 7.0NG.732, FreeBSD Version
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2010 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com

pandora_agents/pc/HP-UX/pandora_agent.conf

@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.731, HP-UX Version
+# Version 7.0NG.732, HP-UX Version
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2009 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com

pandora_agents/pc/Linux/pandora_agent.conf

@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.731, GNU/Linux
+# Version 7.0NG.732, GNU/Linux
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2009 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com

pandora_agents/pc/NT4/pandora_agent.conf

@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.731, GNU/Linux
+# Version 7.0NG.732, GNU/Linux
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2009 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com

pandora_agents/pc/SunOS/pandora_agent.conf

@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.731, Solaris Version
+# Version 7.0NG.732, Solaris Version
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2009 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com

pandora_agents/pc/Win32/pandora_agent.conf

@@ -1,6 +1,6 @@
 # Base config file for Pandora FMS Windows Agent
 # (c) 2006-2010 Artica Soluciones Tecnologicas 
-# Version 7.0NG.731
+# Version 7.0NG.732
 
 # This program is Free Software, you can redistribute it and/or modify it
 # under the terms of the GNU General Public Licence as published by the Free Software

pandora_agents/shellscript/aix/pandora_agent.conf

@@ -1,6 +1,6 @@
 # Fichero de configuracion base de agentes de Pandora
 # Base config file for Pandora agents
-# Version 7.0NG.731, AIX version
+# Version 7.0NG.732, AIX version
 
 # General Parameters
 # ==================

pandora_agents/shellscript/bsd-ipso/pandora_agent.conf

@@ -1,6 +1,6 @@
 # Fichero de configuracion base de agentes de Pandora
 # Base config file for Pandora agents
-# Version 7.0NG.731
+# Version 7.0NG.732
 # FreeBSD/IPSO version
 # Licenced under GPL licence, 2003-2007 Sancho Lerena
 

pandora_agents/shellscript/hp-ux/pandora_agent.conf

@@ -1,6 +1,6 @@
 # Fichero de configuracion base de agentes de Pandora
 # Base config file for Pandora agents
-# Version 7.0NG.731, HPUX Version
+# Version 7.0NG.732, HPUX Version
 
 # General Parameters
 # ==================

pandora_agents/shellscript/linux/pandora_agent.conf

@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.731
+# Version 7.0NG.732
 # Licensed under GPL license v2,
 # (c) 2003-2010 Artica Soluciones Tecnologicas
 # please visit http://pandora.sourceforge.net

pandora_agents/shellscript/mac_osx/pandora_agent.conf

@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.731
+# Version 7.0NG.732
 # Licensed under GPL license v2,
 # (c) 2003-2009 Artica Soluciones Tecnologicas
 # please visit http://pandora.sourceforge.net

pandora_agents/shellscript/openWRT/pandora_agent.conf

@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.731
+# Version 7.0NG.732
 # Licensed under GPL license v2,
 # please visit http://pandora.sourceforge.net
 

pandora_agents/shellscript/solaris/pandora_agent.conf

@@ -1,6 +1,6 @@
 # Fichero de configuracion base de agentes de Pandora
 # Base config file for Pandora agents
-# Version 7.0NG.731, Solaris version
+# Version 7.0NG.732, Solaris version
 
 # General Parameters
 # ==================

pandora_agents/unix/AIX/pandora_agent.conf

@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.731, AIX version
+# Version 7.0NG.732, AIX version
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2010 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com

pandora_agents/unix/DEBIAN/control

@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.731-190227
+Version: 7.0NG.732-190307
 Architecture: all
 Priority: optional
 Section: admin

pandora_agents/unix/DEBIAN/make_deb_package.sh

@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.731-190227"
+pandora_version="7.0NG.732-190307"
 
 echo "Test if you has the tools for to make the packages."
 whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null

pandora_agents/unix/Darwin/pandora_agent.conf

@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.731, GNU/Linux
+# Version 7.0NG.732, GNU/Linux
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2012 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com

pandora_agents/unix/FreeBSD/pandora_agent.conf

@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.731, FreeBSD Version
+# Version 7.0NG.732, FreeBSD Version
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2016 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com

pandora_agents/unix/HP-UX/pandora_agent.conf

@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.731, HP-UX Version
+# Version 7.0NG.732, HP-UX Version
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2009 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com

pandora_agents/unix/Linux/pandora_agent.conf

@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.731, GNU/Linux
+# Version 7.0NG.732, GNU/Linux
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2014 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com

pandora_agents/unix/NT4/pandora_agent.conf

@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.731, GNU/Linux
+# Version 7.0NG.732, GNU/Linux
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2009 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com

pandora_agents/unix/NetBSD/pandora_agent.conf

@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.731, NetBSD Version
+# Version 7.0NG.732, NetBSD Version
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2010 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com

pandora_agents/unix/SunOS/pandora_agent.conf

@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.731, Solaris Version
+# Version 7.0NG.732, Solaris Version
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2009 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com

pandora_agents/unix/pandora_agent

@@ -41,8 +41,8 @@ my $Sem = undef;
 # Semaphore used to control the number of threads
 my $ThreadSem = undef;
 
-use constant AGENT_VERSION => '7.0NG.731';
+use constant AGENT_VERSION => '7.0NG.732';
-use constant AGENT_BUILD => '190227';
+use constant AGENT_BUILD => '190307';
 
 # Agent log default file size maximum and instances
 use constant DEFAULT_MAX_LOG_SIZE => 600000;

pandora_agents/unix/pandora_agent.redhat.spec

@@ -2,8 +2,8 @@
 #Pandora FMS Linux Agent
 #
 %define name        pandorafms_agent_unix
-%define version     7.0NG.731
+%define version     7.0NG.732
-%define release     190227
+%define release     190307
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}

pandora_agents/unix/pandora_agent.spec

@@ -2,8 +2,8 @@
 #Pandora FMS Linux Agent
 #
 %define name        pandorafms_agent_unix
-%define version     7.0NG.731
+%define version     7.0NG.732
-%define release     190227
+%define release     190307
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}

pandora_agents/unix/pandora_agent_installer

@@ -9,8 +9,8 @@
 # Please see http://www.pandorafms.org. This code is licensed under GPL 2.0 license.
 # **********************************************************************
 
-PI_VERSION="7.0NG.731"
+PI_VERSION="7.0NG.732"
-PI_BUILD="190227"
+PI_BUILD="190307"
 OS_NAME=`uname -s`
 
 FORCE=0

pandora_agents/win32/bin/pandora_agent.conf

@@ -1,6 +1,6 @@
 # Base config file for Pandora FMS Windows Agent
 # (c) 2006-2017 Artica Soluciones Tecnologicas 
-# Version 7.0NG.731
+# Version 7.0NG.732
 
 # This program is Free Software, you can redistribute it and/or modify it
 # under the terms of the GNU General Public Licence as published by the Free Software

pandora_agents/win32/installer/pandora.mpi

@@ -3,7 +3,7 @@ AllowLanguageSelection
 {Yes}
 
 AppName
-{Pandora FMS Windows Agent v7.0NG.731}
+{Pandora FMS Windows Agent v7.0NG.732}
 
 ApplicationID
 {17E3D2CF-CA02-406B-8A80-9D31C17BD08F}
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{190227}
+{190307}
 
 ViewReadme
 {Yes}

pandora_agents/win32/pandora.cc

@@ -30,7 +30,7 @@ using namespace Pandora;
 using namespace Pandora_Strutils;
 
 #define PATH_SIZE    _MAX_PATH+1
-#define PANDORA_VERSION ("7.0NG.731(Build 190227)")
+#define PANDORA_VERSION ("7.0NG.732(Build 190307)")
 
 string pandora_path;
 string pandora_dir;

pandora_agents/win32/versioninfo.rc

@@ -11,7 +11,7 @@ BEGIN
       VALUE "LegalCopyright", "Artica ST"
       VALUE "OriginalFilename", "PandoraAgent.exe"
       VALUE "ProductName", "Pandora FMS Windows Agent"
-      VALUE "ProductVersion", "(7.0NG.731(Build 190227))"
+      VALUE "ProductVersion", "(7.0NG.732(Build 190307))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END

pandora_console/DEBIAN/control

@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.731-190227
+Version: 7.0NG.732-190307
 Architecture: all
 Priority: optional
 Section: admin

pandora_console/DEBIAN/make_deb_package.sh

@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.731-190227"
+pandora_version="7.0NG.732-190307"
 
 package_pear=0
 package_pandora=1

pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql

@@ -1199,13 +1199,13 @@ ALTER TABLE titem MODIFY `source_data` int(10) unsigned;
 INSERT INTO `tconfig` (`token`, `value`) VALUES ('big_operation_step_datos_purge', '100');
 INSERT INTO `tconfig` (`token`, `value`) VALUES ('small_operation_step_datos_purge', '1000');
 INSERT INTO `tconfig` (`token`, `value`) VALUES ('days_autodisable_deletion', '30');
-INSERT INTO `tconfig` (`token`, `value`) VALUES ('MR', 24);
+INSERT INTO `tconfig` (`token`, `value`) VALUES ('MR', 25);
 INSERT INTO `tconfig` (`token`, `value`) VALUES ('custom_docs_logo', 'default_docs.png');
 INSERT INTO `tconfig` (`token`, `value`) VALUES ('custom_support_logo', 'default_support.png');
 INSERT INTO `tconfig` (`token`, `value`) VALUES ('custom_logo_white_bg_preview', 'pandora_logo_head_white_bg.png');
 UPDATE tconfig SET value = 'https://licensing.artica.es/pandoraupdate7/server.php' WHERE token='url_update_manager';
 DELETE FROM `tconfig` WHERE `token` = 'current_package_enterprise';
-INSERT INTO `tconfig` (`token`, `value`) VALUES ('current_package_enterprise', '731');
+INSERT INTO `tconfig` (`token`, `value`) VALUES ('current_package_enterprise', '732');
 INSERT INTO `tconfig` (`token`, `value`) VALUES ('status_monitor_fields', 'policy,agent,data_type,module_name,server_type,interval,status,graph,warn,data,timestamp');
 
 -- ---------------------------------------------------------------------
@@ -1900,14 +1900,16 @@ CREATE TABLE IF NOT EXISTS `tevent_extended` (
 -- -----------------------------------------------------
 -- Table `tgis_map_layer_groups`
 -- -----------------------------------------------------
-CREATE TABLE IF NOT EXISTS `tgis_map_layer_groups` (
+CREATE TABLE `tgis_map_layer_groups` (
-	`layer_id` INT NOT NULL,
+  `layer_id` int(11) NOT NULL,
-	`group_id` MEDIUMINT(4) UNSIGNED NOT NULL,
+  `group_id` mediumint(4) unsigned NOT NULL,
-	`agent_id` INT(10) UNSIGNED NOT NULL COMMENT 'Used to link the position to the group',
+  `agent_id` int(10) unsigned NOT NULL COMMENT 'Used to link the position to the group',
   PRIMARY KEY (`layer_id`,`group_id`),
-	FOREIGN KEY (`layer_id`) REFERENCES `tgis_map_layer` (`id_tmap_layer`) ON DELETE CASCADE,
+  KEY `group_id` (`group_id`),
-	FOREIGN KEY (`group_id`) REFERENCES `tgrupo` (`id_grupo`) ON DELETE CASCADE,
+  KEY `agent_id` (`agent_id`),
-	FOREIGN KEY (`agent_id`) REFERENCES `tagente` (`id_agente`) ON DELETE CASCADE
+  CONSTRAINT `tgis_map_layer_groups_ibfk_1` FOREIGN KEY (`layer_id`) REFERENCES `tgis_map_layer` (`id_tmap_layer`) ON DELETE CASCADE,
+  CONSTRAINT `tgis_map_layer_groups_ibfk_2` FOREIGN KEY (`group_id`) REFERENCES `tgrupo` (`id_grupo`) ON DELETE CASCADE,
+  CONSTRAINT `tgis_map_layer_groups_ibfk_3` FOREIGN KEY (`agent_id`) REFERENCES `tagente` (`id_agente`) ON DELETE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 -- -----------------------------------------------------

pandora_console/general/footer.php

@@ -1,16 +1,19 @@
 <?php
 
-// Pandora FMS - http://pandorafms.com
+/**
-// ==================================================
+ * Pandora FMS - http://pandorafms.com
-// Copyright (c) 2005-2011 Artica Soluciones Tecnologicas
+ * ==================================================
-// Please see http://pandorafms.org for full contribution list
+ * Copyright (c) 2005-2011 Artica Soluciones Tecnologicas
-// This program is free software; you can redistribute it and/or
+ * Please see http://pandorafms.org for full contribution list
-// modify it under the terms of the GNU General Public License
+ * This program is free software; you can redistribute it and/or
-// as published by the Free Software Foundation; version 2
+ * modify it under the terms of the GNU General Public License
-// This program is distributed in the hope that it will be useful,
+ * as published by the Free Software Foundation; version 2
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This program is distributed in the hope that it will be useful,
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-// GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
 if (isset($_SERVER['REQUEST_TIME'])) {
     $time = $_SERVER['REQUEST_TIME'];
 } else {
@@ -26,7 +29,7 @@ if (!$config['MR']) {
     $config['MR'] = 0;
 }
 
-echo '<a class="white_bold footer" target="_blank" href="'.$config['homeurl'].$license_file.'">';
+echo '<a class="footer" target="_blank" href="'.$config['homeurl'].$license_file.'">';
 
 require_once $config['homedir'].'/include/functions_update_manager.php';
 
@@ -40,9 +43,9 @@ if ($current_package == 0) {
 
 echo sprintf(__('%s %s - Build %s - MR %s', get_product_name(), $pandora_version, $build_package_version, $config['MR']));
 
-echo '</a><br />';
+echo '</a> ';
-echo '<a class="white footer">'.__('Page generated at').' '.date($config['date_format']);
+echo '<a class="footer">'.__('Page generated at').' '.date($config['date_format']);
-echo '</a><br /><span style="color:#eff">&reg; '.get_copyright_notice().'</span>';
+echo '</a><br /><span>&reg; '.get_copyright_notice().'</span>';
 
 if (isset($config['debug'])) {
     $cache_info = [];

pandora_console/general/header.php

@@ -1,7 +1,7 @@
 <?php
 // Pandora FMS - http://pandorafms.com
 // ==================================================
-// Copyright (c) 2005-2011 Artica Soluciones Tecnologicas
+// Copyright (c) 2005-2019 Artica Soluciones Tecnologicas
 // Please see http://pandorafms.org for full contribution list
 // This program is free software; you can redistribute it and/or
 // modify it under the terms of the GNU General Public License
@@ -19,52 +19,43 @@ require_once 'include/functions_notifications.php';
  config_check();
 
 ?>
-<table width="100%" cellpadding="0" cellspacing="0" style="margin:0px; padding:0px; margin-top: 0px; height: 100%" border="0">
-    <tr>
-        <td style="width:90%;">
-            <a href="index.php?sec=main">
-                <?php
-                $custom_logo = 'images/custom_logo/'.$config['custom_logo'];
 
-                if (!defined('PANDORA_ENTERPRISE')) {
+<div id="header_table"> 
-                    $logo_title = get_product_name().' Opensource';
+    <div id="header_table_inner">           
-                    $custom_logo = 'images/custom_logo/pandora_logo_head_3.png';
+        <?php
+        // ======= Notifications Discovery ===============================================
+        $notifications_numbers = notifications_get_counters();
+        $header_discovery = '<div id="header_discovery">'.notifications_print_ball(
+            $notifications_numbers['notifications'],
+            $notifications_numbers['last_id']
+        ).'</div>';
+
+
+        // ======= Alerts ===============================================
+        $check_minor_release_available = false;
+        $pandora_management = check_acl($config['id_user'], 0, 'PM');
+
+        $check_minor_release_available = db_check_minor_relase_available();
+
+        if ($check_minor_release_available) {
+            if (users_is_admin($config['id_user'])) {
+                if ($config['language'] == 'es') {
+                    set_pandora_error_for_header('Hay una o mas revisiones menores en espera para ser actualizadas. <a style="font-size:8pt;font-style:italic;" target="blank" href="http://wiki.pandorafms.com/index.php?title=Pandora:Documentation_es:Actualizacion#Versi.C3.B3n_7.0NG_.28_Rolling_Release_.29">'.__('Sobre actualización de revisión menor').'</a>', 'Revisión/es menor/es disponible/s');
                 } else {
-                    if (file_exists(ENTERPRISE_DIR.'/'.$custom_logo)) {
+                    set_pandora_error_for_header('There are one or more minor releases waiting for update. <a style="font-size:8pt;font-style:italic;" target="blank" href="http://wiki.pandorafms.com/index.php?title=Pandora:Documentation_en:Anexo_Upgrade#Version_7.0NG_.28_Rolling_Release_.29">'.__('About minor release update').'</a>', 'minor release/s available');
-                        $custom_logo = ENTERPRISE_DIR.'/'.$custom_logo;
+                }
+            }
         }
 
-                    $logo_title = get_product_name().' Enterprise';
-                }
 
-                    echo html_print_image(
+        // Chat messages
-                        $custom_logo,
+        $header_chat = "<div id='header_chat'><span id='icon_new_messages_chat' style='display: none;'>";
-                        true,
+        $header_chat .= "<a href='index.php?sec=workspace&sec2=operation/users/webchat'>";
-                        [
+        $header_chat .= html_print_image('images/header_chat_gray.png', true, ['title' => __('New chat message')]);
-                            'alt'    => $logo_title,
+        $header_chat .= '</a></span></div>';
-                            'border' => '0',
-                        ]
-                    );
-                    ?>
-            </a>
-        </td>
-        <td style="min-width:200px;">
-            <?php
-            $table = new stdClass();
-                $table->id = 'header_table';
-                $table->class = 'none';
-                $table->cellpadding = 0;
-                $table->cellspacing = 0;
-                $table->head = [];
-                $table->data = [];
-                $table->style['clippy'] = $table->style[1] = $table->style[4] = $table->style[5] = $table->style[6] = $table->style[8] = $table->style[9] = $table->style['qr'] = $table->style['notifications'] = 'width: 22px; text-align:center; height: 22px; padding-right: 9px;padding-left: 9px;';
-                $table->style[7] = 'width: 20px; padding-right: 9px;';
-                $table->style['searchbar'] = 'width: 180px; min-width: 180px;';
-                $table->style[11] = 'padding-left: 10px; padding-right: 5px;width: 16px;';
-                $table->width = '100%';
-                $table->styleTable = 'margin: auto; margin-top: 0px;';
-                $table->rowclass[0] = '';
 
+
+        // Search
         $acl_head_search = true;
         if ($config['acl_enterprise'] == 1 && !users_is_admin()) {
             $acl_head_search = db_get_sql(
@@ -76,8 +67,6 @@ config_check();
         }
 
         if ($acl_head_search) {
-                $table->data[0][11] = ui_print_help_tip(__('Blank characters are used as AND conditions'), true);
-
             // Search bar
             $search_bar = '<form method="get" style="display: inline;" name="quicksearch" action="">';
             if (!isset($config['search_keywords'])) {
@@ -107,52 +96,10 @@ config_check();
             $search_bar .= "<input type='hidden' name='head_search_keywords' value='abc' />";
             $search_bar .= '</form>';
 
-                $table->data[0]['searchbar'] = $search_bar;
+            $header_searchbar  = '<div id="header_searchbar">'.ui_print_help_tip(__('Blank characters are used as AND conditions'), true);
+            $header_searchbar .= $search_bar.'</div>';
         }
 
-            if ($config['show_qr_code_header'] == 0) {
-                $show_qr_code_header = 'display: none;';
-            } else {
-                $show_qr_code_header = 'display: inline;';
-            }
-
-                $table->data[0]['qr'] = '<div style="'.$show_qr_code_header.'" id="qr_code_container" style="">'.'<a href="javascript: show_dialog_qrcode();">'.html_print_image(
-                    'images/qrcode_icon.png',
-                    true,
-                    [
-                        'alt'   => __('QR Code of the page'),
-                        'title' => __('QR Code of the page'),
-                    ]
-                ).'</a>'.'</div>';
-
-                echo "<div style='display: none;' id='qrcode_container' title='".__('QR code of the page')."'>";
-                echo "<div id='qrcode_container_image'></div>";
-                echo '</div>';
-                ?>
-                <script type='text/javascript'>
-                    $(document).ready(function() {
-                        $( "#qrcode_container" ).dialog({
-                            autoOpen: false,
-                            modal: true
-                        });
-                    });
-                </script>
-                <?php
-                if ($config['tutorial_mode'] !== 'expert' && !$config['disable_help']) {
-                    $table->data[0]['clippy'] = '<a href="javascript: show_clippy();">'.html_print_image(
-                        'images/clippy_icon.png',
-                        true,
-                        [
-                            'id'    => 'clippy',
-                            'class' => 'clippy',
-                            'alt'   => __('%s assistant', get_product_name()),
-                            'title' => __(
-                                '%s assistant',
-                                get_product_name()
-                            ),
-                        ]
-                    ).'</a>';
-                }
 
         // ======= Autorefresh code =============================
         $autorefresh_txt = '';
@@ -183,7 +130,7 @@ config_check();
             }
 
             if ($do_refresh) {
-                        $autorefresh_img = html_print_image('images/header_refresh.png', true, ['class' => 'bot', 'alt' => 'lightning', 'title' => __('Configure autorefresh')]);
+                $autorefresh_img = html_print_image('images/header_refresh_gray.png', true, ['class' => 'bot', 'alt' => 'lightning', 'title' => __('Configure autorefresh')]);
 
                 if ($_GET['refr']) {
                     $autorefresh_txt .= ' (<span id="refrcounter">'.date('i:s', $config['refr']).'</span>)';
@@ -199,101 +146,97 @@ config_check();
                 $autorefresh_link_open_img = '<a class="white autorefresh" href="'.ui_get_url_refresh($ignored_params).'">';
 
                 if ($_GET['refr']) {
-                            $autorefresh_link_open_txt = '<a class="white autorefresh autorefresh_txt" href="'.ui_get_url_refresh($ignored_params).'">';
+                    $autorefresh_link_open_txt = '<a class="autorefresh autorefresh_txt" href="'.ui_get_url_refresh($ignored_params).'">';
                 } else {
                     $autorefresh_link_open_txt = '<a>';
                 }
 
                 $autorefresh_link_close = '</a>';
+                $display_counter = 'display:block';
             } else {
-                        $autorefresh_img = html_print_image('images/header_refresh_disabled.png', true, ['class' => 'bot autorefresh_disabled', 'alt' => 'lightning', 'title' => __('Disabled autorefresh')]);
+                $autorefresh_img = html_print_image('images/header_refresh_disabled_gray.png', true, ['class' => 'bot autorefresh_disabled', 'alt' => 'lightning', 'title' => __('Disabled autorefresh')]);
 
                 $ignored_params['refr'] = false;
 
                 $autorefresh_link_open_img = '';
                 $autorefresh_link_open_txt = '';
                 $autorefresh_link_close = '';
+
+                $display_counter = 'display:none';
             }
         } else {
-                    $autorefresh_img = html_print_image('images/header_refresh_disabled.png', true, ['class' => 'bot autorefresh_disabled', 'alt' => 'lightning', 'title' => __('Disabled autorefresh')]);
+            $autorefresh_img = html_print_image('images/header_refresh_disabled_gray.png', true, ['class' => 'bot autorefresh_disabled', 'alt' => 'lightning', 'title' => __('Disabled autorefresh')]);
 
             $ignored_params['refr'] = false;
 
             $autorefresh_link_open_img = '';
             $autorefresh_link_open_txt = '';
             $autorefresh_link_close = '';
+
+            $display_counter = 'display:none';
         }
 
-                $table->data[0][1] = $autorefresh_link_open_img.$autorefresh_img.$autorefresh_link_close;
+        $header_autorefresh = '<div id="header_autorefresh">'.$autorefresh_link_open_img.$autorefresh_img.$autorefresh_link_close.'</div>';
-                $table->data[0][2] = $autorefresh_link_open_txt.$autorefresh_txt.$autorefresh_link_close.$autorefresh_additional;
+        $header_autorefresh_counter = '<div id="header_autorefresh_counter" style="'.$display_counter.'">'.$autorefresh_link_open_txt.$autorefresh_txt.$autorefresh_link_close.$autorefresh_additional.'</div>';
-                // ======================================================
-                $pandora_management = check_acl($config['id_user'], 0, 'PM');
 
-                // Main help icon
+
-                if (!$config['disable_help']) {
+        // qr
-                    $table->data[0][4] = '<a href="#" class="modalpopup" id="helpmodal">'.html_print_image(
+        if ($config['show_qr_code_header'] == 0) {
-                        'images/header_help.png',
+            $show_qr_code_header = 'display: none;';
+        } else {
+            $show_qr_code_header = 'display: inline;';
+        }
+
+        $header_qr = '<div id="header_qr" style="'.$show_qr_code_header.'"><div id="qr_code_container"><a href="javascript: show_dialog_qrcode();">'.html_print_image(
+            'images/qrcode_icon_gray.png',
             true,
             [
-                            'title' => __('Main help'),
+                'alt'   => __('QR Code of the page'),
-                            'id'    => 'helpmodal',
+                'title' => __('QR Code of the page'),
-                            'class' => 'modalpopup',
             ]
-                    ).'</a>';
+        ).'</a></div></div>';
-                }
-
-                $notifications_numbers = notifications_get_counters();
-                $table->data[0]['notifications'] = notifications_print_ball(
-                    $notifications_numbers['notifications'],
-                    $notifications_numbers['last_id']
-                );
-
-                // Logout
-                $table->data[0][5] = '<a class="white" href="'.ui_get_full_url('index.php?bye=bye').'">';
-                $table->data[0][5] .= html_print_image('images/header_logout.png', true, ['alt' => __('Logout'), 'class' => 'bot', 'title' => __('Logout')]);
-                $table->data[0][5] .= '</a>';
 
+        echo "<div style='display: none;' id='qrcode_container' title='".__('QR code of the page')."'>";
+        echo "<div id='qrcode_container_image'></div>";
+        echo '</div>';
+        ?>
+        <script type='text/javascript'>
+            $(document).ready(function() {
+                $( "#qrcode_container" ).dialog({
+                    autoOpen: false,
+                    modal: true
+                });
+            });
+        </script>
+        <?php
         // User
         if (is_user_admin($config['id_user']) == 1) {
-                    $table->data[0][6] = html_print_image('images/header_user_admin.png', true, ['title' => __('Edit my user'), 'class' => 'bot', 'alt' => 'user']);
+            $header_user = html_print_image('images/header_user_admin_green.png', true, ['title' => __('Edit my user'), 'class' => 'bot', 'alt' => 'user']);
         } else {
-                    $table->data[0][6] = html_print_image('images/header_user.png', true, ['title' => __('Edit my user'), 'class' => 'bot', 'alt' => 'user']);
+            $header_user = html_print_image('images/header_user_green.png', true, ['title' => __('Edit my user'), 'class' => 'bot', 'alt' => 'user']);
         }
 
-                $table->data[0][6] = '<a href="index.php?sec=workspace&sec2=operation/users/user_edit">'.$table->data[0][6].'</a>';
+        $header_user = '<div id="header_user"><a href="index.php?sec=workspace&sec2=operation/users/user_edit">'.$header_user.'<span> ('.$config['id_user'].')</span></a></div>';
 
-                $table->data[0][7] = '<a href="index.php?sec=workspace&amp;sec2=operation/users/user_edit" class="white_bold"> ('.$config['id_user'].')</a>';
+        // Logout
+        $header_logout = '<div id="header_logout"><a class="white" href="'.ui_get_full_url('index.php?bye=bye').'">';
+        $header_logout .= html_print_image('images/header_logout_gray.png', true, ['alt' => __('Logout'), 'class' => 'bot', 'title' => __('Logout')]);
+        $header_logout .= '</a></div>';
 
-                // Chat messages
+        echo '<div class="header_left">'.$header_autorefresh, $header_autorefresh_counter, $header_qr, $header_chat.'</div>
-                $table->data[0][8] = "<span id='icon_new_messages_chat' style='display: none;'>";
+            <div class="header_center">'.$header_searchbar, $header_discovery.'</div>
-                $table->data[0][8] .= "<a href='index.php?sec=workspace&sec2=operation/users/webchat'>";
+            <div class="header_right">'.$header_user, $header_logout.'</div>';
-                $table->data[0][8] .= html_print_image('images/header_chat.png', true, ['title' => __('New chat message')]);
-                $table->data[0][8] .= '</a>';
-                $table->data[0][8] .= '</span>';
-
-                html_print_table($table);
-
-                unset($table);
         ?>
-        </td>
+    </div>    <!-- Closes #table_header_inner -->        
-        <!--
+</div>    <!-- Closes #table_header -->
-        <td style="text-align:center">
-            <?php
-            echo "<a href='index.php?sec=main'>";
-            if (isset($config['custom_logo'])) {
-                echo html_print_image('images/custom_logo/'.$config['custom_logo'], true, ['height' => '60', 'width' => '139', 'alt' => 'Logo']);
-            }
 
-                echo '</a>';
-            ?>
-        </td>
-        -->
-    </tr>
-</table>
 
 <!-- Notifications content wrapper-->
 <div id='notification-content' style='display:none;' /></div>
 
+<!-- Old style div wrapper -->
+<div id="alert_messages" style="display: none"></div>
+
 <script type="text/javascript">
     /* <![CDATA[ */
     
@@ -538,7 +481,6 @@ config_check();
                 ?>
                 $("a.autorefresh_txt").toggle ();
                 $("#combo_refr").toggle ();
-                $("#combo_refr").css('padding-right', '9px');
                 href = $("a.autorefresh").attr ("href");
                 <?php
                 if ($select[0]['time_autorefresh']) {
@@ -580,6 +522,7 @@ config_check();
         <?php
         if ($_GET['refr']) {
             ?>
+            $("#header_autorefresh").css('padding-right', '5px');
             var refr_time = <?php echo (int) get_parameter('refr', 0); ?>;
             var t = new Date();
             t.setTime (t.getTime () +
@@ -600,7 +543,6 @@ config_check();
         $("a.autorefresh").click (function () {
             $("a.autorefresh_txt").toggle ();
             $("#combo_refr").toggle ();
-            $("#combo_refr").css('padding-right', '9px');
             $("select#ref").change (function () {
                 href = $("a.autorefresh").attr ("href");
                 $(document).attr ("location", href + this.value);

pandora_console/general/logon_ok.php

@@ -80,7 +80,7 @@ if (!empty($all_data)) {
     $data['server_sanity'] = format_numeric((100 - $data['module_sanity']), 1);
 }
 ?>
-<table border="0" width="100%">
+<table border="0" width="100%" cellspacing="0" cellpadding="0">
     <tr>
         
         <td width="25%" style="padding-right: 20px;" valign="top">

pandora_console/general/main_menu.php

@@ -16,16 +16,80 @@ if (! isset($config['id_user'])) {
     exit();
 }
 
+?>
+<script type="text/javascript" language="javascript">
+
+$(document).ready(function(){    
+    var menuType_value = localStorage.getItem("menuType");    
+    if (menuType_value == 'classic') {
+        $('#menu_full').removeClass('menu_full_collapsed').addClass('menu_full_classic'); 
+        $('.logo_icon').css('display','none');
+        $('.logo_full').css('display','block');
+        $('div#title_menu').removeClass('title_menu_collapsed').addClass('title_menu_classic');
+        $('div#page').removeClass('page_collapsed').addClass('page_classic');
+        $('#header_table').removeClass('header_table_collapsed').addClass('header_table_classic');
+        $('#button_collapse').removeClass('button_collapsed').addClass('button_classic');
+        $('ul.submenu').css('left', '214px');    
+        $('li.menu_icon').removeClass('menu_icon_collapsed').addClass("no_hidden_menu");
+    }
+    else{
+        if(menuType_value != 'collapsed'){    
+            localStorage.setItem("menuType", "collapsed");
+        }
+        $('#menu_full').removeClass('menu_full_classic').addClass('menu_full_collapsed'); 
+        $('.logo_full').css('display','none');
+        $('.logo_icon').css('display','block');
+        $('div#title_menu').removeClass('title_menu_classic').addClass('title_menu_collapsed');
+        $('div#page').removeClass('page_classic').addClass('page_collapsed');
+        $('#header_table').removeClass('header_table_classic').addClass('header_table_collapsed');
+        $('#button_collapse').removeClass('button_classic').addClass('button_collapsed');      
+        $('ul.submenu').css('left', '59px');
+        $('li.menu_icon').removeClass("no_hidden_menu").addClass('menu_icon_collapsed');
+    }
+});
+
+
+// Set the height of the menu.
+$(window).on('load', function (){   
+    $("#menu_full").height($("#container").height());
+});
+
+</script>
+<?php
 $autohidden_menu = 0;
 
 if (isset($config['autohidden_menu']) && $config['autohidden_menu']) {
     $autohidden_menu = 1;
 }
 
-$menu_container_id = '';
-
 // Menu container prepared to autohide menu
-echo '<div id="'.$menu_container_id.'">';
+echo '<div id="menu_full">';
+
+$custom_logo = 'images/custom_logo/'.$config['custom_logo'];
+$custom_logo_collapsed = 'images/custom_logo/'.$config['custom_logo_collapsed'];
+
+if (!defined('PANDORA_ENTERPRISE')) {
+    $logo_title = get_product_name().' Opensource';
+    $custom_logo = 'images/custom_logo/pandora_logo_head_green.png';
+    $custom_logo_collapsed = 'images/custom_logo/pandora_logo_green_collapsed.png';
+} else {
+    if (file_exists(ENTERPRISE_DIR.'/'.$custom_logo)) {
+        $custom_logo = ENTERPRISE_DIR.'/'.$custom_logo;
+    }
+
+    $logo_title = get_product_name().' Enterprise';
+}
+
+echo '<div class="logo_green"><a href="index.php?sec=main">';
+if (isset($config['custom_logo'])) {
+    echo html_print_image($custom_logo, true, ['border' => '0', 'width' => '215', 'alt' => $logo_title, 'class' => 'logo_full', 'style' => 'display:none']);
+}
+
+if (isset($config['custom_logo_collapsed'])) {
+    echo html_print_image($custom_logo_collapsed, true, ['border' => '0', 'width' => '60', 'alt' => $logo_title, 'class' => 'logo_icon', 'style' => 'display:block']);
+}
+
+echo '</a></div>';
 
 // echo '<div class="tit bg titop">:: '.__('Operation').' ::</div>';
 require 'operation/menu.php';
@@ -45,16 +109,14 @@ if (check_acl($config['id_user'], 0, 'AW')
 
 require 'godmode/menu.php';
 
+echo '<div id="button_collapse" class="button_collapse"></div>';
+
+
 // require ("links_menu.php");
 echo '</div>';
 // menu_container
 ui_require_jquery_file('cookie');
 
-$config_fixed_menu = false;
-if (isset($config['fixed_menu'])) {
-    $config_fixed_menu = $config['fixed_menu'];
-}
-
 $config_fixed_header = false;
 if (isset($config['fixed_header'])) {
     $config_fixed_header = $config['fixed_header'];
@@ -64,25 +126,35 @@ if (isset($config['fixed_header'])) {
 <script type="text/javascript" language="javascript">
 /* <![CDATA[ */
 
+$('#button_collapse').on('click', function() { 
+
+    if($('#menu_full').hasClass('menu_full_classic')){
+        localStorage.setItem("menuType", "collapsed");
+        $('ul.submenu').css('left', '59px');
+    }
+    else if($('#menu_full').hasClass('menu_full_collapsed')){
+        localStorage.setItem("menuType", "classic");
+        $('ul.submenu').css('left', '214px');
+    }
+
+    $('.logo_full').toggle();
+    $('.logo_icon').toggle();
+    $('#menu_full').toggleClass('menu_full_classic menu_full_collapsed');    
+    $('#button_collapse').toggleClass('button_classic button_collapsed');
+    $('div#title_menu').toggleClass('title_menu_classic title_menu_collapsed');
+    $('div#page').toggleClass('page_classic page_collapsed');
+    $('#header_table').toggleClass('header_table_classic header_table_collapsed');
+    $('li.menu_icon').toggleClass("no_hidden_menu menu_icon_collapsed");
+});
+
+
 var autohidden_menu = <?php echo $autohidden_menu; ?>;
-var fixed_menu = <?php echo json_encode((bool) $config_fixed_menu); ?>;
 var fixed_header = <?php echo json_encode((bool) $config_fixed_header); ?>;
 var id_user = "<?php echo $config['id_user']; ?>";
 var cookie_name = id_user + '-pandora_menu_state';
 var cookie_name_encoded = btoa(cookie_name);
 var click_display = "<?php echo $config['click_display']; ?>";
-var classic_menu = parseInt("<?php echo $config['classic_menu']; ?>");
 
-if ((isNaN(classic_menu)) || (classic_menu == 0)) {
-    classic_menu = false;
-}
-else {
-    classic_menu = true;
-}
-
-if (classic_menu) {
-    autohidden_menu = 1;
-}
 
 var menuState = $.cookie(cookie_name_encoded);
 if (!menuState) {
@@ -109,236 +181,7 @@ function close_submenus () {
     $('div.menu>ul>li.selected>ul').addClass('invisible');
 }
 
-$(document).ready( function() {
-    //Daniel maya 02/06/2016 Fixed menu position--INI
-    if (fixed_menu) {
-        $('div#menu')
-            .css('position', 'fixed')
-            .css('z-index', '9000')
-            .css('top','80px')
-    }else{
-        $('div#menu')
-            .css('z-index', '9000')
-    }
-    if (fixed_header) {
-        $('div#menu')
-            .css('position', 'fixed')
-            .css('z-index', '9000')
-            .css('top','80px')
-        $('#menu_tab_frame_view').css('margin-top','20px')
-    }
-    //Daniel maya 02/06/2016 Fixed menu position--END
-    /*
-    $("img.toggle").click (function (e) {
-        //In case the links gets activated, we don't want to follow link
-        e.preventDefault();
 
-        var menuItem = $(this).parent();
-        var submenu = menuItem.children("ul");
-
-        if (submenu.is(":visible")) {
-            submenu.slideUp();
-            
-            if (typeof menuState[menuItem.attr('id')] != 'undefined')
-                delete menuState[menuItem.attr('id')];
-        }
-        else {
-            submenu.slideDown();
-
-            menuState[menuItem.attr('id')] = 1;
-        }
-        
-        $.cookie(cookie_name_encoded, JSON.stringify(menuState), {expires: 7});
-    });
-    //Cerrar aqui los comentarios cuando esté el menu terminado
-    if (fixed_menu) {
-        $('div#menu')
-            .css('position', 'fixed')
-            .css('z-index', '9000')
-            .css('left', '0')
-            .css('top', $('div#head').innerHeight() + 'px')
-            .css('height', '100%')
-            .css('overflow', 'hidden')
-            .hover(function (e) {
-                if (!autohidden_menu) {
-                    $(this).css('overflow', 'auto').children('div').css('width', 'auto');
-                }
-            }, function (e) {
-                if (!autohidden_menu) {
-                    $(this).css('overflow', 'hidden').children('div').css('width', '100%');
-                }
-            })
-            .children('div')
-                .css('margin-bottom', $('div#head').innerHeight() + 'px');
-
-        if (!fixed_header) {
-            $(window).scroll(function () {
-                if ($(this).scrollTop() <= $('div#head').innerHeight()) {
-                    $('div#menu').css('top', $('div#head').innerHeight() - $(this).scrollTop() + 'px' );
-                } else {
-                    $('div#menu').css('top', '0');
-                }
-            });
-        }
-    }
-    
-    function show_menu () {
-            $('#menu_container').animate({"left": "+=80px"}, 200, function () {
-                if (fixed_menu) {
-                    $('#menu_container').parent().css('overflow', 'auto');
-                }
-            });
-            //show_menu_pretty();
-        }
-        
-    function show_menu_pretty() {
-        open_submenus();
-        $('div.menu ul li').css('background-position', '');
-        $('ul.submenu li a, li.menu_icon a, li.links a, div.menu>ul>li>img.toggle').show();
-        $('.titop').css('color', 'white');
-        $('.bg3').css('color', 'white');
-        $('.bg4').css('color', 'white');
-    }
-    
-    function hide_menu () {
-        if (fixed_menu) {
-            $('#menu_container').parent().css('overflow', 'hidden');
-        }
-        $('#menu_container').animate({"left": "-=80px"}, 100);
-        //hide_menu_pretty();
-    }
-    
-    function hide_menu_pretty() {
-        close_submenus();
-        $('div.menu li').css('background-position', '85px 5px');
-        $('ul.submenu li a, li.menu_icon a, li.links a, div.menu>ul>li>img.toggle').hide();
-        $('.titop').css('color', $('.titop').css('background-color'));
-        $('.bg3').css('color', $('.bg3').css('background-color'));
-        $('.bg4').css('color', $('.bg4').css('background-color'));
-    }
-    */
-    if (autohidden_menu) {
-
-        //handlerIn, handlerOut);
-        //openTime = 0;
-        //handsIn = 0;
-
-        //$('#main').css('margin-left', '50px');
-        //hide_menu_pretty();
-        /*
-        $('#menu').hover(function() {
-            handsIn = 1;
-            if (openTime == 0) {
-                show_menu();
-                openTime = new Date().getTime();
-            }
-        }).mouseleave(function() {
-            handsIn = 0;
-            setTimeout(function() {
-                openedTime = new Date().getTime() - openTime;
-                if(openedTime > 3000 && handsIn == 0) {
-                    hide_menu();
-                    openTime = 0;
-                }
-            }, 3500);
-        });
-        */
-        handsInMenu = 0;
-        openTimeMenu = 0;
-        if (classic_menu) {
-            $('div#title_menu').show();
-            handsInMenu = 1;
-            openTimeMenu = new Date().getTime();
-            $('#menu').css('width', '145px');
-            $('#menu').css('position', 'block');
-            $('div#menu').css('top', '80px');
-            $('li.menu_icon').addClass( " no_hidden_menu" );
-            $('ul.submenu').css('left', '144px');
-
-            $('#menu').mouseleave(function() {
-                handsInMenu = 0;
-                setTimeout(function() {
-                    openedMenu = new Date().getTime() - openTimeMenu;
-                    if(openedMenu > 1000 && handsInMenu == 0) {
-                        $('#menu').css('width', '145px');
-                        $('#menu').css('position', 'block');
-                        $('li.menu_icon').addClass( " no_hidden_menu" );
-                        $('ul.submenu').css('left', '144px');
-                    }
-                }, 2500);
-            });
-        }
-        else {
-            if(!click_display){
-                $('#menu').mouseenter(function() {
-                    $('div#title_menu').show();
-                    handsInMenu = 1;
-                    openTimeMenu = new Date().getTime();
-                    $('#menu').css('width', '145px');
-                    $('li.menu_icon').addClass( " no_hidden_menu" );
-                    $('li.menu_icon').find('li').addClass( " no_hidden_menu" );
-                    $('ul.submenu').css('left', '144px');
-                }).mouseleave(function() {
-                    handsInMenu = 0;
-                    setTimeout(function() {
-                        openedMenu = new Date().getTime() - openTimeMenu;
-                        if(openedMenu > 1000 && handsInMenu == 0) {
-                            $('#menu').css('width', '45px');
-                            $('li.menu_icon').removeClass( " no_hidden_menu");
-                            $('li.menu_icon').find('li').removeClass( " no_hidden_menu" );
-                            $('ul.submenu').css('left', '44px');
-                            $('div#title_menu').hide();
-                        }
-                    }, 2500);
-                });
-            }else{
-                $(document).ready(function() {
-                    $('#menu').on("click", function() {
-                        $('div#title_menu').show();
-                        handsInMenu = 1;
-                        openTimeMenu = new Date().getTime();
-                        $('#menu').css('width', '145px');
-                        $('li.menu_icon').addClass( " no_hidden_menu" );
-                        $('li.menu_icon').find('li').addClass( " no_hidden_menu" );
-                        $('ul.submenu').css('left', '144px');
-                    }).mouseleave(function() {
-                        handsInMenu = 0;
-                        setTimeout(function() {
-                            openedMenu = new Date().getTime() - openTimeMenu;
-                            if(openedMenu > 1000 && handsInMenu == 0) {
-                                $('#menu').css('width', '45px');
-                                $('li.menu_icon').removeClass( " no_hidden_menu");
-                                $('li.menu_icon').find('li').removeClass( " no_hidden_menu" );
-                                $('ul.submenu').css('left', '44px');
-                                $('div#title_menu').hide();
-                            }
-                        }, 5500);
-                    });
-                });
-            }
-        }
-    }
-    else {
-        $('div#title_menu').hide();
-        if(!click_display){
-            $('#menu').mouseenter(function() {
-                handsInMenu = 1;
-                openTimeMenu = new Date().getTime();
-                $('ul.submenu').css('left', '44px');
-            }).mouseleave(function() {
-                handsInMenu = 0;
-                setTimeout(function() {
-                    openedMenu = new Date().getTime() - openTimeMenu;
-                    if(openedMenu > 1000 && handsInMenu == 0) {
-                        $('li.menu_icon').removeClass( " no_hidden_menu");
-                        $('li.menu_icon').find('li').removeClass( " no_hidden_menu" );
-                        $('ul.submenu').css('left', '44px');
-                    }
-                }, 2500);
-            });
-        }
-    }
-});
 /* ]]> */
 </script>
 
@@ -348,12 +191,90 @@ $(document).ready( function() {
     handsIn = 0;
     handsIn2 = 0;
 
+
+/**
+ * Positionate the submenu elements. Add a negative top.
+ *
+ * @param int index It is the position of li.menu_icon in the ul.
+ * @param string id_submenu It is the id of first level submenu.
+ * @param string id_submenu2 It is the id of second level submenu.
+ * @param int item_height It is the height of a menu item (28 o 35).
+ *
+ * @return (int) The position (in px).
+ */
+function menu_calculate_top(index, id_submenu, id_submenu2, item_height){
+
+    var level1 = index;
+    var level2 = $('#'+id_submenu+' ul.submenu > li').length;
+    var level3 = $('#'+id_submenu2+' > li.sub_subMenu').length;
+    var item_height = item_height;
+
+    level2--;
+    if (id_submenu2 !== false) {
+        // If level3 is set, the position is calculated like box is in the center.
+        // wiouth considering level2 box can be moved.
+        level3--;
+        total = (level1 + level3);
+        comp = level3;
+    } else {
+        total = (level1 + level2);
+        comp = level2;
+    }
+
+    // Positionate in the middle
+    if (total > 12 && ((total < 18) || ((level1 - comp) <= 4))) {
+        return - ( Math.floor(comp / 2) * item_height);
+    }
+
+    // Positionate in the bottom
+    if (total >= 18) {
+        return (- comp * item_height);
+    }
+
+    // return 0 by default
+    return 0;
+}
+
+
+/**
+ * Get the menu items to be positioned.
+ *
+ * @param string item It is the selector of the current element.
+ *
+ * @return Add the top position in a inline style.
+ */
+function get_menu_items(item){
+    var item_height = parseInt(item.css('min-height'));
+    var id_submenu = item.attr('id');
+    var id_submenu2 = false;
+    var index = item.index();
+
+    if(item.parent().hasClass('godmode')){
+        index = index+6; // This is because the menu has divided in two parts.
+    }
+    var top_submenu = menu_calculate_top(index, id_submenu, id_submenu2, item_height);
+    top_submenu = top_submenu+'px';
+    $('#'+id_submenu+' ul.submenu').css('top', top_submenu);
+
+    $('.has_submenu').mouseenter(function() {
+        id_submenu2 = item.attr('id');
+        id_submenu2 = $('#'+id_submenu2+' ul.submenu2').attr('id');
+        var top_submenu2 = menu_calculate_top(index, id_submenu, id_submenu2, item_height);
+        top_submenu2 = top_submenu2+'px';
+        $('#'+id_submenu2).css('top', top_submenu2);
+    });
+}
+
+/*
+ * Show and hide submenus
+ */
 if(!click_display){
     $('.menu_icon').mouseenter(function() {
         table_hover = $(this);
         handsIn = 1;
         openTime = new Date().getTime();
         $("ul#sub"+table_hover[0].id).show();
+        get_menu_items(table_hover);
         if( typeof(table_noHover) != 'undefined')
             if ( "ul#sub"+table_hover[0].id != "ul#sub"+table_noHover[0].id )
                 $("ul#sub"+table_noHover[0].id).hide();
@@ -364,7 +285,7 @@ $(document).ready( function() {
             opened = new Date().getTime() - openTime;
             if(opened > 3000 && handsIn == 0) {
                 openTime = 4000;
-                        $("ul#sub"+table_hover[0].id).hide();
+                $("ul#sub"+table_noHover[0].id).hide();
             }
         }, 2500);
     });
@@ -379,6 +300,7 @@ $(document).ready( function() {
                 handsIn = 1;
                 openTime = new Date().getTime();
                 $("ul#sub"+table_hover[0].id).show();
+                get_menu_items(table_hover);
             }).mouseleave(function() {
                 table_noHover = $(this);
                 handsIn = 0;
@@ -386,7 +308,7 @@ $(document).ready( function() {
                     opened = new Date().getTime() - openTime;
                     if(opened > 5000 && handsIn == 0) {
                         openTime = 6000;
-                            $("ul#sub"+table_hover[0].id).hide();
+                        $("ul#sub"+table_noHover[0].id).hide();
                     }
                 }, 5500);
             });
@@ -399,12 +321,13 @@ $(document).ready( function() {
                 handsIn = 1;
                 openTime = new Date().getTime();
                 $("ul#sub"+table_hover[0].id).show();
+                get_menu_items(table_hover);
             });
         }
     });
 }
 
--    $('.has_submenu').mouseenter(function() {
+$('.has_submenu').mouseenter(function() {
     table_hover2 = $(this);
     handsIn2 = 1;
     openTime2 = new Date().getTime();
@@ -425,8 +348,7 @@ $(document).ready( function() {
 });
 
 $(document).ready(function() {
-        if (!classic_menu) {
+
-            //Daniel maya 02/06/2016 Display menu with click --INI
     if(!click_display){
         $('#container').click(function() {
             openTime = 4000;
@@ -434,10 +356,6 @@ $(document).ready( function() {
                 $("ul#sub"+table_hover[0].id).hide();
             if( typeof(table_hover2) != 'undefined')
                 $("ul#sub"+table_hover2[0].id).hide();
-                    $('#menu').css('width', '45px');
-                    $('li.menu_icon').removeClass( " no_hidden_menu");
-                    $('ul.submenu').css('left', '44px');
-                    $('div#title_menu').hide();
         });
     }else{
         $('#main').click(function() {
@@ -446,46 +364,16 @@ $(document).ready( function() {
                 $("ul#sub"+table_hover[0].id).hide();
             if( typeof(table_hover2) != 'undefined')
                 $("ul#sub"+table_hover2[0].id).hide();
-                    $('#menu').css('width', '45px');
-                    $('li.menu_icon').removeClass( " no_hidden_menu");
-                    $('ul.submenu').css('left', '44px');
-                    $('div#title_menu').hide();
         });
     }
-            //Daniel maya 02/06/2016 Display menu with click --END
-        }
-        else {
-            if(!click_display){
-                $('#container').click(function() {
-                    openTime = 4000;
-                    if( typeof(table_hover) != 'undefined')
-                        $("ul#sub"+table_hover[0].id).hide();
-                    if( typeof(table_hover2) != 'undefined')
-                        $("ul#sub"+table_hover2[0].id).hide();
-                    $('#menu').css('width', '145px');
-                    $('ul.submenu').css('left', '144px');
-                });
-            }else{
-                $('#main').click(function() {
-                    openTime = 4000;
-                    if( typeof(table_hover) != 'undefined')
-                        $("ul#sub"+table_hover[0].id).hide();
-                    if( typeof(table_hover2) != 'undefined')
-                        $("ul#sub"+table_hover2[0].id).hide();
-                    $('#menu').css('width', '145px');
-                    $('ul.submenu').css('left', '144px');
-                });
-            }
-        }
 
-        if (classic_menu) {
+
     $('div.menu>ul>li>ul>li>a').click(function() {
         openTime = 4000;
         if( typeof(table_hover) != 'undefined')
             $("ul#sub"+table_hover[0].id).hide();
         if( typeof(table_hover2) != 'undefined')
             $("ul#sub"+table_hover2[0].id).hide();               
-                $('ul.submenu').css('left', '144px');
     });    
         
     $('div.menu>ul>li>ul>li>ul>li>a').click(function() {
@@ -494,36 +382,8 @@ $(document).ready( function() {
             $("ul#sub"+table_hover[0].id).hide();
         if( typeof(table_hover2) != 'undefined')
             $("ul#sub"+table_hover2[0].id).hide();
-                $('ul.submenu').css('left', '144px');
-            });
-        }
-        else {
-            $('div.menu>ul>li>ul>li>a').click(function() {
-                openTime = 4000;
-                if( typeof(table_hover) != 'undefined')
-                    $("ul#sub"+table_hover[0].id).hide();
-                if( typeof(table_hover2) != 'undefined')
-                    $("ul#sub"+table_hover2[0].id).hide();
-                $('#menu').css('width', '45px');
-                $('li.menu_icon').removeClass( " no_hidden_menu");
-                $('ul.submenu').css('left', '44px');
-                $('div#title_menu').hide();
     });
     
-            $('div.menu>ul>li>ul>li>ul>li>a').click(function() {
-                openTime = 4000;
-                if( typeof(table_hover) != 'undefined')
-                    $("ul#sub"+table_hover[0].id).hide();
-                if( typeof(table_hover2) != 'undefined')
-                    $("ul#sub"+table_hover2[0].id).hide();
-                $('#menu').css('width', '45px');
-                $('li.menu_icon').removeClass( " no_hidden_menu");
-                $('ul.submenu').css('left', '44px');
-                $('div#title_menu').hide();
 });
-        }
-    });
-    
-    
     
 </script>

pandora_console/general/mysqlerr.php

@@ -0,0 +1,113 @@
+<html>
+<head>
+    
+<style>
+
+#alert_messages_na{
+    -moz-border-bottom-right-radius: 5px;
+    -webkit-border-bottom-left-radius: 5px;
+    border-bottom-right-radius: 5px;
+    border-bottom-left-radius: 5px;
+    z-index:2;
+    position:fixed;
+    width:700px;
+    background:white;
+    left:50%;
+    top:20%;
+    margin-left:-350px;
+
+}
+
+.modalheade{
+    text-align:center;
+    width:100%;
+    height:37px;
+    left:0px;
+    background-color:#82b92e;
+}
+.modalheadertex{
+    color:white;
+    position:relative;
+    font-family:Nunito;
+    font-size:13pt;
+    top:8px;
+}
+
+.modalconten{
+    color:black;
+    background:white;
+}
+.modalcontentim{
+    float:left;
+    margin-left:30px;
+    margin-top:30px;
+    margin-bottom:30px;
+}
+.modalcontenttex{
+    float:left;
+    text-align:justify;
+    color:black;
+    font-size: 9.5pt;
+    line-height:13pt;
+    margin-top:40px;
+    width:430px;
+    margin-left:30px;
+}
+.modalwikibutto{
+    cursor:pointer;
+    text-align:center;
+    margin-right:45px;
+    float:right;
+    -moz-border-radius: 3px;
+    -webkit-border-radius: 3px;
+    margin-bottom:30px;
+    border-radius: 3px;
+    width:170px;
+    height:30px;
+    border: 1px solid #82b92e;
+    margin-top:8%;
+    background-color:#82b92e;
+}
+.modalwikibuttontex{
+    color:#ffffff;
+    font-family:Nunito;
+    font-size:10pt;
+    position:relative;
+    top:6px;
+}
+
+#opacity{
+background:black;opacity:0.1;left:0px;top:0px;width:100%;height:100%;
+}
+
+</style>
+</head>
+<body>
+    
+<div id="alert_messages_na">
+    
+    <div class='modalheade'>
+        <span class='modalheadertex'>
+            <?php echo __('Database error'); ?>
+        </span>
+    </div>
+
+    <div class='modalconten'>
+        <img class='modalcontentim' src='<?php echo $config['homeurl']; ?>/images/mysqlerr.png'>
+        <div class='modalcontenttex'>
+            <?php
+            echo __('Failure to connect to Database server, please check the configuration file config.php or contact system administrator if you need assistance.');
+            ?>
+        </div>
+    </div>
+    <a href='https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_en:Configuration' target='_blank'>
+    <div class='modalwikibutto cerrar'>
+        <span class='modalwikibuttontex'> <?php echo __('Documentation'); ?></span>
+    </div>
+    </a>
+</div>
+    
+<div id="opacity"></div>
+    
+</body>
+</html>

pandora_console/godmode/setup/performance.php

@@ -594,7 +594,7 @@ $table_other->data[3][1] = html_print_input_text(
 );
 
 $table_other->data[5][0] = __('Use realtime statistics');
-$table_other->data[5][1] = html_print_checkbox_toogle_switch(
+$table_other->data[5][1] = html_print_checkbox_switch(
     'realtimestats',
     1,
     $config['realtimestats'],
@@ -616,7 +616,7 @@ $table_other->data[6][1] = html_print_input_text(
 );
 
 $table_other->data[7][0] = __('Use agent access graph').ui_print_help_icon('agent_access', true);
-$table_other->data[7][1] = html_print_checkbox_toogle_switch('agentaccess', 1, $config['agentaccess'], true);
+$table_other->data[7][1] = html_print_checkbox_switch('agentaccess', 1, $config['agentaccess'], true);
 
 $table_other->data[8][0] = __('Max. recommended number of files in attachment directory');
 $table_other->data[8][0] .= ui_print_help_tip(
@@ -633,7 +633,7 @@ $table_other->data[8][1] = html_print_input_text(
 );
 
 $table_other->data[9][0] = __('Delete not init modules');
-$table_other->data[9][1] = html_print_checkbox_toogle_switch('delete_notinit', 1, $config['delete_notinit'], true);
+$table_other->data[9][1] = html_print_checkbox_switch('delete_notinit', 1, $config['delete_notinit'], true);
 
 $table_other->data[10][0] = __('Big Operation Step to purge old data');
 $table_other->data[10][0] .= ui_print_help_tip(

pandora_console/godmode/setup/setup_auth.php

@@ -43,15 +43,15 @@ if (is_ajax()) {
         if ($type_auth != 'mysql') {
             // Fallback to local authentication
             $row = [];
-            $row['name'] = __('Fallback to local authentication').ui_print_help_tip(__('Enable this option if you want to fallback to local authentication when remote (ldap etc...) authentication failed.'), true);
+            $row['name'] = __('Fallback to local authentication').ui_print_help_tip(__('Enable this option if you want to fallback to local authentication when remote (ldap etc...) authentication failed. Only available when \'Save password\' is enabled.'), true);
-            $row['control'] = html_print_checkbox_toogle_switch('fallback_local_auth', 1, $config['fallback_local_auth'], true);
+            $row['control'] = html_print_checkbox_switch('fallback_local_auth', 1, $config['fallback_local_auth'], true);
             $table->data['fallback_local_auth'] = $row;
 
             if (enterprise_installed()) {
                 // Autocreate remote users
                 $row = [];
                 $row['name'] = __('Autocreate remote users');
-                $row['control'] = html_print_checkbox_toogle_switch_extended('autocreate_remote_users', 1, $config['autocreate_remote_users'], false, '', '', true).'  ';
+                $row['control'] = html_print_checkbox_switch_extended('autocreate_remote_users', 1, $config['autocreate_remote_users'], false, '', '', true).'  ';
                 $table->data['autocreate_remote_users'] = $row;
 
                 add_enterprise_auth_autocreate_profiles($table, $type_auth);
@@ -89,7 +89,7 @@ if (is_ajax()) {
                 // Start TLS
                 $row = [];
                 $row['name'] = __('Start TLS');
-                $row['control'] = html_print_checkbox_toogle_switch('ldap_start_tls', 1, $config['ldap_start_tls'], true);
+                $row['control'] = html_print_checkbox_switch('ldap_start_tls', 1, $config['ldap_start_tls'], true);
                 $table->data['ldap_start_tls'] = $row;
 
                 // Base DN
@@ -135,7 +135,7 @@ if (is_ajax()) {
         $row = [];
         $row['name'] = __('Double authentication').ui_print_help_tip(__('If this option is enabled, the users can use double authentication with their accounts'), true);
         $row['control'] = html_print_input_hidden('double_auth_enabled', 0);
-        $row['control'] .= html_print_checkbox_toogle_switch('double_auth_enabled', 1, $config['double_auth_enabled'], true);
+        $row['control'] .= html_print_checkbox_switch('double_auth_enabled', 1, $config['double_auth_enabled'], true);
         $table->data['double_auth_enabled'] = $row;
 
         // Session timeout

pandora_console/godmode/setup/setup_general.php

@@ -82,17 +82,17 @@ $sources['sql'] = __('Database');
 $table->data[9][1] = html_print_select($sources, 'timesource', $config['timesource'], '', '', '', true);
 
 $table->data[10][0] = __('Automatic check for updates');
-$table->data[10][1] = html_print_checkbox_toogle_switch('autoupdate', 1, $config['autoupdate'], true);
+$table->data[10][1] = html_print_checkbox_switch('autoupdate', 1, $config['autoupdate'], true);
 
 echo "<div id='dialog' title='".__('Enforce https Information')."' style='display:none;'>";
 echo "<p style='text-align: center;'>".__('If SSL is not properly configured you will lose access to ').get_product_name().__(' Console').'</p>';
 echo '</div>';
 
 $table->data[11][0] = __('Enforce https');
-$table->data[11][1] = html_print_checkbox_toogle_switch_extended('https', 1, $config['https'], false, '', '', true);
+$table->data[11][1] = html_print_checkbox_switch_extended('https', 1, $config['https'], false, '', '', true);
 
 $table->data[12][0] = __('Use cert of SSL');
-$table->data[12][1] = html_print_checkbox_toogle_switch_extended('use_cert', 1, $config['use_cert'], false, '', '', true);
+$table->data[12][1] = html_print_checkbox_switch_extended('use_cert', 1, $config['use_cert'], false, '', '', true);
 
 $table->rowstyle[13] = 'display: none;';
 $table->data[13][0] = __('Path of SSL Cert.').ui_print_help_tip(__('Path where you put your cert and name of this cert. Remember your cert only in .pem extension.'), true);
@@ -114,7 +114,7 @@ $table->data[16][0] = __('API password').ui_print_help_tip(__('Please be careful
 $table->data[16][1] = html_print_input_password('api_password', io_output_password($config['api_password']), '', 25, 255, true);
 
 $table->data[17][0] = __('Enable GIS features');
-$table->data[17][1] = html_print_checkbox_toogle_switch('activate_gis', 1, $config['activate_gis'], true);
+$table->data[17][1] = html_print_checkbox_switch('activate_gis', 1, $config['activate_gis'], true);
 
 $table->data[19][0] = __('Enable Netflow');
 $rbt_disabled = false;
@@ -123,7 +123,7 @@ if (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN') {
     $table->data[19][0] .= ui_print_help_tip(__('Not supported in Windows systems'), true);
 }
 
-$table->data[19][1] = html_print_checkbox_toogle_switch_extended('activate_netflow', 1, $config['activate_netflow'], $rbt_disabled, '', '', true);
+$table->data[19][1] = html_print_checkbox_switch_extended('activate_netflow', 1, $config['activate_netflow'], $rbt_disabled, '', '', true);
 
 
 $zone_name = [
@@ -202,15 +202,15 @@ $table->data[28][1] = html_print_input_text('public_url', $config['public_url'],
 
 $table->data[29][0] = __('Referer security');
 $table->data[29][0] .= ui_print_help_tip(__("If enabled, actively checks if the user comes from %s's URL", get_product_name()), true);
-$table->data[29][1] = html_print_checkbox_toogle_switch('referer_security', 1, $config['referer_security'], true);
+$table->data[29][1] = html_print_checkbox_switch('referer_security', 1, $config['referer_security'], true);
 
 $table->data[30][0] = __('Event storm protection');
 $table->data[30][0] .= ui_print_help_tip(__('If set to yes no events or alerts will be generated, but agents will continue receiving data.'), true);
-$table->data[30][1] = html_print_checkbox_toogle_switch('event_storm_protection', 1, $config['event_storm_protection'], true);
+$table->data[30][1] = html_print_checkbox_switch('event_storm_protection', 1, $config['event_storm_protection'], true);
 
 
 $table->data[31][0] = __('Command Snapshot').ui_print_help_tip(__('The string modules with several lines show as command output'), true);
-$table->data[31][1] = html_print_checkbox_toogle_switch('command_snapshot', 1, $config['command_snapshot'], true);
+$table->data[31][1] = html_print_checkbox_switch('command_snapshot', 1, $config['command_snapshot'], true);
 
 $table->data[32][0] = __('Server logs directory').ui_print_help_tip(__('Directory where the server logs are stored.'), true);
 $table->data[32][1] = html_print_input_text(
@@ -250,7 +250,7 @@ $table->data['tutorial_mode'][1] = html_print_select(
 
 $config['past_planned_downtimes'] = isset($config['past_planned_downtimes']) ? $config['past_planned_downtimes'] : 1;
 $table->data[34][0] = __('Allow create planned downtimes in the past').ui_print_help_tip(__('The planned downtimes created in the past will affect the SLA reports'), true);
-$table->data[34][1] = html_print_checkbox_toogle_switch('past_planned_downtimes', 1, $config['past_planned_downtimes'], true);
+$table->data[34][1] = html_print_checkbox_switch('past_planned_downtimes', 1, $config['past_planned_downtimes'], true);
 
 $table->data[35][0] = __('Limit for bulk operations').ui_print_help_tip(__('Your PHP environment is set to 1000 max_input_vars. This parameter should have the same value or lower.', ini_get('max_input_vars')), true);
 $table->data[35][1] = html_print_input_text(
@@ -263,7 +263,7 @@ $table->data[35][1] = html_print_input_text(
 );
 
 $table->data[36][0] = __('Include agents manually disabled');
-$table->data[36][1] = html_print_checkbox_toogle_switch('include_agents', 1, $config['include_agents'], true);
+$table->data[36][1] = html_print_checkbox_switch('include_agents', 1, $config['include_agents'], true);
 
 $table->data[37][0] = __('Audit log directory').ui_print_help_tip(__('Directory where audit log is stored.'), true);
 $table->data[37][1] = html_print_input_text('auditdir', io_safe_output($config['auditdir']), '', 30, 100, true);

pandora_console/godmode/setup/setup_visuals.php

@@ -75,7 +75,7 @@ $table_behaviour->data[$row][1] = html_print_select($values, 'vc_refr', $config[
 $row++;
 
 $table_behaviour->data[$row][0] = __('Paginated module view');
-$table_behaviour->data[$row][1] = html_print_checkbox_toogle_switch(
+$table_behaviour->data[$row][1] = html_print_checkbox_switch(
     'paginate_module',
     1,
     $config['paginate_module'],
@@ -84,7 +84,7 @@ $table_behaviour->data[$row][1] = html_print_checkbox_toogle_switch(
 $row++;
 
 $table_behaviour->data[$row][0] = __('Display data of proc modules in other format');
-$table_behaviour->data[$row][1] = html_print_checkbox_toogle_switch(
+$table_behaviour->data[$row][1] = html_print_checkbox_switch(
     'render_proc',
     1,
     $config['render_proc'],
@@ -102,7 +102,7 @@ $row++;
 
 // Daniel maya 02/06/2016 Display menu with click --INI
 $table_behaviour->data[$row][0] = __('Click to display lateral menus').ui_print_help_tip(__('When enabled, the lateral menus are shown when left clicking them, instead of hovering over them'), true);
-$table_behaviour->data[$row][1] = html_print_checkbox_toogle_switch(
+$table_behaviour->data[$row][1] = html_print_checkbox_switch(
     'click_display',
     1,
     $config['click_display'],
@@ -120,15 +120,6 @@ if (enterprise_installed()) {
     $row++;
 }
 
-$table_behaviour->data[$row][0] = __('Classic menu mode').ui_print_help_tip(__('Text menu options always visible, don\'t hide'), true);
-$table_behaviour->data[$row][1] = html_print_checkbox_toogle_switch(
-    'classic_menu',
-    1,
-    $config['classic_menu'],
-    true
-);
-$row++;
-
 echo '<fieldset>';
 echo '<legend>'.__('Behaviour configuration').'</legend>';
 html_print_table($table_behaviour);
@@ -227,15 +218,24 @@ $table_styles->data[$row][1] = html_print_select(
 $table_styles->data[$row][1] .= '&nbsp;'.html_print_button(__('View'), 'login_background_preview', false, '', 'class="sub camera logo_preview"', true);
 $row++;
 
-$table_styles->data[$row][0] = __('Custom logo (header)').ui_print_help_icon('custom_logo', true);
+
+/**
+ * Print a select for the custom logos.
+ *
+ * @param  string $name This is the name for the select
+ * @param  string $logo This is the option in $config (path)
+ * @return string Print the select
+ */
+function logo_custom_enterprise($name, $logo)
+{
     if (enterprise_installed()) {
         $ent_files = list_files('enterprise/images/custom_logo', 'png', 1, 0);
         $open_files = list_files('images/custom_logo', 'png', 1, 0);
 
-    $table_styles->data[$row][1] = html_print_select(
+        $select = html_print_select(
             array_merge($ent_files, $open_files),
-        'custom_logo',
+            $name,
-        $config['custom_logo'],
+            $logo,
             '',
             '',
             '',
@@ -246,11 +246,12 @@ if (enterprise_installed()) {
             $open,
             'width:240px'
         );
+        return $select;
     } else {
-    $table_styles->data[$row][1] = html_print_select(
+        $select = html_print_select(
             list_files('images/custom_logo', 'png', 1, 0),
-        'custom_logo',
+            $name,
-        $config['custom_logo'],
+            $logo,
             '',
             '',
             '',
@@ -261,11 +262,21 @@ if (enterprise_installed()) {
             $open,
             'width:240px'
         );
+        return $select;
+    }
 }
 
+
+$table_styles->data[$row][0] = __('Custom logo (menu)').ui_print_help_icon('custom_logo', true);
+$table_styles->data[$row][1] = logo_custom_enterprise('custom_logo', $config['custom_logo']);
 $table_styles->data[$row][1] .= '&nbsp;'.html_print_button(__('View'), 'custom_logo_preview', $open, '', 'class="sub camera logo_preview"', true, false, $open, 'visualmodal');
 $row++;
 
+$table_styles->data[$row][0] = __('Custom logo collapsed (menu)').ui_print_help_icon('custom_logo_collapsed', true);
+$table_styles->data[$row][1] = logo_custom_enterprise('custom_logo_collapsed', $config['custom_logo_collapsed']);
+$table_styles->data[$row][1] .= '&nbsp;'.html_print_button(__('View'), 'custom_logo_collapsed_preview', $open, '', 'class="sub camera logo_preview"', true, false, $open, 'visualmodal');
+$row++;
+
 $table_styles->data[$row][0] = __('Custom logo (header white background)');
 if (enterprise_installed()) {
     $ent_files = list_files('enterprise/images/custom_logo', 'png', 1, 0);
@@ -491,7 +502,7 @@ if (enterprise_installed()) {
 
 if (enterprise_installed()) {
     $table_styles->data[$row][0] = __('Disable logo in graphs');
-    $table_styles->data[$row][1] = html_print_checkbox_toogle_switch(
+    $table_styles->data[$row][1] = html_print_checkbox_switch(
         'fixed_graph',
         1,
         $config['fixed_graph'],
@@ -507,7 +518,7 @@ if (enterprise_installed()) {
     */
 
 $table_styles->data[$row][0] = __('Disable helps');
-$table_styles->data[$row][1] = html_print_checkbox_toogle_switch(
+$table_styles->data[$row][1] = html_print_checkbox_switch(
     'disable_help',
     1,
     $config['disable_help'],
@@ -516,7 +527,7 @@ $table_styles->data[$row][1] = html_print_checkbox_toogle_switch(
 $row++;
 
 $table_styles->data[$row][0] = __('Fixed header');
-$table_styles->data[$row][1] = html_print_checkbox_toogle_switch(
+$table_styles->data[$row][1] = html_print_checkbox_switch(
     'fixed_header',
     1,
     $config['fixed_header'],
@@ -524,18 +535,10 @@ $table_styles->data[$row][1] = html_print_checkbox_toogle_switch(
 );
 $row++;
 
-$table_styles->data[$row][0] = __('Fixed menu');
-$table_styles->data[$row][1] = html_print_checkbox_toogle_switch(
-    'fixed_menu',
-    1,
-    $config['fixed_menu'],
-    true
-);
-$row++;
 
     // For 5.1 Autohidden menu feature
     $table_styles->data['autohidden'][0] = __('Autohidden menu');
-$table_styles->data['autohidden'][1] = html_print_checkbox_toogle_switch(
+    $table_styles->data['autohidden'][1] = html_print_checkbox_switch(
         'autohidden_menu',
         1,
         $config['autohidden_menu'],
@@ -543,7 +546,7 @@ $table_styles->data['autohidden'][1] = html_print_checkbox_toogle_switch(
     );
 
     $table_styles->data[$row][0] = __('Visual effects and animation');
-$table_styles->data[$row][1] = html_print_checkbox_toogle_switch(
+    $table_styles->data[$row][1] = html_print_checkbox_switch(
         'visual_animation',
         1,
         $config['visual_animation'],
@@ -567,7 +570,7 @@ $table_gis->size[0] = '50%';
     $table_gis->data = [];
 
     $table_gis->data[$row][0] = __('GIS Labels').ui_print_help_tip(__('This enabling this, you get a label with agent name in GIS maps. If you have lots of agents in the map, will be unreadable. Disabled by default.'), true);
-$table_gis->data[$row][1] = html_print_checkbox_toogle_switch(
+    $table_gis->data[$row][1] = html_print_checkbox_switch(
         'gis_label',
         1,
         $config['gis_label'],
@@ -680,7 +683,7 @@ $table_font->data[$row][1] = html_print_input_text(
     $row++;
 
     $table_font->data[$row][0] = __('Show unit along with value in reports').ui_print_help_tip(__('This enabling this, max, min and avg values will be shown with units.'), true);
-$table_font->data[$row][1] = html_print_checkbox_toogle_switch(
+    $table_font->data[$row][1] = html_print_checkbox_switch(
         'simple_module_value',
         1,
         $config['simple_module_value'],
@@ -778,7 +781,7 @@ $table_chars->data[$row][1] = html_print_input_text(
     $row++;
 
     $table_chars->data[$row][0] = __('Use round corners');
-$table_chars->data[$row][1] = html_print_checkbox_toogle_switch(
+    $table_chars->data[$row][1] = html_print_checkbox_switch(
         'round_corner',
         1,
         $config['round_corner'],
@@ -947,7 +950,7 @@ $table_other->data[$row][0] = __('Show report info with description').ui_print_h
         __('Custom report description info. It will be applied to all reports and templates by default.'),
         true
     );
-$table_other->data[$row][1] = html_print_checkbox_toogle_switch(
+    $table_other->data[$row][1] = html_print_checkbox_switch(
         'custom_report_info',
         1,
         $config['custom_report_info'],
@@ -1061,7 +1064,7 @@ $table_other->data['custom_report_front-footer'][1] = html_print_textarea(
 
 
     $table_other->data[$row][0] = __('Show QR Code icon in the header');
-$table_other->data[$row][1] = html_print_checkbox_toogle_switch(
+    $table_other->data[$row][1] = html_print_checkbox_switch(
         'show_qr_code_header',
         1,
         $config['show_qr_code_header'],
@@ -1099,7 +1102,7 @@ $table_other->data[$row][0] .= ui_print_help_tip(
         __('Show the group name instead the group icon.'),
         true
     );
-$table_other->data[$row][1] = html_print_checkbox_toogle_switch(
+    $table_other->data[$row][1] = html_print_checkbox_switch(
         'show_group_name',
         1,
         $config['show_group_name'],
@@ -1473,6 +1476,11 @@ $(".logo_preview").click (function(e) {
             icon_path = homeUrlEnt + "images/custom_logo/" + icon_name;
             options.grayed = true;
             break;
+        case 'button-custom_logo_collapsed_preview':
+            icon_name = $("select#custom_logo_collapsed option:selected").val();
+            icon_path = homeUrlEnt + "images/custom_logo/" + icon_name;
+            options.grayed = true;
+            break;            
         case 'button-custom_logo_white_bg_preview':
             icon_name = $("select#custom_logo_white_bg option:selected").val();
             icon_path = homeUrlEnt + "images/custom_logo/" + icon_name;

pandora_console/godmode/wizards/DiscoveryTaskList.class.php

@@ -306,7 +306,7 @@ class DiscoveryTaskList extends Wizard
             return false;
         }
 
-        // Get all recon servers.
+        // Get all discovery servers.
         $servers = db_get_all_rows_sql('SELECT * FROM tserver WHERE server_type = 3');
         if ($servers === false) {
             $servers = [];
@@ -337,28 +337,8 @@ class DiscoveryTaskList extends Wizard
                 }
             }
 
-            foreach ($servers as $serverItem) {
-                $id_server = $serverItem['id_server'];
-                $server_name = servers_get_name($id_server);
             $recon_tasks = db_get_all_rows_sql('SELECT * FROM trecon_task');
             $user_groups = implode(',', array_keys(users_get_groups()));
-                $defined_tasks = db_get_all_rows_filter(
-                    'tuser_task_scheduled',
-                    'id_grupo IN ('.$user_groups.')'
-                );
-
-                if (isset($tasks_console) === true
-                    && is_array($tasks_console) === true
-                ) {
-                    foreach ($tasks_console as $key => $value) {
-                        $value['parameters'] = unserialize(
-                            $value['parameters']
-                        );
-
-                        $value['type'] = 'Cron';
-                        array_push($recon_tasks, $value);
-                    }
-                }
 
             // Show network tasks for Recon Server.
             if ($recon_tasks === false) {
@@ -384,31 +364,52 @@ class DiscoveryTaskList extends Wizard
                 $table->head[1] = __('Task name');
                 $table->align[1] = 'left';
 
-                $table->head[2] = __('Interval');
+                $table->head[2] = __('Server name');
                 $table->align[2] = 'left';
 
-                $table->head[3] = __('Network');
+                $table->head[3] = __('Interval');
                 $table->align[3] = 'left';
 
-                $table->head[4] = __('Status');
+                $table->head[4] = __('Network');
                 $table->align[4] = 'left';
 
-                $table->head[5] = __('Task type');
+                $table->head[5] = __('Status');
                 $table->align[5] = 'left';
 
-                $table->head[6] = __('Progress');
+                $table->head[6] = __('Task type');
                 $table->align[6] = 'left';
 
-                $table->head[7] = __('Updated at');
+                $table->head[7] = __('Progress');
                 $table->align[7] = 'left';
 
-                $table->head[8] = __('Operations');
+                $table->head[8] = __('Updated at');
                 $table->align[8] = 'left';
 
+                $table->head[9] = __('Operations');
+                $table->align[9] = 'left';
+
             foreach ($recon_tasks as $task) {
                 $data = [];
+                $server_name = servers_get_name($task['id_recon_server']);
 
-                    if ($task['disabled'] == 0) {
+                // By default.
+                $subnet = $task['subnet'];
+
+                // Exceptions: IPAM.
+                $ipam = false;
+                if ($task['id_recon_script'] != null) {
+                    $recon_script_name = db_get_value('name', 'trecon_script', 'id_recon_script', $task['id_recon_script']);
+                    if (io_safe_output($recon_script_name) == 'IPAM Recon'
+                        && enterprise_installed()
+                    ) {
+                        $subnet_obj = json_decode($task['macros'], true);
+                        $subnet = $subnet_obj['1']['value'];
+                        $tipam_task_id = db_get_value('id', 'tipam_network', 'id_recon_task', $task['id_rt']);
+                        $ipam = true;
+                    }
+                }
+
+                if ($task['disabled'] == 0 && $server_name !== '') {
                     $data[0] = '<a href="'.ui_get_full_url(
                         'index.php?sec=gservers&sec2=godmode/servers/discovery&wiz=tasklist&server_id='.$id_server.'&force='.$task['id_rt']
                     ).'">';
@@ -425,54 +426,51 @@ class DiscoveryTaskList extends Wizard
 
                 $data[1] = '<b>'.$task['name'].'</b>';
 
+                $data[2] = $server_name;
+
                 if ($task['interval_sweep'] > 0) {
-                        $data[2] = human_time_description_raw(
+                    $data[3] = human_time_description_raw(
                         $task['interval_sweep']
                     );
                 } else {
-                        $data[2] = __('Manual');
+                    $data[3] = __('Manual');
                 }
 
-                    if ($task['id_recon_script'] == 0) {
+                if ($task['id_recon_script'] == 0 || $ipam === true) {
-                        $data[3] = $task['subnet'];
+                    $data[4] = $subnet;
                 } else {
-                        $data[3] = '-';
+                    $data[4] = '-';
                 }
 
                 if ($task['status'] <= 0) {
-                        $data[4] = __('Done');
+                    $data[5] = __('Done');
                 } else {
-                        $data[4] = __('Pending');
+                    $data[5] = __('Pending');
                 }
 
                 if ($task['id_recon_script'] == 0) {
                     // Discovery NetScan.
-                        $data[5] = html_print_image(
+                    $data[6] = html_print_image(
                         'images/network.png',
                         true,
                         ['title' => __('Discovery NetScan')]
                     ).'&nbsp;&nbsp;';
-                        $data[5] .= network_profiles_get_name(
+                    $data[6] .= network_profiles_get_name(
                         $task['id_network_profile']
                     );
                 } else {
                     // APP recon task.
-                        $data[5] = html_print_image(
+                    $data[6] = html_print_image(
                         'images/plugin.png',
                         true
                     ).'&nbsp;&nbsp;';
-                        $data[5] .= db_get_sql(
+                    $data[6] .= $recon_script_name;
-                            sprintf(
-                                'SELECT name FROM trecon_script WHERE id_recon_script = %d',
-                                $task['id_recon_script']
-                            )
-                        );
                 }
 
                 if ($task['status'] <= 0 || $task['status'] > 100) {
-                        $data[6] = '-';
+                    $data[7] = '-';
                 } else {
-                        $data[6] = progress_bar(
+                    $data[7] = progress_bar(
                         $task['status'],
                         100,
                         20,
@@ -482,12 +480,12 @@ class DiscoveryTaskList extends Wizard
                 }
 
                 if ($task['utimestamp'] > 0) {
-                        $data[7] = ui_print_timestamp(
+                    $data[8] = ui_print_timestamp(
                         $task['utimestamp'],
                         true
                     );
                 } else {
-                        $data[7] = __('Not executed yet');
+                    $data[8] = __('Not executed yet');
                 }
 
                 if (check_acl(
@@ -496,8 +494,25 @@ class DiscoveryTaskList extends Wizard
                     'PM'
                 )
                 ) {
-                        // Check if is a H&D, Cloud or Application.
+                    if ($ipam === true) {
-                        $data[8] = '<a href="'.ui_get_full_url(
+                        $data[9] = '<a href="'.ui_get_full_url(
+                            sprintf(
+                                'index.php?sec=godmode/extensions&sec2=enterprise/extensions/ipam&action=edit&id=%d',
+                                $tipam_task_id
+                            )
+                        ).'">'.html_print_image(
+                            'images/config.png',
+                            true
+                        ).'</a>';
+                        $data[9] .= '<a href="'.ui_get_full_url(
+                            'index.php?sec=godmode/extensions&sec2=enterprise/extensions/ipam&action=delete&id='.$tipam_task_id
+                        ).'" onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;">'.html_print_image(
+                            'images/cross.png',
+                            true
+                        ).'</a>';
+                    } else {
+                        // Check if is a H&D, Cloud or Application or IPAM.
+                        $data[9] = '<a href="'.ui_get_full_url(
                             sprintf(
                                 'index.php?sec=gservers&sec2=godmode/servers/discovery&%s&task=%d',
                                 $this->getTargetWiz($task),
@@ -507,14 +522,15 @@ class DiscoveryTaskList extends Wizard
                             'images/config.png',
                             true
                         ).'</a>';
-                        $data[8] .= '<a href="'.ui_get_full_url(
+                        $data[9] .= '<a href="'.ui_get_full_url(
                             'index.php?sec=gservers&sec2=godmode/servers/discovery&wiz=tasklist&delete=1&task='.$task['id_rt']
                         ).'" onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;">'.html_print_image(
                             'images/cross.png',
                             true
                         ).'</a>';
+                    }
                 } else {
-                        $data[8] = '';
+                    $data[9] = '';
                 }
 
                 array_push($table->data, $data);
@@ -530,7 +546,6 @@ class DiscoveryTaskList extends Wizard
 
                 unset($table);
         }
-        }
 
         return true;
     }