From 64ed03784b47591d88a1fb96bb2e1339c3c801b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Gonz=C3=A1lez?= <jose.gonzalez@pandorafms.com>
Date: Thu, 24 Feb 2022 11:04:18 +0100
Subject: [PATCH] Fix several issues with mobile view

---
 pandora_console/include/functions_ui.php    | 27 +++++++-------
 pandora_console/mobile/include/ui.class.php |  5 ++-
 pandora_console/mobile/operation/alerts.php | 40 +++++++++++++++------
 3 files changed, 44 insertions(+), 28 deletions(-)

diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index b3b66a4a9b..c146bf5e69 100755
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -2713,16 +2713,15 @@ function ui_print_status_image(
         $imagepath = $path;
     }
 
-    if ($imagepath == 'images/status_sets/default') {
+    if ($imagepath === 'images/status_sets/default') {
         $image_with_css = true;
     }
 
-    $imagepath .= '/'.$type;
-
     if ($image_with_css === true) {
         $shape_status = get_shape_status_set($type);
         return ui_print_status_sets($type, $title, $return, $shape_status, $extra_info);
     } else {
+        $imagepath .= '/'.$type;
         if ($options === false) {
             $options = [];
         }
@@ -2869,7 +2868,7 @@ function ui_print_status_sets(
         $options = [];
     }
 
-    if (isset($options['style'])) {
+    if (isset($options['style']) === true) {
         $options['style'] .= ' display: inline-block;';
     } else {
         $options['style'] = 'display: inline-block;';
@@ -2879,15 +2878,17 @@ function ui_print_status_sets(
         $options['style'] .= ' background: '.modules_get_color_status($status).';';
     }
 
-    if (isset($options['class'])) {
+    $options['style'] .= 'width: 100%;';
+
+    if (isset($options['class']) === true) {
         $options['class'] = $options['class'];
     }
 
-    if ($title != '') {
-        $options['title'] = empty($extra_info) ? $title : $title.'&#10'.$extra_info;
-        $options['data-title'] = empty($extra_info) ? $title : $title.'<br>'.$extra_info;
+    if (empty($title) === false) {
+        $options['title'] = (empty($extra_info) === true) ? $title : $title.'&#10'.$extra_info;
+        $options['data-title'] = (empty($extra_info) === true) ? $title : $title.'<br>'.$extra_info;
         $options['data-use_title_for_force_title'] = 1;
-        if (isset($options['class'])) {
+        if (isset($options['class']) === true) {
             $options['class'] .= ' forced_title';
         } else {
             $options['class'] = 'forced_title';
@@ -2899,15 +2900,13 @@ function ui_print_status_sets(
         $output .= $k.'="'.$v.'"';
     }
 
-    $output .= '>';
-    $output .= '</div>';
+    $output .= '>&nbsp;</div>';
 
     if ($return === false) {
         echo $output;
+    } else {
+        return $output;
     }
-
-    return $output;
-
 }
 
 
diff --git a/pandora_console/mobile/include/ui.class.php b/pandora_console/mobile/include/ui.class.php
index 023ee35ed7..4bfeae3fee 100755
--- a/pandora_console/mobile/include/ui.class.php
+++ b/pandora_console/mobile/include/ui.class.php
@@ -790,12 +790,11 @@ class Ui
         echo '		<title>'.$this->title."</title>\n";
         echo "		<meta charset='UTF-8' />\n";
         echo "		<meta name='viewport' content='width=device-width, initial-scale=1'>\n";
+        echo '      <link rel="icon" href="'.ui_get_full_url('/').ui_get_favicon().'" type="image/ico" />'."\n";
+        echo '      <link rel="shortcut icon" href="'.ui_get_full_url('/').ui_get_favicon().'" type="image/x-icon" />'."\n";
         echo "		<link rel='stylesheet' href='include/style/main.css' />\n";
-        // echo "        <link rel='stylesheet' href='include/style/jquery.mobile-1.4.5.css' />\n";
         echo "		<link rel='stylesheet' href='include/style/jquery.mobile-1.5.0-rc1.min.css' />\n";
-        // echo "        <script src='include/javascript/jquery.js.bakc'></script>\n";
         echo "		<script src='include/javascript/jquery.js'></script>\n";
-        // echo "        <script src='include/javascript/jquery.mobile-1.4.5.js'></script>\n";
         echo "		<script src='include/javascript/jquery.mobile-1.5.0-rc1.js'></script>\n";
         echo "		<script src='../include/javascript/pandora.js'></script>\n";
         echo "		<script src='../include/javascript/pandora_ui.js'></script>\n";
diff --git a/pandora_console/mobile/operation/alerts.php b/pandora_console/mobile/operation/alerts.php
index d898b7584b..c1857f44f5 100644
--- a/pandora_console/mobile/operation/alerts.php
+++ b/pandora_console/mobile/operation/alerts.php
@@ -1,15 +1,33 @@
 <?php
-// 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 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.
+// phpcs:disable Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
+/**
+ * Alerts list view for mobile
+ *
+ * @category   Mobile
+ * @package    Pandora FMS
+ * @subpackage Community
+ * @version    1.0.0
+ * @license    See below
+ *
+ *    ______                 ___                    _______ _______ ________
+ *   |   __ \.-----.--.--.--|  |.-----.----.-----. |    ___|   |   |     __|
+ *  |    __/|  _  |     |  _  ||  _  |   _|  _  | |    ___|       |__     |
+ * |___|   |___._|__|__|_____||_____|__| |___._| |___|   |__|_|__|_______|
+ *
+ * ============================================================================
+ * Copyright (c) 2005-2022 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.
+ * ============================================================================
+ */
+
+// Begin.
 class Alerts
 {