From a2d9aa81d0932ac601928ad2243a02826694899b Mon Sep 17 00:00:00 2001
From: Jonathan <jonathan.leon@pandorafms.com>
Date: Thu, 19 Jan 2023 14:44:30 +0100
Subject: [PATCH 01/25] #9895 Add description error login ldap

---
 pandora_console/index.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pandora_console/index.php b/pandora_console/index.php
index c712be0567..fed8053b4a 100755
--- a/pandora_console/index.php
+++ b/pandora_console/index.php
@@ -415,6 +415,7 @@ if (isset($config['id_user']) === false) {
             unset($_POST['auth_code'], $code);
 
             if (!$double_auth_success) {
+                $config['auth_error'] = __('Double auth error');
                 $login_failed = true;
                 include_once 'general/login_page.php';
                 db_pandora_audit(
@@ -440,6 +441,7 @@ if (isset($config['id_user']) === false) {
         } else if (($config['auth'] === 'saml') && ($login_button_saml)) {
             $saml_user_id = enterprise_hook('saml_process_user_login');
             if (!$saml_user_id) {
+                $config['auth_error'] = __('saml error');
                 $login_failed = true;
                 include_once 'general/login_page.php';
                 while (ob_get_length() > 0) {
@@ -702,6 +704,7 @@ if (isset($config['id_user']) === false) {
                     login_check_failed($nick);
                 }
 
+                $config['auth_error'] = __('User is blocked');
                 $login_failed = true;
             }
 

From 971fc84a470b2ebd536c970cfe7bd7f82d264ab6 Mon Sep 17 00:00:00 2001
From: Pablo Aragon <pablo.aragon@pandorafms.com>
Date: Thu, 9 Feb 2023 10:12:59 +0100
Subject: [PATCH 02/25] 9680-Create widget ModulesByStatus

---
 .../images/widgets/ModulesByStatus.png        | Bin 0 -> 5875 bytes
 pandora_console/include/ajax/module.php       | 258 ++++++++
 pandora_console/include/functions_html.php    |  26 +
 .../include/lib/Dashboard/Widget.php          |   1 +
 .../lib/Dashboard/Widgets/ModulesByStatus.php | 589 ++++++++++++++++++
 5 files changed, 874 insertions(+)
 create mode 100644 pandora_console/images/widgets/ModulesByStatus.png
 create mode 100644 pandora_console/include/lib/Dashboard/Widgets/ModulesByStatus.php

diff --git a/pandora_console/images/widgets/ModulesByStatus.png b/pandora_console/images/widgets/ModulesByStatus.png
new file mode 100644
index 0000000000000000000000000000000000000000..796ff6382a7ae408cfa6e47897a50bf42f14a969
GIT binary patch
literal 5875
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
JPDHLkV1iE?EI0rF

literal 0
HcmV?d00001

diff --git a/pandora_console/include/ajax/module.php b/pandora_console/include/ajax/module.php
index 3857c5d6b2..8e35030cfc 100755
--- a/pandora_console/include/ajax/module.php
+++ b/pandora_console/include/ajax/module.php
@@ -68,6 +68,11 @@ if (check_login()) {
         0
     );
 
+    $get_data_ModulesByStatus = (bool) get_parameter(
+        'get_data_ModulesByStatus',
+        0
+    );
+
     $load_filter_modal = get_parameter('load_filter_modal', 0);
     $save_filter_modal = get_parameter('save_filter_modal', 0);
     $get_monitor_filters = get_parameter('get_monitor_filters', 0);
@@ -1638,6 +1643,259 @@ if (check_login()) {
         return;
     }
 
+    if ($get_data_ModulesByStatus === true) {
+        global $config;
+        $data = [];
+
+        $table_id = get_parameter('table_id', '');
+        $search = get_parameter('search', '');
+        $status = get_parameter('status', '');
+        $start = get_parameter('start', 0);
+        $length = get_parameter('length', $config['block_size']);
+        // There is a limit of (2^32)^2 (18446744073709551615) rows in a MyISAM table, show for show all use max nrows.
+        $length = ($length != '-1') ? $length : '18446744073709551615';
+        $order = get_datatable_order(true);
+        $nodes = get_parameter('nodes', 0);
+
+        $where = '';
+        $recordsTotal = 0;
+
+
+        if (empty($search) === false) {
+            $where = 'tagente_modulo.nombre LIKE "%%'.$search.'%%" AND ';
+        }
+
+        $where .= sprintf(
+            'tagente_estado.estado IN (%s)
+            AND tagente_modulo.delete_pending = 0',
+            $status
+        );
+
+        if (is_metaconsole() === false) {
+            $order_by = '';
+            switch ($order['field']) {
+                case 'nombre':
+                    $order_by = 'tagente_modulo.'.$order['field'].' '.$order['direction'];
+                break;
+
+                case 'alias':
+                    $order_by = 'tagente.'.$order['field'].' '.$order['direction'];
+                break;
+
+                case 'last_status_change':
+                    $order_by = 'tagente_estado.'.$order['field'].' '.$order['direction'];
+                break;
+
+                case 'estado':
+                    $order_by = 'tagente_estado.'.$order['field'].' '.$order['direction'];
+                break;
+
+                default:
+                    $order_by = 'tagente_estado.last_status_change desc';
+                break;
+            }
+
+            $sql = sprintf(
+                'SELECT
+                tagente_modulo.nombre,
+                tagente.alias,
+                tagente.id_agente,
+                tagente_estado.last_status_change,
+                tagente_estado.estado
+                FROM tagente_modulo
+                INNER JOIN tagente
+                    ON tagente_modulo.id_agente = tagente.id_agente 
+                INNER JOIN tagente_estado
+                    ON tagente_estado.id_agente_modulo = tagente_modulo.id_agente_modulo
+                WHERE %s
+                ORDER BY %s
+                LIMIT %d, %d',
+                $where,
+                $order_by,
+                $start,
+                $length
+            );
+            $data = db_get_all_rows_sql($sql);
+
+            $sql_count = sprintf(
+                'SELECT COUNT(*) AS "total"
+                FROM tagente_modulo
+                INNER JOIN tagente
+                    ON tagente_modulo.id_agente = tagente.id_agente 
+                INNER JOIN tagente_estado
+                    ON tagente_estado.id_agente_modulo = tagente_modulo.id_agente_modulo'
+            );
+            $recordsTotal = db_get_value_sql($sql_count);
+
+            // Metaconsole.
+        } else {
+            // $servers_ids = array_column(metaconsole_get_servers(), 'id');
+            $servers_ids = explode(',', $nodes);
+
+            foreach ($servers_ids as $server_id) {
+                try {
+                    $node = new Node((int) $server_id);
+                    $node->connect();
+
+                    $sql = sprintf(
+                        'SELECT
+                        tagente_modulo.nombre,
+                        tagente.alias,
+                        tagente.id_agente,
+                        tagente_estado.last_status_change,
+                        tagente_estado.estado
+                        FROM tagente_modulo
+                        INNER JOIN tagente
+                            ON tagente_modulo.id_agente = tagente.id_agente 
+                        INNER JOIN tagente_estado
+                            ON tagente_estado.id_agente_modulo = tagente_modulo.id_agente_modulo
+                        WHERE %s',
+                        $where
+                    );
+
+                    $res_sql = db_get_all_rows_sql($sql);
+
+                    foreach ($res_sql as $row_sql) {
+                        $row_sql['server_name'] = $node->server_name();
+                        $row_sql['server_url'] = $node->server_url();
+                        array_push($data, $row_sql);
+                    }
+
+                    $node->disconnect();
+                } catch (\Exception $e) {
+                    // Unexistent modules.
+                    $node->disconnect();
+                }
+            }
+
+            // Drop temporary table if exist.
+            db_process_sql('DROP TEMPORARY TABLE IF EXISTS temp_modules_status;');
+
+            $table_temporary = 'CREATE TEMPORARY TABLE IF NOT EXISTS temp_modules_status (
+                id BIGINT UNSIGNED NOT NULL AUTO_INCREMENT,
+                nombre VARCHAR(600),
+                alias VARCHAR(600),
+                id_agente INT,
+                last_status_change INT,
+                estado INT,
+                server_name VARCHAR(100),
+                server_url VARCHAR(200),
+                PRIMARY KEY (`id`),
+                KEY `nombre` (`nombre`(600))
+            )';
+            db_process_sql($table_temporary);
+
+            $result = db_process_sql_insert_multiple('temp_modules_status', $data);
+
+            if (empty($result) === false) {
+                $data = [];
+                $sql = '';
+                $where = '';
+
+                if (empty($search) === false) {
+                    $where = 'nombre LIKE "%%'.$search.'%%" AND ';
+                }
+
+                $where .= sprintf(
+                    'estado IN (%s)',
+                    $status
+                );
+
+                $order_by = $order['field'].' '.$order['direction'];
+
+                $sql = sprintf(
+                    'SELECT
+                        nombre,
+                        alias,
+                        id_agente,
+                        last_status_change,
+                        estado,
+                        server_name,
+                        server_url
+                    FROM temp_modules_status
+                    WHERE %s
+                    ORDER BY %s
+                    LIMIT %d, %d',
+                    $where,
+                    $order_by,
+                    $start,
+                    $length
+                );
+                $data = db_get_all_rows_sql($sql);
+
+                $sql_count = sprintf(
+                    'SELECT COUNT(*) AS "total"
+                    FROM temp_modules_status'
+                );
+
+                $recordsTotal = db_get_value_sql($sql_count);
+            }
+        }
+
+        if ($data === false) {
+            $data = [];
+        }
+
+        foreach ($data as $key => $row) {
+            $data[$key]['nombre'] = html_ellipsis_characters($row['nombre'], 35, true);
+
+            if (is_metaconsole() === false) {
+                $name_link = '<a href="index.php?sec=estado&sec2=';
+            } else {
+                $name_link = '<a href="'.$row['server_url'].'index.php?sec=estado&sec2=';
+            }
+
+            $name_link .= 'operation/agentes/ver_agente&id_agente='.$row['id_agente'];
+            $name_link .= '"><b>';
+            $name_link .= '<span class="ellipsis-35ch">'.html_ellipsis_characters($row['alias'], 35, true).'</span>';
+            $name_link .= '</b></a>';
+
+            $data[$key]['alias'] = $name_link;
+
+            $data[$key]['last_status_change'] = ui_print_timestamp(
+                $row['last_status_change'],
+                true
+            );
+
+            switch ((int) $row['estado']) {
+                case 0:
+                    $status_img = ui_print_status_image(STATUS_MODULE_OK, __('Normal'), true);
+                break;
+
+                case 1:
+                case 6:
+                    $status_img = ui_print_status_image(STATUS_MODULE_CRITICAL, __('Critical'), true);
+                break;
+
+                case 2:
+                    $status_img = ui_print_status_image(STATUS_MODULE_WARNING, __('Warning'), true);
+                break;
+
+                case 3:
+                    $status_img = ui_print_status_image(STATUS_MODULE_UNKNOWN, __('Unknown'), true);
+                break;
+
+                case 5:
+                    $status_img = ui_print_status_image(STATUS_MODULE_NO_DATA, __('Not init'), true);
+                break;
+
+                default:
+                    $status_img = '';
+                break;
+            }
+
+            $data[$key]['estado'] = $status_img;
+        }
+
+        echo json_encode(
+            [
+                'data'            => $data,
+                'recordsTotal'    => $recordsTotal,
+                'recordsFiltered' => $recordsTotal,
+            ]
+        );
+    }
+
     if ($get_children_modules === true) {
         $parent_modules = get_parameter('parent_modulues', false);
         $children_selected = [];
diff --git a/pandora_console/include/functions_html.php b/pandora_console/include/functions_html.php
index 31c2e5214a..4ace0131ab 100644
--- a/pandora_console/include/functions_html.php
+++ b/pandora_console/include/functions_html.php
@@ -6361,3 +6361,29 @@ function html_print_extended_select_for_downtime_cron(
         echo $returnString;
     }
 }
+
+
+/**
+ * Ellipse string to x characters.
+ *
+ * @param  string  $string     String to ellipsis.
+ * @param  integer $characters Characters size to show.
+ * @return string String ellipsed.
+ */
+function html_ellipsis_characters(
+    string $string,
+    int $characters,
+    bool $return=false
+) {
+    $out = $string;
+
+    if (strlen($string) > $characters) {
+        $out = substr($string, 0, $characters).'...';
+    }
+
+    if ($return === true) {
+        return $out;
+    } else {
+        echo $out;
+    }
+}
\ No newline at end of file
diff --git a/pandora_console/include/lib/Dashboard/Widget.php b/pandora_console/include/lib/Dashboard/Widget.php
index 2753b8a55d..3b4e47cb35 100644
--- a/pandora_console/include/lib/Dashboard/Widget.php
+++ b/pandora_console/include/lib/Dashboard/Widget.php
@@ -420,6 +420,7 @@ class Widget
                 case 'ColorModuleTabs':
                 case 'BlockHistogram':
                 case 'DataMatrix':
+                case 'ModulesByStatus':
                     $className .= '\\'.$name;
                 break;
 
diff --git a/pandora_console/include/lib/Dashboard/Widgets/ModulesByStatus.php b/pandora_console/include/lib/Dashboard/Widgets/ModulesByStatus.php
new file mode 100644
index 0000000000..8191607616
--- /dev/null
+++ b/pandora_console/include/lib/Dashboard/Widgets/ModulesByStatus.php
@@ -0,0 +1,589 @@
+<?php
+/**
+ * Widget Module status Pandora FMS Console
+ *
+ * @category   Console Class
+ * @package    Pandora FMS
+ * @subpackage Widget Module status
+ * @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;
+
+use PandoraFMS\Enterprise\Metaconsole\Node;
+
+global $config;
+
+/**
+ * Module status Widgets.
+ */
+class ModulesByStatus 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;
+
+    /**
+     * Grid Width.
+     *
+     * @var integer
+     */
+    protected $gridWidth;
+
+    /**
+     * 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.
+     * @param integer|null $gridWidth   Grid width.
+     */
+    public function __construct(
+        int $cellId,
+        int $dashboardId=0,
+        int $widgetId=0,
+        ?int $width=0,
+        ?int $height=0,
+        ?int $gridWidth=0
+    ) {
+        global $config;
+
+        // WARNING: Do not edit. This chunk must be in the constructor.
+        parent::__construct(
+            $cellId,
+            $dashboardId,
+            $widgetId
+        );
+
+        // Width.
+        $this->width = $width;
+
+        // Height.
+        $this->height = $height;
+
+        // Grid Width.
+        $this->gridWidth = $gridWidth;
+
+        // Cell Id.
+        $this->cellId = $cellId;
+
+        // Options.
+        $this->values = $this->decoders($this->getOptionsWidget());
+
+        // Positions.
+        $this->position = $this->getPositionWidget();
+
+        // Page.
+        $this->page = basename(__FILE__);
+
+        // ClassName.
+        $class = new \ReflectionClass($this);
+        $this->className = $class->getShortName();
+
+        // Title.
+        $this->title = __('Module status');
+
+        // Name.
+        if (empty($this->name) === true) {
+            $this->name = 'ModulesByStatus';
+        }
+
+        // This forces at least a first configuration.
+        // This forces at least a first configuration.
+        $this->configurationRequired = false;
+        if (empty($this->values['status']) === true) {
+            $this->configurationRequired = true;
+        }
+
+        $this->overflow_scrollbars = false;
+    }
+
+
+    /**
+     * 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);
+
+        if (isset($decoder['search']) === true) {
+            $values['search'] = $decoder['search'];
+        }
+
+        if (isset($decoder['status']) === true) {
+            $values['status'] = $decoder['status'];
+        }
+
+        if (isset($decoder['limit']) === true) {
+            $values['limit'] = $decoder['limit'];
+        }
+
+        if (isset($decoder['nodes']) === true) {
+            $values['nodes'] = $decoder['nodes'];
+        }
+
+        return $values;
+    }
+
+
+    /**
+     * Generates inputs for form (specific).
+     *
+     * @return array Of inputs.
+     *
+     * @throws Exception On error.
+     */
+    public function getFormInputs(): array
+    {
+        global $config;
+
+        $values = $this->values;
+
+        // Retrieve global - common inputs.
+        $inputs = parent::getFormInputs();
+
+        // Search.
+        $inputs[] = [
+            'label'     => __('Free search').ui_print_help_tip(__('Search filter by Module name field content'), true),
+            'arguments' => [
+                'name'   => 'search',
+                'type'   => 'text',
+                'value'  => $values['search'],
+                'return' => true,
+                'size'   => 0,
+            ],
+        ];
+
+        // Status fields.
+        $status_fields = [];
+        $status_fields[AGENT_MODULE_STATUS_NORMAL] = __('Normal');
+        $status_fields[AGENT_MODULE_STATUS_CRITICAL_BAD] = __('Critical');
+        $status_fields[AGENT_MODULE_STATUS_WARNING] = __('Warning');
+        $status_fields[AGENT_MODULE_STATUS_UNKNOWN] = __('Unknown');
+        $status_fields[AGENT_MODULE_STATUS_NOT_INIT] = __('Not init');
+        $status_fields[AGENT_MODULE_STATUS_NOT_NORMAL] = __('Not normal');
+        $status_selected = explode(',', $values['status']);
+
+        (isset($values['status']) === false) ? $status_selected = AGENT_MODULE_STATUS_WARNING : '';
+
+        $inputs[] = [
+            'label'     => __('Status'),
+            'arguments' => [
+                'name'       => 'status',
+                'type'       => 'select',
+                'fields'     => $status_fields,
+                'selected'   => $status_selected,
+                'return'     => true,
+                'multiple'   => true,
+                'class'      => 'overflow-hidden',
+                'size'       => count($status_fields),
+                'select_all' => false,
+                'required'   => true,
+            ],
+        ];
+
+        // Limit fields.
+        $limit_fields = [];
+        $limit_fields[5] = 5;
+        $limit_fields[10] = 10;
+        $limit_fields[25] = 25;
+        $limit_fields[100] = 100;
+        $limit_fields[200] = 200;
+        $limit_fields[500] = 500;
+        $limit_fields[1000] = 1000;
+        $limit_selected = explode(',', $values['limit']);
+
+        (isset($values['limit']) === false) ? $limit_selected = 5 : '';
+
+        $inputs[] = [
+            'label'     => __('Limit'),
+            'arguments' => [
+                'name'           => 'limit',
+                'type'           => 'select',
+                'fields'         => $limit_fields,
+                'selected'       => $limit_selected,
+                'return'         => true,
+                'required'       => true,
+                'select2_enable' => false,
+            ],
+        ];
+
+        if (is_metaconsole() === true) {
+            // Nodes fields.
+            $nodes_fields = [];
+            $servers_ids = array_column(metaconsole_get_servers(), 'id');
+            foreach ($servers_ids as $server_id) {
+                $nodes_fields[$server_id] = $server_id;
+            }
+
+            $nodes_selected = explode(',', $values['nodes']);
+
+            (isset($values['nodes']) === false) ? $nodes_selected = '' : '';
+
+            $inputs[] = [
+                'label'     => __('Nodes'),
+                'arguments' => [
+                    'name'       => 'nodes',
+                    'type'       => 'select',
+                    'fields'     => $nodes_fields,
+                    'selected'   => $nodes_selected,
+                    'return'     => true,
+                    'multiple'   => true,
+                    'class'      => 'overflow-hidden',
+                    'size'       => count($nodes_fields),
+                    'select_all' => false,
+                    'required'   => true,
+                ],
+            ];
+        }
+
+        return $inputs;
+    }
+
+
+    /**
+     * Get Post for widget.
+     *
+     * @return array
+     */
+    public function getPost():array
+    {
+        // Retrieve global - common inputs.
+        $values = parent::getPost();
+
+        $values['search'] = \get_parameter('search', '');
+        $values['status'] = \get_parameter('status', '');
+        $values['limit'] = \get_parameter('limit', '');
+        $values['nodes'] = \get_parameter('nodes', '');
+
+        return $values;
+    }
+
+
+    /**
+     * Draw widget.
+     *
+     * @return string;
+     */
+    public function load()
+    {
+        $this->size = parent::getSize();
+
+        $output = '';
+
+        if (is_metaconsole() === true) {
+            $modules = [];
+
+            $servers_ids = array_column(metaconsole_get_servers(), 'id');
+
+            foreach ($servers_ids as $server_id) {
+                try {
+                    $node = new Node((int) $server_id);
+
+                    $node->connect();
+                    $modules_tmp = $this->getInfoModules(
+                        $this->values['search'],
+                        $this->values['status'],
+                        $this->values['nodes']
+                    );
+                    $modules[$node->id()] = $modules_tmp[0];
+                    $node->disconnect();
+                } catch (\Exception $e) {
+                    // Unexistent modules.
+                    $node->disconnect();
+                }
+            }
+        } else {
+            $modules = $this->getInfoModules(
+                $this->values['search'],
+                $this->values['status']
+            );
+        }
+
+        if ($modules !== false && empty($modules) === false) {
+            // Datatables list.
+            try {
+                $info_columns = $this->columns();
+                $column_names = $info_columns['column_names'];
+                $columns = $info_columns['columns'];
+
+                $tableId = 'ModuleByStatus_'.$this->dashboardId.'_'.$this->cellId;
+                // Load datatables user interface.
+                ui_print_datatable(
+                    [
+                        'id'                 => $tableId,
+                        'class'              => 'info_table align-left-important',
+                        'style'              => 'width: 100%',
+                        'columns'            => $columns,
+                        'column_names'       => $column_names,
+                        'ajax_url'           => 'include/ajax/module',
+                        'ajax_data'          => [
+                            'get_data_ModulesByStatus' => 1,
+                            'table_id'                 => $tableId,
+                            'search'                   => $this->values['search'],
+                            'status'                   => $this->values['status'],
+                            'nodes'                    => $this->values['nodes'],
+                        ],
+                        'default_pagination' => $this->values['limit'],
+                        'order'              => [
+                            'field'     => 'last_status_change',
+                            'direction' => 'desc',
+                        ],
+                        'csv'                => 0,
+                    ]
+                );
+            } catch (\Exception $e) {
+                echo $e->getMessage();
+            }
+        } else {
+            $output = '';
+            $output .= '<div class="container-center">';
+            $output .= \ui_print_info_message(
+                __('Not found modules'),
+                '',
+                true
+            );
+            $output .= '</div>';
+
+            return $output;
+        }
+    }
+
+
+    /**
+     * Get info modules.
+     *
+     * @param string $search Free search.
+     * @param string $status Modules status.
+     *
+     * @return array Data.
+     */
+    private function getInfoModules(string $search, string $status): array
+    {
+        if (empty($search) === false) {
+            $where = 'tagente_modulo.nombre LIKE "%%'.$search.'%%" AND ';
+        }
+
+        $where .= sprintf(
+            'tagente_estado.estado IN (%s)
+            AND tagente_modulo.delete_pending = 0',
+            $status
+        );
+
+        $sql = sprintf(
+            'SELECT
+            COUNT(*) AS "modules"
+            FROM tagente_modulo
+            INNER JOIN tagente
+                ON tagente_modulo.id_agente = tagente.id_agente 
+            INNER JOIN tagente_estado
+                ON tagente_estado.id_agente_modulo = tagente_modulo.id_agente_modulo
+            WHERE %s',
+            $where
+        );
+
+        $modules = db_get_all_rows_sql($sql);
+
+        if ($modules === false) {
+            $modules = [];
+        }
+
+        return $modules;
+    }
+
+
+    /**
+     * Get columns.
+     *
+     * @return array
+     */
+    private function columns()
+    {
+        $columns = [];
+        $column_names = [];
+
+        if (is_metaconsole() === true) {
+            $column_names = [
+                __('Module name'),
+                __('Agent'),
+                __('Node'),
+                __('Last status change'),
+                __('Status'),
+            ];
+
+            $columns = [
+                'nombre',
+                'alias',
+                'server_name',
+                'last_status_change',
+                'estado',
+            ];
+        } else {
+            $column_names = [
+                __('Module name'),
+                __('Agent'),
+                __('Last status change'),
+                __('Status'),
+            ];
+
+            $columns = [
+                'nombre',
+                'alias',
+                'last_status_change',
+                'estado',
+            ];
+        }
+
+        $data = [
+            'columns'      => $columns,
+            'column_names' => $column_names,
+        ];
+
+        return $data;
+    }
+
+
+    /**
+     * Get description.
+     *
+     * @return string.
+     */
+    public static function getDescription()
+    {
+        return __('Modules by status');
+    }
+
+
+    /**
+     * Get Name.
+     *
+     * @return string.
+     */
+    public static function getName()
+    {
+        return 'ModulesByStatus';
+    }
+
+
+    /**
+     * Get size Modal Configuration.
+     *
+     * @return array
+     */
+    public function getSizeModalConfiguration(): array
+    {
+        if (is_metaconsole() === true) {
+            $nodes_fields = array_column(metaconsole_get_servers(), 'id');
+
+            $height_counter = (((int) count($nodes_fields)) * 20);
+
+            $size = [
+                'width'  => 450,
+                'height' => (520 + $height_counter),
+            ];
+        } else {
+            $size = [
+                'width'  => 450,
+                'height' => 480,
+            ];
+        }
+
+        return $size;
+    }
+
+
+}

From f35acde8ebb822694f364843b7eb8ca9503019e0 Mon Sep 17 00:00:00 2001
From: Pablo Aragon <pablo.aragon@pandorafms.com>
Date: Thu, 9 Feb 2023 10:37:12 +0100
Subject: [PATCH 03/25] 9680-Create widget ModulesByStatus

---
 .../include/lib/Dashboard/Widgets/ModulesByStatus.php           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pandora_console/include/lib/Dashboard/Widgets/ModulesByStatus.php b/pandora_console/include/lib/Dashboard/Widgets/ModulesByStatus.php
index 8191607616..e2c83ca59d 100644
--- a/pandora_console/include/lib/Dashboard/Widgets/ModulesByStatus.php
+++ b/pandora_console/include/lib/Dashboard/Widgets/ModulesByStatus.php
@@ -258,7 +258,7 @@ class ModulesByStatus extends Widget
         $status_fields[AGENT_MODULE_STATUS_NOT_NORMAL] = __('Not normal');
         $status_selected = explode(',', $values['status']);
 
-        (isset($values['status']) === false) ? $status_selected = AGENT_MODULE_STATUS_WARNING : '';
+        (isset($values['status']) === false) ? $status_selected = AGENT_MODULE_STATUS_CRITICAL_BAD : '';
 
         $inputs[] = [
             'label'     => __('Status'),

From b439ed684ee04ea181a751aca841dfe864e4ae2b Mon Sep 17 00:00:00 2001
From: Pablo Aragon <pablo.aragon@pandorafms.com>
Date: Fri, 10 Feb 2023 10:31:41 +0100
Subject: [PATCH 04/25] 9859-Widget AvgSumMaxMinModule

---
 .../images/widgets/AvgSumMaxMinModule.png     | Bin 0 -> 5984 bytes
 .../include/lib/Dashboard/Widget.php          |   1 +
 .../Dashboard/Widgets/AvgSumMaxMinModule.php  | 701 ++++++++++++++++++
 3 files changed, 702 insertions(+)
 create mode 100644 pandora_console/images/widgets/AvgSumMaxMinModule.png
 create mode 100644 pandora_console/include/lib/Dashboard/Widgets/AvgSumMaxMinModule.php

diff --git a/pandora_console/images/widgets/AvgSumMaxMinModule.png b/pandora_console/images/widgets/AvgSumMaxMinModule.png
new file mode 100644
index 0000000000000000000000000000000000000000..19e980f38dda95f64625f15bcbda86269fb91cf0
GIT binary patch
literal 5984
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
O0000<MNUMnLSTYnx?vvx

literal 0
HcmV?d00001

diff --git a/pandora_console/include/lib/Dashboard/Widget.php b/pandora_console/include/lib/Dashboard/Widget.php
index 2753b8a55d..055c0d3e64 100644
--- a/pandora_console/include/lib/Dashboard/Widget.php
+++ b/pandora_console/include/lib/Dashboard/Widget.php
@@ -420,6 +420,7 @@ class Widget
                 case 'ColorModuleTabs':
                 case 'BlockHistogram':
                 case 'DataMatrix':
+                case 'AvgSumMaxMinModule':
                     $className .= '\\'.$name;
                 break;
 
diff --git a/pandora_console/include/lib/Dashboard/Widgets/AvgSumMaxMinModule.php b/pandora_console/include/lib/Dashboard/Widgets/AvgSumMaxMinModule.php
new file mode 100644
index 0000000000..c1ea70eaba
--- /dev/null
+++ b/pandora_console/include/lib/Dashboard/Widgets/AvgSumMaxMinModule.php
@@ -0,0 +1,701 @@
+<?php
+/**
+ * Widget Avg|Sum|Max|Min Module Data Pandora FMS Console
+ *
+ * @category   Console Class
+ * @package    Pandora FMS
+ * @subpackage Widget Avg|Sum|Max|Min Module Data
+ * @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.
+ * ============================================================================
+ */
+
+namespace PandoraFMS\Dashboard;
+
+use PandoraFMS\Enterprise\Metaconsole\Node;
+
+global $config;
+
+require_once $config['homedir'].'/include/functions_agents.php';
+require_once $config['homedir'].'/include/functions_modules.php';
+
+/**
+ * Avg|Sum|Max|Min Module Widgets.
+ */
+class AvgSumMaxMinModule 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;
+
+    /**
+     * Grid Width.
+     *
+     * @var integer
+     */
+    protected $gridWidth;
+
+    /**
+     * 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.
+     * @param integer|null $gridWidth   Grid width.
+     */
+    public function __construct(
+        int $cellId,
+        int $dashboardId=0,
+        int $widgetId=0,
+        ?int $width=0,
+        ?int $height=0,
+        ?int $gridWidth=0
+    ) {
+        global $config;
+
+        // WARNING: Do not edit. This chunk must be in the constructor.
+        parent::__construct(
+            $cellId,
+            $dashboardId,
+            $widgetId
+        );
+
+        // Width.
+        $this->width = $width;
+
+        // Height.
+        $this->height = $height;
+
+        // Grid Width.
+        $this->gridWidth = $gridWidth;
+
+        // Cell Id.
+        $this->cellId = $cellId;
+
+        // Options.
+        $this->values = $this->decoders($this->getOptionsWidget());
+
+        // Positions.
+        $this->position = $this->getPositionWidget();
+
+        // Page.
+        $this->page = basename(__FILE__);
+
+        // ClassName.
+        $class = new \ReflectionClass($this);
+        $this->className = $class->getShortName();
+
+        // Title.
+        $this->title = __('Avg|Sum|Max|Min Module Data');
+
+        // Name.
+        if (empty($this->name) === true) {
+            $this->name = 'AvgSumMaxMinModule';
+        }
+
+        // This forces at least a first configuration.
+        $this->configurationRequired = false;
+        if (empty($this->values['moduleId']) === true) {
+            $this->configurationRequired = true;
+        } else {
+            try {
+                if (is_metaconsole() === true
+                    && $this->values['metaconsoleId'] > 0
+                ) {
+                    $node = new Node($this->values['metaconsoleId']);
+                    $node->connect();
+                }
+
+                $check_exist = db_get_sql(
+                    sprintf(
+                        'SELECT id_agente_modulo
+                        FROM tagente_modulo
+                        WHERE id_agente_modulo = %s
+                            AND delete_pending = 0',
+                        $this->values['moduleId']
+                    )
+                );
+            } catch (\Exception $e) {
+                // Unexistent agent.
+                if (is_metaconsole() === true
+                    && $this->values['metaconsoleId'] > 0
+                ) {
+                    $node->disconnect();
+                }
+
+                $check_exist = false;
+            } finally {
+                if (is_metaconsole() === true
+                    && $this->values['metaconsoleId'] > 0
+                ) {
+                    $node->disconnect();
+                }
+            }
+
+            if ($check_exist === false) {
+                $this->loadError = true;
+            }
+        }
+
+        $this->overflow_scrollbars = false;
+    }
+
+
+    /**
+     * 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);
+
+        if (isset($decoder['label_'.$this->cellId]) === true) {
+            $values['label'] = $decoder['label_'.$this->cellId];
+        }
+
+        if (isset($decoder['label']) === true) {
+            $values['label'] = $decoder['label'];
+        }
+
+        if (isset($decoder['id_agent_'.$this->cellId]) === true) {
+            $values['agentId'] = $decoder['id_agent_'.$this->cellId];
+        }
+
+        if (isset($decoder['type_'.$this->cellId]) === true) {
+            $values['type'] = $decoder['type_'.$this->cellId];
+        }
+
+        if (isset($decoder['type']) === true) {
+            $values['type'] = $decoder['type'];
+        }
+
+        if (isset($decoder['period_'.$this->cellId]) === true) {
+            $values['period'] = $decoder['period_'.$this->cellId];
+        }
+
+        if (isset($decoder['period']) === true) {
+            $values['period'] = $decoder['period'];
+        }
+
+        if (isset($decoder['agentId']) === true) {
+            $values['agentId'] = $decoder['agentId'];
+        }
+
+        if (isset($decoder['metaconsoleId']) === true) {
+            $values['metaconsoleId'] = $decoder['metaconsoleId'];
+        }
+
+        if (isset($decoder['id_module_'.$this->cellId]) === true) {
+            $values['moduleId'] = $decoder['id_module_'.$this->cellId];
+        }
+
+        if (isset($decoder['moduleId']) === true) {
+            $values['moduleId'] = $decoder['moduleId'];
+        }
+
+        if (isset($decoder['size_value_'.$this->cellId]) === true) {
+            $values['sizeValue'] = $decoder['size_value_'.$this->cellId];
+        }
+
+        if (isset($decoder['sizeValue']) === true) {
+            $values['sizeValue'] = $decoder['sizeValue'];
+        }
+
+        if (isset($decoder['size_label_'.$this->cellId]) === true) {
+            $values['sizeLabel'] = $decoder['size_label_'.$this->cellId];
+        }
+
+        if (isset($decoder['sizeLabel']) === true) {
+            $values['sizeLabel'] = $decoder['sizeLabel'];
+        }
+
+        if (isset($decoder['text_color_'.$this->cellId]) === true) {
+            $values['text_color'] = $decoder['text_color_'.$this->cellId];
+        }
+
+        if (isset($decoder['text_color']) === true) {
+            $values['text_color'] = $decoder['text_color'];
+        }
+
+        if (isset($decoder['unit_'.$this->cellId]) === true) {
+            $values['unit'] = $decoder['unit_'.$this->cellId];
+        }
+
+        if (isset($decoder['unit']) === true) {
+            $values['unit'] = $decoder['unit'];
+        }
+
+        return $values;
+    }
+
+
+    /**
+     * Generates inputs for form (specific).
+     *
+     * @return array Of inputs.
+     *
+     * @throws Exception On error.
+     */
+    public function getFormInputs(): array
+    {
+        global $config;
+
+        $values = $this->values;
+
+        // Default values.
+        if (isset($values['sizeLabel']) === false) {
+            $values['sizeLabel'] = 20;
+        }
+
+        if (isset($values['sizeValue']) === false) {
+            $values['sizeValue'] = 20;
+        }
+
+        // Retrieve global - common inputs.
+        $inputs = parent::getFormInputs();
+
+        // Label.
+        $inputs[] = [
+            'label'     => __('Label'),
+            'arguments' => [
+                'name'   => 'label',
+                'type'   => 'text',
+                'value'  => $values['label'],
+                'return' => true,
+                'size'   => 0,
+            ],
+        ];
+
+        // Type.
+        $type_fields = [];
+        $type_fields[0] = 'AVG';
+        $type_fields[1] = 'SUM';
+        $type_fields[2] = 'MAX';
+        $type_fields[3] = 'MIN';
+        $type_selected = explode(',', $values['type']);
+
+        (isset($values['type']) === false) ? $type_selected = 0 : '';
+
+        $inputs[] = [
+            'label'     => __('Type'),
+            'arguments' => [
+                'name'           => 'type',
+                'type'           => 'select',
+                'fields'         => $type_fields,
+                'selected'       => $type_selected,
+                'return'         => true,
+                'required'       => true,
+                'select2_enable' => false,
+                'sort'           => false,
+            ],
+        ];
+
+        // Period.
+        $period_fields = [];
+        $period_fields[0] = __('Last 30 days');
+        $period_fields[1] = __('This month');
+        $period_fields[2] = __('Last 7 days');
+        $period_fields[3] = __('This week');
+        $period_fields[4] = __('Last 24 hrs');
+        $period_fields[5] = __('Today');
+        $period_selected = explode(',', $values['period']);
+
+        (isset($values['period']) === false) ? $period_selected = 0 : '';
+
+        $inputs[] = [
+            'label'     => __('Time period'),
+            'arguments' => [
+                'name'           => 'period',
+                'type'           => 'select',
+                'fields'         => $period_fields,
+                'selected'       => $period_selected,
+                'return'         => true,
+                'required'       => true,
+                'select2_enable' => false,
+                'sort'           => false,
+            ],
+        ];
+
+        // Autocomplete agents.
+        $inputs[] = [
+            'label'     => __('Agent'),
+            'arguments' => [
+                'type'               => 'autocomplete_agent',
+                'name'               => 'agentAlias',
+                'id_agent_hidden'    => $values['agentId'],
+                'name_agent_hidden'  => 'agentId',
+                'server_id_hidden'   => $values['metaconsoleId'],
+                'name_server_hidden' => 'metaconsoleId',
+                'return'             => true,
+                'module_input'       => true,
+                'module_name'        => 'moduleId',
+                'module_none'        => false,
+                'size'               => 0,
+            ],
+        ];
+
+        // Autocomplete module.
+        $inputs[] = [
+            'label'     => __('Module'),
+            'arguments' => [
+                'type'           => 'autocomplete_module',
+                'name'           => 'moduleId',
+                'selected'       => $values['moduleId'],
+                'return'         => true,
+                'sort'           => false,
+                'agent_id'       => $values['agentId'],
+                'metaconsole_id' => $values['metaconsoleId'],
+                'style'          => 'width: inherit;',
+                'filter_modules' => (users_access_to_agent($values['agentId']) === false) ? [$values['moduleId']] : [],
+                'nothing'        => __('None'),
+                'nothing_value'  => 0,
+            ],
+        ];
+
+        // Text size of value in px.
+        $inputs[] = [
+            'label'     => __('Text size of value in px'),
+            'arguments' => [
+                'name'   => 'sizeValue',
+                'type'   => 'number',
+                'value'  => $values['sizeValue'],
+                'return' => true,
+                'min'    => 0,
+            ],
+        ];
+
+        // Text size of label in px.
+        $inputs[] = [
+            'label'     => __('Text size of label in px'),
+            'arguments' => [
+                'name'   => 'sizeLabel',
+                'type'   => 'number',
+                'value'  => $values['sizeLabel'],
+                'return' => true,
+                'min'    => 0,
+            ],
+        ];
+
+        // Text color.
+        if (empty($values['text_color']) === true) {
+            $values['text_color'] = '#000000';
+
+            if ($config['style'] === 'pandora_black'
+                && is_metaconsole() === false
+            ) {
+                $values['text_color'] = '#eeeeee';
+            }
+        }
+
+        $inputs[] = [
+            'label'     => __('Text color'),
+            'arguments' => [
+                'wrapper' => 'div',
+                'name'    => 'text_color',
+                'type'    => 'color',
+                'value'   => $values['text_color'],
+                'return'  => true,
+            ],
+        ];
+
+        // Unit.
+        $inputs[] = [
+            'label'     => __('Unit'),
+            'arguments' => [
+                'wrapper' => 'div',
+                'name'    => 'unit',
+                'type'    => 'switch',
+                'value'   => $values['unit'],
+                'return'  => true,
+            ],
+        ];
+
+        return $inputs;
+    }
+
+
+    /**
+     * Get Post for widget.
+     *
+     * @return array
+     */
+    public function getPost():array
+    {
+        // Retrieve global - common inputs.
+        $values = parent::getPost();
+
+        $values['label'] = \get_parameter('label', '');
+        $values['type'] = \get_parameter('type', 0);
+        $values['period'] = \get_parameter('period', 0);
+        $values['agentId'] = \get_parameter('agentId', 0);
+        $values['metaconsoleId'] = \get_parameter('metaconsoleId', 0);
+        $values['moduleId'] = \get_parameter('moduleId', 0);
+        $values['sizeValue'] = \get_parameter('sizeValue', 0);
+        $values['sizeLabel'] = \get_parameter_switch('sizeLabel');
+        $values['text_color'] = \get_parameter('text_color', 0);
+        $values['unit'] = \get_parameter_switch('unit');
+
+        return $values;
+    }
+
+
+    /**
+     * Draw widget.
+     *
+     * @return string;
+     */
+    public function load()
+    {
+        global $config;
+
+        $output = '';
+        $text_color = 'color:'.$this->values['text_color'].' !important;';
+
+        $id_module = $this->values['moduleId'];
+
+        $to = 0;
+        $now = time();
+
+        switch ((int) $this->values['period']) {
+            case 0:
+                $to = strtotime('-30 days');
+            break;
+
+            case 1:
+                $to = strtotime(date('Y-m-01 00:00:00'));
+            break;
+
+            case 2:
+                $to = strtotime('-7 days');
+            break;
+
+            case 3:
+                $to = strtotime('last Monday');
+            break;
+
+            case 4:
+                $to = strtotime('-1 days');
+            break;
+
+            case 5:
+                $to = strtotime(date('Y-m-d 00:00:00'));
+            break;
+
+            default:
+                $to = 0;
+            break;
+        }
+
+        $data = 0;
+        switch ((int) $this->values['type']) {
+            case 0:
+                $rows = modules_get_raw_data($id_module, $to, $now);
+                $count = (int) count($rows);
+                $sum = 0;
+                foreach ($rows as $row) {
+                    $sum += (int) $row['datos'];
+                }
+
+                $data = ($sum / $count);
+            break;
+
+            case 1:
+                $rows = modules_get_raw_data($id_module, $to, $now);
+                $sum = 0;
+                foreach ($rows as $row) {
+                    $sum += (int) $row['datos'];
+                }
+
+                $data = $sum;
+            break;
+
+            case 2:
+                $rows = modules_get_min_max_data($id_module, $to);
+
+                $data = $rows[0]['max'];
+            break;
+
+            case 3:
+                $rows = modules_get_min_max_data($id_module, $to);
+
+                $data = $rows[0]['min'];
+            break;
+
+            default:
+                $data = 0;
+            break;
+        }
+
+        $label = $this->values['label'];
+        $sizeLabel = (isset($this->values['sizeLabel']) === true) ? $this->values['sizeLabel'] : 40;
+        $sizeValue = (isset($this->values['sizeValue']) === true) ? $this->values['sizeValue'] : 40;
+
+        $output .= '<div class="container-center">';
+        // General div.
+        $output .= '<div class="container-icon">';
+        // Div value.
+        $output .= '<div style="flex: 0 1 '.$sizeValue.'px; font-size:'.$sizeValue.'px;'.$text_color.'">';
+
+        if (is_numeric($data) === true) {
+            $dataDatos = remove_right_zeros(
+                number_format(
+                    $data,
+                    $config['graph_precision'],
+                    $config['decimal_separator'],
+                    $config['thousand_separator']
+                )
+            );
+        } else {
+            $dataDatos = trim($data);
+        }
+
+        $unit = '';
+        if (empty($this->values['unit']) === false) {
+            $unit = modules_get_unit($id_module);
+        }
+
+        $output .= $dataDatos.'&nbsp;'.$unit;
+
+        $output .= '</div>';
+
+        if (empty($label) === false) {
+            // Div Label.
+            $output .= '<div style="flex: 1 1 '.$sizeLabel.'px; font-size:'.$sizeLabel.'px;'.$text_color.'">'.$label.'</div>';
+        }
+
+        $output .= '</div>';
+        $output .= '</div>';
+        return $output;
+    }
+
+
+    /**
+     * Get description.
+     *
+     * @return string.
+     */
+    public static function getDescription()
+    {
+        return __('Avg|Sum|Max|Min Module Data');
+    }
+
+
+    /**
+     * Get Name.
+     *
+     * @return string.
+     */
+    public static function getName()
+    {
+        return 'AvgSumMaxMinModule';
+    }
+
+
+    /**
+     * Get size Modal Configuration.
+     *
+     * @return array
+     */
+    public function getSizeModalConfiguration(): array
+    {
+        $size = [
+            'width'  => 550,
+            'height' => 710,
+        ];
+
+        return $size;
+    }
+
+
+}

From 0125ba742b53269d879f7e3ca295662dc277acef Mon Sep 17 00:00:00 2001
From: Pablo Aragon <pablo.aragon@pandorafms.com>
Date: Wed, 15 Feb 2023 11:42:50 +0100
Subject: [PATCH 05/25] 9680-Create widget ModulesByStatus

---
 .../lib/Dashboard/Widgets/ModulesByStatus.php  | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/pandora_console/include/lib/Dashboard/Widgets/ModulesByStatus.php b/pandora_console/include/lib/Dashboard/Widgets/ModulesByStatus.php
index e2c83ca59d..21fa53d21c 100644
--- a/pandora_console/include/lib/Dashboard/Widgets/ModulesByStatus.php
+++ b/pandora_console/include/lib/Dashboard/Widgets/ModulesByStatus.php
@@ -302,17 +302,23 @@ class ModulesByStatus extends Widget
             ],
         ];
 
+        // Nodes.
         if (is_metaconsole() === true) {
-            // Nodes fields.
             $nodes_fields = [];
-            $servers_ids = array_column(metaconsole_get_servers(), 'id');
-            foreach ($servers_ids as $server_id) {
-                $nodes_fields[$server_id] = $server_id;
+            $servers_ids = metaconsole_get_servers();
+
+            foreach ($servers_ids as $server) {
+                $nodes_fields[$server['id']] = $server['server_name'];
             }
 
             $nodes_selected = explode(',', $values['nodes']);
 
-            (isset($values['nodes']) === false) ? $nodes_selected = '' : '';
+            (isset($values['nodes']) === false) ? $nodes_selected = $servers_ids : '';
+
+            $nodes_height = count($nodes_fields);
+            if (count($nodes_fields) > 5) {
+                $nodes_height = 5;
+            }
 
             $inputs[] = [
                 'label'     => __('Nodes'),
@@ -324,7 +330,7 @@ class ModulesByStatus extends Widget
                     'return'     => true,
                     'multiple'   => true,
                     'class'      => 'overflow-hidden',
-                    'size'       => count($nodes_fields),
+                    'size'       => $nodes_height,
                     'select_all' => false,
                     'required'   => true,
                 ],

From 5fb43198eabaac3819ea147b511a2cefc7951971 Mon Sep 17 00:00:00 2001
From: Calvo <luis.calvo@pandorafms.com>
Date: Fri, 3 Mar 2023 11:22:39 +0100
Subject: [PATCH 06/25] Fix quores error

---
 pandora_server/lib/PandoraFMS/Core.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm
index 234229b5c1..40196329d1 100644
--- a/pandora_server/lib/PandoraFMS/Core.pm
+++ b/pandora_server/lib/PandoraFMS/Core.pm
@@ -5630,7 +5630,7 @@ sub pandora_server_statistics ($$) {
 				
 				$lag_row = get_db_single_row ($dbh, 
 				"SELECT COUNT(tam.id_agente_modulo) AS module_lag,
-                        AVG(UNIX_TIMESTAMP() - tae.last_execution_try - tae.current_interval) AS "lag" 
+                        AVG(UNIX_TIMESTAMP() - tae.last_execution_try - tae.current_interval) AS lag 
                         FROM (
                           SELECT tagente_estado.last_execution_try, tagente_estado.current_interval, tagente_estado.id_agente_modulo
                               FROM tagente_estado
@@ -5652,7 +5652,7 @@ sub pandora_server_statistics ($$) {
 			# Dataserver LAG calculation:
 			else {
 				$lag_row = get_db_single_row ($dbh, "SELECT COUNT(tam.id_agente_modulo) AS module_lag,
-                            AVG(UNIX_TIMESTAMP() - tae.last_execution_try - tae.current_interval) AS "lag"
+                            AVG(UNIX_TIMESTAMP() - tae.last_execution_try - tae.current_interval) AS lag
                         FROM (
                           SELECT tagente_estado.last_execution_try, tagente_estado.current_interval, tagente_estado.id_agente_modulo
                               FROM tagente_estado

From 2386b87c1d2cb43a2c7eea9e13c6a12f69bc8b2b Mon Sep 17 00:00:00 2001
From: Calvo <luis.calvo@pandorafms.com>
Date: Fri, 3 Mar 2023 11:34:01 +0100
Subject: [PATCH 07/25] Functions servers lag query updated

---
 pandora_console/include/functions_servers.php | 72 ++++++++++++-------
 1 file changed, 45 insertions(+), 27 deletions(-)

diff --git a/pandora_console/include/functions_servers.php b/pandora_console/include/functions_servers.php
index 3f9fe1a6b2..14c8d31813 100644
--- a/pandora_console/include/functions_servers.php
+++ b/pandora_console/include/functions_servers.php
@@ -1017,40 +1017,58 @@ function servers_get_info($id_server=-1)
                 // Remote servers LAG Calculation (server_type != 0).
                 if ($server['server_type'] != 0) {
                     // MySQL 8.0 has function lag(). So, lag must be enclosed in quotations.
-                    $result = db_get_row_sql(
-                        'SELECT COUNT(tagente_modulo.id_agente_modulo) AS module_lag,
-                            AVG(UNIX_TIMESTAMP() - utimestamp - current_interval) AS "lag"
-                        FROM tagente_estado, tagente_modulo, tagente
-                        WHERE utimestamp > 0
-                            AND tagente.disabled = 0
-                            AND tagente.id_agente = tagente_estado.id_agente
-                            AND tagente_modulo.disabled = 0
-                            AND tagente_modulo.id_agente_modulo = tagente_estado.id_agente_modulo
-                            AND current_interval > 0
-                            AND running_by = '.$server['id_server'].'
-                            AND (UNIX_TIMESTAMP() - utimestamp) < ( current_interval * 10)
-                            AND (UNIX_TIMESTAMP() - utimestamp) > current_interval'
+                    $sql = sprintf(
+                        'SELECT COUNT(tam.id_agente_modulo) AS module_lag,
+                        AVG(UNIX_TIMESTAMP() - tae.last_execution_try - tae.current_interval) AS "lag" 
+                        FROM (
+                          SELECT tagente_estado.last_execution_try, tagente_estado.current_interval, tagente_estado.id_agente_modulo
+                              FROM tagente_estado
+                                    WHERE tagente_estado.current_interval > 0
+                                    AND tagente_estado.last_execution_try > 0
+                                    AND tagente_estado.running_by = %d
+                        ) tae
+                    JOIN (
+                            SELECT tagente_modulo.id_agente_modulo
+                                FROM tagente_modulo LEFT JOIN tagente
+                                ON tagente_modulo.id_agente = tagente.id_agente
+                                    WHERE tagente.disabled = 0
+                                    AND tagente_modulo.disabled = 0
+                        ) tam
+                    ON tae.id_agente_modulo = tam.id_agente_modulo
+                    WHERE (UNIX_TIMESTAMP() - tae.last_execution_try) > (tae.current_interval)
+                    AND  (UNIX_TIMESTAMP() - tae.last_execution_try) < ( tae.current_interval * 10)',
+                        $server['id_server']
                     );
                 } else {
                     // Local/Dataserver server LAG calculation.
                     // MySQL 8.0 has function lag(). So, lag must be enclosed in quotations.
-                    $result = db_get_row_sql(
-                        'SELECT COUNT(tagente_modulo.id_agente_modulo) AS module_lag,
-                            AVG(UNIX_TIMESTAMP() - utimestamp - current_interval) AS "lag"
-                        FROM tagente_estado, tagente_modulo, tagente
-                        WHERE utimestamp > 0
-                            AND tagente.disabled = 0
-                            AND tagente.id_agente = tagente_estado.id_agente
-                            AND tagente_modulo.disabled = 0
-                            AND tagente_modulo.id_tipo_modulo < 5
-                            AND tagente_modulo.id_agente_modulo = tagente_estado.id_agente_modulo
-                            AND current_interval > 0
-                            AND (UNIX_TIMESTAMP() - utimestamp) < ( current_interval * 10)
-                            AND running_by = '.$server['id_server'].'
-                            AND (UNIX_TIMESTAMP() - utimestamp) > (current_interval * 1.1)'
+                    $sql = sprintf(
+                        'SELECT COUNT(tam.id_agente_modulo) AS module_lag,
+                            AVG(UNIX_TIMESTAMP() - tae.last_execution_try - tae.current_interval) AS "lag"
+                        FROM (
+                          SELECT tagente_estado.last_execution_try, tagente_estado.current_interval, tagente_estado.id_agente_modulo
+                              FROM tagente_estado
+                                    WHERE tagente_estado.current_interval > 0
+                                    AND tagente_estado.last_execution_try > 0
+                                    AND tagente_estado.running_by = %d
+                        ) tae
+                    JOIN (
+                            SELECT tagente_modulo.id_agente_modulo
+                                FROM tagente_modulo LEFT JOIN tagente
+                                ON tagente_modulo.id_agente = tagente.id_agente
+                                    WHERE tagente.disabled = 0
+                                    AND tagente_modulo.disabled = 0
+                                    AND tagente_modulo.id_tipo_modulo < 5
+                        ) tam
+                    ON tae.id_agente_modulo = tam.id_agente_modulo
+                    WHERE (UNIX_TIMESTAMP() - tae.last_execution_try) > (tae.current_interval * 1.1)
+                    AND  (UNIX_TIMESTAMP() - tae.last_execution_try) < ( tae.current_interval * 10)',
+                        $server['id_server']
                     );
                 }
 
+                $result = db_get_row_sql($sql);
+
                 // Lag over current_interval * 2 is not lag,
                 // it's a timed out module.
                 if (!empty($result['lag'])) {

From 4b31bc340e86e23828f20eb29aece2dbc368d8ac Mon Sep 17 00:00:00 2001
From: Calvo <luis.calvo@pandorafms.com>
Date: Fri, 3 Mar 2023 11:50:21 +0100
Subject: [PATCH 08/25] Fix code style

---
 pandora_console/include/functions_servers.php | 56 ++++++------
 pandora_server/lib/PandoraFMS/Core.pm         | 90 ++++++++++---------
 2 files changed, 76 insertions(+), 70 deletions(-)

diff --git a/pandora_console/include/functions_servers.php b/pandora_console/include/functions_servers.php
index 14c8d31813..3f4071ccf2 100644
--- a/pandora_console/include/functions_servers.php
+++ b/pandora_console/include/functions_servers.php
@@ -1021,22 +1021,22 @@ function servers_get_info($id_server=-1)
                         'SELECT COUNT(tam.id_agente_modulo) AS module_lag,
                         AVG(UNIX_TIMESTAMP() - tae.last_execution_try - tae.current_interval) AS "lag" 
                         FROM (
-                          SELECT tagente_estado.last_execution_try, tagente_estado.current_interval, tagente_estado.id_agente_modulo
-                              FROM tagente_estado
-                                    WHERE tagente_estado.current_interval > 0
-                                    AND tagente_estado.last_execution_try > 0
-                                    AND tagente_estado.running_by = %d
+                            SELECT tagente_estado.last_execution_try, tagente_estado.current_interval, tagente_estado.id_agente_modulo
+                            FROM tagente_estado
+                            WHERE tagente_estado.current_interval > 0
+                            AND tagente_estado.last_execution_try > 0
+                            AND tagente_estado.running_by = %d
                         ) tae
-                    JOIN (
+                        JOIN (
                             SELECT tagente_modulo.id_agente_modulo
-                                FROM tagente_modulo LEFT JOIN tagente
-                                ON tagente_modulo.id_agente = tagente.id_agente
-                                    WHERE tagente.disabled = 0
-                                    AND tagente_modulo.disabled = 0
+                            FROM tagente_modulo LEFT JOIN tagente
+                            ON tagente_modulo.id_agente = tagente.id_agente
+                            WHERE tagente.disabled = 0
+                            AND tagente_modulo.disabled = 0
                         ) tam
-                    ON tae.id_agente_modulo = tam.id_agente_modulo
-                    WHERE (UNIX_TIMESTAMP() - tae.last_execution_try) > (tae.current_interval)
-                    AND  (UNIX_TIMESTAMP() - tae.last_execution_try) < ( tae.current_interval * 10)',
+                        ON tae.id_agente_modulo = tam.id_agente_modulo
+                        WHERE (UNIX_TIMESTAMP() - tae.last_execution_try) > (tae.current_interval)
+                        AND  (UNIX_TIMESTAMP() - tae.last_execution_try) < ( tae.current_interval * 10)',
                         $server['id_server']
                     );
                 } else {
@@ -1044,25 +1044,25 @@ function servers_get_info($id_server=-1)
                     // MySQL 8.0 has function lag(). So, lag must be enclosed in quotations.
                     $sql = sprintf(
                         'SELECT COUNT(tam.id_agente_modulo) AS module_lag,
-                            AVG(UNIX_TIMESTAMP() - tae.last_execution_try - tae.current_interval) AS "lag"
+                        AVG(UNIX_TIMESTAMP() - tae.last_execution_try - tae.current_interval) AS "lag"
                         FROM (
                           SELECT tagente_estado.last_execution_try, tagente_estado.current_interval, tagente_estado.id_agente_modulo
-                              FROM tagente_estado
-                                    WHERE tagente_estado.current_interval > 0
-                                    AND tagente_estado.last_execution_try > 0
-                                    AND tagente_estado.running_by = %d
+                            FROM tagente_estado
+                            WHERE tagente_estado.current_interval > 0
+                            AND tagente_estado.last_execution_try > 0
+                            AND tagente_estado.running_by = %d
                         ) tae
-                    JOIN (
+                        JOIN (
                             SELECT tagente_modulo.id_agente_modulo
-                                FROM tagente_modulo LEFT JOIN tagente
-                                ON tagente_modulo.id_agente = tagente.id_agente
-                                    WHERE tagente.disabled = 0
-                                    AND tagente_modulo.disabled = 0
-                                    AND tagente_modulo.id_tipo_modulo < 5
-                        ) tam
-                    ON tae.id_agente_modulo = tam.id_agente_modulo
-                    WHERE (UNIX_TIMESTAMP() - tae.last_execution_try) > (tae.current_interval * 1.1)
-                    AND  (UNIX_TIMESTAMP() - tae.last_execution_try) < ( tae.current_interval * 10)',
+                            FROM tagente_modulo LEFT JOIN tagente
+                            ON tagente_modulo.id_agente = tagente.id_agente
+                            WHERE tagente.disabled = 0
+                            AND tagente_modulo.disabled = 0
+                            AND tagente_modulo.id_tipo_modulo < 5
+                    ) tam
+                        ON tae.id_agente_modulo = tam.id_agente_modulo
+                        WHERE (UNIX_TIMESTAMP() - tae.last_execution_try) > (tae.current_interval * 1.1)
+                        AND  (UNIX_TIMESTAMP() - tae.last_execution_try) < ( tae.current_interval * 10)',
                         $server['id_server']
                     );
                 }
diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm
index 40196329d1..b911f05b50 100644
--- a/pandora_server/lib/PandoraFMS/Core.pm
+++ b/pandora_server/lib/PandoraFMS/Core.pm
@@ -5627,50 +5627,56 @@ sub pandora_server_statistics ($$) {
 
 			# Non-dataserver LAG calculation:
 			if ($server->{"server_type"} != DATASERVER){
-				
-				$lag_row = get_db_single_row ($dbh, 
-				"SELECT COUNT(tam.id_agente_modulo) AS module_lag,
-                        AVG(UNIX_TIMESTAMP() - tae.last_execution_try - tae.current_interval) AS lag 
-                        FROM (
-                          SELECT tagente_estado.last_execution_try, tagente_estado.current_interval, tagente_estado.id_agente_modulo
-                              FROM tagente_estado
-                                    WHERE tagente_estado.current_interval > 0
-                                    AND tagente_estado.last_execution_try > 0
-                                    AND tagente_estado.running_by = ?
-                        ) tae
-                    JOIN (
-                            SELECT tagente_modulo.id_agente_modulo
-                                FROM tagente_modulo LEFT JOIN tagente
-                                ON tagente_modulo.id_agente = tagente.id_agente
-                                    WHERE tagente.disabled = 0
-                                    AND tagente_modulo.disabled = 0
-                        ) tam
-                    ON tae.id_agente_modulo = tam.id_agente_modulo
-                    WHERE (UNIX_TIMESTAMP() - tae.last_execution_try) > (tae.current_interval)
-                    AND  (UNIX_TIMESTAMP() - tae.last_execution_try) < ( tae.current_interval * 10)", $server->{"id_server"});
-			}
+				$lag_row = get_db_single_row (
+					$dbh,
+					"SELECT COUNT(tam.id_agente_modulo) AS module_lag,
+					AVG(UNIX_TIMESTAMP() - tae.last_execution_try - tae.current_interval) AS lag 
+					FROM (
+						SELECT tagente_estado.last_execution_try, tagente_estado.current_interval, tagente_estado.id_agente_modulo
+						FROM tagente_estado
+						WHERE tagente_estado.current_interval > 0
+						AND tagente_estado.last_execution_try > 0
+						AND tagente_estado.running_by = ?
+					) tae
+					JOIN (
+						SELECT tagente_modulo.id_agente_modulo
+						FROM tagente_modulo LEFT JOIN tagente
+						ON tagente_modulo.id_agente = tagente.id_agente
+						WHERE tagente.disabled = 0
+						AND tagente_modulo.disabled = 0
+					) tam
+					ON tae.id_agente_modulo = tam.id_agente_modulo
+					WHERE (UNIX_TIMESTAMP() - tae.last_execution_try) > (tae.current_interval)
+					AND  (UNIX_TIMESTAMP() - tae.last_execution_try) < ( tae.current_interval * 10)",
+					$server->{"id_server"}
+				);
+}
 			# Dataserver LAG calculation:
 			else {
-				$lag_row = get_db_single_row ($dbh, "SELECT COUNT(tam.id_agente_modulo) AS module_lag,
-                            AVG(UNIX_TIMESTAMP() - tae.last_execution_try - tae.current_interval) AS lag
-                        FROM (
-                          SELECT tagente_estado.last_execution_try, tagente_estado.current_interval, tagente_estado.id_agente_modulo
-                              FROM tagente_estado
-                                    WHERE tagente_estado.current_interval > 0
-                                    AND tagente_estado.last_execution_try > 0
-                                    AND tagente_estado.running_by = ?
-                        ) tae
-                    JOIN (
-                            SELECT tagente_modulo.id_agente_modulo
-                                FROM tagente_modulo LEFT JOIN tagente
-                                ON tagente_modulo.id_agente = tagente.id_agente
-                                    WHERE tagente.disabled = 0
-                                    AND tagente_modulo.disabled = 0
-                                    AND tagente_modulo.id_tipo_modulo < 5
-                        ) tam
-                    ON tae.id_agente_modulo = tam.id_agente_modulo
-                    WHERE (UNIX_TIMESTAMP() - tae.last_execution_try) > (tae.current_interval * 1.1)
-                    AND  (UNIX_TIMESTAMP() - tae.last_execution_try) < ( tae.current_interval * 10)", $server->{"id_server"});
+				$lag_row = get_db_single_row (
+					$dbh,
+					"SELECT COUNT(tam.id_agente_modulo) AS module_lag,
+					AVG(UNIX_TIMESTAMP() - tae.last_execution_try - tae.current_interval) AS lag
+					FROM (
+						SELECT tagente_estado.last_execution_try, tagente_estado.current_interval, tagente_estado.id_agente_modulo
+						FROM tagente_estado
+						WHERE tagente_estado.current_interval > 0
+						AND tagente_estado.last_execution_try > 0
+						AND tagente_estado.running_by = ?
+						) tae
+						JOIN (
+							SELECT tagente_modulo.id_agente_modulo
+							FROM tagente_modulo LEFT JOIN tagente
+							ON tagente_modulo.id_agente = tagente.id_agente
+							WHERE tagente.disabled = 0
+							AND tagente_modulo.disabled = 0
+							AND tagente_modulo.id_tipo_modulo < 5
+						) tam
+					ON tae.id_agente_modulo = tam.id_agente_modulo
+					WHERE (UNIX_TIMESTAMP() - tae.last_execution_try) > (tae.current_interval * 1.1)
+					AND  (UNIX_TIMESTAMP() - tae.last_execution_try) < ( tae.current_interval * 10)",
+					$server->{"id_server"}
+				);
 			}
 			
 			$server->{"module_lag"} = $lag_row->{'module_lag'};

From 6cee279de7823dc460ff0b1da902fa1367500628 Mon Sep 17 00:00:00 2001
From: "alejandro.campos@artica.es" <alejandro.campos@artica.es>
Date: Fri, 3 Mar 2023 12:49:54 +0100
Subject: [PATCH 09/25] fixed entities

---
 pandora_console/godmode/reporting/map_builder.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pandora_console/godmode/reporting/map_builder.php b/pandora_console/godmode/reporting/map_builder.php
index f85849a4ea..e7aecf917d 100644
--- a/pandora_console/godmode/reporting/map_builder.php
+++ b/pandora_console/godmode/reporting/map_builder.php
@@ -487,9 +487,9 @@ if (!$maps && !is_metaconsole()) {
         $data = [];
 
         if (!is_metaconsole()) {
-            $data[0] = '<a href="index.php?sec=network&amp;sec2=operation/visual_console/render_view&amp;id='.$map['id'].'&amp;refr='.$refr.'">'.$map['name'].'</a>';
+            $data[0] = '<a href="index.php?sec=network&amp;sec2=operation/visual_console/render_view&amp;id='.$map['id'].'&amp;refr='.$refr.'">'.io_safe_output($map['name']).'</a>';
         } else {
-            $data[0] = '<a href="index.php?sec=screen&sec2=screens/screens&action=visualmap&pure='.$pure.'&id_visualmap='.$map['id'].'&amp;refr='.$refr.'">'.$map['name'].'</a>';
+            $data[0] = '<a href="index.php?sec=screen&sec2=screens/screens&action=visualmap&pure='.$pure.'&id_visualmap='.$map['id'].'&amp;refr='.$refr.'">'.io_safe_output($map['name']).'</a>';
         }
 
         $data[1] = ui_print_group_icon($map['id_group'], true);

From 4c926f1e046d4bcff8c1f5ff894a58e7c243a7da Mon Sep 17 00:00:00 2001
From: "alejandro.campos@artica.es" <alejandro.campos@artica.es>
Date: Thu, 9 Mar 2023 09:07:04 +0100
Subject: [PATCH 10/25] fixed entities

---
 pandora_console/godmode/reporting/map_builder.php            | 4 ++--
 pandora_console/godmode/reporting/visual_console_builder.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pandora_console/godmode/reporting/map_builder.php b/pandora_console/godmode/reporting/map_builder.php
index 42610ff4c5..898c3becda 100644
--- a/pandora_console/godmode/reporting/map_builder.php
+++ b/pandora_console/godmode/reporting/map_builder.php
@@ -511,9 +511,9 @@ if (!$maps && is_metaconsole() === false) {
         $data = [];
 
         if (is_metaconsole() === false) {
-            $data[0] = '<a href="index.php?sec=network&amp;sec2=operation/visual_console/render_view&amp;id='.$map['id'].'&amp;refr='.$refr.'">'.io_safe_output($map['name']).'</a>';
+            $data[0] = '<a href="index.php?sec=network&amp;sec2=operation/visual_console/render_view&amp;id='.$map['id'].'&amp;refr='.$refr.'">'.$map['name'].'</a>';
         } else {
-            $data[0] = '<a href="index.php?sec=screen&sec2=screens/screens&action=visualmap&pure='.$pure.'&id='.$map['id'].'&amp;refr='.$refr.'">'.io_safe_output($map['name']).'</a>';
+            $data[0] = '<a href="index.php?sec=screen&sec2=screens/screens&action=visualmap&pure='.$pure.'&id='.$map['id'].'&amp;refr='.$refr.'">'.$map['name'].'</a>';
         }
 
         $data[1] = ui_print_group_icon($map['id_group'], true);
diff --git a/pandora_console/godmode/reporting/visual_console_builder.php b/pandora_console/godmode/reporting/visual_console_builder.php
index ca1e0386bf..dfc73b8f67 100755
--- a/pandora_console/godmode/reporting/visual_console_builder.php
+++ b/pandora_console/godmode/reporting/visual_console_builder.php
@@ -165,7 +165,7 @@ switch ($activeTab) {
                 $background_color = (string) get_parameter('background_color');
                 $width = (int) get_parameter('width');
                 $height = (int) get_parameter('height');
-                $visualConsoleName = io_safe_input((string) get_parameter('name'));
+                $visualConsoleName = (string) get_parameter('name');
                 $is_favourite  = (int) get_parameter('is_favourite_sent');
                 $auto_adjust  = (int) get_parameter('auto_adjust_sent');
 

From edbc9d8f6b224c1d9da4418aa0b8027d70c4a9b0 Mon Sep 17 00:00:00 2001
From: Jose Gonzalez <jose.gonzalez@pandorafms.com>
Date: Thu, 9 Mar 2023 23:31:40 +0100
Subject: [PATCH 11/25] Icons review

---
 pandora_console/extensions/files_repo.php     |  8 +-
 .../extensions/files_repo/files_repo_list.php | 11 ++-
 .../godmode/agentes/inventory_manager.php     |  8 +-
 .../agentes/module_manager_editor_common.php  | 33 +++++----
 .../godmode/alerts/alert_commands.php         |  4 +-
 .../godmode/alerts/alert_list.list.php        |  2 +-
 pandora_console/godmode/alerts/alert_list.php |  8 +-
 .../godmode/alerts/alert_templates.php        |  2 +-
 pandora_console/godmode/extensions.php        |  3 +-
 .../module_library/module_library_view.php    |  6 +-
 .../godmode/reporting/reporting_builder.php   | 14 ++--
 .../godmode/setup/setup_general.php           |  8 +-
 .../godmode/setup/setup_visuals.php           | 10 +--
 .../godmode/snmpconsole/snmp_alert.php        |  6 +-
 .../wizards/DiscoveryTaskList.class.php       | 74 +++++++++----------
 .../include/class/CalendarManager.class.php   | 10 +--
 .../include/class/Diagnostics.class.php       |  4 +-
 .../include/class/EventSound.class.php        | 10 +--
 pandora_console/include/functions_cron.php    | 50 ++++++-------
 .../include/functions_integriaims.php         | 10 +--
 .../include/functions_notifications.php       | 18 +++--
 .../include/functions_snmp_browser.php        |  2 +-
 .../lib/ClusterViewer/ClusterManager.php      | 12 +--
 .../rest-api/models/VisualConsole/View.php    | 54 ++++++++------
 .../operation/netflow/nf_live_view.php        |  6 +-
 .../operation/reporting/reporting_viewer.php  | 18 ++---
 pandora_console/operation/users/user_edit.php |  4 +-
 pandora_console/views/cluster/edit.php        |  8 +-
 pandora_console/views/cluster/view.php        | 22 +++---
 29 files changed, 222 insertions(+), 203 deletions(-)

diff --git a/pandora_console/extensions/files_repo.php b/pandora_console/extensions/files_repo.php
index 0313af90b2..656c3377c7 100644
--- a/pandora_console/extensions/files_repo.php
+++ b/pandora_console/extensions/files_repo.php
@@ -115,11 +115,11 @@ function pandora_files_repo_godmode()
     }
 
     // Header tabs.
-    $godmode['text'] = '<a href="index.php?sec=godmode/extensions&sec2=extensions/files_repo">'.html_print_image('images/setup.png', true, ['title' => __('Administration view'), 'class' => 'invert_filter']).'</a>';
+    $godmode['text'] = '<a href="index.php?sec=godmode/extensions&sec2=extensions/files_repo">'.html_print_image('images/configuration@svg.svg', true, ['title' => __('Administration view'), 'class' => 'main_menu_icon invert_filter']).'</a>';
     $godmode['godmode'] = 1;
     $godmode['active'] = 1;
 
-    $operation['text'] = '<a href="index.php?sec=extensions&sec2=extensions/files_repo">'.html_print_image('images/eye_show.png', true, ['title' => __('Operation view'), 'class' => 'invert_filter']).'</a>';
+    $operation['text'] = '<a href="index.php?sec=extensions&sec2=extensions/files_repo">'.html_print_image('images/see-details@svg.svg', true, ['title' => __('Operation view'), 'class' => 'main_menu_icon invert_filter']).'</a>';
     $operation['operation'] = 1;
 
     $onheader = [
@@ -226,10 +226,10 @@ function pandora_files_repo_operation()
     // Header tabs.
     $onheader = [];
     if (check_acl($config['id_user'], 0, 'PM')) {
-        $godmode['text'] = '<a href="index.php?sec=godmode/extensions&sec2=extensions/files_repo">'.html_print_image('images/setup.png', true, ['title' => __('Administration view'), 'class' => 'invert_filter']).'</a>';
+        $godmode['text'] = '<a href="index.php?sec=godmode/extensions&sec2=extensions/files_repo">'.html_print_image('images/configuration@svg.svg', true, ['title' => __('Administration view'), 'class' => 'main_menu_icon invert_filter']).'</a>';
         $godmode['godmode'] = 1;
 
-        $operation['text'] = '<a href="index.php?sec=extensions&sec2=extensions/files_repo">'.html_print_image('images/eye_show.png', true, ['title' => __('Operation view'), 'class' => 'invert_filter']).'</a>';
+        $operation['text'] = '<a href="index.php?sec=extensions&sec2=extensions/files_repo">'.html_print_image('images/see-details@svg.svg', true, ['title' => __('Operation view'), 'class' => 'main_menu_icon invert_filter']).'</a>';
         $operation['operation'] = 1;
         $operation['active'] = 1;
 
diff --git a/pandora_console/extensions/files_repo/files_repo_list.php b/pandora_console/extensions/files_repo/files_repo_list.php
index 6c75218d18..2cb464eec3 100644
--- a/pandora_console/extensions/files_repo/files_repo_list.php
+++ b/pandora_console/extensions/files_repo/files_repo_list.php
@@ -133,9 +133,12 @@ if (!empty($files)) {
             );
             $data[4] .= "<a href=\"$config_url\">";
             $data[4] .= html_print_image(
-                'images/config.png',
+                'images/edit.svg',
                 true,
-                ['title' => __('Edit')]
+                [
+                    'title' => __('Edit'),
+                    'class' => 'main_menu_icon invert_filter',
+                ]
             );
             // Edit image
             $data[4] .= '</a>';
@@ -145,11 +148,11 @@ if (!empty($files)) {
             );
             $data[4] .= " <a href=\"$delete_url\" onClick=\"if (!confirm('".__('Are you sure?')."')) return false;\">";
             $data[4] .= html_print_image(
-                'images/cross.png',
+                'images/delete.svg',
                 true,
                 [
                     'title' => __('Delete'),
-                    'class' => 'invert_filter',
+                    'class' => 'main_menu_icon invert_filter',
                 ]
             );
             // Delete image
diff --git a/pandora_console/godmode/agentes/inventory_manager.php b/pandora_console/godmode/agentes/inventory_manager.php
index b8d8014545..42984caeda 100644
--- a/pandora_console/godmode/agentes/inventory_manager.php
+++ b/pandora_console/godmode/agentes/inventory_manager.php
@@ -235,7 +235,7 @@ if (db_get_num_rows($sql) == 0) {
         if ($id_policy) {
             $policy = policies_get_policy($id_policy);
             $data[0] = '<a href="index.php?sec=gmodules&sec2='.ENTERPRISE_DIR.'/godmode/policies/policies&id='.$id_policy.'">';
-            $data[0] .= html_print_image('images/policies_mc.png', true, ['border' => '0', 'title' => $policy['name']]);
+            $data[0] .= html_print_image('images/policy@svg.svg', true, ['border' => '0', 'title' => $policy['name'], 'class' => 'main_menu_icon invert_filter']);
             $data[0] .= '</a>';
         } else {
             $data[0] = '';
@@ -247,15 +247,15 @@ if (db_get_num_rows($sql) == 0) {
         $data[4] = human_time_description_raw($row['interval']);
         // Delete module
         $data[5] = '<a href="index.php?sec=estado&sec2=godmode/agentes/configurar_agente&tab=inventory&id_agente='.$id_agente.'&delete_inventory_module='.$row['id_agent_module_inventory'].'" onClick="if (!confirm(\''.__('Are you sure?').'\')) return false;">';
-        $data[5] .= html_print_image('images/cross.png', true, ['border' => '0', 'title' => __('Delete'), 'class' => 'invert_filter']);
+        $data[5] .= html_print_image('images/delete.svg', true, ['border' => '0', 'title' => __('Delete'), 'class' => 'main_menu_icon invert_filter']);
         $data[5] .= '</b></a>&nbsp;&nbsp;';
         // Update module
         $data[5] .= '<a href="index.php?sec=estado&sec2=godmode/agentes/configurar_agente&tab=inventory&id_agente='.$id_agente.'&load_inventory_module='.$row['id_module_inventory'].'">';
-        $data[5] .= html_print_image('images/config.png', true, ['border' => '0', 'title' => __('Update'), 'class' => 'invert_filter']);
+        $data[5] .= html_print_image('images/edit.svg', true, ['border' => '0', 'title' => __('Update'), 'class' => 'main_menu_icon invert_filter']);
         $data[5] .= '</b></a>&nbsp;&nbsp;';
         // Force refresh module
         $data[5] .= '<a href="index.php?sec=estado&sec2=godmode/agentes/configurar_agente&tab=inventory&id_agente='.$id_agente.'&force_inventory_module='.$row['id_agent_module_inventory'].'">';
-        $data[5] .= html_print_image('images/target.png', true, ['border' => '0', 'title' => __('Force'), 'class' => 'invert_filter']).'</b></a>';
+        $data[5] .= html_print_image('images/change-active.svg', true, ['border' => '0', 'title' => __('Force'), 'class' => 'main_menu_icon invert_filter']).'</b></a>';
         array_push($table->data, $data);
     }
 
diff --git a/pandora_console/godmode/agentes/module_manager_editor_common.php b/pandora_console/godmode/agentes/module_manager_editor_common.php
index 085afcb455..2cceb5fa34 100644
--- a/pandora_console/godmode/agentes/module_manager_editor_common.php
+++ b/pandora_console/godmode/agentes/module_manager_editor_common.php
@@ -290,7 +290,7 @@ $table_simple->rowclass['captions_module_n_type'] = 'field_half_width pdd_t_10px
 $table_simple->rowclass['module_n_type'] = 'field_half_width';
 $table_simple->data['captions_module_n_type'][0] = html_print_input_hidden('id_module_type_hidden', $id_module_type, true);
 $table_simple->data['captions_module_n_type'][0] .= __('Module group');
-$table_simple->data['captions_module_n_type'][1] = __('Type').ui_print_help_icon($help_type, true, '', 'images/help_green.png', '', 'module_type_help');
+$table_simple->data['captions_module_n_type'][1] = __('Type').ui_print_help_icon($help_type, true, '', '', '', 'module_type_help');
 // Module group and Type.
 $table_simple->rowclass['module_n_type'] = 'field_half_width';
 $table_simple->data['module_n_type'][0] .= html_print_select_from_sql(
@@ -1437,7 +1437,7 @@ if (isset($module_macros)) {
             $table_macros->data[$macro_count][2] = __('Value');
             $table_macros->data[$macro_count][3] = html_print_input_text('module_macro_values[]', $macro_value, '', 50, 60, true, $disabledBecauseInPolicy, false, '', $classdisabledBecauseInPolicy);
             if (!$disabledBecauseInPolicy) {
-                $table_macros->data[$macro_count][4] = '<a href="javascript: delete_macro('.$macro_count.');">'.html_print_image('images/cross.png', true, ['class' => 'invert_filter']).'</a>';
+                $table_macros->data[$macro_count][4] = '<a href="javascript: delete_macro('.$macro_count.');">'.html_print_image('images/delete.svg', true, ['class' => 'main_menu_icon invert_filter']).'</a>';
             }
 
             $macro_count++;
@@ -1446,7 +1446,7 @@ if (isset($module_macros)) {
 }
 
 if (!$disabledBecauseInPolicy) {
-    $table_macros->data[$macro_count][0] = '<span>'.__('Custom macros').'</span> <a href="javascript:add_macro();">'.html_print_image('images/add.png', true, ['class' => 'invert_filter']).'</a>';
+    $table_macros->data[$macro_count][0] = '<span>'.__('Custom macros').'</span> <a href="javascript:add_macro();">'.html_print_image('images/fail@svg.svg', true, ['style' => 'rotate:45deg', 'class' => 'main_menu_icon invert_filter']).'</a>';
 
     $table_macros->colspan[$macro_count][0] = 5;
 }
@@ -1535,14 +1535,15 @@ $table_relations->data[-1][1] = '';
 $table_relations->data[-1][2] = '';
 $table_relations->data[-1][3] = '<a id="disable_updates_button" class="alpha50" href="">';
 $table_relations->data[-1][3] .= html_print_image(
-    'images/lock_mc.png',
-    true
+    'images/policy@svg.svg',
+    true,
+    ['class' => 'main_menu_icon invert_filter']
 ).'</a>';
 $table_relations->data[-1][4] = '<a id="delete_relation_button" href="">';
 $table_relations->data[-1][4] .= html_print_image(
-    'images/cross.png',
+    'images/delete.svg',
     true,
-    ['class' => 'invert_filter']
+    ['class' => 'main_menu_icon invert_filter']
 ).'</a>';
 
 
@@ -1598,15 +1599,15 @@ if ($id_agent_module) {
         $table_relations->data[$relations_count][2] = ($module_relation['type'] === 'direct') ? __('Direct') : __('Failover');
         // Lock relationship updates.
         $table_relations->data[$relations_count][3] = '<a id="disable_updates_button" class="'.$disabled_update_class.'"href="javascript: change_lock_relation('.$relations_count.', '.$module_relation['id'].');">'.html_print_image(
-            'images/lock_mc.png',
+            'images/policy@svg.svg',
             true,
-            ['class' => 'invert_filter']
+            ['class' => 'main_menu_icon invert_filter']
         ).'</a>';
         // Delete relationship.
         $table_relations->data[$relations_count][4] = '<a id="delete_relation_button" href="javascript: delete_relation('.$relations_count.', '.$module_relation['id'].');">'.html_print_image(
-            'images/cross.png',
+            'images/delete.svg',
             true,
-            ['class' => 'invert_filter']
+            ['class' => 'main_menu_icon invert_filter']
         ).'</a>';
         $relations_count++;
     }
@@ -2035,7 +2036,7 @@ function change_modules_autocomplete_input () {
     var id_agent = parseInt($("#hidden-autocomplete_id_agent").val());
     var module_autocomplete = $("#module_autocomplete");
     var load_icon = '<?php html_print_image('images/spinner.gif', false); ?>';
-    var error_icon = '<?php html_print_image('images/error_red.png', false); ?>';
+    var error_icon = '<?php html_print_image('images/error-red@svg.svg', false, ['class' => 'main_menu_icon invert_filter']); ?>';
     if (!module_autocomplete.hasClass('working')) {
         module_autocomplete.addClass('working');
         module_autocomplete.html(load_icon);
@@ -2086,8 +2087,8 @@ function add_new_relation () {
     var button = $("#button-add_relation");
     var iconPlaceholder = $("#add_relation_status");
     var load_icon = '<?php html_print_image('images/spinner.gif', false, ['style' => 'vertical-align:middle;']); ?>';
-    var suc_icon = '<?php html_print_image('images/ok.png', false, ['style' => 'vertical-align:middle;']); ?>';
-    var error_icon = '<?php html_print_image('images/error_red.png', false, ['style' => 'vertical-align:middle;']); ?>';
+    var suc_icon = '<?php html_print_image('images/validate.svg', false, ['class' => 'main_menu_icon invert_filter', 'style' => 'vertical-align:middle;']); ?>';
+    var error_icon = '<?php html_print_image('images/error-red@svg.svg', false, ['class' => 'main_menu_icon invert_filter', 'style' => 'vertical-align:middle;']); ?>';
 
     if (!button.hasClass('working')) {
         button.addClass('working');
@@ -2129,12 +2130,12 @@ function add_new_relation () {
                                     '<td id="module_relations-' + relationsCount + '-2">' + relation_type + '</td>' +
                                     '<td id="module_relations-' + relationsCount + '-3" class="w10p center">' +
                                         '<a id="disable_updates_button" class="alpha50" href="javascript: change_lock_relation(' + relationsCount + ', ' + data + ');">' +
-                                            '<?php echo html_print_image('images/lock_mc.png', true, ['class' => 'invert_filter']); ?>' +
+                                            '<?php echo html_print_image('images/policy@svg.svg', true, ['class' => 'main_menu_icon invert_filter']); ?>' +
                                         '</a>' +
                                     '</td>' +
                                     '<td id="module_relations-' + relationsCount + '-4" class="w10p center">' +
                                         '<a id="delete_relation_button" href="javascript: delete_relation(' + relationsCount + ', ' + data +  ');">' +
-                                            '<?php echo html_print_image('images/cross.png', true, ['class' => 'invert_filter']); ?>' +
+                                            '<?php echo html_print_image('images/delete.svg', true, ['class' => 'main_menu_icon invert_filter']); ?>' +
                                         '</a>' +
                                     '</td>' +
                                 '</tr>';
diff --git a/pandora_console/godmode/alerts/alert_commands.php b/pandora_console/godmode/alerts/alert_commands.php
index 696882e133..9b22483f5c 100644
--- a/pandora_console/godmode/alerts/alert_commands.php
+++ b/pandora_console/godmode/alerts/alert_commands.php
@@ -809,10 +809,10 @@ foreach ($commands as $command) {
         if (is_user_admin($config['id_user']) === true) {
                     $data['action'] = '<span class="inline_flex">';
             $data['action'] .= '<a href="index.php?sec='.$sec.'&sec2=godmode/alerts/alert_commands&amp;copy_command=1&id='.$command['id'].'&pure='.$pure.'&offset='.$offset.'"
-            onClick="if (!confirm(\''.__('Are you sure?').'\')) return false;">'.html_print_image('images/copy.png', true, ['class' => 'invert_filter']).'</a>';
+            onClick="if (!confirm(\''.__('Are you sure?').'\')) return false;">'.html_print_image('images/copy.svg', true, ['class' => 'main_menu_icon invert_filter']).'</a>';
 
             $data['action'] .= '<a href="index.php?sec='.$sec.'&sec2=godmode/alerts/alert_commands&delete_command=1&id='.$command['id'].'&pure='.$pure.'&offset='.$offset_delete.'"
-			onClick="if (!confirm(\''.__('Are you sure?').'\')) return false;">'.html_print_image('images/cross.png', true, ['class' => 'invert_filter']).'</a>';
+			onClick="if (!confirm(\''.__('Are you sure?').'\')) return false;">'.html_print_image('images/delete.svg', true, ['class' => 'main_menu_icon invert_filter']).'</a>';
             $data['action'] .= '</span>';
         }
     }
diff --git a/pandora_console/godmode/alerts/alert_list.list.php b/pandora_console/godmode/alerts/alert_list.list.php
index 854905343a..f844d2c18d 100644
--- a/pandora_console/godmode/alerts/alert_list.list.php
+++ b/pandora_console/godmode/alerts/alert_list.list.php
@@ -1053,7 +1053,7 @@ foreach ($simple_alerts as $alert) {
         $data[4] .= '<form class="view_alert_form display_in" method="post" action="index.php?sec=galertas&sec2=godmode/alerts/alert_view">';
         $data[4] .= html_print_input_image(
             'view_alert',
-            'images/operation.png',
+            'images/details.svg',
             1,
             '',
             true,
diff --git a/pandora_console/godmode/alerts/alert_list.php b/pandora_console/godmode/alerts/alert_list.php
index 4d23bb8d6f..55f786c3c2 100644
--- a/pandora_console/godmode/alerts/alert_list.php
+++ b/pandora_console/godmode/alerts/alert_list.php
@@ -478,17 +478,17 @@ if ($standbyoff_alert) {
 
 
 $searchFlag = true;
-if (!is_metaconsole()) {
+if (is_metaconsole() === false) {
     // The tabs will be shown only with manage alerts permissions
     if (check_acl($config['id_user'], 0, 'LW') || check_acl($config['id_user'], 0, 'LM')) {
         $buttons = [
             'list'    => [
                 'active' => false,
-                'text'   => '<a href="index.php?sec=galertas&sec2=godmode/alerts/alert_list&tab=list&pure='.$pure.'">'.html_print_image('images/list.png', true, ['title' => __('List alerts'), 'class' => 'invert_filter']).'</a>',
+                'text'   => '<a href="index.php?sec=galertas&sec2=godmode/alerts/alert_list&tab=list&pure='.$pure.'">'.html_print_image('images/load@svg.svg', true, ['title' => __('List alerts'), 'class' => 'main_menu_icon invert_filter']).'</a>',
             ],
             'builder' => [
                 'active' => false,
-                'text'   => '<a href="index.php?sec=galertas&sec2=godmode/alerts/alert_list&tab=builder&pure='.$pure.'">'.html_print_image('images/pencil.png', true, ['title' => __('Builder alert'), 'class' => 'invert_filter']).'</a>',
+                'text'   => '<a href="index.php?sec=galertas&sec2=godmode/alerts/alert_list&tab=builder&pure='.$pure.'">'.html_print_image('images/edit.svg', true, ['title' => __('Builder alert'), 'class' => 'main_menu_icon invert_filter']).'</a>',
             ],
         ];
 
@@ -497,7 +497,7 @@ if (!is_metaconsole()) {
         $buttons = '';
     }
 
-    if ($tab == 'list') {
+    if ($tab === 'list') {
         ui_print_standard_header(
             __('Alerts'),
             'images/gm_alerts.png',
diff --git a/pandora_console/godmode/alerts/alert_templates.php b/pandora_console/godmode/alerts/alert_templates.php
index fbe2835354..23d94b094d 100644
--- a/pandora_console/godmode/alerts/alert_templates.php
+++ b/pandora_console/godmode/alerts/alert_templates.php
@@ -450,7 +450,7 @@ foreach ($templates as $template) {
         $data[4] .= html_print_input_hidden('source_id', $template['id'], true);
         $data[4] .= html_print_input_image(
             'dup',
-            'images/copy.png',
+            'images/copy.svg',
             1,
             '',
             true,
diff --git a/pandora_console/godmode/extensions.php b/pandora_console/godmode/extensions.php
index 8faef70d3e..69c5e59b8b 100644
--- a/pandora_console/godmode/extensions.php
+++ b/pandora_console/godmode/extensions.php
@@ -295,7 +295,8 @@ foreach ($extensions as $file => $extension) {
             $data[] = html_print_menu_button(
                 [
                     'href'    => 'index.php?sec=godmode/extensions&amp;sec2=godmode/extensions&enterprise='.(int) $extension['enterprise'].'&delete='.$file,
-                    'image'   => 'images/cross.png',
+                    'image'   => 'images/delete.svg',
+                    'class'   => 'main_menu_icon invert_filter',
                     'title'   => __('Delete'),
                     'onClick' => 'if (!confirm(\''.__('Are you sure?').'\')) return false;',
                 ],
diff --git a/pandora_console/godmode/module_library/module_library_view.php b/pandora_console/godmode/module_library/module_library_view.php
index aeab26be20..aea7681f3b 100644
--- a/pandora_console/godmode/module_library/module_library_view.php
+++ b/pandora_console/godmode/module_library/module_library_view.php
@@ -45,18 +45,18 @@ if (! check_acl($config['id_user'], 0, 'AR')) {
 if (check_acl($config['id_user'], 0, 'PM') && enterprise_installed()) {
     $buttons['setup'] = [
         'active' => false,
-        'text'   => '<a href="index.php?sec=general&sec2=godmode/setup/setup&amp;section=module_library">'.html_print_image('images/gm_setup.png', true, ['title' => __('Setup'), 'class' => 'invert_filter']).'</a>',
+        'text'   => '<a href="index.php?sec=general&sec2=godmode/setup/setup&amp;section=module_library">'.html_print_image('images/configuration@svg.svg', true, ['title' => __('Setup'), 'class' => 'main_menu_icon invert_filter']).'</a>',
     ];
 }
 
 $buttons['categories'] = [
     'active' => false,
-    'text'   => '<a href="index.php?sec=gmodule_library&sec2=godmode/module_library/module_library_view&tab=categories">'.html_print_image('images/list.png', true, ['title' => __('Categories'), 'class' => 'invert_filter']).'</a>',
+    'text'   => '<a href="index.php?sec=gmodule_library&sec2=godmode/module_library/module_library_view&tab=categories">'.html_print_image('images/logs@svg.svg', true, ['title' => __('Categories'), 'class' => 'main_menu_icon invert_filter']).'</a>',
 ];
 
 $buttons['view'] = [
     'active' => false,
-    'text'   => '<a href="index.php?sec=gmodule_library&sec2=godmode/module_library/module_library_view">'.html_print_image('images/eye_show.png', true, ['title' => __('View'), 'class' => 'invert_filter']).'</a>',
+    'text'   => '<a href="index.php?sec=gmodule_library&sec2=godmode/module_library/module_library_view">'.html_print_image('images/see-details@svg.svg', true, ['title' => __('View'), 'class' => 'main_menu_icon invert_filter']).'</a>',
 ];
 
 
diff --git a/pandora_console/godmode/reporting/reporting_builder.php b/pandora_console/godmode/reporting/reporting_builder.php
index a4f688ab05..a0e25d0e04 100755
--- a/pandora_console/godmode/reporting/reporting_builder.php
+++ b/pandora_console/godmode/reporting/reporting_builder.php
@@ -3680,21 +3680,21 @@ $buttons = [
             true,
             [
                 'title' => __('Reports list'),
-                'class' => 'invert_filter',
+                'class' => 'main_menu_icon invert_filter',
             ]
         ).'</a>',
     ],
     'main'         => [
         'active' => false,
-        'text'   => '<a href="'.$urlB.'&tab=main&action=edit&id_report='.$idReport.'&pure='.$pure.'">'.html_print_image('images/op_reporting.png', true, ['title' => __('Main data'), 'class' => 'invert_filter']).'</a>',
+        'text'   => '<a href="'.$urlB.'&tab=main&action=edit&id_report='.$idReport.'&pure='.$pure.'">'.html_print_image('images/op_reporting.png', true, ['title' => __('Main data'), 'class' => 'main_menu_icon invert_filter']).'</a>',
     ],
     'list_items'   => [
         'active' => false,
-        'text'   => '<a href="'.$urlB.'&tab=list_items&action=edit&id_report='.$idReport.'&pure='.$pure.'">'.html_print_image('images/list.png', true, ['title' => __('List items'), 'class' => 'invert_filter']).'</a>',
+        'text'   => '<a href="'.$urlB.'&tab=list_items&action=edit&id_report='.$idReport.'&pure='.$pure.'">'.html_print_image('images/logs@svg.svg', true, ['title' => __('List items'), 'class' => 'main_menu_icon invert_filter']).'</a>',
     ],
     'item_editor'  => [
         'active' => false,
-        'text'   => '<a href="'.$urlB.'&tab=item_editor&action=new&id_report='.$idReport.'&pure='.$pure.'">'.html_print_image('images/pencil.png', true, ['title' => __('Item editor'), 'class' => 'invert_filter']).'</a>',
+        'text'   => '<a href="'.$urlB.'&tab=item_editor&action=new&id_report='.$idReport.'&pure='.$pure.'">'.html_print_image('images/edit.svg', true, ['title' => __('Item editor'), 'class' => 'main_menu_icon invert_filter']).'</a>',
     ],
 ];
 
@@ -3708,11 +3708,11 @@ if ($enterpriseEnable) {
 $buttons['view'] = [
     'active' => false,
     'text'   => '<a href="index.php?sec=reporting&sec2=operation/reporting/reporting_viewer&id='.$idReport.'&pure='.$pure.'">'.html_print_image(
-        'images/eye.png',
+        'images/see-details@svg.svg',
         true,
         [
             'title' => __('View report'),
-            'class' => 'invert_filter',
+            'class' => 'main_menu_icon invert_filter',
         ]
     ).'</a>',
 ];
@@ -3727,7 +3727,7 @@ if ($idReport != 0) {
     $buttons = [
         'main' => [
             'active' => true,
-            'text'   => '<a href="index.php?sec=reporting&sec2=godmode/reporting/reporting_builder&pure='.$pure.'">'.html_print_image('images/report_list.png', true, ['title' => __('Reports list'), 'class' => 'invert_filter']).'</a>',
+            'text'   => '<a href="index.php?sec=reporting&sec2=godmode/reporting/reporting_builder&pure='.$pure.'">'.html_print_image('images/report_list.png', true, ['title' => __('Reports list'), 'class' => 'main_menu_icon invert_filter']).'</a>',
         ],
     ];
     $textReportName = __('Create Custom Report');
diff --git a/pandora_console/godmode/setup/setup_general.php b/pandora_console/godmode/setup/setup_general.php
index fc169f91a2..d19d3587c6 100644
--- a/pandora_console/godmode/setup/setup_general.php
+++ b/pandora_console/godmode/setup/setup_general.php
@@ -292,11 +292,11 @@ $table->data[$i][1] = html_print_input_text_extended(
     true
 );
 $table->data[$i][1] .= '<a id="change_timezone">'.html_print_image(
-    'images/pencil.png',
+    'images/edit.svg',
     true,
     [
         'title' => __('Change timezone'),
-        'class' => 'invert_filter',
+        'class' => 'main_menu_icon invert_filter',
     ]
 ).'</a>';
 $table->data[$i][1] .= '&nbsp;&nbsp;'.html_print_select(
@@ -423,9 +423,9 @@ $table_ichanges = '<table>
         <tr>
             <td>'.$select_out.'</td>
             <td>
-                <a href="javascript:">'.html_print_image('images/darrowright.png', true, ['id' => 'right_iblacklist', 'alt' => __('Push selected modules into blacklist'), 'title' => __('Push selected modules into blacklist'), 'class' => 'invert_filter']).'</a>
+                <a href="javascript:">'.html_print_image('images/arrow@svg.svg', true, ['style' => 'rotate: 180deg;', 'id' => 'right_iblacklist', 'alt' => __('Push selected modules into blacklist'), 'title' => __('Push selected modules into blacklist'), 'class' => 'main_menu_icon invert_filter']).'</a>
                 <br><br>
-                <a href="javascript:">'.html_print_image('images/darrowleft.png', true, ['id' => 'left_iblacklist', 'alt' => __('Pop selected modules out of blacklist'), 'title' => __('Pop selected modules out of blacklist'), 'class' => 'invert_filter']).'</a>
+                <a href="javascript:">'.html_print_image('images/arrow@svg.svg', true, ['style' => 'rotate: 0', 'id' => 'left_iblacklist', 'alt' => __('Pop selected modules out of blacklist'), 'title' => __('Pop selected modules out of blacklist'), 'class' => 'main_menu_icon invert_filter']).'</a>
             </td>
             <td>'.$select_in.'</td>
         </tr>
diff --git a/pandora_console/godmode/setup/setup_visuals.php b/pandora_console/godmode/setup/setup_visuals.php
index 73b2511b2b..5fb042fe66 100755
--- a/pandora_console/godmode/setup/setup_visuals.php
+++ b/pandora_console/godmode/setup/setup_visuals.php
@@ -1626,11 +1626,11 @@ if ($config['csv_divider'] != ';' && $config['csv_divider'] != ',' && $config['c
         true
     );
     $table_other->data[$row][1] .= '<a id="csv_divider_custom" onclick="javascript: edit_csv_divider();">'.html_print_image(
-        'images/list.png',
+        'images/logs@svg.svg',
         true,
         [
             'id'    => 'select',
-            'class' => 'invert_filter',
+            'class' => 'main_menu_icon invert_filter',
         ]
     ).'</a>';
 } else {
@@ -1646,11 +1646,11 @@ if ($config['csv_divider'] != ';' && $config['csv_divider'] != ',' && $config['c
         false
     );
     $table_other->data[$row][1] .= '<a id="csv_divider_custom" onclick="javascript: edit_csv_divider();">'.html_print_image(
-        'images/pencil.png',
+        'images/edit.svg',
         true,
         [
             'id'    => 'pencil',
-            'class' => 'invert_filter',
+            'class' => 'main_menu_icon invert_filter',
         ]
     ).'</a>';
 }
@@ -1777,7 +1777,7 @@ function edit_csv_divider () {
         $("#text-csv_divider").val(value);
     }
     else {
-        $("#csv_divider_custom img").attr("src", "images/pencil.png");
+        $("#csv_divider_custom img").attr("src", "images/edit.svg");
         $("#csv_divider_custom img").attr("id", "pencil");
         $("#text-csv_divider").replaceWith("<select id='csv_divider' name='csv_divider'>");
         var o = new Option(";", ";");
diff --git a/pandora_console/godmode/snmpconsole/snmp_alert.php b/pandora_console/godmode/snmpconsole/snmp_alert.php
index 6ad576198f..e42fe82df1 100755
--- a/pandora_console/godmode/snmpconsole/snmp_alert.php
+++ b/pandora_console/godmode/snmpconsole/snmp_alert.php
@@ -1978,11 +1978,12 @@ if ($create_alert || $update_alert) {
                             $row['id_as']
                         ),
                         'content' => html_print_image(
-                            'images/copy.png',
+                            'images/copy.svg',
                             true,
                             [
                                 'alt'   => __('Duplicate'),
                                 'title' => __('Duplicate'),
+                                'class' => 'main_menu_icon invert_filter',
                             ]
                         ),
                     ],
@@ -1995,11 +1996,12 @@ if ($create_alert || $update_alert) {
                             $row['id_as']
                         ),
                         'content' => html_print_image(
-                            'images/config.png',
+                            'images/edit.svg',
                             true,
                             [
                                 'alt'    => __('Update'),
                                 'border' => 0,
+                                'class'  => 'main_menu_icon invert_filter',
                             ]
                         ),
                     ],
diff --git a/pandora_console/godmode/wizards/DiscoveryTaskList.class.php b/pandora_console/godmode/wizards/DiscoveryTaskList.class.php
index 9372ffe144..781ec7e536 100644
--- a/pandora_console/godmode/wizards/DiscoveryTaskList.class.php
+++ b/pandora_console/godmode/wizards/DiscoveryTaskList.class.php
@@ -673,11 +673,11 @@ class DiscoveryTaskList extends HTML
 
                         $data[0] .= ');" >';
                         $data[0] .= html_print_image(
-                            'images/target.png',
+                            'images/change-active.svg',
                             true,
                             [
                                 'title' => __('Force'),
-                                'class' => 'invert_filter',
+                                'class' => 'main_menu_icon invert_filter',
                             ]
                         );
                         $data[0] .= '</span>';
@@ -731,11 +731,11 @@ class DiscoveryTaskList extends HTML
                     case DISCOVERY_CLOUD_AZURE_COMPUTE:
                         // Discovery Applications MySQL.
                         $data[6] = html_print_image(
-                            'images/plugin.png',
+                            'images/plugin@svg.svg',
                             true,
                             [
                                 'title' => __('Discovery Cloud Azure Compute'),
-                                'class' => 'invert_filter',
+                                'class' => 'main_menu_icon invert_filter',
                             ]
                         ).'&nbsp;&nbsp;';
                         $data[6] .= __('Cloud.Azure.Compute');
@@ -744,11 +744,11 @@ class DiscoveryTaskList extends HTML
                     case DISCOVERY_CLOUD_AWS_EC2:
                         // Discovery Applications MySQL.
                         $data[6] = html_print_image(
-                            'images/plugin.png',
+                            'images/plugin@svg.svg',
                             true,
                             [
                                 'title' => __('Discovery Cloud AWS EC2'),
-                                'class' => 'invert_filter',
+                                'class' => 'main_menu_icon invert_filter',
                             ]
                         ).'&nbsp;&nbsp;';
                         $data[6] .= __('Cloud.AWS.EC2');
@@ -757,11 +757,11 @@ class DiscoveryTaskList extends HTML
                     case DISCOVERY_CLOUD_AWS_RDS:
                         // Discovery Cloud RDS.
                         $data[6] = html_print_image(
-                            'images/op_network.png',
+                            'images/cluster@os.svg',
                             true,
                             [
                                 'title' => __('Discovery Cloud RDS'),
-                                'class' => 'invert_filter',
+                                'class' => 'main_menu_icon invert_filter',
                             ]
                         ).'&nbsp;&nbsp;';
                         $data[6] .= __('Discovery.Cloud.Aws.RDS');
@@ -770,11 +770,11 @@ class DiscoveryTaskList extends HTML
                     case DISCOVERY_CLOUD_AWS_S3:
                         // Discovery Cloud S3.
                         $data[6] = html_print_image(
-                            'images/op_network.png',
+                            'images/cluster@os.svg',
                             true,
                             [
                                 'title' => __('Discovery Cloud S3'),
-                                'class' => 'invert_filter',
+                                'class' => 'main_menu_icon invert_filter',
                             ]
                         ).'&nbsp;&nbsp;';
                         $data[6] .= __('Discovery.Cloud.Aws.S3');
@@ -783,11 +783,11 @@ class DiscoveryTaskList extends HTML
                     case DISCOVERY_APP_MYSQL:
                         // Discovery Applications MySQL.
                         $data[6] = html_print_image(
-                            'images/op_network.png',
+                            'images/cluster@os.svg',
                             true,
                             [
                                 'title' => __('Discovery Applications MySQL'),
-                                'class' => 'invert_filter',
+                                'class' => 'main_menu_icon invert_filter',
                             ]
                         ).'&nbsp;&nbsp;';
                         $data[6] .= __('Discovery.App.MySQL');
@@ -796,11 +796,11 @@ class DiscoveryTaskList extends HTML
                     case DISCOVERY_APP_ORACLE:
                         // Discovery Applications Oracle.
                         $data[6] = html_print_image(
-                            'images/op_network.png',
+                            'images/cluster@os.svg',
                             true,
                             [
                                 'title' => __('Discovery Applications Oracle'),
-                                'class' => 'invert_filter',
+                                'class' => 'main_menu_icon invert_filter',
                             ]
                         ).'&nbsp;&nbsp;';
                         $data[6] .= __('Discovery.App.Oracle');
@@ -809,11 +809,11 @@ class DiscoveryTaskList extends HTML
                     case DISCOVERY_APP_DB2:
                         // Discovery Applications DB2.
                         $data[6] = html_print_image(
-                            'images/op_network.png',
+                            'images/cluster@os.svg',
                             true,
                             [
                                 'title' => __('Discovery Applications DB2'),
-                                'class' => 'invert_filter',
+                                'class' => 'main_menu_icon invert_filter',
                             ]
                         ).'&nbsp;&nbsp;';
                         $data[6] .= __('Discovery.App.DB2');
@@ -823,7 +823,7 @@ class DiscoveryTaskList extends HTML
                         // Internal deployment task.
                         $no_operations = true;
                         $data[6] = html_print_image(
-                            'images/deploy.png',
+                            'images/osx-terminal@groups.svg',
                             true,
                             ['title' => __('Agent deployment')]
                         ).'&nbsp;&nbsp;';
@@ -833,7 +833,7 @@ class DiscoveryTaskList extends HTML
                     case DISCOVERY_APP_MICROSOFT_SQL_SERVER:
                         // Discovery Applications Oracle.
                         $data[6] = html_print_image(
-                            'images/network.png',
+                            'images/cluster@os.svg',
                             true,
                             ['title' => __('Discovery Applications Microsoft SQL Server')]
                         ).'&nbsp;&nbsp;';
@@ -845,20 +845,20 @@ class DiscoveryTaskList extends HTML
                         if ($task['id_recon_script'] == 0) {
                             // Discovery NetScan.
                             $data[6] = html_print_image(
-                                'images/op_network.png',
+                                'images/cluster@os.svg',
                                 true,
                                 [
                                     'title' => __('Discovery NetScan'),
-                                    'class' => 'invert_filter',
+                                    'class' => 'main_menu_icon invert_filter',
                                 ]
                             ).'&nbsp;&nbsp;';
                             $data[6] .= __('Discovery.NetScan');
                         } else {
                             // APP or external script recon task.
                             $data[6] = html_print_image(
-                                'images/plugin.png',
+                                'images/plugin@svg.svg',
                                 true,
-                                ['class' => 'invert_filter']
+                                ['class' => 'main_menu_icon invert_filter']
                             ).'&nbsp;&nbsp;';
                             $data[6] .= $recon_script_name;
                         }
@@ -911,7 +911,7 @@ class DiscoveryTaskList extends HTML
                                 true,
                                 [
                                     'title' => __('Review results'),
-                                    'class' => 'invert_filter',
+                                    'class' => 'main_menu_icon invert_filter',
                                 ]
                             );
                             $data[9] .= '</a>';
@@ -919,11 +919,11 @@ class DiscoveryTaskList extends HTML
 
                         $data[9] .= '<a href="#" onclick="progress_task_list('.$task['id_rt'].',\''.$task['name'].'\')">';
                         $data[9] .= html_print_image(
-                            'images/operation.png',
+                            'images/details.svg',
                             true,
                             [
                                 'title' => __('View summary'),
-                                'class' => 'invert_filter',
+                                'class' => 'main_menu_icon invert_filter',
                             ]
                         );
                         $data[9] .= '</a>';
@@ -940,11 +940,11 @@ class DiscoveryTaskList extends HTML
                         if (check_acl($config['id_user'], 0, 'MR')) {
                             $data[9] .= '<a href="#" onclick="show_map('.$task['id_rt'].',\''.$task['name'].'\')">';
                             $data[9] .= html_print_image(
-                                'images/dynamic_network_icon.png',
+                                'images/web@groups.svg',
                                 true,
                                 [
                                     'title' => __('View map'),
-                                    'class' => 'invert_filter',
+                                    'class' => 'main_menu_icon invert_filter',
                                 ]
                             );
                             $data[9] .= '</a>';
@@ -965,32 +965,32 @@ class DiscoveryTaskList extends HTML
                                         $tipam_task_id
                                     )
                                 ).'">'.html_print_image(
-                                    'images/config.png',
+                                    'images/edit.svg',
                                     true,
                                     [
                                         'title' => __('Edit task'),
-                                        'class' => 'invert_filter',
+                                        'class' => 'main_menu_icon invert_filter',
                                     ]
                                 ).'</a>';
                                 $data[9] .= '<a href="'.ui_get_full_url(
                                     'index.php?sec=gextensions&sec2=enterprise/tools/ipam/ipam&action=delete&id='.$tipam_task_id
                                 ).'" onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;">'.html_print_image(
-                                    'images/cross.png',
+                                    'images/delete.svg',
                                     true,
                                     [
                                         'title' => __('Delete task'),
-                                        'class' => 'invert_filter',
+                                        'class' => 'main_menu_icon invert_filter',
                                     ]
                                 ).'</a>';
                             } else {
                                 $data[9] .= '<a href="'.ui_get_full_url(
                                     'index.php?sec=gservers&sec2=godmode/servers/discovery&wiz=tasklist&delete=1&task='.$task['id_rt']
                                 ).'" onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;">'.html_print_image(
-                                    'images/cross.png',
+                                    'images/delete.svg',
                                     true,
                                     [
                                         'title' => __('Delete task'),
-                                        'class' => 'invert_filter',
+                                        'class' => 'main_menu_icon invert_filter',
                                     ]
                                 ).'</a>';
                             }
@@ -1003,21 +1003,21 @@ class DiscoveryTaskList extends HTML
                                     $task['id_rt']
                                 )
                             ).'">'.html_print_image(
-                                'images/config.png',
+                                'images/edit.svg',
                                 true,
                                 [
                                     'title' => __('Edit task'),
-                                    'class' => 'invert_filter',
+                                    'class' => 'main_menu_icon invert_filter',
                                 ]
                             ).'</a>';
                             $data[9] .= '<a href="'.ui_get_full_url(
                                 'index.php?sec=gservers&sec2=godmode/servers/discovery&wiz=tasklist&delete=1&task='.$task['id_rt']
                             ).'" onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;">'.html_print_image(
-                                'images/cross.png',
+                                'images/delete.svg',
                                 true,
                                 [
                                     'title' => __('Delete task'),
-                                    'class' => 'invert_filter',
+                                    'class' => 'main_menu_icon invert_filter',
                                 ]
                             ).'</a>';
                         }
diff --git a/pandora_console/include/class/CalendarManager.class.php b/pandora_console/include/class/CalendarManager.class.php
index 033e8986bd..78ab62e92c 100644
--- a/pandora_console/include/class/CalendarManager.class.php
+++ b/pandora_console/include/class/CalendarManager.class.php
@@ -155,11 +155,11 @@ class CalendarManager
             'text'   => '<a href="'.ui_get_full_url(
                 $this->url.'&tab_calendar=list'
             ).'&pure='.(int) $config['pure'].'">'.html_print_image(
-                'images/list.png',
+                'images/logs@svg.svg',
                 true,
                 [
                     'title' => __('Alert calendar list'),
-                    'class' => 'invert_filter',
+                    'class' => 'main_menu_icon invert_filter',
                 ]
             ).'</a>',
         ];
@@ -177,11 +177,11 @@ class CalendarManager
                 'text'   => '<a href="'.ui_get_full_url(
                     $this->url.'&tab_calendar=list&op=edit&id='.$id
                 ).'&pure='.(int) $config['pure'].'">'.html_print_image(
-                    'images/pencil.png',
+                    'images/edit.svg',
                     true,
                     [
                         'title' => __('Edit calendar'),
-                        'class' => 'invert_filter',
+                        'class' => 'main_menu_icon invert_filter',
                     ]
                 ).'</a>',
             ];
@@ -195,7 +195,7 @@ class CalendarManager
                     true,
                     [
                         'title' => __('Alert special days'),
-                        'class' => 'invert_filter',
+                        'class' => 'main_menu_icon invert_filter',
                     ]
                 ).'</a>',
             ];
diff --git a/pandora_console/include/class/Diagnostics.class.php b/pandora_console/include/class/Diagnostics.class.php
index f7a660f2c4..aeb5a46400 100644
--- a/pandora_console/include/class/Diagnostics.class.php
+++ b/pandora_console/include/class/Diagnostics.class.php
@@ -139,11 +139,11 @@ class Diagnostics extends Wizard
 
         $pdf_url = $this->url.'&pdf=true';
         $pdf_img = html_print_image(
-            'images/pdf.png',
+            'images/file-pdf.svg',
             true,
             [
                 'title'   => __('Export to PDF'),
-                'class'   => 'invert_filter',
+                'class'   => 'main_menu_icon invert_filter',
                 'onclick' => 'blockResubmit($(this))',
             ]
         );
diff --git a/pandora_console/include/class/EventSound.class.php b/pandora_console/include/class/EventSound.class.php
index 283d99d296..41e54cc4ff 100644
--- a/pandora_console/include/class/EventSound.class.php
+++ b/pandora_console/include/class/EventSound.class.php
@@ -182,22 +182,22 @@ class EventSound extends HTML
         $tabs = [
             'list'    => [
                 'text'   => '<a href="'.$base_url.'">'.html_print_image(
-                    'images/eye_show.png',
+                    'images/see-details@svg.svg',
                     true,
                     [
                         'title' => __('Sounds'),
-                        'class' => 'invert_filter',
+                        'class' => 'main_menu_icon invert_filter',
                     ]
                 ).'</a>',
                 'active' => (bool) ($tab != 'add'),
             ],
             'options' => [
                 'text'   => '<a href="'.$setup_url.'">'.html_print_image(
-                    'images/pen.png',
+                    'images/edit.svg',
                     true,
                     [
                         'title' => __('Create'),
-                        'class' => 'invert_filter',
+                        'class' => 'main_menu_icon invert_filter',
                     ]
                 ).'</a>',
                 'active' => (bool) ($tab == 'add'),
@@ -445,7 +445,7 @@ class EventSound extends HTML
                 true,
                 [
                     'title' => $action,
-                    'class' => 'invert_filter',
+                    'class' => 'main_menu_icon invert_filter',
                 ]
             );
             $options .= '</a>';
diff --git a/pandora_console/include/functions_cron.php b/pandora_console/include/functions_cron.php
index 62333f00b8..462c5459b4 100644
--- a/pandora_console/include/functions_cron.php
+++ b/pandora_console/include/functions_cron.php
@@ -532,11 +532,11 @@ function cron_list_table()
                                     $task['id']
                                 ),
                                 'content' => html_print_image(
-                                    'images/target.png',
+                                    'images/change-active.svg',
                                     true,
                                     [
                                         'title' => __('Force run'),
-                                        'class' => 'invert_filter',
+                                        'class' => 'main_menu_icon invert_filter',
                                     ]
                                 ),
                             ],
@@ -570,11 +570,11 @@ function cron_list_table()
                                     $task['id']
                                 ),
                                 'content' => html_print_image(
-                                    'images/target.png',
+                                    'images/change-active.svg',
                                     true,
                                     [
                                         'title' => __('Force run'),
-                                        'class' => 'invert_filter',
+                                        'class' => 'main_menu_icon invert_filter',
                                     ]
                                 ),
                             ],
@@ -625,11 +625,11 @@ function cron_list_table()
                                     $task['id']
                                 ),
                                 'content' => html_print_image(
-                                    'images/target.png',
+                                    'images/change-active.svg',
                                     true,
                                     [
                                         'title' => __('Force run'),
-                                        'class' => 'invert_filter',
+                                        'class' => 'main_menu_icon invert_filter',
                                     ]
                                 ),
                             ],
@@ -717,11 +717,11 @@ function cron_list_table()
                                     $task['id']
                                 ),
                                 'content' => html_print_image(
-                                    'images/target.png',
+                                    'images/change-active.svg',
                                     true,
                                     [
                                         'title' => __('Force run'),
-                                        'class' => 'invert_filter',
+                                        'class' => 'main_menu_icon invert_filter',
                                     ]
                                 ),
                             ],
@@ -753,11 +753,11 @@ function cron_list_table()
                                     $task['id']
                                 ),
                                 'content' => html_print_image(
-                                    'images/target.png',
+                                    'images/change-active.svg',
                                     true,
                                     [
                                         'title' => __('Force run'),
-                                        'class' => 'invert_filter',
+                                        'class' => 'main_menu_icon invert_filter',
                                     ]
                                 ),
                             ],
@@ -799,11 +799,11 @@ function cron_list_table()
                                     $task['id']
                                 ),
                                 'content' => html_print_image(
-                                    'images/target.png',
+                                    'images/change-active.svg',
                                     true,
                                     [
                                         'title' => __('Force run'),
-                                        'class' => 'invert_filter',
+                                        'class' => 'main_menu_icon invert_filter',
                                     ]
                                 ),
                             ],
@@ -841,11 +841,11 @@ function cron_list_table()
                                     $task['id']
                                 ),
                                 'content' => html_print_image(
-                                    'images/target.png',
+                                    'images/change-active.svg',
                                     true,
                                     [
                                         'title' => __('Force run'),
-                                        'class' => 'invert_filter',
+                                        'class' => 'main_menu_icon invert_filter',
                                     ]
                                 ),
                             ],
@@ -875,11 +875,11 @@ function cron_list_table()
                                     $task['id']
                                 ),
                                 'content' => html_print_image(
-                                    'images/target.png',
+                                    'images/change-active.svg',
                                     true,
                                     [
                                         'title' => __('Force run'),
-                                        'class' => 'invert_filter',
+                                        'class' => 'main_menu_icon invert_filter',
                                     ]
                                 ),
                             ],
@@ -915,11 +915,11 @@ function cron_list_table()
                     $data[7]  = '<a href="'.$url;
                     $data[7] .= 'edit_task=1&id='.$task['id'].'">';
                     $data[7] .= html_print_image(
-                        'images/config.png',
+                        'images/edit.svg',
                         true,
                         [
                             'title' => __('Edit'),
-                            'class' => 'invert_filter',
+                            'class' => 'main_menu_icon invert_filter',
                         ]
                     );
                     $data[7] .= '</a>';
@@ -929,11 +929,11 @@ function cron_list_table()
                     $data[7] .= '<a href="'.$url;
                     $data[7] .= 'delete_task=1&id_user_task='.$task['id'].'">';
                     $data[7] .= html_print_image(
-                        'images/cross.png',
+                        'images/delete.svg',
                         true,
                         [
                             'title' => __('Delete'),
-                            'class' => 'invert_filter',
+                            'class' => 'main_menu_icon invert_filter',
                         ]
                     );
                     $data[7] .= '</a>';
@@ -943,11 +943,11 @@ function cron_list_table()
                     $data[7] = '<a href="'.$url;
                     $data[7] .= 'edit_task=1&id='.$task['id'].'">';
                     $data[7] .= html_print_image(
-                        'images/config.png',
+                        'images/edit.svg',
                         true,
                         [
                             'title' => __('Edit'),
-                            'class' => 'invert_filter',
+                            'class' => 'main_menu_icon invert_filter',
                         ]
                     );
                     $data[7] .= '</a>';
@@ -957,11 +957,11 @@ function cron_list_table()
                     $data[7] .= '<a href="'.$url;
                     $data[7] .= 'delete_task=1&id_user_task='.$task['id'].'">';
                     $data[7] .= html_print_image(
-                        'images/cross.png',
+                        'images/delete.svg',
                         true,
                         [
                             'title' => __('Delete'),
-                            'class' => 'invert_filter',
+                            'class' => 'main_menu_icon invert_filter',
                         ]
                     );
                     $data[7] .= '</a>';
@@ -982,7 +982,7 @@ function cron_list_table()
                             true,
                             [
                                 'title' => ((bool) $task['enabled'] === true) ? __('Disable task') : __('Enable task'),
-                                'class' => 'invert_filter',
+                                'class' => 'main_menu_icon invert_filter',
                             ]
                         ),
                     ],
diff --git a/pandora_console/include/functions_integriaims.php b/pandora_console/include/functions_integriaims.php
index 50795b70af..ff30e799e5 100644
--- a/pandora_console/include/functions_integriaims.php
+++ b/pandora_console/include/functions_integriaims.php
@@ -39,9 +39,9 @@ function integriaims_tabs($active_tab, $view=false)
 
     $url_tabs = ui_get_full_url('index.php?sec=incident&sec2=operation/incidents/');
 
-    $setup_tab['text'] = '<a href="'.ui_get_full_url('index.php?sec=general&sec2=godmode/setup/setup&section=integria').'">'.html_print_image('images/setup.png', true, ['title' => __('Configure Integria IMS'), 'class' => 'invert_filter']).'</a>';
-    $list_tab['text'] = '<a href="'.$url_tabs.'list_integriaims_incidents">'.html_print_image('images/list.png', true, ['title' => __('Ticket list'), 'class' => 'invert_filter']).'</a>';
-    $create_tab['text'] = '<a href="'.$url_tabs.'configure_integriaims_incident">'.html_print_image('images/pencil.png', true, ['title' => __('New ticket'), 'class' => 'invert_filter']).'</a>';
+    $setup_tab['text'] = '<a href="'.ui_get_full_url('index.php?sec=general&sec2=godmode/setup/setup&section=integria').'">'.html_print_image('images/configuration@svg.svg', true, ['title' => __('Configure Integria IMS'), 'class' => 'main_menu_icon invert_filter']).'</a>';
+    $list_tab['text'] = '<a href="'.$url_tabs.'list_integriaims_incidents">'.html_print_image('images/logs@svg.svg', true, ['title' => __('Ticket list'), 'class' => 'main_menu_icon invert_filter']).'</a>';
+    $create_tab['text'] = '<a href="'.$url_tabs.'configure_integriaims_incident">'.html_print_image('images/edit.svg', true, ['title' => __('New ticket'), 'class' => 'main_menu_icon invert_filter']).'</a>';
 
     switch ($active_tab) {
         case 'setup_tab':
@@ -70,8 +70,8 @@ function integriaims_tabs($active_tab, $view=false)
     }
 
     if ($view) {
-        $create_tab['text'] = '<a href="'.$url_tabs.'configure_integriaims_incident&incident_id='.$view.'">'.html_print_image('images/pencil.png', true, ['title' => __('Edit ticket'), 'class' => 'invert_filter']).'</a>';
-        $view_tab['text'] = '<a href="'.$url_tabs.'dashboard_detail_integriaims_incident&incident_id='.$view.'">'.html_print_image('images/operation.png', true, ['title' => __('View ticket'), 'class' => 'invert_filter']).'</a>';
+        $create_tab['text'] = '<a href="'.$url_tabs.'configure_integriaims_incident&incident_id='.$view.'">'.html_print_image('images/edit.svg', true, ['title' => __('Edit ticket'), 'class' => 'main_menu_icon invert_filter']).'</a>';
+        $view_tab['text'] = '<a href="'.$url_tabs.'dashboard_detail_integriaims_incident&incident_id='.$view.'">'.html_print_image('images/details.svg', true, ['title' => __('View ticket'), 'class' => 'main_menu_icon invert_filter']).'</a>';
         // When the current page is the View page.
         if (!$active_tab) {
             $view_tab['active'] = true;
diff --git a/pandora_console/include/functions_notifications.php b/pandora_console/include/functions_notifications.php
index 657ce1ff35..6918bad686 100644
--- a/pandora_console/include/functions_notifications.php
+++ b/pandora_console/include/functions_notifications.php
@@ -863,18 +863,22 @@ function notifications_print_source_select_box($info_selec, $id, $source_id)
             true
         ),
         html_print_image(
-            'images/input_add.png',
+            'images/fail@svg.svg',
             true,
             [
+                'style'   => 'width: 14px;rotate: 45deg',
                 'title'   => $add_title,
+                'class'   => 'main_menu_icon invert_filter',
                 'onclick' => sprintf("add_source_dialog('%s', '%s')", $id, $source_id),
             ]
         ),
         html_print_image(
-            'images/input_delete.png',
+            'images/delete.svg',
             true,
             [
+                'style'   => 'width: 14px',
                 'title'   => $delete_title,
+                'class'   => 'main_menu_icon invert_filter',
                 'onclick' => sprintf(
                     "remove_source_elements('%s', '%s')",
                     $id,
@@ -923,29 +927,31 @@ function notifications_print_two_ways_select($info_selec, $users, $source_id)
             ''
         ),
         html_print_image(
-            'images/darrowright.png',
+            'images/arrow@svg.svg',
             true,
             [
                 'title'   => __('Add elements'),
+                'style'   => 'rotate: 90deg',
                 'onclick' => sprintf(
                     "notifications_modify_two_ways_element('%s', '%s', 'add')",
                     $users,
                     $source_id
                 ),
-                'class'   => 'invert_filter',
+                'class'   => 'main_menu_icon invert_filter',
             ]
         ),
         html_print_image(
-            'images/darrowleft.png',
+            'images/arrow@svg.svg',
             true,
             [
                 'title'   => __('Remove elements'),
+                'style'   => 'rotate: 0',
                 'onclick' => sprintf(
                     "notifications_modify_two_ways_element('%s', '%s', 'remove')",
                     $users,
                     $source_id
                 ),
-                'class'   => 'invert_filter',
+                'class'   => 'main_menu_icon invert_filter',
             ]
         ),
         html_print_select(
diff --git a/pandora_console/include/functions_snmp_browser.php b/pandora_console/include/functions_snmp_browser.php
index a43150c94e..0e51faa66c 100644
--- a/pandora_console/include/functions_snmp_browser.php
+++ b/pandora_console/include/functions_snmp_browser.php
@@ -144,7 +144,7 @@ function snmp_browser_get_html_tree(
         // Branch or leave with branches!
         if (isset($sub_level['__OID__'])) {
             $output .= "<a onfocus='javascript: this.blur();' href='javascript: snmpGet(\"".addslashes($sub_level['__OID__'])."\");'>";
-            $output .= '<img src="'.$url.'/../../images/operation.png" class="vertical_middle">';
+            $output .= '<img src="'.$url.'/../../images/details.svg" class="main_menu_icon invert_filter vertical_middle">';
             $output .= '</a>';
         }
 
diff --git a/pandora_console/include/lib/ClusterViewer/ClusterManager.php b/pandora_console/include/lib/ClusterViewer/ClusterManager.php
index c9739111b7..03af57fb8a 100644
--- a/pandora_console/include/lib/ClusterViewer/ClusterManager.php
+++ b/pandora_console/include/lib/ClusterViewer/ClusterManager.php
@@ -595,11 +595,11 @@ class ClusterManager
                         );
                         $tmp->options .= '">';
                         $tmp->options .= html_print_image(
-                            'images/operation.png',
+                            'images/details.svg',
                             true,
                             [
                                 'title' => __('View'),
-                                'class' => 'invert_filter',
+                                'class' => 'main_menu_icon invert_filter',
                             ]
                         );
                         $tmp->options .= '</a>';
@@ -612,11 +612,11 @@ class ClusterManager
                             );
                             $tmp->options .= '">';
                             $tmp->options .= html_print_image(
-                                'images/config.png',
+                                'images/edit.svg',
                                 true,
                                 [
                                     'title' => __('Edit'),
-                                    'class' => 'invert_filter',
+                                    'class' => 'main_menu_icon invert_filter',
                                 ]
                             );
                             $tmp->options .= '</a>';
@@ -628,11 +628,11 @@ class ClusterManager
                             );
                             $tmp->options .= '">';
                             $tmp->options .= html_print_image(
-                                'images/cross.png',
+                                'images/delete.svg',
                                 true,
                                 [
                                     'title' => __('Delete'),
-                                    'class' => 'invert_filter',
+                                    'class' => 'main_menu_icon invert_filter',
                                 ]
                             );
                             $tmp->options .= '</a>';
diff --git a/pandora_console/include/rest-api/models/VisualConsole/View.php b/pandora_console/include/rest-api/models/VisualConsole/View.php
index e8305df830..635e3aa21a 100644
--- a/pandora_console/include/rest-api/models/VisualConsole/View.php
+++ b/pandora_console/include/rest-api/models/VisualConsole/View.php
@@ -63,22 +63,25 @@ class View extends \HTML
 
         $tabs = [
             [
-                'name' => __('Label settings'),
-                'id'   => 'tab-label',
-                'href' => $url.'&tabSelected=label',
-                'img'  => 'label-settings.png',
+                'name'  => __('Label settings'),
+                'id'    => 'tab-label',
+                'href'  => $url.'&tabSelected=label',
+                'img'   => 'tag@svg.svg',
+                'class' => 'main_menu_icon invert_filter',
             ],
             [
-                'name' => __('General settings'),
-                'id'   => 'tab-general',
-                'href' => $url.'&tabSelected=general',
-                'img'  => 'general-settings.png',
+                'name'  => __('General settings'),
+                'id'    => 'tab-general',
+                'href'  => $url.'&tabSelected=general',
+                'img'   => 'configuration@svg.svg',
+                'class' => 'main_menu_icon invert_filter',
             ],
             [
-                'name' => __('Specific settings'),
-                'id'   => 'tab-specific',
-                'href' => $url.'&tabSelected=specific',
-                'img'  => 'specific-settings.png',
+                'name'  => __('Specific settings'),
+                'id'    => 'tab-specific',
+                'href'  => $url.'&tabSelected=specific',
+                'img'   => 'incremental-data@svg.svg',
+                'class' => 'main_menu_icon invert_filter',
             ],
         ];
 
@@ -91,26 +94,29 @@ class View extends \HTML
             $activetabs = 0;
             $tabs = [
                 [
-                    'name' => __('Specific settings'),
-                    'id'   => 'tab-specific',
-                    'href' => $url.'&tabSelected=specific',
-                    'img'  => 'event_responses_col.png',
+                    'name'  => __('Specific settings'),
+                    'id'    => 'tab-specific',
+                    'href'  => $url.'&tabSelected=specific',
+                    'img'   => 'responses.svg',
+                    'class' => 'main_menu_icon invert_filter',
                 ],
             ];
         } else if ($type === BOX_ITEM || $type === COLOR_CLOUD || $type === ODOMETER) {
             $activetabs = 1;
             $tabs = [
                 [
-                    'name' => __('General settings'),
-                    'id'   => 'tab-general',
-                    'href' => $url.'&tabSelected=general',
-                    'img'  => 'pencil.png',
+                    'name'  => __('General settings'),
+                    'id'    => 'tab-general',
+                    'href'  => $url.'&tabSelected=general',
+                    'img'   => 'edit.svg',
+                    'class' => 'main_menu_icon invert_filter',
                 ],
                 [
-                    'name' => __('Specific settings'),
-                    'id'   => 'tab-specific',
-                    'href' => $url.'&tabSelected=specific',
-                    'img'  => 'event_responses_col.png',
+                    'name'  => __('Specific settings'),
+                    'id'    => 'tab-specific',
+                    'href'  => $url.'&tabSelected=specific',
+                    'img'   => 'responses.svg',
+                    'class' => 'main_menu_icon invert_filter',
                 ],
             ];
         }
diff --git a/pandora_console/operation/netflow/nf_live_view.php b/pandora_console/operation/netflow/nf_live_view.php
index 628b874728..f5ee650fb0 100644
--- a/pandora_console/operation/netflow/nf_live_view.php
+++ b/pandora_console/operation/netflow/nf_live_view.php
@@ -336,7 +336,7 @@ if (is_metaconsole()) {
         '50'            => '50',
         $max_aggregates => $max_aggregates,
     ];
-    echo '<td>'.html_print_select($max_values, 'max_aggregates', $max_aggregates, '', '', 0, true).'<a id="max_values" href="#" onclick="javascript: edit_max_value();">'.html_print_image('images/pencil.png', true, ['id' => 'pencil']).'</a>';
+    echo '<td>'.html_print_select($max_values, 'max_aggregates', $max_aggregates, '', '', 0, true).'<a id="max_values" href="#" onclick="javascript: edit_max_value();">'.html_print_image('images/edit.svg', true, ['id' => 'pencil', 'class' => 'main_menu_icon invert_filter']).'</a>';
     echo '</td>';
 
     echo '<td><b>'.__('Aggregate by').'</b></td>';
@@ -545,14 +545,14 @@ if (is_metaconsole()) {
 <script type="text/javascript">
     function edit_max_value () {
         if ($("#max_values img").attr("id") == "pencil") {
-            $("#max_values img").attr("src", "images/default_list.png");
+            $("#max_values img").attr("src", "images/logs@svg.svg");
             $("#max_values img").attr("id", "select");
             var value = $("#max_aggregates").val();
             $("#max_aggregates").replaceWith("<input id='max_aggregates' name='max_aggregates' type='text'>");
             $("#max_aggregates").val(value);
         }
         else {
-            $("#max_values img").attr("src", "images/pencil.png");
+            $("#max_values img").attr("src", "images/edit.svg");
             $("#max_values img").attr("id", "pencil");
             $("#max_aggregates").replaceWith("<select id='max_aggregates' name='max_aggregates'>");
             var o = new Option("2", 2);
diff --git a/pandora_console/operation/reporting/reporting_viewer.php b/pandora_console/operation/reporting/reporting_viewer.php
index 26e16c7f37..de1c8dc0cb 100755
--- a/pandora_console/operation/reporting/reporting_viewer.php
+++ b/pandora_console/operation/reporting/reporting_viewer.php
@@ -116,7 +116,7 @@ $options['list_reports'] = [
         true,
         [
             'title' => __('Report list'),
-            'class' => 'invert_filter',
+            'class' => 'main_menu_icon invert_filter',
         ]
     ).'</a>',
 ];
@@ -136,25 +136,25 @@ if (check_acl_restricted_all($config['id_user'], $report_group, 'RW')) {
         true,
         [
             'title' => __('Main data'),
-            'class' => 'invert_filter',
+            'class' => 'main_menu_icon invert_filter',
         ]
     ).'</a>';
 
     $options['list_items']['text'] = '<a href="index.php?sec=reporting&sec2=godmode/reporting/reporting_builder&tab=list_items&action=edit&id_report='.$id_report.'&pure='.$pure.'">'.html_print_image(
-        'images/list.png',
+        'images/logs@svg.svg',
         true,
         [
             'title' => __('List items'),
-            'class' => 'invert_filter',
+            'class' => 'main_menu_icon invert_filter',
         ]
     ).'</a>';
 
     $options['item_editor']['text'] = '<a href="index.php?sec=reporting&sec2=godmode/reporting/reporting_builder&tab=item_editor&action=new&id_report='.$id_report.'&pure='.$pure.'">'.html_print_image(
-        'images/pencil.png',
+        'images/edit.svg',
         true,
         [
             'title' => __('Item editor'),
-            'class' => 'invert_filter',
+            'class' => 'main_menu_icon invert_filter',
         ]
     ).'</a>';
 
@@ -170,7 +170,7 @@ $options['view'] = [
         true,
         [
             'title' => __('View report'),
-            'class' => 'invert_filter',
+            'class' => 'main_menu_icon invert_filter',
 
         ]
     ).'</a>',
@@ -183,7 +183,7 @@ if (!defined('METACONSOLE')) {
             true,
             [
                 'title' => __('Full screen mode'),
-                'class' => 'invert_filter',
+                'class' => 'main_menu_icon invert_filter',
             ]
         ).'</a>';
     } else {
@@ -192,7 +192,7 @@ if (!defined('METACONSOLE')) {
             true,
             [
                 'title' => __('Back to normal mode'),
-                'class' => 'invert_filter',
+                'class' => 'main_menu_icon invert_filter',
             ]
         ).'</a>';
 
diff --git a/pandora_console/operation/users/user_edit.php b/pandora_console/operation/users/user_edit.php
index 51423748dc..a66ebe3459 100644
--- a/pandora_console/operation/users/user_edit.php
+++ b/pandora_console/operation/users/user_edit.php
@@ -339,10 +339,10 @@ $user_id .= html_print_anchor(
             base64_encode(__('Your API Token is:').'<br><span class="font_12pt bolder">'.users_get_API_token($config['id_user']).'</span><br>'.__('Please, avoid share this string with others.')),
         ),
         'content' => html_print_image(
-            'images/eye_show.png',
+            'images/see-details@svg.svg',
             true,
             [
-                'class' => 'renew_api_token_image clickable',
+                'class' => 'main_menu_icon renew_api_token_image clickable',
                 'title' => __('Show API Token'),
             ]
         ),
diff --git a/pandora_console/views/cluster/edit.php b/pandora_console/views/cluster/edit.php
index 393951f470..525d159bab 100644
--- a/pandora_console/views/cluster/edit.php
+++ b/pandora_console/views/cluster/edit.php
@@ -62,11 +62,11 @@ $buttons = [];
 
 $main_page = '<a href="'.$wizard->parentUrl.'">';
 $main_page .= html_print_image(
-    'images/list.png',
+    'images/logs@svg.svg',
     true,
     [
         'title' => __('Cluster list'),
-        'class' => 'invert_filter',
+        'class' => 'main_menu_icon invert_filter',
     ]
 );
 $main_page .= '</a>';
@@ -82,11 +82,11 @@ if ($cluster !== null) {
     if ($cluster->id() !== null) {
         $view = '<a href="'.$wizard->parentUrl.'&op=view&id='.$cluster->id().'">';
         $view .= html_print_image(
-            'images/operation.png',
+            'images/details.svg',
             true,
             [
                 'title' => __('View this cluster'),
-                'class' => 'invert_filter',
+                'class' => 'main_menu_icon invert_filter',
             ]
         );
         $view .= '</a>';
diff --git a/pandora_console/views/cluster/view.php b/pandora_console/views/cluster/view.php
index b27fadc519..775ca3e30a 100644
--- a/pandora_console/views/cluster/view.php
+++ b/pandora_console/views/cluster/view.php
@@ -55,22 +55,22 @@ $html->prepareBreadcrum($bc);
 // Header.
 $main_page = '<a href="'.$model->url.'">';
 $main_page .= html_print_image(
-    'images/list.png',
+    'images/logs@svg.svg',
     true,
     [
         'title' => __('Cluster list'),
-        'class' => 'invert_filter',
+        'class' => 'main_menu_icon invert_filter',
     ]
 );
 $main_page .= '</a>';
 
 $edit = '<a href="'.$model->url.'&op=update&id='.$cluster->id().'">';
 $edit .= html_print_image(
-    'images/setup.png',
+    'images/configuration@svg.svg',
     true,
     [
         'title' => __('Edit this cluster'),
-        'class' => 'invert_filter',
+        'class' => 'main_menu_icon invert_filter',
     ]
 );
 $edit .= '</a>';
@@ -184,7 +184,7 @@ if ($in_planned_downtime && !$cluster->agent()->disabled() && !$cluster->agent()
     $agent_name .= '&nbsp;'.ui_print_help_tip(
         __('Agent in scheduled downtime'),
         true,
-        'images/minireloj-16.png'
+        'images/clock.svg'
     ).'</em>';
 }
 
@@ -216,12 +216,12 @@ $table_agent_header .= '<div class="icono_right">'.$status_img.'</div>';
 $table_agent_header .= '&nbsp;&nbsp;';
 $table_agent_header .= '<a href="'.$model->url.'&op=force&id='.$cluster->id();
 $table_agent_header .= '">'.html_print_image(
-    'images/target.png',
+    'images/change-active.svg',
     true,
     [
         'title' => __('Force cluster status calculation'),
         'alt'   => '',
-        'class' => 'invert_filter',
+        'class' => 'main_menu_icon invert_filter',
 
     ]
 ).'</a>';
@@ -266,11 +266,11 @@ foreach ($addresses as $k => $add) {
 
 if (empty($address) === false) {
     $table_agent_ip = '<p>'.html_print_image(
-        'images/world.png',
+        'images/web@groups.svg',
         true,
         [
             'title' => __('IP address'),
-            'class' => 'invert_filter',
+            'class' => 'main_menu_icon invert_filter',
         ]
     );
     $table_agent_ip .= '<span class="align-top inline">';
@@ -279,11 +279,11 @@ if (empty($address) === false) {
 }
 
 $table_agent_description = '<p>'.html_print_image(
-    'images/list.png',
+    'images/logs@svg.svg',
     true,
     [
         'title' => __('Description'),
-        'class' => 'invert_filter',
+        'class' => 'main_menu_icon invert_filter',
     ]
 );
 $table_agent_description .= '<span class="align-top inline">';

From 8736629954510c72fd2aec7ab105965a9231d95c Mon Sep 17 00:00:00 2001
From: daniel <daniel.barbero@artica.es>
Date: Fri, 10 Mar 2023 08:38:44 +0100
Subject: [PATCH 12/25] fixed styles

---
 pandora_console/general/header.php         | 2 --
 pandora_console/include/styles/pandora.css | 4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/pandora_console/general/header.php b/pandora_console/general/header.php
index 81526eb129..6b6f7057b9 100644
--- a/pandora_console/general/header.php
+++ b/pandora_console/general/header.php
@@ -129,8 +129,6 @@ echo sprintf('<div id="header_table" class="header_table_%s">', $menuTypeClass);
             $search_bar .= 'type="search" onfocus="javascript: if (fieldKeyWordEmpty) $(\'#keywords\').val(\'\');"
                     onkeyup="showinterpreter()" class="search_input"/>';
 
-
-            $search_bar .= '<div id="result_order" class="result_order"></div>';
             // $search_bar .= 'onClick="javascript: document.quicksearch.submit()"';
             $search_bar .= "<input type='hidden' name='head_search_keywords' value='abc' />";
             $search_bar .= '</form>';
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index a0678c3079..e683245471 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -1135,6 +1135,7 @@ div#main {
   flex-direction: column;
   height: 100%;
   margin: 25px;
+  margin-bottom: 50px;
 }
 
 textarea.conf_editor {
@@ -8135,7 +8136,7 @@ div.graph div.legend table {
   position: relative;
   overflow: hidden;
   background-color: var(--secondary-color);
-  min-height: calc(100vh - 220px);
+  min-height: calc(100vh - 235px);
 }
 
 /*
@@ -10866,7 +10867,6 @@ tr.bring_next_field {
 .dataTables_wrapper {
   overflow: auto;
   width: 100%;
-  margin-bottom: 25px;
 }
 
 .dataTables_wrapper .dataTables_processing {

From ae6159c7a15f41e668fad6bb12b9842930252905 Mon Sep 17 00:00:00 2001
From: Pablo Aragon <pablo.aragon@pandorafms.com>
Date: Fri, 10 Mar 2023 08:40:38 +0100
Subject: [PATCH 13/25] Events

---
 pandora_console/godmode/events/event_edit_filter.php |  2 +-
 pandora_console/include/functions_events.php         | 12 ++++++------
 pandora_console/include/javascript/pandora_events.js |  2 +-
 pandora_console/include/styles/events.css            |  8 ++++----
 pandora_console/include/styles/tables.css            |  2 +-
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/pandora_console/godmode/events/event_edit_filter.php b/pandora_console/godmode/events/event_edit_filter.php
index d2a8e6bbef..a1c9638a48 100644
--- a/pandora_console/godmode/events/event_edit_filter.php
+++ b/pandora_console/godmode/events/event_edit_filter.php
@@ -778,7 +778,7 @@ $table->data[12][0] = html_print_label_input_block(
 if (!is_metaconsole()) {
     $table->data[12][1] = html_print_label_input_block(
         __('Module search'),
-        '<div class="w100p">'.html_print_autocomplete_modules(
+        '<div class="w100p module-search">'.html_print_autocomplete_modules(
             'module_search',
             $text_module,
             false,
diff --git a/pandora_console/include/functions_events.php b/pandora_console/include/functions_events.php
index f779b7121e..1c6740efff 100644
--- a/pandora_console/include/functions_events.php
+++ b/pandora_console/include/functions_events.php
@@ -3453,7 +3453,7 @@ function events_page_responses($event)
             __('Update'),
             'status_button',
             false,
-            'event_change_status(\''.$event['similar_ids'].'\','.$event['server_id'].');',
+            'event_change_status("'.$event['similar_ids'].'",'.$event['server_id'].');',
             [
                 'icon' => 'next',
                 'mode' => 'link',
@@ -3484,7 +3484,7 @@ function events_page_responses($event)
             __('Add comment'),
             'comment_button',
             false,
-            '$(\'#link_comments\').trigger(\'click\');',
+            '$("#link_comments").trigger("click");',
             [
                 'icon' => 'next',
                 'mode' => 'link',
@@ -3511,7 +3511,7 @@ function events_page_responses($event)
             __('Delete event'),
             'delete_button',
             false,
-            'if(!confirm(\''.__('Are you sure?').'\')) { return false; } this.form.submit();',
+            'if(!confirm("'.__('Are you sure?').'")) { return false; } this.form.submit();',
             [
                 'icon' => 'cancel',
                 'mode' => 'link',
@@ -4260,7 +4260,7 @@ function events_page_details($event, $server_id=0)
             __('View custom fields'),
             'custom_button',
             false,
-            '$(\'#link_custom_fields\').trigger(\'click\');',
+            '$("#link_custom_fields").trigger("click");',
             [ 'mode' => 'link' ],
             true
         );
@@ -5172,7 +5172,7 @@ function events_page_comments($event, $ajax=false, $groupedComments=[])
             __('Add comment'),
             'comment_button',
             false,
-            'event_comment(\''.base64_encode(json_encode($event)).'\');',
+            'event_comment("'.base64_encode(json_encode($event)).'");',
             [
                 'icon' => 'next',
                 'mode' => 'mini secondary',
@@ -5779,7 +5779,7 @@ function get_row_response_action(
         __('Execute again'),
         'btn_str',
         false,
-        'perform_response(\''.base64_encode(json_encode($event_response)).'\','.$response_id.',\''.trim($index).'\')',
+        'perform_response("'.base64_encode(json_encode($event_response)).'",'.$response_id.',"'.trim($index).'")',
         [
             'icon' => 'next',
             'mode' => 'mini secondary',
diff --git a/pandora_console/include/javascript/pandora_events.js b/pandora_console/include/javascript/pandora_events.js
index 7f7700f6f1..9f40d84305 100644
--- a/pandora_console/include/javascript/pandora_events.js
+++ b/pandora_console/include/javascript/pandora_events.js
@@ -67,7 +67,7 @@ function show_event_dialog(event, dialog_page) {
             background: "black"
           },
           width: 710,
-          height: 600,
+          height: 650,
           autoOpen: true,
           open: function() {
             if (
diff --git a/pandora_console/include/styles/events.css b/pandora_console/include/styles/events.css
index c2a4665925..02611196c4 100644
--- a/pandora_console/include/styles/events.css
+++ b/pandora_console/include/styles/events.css
@@ -173,10 +173,6 @@ fieldset {
   max-width: 10px;
 }
 
-.fixed_filter_bar:has(div > div.filter-datatable-submain > form#events_form) {
-  margin-bottom: 0px;
-}
-
 .fixed_filter_bar > div.white_table_graph_header:has(div.filter_summary) {
   padding: 5px 20px;
 }
@@ -524,3 +520,7 @@ td#save_filter_form-0-0 > input[type="radio"],
 td#save_filter_form-0-1 > input[type="radio"] {
   height: 14px;
 }
+
+.module-search > input[type="text"] {
+  margin-bottom: 6px;
+}
diff --git a/pandora_console/include/styles/tables.css b/pandora_console/include/styles/tables.css
index af6508027d..c10738b02c 100644
--- a/pandora_console/include/styles/tables.css
+++ b/pandora_console/include/styles/tables.css
@@ -688,7 +688,7 @@ table.events-filters-create
   > div
   > div
   > .ui-autocomplete-input {
-  width: 94%;
+  width: 100%;
 }
 
 table.events-filters-create > tbody > tr > td > div.flex-row > div {

From 3f884d9aff0df3655a34dce3aab57b54023979db Mon Sep 17 00:00:00 2001
From: Jose Gonzalez <jose.gonzalez@pandorafms.com>
Date: Fri, 10 Mar 2023 11:09:36 +0100
Subject: [PATCH 14/25] Tree View fixed

---
 .../include/class/TreeService.class.php       | 32 +++++--------------
 pandora_console/include/styles/tree.css       | 24 +++++++++-----
 2 files changed, 24 insertions(+), 32 deletions(-)

diff --git a/pandora_console/include/class/TreeService.class.php b/pandora_console/include/class/TreeService.class.php
index 69b06fd684..bfb1556202 100644
--- a/pandora_console/include/class/TreeService.class.php
+++ b/pandora_console/include/class/TreeService.class.php
@@ -424,21 +424,21 @@ class TreeService extends Tree
 
                     switch ($item->agent()->lastStatus()) {
                         case AGENT_STATUS_NORMAL:
-                            $tmp['statusImageHTML'] = '<img src="'.ui_get_full_url('images/status_sets/default/agent_ok_ball.png').'" data-title="NORMAL status." data-use_title_for_force_title="1" class="forced_title" alt="NORMAL status." />';
+                            $tmp['statusImageHTML'] = html_print_div(['class' => 'tree-service-status', 'style' => 'background-color: #82b92e', 'title' => __('Normal status') ], true);
                         break;
 
                         case AGENT_STATUS_CRITICAL:
                         case AGENT_STATUS_ALERT_FIRED:
-                            $tmp['statusImageHTML'] = '<img src="'.ui_get_full_url('images/status_sets/default/agent_critical_ball.png').'" data-title="CRITICAL status." data-use_title_for_force_title="1" class="forced_title" alt="CRITICAL status." />';
+                            $tmp['statusImageHTML'] = html_print_div(['class' => 'tree-service-status', 'style' => 'background-color: #e63c52', 'title' => __('Critical status') ], true);
                         break;
 
                         case AGENT_STATUS_WARNING:
-                            $tmp['statusImageHTML'] = '<img src="'.ui_get_full_url('images/status_sets/default/agent_warning_ball.png').'" data-title="WARNING status." data-use_title_for_force_title="1" class="forced_title" alt="WARNING status." />';
+                            $tmp['statusImageHTML'] = html_print_div(['class' => 'tree-service-status', 'style' => 'background-color: #f3b200', 'title' => __('Warning status') ], true);
                         break;
 
                         case AGENT_STATUS_UNKNOWN:
                         default:
-                            $tmp['statusImageHTML'] = '<img src="'.ui_get_full_url('images/status_sets/default/agent_no_data_ball.png').'" data-title="UNKNOWN status." data-use_title_for_force_title="1" class="forced_title" alt="UNKNOWN status." />';
+                            $tmp['statusImageHTML'] = html_print_div(['class' => 'tree-service-status', 'style' => 'background-color: #B2B2B2', 'title' => __('Unknown status') ], true);
                         break;
                     }
 
@@ -634,36 +634,20 @@ class TreeService extends Tree
                     $tmp['rootID'] = $this->rootID;
                     switch ($item->service()->lastStatus()) {
                         case SERVICE_STATUS_NORMAL:
-                            $tmp['statusImageHTML'] = '<img src="';
-                            $tmp['statusImageHTML'] .= ui_get_full_url(
-                                'images/status_sets/default/agent_ok_ball.png'
-                            );
-                            $tmp['statusImageHTML'] .= '" data-title="NORMAL status." data-use_title_for_force_title="1" class="forced_title" alt="NORMAL status." />';
+                            $tmp['statusImageHTML'] = html_print_div(['class' => 'tree-service-status', 'style' => 'background-color: #82b92e', 'title' => __('Normal status') ], true);
                         break;
 
                         case SERVICE_STATUS_CRITICAL:
-                            $tmp['statusImageHTML'] = '<img src="';
-                            $tmp['statusImageHTML'] .= ui_get_full_url(
-                                'images/status_sets/default/agent_critical_ball.png'
-                            );
-                            $tmp['statusImageHTML'] .= '" data-title="CRITICAL status." data-use_title_for_force_title="1" class="forced_title" alt="CRITICAL status." />';
+                            $tmp['statusImageHTML'] = html_print_div(['class' => 'tree-service-status', 'style' => 'background-color: #e63c52', 'title' => __('Critical status') ], true);
                         break;
 
                         case SERVICE_STATUS_WARNING:
-                            $tmp['statusImageHTML'] = '<img src="';
-                            $tmp['statusImageHTML'] .= ui_get_full_url(
-                                'images/status_sets/default/agent_warning_ball.png'
-                            );
-                            $tmp['statusImageHTML'] .= '" data-title="WARNING status." data-use_title_for_force_title="1" class="forced_title" alt="WARNING status." />';
+                            $tmp['statusImageHTML'] = html_print_div(['class' => 'tree-service-status', 'style' => 'background-color: #f3b200', 'title' => __('Warning status') ], true);
                         break;
 
                         case SERVICE_STATUS_UNKNOWN:
                         default:
-                            $tmp['statusImageHTML'] = '<img src="';
-                            $tmp['statusImageHTML'] .= ui_get_full_url(
-                                'images/status_sets/default/agent_no_data_ball.png'
-                            );
-                            $tmp['statusImageHTML'] .= '" data-title="UNKNOWN status." data-use_title_for_force_title="1" class="forced_title" alt="UNKNOWN status." />';
+                            $tmp['statusImageHTML'] = html_print_div(['class' => 'tree-service-status', 'style' => 'background-color: #B2B2B2', 'title' => __('Unknown status') ], true);
                         break;
                     }
                 break;
diff --git a/pandora_console/include/styles/tree.css b/pandora_console/include/styles/tree.css
index 61ad75716d..a987a751d9 100644
--- a/pandora_console/include/styles/tree.css
+++ b/pandora_console/include/styles/tree.css
@@ -1,6 +1,6 @@
 .tree-root {
   margin-top: 0px;
-  margin-bottom: 0px;
+  margin-bottom: 40px;
 }
 
 .tree-node.tree-node-header {
@@ -8,12 +8,6 @@
   flex-direction: row;
   flex-wrap: wrap;
   align-items: center;
-  /*
-  width: calc(100% - 24px);
-  border: 1px solid #eaeaea;
-  border-radius: 4px;
-  background-color: #fff;
-  */
   margin-bottom: 8px;
 }
 
@@ -392,6 +386,20 @@ div#tree-controller-recipient {
 .tree-node > .node-content > .agent-alerts-fired {
   float: left;
   position: relative;
-  left: 26px;
+  left: 13px;
   top: -5px;
 }
+
+.tree-node > .node-content > div.tree-service-status {
+  width: 7px;
+  height: 20px;
+  margin-left: 0;
+  border-radius: 5px;
+}
+
+.tree-node > .node-content.node-service > div.tree-service-status {
+  width: 7px;
+  height: 20px;
+  margin-left: 5px;
+  border-radius: 5px;
+}

From 5b748d8ec08d3fae64a7453ae4f4508386e8b4b4 Mon Sep 17 00:00:00 2001
From: Jose Gonzalez <jose.gonzalez@pandorafms.com>
Date: Fri, 10 Mar 2023 11:12:26 +0100
Subject: [PATCH 15/25] Added images

---
 pandora_console/images/nodes@svg.svg   | 23 +++++++++++++++++++++++
 pandora_console/images/refresh@svg.svg | 20 ++++++++++++++++++++
 2 files changed, 43 insertions(+)
 create mode 100644 pandora_console/images/nodes@svg.svg
 create mode 100644 pandora_console/images/refresh@svg.svg

diff --git a/pandora_console/images/nodes@svg.svg b/pandora_console/images/nodes@svg.svg
new file mode 100644
index 0000000000..b97a133d73
--- /dev/null
+++ b/pandora_console/images/nodes@svg.svg
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="20px" height="20px" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: sketchtool 61.2 (101010) - https://sketch.com -->
+    <title>A4F45784-4263-40A4-A100-0ADD2A4AF526@svg</title>
+    <desc>Created with sketchtool.</desc>
+    <g id="Mockups" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Mockup---Inventory-v2" transform="translate(-330.000000, -482.000000)">
+            <g id="Base-operations" transform="translate(310.000000, 462.000000)">
+                <g id="Contenido" transform="translate(20.000000, 20.000000)">
+                    <g id="Title">
+                        <g id="Node" transform="translate(0.000000, 1.000000)">
+                            <path d="M11.0005809,0.577602729 L17.0215369,4.05330429 C17.6403998,4.41055362 18.0216446,5.07084166 18.0216446,5.78541725 L18.0216446,12.2084379 C18.0216446,12.9225447 17.6408956,13.5824738 17.0226732,13.9398945 L10.9867915,17.429494 C10.3751132,17.7831311 9.62223302,17.7877875 9.00622741,17.4417433 L3.00985488,14.073251 C2.37954726,13.7191726 1.98939037,13.0524969 1.98939037,12.3295452 L1.98939037,5.78462237 C1.98939037,5.07047279 2.37018458,4.41051094 2.98846546,4.05310589 L8.99976366,0.578199219 C9.61866686,0.220434425 10.3814645,0.220207018 11.0005809,0.577602729 Z" id="Polygon" stroke="#3F3F3F" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"></path>
+                            <polyline id="Path-28" stroke="#3F3F3F" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" points="3 4 10 9 10 17.6651764"></polyline>
+                            <circle id="Oval" fill="#3F3F3F" cx="10" cy="9" r="3"></circle>
+                            <circle id="Oval" fill="#3F3F3F" cx="3" cy="4" r="3"></circle>
+                            <circle id="Oval" fill="#3F3F3F" cx="17" cy="4" r="3"></circle>
+                        </g>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/pandora_console/images/refresh@svg.svg b/pandora_console/images/refresh@svg.svg
new file mode 100644
index 0000000000..bead6c6a97
--- /dev/null
+++ b/pandora_console/images/refresh@svg.svg
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="12px" height="12px" viewBox="0 0 12 12" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: sketchtool 61.2 (101010) - https://sketch.com -->
+    <title>312C8F68-5915-4989-BCE0-E39966548B2E@svg</title>
+    <desc>Created with sketchtool.</desc>
+    <g id="Mockups" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
+        <g id="Mockup---Module-2-default-open" transform="translate(-1857.000000, -3735.000000)" stroke="#3F3F3F" stroke-width="2">
+            <g id="Barra-inferior" transform="translate(0.000000, 3710.000000)">
+                <g id="Acciones" transform="translate(1507.000000, 10.000000)">
+                    <g id="Principal-por-defecto" transform="translate(269.000000, 0.000000)">
+                        <g id="Icons/Elements/update-white" transform="translate(82.000000, 16.000000)">
+                            <polyline id="Path-10" points="10.0005064 0 10.0005064 2.98289013 7 2.98289013"></polyline>
+                            <path d="M0.000657169914,8.00835862 C0.790778884,9.26397417 2.12630154,9.92782378 4.00722512,9.99990745 C6.76864887,9.99990745 9.00722512,7.76136573 9.00722512,4.99998457 C9.00722512,2.23860342 6.76864887,6.16977954e-05 4.00722512,6.16977954e-05 C2.36730125,6.16977954e-05 0.911775413,0.789551382 0,2.00918391" id="Oval" transform="translate(4.503613, 4.999985) scale(-1, -1) translate(-4.503613, -4.999985) "></path>
+                        </g>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file

From 000874ea6e2384cf274082eaf5b081e1989e6335 Mon Sep 17 00:00:00 2001
From: Pablo Aragon <pablo.aragon@pandorafms.com>
Date: Fri, 10 Mar 2023 12:29:13 +0100
Subject: [PATCH 16/25] CSV button datatable. IPAM fix

---
 .../images/file-csv-primary-color.svg         | 11 +++++
 pandora_console/include/functions_ui.php      |  1 -
 pandora_console/include/styles/pandora.css    |  6 ++-
 pandora_console/include/styles/tables.css     | 45 +++++++++++++------
 4 files changed, 47 insertions(+), 16 deletions(-)
 create mode 100644 pandora_console/images/file-csv-primary-color.svg

diff --git a/pandora_console/images/file-csv-primary-color.svg b/pandora_console/images/file-csv-primary-color.svg
new file mode 100644
index 0000000000..51afb11235
--- /dev/null
+++ b/pandora_console/images/file-csv-primary-color.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg  viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 61.2 (89653) - https://sketch.com -->
+    <title>Dark / 20 / file-csv@svg</title>
+    <desc>Created with Sketch.</desc>
+    <g id="Dark-/-20-/-file-csv" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Group" fill="#14524f">
+            <path d="M14,0 L20,6 L20,18 C20,19.1045695 19.1045695,20 18,20 L18,20 L2,20 C0.8954305,20 0,19.1045695 0,18 L0,18 L0,2 C0,0.8954305 0.8954305,0 2,0 L2,0 L14,0 Z M3.51944167,13 C2.19341974,13 1,13.9742896 1,15.5033829 C1,17.0324763 2.15154536,18 3.5333998,18 C4.9222333,18 5.63409771,17.1069012 5.8225324,16.3694181 L4.9222333,16.105548 C4.78963111,16.5520974 4.3778664,17.0866035 3.5333998,17.0866035 C2.73778664,17.0866035 1.99800598,16.5250338 1.99800598,15.5033829 C1.99800598,14.4140731 2.77966102,13.8998647 3.51944167,13.8998647 C4.3778664,13.8998647 4.76171486,14.4073072 4.88035892,14.8673884 L5.78763709,14.5899865 C5.59222333,13.811908 4.88733799,13 3.51944167,13 Z M8.18145563,13 C7.24626122,13 6.45762712,13.6495264 6.45762712,14.5020298 C6.45762712,15.2259811 6.9670987,15.7198917 7.7557328,15.8755074 L8.44666002,16.0108254 C8.83050847,16.0852503 9.04685942,16.3017591 9.04685942,16.579161 C9.04685942,16.917456 8.76071785,17.1677943 8.2442672,17.1677943 C7.54636092,17.1677943 7.20438684,16.7415426 7.16251246,16.2679296 L6.26919242,16.4979702 C6.34596211,17.1813261 6.92522433,18 8.23728814,18 C9.3888335,18 10.0239282,17.255751 10.0239282,16.5182679 C10.0239282,15.8416779 9.54237288,15.2733424 8.64207378,15.1041949 L7.95114656,14.9756428 C7.58823529,14.9079838 7.41375872,14.6982409 7.41375872,14.4343708 C7.41375872,14.1163735 7.72083749,13.8254398 8.1884347,13.8254398 C8.81655035,13.8254398 9.03988036,14.2381597 9.0887338,14.5020298 L9.95413759,14.2449256 C9.84247258,13.7036536 9.38185444,13 8.18145563,13 Z M11.3988036,13.1014885 L10.3449651,13.1014885 L12.1734796,17.8985115 L13.1645065,17.8985115 L15,13.1014885 L13.9810568,13.1014885 L12.6899302,16.6671177 L11.3988036,13.1014885 Z M14,2 L14,7 L19,7 L14,2 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index ede1cbb165..f098a8eb43 100755
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -4457,7 +4457,6 @@ function ui_toggle(
         $output .= "		    }\n";
         $output .= "		});\n";
         $output .= "		$('#tgl_ctrl_".$uniqid."').click(function() {\n";
-        $output .= "				console.log('#image_".$uniqid."');";
         $output .= '			if (hide_tgl_ctrl_'.$uniqid.") {\n";
         $output .= '				hide_tgl_ctrl_'.$uniqid." = 0;\n";
         $output .= "				$('#tgl_div_".$uniqid."').css('height', 'auto');\n";
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index e683245471..57ce9a98f2 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -10071,7 +10071,11 @@ select:focus {
 }
 
 .dataTables_length > label > select {
-  min-height: 3em;
+  min-height: 42px;
+}
+
+.dataTables_length > label {
+  font-size: 0px;
 }
 
 input[type="button"],
diff --git a/pandora_console/include/styles/tables.css b/pandora_console/include/styles/tables.css
index c10738b02c..1aeaa479e7 100644
--- a/pandora_console/include/styles/tables.css
+++ b/pandora_console/include/styles/tables.css
@@ -138,7 +138,7 @@
 .info_table > thead > tr > th,
 .info_table > thead > tr > th * {
   /*border-bottom: 1px solid #e2e2e2;*/
-  font-family: "lato-bolder";
+  font-family: "lato-bold";
   font-style: normal;
   text-rendering: optimizeLegibility;
   -webkit-font-smoothing: antialiased;
@@ -353,23 +353,40 @@ a.pandora_pagination.current:hover {
 
 /* CSV button datatables */
 .dt-button.buttons-csv.buttons-html5 {
-  background-image: url(../../images/file-csv.svg);
-  background-position: center center;
+  background-image: url(../../images/file-csv-primary-color.svg);
+  background-size: 22px;
+  background-position: 48px center;
   background-repeat: no-repeat;
-  color: #000;
-  border: none;
-  cursor: pointer;
-  display: inline;
-  padding: 7pt;
-  margin-left: 10px;
   background-color: transparent;
-}
-.dt-button.buttons-csv.buttons-html5 span {
-  font-size: 0;
+  color: var(--primary-color);
+  font-size: 20px;
+  height: 42px;
+  /* height: 32px; */
+  width: 80px;
+  margin-left: 10px;
+
+  display: flex;
+  justify-content: space-between;
+  flex-direction: row;
+  align-items: center;
+  box-shadow: 0px 3px 6px #c7c7c7;
+  border: 2px solid var(--primary-color);
+  border-radius: 8px;
+  padding: 0 10px;
+  cursor: pointer;
 }
 
-.dt-buttons {
-  margin-top: 3pt;
+.dt-button.buttons-csv.buttons-html5:hover {
+  color: #1d7873 !important;
+  border: 2px solid #1d7873 !important;
+}
+
+.dt-button.buttons-csv.buttons-html5:before {
+  content: "csv";
+}
+
+.dt-button.buttons-csv.buttons-html5 span {
+  font-size: 0;
 }
 
 .dt-button.buttons-csv.buttons-html5:active,

From 3be507ca7ec8146d9d245ff15aa939d96e92df3d Mon Sep 17 00:00:00 2001
From: daniel <daniel.barbero@artica.es>
Date: Fri, 10 Mar 2023 12:40:21 +0100
Subject: [PATCH 17/25] fixed styles

---
 pandora_console/general/header.php            |  5 +-
 .../agentes/planned_downtime.editor.php       |  2 +-
 .../godmode/alerts/alert_list.list.php        |  2 +-
 .../godmode/events/event_filter.php           |  2 +-
 .../godmode/gis_maps/configure_gis_map.php    | 10 ++--
 .../manage_network_components_form_wizard.php |  2 +-
 .../modules/manage_network_templates.php      |  4 +-
 pandora_console/godmode/netflow/nf_edit.php   |  2 +-
 .../godmode/netflow/nf_item_list.php          |  4 +-
 .../reporting_builder.item_editor.php         | 12 ++---
 pandora_console/godmode/setup/gis.php         |  2 +-
 pandora_console/godmode/setup/links.php       |  2 +-
 pandora_console/godmode/setup/news.php        |  2 +-
 pandora_console/godmode/setup/snmp_wizard.php |  2 +-
 .../godmode/snmpconsole/snmp_alert.php        |  4 +-
 .../godmode/users/configure_user.php          |  2 +-
 .../include/class/CalendarManager.class.php   |  4 +-
 .../include/class/NetworkMap.class.php        |  2 +-
 .../include/class/SatelliteAgent.class.php    |  2 +-
 .../class/SatelliteCollection.class.php       |  2 +-
 .../include/functions_container.php           |  4 +-
 pandora_console/include/functions_gis.php     |  2 +-
 pandora_console/include/functions_html.php    |  6 +++
 pandora_console/include/functions_modules.php |  6 +--
 pandora_console/include/functions_ui.php      | 33 +++++++++---
 .../help/en/help_configure_gis_map.php        |  2 +-
 .../include/help/en/help_eventview.php        |  2 +-
 .../include/help/en/help_gis_map_builder.php  |  2 +-
 .../include/help/en/help_setup_gis_index.php  |  2 +-
 .../include/help/es/help_eventview.php        |  2 +-
 .../include/help/es/help_gis_map_builder.php  |  2 +-
 .../help/ja/help_configure_gis_map.php        |  2 +-
 .../include/help/ja/help_eventview.php        |  2 +-
 .../include/help/ja/help_gis_map_builder.php  |  2 +-
 .../include/help/ja/help_setup_gis_index.php  |  2 +-
 .../include/javascript/pandora_events.js      |  2 +-
 .../include/javascript/pandora_modules.js     |  2 +-
 .../javascript/tree/TreeControllerMeta.js     |  4 +-
 pandora_console/include/styles/menu.css       |  5 ++
 .../include/styles/order_interpreter.css      |  1 +
 pandora_console/include/styles/pandora.css    | 19 +++++--
 .../include/styles/pandora_black.css          | 14 ++---
 .../include/styles/visual_maps.css            |  8 +--
 .../operation/agentes/estado_agente.php       | 52 +++++++++----------
 .../operation/gis_maps/gis_map.php            |  2 +-
 .../dashboard_detail_integriaims_incident.php |  2 +-
 .../incidents/list_integriaims_incidents.php  |  4 +-
 pandora_console/operation/search_agents.php   | 24 +++++++--
 pandora_console/operation/search_modules.php  | 24 +++++++--
 pandora_console/operation/search_results.php  | 10 +++-
 .../views/calendar/special_days.php           |  4 +-
 51 files changed, 192 insertions(+), 125 deletions(-)

diff --git a/pandora_console/general/header.php b/pandora_console/general/header.php
index 6b6f7057b9..40f6c3a382 100644
--- a/pandora_console/general/header.php
+++ b/pandora_console/general/header.php
@@ -117,6 +117,7 @@ echo sprintf('<div id="header_table" class="header_table_%s">', $menuTypeClass);
                 }
             }
 
+            $search_bar .= '<div id="result_order" class="result_order"></div>';
             $search_bar .= '<input id="keywords" name="keywords"';
             if (!isset($config['search_keywords'])) {
                 $search_bar .= "value='".__('Enter keywords to search')."'";
@@ -126,13 +127,11 @@ echo sprintf('<div id="header_table" class="header_table_%s">', $menuTypeClass);
                 $search_bar .= "value='".$config['search_keywords']."'";
             }
 
-            $search_bar .= 'type="search" onfocus="javascript: if (fieldKeyWordEmpty) $(\'#keywords\').val(\'\');"
-                    onkeyup="showinterpreter()" class="search_input"/>';
+            $search_bar .= 'type="search" onfocus="javascript: if (fieldKeyWordEmpty) $(\'#keywords\').val(\'\');" onkeyup="showinterpreter()" class="search_input"/>';
 
             // $search_bar .= 'onClick="javascript: document.quicksearch.submit()"';
             $search_bar .= "<input type='hidden' name='head_search_keywords' value='abc' />";
             $search_bar .= '</form>';
-
             $header_searchbar = '<div id="header_searchbar">'.$search_bar.'</div>';
         }
 
diff --git a/pandora_console/godmode/agentes/planned_downtime.editor.php b/pandora_console/godmode/agentes/planned_downtime.editor.php
index 32fdcac6be..f3bea0aa78 100644
--- a/pandora_console/godmode/agentes/planned_downtime.editor.php
+++ b/pandora_console/godmode/agentes/planned_downtime.editor.php
@@ -1452,7 +1452,7 @@ $table->data['module'][1] = "
                 <td class='cell_delete_button' style='text-align: right; width:10%;' id=''>".'<a class="link_delete"
                         onclick="if(!confirm(\''.__('Are you sure?').'\')) return false;"
                         href="">'.html_print_image(
-                            'images/cross.png',
+                            'images/delete.svg',
                             true,
                             [
                                 'border' => '0',
diff --git a/pandora_console/godmode/alerts/alert_list.list.php b/pandora_console/godmode/alerts/alert_list.list.php
index f844d2c18d..45003b2bc0 100644
--- a/pandora_console/godmode/alerts/alert_list.list.php
+++ b/pandora_console/godmode/alerts/alert_list.list.php
@@ -766,7 +766,7 @@ foreach ($simple_alerts as $alert) {
             $data[3] .= '</form>';
             $data[3] .= html_print_input_image(
                 'update_action',
-                'images/config.png',
+                'images/edit.svg',
                 1,
                 'padding:0px;',
                 true,
diff --git a/pandora_console/godmode/events/event_filter.php b/pandora_console/godmode/events/event_filter.php
index b9c611c99a..9a2c9df9f6 100644
--- a/pandora_console/godmode/events/event_filter.php
+++ b/pandora_console/godmode/events/event_filter.php
@@ -186,7 +186,7 @@ foreach ($filters as $filter) {
     ) {
         $table->cellclass[][6] = 'table_action_buttons';
         $data[6] = "<a onclick='if(confirm(\"".__('Are you sure?')."\")) return true; else return false;'href='index.php?sec=geventos&sec2=godmode/events/events&section=filter&delete=1&id=".$filter['id_filter'].'&offset=0&pure='.$config['pure']."'>".html_print_image(
-            'images/cross.png',
+            'images/delete.svg',
             true,
             [
                 'title' => __('Delete'),
diff --git a/pandora_console/godmode/gis_maps/configure_gis_map.php b/pandora_console/godmode/gis_maps/configure_gis_map.php
index 2df8d06c6e..92e9e043b3 100644
--- a/pandora_console/godmode/gis_maps/configure_gis_map.php
+++ b/pandora_console/godmode/gis_maps/configure_gis_map.php
@@ -698,7 +698,7 @@ echo '</form>';
             <td><a id="delete_row" href="none">
             <?php
             html_print_image(
-                'images/cross.png',
+                'images/delete.svg',
                 false,
                 [
                     'alt'   => '',
@@ -1005,7 +1005,7 @@ function getAgentRow (layerId, agentId, agentAlias) {
     var $deleteCol = $("<td />");
 
     var $agentAlias = $("<span class=\"agent_alias\" data-agent-id=\"" + agentId + "\">" + agentAlias + "</span>");
-    var $removeBtn = $('<a class="delete_row" href="javascript:" <?php echo html_print_image('images/cross.png', false, ['class' => 'invert_filter']); ?> </a>');
+    var $removeBtn = $('<a class="delete_row" href="javascript:" <?php echo html_print_image('images/delete.svg', false, ['class' => 'invert_filter']); ?> </a>');
 
     $removeBtn.click(function (event) {
         var $layerRow = $("tr#layer_row_" + layerId);
@@ -1061,7 +1061,7 @@ function getGroupRow (layerId, groupId, groupName, agentId, agentAlias) {
         + "<i>" + agentAlias + "</i>"
         + ")"
         + "</span>");
-    var $removeBtn = $('<a class="delete_row" href="javascript:;"><?php echo html_print_image('images/cross.png', true, ['class' => 'invert_filter']); ?></a>');
+    var $removeBtn = $('<a class="delete_row" href="javascript:;"><?php echo html_print_image('images/delete.svg', true, ['class' => 'invert_filter']); ?></a>');
 
     $removeBtn.click(function (event) {
         var $layerRow = $("tr#layer_row_" + layerId);
@@ -1139,8 +1139,8 @@ function getLayerRow (layerId, layerData) {
     var $layerName = $("<span class=\"layer_name\">" + layerData.name + "</span>");
     var $sortUpBtn = $("<a class=\"up_arrow\" href=\"javascript:;\" />");
     var $sortDownBtn = $("<a class=\"down_arrow\" href=\"javascript:;\" />");
-    var $editBtn = $('<a class="edit_layer" href="javascript:;"><?php echo html_print_image('images/config.png', true, ['class' => 'invert_filter']); ?></a>');
-    var $removeBtn = $('<a class="delete_row" href="javascript:;"><?php echo html_print_image('images/cross.png', true, ['class' => 'invert_filter']); ?></a>');
+    var $editBtn = $('<a class="edit_layer" href="javascript:;"><?php echo html_print_image('images/edit.svg', true, ['class' => 'invert_filter']); ?></a>');
+    var $removeBtn = $('<a class="delete_row" href="javascript:;"><?php echo html_print_image('images/delete.svg', true, ['class' => 'invert_filter']); ?></a>');
 
     $sortUpBtn.click(moveLayerRowUpOnClick);
     $sortDownBtn.click(moveLayerRowDownOnClick);
diff --git a/pandora_console/godmode/modules/manage_network_components_form_wizard.php b/pandora_console/godmode/modules/manage_network_components_form_wizard.php
index 0c9f894ba1..190ff655ff 100644
--- a/pandora_console/godmode/modules/manage_network_components_form_wizard.php
+++ b/pandora_console/godmode/modules/manage_network_components_form_wizard.php
@@ -104,7 +104,7 @@ function generateExtraFields($extra_fields, $protocol)
             'class'   => 'float-right',
             'style'   => $cntFields <= 1 ? 'opacity: 0.5;' : '',
             'content' => html_print_image(
-                'images/cross.png',
+                'images/delete.svg',
                 true,
                 [
                     'title'   => __('Remove last macro oid'),
diff --git a/pandora_console/godmode/modules/manage_network_templates.php b/pandora_console/godmode/modules/manage_network_templates.php
index 4f1c949e9f..2940716ee5 100644
--- a/pandora_console/godmode/modules/manage_network_templates.php
+++ b/pandora_console/godmode/modules/manage_network_templates.php
@@ -266,7 +266,7 @@ foreach ($result as $row) {
     $table->cellclass[][3] = 'table_action_buttons';
     $data[3] = html_print_input_image(
         'delete_profile',
-        'images/cross.png',
+        'images/delete.svg',
         $row['id_np'],
         '',
         true,
@@ -286,7 +286,7 @@ foreach ($result as $row) {
             'class' => 'invert_filter',
         ]
     );
-    $data[3] = '<a href="index.php?sec=gmodules&sec2=godmode/modules/manage_network_templates'.'&delete_profile=1&delete_profile='.$row['id_np'].'" '.'onclick="if (!confirm(\''.__('Are you sure?').'\')) return false;">'.html_print_image('images/cross.png', true, ['title' => __('Delete'), 'class' => 'invert_filter']).'</a>';
+    $data[3] = '<a href="index.php?sec=gmodules&sec2=godmode/modules/manage_network_templates'.'&delete_profile=1&delete_profile='.$row['id_np'].'" '.'onclick="if (!confirm(\''.__('Are you sure?').'\')) return false;">'.html_print_image('images/delete.svg', true, ['title' => __('Delete'), 'class' => 'invert_filter']).'</a>';
     $data[3] .= '<a onclick="blockResubmit($(this))" href="index.php?sec=gmodules&sec2=godmode/modules/manage_network_templates'.'&export_profile='.$row['id_np'].'">'.html_print_image('images/csv.png', true, ['title' => __('Export to CSV'), 'class' => 'invert_filter']).'</a>';
 
     array_push($table->data, $data);
diff --git a/pandora_console/godmode/netflow/nf_edit.php b/pandora_console/godmode/netflow/nf_edit.php
index e384cc1541..b267b40254 100644
--- a/pandora_console/godmode/netflow/nf_edit.php
+++ b/pandora_console/godmode/netflow/nf_edit.php
@@ -191,7 +191,7 @@ foreach ($filters as $filter) {
     if (check_acl_restricted_all($config['id_user'], $filter['id_group'], 'AW')) {
         $table->cellclass[][3] = 'table_action_buttons';
         $data[3] = "<a onclick='if(confirm(\"".__('Are you sure?')."\")) return true; else return false;' 
-            href='".$config['homeurl'].'index.php?sec=netf&sec2=godmode/netflow/nf_edit&delete=1&id='.$filter['id_sg']."&offset=0&pure=$pure'>".html_print_image('images/cross.png', true, ['title' => __('Delete'), 'class' => 'invert_filter']).'</a>';
+            href='".$config['homeurl'].'index.php?sec=netf&sec2=godmode/netflow/nf_edit&delete=1&id='.$filter['id_sg']."&offset=0&pure=$pure'>".html_print_image('images/delete.svg', true, ['title' => __('Delete'), 'class' => 'invert_filter']).'</a>';
     }
 
     array_push($table->data, $data);
diff --git a/pandora_console/godmode/netflow/nf_item_list.php b/pandora_console/godmode/netflow/nf_item_list.php
index d7a267aed6..2c36456a52 100644
--- a/pandora_console/godmode/netflow/nf_item_list.php
+++ b/pandora_console/godmode/netflow/nf_item_list.php
@@ -30,7 +30,7 @@ $buttons['report_items']['active'] = true;
 $buttons['report_items']['text'] = '<a href="'.$config['homeurl'].'index.php?sec=netf&sec2=godmode/netflow/nf_item_list&id='.$id.'">'.html_print_image('images/god6.png', true, ['title' => __('Report items')]).'</a>';
 
 $buttons['edit_report']['active'] = false;
-$buttons['edit_report']['text'] = '<a href="'.$config['homeurl'].'index.php?sec=netf&sec2=godmode/netflow/nf_report_form&id='.$id.'">'.html_print_image('images/config.png', true, ['title' => __('Edit report')]).'</a>';
+$buttons['edit_report']['text'] = '<a href="'.$config['homeurl'].'index.php?sec=netf&sec2=godmode/netflow/nf_report_form&id='.$id.'">'.html_print_image('images/edit.svg', true, ['title' => __('Edit report')]).'</a>';
 
 // Header
 if (! defined('METACONSOLE')) {
@@ -260,7 +260,7 @@ foreach ($reports_item as $item) {
     }
 
     $data[5] = "<a onclick='if(confirm(\"".__('Are you sure?')."\")) return true; else return false;' 
-		href='".$config['homeurl'].'index.php?sec=netf&sec2=godmode/netflow/nf_item_list&delete=1&id_rc='.$item['id_rc'].'&id='.$id."&offset=0'>".html_print_image('images/cross.png', true, ['title' => __('Delete'), 'class' => 'invert_filter']).'</a>'.html_print_checkbox_extended('delete_multiple[]', $item['id_rc'], false, false, '', 'class="check_delete"', true);
+		href='".$config['homeurl'].'index.php?sec=netf&sec2=godmode/netflow/nf_item_list&delete=1&id_rc='.$item['id_rc'].'&id='.$id."&offset=0'>".html_print_image('images/delete.svg', true, ['title' => __('Delete'), 'class' => 'invert_filter']).'</a>'.html_print_checkbox_extended('delete_multiple[]', $item['id_rc'], false, false, '', 'class="check_delete"', true);
 
     array_push($table->data, $data);
 }
diff --git a/pandora_console/godmode/reporting/reporting_builder.item_editor.php b/pandora_console/godmode/reporting/reporting_builder.item_editor.php
index 6002d19cfe..c28bfca6ee 100755
--- a/pandora_console/godmode/reporting/reporting_builder.item_editor.php
+++ b/pandora_console/godmode/reporting/reporting_builder.item_editor.php
@@ -4272,7 +4272,7 @@ function print_SLA_list($width, $action, $idItem=null)
                         echo '</td>';
                         echo '<td class="sla_list_action_col center">';
                         echo '<a href="javascript: deleteSLARow('.$item['id'].');">';
-                        echo html_print_image('images/cross.png', true, ['class' => 'invert_filter']);
+                        echo html_print_image('images/delete.svg', true, ['class' => 'invert_filter']);
                         echo '</a>';
                         echo '</td>';
                         echo '</tr>';
@@ -4313,7 +4313,7 @@ function print_SLA_list($width, $action, $idItem=null)
                                 <a class="delete_button" href="javascript: deleteSLARow(0);">
                                     <?php
                                     html_print_image(
-                                        'images/cross.png',
+                                        'images/delete.svg',
                                         false,
                                         ['class' => 'invert_filter']
                                     );
@@ -4739,7 +4739,7 @@ function print_General_list($width, $action, $idItem=null, $type='general')
                                     <td>'.printSmallFont($nameAgentFailover).$server_name_element.'</td>
                                     <td>'.printSmallFont($nameModuleFailover).'</td>
                                     <td class="center">
-                                        <a href="javascript: deleteGeneralRow('.$item['id'].');">'.html_print_image('images/cross.png', true, ['class' => 'invert_filter']).'</a>
+                                        <a href="javascript: deleteGeneralRow('.$item['id'].');">'.html_print_image('images/delete.svg', true, ['class' => 'invert_filter']).'</a>
                                     </td>
                                 </tr>';
                             } else {
@@ -4747,7 +4747,7 @@ function print_General_list($width, $action, $idItem=null, $type='general')
                                     <td>'.printSmallFont($nameAgent).$server_name_element.'</td>
                                     <td>'.printSmallFont($nameModule).'</td>
                                     <td class="center">
-                                        <a href="javascript: deleteGeneralRow('.$item['id'].');">'.html_print_image('images/cross.png', true, ['class' => 'invert_filter']).'</a>
+                                        <a href="javascript: deleteGeneralRow('.$item['id'].');">'.html_print_image('images/delete.svg', true, ['class' => 'invert_filter']).'</a>
                                     </td>
                                 </tr>';
                             }
@@ -4757,7 +4757,7 @@ function print_General_list($width, $action, $idItem=null, $type='general')
 								<td>'.printSmallFont($nameModule).'</td>
 								<td>'.printSmallFont($operation[$item['operation']]).'</td>
 								<td class="center">
-									<a href="javascript: deleteGeneralRow('.$item['id'].');">'.html_print_image('images/cross.png', true, ['class' => 'invert_filter']).'</a>
+									<a href="javascript: deleteGeneralRow('.$item['id'].');">'.html_print_image('images/delete.svg', true, ['class' => 'invert_filter']).'</a>
 								</td>
 							</tr>';
                         }
@@ -4795,7 +4795,7 @@ function print_General_list($width, $action, $idItem=null, $type='general')
                                 <a class="delete_button" href="javascript: deleteGeneralRow(0);">
                                     <?php
                                     html_print_image(
-                                        'images/cross.png',
+                                        'images/delete.svg',
                                         false,
                                         ['class' => 'invert_filter']
                                     );
diff --git a/pandora_console/godmode/setup/gis.php b/pandora_console/godmode/setup/gis.php
index 671b9b71db..57edc19f5c 100755
--- a/pandora_console/godmode/setup/gis.php
+++ b/pandora_console/godmode/setup/gis.php
@@ -84,7 +84,7 @@ if ($mapsConnections !== false) {
             '<a href="index.php?sec=gsetup&sec2=godmode/setup/gis_step_2&amp;action=edit_connection_map&amp;id_connection_map='.$mapsConnection['id_tmap_connection'].'">'.$mapsConnection['conection_name'].'</a>',
             ui_print_group_icon($mapsConnection['group_id'], true),
             '<a href="index.php?sec=gsetup&sec2=godmode/setup/setup&amp;section=gis&amp;id_connection_map='.$mapsConnection['id_tmap_connection'].'&amp;action=delete_connection"
-				onClick="javascript: if (!confirm(\''.__('Do you wan delete this connection?').'\')) return false;">'.html_print_image('images/cross.png', true, ['class' => 'invert_filter']).'</a>',
+				onClick="javascript: if (!confirm(\''.__('Do you wan delete this connection?').'\')) return false;">'.html_print_image('images/delete.svg', true, ['class' => 'invert_filter']).'</a>',
         ];
         $table->cellclass[][2] = 'table_action_buttons';
     }
diff --git a/pandora_console/godmode/setup/links.php b/pandora_console/godmode/setup/links.php
index 7bd589fe27..b11bd3539f 100644
--- a/pandora_console/godmode/setup/links.php
+++ b/pandora_console/godmode/setup/links.php
@@ -208,7 +208,7 @@ if ((isset($_GET['form_add'])) or (isset($_GET['form_edit']))) {
 
             echo "<tr><td class='$tdcolor'><b><a href='index.php?sec=gsetup&sec2=godmode/setup/links&form_edit=1&id_link=".$row['id_link']."'>".$row['name'].'</a></b></td>';
             echo '<td class="'.$tdcolor.' table_action_buttons"><a href="index.php?sec=gsetup&sec2=godmode/setup/links&id_link='.$row['id_link'].'&borrar='.$row['id_link'].'" onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;">'.html_print_image(
-                'images/cross.png',
+                'images/delete.svg',
                 true,
                 ['class' => 'invert_filter']
             ).'</a></td></tr>';
diff --git a/pandora_console/godmode/setup/news.php b/pandora_console/godmode/setup/news.php
index efbf574779..ee4b47d930 100644
--- a/pandora_console/godmode/setup/news.php
+++ b/pandora_console/godmode/setup/news.php
@@ -373,7 +373,7 @@ if ((isset($_GET['form_add'])) || (isset($_GET['form_edit']))) {
                 echo "<td class='$tdcolor'>".__('No').'</b></td>';
             }
 
-            echo '<td class="'.$tdcolor.' table_action_buttons"><a href="index.php?sec=gsetup&sec2=godmode/setup/news&id_news='.$row['id_news'].'&borrar='.$row['id_news'].'" onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;">'.html_print_image('images/cross.png', true, ['border' => '0', 'class' => 'invert_filter']).'</a></td></tr>';
+            echo '<td class="'.$tdcolor.' table_action_buttons"><a href="index.php?sec=gsetup&sec2=godmode/setup/news&id_news='.$row['id_news'].'&borrar='.$row['id_news'].'" onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;">'.html_print_image('images/delete.svg', true, ['border' => '0', 'class' => 'invert_filter']).'</a></td></tr>';
         }
 
         echo '</table>';
diff --git a/pandora_console/godmode/setup/snmp_wizard.php b/pandora_console/godmode/setup/snmp_wizard.php
index e788b408cd..62558dbc87 100644
--- a/pandora_console/godmode/setup/snmp_wizard.php
+++ b/pandora_console/godmode/setup/snmp_wizard.php
@@ -107,7 +107,7 @@ html_print_table($table);
 
 function cell_op($oid='')
 {
-    return '<img class="loading invisible" src="'.'images/spinner.gif'.'" />'.'<a class="button_edit_snmp" href="javascript: edit_snmp(\''.$oid.'\');">'.html_print_image('images/cog.png', true, ['class' => 'invert_filter', 'title' => __('Edit')]).'</a>'.'<a class="delete_button_snmp" href="javascript: delete_snmp(\''.$oid.'\');">'.html_print_image('images/cross.png', true, ['title' => __('Delete'), 'class' => 'invert_filter']).'</a>';
+    return '<img class="loading invisible" src="'.'images/spinner.gif'.'" />'.'<a class="button_edit_snmp" href="javascript: edit_snmp(\''.$oid.'\');">'.html_print_image('images/cog.png', true, ['class' => 'invert_filter', 'title' => __('Edit')]).'</a>'.'<a class="delete_button_snmp" href="javascript: delete_snmp(\''.$oid.'\');">'.html_print_image('images/delete.svg', true, ['title' => __('Delete'), 'class' => 'invert_filter']).'</a>';
 }
 
 
diff --git a/pandora_console/godmode/snmpconsole/snmp_alert.php b/pandora_console/godmode/snmpconsole/snmp_alert.php
index e42fe82df1..72e695eb71 100755
--- a/pandora_console/godmode/snmpconsole/snmp_alert.php
+++ b/pandora_console/godmode/snmpconsole/snmp_alert.php
@@ -1943,7 +1943,7 @@ if ($create_alert || $update_alert) {
                 $data[1] .= '<tr>';
                 $data[1] .= '<td>'.alerts_get_alert_action_name($action['alert_type']).'</td>';
                 $data[1] .= '<td> <a href="index.php?sec=snmpconsole&sec2=godmode/snmpconsole/snmp_alert&delete_action=1&action_id='.$action['id'].'" onClick="javascript:return confirm(\''.__('Are you sure?').'\')">'.html_print_image(
-                    'images/cross.png',
+                    'images/delete.svg',
                     true,
                     [
                         'border' => '0',
@@ -2027,7 +2027,7 @@ if ($create_alert || $update_alert) {
                     [
                         'href'    => 'javascript: ',
                         'content' => html_print_image(
-                            'images/cross.png',
+                            'images/delete.svg',
                             true,
                             [
                                 'title' => __('Delete action'),
diff --git a/pandora_console/godmode/users/configure_user.php b/pandora_console/godmode/users/configure_user.php
index 468d789e0f..c0074ac4f1 100644
--- a/pandora_console/godmode/users/configure_user.php
+++ b/pandora_console/godmode/users/configure_user.php
@@ -1887,7 +1887,7 @@ echo '</div>';
 // This is an image generated for JS.
 $delete_image = html_print_input_image(
     'del',
-    'images/cross.png',
+    'images/delete.svg',
     1,
     '',
     true,
diff --git a/pandora_console/include/class/CalendarManager.class.php b/pandora_console/include/class/CalendarManager.class.php
index 78ab62e92c..d2411e8263 100644
--- a/pandora_console/include/class/CalendarManager.class.php
+++ b/pandora_console/include/class/CalendarManager.class.php
@@ -697,7 +697,7 @@ class CalendarManager
                                 );
                                 $tmp->options .= '">';
                                 $tmp->options .= html_print_image(
-                                    'images/config.png',
+                                    'images/edit.svg',
                                     true,
                                     [
                                         'title' => __('Edit'),
@@ -731,7 +731,7 @@ class CalendarManager
                                 );
                                 $tmp->options .= '">';
                                 $tmp->options .= html_print_image(
-                                    'images/cross.png',
+                                    'images/delete.svg',
                                     true,
                                     [
                                         'title' => __('Delete'),
diff --git a/pandora_console/include/class/NetworkMap.class.php b/pandora_console/include/class/NetworkMap.class.php
index 701eb4ecfb..2f073fed3a 100644
--- a/pandora_console/include/class/NetworkMap.class.php
+++ b/pandora_console/include/class/NetworkMap.class.php
@@ -3246,7 +3246,7 @@ class NetworkMap
         $table->data['template_row']['edit'] = '';
 
         $table->data['template_row']['edit'] .= '<span class="edit_icon_correct" style="display: none">'.html_print_image('images/pixel_green.png', true, ['class' => 'main_menu_icon']).'</span><span class="edit_icon_fail" style="display: none" >'.html_print_image('images/dot_red.png', true).'</span><span class="edit_icon_progress" style="display: none">'.html_print_image('images/spinner.gif', true).'</span>';
-        // <span class="edit_icon"><a class="edit_icon_link" title="'.__('Update').'" href="#">'.html_print_image('images/config.png', true, ['class' => 'invert_filter']).'</a></span>';
+        // <span class="edit_icon"><a class="edit_icon_link" title="'.__('Update').'" href="#">'.html_print_image('images/edit.svg', true, ['class' => 'invert_filter']).'</a></span>';
         $table->data['template_row']['edit'] .= '<a class="delete_icon" href="#">'.html_print_image('images/delete.svg', true, ['class' => 'main_menu_icon invert_filter', 'style' => 'padding: 10px']).'</a>';
 
         $table->colspan['no_relations']['0'] = 5;
diff --git a/pandora_console/include/class/SatelliteAgent.class.php b/pandora_console/include/class/SatelliteAgent.class.php
index aa86f25e81..18a4806bb5 100644
--- a/pandora_console/include/class/SatelliteAgent.class.php
+++ b/pandora_console/include/class/SatelliteAgent.class.php
@@ -401,7 +401,7 @@ class SatelliteAgent extends HTML
 
                         if ($disable === false) {
                             $tmp->actions .= html_print_image(
-                                ($delete === true) ? 'images/add.png' : 'images/cross.png',
+                                ($delete === true) ? 'images/add.png' : 'images/delete.svg',
                                 true,
                                 [
                                     'border'  => '0',
diff --git a/pandora_console/include/class/SatelliteCollection.class.php b/pandora_console/include/class/SatelliteCollection.class.php
index d94756603a..a8af32d3b6 100644
--- a/pandora_console/include/class/SatelliteCollection.class.php
+++ b/pandora_console/include/class/SatelliteCollection.class.php
@@ -236,7 +236,7 @@ class SatelliteCollection extends HTML
 
                         $tmp->actions = '';
                         $tmp->actions .= html_print_image(
-                            ($delete === 0) ? 'images/add.png' : 'images/cross.png',
+                            ($delete === 0) ? 'images/add.png' : 'images/delete.svg',
                             true,
                             [
                                 'border'  => '0',
diff --git a/pandora_console/include/functions_container.php b/pandora_console/include/functions_container.php
index e9d034f431..9137a7fa3a 100644
--- a/pandora_console/include/functions_container.php
+++ b/pandora_console/include/functions_container.php
@@ -180,7 +180,7 @@ function folder_table($graphs)
 
         if (($report_w || $report_m) && users_can_manage_group_all($access)) {
             $data[4] = '<a href="index.php?sec=reporting&sec2=godmode/reporting/graph_builder&edit_graph=1&id='.$graph['id_graph'].'">'.html_print_image(
-                'images/config.png',
+                'images/edit.svg',
                 true,
                 ['class' => 'invert_filter']
             ).'</a>';
@@ -188,7 +188,7 @@ function folder_table($graphs)
             $data[4] .= '&nbsp;';
 
             $data[4] .= '<a href="index.php?sec=reporting&sec2=godmode/reporting/graphs&delete_graph=1&id='.$graph['id_graph'].'" onClick="if (!confirm(\''.__('Are you sure?').'\'))
-					return false;">'.html_print_image('images/cross.png', true, ['alt' => __('Delete'), 'title' => __('Delete'), 'class' => 'invert_filter']).'</a>'.html_print_checkbox_extended('delete_multiple[]', $graph['id_graph'], false, false, '', 'class="check_delete mrgn_lft_2px"', true);
+					return false;">'.html_print_image('images/delete.svg', true, ['alt' => __('Delete'), 'title' => __('Delete'), 'class' => 'invert_filter']).'</a>'.html_print_checkbox_extended('delete_multiple[]', $graph['id_graph'], false, false, '', 'class="check_delete mrgn_lft_2px"', true);
         }
 
         array_push($table->data, $data);
diff --git a/pandora_console/include/functions_gis.php b/pandora_console/include/functions_gis.php
index 4dedff553a..48d42d43c5 100644
--- a/pandora_console/include/functions_gis.php
+++ b/pandora_console/include/functions_gis.php
@@ -1585,7 +1585,7 @@ function gis_add_conection_maps_in_form($map_connection_list)
                 <tr class="row_0">
                     <td>'.html_print_input_text('map_connection_name_'.$mapConnection['id_conection'], $mapConnectionRowDB['conection_name'], '', 20, 40, true, true).'</td>
                     <td>'.$radioButton.'</td>
-                    <td><a id="delete_row" href="javascript: deleteConnectionMap(\''.$mapConnection['id_conection'].'\')">'.html_print_image('images/cross.png', true, ['alt' => '', 'class' => 'invert_filter']).'</a></td>
+                    <td><a id="delete_row" href="javascript: deleteConnectionMap(\''.$mapConnection['id_conection'].'\')">'.html_print_image('images/delete.svg', true, ['alt' => '', 'class' => 'invert_filter']).'</a></td>
                 </tr>
             </tbody>
             <script type="text/javascript">
diff --git a/pandora_console/include/functions_html.php b/pandora_console/include/functions_html.php
index 5b16cbabd6..01d8172633 100644
--- a/pandora_console/include/functions_html.php
+++ b/pandora_console/include/functions_html.php
@@ -4565,6 +4565,12 @@ function html_print_image(
     // Dont use safe_input here or the performance will dead.
     $style = '';
 
+    if (empty($options) === false && isset($options['class']) === true) {
+        $options['class'] .= ' main_menu_icon';
+    } else {
+        $options['class'] = 'main_menu_icon invert_filter';
+    }
+
     if (!empty($options)) {
         // Deprecated or value-less attributes.
         if (isset($options['align'])) {
diff --git a/pandora_console/include/functions_modules.php b/pandora_console/include/functions_modules.php
index f804416a6a..dbb988782a 100755
--- a/pandora_console/include/functions_modules.php
+++ b/pandora_console/include/functions_modules.php
@@ -1019,7 +1019,7 @@ function modules_format_delete($id)
     $txt = '';
 
     if (check_acl($config['id_user'], $group, 'AW') == 1) {
-        $txt = '<a href="index.php?sec=estado&sec2=operation/agentes/datos_agente&period='.$period.'&id='.$module_id.'&delete='.$id.'">'.html_print_image('images/cross.png', true, ['border' => '0', 'class' => 'invert_filter']).'</a>';
+        $txt = '<a href="index.php?sec=estado&sec2=operation/agentes/datos_agente&period='.$period.'&id='.$module_id.'&delete='.$id.'">'.html_print_image('images/delete.svg', true, ['border' => '0', 'class' => 'invert_filter']).'</a>';
     }
 
     return $txt;
@@ -1040,7 +1040,7 @@ function modules_format_delete_string($id)
     $txt = '';
 
     if (check_acl($config['id_user'], $group, 'AW') == 1) {
-        $txt = '<a href="index.php?sec=estado&sec2=operation/agentes/datos_agente&period='.$period.'&id='.$module_id.'&delete_string='.$id.'">'.html_print_image('images/cross.png', true, ['border' => '0', 'class' => 'invert_filter']).'</a>';
+        $txt = '<a href="index.php?sec=estado&sec2=operation/agentes/datos_agente&period='.$period.'&id='.$module_id.'&delete_string='.$id.'">'.html_print_image('images/delete.svg', true, ['border' => '0', 'class' => 'invert_filter']).'</a>';
     }
 
     return $txt;
@@ -1061,7 +1061,7 @@ function modules_format_delete_log4x($id)
     $txt = '';
 
     if (check_acl($config['id_user'], $group, 'AW') == 1) {
-        $txt = '<a href="index.php?sec=estado&sec2=operation/agentes/datos_agente&period='.$period.'&id='.$module_id.'&delete_log4x='.$id.'">'.html_print_image('images/cross.png', true, ['border' => '0', 'class' => 'invert_filter']).'</a>';
+        $txt = '<a href="index.php?sec=estado&sec2=operation/agentes/datos_agente&period='.$period.'&id='.$module_id.'&delete_log4x='.$id.'">'.html_print_image('images/delete.svg', true, ['border' => '0', 'class' => 'invert_filter']).'</a>';
     }
 
     return $txt;
diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index f098a8eb43..d272ee224a 100755
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -708,7 +708,7 @@ function ui_print_group_icon($id_group, $return=false, $path='', $style='', $lin
 
     if ($link === true) {
         if ($tactical_view === true) {
-            $output = '<a href="'.$config['homeurl'].'index.php?sec=gagente&sec2=godmode/groups/tactical&id_group='.$id_group.'">';
+            $output = '<a href="'.$config['homeurl'].'index.php?sec=gagent&sec2=godmode/groups/tactical&id_group='.$id_group.'">';
         } else {
             $output = '<a href="'.$config['homeurl'].'index.php?sec=estado&amp;sec2=operation/agentes/estado_agente&amp;refr=60&amp;group_id='.$id_group.'">';
         }
@@ -728,12 +728,13 @@ function ui_print_group_icon($id_group, $return=false, $path='', $style='', $lin
             }
 
             $icon = (str_contains($icon, '.svg') === true) ? $icon : $icon.'.svg';
+
             $output .= html_print_image(
                 'images/'.$icon,
                 true,
                 [
                     'style' => $style,
-                    'class' => $class,
+                    'class' => 'main_menu_icon '.$class,
                     'alt'   => groups_get_name($id_group, true),
                     'title' => groups_get_name($id_group, true),
                 ],
@@ -839,6 +840,10 @@ function ui_print_os_icon(
         $subfolder .= '/so_big_icons';
     }
 
+    if (isset($options['class']) === false) {
+        $options['class'] = 'main_menu_icon';
+    }
+
     $no_in_meta = (is_metaconsole() === false);
 
     $icon = (string) db_get_value('icon_name', 'tconfig_os', 'id_os', (int) $id_os);
@@ -859,13 +864,29 @@ function ui_print_os_icon(
         }
     } else if ($apply_skin) {
         if ($only_src) {
-            $output = html_print_image('images/'.$subfolder.'/'.$icon, true, $options, true, $relative, $no_in_meta, true);
+            $output = html_print_image(
+                'images/'.$subfolder.'/'.$icon,
+                true,
+                $options,
+                true,
+                $relative,
+                $no_in_meta,
+                true
+            );
         } else {
             if (!isset($options['title'])) {
                 $options['title'] = $os_name;
             }
 
-            $output = html_print_image('images/'.$subfolder.'/'.$icon, true, $options, false, $relative, $no_in_meta, true);
+            $output = html_print_image(
+                'images/'.$subfolder.'/'.$icon,
+                true,
+                $options,
+                false,
+                $relative,
+                $no_in_meta,
+                true
+            );
         }
     } else {
         // $output = "<img src='images/os_icons/" . $icon . "' alt='" . $os_name . "' title='" . $os_name . "'>";
@@ -7330,7 +7351,7 @@ function ui_get_inventory_module_add_form(
     $row['hidden-input'] .= html_print_input_text('hidden-custom-field-input', '', '', 25, 40, true);
     $row['hidden-input'] .= '<span>&nbsp;</span>';
     $row['hidden-input'] .= html_print_image(
-        'images/cross.png',
+        'images/delete.svg',
         true,
         [
             'border' => '0',
@@ -7378,7 +7399,7 @@ function ui_get_inventory_module_add_form(
 
             $row['input'] .= '<span>&nbsp;</span>';
             $row['input'] .= html_print_image(
-                'images/cross.png',
+                'images/delete.svg',
                 true,
                 [
                     'border' => '0',
diff --git a/pandora_console/include/help/en/help_configure_gis_map.php b/pandora_console/include/help/en/help_configure_gis_map.php
index fe86626457..80ecb195a3 100644
--- a/pandora_console/include/help/en/help_configure_gis_map.php
+++ b/pandora_console/include/help/en/help_configure_gis_map.php
@@ -49,7 +49,7 @@ Once the selection of the connection (or connections) is done, there is a posibi
 Each map has one or more layers<sup><span class="font_75p">1</span></sup> to show the agents. Each layer can have show the agents of a <strong>group</strong> and/or a <strong>list of agents</strong>. This way it's easy to set up the agents that will be shown on each Layer.
 </p>
 <p>
-The layers can be set as <strong>visible</strong> or <strong>hidden</strong>, and select the <strong>group</strong> with the selector or add <strong>agents</strong> with the box. Once the layer is defined (it will not be completely saved until the whole map is saved) it will be moved to the left column of defined layers, where it is possible to <strong>order</strong> (<?php html_print_image('images/up.png', false, ['alt' => 'move up icon']); ?> and <?php html_print_image('images/down.png', false, ['alt' => 'move down icon']); ?>) them, <strong>delete</strong> (<?php html_print_image('images/cross.png', false, ['alt' => 'delete icon']); ?>), or <strong>edited</strong> (<?php html_print_image('images/config.png', false, ['alt' => 'edit icon']); ?>) again.
+The layers can be set as <strong>visible</strong> or <strong>hidden</strong>, and select the <strong>group</strong> with the selector or add <strong>agents</strong> with the box. Once the layer is defined (it will not be completely saved until the whole map is saved) it will be moved to the left column of defined layers, where it is possible to <strong>order</strong> (<?php html_print_image('images/up.png', false, ['alt' => 'move up icon']); ?> and <?php html_print_image('images/down.png', false, ['alt' => 'move down icon']); ?>) them, <strong>delete</strong> (<?php html_print_image('images/delete.svg', false, ['alt' => 'delete icon']); ?>), or <strong>edited</strong> (<?php html_print_image('images/edit.svg', false, ['alt' => 'edit icon']); ?>) again.
 </p>
 <hr/>
 <sup><span class="font_75p">1</span></sup> <span class="font_85p">The default map can have 0 layers as is the one used in the agent GIS view and only uses one layer with the agent name.</span>
diff --git a/pandora_console/include/help/en/help_eventview.php b/pandora_console/include/help/en/help_eventview.php
index 6f96b2f89d..84de68af07 100644
--- a/pandora_console/include/help/en/help_eventview.php
+++ b/pandora_console/include/help/en/help_eventview.php
@@ -26,7 +26,7 @@
 <div class="pdd_l_30px w150px float-left line_17px">
     <h3>Actions</h3>
     <?php html_print_image('images/ok.png', false, ['title' => 'Validate event', 'alt' => 'Validate event']); ?> - Validate event<br>
-    <?php html_print_image('images/cross.png', false, ['title' => 'Delete event', 'alt' => 'Delete event']); ?> - Delete event<br>
+    <?php html_print_image('images/delete.svg', false, ['title' => 'Delete event', 'alt' => 'Delete event']); ?> - Delete event<br>
     <?php html_print_image('images/eye.png', false, ['title' => 'Show more', 'alt' => 'Show more']); ?> - Show more<br>
     <?php html_print_image('images/hourglass.png', false, ['title' => 'In progress', 'alt' => 'In progress']); ?> - In progress    
 </div>
diff --git a/pandora_console/include/help/en/help_gis_map_builder.php b/pandora_console/include/help/en/help_gis_map_builder.php
index ef666c7183..fbe6d98ab9 100644
--- a/pandora_console/include/help/en/help_gis_map_builder.php
+++ b/pandora_console/include/help/en/help_gis_map_builder.php
@@ -22,7 +22,7 @@ Options:
 <dd>Click on the view icon to <strong>view</strong> the map.</dd>
 <dt>Default radio button</dt>
 <dd>Click on the <strong>radio button</strong> corresponding to the map you want to make the default to set the <strong>default map</strong> </dd>
-<dt><?php html_print_image('images/cross.png', false, ['alt' => 'Delete']); ?> Delete</dt>
+<dt><?php html_print_image('images/delete.svg', false, ['alt' => 'Delete']); ?> Delete</dt>
 <dd>Click on the delete icon to <strong>delete</strong> the map.</dd>
 <dt>Create Button</dt>
 <dd>Click on Create button to <strong>create</strong> a new map.</dd>
diff --git a/pandora_console/include/help/en/help_setup_gis_index.php b/pandora_console/include/help/en/help_setup_gis_index.php
index d5db84cdd7..cb92e74aa4 100644
--- a/pandora_console/include/help/en/help_setup_gis_index.php
+++ b/pandora_console/include/help/en/help_setup_gis_index.php
@@ -9,5 +9,5 @@
 This page is the place where the admin can configure <strong>connections to GIS Map Servers</strong>.
 </p>
 <p>
-Here it is possible to see the list of defined connections, <strong>edit</strong> any one of them by clicking on their name, <strong>delete</strong> any connection by clicking on the delete icon (<?php html_print_image('images/cross.png', false, ['alt' => 'delete icon']); ?>) or <strong>create</strong> new connections using the create button.
+Here it is possible to see the list of defined connections, <strong>edit</strong> any one of them by clicking on their name, <strong>delete</strong> any connection by clicking on the delete icon (<?php html_print_image('images/delete.svg', false, ['alt' => 'delete icon']); ?>) or <strong>create</strong> new connections using the create button.
 </p>
diff --git a/pandora_console/include/help/es/help_eventview.php b/pandora_console/include/help/es/help_eventview.php
index 3f422aa1e0..017ba19148 100644
--- a/pandora_console/include/help/es/help_eventview.php
+++ b/pandora_console/include/help/es/help_eventview.php
@@ -26,7 +26,7 @@
 <div class="pdd_l_30px w150px float-left line_17px">
     <h3>Acciones</h3>
     <?php html_print_image('images/ok.png', false, ['title' => 'Validate event', 'alt' => 'Validate event']); ?> - Validar evento<br>
-    <?php html_print_image('images/cross.png', false, ['title' => 'Delete event', 'alt' => 'Delete event']); ?> - Borrar evento<br>
+    <?php html_print_image('images/delete.svg', false, ['title' => 'Delete event', 'alt' => 'Delete event']); ?> - Borrar evento<br>
     <?php html_print_image('images/eye.png', false, ['title' => 'Mostrar más', 'alt' => 'Mostrar más']); ?> - Mostrar más<br>
     <?php html_print_image('images/hourglass.png', false, ['title' => 'En progreso', 'alt' => 'En progreso']); ?> - En progreso
 </div>
diff --git a/pandora_console/include/help/es/help_gis_map_builder.php b/pandora_console/include/help/es/help_gis_map_builder.php
index 5abae44f56..5a289a571f 100644
--- a/pandora_console/include/help/es/help_gis_map_builder.php
+++ b/pandora_console/include/help/es/help_gis_map_builder.php
@@ -26,7 +26,7 @@ Opciones:
 <dd>Haga click en icono de visualizar para <strong>visualizar</strong> el mapa.</dd>
 <dt>Botón radio por defecto</dt>
 <dd>Haga click en el <strong> botón radio </strong> que se corresponda con el mapa que quiere por defecto para instalar <strong>mapa por defecto</strong> </dd>
-<dt><?php html_print_image('images/cross.png', false, ['alt' => 'Delete']); ?> Eliminar</dt>
+<dt><?php html_print_image('images/delete.svg', false, ['alt' => 'Delete']); ?> Eliminar</dt>
 <dd>Haga click en el botón de eliminar para <strong>eliminar</strong> el mapa</dd>
 <dt>Crear botón </dt>
 <dd>Haga click en el Botón de Crear para <strong>crear</strong> un mapa nuevo</dd>
diff --git a/pandora_console/include/help/ja/help_configure_gis_map.php b/pandora_console/include/help/ja/help_configure_gis_map.php
index b995e2e79f..7c5e5c07b8 100644
--- a/pandora_console/include/help/ja/help_configure_gis_map.php
+++ b/pandora_console/include/help/ja/help_configure_gis_map.php
@@ -57,7 +57,7 @@ GIS マップを設定するためには、少なくとも一つ選択されて
 <p>
 レイヤは、<strong>表示</strong>、<strong>非表示</strong>の設定ができ、<strong>グループ</strong>を選択や<strong>エージェント</strong>の追加ができます。
 一度レイヤが定義されると、左側の定義済レイヤに移ります。(定義は、マップ全体が保存されるまでは保存されません。)
-ここでは、再度、<strong>順番の変更</strong> (<?php html_print_image('images/up.png', false, ['alt' => 'move up icon']); ?>、<?php html_print_image('images/down.png', false, ['alt' => 'move down icon']); ?>)、<strong>削除</strong> (<?php html_print_image('images/cross.png', false, ['alt' => 'delete icon']); ?>)、<strong>編集</strong> (<?php html_print_image('images/config.png', false, ['alt' => 'edit icon']); ?>) ができます。
+ここでは、再度、<strong>順番の変更</strong> (<?php html_print_image('images/up.png', false, ['alt' => 'move up icon']); ?>、<?php html_print_image('images/down.png', false, ['alt' => 'move down icon']); ?>)、<strong>削除</strong> (<?php html_print_image('images/delete.svg', false, ['alt' => 'delete icon']); ?>)、<strong>編集</strong> (<?php html_print_image('images/edit.svg', false, ['alt' => 'edit icon']); ?>) ができます。
 </p>
 <hr/>
 <sup><span class="font_75p">1</span></sup> <span class="font_85p">デフォルトマップでは、エージェント名で一つのレイヤしか表示しない場合は、レイヤを持たない設定も可能です。</span>
diff --git a/pandora_console/include/help/ja/help_eventview.php b/pandora_console/include/help/ja/help_eventview.php
index 6246b12f79..bda2a1a7eb 100644
--- a/pandora_console/include/help/ja/help_eventview.php
+++ b/pandora_console/include/help/ja/help_eventview.php
@@ -26,7 +26,7 @@
 <div class="pdd_l_30px w150px float-left line_17px">
     <h3>アクション</h3>
     <?php html_print_image('images/ok.png', false, ['title' => '承諾する', 'alt' => '承諾する']); ?> - 承諾する<br>
-    <?php html_print_image('images/cross.png', false, ['title' => '削除する', 'alt' => '削除する']); ?> - 削除する<br>
+    <?php html_print_image('images/delete.svg', false, ['title' => '削除する', 'alt' => '削除する']); ?> - 削除する<br>
     <?php html_print_image('images/page_lightning.png', false, ['title' => 'インシデントを作成する', 'alt' => 'インシデントを作成する']); ?> - インシデントを作成する
 </div>
 
diff --git a/pandora_console/include/help/ja/help_gis_map_builder.php b/pandora_console/include/help/ja/help_gis_map_builder.php
index 1deb2e2d0f..436bc0ee48 100644
--- a/pandora_console/include/help/ja/help_gis_map_builder.php
+++ b/pandora_console/include/help/ja/help_gis_map_builder.php
@@ -25,7 +25,7 @@
 <dd>表示アイコンをクリックすると、マップを<strong>参照</strong>できます。</dd>
 <dt>デフォルトラジオボタン</dt>
 <dd><strong>ラジオボタン</strong>をクリックすると、そのマップが<strong>デフォルトマップ</strong>に設定されます。</dd>
-<dt><?php html_print_image('images/cross.png', false, ['alt' => 'Delete']); ?> 削除</dt>
+<dt><?php html_print_image('images/delete.svg', false, ['alt' => 'Delete']); ?> 削除</dt>
 <dd>削除アイコンをクリックすると、そのマップを<strong>削除</strong>します。</dd>
 <dt>作成ボタン</dt>
 <dd>作成ボタンをクリックすると、新しいマップを<strong>作成</strong>できます。</dd>
diff --git a/pandora_console/include/help/ja/help_setup_gis_index.php b/pandora_console/include/help/ja/help_setup_gis_index.php
index 181ca6cf43..13c4eb8d9e 100644
--- a/pandora_console/include/help/ja/help_setup_gis_index.php
+++ b/pandora_console/include/help/ja/help_setup_gis_index.php
@@ -11,6 +11,6 @@
 <p>
 設定済の利用マップ定義一覧の参照できます。
 <strong>編集</strong>するにはマップ名をクリックします。
-<strong>削除</strong>するには削除アイコン(<?php html_print_image('images/cross.png', false, ['alt' => 'delete icon']); ?> )をクリックします。
+<strong>削除</strong>するには削除アイコン(<?php html_print_image('images/delete.svg', false, ['alt' => 'delete icon']); ?> )をクリックします。
 また、新たな設定を<strong>作成</strong>するには、「作成」ボタンをクリックします。
 </p>
diff --git a/pandora_console/include/javascript/pandora_events.js b/pandora_console/include/javascript/pandora_events.js
index 9f40d84305..e3f4040205 100644
--- a/pandora_console/include/javascript/pandora_events.js
+++ b/pandora_console/include/javascript/pandora_events.js
@@ -628,7 +628,7 @@ function delete_event(table, id_evento, event_rep, row, server_id) {
     },
     onDeny: function() {
       button.children[0];
-      button.children[0].src = "images/cross.png";
+      button.children[0].src = "images/delete.svg";
       return;
     }
   });
diff --git a/pandora_console/include/javascript/pandora_modules.js b/pandora_console/include/javascript/pandora_modules.js
index d780b979f7..771efb460f 100644
--- a/pandora_console/include/javascript/pandora_modules.js
+++ b/pandora_console/include/javascript/pandora_modules.js
@@ -1216,7 +1216,7 @@ function delete_macro_local_component(prefix) {
 //Add a new module macro
 function add_macro() {
   var macro_count = parseInt($("#hidden-module_macro_count").val());
-  var delete_icon = '<?php html_print_image ("images/cross.png", false) ?>';
+  var delete_icon = '<?php html_print_image ("images/delete.svg", false) ?>';
 
   // Add inputs for the new macro
   $("#module_macros").append(
diff --git a/pandora_console/include/javascript/tree/TreeControllerMeta.js b/pandora_console/include/javascript/tree/TreeControllerMeta.js
index ab56ab73f0..084854b5e6 100644
--- a/pandora_console/include/javascript/tree/TreeControllerMeta.js
+++ b/pandora_console/include/javascript/tree/TreeControllerMeta.js
@@ -666,7 +666,7 @@ var TreeController = {
                 var $updateicon = $(
                   '<img src="' +
                     (controller.baseURL.length > 0 ? controller.baseURL : "") +
-                    'images/config.png" class="invert_filter" style="width:18px; vertical-align: middle;"/>'
+                    'images/edit.svg" class="invert_filter" style="width:18px; vertical-align: middle;"/>'
                 );
                 var $updatebtn = $('<a href = "' + url_edit + '"></a>').append(
                   $updateicon
@@ -682,7 +682,7 @@ var TreeController = {
                 var $deleteBtn = $(
                   '<a><img src="' +
                     (controller.baseURL.length > 0 ? controller.baseURL : "") +
-                    'images/cross.png" class="invert_filter" style="width:18px; vertical-align: middle; cursor: pointer;"/></a>'
+                    'images/delete.svg" class="invert_filter" style="width:18px; vertical-align: middle; cursor: pointer;"/></a>'
                 );
                 $deleteBtn.click(function(event) {
                   var ok_function = function() {
diff --git a/pandora_console/include/styles/menu.css b/pandora_console/include/styles/menu.css
index e5ea0e51d6..0a777074ed 100644
--- a/pandora_console/include/styles/menu.css
+++ b/pandora_console/include/styles/menu.css
@@ -695,3 +695,8 @@ ul li {
 .head_tab_unselected span {
   color: #95a3bf;
 }
+
+.logo_full {
+  width: 215px !important;
+  height: auto !important;
+}
diff --git a/pandora_console/include/styles/order_interpreter.css b/pandora_console/include/styles/order_interpreter.css
index 28366e8376..604a0141a8 100644
--- a/pandora_console/include/styles/order_interpreter.css
+++ b/pandora_console/include/styles/order_interpreter.css
@@ -11,6 +11,7 @@ div.show_result_interpreter {
   position: absolute;
   z-index: 1;
   width: 300px;
+  top: 45px;
 }
 
 .more_results {
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index 57ce9a98f2..03c77f3eac 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -1135,7 +1135,11 @@ div#main {
   flex-direction: column;
   height: 100%;
   margin: 25px;
-  margin-bottom: 50px;
+  margin-bottom: 70px;
+}
+
+div#main:has(.networkconsole) {
+  margin-bottom: 0px;
 }
 
 textarea.conf_editor {
@@ -1431,7 +1435,7 @@ div#head {
   min-width: 882px;
   background-color: #fff;
   color: #000;
-  z-index: 1;
+  z-index: 2;
 }
 
 .fixed_header {
@@ -8132,11 +8136,11 @@ div.graph div.legend table {
 .networkconsole {
   width: 100%;
   height: 100%;
-  min-height: 460px;
   position: relative;
   overflow: hidden;
   background-color: var(--secondary-color);
-  min-height: calc(100vh - 235px);
+  min-height: calc(100vh - 200px);
+  border: 1px solid #cacaca;
 }
 
 /*
@@ -11216,11 +11220,16 @@ table.table_modal_alternate
   border-left: 0;
 }
 
-.main_menu_icon {
+img.main_menu_icon[src$=".svg"] {
   width: 20px;
   height: 20px;
 }
 
+input.main_menu_icon[src$=".svg"] {
+  width: 22px;
+  height: 22px;
+}
+
 .header_help_icon {
   width: 16px;
   height: 16px;
diff --git a/pandora_console/include/styles/pandora_black.css b/pandora_console/include/styles/pandora_black.css
index da9f58a9de..5eedca2185 100644
--- a/pandora_console/include/styles/pandora_black.css
+++ b/pandora_console/include/styles/pandora_black.css
@@ -74,7 +74,6 @@ div#head {
 .menu_full_classic #menu_tabs {
   height: 49px;
   border-bottom: 1px solid #82b92e;
-  padding-bottom: 2px;
 }
 
 .menu_full_collapsed #menu_tabs {
@@ -1063,10 +1062,6 @@ div.integria_details_description textarea {
 }
 
 .networkconsole {
-  width: 100%;
-  height: 100%;
-  position: relative;
-  overflow: hidden;
   background-color: #111;
 }
 
@@ -1406,11 +1401,6 @@ p.trademark-copyright {
   overflow: auto;
 }
 
-.action_buttons_background_mask {
-  background-color: #222;
-  border-top: 1px solid #82b92e;
-}
-
 button.buttonButton,
 button.submitButton {
   box-shadow: 0px 3px 6px #111;
@@ -1501,3 +1491,7 @@ div.white_box.white_box_opened.no_border {
 table.filter-table-adv td > div label {
   color: white !important;
 }
+
+#principal_action_buttons {
+  background: #111111;
+}
diff --git a/pandora_console/include/styles/visual_maps.css b/pandora_console/include/styles/visual_maps.css
index 8a0af9160b..835c0767b9 100644
--- a/pandora_console/include/styles/visual_maps.css
+++ b/pandora_console/include/styles/visual_maps.css
@@ -142,7 +142,7 @@ div#edit-controls input.sub[disabled] {
 
 input.delete_min,
 button.delete_min {
-  background: url(../../images/cross.png) no-repeat center;
+  background: url(../../images/delete.svg) no-repeat center;
 }
 input.delete_min[disabled],
 button.delete_min[disabled] {
@@ -154,7 +154,7 @@ button.delete_min_white {
 }
 input.delete_min_white[disabled],
 button.delete_min_white[disabled] {
-  background: url(../../images/cross.png) no-repeat center;
+  background: url(../../images/delete.svg) no-repeat center;
 }
 
 input.graph_min,
@@ -297,7 +297,7 @@ button.camera_min_white[disabled] {
 
 input.config_min,
 button.config_min {
-  background: url(../../images/config.png) no-repeat center;
+  background: url(../../images/edit.svg) no-repeat center;
 }
 input.config_min[disabled],
 button.config_min[disabled] {
@@ -309,7 +309,7 @@ button.config_min_white {
 }
 input.config_min_white[disabled],
 button.config_min_white[disabled] {
-  background: url(../../images/config.png) no-repeat center;
+  background: url(../../images/edit.svg) no-repeat center;
 }
 
 input.label_min,
diff --git a/pandora_console/operation/agentes/estado_agente.php b/pandora_console/operation/agentes/estado_agente.php
index c6a1e43b5c..1841bd7f6e 100644
--- a/pandora_console/operation/agentes/estado_agente.php
+++ b/pandora_console/operation/agentes/estado_agente.php
@@ -1028,7 +1028,7 @@ $tableAgents->size[1] = '14%';
 
 $tableAgents->head[2] = '<span>'.__('OS').'</span>';
 $tableAgents->head[2] .= ui_get_sorting_arrows($url_up_os, $url_down_os, $selectOsUp, $selectOsDown);
-$tableAgents->size[2] = '7%';
+$tableAgents->size[2] = '5%';
 
 $tableAgents->head[3] = '<span>'.__('Interval').'</span>';
 $tableAgents->head[3] .= ui_get_sorting_arrows($url_up_interval, $url_down_interval, $selectIntervalUp, $selectIntervalDown);
@@ -1054,16 +1054,12 @@ $tableAgents->head[9] = '<span>'.__('Last contact').'</span>';
 $tableAgents->head[9] .= ui_get_sorting_arrows($url_up_last, $url_down_last, $selectLastContactUp, $selectLastContactDown);
 $tableAgents->size[9] = '7%';
 
-$tableAgents->head[10] = '<span>'.__('Last status change').'</span>';
+$tableAgents->head[10] = '<span>'.__('L.S change').'</span>';
 $tableAgents->head[10] .= ui_get_sorting_arrows($url_up_last_status_change, $url_down_last_status_change, $selectLastStatusChangeUp, $selectLastStatusChangeDown);
-$tableAgents->size[10] = '10%';
+$tableAgents->size[10] = '8%';
 
-$tableAgents->head[11] = '<span>'.__('Remote').'</span>';
-$tableAgents->head[11] .= ui_get_sorting_arrows($url_up_remote, $url_down_remote, $selectRemoteUp, $selectRemoteDown);
-$tableAgents->size[11] = '7%';
-
-$tableAgents->head[12] = '<span>'.__('Op').'</span>';
-$tableAgents->size[12] = '4%';
+$tableAgents->head[11] = '<span>'.__('Op').'</span>';
+$tableAgents->size[11] = '6%';
 
 $tableAgents->align = [];
 
@@ -1076,10 +1072,10 @@ $tableAgents->align[7] = 'left';
 $tableAgents->align[8] = 'left';
 $tableAgents->align[9] = 'left';
 $tableAgents->align[10] = 'left';
-$tableAgents->align[11] = 'left';
 
 $tableAgents->style = [];
 $tableAgents->data = [];
+$tableAgents->cellclass = [];
 
 $rowPair = true;
 $iterator = 0;
@@ -1198,6 +1194,21 @@ foreach ($agents as $agent) {
         $agent['agent_version']
     );
 
+    if (enterprise_installed()) {
+        enterprise_include_once('include/functions_config_agents.php');
+        if (enterprise_hook('config_agents_has_remote_configuration', [$agent['id_agente']])) {
+            $data[5] .= '<a href="index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&tab=remote_configuration&id_agente='.$agent['id_agente'].'&disk_conf=1">'.html_print_image(
+                'images/remote-configuration@svg.svg',
+                true,
+                [
+                    'align' => 'middle',
+                    'title' => __('Remote config'),
+                    'class' => 'invert_filter main_menu_icon',
+                ]
+            ).'</a>';
+        }
+    }
+
     $data[6] = reporting_tiny_stats($agent, true, 'modules', ':', $strict_user);
 
     $data[7] = $status_img;
@@ -1216,24 +1227,9 @@ foreach ($agents as $agent) {
         'status'        => -1,
     ];
 
-    $data[11] = '';
-    if (enterprise_installed()) {
-        enterprise_include_once('include/functions_config_agents.php');
-        if (enterprise_hook('config_agents_has_remote_configuration', [$agent['id_agente']])) {
-            $data[11] = '<a href="index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&tab=remote_configuration&id_agente='.$agent['id_agente'].'&disk_conf=1">'.html_print_image(
-                'images/remote-configuration@svg.svg',
-                true,
-                [
-                    'align' => 'middle',
-                    'title' => __('Remote config'),
-                    'class' => 'invert_filter main_menu_icon',
-                ]
-            ).'</a>';
-        }
-    }
-
     $fb64 = base64_encode(json_encode($agent_event_filter));
-    $data[12] = '<a href="index.php?sec=eventos&sec2=operation/events/events&fb64='.$fb64.'">'.html_print_image(
+    $tableAgents->cellclass[][11] = 'table_action_buttons';
+    $data[11] = '<a href="index.php?sec=eventos&sec2=operation/events/events&fb64='.$fb64.'">'.html_print_image(
         'images/event.svg',
         true,
         [
@@ -1257,7 +1253,7 @@ foreach ($agents as $agent) {
             $url = 'index.php?sec=gagente&amp;sec2=godmode/agentes/configurar_agente&amp;id_agente='.$agent['id_agente'];
         }
 
-        $data[12] .= '<a href="'.$url.'">'.html_print_image(
+        $data[11] .= '<a href="'.$url.'">'.html_print_image(
             'images/edit.svg',
             true,
             [
diff --git a/pandora_console/operation/gis_maps/gis_map.php b/pandora_console/operation/gis_maps/gis_map.php
index 0e044d37cb..4a9f56dd7a 100644
--- a/pandora_console/operation/gis_maps/gis_map.php
+++ b/pandora_console/operation/gis_maps/gis_map.php
@@ -187,7 +187,7 @@ if ($maps !== false) {
             }
 
             $table->cellclass[]['op'] = 'table_action_buttons';
-            $data['op'] = '<a href="index.php?sec=godgismaps&amp;sec2=godmode/gis_maps/configure_gis_map&map_id='.$map['id_tgis_map'].'&amp;action=edit_map">'.html_print_image('images/config.png', true, ['title' => __('Edit')]).'</a>'.'<a href="index.php?sec=godgismaps&amp;sec2=operation/gis_maps/gis_map&amp;map_id='.$map['id_tgis_map'].'&amp;action=delete_map" onclick="return confirmDelete();">'.html_print_image('images/cross.png', true, ['title' => __('Delete'), 'class' => 'invert_filter']).'</a>';
+            $data['op'] = '<a href="index.php?sec=godgismaps&amp;sec2=godmode/gis_maps/configure_gis_map&map_id='.$map['id_tgis_map'].'&amp;action=edit_map">'.html_print_image('images/edit.svg', true, ['title' => __('Edit')]).'</a>'.'<a href="index.php?sec=godgismaps&amp;sec2=operation/gis_maps/gis_map&amp;map_id='.$map['id_tgis_map'].'&amp;action=delete_map" onclick="return confirmDelete();">'.html_print_image('images/delete.svg', true, ['title' => __('Delete'), 'class' => 'invert_filter']).'</a>';
         }
 
         array_push($table->data, $data);
diff --git a/pandora_console/operation/incidents/dashboard_detail_integriaims_incident.php b/pandora_console/operation/incidents/dashboard_detail_integriaims_incident.php
index b6d8c83b82..88cc174665 100644
--- a/pandora_console/operation/incidents/dashboard_detail_integriaims_incident.php
+++ b/pandora_console/operation/incidents/dashboard_detail_integriaims_incident.php
@@ -195,7 +195,7 @@ foreach ($files as $key => $value) {
     $table_files->data[$i][4] = $value[13];
     $table_files->data[$i][5] .= '<a id="link_delete_file" href="'.ui_get_full_url('index.php?sec=incident&sec2=operation/incidents/dashboard_detail_integriaims_incident&incident_id='.$incident_id.'&delete_file='.$value[0]).'"
                                 onClick="javascript:if (!confirm(\''.__('Are you sure?').'\')) return false;">';
-    $table_files->data[$i][5] .= html_print_image('images/cross.png', true, ['title' => __('Delete'), 'class' => 'invert_filter']);
+    $table_files->data[$i][5] .= html_print_image('images/delete.svg', true, ['title' => __('Delete'), 'class' => 'invert_filter']);
 
 
     $table_files->data[$i][5] .= '</a>';
diff --git a/pandora_console/operation/incidents/list_integriaims_incidents.php b/pandora_console/operation/incidents/list_integriaims_incidents.php
index 71dd1df064..ce68e941fb 100644
--- a/pandora_console/operation/incidents/list_integriaims_incidents.php
+++ b/pandora_console/operation/incidents/list_integriaims_incidents.php
@@ -547,12 +547,12 @@ foreach ($incidents_paginated as $key => $value) {
     $table->data[$i][8] = '';
     $table->cellclass[$i][8] = 'table_action_buttons';
     $table->data[$i][8] .= '<a href="'.ui_get_full_url('index.php?sec=incident&sec2=operation/incidents/configure_integriaims_incident&incident_id='.$array_get_incidents[$key][0]).'">';
-    $table->data[$i][8] .= html_print_image('images/config.png', true, ['title' => __('Edit')]);
+    $table->data[$i][8] .= html_print_image('images/edit.svg', true, ['title' => __('Edit')]);
     $table->data[$i][8] .= '</a>';
 
     $table->data[$i][8] .= '<a id="link_delete_incident" href="'.ui_get_full_url('index.php?sec=incident&sec2=operation/incidents/list_integriaims_incidents&delete_incident='.$array_get_incidents[$key][0]).'"        
     onClick="javascript:if (!confirm(\''.__('Are you sure?').'\')) return false;">';
-    $table->data[$i][8] .= html_print_image('images/cross.png', true, ['title' => __('Delete'), 'class' => 'invert_filter']);
+    $table->data[$i][8] .= html_print_image('images/delete.svg', true, ['title' => __('Delete'), 'class' => 'invert_filter']);
     $table->data[$i][8] .= '</a>';
 
     $i++;
diff --git a/pandora_console/operation/search_agents.php b/pandora_console/operation/search_agents.php
index eb1c21af14..b5e774048d 100755
--- a/pandora_console/operation/search_agents.php
+++ b/pandora_console/operation/search_agents.php
@@ -34,7 +34,7 @@ if (!$agents || !$searchAgents) {
     $table->cellpadding = 4;
     $table->cellspacing = 4;
     $table->width = '98%';
-    $table->class = 'databox';
+    $table->class = 'info_table';
 
     $table->head = [];
 
@@ -154,15 +154,29 @@ if (!$agents || !$searchAgents) {
     }
 
     echo '<br />';
-    if (!$only_count) {
-        ui_pagination($totalAgents);
-    }
 
     html_print_table($table);
     unset($table);
     if (!$only_count) {
-        ui_pagination($totalAgents);
+        $tablePagination = ui_pagination(
+            $totalAgents,
+            false,
+            0,
+            0,
+            true,
+            'offset',
+            false
+        );
     }
+
+    html_print_action_buttons(
+        '',
+        [
+            'type'          => 'data_table',
+            'class'         => 'fixed_action_buttons',
+            'right_content' => $tablePagination,
+        ]
+    );
 }
 
 if ($only_count) {
diff --git a/pandora_console/operation/search_modules.php b/pandora_console/operation/search_modules.php
index 17b37d7d4e..4a452829d5 100644
--- a/pandora_console/operation/search_modules.php
+++ b/pandora_console/operation/search_modules.php
@@ -26,7 +26,7 @@ if (!$modules || !$searchModules) {
     $table->cellpadding = 4;
     $table->cellspacing = 4;
     $table->width = '98%';
-    $table->class = 'databox';
+    $table->class = 'info_table';
 
     $table->head = [];
     $table->head[0] = __('Module').' <a href="index.php?search_category=modules&keywords='.$config['search_keywords'].'&head_search_keywords=abc&offset='.$offset.'&sort_field=module_name&sort=up">'.html_print_image('images/sort_up.png', true, ['style' => $selectModuleNameUp]).'</a><a href="index.php?search_category=modules&keywords='.$config['search_keywords'].'&head_search_keywords=abc&offset='.$offset.'&sort_field=module_name&sort=down">'.html_print_image('images/sort_down.png', true, ['style' => $selectModuleNameDown]).'</a>';
@@ -209,7 +209,7 @@ if (!$modules || !$searchModules) {
 
             $url_edit = 'index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&id_agente='.$module['id_agente'].'&tab=module&id_agent_module='.$module['id_agente_modulo'].'&edit_module=1';
 
-            $edit_module = '<a href="'.$url_edit.'">'.html_print_image('images/config.png', true).'</a>';
+            $edit_module = '<a href="'.$url_edit.'">'.html_print_image('images/edit.svg', true).'</a>';
         } else {
             $edit_module = '';
         }
@@ -232,8 +232,24 @@ if (!$modules || !$searchModules) {
     }
 
     echo '<br />';
-    ui_pagination($totalModules);
     html_print_table($table);
     unset($table);
-    ui_pagination($totalModules);
+    $tablePagination = ui_pagination(
+        $totalModules,
+        false,
+        0,
+        0,
+        true,
+        'offset',
+        false
+    );
+
+    html_print_action_buttons(
+        '',
+        [
+            'type'          => 'data_table',
+            'class'         => 'fixed_action_buttons',
+            'right_content' => $tablePagination,
+        ]
+    );
 }
diff --git a/pandora_console/operation/search_results.php b/pandora_console/operation/search_results.php
index 650bda0c36..331d70150a 100644
--- a/pandora_console/operation/search_results.php
+++ b/pandora_console/operation/search_results.php
@@ -189,13 +189,19 @@ $onheader = [
     'policies' => $policies_tab,
 ];
 
-ui_print_page_header(
+ui_print_standard_header(
     __('Search').': "'.$config['search_keywords'].'"',
     'images/zoom_mc.png',
     false,
     '',
     false,
-    $onheader
+    $onheader,
+    [
+        [
+            'link'  => '',
+            'label' => __('Search'),
+        ],
+    ]
 );
 
 $only_count = false;
diff --git a/pandora_console/views/calendar/special_days.php b/pandora_console/views/calendar/special_days.php
index 905a057f05..fdf98d28b1 100644
--- a/pandora_console/views/calendar/special_days.php
+++ b/pandora_console/views/calendar/special_days.php
@@ -449,7 +449,7 @@ for ($month = 1; $month <= 12; $month++) {
                         $cal_table->data[$cal_line][$week] .= '<a href="'.$url.'&op=edit&id='.$special_day['id'].'" title=';
                         $cal_table->data[$cal_line][$week] .= __('Edit');
                         $cal_table->data[$cal_line][$week] .= '>'.html_print_image(
-                            'images/config.png',
+                            'images/edit.svg',
                             true,
                             ['class' => 'invert_filter']
                         ).'</a> &nbsp;';
@@ -461,7 +461,7 @@ for ($month = 1; $month <= 12; $month++) {
                         $cal_table->data[$cal_line][$week] .= __('Remove');
                         $cal_table->data[$cal_line][$week] .= '">';
                         $cal_table->data[$cal_line][$week] .= html_print_image(
-                            'images/cross.png',
+                            'images/delete.svg',
                             true,
                             ['class' => 'invert_filter']
                         ).'</a>';

From dc216ff78820b2507c9c677ba6f20b50dfdbfe3b Mon Sep 17 00:00:00 2001
From: Jose Gonzalez <jose.gonzalez@pandorafms.com>
Date: Fri, 10 Mar 2023 12:47:44 +0100
Subject: [PATCH 18/25] Tree view black

---
 .../include/javascript/tree/TreeController.js            | 8 ++++----
 pandora_console/include/styles/pandora_black.css         | 9 ++++++++-
 pandora_console/include/styles/tree.css                  | 4 ++++
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/pandora_console/include/javascript/tree/TreeController.js b/pandora_console/include/javascript/tree/TreeController.js
index 49d390888e..07fe111027 100644
--- a/pandora_console/include/javascript/tree/TreeController.js
+++ b/pandora_console/include/javascript/tree/TreeController.js
@@ -637,7 +637,7 @@ var TreeController = {
           var $content = $("<div></div>");
 
           // Leaf icon
-          $leafIcon.addClass("leaf-icon invert_filter");
+          $leafIcon.addClass("leaf-icon");
 
           // Content
           $content.addClass("node-content");
@@ -657,7 +657,7 @@ var TreeController = {
                     (controller.baseURL.length > 0 ? controller.baseURL : "") +
                     "images/" +
                     element.icon +
-                    '" /></div></div>'
+                    '" class="invert_filter"/></div></div>'
                 );
               } else if (
                 typeof element.iconHTML != "undefined" &&
@@ -759,7 +759,7 @@ var TreeController = {
                         : "") +
                       'images/event.svg" /> '
                   );
-                  $eventImage.addClass("agent-alerts-fired");
+                  $eventImage.addClass("agent-alerts-fired invert_filter");
                   $eventImage
                     .click(function(e) {
                       e.preventDefault();
@@ -875,7 +875,7 @@ var TreeController = {
                 $content.append($statusImage);
               }
               var image_tooltip =
-                '<span><img class="invert_filter forced_title" data-title="' +
+                '<span class="reinvert_filter"><img class="invert_filter forced_title" data-title="' +
                 (element.title ? element.title : element.name) +
                 '" data-use_title_for_force_title="1" src="' +
                 (controller.baseURL.length > 0 ? controller.baseURL : "") +
diff --git a/pandora_console/include/styles/pandora_black.css b/pandora_console/include/styles/pandora_black.css
index da9f58a9de..2e106284ee 100644
--- a/pandora_console/include/styles/pandora_black.css
+++ b/pandora_console/include/styles/pandora_black.css
@@ -426,6 +426,9 @@ a.pandora_pagination {
   color: #fff;
 }
 
+span.reinvert_filter {
+  filter: invert(1);
+}
 /* firts_task.css */
 .new_task,
 div.new_task,
@@ -449,7 +452,11 @@ div.new_task > div {
 }
 
 /* tree.css */
-.node-content:hover {
+.tree-node div.node-content {
+  background-color: #444;
+}
+
+.tree-node div.node-content:hover {
   background-color: #222;
 }
 
diff --git a/pandora_console/include/styles/tree.css b/pandora_console/include/styles/tree.css
index a987a751d9..4c552e5e6d 100644
--- a/pandora_console/include/styles/tree.css
+++ b/pandora_console/include/styles/tree.css
@@ -403,3 +403,7 @@ div#tree-controller-recipient {
   margin-left: 5px;
   border-radius: 5px;
 }
+
+.tree-node .node-icon.node-status {
+  border: 0;
+}

From bb6bf855376428fc8ff561f20b494878f41fae25 Mon Sep 17 00:00:00 2001
From: Jose Gonzalez <jose.gonzalez@pandorafms.com>
Date: Fri, 10 Mar 2023 12:48:31 +0100
Subject: [PATCH 19/25] Minor visual fixes

---
 .../godmode/massive/massive_operations.php      | 10 +++++-----
 pandora_console/include/ajax/module.php         |  2 +-
 pandora_console/include/functions_reporting.php | 17 ++---------------
 3 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/pandora_console/godmode/massive/massive_operations.php b/pandora_console/godmode/massive/massive_operations.php
index d2e11b8c89..100b3eb933 100755
--- a/pandora_console/godmode/massive/massive_operations.php
+++ b/pandora_console/godmode/massive/massive_operations.php
@@ -216,7 +216,7 @@ if ($option == '') {
 
 $alertstab = [
     'text'   => '<a href="'.$url.'&tab=massive_alerts">'.html_print_image(
-        'images/bell.png',
+        'images/alert@svg.svg',
         true,
         [
             'title' => __('Alerts operations'),
@@ -228,7 +228,7 @@ $alertstab = [
 
 $userstab = [
     'text'   => '<a href="'.$url.'&tab=massive_users">'.html_print_image(
-        'images/user.png',
+        'images/user.svg',
         true,
         [
             'title' => __('Users operations'),
@@ -240,7 +240,7 @@ $userstab = [
 
 $agentstab = [
     'text'   => '<a href="'.$url.'&tab=massive_agents">'.html_print_image(
-        'images/agent.png',
+        'images/agents@svg.svg',
         true,
         [
             'title' => __('Agents operations'),
@@ -252,7 +252,7 @@ $agentstab = [
 
 $modulestab = [
     'text'   => '<a href="'.$url.'&tab=massive_modules">'.html_print_image(
-        'images/module.png',
+        'images/modules@svg.svg',
         true,
         [
             'title' => __('Modules operations'),
@@ -264,7 +264,7 @@ $modulestab = [
 
 $pluginstab = [
     'text'   => '<a href="'.$url.'&tab=massive_plugins">'.html_print_image(
-        'images/plugin.png',
+        'images/plugins@svg.svg',
         true,
         [
             'title' => __('Plugins operations'),
diff --git a/pandora_console/include/ajax/module.php b/pandora_console/include/ajax/module.php
index 052f105eda..01b259fe7b 100755
--- a/pandora_console/include/ajax/module.php
+++ b/pandora_console/include/ajax/module.php
@@ -248,7 +248,7 @@ if (check_login()) {
             false,
             false
         );
-        $formtable->data[0][3] = "<a href='javascript: show_module_detail_dialog(".$module_id.', '.$agentId.', "'.$server_name.'", 0, -1,"'.modules_get_agentmodule_name($module_id)."\")'>".html_print_image('images/refresh.png', true, ['style' => 'vertical-align: middle;', 'border' => '0', 'class' => 'invert_filter' ]).'</a>';
+        $formtable->data[0][3] = "<a href='javascript: show_module_detail_dialog(".$module_id.', '.$agentId.', "'.$server_name.'", 0, -1,"'.modules_get_agentmodule_name($module_id)."\")'>".html_print_image('images/refresh@svg.svg', true, ['style' => 'vertical-align: middle;', 'border' => '0', 'class' => 'main_menu_icon invert_filter' ]).'</a>';
         $formtable->rowspan[0][3] = 2;
         $formtable->cellstyle[0][3] = 'vertical-align: middle;';
 
diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php
index 0c3a0a6db5..9c99d47a2a 100755
--- a/pandora_console/include/functions_reporting.php
+++ b/pandora_console/include/functions_reporting.php
@@ -12169,24 +12169,11 @@ function reporting_get_stats_alerts($data, $links=false)
     $tdata[3] = html_print_div(
         [
             'title' => __('Fired alerts'),
-            'style' => 'background-color: '.COL_CRITICAL,
-            'class' => 'alert_background_state main_menu_icon invert_filter',
+            'style' => 'background-color: '.COL_ALERTFIRED,
+            'class' => 'alert_background_state main_menu_icon',
         ],
         true
     );
-    /*
-        html_print_image(
-        'images/bell_error.png',
-        true,
-        [
-            'title' => __('Fired alerts'),
-            'class' => 'invert_filter',
-        ],
-        false,
-        false,
-        false,
-        true
-    );*/
     $tdata[4] = $data['monitor_alerts_fired'] <= 0 ? '-' : $data['monitor_alerts_fired'];
     $tdata[4] = '<a style="color: '.COL_ALERTFIRED.';" class="big_data" href="'.$urls['monitor_alerts_fired'].'">'.$tdata[4].'</a>';
     $table_al->rowclass[] = '';

From f875fe674e310e5d057240cc637b6c8e900ab484 Mon Sep 17 00:00:00 2001
From: Jose Gonzalez <jose.gonzalez@pandorafms.com>
Date: Fri, 10 Mar 2023 12:52:18 +0100
Subject: [PATCH 20/25] Fix main_menu_icons

---
 pandora_console/include/styles/pandora.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index 03c77f3eac..5a340c3218 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -11220,6 +11220,7 @@ table.table_modal_alternate
   border-left: 0;
 }
 
+div.main_menu_icon,
 img.main_menu_icon[src$=".svg"] {
   width: 20px;
   height: 20px;

From ceed3c5d518832c68f46cb0e8f59ad6684fb6ff6 Mon Sep 17 00:00:00 2001
From: Pablo Aragon <pablo.aragon@pandorafms.com>
Date: Fri, 10 Mar 2023 13:02:23 +0100
Subject: [PATCH 21/25] Alert details validation

---
 pandora_console/operation/agentes/alerts_status.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pandora_console/operation/agentes/alerts_status.php b/pandora_console/operation/agentes/alerts_status.php
index 418e52e8a8..bb3d0e9a39 100755
--- a/pandora_console/operation/agentes/alerts_status.php
+++ b/pandora_console/operation/agentes/alerts_status.php
@@ -545,7 +545,7 @@ function alerts_table_controls() {
     
     $(document).ready ( function () {
         alerts_table_controls();
-        $('#submit-alert_validate').on('click', function () {
+        $('#button-alert_validate').on('click', function () {
             validateAlerts();
         });
     });

From 8778fcea93bd97902347a52091788f755d8d6067 Mon Sep 17 00:00:00 2001
From: daniel <daniel.barbero@artica.es>
Date: Fri, 10 Mar 2023 14:49:38 +0100
Subject: [PATCH 22/25] fixed styles

---
 .../godmode/agentes/fields_manager.php        |  2 +-
 pandora_console/include/ajax/module.php       | 28 +++++++++----------
 .../include/styles/pandora_black.css          |  5 ++++
 .../operation/agentes/alerts_status.php       |  4 ++-
 .../operation/agentes/estado_monitores.php    |  2 +-
 pandora_console/operation/search_agents.php   |  2 ++
 pandora_console/operation/search_modules.php  |  5 ++++
 7 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/pandora_console/godmode/agentes/fields_manager.php b/pandora_console/godmode/agentes/fields_manager.php
index ed5f2dcd68..aed5bc69a3 100644
--- a/pandora_console/godmode/agentes/fields_manager.php
+++ b/pandora_console/godmode/agentes/fields_manager.php
@@ -174,7 +174,7 @@ foreach ($fields as $field) {
     $data[1] = $field['name'];
 
     $data[2] = html_print_image(
-        ((bool) $field['display_on_front'] === true) ? 'images/validate.svg' : 'images/icono_stop.png',
+        ((bool) $field['display_on_front'] === true) ? 'images/validate.svg' : 'images/fail@svg.svg',
         true,
         ['class' => 'main_menu_icon invert_filter']
     );
diff --git a/pandora_console/include/ajax/module.php b/pandora_console/include/ajax/module.php
index 01b259fe7b..ca6d948117 100755
--- a/pandora_console/include/ajax/module.php
+++ b/pandora_console/include/ajax/module.php
@@ -1279,14 +1279,14 @@ if (check_login()) {
                         $linkCaption = __('Refresh');
                     }
 
-                    $moduleActionButtons[] = html_print_button(
-                        $linkCaption,
-                        'additional_action_for_'.$idAgenteModulo,
-                        false,
-                        'window.location.assign("index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;id_agente='.$id_agente.'&amp;id_agente_modulo='.$module['id_agente_modulo'].'&amp;refr=60'.$addedLinkParams.'")',
+                    $moduleActionButtons[] = html_print_anchor(
                         [
-                            'mode'  => 'link',
-                            'style' => 'justify-content: flex-end;',
+                            'href'    => 'index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;id_agente='.$id_agente.'&amp;id_agente_modulo='.$module['id_agente_modulo'].'&amp;refr=60'.$addedLinkParams.'"',
+                            'content' => html_print_image(
+                                'images/go-back@svg.svg',
+                                true,
+                                [ 'class' => 'main_menu_icon' ]
+                            ),
                         ],
                         true
                     );
@@ -1296,14 +1296,14 @@ if (check_login()) {
             if ((bool) check_acl($config['id_user'], $id_grupo, 'AW') === true
                 && $cluster_view === false
             ) {
-                $moduleActionButtons[] = html_print_button(
-                    __('Edit'),
-                    'edit_module_'.$idAgenteModulo,
-                    false,
-                    'window.location.assign("index.php?sec=gagente&amp;sec2=godmode/agentes/configurar_agente&amp;id_agente='.$id_agente.'&amp;tab=module&amp;id_agent_module='.$module['id_agente_modulo'].'&amp;edit_module='.$module['id_modulo'].'")',
+                $moduleActionButtons[] = html_print_anchor(
                     [
-                        'mode'  => 'link',
-                        'style' => 'justify-content: flex-end;',
+                        'href'    => 'index.php?sec=gagente&amp;sec2=godmode/agentes/configurar_agente&amp;id_agente='.$id_agente.'&amp;tab=module&amp;id_agent_module='.$module['id_agente_modulo'].'&amp;edit_module='.$module['id_modulo'].'"',
+                        'content' => html_print_image(
+                            'images/edit.svg',
+                            true,
+                            [ 'class' => 'main_menu_icon' ]
+                        ),
                     ],
                     true
                 );
diff --git a/pandora_console/include/styles/pandora_black.css b/pandora_console/include/styles/pandora_black.css
index 9a0a6ac63e..4ff0e5b7ce 100644
--- a/pandora_console/include/styles/pandora_black.css
+++ b/pandora_console/include/styles/pandora_black.css
@@ -774,6 +774,11 @@ form ul.form_flex {
   filter: invert(100%);
 }
 
+.info_table .invert_filter,
+.info_table .labels {
+  filter: invert(100%);
+}
+
 .graph_conteiner_inside,
 .container_table,
 .second_background,
diff --git a/pandora_console/operation/agentes/alerts_status.php b/pandora_console/operation/agentes/alerts_status.php
index bb3d0e9a39..1378351614 100755
--- a/pandora_console/operation/agentes/alerts_status.php
+++ b/pandora_console/operation/agentes/alerts_status.php
@@ -371,11 +371,12 @@ if ($agent_view_page === true) {
         [
             'id'                  => 'alerts_status_datatable',
             'class'               => 'info_table',
-            'style'               => 'width: 100%',
+            'style'               => 'width: 99%',
             'columns'             => $columns,
             'column_names'        => $column_names,
             'no_sortable_columns' => $no_sortable_columns,
             'ajax_url'            => 'include/ajax/alert_list.ajax',
+            'dom_elements'        => 'pfrti',
             'ajax_data'           => [
                 'get_agent_alerts_datatable' => 1,
                 'id_agent'                   => $idAgent,
@@ -406,6 +407,7 @@ if ($agent_view_page === true) {
                     ],
                 ],
                 'no_toggle' => true,
+                'class'     => 'flex',
             ],
         ]
     );
diff --git a/pandora_console/operation/agentes/estado_monitores.php b/pandora_console/operation/agentes/estado_monitores.php
index 0d04a3b6f0..57f06fd940 100755
--- a/pandora_console/operation/agentes/estado_monitores.php
+++ b/pandora_console/operation/agentes/estado_monitores.php
@@ -542,7 +542,7 @@ function print_form_filter_monitors(
 
     $form_text = '';
     $table = new stdClass();
-    $table->class = 'filter_table';
+    $table->class = 'filter-table-adv';
     $table->id = 'module_filter_agent_view';
     $table->styleTable = 'border-radius: 0;padding: 0;margin: 0 0 10px;';
     $table->width = '100%';
diff --git a/pandora_console/operation/search_agents.php b/pandora_console/operation/search_agents.php
index b5e774048d..89363f792a 100755
--- a/pandora_console/operation/search_agents.php
+++ b/pandora_console/operation/search_agents.php
@@ -136,6 +136,8 @@ if (!$agents || !$searchAgents) {
             ).'</a>';
         }
 
+        $table->cellclass[][9] = 'table_action_buttons';
+
         array_push(
             $table->data,
             [
diff --git a/pandora_console/operation/search_modules.php b/pandora_console/operation/search_modules.php
index 4a452829d5..29c6fb7fcb 100644
--- a/pandora_console/operation/search_modules.php
+++ b/pandora_console/operation/search_modules.php
@@ -72,6 +72,7 @@ if (!$modules || !$searchModules) {
         'web_content_string'
     );
 
+    $i = 0;
     foreach ($modules as $module) {
         $module['datos'] = modules_get_last_value($module['id_agente_modulo']);
         $module['module_name'] = $module['nombre'];
@@ -162,6 +163,7 @@ if (!$modules || !$searchModules) {
         }
 
         $graphCell = '';
+        $table->cellclass[$i][5] = 'table_action_buttons';
         if ($module['history_data'] == 1) {
             $graph_type = return_graphtype($module['id_tipo_modulo']);
 
@@ -204,6 +206,7 @@ if (!$modules || !$searchModules) {
 
         $group_agent = agents_get_agent_group($module['id_agente']);
 
+        $table->cellclass[$i][8] = 'table_action_buttons';
         if (check_acl($config['id_user'], $group_agent, 'AW')) {
             $edit_module = 'aaa';
 
@@ -229,6 +232,8 @@ if (!$modules || !$searchModules) {
                 $edit_module,
             ]
         );
+
+        $i++;
     }
 
     echo '<br />';

From a4d1d2c9b23a2a077bd6dad9aa69d4347aec4027 Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Sat, 11 Mar 2023 01:00:20 +0100
Subject: [PATCH 23/25] Auto-updated build strings.

---
 pandora_agents/unix/DEBIAN/control             | 2 +-
 pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +-
 pandora_agents/unix/pandora_agent              | 2 +-
 pandora_agents/unix/pandora_agent.redhat.spec  | 2 +-
 pandora_agents/unix/pandora_agent.spec         | 2 +-
 pandora_agents/unix/pandora_agent_installer    | 2 +-
 pandora_agents/win32/installer/pandora.mpi     | 2 +-
 pandora_agents/win32/pandora.cc                | 2 +-
 pandora_agents/win32/versioninfo.rc            | 2 +-
 pandora_console/DEBIAN/control                 | 2 +-
 pandora_console/DEBIAN/make_deb_package.sh     | 2 +-
 pandora_console/include/config_process.php     | 2 +-
 pandora_console/install.php                    | 2 +-
 pandora_console/pandora_console.redhat.spec    | 2 +-
 pandora_console/pandora_console.rhel7.spec     | 2 +-
 pandora_console/pandora_console.spec           | 2 +-
 pandora_server/DEBIAN/control                  | 2 +-
 pandora_server/DEBIAN/make_deb_package.sh      | 2 +-
 pandora_server/lib/PandoraFMS/Config.pm        | 2 +-
 pandora_server/lib/PandoraFMS/PluginTools.pm   | 2 +-
 pandora_server/pandora_server.redhat.spec      | 2 +-
 pandora_server/pandora_server.spec             | 2 +-
 pandora_server/pandora_server_installer        | 2 +-
 pandora_server/util/pandora_db.pl              | 2 +-
 pandora_server/util/pandora_manage.pl          | 2 +-
 25 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control
index 5a6b6e4894..0a32463988 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.769-230310
+Version: 7.0NG.769-230311
 Architecture: all
 Priority: optional
 Section: admin
diff --git a/pandora_agents/unix/DEBIAN/make_deb_package.sh b/pandora_agents/unix/DEBIAN/make_deb_package.sh
index 0ff5c31c0b..818a7dfae0 100644
--- a/pandora_agents/unix/DEBIAN/make_deb_package.sh
+++ b/pandora_agents/unix/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.769-230310"
+pandora_version="7.0NG.769-230311"
 
 echo "Test if you has the tools for to make the packages."
 whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null
diff --git a/pandora_agents/unix/pandora_agent b/pandora_agents/unix/pandora_agent
index 0e6522165b..6d80b6ff83 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -1023,7 +1023,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.769';
-use constant AGENT_BUILD => '230310';
+use constant AGENT_BUILD => '230311';
 
 # Agent log default file size maximum and instances
 use constant DEFAULT_MAX_LOG_SIZE => 600000;
diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec
index c23d462fd1..e5f98516a4 100644
--- a/pandora_agents/unix/pandora_agent.redhat.spec
+++ b/pandora_agents/unix/pandora_agent.redhat.spec
@@ -4,7 +4,7 @@
 %global __os_install_post %{nil}
 %define name        pandorafms_agent_linux
 %define version     7.0NG.769
-%define release     230310
+%define release     230311
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}
diff --git a/pandora_agents/unix/pandora_agent.spec b/pandora_agents/unix/pandora_agent.spec
index 33324b25e1..7fa9acc2c3 100644
--- a/pandora_agents/unix/pandora_agent.spec
+++ b/pandora_agents/unix/pandora_agent.spec
@@ -4,7 +4,7 @@
 %global __os_install_post %{nil}
 %define name        pandorafms_agent_linux
 %define version     7.0NG.769
-%define release     230310
+%define release     230311
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}
diff --git a/pandora_agents/unix/pandora_agent_installer b/pandora_agents/unix/pandora_agent_installer
index ab50df62d1..6f6ba7ccc4 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.769"
-PI_BUILD="230310"
+PI_BUILD="230311"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index 8d6bea8586..21581e29b2 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{230310}
+{230311}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 024db5dc39..c3602378d9 100644
--- a/pandora_agents/win32/pandora.cc
+++ b/pandora_agents/win32/pandora.cc
@@ -30,7 +30,7 @@ using namespace Pandora;
 using namespace Pandora_Strutils;
 
 #define PATH_SIZE    _MAX_PATH+1
-#define PANDORA_VERSION ("7.0NG.769 Build 230310")
+#define PANDORA_VERSION ("7.0NG.769 Build 230311")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index 63db898d79..cbccd60e65 100644
--- a/pandora_agents/win32/versioninfo.rc
+++ b/pandora_agents/win32/versioninfo.rc
@@ -11,7 +11,7 @@ BEGIN
       VALUE "LegalCopyright", "Artica ST"
       VALUE "OriginalFilename", "PandoraAgent.exe"
       VALUE "ProductName", "Pandora FMS Windows Agent"
-      VALUE "ProductVersion", "(7.0NG.769(Build 230310))"
+      VALUE "ProductVersion", "(7.0NG.769(Build 230311))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index de8bff7c41..187c697b96 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.769-230310
+Version: 7.0NG.769-230311
 Architecture: all
 Priority: optional
 Section: admin
diff --git a/pandora_console/DEBIAN/make_deb_package.sh b/pandora_console/DEBIAN/make_deb_package.sh
index 486224eab7..ab21f4a778 100644
--- a/pandora_console/DEBIAN/make_deb_package.sh
+++ b/pandora_console/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.769-230310"
+pandora_version="7.0NG.769-230311"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 3ad202b031..5a644be4dc 100644
--- a/pandora_console/include/config_process.php
+++ b/pandora_console/include/config_process.php
@@ -20,7 +20,7 @@
 /**
  * Pandora build version and version
  */
-$build_version = 'PC230310';
+$build_version = 'PC230311';
 $pandora_version = 'v7.0NG.769';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index eb75f84d09..cb931e1931 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -131,7 +131,7 @@
         <div style='padding-bottom: 50px'>
             <?php
             $version = '7.0NG.769';
-            $build = '230310';
+            $build = '230311';
             $banner = "v$version Build $build";
             error_reporting(0);
 
diff --git a/pandora_console/pandora_console.redhat.spec b/pandora_console/pandora_console.redhat.spec
index 75f46ec9f0..0bb660f53a 100644
--- a/pandora_console/pandora_console.redhat.spec
+++ b/pandora_console/pandora_console.redhat.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.769
-%define release     230310
+%define release     230311
 
 # User and Group under which Apache is running
 %define httpd_name  httpd
diff --git a/pandora_console/pandora_console.rhel7.spec b/pandora_console/pandora_console.rhel7.spec
index 6825f4a06a..9aafb552b1 100644
--- a/pandora_console/pandora_console.rhel7.spec
+++ b/pandora_console/pandora_console.rhel7.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.769
-%define release     230310
+%define release     230311
 
 # User and Group under which Apache is running
 %define httpd_name  httpd
diff --git a/pandora_console/pandora_console.spec b/pandora_console/pandora_console.spec
index 989914d732..0019dd4a76 100644
--- a/pandora_console/pandora_console.spec
+++ b/pandora_console/pandora_console.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.769
-%define release     230310
+%define release     230311
 %define httpd_name      httpd
 # User and Group under which Apache is running
 %define httpd_name  apache2
diff --git a/pandora_server/DEBIAN/control b/pandora_server/DEBIAN/control
index 6398d9bac9..2243dac1f2 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.769-230310
+Version: 7.0NG.769-230311
 Architecture: all
 Priority: optional
 Section: admin
diff --git a/pandora_server/DEBIAN/make_deb_package.sh b/pandora_server/DEBIAN/make_deb_package.sh
index 5164e8ac66..f185a7e2a4 100644
--- a/pandora_server/DEBIAN/make_deb_package.sh
+++ b/pandora_server/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.769-230310"
+pandora_version="7.0NG.769-230311"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 219c5b3c84..19fd3a1fa8 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@@ -46,7 +46,7 @@ our @EXPORT = qw(
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.769";
-my $pandora_build = "230310";
+my $pandora_build = "230311";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash
diff --git a/pandora_server/lib/PandoraFMS/PluginTools.pm b/pandora_server/lib/PandoraFMS/PluginTools.pm
index 835e297373..d3bf1fba3f 100644
--- a/pandora_server/lib/PandoraFMS/PluginTools.pm
+++ b/pandora_server/lib/PandoraFMS/PluginTools.pm
@@ -34,7 +34,7 @@ our @ISA = qw(Exporter);
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.769";
-my $pandora_build = "230310";
+my $pandora_build = "230311";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 our %EXPORT_TAGS = ( 'all' => [ qw() ] );
diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec
index 7f657e1ab8..42a1c0735a 100644
--- a/pandora_server/pandora_server.redhat.spec
+++ b/pandora_server/pandora_server.redhat.spec
@@ -4,7 +4,7 @@
 %global __os_install_post %{nil}
 %define name        pandorafms_server
 %define version     7.0NG.769
-%define release     230310
+%define release     230311
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index adbe75189b..3d9164a73c 100644
--- a/pandora_server/pandora_server.spec
+++ b/pandora_server/pandora_server.spec
@@ -4,7 +4,7 @@
 %global __os_install_post %{nil}
 %define name        pandorafms_server
 %define version     7.0NG.769
-%define release     230310
+%define release     230311
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index da483f4b7d..0fceb4999e 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.769"
-PI_BUILD="230310"
+PI_BUILD="230311"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 6942f8e4fe..cf74e3a4a0 100755
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -35,7 +35,7 @@ use PandoraFMS::Config;
 use PandoraFMS::DB;
 
 # version: define current version
-my $version = "7.0NG.769 Build 230310";
+my $version = "7.0NG.769 Build 230311";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 15ff91c2b8..8dd39c6752 100755
--- a/pandora_server/util/pandora_manage.pl
+++ b/pandora_server/util/pandora_manage.pl
@@ -36,7 +36,7 @@ use Encode::Locale;
 Encode::Locale::decode_argv;
 
 # version: define current version
-my $version = "7.0NG.769 Build 230310";
+my $version = "7.0NG.769 Build 230311";
 
 # save program name for logging
 my $progname = basename($0);

From ef04e54058f40e7326cb00013baaf4de8f8fa767 Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Sun, 12 Mar 2023 01:00:40 +0100
Subject: [PATCH 24/25] Auto-updated build strings.

---
 pandora_agents/unix/DEBIAN/control             | 2 +-
 pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +-
 pandora_agents/unix/pandora_agent              | 2 +-
 pandora_agents/unix/pandora_agent.redhat.spec  | 2 +-
 pandora_agents/unix/pandora_agent.spec         | 2 +-
 pandora_agents/unix/pandora_agent_installer    | 2 +-
 pandora_agents/win32/installer/pandora.mpi     | 2 +-
 pandora_agents/win32/pandora.cc                | 2 +-
 pandora_agents/win32/versioninfo.rc            | 2 +-
 pandora_console/DEBIAN/control                 | 2 +-
 pandora_console/DEBIAN/make_deb_package.sh     | 2 +-
 pandora_console/include/config_process.php     | 2 +-
 pandora_console/install.php                    | 2 +-
 pandora_console/pandora_console.redhat.spec    | 2 +-
 pandora_console/pandora_console.rhel7.spec     | 2 +-
 pandora_console/pandora_console.spec           | 2 +-
 pandora_server/DEBIAN/control                  | 2 +-
 pandora_server/DEBIAN/make_deb_package.sh      | 2 +-
 pandora_server/lib/PandoraFMS/Config.pm        | 2 +-
 pandora_server/lib/PandoraFMS/PluginTools.pm   | 2 +-
 pandora_server/pandora_server.redhat.spec      | 2 +-
 pandora_server/pandora_server.spec             | 2 +-
 pandora_server/pandora_server_installer        | 2 +-
 pandora_server/util/pandora_db.pl              | 2 +-
 pandora_server/util/pandora_manage.pl          | 2 +-
 25 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control
index 0a32463988..8cb75d2199 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.769-230311
+Version: 7.0NG.769-230312
 Architecture: all
 Priority: optional
 Section: admin
diff --git a/pandora_agents/unix/DEBIAN/make_deb_package.sh b/pandora_agents/unix/DEBIAN/make_deb_package.sh
index 818a7dfae0..97696c12a9 100644
--- a/pandora_agents/unix/DEBIAN/make_deb_package.sh
+++ b/pandora_agents/unix/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.769-230311"
+pandora_version="7.0NG.769-230312"
 
 echo "Test if you has the tools for to make the packages."
 whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null
diff --git a/pandora_agents/unix/pandora_agent b/pandora_agents/unix/pandora_agent
index 6d80b6ff83..1d44d5ff12 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -1023,7 +1023,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.769';
-use constant AGENT_BUILD => '230311';
+use constant AGENT_BUILD => '230312';
 
 # Agent log default file size maximum and instances
 use constant DEFAULT_MAX_LOG_SIZE => 600000;
diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec
index e5f98516a4..453ae23d37 100644
--- a/pandora_agents/unix/pandora_agent.redhat.spec
+++ b/pandora_agents/unix/pandora_agent.redhat.spec
@@ -4,7 +4,7 @@
 %global __os_install_post %{nil}
 %define name        pandorafms_agent_linux
 %define version     7.0NG.769
-%define release     230311
+%define release     230312
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}
diff --git a/pandora_agents/unix/pandora_agent.spec b/pandora_agents/unix/pandora_agent.spec
index 7fa9acc2c3..35f6aa06c0 100644
--- a/pandora_agents/unix/pandora_agent.spec
+++ b/pandora_agents/unix/pandora_agent.spec
@@ -4,7 +4,7 @@
 %global __os_install_post %{nil}
 %define name        pandorafms_agent_linux
 %define version     7.0NG.769
-%define release     230311
+%define release     230312
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}
diff --git a/pandora_agents/unix/pandora_agent_installer b/pandora_agents/unix/pandora_agent_installer
index 6f6ba7ccc4..ac1c2c241c 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.769"
-PI_BUILD="230311"
+PI_BUILD="230312"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index 21581e29b2..ed2843992d 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{230311}
+{230312}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index c3602378d9..3c010ae74f 100644
--- a/pandora_agents/win32/pandora.cc
+++ b/pandora_agents/win32/pandora.cc
@@ -30,7 +30,7 @@ using namespace Pandora;
 using namespace Pandora_Strutils;
 
 #define PATH_SIZE    _MAX_PATH+1
-#define PANDORA_VERSION ("7.0NG.769 Build 230311")
+#define PANDORA_VERSION ("7.0NG.769 Build 230312")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index cbccd60e65..eb988c71cc 100644
--- a/pandora_agents/win32/versioninfo.rc
+++ b/pandora_agents/win32/versioninfo.rc
@@ -11,7 +11,7 @@ BEGIN
       VALUE "LegalCopyright", "Artica ST"
       VALUE "OriginalFilename", "PandoraAgent.exe"
       VALUE "ProductName", "Pandora FMS Windows Agent"
-      VALUE "ProductVersion", "(7.0NG.769(Build 230311))"
+      VALUE "ProductVersion", "(7.0NG.769(Build 230312))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 187c697b96..781bfd3b59 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.769-230311
+Version: 7.0NG.769-230312
 Architecture: all
 Priority: optional
 Section: admin
diff --git a/pandora_console/DEBIAN/make_deb_package.sh b/pandora_console/DEBIAN/make_deb_package.sh
index ab21f4a778..829b62c00f 100644
--- a/pandora_console/DEBIAN/make_deb_package.sh
+++ b/pandora_console/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.769-230311"
+pandora_version="7.0NG.769-230312"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 5a644be4dc..b3341342d8 100644
--- a/pandora_console/include/config_process.php
+++ b/pandora_console/include/config_process.php
@@ -20,7 +20,7 @@
 /**
  * Pandora build version and version
  */
-$build_version = 'PC230311';
+$build_version = 'PC230312';
 $pandora_version = 'v7.0NG.769';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index cb931e1931..676f79a973 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -131,7 +131,7 @@
         <div style='padding-bottom: 50px'>
             <?php
             $version = '7.0NG.769';
-            $build = '230311';
+            $build = '230312';
             $banner = "v$version Build $build";
             error_reporting(0);
 
diff --git a/pandora_console/pandora_console.redhat.spec b/pandora_console/pandora_console.redhat.spec
index 0bb660f53a..70050d4dd0 100644
--- a/pandora_console/pandora_console.redhat.spec
+++ b/pandora_console/pandora_console.redhat.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.769
-%define release     230311
+%define release     230312
 
 # User and Group under which Apache is running
 %define httpd_name  httpd
diff --git a/pandora_console/pandora_console.rhel7.spec b/pandora_console/pandora_console.rhel7.spec
index 9aafb552b1..c4f6c6a30a 100644
--- a/pandora_console/pandora_console.rhel7.spec
+++ b/pandora_console/pandora_console.rhel7.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.769
-%define release     230311
+%define release     230312
 
 # User and Group under which Apache is running
 %define httpd_name  httpd
diff --git a/pandora_console/pandora_console.spec b/pandora_console/pandora_console.spec
index 0019dd4a76..cd29afdc1e 100644
--- a/pandora_console/pandora_console.spec
+++ b/pandora_console/pandora_console.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.769
-%define release     230311
+%define release     230312
 %define httpd_name      httpd
 # User and Group under which Apache is running
 %define httpd_name  apache2
diff --git a/pandora_server/DEBIAN/control b/pandora_server/DEBIAN/control
index 2243dac1f2..c33fd3c53d 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.769-230311
+Version: 7.0NG.769-230312
 Architecture: all
 Priority: optional
 Section: admin
diff --git a/pandora_server/DEBIAN/make_deb_package.sh b/pandora_server/DEBIAN/make_deb_package.sh
index f185a7e2a4..8d73fd4d47 100644
--- a/pandora_server/DEBIAN/make_deb_package.sh
+++ b/pandora_server/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.769-230311"
+pandora_version="7.0NG.769-230312"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 19fd3a1fa8..069fc203de 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@@ -46,7 +46,7 @@ our @EXPORT = qw(
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.769";
-my $pandora_build = "230311";
+my $pandora_build = "230312";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash
diff --git a/pandora_server/lib/PandoraFMS/PluginTools.pm b/pandora_server/lib/PandoraFMS/PluginTools.pm
index d3bf1fba3f..cd39bfb61d 100644
--- a/pandora_server/lib/PandoraFMS/PluginTools.pm
+++ b/pandora_server/lib/PandoraFMS/PluginTools.pm
@@ -34,7 +34,7 @@ our @ISA = qw(Exporter);
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.769";
-my $pandora_build = "230311";
+my $pandora_build = "230312";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 our %EXPORT_TAGS = ( 'all' => [ qw() ] );
diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec
index 42a1c0735a..39a650ee84 100644
--- a/pandora_server/pandora_server.redhat.spec
+++ b/pandora_server/pandora_server.redhat.spec
@@ -4,7 +4,7 @@
 %global __os_install_post %{nil}
 %define name        pandorafms_server
 %define version     7.0NG.769
-%define release     230311
+%define release     230312
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 3d9164a73c..9d017bd114 100644
--- a/pandora_server/pandora_server.spec
+++ b/pandora_server/pandora_server.spec
@@ -4,7 +4,7 @@
 %global __os_install_post %{nil}
 %define name        pandorafms_server
 %define version     7.0NG.769
-%define release     230311
+%define release     230312
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 0fceb4999e..19f13fafb9 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.769"
-PI_BUILD="230311"
+PI_BUILD="230312"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index cf74e3a4a0..be892298a4 100755
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -35,7 +35,7 @@ use PandoraFMS::Config;
 use PandoraFMS::DB;
 
 # version: define current version
-my $version = "7.0NG.769 Build 230311";
+my $version = "7.0NG.769 Build 230312";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 8dd39c6752..23ba6cbdc0 100755
--- a/pandora_server/util/pandora_manage.pl
+++ b/pandora_server/util/pandora_manage.pl
@@ -36,7 +36,7 @@ use Encode::Locale;
 Encode::Locale::decode_argv;
 
 # version: define current version
-my $version = "7.0NG.769 Build 230311";
+my $version = "7.0NG.769 Build 230312";
 
 # save program name for logging
 my $progname = basename($0);

From 87e165ff806935dc634435c6f73e89adf22463ce Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Mon, 13 Mar 2023 01:00:18 +0100
Subject: [PATCH 25/25] Auto-updated build strings.

---
 pandora_agents/unix/DEBIAN/control             | 2 +-
 pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +-
 pandora_agents/unix/pandora_agent              | 2 +-
 pandora_agents/unix/pandora_agent.redhat.spec  | 2 +-
 pandora_agents/unix/pandora_agent.spec         | 2 +-
 pandora_agents/unix/pandora_agent_installer    | 2 +-
 pandora_agents/win32/installer/pandora.mpi     | 2 +-
 pandora_agents/win32/pandora.cc                | 2 +-
 pandora_agents/win32/versioninfo.rc            | 2 +-
 pandora_console/DEBIAN/control                 | 2 +-
 pandora_console/DEBIAN/make_deb_package.sh     | 2 +-
 pandora_console/include/config_process.php     | 2 +-
 pandora_console/install.php                    | 2 +-
 pandora_console/pandora_console.redhat.spec    | 2 +-
 pandora_console/pandora_console.rhel7.spec     | 2 +-
 pandora_console/pandora_console.spec           | 2 +-
 pandora_server/DEBIAN/control                  | 2 +-
 pandora_server/DEBIAN/make_deb_package.sh      | 2 +-
 pandora_server/lib/PandoraFMS/Config.pm        | 2 +-
 pandora_server/lib/PandoraFMS/PluginTools.pm   | 2 +-
 pandora_server/pandora_server.redhat.spec      | 2 +-
 pandora_server/pandora_server.spec             | 2 +-
 pandora_server/pandora_server_installer        | 2 +-
 pandora_server/util/pandora_db.pl              | 2 +-
 pandora_server/util/pandora_manage.pl          | 2 +-
 25 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control
index 8cb75d2199..e6553ada2f 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.769-230312
+Version: 7.0NG.769-230313
 Architecture: all
 Priority: optional
 Section: admin
diff --git a/pandora_agents/unix/DEBIAN/make_deb_package.sh b/pandora_agents/unix/DEBIAN/make_deb_package.sh
index 97696c12a9..cadc4a6fd2 100644
--- a/pandora_agents/unix/DEBIAN/make_deb_package.sh
+++ b/pandora_agents/unix/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.769-230312"
+pandora_version="7.0NG.769-230313"
 
 echo "Test if you has the tools for to make the packages."
 whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null
diff --git a/pandora_agents/unix/pandora_agent b/pandora_agents/unix/pandora_agent
index 1d44d5ff12..f828e1a7ae 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -1023,7 +1023,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.769';
-use constant AGENT_BUILD => '230312';
+use constant AGENT_BUILD => '230313';
 
 # Agent log default file size maximum and instances
 use constant DEFAULT_MAX_LOG_SIZE => 600000;
diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec
index 453ae23d37..4ff8cf8848 100644
--- a/pandora_agents/unix/pandora_agent.redhat.spec
+++ b/pandora_agents/unix/pandora_agent.redhat.spec
@@ -4,7 +4,7 @@
 %global __os_install_post %{nil}
 %define name        pandorafms_agent_linux
 %define version     7.0NG.769
-%define release     230312
+%define release     230313
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}
diff --git a/pandora_agents/unix/pandora_agent.spec b/pandora_agents/unix/pandora_agent.spec
index 35f6aa06c0..6705e0ee72 100644
--- a/pandora_agents/unix/pandora_agent.spec
+++ b/pandora_agents/unix/pandora_agent.spec
@@ -4,7 +4,7 @@
 %global __os_install_post %{nil}
 %define name        pandorafms_agent_linux
 %define version     7.0NG.769
-%define release     230312
+%define release     230313
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}
diff --git a/pandora_agents/unix/pandora_agent_installer b/pandora_agents/unix/pandora_agent_installer
index ac1c2c241c..06c37d34cd 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.769"
-PI_BUILD="230312"
+PI_BUILD="230313"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index ed2843992d..60ebc7abad 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{230312}
+{230313}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 3c010ae74f..e7aeba8540 100644
--- a/pandora_agents/win32/pandora.cc
+++ b/pandora_agents/win32/pandora.cc
@@ -30,7 +30,7 @@ using namespace Pandora;
 using namespace Pandora_Strutils;
 
 #define PATH_SIZE    _MAX_PATH+1
-#define PANDORA_VERSION ("7.0NG.769 Build 230312")
+#define PANDORA_VERSION ("7.0NG.769 Build 230313")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index eb988c71cc..394e2e2be5 100644
--- a/pandora_agents/win32/versioninfo.rc
+++ b/pandora_agents/win32/versioninfo.rc
@@ -11,7 +11,7 @@ BEGIN
       VALUE "LegalCopyright", "Artica ST"
       VALUE "OriginalFilename", "PandoraAgent.exe"
       VALUE "ProductName", "Pandora FMS Windows Agent"
-      VALUE "ProductVersion", "(7.0NG.769(Build 230312))"
+      VALUE "ProductVersion", "(7.0NG.769(Build 230313))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 781bfd3b59..020733306e 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.769-230312
+Version: 7.0NG.769-230313
 Architecture: all
 Priority: optional
 Section: admin
diff --git a/pandora_console/DEBIAN/make_deb_package.sh b/pandora_console/DEBIAN/make_deb_package.sh
index 829b62c00f..5a23822ad2 100644
--- a/pandora_console/DEBIAN/make_deb_package.sh
+++ b/pandora_console/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.769-230312"
+pandora_version="7.0NG.769-230313"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index b3341342d8..9fa5ae55f2 100644
--- a/pandora_console/include/config_process.php
+++ b/pandora_console/include/config_process.php
@@ -20,7 +20,7 @@
 /**
  * Pandora build version and version
  */
-$build_version = 'PC230312';
+$build_version = 'PC230313';
 $pandora_version = 'v7.0NG.769';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 676f79a973..94fba1f271 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -131,7 +131,7 @@
         <div style='padding-bottom: 50px'>
             <?php
             $version = '7.0NG.769';
-            $build = '230312';
+            $build = '230313';
             $banner = "v$version Build $build";
             error_reporting(0);
 
diff --git a/pandora_console/pandora_console.redhat.spec b/pandora_console/pandora_console.redhat.spec
index 70050d4dd0..2371461f48 100644
--- a/pandora_console/pandora_console.redhat.spec
+++ b/pandora_console/pandora_console.redhat.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.769
-%define release     230312
+%define release     230313
 
 # User and Group under which Apache is running
 %define httpd_name  httpd
diff --git a/pandora_console/pandora_console.rhel7.spec b/pandora_console/pandora_console.rhel7.spec
index c4f6c6a30a..1c4fbb9602 100644
--- a/pandora_console/pandora_console.rhel7.spec
+++ b/pandora_console/pandora_console.rhel7.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.769
-%define release     230312
+%define release     230313
 
 # User and Group under which Apache is running
 %define httpd_name  httpd
diff --git a/pandora_console/pandora_console.spec b/pandora_console/pandora_console.spec
index cd29afdc1e..c73bbff767 100644
--- a/pandora_console/pandora_console.spec
+++ b/pandora_console/pandora_console.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.769
-%define release     230312
+%define release     230313
 %define httpd_name      httpd
 # User and Group under which Apache is running
 %define httpd_name  apache2
diff --git a/pandora_server/DEBIAN/control b/pandora_server/DEBIAN/control
index c33fd3c53d..45a089c547 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.769-230312
+Version: 7.0NG.769-230313
 Architecture: all
 Priority: optional
 Section: admin
diff --git a/pandora_server/DEBIAN/make_deb_package.sh b/pandora_server/DEBIAN/make_deb_package.sh
index 8d73fd4d47..2d7dc46c06 100644
--- a/pandora_server/DEBIAN/make_deb_package.sh
+++ b/pandora_server/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.769-230312"
+pandora_version="7.0NG.769-230313"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 069fc203de..554f5c3383 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@@ -46,7 +46,7 @@ our @EXPORT = qw(
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.769";
-my $pandora_build = "230312";
+my $pandora_build = "230313";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash
diff --git a/pandora_server/lib/PandoraFMS/PluginTools.pm b/pandora_server/lib/PandoraFMS/PluginTools.pm
index cd39bfb61d..cd0cb9fc64 100644
--- a/pandora_server/lib/PandoraFMS/PluginTools.pm
+++ b/pandora_server/lib/PandoraFMS/PluginTools.pm
@@ -34,7 +34,7 @@ our @ISA = qw(Exporter);
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.769";
-my $pandora_build = "230312";
+my $pandora_build = "230313";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 our %EXPORT_TAGS = ( 'all' => [ qw() ] );
diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec
index 39a650ee84..f12dce0155 100644
--- a/pandora_server/pandora_server.redhat.spec
+++ b/pandora_server/pandora_server.redhat.spec
@@ -4,7 +4,7 @@
 %global __os_install_post %{nil}
 %define name        pandorafms_server
 %define version     7.0NG.769
-%define release     230312
+%define release     230313
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 9d017bd114..6b03f847d1 100644
--- a/pandora_server/pandora_server.spec
+++ b/pandora_server/pandora_server.spec
@@ -4,7 +4,7 @@
 %global __os_install_post %{nil}
 %define name        pandorafms_server
 %define version     7.0NG.769
-%define release     230312
+%define release     230313
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 19f13fafb9..b14901c613 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.769"
-PI_BUILD="230312"
+PI_BUILD="230313"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index be892298a4..1d7dd60493 100755
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -35,7 +35,7 @@ use PandoraFMS::Config;
 use PandoraFMS::DB;
 
 # version: define current version
-my $version = "7.0NG.769 Build 230312";
+my $version = "7.0NG.769 Build 230313";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 23ba6cbdc0..37c365cfcd 100755
--- a/pandora_server/util/pandora_manage.pl
+++ b/pandora_server/util/pandora_manage.pl
@@ -36,7 +36,7 @@ use Encode::Locale;
 Encode::Locale::decode_argv;
 
 # version: define current version
-my $version = "7.0NG.769 Build 230312";
+my $version = "7.0NG.769 Build 230313";
 
 # save program name for logging
 my $progname = basename($0);