From 6efaa2bbc605747c02e1922ebb326e130addee97 Mon Sep 17 00:00:00 2001
From: Daniel Maya <daniel.maya@pandorafms.com>
Date: Tue, 21 Feb 2023 15:06:15 +0100
Subject: [PATCH 1/7] #8642 Added heatmap widget

---
 pandora_console/include/class/Heatmap.class.php  | 4 +++-
 pandora_console/include/lib/Dashboard/Widget.php | 4 ++++
 pandora_console/operation/heatmap.php            | 1 +
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/pandora_console/include/class/Heatmap.class.php b/pandora_console/include/class/Heatmap.class.php
index 8572d6cad1..bab7f8fd85 100644
--- a/pandora_console/include/class/Heatmap.class.php
+++ b/pandora_console/include/class/Heatmap.class.php
@@ -25,6 +25,8 @@
  * GNU General Public License for more details.
  * ============================================================================
  */
+
+namespace PandoraFMS;
 class Heatmap
 {
 
@@ -159,7 +161,7 @@ class Heatmap
             ],
         ];
 
-        echo '<div id="div_'.$this->randomId.'" class="mainDiv">';
+        echo '<div id="div_'.$this->randomId.'" class="mainDiv" style="width: 100%;height: 100%">';
         ?>
             <script type="text/javascript">
                 $(document).ready(function() {
diff --git a/pandora_console/include/lib/Dashboard/Widget.php b/pandora_console/include/lib/Dashboard/Widget.php
index 2753b8a55d..3616d185f7 100644
--- a/pandora_console/include/lib/Dashboard/Widget.php
+++ b/pandora_console/include/lib/Dashboard/Widget.php
@@ -423,6 +423,10 @@ class Widget
                     $className .= '\\'.$name;
                 break;
 
+                case 'heatmap':
+                    $className .= '\HeatmapWidget';
+                break;
+
                 default:
                     $className = false;
                 break;
diff --git a/pandora_console/operation/heatmap.php b/pandora_console/operation/heatmap.php
index a9ab10ed47..a0531af5e0 100644
--- a/pandora_console/operation/heatmap.php
+++ b/pandora_console/operation/heatmap.php
@@ -41,6 +41,7 @@ if ($agent_a === false && $agent_w === false) {
 }
 
 require_once $config['homedir'].'/include/class/Heatmap.class.php';
+use PandoraFMS\Heatmap;
 
 $pure = (bool) get_parameter('pure', false);
 $type = get_parameter('type', 0);

From d4f6baa9bb4529e639aefc86287c9c81302ce486 Mon Sep 17 00:00:00 2001
From: Daniel Maya <daniel.maya@pandorafms.com>
Date: Tue, 21 Feb 2023 15:06:58 +0100
Subject: [PATCH 2/7] #8642 Added heatmap widget 2

---
 .../include/lib/Dashboard/Widgets/heatmap.php | 316 ++++++++++++++++++
 1 file changed, 316 insertions(+)
 create mode 100644 pandora_console/include/lib/Dashboard/Widgets/heatmap.php

diff --git a/pandora_console/include/lib/Dashboard/Widgets/heatmap.php b/pandora_console/include/lib/Dashboard/Widgets/heatmap.php
new file mode 100644
index 0000000000..c10c7c1f27
--- /dev/null
+++ b/pandora_console/include/lib/Dashboard/Widgets/heatmap.php
@@ -0,0 +1,316 @@
+<?php
+/**
+ * Widget Heatmap Pandora FMS Console
+ *
+ * @category   Console Class
+ * @package    Pandora FMS
+ * @subpackage Widget Heatmap
+ * @version    1.0.0
+ * @license    See below
+ *
+ *    ______                 ___                    _______ _______ ________
+ *   |   __ \.-----.--.--.--|  |.-----.----.-----. |    ___|   |   |     __|
+ *  |    __/|  _  |     |  _  ||  _  |   _|  _  | |    ___|       |__     |
+ * |___|   |___._|__|__|_____||_____|__| |___._| |___|   |__|_|__|_______|
+ *
+ * ============================================================================
+ * Copyright (c) 2005-2023 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.
+ * ============================================================================
+ */
+
+namespace PandoraFMS\Dashboard;
+
+global $config;
+
+require_once $config['homedir'].'/include/class/Heatmap.class.php';
+
+use PandoraFMS\Heatmap;
+
+/**
+ * Heatmap Widgets.
+ */
+class HeatmapWidget extends Widget
+{
+
+    /**
+     * Name widget.
+     *
+     * @var string
+     */
+    protected $name;
+
+    /**
+     * Title widget.
+     *
+     * @var string
+     */
+    protected $title;
+
+    /**
+     * Page widget;
+     *
+     * @var string
+     */
+    protected $page;
+
+    /**
+     * Class name widget.
+     *
+     * @var [type]
+     */
+    protected $className;
+
+    /**
+     * Values options for each widget.
+     *
+     * @var [type]
+     */
+    protected $values;
+
+    /**
+     * Configuration required.
+     *
+     * @var boolean
+     */
+    protected $configurationRequired;
+
+    /**
+     * Error load widget.
+     *
+     * @var boolean
+     */
+    protected $loadError;
+
+    /**
+     * Width.
+     *
+     * @var integer
+     */
+    protected $width;
+
+    /**
+     * Heigth.
+     *
+     * @var integer
+     */
+    protected $height;
+
+    /**
+     * Dashboard ID.
+     *
+     * @var integer
+     */
+    protected $dashboardId;
+
+    /**
+     * Cell ID.
+     *
+     * @var integer
+     */
+    protected $cellId;
+
+
+    /**
+     * Construct.
+     *
+     * @param integer      $cellId      Cell ID.
+     * @param integer      $dashboardId Dashboard ID.
+     * @param integer      $widgetId    Widget ID.
+     * @param integer|null $width       New width.
+     * @param integer|null $height      New height.
+     */
+    public function __construct(
+        int $cellId,
+        int $dashboardId=0,
+        int $widgetId=0,
+        ?int $width=0,
+        ?int $height=0
+    ) {
+        global $config;
+
+        // Includes.
+        // WARNING: Do not edit. This chunk must be in the constructor.
+        parent::__construct(
+            $cellId,
+            $dashboardId,
+            $widgetId
+        );
+
+        // Width.
+        $this->width = $width;
+
+        // Height.
+        $this->height = $height;
+
+        // Cell Id.
+        $this->cellId = $cellId;
+
+        // Widget ID.
+        $this->widgetId = $widgetId;
+
+        // Dashboard ID.
+        $this->dashboardId = $dashboardId;
+
+        // Options.
+        $this->values = $this->decoders($this->getOptionsWidget());
+
+        // Page.
+        $this->page = basename(__FILE__);
+
+        // ClassName.
+        $class = new \ReflectionClass($this);
+        $this->className = $class->getShortName();
+
+        // Title.
+        $this->title = __('Heatmap');
+
+        // Name.
+        if (empty($this->name) === true) {
+            $this->name = 'heatmap';
+        }
+    }
+
+
+    /**
+     * Decoders hack for retrocompability.
+     *
+     * @param array $decoder Values.
+     *
+     * @return array Returns the values ​​with the correct key.
+     */
+    public function decoders(array $decoder): array
+    {
+        $values = [];
+        // Retrieve global - common inputs.
+        $values = parent::decoders($decoder);
+
+        return $values;
+    }
+
+
+    /**
+     * Generates inputs for form (specific).
+     *
+     * @return array Of inputs.
+     *
+     * @throws Exception On error.
+     */
+    public function getFormInputs(): array
+    {
+        // Retrieve global - common inputs.
+        $inputs = parent::getFormInputs();
+
+        return $inputs;
+    }
+
+
+    /**
+     * Get Post for widget.
+     *
+     * @return array
+     */
+    public function getPost(): array
+    {
+        // Retrieve global - common inputs.
+        $values = parent::getPost();
+
+        return $values;
+    }
+
+
+    /**
+     * Get description.
+     *
+     * @return string.
+     */
+    public static function getDescription()
+    {
+        return __('Heatmap');
+    }
+
+
+    /**
+     * Get Name.
+     *
+     * @return string.
+     */
+    public static function getName()
+    {
+        return 'heatmap';
+    }
+
+
+    /**
+     * Get size Modal Configuration.
+     *
+     * @return array
+     */
+    public function getSizeModalConfiguration(): array
+    {
+        $size = [
+            'width'  => 400,
+            'height' => 205,
+        ];
+
+        return $size;
+    }
+
+
+    /**
+     * Draw widget.
+     *
+     * @return string;
+     */
+    public function load()
+    {
+        global $config;
+
+        \ui_require_css_file('heatmap', 'include/styles/', true);
+
+        $values = $this->values;
+        hd($values, true);
+
+        // Control call flow.
+        $heatmap = new Heatmap(0, [], null, 300, 400, 200, 0, 1);
+        // AJAX controller.
+        if (is_ajax() === true) {
+            $method = get_parameter('method');
+
+            if ($method === 'drawWidget') {
+                // Run.
+                $heatmap->run();
+            } else {
+                if (method_exists($heatmap, $method) === true) {
+                    if ($heatmap->ajaxMethod($method) === true) {
+                        $heatmap->{$method}();
+                    } else {
+                        echo 'Unavailable method';
+                    }
+                } else {
+                    echo 'Method not found';
+                }
+
+                // Stop any execution.
+                exit;
+            }
+        } else {
+            // Run.
+            $heatmap->run();
+
+            // Dialog.
+            echo '<div id="config_dialog" style="padding:15px" class="invisible"></div>';
+        }
+
+        return '';
+    }
+
+
+}

From fceddb13653f49e6590317b828f2357ae85efa76 Mon Sep 17 00:00:00 2001
From: Daniel Maya <daniel.maya@pandorafms.com>
Date: Sun, 26 Feb 2023 18:10:58 +0100
Subject: [PATCH 3/7] #8642 Added heatmap widget 3

---
 .../include/class/Heatmap.class.php           | 28 +++++++++++++------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/pandora_console/include/class/Heatmap.class.php b/pandora_console/include/class/Heatmap.class.php
index bab7f8fd85..ff017b0c24 100644
--- a/pandora_console/include/class/Heatmap.class.php
+++ b/pandora_console/include/class/Heatmap.class.php
@@ -97,18 +97,26 @@ class Heatmap
      */
     protected $group = null;
 
+    /**
+     * Heatmap group.
+     *
+     * @var boolean
+     */
+    protected $dashboard = null;
+
 
     /**
      * Constructor function
      *
-     * @param integer $type     Heatmap type.
-     * @param array   $filter   Heatmap filter.
-     * @param string  $randomId Heatmap random id.
-     * @param integer $refresh  Heatmap refresh.
-     * @param integer $width    Width.
-     * @param integer $height   Height.
-     * @param string  $search   Heatmap search.
-     * @param integer $group    Heatmap group.
+     * @param integer $type      Heatmap type.
+     * @param array   $filter    Heatmap filter.
+     * @param string  $randomId  Heatmap random id.
+     * @param integer $refresh   Heatmap refresh.
+     * @param integer $width     Width.
+     * @param integer $height    Height.
+     * @param string  $search    Heatmap search.
+     * @param integer $group     Heatmap group.
+     * @param boolean $dashboard Dashboard widget.
      */
     public function __construct(
         int $type=0,
@@ -118,7 +126,8 @@ class Heatmap
         int $width=0,
         int $height=0,
         string $search=null,
-        int $group=1
+        int $group=1,
+        bool $dashboard=false
     ) {
         $this->type = $type;
         $this->filter = $filter;
@@ -128,6 +137,7 @@ class Heatmap
         $this->height = $height;
         $this->search = $search;
         $this->group = $group;
+        $this->dashboard = $dashboard;
     }
 
 

From 62d1249fe084dddede68e2ebc45422afca6767f5 Mon Sep 17 00:00:00 2001
From: Daniel Maya <daniel.maya@pandorafms.com>
Date: Tue, 14 Mar 2023 12:47:10 +0100
Subject: [PATCH 4/7] #8642 Added heatmap widget 4

---
 pandora_console/images/widgets/heatmap.png    | Bin 0 -> 5155 bytes
 .../include/class/Heatmap.class.php           | 110 ++++++++++--
 .../include/javascript/pandora_dashboards.js  |  33 ++++
 .../include/lib/Dashboard/Widgets/heatmap.php | 170 +++++++++++++++++-
 pandora_console/operation/heatmap.php         |   5 +-
 5 files changed, 295 insertions(+), 23 deletions(-)
 create mode 100644 pandora_console/images/widgets/heatmap.png

diff --git a/pandora_console/images/widgets/heatmap.png b/pandora_console/images/widgets/heatmap.png
new file mode 100644
index 0000000000000000000000000000000000000000..413134613b5d68f89c89eeb2f661478f6e438298
GIT binary patch
literal 5155
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
RSy})9002ovPDHLkV1fwLx2pgE

literal 0
HcmV?d00001

diff --git a/pandora_console/include/class/Heatmap.class.php b/pandora_console/include/class/Heatmap.class.php
index ff017b0c24..f7375c2a5e 100644
--- a/pandora_console/include/class/Heatmap.class.php
+++ b/pandora_console/include/class/Heatmap.class.php
@@ -14,7 +14,7 @@
  * |___|   |___._|__|__|_____||_____|__| |___._| |___|   |__|_|__|_______|
  *
  * ============================================================================
- * Copyright (c) 2005-2022 Artica Soluciones Tecnologicas
+ * Copyright (c) 2005-2023 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
@@ -160,27 +160,40 @@ class Heatmap
                 false
             ),
             'data'     => [
-                'page'     => 'operation/heatmap',
-                'method'   => 'showHeatmap',
-                'randomId' => $this->randomId,
-                'type'     => $this->type,
-                'filter'   => $this->filter,
-                'refresh'  => $this->refresh,
-                'search'   => $this->search,
-                'group'    => $this->group,
+                'page'      => 'operation/heatmap',
+                'method'    => 'showHeatmap',
+                'randomId'  => $this->randomId,
+                'type'      => $this->type,
+                'filter'    => $this->filter,
+                'refresh'   => $this->refresh,
+                'search'    => $this->search,
+                'group'     => $this->group,
+                'dashboard' => (int) $this->dashboard,
             ],
         ];
 
-        echo '<div id="div_'.$this->randomId.'" class="mainDiv" style="width: 100%;height: 100%">';
+        $style_dashboard = '';
+        if ($this->dashboard === true) {
+            $style_dashboard = 'min-height: 0px';
+        }
+
+        echo '<div id="div_'.$this->randomId.'" class="mainDiv" style="width: 100%;height: 100%;'.$style_dashboard.'">';
         ?>
             <script type="text/javascript">
                 $(document).ready(function() {
                     const randomId = '<?php echo $this->randomId; ?>';
                     const refresh = '<?php echo $this->refresh; ?>';
+                    const dashboard = '<?php echo $this->dashboard; ?>';
+
                     let setting = <?php echo json_encode($settings); ?>;
                     setting['data']['height'] = $(`#div_${randomId}`).height() + 10;
                     setting['data']['width'] = $(`#div_${randomId}`).width();
 
+                    if (dashboard === '1') {
+                        setting['data']['width'] -= 10;
+                        setting['data']['height'] -= 10;
+                    }
+
                     var totalModules = 0;
 
                     // Initial charge.
@@ -209,11 +222,13 @@ class Heatmap
                         let target = $(`#${randomId}_${randomPoint}`);
                         setTimeout(function() {
                             let class_name = target.attr('class');
-                            class_name = class_name.split(' ')[0];
-                            const newClassName = class_name.split('_')[0];
-                            target.removeClass(`${class_name} hover`);
-                            target.addClass(`${newClassName}_${solid} hover`);
-                            oneSquare(getRandomInteger(1, 10), getRandomInteger(100, 900));
+                            if (typeof class_name !== 'undefined') {
+                                class_name = class_name.split(' ')[0];
+                                const newClassName = class_name.split('_')[0];
+                                target.removeClass(`${class_name} hover`);
+                                target.addClass(`${newClassName}_${solid} hover`);
+                                oneSquare(getRandomInteger(1, 10), getRandomInteger(100, 900));
+                            }
                         }, time);
                     }
 
@@ -348,6 +363,8 @@ class Heatmap
      */
     protected function getAllAgents()
     {
+        global $config;
+
         $filter['disabled'] = 0;
 
         $alias = '';
@@ -355,6 +372,14 @@ class Heatmap
             $alias = ' AND alias LIKE "%'.$this->search.'%"';
         }
 
+        $id_user_groups = '';
+        if (users_is_admin() === false) {
+            $user_groups = array_keys(users_get_groups($config['user'], 'AR', false));
+            if (empty($user_groups) === false) {
+                $id_user_groups = ' AND id_grupo IN ('.implode(',', $user_groups).')';
+            }
+        }
+
         $id_grupo = '';
         if (empty($this->filter) === false && current($this->filter) != 0) {
             $id_grupo = ' AND id_grupo IN ('.implode(',', $this->filter).')';
@@ -366,8 +391,9 @@ class Heatmap
             unknown_count,notinit_count,total_count,fired_count,
             (SELECT last_status_change FROM tagente_estado WHERE id_agente = tagente.id_agente
             ORDER BY last_status_change DESC LIMIT 1) AS last_status_change
-            FROM tagente WHERE `disabled` = 0 %s %s ORDER BY id_grupo,id_agente ASC',
+            FROM tagente WHERE `disabled` = 0 %s %s %s ORDER BY id_grupo,id_agente ASC',
             $alias,
+            $id_user_groups,
             $id_grupo
         );
 
@@ -429,6 +455,8 @@ class Heatmap
      */
     protected function getAllModulesByGroup()
     {
+        global $config;
+
         $filter_group = '';
         if (empty($this->filter) === false && current($this->filter) != -1) {
             $filter_group = 'AND am.id_module_group IN ('.implode(',', $this->filter).')';
@@ -439,12 +467,26 @@ class Heatmap
             $filter_name = 'AND nombre LIKE "%'.$this->search.'%"';
         }
 
+        $id_user_groups = '';
+        if (users_is_admin() === false) {
+            $user_groups = array_keys(users_get_groups($config['user'], 'AR', false));
+            if (empty($user_groups) === false) {
+                $id_user_groups = sprintf(
+                    'INNER JOIN tagente a ON a.id_agente = ae.id_agente
+                    AND a.id_grupo IN (%s)',
+                    implode(',', $user_groups)
+                );
+            }
+        }
+
         // All modules.
         $sql = sprintf(
             'SELECT am.id_agente_modulo AS id, ae.estado AS `status`, am.id_module_group AS id_grupo,
             ae.last_status_change FROM tagente_modulo am
             INNER JOIN tagente_estado ae ON am.id_agente_modulo = ae.id_agente_modulo
+            %s
             WHERE am.disabled = 0 %s %s GROUP BY am.id_module_group, am.id_agente_modulo',
+            $id_user_groups,
             $filter_group,
             $filter_name
         );
@@ -527,6 +569,8 @@ class Heatmap
      */
     protected function getAllModulesByTag()
     {
+        global $config;
+
         $filter_tag = '';
         if (empty($this->filter) === false && $this->filter[0] !== '0') {
             $tags = implode(',', $this->filter);
@@ -538,12 +582,26 @@ class Heatmap
             $filter_name = 'AND nombre LIKE "%'.$this->search.'%"';
         }
 
+        $id_user_groups = '';
+        if (users_is_admin() === false) {
+            $user_groups = array_keys(users_get_groups($config['user'], 'AR', false));
+            if (empty($user_groups) === false) {
+                $id_user_groups = sprintf(
+                    'INNER JOIN tagente a ON a.id_agente = ae.id_agente
+                    AND a.id_grupo IN (%s)',
+                    implode(',', $user_groups)
+                );
+            }
+        }
+
         // All modules.
         $sql = sprintf(
             'SELECT ae.id_agente_modulo AS id, ae.estado AS `status`, tm.id_tag AS id_grupo,
             ae.last_status_change FROM tagente_estado ae
+            %s
             INNER JOIN ttag_module tm ON tm.id_agente_modulo = ae.id_agente_modulo
             WHERE 1=1 %s %s GROUP BY tm.id_tag, ae.id_agente_modulo',
+            $id_user_groups,
             $filter_tag,
             $filter_name
         );
@@ -626,17 +684,33 @@ class Heatmap
      */
     protected function getAllModulesByAgents()
     {
+        global $config;
+
         $filter_name = '';
         if (empty($this->search) === false) {
             $filter_name = 'AND nombre LIKE "%'.$this->search.'%"';
         }
 
+        $id_user_groups = '';
+        if (users_is_admin() === false) {
+            $user_groups = array_keys(users_get_groups($config['user'], 'AR', false));
+            if (empty($user_groups) === false) {
+                $id_user_groups = sprintf(
+                    'INNER JOIN tagente a ON a.id_agente = ae.id_agente
+                    AND a.id_grupo IN (%s)',
+                    implode(',', $user_groups)
+                );
+            }
+        }
+
         // All modules.
         $sql = sprintf(
             'SELECT am.id_agente_modulo AS id, ae.estado AS `status`, am.id_agente AS id_grupo,
             ae.last_status_change FROM tagente_modulo am
             INNER JOIN tagente_estado ae ON am.id_agente_modulo = ae.id_agente_modulo
+            %s
             WHERE am.disabled = 0 %s GROUP BY ae.id_agente_modulo ORDER BY id_grupo',
+            $id_user_groups,
             $filter_name
         );
 
@@ -912,7 +986,7 @@ class Heatmap
                 });
             </script>
         <?php
-        if (count($groups) > 1 && $this->group === 1) {
+        if (count($groups) > 1 && $this->group === 1 && $this->dashboard === false) {
             $x_back = 0;
             $y_back = 0;
 
@@ -1111,7 +1185,7 @@ class Heatmap
         echo '</svg>';
 
         // Dialog.
-        echo '<div id="info_dialog" style="padding:15px" class="invisible"></div>';
+        echo '<div id="info_dialog"></div>';
     }
 
 
diff --git a/pandora_console/include/javascript/pandora_dashboards.js b/pandora_console/include/javascript/pandora_dashboards.js
index 7ffafd974f..3347ff0323 100644
--- a/pandora_console/include/javascript/pandora_dashboards.js
+++ b/pandora_console/include/javascript/pandora_dashboards.js
@@ -1560,3 +1560,36 @@ function showManualThresholds(element) {
     $(".dashboard-input-threshold-critical").addClass("invisible_important");
   }
 }
+
+/**
+ * @return {void}
+ */
+// eslint-disable-next-line no-unused-vars
+function type_change() {
+  var type = document.getElementById("type").value;
+
+  switch (type) {
+    case "3":
+      $("#li_tags").hide();
+      $("#li_groups").hide();
+      $("#li_module_groups").hide();
+      break;
+    case "2":
+      $("#li_tags").hide();
+      $("#li_groups").hide();
+      $("#li_module_groups").show();
+      break;
+    case "1":
+      $("#li_tags").show();
+      $("#li_groups").hide();
+      $("#li_module_groups").hide();
+      break;
+
+    default:
+    case "0":
+      $("#li_tags").hide();
+      $("#li_groups").show();
+      $("#li_module_groups").hide();
+      break;
+  }
+}
diff --git a/pandora_console/include/lib/Dashboard/Widgets/heatmap.php b/pandora_console/include/lib/Dashboard/Widgets/heatmap.php
index c10c7c1f27..2f9d9533cd 100644
--- a/pandora_console/include/lib/Dashboard/Widgets/heatmap.php
+++ b/pandora_console/include/lib/Dashboard/Widgets/heatmap.php
@@ -192,6 +192,26 @@ class HeatmapWidget extends Widget
         // Retrieve global - common inputs.
         $values = parent::decoders($decoder);
 
+        if (isset($decoder['search']) === true) {
+            $values['search'] = $decoder['search'];
+        }
+
+        if (isset($decoder['type']) === true) {
+            $values['type'] = $decoder['type'];
+        }
+
+        if (isset($decoder['groups']) === true) {
+            $values['groups'] = $decoder['groups'];
+        }
+
+        if (isset($decoder['tags']) === true) {
+            $values['tags'] = $decoder['tags'];
+        }
+
+        if (isset($decoder['module_groups']) === true) {
+            $values['module_groups'] = $decoder['module_groups'];
+        }
+
         return $values;
     }
 
@@ -205,9 +225,117 @@ class HeatmapWidget extends Widget
      */
     public function getFormInputs(): array
     {
+        global $config;
         // Retrieve global - common inputs.
         $inputs = parent::getFormInputs();
 
+        $values = $this->values;
+
+        // Search.
+        $inputs[] = [
+            'label'     => \__('Search'),
+            'arguments' => [
+                'name'   => 'search',
+                'type'   => 'text',
+                'class'  => 'event-widget-input',
+                'value'  => $values['search'],
+                'return' => true,
+                'size'   => 30,
+            ],
+        ];
+
+        $inputs[] = [
+            'label'     => __('Type'),
+            'arguments' => [
+                'type'     => 'select',
+                'fields'   => [
+                    0 => __('Group agents'),
+                    1 => __('Group modules by tag'),
+                    2 => __('Group modules by module group'),
+                    3 => __('Group modules by agents'),
+                ],
+                'name'     => 'type',
+                'selected' => $values['type'],
+                'script'   => 'type_change()',
+                'return'   => true,
+            ],
+        ];
+
+        // Filters.
+        $inputs[] = [
+            'label'     => __('Groups'),
+            'style'     => ($values['type'] === '0') ? '' : 'display:none',
+            'id'        => 'li_groups',
+            'arguments' => [
+                'type'           => 'select_groups',
+                'name'           => 'groups[]',
+                'returnAllGroup' => true,
+                'privilege'      => 'AR',
+                'selected'       => explode(',', $values['groups'][0]),
+                'return'         => true,
+                'multiple'       => true,
+            ],
+        ];
+
+        if (tags_has_user_acl_tags($config['id_user']) === false) {
+            $tags = db_get_all_rows_sql(
+                'SELECT id_tag, name FROM ttag WHERE id_tag ORDER BY name'
+            );
+        } else {
+            $user_tags = tags_get_user_tags($config['id_user'], 'AR');
+            if (empty($user_tags) === false) {
+                $id_user_tags = array_keys($user_tags);
+                $tags = db_get_all_rows_sql(
+                    'SELECT id_tag, name FROM ttag
+                    WHERE id_tag IN ('.implode(',', $id_user_tags).')
+                    ORDER BY name'
+                );
+            } else {
+                $tags = db_get_all_rows_sql(
+                    'SELECT id_tag, name FROM ttag WHERE id_tag ORDER BY name'
+                );
+            }
+        }
+
+        $inputs[] = [
+            'label'     => __('Tag'),
+            'style'     => ($values['type'] === '1') ? '' : 'display:none',
+            'id'        => 'li_tags',
+            'arguments' => [
+                'type'     => 'select',
+                'fields'   => $tags,
+                'name'     => 'tags[]',
+                'selected' => explode(',', $values['tags'][0]),
+                'return'   => true,
+                'multiple' => true,
+            ],
+        ];
+
+        $module_groups_aux = db_get_all_rows_sql(
+            'SELECT id_mg, name FROM tmodule_group ORDER BY name'
+        );
+
+        $module_groups = [];
+        foreach ($module_groups_aux as $key => $module_group) {
+            $module_groups[$module_group['id_mg']] = $module_group['name'];
+        }
+
+        $inputs[] = [
+            'label'     => __('Module group'),
+            'style'     => ($values['type'] === '2') ? '' : 'display:none',
+            'id'        => 'li_module_groups',
+            'arguments' => [
+                'type'          => 'select',
+                'fields'        => $module_groups,
+                'name'          => 'module_groups[]',
+                'selected'      => explode(',', $values['module_groups'][0]),
+                'return'        => true,
+                'multiple'      => true,
+                'nothing'       => __('Not assigned'),
+                'nothing_value' => 0,
+            ],
+        ];
+
         return $inputs;
     }
 
@@ -222,6 +350,27 @@ class HeatmapWidget extends Widget
         // Retrieve global - common inputs.
         $values = parent::getPost();
 
+        $values['search'] = \get_parameter('search', '');
+        $values['type'] = \get_parameter('type', 0);
+
+        switch ((int) $values['type']) {
+            case 2:
+                $values['module_groups'] = \get_parameter('module_groups', 0);
+            break;
+
+            case 1:
+                $values['tags'] = \get_parameter('tags', 0);
+            break;
+
+            case 0:
+                $values['groups'] = \get_parameter('groups', 0);
+            break;
+
+            default:
+                // Do nothing.
+            break;
+        }
+
         return $values;
     }
 
@@ -256,8 +405,8 @@ class HeatmapWidget extends Widget
     public function getSizeModalConfiguration(): array
     {
         $size = [
-            'width'  => 400,
-            'height' => 205,
+            'width'  => 500,
+            'height' => 300,
         ];
 
         return $size;
@@ -276,10 +425,23 @@ class HeatmapWidget extends Widget
         \ui_require_css_file('heatmap', 'include/styles/', true);
 
         $values = $this->values;
-        hd($values, true);
+        $search = (empty($values['search']) === false) ? $values['search'] : '';
+        $type = (empty($values['type']) === false) ? $values['type'] : 0;
+        $filter = [];
+        if (isset($values['groups'])) {
+            $filter = explode(',', $values['groups'][0]);
+        }
+
+        if (isset($values['tags'])) {
+            $filter = explode(',', $values['tags'][0]);
+        }
+
+        if (isset($values['module_groups'])) {
+            $filter = explode(',', $values['module_groups'][0]);
+        }
 
         // Control call flow.
-        $heatmap = new Heatmap(0, [], null, 300, 400, 200, 0, 1);
+        $heatmap = new Heatmap($type, $filter, null, 300, 400, 200, $search, 0, true);
         // AJAX controller.
         if (is_ajax() === true) {
             $method = get_parameter('method');
diff --git a/pandora_console/operation/heatmap.php b/pandora_console/operation/heatmap.php
index a53eebd698..1e063d3c3d 100644
--- a/pandora_console/operation/heatmap.php
+++ b/pandora_console/operation/heatmap.php
@@ -62,6 +62,8 @@ if ($group_sent === true) {
     $group = (int) get_parameter('group', true);
 }
 
+$dashboard = (bool) get_parameter('dashboard', false);
+
 $is_ajax = is_ajax();
 if ($is_ajax === false && $pure === false) {
     $viewtab['config'] = '<a id="config" href="">'.html_print_image(
@@ -192,6 +194,7 @@ if ($is_ajax === false && $pure === true) {
     html_print_input_hidden('type', $type);
     html_print_input_hidden('search', $search);
     html_print_input_hidden('filter', implode(',', $filter));
+    html_print_input_hidden('dashboard', $dashboard);
     echo '</form>';
     echo '</div>';
     echo '</div>';
@@ -230,7 +233,7 @@ if ($is_ajax === false && $pure === true) {
 // Control call flow.
 try {
     // Heatmap construct.
-    $heatmap = new Heatmap($type, $filter, $randomId, $refresh, $width, $height, $search, $group);
+    $heatmap = new Heatmap($type, $filter, $randomId, $refresh, $width, $height, $search, $group, $dashboard);
 } catch (Exception $e) {
     if (is_ajax() === true) {
         echo json_encode(['error' => '[Heatmap]'.$e->getMessage() ]);

From a7a283fe2275326b54848974d7c9f6aba9512cb0 Mon Sep 17 00:00:00 2001
From: Daniel Maya <daniel.maya@pandorafms.com>
Date: Tue, 14 Mar 2023 12:52:44 +0100
Subject: [PATCH 5/7] #8642 Fixed heatmap widget

---
 pandora_console/include/class/Heatmap.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pandora_console/include/class/Heatmap.class.php b/pandora_console/include/class/Heatmap.class.php
index f7375c2a5e..c440fcfecc 100644
--- a/pandora_console/include/class/Heatmap.class.php
+++ b/pandora_console/include/class/Heatmap.class.php
@@ -381,7 +381,7 @@ class Heatmap
         }
 
         $id_grupo = '';
-        if (empty($this->filter) === false && current($this->filter) != 0) {
+        if (empty($this->filter) === false && empty(current($this->filter)) === false) {
             $id_grupo = ' AND id_grupo IN ('.implode(',', $this->filter).')';
         }
 

From feff8668be741eee62a94b031f90f0defaf3a538 Mon Sep 17 00:00:00 2001
From: Daniel Maya <daniel.maya@pandorafms.com>
Date: Tue, 14 Mar 2023 16:49:12 +0100
Subject: [PATCH 6/7] #8642 added img

---
 pandora_console/images/widgets/heatmap.png | Bin 5155 -> 5436 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/pandora_console/images/widgets/heatmap.png b/pandora_console/images/widgets/heatmap.png
index 413134613b5d68f89c89eeb2f661478f6e438298..f16f8eb9927d60fc3da4ae07f9584d4212cf0047 100644
GIT binary patch
literal 5436
zcmaJ_by$;o`==QQ1L>4eiUQjJiP12+J4GC9l4Em>E*Yf=f*_&7knUELk`w_!lyD$Y
zf^<lSiZ7n`ob#SPe&_dG*YkYix<8*g|9I~Eu9=B0BRvm285tR)zMhuF+3NQD1<;&*
z`8BQ`pDo;YZ9BXr<|aM>fkTmLATcf|kUkpWhO$5*kU_WlP|9Rvl)@fXc6d8uBSlvX
z8jScY0}e!E&(LIK%4&gFgsT?{4{|}ddHARZZ8f(Efjp2ZLbkHTP-83{<?f*uj6+!l
zn^?I9d%41pLTaiY<v_(V0yGMb00pAGeS8%IRfPWFRXp4OzJ>^a{t&@?sR;eoC_7^_
z5FCR;f#kqYNmnRT8YB+`OUYfmDhHJSNkgTf5U4CfN?KA%P7!)lQA!^4=Oc8c4Trp`
zXrZO^r>?V;ijX@Vk5z;~0s;cS0Wx3=&J7|3gTWwBX^6D6<e7w|Z;%fj5h&^7EBqIO
z7RuKZ=Yhq0V0=Ko84)fRKfH?2nWg`A0ge5e*2nkHFr5Vq5{SS;q`=VMF8w8FZ2bR=
zqS1d#`{FH7|Fif1B=)rm!lED+C|`^p&h;#DH-&$z!YaaXC<GpZv%+A!|B9lSI|h&O
zb;n>q(o$e)keIE94-ymLd-)H5v9Y4Qk1rnK<BHPPQV}|%0DE{K6}4nF<Y78+O}MnY
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
LCR$aRHwga$X}--D

literal 5155
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
RSy})9002ovPDHLkV1fwLx2pgE


From e311c81f845f210e4bc64a56d1cbf29aee4911d2 Mon Sep 17 00:00:00 2001
From: Daniel Maya <daniel.maya@pandorafms.com>
Date: Fri, 24 Mar 2023 14:11:08 +0100
Subject: [PATCH 7/7] #8642 Fixed meta

---
 pandora_console/include/ajax/heatmap.ajax.php |   12 +
 .../include/class/Heatmap.class.php           | 1008 +++++++++++------
 2 files changed, 684 insertions(+), 336 deletions(-)

diff --git a/pandora_console/include/ajax/heatmap.ajax.php b/pandora_console/include/ajax/heatmap.ajax.php
index abfcd39e45..dd22fcdfef 100644
--- a/pandora_console/include/ajax/heatmap.ajax.php
+++ b/pandora_console/include/ajax/heatmap.ajax.php
@@ -26,6 +26,8 @@
  * ============================================================================
  */
 
+use PandoraFMS\Enterprise\Metaconsole\Node;
+
 if (is_ajax() === true) {
     global $config;
 
@@ -216,6 +218,12 @@ if (is_ajax() === true) {
     if ($getInfo === true) {
         enterprise_include_once('include/functions_agents.php');
         $id = get_parameter('id', 0);
+        $id_server = get_parameter('id_server', 0);
+        if (empty($id_server) === false) {
+            $nd = new Node($id_server);
+            $nd->connect();
+        }
+
         switch ($type) {
             case 3:
             case 2:
@@ -375,6 +383,10 @@ if (is_ajax() === true) {
                 }
             break;
         }
+
+        if (empty($id_server) === false) {
+            $nd->disconnect();
+        }
     }
 
     return;
diff --git a/pandora_console/include/class/Heatmap.class.php b/pandora_console/include/class/Heatmap.class.php
index c440fcfecc..de3ef90ba3 100644
--- a/pandora_console/include/class/Heatmap.class.php
+++ b/pandora_console/include/class/Heatmap.class.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Heatmap class.
  *
@@ -27,6 +28,9 @@
  */
 
 namespace PandoraFMS;
+
+use PandoraFMS\Enterprise\Metaconsole\Node;
+
 class Heatmap
 {
 
@@ -179,103 +183,106 @@ class Heatmap
 
         echo '<div id="div_'.$this->randomId.'" class="mainDiv" style="width: 100%;height: 100%;'.$style_dashboard.'">';
         ?>
-            <script type="text/javascript">
-                $(document).ready(function() {
-                    const randomId = '<?php echo $this->randomId; ?>';
-                    const refresh = '<?php echo $this->refresh; ?>';
-                    const dashboard = '<?php echo $this->dashboard; ?>';
+        <script type="text/javascript">
+            $(document).ready(function() {
+                const randomId = '<?php echo $this->randomId; ?>';
+                const refresh = '<?php echo $this->refresh; ?>';
+                const dashboard = '<?php echo $this->dashboard; ?>';
 
-                    let setting = <?php echo json_encode($settings); ?>;
-                    setting['data']['height'] = $(`#div_${randomId}`).height() + 10;
-                    setting['data']['width'] = $(`#div_${randomId}`).width();
+                let setting = <?php echo json_encode($settings); ?>;
+                setting['data']['height'] = $(`#div_${randomId}`).height() + 10;
+                setting['data']['width'] = $(`#div_${randomId}`).width();
 
-                    if (dashboard === '1') {
-                        setting['data']['width'] -= 10;
-                        setting['data']['height'] -= 10;
-                    }
+                if (dashboard === '1') {
+                    setting['data']['width'] -= 10;
+                    setting['data']['height'] -= 10;
+                }
 
-                    var totalModules = 0;
+                var totalModules = 0;
 
-                    // Initial charge.
-                    $.ajax({
-                        type: setting.type,
-                        dataType: setting.dataType,
-                        url: setting.url,
-                        data: setting.data,
-                        success: function(data) {
-                            $(`#div_${randomId}`).append(data);
-                            totalModules = $('rect').length;
-                            let cont = 0;
-                            while (cont < Math.ceil(totalModules / 10)) {
-                                oneSquare(getRandomInteger(1, 10), getRandomInteger(100, 900));
-                                cont ++;
-                            }
+                // Initial charge.
+                $.ajax({
+                    type: setting.type,
+                    dataType: setting.dataType,
+                    url: setting.url,
+                    data: setting.data,
+                    success: function(data) {
+                        $(`#div_${randomId}`).append(data);
+                        totalModules = $('rect').length;
+                        let cont = 0;
+                        while (cont < Math.ceil(totalModules / 10)) {
+                            oneSquare(getRandomInteger(1, 10), getRandomInteger(100, 900));
+                            cont++;
                         }
-                    });
-
-                    function getRandomInteger(min, max) {
-                        return Math.floor(Math.random() * max) + min;
                     }
+                });
 
-                    function oneSquare(solid, time) {
-                        var randomPoint = getRandomInteger(1, totalModules);
-                        let target = $(`#${randomId}_${randomPoint}`);
-                        setTimeout(function() {
-                            let class_name = target.attr('class');
-                            if (typeof class_name !== 'undefined') {
-                                class_name = class_name.split(' ')[0];
-                                const newClassName = class_name.split('_')[0];
-                                target.removeClass(`${class_name} hover`);
-                                target.addClass(`${newClassName}_${solid} hover`);
-                                oneSquare(getRandomInteger(1, 10), getRandomInteger(100, 900));
-                            }
-                        }, time);
-                    }
+                function getRandomInteger(min, max) {
+                    return Math.floor(Math.random() * max) + min;
+                }
 
-                    // Refresh.
-                    setInterval(
-                        function() {
-                            refreshMap();
+                function oneSquare(solid, time) {
+                    var randomPoint = getRandomInteger(1, totalModules);
+                    let target = $(`#${randomId}_${randomPoint}`);
+                    setTimeout(function() {
+                        let class_name = target.attr('class');
+                        if (typeof class_name !== 'undefined') {
+                            class_name = class_name.split(' ')[0];
+                            const newClassName = class_name.split('_')[0];
+                            target.removeClass(`${class_name} hover`);
+                            target.addClass(`${newClassName}_${solid} hover`);
+                            oneSquare(getRandomInteger(1, 10), getRandomInteger(100, 900));
+                        }
+                    }, time);
+                }
+
+                // Refresh.
+                setInterval(
+                    function() {
+                        refreshMap();
+                    },
+                    (refresh * 1000)
+                );
+
+                function refreshMap() {
+                    $.ajax({
+                        type: 'GET',
+                        url: '<?php echo ui_get_full_url('ajax.php', false, false, false); ?>',
+                        data: {
+                            page: "operation/heatmap",
+                            method: 'getDataJson',
+                            randomId: randomId,
+                            type: setting['data']['type'],
+                            refresh: setting['data']['refresh'],
+                            filter: setting['data']['filter'],
+                            search: setting['data']['search'],
+                            group: setting['data']['group']
                         },
-                        (refresh * 1000)
-                    );
+                        dataType: 'json',
+                        success: function(data) {
+                            const total = Object.keys(data).length;
+                            if (total === $(`#svg_${randomId} rect`).length) {
+                                // Object to array.
+                                let lista = Object.values(data);
+                                // randomly sort.
+                                lista = lista.sort(function() {
+                                    return Math.random() - 0.5
+                                });
 
-                    function refreshMap() {
-                        $.ajax({
-                            type: 'GET',
-                            url: '<?php echo ui_get_full_url('ajax.php', false, false, false); ?>',
-                            data: {
-                                page: "operation/heatmap",
-                                method: 'getDataJson',
-                                randomId: randomId,
-                                type: setting['data']['type'],
-                                refresh: setting['data']['refresh'],
-                                filter: setting['data']['filter'],
-                                search: setting['data']['search'],
-                                group: setting['data']['group']
-                            },
-                            dataType: 'json',
-                            success: function(data) {
-                                const total = Object.keys(data).length;
-                                if (total === $(`#svg_${randomId} rect`).length) {
-                                    // Object to array.
-                                    let lista = Object.values(data);
-                                    // randomly sort.
-                                    lista = lista.sort(function() {return Math.random() - 0.5});
+                                let countPerSecond = total / refresh;
+                                if (countPerSecond < 1) {
+                                    countPerSecond = 1;
+                                }
 
-                                    let countPerSecond = total / refresh;
-                                    if (countPerSecond < 1) {
-                                        countPerSecond = 1;
-                                    }
+                                let cont = 0;
+                                let limit = countPerSecond - 1;
 
-                                    let cont = 0;
-                                    let limit = countPerSecond - 1;
-
-                                    const timer = setInterval(
+                                const timer = setInterval(
                                     function() {
                                         while (cont <= limit) {
                                             if (typeof lista[cont] !== 'undefined') {
                                                 const rect = document.getElementsByName(`${lista[cont]['id']}`);
+                                                console.log(rect[0]);
                                                 $(`#${rect[0].id}`).removeClass();
                                                 $(`#${rect[0].id}`).addClass(`${lista[cont]['status']} hover`);
                                             }
@@ -287,20 +294,20 @@ class Heatmap
                                     1000
                                 );
 
-                                    setTimeout(
-                                        function(){
-                                            clearInterval(timer);
-                                        },
-                                        (refresh * 1000)
-                                    );
-                                } else {
-                                    location.reload();
-                                }
+                                setTimeout(
+                                    function() {
+                                        clearInterval(timer);
+                                    },
+                                    (refresh * 1000)
+                                );
+                            } else {
+                                location.reload();
                             }
-                        });
-                    }
-                });
-            </script>
+                        }
+                    });
+                }
+            });
+        </script>
         <?php
         echo '</div>';
     }
@@ -397,51 +404,115 @@ class Heatmap
             $id_grupo
         );
 
-        $result = db_get_all_rows_sql($sql);
-
         $agents = [];
-        // Agent status.
-        foreach ($result as $key => $agent) {
-            if ($agent['total_count'] === 0 || $agent['total_count'] === $agent['notinit_count']) {
-                $status = 'notinit';
-            } else if ($agent['critical_count'] > 0) {
-                $status = 'critical';
-            } else if ($agent['warning_count'] > 0) {
-                $status = 'warning';
-            } else if ($agent['unknown_count'] > 0) {
-                $status = 'unknown';
-            } else {
-                $status = 'normal';
-            }
+        if (is_metaconsole() === true) {
+            $nodes = metaconsole_get_connections();
+            $cont = 0;
+            foreach ($nodes as $node) {
+                try {
+                    $nd = new Node($node['id']);
+                    $nd->connect();
 
-            if ($agent['last_status_change'] != 0) {
-                $seconds = (time() - $agent['last_status_change']);
+                    $result = db_get_all_rows_sql($sql);
+                    // Agent status.
+                    foreach ($result as $agent) {
+                        if ($agent['total_count'] === 0 || $agent['total_count'] === $agent['notinit_count']) {
+                            $status = 'notinit';
+                        } else if ($agent['critical_count'] > 0) {
+                            $status = 'critical';
+                        } else if ($agent['warning_count'] > 0) {
+                            $status = 'warning';
+                        } else if ($agent['unknown_count'] > 0) {
+                            $status = 'unknown';
+                        } else {
+                            $status = 'normal';
+                        }
 
-                if ($seconds >= SECONDS_1DAY) {
-                    $status .= '_10';
-                } else if ($seconds >= 77760) {
-                    $status .= '_9';
-                } else if ($seconds >= 69120) {
-                    $status .= '_8';
-                } else if ($seconds >= 60480) {
-                    $status .= '_7';
-                } else if ($seconds >= 51840) {
-                    $status .= '_6';
-                } else if ($seconds >= 43200) {
-                    $status .= '_5';
-                } else if ($seconds >= 34560) {
-                    $status .= '_4';
-                } else if ($seconds >= 25920) {
-                    $status .= '_3';
-                } else if ($seconds >= 17280) {
-                    $status .= '_2';
-                } else if ($seconds >= 8640) {
-                    $status .= '_1';
+                        if ($agent['last_status_change'] != 0) {
+                            $seconds = (time() - $agent['last_status_change']);
+
+                            if ($seconds >= SECONDS_1DAY) {
+                                $status .= '_10';
+                            } else if ($seconds >= 77760) {
+                                $status .= '_9';
+                            } else if ($seconds >= 69120) {
+                                $status .= '_8';
+                            } else if ($seconds >= 60480) {
+                                $status .= '_7';
+                            } else if ($seconds >= 51840) {
+                                $status .= '_6';
+                            } else if ($seconds >= 43200) {
+                                $status .= '_5';
+                            } else if ($seconds >= 34560) {
+                                $status .= '_4';
+                            } else if ($seconds >= 25920) {
+                                $status .= '_3';
+                            } else if ($seconds >= 17280) {
+                                $status .= '_2';
+                            } else if ($seconds >= 8640) {
+                                $status .= '_1';
+                            }
+                        }
+
+                        $agents[$cont] = $agent;
+                        $agents[$cont]['status'] = $status;
+                        $agents[$cont]['server'] = $node['id'];
+
+                        ++$cont;
+                    }
+                } catch (\Exception $e) {
+                    $nd->disconnect();
+                    $agents = [];
+                } finally {
+                    $nd->disconnect();
                 }
             }
+        } else {
+            $result = db_get_all_rows_sql($sql);
 
-            $agents[$key] = $agent;
-            $agents[$key]['status'] = $status;
+            // Agent status.
+            foreach ($result as $key => $agent) {
+                if ($agent['total_count'] === 0 || $agent['total_count'] === $agent['notinit_count']) {
+                    $status = 'notinit';
+                } else if ($agent['critical_count'] > 0) {
+                    $status = 'critical';
+                } else if ($agent['warning_count'] > 0) {
+                    $status = 'warning';
+                } else if ($agent['unknown_count'] > 0) {
+                    $status = 'unknown';
+                } else {
+                    $status = 'normal';
+                }
+
+                if ($agent['last_status_change'] != 0) {
+                    $seconds = (time() - $agent['last_status_change']);
+
+                    if ($seconds >= SECONDS_1DAY) {
+                        $status .= '_10';
+                    } else if ($seconds >= 77760) {
+                        $status .= '_9';
+                    } else if ($seconds >= 69120) {
+                        $status .= '_8';
+                    } else if ($seconds >= 60480) {
+                        $status .= '_7';
+                    } else if ($seconds >= 51840) {
+                        $status .= '_6';
+                    } else if ($seconds >= 43200) {
+                        $status .= '_5';
+                    } else if ($seconds >= 34560) {
+                        $status .= '_4';
+                    } else if ($seconds >= 25920) {
+                        $status .= '_3';
+                    } else if ($seconds >= 17280) {
+                        $status .= '_2';
+                    } else if ($seconds >= 8640) {
+                        $status .= '_1';
+                    }
+                }
+
+                $agents[$key] = $agent;
+                $agents[$key]['status'] = $status;
+            }
         }
 
         return $agents;
@@ -491,71 +562,157 @@ class Heatmap
             $filter_name
         );
 
-        $result = db_get_all_rows_sql($sql);
+        if (is_metaconsole() === true) {
+            $nodes = metaconsole_get_connections();
+            $cont = 0;
+            $result = [];
+            foreach ($nodes as $node) {
+                try {
+                    $nd = new Node($node['id']);
+                    $nd->connect();
 
-        // Module status.
-        foreach ($result as $key => $module) {
-            $status = '';
-            switch ($module['status']) {
-                case AGENT_MODULE_STATUS_CRITICAL_BAD:
-                case AGENT_MODULE_STATUS_CRITICAL_ALERT:
-                case 1:
-                case 100:
-                    $status = 'critical';
-                break;
+                    $modules = db_get_all_rows_sql($sql);
 
-                case AGENT_MODULE_STATUS_NORMAL:
-                case AGENT_MODULE_STATUS_NORMAL_ALERT:
-                case 0:
-                case 300:
-                    $status = 'normal';
-                break;
+                    // Module status.
+                    foreach ($modules as $key => $module) {
+                        $status = '';
+                        switch ($module['status']) {
+                            case AGENT_MODULE_STATUS_CRITICAL_BAD:
+                            case AGENT_MODULE_STATUS_CRITICAL_ALERT:
+                            case 1:
+                            case 100:
+                                $status = 'critical';
+                            break;
 
-                case AGENT_MODULE_STATUS_WARNING:
-                case AGENT_MODULE_STATUS_WARNING_ALERT:
-                case 2:
-                case 200:
-                    $status = 'warning';
-                break;
+                            case AGENT_MODULE_STATUS_NORMAL:
+                            case AGENT_MODULE_STATUS_NORMAL_ALERT:
+                            case 0:
+                            case 300:
+                                $status = 'normal';
+                            break;
 
-                default:
-                case AGENT_MODULE_STATUS_UNKNOWN:
-                case 3:
-                    $status = 'unknown';
-                break;
-                case AGENT_MODULE_STATUS_NOT_INIT:
-                case 5:
-                    $status = 'notinit';
-                break;
-            }
+                            case AGENT_MODULE_STATUS_WARNING:
+                            case AGENT_MODULE_STATUS_WARNING_ALERT:
+                            case 2:
+                            case 200:
+                                $status = 'warning';
+                            break;
 
-            if ($module['last_status_change'] != 0) {
-                $seconds = (time() - $module['last_status_change']);
+                            default:
+                            case AGENT_MODULE_STATUS_UNKNOWN:
+                            case 3:
+                                $status = 'unknown';
+                            break;
+                            case AGENT_MODULE_STATUS_NOT_INIT:
+                            case 5:
+                                $status = 'notinit';
+                            break;
+                        }
 
-                if ($seconds >= SECONDS_1DAY) {
-                    $status .= '_10';
-                } else if ($seconds >= 77760) {
-                    $status .= '_9';
-                } else if ($seconds >= 69120) {
-                    $status .= '_8';
-                } else if ($seconds >= 60480) {
-                    $status .= '_7';
-                } else if ($seconds >= 51840) {
-                    $status .= '_6';
-                } else if ($seconds >= 43200) {
-                    $status .= '_5';
-                } else if ($seconds >= 34560) {
-                    $status .= '_4';
-                } else if ($seconds >= 25920) {
-                    $status .= '_3';
-                } else if ($seconds >= 17280) {
-                    $status .= '_2';
-                } else if ($seconds >= 8640) {
-                    $status .= '_1';
+                        if ($module['last_status_change'] != 0) {
+                            $seconds = (time() - $module['last_status_change']);
+
+                            if ($seconds >= SECONDS_1DAY) {
+                                $status .= '_10';
+                            } else if ($seconds >= 77760) {
+                                $status .= '_9';
+                            } else if ($seconds >= 69120) {
+                                $status .= '_8';
+                            } else if ($seconds >= 60480) {
+                                $status .= '_7';
+                            } else if ($seconds >= 51840) {
+                                $status .= '_6';
+                            } else if ($seconds >= 43200) {
+                                $status .= '_5';
+                            } else if ($seconds >= 34560) {
+                                $status .= '_4';
+                            } else if ($seconds >= 25920) {
+                                $status .= '_3';
+                            } else if ($seconds >= 17280) {
+                                $status .= '_2';
+                            } else if ($seconds >= 8640) {
+                                $status .= '_1';
+                            }
+                        }
+
+                        $result[$cont] = $module;
+                        $result[$cont]['status'] = $status;
+                        $result[$cont]['server'] = $node['id'];
+                        ++$cont;
+                    }
+                } catch (\Exception $e) {
+                    $nd->disconnect();
+                } finally {
+                    $nd->disconnect();
                 }
             }
+        } else {
+            $result = db_get_all_rows_sql($sql);
 
-            $result[$key]['status'] = $status;
+            // Module status.
+            foreach ($result as $key => $module) {
+                $status = '';
+                switch ($module['status']) {
+                    case AGENT_MODULE_STATUS_CRITICAL_BAD:
+                    case AGENT_MODULE_STATUS_CRITICAL_ALERT:
+                    case 1:
+                    case 100:
+                        $status = 'critical';
+                    break;
+
+                    case AGENT_MODULE_STATUS_NORMAL:
+                    case AGENT_MODULE_STATUS_NORMAL_ALERT:
+                    case 0:
+                    case 300:
+                        $status = 'normal';
+                    break;
+
+                    case AGENT_MODULE_STATUS_WARNING:
+                    case AGENT_MODULE_STATUS_WARNING_ALERT:
+                    case 2:
+                    case 200:
+                        $status = 'warning';
+                    break;
+
+                    default:
+                    case AGENT_MODULE_STATUS_UNKNOWN:
+                    case 3:
+                        $status = 'unknown';
+                    break;
+                    case AGENT_MODULE_STATUS_NOT_INIT:
+                    case 5:
+                        $status = 'notinit';
+                    break;
+                }
+
+                if ($module['last_status_change'] != 0) {
+                    $seconds = (time() - $module['last_status_change']);
+
+                    if ($seconds >= SECONDS_1DAY) {
+                        $status .= '_10';
+                    } else if ($seconds >= 77760) {
+                        $status .= '_9';
+                    } else if ($seconds >= 69120) {
+                        $status .= '_8';
+                    } else if ($seconds >= 60480) {
+                        $status .= '_7';
+                    } else if ($seconds >= 51840) {
+                        $status .= '_6';
+                    } else if ($seconds >= 43200) {
+                        $status .= '_5';
+                    } else if ($seconds >= 34560) {
+                        $status .= '_4';
+                    } else if ($seconds >= 25920) {
+                        $status .= '_3';
+                    } else if ($seconds >= 17280) {
+                        $status .= '_2';
+                    } else if ($seconds >= 8640) {
+                        $status .= '_1';
+                    }
+                }
+
+                $result[$key]['status'] = $status;
+            }
         }
 
         return $result;
@@ -600,77 +757,163 @@ class Heatmap
             ae.last_status_change FROM tagente_estado ae
             %s
             INNER JOIN ttag_module tm ON tm.id_agente_modulo = ae.id_agente_modulo
-            WHERE 1=1 %s %s GROUP BY tm.id_tag, ae.id_agente_modulo',
+            WHERE 1=1 %s %s GROUP BY ae.id_agente_modulo',
             $id_user_groups,
             $filter_tag,
             $filter_name
         );
 
-        $result = db_get_all_rows_sql($sql);
+        if (is_metaconsole() === true) {
+            $nodes = metaconsole_get_connections();
+            $result = [];
+            $cont = 0;
+            foreach ($nodes as $node) {
+                try {
+                    $nd = new Node($node['id']);
+                    $nd->connect();
 
-        // Module status.
-        foreach ($result as $key => $module) {
-            $status = '';
-            switch ($module['status']) {
-                case AGENT_MODULE_STATUS_CRITICAL_BAD:
-                case AGENT_MODULE_STATUS_CRITICAL_ALERT:
-                case 1:
-                case 100:
-                    $status = 'critical';
-                break;
+                    $modules = db_get_all_rows_sql($sql);
 
-                case AGENT_MODULE_STATUS_NORMAL:
-                case AGENT_MODULE_STATUS_NORMAL_ALERT:
-                case 0:
-                case 300:
-                    $status = 'normal';
-                break;
+                    // Module status.
+                    foreach ($modules as $key => $module) {
+                        $status = '';
+                        switch ($module['status']) {
+                            case AGENT_MODULE_STATUS_CRITICAL_BAD:
+                            case AGENT_MODULE_STATUS_CRITICAL_ALERT:
+                            case 1:
+                            case 100:
+                                $status = 'critical';
+                            break;
 
-                case AGENT_MODULE_STATUS_WARNING:
-                case AGENT_MODULE_STATUS_WARNING_ALERT:
-                case 2:
-                case 200:
-                    $status = 'warning';
-                break;
+                            case AGENT_MODULE_STATUS_NORMAL:
+                            case AGENT_MODULE_STATUS_NORMAL_ALERT:
+                            case 0:
+                            case 300:
+                                $status = 'normal';
+                            break;
 
-                default:
-                case AGENT_MODULE_STATUS_UNKNOWN:
-                case 3:
-                    $status = 'unknown';
-                break;
-                case AGENT_MODULE_STATUS_NOT_INIT:
-                case 5:
-                    $status = 'notinit';
-                break;
-            }
+                            case AGENT_MODULE_STATUS_WARNING:
+                            case AGENT_MODULE_STATUS_WARNING_ALERT:
+                            case 2:
+                            case 200:
+                                $status = 'warning';
+                            break;
 
-            if ($module['last_status_change'] != 0) {
-                $seconds = (time() - $module['last_status_change']);
+                            default:
+                            case AGENT_MODULE_STATUS_UNKNOWN:
+                            case 3:
+                                $status = 'unknown';
+                            break;
+                            case AGENT_MODULE_STATUS_NOT_INIT:
+                            case 5:
+                                $status = 'notinit';
+                            break;
+                        }
 
-                if ($seconds >= SECONDS_1DAY) {
-                    $status .= '_10';
-                } else if ($seconds >= 77760) {
-                    $status .= '_9';
-                } else if ($seconds >= 69120) {
-                    $status .= '_8';
-                } else if ($seconds >= 60480) {
-                    $status .= '_7';
-                } else if ($seconds >= 51840) {
-                    $status .= '_6';
-                } else if ($seconds >= 43200) {
-                    $status .= '_5';
-                } else if ($seconds >= 34560) {
-                    $status .= '_4';
-                } else if ($seconds >= 25920) {
-                    $status .= '_3';
-                } else if ($seconds >= 17280) {
-                    $status .= '_2';
-                } else if ($seconds >= 8640) {
-                    $status .= '_1';
+                        if ($module['last_status_change'] != 0) {
+                            $seconds = (time() - $module['last_status_change']);
+
+                            if ($seconds >= SECONDS_1DAY) {
+                                $status .= '_10';
+                            } else if ($seconds >= 77760) {
+                                $status .= '_9';
+                            } else if ($seconds >= 69120) {
+                                $status .= '_8';
+                            } else if ($seconds >= 60480) {
+                                $status .= '_7';
+                            } else if ($seconds >= 51840) {
+                                $status .= '_6';
+                            } else if ($seconds >= 43200) {
+                                $status .= '_5';
+                            } else if ($seconds >= 34560) {
+                                $status .= '_4';
+                            } else if ($seconds >= 25920) {
+                                $status .= '_3';
+                            } else if ($seconds >= 17280) {
+                                $status .= '_2';
+                            } else if ($seconds >= 8640) {
+                                $status .= '_1';
+                            }
+                        }
+
+                        $result[$cont] = $module;
+                        $result[$cont]['status'] = $status;
+                        $result[$cont]['server'] = $node['id'];
+                        ++$cont;
+                    }
+                } catch (\Exception $e) {
+                    $nd->disconnect();
+                } finally {
+                    $nd->disconnect();
                 }
             }
+        } else {
+            $result = db_get_all_rows_sql($sql);
 
-            $result[$key]['status'] = $status;
+            // Module status.
+            foreach ($result as $key => $module) {
+                $status = '';
+                switch ($module['status']) {
+                    case AGENT_MODULE_STATUS_CRITICAL_BAD:
+                    case AGENT_MODULE_STATUS_CRITICAL_ALERT:
+                    case 1:
+                    case 100:
+                        $status = 'critical';
+                    break;
+
+                    case AGENT_MODULE_STATUS_NORMAL:
+                    case AGENT_MODULE_STATUS_NORMAL_ALERT:
+                    case 0:
+                    case 300:
+                        $status = 'normal';
+                    break;
+
+                    case AGENT_MODULE_STATUS_WARNING:
+                    case AGENT_MODULE_STATUS_WARNING_ALERT:
+                    case 2:
+                    case 200:
+                        $status = 'warning';
+                    break;
+
+                    default:
+                    case AGENT_MODULE_STATUS_UNKNOWN:
+                    case 3:
+                        $status = 'unknown';
+                    break;
+                    case AGENT_MODULE_STATUS_NOT_INIT:
+                    case 5:
+                        $status = 'notinit';
+                    break;
+                }
+
+                if ($module['last_status_change'] != 0) {
+                    $seconds = (time() - $module['last_status_change']);
+
+                    if ($seconds >= SECONDS_1DAY) {
+                        $status .= '_10';
+                    } else if ($seconds >= 77760) {
+                        $status .= '_9';
+                    } else if ($seconds >= 69120) {
+                        $status .= '_8';
+                    } else if ($seconds >= 60480) {
+                        $status .= '_7';
+                    } else if ($seconds >= 51840) {
+                        $status .= '_6';
+                    } else if ($seconds >= 43200) {
+                        $status .= '_5';
+                    } else if ($seconds >= 34560) {
+                        $status .= '_4';
+                    } else if ($seconds >= 25920) {
+                        $status .= '_3';
+                    } else if ($seconds >= 17280) {
+                        $status .= '_2';
+                    } else if ($seconds >= 8640) {
+                        $status .= '_1';
+                    }
+                }
+
+                $result[$key]['status'] = $status;
+            }
         }
 
         return $result;
@@ -714,71 +957,157 @@ class Heatmap
             $filter_name
         );
 
-        $result = db_get_all_rows_sql($sql);
+        if (is_metaconsole() === true) {
+            $result = [];
+            $nodes = metaconsole_get_connections();
+            $cont = 0;
+            foreach ($nodes as $node) {
+                try {
+                    $nd = new Node($node['id']);
+                    $nd->connect();
 
-        // Module status.
-        foreach ($result as $key => $module) {
-            $status = '';
-            switch ($module['status']) {
-                case AGENT_MODULE_STATUS_CRITICAL_BAD:
-                case AGENT_MODULE_STATUS_CRITICAL_ALERT:
-                case 1:
-                case 100:
-                    $status = 'critical';
-                break;
+                    $modules = db_get_all_rows_sql($sql);
+                    // Module status.
+                    foreach ($modules as $key => $module) {
+                        $status = '';
+                        switch ($module['status']) {
+                            case AGENT_MODULE_STATUS_CRITICAL_BAD:
+                            case AGENT_MODULE_STATUS_CRITICAL_ALERT:
+                            case 1:
+                            case 100:
+                                $status = 'critical';
+                            break;
 
-                case AGENT_MODULE_STATUS_NORMAL:
-                case AGENT_MODULE_STATUS_NORMAL_ALERT:
-                case 0:
-                case 300:
-                    $status = 'normal';
-                break;
+                            case AGENT_MODULE_STATUS_NORMAL:
+                            case AGENT_MODULE_STATUS_NORMAL_ALERT:
+                            case 0:
+                            case 300:
+                                $status = 'normal';
+                            break;
 
-                case AGENT_MODULE_STATUS_WARNING:
-                case AGENT_MODULE_STATUS_WARNING_ALERT:
-                case 2:
-                case 200:
-                    $status = 'warning';
-                break;
+                            case AGENT_MODULE_STATUS_WARNING:
+                            case AGENT_MODULE_STATUS_WARNING_ALERT:
+                            case 2:
+                            case 200:
+                                $status = 'warning';
+                            break;
 
-                default:
-                case AGENT_MODULE_STATUS_UNKNOWN:
-                case 3:
-                    $status = 'unknown';
-                break;
-                case AGENT_MODULE_STATUS_NOT_INIT:
-                case 5:
-                    $status = 'notinit';
-                break;
-            }
+                            default:
+                            case AGENT_MODULE_STATUS_UNKNOWN:
+                            case 3:
+                                $status = 'unknown';
+                            break;
+                            case AGENT_MODULE_STATUS_NOT_INIT:
+                            case 5:
+                                $status = 'notinit';
+                            break;
+                        }
 
-            if ($module['last_status_change'] != 0) {
-                $seconds = (time() - $module['last_status_change']);
+                        if ($module['last_status_change'] != 0) {
+                            $seconds = (time() - $module['last_status_change']);
 
-                if ($seconds >= SECONDS_1DAY) {
-                    $status .= '_10';
-                } else if ($seconds >= 77760) {
-                    $status .= '_9';
-                } else if ($seconds >= 69120) {
-                    $status .= '_8';
-                } else if ($seconds >= 60480) {
-                    $status .= '_7';
-                } else if ($seconds >= 51840) {
-                    $status .= '_6';
-                } else if ($seconds >= 43200) {
-                    $status .= '_5';
-                } else if ($seconds >= 34560) {
-                    $status .= '_4';
-                } else if ($seconds >= 25920) {
-                    $status .= '_3';
-                } else if ($seconds >= 17280) {
-                    $status .= '_2';
-                } else if ($seconds >= 8640) {
-                    $status .= '_1';
+                            if ($seconds >= SECONDS_1DAY) {
+                                $status .= '_10';
+                            } else if ($seconds >= 77760) {
+                                $status .= '_9';
+                            } else if ($seconds >= 69120) {
+                                $status .= '_8';
+                            } else if ($seconds >= 60480) {
+                                $status .= '_7';
+                            } else if ($seconds >= 51840) {
+                                $status .= '_6';
+                            } else if ($seconds >= 43200) {
+                                $status .= '_5';
+                            } else if ($seconds >= 34560) {
+                                $status .= '_4';
+                            } else if ($seconds >= 25920) {
+                                $status .= '_3';
+                            } else if ($seconds >= 17280) {
+                                $status .= '_2';
+                            } else if ($seconds >= 8640) {
+                                $status .= '_1';
+                            }
+                        }
+
+                        $result[$cont] = $module;
+                        $result[$cont]['status'] = $status;
+                        $result[$cont]['server'] = $node['id'];
+                        ++$cont;
+                    }
+                } catch (\Exception $e) {
+                    $nd->disconnect();
+                    $result = [];
+                } finally {
+                    $nd->disconnect();
                 }
             }
+        } else {
+            $result = db_get_all_rows_sql($sql);
 
-            $result[$key]['status'] = $status;
+            // Module status.
+            foreach ($result as $key => $module) {
+                $status = '';
+                switch ($module['status']) {
+                    case AGENT_MODULE_STATUS_CRITICAL_BAD:
+                    case AGENT_MODULE_STATUS_CRITICAL_ALERT:
+                    case 1:
+                    case 100:
+                        $status = 'critical';
+                    break;
+
+                    case AGENT_MODULE_STATUS_NORMAL:
+                    case AGENT_MODULE_STATUS_NORMAL_ALERT:
+                    case 0:
+                    case 300:
+                        $status = 'normal';
+                    break;
+
+                    case AGENT_MODULE_STATUS_WARNING:
+                    case AGENT_MODULE_STATUS_WARNING_ALERT:
+                    case 2:
+                    case 200:
+                        $status = 'warning';
+                    break;
+
+                    default:
+                    case AGENT_MODULE_STATUS_UNKNOWN:
+                    case 3:
+                        $status = 'unknown';
+                    break;
+                    case AGENT_MODULE_STATUS_NOT_INIT:
+                    case 5:
+                        $status = 'notinit';
+                    break;
+                }
+
+                if ($module['last_status_change'] != 0) {
+                    $seconds = (time() - $module['last_status_change']);
+
+                    if ($seconds >= SECONDS_1DAY) {
+                        $status .= '_10';
+                    } else if ($seconds >= 77760) {
+                        $status .= '_9';
+                    } else if ($seconds >= 69120) {
+                        $status .= '_8';
+                    } else if ($seconds >= 60480) {
+                        $status .= '_7';
+                    } else if ($seconds >= 51840) {
+                        $status .= '_6';
+                    } else if ($seconds >= 43200) {
+                        $status .= '_5';
+                    } else if ($seconds >= 34560) {
+                        $status .= '_4';
+                    } else if ($seconds >= 25920) {
+                        $status .= '_3';
+                    } else if ($seconds >= 17280) {
+                        $status .= '_2';
+                    } else if ($seconds >= 8640) {
+                        $status .= '_1';
+                    }
+                }
+
+                $result[$key]['status'] = $status;
+            }
         }
 
         return $result;
@@ -876,7 +1205,6 @@ class Heatmap
     {
         $yAxis = sqrt(($total / $relation));
         return $yAxis;
-
     }
 
 
@@ -887,7 +1215,7 @@ class Heatmap
      *
      * @return boolean True allowed, false not.
      */
-    public function ajaxMethod(string $method):bool
+    public function ajaxMethod(string $method): bool
     {
         return in_array($method, $this->AJAXMethods);
     }
@@ -933,8 +1261,13 @@ class Heatmap
         $contY = 0;
         $cont = 1;
         foreach ($result as $value) {
+            $name = $value['id'];
+            if (empty($value['server']) === false) {
+                $name .= '|'.$value['server'];
+            }
+
             echo '<rect id="'.$this->randomId.'_'.$cont.'" class="'.$value['status'].' hover"
-                width="1" height="1" x ="'.$contX.' "y="'.$contY.'" name="'.$value['id'].'" />';
+                width="1" height="1" x ="'.$contX.' "y="'.$contY.'" name="'.$name.'" />';
 
             $contX++;
             if ($contX >= $Xaxis) {
@@ -952,39 +1285,42 @@ class Heatmap
         }
 
         ?>
-            <script type="text/javascript">
-                $('rect').click(function() {
-                    const type = <?php echo $this->type; ?>;
-                    const id = $(`#${this.id}`).attr("name");
+        <script type="text/javascript">
+            $('rect').click(function() {
+                const type = <?php echo $this->type; ?>;
+                const name = $(`#${this.id}`).attr("name");
+                const id = name.split('|')[0];
+                const server = name.split('|')[1];
 
-                    $("#info_dialog").dialog({
-                        resizable: true,
-                        draggable: true,
-                        modal: true,
-                        closeOnEscape: true,
-                        height: 400,
-                        width: 530,
-                        title: '<?php echo __('Info'); ?>',
-                        open: function() {
-                            $.ajax({
-                                type: 'GET',
-                                url: '<?php echo ui_get_full_url('ajax.php', false, false, false); ?>',
-                                data: {
-                                    page: "include/ajax/heatmap.ajax",
-                                    getInfo: 1,
-                                    type: type,
-                                    id: id,
-                                },
-                                dataType: 'html',
-                                success: function(data) {
-                                    $('#info_dialog').empty();
-                                    $('#info_dialog').append(data);
-                                }
-                            });
-                        },
-                    });
+                $("#info_dialog").dialog({
+                    resizable: true,
+                    draggable: true,
+                    modal: true,
+                    closeOnEscape: true,
+                    height: 400,
+                    width: 530,
+                    title: '<?php echo __('Info'); ?>',
+                    open: function() {
+                        $.ajax({
+                            type: 'GET',
+                            url: '<?php echo ui_get_full_url('ajax.php', false, false, false); ?>',
+                            data: {
+                                page: "include/ajax/heatmap.ajax",
+                                getInfo: 1,
+                                type: type,
+                                id: id,
+                                id_server: server,
+                            },
+                            dataType: 'html',
+                            success: function(data) {
+                                $('#info_dialog').empty();
+                                $('#info_dialog').append(data);
+                            }
+                        });
+                    },
                 });
-            </script>
+            });
+        </script>
         <?php
         if (count($groups) > 1 && $this->group === 1 && $this->dashboard === false) {
             $x_back = 0;