From 00d4f0c57d0349e165e6bcc31dad3bdfd0fefc9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Gonz=C3=A1lez?= <jose.gonzalez@pandorafms.com>
Date: Wed, 16 Jun 2021 15:29:28 +0200
Subject: [PATCH] Clean code and fix issue with lateral main menu

---
 pandora_console/general/header.php         |   7 +-
 pandora_console/general/main_menu.php      | 120 +++++++++++----------
 pandora_console/include/config_process.php |   2 +-
 pandora_console/include/functions_menu.php |   6 +-
 pandora_console/include/styles/menu.css    |   4 +-
 pandora_console/index.php                  |  32 +++---
 6 files changed, 90 insertions(+), 81 deletions(-)

diff --git a/pandora_console/general/header.php b/pandora_console/general/header.php
index 81d51dc749..dedae177cb 100644
--- a/pandora_console/general/header.php
+++ b/pandora_console/general/header.php
@@ -23,13 +23,8 @@ ui_require_css_file('order_interpreter');
 // Global errors/warnings checking.
 config_check();
 
+echo sprintf('<div id="header_table" class="header_table_%s">', $menuTypeClass);
 
-
-if ($config['menu_type'] == 'classic') {
-    echo '<div id="header_table" class="header_table_classic">';
-} else {
-    echo '<div id="header_table" class="header_table_collapsed">';
-}
 ?>
     <div id="header_table_inner">        
         <?php
diff --git a/pandora_console/general/main_menu.php b/pandora_console/general/main_menu.php
index 5a45058c58..057f9f4b8a 100644
--- a/pandora_console/general/main_menu.php
+++ b/pandora_console/general/main_menu.php
@@ -1,17 +1,33 @@
 <?php
+/**
+ * Lateral Main Menu.
+ *
+ * @category   Main Menu.
+ * @package    Pandora FMS.
+ * @subpackage OpenSource.
+ * @version    1.0.0
+ * @license    See below
+ *
+ *    ______                 ___                    _______ _______ ________
+ *   |   __ \.-----.--.--.--|  |.-----.----.-----. |    ___|   |   |     __|
+ *  |    __/|  _  |     |  _  ||  _  |   _|  _  | |    ___|       |__     |
+ * |___|   |___._|__|__|_____||_____|__| |___._| |___|   |__|_|__|_______|
+ *
+ * ============================================================================
+ * Copyright (c) 2005-2021 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
+ * as published by the Free Software Foundation for version 2.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * ============================================================================
+ */
 
-// Pandora FMS - http://pandorafms.com
-// ==================================================
-// Copyright (c) 2005-2021 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
-// as published by the Free Software Foundation; version 2
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-if (! isset($config['id_user'])) {
+// Begin.
+if (isset($config['id_user']) === false) {
     include 'general/login_page.php';
     exit();
 }
@@ -20,9 +36,9 @@ if (! isset($config['id_user'])) {
 <script type="text/javascript" language="javascript">
 
 $(document).ready(function(){    
-    var menuType_value = "<?php echo $config['menu_type']; ?>";
+    var menuType_value = "<?php echo $_SESSION['menu_type']; ?>";
 
-    if (menuType_value == 'classic') {
+    if (menuType_value === 'classic') {
         $('ul.submenu').css('left', '214px');    
     }
     else{
@@ -34,26 +50,22 @@ $(document).ready(function(){
 <?php
 $autohidden_menu = 0;
 
-if (isset($config['autohidden_menu']) && $config['autohidden_menu']) {
+if (isset($config['autohidden_menu']) === true && (bool) $config['autohidden_menu'] === true) {
     $autohidden_menu = 1;
 }
 
-// Menu container prepared to autohide menu
-if ($config['menu_type'] == 'classic') {
-    echo '<div id="menu_full" class="menu_full_classic">';
-} else {
-    echo '<div id="menu_full" class="menu_full_collapsed">';
-}
+// Start of full lateral menu.
+echo sprintf('<div id="menu_full" class="menu_full_%s">', $menuTypeClass);
 
 $custom_logo = 'images/custom_logo/'.$config['custom_logo'];
 $custom_logo_collapsed = 'images/custom_logo/'.$config['custom_logo_collapsed'];
 
-if (!defined('PANDORA_ENTERPRISE')) {
+if (defined('PANDORA_ENTERPRISE') === false) {
     $logo_title = get_product_name().' Opensource';
     $custom_logo = 'images/custom_logo/pandora_logo_head_3.png';
     $custom_logo_collapsed = 'images/custom_logo/pandora_logo_green_collapsed.png';
 } else {
-    if (file_exists(ENTERPRISE_DIR.'/'.$custom_logo)) {
+    if (file_exists(ENTERPRISE_DIR.'/'.$custom_logo) === true) {
         $custom_logo = ENTERPRISE_DIR.'/'.$custom_logo;
     }
 
@@ -61,54 +73,48 @@ if (!defined('PANDORA_ENTERPRISE')) {
 }
 
 echo '<div class="logo_green"><a href="index.php?sec=main">';
-if (isset($config['custom_logo'])) {
-    if ($config['menu_type'] == 'classic') {
-        echo html_print_image($custom_logo, true, ['border' => '0', 'width' => '215', 'alt' => $logo_title, 'class' => 'logo_full', 'style' => 'display:block']);
-    } else {
-        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']) === true) {
+    echo html_print_image(
+        $custom_logo,
+        true,
+        [
+            'border' => '0',
+            'width'  => '215',
+            'alt'    => $logo_title,
+            'class'  => 'logo_full',
+            'style'  => ($menuCollapsed === true) ? 'display:none' : 'display:block',
+        ]
+    );
 }
 
-if (isset($config['custom_logo_collapsed'])) {
-    if ($config['menu_type'] == 'classic') {
-        echo html_print_image($custom_logo_collapsed, true, ['border' => '0', 'width' => '60', 'alt' => $logo_title, 'class' => 'logo_icon', 'style' => 'display:none']);
-    } else {
-        echo html_print_image($custom_logo_collapsed, true, ['border' => '0', 'width' => '60', 'alt' => $logo_title, 'class' => 'logo_icon', 'style' => 'display:block']);
-    }
+if (isset($config['custom_logo_collapsed']) === true) {
+    echo html_print_image(
+        $custom_logo_collapsed,
+        true,
+        [
+            'border' => '0',
+            'width'  => '60',
+            'alt'    => $logo_title,
+            'class'  => 'logo_icon',
+            'style'  => ($menuCollapsed === true) ? 'display:block' : 'display:none',
+        ]
+    );
 }
 
 echo '</a></div>';
 
-// echo '<div class="tit bg titop">:: '.__('Operation').' ::</div>';
 require 'operation/menu.php';
-
-// Check all enterprise ACL used in godmenu items to print menu headers
-if (check_acl($config['id_user'], 0, 'AW')
-    || check_acl($config['id_user'], 0, 'PM')
-    || check_acl($config['id_user'], 0, 'LM')
-    || check_acl($config['id_user'], 0, 'UM')
-    || check_acl($config['id_user'], 0, 'LW')
-    || check_acl($config['id_user'], 0, 'EW')
-    || check_acl($config['id_user'], 0, 'DW')
-) {
-    // echo '<div class="tit bg3">:: '.__('Administration').' ::</div>';
-}
-
 require 'godmode/menu.php';
 
-if ($config['menu_type'] == 'classic') {
-    echo '<div id="button_collapse" class="button_classic button_collapse"></div>';
-} else {
-    echo '<div id="button_collapse" class="button_collapsed button_collapse"></div>';
-}
+echo sprintf('<div id="button_collapse" class="button_%s button_collapse"></div>', $menuTypeClass);
 
-// require ("links_menu.php");
 echo '</div>';
-// menu_container
+// Menu_container.
 ui_require_jquery_file('cookie');
 
 $config_fixed_header = false;
-if (isset($config['fixed_header'])) {
+if (isset($config['fixed_header']) === true) {
     $config_fixed_header = $config['fixed_header'];
 }
 ?>
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 7c41358e47..b7cbae31c9 100644
--- a/pandora_console/include/config_process.php
+++ b/pandora_console/include/config_process.php
@@ -304,7 +304,7 @@ switch ($config['dbtype']) {
 
 // ======================================================================
 // Menu display mode.
-if (isset($_SESSION['meny_type']) === true && $_SESSION['menu_type']) {
+if (isset($_SESSION['meny_type']) === true && empty($_SESSION['menu_type']) === false) {
     $config['menu_type'] = $_SESSION['menu_type'];
 } else {
     $config['menu_type'] = 'classic';
diff --git a/pandora_console/include/functions_menu.php b/pandora_console/include/functions_menu.php
index 442a18f61f..9f28d0e7d6 100644
--- a/pandora_console/include/functions_menu.php
+++ b/pandora_console/include/functions_menu.php
@@ -30,7 +30,7 @@
 global $config;
 
 // Set variable to store menu type (classic or collapsed).
-if (!empty(get_parameter('menuType'))) {
+if (is_ajax() === true && empty(get_parameter('menuType')) === false) {
     $_SESSION['menu_type'] = get_parameter('menuType', 'classic');
     return;
 }
@@ -108,7 +108,7 @@ function menu_print_menu(&$menu)
 
         $submenu = false;
 
-        if ($config['menu_type'] == 'classic') {
+        if ($_SESSION['menu_type'] === 'classic') {
             $classes = [
                 'menu_icon',
                 'no_hidden_menu',
@@ -413,7 +413,7 @@ function menu_print_menu(&$menu)
         $length = strlen(__($main['text']));
         $padding_top = ( $length >= 18) ? 6 : 12;
 
-        if ($config['menu_type'] == 'classic') {
+        if ($_SESSION['menu_type'] === 'classic') {
             $output .= '<div id="title_menu" class="title_menu_classic">'.$main['text'].'</div>';
         } else {
             $output .= '<div id="title_menu" class="title_menu_collapsed">'.$main['text'].'</div>';
diff --git a/pandora_console/include/styles/menu.css b/pandora_console/include/styles/menu.css
index d0acc524f3..c97d2f9274 100644
--- a/pandora_console/include/styles/menu.css
+++ b/pandora_console/include/styles/menu.css
@@ -416,11 +416,11 @@ ul li {
 }
 
 .menu_full_classic .title_menu_classic {
-  display: flex;
+  display: flex !important;
 }
 
 .menu_full_collapsed .title_menu_collapsed {
-  display: none;
+  display: none !important;
 }
 
 .button_classic {
diff --git a/pandora_console/index.php b/pandora_console/index.php
index ac14a19818..8c59153649 100755
--- a/pandora_console/index.php
+++ b/pandora_console/index.php
@@ -1055,16 +1055,20 @@ if ((bool) $config['maintenance_mode'] === true
 }
 
 
-// Header.
+// Pure.
 if ($config['pure'] == 0) {
-    echo '<div id="container"><div id="head">';
+    // Menu container prepared to autohide menu.
+    $menuCollapsed = (isset($_SESSION['menu_type']) === true && $_SESSION['menu_type'] !== 'classic');
+    $menuTypeClass = ($menuCollapsed === true) ? 'collapsed' : 'classic';
+    // Container.
+    echo '<div id="container">';
+    // Header.
+    echo '<div id="head">';
     include 'general/header.php';
-
-    if ($config['menu_type'] == 'classic') {
-        echo '</div><div id="page" class="page_classic"><div id="menu">';
-    } else {
-        echo '</div><div id="page" class="page_collapsed"><div id="menu">';
-    }
+    echo '</div>';
+    // Main menu.
+    echo sprintf('<div id="page" class="page_%s">', $menuTypeClass);
+    echo '<div id="menu">';
 
     include 'general/main_menu.php';
     echo '</div>';
@@ -1272,11 +1276,15 @@ if ($config['pure'] == 0) {
     // Main pure.
 }
 
-echo '<div id="wiz_container">';
-echo '</div>';
+html_print_div(
+    ['id' => 'wiz_container'],
+    true
+);
 
-echo '<div id="um_msg_receiver">';
-echo '</div>';
+html_print_div(
+    ['id' => 'um_msg_receiver'],
+    true
+);
 
 // Connection lost alert.
 ui_require_javascript_file('connection_check');