From 0b1e60b8cf5bf0080020df90105c4625083f755f Mon Sep 17 00:00:00 2001
From: Calvo <luis.calvo@artica.es>
Date: Tue, 6 Apr 2021 18:18:17 +0200
Subject: [PATCH 01/93] Fixed view icon on report and custom graphs

---
 pandora_console/godmode/reporting/graph_builder.php      | 2 +-
 pandora_console/godmode/reporting/reporting_builder.php  | 2 +-
 pandora_console/operation/reporting/graph_viewer.php     | 2 +-
 pandora_console/operation/reporting/reporting_viewer.php | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pandora_console/godmode/reporting/graph_builder.php b/pandora_console/godmode/reporting/graph_builder.php
index 79fdfde250..27cbc9354d 100644
--- a/pandora_console/godmode/reporting/graph_builder.php
+++ b/pandora_console/godmode/reporting/graph_builder.php
@@ -319,7 +319,7 @@ if ($edit_graph) {
         'view'         => [
             'active' => false,
             'text'   => '<a href="index.php?sec=reporting&sec2=operation/reporting/graph_viewer&view_graph=1&id='.$id_graph.'">'.html_print_image(
-                'images/operation.png',
+                'images/eye.png',
                 true,
                 [
                     'title' => __('View graph'),
diff --git a/pandora_console/godmode/reporting/reporting_builder.php b/pandora_console/godmode/reporting/reporting_builder.php
index d4967be810..e758f6ac0b 100755
--- a/pandora_console/godmode/reporting/reporting_builder.php
+++ b/pandora_console/godmode/reporting/reporting_builder.php
@@ -3209,7 +3209,7 @@ 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/operation.png',
+        'images/eye.png',
         true,
         [
             'title' => __('View report'),
diff --git a/pandora_console/operation/reporting/graph_viewer.php b/pandora_console/operation/reporting/graph_viewer.php
index 000179fe4e..5e2de125e0 100644
--- a/pandora_console/operation/reporting/graph_viewer.php
+++ b/pandora_console/operation/reporting/graph_viewer.php
@@ -196,7 +196,7 @@ if ($view_graph) {
     }
 
     $options['view']['text'] = '<a href="index.php?sec=reporting&sec2=operation/reporting/graph_viewer&view_graph=1&id='.$id_graph.'">'.html_print_image(
-        'images/operation.png',
+        'images/eye.png',
         true,
         [
             'title' => __('View graph'),
diff --git a/pandora_console/operation/reporting/reporting_viewer.php b/pandora_console/operation/reporting/reporting_viewer.php
index 5434553aea..7dfecce0b9 100755
--- a/pandora_console/operation/reporting/reporting_viewer.php
+++ b/pandora_console/operation/reporting/reporting_viewer.php
@@ -125,7 +125,7 @@ if (check_acl_restricted_all($config['id_user'], $report_group, 'RW')) {
 $options['view'] = [
     'active' => true,
     'text'   => '<a href="index.php?sec=reporting&sec2=operation/reporting/reporting_viewer&id='.$id_report.'&pure='.$pure.'">'.html_print_image(
-        'images/operation.png',
+        'images/eye.png',
         true,
         [
             'title' => __('View report'),

From 420960ed9ee001936e807583e309d150e09d366a Mon Sep 17 00:00:00 2001
From: Calvo <luis.calvo@artica.es>
Date: Wed, 7 Apr 2021 10:14:27 +0200
Subject: [PATCH 02/93] Changed search bar text

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

diff --git a/pandora_console/include/class/OrderInterpreter.class.php b/pandora_console/include/class/OrderInterpreter.class.php
index 947c70c953..e5b347d58f 100644
--- a/pandora_console/include/class/OrderInterpreter.class.php
+++ b/pandora_console/include/class/OrderInterpreter.class.php
@@ -424,7 +424,7 @@ class OrderInterpreter extends Wizard
             }
 
             if ($iterator === 0) {
-                echo __('No results found');
+                echo __('Press enter to search');
             }
 
             echo '</div>';

From ee858280e11b7ef599ccc4fcb171075c6572745b Mon Sep 17 00:00:00 2001
From: Jose Gonzalez <jose.gonzalez@artica.es>
Date: Fri, 9 Apr 2021 13:30:31 +0200
Subject: [PATCH 03/93] Changed CSRF hidden function for allow return

---
 pandora_console/include/functions_html.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pandora_console/include/functions_html.php b/pandora_console/include/functions_html.php
index a5b4eb4448..ed8bc0922e 100644
--- a/pandora_console/include/functions_html.php
+++ b/pandora_console/include/functions_html.php
@@ -4298,10 +4298,14 @@ function html_print_sort_arrows($params, $order_tag, $up='up', $down='down')
 
 /**
  * Print an input hidden with a new csrf token generated
+ *
+ * @param boolean $return If it is true return a string with the output instead to echo the output.
+ *
+ * @return void
  */
-function html_print_csrf_hidden()
+function html_print_csrf_hidden(bool $return=false)
 {
-    html_print_input_hidden('csrf_code', generate_csrf_code());
+    return html_print_input_hidden('csrf_code', generate_csrf_code(), $return);
 }
 
 

From 9f92a4b6c526770667e5c828447ae874a752bba0 Mon Sep 17 00:00:00 2001
From: Jose Gonzalez <jose.gonzalez@artica.es>
Date: Fri, 9 Apr 2021 13:31:11 +0200
Subject: [PATCH 04/93] Added CSRF token input for PrintForms

---
 pandora_console/include/class/HTML.class.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pandora_console/include/class/HTML.class.php b/pandora_console/include/class/HTML.class.php
index d55aebb924..d5bf6dfc97 100644
--- a/pandora_console/include/class/HTML.class.php
+++ b/pandora_console/include/class/HTML.class.php
@@ -867,6 +867,7 @@ class HTML
         }
 
         $output .= '<ul class="wizard">'.$output_submit.'</ul>';
+        $output .= html_print_csrf_hidden(true);
         $output .= '</form>';
         $output .= '<script>'.$js.'</script>';
         if ($rawjs) {
@@ -1002,6 +1003,7 @@ class HTML
         $output .= '</div>';
 
         $output .= '<ul class="wizard">'.$output_submit.'</ul>';
+        $output .= html_print_csrf_hidden(true);
         $output .= '</form>';
         $output .= '<script>'.$js.'</script>';
         if ($rawjs) {
@@ -1073,6 +1075,7 @@ class HTML
         $output .= '</div>';
 
         $output .= '<ul class="wizard">'.$output_submit.'</ul>';
+        $output .= html_print_csrf_hidden(true);
         $output .= '</form>';
         $output .= '<script>'.$js.'</script>';
         if ($rawjs) {

From 93f355132626d25baa51c0180cafd4f7a710ab26 Mon Sep 17 00:00:00 2001
From: "alejandro.campos@artica.es" <alejandro.campos@artica.es>
Date: Mon, 12 Apr 2021 18:17:09 +0200
Subject: [PATCH 05/93] Create interface views

---
 pandora_console/include/ajax/agent.php        |  16 +
 .../agentes/interface_view.functions.php      | 738 ++++++++++++++++++
 .../operation/agentes/interface_view.php      | 259 ++++++
 .../operation/agentes/ver_agente.php          |  32 +
 pandora_console/operation/menu.php            |   3 +
 5 files changed, 1048 insertions(+)
 create mode 100644 pandora_console/operation/agentes/interface_view.functions.php
 create mode 100644 pandora_console/operation/agentes/interface_view.php

diff --git a/pandora_console/include/ajax/agent.php b/pandora_console/include/ajax/agent.php
index 9386dfa7e9..c593a35240 100644
--- a/pandora_console/include/ajax/agent.php
+++ b/pandora_console/include/ajax/agent.php
@@ -27,12 +27,28 @@ ob_clean();
 // * q
 // * id_group
 $search_agents = (bool) get_parameter('search_agents');
+$get_agents_interfaces = (bool) get_parameter('get_agents_interfaces');
+$id_agents = get_parameter('id_agents', []);
 $get_agents_group = (bool) get_parameter('get_agents_group', false);
 $force_local = (bool) get_parameter('force_local', false);
 if (https_is_running()) {
     header('Content-type: application/json');
 }
 
+if ($get_agents_interfaces) {
+    $agents_interfaces = agents_get_network_interfaces($id_agents);
+
+    // Include alias per agent.
+    foreach ($agents_interfaces as $key => $value) {
+        $agent_alias = agents_get_alias($key);
+        $agents_interfaces[$key]['agent_alias'] = $agent_alias;
+    }
+
+    echo json_encode($agents_interfaces);
+
+    return;
+}
+
 if ($get_agents_group) {
     $id_group = (int) get_parameter('id_group', -1);
     $mode = (string) get_parameter('mode', 'json');
diff --git a/pandora_console/operation/agentes/interface_view.functions.php b/pandora_console/operation/agentes/interface_view.functions.php
new file mode 100644
index 0000000000..df0371c8fe
--- /dev/null
+++ b/pandora_console/operation/agentes/interface_view.functions.php
@@ -0,0 +1,738 @@
+<?php
+/**
+ *  Pandora FMS - http://pandorafms.com
+ *  ==================================================
+ *  Copyright (c) 2005-2021 Artica Soluciones Tecnologicas
+ *  Please see http://pandorafms.org for full contribution list
+ *  This program is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU General Public License
+ *  as published by the Free Software Foundation; 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.
+ */
+
+
+/**
+ * Print filters for interface view.
+ *
+ * @param string sec Section (type of filter will vary across sections).
+ */
+function print_filters($sec)
+{
+    $table = new StdClass();
+    $table->width = '100%';
+    $table->cellspacing = 0;
+    $table->cellpadding = 0;
+    $table->class = 'databox filters';
+
+    if ($sec === 'view') {
+        $table->style[0] = 'font-weight: bold;';
+        $table->style[1] = 'font-weight: bold;';
+        $table->style[2] = 'font-weight: bold;';
+        $table->style[3] = 'font-weight: bold;';
+        $table->style[4] = 'font-weight: bold;';
+
+        $table->data[0][0] = __('Group');
+        $table->data[0][1] .= html_print_select_groups(
+            $config['id_user'],
+            'AR',
+            true,
+            'group_id',
+            $ag_group,
+            '',
+            '',
+            '0',
+            true,
+            false,
+            false,
+            '',
+            false,
+            '',
+            false,
+            false,
+            'id_grupo',
+            false
+        );
+
+        $table->data[0][2] = __('Recursion');
+
+        $table->data[0][2] .= html_print_input(
+            [
+                'type'    => 'checkbox',
+                'name'    => 'recursion',
+                'return'  => true,
+                'checked' => $recursion,
+                'value'   => 1,
+            ]
+        );
+
+        $table->data[1][0] = __('Agents');
+
+        if (empty($agents) === true || $agents == -1) {
+            $agents = [];
+        }
+
+        $table->data[1][1] = html_print_select(
+            [],
+            'selected_agents[]',
+            '',
+            '',
+            '',
+            0,
+            true,
+            true,
+            true,
+            '',
+            false,
+            'min-width: 180px; max-width: 200px;'
+        );
+
+        // Interfaces.
+        $table->data[1][3] = '<b>'.__('Interfaces').'</b>';
+        $table->data[1][4] = html_print_select(
+            [],
+            'selected_interfaces[]',
+            $selected_interfaces,
+            '',
+            '',
+            0,
+            true,
+            true,
+            true,
+            '',
+            false,
+            'min-width: 180px; max-width: 200px;'
+        );
+
+        $table->data[2][4] = html_print_submit_button(
+            __('Show'),
+            'uptbutton',
+            false,
+            'class="sub search mgn_tp_0"',
+            true
+        );
+
+        $filters = '<form method="post" action="'.ui_get_url_refresh(
+            [
+                'selected_agents'     => $selected_agents,
+                'selected_interfaces' => $selected_interfaces,
+                'selected_group_id'   => $selected_group_id,
+            ]
+        ).'">';
+
+        $filters .= html_print_table($table, true);
+        $filters .= '</form>';
+    } else {
+        $table->style[0] = 'font-weight: bold;';
+
+        $table->data[0][0] = '<b>'.__('Interfaces').'</b>';
+        $table->data[0][1] = html_print_select(
+            [],
+            'selected_interfaces[]',
+            $selected_interfaces,
+            '',
+            '',
+            0,
+            true,
+            true,
+            true,
+            '',
+            false,
+            'min-width: 180px; max-width: 200px;'
+        );
+
+        $table->data[1][1] = html_print_submit_button(
+            __('Show'),
+            'uptbutton',
+            false,
+            'class="sub search mgn_tp_0"',
+            true
+        );
+
+        $filters = '<form method="post" action="'.ui_get_url_refresh(
+            [
+                'selected_agents'     => $selected_agents,
+                'selected_interfaces' => $selected_interfaces,
+                'selected_group_id'   => $selected_group_id,
+            ]
+        ).'">';
+
+        $filters .= html_print_table($table, true);
+        $filters .= '</form>';
+    }
+
+    ui_toggle(
+        $filters,
+        __('Interface filter'),
+        __('Interface filter'),
+        'ui_toggle_if_filter'
+    );
+    unset($table);
+}
+
+
+/**
+ * Print interfaces table.
+ *
+ * @param array data Array containing data of interfaces.
+ * @param array selected_agents Selected agents.
+ * @param array selected_interfaces Selected interfaces.
+ * @param string sort_field Field used to sort table.
+ * @param string sort Direction used to sort by field.
+ * @param int pagination_index Active page (used for pagination).
+ * @param string sec Active section of page.
+ */
+function print_table(
+    $data,
+    $selected_agents,
+    $selected_interfaces,
+    $sort_field,
+    $sort,
+    $pagination_index,
+    $sec
+) {
+    global $config;
+
+    $selected = true;
+    $select_if_name_up = false;
+    $select_if_name_down = false;
+    $select_if_speed_data_up = false;
+    $select_if_speed_data_down = false;
+    $select_if_in_octets_up = false;
+    $select_if_in_octets_down = false;
+    $select_if_out_octets_up = false;
+    $select_if_out_octets_down = false;
+    $select_if_usage_module_data_in_up = false;
+    $select_if_usage_module_data_in_down = false;
+    $select_if_usage_module_data_out_up = false;
+    $select_if_usage_module_data_out_down = false;
+    $select_if_last_data_up = false;
+    $select_if_last_data_down = false;
+    $order = null;
+
+    switch ($sort_field) {
+        case 'if_agent_name':
+            switch ($sort) {
+                case 'up':
+                    $select_if_agent_name_up = $selected;
+                    $order = [
+                        'field' => 'if_agent_name',
+                        'order' => 'ASC',
+                    ];
+                break;
+
+                case 'down':
+                default:
+                    $select_if_agent_name_down = $selected;
+                    $order = [
+                        'field' => 'if_agent_name',
+                        'order' => 'DESC',
+                    ];
+                break;
+            }
+        break;
+
+        case 'if_name':
+            switch ($sort) {
+                case 'up':
+                    $select_if_name_up = $selected;
+                    $order = [
+                        'field' => 'if_name',
+                        'order' => 'ASC',
+                    ];
+                break;
+
+                case 'down':
+                default:
+                    $select_if_name_down = $selected;
+                    $order = [
+                        'field' => 'if_name',
+                        'order' => 'DESC',
+                    ];
+                break;
+            }
+        break;
+
+        case 'if_speed_data':
+            switch ($sort) {
+                case 'up':
+                    $select_if_speed_data_up = $selected;
+                    $order = [
+                        'field' => 'if_speed_data',
+                        'order' => 'ASC',
+                    ];
+                break;
+
+                case 'down':
+                default:
+                    $select_if_speed_data_down = $selected;
+                    $order = [
+                        'field' => 'if_speed_data',
+                        'order' => 'DESC',
+                    ];
+                break;
+            }
+        break;
+
+        case 'if_in_octets':
+            switch ($sort) {
+                case 'up':
+                    $select_if_in_octets_up = $selected;
+                    $order = [
+                        'field' => 'if_in_octets',
+                        'order' => 'ASC',
+                    ];
+                break;
+
+                case 'down':
+                default:
+                    $select_if_in_octets_down = $selected;
+                    $order = [
+                        'field' => 'if_in_octets',
+                        'order' => 'DESC',
+                    ];
+                break;
+            }
+        break;
+
+        case 'if_out_octets':
+            switch ($sort) {
+                case 'up':
+                    $select_if_out_octets_up = $selected;
+                    $order = [
+                        'field' => 'if_out_octets',
+                        'order' => 'ASC',
+                    ];
+                break;
+
+                case 'down':
+                default:
+                    $select_if_out_octets_down = $selected;
+                    $order = [
+                        'field' => 'if_out_octets',
+                        'order' => 'DESC',
+                    ];
+                break;
+            }
+        break;
+
+        case 'if_usage_module_data_in':
+            switch ($sort) {
+                case 'up':
+                    $select_if_usage_module_data_in_up = $selected;
+                    $order = [
+                        'field' => 'if_usage_module_data_in',
+                        'order' => 'ASC',
+                    ];
+                break;
+
+                case 'down':
+                default:
+                    $select_if_usage_module_data_in_down = $selected;
+                    $order = [
+                        'field' => 'if_usage_module_data_in',
+                        'order' => 'DESC',
+                    ];
+                break;
+            }
+        break;
+
+        case 'if_usage_module_data_out':
+            switch ($sort) {
+                case 'up':
+                    $select_if_usage_module_data_out_up = $selected;
+                    $order = [
+                        'field' => 'if_usage_module_data_out',
+                        'order' => 'ASC',
+                    ];
+                break;
+
+                case 'down':
+                default:
+                    $select_if_usage_module_data_out_down = $selected;
+                    $order = [
+                        'field' => 'if_usage_module_data_out',
+                        'order' => 'DESC',
+                    ];
+                break;
+            }
+        break;
+
+        case 'if_last_data':
+            switch ($sort) {
+                case 'up':
+                    $select_if_last_data_up = $selected;
+                    $order = [
+                        'field' => 'if_last_data',
+                        'order' => 'ASC',
+                    ];
+                break;
+
+                case 'down':
+                default:
+                    $select_if_last_data_down = $selected;
+                    $order = [
+                        'field' => 'if_last_data',
+                        'order' => 'DESC',
+                    ];
+                break;
+            }
+        break;
+
+        default:
+            $select_if_agent_name = ($sec === 'view') ? true : false;
+            $select_if_name_up = ($sec === 'estado') ? true : false;
+            $select_if_name_down = false;
+            $select_if_speed_data_up = false;
+            $select_if_speed_data_down = false;
+            $select_if_in_octets_up = false;
+            $select_if_in_octets_down = false;
+            $select_if_out_octets_up = false;
+            $select_if_out_octets_down = false;
+            $select_if_usage_module_data_in_up = false;
+            $select_if_usage_module_data_in_down = false;
+            $select_if_usage_module_data_out_up = false;
+            $select_if_usage_module_data_out_down = false;
+            $select_if_last_data_up = false;
+            $select_if_last_data_down = false;
+        break;
+    }
+
+    if ($sec === 'estado') {
+        $agent_id = (int) get_parameter('id_agente', 0);
+
+        $sort_url_page = 'ver_agente';
+        $sec = 'estado';
+        $query_params = '&id_agente='.$agent_id.'&tab=interface';
+    } else {
+        $sort_url_page = 'interface_view';
+        $sec = 'view';
+        $query_params = '';
+    }
+
+    // Build URLs to sort the table.
+    $url_if_agent_name = 'index.php?sec='.$sec.'&sec2=operation/agentes/'.$sort_url_page.$query_params;
+    $url_if_name = 'index.php?sec='.$sec.'&sec2=operation/agentes/'.$sort_url_page.$query_params;
+    $url_if_speed = 'index.php?sec='.$sec.'&sec2=operation/agentes/'.$sort_url_page.$query_params;
+    $url_if_in_octets = 'index.php?sec='.$sec.'&sec2=operation/agentes/'.$sort_url_page.$query_params;
+    $url_if_out_octets = 'index.php?sec='.$sec.'&sec2=operation/agentes/'.$sort_url_page.$query_params;
+    $url_if_bandwidth_usage_in = 'index.php?sec='.$sec.'&sec2=operation/agentes/'.$sort_url_page.$query_params;
+    $url_if_bandwidth_usage_out = 'index.php?sec='.$sec.'&sec2=operation/agentes/'.$sort_url_page.$query_params;
+    $last_data = 'index.php?sec='.$sec.'&sec2=operation/agentes/'.$sort_url_page.$query_params;
+
+    $selected_agents_query_str = '';
+    $selected_interfaces_query_str = '';
+
+    foreach ($selected_agents as $key => $agent) {
+        $selected_agents_query_str .= '&selected_agents['.$key.']='.$agent;
+    }
+
+    foreach ($selected_interfaces as $key => $interface) {
+        $selected_interfaces_query_str .= '&selected_interfaces['.$key.']='.$interface;
+    }
+
+    $url_if_agent_name .= $selected_agents_query_str.'&'.$selected_interfaces_query_str;
+    $url_if_name .= $selected_agents_query_str.'&'.$selected_interfaces_query_str;
+    $url_if_speed .= $selected_agents_query_str.'&'.$selected_interfaces_query_str;
+    $url_if_in_octets .= $selected_agents_query_str.'&'.$selected_interfaces_query_str;
+    $url_if_out_octets .= $selected_agents_query_str.'&'.$selected_interfaces_query_str;
+    $url_if_bandwidth_usage_in .= $selected_agents_query_str.'&'.$selected_interfaces_query_str;
+    $url_if_bandwidth_usage_out .= $selected_agents_query_str.'&'.$selected_interfaces_query_str;
+    $last_data .= $selected_agents_query_str.'&'.$selected_interfaces_query_str;
+
+    $url_if_agent_name .= '&recursion='.$recursion;
+    $url_if_name .= '&recursion='.$recursion;
+    $url_if_speed .= '&recursion='.$recursion;
+    $url_if_in_octets .= '&recursion='.$recursion;
+    $url_if_out_octets .= '&recursion='.$recursion;
+    $url_if_bandwidth_usage_in .= '&recursion='.$recursion;
+    $url_if_bandwidth_usage_out .= '&recursion='.$recursion;
+    $last_data .= '&recursion='.$recursion;
+
+    $url_if_agent_name .= '&sort_field=if_agent_name&sort=';
+    $url_if_name .= '&sort_field=if_name&sort=';
+    $url_if_speed .= '&sort_field=if_speed_data&sort=';
+    $url_if_in_octets .= '&sort_field=if_in_octets&sort=';
+    $url_if_out_octets .= '&sort_field=if_out_octets&sort=';
+    $url_if_bandwidth_usage_in .= '&sort_field=if_usage_module_data_in&sort=';
+    $url_if_bandwidth_usage_out .= '&sort_field=if_usage_module_data_out&sort=';
+    $last_data .= '&sort_field=if_last_data&sort=';
+
+    if (empty($data) === false) {
+        $table = new StdClass();
+        $table->cellpadding = 0;
+        $table->cellspacing = 0;
+        $table->width = '100%';
+        $table->class = 'info_table';
+        $table->head = [];
+        $table->data = [];
+        $table->size = [];
+        $table->align = [];
+
+        $show_fields = explode(',', $config['status_monitor_fields']);
+
+        if ($sec === 'view') {
+            $table->head[0] = __('Agent');
+            $table->head[0] .= ui_get_sorting_arrows(
+                $url_if_agent_name.'up',
+                $url_if_agent_name.'down',
+                $select_if_agent_name_up,
+                $select_if_agent_name_down
+            );
+        }
+
+        $table->head[1] = __('IfName');
+        $table->head[1] .= ui_get_sorting_arrows(
+            $url_if_name.'up',
+            $url_if_name.'down',
+            $select_if_name_up,
+            $select_if_name_down
+        );
+
+        $table->head[2] = __('Status');
+
+        $table->head[3] = __('IfSpeed');
+        $table->head[3] .= ui_get_sorting_arrows(
+            $url_if_speed.'up',
+            $url_if_speed.'down',
+            $select_if_speed_data_up,
+            $select_if_speed_data_down
+        );
+
+        $table->head[4] = __('IfInOctets');
+        $table->head[4] .= ui_get_sorting_arrows(
+            $url_if_in_octets.'up',
+            $url_if_in_octets.'down',
+            $select_if_in_octets_up,
+            $select_if_in_octets_down
+        );
+
+        $table->head[5] = __('IfOutOctets');
+        $table->head[5] .= ui_get_sorting_arrows(
+            $url_if_out_octets.'up',
+            $url_if_out_octets.'down',
+            $select_if_out_octets_up,
+            $select_if_out_octets_down
+        );
+
+        $table->head[6] = __('% Bandwidth usage (in)');
+        $table->head[6] .= ui_get_sorting_arrows(
+            $url_if_bandwidth_usage_in.'up',
+            $url_if_bandwidth_usage_in.'down',
+            $select_if_usage_module_data_in_up,
+            $select_if_usage_module_data_in_down
+        );
+
+        $table->head[7] = __('% Bandwidth usage (out)');
+        $table->head[7] .= ui_get_sorting_arrows(
+            $url_if_bandwidth_usage_out.'up',
+            $url_if_bandwidth_usage_out.'down',
+            $select_if_usage_module_data_out_up,
+            $select_if_usage_module_data_out_down
+        );
+
+        $table->head[8] = __('Last data');
+        $table->head[8] .= ui_get_sorting_arrows(
+            $last_data.'up',
+            $last_data.'down',
+            $select_if_last_data_up,
+            $select_if_last_data_down
+        );
+
+        $loop_index = 0;
+        $table_data = [];
+
+        $interfaces_array = array_column($data, 'interfaces');
+        $agents = array_column($data, 'name');
+
+        $all_interfaces = [];
+
+        foreach ($data as $value) {
+            $agent_alias = agents_get_alias($value['name']);
+
+            foreach ($value['interfaces'] as $if_name => $interface) {
+                $interface['agent_id'] = $value['name'];
+                $interface['agent_alias'] = $agent_alias;
+                $interface['if_name'] = $if_name;
+                $all_interfaces[$if_name] = $interface;
+            }
+        }
+
+        if ($sec === 'estado'
+            && is_array($selected_interfaces) === true
+            && empty($selected_interfaces) === true
+        ) {
+            $filtered_interfaces = $all_interfaces;
+        } else {
+            // Filter interfaces array.
+            $filtered_interfaces = array_filter(
+                $all_interfaces,
+                function ($interface) use ($selected_interfaces) {
+                    return in_array(
+                        $interface['status_module_id'],
+                        $selected_interfaces
+                    ) === true;
+                }
+            );
+        }
+
+        $data = [];
+
+        foreach ($filtered_interfaces as $if_name => $agent_interfaces) {
+            // Get usage modules.
+            $usage_module_in = db_get_row(
+                'tagente_modulo',
+                'nombre',
+                $if_name.'_inUsage'
+            );
+            $usage_module_out = db_get_row(
+                'tagente_modulo',
+                'nombre',
+                $if_name.'_outUsage'
+            );
+
+            $usage_module_id_in = $usage_module_in['id_agente_modulo'];
+            $usage_module_id_out = $usage_module_out['id_agente_modulo'];
+            $usage_module_description = $usage_module_in['descripcion'];
+
+            // Get usage modules data.
+            $usage_module_data_in = modules_get_previous_data(
+                $usage_module_id_in,
+                time()
+            );
+
+            $usage_module_data_out = modules_get_previous_data(
+                $usage_module_id_out,
+                time()
+            );
+
+            // Extract ifSpeed from description of usage module.
+            $if_speed_str = strstr($usage_module_description, 'Speed:');
+            $if_speed_str = substr($if_speed_str, 0, -1);
+            $if_speed_str = explode(':', $if_speed_str)[1];
+
+            $matches = [];
+            preg_match_all('/\d+/', $if_speed_str, $matches);
+
+            $if_speed_value = $matches[0][0];
+
+            // Transform ifSpeed unit.
+            $divisor = 1000;
+            $counter = 0;
+            while ($if_speed_value >= $divisor) {
+                if ($if_speed_value >= $divisor) {
+                    $if_speed_value = ($if_speed_value / $divisor);
+                }
+
+                $counter++;
+            }
+
+            $if_speed_unit = 'bps';
+
+            switch ($counter) {
+                case 1:
+                    $if_speed_unit = 'Kbps';
+                break;
+
+                case 2:
+                    $if_speed_unit = 'Mbps';
+                break;
+
+                case 3:
+                    $if_speed_unit = 'Gbps';
+                break;
+
+                case 4:
+                    $if_speed_unit = 'Tbps';
+                break;
+
+                default:
+                    $if_speed_unit = 'bps';
+                break;
+            }
+
+            // Get in and out traffic.
+            $ifInOctets = modules_get_previous_data(
+                $agent_interfaces['traffic']['in'],
+                time()
+            );
+            $ifOutOctets = modules_get_previous_data(
+                $agent_interfaces['traffic']['out'],
+                time()
+            );
+
+            // Get last data timestamp.
+            $timestamps_array = array_merge(
+                array_column(ifInOctets, 'utimestamp'),
+                array_column(ifOutOctets, 'utimestamp')
+            );
+
+            if ($sec === 'view') {
+                $table_data[$loop_index]['if_agent_name'] = '<a href="index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&tab=main&id_agente='.$agent_interfaces['agent_id'].'">'.$agent_interfaces['agent_alias'].'</a>';
+            }
+
+            $table_data[$loop_index]['if_name'] = $agent_interfaces['if_name'];
+            $table_data[$loop_index]['if_status_image'] = $agent_interfaces['status_image'];
+            $table_data[$loop_index]['if_speed_data'] = ($if_speed_value === null) ? __('N/A') : $if_speed_value.' '.$if_speed_unit;
+            $table_data[$loop_index]['if_in_octets'] = ($ifInOctets['datos'] === null) ? __('N/A') : $ifInOctets['datos'];
+            $table_data[$loop_index]['if_out_octets'] = ($ifOutOctets['datos'] === null) ? __('N/A') : $ifOutOctets['datos'];
+            $table_data[$loop_index]['if_usage_module_data_in'] = ($usage_module_data_in['datos'] === null) ? __('N/A') : $usage_module_data_in['datos'];
+            $table_data[$loop_index]['if_usage_module_data_out'] = ($usage_module_data_out['datos'] === null) ? __('N/A') : $usage_module_data_out['datos'];
+            $table_data[$loop_index]['if_last_data'] = human_time_comparation(
+                max(
+                    $ifInOctets['utimestamp'],
+                    $ifOutOctets['utimestamp']
+                )
+            );
+
+            $loop_index++;
+        }
+
+        // Sort array of previously processed table values.
+        if ($sort === 'up') {
+            $res = usort(
+                $table_data,
+                function ($a, $b) use ($sort_field) {
+                    if ($a[$sort_field] > $b[$sort_field]) {
+                        return 1;
+                    } else {
+                        return -1;
+                    }
+                }
+            );
+        }
+
+        if ($sort === 'down') {
+            $res = usort(
+                $table_data,
+                function ($a, $b) use ($sort_field) {
+                    if ($b[$sort_field] > $a[$sort_field]) {
+                        return 1;
+                    } else {
+                        return -1;
+                    }
+                }
+            );
+        }
+
+        $sliced_table_data = array_slice(
+            $table_data,
+            $pagination_index,
+            $config['block_size']
+        );
+
+        foreach ($sliced_table_data as $value) {
+            array_push($table->data, array_values($value));
+        }
+
+        html_print_table($table);
+
+        if (count($selected_interfaces) > $config['block_size']) {
+            ui_pagination(count($selected_interfaces), false, $pagination_index, 0, false, 'offset', true, 'pagination-bottom');
+        }
+    } else {
+            ui_print_info_message(['no_close' => true, 'message' => __('No search parameters')]);
+    }
+}
diff --git a/pandora_console/operation/agentes/interface_view.php b/pandora_console/operation/agentes/interface_view.php
new file mode 100644
index 0000000000..a24788edd0
--- /dev/null
+++ b/pandora_console/operation/agentes/interface_view.php
@@ -0,0 +1,259 @@
+<?php
+/**
+ *  Pandora FMS - http://pandorafms.com
+ *  ==================================================
+ *  Copyright (c) 2005-2021 Artica Soluciones Tecnologicas
+ *  Please see http://pandorafms.org for full contribution list
+ *  This program is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU General Public License
+ *  as published by the Free Software Foundation; 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.
+ */
+
+global $config;
+
+check_login();
+
+if (check_acl($config['id_user'], 0, 'AR') === false) {
+    db_pandora_audit(
+        'ACL Violation',
+        'Trying to access Agent Management'
+    );
+    include 'general/noaccess.php';
+    return;
+}
+
+require_once 'interface_view.functions.php';
+require_once $config['homedir'].'/include/functions_agents.php';
+
+$recursion = get_parameter_switch('recursion', false);
+if ($recursion === false) {
+    $recursion = get_parameter('recursion', false);
+}
+
+$selected_agents = get_parameter('selected_agents', []);
+$selected_interfaces = get_parameter('selected_interfaces', []);
+$refr = (int) get_parameter('refr', 0);
+$offset = (int) get_parameter('offset', 0);
+$sort_field = get_parameter('sort_field');
+$sort = get_parameter('sort', 'none');
+$autosearch = false;
+$sec = (string) get_parameter('sec', 'view');
+$agent_id = (int) get_parameter('id_agente', 0);
+
+if ($sec === 'view') {
+    ui_print_page_header(
+        __('Interface view').$subpage,
+        '',
+        false,
+        '',
+        true
+    );
+}
+
+$agent_filter = ['id_agente' => $agent_id];
+
+// Autosearch if search parameters are different from those by default.
+if (empty($selected_agents) === false || empty($selected_interfaces) === false
+    || $sort_field !== '' || $sort !== 'none' || $sec === 'estado'
+) {
+    $autosearch = true;
+}
+
+print_filters($sec);
+
+$result = false;
+
+if ($autosearch === true) {
+    if ($sec === 'estado') {
+        $result = agents_get_network_interfaces(false, $agent_filter);
+    } else {
+        $result = agents_get_network_interfaces($selected_agents);
+    }
+
+    if ($result === false) {
+        $result = [];
+    } else {
+        ui_pagination(
+            count($selected_interfaces),
+            false,
+            $offset,
+            0,
+            false,
+            'offset',
+            true
+        );
+    }
+}
+
+print_table(
+    $result,
+    $selected_agents,
+    $selected_interfaces,
+    $sort_field,
+    $sort,
+    $offset,
+    $sec
+);
+
+?>
+<script type="text/javascript">
+
+$(document).ready(function() {
+    var group_id = $("#group_id").val();
+    load_agents_selector(group_id);
+
+    var sec = "<?php echo $sec; ?>";
+    var agent_id = "<?php echo $agent_id; ?>";
+
+    if (sec === 'estado' && agent_id > 0) {
+        load_agent_interfaces_selector([agent_id]);
+    }
+});
+
+
+$('#moduletype').click(function() {
+    jQuery.get (
+        "ajax.php",
+        {
+            "page": "general/subselect_data_module",
+            "module":$('#moduletype').val()
+        },
+        function (data, status) {
+            $("#datatypetittle").show ();
+            $("#datatypebox").hide ()
+            .empty ()
+            .append (data)
+            .show ();
+        },
+        "html"
+    );
+
+    return false;
+});
+
+
+function toggle_full_value(id) {
+    text = $('#hidden_value_module_' + id).html();
+    old_text = $("#value_module_text_" + id).html();
+    
+    $("#hidden_value_module_" + id).html(old_text);
+    
+    $("#value_module_text_" + id).html(text);
+}
+
+function load_agents_selector(group) {
+    
+    jQuery.post ("ajax.php",
+        {
+            "page" : "operation/agentes/ver_agente",
+            "get_agents_group_json" : 1,
+            "id_group" : group,
+            "privilege" : "AW",
+            "keys_prefix" : "_",
+            "recursion" : $('#checkbox-recursion').is(':checked')
+        },
+        function (data, status) {
+            $("#selected_agents").html('');
+            jQuery.each (data, function (id, value) {
+                id = id.substring(1);
+                
+                option = $("<option></option>")
+                    .attr ("value", value["id_agente"])
+                    .html (value["alias"]);
+                $("#id_agents").append (option);
+                $("#selected_agents").append (option);
+            });
+
+            var selected_agents = "<?php echo implode(',', $selected_agents); ?>";
+
+            $.each(selected_agents.split(","), function(i,e) {
+                $("#selected_agents option[value='" + e + "']").prop(
+                    "selected",
+                    true
+                );
+            });
+
+            load_agent_interfaces_selector($("#selected_agents").val());
+        },
+        "json"
+    );
+}
+
+$("#group_id").change(function() {
+    load_agents_selector(this.value);
+});
+
+$("#checkbox-recursion").change (function () {
+    jQuery.post ("ajax.php",
+        {"page" : "operation/agentes/ver_agente",
+            "get_agents_group_json" : 1,
+            "id_group" :     $("#group_id").val(),
+            "privilege" : "AW",
+            "keys_prefix" : "_",
+            "recursion" : $('#checkbox-recursion').is(':checked')
+        },
+        function (data, status) {
+            $("#selected_agents").html('');
+            $("#module").html('');
+            jQuery.each (data, function (id, value) {
+                id = id.substring(1);
+                
+                option = $("<option></option>")
+                    .attr ("value", value["id_agente"])
+                    .html (value["alias"]);
+                $("#id_agents").append (option);
+                $("#selected_agents").append (option);
+            });
+        },
+        "json"
+    );
+});
+
+$("#selected_agents").click (function() {
+    var selected_agents = $(this).val();
+
+    load_agent_interfaces_selector(selected_agents);
+});
+
+function load_agent_interfaces_selector(selected_agents) {
+    $("#selected_interfaces").empty();
+    jQuery.post ("ajax.php",
+        {
+            "page" : "include/ajax/agent",
+            "get_agents_interfaces" : 1,
+            "id_agents" : selected_agents
+        },
+        function (data, status) {
+            $("#module").html('');
+
+            if (data) {
+                Object.values(data).forEach(function(obj) {
+                    for (const [key, value] of Object.entries(obj.interfaces)) {
+                        option = $("<option></option>")
+                        .attr ("value", value.status_module_id)
+                        .html (key + ' (' + obj.agent_alias + ')');
+                    $("#selected_interfaces").append(option);
+                    }
+                });
+            }
+
+            var selected_interfaces =
+                "<?php echo implode(',', $selected_interfaces); ?>";
+
+            $.each(selected_interfaces.split(","), function(i,e) {
+                $("#selected_interfaces option[value='" + e + "']").prop(
+                    "selected",
+                    true
+                );
+            });
+
+        },
+        "json"
+    );
+}
+
+</script>
diff --git a/pandora_console/operation/agentes/ver_agente.php b/pandora_console/operation/agentes/ver_agente.php
index 01a21bf19d..b220362a37 100644
--- a/pandora_console/operation/agentes/ver_agente.php
+++ b/pandora_console/operation/agentes/ver_agente.php
@@ -1231,7 +1231,30 @@ if ($tab == 'main') {
     $maintab['active'] = false;
 }
 
+// Interfaces tab.
+$agent_interfaces = agents_get_network_interfaces(
+    false,
+    ['id_agente' => $id_agente]
+);
 
+$agent_interfaces_count = count($agent_interfaces[$id_agente]['interfaces']);
+
+if ($agent_interfaces_count > 0) {
+    $interfacetab['text'] = '<a href="index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente='.$id_agente.'&tab=interface">'.html_print_image(
+        'images/link.png',
+        true,
+        [
+            'title' => __('Interfaces'),
+            'class' => 'invert_filter',
+        ]
+    ).'</a>';
+
+    if ($tab == 'interface') {
+        $interfacetab['active'] = true;
+    } else {
+        $interfacetab['active'] = false;
+    }
+}
 
 // Alert tab.
 $alerttab['text'] = '<a href="index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente='.$id_agente.'&tab=alert">'.html_print_image(
@@ -1512,6 +1535,7 @@ $onheader = [
     'manage'             => $managetab,
     'main'               => $maintab,
     'alert'              => $alerttab,
+    'interface'          => $interfacetab,
     'inventory'          => $inventorytab,
     'collection'         => $collectiontab,
     'gis'                => $gistab,
@@ -1630,6 +1654,10 @@ switch ($tab) {
         $tab_name = '';
     break;
 
+    case 'interface':
+        $tab_name = 'Interfaces';
+    break;
+
     case 'alert':
         $tab_name = 'Alerts';
     break;
@@ -1760,6 +1788,10 @@ switch ($tab) {
         include 'datos_agente.php';
     break;
 
+    case 'interface':
+        include 'interface_view.php';
+    break;
+
     case 'alert':
         include 'alerts_status.php';
     break;
diff --git a/pandora_console/operation/menu.php b/pandora_console/operation/menu.php
index d43829b753..9013cd7c32 100644
--- a/pandora_console/operation/menu.php
+++ b/pandora_console/operation/menu.php
@@ -58,6 +58,9 @@ if (check_acl($config['id_user'], 0, 'AR')) {
     $sub2['operation/agentes/status_monitor']['text'] = __('Monitor detail');
     $sub2['operation/agentes/status_monitor']['refr'] = 0;
 
+    $sub2['operation/agentes/interface_view']['text'] = __('Interface view');
+    $sub2['operation/agentes/interface_view']['refr'] = 0;
+
     enterprise_hook('tag_view_submenu');
 
     $sub2['operation/agentes/alerts_status']['text'] = __('Alert detail');

From 3ab970ced9a2e49a65ecb6654c9a3f62398cc968 Mon Sep 17 00:00:00 2001
From: marcos <marcos.alconada@artica.es>
Date: Tue, 20 Apr 2021 12:41:21 +0200
Subject: [PATCH 06/93] fixed visual error on tm

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

diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index 740e5c6053..2e9b46cc8d 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -8500,3 +8500,6 @@ div.stat-win-spinner img {
 .font_11pt {
   font-size: 11pt;
 }
+.align-left-important {
+  text-align: left !important;
+}

From b922de7a8ea46528ae53eb5def50cb1adf4c18eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Gonz=C3=A1lez?= <jose.gonzalez@pandorafms.com>
Date: Thu, 22 Apr 2021 17:10:59 +0200
Subject: [PATCH 07/93] Fixed visual issues

---
 pandora_console/include/styles/agent_alerts.css | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pandora_console/include/styles/agent_alerts.css b/pandora_console/include/styles/agent_alerts.css
index 7a140a1704..8726228b33 100644
--- a/pandora_console/include/styles/agent_alerts.css
+++ b/pandora_console/include/styles/agent_alerts.css
@@ -26,6 +26,10 @@
   justify-content: center;
 }
 
+#img-full-screen {
+  width: 12em;
+}
+
 #full_screen_refresh_box,
 #slc-refresh-rate,
 #img-full-screen {
@@ -45,6 +49,7 @@
 
 .agent_alerts_header_pure {
   position: absolute;
+  z-index: 500;
 }
 
 .agents_alerts_header form > ul > li {

From 1d472ec4806b47387a551d3673d5a77b864cb4ee Mon Sep 17 00:00:00 2001
From: Daniel Maya <daniel.maya@artica.es>
Date: Thu, 29 Apr 2021 08:55:16 +0200
Subject: [PATCH 08/93] #7455 Fixed check_process

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

diff --git a/pandora_console/godmode/servers/modificar_server.php b/pandora_console/godmode/servers/modificar_server.php
index 90c9130d4d..d1ac51b279 100644
--- a/pandora_console/godmode/servers/modificar_server.php
+++ b/pandora_console/godmode/servers/modificar_server.php
@@ -386,10 +386,10 @@ function check_process (id_server) {
         parameters,
         function (data) {
             if (data['correct']) {
-                $("#check_exec_server img").attr("src", <?php echo 'images/dot_green.png'; ?>);
+                $("#check_exec_server img").attr("src", "images/dot_green.png");
             }
             else {
-                $("#check_exec_server img").attr("src", <?php echo 'images/dot_red.png'; ?>);
+                $("#check_exec_server img").attr("src", "images/dot_red.png");
                 $("#check_error_message").empty();
                 $("#check_error_message").append("<span>" + data['message'] + "</span>");
             }

From 4aea645735fb45c3eec63a6fe6409a695be14e8d Mon Sep 17 00:00:00 2001
From: Calvo <luis.calvo@artica.es>
Date: Thu, 29 Apr 2021 11:15:20 +0200
Subject: [PATCH 09/93] Fixed visual bug on user creation error

---
 pandora_console/godmode/users/configure_user.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pandora_console/godmode/users/configure_user.php b/pandora_console/godmode/users/configure_user.php
index 6948368eb1..31ca0897d0 100644
--- a/pandora_console/godmode/users/configure_user.php
+++ b/pandora_console/godmode/users/configure_user.php
@@ -439,6 +439,12 @@ if ($create_user) {
 
         if ($result) {
             $res = save_pass_history($id, $password_new);
+        } else {
+            $is_err = true;
+            $user_info = $values;
+            $password_new = '';
+            $password_confirm = '';
+            $new_user = true;
         }
 
         db_pandora_audit(

From 588e06d35721f25cddabaf5403b1904d40b6b675 Mon Sep 17 00:00:00 2001
From: Daniel Maya <daniel.maya@artica.es>
Date: Thu, 29 Apr 2021 12:45:35 +0200
Subject: [PATCH 10/93] #7344 fixed select

---
 pandora_console/include/styles/meta_dashboards.css | 8 ++++++++
 pandora_console/views/dashboard/header.php         | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/pandora_console/include/styles/meta_dashboards.css b/pandora_console/include/styles/meta_dashboards.css
index 1b24b3bce5..d2d7f902a3 100644
--- a/pandora_console/include/styles/meta_dashboards.css
+++ b/pandora_console/include/styles/meta_dashboards.css
@@ -22,3 +22,11 @@ div#page {
   right: 50px;
   top: 20px;
 }
+
+.select-dashboard-width {
+  width: 110%;
+}
+
+#menu_tab li.nomn form#form-select-dashboard {
+  margin-top: 0px !important;
+}
diff --git a/pandora_console/views/dashboard/header.php b/pandora_console/views/dashboard/header.php
index 64626056dd..c828740565 100644
--- a/pandora_console/views/dashboard/header.php
+++ b/pandora_console/views/dashboard/header.php
@@ -189,7 +189,7 @@ $combo_dashboard['text'] .= html_print_select(
     true,
     false,
     true,
-    '',
+    'select-dashboard-width',
     false,
     ''
 );

From 9ab027b2868ae6d9476a42bf692f431c63825dd1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Gonz=C3=A1lez?= <jose.gonzalez@pandorafms.com>
Date: Thu, 29 Apr 2021 13:28:03 +0200
Subject: [PATCH 11/93] WIP: Upload

---
 pandora_console/extensions/agents_modules.php | 50 +++++++---
 pandora_console/extensions/module_groups.php  | 16 +++-
 .../extensions/realtime_graphs.php            | 15 ++-
 .../extensions/resource_registration.php      |  9 +-
 .../general/first_task/cluster_builder.php    | 14 ++-
 .../godmode/agentes/modificar_agente.php      | 53 ++++++++---
 .../godmode/agentes/module_manager.php        |  1 -
 .../agentes/module_manager_editor_common.php  |  7 +-
 .../godmode/reporting/map_builder.php         | 62 ++++++++----
 .../reporting/visual_console_favorite.php     | 65 +++++++++----
 .../godmode/snmpconsole/snmp_filters.php      | 27 +++++-
 .../snmpconsole/snmp_trap_generator.php       | 17 +++-
 .../include/class/AgentsAlerts.class.php      | 39 +++-----
 pandora_console/include/functions_ui.php      | 95 +++++++++++++++++++
 .../operation/agentes/alerts_status.php       | 19 +++-
 .../operation/agentes/estado_agente.php       | 54 ++++++++---
 .../operation/agentes/group_view.php          | 56 ++++++++---
 .../operation/agentes/status_monitor.php      | 60 ++++++++----
 .../operation/agentes/tactical.php            | 55 ++++++++---
 .../operation/dashboard/dashboard.php         |  4 +-
 .../operation/snmpconsole/snmp_browser.php    | 22 +++--
 .../snmpconsole/snmp_mib_uploader.php         | 61 +++++++++---
 22 files changed, 598 insertions(+), 203 deletions(-)

diff --git a/pandora_console/extensions/agents_modules.php b/pandora_console/extensions/agents_modules.php
index 0abde09010..f93dec02a4 100644
--- a/pandora_console/extensions/agents_modules.php
+++ b/pandora_console/extensions/agents_modules.php
@@ -1,16 +1,29 @@
 <?php
 /**
- *  Pandora FMS - http://pandorafms.com
- *  ==================================================
- *  Copyright (c) 2005-2021 Artica Soluciones Tecnologicas
- *  Please see http://pandorafms.org for full contribution list
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU General Public License
- *  as published by the Free Software Foundation; 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.
+ * Agents/Modules Monitoring view.
+ *
+ * @category   Operations
+ * @package    Pandora FMS
+ * @subpackage Opensource
+ * @version    1.0.0
+ * @license    See below
+ *
+ *    ______                 ___                    _______ _______ ________
+ *   |   __ \.-----.--.--.--|  |.-----.----.-----. |    ___|   |   |     __|
+ *  |    __/|  _  |     |  _  ||  _  |   _|  _  | |    ___|       |__     |
+ * |___|   |___._|__|__|_____||_____|__| |___._| |___|   |__|_|__|_______|
+ *
+ * ============================================================================
+ * Copyright (c) 2005-2021 Artica Soluciones Tecnologicas
+ * Please see http://pandorafms.org for full contribution list
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation for version 2.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * ============================================================================
  */
 
 // Begin.
@@ -435,14 +448,25 @@ function mainAgentsModules()
 
     if ($config['pure'] == 0) {
         // Header.
-        ui_print_page_header(
+        ui_print_standard_header(
             __('Agents/Modules'),
             'images/module.png',
             false,
             '',
             false,
-            $updated_time
+            (array) $updated_time,
+            [
+                [
+                    'link'  => '',
+                    'label' => __('Monitoring'),
+                ],
+                [
+                    'link'  => '',
+                    'label' => __('Views'),
+                ],
+            ]
         );
+
         echo '<table class="w100p">';
         echo '<tr>';
         echo "<td> <span class='float-right'>".$fullscreen['text'].'</span> </td>';
diff --git a/pandora_console/extensions/module_groups.php b/pandora_console/extensions/module_groups.php
index 3b9670a8e0..4e1f0e791c 100644
--- a/pandora_console/extensions/module_groups.php
+++ b/pandora_console/extensions/module_groups.php
@@ -196,7 +196,6 @@ function mainModuleGroups()
                     ON ta.id_agente = tam.id_agente
                 WHERE ta.disabled = 0
                     AND tam.disabled = 0
-                    AND tam.id_modulo <> 0
                     AND tam.delete_pending = 0
                     AND ta.id_grupo IN (%s)
                 GROUP BY tam.id_agente_modulo
@@ -246,13 +245,24 @@ function mainModuleGroups()
         $array_data[$value['id_grupo']][$value['id_mg']] = $value;
     }
 
-    ui_print_page_header(
+    // Header.
+    ui_print_standard_header(
         __('Combined table of agent group and module group'),
         'images/module_group.png',
         false,
         '',
         false,
-        ''
+        [],
+        [
+            [
+                'link'  => '',
+                'label' => __('Monitoring'),
+            ],
+            [
+                'link'  => '',
+                'label' => __('Views'),
+            ],
+        ]
     );
 
     echo "<table cellpadding='4' cellspacing='4' class='databox filters bolder margin-bottom-10' width='100%'>
diff --git a/pandora_console/extensions/realtime_graphs.php b/pandora_console/extensions/realtime_graphs.php
index 86fcfc4f0e..51d987ae25 100644
--- a/pandora_console/extensions/realtime_graphs.php
+++ b/pandora_console/extensions/realtime_graphs.php
@@ -49,13 +49,24 @@ function pandora_realtime_graphs()
 
     $hide_header = get_parameter('hide_header', 0);
     if ($hide_header === 0) {
-        ui_print_page_header(
+        // Header.
+        ui_print_standard_header(
             __('Realtime graphs'),
             'images/extensions.png',
             false,
             'real_time_view',
             false,
-            $onheader
+            $onheader,
+            [
+                [
+                    'link'  => '',
+                    'label' => __('Monitoring'),
+                ],
+                [
+                    'link'  => '',
+                    'label' => __('Views'),
+                ],
+            ]
         );
     }
 
diff --git a/pandora_console/extensions/resource_registration.php b/pandora_console/extensions/resource_registration.php
index 950f4e2b81..2f904dbf9f 100755
--- a/pandora_console/extensions/resource_registration.php
+++ b/pandora_console/extensions/resource_registration.php
@@ -1096,13 +1096,8 @@ function resource_registration_extension_main()
     }
 
     $xml = simplexml_load_file($_FILES['resource_upload']['tmp_name'], null, LIBXML_NOCDATA);
-    if ($xml === false) {
-        ui_print_error_message(
-            __('Error uploading resource. Check if the selected file is a valid resource template in .ptr format')
-        );
-    } else {
-        process_upload_xml($xml);
-    }
+
+    process_upload_xml($xml);
 }
 
 
diff --git a/pandora_console/general/first_task/cluster_builder.php b/pandora_console/general/first_task/cluster_builder.php
index 08ea618cce..157bdce0d7 100644
--- a/pandora_console/general/first_task/cluster_builder.php
+++ b/pandora_console/general/first_task/cluster_builder.php
@@ -24,12 +24,20 @@ if (! check_acl($config['id_user'], 0, 'AR') && ! check_acl($config['id_user'],
     return;
 }
 
-\ui_print_page_header(
-    __('Monitoring').' &raquo; '.__('Clusters'),
+// Header.
+ui_print_standard_header(
+    __('Clusters'),
     'images/chart.png',
     false,
     '',
-    false
+    false,
+    [],
+    [
+        [
+            'link'  => '',
+            'label' => __('Monitoring'),
+        ],
+    ]
 );
 
 ui_require_css_file('first_task');
diff --git a/pandora_console/godmode/agentes/modificar_agente.php b/pandora_console/godmode/agentes/modificar_agente.php
index 6d9516bad7..807635bd80 100644
--- a/pandora_console/godmode/agentes/modificar_agente.php
+++ b/pandora_console/godmode/agentes/modificar_agente.php
@@ -1,17 +1,32 @@
 <?php
+/**
+ * Agents defined view.
+ *
+ * @category   Manage Agents.
+ * @package    Pandora FMS
+ * @subpackage Resources.
+ * @version    1.0.0
+ * @license    See below
+ *
+ *    ______                 ___                    _______ _______ ________
+ *   |   __ \.-----.--.--.--|  |.-----.----.-----. |    ___|   |   |     __|
+ *  |    __/|  _  |     |  _  ||  _  |   _|  _  | |    ___|       |__     |
+ * |___|   |___._|__|__|_____||_____|__| |___._| |___|   |__|_|__|_______|
+ *
+ * ============================================================================
+ * Copyright (c) 2005-2021 Artica Soluciones Tecnologicas
+ * Please see http://pandorafms.org for full contribution list
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation for version 2.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * ============================================================================
+ */
 
-// Pandora FMS - http://pandorafms.com
-// ==================================================
-// Copyright (c) 2005-2021 Artica Soluciones Tecnologicas
-// Please see http://pandorafms.org for full contribution list
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation 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.
-// Load global vars
+// Begin.
 check_login();
 
 // Take some parameters (GET).
@@ -76,13 +91,23 @@ $viewtab['active'] = false;
 $onheader = ['view' => $viewtab];
 
 // Header.
-ui_print_page_header(
+ui_print_standard_header(
     __('Agents defined in %s', get_product_name()),
     'images/agent.png',
     false,
     '',
     true,
-    $onheader
+    $onheader,
+    [
+        [
+            'link'  => '',
+            'label' => __('Resources'),
+        ],
+        [
+            'link'  => '',
+            'label' => __('Manage agents'),
+        ],
+    ]
 );
 
 if (is_central_policies_on_node()) {
diff --git a/pandora_console/godmode/agentes/module_manager.php b/pandora_console/godmode/agentes/module_manager.php
index d8dd0eeef2..91c6395b96 100644
--- a/pandora_console/godmode/agentes/module_manager.php
+++ b/pandora_console/godmode/agentes/module_manager.php
@@ -1072,7 +1072,6 @@ foreach ($modules as $module) {
             [
                 'alt'   => __('Enable module'),
                 'title' => __('Enable module'),
-                'class' => 'invert_filter_important',
             ]
         ).'</a>';
     } else {
diff --git a/pandora_console/godmode/agentes/module_manager_editor_common.php b/pandora_console/godmode/agentes/module_manager_editor_common.php
index 1a4577c4ee..7e9f29f2eb 100644
--- a/pandora_console/godmode/agentes/module_manager_editor_common.php
+++ b/pandora_console/godmode/agentes/module_manager_editor_common.php
@@ -115,12 +115,7 @@ function add_component_selection($id_network_component_type)
         '',
         '---'.__('Manual setup').'---',
         0,
-        true,
-        false,
-        true,
-        '',
-        false,
-        'width: 460px; '
+        true
     );
     $data[1] .= '</span>';
     $data[1] .= ' <span id="component_loading" class="invisible">';
diff --git a/pandora_console/godmode/reporting/map_builder.php b/pandora_console/godmode/reporting/map_builder.php
index 1dd607c57c..192c6be218 100644
--- a/pandora_console/godmode/reporting/map_builder.php
+++ b/pandora_console/godmode/reporting/map_builder.php
@@ -1,16 +1,32 @@
 <?php
+/**
+ * Map builder console.
+ *
+ * @category   Topology maps
+ * @package    Pandora FMS
+ * @subpackage Visual consoles
+ * @version    1.0.0
+ * @license    See below
+ *
+ *    ______                 ___                    _______ _______ ________
+ *   |   __ \.-----.--.--.--|  |.-----.----.-----. |    ___|   |   |     __|
+ *  |    __/|  _  |     |  _  ||  _  |   _|  _  | |    ___|       |__     |
+ * |___|   |___._|__|__|_____||_____|__| |___._| |___|   |__|_|__|_______|
+ *
+ * ============================================================================
+ * Copyright (c) 2007-2021 Artica Soluciones Tecnologicas
+ * Please see http://pandorafms.org for full contribution list
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation for version 2.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * ============================================================================
+ */
 
-// Pandora FMS - http://pandorafms.com
-// ==================================================
-// Copyright (c) 2005-2021 Artica Soluciones Tecnologicas
-// Please see http://pandorafms.org for full contribution list
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation for version 2.
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
+// Begin.
 global $config;
 
 require_once $config['homedir'].'/include/functions_visual_map.php';
@@ -32,9 +48,7 @@ if (!$vconsoles_read && !$vconsoles_write && !$vconsoles_manage) {
     exit;
 }
 
-
-
-if (!$is_metaconsole) {
+if ($is_metaconsole === false) {
     $url_visual_console                 = 'index.php?sec=network&sec2=godmode/reporting/map_builder';
     $url_visual_console_favorite        = 'index.php?sec=network&sec2=godmode/reporting/visual_console_favorite';
     $url_visual_console_template        = 'index.php?sec=network&sec2=enterprise/godmode/reporting/visual_console_template';
@@ -102,14 +116,24 @@ if ($is_enterprise !== ENTERPRISE_NOT_HOOK && $vconsoles_manage) {
     ];
 }
 
-if (!$is_metaconsole) {
-    ui_print_page_header(
-        __('Reporting').' &raquo; '.__('Visual Console'),
+if ($is_metaconsole === false) {
+    ui_print_standard_header(
+        __('Visual Favourite List'),
         'images/op_reporting.png',
         false,
         '',
-        false,
-        $buttons
+        true,
+        $buttons,
+        [
+            [
+                'link'  => '',
+                'label' => __('Topology maps'),
+            ],
+            [
+                'link'  => '',
+                'label' => __('Visual console'),
+            ],
+        ]
     );
 } else {
     ui_meta_print_header(
diff --git a/pandora_console/godmode/reporting/visual_console_favorite.php b/pandora_console/godmode/reporting/visual_console_favorite.php
index 8bd58abf64..16b5978dd2 100644
--- a/pandora_console/godmode/reporting/visual_console_favorite.php
+++ b/pandora_console/godmode/reporting/visual_console_favorite.php
@@ -1,19 +1,38 @@
 <?php
-// Pandora FMS - http://pandorafms.com
-// ==================================================
-// Copyright (c) 2005-2021 Artica Soluciones Tecnologicas
-// Please see http://pandorafms.org for full contribution list
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation for version 2.
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
+/**
+ * Favorite visual console.
+ *
+ * @category   Topology maps
+ * @package    Pandora FMS
+ * @subpackage Visual consoles
+ * @version    1.0.0
+ * @license    See below
+ *
+ *    ______                 ___                    _______ _______ ________
+ *   |   __ \.-----.--.--.--|  |.-----.----.-----. |    ___|   |   |     __|
+ *  |    __/|  _  |     |  _  ||  _  |   _|  _  | |    ___|       |__     |
+ * |___|   |___._|__|__|_____||_____|__| |___._| |___|   |__|_|__|_______|
+ *
+ * ============================================================================
+ * Copyright (c) 2007-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.
+ * ============================================================================
+ */
+
+// Begin.
 global $config;
 
 require_once $config['homedir'].'/include/functions_visual_map.php';
-
+// Breadcrumb.
+require_once $config['homedir'].'/include/class/HTML.class.php';
+ui_require_css_file('discovery');
 // ACL for the general permission
 $vconsoles_read   = check_acl($config['id_user'], 0, 'VR');
 $vconsoles_write  = check_acl($config['id_user'], 0, 'VW');
@@ -32,7 +51,7 @@ if (!$vconsoles_read && !$vconsoles_write && !$vconsoles_manage) {
 }
 
 
-if (!$is_metaconsole) {
+if ($is_metaconsole === false) {
     $url_visual_console                 = 'index.php?sec=network&sec2=godmode/reporting/map_builder';
     $url_visual_console_favorite        = 'index.php?sec=network&sec2=godmode/reporting/visual_console_favorite';
     $url_visual_console_template        = 'index.php?sec=network&sec2=enterprise/godmode/reporting/visual_console_template';
@@ -94,14 +113,24 @@ if ($is_enterprise !== ENTERPRISE_NOT_HOOK && $vconsoles_manage) {
     ];
 }
 
-if (!$is_metaconsole) {
-    ui_print_page_header(
-        __('Reporting').' &raquo; '.__('Visual Favourite Console'),
+if ($is_metaconsole === false) {
+    ui_print_standard_header(
+        __('Favourite Visual Console'),
         'images/op_reporting.png',
         false,
         '',
-        false,
-        $buttons
+        true,
+        $buttons,
+        [
+            [
+                'link'  => '',
+                'label' => __('Topology maps'),
+            ],
+            [
+                'link'  => '',
+                'label' => __('Visual console'),
+            ],
+        ]
     );
 } else {
     ui_meta_print_header(
diff --git a/pandora_console/godmode/snmpconsole/snmp_filters.php b/pandora_console/godmode/snmpconsole/snmp_filters.php
index 8afefcf34f..821d7a7c6e 100644
--- a/pandora_console/godmode/snmpconsole/snmp_filters.php
+++ b/pandora_console/godmode/snmpconsole/snmp_filters.php
@@ -32,15 +32,36 @@ $index_post = (int) get_parameter('index_post', 0);
 // Create/update header
 if ($edit_filter > -2) {
     if ($edit_filter > -1) {
-        ui_print_page_header(__('SNMP Console').' &raquo; '.__('Update filter'), 'images/op_snmp.png', false, '', false);
+        $activeFilterCaption = ' &raquo; '.__('Update filter');
     } else {
-        ui_print_page_header(__('SNMP Console').' &raquo; '.__('Create filter'), 'images/op_snmp.png', false, '', false);
+        $activeFilterCaption = ' &raquo; '.__('Create filter');
     }
 } else {
     // Overview header
-    ui_print_page_header(__('SNMP Console').' &raquo; '.__('Filter overview'), 'images/op_snmp.png', false, '', false);
+    $activeFilterCaption = ' &raquo; '.__('Filter overview');
 }
 
+// Header.
+ui_print_standard_header(
+    __('SNMP Console').$activeFilterCaption,
+    'images/op_snmp.png',
+    false,
+    '',
+    false,
+    [],
+    [
+        [
+            'link'  => '',
+            'label' => __('Monitoring'),
+        ],
+        [
+            'link'  => '',
+            'label' => __('SMNP'),
+        ],
+    ]
+);
+
+
 // Create/update filter
 if ($update_filter > -2) {
     // UPDATE
diff --git a/pandora_console/godmode/snmpconsole/snmp_trap_generator.php b/pandora_console/godmode/snmpconsole/snmp_trap_generator.php
index 29137f1382..15173eee4c 100755
--- a/pandora_console/godmode/snmpconsole/snmp_trap_generator.php
+++ b/pandora_console/godmode/snmpconsole/snmp_trap_generator.php
@@ -33,14 +33,27 @@ $snmp_type = (int) get_parameter('snmp_type', 0);
 $snmp_value = (string) get_parameter('snmp_value', '');
 $generate_trap = (bool) get_parameter('generate_trap', 0);
 
-ui_print_page_header(
+// Header.
+ui_print_standard_header(
     __('SNMP Trap generator'),
     'images/op_snmp.png',
     false,
     'snmp_trap_generator_view',
-    false
+    false,
+    [],
+    [
+        [
+            'link'  => '',
+            'label' => __('Monitoring'),
+        ],
+        [
+            'link'  => '',
+            'label' => __('SMNP'),
+        ],
+    ]
 );
 
+
 if ($generate_trap) {
     $result = true;
     $error = '';
diff --git a/pandora_console/include/class/AgentsAlerts.class.php b/pandora_console/include/class/AgentsAlerts.class.php
index f566e3a4d9..53e531719c 100644
--- a/pandora_console/include/class/AgentsAlerts.class.php
+++ b/pandora_console/include/class/AgentsAlerts.class.php
@@ -729,37 +729,24 @@ class AgentsAlerts extends HTML
     public function loadHeader()
     {
         if ($this->pure == 0) {
-            // Breadcrums.
-            $this->setBreadcrum([]);
-
-            $this->prepareBreadcrum(
-                [
-                    [
-                        'link'     => '',
-                        'label'    => __('Monitoring'),
-                        'selected' => false,
-                    ],
-                    [
-                        'link'     => '',
-                        'label'    => __('Views'),
-                        'selected' => true,
-                    ],
-                ],
-                true
-            );
-
-            ui_print_page_header(
+            // Header.
+            ui_print_standard_header(
                 __('Agents/Alerts'),
                 '',
                 false,
                 '',
-                true,
-                '',
                 false,
-                '',
-                GENERIC_SIZE_TEXT,
-                '',
-                $this->printHeader(true)
+                [],
+                [
+                    [
+                        'link'  => '',
+                        'label' => __('Monitoring'),
+                    ],
+                    [
+                        'link'  => '',
+                        'label' => __('Views'),
+                    ],
+                ]
             );
         }
 
diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index 2e2e4b5958..e3281e877d 100755
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -35,6 +35,8 @@ if (isset($config['homedir'])) {
     include_once $config['homedir'].'/include/functions_groups.php';
     include_once $config['homedir'].'/include/functions_users.php';
     include_once $config['homedir'].'/include/functions_html.php';
+    // For standard breadcrumbs.
+    ui_require_css_file('discovery');
 }
 
 
@@ -4296,6 +4298,99 @@ function ui_get_full_url($url='', $no_proxy=false, $add_name_php_file=false, $me
 }
 
 
+/**
+ * Generates the Pandora 75x Standard views header.
+ * This function should be the standard for
+ * generating the headers of all PFMS views.
+ *
+ * @param string  $title       The title of this view.
+ * @param string  $icon        Icon for show.
+ * @param boolean $return      If true, the string with the formed header is returned.
+ * @param string  $help        String for attach at end a link for help.
+ * @param boolean $godmode     If false, it will created like operation mode.
+ * @param array   $options     Tabs allowed
+ * @param array   $breadcrumbs Breadcrumbs with the walk.
+ *
+ *  EXAMPLE:
+ *  ```
+ *   $buttons['option_1'] = [
+ *     'active' => false,
+ *     'text'   => '<a href="'.$url.'">'.html_print_image(
+ *         'images/wand.png',
+ *         true,
+ *         [ 'title' => __('Option 1 for show'), 'class' => 'invert_filter' ]
+ *     ).'</a>',
+ *    ];
+ *
+ *    ui_print_standard_header(
+ *      __('Favorites'),
+ *      'images/op_reporting.png',
+ *      false,
+ *      '',
+ *      true,
+ *      $buttons,
+ *      [
+ *         [ 'link'  => '', 'label' => __('Topology maps') ],
+ *         [ 'link'  => '', 'label' => __('Visual console') ],
+ *      ]
+ *  );
+ *  ```
+ *
+ * @return string If apply
+ */
+function ui_print_standard_header(
+    string $title,
+    string $icon='',
+    bool $return=false,
+    string $help='',
+    bool $godmode=false,
+    array $options=[],
+    array $breadcrumbs=[]
+) {
+    // Create the breadcrumb.
+    $headerInformation = new HTML();
+    $headerInformation->setBreadcrum([]);
+    // Prepare the breadcrumbs.
+    $countBreadcrumbs = count($breadcrumbs);
+    $countUnitBreadcrumb = 0;
+    $applyBreadcrumbs = [];
+    foreach ($breadcrumbs as $unitBreadcrumb) {
+        // Count new breadcrumb.
+        $countUnitBreadcrumb++;
+        // Apply selected if is the last.
+        $unitBreadcrumb['selected'] = ($countBreadcrumbs === $countUnitBreadcrumb);
+        // Apply for another breadcrumb.
+        $applyBreadcrumbs[] = $unitBreadcrumb;
+    }
+
+    // Attach breadcrumbs.
+    $headerInformation->prepareBreadcrum(
+        $applyBreadcrumbs,
+        true
+    );
+    // Create the header.
+    $output = ui_print_page_header(
+        $title,
+        $icon,
+        true,
+        $help,
+        $godmode,
+        $options,
+        false,
+        '',
+        GENERIC_SIZE_TEXT,
+        '',
+        $headerInformation->printHeader(true)
+    );
+
+    if ($return !== true) {
+        echo $output;
+    } else {
+        return $output;
+    }
+}
+
+
 /**
  * Return a standard page header (Pandora FMS 3.1 version)
  *
diff --git a/pandora_console/operation/agentes/alerts_status.php b/pandora_console/operation/agentes/alerts_status.php
index 34688e5b10..ed4559abe3 100755
--- a/pandora_console/operation/agentes/alerts_status.php
+++ b/pandora_console/operation/agentes/alerts_status.php
@@ -188,12 +188,25 @@ if ($idAgent != 0) {
 
     $print_agent = true;
 
-    if (!is_metaconsole()) {
-        ui_print_page_header(
+    if (is_metaconsole() === false) {
+        // Header.
+        ui_print_standard_header(
             __('Alert detail'),
             'images/op_alerts.png',
             false,
-            ''
+            '',
+            false,
+            [],
+            [
+                [
+                    'link'  => '',
+                    'label' => __('Monitoring'),
+                ],
+                [
+                    'link'  => '',
+                    'label' => __('Views'),
+                ],
+            ]
         );
     } else {
         ui_meta_print_header(__('Alerts view'));
diff --git a/pandora_console/operation/agentes/estado_agente.php b/pandora_console/operation/agentes/estado_agente.php
index 6db5feaf7d..3db452ac16 100644
--- a/pandora_console/operation/agentes/estado_agente.php
+++ b/pandora_console/operation/agentes/estado_agente.php
@@ -1,17 +1,32 @@
 <?php
+/**
+ * Agent Status View.
+ *
+ * @category   View
+ * @package    Pandora FMS
+ * @subpackage Monitoring.
+ * @version    1.0.0
+ * @license    See below
+ *
+ *    ______                 ___                    _______ _______ ________
+ *   |   __ \.-----.--.--.--|  |.-----.----.-----. |    ___|   |   |     __|
+ *  |    __/|  _  |     |  _  ||  _  |   _|  _  | |    ___|       |__     |
+ * |___|   |___._|__|__|_____||_____|__| |___._| |___|   |__|_|__|_______|
+ *
+ * ============================================================================
+ * Copyright (c) 2005-2021 Artica Soluciones Tecnologicas
+ * Please see http://pandorafms.org for full contribution list
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation for version 2.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * ============================================================================
+ */
 
-// Pandora FMS - http://pandorafms.com
-// ==================================================
-// Copyright (c) 2005-2021 Artica Soluciones Tecnologicas
-// Please see http://pandorafms.org for full contribution list
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation 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.
-// Load global vars
+// Begin.
 global $config;
 
 ob_start();
@@ -192,13 +207,24 @@ if (check_acl($config['id_user'], 0, 'AW')) {
     $onheader = ['setup' => $setuptab];
 }
 
-ui_print_page_header(
+// Header.
+ui_print_standard_header(
     __('Agent detail'),
     'images/agent.png',
     false,
     '',
     false,
-    $onheader
+    $onheader,
+    [
+        [
+            'link'  => '',
+            'label' => __('Monitoring'),
+        ],
+        [
+            'link'  => '',
+            'label' => __('Views'),
+        ],
+    ]
 );
 
 if (!$strict_user) {
diff --git a/pandora_console/operation/agentes/group_view.php b/pandora_console/operation/agentes/group_view.php
index 61dfda1a22..000931ff6b 100644
--- a/pandora_console/operation/agentes/group_view.php
+++ b/pandora_console/operation/agentes/group_view.php
@@ -1,16 +1,32 @@
 <?php
-// Pandora FMS - http://pandorafms.com
-// ==================================================
-// Copyright (c) 2005-2021 Artica Soluciones Tecnologicas
-// Please see http://pandorafms.org for full contribution list
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation for version 2.
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// Load global vars
+/**
+ * Group View.
+ *
+ * @category   View
+ * @package    Pandora FMS
+ * @subpackage Monitoring.
+ * @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.
+ * ============================================================================
+ */
+
+// Begin.
 require_once 'include/config.php';
 require_once 'include/functions_reporting.php';
 require_once $config['homedir'].'/include/functions_agents.php';
@@ -62,17 +78,27 @@ if ($config['realtimestats'] == 0) {
     $updated_time .= '</a>';
 } else {
     // $updated_info = __("Updated at realtime");
-        $updated_info = '';
+    $updated_info = '';
 }
 
 // Header.
-ui_print_page_header(
+ui_print_standard_header(
     __('Group view'),
     'images/group.png',
     false,
     '',
     false,
-    $updated_time
+    (array) $updated_time,
+    [
+        [
+            'link'  => '',
+            'label' => __('Monitoring'),
+        ],
+        [
+            'link'  => '',
+            'label' => __('Views'),
+        ],
+    ]
 );
 
 $total_agentes = 0;
diff --git a/pandora_console/operation/agentes/status_monitor.php b/pandora_console/operation/agentes/status_monitor.php
index ee20c2d8c1..093290a813 100644
--- a/pandora_console/operation/agentes/status_monitor.php
+++ b/pandora_console/operation/agentes/status_monitor.php
@@ -1,17 +1,32 @@
 <?php
-// This file is an example on how things must NEVER be done.
-// Pandora FMS - http://pandorafms.com
-// ==================================================
-// Copyright (c) 2005-2021 Artica Soluciones Tecnologicas
-// Please see http://pandorafms.org for full contribution list
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation for version 2.
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// Load global vars
+/**
+ * Monitor Status View.
+ *
+ * @category   View
+ * @package    Pandora FMS
+ * @subpackage Monitoring.
+ * @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.
+ * ============================================================================
+ */
+
+// Begin.
 global $config;
 
 check_login();
@@ -67,7 +82,7 @@ if (! defined('METACONSOLE')) {
     switch ($section) {
         case 'fields':
             $buttons['fields']['active'] = true;
-            $subpage = ' - '.__('Custom fields');
+            $subpage = ' &raquo; '.__('Custom fields');
         break;
 
         default:
@@ -75,13 +90,24 @@ if (! defined('METACONSOLE')) {
         break;
     }
 
-    ui_print_page_header(
+    // Header.
+    ui_print_standard_header(
         __('Monitor detail').$subpage,
-        '',
+        'images/agent.png',
         false,
         '',
         true,
-        $buttons
+        $buttons,
+        [
+            [
+                'link'  => '',
+                'label' => __('Monitoring'),
+            ],
+            [
+                'link'  => '',
+                'label' => __('Views'),
+            ],
+        ]
     );
 
     if ($section == 'fields') {
diff --git a/pandora_console/operation/agentes/tactical.php b/pandora_console/operation/agentes/tactical.php
index d7f668597e..d82a749a85 100755
--- a/pandora_console/operation/agentes/tactical.php
+++ b/pandora_console/operation/agentes/tactical.php
@@ -1,17 +1,32 @@
 <?php
+/**
+ * Tactical View.
+ *
+ * @category   View
+ * @package    Pandora FMS
+ * @subpackage Monitoring.
+ * @version    1.0.0
+ * @license    See below
+ *
+ *    ______                 ___                    _______ _______ ________
+ *   |   __ \.-----.--.--.--|  |.-----.----.-----. |    ___|   |   |     __|
+ *  |    __/|  _  |     |  _  ||  _  |   _|  _  | |    ___|       |__     |
+ * |___|   |___._|__|__|_____||_____|__| |___._| |___|   |__|_|__|_______|
+ *
+ * ============================================================================
+ * Copyright (c) 2005-2021 Artica Soluciones Tecnologicas
+ * Please see http://pandorafms.org for full contribution list
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation for version 2.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * ============================================================================
+ */
 
-// Pandora FMS - http://pandorafms.com
-// ==================================================
-// Copyright (c) 2005-2021 Artica Soluciones Tecnologicas
-// Please see http://pandorafms.org for full contribution list
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation 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.
-// Load global vars
+// Begin.
 global $config;
 
 require_once 'include/functions_events.php';
@@ -46,17 +61,27 @@ if ($config['realtimestats'] == 0) {
     $updated_time .= '</a>';
 } else {
     // $updated_info = __("Updated at realtime");
-        $updated_info = '';
+    $updated_info = '';
 }
 
 // Header.
-ui_print_page_header(
+ui_print_standard_header(
     __('Tactical view'),
     '',
     false,
     '',
     false,
-    $updated_time
+    (array) $updated_time,
+    [
+        [
+            'link'  => '',
+            'label' => __('Monitoring'),
+        ],
+        [
+            'link'  => '',
+            'label' => __('Views'),
+        ],
+    ]
 );
 
 // Currently this function makes loading this page is impossible. Change
diff --git a/pandora_console/operation/dashboard/dashboard.php b/pandora_console/operation/dashboard/dashboard.php
index 3b081cfc7a..b80a871266 100644
--- a/pandora_console/operation/dashboard/dashboard.php
+++ b/pandora_console/operation/dashboard/dashboard.php
@@ -1,7 +1,6 @@
 <?php
 /**
- * Extension to manage a list of gateways and the node address where they should
- * point to.
+ * Dashboards.
  *
  * @category   Dashboards
  * @package    Pandora FMS
@@ -27,6 +26,7 @@
  * ============================================================================
  */
 
+// Begin.
 global $config;
 
 require $config['homedir'].'/vendor/autoload.php';
diff --git a/pandora_console/operation/snmpconsole/snmp_browser.php b/pandora_console/operation/snmpconsole/snmp_browser.php
index 9b5a194410..7e493d7149 100644
--- a/pandora_console/operation/snmpconsole/snmp_browser.php
+++ b/pandora_console/operation/snmpconsole/snmp_browser.php
@@ -1,9 +1,8 @@
 <?php
 /**
- * Extension to manage a list of gateways and the node address where they should
- * point to.
+ * SMNP Browser view
  *
- * @category   Extensions
+ * @category   Monitoring
  * @package    Pandora FMS
  * @subpackage Community
  * @version    1.0.0
@@ -27,6 +26,7 @@
  * ============================================================================
  */
 
+// Begin.
 global $config;
 require_once $config['homedir'].'/include/functions_snmp_browser.php';
 ui_require_javascript_file('pandora_snmp_browser');
@@ -42,7 +42,6 @@ if (!check_acl($config['id_user'], 0, 'AR')) {
 
 
 
-// Header.
 $url = 'index.php?sec=snmpconsole&sec2=operation/snmpconsole/snmp_browser&pure='.$config['pure'];
 if ($config['pure']) {
     // Windowed.
@@ -70,13 +69,24 @@ if ($config['pure']) {
     $link['text'] .= '</a>';
 }
 
-ui_print_page_header(
+// Header.
+ui_print_standard_header(
     __('SNMP Browser'),
     'images/op_snmp.png',
     false,
     'snmp_browser_view',
     false,
-    [$link]
+    [$link],
+    [
+        [
+            'link'  => '',
+            'label' => __('Monitoring'),
+        ],
+        [
+            'link'  => '',
+            'label' => __('SMNP'),
+        ],
+    ]
 );
 
 // SNMP tree container.
diff --git a/pandora_console/operation/snmpconsole/snmp_mib_uploader.php b/pandora_console/operation/snmpconsole/snmp_mib_uploader.php
index 8b21420fb0..53bc811268 100644
--- a/pandora_console/operation/snmpconsole/snmp_mib_uploader.php
+++ b/pandora_console/operation/snmpconsole/snmp_mib_uploader.php
@@ -1,17 +1,32 @@
 <?php
+/**
+ * MIB Uploader view
+ *
+ * @category   Monitoring
+ * @package    Pandora FMS
+ * @subpackage Community
+ * @version    1.0.0
+ * @license    See below
+ *
+ *    ______                 ___                    _______ _______ ________
+ *   |   __ \.-----.--.--.--|  |.-----.----.-----. |    ___|   |   |     __|
+ *  |    __/|  _  |     |  _  ||  _  |   _|  _  | |    ___|       |__     |
+ * |___|   |___._|__|__|_____||_____|__| |___._| |___|   |__|_|__|_______|
+ *
+ * ============================================================================
+ * Copyright (c) 2005-2021 Artica Soluciones Tecnologicas
+ * Please see http://pandorafms.org for full contribution list
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation for version 2.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * ============================================================================
+ */
 
-// Pandora FMS - http://pandorafms.com
-// ==================================================
-// Copyright (c) 2013-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.
-// Load global vars
+// Begin.
 global $config;
 
 check_login();
@@ -24,8 +39,26 @@ if (! check_acl($config['id_user'], 0, 'PM')) {
 
 require_once 'include/functions_filemanager.php';
 
-// Header
-ui_print_page_header(__('MIB uploader'), 'images/op_snmp.png', false, '', false);
+// Header.
+ui_print_standard_header(
+    __('MIB uploader'),
+    'images/op_snmp.png',
+    false,
+    '',
+    false,
+    [],
+    [
+        [
+            'link'  => '',
+            'label' => __('Monitoring'),
+        ],
+        [
+            'link'  => '',
+            'label' => __('SMNP'),
+        ],
+    ]
+);
+
 
 if (isset($config['filemanager']['message'])) {
     echo $config['filemanager']['message'];

From c54ad46f336acd5c221db622cc908df526656304 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Gonz=C3=A1lez?= <jose.gonzalez@pandorafms.com>
Date: Thu, 29 Apr 2021 15:35:33 +0200
Subject: [PATCH 12/93] Added standard header

---
 .../operation/snmpconsole/snmp_statistics.php | 14 ++++++++--
 .../operation/snmpconsole/snmp_view.php       | 28 ++++++++++++++++---
 pandora_console/operation/tree.php            | 23 +++++++++++++--
 3 files changed, 56 insertions(+), 9 deletions(-)

diff --git a/pandora_console/operation/snmpconsole/snmp_statistics.php b/pandora_console/operation/snmpconsole/snmp_statistics.php
index a240c7d6a6..ca1a3ce6e7 100755
--- a/pandora_console/operation/snmpconsole/snmp_statistics.php
+++ b/pandora_console/operation/snmpconsole/snmp_statistics.php
@@ -81,8 +81,8 @@ $statistics['text'] = '<a href="index.php?sec=estado&sec2=operation/snmpconsole/
 ).'</a>';
 
 // Header
-ui_print_page_header(
-    __('SNMP Console'),
+ui_print_standard_header(
+    __('SNMP Statistics'),
     'images/op_snmp.png',
     false,
     '',
@@ -91,6 +91,16 @@ ui_print_page_header(
         $fullscreen,
         $list,
         $statistics,
+    ],
+    [
+        [
+            'link'  => '',
+            'label' => __('Monitoring'),
+        ],
+        [
+            'link'  => '',
+            'label' => __('SNMP'),
+        ],
     ]
 );
 
diff --git a/pandora_console/operation/snmpconsole/snmp_view.php b/pandora_console/operation/snmpconsole/snmp_view.php
index 5442f75823..b87a126fae 100755
--- a/pandora_console/operation/snmpconsole/snmp_view.php
+++ b/pandora_console/operation/snmpconsole/snmp_view.php
@@ -698,8 +698,8 @@ $trapcount = (int) db_get_value_sql($sql_count);
 
 // No traps.
 if (empty($traps)) {
-    // Header.
-    ui_print_page_header(
+    // Header
+    ui_print_standard_header(
         __('SNMP Console'),
         'images/op_snmp.png',
         false,
@@ -708,6 +708,16 @@ if (empty($traps)) {
         [
             $list,
             $statistics,
+        ],
+        [
+            [
+                'link'  => '',
+                'label' => __('Monitoring'),
+            ],
+            [
+                'link'  => '',
+                'label' => __('SNMP'),
+            ],
         ]
     );
 
@@ -796,8 +806,8 @@ if (empty($traps)) {
         ui_require_javascript_file('wz_jsgraphics');
         ui_require_javascript_file('pandora_visual_console');
     } else {
-        // Header.
-        ui_print_page_header(
+        // Header
+        ui_print_standard_header(
             __('SNMP Console'),
             'images/op_snmp.png',
             false,
@@ -807,6 +817,16 @@ if (empty($traps)) {
                 $fullscreen,
                 $list,
                 $statistics,
+            ],
+            [
+                [
+                    'link'  => '',
+                    'label' => __('Monitoring'),
+                ],
+                [
+                    'link'  => '',
+                    'label' => __('SNMP'),
+                ],
             ]
         );
     }
diff --git a/pandora_console/operation/tree.php b/pandora_console/operation/tree.php
index 676e0085c6..d0d68858d5 100755
--- a/pandora_console/operation/tree.php
+++ b/pandora_console/operation/tree.php
@@ -147,12 +147,29 @@ switch ($tab) {
     break;
 }
 
-if (!is_metaconsole()) {
+if (is_metaconsole() === false) {
     if (!$strict_acl) {
-        $header_title = $header_title.' - '.$header_sub_title;
+        $header_title = $header_title.' &raquo; '.$header_sub_title;
     }
 
-    ui_print_page_header($header_title, 'images/extensions.png', false, 'tree_view', false, $tabs);
+    ui_print_standard_header(
+        $header_title,
+        'images/extensions.png',
+        false,
+        'tree_view',
+        false,
+        $tabs,
+        [
+            [
+                'link'  => '',
+                'label' => __('Monitoring'),
+            ],
+            [
+                'link'  => '',
+                'label' => __('View'),
+            ],
+        ]
+    );
 }
 
 // ---------------------Tabs -------------------------------------------

From 6ad371e4ab77f8a9959dc2123ed6017644982895 Mon Sep 17 00:00:00 2001
From: Calvo <luis.calvo@artica.es>
Date: Thu, 29 Apr 2021 16:04:51 +0200
Subject: [PATCH 13/93] Email test working with data in text fields

---
 .../godmode/setup/setup_general.php           | 21 ++++++--
 pandora_console/include/functions.php         | 50 +++++++++++++++----
 2 files changed, 58 insertions(+), 13 deletions(-)

diff --git a/pandora_console/godmode/setup/setup_general.php b/pandora_console/godmode/setup/setup_general.php
index fbd33b8a90..8e152718ae 100644
--- a/pandora_console/godmode/setup/setup_general.php
+++ b/pandora_console/godmode/setup/setup_general.php
@@ -34,9 +34,11 @@ check_login();
 
 if (is_ajax()) {
     $test_address = get_parameter('test_address', '');
+    $params = get_parameter('params', '');
 
     $res = send_test_email(
-        $test_address
+        $test_address,
+        $params
     );
 
     echo $res;
@@ -704,12 +706,25 @@ function show_email_test(id) {
 
 function perform_email_test () {
     var test_address = $('#text-email_test_address').val();
+    params = {
+        email_smtpServer : $('#text-email_smtpServer').val(),
+        email_smtpPort : $('#text-email_smtpPort').val(),
+        email_username : $('#text-email_username').val(),
+        email_password : $('#password-email_password').val(),
+        email_encryption : $( "#email_encryption option:selected" ).val(),
+        email_from_dir : $('#text-email_from_dir').val(),
+        email_from_name : $('#text-email_from_name').val()
+    };
 
     $.ajax({
         type: "POST",
         url: "ajax.php",
-        data: "page=godmode/setup/setup_general&test_address="+test_address,
-        dataType: "html",
+        data : {
+                    page: "godmode/setup/setup_general",
+                    test_address: test_address,
+                    params: params
+                },
+        dataType: "json",
         success: function(data) {
             if (parseInt(data) === 1) {
                 $('#email_test_sent_message').show();
diff --git a/pandora_console/include/functions.php b/pandora_console/include/functions.php
index 32312238ce..139ce2cd7e 100644
--- a/pandora_console/include/functions.php
+++ b/pandora_console/include/functions.php
@@ -5960,27 +5960,57 @@ function get_data_multiplier($unit)
 /**
  * Send test email to check email setups.
  *
- * @param string $to Target email account.
+ * @param string $to     Target email account.
+ * @param array  $params Array with connection data.
+ * Available fields:
+ * 'email_smtpServer',
+ * 'email_smtpPort',
+ * 'email_username',
+ * 'email_password',
+ * 'email_encryption',
+ * 'email_from_dir',
+ * 'email_from_name',
  *
  * @return integer Status of the email send task.
  */
 function send_test_email(
-    string $to
+    string $to,
+    array $params=null
 ) {
     global $config;
 
+    $valid_params = [
+        'email_smtpServer',
+        'email_smtpPort',
+        'email_username',
+        'email_password',
+        'email_encryption',
+        'email_from_dir',
+        'email_from_name',
+    ];
+
+    if (empty($params) === true) {
+        foreach ($valid_params as $token) {
+            $params[$token] = $config[$token];
+        }
+    } else {
+        if (array_diff($valid_params, array_keys($params)) === false) {
+            return false;
+        }
+    }
+
     $result = false;
     try {
         $transport = new Swift_SmtpTransport(
-            $config['email_smtpServer'],
-            $config['email_smtpPort']
+            $params['email_smtpServer'],
+            $params['email_smtpPort']
         );
 
-        $transport->setUsername($config['email_username']);
-        $transport->setPassword($config['email_password']);
+        $transport->setUsername($params['email_username']);
+        $transport->setPassword($params['email_password']);
 
-        if ($config['email_encryption']) {
-            $transport->setEncryption($config['email_encryption']);
+        if ($params['email_encryption']) {
+            $transport->setEncryption($params['email_encryption']);
         }
 
         $mailer = new Swift_Mailer($transport);
@@ -5989,8 +6019,8 @@ function send_test_email(
 
         $message->setFrom(
             [
-                $config['email_from_dir'] => io_safe_output(
-                    $config['email_from_name']
+                $params['email_from_dir'] => io_safe_output(
+                    $params['email_from_name']
                 ),
             ]
         );

From 71c88313d5492741c1b31bcbae56bd6abe1f4a27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Gonz=C3=A1lez?= <jose.gonzalez@pandorafms.com>
Date: Fri, 30 Apr 2021 10:58:37 +0200
Subject: [PATCH 14/93] Added standard header

---
 .../godmode/reporting/reporting_builder.php   | 72 +++++++++++++------
 .../operation/reporting/reporting_viewer.php  | 16 +++--
 .../operation/visual_console/view.php         |  2 +
 3 files changed, 65 insertions(+), 25 deletions(-)

diff --git a/pandora_console/godmode/reporting/reporting_builder.php b/pandora_console/godmode/reporting/reporting_builder.php
index c52639d99f..af392055c6 100755
--- a/pandora_console/godmode/reporting/reporting_builder.php
+++ b/pandora_console/godmode/reporting/reporting_builder.php
@@ -567,17 +567,24 @@ switch ($action) {
             // Print header.
             ui_meta_print_header(__('Reporting'), '', $buttons);
         } else {
-            // Page header for normal console.
-            ui_print_page_header(
-                __('Custom reporting'),
+            // Header.
+            ui_print_standard_header(
+                __('List of reports'),
                 'images/op_reporting.png',
                 false,
                 '',
                 false,
                 $buttons,
-                false,
-                '',
-                60
+                [
+                    [
+                        'link'  => '',
+                        'label' => __('Reporting'),
+                    ],
+                    [
+                        'link'  => '',
+                        'label' => __('Custom reports'),
+                    ],
+                ]
             );
         }
 
@@ -3145,17 +3152,24 @@ switch ($action) {
                 // Print header.
                 ui_meta_print_header(__('Reporting'), '', $buttons);
             } else {
-                // Page header for normal console.
-                ui_print_page_header(
+                // Header.
+                ui_print_standard_header(
                     $subsection,
                     'images/op_reporting.png',
                     false,
                     '',
                     false,
                     $buttons,
-                    false,
-                    '',
-                    60
+                    [
+                        [
+                            'link'  => '',
+                            'label' => __('Reporting'),
+                        ],
+                        [
+                            'link'  => '',
+                            'label' => __('Custom reports'),
+                        ],
+                    ]
                 );
             }
 
@@ -3251,17 +3265,25 @@ if ($enterpriseEnable && defined('METACONSOLE')) {
 } else {
     $tab_builder = ($activeTab === 'item_editor') ? 'reporting_item_editor_tab' : '';
 
-    if ($action !== 'update' && !is_metaconsole()) {
-        ui_print_page_header(
+    if ($action !== 'update' && is_metaconsole() === false) {
+        // Header.
+        ui_print_standard_header(
             $textReportName,
             'images/op_reporting.png',
             false,
             $tab_builder,
             false,
             $buttons,
-            false,
-            '',
-            60
+            [
+                [
+                    'link'  => '',
+                    'label' => __('Reporting'),
+                ],
+                [
+                    'link'  => '',
+                    'label' => __('Custom reports'),
+                ],
+            ]
         );
     }
 }
@@ -3291,17 +3313,25 @@ if ($resultOperationDB !== null) {
         $activeTab = 'list_items';
         $buttons[$activeTab]['active'] = true;
 
-        if (!is_metaconsole()) {
-            ui_print_page_header(
+        if (is_metaconsole() === false) {
+            // Header.
+            ui_print_standard_header(
                 $textReportName,
                 'images/op_reporting.png',
                 false,
                 $helpers,
                 false,
                 $buttons,
-                false,
-                '',
-                60
+                [
+                    [
+                        'link'  => '',
+                        'label' => __('Reporting'),
+                    ],
+                    [
+                        'link'  => '',
+                        'label' => __('Custom reports'),
+                    ],
+                ]
             );
         }
     }
diff --git a/pandora_console/operation/reporting/reporting_viewer.php b/pandora_console/operation/reporting/reporting_viewer.php
index 5434553aea..c5870c1886 100755
--- a/pandora_console/operation/reporting/reporting_viewer.php
+++ b/pandora_console/operation/reporting/reporting_viewer.php
@@ -173,16 +173,24 @@ if (is_metaconsole()) {
     // Print header
     ui_meta_print_header(__('Reporting'), '', $options);
 } else {
-    ui_print_page_header(
+    // Header.
+    ui_print_standard_header(
         reporting_get_name($id_report),
         'images/op_reporting.png',
         false,
         '',
         false,
         $options,
-        false,
-        '',
-        55
+        [
+            [
+                'link'  => '',
+                'label' => __('Reporting'),
+            ],
+            [
+                'link'  => '',
+                'label' => __('Custom reports'),
+            ],
+        ]
     );
 }
 
diff --git a/pandora_console/operation/visual_console/view.php b/pandora_console/operation/visual_console/view.php
index 0b229c46d8..3b9250b865 100644
--- a/pandora_console/operation/visual_console/view.php
+++ b/pandora_console/operation/visual_console/view.php
@@ -36,6 +36,8 @@ require_once $config['homedir'].'/vendor/autoload.php';
 // TODO: include file functions.
 require_once $config['homedir'].'/include/functions_visual_map.php';
 
+error_log('HOLA');
+
 
 /**
  * Function for return button visual console edition.

From 3f33a0ec2941d6eaa8b2a36bd8cb05dbaa4d9509 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Gonz=C3=A1lez?= <jose.gonzalez@pandorafms.com>
Date: Fri, 30 Apr 2021 12:35:02 +0200
Subject: [PATCH 15/93] Added standard header

---
 pandora_console/godmode/reporting/graphs.php  | 61 ++++++++++++++-----
 .../agentes/pandora_networkmap.editor.php     | 24 ++++++--
 .../operation/agentes/pandora_networkmap.php  | 57 ++++++++++++-----
 3 files changed, 108 insertions(+), 34 deletions(-)

diff --git a/pandora_console/godmode/reporting/graphs.php b/pandora_console/godmode/reporting/graphs.php
index 3fdf7b3969..0c93074a2d 100644
--- a/pandora_console/godmode/reporting/graphs.php
+++ b/pandora_console/godmode/reporting/graphs.php
@@ -1,16 +1,32 @@
 <?php
-// Pandora FMS - http://pandorafms.com
-// ==================================================
-// Copyright (c) 2005-2021 Artica Soluciones Tecnologicas
-// Please see http://pandorafms.org for full contribution list
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation for version 2.
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// Load global variables
+/**
+ * Reporting graphs.
+ *
+ * @category   Reporting
+ * @package    Pandora FMS
+ * @subpackage Community
+ * @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.
+ * ============================================================================
+ */
+
+// Begin.
 global $config;
 
 require_once 'include/functions_custom_graphs.php';
@@ -99,8 +115,25 @@ $view_graph = (bool) get_parameter('view_graph');
 $id = (int) get_parameter('id');
 $multiple_delete = (bool) get_parameter('multiple_delete', 0);
 
-// Header
-ui_print_page_header(__('Reporting').' &raquo; '.__('Custom graphs'), 'images/chart.png', false, '', false, $buttons);
+// Header.
+ui_print_standard_header(
+    __('List of custom graphs'),
+    'images/chart.png',
+    false,
+    '',
+    false,
+    $buttons,
+    [
+        [
+            'link'  => '',
+            'label' => __('Reporting'),
+        ],
+        [
+            'link'  => '',
+            'label' => __('Custom graphs'),
+        ],
+    ]
+);
 
 // Delete module SQL code
 if ($delete_graph) {
diff --git a/pandora_console/operation/agentes/pandora_networkmap.editor.php b/pandora_console/operation/agentes/pandora_networkmap.editor.php
index 4937b3d38f..e376ae9c53 100644
--- a/pandora_console/operation/agentes/pandora_networkmap.editor.php
+++ b/pandora_console/operation/agentes/pandora_networkmap.editor.php
@@ -1,9 +1,8 @@
 <?php
 /**
- * Extension to manage a list of gateways and the node address where they should
- * point to.
+ * Empty Network editor.
  *
- * @category   Extensions
+ * @category   View
  * @package    Pandora FMS
  * @subpackage Community
  * @version    1.0.0
@@ -27,6 +26,7 @@
  * ============================================================================
  */
 
+// Begin.
 global $config;
 
 // Check user credentials.
@@ -203,12 +203,24 @@ if ($edit_networkmap) {
     }
 }
 
-ui_print_page_header(
-    __('Networkmap'),
+// Header.
+ui_print_standard_header(
+    __('Network maps editor'),
     'images/bricks.png',
     false,
     'network_map_enterprise_edit',
-    false
+    false,
+    [],
+    [
+        [
+            'link'  => '',
+            'label' => __('Topology maps'),
+        ],
+        [
+            'link'  => '',
+            'label' => __('Networkmap'),
+        ],
+    ]
 );
 
 $id_snmp_l2_recon = db_get_value(
diff --git a/pandora_console/operation/agentes/pandora_networkmap.php b/pandora_console/operation/agentes/pandora_networkmap.php
index 8c8c5ec087..c960a333aa 100644
--- a/pandora_console/operation/agentes/pandora_networkmap.php
+++ b/pandora_console/operation/agentes/pandora_networkmap.php
@@ -1,15 +1,32 @@
 <?php
-// ______                 __                     _______ _______ _______
-// |   __ \.---.-.-----.--|  |.-----.----.---.-. |    ___|   |   |     __|
-// |    __/|  _  |     |  _  ||  _  |   _|  _  | |    ___|       |__     |
-// |___|   |___._|__|__|_____||_____|__| |___._| |___|   |__|_|__|_______|
-//
-// ============================================================================
-// Copyright (c) 2007-2021 Artica Soluciones Tecnologicas, http://www.artica.es
-// This code is NOT free software. This code is NOT licenced under GPL2 licence
-// You cannnot redistribute it without written permission of copyright holder.
-// ============================================================================
-// Load global variables
+/**
+ * Network map.
+ *
+ * @category   View
+ * @package    Pandora FMS
+ * @subpackage Community
+ * @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.
+ * ============================================================================
+ */
+
+// Begin.
 global $config;
 
 // Check user credentials.
@@ -645,12 +662,24 @@ switch ($tab) {
             <?php
         }
 
-        ui_print_page_header(
-            __('Networkmap'),
+        // Header.
+        ui_print_standard_header(
+            __('List of network maps'),
             'images/op_network.png',
             false,
             '',
-            false
+            false,
+            [],
+            [
+                [
+                    'link'  => '',
+                    'label' => __('Topology maps'),
+                ],
+                [
+                    'link'  => '',
+                    'label' => __('Networkmap'),
+                ],
+            ]
         );
 
         echo $result_txt;

From 46a691c39795fd596424ebaa01ff96ccc2635fcf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Gonz=C3=A1lez?= <jose.gonzalez@pandorafms.com>
Date: Fri, 30 Apr 2021 13:24:55 +0200
Subject: [PATCH 16/93] Added standard headers

---
 .../godmode/reporting/graph_builder.php       | 60 +++++++++++--------
 .../reporting/visual_console_builder.php      | 58 +++++++++++++-----
 .../operation/visual_console/view.php         | 22 +++++--
 3 files changed, 94 insertions(+), 46 deletions(-)

diff --git a/pandora_console/godmode/reporting/graph_builder.php b/pandora_console/godmode/reporting/graph_builder.php
index 79fdfde250..53d5fbcbd1 100644
--- a/pandora_console/godmode/reporting/graph_builder.php
+++ b/pandora_console/godmode/reporting/graph_builder.php
@@ -26,10 +26,9 @@
  * ============================================================================
  */
 
+// Begin.
 global $config;
 
-
-
 if (is_ajax()) {
     $search_agents = (bool) get_parameter('search_agents');
 
@@ -340,37 +339,43 @@ if ($edit_graph) {
 
 $head = __('Graph builder');
 
-if (isset($name)) {
-    $head .= ' - '.$name;
+if (isset($name) === true) {
+    $head .= ' &raquo; '.$name;
 }
 
 // Header.
-$tab = get_parameter('tab', '');
+$tab = get_parameter('tab');
 switch ($tab) {
-    default:
-    case 'main':
-        ui_print_page_header(
-            $head,
-            'images/chart.png',
-            false,
-            'graph_builder',
-            false,
-            $buttons
-        );
+    case 'graph_editor':
+        $headerHelp = '';
     break;
 
-    case 'graph_editor':
-        ui_print_page_header(
-            $head,
-            'images/chart.png',
-            false,
-            '',
-            false,
-            $buttons
-        );
+    case 'main':
+    default:
+        $headerHelp = 'graph_builder';
     break;
 }
 
+// Header.
+ui_print_standard_header(
+    $head,
+    'images/chart.png',
+    false,
+    $headerHelp,
+    false,
+    [$buttons],
+    [
+        [
+            'link'  => '',
+            'label' => __('Reporting'),
+        ],
+        [
+            'link'  => '',
+            'label' => __('Custom graphs'),
+        ],
+    ]
+);
+
 if ($add_graph) {
     ui_print_result_message(
         $id_graph,
@@ -418,7 +423,8 @@ if (!$delete_module) {
         $chunk1 = explode('|', $chunkdata);
         $modules = '';
         $weights = '';
-        for ($a = 0; $a < count($chunk1); $a++) {
+        $chunkCount = count($chunk1);
+        for ($a = 0; $a < $chunkCount; $a++) {
             $chunk2[$a] = [];
             $chunk2[$a] = explode(',', $chunk1[$a]);
             if (strpos($modules, $chunk2[$a][1]) == 0) {
@@ -450,4 +456,8 @@ switch ($active_tab) {
     case 'graph_editor':
         include_once 'godmode/reporting/graph_builder.graph_editor.php';
     break;
+
+    default:
+        // Nothing to do.
+    break;
 }
diff --git a/pandora_console/godmode/reporting/visual_console_builder.php b/pandora_console/godmode/reporting/visual_console_builder.php
index b03b55dd76..8c18dccd2c 100755
--- a/pandora_console/godmode/reporting/visual_console_builder.php
+++ b/pandora_console/godmode/reporting/visual_console_builder.php
@@ -1,16 +1,33 @@
 <?php
-// Pandora FMS - http://pandorafms.com
-// ==================================================
-// Copyright (c) 2005-2021 Artica Soluciones Tecnologicas
-// Please see http://pandorafms.org for full contribution list
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation for version 2.
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// Login check
+/**
+ * Extension to manage a list of gateways and the node address where they should
+ * point to.
+ *
+ * @category   Extensions
+ * @package    Pandora FMS
+ * @subpackage Community
+ * @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.
+ * ============================================================================
+ */
+
+// Begin.
 global $config;
 global $statusProcessInDB;
 
@@ -810,14 +827,25 @@ $buttons[$activeTab]['active'] = true;
 
 $tab_builder = ($activeTab === 'editor') ? 'visual_console_editor_editor_tab' : '';
 
-if (!defined('METACONSOLE')) {
-    ui_print_page_header(
+if (is_metaconsole() === false) {
+    // Header.
+    ui_print_standard_header(
         $visualConsoleName,
         'images/visual_console.png',
         false,
         $tab_builder,
         false,
-        $buttons
+        $buttons,
+        [
+            [
+                'link'  => '',
+                'label' => __('Topology maps'),
+            ],
+            [
+                'link'  => '',
+                'label' => __('Visual console'),
+            ],
+        ]
     );
 }
 
diff --git a/pandora_console/operation/visual_console/view.php b/pandora_console/operation/visual_console/view.php
index 3b9250b865..12ca2e3869 100644
--- a/pandora_console/operation/visual_console/view.php
+++ b/pandora_console/operation/visual_console/view.php
@@ -36,8 +36,6 @@ require_once $config['homedir'].'/vendor/autoload.php';
 // TODO: include file functions.
 require_once $config['homedir'].'/include/functions_visual_map.php';
 
-error_log('HOLA');
-
 
 /**
  * Function for return button visual console edition.
@@ -200,7 +198,7 @@ $options['view']['text'] = '<a href="index.php?sec=network&sec2=operation/visual
 ).'</a>';
 $options['view']['active'] = true;
 
-if (!is_metaconsole()) {
+if (is_metaconsole() === false) {
     if (!$config['pure']) {
         $options['pure']['text'] = '<a href="index.php?sec=network&sec2=operation/visual_console/render_view&id='.$visualConsoleId.'&pure=1&refr='.$refr.'">'.html_print_image(
             'images/full_screen.png',
@@ -210,13 +208,25 @@ if (!is_metaconsole()) {
                 'class' => 'invert_filter',
             ]
         ).'</a>';
-        ui_print_page_header(
+
+        // Header.
+        ui_print_standard_header(
             $visualConsoleName,
             'images/visual_console.png',
             false,
             'visual_console_view',
             false,
-            $options
+            $options,
+            [
+                [
+                    'link'  => '',
+                    'label' => __('Topology maps'),
+                ],
+                [
+                    'link'  => '',
+                    'label' => __('Visual console'),
+                ],
+            ]
         );
     }
 
@@ -467,7 +477,7 @@ if ($pure === true) {
 
 // Check groups can access user.
 $aclUserGroups = [];
-if (!users_can_manage_group_all('AR')) {
+if (users_can_manage_group_all('AR') === false) {
     $aclUserGroups = array_keys(users_get_groups(false, 'AR'));
 }
 

From cea27392c885308395c24f6feda63ffb58bab007 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Gonz=C3=A1lez?= <jose.gonzalez@pandorafms.com>
Date: Fri, 30 Apr 2021 13:39:10 +0200
Subject: [PATCH 17/93] Added standard header

---
 .../operation/messages/message_edit.php       | 21 +++++--
 .../operation/messages/message_list.php       | 55 +++++++++++--------
 2 files changed, 48 insertions(+), 28 deletions(-)

diff --git a/pandora_console/operation/messages/message_edit.php b/pandora_console/operation/messages/message_edit.php
index 2378372a2a..d7e6b51042 100644
--- a/pandora_console/operation/messages/message_edit.php
+++ b/pandora_console/operation/messages/message_edit.php
@@ -1,9 +1,8 @@
 <?php
 /**
- * Extension to manage a list of gateways and the node address where they should
- * point to.
+ * Compose message view
  *
- * @category   Extensions
+ * @category   Workspace
  * @package    Pandora FMS
  * @subpackage Community
  * @version    1.0.0
@@ -80,13 +79,23 @@ $buttons['create_message'] = [
 ];
 
 // Header.
-ui_print_page_header(
-    __('Messages'),
+ui_print_standard_header(
+    __('Compose message'),
     'images/email_mc.png',
     false,
     '',
     false,
-    $buttons
+    $buttons,
+    [
+        [
+            'link'  => '',
+            'label' => __('Workspace'),
+        ],
+        [
+            'link'  => '',
+            'label' => __('Messages'),
+        ],
+    ]
 );
 
 // Read a message.
diff --git a/pandora_console/operation/messages/message_list.php b/pandora_console/operation/messages/message_list.php
index 9b25b9da9c..fe96a811a5 100644
--- a/pandora_console/operation/messages/message_list.php
+++ b/pandora_console/operation/messages/message_list.php
@@ -1,9 +1,8 @@
 <?php
 /**
- * Extension to manage a list of gateways and the node address where they should
- * point to.
+ * Sent / Received messages view.
  *
- * @category   Extensions
+ * @category   Workspace
  * @package    Pandora FMS
  * @subpackage Community
  * @version    1.0.0
@@ -27,23 +26,24 @@
  * ============================================================================
  */
 
+// Begin.
 require_once 'include/functions_messages.php';
 
 global $config;
 
 $delete_msg = get_parameter('delete_message', 0);
 $multiple_delete = get_parameter('multiple_delete', 0);
-$show_sent = get_parameter('show_sent', 0);
+$show_sent = (bool) get_parameter('show_sent', false);
 $mark_unread = get_parameter('mark_unread', 0);
 
 $active_list = true;
 $active_sent = false;
-if ($show_sent !== 0) {
+if ($show_sent === true) {
     $active_list = false;
     $active_sent = true;
 }
 
-
+$tabSelectedMessage = ($show_sent === true) ? __('Sent messages') : __('Received messages');
 
 $buttons['message_list'] = [
     'active' => $active_list,
@@ -67,14 +67,25 @@ $buttons['create_message'] = [
     ).'</a>',
 ];
 
-if (!is_ajax()) {
-    ui_print_page_header(
-        __('Messages'),
+if (is_ajax() === false) {
+    // Header.
+    ui_print_standard_header(
+        $tabSelectedMessage,
         'images/email_mc.png',
         false,
         '',
         false,
-        $buttons
+        $buttons,
+        [
+            [
+                'link'  => '',
+                'label' => __('Workspace'),
+            ],
+            [
+                'link'  => '',
+                'label' => __('Messages'),
+            ],
+        ]
     );
 }
 
@@ -86,7 +97,7 @@ if ($mark_unread) {
 if ($delete_msg) {
     $id = (int) get_parameter('id');
 
-    if ($show_sent) {
+    if ($show_sent === true) {
         $result = messages_delete_message_sent($id);
     } else {
         $result = messages_delete_message($id);
@@ -104,7 +115,7 @@ if ($multiple_delete) {
     $ids = (array) get_parameter('delete_multiple_messages', []);
 
     foreach ($ids as $id) {
-        if ($show_sent) {
+        if ($show_sent === true) {
             $result = messages_delete_message_sent($id);
         } else {
             $result = messages_delete_message($id);
@@ -122,7 +133,7 @@ if ($multiple_delete) {
     );
 }
 
-if ($show_sent) {
+if ($show_sent === true) {
     // Sent view.
     $num_messages = messages_get_count_sent($config['id_user']);
     if ($num_messages > 0 && !is_ajax()) {
@@ -142,7 +153,7 @@ if ($show_sent) {
     }
 }
 
-if (empty($messages)) {
+if (empty($messages) === true) {
     ui_print_info_message(
         [
             'no_close' => true,
@@ -175,7 +186,7 @@ if (empty($messages)) {
 
     $table->head[5] = html_print_checkbox('all_delete_messages', 0, false, true, false);
     $table->head[0] = __('Status');
-    if ($show_sent) {
+    if ($show_sent === true) {
         $table->head[1] = __('Destination');
     } else {
         $table->head[1] = __('Sender');
@@ -194,7 +205,7 @@ if (empty($messages)) {
 
         $data[0] = '';
         if ($message['read'] == 1) {
-            if ($show_sent) {
+            if ($show_sent === true) {
                 $data[0] .= '<a href="index.php?sec=message_list&amp;sec2=operation/messages/message_edit&read_message=1&amp;show_sent=1&amp;id_message='.$message_id.'">';
                 $data[0] .= html_print_image('images/email_inbox.png', true, ['border' => 0, 'title' => __('Click to read'), 'class' => 'invert_filter']);
                 $data[0] .= '</a>';
@@ -204,7 +215,7 @@ if (empty($messages)) {
                 $data[0] .= '</a>';
             }
         } else {
-            if ($show_sent) {
+            if ($show_sent === true) {
                 $data[0] .= '<a href="index.php?sec=message_list&amp;sec2=operation/messages/message_edit&amp;read_message=1&amp;show_sent=1&amp;id_message='.$message_id.'">';
                 $data[0] .= html_print_image('images/email_inbox.png', true, ['border' => 0, 'title' => __('Message unread - click to read'), 'class' => 'invert_filter']);
                 $data[0] .= '</a>';
@@ -215,7 +226,7 @@ if (empty($messages)) {
             }
         }
 
-        if ($show_sent) {
+        if ($show_sent === true) {
             $dest_user = get_user_fullname($message['dest']);
             if (!$dest_user) {
                 $dest_user = $message['dest'];
@@ -231,7 +242,7 @@ if (empty($messages)) {
             $data[1] = $orig_user;
         }
 
-        if ($show_sent) {
+        if ($show_sent === true) {
             $data[2] = '<a href="index.php?sec=message_list&amp;sec2=operation/messages/message_edit&amp;read_message=1&show_sent=1&amp;id_message='.$message_id.'">';
         } else {
             $data[2] = '<a href="index.php?sec=message_list&amp;sec2=operation/messages/message_edit&amp;read_message=1&amp;id_message='.$message_id.'">';
@@ -252,7 +263,7 @@ if (empty($messages)) {
         );
 
         $table->cellclass[][4] = 'action_buttons';
-        if ($show_sent) {
+        if ($show_sent === true) {
             $data[4] = '<a href="index.php?sec=message_list&amp;sec2=operation/messages/message_list&show_sent=1&delete_message=1&id='.$message_id.'"
                 onClick="javascript:if (!confirm(\''.__('Are you sure?').'\')) return false;">'.html_print_image('images/cross.png', true, ['title' => __('Delete'), 'class' => 'invert_filter']).'</a>';
         } else {
@@ -264,8 +275,8 @@ if (empty($messages)) {
     }
 }
 
-if (!empty($messages)) {
-    if ($show_sent) {
+if (empty($messages) === false) {
+    if ($show_sent === true) {
         echo '<form method="post" action="index.php?sec=message_list&amp;sec2=operation/messages/message_list&show_sent=1">';
     } else {
         echo '<form method="post" action="index.php?sec=message_list&amp;sec2=operation/messages/message_list">';

From ab984b8c324a79ef65566769a7611f290de7b602 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Gonz=C3=A1lez?= <jose.gonzalez@pandorafms.com>
Date: Fri, 30 Apr 2021 13:50:58 +0200
Subject: [PATCH 18/93] Added standard headers

---
 .../godmode/groups/configure_group.php        | 19 +++++++++---
 pandora_console/godmode/groups/group_list.php | 30 ++++++++++++++-----
 2 files changed, 38 insertions(+), 11 deletions(-)

diff --git a/pandora_console/godmode/groups/configure_group.php b/pandora_console/godmode/groups/configure_group.php
index b06ae97b25..cfcd708947 100644
--- a/pandora_console/godmode/groups/configure_group.php
+++ b/pandora_console/godmode/groups/configure_group.php
@@ -95,7 +95,7 @@ if ($id_group) {
 }
 
 // Header
-if (defined('METACONSOLE')) {
+if (is_metaconsole() === true) {
     agents_meta_print_header();
     $sec = 'advanced';
 } else {
@@ -105,13 +105,24 @@ if (defined('METACONSOLE')) {
         $title_in_header = __('Create group');
     }
 
-    ui_print_page_header(
+    // Header.
+    ui_print_standard_header(
         $title_in_header,
         'images/group.png',
         false,
         '',
-        true,
-        ''
+        false,
+        [],
+        [
+            [
+                'link'  => '',
+                'label' => __('Profiles'),
+            ],
+            [
+                'link'  => '',
+                'label' => __('Manage agents group'),
+            ],
+        ]
     );
     $sec = 'gagente';
 }
diff --git a/pandora_console/godmode/groups/group_list.php b/pandora_console/godmode/groups/group_list.php
index be1abc90d3..507f21ff9c 100644
--- a/pandora_console/godmode/groups/group_list.php
+++ b/pandora_console/godmode/groups/group_list.php
@@ -333,6 +333,7 @@ $title = __('Groups defined in %s', get_product_name());
 switch ($tab) {
     case 'tree':
         $buttons['tree']['active'] = true;
+        $title .= sprintf(' &raquo; %s', __('Tree view'));
     break;
 
     case 'credbox':
@@ -343,23 +344,38 @@ switch ($tab) {
     case 'groups':
     default:
         $buttons['groups']['active'] = true;
+        $title .= sprintf(' &raquo; %s', __('Table view'));
     break;
 }
 
 // Header.
 if (is_metaconsole() === true) {
     agents_meta_print_header();
-    echo '<div class="notify">';
-    echo __('Edit or delete groups can cause problems with synchronization');
-    echo '</div>';
+    html_print_div(
+        [
+            'class'   => 'notify',
+            'content' => __('Edit or delete groups can cause problems with synchronization'),
+        ]
+    );
 } else {
-    ui_print_page_header(
+    // Header.
+    ui_print_standard_header(
         $title,
         'images/group.png',
         false,
         '',
-        true,
-        $buttons
+        false,
+        $buttons,
+        [
+            [
+                'link'  => '',
+                'label' => __('Profiles'),
+            ],
+            [
+                'link'  => '',
+                'label' => __('Manage agents group'),
+            ],
+        ]
     );
 }
 
@@ -471,7 +487,7 @@ if ($update_group) {
                 $values = [
                     'nombre'      => $name,
                     'icon'        => empty($icon) ? '' : substr($icon, 0, -4),
-                    'parent'      => $id_parent == -1 ? 0 : $id_parent,
+                    'parent'      => ($id_parent == -1) ? 0 : $id_parent,
                     'disabled'    => !$alerts_enabled,
                     'custom_id'   => $custom_id,
                     'id_skin'     => $skin,

From dbb7fe364fc4c433f8e67314782cbe0029fa969e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Gonz=C3=A1lez?= <jose.gonzalez@pandorafms.com>
Date: Fri, 30 Apr 2021 14:35:54 +0200
Subject: [PATCH 19/93] Added standard headers

---
 .../module_library/module_library_view.php    | 19 ++++-
 pandora_console/godmode/setup/os.php          | 74 +++++++++++++------
 2 files changed, 70 insertions(+), 23 deletions(-)

diff --git a/pandora_console/godmode/module_library/module_library_view.php b/pandora_console/godmode/module_library/module_library_view.php
index f69c7779fb..31553a5352 100644
--- a/pandora_console/godmode/module_library/module_library_view.php
+++ b/pandora_console/godmode/module_library/module_library_view.php
@@ -58,12 +58,27 @@ $buttons['view'] = [
 
 
 $tab = get_parameter('tab', 'view');
-if ($tab != 'search_module') {
+if ($tab !== 'search_module') {
     $buttons[$tab]['active'] = true;
 }
 
-ui_print_page_header(__('Module Library').' &raquo; '.__('View'), '', false, 'module_library', true, $buttons);
+$headerTitle = ($tab === 'categories') ? __('Categories') : __('Main view');
 
+// Header.
+ui_print_standard_header(
+    $headerTitle,
+    '',
+    false,
+    'module_library',
+    true,
+    $buttons,
+    [
+        [
+            'link'  => '',
+            'label' => __('Module library'),
+        ],
+    ]
+);
 
 // Styles.
 ui_require_css_file('module_library');
diff --git a/pandora_console/godmode/setup/os.php b/pandora_console/godmode/setup/os.php
index 44888465bf..1be6755749 100644
--- a/pandora_console/godmode/setup/os.php
+++ b/pandora_console/godmode/setup/os.php
@@ -1,17 +1,32 @@
 <?php
+/**
+ * OS Edition
+ *
+ * @category   Server
+ * @package    Pandora FMS
+ * @subpackage Godmode
+ * @version    1.0.0
+ * @license    See below
+ *
+ *    ______                 ___                    _______ _______ ________
+ *   |   __ \.-----.--.--.--|  |.-----.----.-----. |    ___|   |   |     __|
+ *  |    __/|  _  |     |  _  ||  _  |   _|  _  | |    ___|       |__     |
+ * |___|   |___._|__|__|_____||_____|__| |___._| |___|   |__|_|__|_______|
+ *
+ * ============================================================================
+ * Copyright (c) 2005-2021 Artica Soluciones Tecnologicas
+ * Please see http://pandorafms.org for full contribution list
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation for version 2.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * ============================================================================
+ */
 
-// Pandora FMS - http://pandorafms.com
-// ==================================================
-// Copyright (c) 2005-2021 Artica Soluciones Tecnologicas
-// Please see http://pandorafms.org for full contribution list
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation 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.
-// Load global vars
+// Begin.
 global $config;
 
 check_login();
@@ -45,8 +60,8 @@ if ($idOS) {
 $message = '';
 
 switch ($action) {
-    default:
     case 'new':
+    default:
         $actionHidden = 'save';
         $textButton = __('Create');
         $classButton = 'class="sub next"';
@@ -183,12 +198,31 @@ $buttons = [
 
 $buttons[$tab]['active'] = true;
 
-if (!is_metaconsole()) {
+$headerTitle = ($tab === 'builder') ? __('Edit OS') : __('List of OS');
+
+if (is_metaconsole() === false) {
     // Header.
-    ui_print_page_header(__('Edit OS'), '', false, '', true, $buttons);
+    ui_print_standard_header(
+        $headerTitle,
+        '',
+        false,
+        '',
+        true,
+        $buttons,
+        [
+            [
+                'link'  => '',
+                'label' => __('Servers'),
+            ],
+            [
+                'link'  => '',
+                'label' => __('Edit OS'),
+            ],
+        ]
+    );
 }
 
-if (!empty($id_message)) {
+if (empty($id_message) === false) {
     switch ($id_message) {
         case 1:
             echo ui_print_success_message(__('Success creating OS'), '', true);
@@ -226,13 +260,11 @@ if (!empty($id_message)) {
 
 switch ($tab) {
     case 'list':
+    default:
         include_once $config['homedir'].'/godmode/setup/os.list.php';
-    return;
+    break;
 
-        break;
     case 'builder':
         include_once $config['homedir'].'/godmode/setup/os.builder.php';
-    return;
-
-        break;
+    break;
 }

From 0dc1ec449ca407c3b81d7b8493d2a18b7d16aad2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Gonz=C3=A1lez?= <jose.gonzalez@pandorafms.com>
Date: Fri, 30 Apr 2021 14:44:03 +0200
Subject: [PATCH 20/93] Added standard headers

---
 pandora_console/operation/users/user_edit.php |  6 +++---
 .../operation/users/user_edit_header.php      | 20 ++++++++++++-------
 .../users/user_edit_notifications.php         |  1 +
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/pandora_console/operation/users/user_edit.php b/pandora_console/operation/users/user_edit.php
index 40bc8aa2b4..a8aaa5936e 100644
--- a/pandora_console/operation/users/user_edit.php
+++ b/pandora_console/operation/users/user_edit.php
@@ -1,9 +1,8 @@
 <?php
 /**
- * Extension to manage a list of gateways and the node address where they should
- * point to.
+ * User edition.
  *
- * @category   Extensions
+ * @category   Operation
  * @package    Pandora FMS
  * @subpackage Community
  * @version    1.0.0
@@ -29,6 +28,7 @@
 
 global $config;
 
+$headerTitle = __('User detail editor');
 // Load the header.
 require $config['homedir'].'/operation/users/user_edit_header.php';
 
diff --git a/pandora_console/operation/users/user_edit_header.php b/pandora_console/operation/users/user_edit_header.php
index 8f1d3e9a02..4e28945e04 100644
--- a/pandora_console/operation/users/user_edit_header.php
+++ b/pandora_console/operation/users/user_edit_header.php
@@ -113,17 +113,23 @@ if (is_metaconsole()) {
         $tab_name = 'User Notifications';
     }
 
-    ui_print_page_header(
-        __('User detail editor'),
+    // Header.
+    ui_print_standard_header(
+        $headerTitle,
         'images/user.png',
         false,
         $helpers,
         false,
         $buttons,
-        false,
-        '',
-        GENERIC_SIZE_TEXT,
-        '',
-        __('Workspace').ui_print_breadcrums($tab_name)
+        [
+            [
+                'link'  => '',
+                'label' => __('Workspace'),
+            ],
+            [
+                'link'  => '',
+                'label' => __('Edit user'),
+            ],
+        ]
     );
 }
diff --git a/pandora_console/operation/users/user_edit_notifications.php b/pandora_console/operation/users/user_edit_notifications.php
index c7cd4bb1b5..4228c16543 100644
--- a/pandora_console/operation/users/user_edit_notifications.php
+++ b/pandora_console/operation/users/user_edit_notifications.php
@@ -33,6 +33,7 @@ global $config;
 require_once $config['homedir'].'/include/functions_notifications.php';
 
 // Load the header.
+$headerTitle = __('User notifications');
 require $config['homedir'].'/operation/users/user_edit_header.php';
 
 if (get_parameter('change_label', 0)) {

From e49edc93d6554d8f124669e379dd9b12685a07fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Gonz=C3=A1lez?= <jose.gonzalez@pandorafms.com>
Date: Tue, 4 May 2021 13:48:13 +0200
Subject: [PATCH 21/93] Fixed missed parameter

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

diff --git a/pandora_console/include/class/AgentWizard.class.php b/pandora_console/include/class/AgentWizard.class.php
index e7486c3cd8..b72b2985f9 100644
--- a/pandora_console/include/class/AgentWizard.class.php
+++ b/pandora_console/include/class/AgentWizard.class.php
@@ -2086,7 +2086,7 @@ class AgentWizard extends HTML
                         $tmp->id_modulo(MODULE_PLUGIN);
 
                         if ($this->wizardSection === 'snmp_interfaces_explorer'
-                            && empty($candidate['macros']) === true
+                            && empty($candidate['macros']) === false
                         ) {
                             // Use definition provided.
                             $tmp->id_plugin($candidate['id_plugin']);

From fdeaf529121afe60000dc21e62ef5336da127204 Mon Sep 17 00:00:00 2001
From: "alejandro.campos@artica.es" <alejandro.campos@artica.es>
Date: Fri, 7 May 2021 14:29:29 +0200
Subject: [PATCH 22/93] implemented user level authentication for integria ims
 integration

---
 pandora_console/extras/mr/47.sql              |   6 +
 .../pandoradb_migrate_6.0_to_7.0.mysql.sql    |   2 +
 .../godmode/agentes/agent_incidents.php       |   2 +-
 .../godmode/alerts/configure_alert_action.php |   2 +-
 .../godmode/setup/setup_integria.php          |  49 +++++--
 .../include/ajax/integria_incidents.ajax.php  |   2 +-
 pandora_console/include/functions_config.php  |   8 ++
 pandora_console/include/functions_graph.php   |  14 +-
 .../include/functions_integriaims.php         |  47 ++++++-
 pandora_console/include/styles/pandora.css    |   3 +-
 .../configure_integriaims_incident.php        |  18 +--
 .../dashboard_detail_integriaims_incident.php |  22 ++--
 .../incidents/list_integriaims_incidents.php  |  10 +-
 pandora_console/operation/users/user_edit.php | 123 +++++++++++++++++-
 pandora_console/pandoradb.sql                 |   2 +
 15 files changed, 257 insertions(+), 53 deletions(-)
 create mode 100644 pandora_console/extras/mr/47.sql

diff --git a/pandora_console/extras/mr/47.sql b/pandora_console/extras/mr/47.sql
new file mode 100644
index 0000000000..99597d995f
--- /dev/null
+++ b/pandora_console/extras/mr/47.sql
@@ -0,0 +1,6 @@
+START TRANSACTION;
+
+ALTER TABLE `tusuario` ADD COLUMN `integria_user_level_user` VARCHAR(60);
+ALTER TABLE `tusuario` ADD COLUMN `integria_user_level_pass` VARCHAR(45);
+
+COMMIT;
diff --git a/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql b/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
index fce9be7024..b8242b07e8 100644
--- a/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
+++ b/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
@@ -1527,6 +1527,8 @@ ALTER TABLE `tusuario` MODIFY COLUMN `default_event_filter` int(10) unsigned NOT
 	ADD CONSTRAINT `fk_filter_id` FOREIGN KEY `fk_filter_id` (`id_filter`) REFERENCES `tevent_filter` (`id_filter`) ON DELETE SET NULL ON UPDATE RESTRICT,
 	DROP FOREIGN KEY `fk_id_filter`,
 	DROP INDEX `fk_id_filter`;
+ALTER TABLE `tusuario` ADD COLUMN `integria_user_level_user` VARCHAR(60);
+ALTER TABLE `tusuario` ADD COLUMN `integria_user_level_pass` VARCHAR(45);
 
 
 -- ---------------------------------------------------------------------
diff --git a/pandora_console/godmode/agentes/agent_incidents.php b/pandora_console/godmode/agentes/agent_incidents.php
index 16cdd9370c..c92dca6fab 100644
--- a/pandora_console/godmode/agentes/agent_incidents.php
+++ b/pandora_console/godmode/agentes/agent_incidents.php
@@ -55,7 +55,7 @@ $params = [
     agents_get_name($id_agent),
 ];
 
-$result = integria_api_call($config['integria_hostname'], $config['integria_user'], $config['integria_pass'], $config['integria_api_pass'], 'get_incidents', $params, false, 'json', ',');
+$result = integria_api_call(null, null, null, null, 'get_incidents', $params, false, 'json', ',');
 
 $result = json_decode($result, true);
 
diff --git a/pandora_console/godmode/alerts/configure_alert_action.php b/pandora_console/godmode/alerts/configure_alert_action.php
index 459b12d1ac..e6e7dcfbad 100644
--- a/pandora_console/godmode/alerts/configure_alert_action.php
+++ b/pandora_console/godmode/alerts/configure_alert_action.php
@@ -43,7 +43,7 @@ if (is_ajax()) {
     if ($get_integria_ticket_custom_types) {
         $ticket_type_id = get_parameter('ticket_type_id');
 
-        $api_call = integria_api_call($config['integria_hostname'], $config['integria_user'], $config['integria_pass'], $config['integria_api_pass'], 'get_incident_fields', $ticket_type_id, false, 'json');
+        $api_call = integria_api_call(null, null, null, null, 'get_incident_fields', $ticket_type_id, false, 'json');
 
         echo $api_call;
         return;
diff --git a/pandora_console/godmode/setup/setup_integria.php b/pandora_console/godmode/setup/setup_integria.php
index 9e63fb3639..7d87e6f5c3 100644
--- a/pandora_console/godmode/setup/setup_integria.php
+++ b/pandora_console/godmode/setup/setup_integria.php
@@ -41,8 +41,10 @@ if (is_ajax()) {
     $integria_pass = get_parameter('integria_pass', '');
     $integria_api_hostname = get_parameter('api_hostname', '');
     $integria_api_pass = get_parameter('api_pass', '');
+    $user_level_conf = get_parameter('user_level_conf', 0);
+    $user_level_conf_bool = $user_level_conf === 'true' ? true : false;
 
-    $login_result = integria_api_call($integria_api_hostname, $integria_user, $integria_pass, $integria_api_pass, 'get_login', []);
+    $login_result = integria_api_call($integria_api_hostname, $integria_user, $integria_pass, $integria_api_pass, 'get_login', [], false, '', '', $user_level_conf_bool);
 
     if ($login_result != false) {
         echo json_encode(['login' => 1]);
@@ -53,7 +55,7 @@ if (is_ajax()) {
     return;
 }
 
-$has_connection = integria_api_call($config['integria_hostname'], $config['integria_user'], $config['integria_pass'], $config['integria_api_pass'], 'get_login', []);
+$has_connection = integria_api_call(null, null, null, null, 'get_login', []);
 
 if ($has_connection === false && $config['integria_enabled']) {
     ui_print_error_message(__('Integria IMS API is not reachable'));
@@ -86,7 +88,7 @@ if (get_parameter('update_config', 0) == 1) {
             );
         }
 
-        $ticket_types = integria_api_call($config['integria_hostname'], $config['integria_user'], $config['integria_pass'], $config['integria_api_pass'], 'get_types', '', false, 'json');
+        $ticket_types = integria_api_call(null, null, null, null, 'get_types', '', false, 'json');
 
         $types_string = '';
 
@@ -216,19 +218,19 @@ $integria_users_values = [];
 $integria_types_values = [];
 $integria_status_values = [];
 
-$integria_groups_csv = integria_api_call($config['integria_hostname'], $config['integria_user'], $config['integria_pass'], $config['integria_api_pass'], 'get_groups', []);
+$integria_groups_csv = integria_api_call(null, null, null, null, 'get_groups', []);
 
 get_array_from_csv_data_pair($integria_groups_csv, $integria_group_values);
 
-$integria_status_csv = integria_api_call($config['integria_hostname'], $config['integria_user'], $config['integria_pass'], $config['integria_api_pass'], 'get_incidents_status', []);
+$integria_status_csv = integria_api_call(null, null, null, null, 'get_incidents_status', []);
 
 get_array_from_csv_data_pair($integria_status_csv, $integria_status_values);
 
-$integria_criticity_levels_csv = integria_api_call($config['integria_hostname'], $config['integria_user'], $config['integria_pass'], $config['integria_api_pass'], 'get_incident_priorities', []);
+$integria_criticity_levels_csv = integria_api_call(null, null, null, null, 'get_incident_priorities', []);
 
 get_array_from_csv_data_pair($integria_criticity_levels_csv, $integria_criticity_values);
 
-$integria_users_csv = integria_api_call($config['integria_hostname'], $config['integria_user'], $config['integria_pass'], $config['integria_api_pass'], 'get_users', []);
+$integria_users_csv = integria_api_call(null, null, null, null, 'get_users', []);
 
 $csv_array = explode("\n", $integria_users_csv);
 
@@ -238,7 +240,7 @@ foreach ($csv_array as $csv_line) {
     }
 }
 
-$integria_types_csv = integria_api_call($config['integria_hostname'], $config['integria_user'], $config['integria_pass'], $config['integria_api_pass'], 'get_types', []);
+$integria_types_csv = integria_api_call(null, null, null, null, 'get_types', []);
 
 get_array_from_csv_data_pair($integria_types_csv, $integria_types_values);
 
@@ -267,6 +269,12 @@ $table_remote->class = 'databox filters';
 $table_remote->size['name'] = '30%';
 $table_remote->style['name'] = 'font-weight: bold';
 
+// Enable eHorus user configuration.
+$row = [];
+$row['name'] = ('Integria configuration at user level');
+$row['control'] = html_print_checkbox_switch('integria_user_level_conf', 1, $config['integria_user_level_conf'], true);
+$table_remote->data['integria_user_level_conf'] = $row;
+
 // Integria user.
 $row = [];
 $row['name'] = __('User');
@@ -632,6 +640,29 @@ echo '</form>';
 
 <script type="text/javascript">
 
+    if($('input:checkbox[name="integria_user_level_conf"]').is(':checked'))
+    {
+        $('#integria-remote-setup-integria_user').hide();
+        $('#integria-remote-setup-integria_pass').hide()
+    }
+
+    var handleUserLevel = function(event) {
+        var is_checked = $('input:checkbox[name="integria_enabled"]').is(':checked');
+        var is_checked_userlevel = $('input:checkbox[name="integria_user_level_conf"]').is(':checked');
+        
+        if (event.target.value == '1' && is_checked && !is_checked_userlevel) {
+            showUserPass();
+            $('input:checkbox[name="integria_user_level_conf"]').attr('checked', true);
+        }
+        else {
+            hideUserPass();
+            $('input:checkbox[name="integria_user_level_conf"]').attr('checked', false);
+        };
+    }
+
+    $('input:checkbox[name="integria_enabled"]').change(handleEnable);
+    $('input:checkbox[name="integria_user_level_conf"]').change(handleUserLevel);
+
     if(!$('input:checkbox[name="integria_enabled"]').is(':checked')) {
         $('#form_remote').hide();
         $('#form_custom_response_settings').hide();
@@ -723,6 +754,7 @@ echo '</form>';
         var integria_pass = $('input[name=integria_pass]').val();
         var api_hostname = $('input[name=integria_hostname]').val();
         var api_pass = $('input[name=integria_api_pass]').val();
+        var user_level_conf = $('input:checkbox[name="integria_user_level_conf"]').is(':checked');
 
         var data = {
             page: 'godmode/setup/setup_integria',
@@ -731,6 +763,7 @@ echo '</form>';
             integria_pass: integria_pass,
             api_hostname: api_hostname,
             api_pass: api_pass,
+            user_level_conf: user_level_conf,
         }
 
         // AJAX call to check API connection.
diff --git a/pandora_console/include/ajax/integria_incidents.ajax.php b/pandora_console/include/ajax/integria_incidents.ajax.php
index 73fa041b93..7b5bc424ec 100644
--- a/pandora_console/include/ajax/integria_incidents.ajax.php
+++ b/pandora_console/include/ajax/integria_incidents.ajax.php
@@ -35,7 +35,7 @@ if (check_login()) {
     $search_term = get_parameter('search_term', '');
 
     if ($get_users) {
-        $integria_users_csv = integria_api_call($config['integria_hostname'], $config['integria_user'], $config['integria_pass'], $config['integria_api_pass'], 'get_users', []);
+        $integria_users_csv = integria_api_call(null, null, null, null, 'get_users', []);
 
         $csv_array = explode("\n", $integria_users_csv);
 
diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php
index e794643148..90f79c1b3f 100644
--- a/pandora_console/include/functions_config.php
+++ b/pandora_console/include/functions_config.php
@@ -1642,6 +1642,10 @@ function config_update_config()
                 break;
 
                 case 'integria':
+                    if (!config_update_value('integria_user_level_conf', (int) get_parameter('integria_user_level_conf', 0))) {
+                        $error_update[] = __('Integria user login');
+                    }
+
                     if (!config_update_value('integria_enabled', (int) get_parameter('integria_enabled', 0))) {
                         $error_update[] = __('Enable Integria IMS');
                     }
@@ -3244,6 +3248,10 @@ function config_process_config()
     }
 
     // Integria.
+    if (!isset($config['integria_user_level_conf'])) {
+        config_update_value('integria_user_level_conf', 0);
+    }
+
     if (!isset($config['integria_enabled'])) {
         config_update_value('integria_enabled', 0);
     }
diff --git a/pandora_console/include/functions_graph.php b/pandora_console/include/functions_graph.php
index 0546945b40..fea7a23609 100644
--- a/pandora_console/include/functions_graph.php
+++ b/pandora_console/include/functions_graph.php
@@ -2978,9 +2978,9 @@ function grafico_incidente_prioridad()
 {
     global $config;
 
-    $integria_ticket_count_by_priority_json = integria_api_call($config['integria_hostname'], $config['integria_user'], $config['integria_pass'], $config['integria_api_pass'], 'get_tickets_count', ['prioridad', 30], false, '', '|;|');
+    $integria_ticket_count_by_priority_json = integria_api_call(null, null, null, null, 'get_tickets_count', ['prioridad', 30], false, '', '|;|');
 
-    $integria_priorities_map_json = integria_api_call($config['integria_hostname'], $config['integria_user'], $config['integria_pass'], $config['integria_api_pass'], 'get_incident_priorities', '', false, 'json');
+    $integria_priorities_map_json = integria_api_call(null, null, null, null, 'get_incident_priorities', '', false, 'json');
 
     $integria_ticket_count_by_priority = json_decode($integria_ticket_count_by_priority_json, true);
     $integria_priorities_map = json_decode($integria_priorities_map_json, true);
@@ -3023,9 +3023,9 @@ function graph_incidents_status()
 {
     global $config;
 
-    $integria_ticket_count_by_status_json = integria_api_call($config['integria_hostname'], $config['integria_user'], $config['integria_pass'], $config['integria_api_pass'], 'get_tickets_count', ['estado', 30], false, '', '|;|');
+    $integria_ticket_count_by_status_json = integria_api_call(null, null, null, null, 'get_tickets_count', ['estado', 30], false, '', '|;|');
 
-    $integria_status_map_json = integria_api_call($config['integria_hostname'], $config['integria_user'], $config['integria_pass'], $config['integria_api_pass'], 'get_incidents_status', '', false, 'json');
+    $integria_status_map_json = integria_api_call(null, null, null, null, 'get_incidents_status', '', false, 'json');
 
     $integria_ticket_count_by_status = json_decode($integria_ticket_count_by_status_json, true);
     $integria_status_map = json_decode($integria_status_map_json, true);
@@ -3068,9 +3068,9 @@ function graphic_incident_group()
 {
     global $config;
 
-    $integria_ticket_count_by_group_json = integria_api_call($config['integria_hostname'], $config['integria_user'], $config['integria_pass'], $config['integria_api_pass'], 'get_tickets_count', ['id_grupo', 30], false, '', '|;|');
+    $integria_ticket_count_by_group_json = integria_api_call(null, null, null, null, 'get_tickets_count', ['id_grupo', 30], false, '', '|;|');
 
-    $integria_group_map_json = integria_api_call($config['integria_hostname'], $config['integria_user'], $config['integria_pass'], $config['integria_api_pass'], 'get_groups', '', false, 'json');
+    $integria_group_map_json = integria_api_call(null, null, null, null, 'get_groups', '', false, 'json');
 
     $integria_ticket_count_by_group = json_decode($integria_ticket_count_by_group_json, true);
     $integria_group_map = json_decode($integria_group_map_json, true);
@@ -3114,7 +3114,7 @@ function graphic_incident_user()
 {
     global $config;
 
-    $integria_ticket_count_by_user_json = integria_api_call($config['integria_hostname'], $config['integria_user'], $config['integria_pass'], $config['integria_api_pass'], 'get_tickets_count', ['id_usuario', 30], false, '', '|;|');
+    $integria_ticket_count_by_user_json = integria_api_call(null, null, null, null, 'get_tickets_count', ['id_usuario', 30], false, '', '|;|');
 
     $integria_ticket_count_by_user = json_decode($integria_ticket_count_by_user_json, true);
 
diff --git a/pandora_console/include/functions_integriaims.php b/pandora_console/include/functions_integriaims.php
index 436e189a9d..fd7e1b7c7c 100644
--- a/pandora_console/include/functions_integriaims.php
+++ b/pandora_console/include/functions_integriaims.php
@@ -21,6 +21,7 @@ global $config;
 
 require_once $config['homedir'].'/include/functions_ui.php';
 require_once $config['homedir'].'/include/functions_html.php';
+require_once $config['homedir'].'/include/functions_users.php';
 require_once $config['homedir'].'/include/functions.php';
 
 
@@ -137,7 +138,7 @@ function integriaims_get_details($details, $detail_index=false)
         break;
     }
 
-    $api_call = integria_api_call($config['integria_hostname'], $config['integria_user'], $config['integria_pass'], $config['integria_api_pass'], $operation);
+    $api_call = integria_api_call(null, null, null, null, $operation);
     $result = [];
     get_array_from_csv_data_pair($api_call, $result);
 
@@ -165,8 +166,42 @@ function integriaims_get_details($details, $detail_index=false)
  *
  * @return boolean True if API request succeeded, false if API request failed.
  */
-function integria_api_call($api_hostname, $user, $user_pass, $api_pass, $operation, $params='', $show_credentials_error_msg=false, $return_type='', $token='')
+function integria_api_call($api_hostname=null, $user=null, $user_pass=null, $api_pass=null, $operation, $params='', $show_credentials_error_msg=false, $return_type='', $token='', $user_level_conf=null)
 {
+    global $config;
+
+    if ($user_level_conf === null) {
+        $user_level_conf = (bool) $config['integria_user_level_conf'];
+    }
+
+    $user_info = users_get_user_by_id($config['id_user']);
+
+    // API access data.
+    if ($api_hostname === null) {
+        $api_hostname = $config['integria_hostname'];
+    }
+
+    if ($api_pass === null) {
+        $api_pass = $config['integria_api_pass'];
+    }
+
+    // Integria user and password.
+    if ($user === null || $user_level_conf === true) {
+        $user = $config['integria_user'];
+
+        if ($user_level_conf === true) {
+            $user = $user_info['integria_user_level_user'];
+        }
+    }
+
+    if ($user_pass === null || $user_level_conf === true) {
+        $user_pass = $config['integria_pass'];
+
+        if ($user_level_conf === true) {
+            $user_pass = $user_info['integria_user_level_pass'];
+        }
+    }
+
     if (is_array($params)) {
         $params = implode($token, $params);
     }
@@ -352,10 +387,10 @@ function get_tickets_integriaims($tickets_filters)
 
     // API call.
     $result_api_call_list = integria_api_call(
-        $config['integria_hostname'],
-        $config['integria_user'],
-        $config['integria_pass'],
-        $config['integria_api_pass'],
+        null,
+        null,
+        null,
+        null,
         'get_incidents',
         [
             $incident_text,
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index 740e5c6053..1eb82bc72c 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -4877,7 +4877,8 @@ input:checked + .p-slider:before {
 
 .user_edit_first_row,
 .user_edit_second_row,
-.user_edit_third_row {
+.user_edit_third_row,
+.user_edit_fourth_row {
   margin-bottom: 20px;
 }
 
diff --git a/pandora_console/operation/incidents/configure_integriaims_incident.php b/pandora_console/operation/incidents/configure_integriaims_incident.php
index 50c3452fb5..c86fa428da 100644
--- a/pandora_console/operation/incidents/configure_integriaims_incident.php
+++ b/pandora_console/operation/incidents/configure_integriaims_incident.php
@@ -42,7 +42,7 @@ if ($config['integria_enabled'] == 0) {
 }
 
 // Check connection to Integria IMS API.
-$has_connection = integria_api_call($config['integria_hostname'], $config['integria_user'], $config['integria_pass'], $config['integria_api_pass'], 'get_login');
+$has_connection = integria_api_call(null, null, null, null, 'get_login');
 
 if ($has_connection === false) {
     ui_print_error_message(__('Integria IMS API is not reachable'));
@@ -59,19 +59,19 @@ $integria_users_values = [];
 $integria_types_values = [];
 $integria_status_values = [];
 
-$integria_groups_csv = integria_api_call($config['integria_hostname'], $config['integria_user'], $config['integria_pass'], $config['integria_api_pass'], 'get_groups');
+$integria_groups_csv = integria_api_call(null, null, null, null, 'get_groups');
 
 get_array_from_csv_data_pair($integria_groups_csv, $integria_group_values);
 
-$integria_status_csv = integria_api_call($config['integria_hostname'], $config['integria_user'], $config['integria_pass'], $config['integria_api_pass'], 'get_incidents_status');
+$integria_status_csv = integria_api_call(null, null, null, null, 'get_incidents_status');
 
 get_array_from_csv_data_pair($integria_status_csv, $integria_status_values);
 
-$integria_criticity_levels_csv = integria_api_call($config['integria_hostname'], $config['integria_user'], $config['integria_pass'], $config['integria_api_pass'], 'get_incident_priorities');
+$integria_criticity_levels_csv = integria_api_call(null, null, null, null, 'get_incident_priorities');
 
 get_array_from_csv_data_pair($integria_criticity_levels_csv, $integria_criticity_values);
 
-$integria_users_csv = integria_api_call($config['integria_hostname'], $config['integria_user'], $config['integria_pass'], $config['integria_api_pass'], 'get_users');
+$integria_users_csv = integria_api_call(null, null, null, null, 'get_users');
 
 $csv_array = explode("\n", $integria_users_csv);
 
@@ -81,7 +81,7 @@ foreach ($csv_array as $csv_line) {
     }
 }
 
-$integria_types_csv = integria_api_call($config['integria_hostname'], $config['integria_user'], $config['integria_pass'], $config['integria_api_pass'], 'get_types');
+$integria_types_csv = integria_api_call(null, null, null, null, 'get_types');
 
 get_array_from_csv_data_pair($integria_types_csv, $integria_types_values);
 
@@ -105,7 +105,7 @@ $incident_content = str_replace(',', ':::', $incident_content);
 // Perform action.
 if ($create_incident === true) {
     // Call Integria IMS API method to create an incident.
-    $result_api_call = integria_api_call($config['integria_hostname'], $incident_creator, $config['integria_pass'], $config['integria_api_pass'], 'create_incident', [$incident_title, $incident_group_id, $incident_criticity_id, $incident_content, '', $incident_type, '', $incident_owner, '0', $incident_status], false, '', ',');
+    $result_api_call = integria_api_call(null, null, null, null, 'create_incident', [$incident_title, $incident_group_id, $incident_criticity_id, $incident_content, '', $incident_type, '', $incident_owner, '0', $incident_status], false, '', ',');
 
     // Necessary to explicitly set true if not false because function returns api call result in case of success instead of true value.
     $incident_created_ok = ($result_api_call != false) ? true : false;
@@ -117,7 +117,7 @@ if ($create_incident === true) {
     );
 } else if ($update_incident === true) {
     // Call Integria IMS API method to update an incident.
-    $result_api_call = integria_api_call($config['integria_hostname'], $config['integria_user'], $config['integria_pass'], $config['integria_api_pass'], 'update_incident', [$incident_id_edit, $incident_title, $incident_content, '', $incident_group_id, $incident_criticity_id, 0, $incident_status, $incident_owner, 0, $incident_type], false, '', ',');
+    $result_api_call = integria_api_call(null, null, null, null, 'update_incident', [$incident_id_edit, $incident_title, $incident_content, '', $incident_group_id, $incident_criticity_id, 0, $incident_status, $incident_owner, 0, $incident_type], false, '', ',');
 
     // Necessary to explicitly set true if not false because function returns api call result in case of success instead of true value.
     $incident_updated_ok = ($result_api_call != false) ? true : false;
@@ -132,7 +132,7 @@ if ($create_incident === true) {
 // If incident id is specified, retrieve incident values from api to populate combos with such values.
 if ($update) {
     // Call Integria IMS API method to get details of an incident given its id.
-    $result_api_call = integria_api_call($config['integria_hostname'], $config['integria_user'], $config['integria_pass'], $config['integria_api_pass'], 'get_incident_details', [$incident_id_edit], false, '', ',');
+    $result_api_call = integria_api_call(null, null, null, null, 'get_incident_details', [$incident_id_edit], false, '', ',');
 
     // API call does not return indexes, therefore future modifications of API function in Integria IMS may lead to inconsistencies when accessing resulting array in this file.
     $incident_details_separator = explode(',', $result_api_call);
diff --git a/pandora_console/operation/incidents/dashboard_detail_integriaims_incident.php b/pandora_console/operation/incidents/dashboard_detail_integriaims_incident.php
index c4d7cb8617..596a336360 100644
--- a/pandora_console/operation/incidents/dashboard_detail_integriaims_incident.php
+++ b/pandora_console/operation/incidents/dashboard_detail_integriaims_incident.php
@@ -32,7 +32,7 @@ if ($config['integria_enabled'] == 0) {
 }
 
 // Check connection to Integria IMS API.
-$has_connection = integria_api_call($config['integria_hostname'], $config['integria_user'], $config['integria_pass'], $config['integria_api_pass'], 'get_login', []);
+$has_connection = integria_api_call(null, null, null, null, 'get_login', []);
 
 if ($has_connection === false) {
     ui_print_error_message(__('Integria IMS API is not reachable'));
@@ -46,10 +46,10 @@ ui_require_css_file('integriaims');
 $incident_id = (int) get_parameter('incident_id');
 // API call.
 $result_api_call_list = integria_api_call(
-    $config['integria_hostname'],
-    $config['integria_user'],
-    $config['integria_pass'],
-    $config['integria_api_pass'],
+    null,
+    null,
+    null,
+    null,
     'get_incident_details',
     [$incident_id]
 );
@@ -159,7 +159,7 @@ if ($upload_file && ($_FILES['userfile']['name'] != '')) {
 
         $filecontent = base64_encode(file_get_contents($_FILES['userfile']['tmp_name']));
 
-        $result_api_call = integria_api_call($config['integria_hostname'], $config['integria_user'], $config['integria_pass'], $config['integria_api_pass'], 'attach_file', [$incident_id, $filename, $filesize, $filedescription, $filecontent], false, '', ';');
+        $result_api_call = integria_api_call(null, null, null, null, 'attach_file', [$incident_id, $filename, $filesize, $filedescription, $filecontent], false, '', ';');
 
         // API method returns '0' string if success.
         $file_added = ($result_api_call === '0') ? true : false;
@@ -176,7 +176,7 @@ if ($upload_file && ($_FILES['userfile']['name'] != '')) {
 
 // Delete file.
 if (isset($_GET['delete_file'])) {
-    $result_api_call = integria_api_call($config['integria_hostname'], $config['integria_user'], $config['integria_pass'], $config['integria_api_pass'], 'delete_file', [$delete_file_id]);
+    $result_api_call = integria_api_call(null, null, null, null, 'delete_file', [$delete_file_id]);
 
     $file_deleted = false;
 
@@ -193,7 +193,7 @@ if (isset($_GET['delete_file'])) {
 
 // Download file.
 if (isset($_GET['download_file'])) {
-    $file_base64 = integria_api_call($config['integria_hostname'], $config['integria_user'], $config['integria_pass'], $config['integria_api_pass'], 'download_file', [$download_file_id]);
+    $file_base64 = integria_api_call(null, null, null, null, 'download_file', [$download_file_id]);
     ob_end_clean();
 
     $decoded = base64_decode($file_base64);
@@ -219,7 +219,7 @@ if (isset($_GET['download_file'])) {
 }
 
 // Retrieve files belonging to incident and create list table.
-$result_api_call = integria_api_call($config['integria_hostname'], $config['integria_user'], $config['integria_pass'], $config['integria_api_pass'], 'get_incident_files', [$incident_id]);
+$result_api_call = integria_api_call(null, null, null, null, 'get_incident_files', [$incident_id]);
 
 if ($result_api_call != false && strlen($result_api_call) > 0) {
     $files = [];
@@ -322,7 +322,7 @@ $table_comments_section->data[1][1] .= '<div class="w100p right">'.html_print_su
 
 // Upload comment. If ticket is closed, this action cannot be performed.
 if ($upload_comment && $array_get_incidents[6] != 7) {
-    $result_api_call = integria_api_call($config['integria_hostname'], $config['integria_user'], $config['integria_pass'], $config['integria_api_pass'], 'create_workunit', [$incident_id, $comment_description, '0.00', 0, 1, '0'], false, '', '|;|');
+    $result_api_call = integria_api_call(null, null, null, null, 'create_workunit', [$incident_id, $comment_description, '0.00', 0, 1, '0'], false, '', '|;|');
 
     // API method returns id of new comment if success.
     $comment_added = ($result_api_call >= '0') ? true : false;
@@ -335,7 +335,7 @@ if ($upload_comment && $array_get_incidents[6] != 7) {
 }
 
 // Retrieve comments belonging to incident and create comments table.
-$result_api_call = integria_api_call($config['integria_hostname'], $config['integria_user'], $config['integria_pass'], $config['integria_api_pass'], 'get_incident_workunits', [$incident_id]);
+$result_api_call = integria_api_call(null, null, null, null, 'get_incident_workunits', [$incident_id]);
 
 if ($result_api_call != false && strlen($result_api_call) > 0) {
     $comments = [];
diff --git a/pandora_console/operation/incidents/list_integriaims_incidents.php b/pandora_console/operation/incidents/list_integriaims_incidents.php
index a352300cd2..c6f64750f1 100644
--- a/pandora_console/operation/incidents/list_integriaims_incidents.php
+++ b/pandora_console/operation/incidents/list_integriaims_incidents.php
@@ -43,7 +43,7 @@ if ($config['integria_enabled'] == 0) {
 }
 
 // Check connection to Integria IMS API.
-$has_connection = integria_api_call($config['integria_hostname'], $config['integria_user'], $config['integria_pass'], $config['integria_api_pass'], 'get_login', []);
+$has_connection = integria_api_call(null, null, null, null, 'get_login', []);
 
 if ($has_connection === false) {
     ui_print_error_message(__('Integria IMS API is not reachable'));
@@ -70,10 +70,10 @@ $delete_incident = get_parameter('delete_incident');
 if ($delete_incident) {
     // Call Integria IMS API method to delete an incident.
     $result_api_call_delete = integria_api_call(
-        $config['integria_hostname'],
-        $config['integria_user'],
-        $config['integria_pass'],
-        $config['integria_api_pass'],
+        null,
+        null,
+        null,
+        null,
         'delete_incident',
         [$delete_incident]
     );
diff --git a/pandora_console/operation/users/user_edit.php b/pandora_console/operation/users/user_edit.php
index 40bc8aa2b4..700836960a 100644
--- a/pandora_console/operation/users/user_edit.php
+++ b/pandora_console/operation/users/user_edit.php
@@ -127,7 +127,8 @@ if (isset($_GET['modified']) && !$view_mode) {
     $upd_info['ehorus_user_level_pass'] = get_parameter('ehorus_user_level_pass');
     $upd_info['ehorus_user_level_enabled'] = get_parameter('ehorus_user_level_enabled', 0);
 
-
+    $upd_info['integria_user_level_user'] = get_parameter('integria_user_level_user');
+    $upd_info['integria_user_level_pass'] = get_parameter('integria_user_level_pass');
 
     $is_admin = db_get_value('is_admin', 'tusuario', 'id_user', $id);
 
@@ -729,12 +730,57 @@ if ($config['ehorus_enabled'] && $config['ehorus_user_level_conf']) {
     $row['control'] .= '<span id="test-ehorus-message" class="invisible"></span>';
     $table_remote->data['ehorus_test'] = $row;
 
-    echo '<div class="ehorus_user_conf">';
-
+    echo '<div class="ehorus_user_conf user_edit_fourth_row">';
     html_print_table($table_remote);
      echo '</div>';
 }
 
+if ($config['integria_enabled'] && $config['integria_user_level_conf']) {
+    // Integria IMS user remote login.
+    $table_remote = new StdClass();
+    $table_remote->data = [];
+    $table_remote->width = '100%';
+    $table_remote->id = 'integria-remote-setup';
+    $table_remote->class = 'white_box';
+    $table_remote->size['name'] = '30%';
+    $table_remote->style['name'] = 'font-weight: bold';
+
+    // Integria IMS user level authentication.
+    // Title
+    $row = [];
+    $row['control'] = '<p class="edit_user_labels">'.__('Integria user configuration').': </p>';
+    $table_remote->data['integria_user_level_conf'] = $row;
+
+    // Integria IMS user.
+    $row = [];
+    $row['name'] = __('User');
+    $row['control'] = html_print_input_text('integria_user_level_user', $user_info['integria_user_level_user'], '', 30, 100, true);
+    $table_remote->data['integria_user_level_user'] = $row;
+
+    // Integria IMS pass.
+    $row = [];
+    $row['name'] = __('Password');
+    $row['control'] = html_print_input_password('integria_user_level_pass', io_output_password($user_info['integria_user_level_pass']), '', 30, 100, true);
+    $table_remote->data['integria_user_level_pass'] = $row;
+
+    // Test.
+    $integria_host = db_get_value('value', 'tconfig', 'token', 'integria_hostname');
+    $integria_api_pass = db_get_value('value', 'tconfig', 'token', 'integria_api_pass');
+
+    $row = [];
+    $row['name'] = __('Test');
+    $row['control'] = html_print_button(__('Start'), 'test-integria', false, 'integria_connection_test(&quot;'.$integria_host.'&quot;,'.$integria_api_pass.')', 'class="sub next"', true);
+    $row['control'] .= '&nbsp;<span id="test-integria-spinner" class="invisible">&nbsp;'.html_print_image('images/spinner.gif', true).'</span>';
+    $row['control'] .= '&nbsp;<span id="test-integria-success" class="invisible">&nbsp;'.html_print_image('images/status_sets/default/severity_normal.png', true).'</span>';
+    $row['control'] .= '&nbsp;<span id="test-integria-failure" class="invisible">&nbsp;'.html_print_image('images/status_sets/default/severity_critical.png', true).'</span>';
+    $row['control'] .= '<span id="test-integria-message" class="invisible"></span>';
+    $table_remote->data['integria_test'] = $row;
+
+    echo '<div class="integria_user_conf">';
+    html_print_table($table_remote);
+    echo '</div>';
+}
+
 
 echo '<div class="edit_user_button">';
 if (!$config['user_can_update_info']) {
@@ -1278,4 +1324,75 @@ function ehorus_connection_test(host, port) {
             hideLoadingImage();
         });
     }
+
+function integria_connection_test(api_hostname, api_pass) {
+        var user = $('input#text-integria_user_level_user').val();
+        var pass = $('input#password-integria_user_level_pass').val();
+
+        var badRequestMessage = '<?php echo __('Empty user or password'); ?>';
+        var notFoundMessage = '<?php echo __('User not found'); ?>';
+        var invalidPassMessage = '<?php echo __('Invalid password'); ?>';
+        
+        var hideLoadingImage = function () {
+            $('#test-integria-spinner').hide();
+        }
+        var showLoadingImage = function () {
+            $('#test-integria-spinner').show();
+        }
+        var hideSuccessImage = function () {
+            $('#test-integria-success').hide();
+        }
+        var showSuccessImage = function () {
+            $('#test-integria-success').show();
+        }
+        var hideFailureImage = function () {
+            $('#test-integria-failure').hide();
+        }
+        var showFailureImage = function () {
+            $('#test-integria-failure').show();
+        }
+        var hideMessage = function () {
+            $('#test-integria-message').hide();
+        }
+        var showMessage = function () {
+            $('#test-integria-message').show();
+        }
+        var changeTestMessage = function (message) {
+            $('#test-integria-message').text(message);
+        }
+        
+        hideSuccessImage();
+        hideFailureImage();
+        hideMessage();
+        showLoadingImage();
+
+        $.ajax({
+            url: "ajax.php",
+            type: 'POST',
+            dataType: 'json',
+            data: {
+                page: 'godmode/setup/setup_integria',
+                operation: 'check_api_access',
+                integria_user: user,
+                integria_pass: pass,
+                api_hostname: api_hostname,
+                api_pass: api_pass,
+            }
+        })
+        .done(function(data, textStatus, xhr) {
+            if (data.login == '1') {
+                showSuccessImage();
+            } else {
+                showFailureImage();
+                showMessage();
+            }
+        })
+        .fail(function(xhr, textStatus, errorThrown) {
+            showFailureImage();
+            showMessage();
+        })
+        .always(function(xhr, textStatus) {
+            hideLoadingImage();
+        });
+    }
 </script>
diff --git a/pandora_console/pandoradb.sql b/pandora_console/pandoradb.sql
index be106eef9d..b06ee1709a 100644
--- a/pandora_console/pandoradb.sql
+++ b/pandora_console/pandoradb.sql
@@ -1267,6 +1267,8 @@ CREATE TABLE IF NOT EXISTS `tusuario` (
 	`ehorus_user_level_user` VARCHAR(60),
 	`ehorus_user_level_pass` VARCHAR(45),
 	`ehorus_user_level_enabled` TINYINT(1),
+	`integria_user_level_user` VARCHAR(60),
+	`integria_user_level_pass` VARCHAR(45),
 	CONSTRAINT `fk_filter_id` FOREIGN KEY (`id_filter`) REFERENCES tevent_filter (`id_filter`) ON DELETE SET NULL,
 	UNIQUE KEY `id_user` (`id_user`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;

From a08a69fa916b0391a4987da2ba55624bb2ed71c3 Mon Sep 17 00:00:00 2001
From: Daniel Maya <daniel.maya@artica.es>
Date: Wed, 12 May 2021 12:39:56 +0200
Subject: [PATCH 23/93] #7522 fixed duplicate ip_target

---
 pandora_console/include/functions_modules.php | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pandora_console/include/functions_modules.php b/pandora_console/include/functions_modules.php
index 0a643480f7..1a7548174b 100755
--- a/pandora_console/include/functions_modules.php
+++ b/pandora_console/include/functions_modules.php
@@ -218,7 +218,16 @@ function modules_copy_agent_module_to_agent($id_agent_module, $id_destiny_agent,
         $new_module = $module;
 
         // Rewrite different values
-        $new_module['ip_target'] = agents_get_address($id_destiny_agent);
+        if ($module['id_tipo_modulo'] == MODULE_TYPE_REMOTE_CMD
+            || $module['id_tipo_modulo'] == MODULE_TYPE_REMOTE_CMD_PROC
+            || $module['id_tipo_modulo'] == MODULE_TYPE_REMOTE_CMD_STRING
+            || $module['id_tipo_modulo'] == MODULE_TYPE_REMOTE_CMD_INC
+        ) {
+            $new_module['ip_target'] = $module['ip_target'];
+        } else {
+            $new_module['ip_target'] = agents_get_address($id_destiny_agent);
+        }
+
         $new_module['policy_linked'] = 0;
         $new_module['id_policy_module'] = 0;
 

From b0b50654db8c9596ab5d266a3261203db1a9d0bf Mon Sep 17 00:00:00 2001
From: Ramon Novoa <ramonnovoa@gmail.com>
Date: Wed, 12 May 2021 13:29:59 +0200
Subject: [PATCH 24/93] Revert "Specify -C option to Launch tentacle_server
 when using SSL proxy mode."

This reverts commit ed53b3c67bd57eb3ac4c78c344458bda58158882.

-C is not a valid option for tentacle_server.
---
 pandora_agents/win32/pandora_windows_service.cc | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/pandora_agents/win32/pandora_windows_service.cc b/pandora_agents/win32/pandora_windows_service.cc
index 70ce28b1f1..900694183c 100644
--- a/pandora_agents/win32/pandora_windows_service.cc
+++ b/pandora_agents/win32/pandora_windows_service.cc
@@ -423,7 +423,7 @@ Pandora_Windows_Service::killTentacleProxy() {
 
 int 
 Pandora_Windows_Service::launchTentacleProxy() {
-	string server_ip, server_port, proxy_max_connections, proxy_timeout, server_ssl;
+	string server_ip, server_port, proxy_max_connections, proxy_timeout;
 	string proxy_cmd, proxy_address, proxy_port;
 	PROCESS_INFORMATION pi;
 	STARTUPINFO         si;	
@@ -451,15 +451,6 @@ Pandora_Windows_Service::launchTentacleProxy() {
 			server_port = "41121";
 		}
 
-		server_ssl = conf->getValue("server_ssl");
-
-		if (server_ssl == "1") {
-			proxy_cmd = "tentacle_server.exe -C";
-		}
-		else {
-			proxy_cmd = "tentacle_server.exe";
-		}
-
 		// Proxy address.
 		proxy_address = conf->getValue("proxy_address");
 		if (proxy_address == "") {
@@ -472,7 +463,7 @@ Pandora_Windows_Service::launchTentacleProxy() {
 			proxy_port = "41121";
 		}
 
-		proxy_cmd += " -b " + server_ip + " -g " + server_port + " -c " + proxy_max_connections + " -t " + proxy_timeout + " -a " + proxy_address + " -p " + proxy_port;
+		proxy_cmd = "tentacle_server.exe -b " + server_ip + " -g " + server_port + " -c " + proxy_max_connections + " -t " + proxy_timeout + " -a " + proxy_address + " -p " + proxy_port;
 
 		ZeroMemory (&si, sizeof (si));
 		ZeroMemory (&pi, sizeof (pi));

From 7d7c4db8f4592f4e91d5874d40f4da89aed3b36a Mon Sep 17 00:00:00 2001
From: Ramon Novoa <ramonnovoa@gmail.com>
Date: Wed, 12 May 2021 15:21:44 +0200
Subject: [PATCH 25/93] Revert "Use -C to invoke tentacle_server when using SSL
 proxy mode (see also e8e59f3e3e98)."

This reverts commit f005b00eb64d715ee6eca5d1ac795a56a1be068c.

-C is not a valid option for tentacle_server.
---
 pandora_agents/unix/pandora_agent | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pandora_agents/unix/pandora_agent b/pandora_agents/unix/pandora_agent
index f85a2db72c..4613479ae1 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -2331,9 +2331,6 @@ sub launch_tentacle_proxy () {
 
 			#Execute tentacle server as a daemon
 			my $new_process = "tentacle_server -a ".$Conf{'proxy_address'}." -p ".$Conf{'proxy_port'}." -b ".$Conf{'server_ip'}." -g ".$Conf{'server_port'}." -c ".$Conf{'proxy_max_connection'}." -t ".$Conf{'proxy_timeout'};
-
-			$new_process .= ' -C' if ($Conf{'server_ssl'} eq '1');
-
 			log_message ('setup', 'Proxy mode enabled');
 			exec ($new_process);
 		} 

From d711d713927e5d5e59c9a31c93ed3cca80f70607 Mon Sep 17 00:00:00 2001
From: marcos <marcos.alconada@artica.es>
Date: Thu, 13 May 2021 13:09:42 +0200
Subject: [PATCH 26/93] remove vamos a ver

---
 pandora_console/operation/tree.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pandora_console/operation/tree.php b/pandora_console/operation/tree.php
index 93e1c18813..c7e5097c55 100755
--- a/pandora_console/operation/tree.php
+++ b/pandora_console/operation/tree.php
@@ -444,7 +444,6 @@ enterprise_hook('close_meta_frame');
         .hide()
         .prop("id", "module_details_window")
         .appendTo('body');
-    console.log("vamos a ver");
     function show_module_detail_dialog(module_id, id_agent, server_name, offset, period, module_name) {
         var params = {};
         var f = new Date();

From 40cfe62e9652cdea66b7f832253e154d6f73c56f Mon Sep 17 00:00:00 2001
From: marcos <marcos.alconada@artica.es>
Date: Thu, 13 May 2021 13:14:16 +0200
Subject: [PATCH 27/93] changed bell orange

---
 pandora_console/images/bell_orange.png | Bin 898 -> 432 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/pandora_console/images/bell_orange.png b/pandora_console/images/bell_orange.png
index f9ded2982548ed97d3db221bb5c54b7199509269..e54f00a367d855eb5c6e1d2ec80e02ba4653f018 100644
GIT binary patch
literal 432
zcmV;h0Z;ykP)<h;3K|Lk000e1NJLTq000*N000*V1^@s7mo4Nr0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzQb|NXRCwBAU_b(lAmZmH<NqL<30Vdp
zfG`nE86%MK9!LuSaUwtfA<G)TRG=Gn9$7n9GeH0#fCwXyY9PLkVh55D3P5%PE}zsB
z;YEmX?}7L{j1Le%_!Kr^6K6zI<N&1hqbp+fJIjbIq!_R%hB*tD23$Y@tCNsS+>hiO
zM+Qm&KmbvWfX*oZVg+<@CLHeW2jctaallAK+L{3LY$1xt*sO(u0&LDmAmkS&Qap~V
zn4gehSbjBt<tkhNl)xCV1RW^Y44~YFKt&5+ax7R3nFtDFC_9ksm<0$hnj%IL(ibS+
z=0mv`fPOcm$Z#|Rae)g!><F~%1JQ;<6SxBjp`Zw~-~quD2z9Xoi9tM{*yOE1M*KNY
zly^u4*a{O+DVa}ZiIsq_@F_qpf++wCK#|Kxq>JX`D4z;}hD@MFCQ^U~7pM@~2zA{D
ae0l&BD0uNljDjTq0000<MNUMnLSTX_DxEk0

literal 898
zcmex=<Ns}j76xV}CJ+Jw79e8fU}a@tVdY|HXXD`E;^E=u;^yY%6B6L%6XfIO77!B<
z6c!N`73JX<mk<+?5E2m;VPpoXXJO@JW#ts%<>nP38T>!MAjrWW#2~=TsKme|$jB_n
z`2PswA_fLVRz@&jfC5G)p!?X^IXJnv1sIqZnVFebm_e=us;mXdF|Y`-3Mm>ovIz$!
zvMUve7&T5@$f4}C@t|nX#SbdRNkvVZTw>x9l2WQ_>Kd9_CZ=ZQ7M51dF0O9w9-dyo
zA)#U65s^{JDXD4c8JStdC8cHM6_r)ZEv;?s9i3g1CQq3<ZTgIvvlcC0vUJ(<6)RV5
z+Pr1!w(UE1?mBe%$kAiRPn<k;>GGAU*RJ2VdF$b$$4{O<d;a3(tB;>PfBE|D`;VW$
z7#Wx$-T{&j4<Y$S5a=H!78Yg}c94G<naY8fS&)TQ(U48ZF_1m6P*};Rkwe63;=+vw
zIhBorK8Pk2UE~r|F?p!^5#%MXkBIY76InijdkF5I|F;-;m>Gc)#w^HS&+zN@x8*+`
zuKtl66wmR(xVClaHlcfQ%YWUmE0mId_#kEC`7?$+GV9;0|F}E+quY{yLf6yG&x)>`
zcJAZP=^PFk&wuQ&WcmDQ&U0lM{kO^={xck%b-cGUUiAEeb<-CayXMOtz4~{<{jE-I
z%4aO@_OUNBK9^~qww|eCx!1>Sb05vl<t@#XGMjWQ@~tU%^3!QCV$5frOE)TC_;^nH
zWBmHG{jb$cm!CYFU3BW+xo>;dZjZiQ>wnjN^QZY=lc#-n{&erp#r2ulw`cwSvh~}A
zU-yrTiQSssVp?5&x?<hhTQ^U3mGCWToH(K4K|?)P^TT_y)0b9gdo-Q8#%<xl^)Gf$
zqIjXCIzzI`C*Qb_@qfCl*8i>c{LippR{O#DPZ}@fzrLA&YJXH=|8<eI>-GLK7=OHK
QS?hY}SMl3V_Wy4J0A~(ig8%>k


From 9cde8c345fcc8ef8255a5dd360abcc8ba0a8be4a Mon Sep 17 00:00:00 2001
From: "alejandro.campos@artica.es" <alejandro.campos@artica.es>
Date: Thu, 13 May 2021 13:33:45 +0200
Subject: [PATCH 28/93] removed deprecated incident permissions

---
 pandora_console/extras/mr/47.sql              |   3 +
 .../pandoradb_migrate_6.0_to_7.0.mysql.sql    |   3 +
 pandora_console/general/main_menu.php         |   1 -
 .../godmode/agentes/agent_incidents.php       |   2 +-
 .../godmode/gis_maps/configure_gis_map.php    |   4 +-
 .../godmode/netflow/nf_item_list.php          |   9 -
 .../godmode/setup/setup_netflow.php           |   9 -
 .../godmode/users/configure_profile.php       |  27 +--
 .../godmode/users/profile_list.php            |  27 +--
 .../include/class/NetworkMap.class.php        |   2 +-
 pandora_console/include/functions.php         |  23 +--
 pandora_console/include/functions_api.php     | 186 ++++--------------
 .../include/functions_integriaims.php         |  20 +-
 pandora_console/include/functions_netflow.php |   2 +-
 .../include/functions_networkmap.php          |   2 +-
 pandora_console/include/functions_users.php   |   3 -
 .../configure_integriaims_incident.php        |   7 -
 .../dashboard_detail_integriaims_incident.php |  30 +--
 .../incidents/incident_statistics.php         |   8 +-
 .../incidents/integriaims_export_csv.php      |   8 -
 .../incidents/list_integriaims_incidents.php  |  41 ++--
 pandora_console/operation/menu.php            |  47 ++---
 .../operation/netflow/nf_live_view.php        |   2 +-
 .../operation/search_graphs.getdata.php       |   2 +-
 pandora_console/operation/search_graphs.php   |   2 +-
 pandora_console/operation/search_helps.php    |   2 -
 .../operation/search_maps.getdata.php         |   2 +-
 pandora_console/operation/search_maps.php     |   2 +-
 pandora_console/operation/search_reports.php  |   4 +-
 pandora_console/operation/search_results.php  |   3 +-
 .../operation/snmpconsole/snmp_view.php       |  87 +++-----
 pandora_console/pandoradb.sql                 |   3 -
 pandora_server/util/pandora_manage.pl         |  28 +--
 33 files changed, 156 insertions(+), 445 deletions(-)

diff --git a/pandora_console/extras/mr/47.sql b/pandora_console/extras/mr/47.sql
index 99597d995f..ff25ad522f 100644
--- a/pandora_console/extras/mr/47.sql
+++ b/pandora_console/extras/mr/47.sql
@@ -2,5 +2,8 @@ START TRANSACTION;
 
 ALTER TABLE `tusuario` ADD COLUMN `integria_user_level_user` VARCHAR(60);
 ALTER TABLE `tusuario` ADD COLUMN `integria_user_level_pass` VARCHAR(45);
+ALTER TABLE `tperfil` DROP COLUMN `incident_view`;
+ALTER TABLE `tperfil` DROP COLUMN `incident_edit`;
+ALTER TABLE `tperfil` DROP COLUMN `incident_management`;
 
 COMMIT;
diff --git a/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql b/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
index b8242b07e8..801327f212 100644
--- a/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
+++ b/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
@@ -4027,3 +4027,6 @@ DELETE FROM `tconfig` WHERE `token` = 'ipam_installed';
 
 DELETE FROM `tconfig` WHERE `token` = 'ipam_recon_script_id';
 
+ALTER TABLE `tperfil` DROP COLUMN `incident_view`;
+ALTER TABLE `tperfil` DROP COLUMN `incident_edit`;
+ALTER TABLE `tperfil` DROP COLUMN `incident_management`;
\ No newline at end of file
diff --git a/pandora_console/general/main_menu.php b/pandora_console/general/main_menu.php
index 9a5e4168b4..5a45058c58 100644
--- a/pandora_console/general/main_menu.php
+++ b/pandora_console/general/main_menu.php
@@ -88,7 +88,6 @@ if (check_acl($config['id_user'], 0, 'AW')
     || check_acl($config['id_user'], 0, 'LM')
     || check_acl($config['id_user'], 0, 'UM')
     || check_acl($config['id_user'], 0, 'LW')
-    || check_acl($config['id_user'], 0, 'IW')
     || check_acl($config['id_user'], 0, 'EW')
     || check_acl($config['id_user'], 0, 'DW')
 ) {
diff --git a/pandora_console/godmode/agentes/agent_incidents.php b/pandora_console/godmode/agentes/agent_incidents.php
index c92dca6fab..3917c2f81a 100644
--- a/pandora_console/godmode/agentes/agent_incidents.php
+++ b/pandora_console/godmode/agentes/agent_incidents.php
@@ -39,7 +39,7 @@ $offset = (int) get_parameter('offset', 0);
 
 // See if id_agente is set (either POST or GET, otherwise -1
 $id_agent = (int) get_parameter('id_agente');
-$groups = users_get_groups($config['id_user'], 'IR');
+$groups = users_get_groups($config['id_user'], 'AR');
 $filter = ' AND id_agent = '.$id_agent;
 $url = 'index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&tab=incident&id_agente='.$id_agent;
 
diff --git a/pandora_console/godmode/gis_maps/configure_gis_map.php b/pandora_console/godmode/gis_maps/configure_gis_map.php
index 5b68afaf37..4c921525e6 100644
--- a/pandora_console/godmode/gis_maps/configure_gis_map.php
+++ b/pandora_console/godmode/gis_maps/configure_gis_map.php
@@ -15,7 +15,7 @@ global $config;
 
 check_login();
 
-$gis_w = check_acl($config['id_user'], 0, 'MW');
+$gis_w = check_acl($config['id_user'], 0, 'MW', false, true, true);
 $gis_m = check_acl($config['id_user'], 0, 'MM');
 $access = ($gis_w == true) ? 'MW' : (($gis_m == true) ? 'MM' : 'MW');
 
@@ -490,7 +490,7 @@ if (users_can_manage_group_all('MM') === true) {
 $table->data[2][0] = __('Group');
 $table->data[2][1] = html_print_select_groups(
     false,
-    'IW',
+    'AR',
     $return_all_group,
     'map_group_id',
     $map_group_id,
diff --git a/pandora_console/godmode/netflow/nf_item_list.php b/pandora_console/godmode/netflow/nf_item_list.php
index 558cbb339c..d7a267aed6 100644
--- a/pandora_console/godmode/netflow/nf_item_list.php
+++ b/pandora_console/godmode/netflow/nf_item_list.php
@@ -20,15 +20,6 @@ require_once $config['homedir'].'/include/functions_html.php';
 
 check_login();
 
-if (! check_acl($config['id_user'], 0, 'IW')) {
-    db_pandora_audit(
-        'ACL Violation',
-        'Trying to access event viewer'
-    );
-    include 'general/noaccess.php';
-    return;
-}
-
 // id report
 $id = (int) get_parameter('id');
 
diff --git a/pandora_console/godmode/setup/setup_netflow.php b/pandora_console/godmode/setup/setup_netflow.php
index 33ceb5295f..47d93790b4 100644
--- a/pandora_console/godmode/setup/setup_netflow.php
+++ b/pandora_console/godmode/setup/setup_netflow.php
@@ -24,15 +24,6 @@ require_once 'include/functions_ui.php';
 
 check_login();
 
-if (! check_acl($config['id_user'], 0, 'IR')) {
-    db_pandora_audit(
-        'ACL Violation',
-        'Trying to access netflow setup'
-    );
-    include 'general/noaccess.php';
-    return;
-}
-
 $update = (bool) get_parameter('update');
 
 $table->width = '100%';
diff --git a/pandora_console/godmode/users/configure_profile.php b/pandora_console/godmode/users/configure_profile.php
index e41be191ea..44ef0e6a1e 100644
--- a/pandora_console/godmode/users/configure_profile.php
+++ b/pandora_console/godmode/users/configure_profile.php
@@ -85,11 +85,6 @@ if ($id_profile || $new_profile) {
         // Name
         $name = '';
 
-        // Incidents
-        $incident_view = 0;
-        $incident_edit = 0;
-        $incident_management = 0;
-
         // Agents
         $agent_view = 0;
         $agent_edit = 0;
@@ -148,11 +143,6 @@ if ($id_profile || $new_profile) {
         // Name
         $name = $profile['name'];
 
-        // Incidents
-        $incident_view = (bool) $profile['incident_view'];
-        $incident_edit = (bool) $profile['incident_edit'];
-        $incident_management = (bool) $profile['incident_management'];
-
         // Agents
         $agent_view = (bool) $profile['agent_view'];
         $agent_edit = (bool) $profile['agent_edit'];
@@ -197,7 +187,7 @@ if ($id_profile || $new_profile) {
         );
         enterprise_include_once('include/functions_audit.php');
 
-        $info = 'Name: '.$name.' Incident view: '.$incident_view.' Incident edit: '.$incident_edit.' Incident management: '.$incident_management.' Agent view: '.$agent_view.' Agent edit: '.$agent_edit.' Agent disable: '.$agent_disable.' Alert edit: '.$alert_edit.' Alert management: '.$alert_management.' User management: '.$user_management.' DB management: '.$db_management.' Event view: '.$event_view.' Event edit: '.$event_edit.' Event management: '.$event_management.' Report view: '.$report_view.' Report edit: '.$report_edit.' Report management: '.$report_management.' Network map view: '.$map_view.' Network map edit: '.$map_edit.' Network map management: '.$map_management.' Visual console view: '.$vconsole_view.' Visual console edit: '.$vconsole_edit.' Visual console management: '.$vconsole_management.' '.get_product_name().' Management: '.$pandora_management;
+        $info = 'Name: '.$name.' Agent view: '.$agent_view.' Agent edit: '.$agent_edit.' Agent disable: '.$agent_disable.' Alert edit: '.$alert_edit.' Alert management: '.$alert_management.' User management: '.$user_management.' DB management: '.$db_management.' Event view: '.$event_view.' Event edit: '.$event_edit.' Event management: '.$event_management.' Report view: '.$report_view.' Report edit: '.$report_edit.' Report management: '.$report_management.' Network map view: '.$map_view.' Network map edit: '.$map_edit.' Network map management: '.$map_management.' Visual console view: '.$vconsole_view.' Visual console edit: '.$vconsole_edit.' Visual console management: '.$vconsole_management.' '.get_product_name().' Management: '.$pandora_management;
 
         enterprise_hook('audit_pandora_enterprise', [$id_audit, $info]);
 
@@ -319,21 +309,6 @@ if ($id_profile || $new_profile) {
     $table->data['VM'] = $row;
     $table->data[] = '<hr>';
 
-    // Incidents
-    $row = [];
-    $row['name'] = __('View incidents');
-    $row['input'] = html_print_checkbox('incident_view', 1, $incident_view, true);
-    $table->data['IR'] = $row;
-    $row = [];
-    $row['name'] = __('Edit incidents');
-    $row['input'] = html_print_checkbox('incident_edit', 1, $incident_edit, true, false, 'autoclick_profile_users(\'incident_edit\', \'incident_view\', \'false\')');
-    $table->data['IW'] = $row;
-    $row = [];
-    $row['name'] = __('Manage incidents');
-    $row['input'] = html_print_checkbox('incident_management', 1, $incident_management, true, false, 'autoclick_profile_users(\'incident_management\', \'incident_view\', \'incident_edit\');');
-    $table->data['IM'] = $row;
-    $table->data[] = '<hr>';
-
     $disable_option = 'javascript: return false;';
     if (check_acl($config['id_user'], 0, 'PM') || users_is_admin()) {
         $disable_option = '';
diff --git a/pandora_console/godmode/users/profile_list.php b/pandora_console/godmode/users/profile_list.php
index bd66475968..81973f6df7 100644
--- a/pandora_console/godmode/users/profile_list.php
+++ b/pandora_console/godmode/users/profile_list.php
@@ -107,11 +107,6 @@ if ($delete_profile) {
 if ($create_profile || $update_profile) {
     $name = get_parameter('name');
 
-    // Incidents
-    $incident_view = (bool) get_parameter('incident_view');
-    $incident_edit = (bool) get_parameter('incident_edit');
-    $incident_management = (bool) get_parameter('incident_management');
-
     // Agents
     $agent_view = (bool) get_parameter('agent_view');
     $agent_edit = (bool) get_parameter('agent_edit');
@@ -152,9 +147,6 @@ if ($create_profile || $update_profile) {
 
     $values = [
         'name'                => $name,
-        'incident_view'       => $incident_view,
-        'incident_edit'       => $incident_edit,
-        'incident_management' => $incident_management,
         'agent_view'          => $agent_view,
         'agent_edit'          => $agent_edit,
         'agent_disable'       => $agent_disable,
@@ -183,10 +175,7 @@ if ($update_profile) {
     if ($name) {
         $ret = db_process_sql_update('tperfil', $values, ['id_perfil' => $id_profile]);
         if ($ret !== false) {
-            $info = '{"Name":"'.$incident_view.'",
-				"Incident view":"'.$incident_view.'",
-				"Incident edit":"'.$incident_edit.'",
-				"Incident management":"'.$incident_management.'",
+            $info = '{"Name":"'.$name.'",
 				"Agent view":"'.$agent_view.'",
 				"Agent edit":"'.$agent_edit.'",
 				"Agent disable":"'.$agent_disable.'",
@@ -234,10 +223,7 @@ if ($create_profile) {
 
         if ($ret !== false) {
             ui_print_success_message(__('Successfully created'));
-            $info = '{"Name":"'.$incident_view.'",
-				"Incident view":"'.$incident_view.'",
-				"Incident edit":"'.$incident_edit.'",
-				"Incident management":"'.$incident_management.'",
+            $info = '{"Name":"'.$name.'",
 				"Agent view":"'.$agent_view.'",
 				"Agent edit":"'.$agent_edit.'",
 				"Agent disable":"'.$agent_disable.'",
@@ -289,9 +275,6 @@ $table->align = [];
 
 $table->head['profiles'] = __('Profiles');
 
-$table->head['IR'] = 'IR';
-$table->head['IW'] = 'IW';
-$table->head['IM'] = 'IM';
 $table->head['AR'] = 'AR';
 $table->head['AW'] = 'AW';
 $table->head['AD'] = 'AD';
@@ -317,9 +300,6 @@ $table->head['operations'] = '<span title="Operations">'.__('Op.').'</span>';
 $table->align = array_fill(1, 11, 'center');
 
 $table->size['profiles'] = '200px';
-$table->size['IR'] = '10px';
-$table->size['IW'] = '10px';
-$table->size['IM'] = '10px';
 $table->size['AR'] = '10px';
 $table->size['AW'] = '10px';
 $table->size['AD'] = '10px';
@@ -358,9 +338,6 @@ $img = html_print_image(
 
 foreach ($profiles as $profile) {
     $data['profiles'] = '<a href="index.php?sec='.$sec.'&amp;sec2=godmode/users/configure_profile&id='.$profile['id_perfil'].'&pure='.$pure.'">'.$profile['name'].'</a>';
-    $data['IR'] = ($profile['incident_view'] ? $img : '');
-    $data['IW'] = ($profile['incident_edit'] ? $img : '');
-    $data['IM'] = ($profile['incident_management'] ? $img : '');
     $data['AR'] = ($profile['agent_view'] ? $img : '');
     $data['AW'] = ($profile['agent_edit'] ? $img : '');
     $data['AD'] = ($profile['agent_disable'] ? $img : '');
diff --git a/pandora_console/include/class/NetworkMap.class.php b/pandora_console/include/class/NetworkMap.class.php
index 1298fe1ef1..c953b74dec 100644
--- a/pandora_console/include/class/NetworkMap.class.php
+++ b/pandora_console/include/class/NetworkMap.class.php
@@ -3207,7 +3207,7 @@ class NetworkMap
         $table->data[0][0] = __('Group');
         $table->data[0][1] = html_print_select_groups(
             false,
-            'IW',
+            'AR',
             false,
             'group_for_show_agents',
             -1,
diff --git a/pandora_console/include/functions.php b/pandora_console/include/functions.php
index 32312238ce..20d7422053 100644
--- a/pandora_console/include/functions.php
+++ b/pandora_console/include/functions.php
@@ -2281,9 +2281,6 @@ function check_login($output=true)
  * Check access privileges to resources
  *
  * Access can be:
- * IR - Incident/report Read
- * IW - Incident/report Write
- * IM - Incident/report Management
  * AR - Agent Read
  * AW - Agent Write
  * LW - Alert Write
@@ -2374,9 +2371,6 @@ function check_acl_one_of_groups($id_user, $groups, $access, $cache=true)
  * Check access privileges to resources (write or management is not allowed for 'all' group )
  *
  * Access can be:
- * IR - Incident/report Read
- * IW - Incident/report Write
- * IM - Incident/report Management
  * AR - Agent Read
  * AW - Agent Write
  * LW - Alert Write
@@ -2445,18 +2439,6 @@ function check_acl_restricted_all($id_user, $id_group, $access, $onlyOneGroup=fa
 function get_acl_column($access)
 {
     switch ($access) {
-        case 'IR':
-        return 'incident_view';
-
-            break;
-        case 'IW':
-        return 'incident_edit';
-
-            break;
-        case 'IM':
-        return 'incident_management';
-
-            break;
         case 'AR':
         return 'agent_view';
 
@@ -2552,10 +2534,7 @@ function get_users_acl($id_user)
         $rowdup = $users_acl_cache[$id_user];
     } else {
         $query = sprintf(
-            "SELECT sum(tperfil.incident_view) as incident_view,
-						sum(tperfil.incident_edit) as incident_edit,
-						sum(tperfil.incident_management) as incident_management,
-						sum(tperfil.agent_view) as agent_view,
+            "SELECT sum(tperfil.agent_view) as agent_view,
 						sum(tperfil.agent_edit) as agent_edit,
 						sum(tperfil.alert_edit) as alert_edit,
 						sum(tperfil.alert_management) as alert_management,
diff --git a/pandora_console/include/functions_api.php b/pandora_console/include/functions_api.php
index de094fabad..0fd46701b4 100644
--- a/pandora_console/include/functions_api.php
+++ b/pandora_console/include/functions_api.php
@@ -486,7 +486,7 @@ function api_get_groups($thrash1, $thrash2, $other, $returnType, $user_in_db)
         $returnAllColumns = ( $other['data'][2] == '1' ? true : false);
     }
 
-    $groups = users_get_groups($user_in_db, 'IR', $returnAllGroup, $returnAllColumns);
+    $groups = users_get_groups($user_in_db, 'AR', $returnAllGroup, $returnAllColumns);
 
     $data_groups = [];
     foreach ($groups as $id => $group) {
@@ -11358,9 +11358,6 @@ function api_get_user_profiles_info($thrash1, $thrash2, $thrash3, $returnType)
         [
             'id_perfil',
             'name',
-            'incident_view as IR',
-            'incident_edit as IW',
-            'incident_management as IM',
             'agent_view as AR',
             'agent_edit as AW',
             'agent_disable as AD',
@@ -11413,29 +11410,26 @@ function api_set_create_user_profile_info($thrash1, $thrash2, $other, $returnTyp
 
     $values = [
         'name'                => (string) $other['data'][0],
-        'incident_view'       => (bool) $other['data'][1] ? 1 : 0,
-        'incident_edit'       => (bool) $other['data'][2] ? 1 : 0,
-        'incident_management' => (bool) $other['data'][3] ? 1 : 0,
-        'agent_view'          => (bool) $other['data'][4] ? 1 : 0,
-        'agent_edit'          => (bool) $other['data'][5] ? 1 : 0,
-        'agent_disable'       => (bool) $other['data'][6] ? 1 : 0,
-        'alert_edit'          => (bool) $other['data'][7] ? 1 : 0,
-        'alert_management'    => (bool) $other['data'][8] ? 1 : 0,
-        'user_management'     => (bool) $other['data'][9] ? 1 : 0,
-        'db_management'       => (bool) $other['data'][10] ? 1 : 0,
-        'event_view'          => (bool) $other['data'][11] ? 1 : 0,
-        'event_edit'          => (bool) $other['data'][12] ? 1 : 0,
-        'event_management'    => (bool) $other['data'][13] ? 1 : 0,
-        'report_view'         => (bool) $other['data'][14] ? 1 : 0,
-        'report_edit'         => (bool) $other['data'][15] ? 1 : 0,
-        'report_management'   => (bool) $other['data'][16] ? 1 : 0,
-        'map_view'            => (bool) $other['data'][17] ? 1 : 0,
-        'map_edit'            => (bool) $other['data'][18] ? 1 : 0,
-        'map_management'      => (bool) $other['data'][19] ? 1 : 0,
-        'vconsole_view'       => (bool) $other['data'][20] ? 1 : 0,
-        'vconsole_edit'       => (bool) $other['data'][21] ? 1 : 0,
-        'vconsole_management' => (bool) $other['data'][22] ? 1 : 0,
-        'pandora_management'  => (bool) $other['data'][23] ? 1 : 0,
+        'agent_view'          => (bool) $other['data'][1] ? 1 : 0,
+        'agent_edit'          => (bool) $other['data'][2] ? 1 : 0,
+        'agent_disable'       => (bool) $other['data'][3] ? 1 : 0,
+        'alert_edit'          => (bool) $other['data'][4] ? 1 : 0,
+        'alert_management'    => (bool) $other['data'][5] ? 1 : 0,
+        'user_management'     => (bool) $other['data'][6] ? 1 : 0,
+        'db_management'       => (bool) $other['data'][7] ? 1 : 0,
+        'event_view'          => (bool) $other['data'][8] ? 1 : 0,
+        'event_edit'          => (bool) $other['data'][9] ? 1 : 0,
+        'event_management'    => (bool) $other['data'][10] ? 1 : 0,
+        'report_view'         => (bool) $other['data'][11] ? 1 : 0,
+        'report_edit'         => (bool) $other['data'][12] ? 1 : 0,
+        'report_management'   => (bool) $other['data'][13] ? 1 : 0,
+        'map_view'            => (bool) $other['data'][14] ? 1 : 0,
+        'map_edit'            => (bool) $other['data'][15] ? 1 : 0,
+        'map_management'      => (bool) $other['data'][16] ? 1 : 0,
+        'vconsole_view'       => (bool) $other['data'][17] ? 1 : 0,
+        'vconsole_edit'       => (bool) $other['data'][18] ? 1 : 0,
+        'vconsole_management' => (bool) $other['data'][19] ? 1 : 0,
+        'pandora_management'  => (bool) $other['data'][20] ? 1 : 0,
     ];
 
     $return = db_process_sql_insert('tperfil', $values);
@@ -11475,29 +11469,26 @@ function api_set_update_user_profile_info($id_profile, $thrash1, $other, $return
 
     $values = [
         'name'                => $other['data'][0] == '' ? $profile['name'] : (string) $other['data'][0],
-        'incident_view'       => $other['data'][1] == '' ? $profile['incident_view'] : (bool) $other['data'][1] ? 1 : 0,
-        'incident_edit'       => $other['data'][2] == '' ? $profile['incident_edit'] : (bool) $other['data'][2] ? 1 : 0,
-        'incident_management' => $other['data'][3] == '' ? $profile['incident_management'] : (bool) $other['data'][3] ? 1 : 0,
-        'agent_view'          => $other['data'][4] == '' ? $profile['agent_view'] : (bool) $other['data'][4] ? 1 : 0,
-        'agent_edit'          => $other['data'][5] == '' ? $profile['agent_edit'] : (bool) $other['data'][5] ? 1 : 0,
-        'agent_disable'       => $other['data'][6] == '' ? $profile['agent_disable'] : (bool) $other['data'][6] ? 1 : 0,
-        'alert_edit'          => $other['data'][7] == '' ? $profile['alert_edit'] : (bool) $other['data'][7] ? 1 : 0,
-        'alert_management'    => $other['data'][8] == '' ? $profile['alert_management'] : (bool) $other['data'][8] ? 1 : 0,
-        'user_management'     => $other['data'][9] == '' ? $profile['user_management'] : (bool) $other['data'][9] ? 1 : 0,
-        'db_management'       => $other['data'][10] == '' ? $profile['db_management'] : (bool) $other['data'][10] ? 1 : 0,
-        'event_view'          => $other['data'][11] == '' ? $profile['event_view'] : (bool) $other['data'][11] ? 1 : 0,
-        'event_edit'          => $other['data'][12] == '' ? $profile['event_edit'] : (bool) $other['data'][12] ? 1 : 0,
-        'event_management'    => $other['data'][13] == '' ? $profile['event_management'] : (bool) $other['data'][13] ? 1 : 0,
-        'report_view'         => $other['data'][14] == '' ? $profile['report_view'] : (bool) $other['data'][14] ? 1 : 0,
-        'report_edit'         => $other['data'][15] == '' ? $profile['report_edit'] : (bool) $other['data'][15] ? 1 : 0,
-        'report_management'   => $other['data'][16] == '' ? $profile['report_management'] : (bool) $other['data'][16] ? 1 : 0,
-        'map_view'            => $other['data'][17] == '' ? $profile['map_view'] : (bool) $other['data'][17] ? 1 : 0,
-        'map_edit'            => $other['data'][18] == '' ? $profile['map_edit'] : (bool) $other['data'][18] ? 1 : 0,
-        'map_management'      => $other['data'][19] == '' ? $profile['map_management'] : (bool) $other['data'][19] ? 1 : 0,
-        'vconsole_view'       => $other['data'][20] == '' ? $profile['vconsole_view'] : (bool) $other['data'][20] ? 1 : 0,
-        'vconsole_edit'       => $other['data'][21] == '' ? $profile['vconsole_edit'] : (bool) $other['data'][21] ? 1 : 0,
-        'vconsole_management' => $other['data'][22] == '' ? $profile['vconsole_management'] : (bool) $other['data'][22] ? 1 : 0,
-        'pandora_management'  => $other['data'][23] == '' ? $profile['pandora_management'] : (bool) $other['data'][23] ? 1 : 0,
+        'agent_view'          => $other['data'][1] == '' ? $profile['agent_view'] : (bool) $other['data'][1] ? 1 : 0,
+        'agent_edit'          => $other['data'][2] == '' ? $profile['agent_edit'] : (bool) $other['data'][2] ? 1 : 0,
+        'agent_disable'       => $other['data'][3] == '' ? $profile['agent_disable'] : (bool) $other['data'][3] ? 1 : 0,
+        'alert_edit'          => $other['data'][4] == '' ? $profile['alert_edit'] : (bool) $other['data'][4] ? 1 : 0,
+        'alert_management'    => $other['data'][5] == '' ? $profile['alert_management'] : (bool) $other['data'][5] ? 1 : 0,
+        'user_management'     => $other['data'][6] == '' ? $profile['user_management'] : (bool) $other['data'][6] ? 1 : 0,
+        'db_management'       => $other['data'][7] == '' ? $profile['db_management'] : (bool) $other['data'][7] ? 1 : 0,
+        'event_view'          => $other['data'][8] == '' ? $profile['event_view'] : (bool) $other['data'][8] ? 1 : 0,
+        'event_edit'          => $other['data'][9] == '' ? $profile['event_edit'] : (bool) $other['data'][9] ? 1 : 0,
+        'event_management'    => $other['data'][10] == '' ? $profile['event_management'] : (bool) $other['data'][10] ? 1 : 0,
+        'report_view'         => $other['data'][11] == '' ? $profile['report_view'] : (bool) $other['data'][11] ? 1 : 0,
+        'report_edit'         => $other['data'][12] == '' ? $profile['report_edit'] : (bool) $other['data'][12] ? 1 : 0,
+        'report_management'   => $other['data'][13] == '' ? $profile['report_management'] : (bool) $other['data'][13] ? 1 : 0,
+        'map_view'            => $other['data'][14] == '' ? $profile['map_view'] : (bool) $other['data'][14] ? 1 : 0,
+        'map_edit'            => $other['data'][15] == '' ? $profile['map_edit'] : (bool) $other['data'][15] ? 1 : 0,
+        'map_management'      => $other['data'][16] == '' ? $profile['map_management'] : (bool) $other['data'][16] ? 1 : 0,
+        'vconsole_view'       => $other['data'][17] == '' ? $profile['vconsole_view'] : (bool) $other['data'][17] ? 1 : 0,
+        'vconsole_edit'       => $other['data'][18] == '' ? $profile['vconsole_edit'] : (bool) $other['data'][18] ? 1 : 0,
+        'vconsole_management' => $other['data'][19] == '' ? $profile['vconsole_management'] : (bool) $other['data'][19] ? 1 : 0,
+        'pandora_management'  => $other['data'][20] == '' ? $profile['pandora_management'] : (bool) $other['data'][20] ? 1 : 0,
     ];
 
     $return = db_process_sql_update('tperfil', $values, ['id_perfil' => $id_profile]);
@@ -11545,101 +11536,6 @@ function api_set_delete_user_profile_info($id_profile, $thrash1, $thrash2, $retu
 }
 
 
-/**
- * Create new incident in Pandora.
- *
- * @param $thrash1 Don't use.
- * @param $thrash2 Don't use.
- * @param array             $other it's array, $other as param is <title>;<description>;
- *              <origin>;<priority>;<state>;<group> in this order and separator char
- *              (after text ; ) and separator (pass in param othermode as
- *              othermode=url_encode_separator_<separator>)
- *              example:
- *
- *              api.php?op=set&op2=new_incident&other=titulo|descripcion%20texto|Logfiles|2|10|12&other_mode=url_encode_separator_|
- *
- * @param $thrash3 Don't use.
- */
-function api_set_new_incident($thrash1, $thrash2, $other, $thrash3)
-{
-    global $config;
-
-    if (defined('METACONSOLE')) {
-        return;
-    }
-
-    if (!check_acl($config['id_user'], 0, 'IW')) {
-        returnError('forbidden', 'string');
-        return;
-    }
-
-    $title = $other['data'][0];
-    $description = $other['data'][1];
-    $origin = $other['data'][2];
-    $priority = $other['data'][3];
-    $id_creator = 'API';
-    $state = $other['data'][4];
-    $group = $other['data'][5];
-
-    $values = [
-        'inicio'        => 'NOW()',
-        'actualizacion' => 'NOW()',
-        'titulo'        => $title,
-        'descripcion'   => $description,
-        'id_usuario'    => 'API',
-        'origen'        => $origin,
-        'estado'        => $state,
-        'prioridad'     => $priority,
-        'id_grupo'      => $group,
-        'id_creator'    => $id_creator,
-    ];
-    $idIncident = db_process_sql_insert('tincidencia', $values);
-
-    if ($idIncident === false) {
-        returnError('A new incident could not be created.');
-    } else {
-        returnData('string', ['type' => 'string', 'data' => $idIncident]);
-    }
-}
-
-
-/**
- * Add note into a incident.
- *
- * @param $id string Username author of note.
- * @param $id2 integer ID of incident.
- * @param $other string Note.
- * @param $thrash2 Don't use.
- */
-function api_set_new_note_incident($id, $id2, $other, $thrash2)
-{
-    global $config;
-
-    if (defined('METACONSOLE')) {
-        return;
-    }
-
-    if (!check_acl($config['id_user'], 0, 'IW')) {
-        returnError('forbidden', 'string');
-        return;
-    }
-
-    $values = [
-        'id_usuario'  => $id,
-        'id_incident' => $id2,
-        'nota'        => $other['data'],
-    ];
-
-    $idNote = db_process_sql_insert('tnota', $values);
-
-    if ($idNote === false) {
-        returnError('A new incident could not be created+.');
-    } else {
-        returnData('string', ['type' => 'string', 'data' => $idNote]);
-    }
-}
-
-
 /**
  * Disable a module, given agent and module name.
  *
diff --git a/pandora_console/include/functions_integriaims.php b/pandora_console/include/functions_integriaims.php
index fd7e1b7c7c..e7463db933 100644
--- a/pandora_console/include/functions_integriaims.php
+++ b/pandora_console/include/functions_integriaims.php
@@ -79,22 +79,10 @@ function integriaims_tabs($active_tab, $view=false)
     }
 
     $onheader = [];
-
-    if (check_acl($config['id_user'], 0, 'IR') && $view) {
-        $onheader['view'] = $view_tab;
-    }
-
-    if (check_acl($config['id_user'], 0, 'PM')) {
-        $onheader['configure'] = $setup_tab;
-    }
-
-    if (check_acl($config['id_user'], 0, 'IR')) {
-        $onheader['list'] = $list_tab;
-    }
-
-    if (check_acl($config['id_user'], 0, 'IW')) {
-        $onheader['create'] = $create_tab;
-    }
+    $onheader['view'] = $view_tab;
+    $onheader['configure'] = $setup_tab;
+    $onheader['list'] = $list_tab;
+    $onheader['create'] = $create_tab;
 
     return $onheader;
 }
diff --git a/pandora_console/include/functions_netflow.php b/pandora_console/include/functions_netflow.php
index 69d9a85cd5..cd31986a2a 100644
--- a/pandora_console/include/functions_netflow.php
+++ b/pandora_console/include/functions_netflow.php
@@ -120,7 +120,7 @@ function netflow_check_filter_group($id_sg)
     $id_group = db_get_value('id_group', 'tnetflow_filter', 'id_sg', $id_sg);
     $own_info = get_user_info($config['id_user']);
     // Get group list that user has access.
-    $groups_user = users_get_groups($config['id_user'], 'IW', $own_info['is_admin'], true);
+    $groups_user = users_get_groups($config['id_user'], 'AR', $own_info['is_admin'], true);
     $groups_id = [];
     $has_permission = false;
 
diff --git a/pandora_console/include/functions_networkmap.php b/pandora_console/include/functions_networkmap.php
index ed76a6b880..7e0a467041 100644
--- a/pandora_console/include/functions_networkmap.php
+++ b/pandora_console/include/functions_networkmap.php
@@ -1500,7 +1500,7 @@ function networkmap_delete_relations($id_map)
 
 function get_networkmaps($id)
 {
-    $groups = array_keys(users_get_groups(null, 'IW'));
+    $groups = array_keys(users_get_groups(null, 'MW'));
 
     $filter = [];
     $filter['id_group'] = $groups;
diff --git a/pandora_console/include/functions_users.php b/pandora_console/include/functions_users.php
index 17e2d8baf0..6eb975eaff 100755
--- a/pandora_console/include/functions_users.php
+++ b/pandora_console/include/functions_users.php
@@ -235,9 +235,6 @@ function groups_combine_acl($acl_group_a, $acl_group_b)
     }
 
     $acl_list = [
-        'incident_view'       => 1,
-        'incident_edit'       => 1,
-        'incident_management' => 1,
         'agent_view'          => 1,
         'agent_edit'          => 1,
         'agent_disable'       => 1,
diff --git a/pandora_console/operation/incidents/configure_integriaims_incident.php b/pandora_console/operation/incidents/configure_integriaims_incident.php
index c86fa428da..b8eceefd81 100644
--- a/pandora_console/operation/incidents/configure_integriaims_incident.php
+++ b/pandora_console/operation/incidents/configure_integriaims_incident.php
@@ -16,13 +16,6 @@ global $config;
 
 check_login();
 
-if (!(check_acl($config['id_user'], 0, 'IW') && check_acl($config['id_user'], 0, 'IR'))) {
-    // Doesn't have access to this page.
-    db_pandora_audit('ACL Violation', 'Trying to access IntegriaIMS ticket creation');
-    include 'general/noaccess.php';
-    exit;
-}
-
 require_once $config['homedir'].'/include/functions_integriaims.php';
 
 $update = (isset($_GET['incident_id']) === true);
diff --git a/pandora_console/operation/incidents/dashboard_detail_integriaims_incident.php b/pandora_console/operation/incidents/dashboard_detail_integriaims_incident.php
index 596a336360..03f96c4a51 100644
--- a/pandora_console/operation/incidents/dashboard_detail_integriaims_incident.php
+++ b/pandora_console/operation/incidents/dashboard_detail_integriaims_incident.php
@@ -18,13 +18,6 @@ require_once 'include/functions_integriaims.php';
 
 check_login();
 
-if (!check_acl($config['id_user'], 0, 'IR')) {
-    // Doesn't have access to this page.
-    db_pandora_audit('ACL Violation', 'Trying to access IntegriaIMS ticket creation');
-    include 'general/noaccess.php';
-    exit;
-}
-
 // Check if Integria integration enabled.
 if ($config['integria_enabled'] == 0) {
     ui_print_error_message(__('In order to access ticket management system, integration with Integria IMS must be enabled and properly configured'));
@@ -124,10 +117,7 @@ $table_files->head[1] = __('Timestamp');
 $table_files->head[2] = __('Description');
 $table_files->head[3] = __('User');
 $table_files->head[4] = __('Size');
-
-if (check_acl($config['id_user'], 0, 'IW')) {
-    $table_files->head[5] = __('Delete');
-}
+$table_files->head[5] = __('Delete');
 
 $table_files->data = [];
 
@@ -240,11 +230,10 @@ foreach ($files as $key => $value) {
     $table_files->data[$i][2] = $value[12];
     $table_files->data[$i][3] = $value[8];
     $table_files->data[$i][4] = $value[13];
-    if (check_acl($config['id_user'], 0, 'IW')) {
-        $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] .= '<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] .= '</a>';
 
@@ -267,9 +256,7 @@ $table_files_section->data[2][0] .= '<div class="w100p right">'.html_print_submi
 
 $upload_file_form = '<div class="w100p">';
 
-if (check_acl($config['id_user'], 0, 'IW')) {
-    $upload_file_form .= '<form method="post" id="file_control" enctype="multipart/form-data">'.'<h4>'.__('Add attachment').'</h4>'.html_print_table($table_files_section, true).html_print_input_hidden('upload_file', 1, true);
-}
+$upload_file_form .= '<form method="post" id="file_control" enctype="multipart/form-data">'.'<h4>'.__('Add attachment').'</h4>'.html_print_table($table_files_section, true).html_print_input_hidden('upload_file', 1, true);
 
 $upload_file_form .= '<h4>'.__('Attached files').'</h4>'.html_print_table($table_files, true).'</form></div>';
 
@@ -361,9 +348,8 @@ if (!empty($comments)) {
 
 $upload_comment_form = '<div class="w100p">';
 
-if (check_acl($config['id_user'], 0, 'IW')) {
-    $upload_comment_form .= '<form method="post" id="comment_form" enctype="multipart/form-data"><h4>'.__('Add comment').'</h4>'.html_print_table($table_comments_section, true).html_print_input_hidden('upload_comment', 1, true).'</form>';
-}
+$upload_comment_form .= '<form method="post" id="comment_form" enctype="multipart/form-data"><h4>'.__('Add comment').'</h4>'.html_print_table($table_comments_section, true).html_print_input_hidden('upload_comment', 1, true).'</form>';
+
 
 $upload_comment_form .= '<h4>'.__('Comments').'</h4>'.$comment_table.'</div>';
 
diff --git a/pandora_console/operation/incidents/incident_statistics.php b/pandora_console/operation/incidents/incident_statistics.php
index af1867264f..2aa97ad46c 100755
--- a/pandora_console/operation/incidents/incident_statistics.php
+++ b/pandora_console/operation/incidents/incident_statistics.php
@@ -18,11 +18,9 @@ require_once $config['homedir'].'/include/functions_graph.php';
 
 check_login();
 
-if (! check_acl($config['id_user'], 0, 'IR') && ! check_acl($config['id_user'], 0, 'IW') && ! check_acl($config['id_user'], 0, 'IM')) {
-    db_pandora_audit('ACL Violation', 'Trying to access Incident section');
-    include 'general/noaccess.php';
-    exit;
-}
+db_pandora_audit('ACL Violation', 'Trying to access Incident section');
+require 'general/noaccess.php';
+exit;
 
 ui_print_page_header(__('Incidents').' &raquo; '.__('Statistics'), 'images/book_edit.png', false, '', false, '');
 
diff --git a/pandora_console/operation/incidents/integriaims_export_csv.php b/pandora_console/operation/incidents/integriaims_export_csv.php
index d4be4443d6..04e0970ab4 100644
--- a/pandora_console/operation/incidents/integriaims_export_csv.php
+++ b/pandora_console/operation/incidents/integriaims_export_csv.php
@@ -20,14 +20,6 @@ require_once '../../include/functions_integriaims.php';
 
 check_login();
 
-if (! check_acl($config['id_user'], 0, 'IR') && ! check_acl($config['id_user'], 0, 'IW') && ! check_acl($config['id_user'], 0, 'IM')) {
-    // Doesn't have access to this page.
-    db_pandora_audit('ACL Violation', 'Trying to access IntegriaIMS ticket creation');
-    include 'general/noaccess.php';
-    exit;
-}
-
-
 // API calls.
 $status_incident = integriaims_get_details('status');
 $group_incident = integriaims_get_details('group');
diff --git a/pandora_console/operation/incidents/list_integriaims_incidents.php b/pandora_console/operation/incidents/list_integriaims_incidents.php
index c6f64750f1..eadf892b04 100644
--- a/pandora_console/operation/incidents/list_integriaims_incidents.php
+++ b/pandora_console/operation/incidents/list_integriaims_incidents.php
@@ -18,13 +18,6 @@ require_once 'include/functions_integriaims.php';
 
 check_login();
 
-if (! check_acl($config['id_user'], 0, 'IR')) {
-    // Doesn't have access to this page.
-    db_pandora_audit('ACL Violation', 'Trying to access IntegriaIMS ticket creation');
-    include 'general/noaccess.php';
-    exit;
-}
-
 // Header tabs.
 $onheader = integriaims_tabs('list_tab');
 ui_print_page_header(
@@ -266,9 +259,7 @@ $table->head[4] = __('Prior');
 $table->head[5] = __('Updated/Started');
 $table->head[6] = __('Creator');
 $table->head[7] = __('Owner');
-if (check_acl($config['id_user'], 0, 'IW') || check_acl($config['id_user'], 0, 'IM')) {
-    $table->head[8] = '';
-}
+$table->head[8] = '';
 
 $table->data = [];
 $i = 0;
@@ -294,18 +285,14 @@ foreach ($incidents_paginated as $key => $value) {
     $table->data[$i][7] = $array_get_incidents[$key][5];
     $table->data[$i][8] = '';
     $table->cellclass[$i][8] = 'action_buttons';
-    if (check_acl($config['id_user'], 0, 'IW')) {
-        $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] .= '</a>';
-    }
+    $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] .= '</a>';
 
-    if (check_acl($config['id_user'], 0, 'IM')) {
-        $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] .= '</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] .= '</a>';
 
     $i++;
 }
@@ -320,13 +307,11 @@ if (empty($table->data) === true) {
 }
 
 // Show button to create incident.
-if (check_acl($config['id_user'], 0, 'IR')) {
-    echo '<form method="POST" action="'.ui_get_full_url('index.php?sec=incident&sec2=operation/incidents/configure_integriaims_incident').'">';
-        echo '<div class="wi100p right">';
-            html_print_submit_button(__('Create'), 'create_new_incident', false, 'class="sub next"');
-        echo '</div>';
-    echo '</form>';
-}
+echo '<form method="POST" action="'.ui_get_full_url('index.php?sec=incident&sec2=operation/incidents/configure_integriaims_incident').'">';
+    echo '<div class="wi100p right">';
+        html_print_submit_button(__('Create'), 'create_new_incident', false, 'class="sub next"');
+    echo '</div>';
+echo '</form>';
 
 // Datapicker library for show calendar.
 ui_require_jquery_file('ui.datepicker-'.get_user_language(), 'include/javascript/i18n/');
diff --git a/pandora_console/operation/menu.php b/pandora_console/operation/menu.php
index d43829b753..11b873e0b3 100644
--- a/pandora_console/operation/menu.php
+++ b/pandora_console/operation/menu.php
@@ -267,9 +267,9 @@ if (check_acl($config['id_user'], 0, 'MR') || check_acl($config['id_user'], 0, '
 
         $own_info = get_user_info($config['id_user']);
         if ($own_info['is_admin'] || check_acl($config['id_user'], 0, 'PM')) {
-            $own_groups = array_keys(users_get_groups($config['id_user'], 'IR'));
+            $own_groups = array_keys(users_get_groups($config['id_user'], 'MR'));
         } else {
-            $own_groups = array_keys(users_get_groups($config['id_user'], 'IR', false));
+            $own_groups = array_keys(users_get_groups($config['id_user'], 'MR', false));
         }
 
         foreach ($gisMaps as $gisMap) {
@@ -278,10 +278,6 @@ if (check_acl($config['id_user'], 0, 'MR') || check_acl($config['id_user'], 0, '
                 continue;
             }
 
-            if (! check_acl($config['id_user'], $gisMap['group_id'], 'IR')) {
-                continue;
-            }
-
             $sub2['operation/gis_maps/render_view&amp;map_id='.$gisMap['id_tgis_map']]['text'] = mb_substr(io_safe_output($gisMap['map_name']), 0, 15);
             $sub2['operation/gis_maps/render_view&amp;map_id='.$gisMap['id_tgis_map']]['id'] = mb_substr(io_safe_output($gisMap['map_name']), 0, 15);
             $sub2['operation/gis_maps/render_view&amp;map_id='.$gisMap['id_tgis_map']]['title'] = io_safe_output($gisMap['map_name']);
@@ -459,30 +455,25 @@ $sub['operation/users/user_edit_notifications']['refr'] = 0;
 
 
 // Incidents.
-if (check_acl($config['id_user'], 0, 'IR')
-    || check_acl($config['id_user'], 0, 'IW')
-    || check_acl($config['id_user'], 0, 'IM')
-) {
-    $temp_sec2 = $sec2;
-    $sec2 = 'incident';
-    $sec2sub = 'operation/incidents/incident_statistics';
-    $sub[$sec2]['text'] = __('Incidents');
-    $sub[$sec2]['id'] = 'Incidents';
-    $sub[$sec2]['type'] = 'direct';
-    $sub[$sec2]['subtype'] = 'nolink';
-    $sub[$sec2]['refr'] = 0;
-    $sub[$sec2]['subsecs'] = [
-        'operation/incidents/incident_detail',
-        'operation/integria_incidents',
-    ];
+$temp_sec2 = $sec2;
+$sec2 = 'incident';
+$sec2sub = 'operation/incidents/incident_statistics';
+$sub[$sec2]['text'] = __('Incidents');
+$sub[$sec2]['id'] = 'Incidents';
+$sub[$sec2]['type'] = 'direct';
+$sub[$sec2]['subtype'] = 'nolink';
+$sub[$sec2]['refr'] = 0;
+$sub[$sec2]['subsecs'] = [
+    'operation/incidents/incident_detail',
+    'operation/integria_incidents',
+];
 
-    $sub2 = [];
-    $sub2[$sec2sub]['text'] = __('Integria IMS statistics');
-    $sub2['operation/incidents/list_integriaims_incidents']['text'] = __('Integria IMS ticket list');
+$sub2 = [];
+$sub2[$sec2sub]['text'] = __('Integria IMS statistics');
+$sub2['operation/incidents/list_integriaims_incidents']['text'] = __('Integria IMS ticket list');
 
-    $sub[$sec2]['sub2'] = $sub2;
-    $sec2 = $temp_sec2;
-}
+$sub[$sec2]['sub2'] = $sub2;
+$sec2 = $temp_sec2;
 
 
 // Messages.
diff --git a/pandora_console/operation/netflow/nf_live_view.php b/pandora_console/operation/netflow/nf_live_view.php
index dae0c9457a..a27686f8a7 100644
--- a/pandora_console/operation/netflow/nf_live_view.php
+++ b/pandora_console/operation/netflow/nf_live_view.php
@@ -370,7 +370,7 @@ if (is_metaconsole()) {
     ).'</td>';
     $own_info = get_user_info($config['id_user']);
     echo '<td><span id="filter_group_color"><b>'.__('Group').'</b></span></td>';
-    echo "<td colspan='2'>".html_print_select_groups($config['id_user'], 'IW', $own_info['is_admin'], 'assign_group', $filter['id_group'], '', '', -1, true, false, false).'</td>';
+    echo "<td colspan='2'>".html_print_select_groups($config['id_user'], 'AR', $own_info['is_admin'], 'assign_group', $filter['id_group'], '', '', -1, true, false, false).'</td>';
     echo '</tr>';
 
     $advanced_toggle = '<table class="w100p">';
diff --git a/pandora_console/operation/search_graphs.getdata.php b/pandora_console/operation/search_graphs.getdata.php
index 9874ef37e2..13db4c2923 100644
--- a/pandora_console/operation/search_graphs.getdata.php
+++ b/pandora_console/operation/search_graphs.getdata.php
@@ -16,7 +16,7 @@ global $config;
 require_once 'include/functions_custom_graphs.php';
 
 // Check ACL
-$searchGraphs = check_acl($config['id_user'], 0, 'IR');
+$searchGraphs = check_acl($config['id_user'], 0, 'RR');
 
 $graphs = false;
 
diff --git a/pandora_console/operation/search_graphs.php b/pandora_console/operation/search_graphs.php
index 69df4e4ded..8f76f0dea8 100755
--- a/pandora_console/operation/search_graphs.php
+++ b/pandora_console/operation/search_graphs.php
@@ -15,7 +15,7 @@ global $config;
 
 require_once 'include/functions_custom_graphs.php';
 
-$searchGraphs = check_acl($config['id_user'], 0, 'IR');
+$searchGraphs = check_acl($config['id_user'], 0, 'RR');
 
 if ($graphs === false || !$searchGraphs) {
     echo "<br><div class='nf'>".__('Zero results found')."</div>\n";
diff --git a/pandora_console/operation/search_helps.php b/pandora_console/operation/search_helps.php
index 2433355571..b205d265ef 100644
--- a/pandora_console/operation/search_helps.php
+++ b/pandora_console/operation/search_helps.php
@@ -13,8 +13,6 @@
 // GNU General Public License for more details.
 global $config;
 
-$totalHelps = check_acl($config['id_user'], 0, 'IR');
-
 if ($helps === false || !$searchHelps) {
     echo "<br><div class='nf'>".__('Zero results found.').sprintf(
         __('You can find more help in the <a class="underline" href="%s">wiki</a>'),
diff --git a/pandora_console/operation/search_maps.getdata.php b/pandora_console/operation/search_maps.getdata.php
index 2f8fa18a49..e96113cbb3 100644
--- a/pandora_console/operation/search_maps.getdata.php
+++ b/pandora_console/operation/search_maps.getdata.php
@@ -13,7 +13,7 @@
 // GNU General Public License for more details.
 global $config;
 
-$searchMaps = check_acl($config['id_user'], 0, 'IR');
+$searchMaps = check_acl($config['id_user'], 0, 'VR');
 
 $maps = false;
 $totalMaps = 0;
diff --git a/pandora_console/operation/search_maps.php b/pandora_console/operation/search_maps.php
index 804051f000..0ab656d9b5 100755
--- a/pandora_console/operation/search_maps.php
+++ b/pandora_console/operation/search_maps.php
@@ -13,7 +13,7 @@
 // GNU General Public License for more details.
 global $config;
 
-$searchMaps = check_acl($config['id_user'], 0, 'IR');
+$searchMaps = check_acl($config['id_user'], 0, 'VR');
 
 if ($maps === false || !$searchMaps) {
         echo "<br><div class='nf'>".__('Zero results found')."</div>\n";
diff --git a/pandora_console/operation/search_reports.php b/pandora_console/operation/search_reports.php
index ee565676eb..d86b0c5446 100755
--- a/pandora_console/operation/search_reports.php
+++ b/pandora_console/operation/search_reports.php
@@ -19,9 +19,7 @@ require_once 'include/functions_reports.php';
 $linkReport = false;
 $searchReports = check_acl($config['id_user'], 0, 'RR');
 
-if (check_acl($config['id_user'], 0, 'IW')) {
-    $linkReport = true;
-}
+$linkReport = true;
 
 if ($reports === false || !$searchReports) {
         echo "<br><div class='nf'>".__('Zero results found')."</div>\n";
diff --git a/pandora_console/operation/search_results.php b/pandora_console/operation/search_results.php
index e1a9d078e3..5e0fa14384 100644
--- a/pandora_console/operation/search_results.php
+++ b/pandora_console/operation/search_results.php
@@ -19,7 +19,8 @@ enterprise_include('operation/reporting/custom_reporting.php');
 
 $searchAgents = $searchAlerts = $searchModules = check_acl($config['id_user'], 0, 'AR');
 $searchUsers = $searchPolicies = check_acl($config['id_user'], 0, 'AR');
-$searchMaps = $searchReports = $searchGraphs = check_acl($config['id_user'], 0, 'IR');
+$searchReports = $searchGraphs = check_acl($config['id_user'], 0, 'RR');
+$searchMaps = check_acl($config['id_user'], 0, 'VR');
 $searchMain = true;
 $searchHelps = true;
 
diff --git a/pandora_console/operation/snmpconsole/snmp_view.php b/pandora_console/operation/snmpconsole/snmp_view.php
index 5442f75823..1ac05621bc 100755
--- a/pandora_console/operation/snmpconsole/snmp_view.php
+++ b/pandora_console/operation/snmpconsole/snmp_view.php
@@ -133,10 +133,10 @@ if ($config['pure']) {
 
 
 // OPERATIONS
-// Delete SNMP Trap entry Event (only incident management access).
+// Delete SNMP Trap entry Event.
 if (isset($_GET['delete'])) {
     $id_trap = (int) get_parameter_get('delete', 0);
-    if ($id_trap > 0 && check_acl($config['id_user'], 0, 'IM')) {
+    if ($id_trap > 0) {
         if ($group_by) {
             $sql_ids_traps = 'SELECT id_trap, source FROM ttrap WHERE oid IN (SELECT oid FROM ttrap WHERE id_trap = '.$id_trap.')
 			AND source IN (SELECT source FROM ttrap WHERE id_trap = '.$id_trap.')';
@@ -156,42 +156,30 @@ if (isset($_GET['delete'])) {
                 __('Could not be deleted')
             );
         }
-    } else {
-        db_pandora_audit(
-            'ACL Violation',
-            'Trying to delete SNMP event ID #'.$id_trap
-        );
     }
 }
 
-// Check Event (only incident write access).
+// Check Event.
 if (isset($_GET['check'])) {
     $id_trap = (int) get_parameter_get('check', 0);
-    if (check_acl($config['id_user'], 0, 'IW')) {
-        $values = [
-            'status'     => 1,
-            'id_usuario' => $config['id_user'],
-        ];
-        $result = db_process_sql_update('ttrap', $values, ['id_trap' => $id_trap]);
-        enterprise_hook('snmp_update_forwarded_modules', [$id_trap]);
+    $values = [
+        'status'     => 1,
+        'id_usuario' => $config['id_user'],
+    ];
+    $result = db_process_sql_update('ttrap', $values, ['id_trap' => $id_trap]);
+    enterprise_hook('snmp_update_forwarded_modules', [$id_trap]);
 
-        ui_print_result_message(
-            $result,
-            __('Successfully updated'),
-            __('Could not be updated')
-        );
-    } else {
-        db_pandora_audit(
-            'ACL Violation',
-            'Trying to checkout SNMP Trap ID'.$id_trap
-        );
-    }
+    ui_print_result_message(
+        $result,
+        __('Successfully updated'),
+        __('Could not be updated')
+    );
 }
 
 // Mass-process DELETE.
 if (isset($_POST['deletebt'])) {
     $trap_ids = get_parameter_post('snmptrapid', []);
-    if (is_array($trap_ids) && check_acl($config['id_user'], 0, 'IW')) {
+    if (is_array($trap_ids)) {
         if ($group_by) {
             foreach ($trap_ids as $key => $value) {
                 $sql_ids_traps = 'SELECT id_trap, source FROM ttrap WHERE oid IN (SELECT oid FROM ttrap WHERE id_trap = '.$value.')
@@ -210,28 +198,18 @@ if (isset($_POST['deletebt'])) {
                 enterprise_hook('snmp_update_forwarded_modules', [$forward_info]);
             }
         }
-    } else {
-        db_pandora_audit(
-            'ACL Violation',
-            'Trying to mass-delete SNMP Trap ID'
-        );
     }
 }
 
 // Mass-process UPDATE.
 if (isset($_POST['updatebt'])) {
     $trap_ids = get_parameter_post('snmptrapid', []);
-    if (is_array($trap_ids) && check_acl($config['id_user'], 0, 'IW')) {
+    if (is_array($trap_ids)) {
         foreach ($trap_ids as $id_trap) {
             $sql = sprintf("UPDATE ttrap SET status = 1, id_usuario = '%s' WHERE id_trap = %d", $config['id_user'], $id_trap);
             db_process_sql($sql);
             enterprise_hook('snmp_update_forwarded_modules', [$id_trap]);
         }
-    } else {
-        db_pandora_audit(
-            'ACL Violation',
-            'Trying to mass-delete SNMP Trap ID'
-        );
     }
 }
 
@@ -1025,7 +1003,7 @@ if ($traps !== false) {
         // Actions.
         $data[8] = '';
 
-        if (empty($trap['status']) && check_acl($config['id_user'], 0, 'IW')) {
+        if (empty($trap['status'])) {
             $data[8] .= '<a href="'.$urlPagination.'&check='.$trap['id_trap'].'">'.html_print_image('images/ok.png', true, ['border' => '0', 'title' => __('Validate')]).'</a> ';
         }
 
@@ -1045,17 +1023,15 @@ if ($traps !== false) {
         } else {
             $agent_trap_group = db_get_value('id_grupo', 'tagente', 'nombre', $trap['source']);
 
-            if ((check_acl($config['id_user'], $agent_trap_group, 'IM'))) {
-                $data[8] .= '<a href="'.$urlPagination.'&delete='.$trap['id_trap'].'&offset='.$offset.'" onClick="javascript:return confirm(\''.__('Are you sure?').'\')">'.html_print_image(
-                    'images/cross.png',
-                    true,
-                    [
-                        'border' => '0',
-                        'title'  => __('Delete'),
-                        'class'  => 'invert_filter',
-                    ]
-                ).'</a> ';
-            }
+            $data[8] .= '<a href="'.$urlPagination.'&delete='.$trap['id_trap'].'&offset='.$offset.'" onClick="javascript:return confirm(\''.__('Are you sure?').'\')">'.html_print_image(
+                'images/cross.png',
+                true,
+                [
+                    'border' => '0',
+                    'title'  => __('Delete'),
+                    'class'  => 'invert_filter',
+                ]
+            ).'</a> ';
         }
 
         $data[8] .= '<a href="javascript: toggleVisibleExtendedInfo('.$trap['id_trap'].');">'.html_print_image(
@@ -1217,14 +1193,11 @@ if ($idx == 0) {
 unset($table);
 
 echo '<div class="w98p right">';
-if (check_acl($config['id_user'], 0, 'IW')) {
-    html_print_submit_button(__('Validate'), 'updatebt', false, 'class="sub ok"');
-}
 
-if (check_acl($config['id_user'], 0, 'IM')) {
-    echo '&nbsp;';
-    html_print_submit_button(__('Delete'), 'deletebt', false, 'class="sub delete" onClick="javascript:return confirm(\''.__('Are you sure?').'\')"');
-}
+html_print_submit_button(__('Validate'), 'updatebt', false, 'class="sub ok"');
+
+echo '&nbsp;';
+html_print_submit_button(__('Delete'), 'deletebt', false, 'class="sub delete" onClick="javascript:return confirm(\''.__('Are you sure?').'\')"');
 
 echo '</div></form>';
 
diff --git a/pandora_console/pandoradb.sql b/pandora_console/pandoradb.sql
index b06ee1709a..59bfa1996e 100644
--- a/pandora_console/pandoradb.sql
+++ b/pandora_console/pandoradb.sql
@@ -1049,9 +1049,6 @@ CREATE TABLE IF NOT EXISTS `torigen` (
 CREATE TABLE IF NOT EXISTS `tperfil` (
 	`id_perfil` int(10) unsigned NOT NULL auto_increment,
 	`name` TEXT NOT NULL,
-	`incident_edit` tinyint(1) NOT NULL DEFAULT 0,
-	`incident_view` tinyint(1) NOT NULL DEFAULT 0,
-	`incident_management` tinyint(1) NOT NULL DEFAULT 0,
 	`agent_view` tinyint(1) NOT NULL DEFAULT 0,
 	`agent_edit` tinyint(1) NOT NULL DEFAULT 0,
 	`alert_edit` tinyint(1) NOT NULL DEFAULT 0,
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 49a8ea7d76..cfdced90cf 100755
--- a/pandora_server/util/pandora_manage.pl
+++ b/pandora_server/util/pandora_manage.pl
@@ -192,8 +192,8 @@ sub help_screen{
 	help_screen_line('--add_profile', '<user_name> <profile_name> <group_name>', 'Add perfil to user');
 	help_screen_line('--delete_profile', '<user_name> <profile_name> <group_name>', 'Delete perfil from user');
 	help_screen_line('--add_profile_to_user', '<user_id> <profile_name> [<group_name>]', 'Add a profile in group to a user');
-	help_screen_line('--create_profile', "<profile_name> <incident_view> <incident_edit> <incident_management> <agent_view>\n\t   <agent_edit> <agent_disable> <alert_edit> <alert_management> <user_management> <db_management>\n\t   <event_view> <event_edit> <event_management> <report_view> <report_edit> <report_management>\n\t   <map_view> <map_edit> <map_management> <vconsole_view> <vconsole_edit> <vconsole_management>\n\t   <pandora_management>", 'Create profile');
-	help_screen_line('--update_profile', "<profile_name> <incident_view> <incident_edit> <incident_management> <agent_view>\n\t   <agent_edit> <agent_disable> <alert_edit> <alert_management> <user_management> <db_management>\n\t   <event_view> <event_edit> <event_management> <report_view> <report_edit> <report_management>\n\t   <map_view> <map_edit> <map_management> <vconsole_view> <vconsole_edit> <vconsole_management>\n\t   <pandora_management>", 'Modify profile');
+	help_screen_line('--create_profile', "<profile_name> <agent_view>\n\t   <agent_edit> <agent_disable> <alert_edit> <alert_management> <user_management> <db_management>\n\t   <event_view> <event_edit> <event_management> <report_view> <report_edit> <report_management>\n\t   <map_view> <map_edit> <map_management> <vconsole_view> <vconsole_edit> <vconsole_management>\n\t   <pandora_management>", 'Create profile');
+	help_screen_line('--update_profile', "<profile_name> <agent_view>\n\t   <agent_edit> <agent_disable> <alert_edit> <alert_management> <user_management> <db_management>\n\t   <event_view> <event_edit> <event_management> <report_view> <report_edit> <report_management>\n\t   <map_view> <map_edit> <map_management> <vconsole_view> <vconsole_edit> <vconsole_management>\n\t   <pandora_management>", 'Modify profile');
 	help_screen_line('--disable_eacl', '', 'Disable enterprise ACL system');
 	help_screen_line('--enable_eacl', '', 'Enable enterprise ACL system');
 	help_screen_line('--disable_double_auth', '<user_name>', 'Disable the double authentication for the specified user');
@@ -563,14 +563,14 @@ sub pandora_create_user_profile ($$$$) {
 ##########################################################################
 ## Create profile.
 ##########################################################################
-sub pandora_create_profile ($$$$$$$$$$$$$$$$$$$$$$$$$) {
-        my ($dbh, $profile_name, $incident_view,$incident_edit, $incident_management, $agent_view,
+sub pandora_create_profile ($$$$$$$$$$$$$$$$$$$$$$) {
+        my ($dbh, $profile_name, $agent_view,
 		$agent_edit, $agent_disable, $alert_edit, $alert_management, $user_management, $db_management,
 		$event_view, $event_edit, $event_management, $report_view, $report_edit, $report_management,
 		$map_view, $map_edit, $map_management, $vconsole_view, $vconsole_edit, $vconsole_management, $pandora_management) = @_;
 
-		return db_insert ($dbh, 'id_up', 'INSERT INTO tperfil (name,incident_view,incident_edit,incident_management,agent_view,agent_edit,agent_disable,alert_edit,alert_management,user_management,db_management,event_view,event_edit,event_management,report_view,report_edit,report_management,map_view,map_edit,map_management,vconsole_view,vconsole_edit,vconsole_management,pandora_management) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?);',
-		safe_input($profile_name), $incident_view,$incident_edit, $incident_management, $agent_view,
+		return db_insert ($dbh, 'id_up', 'INSERT INTO tperfil (name,agent_view,agent_edit,agent_disable,alert_edit,alert_management,user_management,db_management,event_view,event_edit,event_management,report_view,report_edit,report_management,map_view,map_edit,map_management,vconsole_view,vconsole_edit,vconsole_management,pandora_management) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?);',
+		safe_input($profile_name), $agent_view,
 		$agent_edit, $agent_disable, $alert_edit, $alert_management, $user_management, $db_management,
 		$event_view, $event_edit, $event_management, $report_view, $report_edit, $report_management,
 		$map_view, $map_edit, $map_management, $vconsole_view, $vconsole_edit, $vconsole_management, $pandora_management);
@@ -579,14 +579,14 @@ sub pandora_create_profile ($$$$$$$$$$$$$$$$$$$$$$$$$) {
 ##########################################################################
 #### Update profile.
 ###########################################################################
-sub pandora_update_profile ($$$$$$$$$$$$$$$$$$$$$$$$$) {
-	my ($dbh, $profile_name, $incident_view,$incident_edit, $incident_management, $agent_view,
+sub pandora_update_profile ($$$$$$$$$$$$$$$$$$$$$$) {
+	my ($dbh, $profile_name, $agent_view,
 		$agent_edit, $agent_disable, $alert_edit, $alert_management, $user_management, $db_management,
 		$event_view, $event_edit, $event_management, $report_view, $report_edit, $report_management,
 		$map_view, $map_edit, $map_management, $vconsole_view, $vconsole_edit, $vconsole_management, $pandora_management) = @_;
 
-		return db_update ($dbh, 'UPDATE tperfil SET incident_view = ?, incident_edit = ?, incident_management = ?, agent_view = ?, agent_edit = ?, agent_disable = ?, alert_edit = ?, alert_management = ?, user_management = ?, db_management = ?, event_view = ?, event_edit = ?, event_management = ?, report_view = ?, report_edit = ?, report_management = ?, map_view = ?, map_edit = ?, map_management = ?, vconsole_view = ?, vconsole_edit = ?, vconsole_management = ?, pandora_management = ? WHERE name=?;',
-		$incident_view,$incident_edit, $incident_management, $agent_view,
+		return db_update ($dbh, 'UPDATE tperfil SET agent_view = ?, agent_edit = ?, agent_disable = ?, alert_edit = ?, alert_management = ?, user_management = ?, db_management = ?, event_view = ?, event_edit = ?, event_management = ?, report_view = ?, report_edit = ?, report_management = ?, map_view = ?, map_edit = ?, map_management = ?, vconsole_view = ?, vconsole_edit = ?, vconsole_management = ?, pandora_management = ? WHERE name=?;',
+		$agent_view,
 		$agent_edit, $agent_disable, $alert_edit, $alert_management, $user_management, $db_management,
 		$event_view, $event_edit, $event_management, $report_view, $report_edit, $report_management,
 		$map_view, $map_edit, $map_management, $vconsole_view, $vconsole_edit, $vconsole_management, $pandora_management, safe_input($profile_name));
@@ -4008,7 +4008,7 @@ sub cli_add_profile() {
 ##############################################################################
 
 sub cli_create_profile() {
-	my ($profile_name,$incident_view,$incident_edit,$incident_management,$agent_view,
+	my ($profile_name,$agent_view,
 	$agent_edit,$agent_disable,$alert_edit,$alert_management,$user_management,$db_management,
 	$event_view,$event_edit,$event_management,$report_view,$report_edit,$report_management,
 	$map_view,$map_edit,$map_management,$vconsole_view,$vconsole_edit,$vconsole_management,$pandora_management) = @ARGV[2..25];
@@ -4016,7 +4016,7 @@ sub cli_create_profile() {
 	my $id_profile = get_profile_id($dbh,$profile_name);
 	non_exist_check($id_profile,'profile',$profile_name);
 
-	pandora_create_profile ($dbh, $profile_name, $incident_view, $incident_edit, $incident_management, $agent_view,
+	pandora_create_profile ($dbh, $profile_name, $agent_view,
 	$agent_edit, $agent_disable, $alert_edit, $alert_management, $user_management, $db_management,
 	$event_view, $event_edit, $event_management, $report_view, $report_edit, $report_management,
 	$map_view, $map_edit, $map_management, $vconsole_view, $vconsole_edit, $vconsole_management, $pandora_management);
@@ -4028,7 +4028,7 @@ sub cli_create_profile() {
 ##############################################################################
 #
 sub cli_update_profile() {
-	my ($profile_name,$incident_view,$incident_edit,$incident_management,$agent_view,
+	my ($profile_name,$agent_view,
 	$agent_edit,$agent_disable,$alert_edit,$alert_management,$user_management,$db_management,
 	$event_view,$event_edit,$event_management,$report_view,$report_edit,$report_management,
 	$map_view,$map_edit,$map_management,$vconsole_view,$vconsole_edit,$vconsole_management,$pandora_management) = @ARGV[2..25];
@@ -4036,7 +4036,7 @@ sub cli_update_profile() {
 	my $id_profile = get_profile_id($dbh,$profile_name);
 	exist_check($id_profile,'profile',$profile_name);
 
-	pandora_update_profile ($dbh, $profile_name, $incident_view, $incident_edit, $incident_management, $agent_view,
+	pandora_update_profile ($dbh, $profile_name, $agent_view,
 	$agent_edit, $agent_disable, $alert_edit, $alert_management, $user_management, $db_management,
 	$event_view, $event_edit, $event_management, $report_view, $report_edit, $report_management,
 	$map_view, $map_edit, $map_management, $vconsole_view, $vconsole_edit, $vconsole_management, $pandora_management);

From 172afc907093b555041af5f42bcf65882128b75c Mon Sep 17 00:00:00 2001
From: "alejandro.campos@artica.es" <alejandro.campos@artica.es>
Date: Thu, 13 May 2021 13:40:09 +0200
Subject: [PATCH 29/93] minor change

---
 .../incidents/dashboard_detail_integriaims_incident.php         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pandora_console/operation/incidents/dashboard_detail_integriaims_incident.php b/pandora_console/operation/incidents/dashboard_detail_integriaims_incident.php
index 03f96c4a51..9229ffdd90 100644
--- a/pandora_console/operation/incidents/dashboard_detail_integriaims_incident.php
+++ b/pandora_console/operation/incidents/dashboard_detail_integriaims_incident.php
@@ -149,7 +149,7 @@ if ($upload_file && ($_FILES['userfile']['name'] != '')) {
 
         $filecontent = base64_encode(file_get_contents($_FILES['userfile']['tmp_name']));
 
-        $result_api_call = integria_api_call(null, null, null, null, 'attach_file', [$incident_id, $filename, $filesize, $filedescription, $filecontent], false, '', ';');
+        $result_api_call = integria_api_call(null, null, null, null, 'attach_file', [$incident_id, $filename, $filesize, $filedescription, $filecontent], false, '', '|;|');
 
         // API method returns '0' string if success.
         $file_added = ($result_api_call === '0') ? true : false;

From b52f971262921e7b6315c47388a82a9dbc56764a Mon Sep 17 00:00:00 2001
From: "alejandro.campos@artica.es" <alejandro.campos@artica.es>
Date: Thu, 13 May 2021 14:06:54 +0200
Subject: [PATCH 30/93] minor change

---
 pandora_console/pandoradb_data.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pandora_console/pandoradb_data.sql b/pandora_console/pandoradb_data.sql
index 6fe259d898..ab44483301 100644
--- a/pandora_console/pandoradb_data.sql
+++ b/pandora_console/pandoradb_data.sql
@@ -364,7 +364,7 @@ INSERT INTO `tusuario_perfil` (`id_up`, `id_usuario`, `id_perfil`, `id_grupo`, `
 -- Dumping data for table `tperfil`
 --
 
-INSERT INTO `tperfil` VALUES (1,'Operator&#x20;&#40;Read&#41;',0,1,0,1,0,0,0,0,0,0,1,0,0,1,0,0,0,1,0,0,1,0,0),(2,'Operator&#x20;&#40;Write&#41;',1,1,0,1,0,0,0,0,0,0,1,1,0,1,1,0,0,1,1,0,1,1,0),(3,'Chief&#x20;Operator',1,1,1,1,0,0,0,0,0,0,1,1,1,1,1,0,1,1,1,1,1,1,1),(4,'Group&#x20;coordinator',1,1,1,1,1,1,1,0,1,0,1,1,1,1,1,1,1,1,1,1,1,1,1),(5,'Pandora&#x20;Administrator',1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1);
+INSERT INTO `tperfil` VALUES (1,'Operator&#x20;&#40;Read&#41;',1,0,0,0,0,0,0,1,0,0,1,0,0,0,1,0,0,1,0,0),(2,'Operator&#x20;&#40;Write&#41;',1,1,0,1,0,0,0,0,0,0,1,1,0,1,1,0,0,1,1,0,1,1,0),(3,'Chief&#x20;Operator',1,1,1,1,0,0,0,0,0,0,1,1,1,1,1,0,1,1,1,1,1,1,1),(4,'Group&#x20;coordinator',1,1,1,1,1,1,1,0,1,0,1,1,1,1,1,1,1,1,1,1,1,1,1),(5,'Pandora&#x20;Administrator',1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1);
 
 --
 -- Dumping data for table `tnews`

From 1a194e16445b1c39c43fc7b008b0b052f7b87e74 Mon Sep 17 00:00:00 2001
From: "alejandro.campos@artica.es" <alejandro.campos@artica.es>
Date: Thu, 13 May 2021 14:10:42 +0200
Subject: [PATCH 31/93] minor change

---
 pandora_console/pandoradb_data.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pandora_console/pandoradb_data.sql b/pandora_console/pandoradb_data.sql
index ab44483301..b1d5f860c7 100644
--- a/pandora_console/pandoradb_data.sql
+++ b/pandora_console/pandoradb_data.sql
@@ -364,7 +364,7 @@ INSERT INTO `tusuario_perfil` (`id_up`, `id_usuario`, `id_perfil`, `id_grupo`, `
 -- Dumping data for table `tperfil`
 --
 
-INSERT INTO `tperfil` VALUES (1,'Operator&#x20;&#40;Read&#41;',1,0,0,0,0,0,0,1,0,0,1,0,0,0,1,0,0,1,0,0),(2,'Operator&#x20;&#40;Write&#41;',1,1,0,1,0,0,0,0,0,0,1,1,0,1,1,0,0,1,1,0,1,1,0),(3,'Chief&#x20;Operator',1,1,1,1,0,0,0,0,0,0,1,1,1,1,1,0,1,1,1,1,1,1,1),(4,'Group&#x20;coordinator',1,1,1,1,1,1,1,0,1,0,1,1,1,1,1,1,1,1,1,1,1,1,1),(5,'Pandora&#x20;Administrator',1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1);
+INSERT INTO `tperfil` VALUES (1,'Operator&#x20;&#40;Read&#41;',1,0,0,0,0,0,0,1,0,0,1,0,0,0,1,0,0,1,0,0),(2,'Operator&#x20;&#40;Write&#41;',1,0,0,0,0,0,0,1,1,0,1,1,0,0,1,1,0,1,1,0),(3,'Chief&#x20;Operator',1,0,0,0,0,0,0,1,1,1,1,1,0,1,1,1,1,1,1,1),(4,'Group&#x20;coordinator',1,1,1,1,0,1,0,1,1,1,1,1,1,1,1,1,1,1,1,1),(5,'Pandora&#x20;Administrator',1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1);
 
 --
 -- Dumping data for table `tnews`

From 0633ac24b92aeb5b71fde5144cacd9471b9dc348 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Gonz=C3=A1lez?= <jose.gonzalez@pandorafms.com>
Date: Thu, 13 May 2021 16:43:18 +0200
Subject: [PATCH 32/93] Fixed issues with https calls

---
 pandora_server/util/pandora_revent.pl | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/pandora_server/util/pandora_revent.pl b/pandora_server/util/pandora_revent.pl
index 5a517ffe40..f0eed4793c 100755
--- a/pandora_server/util/pandora_revent.pl
+++ b/pandora_server/util/pandora_revent.pl
@@ -12,6 +12,7 @@
 # Includes list
 use strict;
 use LWP::Simple;
+use LWP::UserAgent;
 use MIME::Base64;
 use lib '/usr/lib/perl5';
 use PandoraFMS::Tools;
@@ -255,15 +256,15 @@ sub tool_api_main () {
 		}
 		
 		if ($event_name eq "") {
-			print "[ERROR] Missing id agent! Read help info:\n\n";
+			print "[ERROR] Missing event name! Read help info:\n\n";
 			help_screen ();
 		}
 		if ($id_group eq "") {
 			print "[ERROR] Missing event group! Read help info:\n\n";
 			help_screen ();
 		}
-		if ($id_agent eq "" && $agent_name eq "") {
-			print "[ERROR] Missing id agent! and agent_name Read help info:\n\n";
+		if ($id_agent eq "") {
+			print "[ERROR] Missing id agent! Read help info:\n\n";
 			help_screen ();
 		}
 		
@@ -323,23 +324,24 @@ sub tool_api_main () {
 	else {
 		#-----------DEBUG----------------------------
 		#print($call_api . "\n\n\n");
-		
-		my $content = get($call_api);
-		
+		# Support HTTPS without hostname verification.
+		my $ua = LWP::UserAgent->new(ssl_opts => { verify_hostname => 0 });
+		my $content = $ua->get($call_api);
+
 		#-----------DEBUG----------------------------
 		#print($content . "\n\n\n");
-		
+
 		if ($option eq '-create_event') {
 			if ($content eq undef) {
 				print "[ERROR] Not respond or bad syntax. Read help info:\n\n";
 				help_screen();
 			}
 			else {
-				print "Event ID: $content";
+				print "Event ID: ".$content->{'_content'};
 			}
 		}
 		elsif ($option eq '-validate_event') {
-			print "[RESULT] $content";
+			print "[RESULT] ".$content->{'_content'};
 		}
 	}
 	

From 9b6ad55910f8b3ae718d4260adfde7a85017452c Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Fri, 14 May 2021 01:00:47 +0200
Subject: [PATCH 33/93] 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 36e53ecea4..01fafa553e 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.754-210513
+Version: 7.0NG.754-210514
 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 cf86004742..7fb8d51adc 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.754-210513"
+pandora_version="7.0NG.754-210514"
 
 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 248f0fd4a1..441e9b0496 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -1015,7 +1015,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.754';
-use constant AGENT_BUILD => '210513';
+use constant AGENT_BUILD => '210514';
 
 # 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 2e51763325..99c3b449e5 100644
--- a/pandora_agents/unix/pandora_agent.redhat.spec
+++ b/pandora_agents/unix/pandora_agent.redhat.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     7.0NG.754
-%define release     210513
+%define release     210514
 
 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 7e85bcba76..e3ea9593d0 100644
--- a/pandora_agents/unix/pandora_agent.spec
+++ b/pandora_agents/unix/pandora_agent.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     7.0NG.754
-%define release     210513
+%define release     210514
 
 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 99f7f5d086..276b308087 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.754"
-PI_BUILD="210513"
+PI_BUILD="210514"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index d1cb263733..14ef458a10 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{210513}
+{210514}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 57c368a773..03abdb96a4 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.754 Build 210513")
+#define PANDORA_VERSION ("7.0NG.754 Build 210514")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index 895e32ceb8..3ecc3bff66 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.754(Build 210513))"
+      VALUE "ProductVersion", "(7.0NG.754(Build 210514))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index f0bb243dba..b1cdcf4850 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.754-210513
+Version: 7.0NG.754-210514
 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 0c82e3b4f4..492d4cfec2 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.754-210513"
+pandora_version="7.0NG.754-210514"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index ac57a8e236..0ec89a7e8f 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 = 'PC210513';
+$build_version = 'PC210514';
 $pandora_version = 'v7.0NG.754';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 579f810b12..c96c65c78f 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -129,7 +129,7 @@
         <div style='height: 10px'>
             <?php
             $version = '7.0NG.754';
-            $build = '210513';
+            $build = '210514';
             $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 b5e1e63fcf..ae6176b379 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.754
-%define release     210513
+%define release     210514
 
 # 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 bc1637ef98..09debf1a96 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.754
-%define release     210513
+%define release     210514
 
 # 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 49e0304ef8..41ad228608 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.754
-%define release     210513
+%define release     210514
 %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 ea23fcb54b..d792b4067b 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.754-210513
+Version: 7.0NG.754-210514
 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 1d3514d6c0..96f88059d8 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.754-210513"
+pandora_version="7.0NG.754-210514"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index cf8e4bc2e7..6a48f15bcd 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@@ -45,7 +45,7 @@ our @EXPORT = qw(
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.754";
-my $pandora_build = "210513";
+my $pandora_build = "210514";
 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 4e20c5e69f..81c19aaa84 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.754";
-my $pandora_build = "210513";
+my $pandora_build = "210514";
 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 8a8cfd64fa..4c54bfacd2 100644
--- a/pandora_server/pandora_server.redhat.spec
+++ b/pandora_server/pandora_server.redhat.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     7.0NG.754
-%define release     210513
+%define release     210514
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 36504c200e..a6e31ca539 100644
--- a/pandora_server/pandora_server.spec
+++ b/pandora_server/pandora_server.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     7.0NG.754
-%define release     210513
+%define release     210514
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 34be4a360a..f711a776d2 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.754"
-PI_BUILD="210513"
+PI_BUILD="210514"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 83a9dfdec9..7015a1e57f 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.754 Build 210513";
+my $version = "7.0NG.754 Build 210514";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 0d8a97ae19..a9fcbc9b2e 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.754 Build 210513";
+my $version = "7.0NG.754 Build 210514";
 
 # save program name for logging
 my $progname = basename($0);

From 86447e2a0ba58a92c0e2d66f83507d9dfefe0841 Mon Sep 17 00:00:00 2001
From: "alejandro.campos@artica.es" <alejandro.campos@artica.es>
Date: Fri, 14 May 2021 10:10:42 +0200
Subject: [PATCH 34/93] visual fix

---
 .../agentes/interface_view.functions.php      | 26 +++++++------------
 1 file changed, 10 insertions(+), 16 deletions(-)

diff --git a/pandora_console/operation/agentes/interface_view.functions.php b/pandora_console/operation/agentes/interface_view.functions.php
index df0371c8fe..03070dd4d6 100644
--- a/pandora_console/operation/agentes/interface_view.functions.php
+++ b/pandora_console/operation/agentes/interface_view.functions.php
@@ -106,14 +106,6 @@ function print_filters($sec)
             'min-width: 180px; max-width: 200px;'
         );
 
-        $table->data[2][4] = html_print_submit_button(
-            __('Show'),
-            'uptbutton',
-            false,
-            'class="sub search mgn_tp_0"',
-            true
-        );
-
         $filters = '<form method="post" action="'.ui_get_url_refresh(
             [
                 'selected_agents'     => $selected_agents,
@@ -123,6 +115,15 @@ function print_filters($sec)
         ).'">';
 
         $filters .= html_print_table($table, true);
+
+        $filters .= "<div class='height_100p right'>".html_print_submit_button(
+            __('Show'),
+            'uptbutton',
+            false,
+            'class="sub search mgn_tp_0"',
+            true
+        ).'</div>';
+
         $filters .= '</form>';
     } else {
         $table->style[0] = 'font-weight: bold;';
@@ -143,14 +144,6 @@ function print_filters($sec)
             'min-width: 180px; max-width: 200px;'
         );
 
-        $table->data[1][1] = html_print_submit_button(
-            __('Show'),
-            'uptbutton',
-            false,
-            'class="sub search mgn_tp_0"',
-            true
-        );
-
         $filters = '<form method="post" action="'.ui_get_url_refresh(
             [
                 'selected_agents'     => $selected_agents,
@@ -169,6 +162,7 @@ function print_filters($sec)
         __('Interface filter'),
         'ui_toggle_if_filter'
     );
+
     unset($table);
 }
 

From 2c065d6f383d77343da8dc266233e53834ffb6e4 Mon Sep 17 00:00:00 2001
From: "alejandro.campos@artica.es" <alejandro.campos@artica.es>
Date: Fri, 14 May 2021 10:14:53 +0200
Subject: [PATCH 35/93] visual fix

---
 .../operation/agentes/interface_view.functions.php       | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pandora_console/operation/agentes/interface_view.functions.php b/pandora_console/operation/agentes/interface_view.functions.php
index 03070dd4d6..d94c56bd22 100644
--- a/pandora_console/operation/agentes/interface_view.functions.php
+++ b/pandora_console/operation/agentes/interface_view.functions.php
@@ -153,6 +153,15 @@ function print_filters($sec)
         ).'">';
 
         $filters .= html_print_table($table, true);
+
+        $filters .= "<div class='height_100p right'>".html_print_submit_button(
+            __('Show'),
+            'uptbutton',
+            false,
+            'class="sub search mgn_tp_0"',
+            true
+        ).'</div>';
+
         $filters .= '</form>';
     }
 

From 998fb4b0dcbb1d326dabdb52848b5ce5ca4622b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Gonz=C3=A1lez?= <jose.gonzalez@pandorafms.com>
Date: Fri, 14 May 2021 11:22:32 +0200
Subject: [PATCH 36/93] Fixed issue with undesired deactivate dynamic threshold
 max field

---
 .../agentes/module_manager_editor_common.php    | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/pandora_console/godmode/agentes/module_manager_editor_common.php b/pandora_console/godmode/agentes/module_manager_editor_common.php
index 1a4577c4ee..bda1aaa2b5 100644
--- a/pandora_console/godmode/agentes/module_manager_editor_common.php
+++ b/pandora_console/godmode/agentes/module_manager_editor_common.php
@@ -1574,10 +1574,6 @@ $(document).ready (function () {
     });
 
     disabled_two_tailed(disabledBecauseInPolicy);
-    $('#checkbox-dynamic_two_tailed').change (function() {
-        disabled_two_tailed(disabledBecauseInPolicy);
-    });
-
 
     //Dynamic_options_advance;
     $('.hide_dinamic').hide();
@@ -1646,15 +1642,10 @@ function disabled_status (disabledBecauseInPolicy) {
 }
 
 function disabled_two_tailed (disabledBecauseInPolicy) {
-    if($('#checkbox-dynamic_two_tailed').prop('checked')){
-        $('#text-dynamic_max').prop('readonly', false);
-        $('#text-dynamic_max').removeClass('readonly');
-    }
-    else{
-        if (disabledBecauseInPolicy == 0){
-            $('#text-dynamic_max').prop('readonly', true);
-            $('#text-dynamic_max').addClass('readonly');
-        }
+    if (disabledBecauseInPolicy == 1){
+            $('#text-dynamic_max')
+                .prop('readonly', true)
+                .addClass('readonly');
     }
 }
 

From 9cde3092227a6f0b2d1cfae628eb3ae3f311a400 Mon Sep 17 00:00:00 2001
From: marcos <marcos.alconada@artica.es>
Date: Fri, 14 May 2021 11:58:08 +0200
Subject: [PATCH 37/93] new bell orange

---
 pandora_console/images/bell_green.png  | Bin 392 -> 548 bytes
 pandora_console/images/bell_orange.png | Bin 432 -> 566 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/pandora_console/images/bell_green.png b/pandora_console/images/bell_green.png
index b8069e77542afba3d5de31cd978f9988dac5b095..44fb033d010bac80a62e4516f597a977532e78c1 100644
GIT binary patch
delta 531
zcmeBRUcxd#rk+vNChrde0|QICqpu?a!^VE@KZ&eBzC~(;XPU1sgBFm@!NAy_$-n|+
zF#@p^5Hm0^EntF+2rOWRvxPvCxv>l@fQqMkx;Tbd2u=;M^=5VysI3-M?5%eY$x&J+
z9DPvFgNs{Ql(k-(o7M5PikHF>ubiBmtpOrIoj=T36w4?1c?WX{Dtn&!nKs!rfAVDI
z%V%br&$r&ppc;R)S@{6_CaDg=j#HsWg@sft5=86fG_^lfIN+{yfNjO1?vT^Ry9LxU
zHJ1D4?pf4+n`3tIN1Z5_?V=OP3*Y{}A)sS4&t;QEbH1&$vESi(Kh6x(iz2!FdOjY<
z8hQ?2`mK1bNw&4i^~58crnbDoZ*3`i8}%QnR7U$H$L83k{1xVXEOPemI?-$o?su^Y
zNu6)``2I7o@N%qP(o)oyHADWxS08zArbXp<&j;{rlkxj=ar@#cOI%NdbI5zmsp1b4
z>22!1s<+|n_jNB6TC0~9)Q8S;ZN2p?HH>lI(>d;cznkomC^)G4e&(`+{?96`3r|iu
z@@@B@6YS2c7N?pNAD3J|zNnK^E#c`J#m6SIQ{Vl%ew}s4O=&gX<Em2j^Q}HUc^H^;
zRR7nhcfrRjCxunWYuahuuu8U2c%L{~TfguQOMZRKyu+zC@;~S&eJEbhmR?oK1BxzB
LS3j3^P6<r_x2VoA

delta 373
zcmV-*0gC>l1c(EW9De{(J6>u4000DMK}|sb0I`n?{9y$E00BQqL_t(I5sgzpPQx$|
z+}%`2RHEt+pl3kj3Ay$}`9XOJ<^_lsG(YGG^;mcTNL;v)CsaLvR3tB6g>^S6ZWGD!
z?99$Ow$}iAKDW3iWb8=+N{Mc9IVGZ{48f^9YzuCFHl*W|2Y*0pnwU$^Klg6@QCUx;
zfS9pA_zdLGCMjls6@RTq?xtEP*VsZ>d7d(hK{Uxx^B-4-?&&<IUiNCm6!v~I(yhcl
zpe!p=hBi-lG*K=V@W7`^9-5iAXA}zrkRLLtj>uPvV*w>P&heIF0cL#ZXa<`b3xuA$
z?pk1H3(~6Lj&3`jLFm$nwl~&2kF&0;+dS|2HY~jR$qPiF!YT}0x$%2xIl;X)Au%E4
zp>OZ3h78XkE-fc`dx%Ey-|I3woHs*(M|iZc;(xawV*RWKQ|UT}O{u-FMxB2FNEui!
Tr3I$V00000NkvXXu0mjf9c80H

diff --git a/pandora_console/images/bell_orange.png b/pandora_console/images/bell_orange.png
index e54f00a367d855eb5c6e1d2ec80e02ba4653f018..b166c3b54d5802239d865c185e8720957a6eead4 100644
GIT binary patch
literal 566
zcmeAS@N?(olHy`uVBq!ia0vp^0zfRp!N$PAsA`k<2gqSbcl32+VA$Bt{U?zX$hSz1
z@J#ddWzYh$IT#q*GZ|QbEJh%f0%8URrUguJ5rGBFaJCRgGB=iC1yJ!yPZ!4!3&FX;
zw%*K+0(WnoR$X$zK4FVbqWZR`*a;$HO)E5RL}+kul?&#&2;}(W<m7A(5NT@d*njZW
zDZe8Q2i!P*l-}zzu6~!Q-#N$P=(|1U`RQfp<*f?Ab<d(UHEW!@l_((H633Q&gzrN_
z1k=JJUU^NPW|yocruQ~P?_BhY=l#s$tat@Oj_*2+FZ2!vKHXjJw)C_Shwb+%ug=VD
zc%%I!@%h8p_qJ<xgj%0ax>{BB*m7f`TF&IY;7KobuQtp4z2eZW-qOcHER3;C{9Kh+
zGxlw3E_ipPDe_q0a_O^S)+gl7EtoEwrZ4m*V-ZtKKkJ(ksjGTM>V=nOU-B5a9Vwhw
z{e6~l%B6|ilY;iTY&hPLrEu_5@CN;^=3V@pqKsCLM7Xwk_@@MQJH#-a5)S;kg4yBG
zR8^stebpYj|9{OYQRH+#SGOUl>zKZz_Pd~0NpVXHW^T!j<(wk0xXoww%A?6{!tWdW
z!pu@$^(<-;zx<2)B}>US<5N~sc71Snh<$VX_G#(11vcLWS^55zZd}VOaNg|S^!Yp7
steNvto(DeEE9Co{E}eC7qpbNqbJpC6!D+{f)j*Nw>FVdQ&MBb@09a<+Z2$lO

literal 432
zcmV;h0Z;ykP)<h;3K|Lk000e1NJLTq000*N000*V1^@s7mo4Nr0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzQb|NXRCwBAU_b(lAmZmH<NqL<30Vdp
zfG`nE86%MK9!LuSaUwtfA<G)TRG=Gn9$7n9GeH0#fCwXyY9PLkVh55D3P5%PE}zsB
z;YEmX?}7L{j1Le%_!Kr^6K6zI<N&1hqbp+fJIjbIq!_R%hB*tD23$Y@tCNsS+>hiO
zM+Qm&KmbvWfX*oZVg+<@CLHeW2jctaallAK+L{3LY$1xt*sO(u0&LDmAmkS&Qap~V
zn4gehSbjBt<tkhNl)xCV1RW^Y44~YFKt&5+ax7R3nFtDFC_9ksm<0$hnj%IL(ibS+
z=0mv`fPOcm$Z#|Rae)g!><F~%1JQ;<6SxBjp`Zw~-~quD2z9Xoi9tM{*yOE1M*KNY
zly^u4*a{O+DVa}ZiIsq_@F_qpf++wCK#|Kxq>JX`D4z;}hD@MFCQ^U~7pM@~2zA{D
ae0l&BD0uNljDjTq0000<MNUMnLSTX_DxEk0


From bfc805d6a7ab004ad5a6f9072359ca1ad9fa6c49 Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Sat, 15 May 2021 01:00:46 +0200
Subject: [PATCH 38/93] 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 01fafa553e..4c3f3086ae 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.754-210514
+Version: 7.0NG.754-210515
 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 7fb8d51adc..a7e945bb61 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.754-210514"
+pandora_version="7.0NG.754-210515"
 
 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 441e9b0496..5966c66855 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -1015,7 +1015,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.754';
-use constant AGENT_BUILD => '210514';
+use constant AGENT_BUILD => '210515';
 
 # 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 99c3b449e5..65aca49c84 100644
--- a/pandora_agents/unix/pandora_agent.redhat.spec
+++ b/pandora_agents/unix/pandora_agent.redhat.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     7.0NG.754
-%define release     210514
+%define release     210515
 
 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 e3ea9593d0..c18fa4399f 100644
--- a/pandora_agents/unix/pandora_agent.spec
+++ b/pandora_agents/unix/pandora_agent.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     7.0NG.754
-%define release     210514
+%define release     210515
 
 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 276b308087..f80e3c9067 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.754"
-PI_BUILD="210514"
+PI_BUILD="210515"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index 14ef458a10..fb5113043e 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{210514}
+{210515}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 03abdb96a4..1419402db4 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.754 Build 210514")
+#define PANDORA_VERSION ("7.0NG.754 Build 210515")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index 3ecc3bff66..5c0033c34a 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.754(Build 210514))"
+      VALUE "ProductVersion", "(7.0NG.754(Build 210515))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index b1cdcf4850..d77a5581f7 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.754-210514
+Version: 7.0NG.754-210515
 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 492d4cfec2..c81c266455 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.754-210514"
+pandora_version="7.0NG.754-210515"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 0ec89a7e8f..594bc788fe 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 = 'PC210514';
+$build_version = 'PC210515';
 $pandora_version = 'v7.0NG.754';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index c96c65c78f..34c6fa723a 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -129,7 +129,7 @@
         <div style='height: 10px'>
             <?php
             $version = '7.0NG.754';
-            $build = '210514';
+            $build = '210515';
             $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 ae6176b379..19f32d65ec 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.754
-%define release     210514
+%define release     210515
 
 # 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 09debf1a96..97b524e30a 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.754
-%define release     210514
+%define release     210515
 
 # 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 41ad228608..5ed4681858 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.754
-%define release     210514
+%define release     210515
 %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 d792b4067b..085e63b280 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.754-210514
+Version: 7.0NG.754-210515
 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 96f88059d8..43fe8552aa 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.754-210514"
+pandora_version="7.0NG.754-210515"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 6a48f15bcd..095bf4b85c 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@@ -45,7 +45,7 @@ our @EXPORT = qw(
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.754";
-my $pandora_build = "210514";
+my $pandora_build = "210515";
 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 81c19aaa84..48fb311e57 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.754";
-my $pandora_build = "210514";
+my $pandora_build = "210515";
 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 4c54bfacd2..db4b5f7997 100644
--- a/pandora_server/pandora_server.redhat.spec
+++ b/pandora_server/pandora_server.redhat.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     7.0NG.754
-%define release     210514
+%define release     210515
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index a6e31ca539..8627610800 100644
--- a/pandora_server/pandora_server.spec
+++ b/pandora_server/pandora_server.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     7.0NG.754
-%define release     210514
+%define release     210515
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index f711a776d2..43d537772b 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.754"
-PI_BUILD="210514"
+PI_BUILD="210515"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 7015a1e57f..fc6f794cb5 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.754 Build 210514";
+my $version = "7.0NG.754 Build 210515";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index a9fcbc9b2e..329ed17771 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.754 Build 210514";
+my $version = "7.0NG.754 Build 210515";
 
 # save program name for logging
 my $progname = basename($0);

From 8c0461e2bff19af990da4072626d0e4e549a976b Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Sun, 16 May 2021 01:00:26 +0200
Subject: [PATCH 39/93] 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 4c3f3086ae..7bb67c841b 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.754-210515
+Version: 7.0NG.754-210516
 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 a7e945bb61..3bc5643e9d 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.754-210515"
+pandora_version="7.0NG.754-210516"
 
 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 5966c66855..84814fca7e 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -1015,7 +1015,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.754';
-use constant AGENT_BUILD => '210515';
+use constant AGENT_BUILD => '210516';
 
 # 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 65aca49c84..19bcb31363 100644
--- a/pandora_agents/unix/pandora_agent.redhat.spec
+++ b/pandora_agents/unix/pandora_agent.redhat.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     7.0NG.754
-%define release     210515
+%define release     210516
 
 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 c18fa4399f..a06164cb6d 100644
--- a/pandora_agents/unix/pandora_agent.spec
+++ b/pandora_agents/unix/pandora_agent.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     7.0NG.754
-%define release     210515
+%define release     210516
 
 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 f80e3c9067..892dc125bd 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.754"
-PI_BUILD="210515"
+PI_BUILD="210516"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index fb5113043e..e2ff439c3b 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{210515}
+{210516}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 1419402db4..53e59b24d9 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.754 Build 210515")
+#define PANDORA_VERSION ("7.0NG.754 Build 210516")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index 5c0033c34a..c00928c3ba 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.754(Build 210515))"
+      VALUE "ProductVersion", "(7.0NG.754(Build 210516))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index d77a5581f7..c01ed23ee9 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.754-210515
+Version: 7.0NG.754-210516
 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 c81c266455..e74527610d 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.754-210515"
+pandora_version="7.0NG.754-210516"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 594bc788fe..d807791fbe 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 = 'PC210515';
+$build_version = 'PC210516';
 $pandora_version = 'v7.0NG.754';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 34c6fa723a..3b491307d2 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -129,7 +129,7 @@
         <div style='height: 10px'>
             <?php
             $version = '7.0NG.754';
-            $build = '210515';
+            $build = '210516';
             $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 19f32d65ec..3af4fb4389 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.754
-%define release     210515
+%define release     210516
 
 # 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 97b524e30a..a6911309f9 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.754
-%define release     210515
+%define release     210516
 
 # 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 5ed4681858..5e8c89346d 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.754
-%define release     210515
+%define release     210516
 %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 085e63b280..f639cbae78 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.754-210515
+Version: 7.0NG.754-210516
 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 43fe8552aa..f68654c43b 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.754-210515"
+pandora_version="7.0NG.754-210516"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 095bf4b85c..d0218b9c91 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@@ -45,7 +45,7 @@ our @EXPORT = qw(
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.754";
-my $pandora_build = "210515";
+my $pandora_build = "210516";
 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 48fb311e57..c5953f7906 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.754";
-my $pandora_build = "210515";
+my $pandora_build = "210516";
 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 db4b5f7997..b6606a8f67 100644
--- a/pandora_server/pandora_server.redhat.spec
+++ b/pandora_server/pandora_server.redhat.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     7.0NG.754
-%define release     210515
+%define release     210516
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 8627610800..81bf328181 100644
--- a/pandora_server/pandora_server.spec
+++ b/pandora_server/pandora_server.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     7.0NG.754
-%define release     210515
+%define release     210516
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 43d537772b..c6f5bbc54b 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.754"
-PI_BUILD="210515"
+PI_BUILD="210516"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index fc6f794cb5..27c734c99c 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.754 Build 210515";
+my $version = "7.0NG.754 Build 210516";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 329ed17771..471c85f282 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.754 Build 210515";
+my $version = "7.0NG.754 Build 210516";
 
 # save program name for logging
 my $progname = basename($0);

From d2fd310ea2881590db8e706bb381db1eabd7e9fb Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Mon, 17 May 2021 01:00:38 +0200
Subject: [PATCH 40/93] 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 7bb67c841b..8526580f7d 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.754-210516
+Version: 7.0NG.754-210517
 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 3bc5643e9d..2ae95a0f02 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.754-210516"
+pandora_version="7.0NG.754-210517"
 
 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 84814fca7e..d74f7c37e9 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -1015,7 +1015,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.754';
-use constant AGENT_BUILD => '210516';
+use constant AGENT_BUILD => '210517';
 
 # 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 19bcb31363..14b1d09bf0 100644
--- a/pandora_agents/unix/pandora_agent.redhat.spec
+++ b/pandora_agents/unix/pandora_agent.redhat.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     7.0NG.754
-%define release     210516
+%define release     210517
 
 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 a06164cb6d..957c253e0f 100644
--- a/pandora_agents/unix/pandora_agent.spec
+++ b/pandora_agents/unix/pandora_agent.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     7.0NG.754
-%define release     210516
+%define release     210517
 
 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 892dc125bd..cca2a47bd1 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.754"
-PI_BUILD="210516"
+PI_BUILD="210517"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index e2ff439c3b..a6fcc0802a 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{210516}
+{210517}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 53e59b24d9..1d367ca6a6 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.754 Build 210516")
+#define PANDORA_VERSION ("7.0NG.754 Build 210517")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index c00928c3ba..a0dc952613 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.754(Build 210516))"
+      VALUE "ProductVersion", "(7.0NG.754(Build 210517))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index c01ed23ee9..4afac2847f 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.754-210516
+Version: 7.0NG.754-210517
 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 e74527610d..3f1b5cfa31 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.754-210516"
+pandora_version="7.0NG.754-210517"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index d807791fbe..3fd4d471b9 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 = 'PC210516';
+$build_version = 'PC210517';
 $pandora_version = 'v7.0NG.754';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 3b491307d2..73d132a3f7 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -129,7 +129,7 @@
         <div style='height: 10px'>
             <?php
             $version = '7.0NG.754';
-            $build = '210516';
+            $build = '210517';
             $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 3af4fb4389..d2c596106c 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.754
-%define release     210516
+%define release     210517
 
 # 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 a6911309f9..f0a62efb0d 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.754
-%define release     210516
+%define release     210517
 
 # 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 5e8c89346d..64fc3e3794 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.754
-%define release     210516
+%define release     210517
 %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 f639cbae78..e53d5f98c6 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.754-210516
+Version: 7.0NG.754-210517
 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 f68654c43b..7bb9925819 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.754-210516"
+pandora_version="7.0NG.754-210517"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index d0218b9c91..80bd480d8f 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@@ -45,7 +45,7 @@ our @EXPORT = qw(
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.754";
-my $pandora_build = "210516";
+my $pandora_build = "210517";
 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 c5953f7906..f392deca89 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.754";
-my $pandora_build = "210516";
+my $pandora_build = "210517";
 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 b6606a8f67..b3d8e73508 100644
--- a/pandora_server/pandora_server.redhat.spec
+++ b/pandora_server/pandora_server.redhat.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     7.0NG.754
-%define release     210516
+%define release     210517
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 81bf328181..689812cb20 100644
--- a/pandora_server/pandora_server.spec
+++ b/pandora_server/pandora_server.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     7.0NG.754
-%define release     210516
+%define release     210517
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index c6f5bbc54b..14339f5490 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.754"
-PI_BUILD="210516"
+PI_BUILD="210517"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 27c734c99c..1c70abef74 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.754 Build 210516";
+my $version = "7.0NG.754 Build 210517";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 471c85f282..1f5c6c9c04 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.754 Build 210516";
+my $version = "7.0NG.754 Build 210517";
 
 # save program name for logging
 my $progname = basename($0);

From 663d1dcf75e70f96bbc465d9151bf0265a2bdadb Mon Sep 17 00:00:00 2001
From: "alejandro.campos@artica.es" <alejandro.campos@artica.es>
Date: Mon, 17 May 2021 13:43:20 +0200
Subject: [PATCH 41/93] minor fix

---
 pandora_console/operation/incidents/incident_statistics.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pandora_console/operation/incidents/incident_statistics.php b/pandora_console/operation/incidents/incident_statistics.php
index 2aa97ad46c..b4966c1b96 100755
--- a/pandora_console/operation/incidents/incident_statistics.php
+++ b/pandora_console/operation/incidents/incident_statistics.php
@@ -18,10 +18,6 @@ require_once $config['homedir'].'/include/functions_graph.php';
 
 check_login();
 
-db_pandora_audit('ACL Violation', 'Trying to access Incident section');
-require 'general/noaccess.php';
-exit;
-
 ui_print_page_header(__('Incidents').' &raquo; '.__('Statistics'), 'images/book_edit.png', false, '', false, '');
 
 if (!$config['integria_enabled']) {

From fd372d53d1282bae53fb93bb81178b096b331ed1 Mon Sep 17 00:00:00 2001
From: Daniel Maya <daniel.maya@artica.es>
Date: Mon, 17 May 2021 13:00:59 +0000
Subject: [PATCH 42/93] Ent 6978 umbrales inversos fallan

---
 pandora_server/lib/PandoraFMS/Core.pm | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm
index a384d3701e..bbce7913e9 100644
--- a/pandora_server/lib/PandoraFMS/Core.pm
+++ b/pandora_server/lib/PandoraFMS/Core.pm
@@ -4652,11 +4652,17 @@ sub get_module_status ($$$) {
 			}
 			# (-inf, critical_min), [critical_max, +inf)
 			else {
-				return 1 if ($data < $critical_min || $data >= $critical_max);
-				return 1 if ($data <= $critical_max && $critical_max < $critical_min);
+				if ($critical_min == 0) {
+					return 1 if ($data > $critical_max);
+				}elsif ($critical_max == 0) {
+					return 1 if ($data <= $critical_min);
+				} else {
+					return 1 if ($data < $critical_min || $data >= $critical_max);
+					return 1 if ($data <= $critical_max && $critical_max < $critical_min);
+				}
 			}
 		}
-	
+
 		# Warning
 		if ($warning_min ne $warning_max) {
 			# [warning_min, warning_max)
@@ -4666,8 +4672,14 @@ sub get_module_status ($$$) {
 			}
 			# (-inf, warning_min), [warning_max, +inf)
 			else {
-				return 2 if ($data < $warning_min || $data >= $warning_max);
-				return 2 if ($data <= $warning_max && $warning_max < $warning_min);
+				if ($warning_min == 0) {
+					return 1 if ($data > $warning_max);
+				}elsif ($warning_max == 0) {
+					return 1 if ($data <= $warning_min);
+				} else {
+					return 2 if ($data < $warning_min || $data >= $warning_max);
+					return 2 if ($data <= $warning_max && $warning_max < $warning_min);
+				}
 			}
 		}
 	}

From 739bc7ebd91cfd034f45aa6632ddebfeda4258ed Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Tue, 18 May 2021 01:00:45 +0200
Subject: [PATCH 43/93] 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 8526580f7d..fc93b3de67 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.754-210517
+Version: 7.0NG.754-210518
 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 2ae95a0f02..c037fa86d9 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.754-210517"
+pandora_version="7.0NG.754-210518"
 
 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 930dc04624..150ef4a51f 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -1015,7 +1015,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.754';
-use constant AGENT_BUILD => '210517';
+use constant AGENT_BUILD => '210518';
 
 # 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 14b1d09bf0..f64a53debe 100644
--- a/pandora_agents/unix/pandora_agent.redhat.spec
+++ b/pandora_agents/unix/pandora_agent.redhat.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     7.0NG.754
-%define release     210517
+%define release     210518
 
 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 957c253e0f..f631031700 100644
--- a/pandora_agents/unix/pandora_agent.spec
+++ b/pandora_agents/unix/pandora_agent.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     7.0NG.754
-%define release     210517
+%define release     210518
 
 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 cca2a47bd1..5775fff708 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.754"
-PI_BUILD="210517"
+PI_BUILD="210518"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index a6fcc0802a..06927012e5 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{210517}
+{210518}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 1d367ca6a6..bfad64aa62 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.754 Build 210517")
+#define PANDORA_VERSION ("7.0NG.754 Build 210518")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index a0dc952613..b73e932f3e 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.754(Build 210517))"
+      VALUE "ProductVersion", "(7.0NG.754(Build 210518))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 4afac2847f..a785b2713e 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.754-210517
+Version: 7.0NG.754-210518
 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 3f1b5cfa31..c613edcc02 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.754-210517"
+pandora_version="7.0NG.754-210518"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 3fd4d471b9..9d034e0fef 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 = 'PC210517';
+$build_version = 'PC210518';
 $pandora_version = 'v7.0NG.754';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 73d132a3f7..9856e01ec7 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -129,7 +129,7 @@
         <div style='height: 10px'>
             <?php
             $version = '7.0NG.754';
-            $build = '210517';
+            $build = '210518';
             $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 d2c596106c..c4c9c18c8f 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.754
-%define release     210517
+%define release     210518
 
 # 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 f0a62efb0d..6a1c092c40 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.754
-%define release     210517
+%define release     210518
 
 # 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 64fc3e3794..e2b600d731 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.754
-%define release     210517
+%define release     210518
 %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 e53d5f98c6..7001a14efc 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.754-210517
+Version: 7.0NG.754-210518
 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 7bb9925819..adbecff666 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.754-210517"
+pandora_version="7.0NG.754-210518"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 80bd480d8f..05b6259223 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@@ -45,7 +45,7 @@ our @EXPORT = qw(
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.754";
-my $pandora_build = "210517";
+my $pandora_build = "210518";
 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 f392deca89..44e598dd0e 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.754";
-my $pandora_build = "210517";
+my $pandora_build = "210518";
 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 b3d8e73508..9c2c788f07 100644
--- a/pandora_server/pandora_server.redhat.spec
+++ b/pandora_server/pandora_server.redhat.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     7.0NG.754
-%define release     210517
+%define release     210518
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 689812cb20..1c57ed3718 100644
--- a/pandora_server/pandora_server.spec
+++ b/pandora_server/pandora_server.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     7.0NG.754
-%define release     210517
+%define release     210518
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 14339f5490..6ffab8d15b 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.754"
-PI_BUILD="210517"
+PI_BUILD="210518"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 1c70abef74..f0d90fa665 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.754 Build 210517";
+my $version = "7.0NG.754 Build 210518";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index ae53f07dbf..f55de28ad3 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.754 Build 210517";
+my $version = "7.0NG.754 Build 210518";
 
 # save program name for logging
 my $progname = basename($0);

From be6269fc8928ef40dd3ffdc4538b0e8456e44d6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Gonz=C3=A1lez?= <jose.gonzalez@pandorafms.com>
Date: Tue, 18 May 2021 10:25:45 +0200
Subject: [PATCH 44/93] Code review

---
 pandora_agents/unix/pandora_revent    | 18 ++++++++----------
 pandora_server/util/pandora_revent.pl | 22 ++++++----------------
 2 files changed, 14 insertions(+), 26 deletions(-)

diff --git a/pandora_agents/unix/pandora_revent b/pandora_agents/unix/pandora_revent
index 3af581decb..2f9d04e21a 100755
--- a/pandora_agents/unix/pandora_revent
+++ b/pandora_agents/unix/pandora_revent
@@ -3,7 +3,7 @@
 ########################################################################
 # Pandora FMS - Remote Event Tool (via WEB API) 
 ########################################################################
-# Copyright (c) 2013 Artica Soluciones Tecnologicas S.L
+# Copyright (c) 2021 Artica Soluciones Tecnologicas S.L
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License version 2
@@ -12,6 +12,7 @@
 # Includes list
 use strict;
 use LWP::Simple;
+use LWP::UserAgent;
 use MIME::Base64;
 use lib '/usr/lib/perl5';
 use PandoraFMS::Tools;
@@ -88,7 +89,7 @@ Optional parameters:
 ##############################################################################
 sub tool_api_init () {
 	
-	print "\nPandora FMS Remote Event Tool Copyright (c) 2013-2015 Artica ST\n";
+	print "\nPandora FMS Remote Event Tool Copyright (c) 2013-2021 Artica ST\n";
 	print "This program is Free Software, licensed under the terms of GPL License v2\n";
 	print "You can download latest versions and documentation at http://www.pandorafms.org\n\n";
 	
@@ -190,7 +191,7 @@ sub tool_api_main () {
 				$id_group = $ARGV[$i + 1];
 			}
 			if ($line eq '-name') {
-				$event_name = $ARGV[$i + 1];
+				$event_name = join('%23', split("#", $ARGV[$i + 1]));
 			}
 			if ($line eq '-type') {
 				$event_type = $ARGV[$i + 1];
@@ -255,17 +256,13 @@ sub tool_api_main () {
 		}
 		
 		if ($event_name eq "") {
-			print "[ERROR] Missing id agent! Read help info:\n\n";
+			print "[ERROR] Missing event name! Read help info:\n\n";
 			help_screen ();
 		}
 		if ($id_group eq "") {
 			print "[ERROR] Missing event group! Read help info:\n\n";
 			help_screen ();
 		}
-		if ($id_agent eq "" && $agent_name eq "") {
-			print "[ERROR] Missing id agent! and agent_name Read help info:\n\n";
-			help_screen ();
-		}
 		
 		$data_event = $event_name .
 			"|" . $id_group .
@@ -321,7 +318,8 @@ sub tool_api_main () {
 		exit;
  	}
 	else {
-		my $content = get($call_api);
+		my $ua = LWP::UserAgent->new(ssl_opts => { verify_hostname => 0 });
+		my $content = $ua->get($call_api);
 		
 		if ($option eq '-create_event') {
 			if ($content eq undef) {
@@ -329,7 +327,7 @@ sub tool_api_main () {
 				help_screen();
 			}
 			else {
-				print "Event ID: $content";
+				print "Event ID: $content->{'_content'}";
 			}
 		}
 		elsif ($option eq '-validate_event') {
diff --git a/pandora_server/util/pandora_revent.pl b/pandora_server/util/pandora_revent.pl
index f0eed4793c..2f9d04e21a 100755
--- a/pandora_server/util/pandora_revent.pl
+++ b/pandora_server/util/pandora_revent.pl
@@ -3,7 +3,7 @@
 ########################################################################
 # Pandora FMS - Remote Event Tool (via WEB API) 
 ########################################################################
-# Copyright (c) 2013-2021 Artica Soluciones Tecnologicas S.L
+# Copyright (c) 2021 Artica Soluciones Tecnologicas S.L
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License version 2
@@ -62,7 +62,7 @@ Optional parameters:
 	[-owner_user <owner event>]	: Use the login name, not the descriptive
 	[-source <source>]			: (By default 'Pandora')
 	[-tag <tags>]				: Tag (must exist in the system to be imported)
-	[-custom_data <custom_data>]: Custom data should be a base 64 encoded JSON document example -custom_data \'{\"test1\" : 1, \"test2\": 2}\'
+	[-custom_data <custom_data>]: Custom data has to be in JSON format. Example: -custom_data \'{\"test1\" : \"t1\", \"test2\": \"2\"}\'
 	[-id_extra <id extra>]      : Id extra
 	[-agent_name <Agent name>]  : Agent name, Not to be confused with the alias.
 	[-force_create_agent<0 o 1>]: Force the creation of agent through an event this will create when it is 1.
@@ -191,7 +191,7 @@ sub tool_api_main () {
 				$id_group = $ARGV[$i + 1];
 			}
 			if ($line eq '-name') {
-				$event_name = $ARGV[$i + 1];
+				$event_name = join('%23', split("#", $ARGV[$i + 1]));
 			}
 			if ($line eq '-type') {
 				$event_type = $ARGV[$i + 1];
@@ -263,10 +263,6 @@ sub tool_api_main () {
 			print "[ERROR] Missing event group! Read help info:\n\n";
 			help_screen ();
 		}
-		if ($id_agent eq "") {
-			print "[ERROR] Missing id agent! Read help info:\n\n";
-			help_screen ();
-		}
 		
 		$data_event = $event_name .
 			"|" . $id_group .
@@ -322,26 +318,20 @@ sub tool_api_main () {
 		exit;
  	}
 	else {
-		#-----------DEBUG----------------------------
-		#print($call_api . "\n\n\n");
-		# Support HTTPS without hostname verification.
 		my $ua = LWP::UserAgent->new(ssl_opts => { verify_hostname => 0 });
 		my $content = $ua->get($call_api);
-
-		#-----------DEBUG----------------------------
-		#print($content . "\n\n\n");
-
+		
 		if ($option eq '-create_event') {
 			if ($content eq undef) {
 				print "[ERROR] Not respond or bad syntax. Read help info:\n\n";
 				help_screen();
 			}
 			else {
-				print "Event ID: ".$content->{'_content'};
+				print "Event ID: $content->{'_content'}";
 			}
 		}
 		elsif ($option eq '-validate_event') {
-			print "[RESULT] ".$content->{'_content'};
+			print "[RESULT] $content";
 		}
 	}
 	

From 5cdc0b8a14e018c4948e80fbb1297e57f3538cd3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Gonz=C3=A1lez?= <jose.gonzalez@pandorafms.com>
Date: Tue, 18 May 2021 10:52:39 +0200
Subject: [PATCH 45/93] Code review

---
 pandora_agents/unix/pandora_revent    | 10 +++++-----
 pandora_server/util/pandora_revent.pl | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pandora_agents/unix/pandora_revent b/pandora_agents/unix/pandora_revent
index 2f9d04e21a..cecb64a0f7 100755
--- a/pandora_agents/unix/pandora_revent
+++ b/pandora_agents/unix/pandora_revent
@@ -33,13 +33,13 @@ sub help_screen{
 \t$0 -p <path_to_consoleAPI> -u <credentials> -create_event <options> 
 
 Where options:\n
-	-u <credentials>			: API credentials separated by comma: <api_pass>,<user>,<pass>
-	-name <event_name>			: Free text
-	-group <id_group>			: Group ID (use 0 for 'all') 
-	-agent					    : Agent ID
+	-u <credentials>		: API credentials separated by comma: <api_pass>,<user>,<pass>
+	-name <event_name>	: Free text
+	-group <id_group>		: Group ID (use 0 for 'all') 
 	
 Optional parameters:
-	
+
+	[-agent <id_agent]	: Agent ID
 	[-status <status>]			: 0 New, 1 Validated, 2 In process
 	[-user <id_user>]			: User comment (use in combination with -comment option)
 	[-type <event_type>]		: unknown, alert_fired, alert_recovered, alert_ceased
diff --git a/pandora_server/util/pandora_revent.pl b/pandora_server/util/pandora_revent.pl
index 2f9d04e21a..cecb64a0f7 100755
--- a/pandora_server/util/pandora_revent.pl
+++ b/pandora_server/util/pandora_revent.pl
@@ -33,13 +33,13 @@ sub help_screen{
 \t$0 -p <path_to_consoleAPI> -u <credentials> -create_event <options> 
 
 Where options:\n
-	-u <credentials>			: API credentials separated by comma: <api_pass>,<user>,<pass>
-	-name <event_name>			: Free text
-	-group <id_group>			: Group ID (use 0 for 'all') 
-	-agent					    : Agent ID
+	-u <credentials>		: API credentials separated by comma: <api_pass>,<user>,<pass>
+	-name <event_name>	: Free text
+	-group <id_group>		: Group ID (use 0 for 'all') 
 	
 Optional parameters:
-	
+
+	[-agent <id_agent]	: Agent ID
 	[-status <status>]			: 0 New, 1 Validated, 2 In process
 	[-user <id_user>]			: User comment (use in combination with -comment option)
 	[-type <event_type>]		: unknown, alert_fired, alert_recovered, alert_ceased

From 9666b76fa9ab108b85a92bd88053f461afa88728 Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Tue, 18 May 2021 10:56:40 +0200
Subject: [PATCH 46/93] Common requirements using base url

---
 pandora_console/operation/visual_console/public_console.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pandora_console/operation/visual_console/public_console.php b/pandora_console/operation/visual_console/public_console.php
index 8a6ff462fc..5c6f2d1fcf 100755
--- a/pandora_console/operation/visual_console/public_console.php
+++ b/pandora_console/operation/visual_console/public_console.php
@@ -16,6 +16,10 @@
 require_once '../../include/config.php';
 
 $legacy = (bool) get_parameter('legacy', $config['legacy_vc']);
+if (is_metaconsole() === true) {
+    $config['requirements_use_base_url'] = true;
+}
+
 if ($legacy === false) {
     include_once $config['homedir'].'/operation/visual_console/public_view.php';
 } else {

From b0fbe192a0058bec8eafeae1059d3fb2fabc4033 Mon Sep 17 00:00:00 2001
From: "rafael.ameijeiras" <rafael.ameijeiras@artica.es>
Date: Tue, 18 May 2021 11:43:43 +0200
Subject: [PATCH 47/93] adding expect to be used with ssh modules

---
 extras/deploy-scripts/pandora_deploy_community.sh |  2 ++
 extras/docker/centos8/base/Dockerfile             | 14 ++++++++------
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/extras/deploy-scripts/pandora_deploy_community.sh b/extras/deploy-scripts/pandora_deploy_community.sh
index 5e580ef1a3..29502b8ef2 100644
--- a/extras/deploy-scripts/pandora_deploy_community.sh
+++ b/extras/deploy-scripts/pandora_deploy_community.sh
@@ -254,6 +254,8 @@ server_dependencies=" \
     perl(Geo::IP) \
     perl(IO::Socket::INET6) \
     perl(XML::Twig) \
+    expect \
+	openssh-clients \
     http://firefly.artica.es/centos7/xprobe2-0.3-12.2.x86_64.rpm \
     http://firefly.artica.es/centos7/wmic-1.4-1.el7.x86_64.rpm"
 execute_cmd "yum install -y $server_dependencies" "Installing Pandora FMS Server dependencies"
diff --git a/extras/docker/centos8/base/Dockerfile b/extras/docker/centos8/base/Dockerfile
index a35aea2937..2e66972229 100644
--- a/extras/docker/centos8/base/Dockerfile
+++ b/extras/docker/centos8/base/Dockerfile
@@ -11,7 +11,7 @@ RUN dnf install -y --setopt=tsflags=nodocs \
 RUN dnf module reset -y php && dnf module install -y php:remi-7.3
 RUN dnf config-manager --set-enabled powertools
 
-# Install console
+# Install console dependencies
 RUN dnf install -y --setopt=tsflags=nodocs \
         php \
         php-mcrypt \php-cli \
@@ -91,9 +91,9 @@ RUN dnf install -y --setopt=tsflags=nodocs \
         php-yaml
 
 RUN mkdir -p /run/php-fpm/ ; chown -R root:apache /run/php-fpm/
-# not installed perl-Net-Telnet gtk-update-icon-cach ghostscript-fonts
+# Not installed perl-Net-Telnet gtk-update-icon-cach ghostscript-fonts
 
-# Install server
+# Install server dependencies 
 
 RUN dnf install -y  --setopt=tsflags=nodocs \
         GeoIP \
@@ -256,16 +256,18 @@ RUN dnf install -y  --setopt=tsflags=nodocs \
         nmap \
         net-snmp-utils \
         sudo \
+        expect \
+	openssh-clients \
         http://firefly.artica.es/centos8/perl-Net-Telnet-3.04-1.el8.noarch.rpm \
-        http://firefly.artica.es/centos8/wmi-1.3.14-4.el7.art.x86_64.rpm 
+        http://firefly.artica.es/centos7/wmic-1.4-1.el7.x86_64.rpm
 
-# install utils
+# Install utils
 RUN dnf install -y supervisor crontabs http://firefly.artica.es/centos8/phantomjs-2.1.1-1.el7.x86_64.rpm --setopt=tsflags=nodocs
 # SDK VMware perl dependencies
 RUN dnf install -y http://firefly.artica.es/centos8/perl-Crypt-OpenSSL-AES-0.02-1.el8.x86_64.rpm http://firefly.artica.es/centos8/perl-Crypt-SSLeay-0.73_07-1.gf.el8.x86_64.rpm perl-Net-HTTP perl-libwww-perl openssl-devel perl-Crypt-CBC perl-Bytes-Random-Secure perl-Crypt-Random-Seed perl-Math-Random-ISAAC perl-JSON http://firefly.artica.es/centos8/VMware-vSphere-Perl-SDK-6.5.0-4566394.x86_64.rpm
 # Instant client Oracle
 RUN dnf install -y https://download.oracle.com/otn_software/linux/instantclient/19800/oracle-instantclient19.8-basic-19.8.0.0.0-1.x86_64.rpm https://download.oracle.com/otn_software/linux/instantclient/19800/oracle-instantclient19.8-sqlplus-19.8.0.0.0-1.x86_64.rpm
-
+# Install Phantom
 RUN dnf install -y supervisor crontabs http://firefly.artica.es/centos8/phantomjs-2.1.1-1.el7.x86_64.rpm --setopt=tsflags=nodocs
 
 

From 0d50ea94dbfad78923919526ff0dd1ba58b8bee0 Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Tue, 18 May 2021 13:27:06 +0200
Subject: [PATCH 48/93] Ensure oid starts with dot - braa requriements

---
 pandora_console/include/class/AgentWizard.class.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pandora_console/include/class/AgentWizard.class.php b/pandora_console/include/class/AgentWizard.class.php
index e7486c3cd8..e572fd67ed 100644
--- a/pandora_console/include/class/AgentWizard.class.php
+++ b/pandora_console/include/class/AgentWizard.class.php
@@ -1582,6 +1582,10 @@ class AgentWizard extends HTML
                 if ($candidate['execution_type'] === 0
                     || $candidate['execution_type'] === EXECUTION_TYPE_NETWORK
                 ) {
+                    if (substr($candidate['value'], 0, 1) !== '.') {
+                        $candidate['value'] = '.'.$candidate['value'];
+                    }
+
                     if ($this->serverType === SERVER_TYPE_ENTERPRISE_SATELLITE) {
                         $values['id_module'] = MODULE_DATA;
                         $values['module_interval'] = 1;

From 876e3dd1917d6333bed760267edfd780916dfcbf Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Tue, 18 May 2021 13:27:56 +0200
Subject: [PATCH 49/93] Minor fix - linter return type in comments set to mixed

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

diff --git a/pandora_console/include/functions_db.php b/pandora_console/include/functions_db.php
index f7d264d0c4..26a46eae7b 100644
--- a/pandora_console/include/functions_db.php
+++ b/pandora_console/include/functions_db.php
@@ -374,7 +374,7 @@ function db_get_value_filter($field, $table, $filter, $where_join='AND', $search
  *
  * @param string SQL select statement to execute.
  *
- * @return the first value of the first row of a table result from query.
+ * @return mixed the first value of the first row of a table result from query.
  */
 function db_get_value_sql($sql, $dbconnection=false)
 {

From e5ebc523568a0921b7c83cd3da8c1047889623c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Gonz=C3=A1lez?= <jose.gonzalez@pandorafms.com>
Date: Tue, 4 May 2021 13:48:13 +0200
Subject: [PATCH 50/93] Fixed missed parameter

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

diff --git a/pandora_console/include/class/AgentWizard.class.php b/pandora_console/include/class/AgentWizard.class.php
index e572fd67ed..d42538187a 100644
--- a/pandora_console/include/class/AgentWizard.class.php
+++ b/pandora_console/include/class/AgentWizard.class.php
@@ -2090,7 +2090,7 @@ class AgentWizard extends HTML
                         $tmp->id_modulo(MODULE_PLUGIN);
 
                         if ($this->wizardSection === 'snmp_interfaces_explorer'
-                            && empty($candidate['macros']) === true
+                            && empty($candidate['macros']) === false
                         ) {
                             // Use definition provided.
                             $tmp->id_plugin($candidate['id_plugin']);

From 46e0cbca707336f352afc36a1a9bebfae289c281 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Gonz=C3=A1lez?= <jose.gonzalez@pandorafms.com>
Date: Tue, 18 May 2021 14:52:23 +0200
Subject: [PATCH 51/93] id_agent control for pandora_revent

---
 pandora_console/include/functions_api.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pandora_console/include/functions_api.php b/pandora_console/include/functions_api.php
index a39d9da92a..a4fdddc405 100644
--- a/pandora_console/include/functions_api.php
+++ b/pandora_console/include/functions_api.php
@@ -12905,8 +12905,10 @@ function api_set_create_event($id, $trash1, $other, $returnType)
 
         $error_msg = '';
         if ($other['data'][2] != '') {
+            // Id agent assignment.
             $id_agent = $other['data'][2];
-            if (is_metaconsole()) {
+            // To the next if is metaconsole and id_agent is not none.
+            if (is_metaconsole() === true && $id_agent > 0) {
                 // On metaconsole, connect with the node to check the permissions
                 if (empty($values['server_id'])) {
                     $agent_cache = db_get_row('tmetaconsole_agent', 'id_tagente', $id_agent);

From 5342ae077c7643efbb1998fad56a280638fbd799 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Gonz=C3=A1lez?= <jose.gonzalez@pandorafms.com>
Date: Tue, 18 May 2021 15:27:45 +0200
Subject: [PATCH 52/93] id_agent default value

---
 pandora_agents/unix/pandora_revent    | 7 ++++++-
 pandora_server/util/pandora_revent.pl | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/pandora_agents/unix/pandora_revent b/pandora_agents/unix/pandora_revent
index cecb64a0f7..f78bc7dfe5 100755
--- a/pandora_agents/unix/pandora_revent
+++ b/pandora_agents/unix/pandora_revent
@@ -121,7 +121,7 @@ sub tool_api_main () {
 	my $db_user;
 	my $db_pass;
 	my @db_info;
-	my $id_agent;
+	my $id_agent = '0';
 	my $id_user = '';
 	my $status = '';
 	my $id_agent_module = '';
@@ -186,6 +186,11 @@ sub tool_api_main () {
 			
 			if ($line eq '-agent') {
 				$id_agent = $ARGV[$i + 1];
+				# If not defined, send 0 for API.
+				if ($id_agent eq undef) {
+					$id_agent = '0';
+				}
+
 			}
 			if ($line eq '-group') {
 				$id_group = $ARGV[$i + 1];
diff --git a/pandora_server/util/pandora_revent.pl b/pandora_server/util/pandora_revent.pl
index cecb64a0f7..f78bc7dfe5 100755
--- a/pandora_server/util/pandora_revent.pl
+++ b/pandora_server/util/pandora_revent.pl
@@ -121,7 +121,7 @@ sub tool_api_main () {
 	my $db_user;
 	my $db_pass;
 	my @db_info;
-	my $id_agent;
+	my $id_agent = '0';
 	my $id_user = '';
 	my $status = '';
 	my $id_agent_module = '';
@@ -186,6 +186,11 @@ sub tool_api_main () {
 			
 			if ($line eq '-agent') {
 				$id_agent = $ARGV[$i + 1];
+				# If not defined, send 0 for API.
+				if ($id_agent eq undef) {
+					$id_agent = '0';
+				}
+
 			}
 			if ($line eq '-group') {
 				$id_group = $ARGV[$i + 1];

From 91d11bd4cf32868a966782b3af84a93b2372f86d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Gonz=C3=A1lez?= <jose.gonzalez@pandorafms.com>
Date: Tue, 18 May 2021 16:37:05 +0200
Subject: [PATCH 53/93] Controlled pandora_revent with id_agent 0

---
 pandora_console/include/functions_api.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pandora_console/include/functions_api.php b/pandora_console/include/functions_api.php
index a4fdddc405..a37d1dbd7d 100644
--- a/pandora_console/include/functions_api.php
+++ b/pandora_console/include/functions_api.php
@@ -12905,7 +12905,7 @@ function api_set_create_event($id, $trash1, $other, $returnType)
 
         $error_msg = '';
         if ($other['data'][2] != '') {
-            // Id agent assignment.
+            // Id agent assignment. If come from pandora_revent, id_agent can be 0.
             $id_agent = $other['data'][2];
             // To the next if is metaconsole and id_agent is not none.
             if (is_metaconsole() === true && $id_agent > 0) {
@@ -12931,7 +12931,7 @@ function api_set_create_event($id, $trash1, $other, $returnType)
 
             $values['id_agente'] = $id_agent;
 
-            if (!util_api_check_agent_and_print_error($id_agent, 'string', 'AR')) {
+            if ((int) $id_agent > 0 && util_api_check_agent_and_print_error($id_agent, 'string', 'AR') === false) {
                 if (is_metaconsole()) {
                     metaconsole_restore_db();
                 }

From 074fadda35ee674e7cfd199528f870f719902eff Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Tue, 18 May 2021 18:49:20 +0200
Subject: [PATCH 54/93] Fix in item load vc-public link

---
 .../include/rest-api/models/VisualConsole/Item.php            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pandora_console/include/rest-api/models/VisualConsole/Item.php b/pandora_console/include/rest-api/models/VisualConsole/Item.php
index c391917731..7da6e26426 100644
--- a/pandora_console/include/rest-api/models/VisualConsole/Item.php
+++ b/pandora_console/include/rest-api/models/VisualConsole/Item.php
@@ -1072,8 +1072,8 @@ class Item extends CachedModel
         $mobile_navigation = false;
 
         if (isset($_SERVER['PHP_SELF']) === true
-            && (strstr($_SERVER['PHP_SELF'], 'mobile/') !== false
-            || strstr($_SERVER['HTTP_REFERER'], 'mobile/') !== false)
+            && (strstr(($_SERVER['PHP_SELF'] ?? ''), 'mobile/') !== false
+            || strstr(($_SERVER['HTTP_REFERER'] ?? ''), 'mobile/') !== false)
         ) {
             $mobile_navigation = true;
         }

From 8fc438f91378176919b64509ca5a2feae983dba7 Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Tue, 18 May 2021 18:50:01 +0200
Subject: [PATCH 55/93] Fix in item load vc-public link

---
 .../include/rest-api/models/VisualConsole/Item.php           | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pandora_console/include/rest-api/models/VisualConsole/Item.php b/pandora_console/include/rest-api/models/VisualConsole/Item.php
index 7da6e26426..720df2b0f9 100644
--- a/pandora_console/include/rest-api/models/VisualConsole/Item.php
+++ b/pandora_console/include/rest-api/models/VisualConsole/Item.php
@@ -1072,8 +1072,9 @@ class Item extends CachedModel
         $mobile_navigation = false;
 
         if (isset($_SERVER['PHP_SELF']) === true
-            && (strstr(($_SERVER['PHP_SELF'] ?? ''), 'mobile/') !== false
-            || strstr(($_SERVER['HTTP_REFERER'] ?? ''), 'mobile/') !== false)
+            && isset($_SERVER['HTTP_REFERER']) === true
+            && (strstr($_SERVER['PHP_SELF'], 'mobile/') !== false
+            || strstr($_SERVER['HTTP_REFERER'], 'mobile/') !== false)
         ) {
             $mobile_navigation = true;
         }

From f3eb5605182a79d3420dfc91324863d8e22f0abc Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Wed, 19 May 2021 01:00:46 +0200
Subject: [PATCH 56/93] 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 fc93b3de67..e1a0b8f0f0 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.754-210518
+Version: 7.0NG.754-210519
 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 c037fa86d9..efd6b0843f 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.754-210518"
+pandora_version="7.0NG.754-210519"
 
 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 150ef4a51f..3533c3390c 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -1015,7 +1015,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.754';
-use constant AGENT_BUILD => '210518';
+use constant AGENT_BUILD => '210519';
 
 # 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 f64a53debe..e130e6f231 100644
--- a/pandora_agents/unix/pandora_agent.redhat.spec
+++ b/pandora_agents/unix/pandora_agent.redhat.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     7.0NG.754
-%define release     210518
+%define release     210519
 
 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 f631031700..cf96d6d051 100644
--- a/pandora_agents/unix/pandora_agent.spec
+++ b/pandora_agents/unix/pandora_agent.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     7.0NG.754
-%define release     210518
+%define release     210519
 
 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 5775fff708..6cefdd0081 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.754"
-PI_BUILD="210518"
+PI_BUILD="210519"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index 06927012e5..6bfd7d14ad 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{210518}
+{210519}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index bfad64aa62..3ea9f99f4d 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.754 Build 210518")
+#define PANDORA_VERSION ("7.0NG.754 Build 210519")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index b73e932f3e..bf76b70e96 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.754(Build 210518))"
+      VALUE "ProductVersion", "(7.0NG.754(Build 210519))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index a785b2713e..738ec03949 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.754-210518
+Version: 7.0NG.754-210519
 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 c613edcc02..6a5939f5ff 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.754-210518"
+pandora_version="7.0NG.754-210519"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 9d034e0fef..e47c495d7c 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 = 'PC210518';
+$build_version = 'PC210519';
 $pandora_version = 'v7.0NG.754';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 9856e01ec7..de55a2ba1b 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -129,7 +129,7 @@
         <div style='height: 10px'>
             <?php
             $version = '7.0NG.754';
-            $build = '210518';
+            $build = '210519';
             $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 c4c9c18c8f..0649cd426c 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.754
-%define release     210518
+%define release     210519
 
 # 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 6a1c092c40..e73adb628b 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.754
-%define release     210518
+%define release     210519
 
 # 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 e2b600d731..a63f54b78c 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.754
-%define release     210518
+%define release     210519
 %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 7001a14efc..70344ba7e5 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.754-210518
+Version: 7.0NG.754-210519
 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 adbecff666..a64aa0424f 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.754-210518"
+pandora_version="7.0NG.754-210519"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 05b6259223..3d0051f853 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@@ -45,7 +45,7 @@ our @EXPORT = qw(
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.754";
-my $pandora_build = "210518";
+my $pandora_build = "210519";
 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 44e598dd0e..9de8246987 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.754";
-my $pandora_build = "210518";
+my $pandora_build = "210519";
 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 9c2c788f07..2a3c618def 100644
--- a/pandora_server/pandora_server.redhat.spec
+++ b/pandora_server/pandora_server.redhat.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     7.0NG.754
-%define release     210518
+%define release     210519
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 1c57ed3718..2ff4ae4f33 100644
--- a/pandora_server/pandora_server.spec
+++ b/pandora_server/pandora_server.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     7.0NG.754
-%define release     210518
+%define release     210519
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 6ffab8d15b..bd4a797870 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.754"
-PI_BUILD="210518"
+PI_BUILD="210519"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index f0d90fa665..47a5f16a84 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.754 Build 210518";
+my $version = "7.0NG.754 Build 210519";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index f55de28ad3..37ad807aaa 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.754 Build 210518";
+my $version = "7.0NG.754 Build 210519";
 
 # save program name for logging
 my $progname = basename($0);

From 4b114e63a4a002bb8ffe99ebd15bbc9c078aff4f Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Wed, 19 May 2021 10:13:25 +0200
Subject: [PATCH 57/93] Minor fix

---
 .../include/rest-api/models/VisualConsole/Item.php          | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pandora_console/include/rest-api/models/VisualConsole/Item.php b/pandora_console/include/rest-api/models/VisualConsole/Item.php
index 720df2b0f9..028551e09d 100644
--- a/pandora_console/include/rest-api/models/VisualConsole/Item.php
+++ b/pandora_console/include/rest-api/models/VisualConsole/Item.php
@@ -1071,10 +1071,8 @@ class Item extends CachedModel
 
         $mobile_navigation = false;
 
-        if (isset($_SERVER['PHP_SELF']) === true
-            && isset($_SERVER['HTTP_REFERER']) === true
-            && (strstr($_SERVER['PHP_SELF'], 'mobile/') !== false
-            || strstr($_SERVER['HTTP_REFERER'], 'mobile/') !== false)
+        if (strstr(($_SERVER['PHP_SELF'] ?? ''), 'mobile/') !== false
+            || strstr(($_SERVER['HTTP_REFERER'] ?? ''), 'mobile/') !== false
         ) {
             $mobile_navigation = true;
         }

From 09ccaf254eca15c6618f65948aa06a6125748a30 Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Wed, 19 May 2021 11:31:52 +0200
Subject: [PATCH 58/93] Fixed public access and added PublicLogin interface,
 including code style fixex

---
 pandora_console/ajax.php                      |  26 +-
 .../extras/delete_files/delete_files.txt      |   1 +
 .../reporting/visual_console_builder.php      |   6 +-
 .../javascript/pandora_visual_console.js      |  10 +-
 .../include/lib/Dashboard/Manager.php         |   3 +-
 pandora_console/include/lib/PublicLogin.php   |  61 ++++
 pandora_console/include/lib/User.php          |  92 ++++-
 .../include/lib/Websockets/WebSocketUser.php  |   4 +-
 .../operation/visual_console/legacy_view.php  |   6 +-
 .../operation/visual_console/public_view.php  |  13 +-
 .../operation/visual_console/pure_ajax.php    | 314 ------------------
 .../vendor/composer/ClassLoader.php           |  34 ++
 .../vendor/composer/autoload_classmap.php     |   2 +
 .../vendor/composer/autoload_real.php         |   2 +-
 .../vendor/composer/autoload_static.php       |   2 +
 15 files changed, 231 insertions(+), 345 deletions(-)
 create mode 100644 pandora_console/include/lib/PublicLogin.php
 delete mode 100644 pandora_console/operation/visual_console/pure_ajax.php

diff --git a/pandora_console/ajax.php b/pandora_console/ajax.php
index fca916d796..f0032476e2 100644
--- a/pandora_console/ajax.php
+++ b/pandora_console/ajax.php
@@ -31,18 +31,18 @@ require 'vendor/autoload.php';
 
 define('AJAX', true);
 
-if (!defined('__PAN_XHPROF__')) {
+if (defined('__PAN_XHPROF__') === false) {
     define('__PAN_XHPROF__', 0);
 }
 
 if (__PAN_XHPROF__ === 1) {
-    if (function_exists('tideways_xhprof_enable')) {
+    if (function_exists('tideways_xhprof_enable') === true) {
         tideways_xhprof_enable();
     }
 }
 
-if ((! file_exists('include/config.php'))
-    || (! is_readable('include/config.php'))
+if (file_exists('include/config.php') === false
+    || is_readable('include/config.php') === false
 ) {
     exit;
 }
@@ -57,11 +57,11 @@ require_once 'include/auth/mysql.php';
 if (isset($config['console_log_enabled']) === true
     && $config['console_log_enabled'] == 1
 ) {
-    ini_set('log_errors', 1);
+    ini_set('log_errors', true);
     ini_set('error_log', $config['homedir'].'/log/console.log');
 } else {
-    ini_set('log_errors', 0);
-    ini_set('error_log', null);
+    ini_set('log_errors', false);
+    ini_set('error_log', '');
 }
 
 // Sometimes input is badly retrieved from caller...
@@ -98,9 +98,11 @@ if (isset($_GET['loginhash']) === true) {
     }
 }
 
+// Another auth class example: PandoraFMS\Dashboard\Manager.
 $auth_class = io_safe_output(
-    get_parameter('auth_class', 'PandoraFMS\Dashboard\Manager')
+    get_parameter('auth_class', 'PandoraFMS\User')
 );
+
 $public_hash = get_parameter('auth_hash', false);
 $public_login = false;
 // Check user.
@@ -124,7 +126,7 @@ if (class_exists($auth_class) === false || $public_hash === false) {
 ob_start();
 
 // Enterprise support.
-if (file_exists(ENTERPRISE_DIR.'/load_enterprise.php')) {
+if (file_exists(ENTERPRISE_DIR.'/load_enterprise.php') === true) {
     include_once ENTERPRISE_DIR.'/load_enterprise.php';
 }
 
@@ -142,12 +144,12 @@ if ($isFunctionSkins !== ENTERPRISE_NOT_HOOK) {
     );
 }
 
-if (is_metaconsole()) {
+if (is_metaconsole() === true) {
     // Backward compatibility.
     define('METACONSOLE', true);
 }
 
-if (file_exists($page)) {
+if (file_exists($page) === true) {
     include_once $page;
 } else {
     echo '<br /><b class="error">Sorry! I can\'t find the page '.$page.'!</b>';
@@ -172,7 +174,7 @@ if (isset($config['force_instant_logout']) === true
     header_remove('Set-Cookie');
     setcookie(session_name(), $_COOKIE[session_name()], (time() - 4800), '/');
 
-    if ($config['auth'] == 'saml') {
+    if ($config['auth'] === 'saml') {
         include_once $config['saml_path'].'simplesamlphp/lib/_autoload.php';
         $as = new SimpleSAML_Auth_Simple('PandoraFMS');
         $as->logout();
diff --git a/pandora_console/extras/delete_files/delete_files.txt b/pandora_console/extras/delete_files/delete_files.txt
index 50d4b78c33..1d8e1ec96e 100644
--- a/pandora_console/extras/delete_files/delete_files.txt
+++ b/pandora_console/extras/delete_files/delete_files.txt
@@ -82,3 +82,4 @@ include/lib/WSManager.php
 include/lib/WebSocketServer.php
 include/lib/WebSocketUser.php
 operation/network/network_explorer.php
+operation/vsual_console/pure_ajax.php
diff --git a/pandora_console/godmode/reporting/visual_console_builder.php b/pandora_console/godmode/reporting/visual_console_builder.php
index b03b55dd76..4bbd818c62 100755
--- a/pandora_console/godmode/reporting/visual_console_builder.php
+++ b/pandora_console/godmode/reporting/visual_console_builder.php
@@ -14,6 +14,8 @@
 global $config;
 global $statusProcessInDB;
 
+use PandoraFMS\User;
+
 check_login();
 
 require_once $config['homedir'].'/include/functions_visual_map.php';
@@ -753,8 +755,8 @@ if (!defined('METACONSOLE')) {
     $url_view = 'index.php?sec=screen&sec2=screens/screens&action=visualmap&pure=0&id_visualmap='.$idVisualConsole.'&refr='.$view_refresh;
 }
 
-// Hash for auto-auth in public link
-$hash = md5($config['dbpass'].$idVisualConsole.$config['id_user']);
+// Hash for auto-auth in public link.
+$hash = User::generatePublicHash();
 
 $buttons = [];
 
diff --git a/pandora_console/include/javascript/pandora_visual_console.js b/pandora_console/include/javascript/pandora_visual_console.js
index 30a3d3f795..1b0a82b78f 100755
--- a/pandora_console/include/javascript/pandora_visual_console.js
+++ b/pandora_console/include/javascript/pandora_visual_console.js
@@ -1,5 +1,5 @@
 // TODO: Add Artica ST header.
-/* globals jQuery, VisualConsole, AsyncTaskManager */
+/* globals jQuery, VisualConsole, AsyncTaskManager, hash, id_user */
 
 /*
  * *********************
@@ -720,7 +720,9 @@ function loadVisualConsoleData(baseUrl, vcId, size, callback) {
       {
         page: "include/rest-api/index",
         getVisualConsole: 1,
-        visualConsoleId: vcId
+        visualConsoleId: vcId,
+        id_user: id_user,
+        auth_hash: hash
       },
       "json"
     )
@@ -735,7 +737,9 @@ function loadVisualConsoleData(baseUrl, vcId, size, callback) {
         page: "include/rest-api/index",
         getVisualConsoleItems: 1,
         size: size,
-        visualConsoleId: vcId
+        visualConsoleId: vcId,
+        id_user: id_user,
+        auth_hash: hash
       },
       "json"
     )
diff --git a/pandora_console/include/lib/Dashboard/Manager.php b/pandora_console/include/lib/Dashboard/Manager.php
index be87ef8732..e72f292537 100644
--- a/pandora_console/include/lib/Dashboard/Manager.php
+++ b/pandora_console/include/lib/Dashboard/Manager.php
@@ -5,11 +5,12 @@ namespace PandoraFMS\Dashboard;
 
 use PandoraFMS\View;
 use PandoraFMS\Dashboard\Cell;
+use PandoraFMS\PublicLogin;
 
 /**
  * Dashboard manager.
  */
-class Manager
+class Manager implements PublicLogin
 {
 
     /**
diff --git a/pandora_console/include/lib/PublicLogin.php b/pandora_console/include/lib/PublicLogin.php
new file mode 100644
index 0000000000..b6124a62e7
--- /dev/null
+++ b/pandora_console/include/lib/PublicLogin.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * Public access interface to provide access using hash and id_user.
+ *
+ * @category   Interfaces
+ * @package    Pandora FMS
+ * @subpackage Login
+ * @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.
+ * ============================================================================
+ */
+
+// Begin.
+namespace PandoraFMS;
+
+interface PublicLogin
+{
+
+
+    /**
+     * Generates a hash to authenticate in public views.
+     *
+     * @param string|null $other_secret If you need to authenticate using a
+     * varable string, use this 'other_secret' to customize the hash.
+     *
+     * @return string Returns a hash with the authenticaction.
+     */
+    public static function generatePublicHash(?string $other_secret=''):string;
+
+
+    /**
+     * Validates a hash to authenticate in public view.
+     *
+     * @param string $hash         Hash to be checked.
+     * @param string $other_secret Any custom string needed for you.
+     *
+     * @return boolean Returns true if hash is valid.
+     */
+    public static function validatePublicHash(
+        string $hash,
+        string $other_secret=''
+    ):bool;
+
+
+}
diff --git a/pandora_console/include/lib/User.php b/pandora_console/include/lib/User.php
index 8668c625e8..692a18308a 100644
--- a/pandora_console/include/lib/User.php
+++ b/pandora_console/include/lib/User.php
@@ -32,7 +32,7 @@ namespace PandoraFMS;
 /**
  * Object user.
  */
-class User
+class User implements PublicLogin
 {
 
     /**
@@ -53,11 +53,11 @@ class User
     /**
      * Initializes a user object.
      *
-     * @param array $data User information
+     * @param array|null $data User information.
      * - Username
      * - PHP session ID.
      */
-    public function __construct($data)
+    public function __construct(?array $data)
     {
         global $config;
 
@@ -88,17 +88,20 @@ class User
             if (isset($data['id_usuario']) === true
                 && isset($data['password']) === true
             ) {
-                $user_in_db = process_user_login($user, $password, true);
+                $user_in_db = process_user_login(
+                    $data['id_usuario'],
+                    $data['password'],
+                    true
+                );
                 if ($user_in_db !== false) {
                     $config['id_usuario'] = $user_in_db;
-                    $correctLogin = true;
 
                     // Originally at api.php.
                     if (session_status() === PHP_SESSION_NONE) {
                         session_start();
                     }
 
-                    $_SESSION['id_usuario'] = $user;
+                    $_SESSION['id_usuario'] = $data['id_usuario'];
                     session_write_close();
 
                     $this->idUser = $data['id_usuario'];
@@ -113,4 +116,81 @@ class User
     }
 
 
+    /**
+     * Generates a hash to authenticate in public views.
+     *
+     * @param string|null $other_secret If you need to authenticate using a
+     * varable string, use this 'other_secret' to customize the hash.
+     *
+     * @return string Returns a hash with the authenticaction.
+     */
+    public static function generatePublicHash(?string $other_secret=''):string
+    {
+        global $config;
+
+        $str = $config['dbpass'];
+        $str .= $config['id_user'];
+        $str .= $other_secret;
+        return hash('sha256', $str);
+    }
+
+
+    /**
+     * Validates a hash to authenticate in public view.
+     *
+     * @param string $hash         Hash to be checked.
+     * @param string $other_secret Any custom string needed for you.
+     *
+     * @return boolean Returns true if hash is valid.
+     */
+    public static function validatePublicHash(
+        string $hash,
+        string $other_secret=''
+    ):bool {
+        global $config;
+
+        if (isset($config['id_user']) === true) {
+            // Already logged in.
+            return true;
+        }
+
+        $userFromParams = false;
+        // Try to get id_user from parameters if it is missing.
+        if (isset($config['id_user']) === false) {
+            $userFromParams = true;
+            $config['id_user'] = get_parameter('id_user', false);
+            // It is impossible to authenticate without an id user.
+            if ($config['id_user'] === false) {
+                unset($config['id_user']);
+                return false;
+            }
+        } else {
+            $config['public_access'] = false;
+        }
+
+        // Build a hash to check.
+        $hashCheck = self::generatePublicHash($other_secret);
+        if ($hashCheck === $hash) {
+            // "Log" user in.
+            if (session_status() !== PHP_SESSION_ACTIVE) {
+                session_start();
+            }
+
+            $_SESSION['id_usuario'] = $config['id_user'];
+            session_write_close();
+
+            $config['public_access'] = true;
+            $config['force_instant_logout'] = true;
+            return true;
+        }
+
+        // Remove id user from config array if authentication has failed.
+        if ($userFromParams === true) {
+            unset($config['id_user']);
+        }
+
+        return false;
+    }
+
+
 }
diff --git a/pandora_console/include/lib/Websockets/WebSocketUser.php b/pandora_console/include/lib/Websockets/WebSocketUser.php
index bcbe30cc17..9ab6c9e5da 100644
--- a/pandora_console/include/lib/Websockets/WebSocketUser.php
+++ b/pandora_console/include/lib/Websockets/WebSocketUser.php
@@ -147,8 +147,8 @@ class WebSocketUser
     /**
      * Initializes a websocket user.
      *
-     * @param string $id     Id of the new user.
-     * @param Socket $socket Socket where communication is stablished.
+     * @param string  $id     Id of the new user.
+     * @param \Socket $socket Socket where communication is stablished.
      */
     public function __construct($id, $socket)
     {
diff --git a/pandora_console/operation/visual_console/legacy_view.php b/pandora_console/operation/visual_console/legacy_view.php
index c9b4c086b2..3dab575425 100644
--- a/pandora_console/operation/visual_console/legacy_view.php
+++ b/pandora_console/operation/visual_console/legacy_view.php
@@ -13,6 +13,8 @@
 // GNU General Public License for more details.
 global $config;
 
+use PandoraFMS\User;
+
 // Login check
 require_once $config['homedir'].'/include/functions_visual_map.php';
 ui_require_css_file('visual_maps');
@@ -122,7 +124,9 @@ $options['consoles_list']['text'] = '<a href="index.php?sec=network&sec2=godmode
 if ($vconsole_write || $vconsole_manage) {
     $url_base = 'index.php?sec=network&sec2=godmode/reporting/visual_console_builder&action=';
 
-    $hash = md5($config['dbpass'].$id_layout.$config['id_user']);
+    // Hash for auto-auth in public link.
+    $hash = User::generatePublicHash();
+
 
     $options['public_link']['text'] = '<a href="'.ui_get_full_url(
         'operation/visual_console/public_console.php?hash='.$hash.'&id_layout='.$id_layout.'&id_user='.$config['id_user']
diff --git a/pandora_console/operation/visual_console/public_view.php b/pandora_console/operation/visual_console/public_view.php
index e5e761cb19..2ebb5370f3 100644
--- a/pandora_console/operation/visual_console/public_view.php
+++ b/pandora_console/operation/visual_console/public_view.php
@@ -13,6 +13,8 @@
 // GNU General Public License for more details.
 require_once '../../include/config.php';
 
+use PandoraFMS\User;
+
 // Set root on homedir, as defined in setup.
 chdir($config['homedir']);
 
@@ -67,10 +69,13 @@ if (!isset($config['pure'])) {
     $config['pure'] = 0;
 }
 
-$myhash = md5($config['dbpass'].$visualConsoleId.$config['id_user']);
-
 // Check input hash.
-if ($myhash != $hash) {
+if (User::validatePublicHash($hash) !== true) {
+    db_pandora_audit(
+        'Invalid public visual console',
+        'Trying to access public visual console'
+    );
+    include 'general/noaccess.php';
     exit;
 }
 
@@ -177,6 +182,8 @@ $visualConsoleItems = VisualConsole::getItemsFromDB(
     var props = <?php echo (string) $visualConsole; ?>;
     var items = <?php echo '['.implode($visualConsoleItems, ',').']'; ?>;
     var baseUrl = "<?php echo ui_get_full_url('/', false, false, false); ?>";
+    var hash = "<?php echo get_parameter('hash', ''); ?>";
+    var id_user = "<?php echo get_parameter('id_user', ''); ?>";
 
     var controls = document.getElementById('vc-controls');
     autoHideElement(controls, 1000);
diff --git a/pandora_console/operation/visual_console/pure_ajax.php b/pandora_console/operation/visual_console/pure_ajax.php
deleted file mode 100644
index 9ef9fe3f56..0000000000
--- a/pandora_console/operation/visual_console/pure_ajax.php
+++ /dev/null
@@ -1,314 +0,0 @@
-<?php
-
-// Pandora FMS - http://pandorafms.com
-// ==================================================
-// Copyright (c) 2005-2021 Artica Soluciones Tecnologicas
-// Please see http://pandorafms.org for full contribution list
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation for version 2.
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-global $config;
-
-// Login check
-require_once $config['homedir'].'/include/functions_visual_map.php';
-
-check_login();
-
-if (!defined('METACONSOLE')) {
-    $id_layout = (int) get_parameter('id');
-} else {
-    $id_layout = (int) get_parameter('id_visualmap');
-}
-
-if ($id_layout) {
-    $default_action = 'edit';
-} else {
-    $default_action = 'new';
-}
-
-if (!defined('METACONSOLE')) {
-    $action = get_parameterBetweenListValues(
-        'action',
-        [
-            'new',
-            'save',
-            'edit',
-            'update',
-            'delete',
-        ],
-        $default_action
-    );
-} else {
-    $action = get_parameterBetweenListValues(
-        'action2',
-        [
-            'new',
-            'save',
-            'edit',
-            'update',
-            'delete',
-        ],
-        $default_action
-    );
-}
-
-$refr = (int) get_parameter('refr', $config['vc_refr']);
-$graph_javascript = (bool) get_parameter('graph_javascript', false);
-$vc_refr = false;
-
-if (isset($config['vc_refr']) and $config['vc_refr'] != 0) {
-    $view_refresh = $config['vc_refr'];
-} else {
-    $view_refresh = '300';
-}
-
-// Get input parameter for layout id
-if (! $id_layout) {
-    db_pandora_audit(
-        'ACL Violation',
-        'Trying to access visual console without id layout'
-    );
-    include 'general/noaccess.php';
-    exit;
-}
-
-$layout = db_get_row('tlayout', 'id', $id_layout);
-
-if (! $layout) {
-    db_pandora_audit(
-        'ACL Violation',
-        'Trying to access visual console without id layout'
-    );
-    include 'general/noaccess.php';
-    exit;
-}
-
-$id_group = $layout['id_group'];
-$layout_name = $layout['name'];
-$background = $layout['background'];
-$bwidth = $layout['width'];
-$bheight = $layout['height'];
-
-$pure_url = '&pure='.$config['pure'];
-
-// ACL
-$vconsole_read = check_acl($config['id_user'], $id_group, 'VR');
-$vconsole_write = check_acl($config['id_user'], $id_group, 'VW');
-$vconsole_manage = check_acl($config['id_user'], $id_group, 'VM');
-
-if (! $vconsole_read && !$vconsole_write && !$vconsole_manage) {
-    db_pandora_audit(
-        'ACL Violation',
-        'Trying to access visual console without group access'
-    );
-    include 'general/noaccess.php';
-    exit;
-}
-
-// Render map
-$options = [];
-
-$options['consoles_list']['text'] = '<a href="index.php?sec=network&sec2=godmode/reporting/map_builder&refr='.$refr.'">'.html_print_image(
-    'images/visual_console.png',
-    true,
-    ['title' => __('Visual consoles list')]
-).'</a>';
-
-if ($vconsole_write || $vconsole_manage) {
-    $url_base = 'index.php?sec=network&sec2=godmode/reporting/visual_console_builder&action=';
-
-    $hash = md5($config['dbpass'].$id_layout.$config['id_user']);
-
-    $options['public_link']['text'] = '<a href="'.ui_get_full_url('operation/visual_console/public_console.php?hash='.$hash.'&id_layout='.$id_layout.'&id_user='.$config['id_user']).'" target="_blank">'.html_print_image(
-        'images/camera_mc.png',
-        true,
-        [
-            'title' => __('Show link to public Visual Console'),
-            'class' => 'invert_filter',
-        ]
-    ).'</a>';
-    $options['public_link']['active'] = false;
-
-    $options['data']['text'] = '<a href="'.$url_base.$action.'&tab=data&id_visual_console='.$id_layout.'">'.html_print_image(
-        'images/op_reporting.png',
-        true,
-        [
-            'title' => __('Main data'),
-            'class' => 'invert_filter',
-        ]
-    ).'</a>';
-    $options['list_elements']['text'] = '<a href="'.$url_base.$action.'&tab=list_elements&id_visual_console='.$id_layout.'">'.html_print_image(
-        'images/list.png',
-        true,
-        [
-            'title' => __('List elements'),
-            'class' => 'invert_filter',
-        ]
-    ).'</a>';
-
-    if (enterprise_installed()) {
-        $options['wizard_services']['text'] = '<a href="'.$url_base.$action.'&tab=wizard_services&id_visual_console='.$id_layout.'">'.html_print_image(
-            'images/wand_services.png',
-            true,
-            [
-                'title' => __('Services wizard'),
-                'class' => 'invert_filter',
-            ]
-        ).'</a>';
-    }
-
-    $options['wizard']['text'] = '<a href="'.$url_base.$action.'&tab=wizard&id_visual_console='.$id_layout.'">'.html_print_image(
-        'images/wand.png',
-        true,
-        [
-            'title' => __('Wizard'),
-            'class' => 'invert_filter',
-        ]
-    ).'</a>';
-    $options['editor']['text'] = '<a href="'.$url_base.$action.'&tab=editor&id_visual_console='.$id_layout.'">'.html_print_image(
-        'images/builder.png',
-        true,
-        [
-            'title' => __('Builder'),
-            'class' => 'invert_filter',
-        ]
-    ).'</a>';
-}
-
-$options['view']['text'] = '<a href="index.php?sec=network&sec2=operation/visual_console/render_view&id='.$id_layout.'&refr='.$view_refresh.'">'.html_print_image(
-    'images/eye.png',
-    true,
-    [
-        'title' => __('View'),
-        'class' => 'invert_filter',
-    ]
-).'</a>';
-$options['view']['active'] = true;
-
-if (!is_metaconsole()) {
-    if (!$config['pure']) {
-        $options['pure']['text'] = '<a href="index.php?sec=network&sec2=operation/visual_console/render_view&id='.$id_layout.'&refr='.$refr.'&pure=1">'.html_print_image(
-            'images/full_screen.png',
-            true,
-            [
-                'title' => __('Full screen mode'),
-                'class' => 'invert_filter',
-            ]
-        ).'</a>';
-        ui_print_page_header($layout_name, 'images/visual_console.png', false, '', false, $options);
-    }
-
-    // Set the hidden value for the javascript
-    html_print_input_hidden('metaconsole', 0);
-} else {
-    // Set the hidden value for the javascript
-    html_print_input_hidden('metaconsole', 1);
-}
-
-        visual_map_print_visual_map(
-            $id_layout,
-            true,
-            true,
-            null,
-            null,
-            '',
-            false,
-            $graph_javascript
-        );
-
-        ?>
-    <style type="text/css">
-        /* Avoid the main_pure container 1000px height */
-        body.pure {
-            min-height: 100px;
-        }
-        div#main_pure {
-            height: 100%;
-            margin: 0px;
-        }
-    </style>
-    <?php
-    ui_require_javascript_file('wz_jsgraphics');
-    ui_require_javascript_file('pandora_visual_console');
-    $ignored_params['refr'] = '';
-    ?>
-
-<script language="javascript" type="text/javascript">
-    $(document).ready (function () {
-        var refr = <?php echo (int) $refr; ?>;
-        var pure = <?php echo (int) $config['pure']; ?>;
-        var href = "<?php echo ui_get_url_refresh($ignored_params); ?>";
-                
-        $(".module_graph .menu_graph").css('display','none');
-        
-        $(".parent_graph").each(function(){
-            
-        if($(this).css('background-color') != 'rgb(255, 255, 255)'){
-                $(this).css('color', '#999');                
-                }
-        });            
-
-        $(".overlay").removeClass("overlay").addClass("overlaydisabled");
-            
-    });
-    
-    $(window).on('load', function () {
-        $('.item:not(.icon) img').each(function(){
-            
-            
-            if($(this).css('float')=='left' || $(this).css('float')=='right'){
-            
-                
-            $(this).css('margin-top',(parseInt($(this).parent().parent().css('height'))/2-parseInt($(this).css('height'))/2)+'px');
-            $(this).css('margin-left','');
-            
-            }
-            else{
-                $(this).css('margin-left',(parseInt($(this).parent().parent().css('width'))/2-parseInt($(this).css('width'))/2)+'px');
-                $(this).css('margin-top','');
-            }
-            
-        });
-        
-        $('.item > div').each( function() {
-            if ($(this).css('float')=='left' || $(this).css('float')=='right') {
-                if($(this).attr('id').indexOf('clock') || $(this).attr('id').indexOf('overlay')){
-                    $(this).css('margin-top',(parseInt($(this).parent().css('height'))/2-parseInt($(this).css('height'))/2)+'px');
-                }
-                else{
-                    $(this).css('margin-top',(parseInt($(this).parent().css('height'))/2-parseInt($(this).css('height'))/2-15)+'px');
-                }
-                $(this).css('margin-left','');
-            }
-            else {
-                $(this).css('margin-left',(parseInt($(this).parent().css('width'))/2-parseInt($(this).css('width'))/2)+'px');
-                $(this).css('margin-top','');
-            }
-        });
-        
-        $('.item > a > div').each(function(){
-            if($(this).css('float')=='left' || $(this).css('float')=='right'){
-            
-                
-            $(this).css('margin-top',(parseInt($(this).parent().parent().css('height'))/2-parseInt($(this).css('height'))/2-5)+'px');
-            $(this).css('margin-left','');
-            
-            }
-            else{
-                $(this).css('margin-left',(parseInt($(this).parent().parent().css('width'))/2-parseInt($(this).css('width'))/2)+'px');
-                $(this).css('margin-top','');
-            }
-            
-        });
-        
-        $(".graph:not([class~='noresizevc'])").each(function(){
-            height = parseInt($(this).css("height")) - 30;
-            $(this).css('height', height);
-        });
-            
-    });
-</script>
\ No newline at end of file
diff --git a/pandora_console/vendor/composer/ClassLoader.php b/pandora_console/vendor/composer/ClassLoader.php
index 1a58957d25..247294d66e 100644
--- a/pandora_console/vendor/composer/ClassLoader.php
+++ b/pandora_console/vendor/composer/ClassLoader.php
@@ -42,6 +42,8 @@ namespace Composer\Autoload;
  */
 class ClassLoader
 {
+    private $vendorDir;
+
     // PSR-4
     private $prefixLengthsPsr4 = array();
     private $prefixDirsPsr4 = array();
@@ -57,6 +59,13 @@ class ClassLoader
     private $missingClasses = array();
     private $apcuPrefix;
 
+    private static $registeredLoaders = array();
+
+    public function __construct($vendorDir = null)
+    {
+        $this->vendorDir = $vendorDir;
+    }
+
     public function getPrefixes()
     {
         if (!empty($this->prefixesPsr0)) {
@@ -300,6 +309,17 @@ class ClassLoader
     public function register($prepend = false)
     {
         spl_autoload_register(array($this, 'loadClass'), true, $prepend);
+
+        if (null === $this->vendorDir) {
+            return;
+        }
+
+        if ($prepend) {
+            self::$registeredLoaders = array($this->vendorDir => $this) + self::$registeredLoaders;
+        } else {
+            unset(self::$registeredLoaders[$this->vendorDir]);
+            self::$registeredLoaders[$this->vendorDir] = $this;
+        }
     }
 
     /**
@@ -308,6 +328,10 @@ class ClassLoader
     public function unregister()
     {
         spl_autoload_unregister(array($this, 'loadClass'));
+
+        if (null !== $this->vendorDir) {
+            unset(self::$registeredLoaders[$this->vendorDir]);
+        }
     }
 
     /**
@@ -367,6 +391,16 @@ class ClassLoader
         return $file;
     }
 
+    /**
+     * Returns the currently registered loaders indexed by their corresponding vendor directories.
+     *
+     * @return self[]
+     */
+    public static function getRegisteredLoaders()
+    {
+        return self::$registeredLoaders;
+    }
+
     private function findFileWithExtension($class, $ext)
     {
         // PSR-4 lookup
diff --git a/pandora_console/vendor/composer/autoload_classmap.php b/pandora_console/vendor/composer/autoload_classmap.php
index 4169e631c6..934f8e77e2 100644
--- a/pandora_console/vendor/composer/autoload_classmap.php
+++ b/pandora_console/vendor/composer/autoload_classmap.php
@@ -113,6 +113,7 @@ return array(
     'Models\\VisualConsole\\Items\\Label' => $baseDir . '/include/rest-api/models/VisualConsole/Items/Label.php',
     'Models\\VisualConsole\\Items\\Line' => $baseDir . '/include/rest-api/models/VisualConsole/Items/Line.php',
     'Models\\VisualConsole\\Items\\ModuleGraph' => $baseDir . '/include/rest-api/models/VisualConsole/Items/ModuleGraph.php',
+    'Models\\VisualConsole\\Items\\NetworkLink' => $baseDir . '/include/rest-api/models/VisualConsole/Items/NetworkLink.php',
     'Models\\VisualConsole\\Items\\Percentile' => $baseDir . '/include/rest-api/models/VisualConsole/Items/Percentile.php',
     'Models\\VisualConsole\\Items\\SimpleValue' => $baseDir . '/include/rest-api/models/VisualConsole/Items/SimpleValue.php',
     'Models\\VisualConsole\\Items\\StaticGraph' => $baseDir . '/include/rest-api/models/VisualConsole/Items/StaticGraph.php',
@@ -320,6 +321,7 @@ return array(
     'PandoraFMS\\Module' => $baseDir . '/include/lib/Module.php',
     'PandoraFMS\\ModuleStatus' => $baseDir . '/include/lib/ModuleStatus.php',
     'PandoraFMS\\ModuleType' => $baseDir . '/include/lib/ModuleType.php',
+    'PandoraFMS\\PublicLogin' => $baseDir . '/include/lib/PublicLogin.php',
     'PandoraFMS\\User' => $baseDir . '/include/lib/User.php',
     'PandoraFMS\\View' => $baseDir . '/include/lib/View.php',
     'PandoraFMS\\Websockets\\WSManager' => $baseDir . '/include/lib/Websockets/WSManager.php',
diff --git a/pandora_console/vendor/composer/autoload_real.php b/pandora_console/vendor/composer/autoload_real.php
index 33d719ba60..d079efd543 100644
--- a/pandora_console/vendor/composer/autoload_real.php
+++ b/pandora_console/vendor/composer/autoload_real.php
@@ -25,7 +25,7 @@ class ComposerAutoloaderInitfdecadadce22e6dde51e9535fe4ad7aa
         require __DIR__ . '/platform_check.php';
 
         spl_autoload_register(array('ComposerAutoloaderInitfdecadadce22e6dde51e9535fe4ad7aa', 'loadClassLoader'), true, true);
-        self::$loader = $loader = new \Composer\Autoload\ClassLoader();
+        self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
         spl_autoload_unregister(array('ComposerAutoloaderInitfdecadadce22e6dde51e9535fe4ad7aa', 'loadClassLoader'));
 
         $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
diff --git a/pandora_console/vendor/composer/autoload_static.php b/pandora_console/vendor/composer/autoload_static.php
index e1953333f9..fc522a2370 100644
--- a/pandora_console/vendor/composer/autoload_static.php
+++ b/pandora_console/vendor/composer/autoload_static.php
@@ -195,6 +195,7 @@ class ComposerStaticInitfdecadadce22e6dde51e9535fe4ad7aa
         'Models\\VisualConsole\\Items\\Label' => __DIR__ . '/../..' . '/include/rest-api/models/VisualConsole/Items/Label.php',
         'Models\\VisualConsole\\Items\\Line' => __DIR__ . '/../..' . '/include/rest-api/models/VisualConsole/Items/Line.php',
         'Models\\VisualConsole\\Items\\ModuleGraph' => __DIR__ . '/../..' . '/include/rest-api/models/VisualConsole/Items/ModuleGraph.php',
+        'Models\\VisualConsole\\Items\\NetworkLink' => __DIR__ . '/../..' . '/include/rest-api/models/VisualConsole/Items/NetworkLink.php',
         'Models\\VisualConsole\\Items\\Percentile' => __DIR__ . '/../..' . '/include/rest-api/models/VisualConsole/Items/Percentile.php',
         'Models\\VisualConsole\\Items\\SimpleValue' => __DIR__ . '/../..' . '/include/rest-api/models/VisualConsole/Items/SimpleValue.php',
         'Models\\VisualConsole\\Items\\StaticGraph' => __DIR__ . '/../..' . '/include/rest-api/models/VisualConsole/Items/StaticGraph.php',
@@ -402,6 +403,7 @@ class ComposerStaticInitfdecadadce22e6dde51e9535fe4ad7aa
         'PandoraFMS\\Module' => __DIR__ . '/../..' . '/include/lib/Module.php',
         'PandoraFMS\\ModuleStatus' => __DIR__ . '/../..' . '/include/lib/ModuleStatus.php',
         'PandoraFMS\\ModuleType' => __DIR__ . '/../..' . '/include/lib/ModuleType.php',
+        'PandoraFMS\\PublicLogin' => __DIR__ . '/../..' . '/include/lib/PublicLogin.php',
         'PandoraFMS\\User' => __DIR__ . '/../..' . '/include/lib/User.php',
         'PandoraFMS\\View' => __DIR__ . '/../..' . '/include/lib/View.php',
         'PandoraFMS\\Websockets\\WSManager' => __DIR__ . '/../..' . '/include/lib/Websockets/WSManager.php',

From 538e7beb48e3de85ed9e875204a717397cb79f2c Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Wed, 19 May 2021 11:57:17 +0200
Subject: [PATCH 59/93] Public access using PublicLogin interface

---
 .../include/javascript/pandora_dashboards.js  |  4 +++-
 .../javascript/pandora_visual_console.js      | 23 +++++++++++++------
 .../Dashboard/Widgets/maps_made_by_user.php   |  4 +++-
 .../visual_console/legacy_public_view.php     | 17 ++++++++++----
 .../operation/visual_console/public_view.php  | 12 +++++++---
 5 files changed, 43 insertions(+), 17 deletions(-)

diff --git a/pandora_console/include/javascript/pandora_dashboards.js b/pandora_console/include/javascript/pandora_dashboards.js
index efefaf1195..0b370deab7 100644
--- a/pandora_console/include/javascript/pandora_dashboards.js
+++ b/pandora_console/include/javascript/pandora_dashboards.js
@@ -1151,7 +1151,9 @@ function dashboardLoadVC(settings) {
     300 * 1000,
     handleUpdate,
     beforeUpdate,
-    settings.size
+    settings.size,
+    settings.id_user,
+    settings.hash
   );
 }
 
diff --git a/pandora_console/include/javascript/pandora_visual_console.js b/pandora_console/include/javascript/pandora_visual_console.js
index 1b0a82b78f..a26423c96c 100755
--- a/pandora_console/include/javascript/pandora_visual_console.js
+++ b/pandora_console/include/javascript/pandora_visual_console.js
@@ -1,5 +1,5 @@
 // TODO: Add Artica ST header.
-/* globals jQuery, VisualConsole, AsyncTaskManager, hash, id_user */
+/* globals jQuery, VisualConsole, AsyncTaskManager */
 
 /*
  * *********************
@@ -17,6 +17,9 @@
  * @param {function | null} onUpdate Callback which will be execuded when the Visual Console.
  * is updated. It will receive two arguments with the old and the new Visual Console's
  * data structure.
+ * @param {string|null} id_user User id given for public access.
+ * @param {string|null} hash Authorization hash given for public access.
+ *
  * @return {VisualConsole | null} The Visual Console instance or a null value.
  */
 // eslint-disable-next-line no-unused-vars
@@ -28,7 +31,9 @@ function createVisualConsole(
   updateInterval,
   onUpdate,
   beforeUpdate,
-  size
+  size,
+  id_user,
+  hash
 ) {
   if (container == null || props == null || items == null) return null;
   if (baseUrl == null) baseUrl = "";
@@ -46,6 +51,8 @@ function createVisualConsole(
           baseUrl,
           visualConsoleId,
           size,
+          id_user,
+          hash,
           function(error, data) {
             if (error) {
               //Remove spinner change VC.
@@ -651,6 +658,8 @@ function createVisualConsole(
  * Fetch a Visual Console's structure and its items.
  * @param {string} baseUrl Base URL to build the API path.
  * @param {number} vcId Identifier of the Visual Console.
+ * @param {string|null} id_user User id given for public access.
+ * @param {string|null} hash Authorization hash given for public access.
  * @param {function} callback Function to be executed on request success or fail.
  * On success, the function will receive an object with the next properties:
  * - `props`: object with the Visual Console's data structure.
@@ -658,7 +667,7 @@ function createVisualConsole(
  * @return {Object} Cancellable. Object which include and .abort([statusText]) function.
  */
 // eslint-disable-next-line no-unused-vars
-function loadVisualConsoleData(baseUrl, vcId, size, callback) {
+function loadVisualConsoleData(baseUrl, vcId, size, id_user, hash, callback) {
   // var apiPath = baseUrl + "/include/rest-api";
   var apiPath = baseUrl + "/ajax.php";
   var vcJqXHR = null;
@@ -721,8 +730,8 @@ function loadVisualConsoleData(baseUrl, vcId, size, callback) {
         page: "include/rest-api/index",
         getVisualConsole: 1,
         visualConsoleId: vcId,
-        id_user: id_user,
-        auth_hash: hash
+        id_user: typeof id_user == undefined ? id_user : null,
+        auth_hash: typeof hash == undefined ? hash : null
       },
       "json"
     )
@@ -738,8 +747,8 @@ function loadVisualConsoleData(baseUrl, vcId, size, callback) {
         getVisualConsoleItems: 1,
         size: size,
         visualConsoleId: vcId,
-        id_user: id_user,
-        auth_hash: hash
+        id_user: typeof id_user == undefined ? id_user : null,
+        auth_hash: typeof hash == undefined ? hash : null
       },
       "json"
     )
diff --git a/pandora_console/include/lib/Dashboard/Widgets/maps_made_by_user.php b/pandora_console/include/lib/Dashboard/Widgets/maps_made_by_user.php
index 32a095e132..9bbd69d470 100644
--- a/pandora_console/include/lib/Dashboard/Widgets/maps_made_by_user.php
+++ b/pandora_console/include/lib/Dashboard/Widgets/maps_made_by_user.php
@@ -29,7 +29,7 @@
 namespace PandoraFMS\Dashboard;
 // Load Visual Console.
 use Models\VisualConsole\Container as VisualConsole;
-
+use PandoraFMS\User;
 /**
  * Maps by users Widgets.
  */
@@ -498,6 +498,8 @@ class MapsMadeByUser extends Widget
                 'ratio'   => $ratio_t,
                 'size'    => $size,
                 'cellId'  => $this->cellId,
+                'hash'    => User::generatePublicHash(),
+                'id_user' => $config['id_user'],
             ]
         );
 
diff --git a/pandora_console/operation/visual_console/legacy_public_view.php b/pandora_console/operation/visual_console/legacy_public_view.php
index eae9f1767f..f7c23f8d00 100644
--- a/pandora_console/operation/visual_console/legacy_public_view.php
+++ b/pandora_console/operation/visual_console/legacy_public_view.php
@@ -15,7 +15,11 @@
 // The session is configured and started inside the config process.
 require_once '../../include/config.php';
 
-// Set root on homedir, as defined in setup
+require_once $config['homedir'].'/vendor/autoload.php';
+
+use PandoraFMS\User;
+
+// Set root on homedir, as defined in setup.
 chdir($config['homedir']);
 
 ob_start();
@@ -61,10 +65,13 @@ $id_layout = (int) get_parameter('id_layout');
 $graph_javascript = (bool) get_parameter('graph_javascript');
 $config['id_user'] = get_parameter('id_user');
 
-$myhash = md5($config['dbpass'].$id_layout.$config['id_user']);
-
-// Check input hash
-if ($myhash != $hash) {
+// Check input hash.
+if (User::validatePublicHash($hash) !== true) {
+    db_pandora_audit(
+        'Invalid public visual console',
+        'Trying to access public visual console'
+    );
+    include 'general/noaccess.php';
     exit;
 }
 
diff --git a/pandora_console/operation/visual_console/public_view.php b/pandora_console/operation/visual_console/public_view.php
index 2ebb5370f3..759888aabb 100644
--- a/pandora_console/operation/visual_console/public_view.php
+++ b/pandora_console/operation/visual_console/public_view.php
@@ -182,8 +182,6 @@ $visualConsoleItems = VisualConsole::getItemsFromDB(
     var props = <?php echo (string) $visualConsole; ?>;
     var items = <?php echo '['.implode($visualConsoleItems, ',').']'; ?>;
     var baseUrl = "<?php echo ui_get_full_url('/', false, false, false); ?>";
-    var hash = "<?php echo get_parameter('hash', ''); ?>";
-    var id_user = "<?php echo get_parameter('id_user', ''); ?>";
 
     var controls = document.getElementById('vc-controls');
     autoHideElement(controls, 1000);
@@ -266,7 +264,15 @@ $visualConsoleItems = VisualConsole::getItemsFromDB(
         items,
         baseUrl,
         <?php echo ($refr * 1000); ?>,
-        handleUpdate
+        handleUpdate,
+        // BeforeUpdate.
+        null,
+        // Size.
+        null,
+        // User id.
+        "<?php echo get_parameter('id_user', ''); ?>",
+        // Hash.
+        "<?php echo get_parameter('hash', ''); ?>"
     );
 
     var controls = document.getElementById('vc-controls');

From 45b5ab45899c743b3fbc2f8faaabc5f6638d0d7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Gonz=C3=A1lez?= <jose.gonzalez@pandorafms.com>
Date: Wed, 19 May 2021 12:40:06 +0200
Subject: [PATCH 60/93] Added separator control

---
 pandora_agents/unix/pandora_revent    | 83 ++++++++++++++-------------
 pandora_server/util/pandora_revent.pl | 83 ++++++++++++++-------------
 2 files changed, 88 insertions(+), 78 deletions(-)

diff --git a/pandora_agents/unix/pandora_revent b/pandora_agents/unix/pandora_revent
index f78bc7dfe5..0cba15a4eb 100755
--- a/pandora_agents/unix/pandora_revent
+++ b/pandora_agents/unix/pandora_revent
@@ -33,40 +33,41 @@ sub help_screen{
 \t$0 -p <path_to_consoleAPI> -u <credentials> -create_event <options> 
 
 Where options:\n
-	-u <credentials>		: API credentials separated by comma: <api_pass>,<user>,<pass>
-	-name <event_name>	: Free text
-	-group <id_group>		: Group ID (use 0 for 'all') 
+	-u <credentials>   : API credentials separated by comma: <api_pass>,<user>,<pass>
+	-name <event_name> : Free text (surrounded by single-quotes, for security reasons)
+	-group <id_group>  : Group ID (use 0 for 'all') 
 	
 Optional parameters:
 
-	[-agent <id_agent]	: Agent ID
-	[-status <status>]			: 0 New, 1 Validated, 2 In process
-	[-user <id_user>]			: User comment (use in combination with -comment option)
-	[-type <event_type>]		: unknown, alert_fired, alert_recovered, alert_ceased
+	[-agent <id_agent] : Agent ID
+	[-status <status>] : 0 New, 1 Validated, 2 In process
+	[-user <id_user>] : User comment (use in combination with -comment option)
+	[-type <event_type>] : unknown, alert_fired, alert_recovered, alert_ceased
 								  alert_manual_validation, system, error, new_agent
 								  configuration_change, going_unknown, going_down_critical,
 								  going_down_warning, going_up_normal
-	[-severity <severity>] 		: 0 Maintance,
+	[-severity <severity>] : 0 Maintance,
 								  1 Informative,
 								  2 Normal,
 								  3 Warning,
 								  4 Crit,
 								  5 Minor,
 								  6 Major
-	[-am <id_agent_module>]		: ID Agent Module linked to event
-	[-alert <id_alert_am>]		: ID Alert Module linked to event
+	[-am <id_agent_module>] : ID Agent Module linked to event
+	[-alert <id_alert_am>] : ID Alert Module linked to event
 	[-c_instructions <critical_instructions>]
 	[-w_instructions <warning_instructions>]
 	[-u_instructions <unknown_instructions>]
-	[-user_comment <comment>]
-	[-owner_user <owner event>]	: Use the login name, not the descriptive
-	[-source <source>]			: (By default 'Pandora')
-	[-tag <tags>]				: Tag (must exist in the system to be imported)
+	[-user_comment <comment>] : Free text  (surrounded by single-quotes, for security reasons) 
+	[-owner_user <owner event>] : Use the login name, not the descriptive
+	[-source <source>] : (By default 'Pandora')
+	[-tag <tags>] : Tag (must exist in the system to be imported)
 	[-custom_data <custom_data>]: Custom data has to be in JSON format. Example: -custom_data \'{\"test1\" : \"t1\", \"test2\": \"2\"}\'
-	[-id_extra <id extra>]      : Id extra
-	[-agent_name <Agent name>]  : Agent name, Not to be confused with the alias.
-	[-force_create_agent<0 o 1>]: Force the creation of agent through an event this will create when it is 1.
-	[-server_id <server_id>]	: The pandora node server_id\n\n";
+	[-id_extra <id extra>] : Id extra
+	[-agent_name <Agent name>] : Agent name, Not to be confused with the alias.
+	[-force_create_agent<0 o 1>] : Force the creation of agent through an event this will create when it is 1.
+	[-separator '<char/s>'] : If you use the vertical bar `|` in the event name, you must set other character for send the info. This must be surrounded by single-quotes
+	[-server_id <server_id>] : The pandora node server_id\n\n";
 	
 	print "Example of event generation:\n\n";
 	
@@ -142,6 +143,7 @@ sub tool_api_main () {
 	my $call_api;
 	my $custom_data = "";
 	my $server_id = 0;
+	my $separator = '|';
 	
 	#~ help or api path (required)
 	if ($ARGV[0] eq '-h') {
@@ -256,6 +258,9 @@ sub tool_api_main () {
 			if ($line eq '-server_id') {
 				$server_id = $ARGV[$i + 1];
 			}
+			if ($line eq '-separator') {
+				$separator = $ARGV[$i + 1];
+			}
 			
 			$i++;
 		}
@@ -270,32 +275,32 @@ sub tool_api_main () {
 		}
 		
 		$data_event = $event_name .
-			"|" . $id_group .
-			"|" . $id_agent .
-			"|" . $status .
-			"|" . $id_user .
-			"|" . $event_type .
-			"|" . $severity .
-			"|" . $id_agent_module .
-			"|" . $id_alert_am . 
-			"|" . $critical_instructions .
-			"|" . $warning_instructions .
-			"|" . $unknown_instructions .
-			"|" . $user_comment .
-			"|" . $owner_user .
-			"|" . $source .
-			"|" . $tags .
-			"|" . $custom_data .
-			"|" . $server_id .
-			"|" . $id_extra .
-			"|" . $agent_name .
-			"|" . $force_create_agent;
+			$separator . $id_group .
+			$separator . $id_agent .
+			$separator . $status .
+			$separator . $id_user .
+			$separator . $event_type .
+			$separator . $severity .
+			$separator . $id_agent_module .
+			$separator . $id_alert_am . 
+			$separator . $critical_instructions .
+			$separator . $warning_instructions .
+			$separator . $unknown_instructions .
+			$separator . $user_comment .
+			$separator . $owner_user .
+			$separator . $source .
+			$separator . $tags .
+			$separator . $custom_data .
+			$separator . $server_id .
+			$separator . $id_extra .
+			$separator . $agent_name .
+			$separator . $force_create_agent;
 
 		$call_api = $api_path . '?' .
 			'op=set&' .
 			'op2=create_event&' .
 			'other=' . $data_event .'&' .
-			'other_mode=url_encode_separator_|&' .
+			'other_mode=url_encode_separator_'.$separator.'&' .
 			'apipass=' . $api_pass . '&' .
 			'user=' . $db_user . '&' .
 			'pass=' . $db_pass;
diff --git a/pandora_server/util/pandora_revent.pl b/pandora_server/util/pandora_revent.pl
index f78bc7dfe5..0cba15a4eb 100755
--- a/pandora_server/util/pandora_revent.pl
+++ b/pandora_server/util/pandora_revent.pl
@@ -33,40 +33,41 @@ sub help_screen{
 \t$0 -p <path_to_consoleAPI> -u <credentials> -create_event <options> 
 
 Where options:\n
-	-u <credentials>		: API credentials separated by comma: <api_pass>,<user>,<pass>
-	-name <event_name>	: Free text
-	-group <id_group>		: Group ID (use 0 for 'all') 
+	-u <credentials>   : API credentials separated by comma: <api_pass>,<user>,<pass>
+	-name <event_name> : Free text (surrounded by single-quotes, for security reasons)
+	-group <id_group>  : Group ID (use 0 for 'all') 
 	
 Optional parameters:
 
-	[-agent <id_agent]	: Agent ID
-	[-status <status>]			: 0 New, 1 Validated, 2 In process
-	[-user <id_user>]			: User comment (use in combination with -comment option)
-	[-type <event_type>]		: unknown, alert_fired, alert_recovered, alert_ceased
+	[-agent <id_agent] : Agent ID
+	[-status <status>] : 0 New, 1 Validated, 2 In process
+	[-user <id_user>] : User comment (use in combination with -comment option)
+	[-type <event_type>] : unknown, alert_fired, alert_recovered, alert_ceased
 								  alert_manual_validation, system, error, new_agent
 								  configuration_change, going_unknown, going_down_critical,
 								  going_down_warning, going_up_normal
-	[-severity <severity>] 		: 0 Maintance,
+	[-severity <severity>] : 0 Maintance,
 								  1 Informative,
 								  2 Normal,
 								  3 Warning,
 								  4 Crit,
 								  5 Minor,
 								  6 Major
-	[-am <id_agent_module>]		: ID Agent Module linked to event
-	[-alert <id_alert_am>]		: ID Alert Module linked to event
+	[-am <id_agent_module>] : ID Agent Module linked to event
+	[-alert <id_alert_am>] : ID Alert Module linked to event
 	[-c_instructions <critical_instructions>]
 	[-w_instructions <warning_instructions>]
 	[-u_instructions <unknown_instructions>]
-	[-user_comment <comment>]
-	[-owner_user <owner event>]	: Use the login name, not the descriptive
-	[-source <source>]			: (By default 'Pandora')
-	[-tag <tags>]				: Tag (must exist in the system to be imported)
+	[-user_comment <comment>] : Free text  (surrounded by single-quotes, for security reasons) 
+	[-owner_user <owner event>] : Use the login name, not the descriptive
+	[-source <source>] : (By default 'Pandora')
+	[-tag <tags>] : Tag (must exist in the system to be imported)
 	[-custom_data <custom_data>]: Custom data has to be in JSON format. Example: -custom_data \'{\"test1\" : \"t1\", \"test2\": \"2\"}\'
-	[-id_extra <id extra>]      : Id extra
-	[-agent_name <Agent name>]  : Agent name, Not to be confused with the alias.
-	[-force_create_agent<0 o 1>]: Force the creation of agent through an event this will create when it is 1.
-	[-server_id <server_id>]	: The pandora node server_id\n\n";
+	[-id_extra <id extra>] : Id extra
+	[-agent_name <Agent name>] : Agent name, Not to be confused with the alias.
+	[-force_create_agent<0 o 1>] : Force the creation of agent through an event this will create when it is 1.
+	[-separator '<char/s>'] : If you use the vertical bar `|` in the event name, you must set other character for send the info. This must be surrounded by single-quotes
+	[-server_id <server_id>] : The pandora node server_id\n\n";
 	
 	print "Example of event generation:\n\n";
 	
@@ -142,6 +143,7 @@ sub tool_api_main () {
 	my $call_api;
 	my $custom_data = "";
 	my $server_id = 0;
+	my $separator = '|';
 	
 	#~ help or api path (required)
 	if ($ARGV[0] eq '-h') {
@@ -256,6 +258,9 @@ sub tool_api_main () {
 			if ($line eq '-server_id') {
 				$server_id = $ARGV[$i + 1];
 			}
+			if ($line eq '-separator') {
+				$separator = $ARGV[$i + 1];
+			}
 			
 			$i++;
 		}
@@ -270,32 +275,32 @@ sub tool_api_main () {
 		}
 		
 		$data_event = $event_name .
-			"|" . $id_group .
-			"|" . $id_agent .
-			"|" . $status .
-			"|" . $id_user .
-			"|" . $event_type .
-			"|" . $severity .
-			"|" . $id_agent_module .
-			"|" . $id_alert_am . 
-			"|" . $critical_instructions .
-			"|" . $warning_instructions .
-			"|" . $unknown_instructions .
-			"|" . $user_comment .
-			"|" . $owner_user .
-			"|" . $source .
-			"|" . $tags .
-			"|" . $custom_data .
-			"|" . $server_id .
-			"|" . $id_extra .
-			"|" . $agent_name .
-			"|" . $force_create_agent;
+			$separator . $id_group .
+			$separator . $id_agent .
+			$separator . $status .
+			$separator . $id_user .
+			$separator . $event_type .
+			$separator . $severity .
+			$separator . $id_agent_module .
+			$separator . $id_alert_am . 
+			$separator . $critical_instructions .
+			$separator . $warning_instructions .
+			$separator . $unknown_instructions .
+			$separator . $user_comment .
+			$separator . $owner_user .
+			$separator . $source .
+			$separator . $tags .
+			$separator . $custom_data .
+			$separator . $server_id .
+			$separator . $id_extra .
+			$separator . $agent_name .
+			$separator . $force_create_agent;
 
 		$call_api = $api_path . '?' .
 			'op=set&' .
 			'op2=create_event&' .
 			'other=' . $data_event .'&' .
-			'other_mode=url_encode_separator_|&' .
+			'other_mode=url_encode_separator_'.$separator.'&' .
 			'apipass=' . $api_pass . '&' .
 			'user=' . $db_user . '&' .
 			'pass=' . $db_pass;

From e0ec645613f403140ea2d085d0299ab33361ac22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Gonz=C3=A1lez?= <jose.gonzalez@pandorafms.com>
Date: Wed, 19 May 2021 15:22:24 +0200
Subject: [PATCH 61/93] Fixed issue with last hash symbol

---
 pandora_agents/unix/pandora_revent    | 3 ++-
 pandora_server/util/pandora_revent.pl | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pandora_agents/unix/pandora_revent b/pandora_agents/unix/pandora_revent
index 0cba15a4eb..5f1bc8c3bd 100755
--- a/pandora_agents/unix/pandora_revent
+++ b/pandora_agents/unix/pandora_revent
@@ -198,7 +198,8 @@ sub tool_api_main () {
 				$id_group = $ARGV[$i + 1];
 			}
 			if ($line eq '-name') {
-				$event_name = join('%23', split("#", $ARGV[$i + 1]));
+				$event_name = $ARGV[$i + 1];
+				$event_name =~ s/#/%23/g;
 			}
 			if ($line eq '-type') {
 				$event_type = $ARGV[$i + 1];
diff --git a/pandora_server/util/pandora_revent.pl b/pandora_server/util/pandora_revent.pl
index 0cba15a4eb..5f1bc8c3bd 100755
--- a/pandora_server/util/pandora_revent.pl
+++ b/pandora_server/util/pandora_revent.pl
@@ -198,7 +198,8 @@ sub tool_api_main () {
 				$id_group = $ARGV[$i + 1];
 			}
 			if ($line eq '-name') {
-				$event_name = join('%23', split("#", $ARGV[$i + 1]));
+				$event_name = $ARGV[$i + 1];
+				$event_name =~ s/#/%23/g;
 			}
 			if ($line eq '-type') {
 				$event_type = $ARGV[$i + 1];

From 4711ca485687c8d90309d3868b3d064c395d03ea Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Wed, 19 May 2021 17:44:07 +0200
Subject: [PATCH 62/93] Avoid connection accumulation

---
 pandora_console/include/javascript/pandora_visual_console.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pandora_console/include/javascript/pandora_visual_console.js b/pandora_console/include/javascript/pandora_visual_console.js
index a26423c96c..0400ca56ad 100755
--- a/pandora_console/include/javascript/pandora_visual_console.js
+++ b/pandora_console/include/javascript/pandora_visual_console.js
@@ -76,7 +76,7 @@ function createVisualConsole(
                 "[API]",
                 error.message
               );
-              done();
+              abortable.abort();
               return;
             }
 

From 63da7abe4704b43bfb91282bff33a72415ec6054 Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Thu, 20 May 2021 01:00:47 +0200
Subject: [PATCH 63/93] 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 e1a0b8f0f0..4682564973 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.754-210519
+Version: 7.0NG.754-210520
 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 efd6b0843f..6bac49e622 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.754-210519"
+pandora_version="7.0NG.754-210520"
 
 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 3533c3390c..72382dc598 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -1015,7 +1015,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.754';
-use constant AGENT_BUILD => '210519';
+use constant AGENT_BUILD => '210520';
 
 # 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 e130e6f231..e88db2c983 100644
--- a/pandora_agents/unix/pandora_agent.redhat.spec
+++ b/pandora_agents/unix/pandora_agent.redhat.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     7.0NG.754
-%define release     210519
+%define release     210520
 
 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 cf96d6d051..a6c30e9ebf 100644
--- a/pandora_agents/unix/pandora_agent.spec
+++ b/pandora_agents/unix/pandora_agent.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     7.0NG.754
-%define release     210519
+%define release     210520
 
 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 6cefdd0081..90311e3ea7 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.754"
-PI_BUILD="210519"
+PI_BUILD="210520"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index 6bfd7d14ad..27438b39e6 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{210519}
+{210520}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 3ea9f99f4d..8175c802aa 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.754 Build 210519")
+#define PANDORA_VERSION ("7.0NG.754 Build 210520")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index bf76b70e96..0e749e22e7 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.754(Build 210519))"
+      VALUE "ProductVersion", "(7.0NG.754(Build 210520))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 738ec03949..091b98c419 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.754-210519
+Version: 7.0NG.754-210520
 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 6a5939f5ff..4651f3ec75 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.754-210519"
+pandora_version="7.0NG.754-210520"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index e47c495d7c..fc5a4f76f6 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 = 'PC210519';
+$build_version = 'PC210520';
 $pandora_version = 'v7.0NG.754';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index de55a2ba1b..d865cda708 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -129,7 +129,7 @@
         <div style='height: 10px'>
             <?php
             $version = '7.0NG.754';
-            $build = '210519';
+            $build = '210520';
             $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 0649cd426c..87b7e66771 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.754
-%define release     210519
+%define release     210520
 
 # 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 e73adb628b..629f87fb0a 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.754
-%define release     210519
+%define release     210520
 
 # 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 a63f54b78c..e7ace9a9ec 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.754
-%define release     210519
+%define release     210520
 %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 70344ba7e5..505784b7ca 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.754-210519
+Version: 7.0NG.754-210520
 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 a64aa0424f..938a6b31d1 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.754-210519"
+pandora_version="7.0NG.754-210520"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 3d0051f853..d2360e4f3e 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@@ -45,7 +45,7 @@ our @EXPORT = qw(
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.754";
-my $pandora_build = "210519";
+my $pandora_build = "210520";
 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 9de8246987..bc85c820fc 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.754";
-my $pandora_build = "210519";
+my $pandora_build = "210520";
 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 2a3c618def..5d307561e4 100644
--- a/pandora_server/pandora_server.redhat.spec
+++ b/pandora_server/pandora_server.redhat.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     7.0NG.754
-%define release     210519
+%define release     210520
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 2ff4ae4f33..7d8268e665 100644
--- a/pandora_server/pandora_server.spec
+++ b/pandora_server/pandora_server.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     7.0NG.754
-%define release     210519
+%define release     210520
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index bd4a797870..e6c50b6d55 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.754"
-PI_BUILD="210519"
+PI_BUILD="210520"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 47a5f16a84..19bb22f7ec 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.754 Build 210519";
+my $version = "7.0NG.754 Build 210520";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 37ad807aaa..77deeb82fb 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.754 Build 210519";
+my $version = "7.0NG.754 Build 210520";
 
 # save program name for logging
 my $progname = basename($0);

From 11d1b785b2b206287028da6a3f13ea73d185a145 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Gonz=C3=A1lez?= <jose.gonzalez@pandorafms.com>
Date: Thu, 20 May 2021 14:44:40 +0200
Subject: [PATCH 64/93] Fixed issue with group events in reports

---
 pandora_console/include/functions_events.php  |  6 +--
 .../include/functions_reporting.php           | 44 +++++++++++--------
 2 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/pandora_console/include/functions_events.php b/pandora_console/include/functions_events.php
index 348e72424b..c1d7aeb404 100644
--- a/pandora_console/include/functions_events.php
+++ b/pandora_console/include/functions_events.php
@@ -3152,10 +3152,6 @@ function events_get_agent(
         }
     }
 
-    if (is_metaconsole() === true && empty($id_server) === false) {
-        $sql_where .= ' AND server_id = '.$id_server;
-    }
-
     if ($show_summary_group) {
         return events_get_events_grouped(
             $sql_where,
@@ -3169,7 +3165,7 @@ function events_get_agent(
     } else {
         return events_get_events_no_grouped(
             $sql_where,
-            (is_metaconsole() === true && empty($id_server) === false) ? true : false,
+            (is_metaconsole() === true && (int) $id_server === 0) ? true : false,
             $history
         );
     }
diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php
index e82bac98ce..b2d1edb62d 100755
--- a/pandora_console/include/functions_reporting.php
+++ b/pandora_console/include/functions_reporting.php
@@ -1837,6 +1837,7 @@ function reporting_event_report_group(
         $content['name'] = __('Event Report Group');
     }
 
+    $id_meta = 0;
     if (is_metaconsole() === true && empty($content['server_name']) === false) {
         $id_meta = metaconsole_get_id_server($content['server_name']);
         $server = metaconsole_get_connection_by_id($id_meta);
@@ -1928,7 +1929,7 @@ function reporting_event_report_group(
         true,
         false,
         false,
-        false,
+        $id_meta,
         $filter_event_filter_exclude
     );
 
@@ -2176,10 +2177,6 @@ function reporting_event_report_module(
         );
     }
 
-    if (is_metaconsole()) {
-        metaconsole_restore_db();
-    }
-
     $return['description'] = $content['description'];
     $return['show_extended_events'] = $content['show_extended_events'];
     $return['date'] = reporting_get_date_text($report, $content);
@@ -2241,7 +2238,7 @@ function reporting_event_report_module(
         $return['data'] = array_reverse($data);
     }
 
-    if ($config['metaconsole']) {
+    if (is_metaconsole() === true) {
         metaconsole_restore_db();
     }
 
@@ -3242,10 +3239,6 @@ function reporting_event_report_agent(
         );
     }
 
-    if ($config['metaconsole']) {
-        metaconsole_restore_db();
-    }
-
     $label = (isset($content['style']['label'])) ? $content['style']['label'] : '';
     if ($label != '') {
         $label = reporting_label_macro(
@@ -3292,9 +3285,14 @@ function reporting_event_report_agent(
         $filter_event_type,
         $filter_event_status,
         $filter_event_filter_search,
-        $filter_event_filter_exclude
+        $filter_event_filter_exclude,
+        $id_server
     );
 
+    if (is_metaconsole() === true) {
+        metaconsole_restore_db();
+    }
+
     reporting_set_conf_charts(
         $width,
         $height,
@@ -9580,12 +9578,21 @@ function reporting_get_module_detailed_event(
  * It construct a table object with all the grouped events happened in an agent
  * during a period of time.
  *
- * @param mixed Agent id(s) to get the report from.
- * @param int Period of time (in seconds) to get the report.
- * @param int Beginning date (unixtime) of the report
- * @param bool Flag to return or echo the report table (echo by default).
+ * @param mixed   $id_agents                   Agent id(s) to get the report from.
+ * @param integer $period                      Period of time (in seconds) to get the report.
+ * @param integer $date                        Beginning date (unixtime) of the report.
+ * @param boolean $return                      Flag to return or echo the report table (echo by default).
+ * @param boolean $only_data                   Only data.
+ * @param boolean $history                     History.
+ * @param boolean $show_summary_group          Show summary group.
+ * @param boolean $filter_event_severity       Filter.
+ * @param boolean $filter_event_type           Filter.
+ * @param boolean $filter_event_status         Filter.
+ * @param boolean $filter_event_filter_search  Filter.
+ * @param boolean $filter_event_filter_exclude Filter.
+ * @param integer $id_server                   Id server.
  *
- * @return A table object (XHTML)
+ * @return array table object (XHTML)
  */
 function reporting_get_agents_detailed_event(
     $id_agents,
@@ -9599,7 +9606,8 @@ function reporting_get_agents_detailed_event(
     $filter_event_type=false,
     $filter_event_status=false,
     $filter_event_filter_search=false,
-    $filter_event_filter_exclude=false
+    $filter_event_filter_exclude=false,
+    $id_server=0
 ) {
     global $config;
 
@@ -9634,7 +9642,7 @@ function reporting_get_agents_detailed_event(
             false,
             false,
             false,
-            false,
+            $id_server,
             $filter_event_filter_exclude
         );
 

From f86c1c50c6f76f4f45618c3eb5703fd40c563c87 Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Fri, 21 May 2021 01:01:12 +0200
Subject: [PATCH 65/93] 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 4682564973..a0e9dd27f6 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.754-210520
+Version: 7.0NG.754-210521
 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 6bac49e622..191fa502e0 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.754-210520"
+pandora_version="7.0NG.754-210521"
 
 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 72382dc598..b6444182dc 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -1015,7 +1015,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.754';
-use constant AGENT_BUILD => '210520';
+use constant AGENT_BUILD => '210521';
 
 # 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 e88db2c983..503d2d3015 100644
--- a/pandora_agents/unix/pandora_agent.redhat.spec
+++ b/pandora_agents/unix/pandora_agent.redhat.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     7.0NG.754
-%define release     210520
+%define release     210521
 
 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 a6c30e9ebf..83ab42a6bb 100644
--- a/pandora_agents/unix/pandora_agent.spec
+++ b/pandora_agents/unix/pandora_agent.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     7.0NG.754
-%define release     210520
+%define release     210521
 
 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 90311e3ea7..3c45c8f265 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.754"
-PI_BUILD="210520"
+PI_BUILD="210521"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index 27438b39e6..aad385a042 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{210520}
+{210521}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 8175c802aa..ce40bf37b0 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.754 Build 210520")
+#define PANDORA_VERSION ("7.0NG.754 Build 210521")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index 0e749e22e7..ff384ab202 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.754(Build 210520))"
+      VALUE "ProductVersion", "(7.0NG.754(Build 210521))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 091b98c419..55dac40038 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.754-210520
+Version: 7.0NG.754-210521
 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 4651f3ec75..67b434af1b 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.754-210520"
+pandora_version="7.0NG.754-210521"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index fc5a4f76f6..929554ed13 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 = 'PC210520';
+$build_version = 'PC210521';
 $pandora_version = 'v7.0NG.754';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index d865cda708..9112b68b61 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -129,7 +129,7 @@
         <div style='height: 10px'>
             <?php
             $version = '7.0NG.754';
-            $build = '210520';
+            $build = '210521';
             $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 87b7e66771..b3110e168c 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.754
-%define release     210520
+%define release     210521
 
 # 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 629f87fb0a..4a5fc9e715 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.754
-%define release     210520
+%define release     210521
 
 # 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 e7ace9a9ec..06d7a541ac 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.754
-%define release     210520
+%define release     210521
 %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 505784b7ca..17ea3f36f9 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.754-210520
+Version: 7.0NG.754-210521
 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 938a6b31d1..33f1f4f967 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.754-210520"
+pandora_version="7.0NG.754-210521"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index d2360e4f3e..ec15f86c95 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@@ -45,7 +45,7 @@ our @EXPORT = qw(
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.754";
-my $pandora_build = "210520";
+my $pandora_build = "210521";
 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 bc85c820fc..927d34eb5e 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.754";
-my $pandora_build = "210520";
+my $pandora_build = "210521";
 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 5d307561e4..abd371287a 100644
--- a/pandora_server/pandora_server.redhat.spec
+++ b/pandora_server/pandora_server.redhat.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     7.0NG.754
-%define release     210520
+%define release     210521
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 7d8268e665..ed8148d8e3 100644
--- a/pandora_server/pandora_server.spec
+++ b/pandora_server/pandora_server.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     7.0NG.754
-%define release     210520
+%define release     210521
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index e6c50b6d55..de6776d5a2 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.754"
-PI_BUILD="210520"
+PI_BUILD="210521"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 19bb22f7ec..4fce21053d 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.754 Build 210520";
+my $version = "7.0NG.754 Build 210521";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 77deeb82fb..accad13c44 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.754 Build 210520";
+my $version = "7.0NG.754 Build 210521";
 
 # save program name for logging
 my $progname = basename($0);

From 26acafac47bcf3350f09297fb6988a4882f4f4d5 Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Fri, 21 May 2021 12:57:48 +0200
Subject: [PATCH 66/93] Alert correlatioin some improvements

---
 pandora_console/include/styles/alert.css | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/pandora_console/include/styles/alert.css b/pandora_console/include/styles/alert.css
index eb8f2d7583..63b97a0414 100644
--- a/pandora_console/include/styles/alert.css
+++ b/pandora_console/include/styles/alert.css
@@ -2,6 +2,10 @@
   display: inline-block;
 }
 
+#rules {
+  display: block;
+}
+
 li#li-buttons-alert-list > div {
   margin-left: 10px;
 }
@@ -132,11 +136,14 @@ div.target {
   width: 100%;
 }
 div.target.flex {
-  display: block;
   border: 2px dashed #ddd;
   margin-left: 0em;
   margin-top: 10px;
   padding: 1em;
+  display: flex;
+  flex-direction: row;
+  flex-wrap: wrap;
+  height: fit-content;
 }
 
 .fields,
@@ -190,6 +197,8 @@ div#rules.show {
   font-weight: 600;
   background-color: #333;
   word-break: break-all;
+  height: fit-content;
+  min-height: 2.3em;
 }
 
 .field.opacityElements {
@@ -215,6 +224,11 @@ div#rules.show {
   background-color: #82b92e;
 }
 
+.variable:empty::before {
+  content: "empty";
+  font-style: italic;
+}
+
 .modifier {
   background-color: #cba9d2;
 }

From 01e811254e2270282fcb6dd0b20b48c0bce8556f Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Sat, 22 May 2021 01:00:37 +0200
Subject: [PATCH 67/93] 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 a0e9dd27f6..9affe47935 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.754-210521
+Version: 7.0NG.754-210522
 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 191fa502e0..8797175109 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.754-210521"
+pandora_version="7.0NG.754-210522"
 
 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 b6444182dc..02d4bdd878 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -1015,7 +1015,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.754';
-use constant AGENT_BUILD => '210521';
+use constant AGENT_BUILD => '210522';
 
 # 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 503d2d3015..a11dc74ead 100644
--- a/pandora_agents/unix/pandora_agent.redhat.spec
+++ b/pandora_agents/unix/pandora_agent.redhat.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     7.0NG.754
-%define release     210521
+%define release     210522
 
 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 83ab42a6bb..a0d791ef4b 100644
--- a/pandora_agents/unix/pandora_agent.spec
+++ b/pandora_agents/unix/pandora_agent.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     7.0NG.754
-%define release     210521
+%define release     210522
 
 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 3c45c8f265..7ea1c70bef 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.754"
-PI_BUILD="210521"
+PI_BUILD="210522"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index aad385a042..5e75c263b4 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{210521}
+{210522}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index ce40bf37b0..ee2c5d2845 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.754 Build 210521")
+#define PANDORA_VERSION ("7.0NG.754 Build 210522")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index ff384ab202..c3a9dbe60a 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.754(Build 210521))"
+      VALUE "ProductVersion", "(7.0NG.754(Build 210522))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 55dac40038..76d7815ef0 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.754-210521
+Version: 7.0NG.754-210522
 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 67b434af1b..b6815eb0c1 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.754-210521"
+pandora_version="7.0NG.754-210522"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 929554ed13..d8abc9ec45 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 = 'PC210521';
+$build_version = 'PC210522';
 $pandora_version = 'v7.0NG.754';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 9112b68b61..1bc1410db0 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -129,7 +129,7 @@
         <div style='height: 10px'>
             <?php
             $version = '7.0NG.754';
-            $build = '210521';
+            $build = '210522';
             $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 b3110e168c..51fb1f9415 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.754
-%define release     210521
+%define release     210522
 
 # 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 4a5fc9e715..ccb6ff5eed 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.754
-%define release     210521
+%define release     210522
 
 # 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 06d7a541ac..3cf640f1ac 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.754
-%define release     210521
+%define release     210522
 %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 17ea3f36f9..38d6568c54 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.754-210521
+Version: 7.0NG.754-210522
 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 33f1f4f967..fa960a735e 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.754-210521"
+pandora_version="7.0NG.754-210522"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index ec15f86c95..470dbd9088 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@@ -45,7 +45,7 @@ our @EXPORT = qw(
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.754";
-my $pandora_build = "210521";
+my $pandora_build = "210522";
 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 927d34eb5e..16ca96b53f 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.754";
-my $pandora_build = "210521";
+my $pandora_build = "210522";
 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 abd371287a..fedb23be12 100644
--- a/pandora_server/pandora_server.redhat.spec
+++ b/pandora_server/pandora_server.redhat.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     7.0NG.754
-%define release     210521
+%define release     210522
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index ed8148d8e3..61220acffe 100644
--- a/pandora_server/pandora_server.spec
+++ b/pandora_server/pandora_server.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     7.0NG.754
-%define release     210521
+%define release     210522
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index de6776d5a2..3dae755dc7 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.754"
-PI_BUILD="210521"
+PI_BUILD="210522"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 4fce21053d..c268689114 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.754 Build 210521";
+my $version = "7.0NG.754 Build 210522";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index accad13c44..21e8a70199 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.754 Build 210521";
+my $version = "7.0NG.754 Build 210522";
 
 # save program name for logging
 my $progname = basename($0);

From 5366b40ac36e8389b8e797b4a9cc626a30751f57 Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Sun, 23 May 2021 01:00:27 +0200
Subject: [PATCH 68/93] 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 9affe47935..8535545152 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.754-210522
+Version: 7.0NG.754-210523
 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 8797175109..dc63f884c0 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.754-210522"
+pandora_version="7.0NG.754-210523"
 
 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 02d4bdd878..53adf96a58 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -1015,7 +1015,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.754';
-use constant AGENT_BUILD => '210522';
+use constant AGENT_BUILD => '210523';
 
 # 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 a11dc74ead..6d9cfab618 100644
--- a/pandora_agents/unix/pandora_agent.redhat.spec
+++ b/pandora_agents/unix/pandora_agent.redhat.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     7.0NG.754
-%define release     210522
+%define release     210523
 
 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 a0d791ef4b..2d41ef856a 100644
--- a/pandora_agents/unix/pandora_agent.spec
+++ b/pandora_agents/unix/pandora_agent.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     7.0NG.754
-%define release     210522
+%define release     210523
 
 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 7ea1c70bef..c6d68830d6 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.754"
-PI_BUILD="210522"
+PI_BUILD="210523"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index 5e75c263b4..f90e97b3de 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{210522}
+{210523}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index ee2c5d2845..390066e556 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.754 Build 210522")
+#define PANDORA_VERSION ("7.0NG.754 Build 210523")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index c3a9dbe60a..8f455548a1 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.754(Build 210522))"
+      VALUE "ProductVersion", "(7.0NG.754(Build 210523))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 76d7815ef0..2b0026454b 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.754-210522
+Version: 7.0NG.754-210523
 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 b6815eb0c1..7f0470bdcb 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.754-210522"
+pandora_version="7.0NG.754-210523"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index d8abc9ec45..84d5fc266d 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 = 'PC210522';
+$build_version = 'PC210523';
 $pandora_version = 'v7.0NG.754';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 1bc1410db0..24e5ae9e17 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -129,7 +129,7 @@
         <div style='height: 10px'>
             <?php
             $version = '7.0NG.754';
-            $build = '210522';
+            $build = '210523';
             $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 51fb1f9415..70fac37866 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.754
-%define release     210522
+%define release     210523
 
 # 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 ccb6ff5eed..41da223ad8 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.754
-%define release     210522
+%define release     210523
 
 # 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 3cf640f1ac..f4138f4e96 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.754
-%define release     210522
+%define release     210523
 %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 38d6568c54..deb8bbb0b7 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.754-210522
+Version: 7.0NG.754-210523
 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 fa960a735e..18cac26bf1 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.754-210522"
+pandora_version="7.0NG.754-210523"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 470dbd9088..46c4a4625c 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@@ -45,7 +45,7 @@ our @EXPORT = qw(
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.754";
-my $pandora_build = "210522";
+my $pandora_build = "210523";
 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 16ca96b53f..b19727e2ea 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.754";
-my $pandora_build = "210522";
+my $pandora_build = "210523";
 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 fedb23be12..de52922999 100644
--- a/pandora_server/pandora_server.redhat.spec
+++ b/pandora_server/pandora_server.redhat.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     7.0NG.754
-%define release     210522
+%define release     210523
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 61220acffe..88033bd81e 100644
--- a/pandora_server/pandora_server.spec
+++ b/pandora_server/pandora_server.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     7.0NG.754
-%define release     210522
+%define release     210523
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 3dae755dc7..9018e7e166 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.754"
-PI_BUILD="210522"
+PI_BUILD="210523"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index c268689114..66eb4a3af3 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.754 Build 210522";
+my $version = "7.0NG.754 Build 210523";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 21e8a70199..f49bfb9052 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.754 Build 210522";
+my $version = "7.0NG.754 Build 210523";
 
 # save program name for logging
 my $progname = basename($0);

From 3388bfa69948e8a55a64175be2df4fccf495ab3f Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Mon, 24 May 2021 01:00:35 +0200
Subject: [PATCH 69/93] 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 8535545152..045e64391c 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.754-210523
+Version: 7.0NG.754-210524
 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 dc63f884c0..f3df492a0a 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.754-210523"
+pandora_version="7.0NG.754-210524"
 
 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 53adf96a58..021ee8e55d 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -1015,7 +1015,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.754';
-use constant AGENT_BUILD => '210523';
+use constant AGENT_BUILD => '210524';
 
 # 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 6d9cfab618..874752b725 100644
--- a/pandora_agents/unix/pandora_agent.redhat.spec
+++ b/pandora_agents/unix/pandora_agent.redhat.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     7.0NG.754
-%define release     210523
+%define release     210524
 
 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 2d41ef856a..1439223b1f 100644
--- a/pandora_agents/unix/pandora_agent.spec
+++ b/pandora_agents/unix/pandora_agent.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     7.0NG.754
-%define release     210523
+%define release     210524
 
 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 c6d68830d6..7450490f02 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.754"
-PI_BUILD="210523"
+PI_BUILD="210524"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index f90e97b3de..dd496ed43f 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{210523}
+{210524}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 390066e556..9d89f4aa72 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.754 Build 210523")
+#define PANDORA_VERSION ("7.0NG.754 Build 210524")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index 8f455548a1..f603ecfefb 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.754(Build 210523))"
+      VALUE "ProductVersion", "(7.0NG.754(Build 210524))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 2b0026454b..5d77e0a847 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.754-210523
+Version: 7.0NG.754-210524
 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 7f0470bdcb..263a5d1387 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.754-210523"
+pandora_version="7.0NG.754-210524"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 84d5fc266d..a542a6a4fe 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 = 'PC210523';
+$build_version = 'PC210524';
 $pandora_version = 'v7.0NG.754';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 24e5ae9e17..1298209bb4 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -129,7 +129,7 @@
         <div style='height: 10px'>
             <?php
             $version = '7.0NG.754';
-            $build = '210523';
+            $build = '210524';
             $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 70fac37866..587c6c790d 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.754
-%define release     210523
+%define release     210524
 
 # 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 41da223ad8..3a885aae7f 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.754
-%define release     210523
+%define release     210524
 
 # 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 f4138f4e96..cb7e5c6578 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.754
-%define release     210523
+%define release     210524
 %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 deb8bbb0b7..6627e82df5 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.754-210523
+Version: 7.0NG.754-210524
 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 18cac26bf1..762fc17f74 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.754-210523"
+pandora_version="7.0NG.754-210524"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 46c4a4625c..e52e4764b1 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@@ -45,7 +45,7 @@ our @EXPORT = qw(
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.754";
-my $pandora_build = "210523";
+my $pandora_build = "210524";
 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 b19727e2ea..0776ee36d7 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.754";
-my $pandora_build = "210523";
+my $pandora_build = "210524";
 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 de52922999..af1008efd8 100644
--- a/pandora_server/pandora_server.redhat.spec
+++ b/pandora_server/pandora_server.redhat.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     7.0NG.754
-%define release     210523
+%define release     210524
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 88033bd81e..deba06403b 100644
--- a/pandora_server/pandora_server.spec
+++ b/pandora_server/pandora_server.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     7.0NG.754
-%define release     210523
+%define release     210524
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 9018e7e166..2745df7b03 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.754"
-PI_BUILD="210523"
+PI_BUILD="210524"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 66eb4a3af3..3696fde9d6 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.754 Build 210523";
+my $version = "7.0NG.754 Build 210524";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index f49bfb9052..7a9990f240 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.754 Build 210523";
+my $version = "7.0NG.754 Build 210524";
 
 # save program name for logging
 my $progname = basename($0);

From 362855a24e81a3ad23f9ed21cbc7c9e550d91a39 Mon Sep 17 00:00:00 2001
From: Junichi Satoh <junichi@rworks.jp>
Date: Mon, 24 May 2021 18:56:18 +0900
Subject: [PATCH 70/93] Fixed to follow ACL with get_agents_group_json.

---
 pandora_console/operation/agentes/ver_agente.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pandora_console/operation/agentes/ver_agente.php b/pandora_console/operation/agentes/ver_agente.php
index 6149270408..4c5b25a469 100644
--- a/pandora_console/operation/agentes/ver_agente.php
+++ b/pandora_console/operation/agentes/ver_agente.php
@@ -153,7 +153,7 @@ if (is_ajax()) {
             // Case.
             'lower',
             // NoACL.
-            true,
+            false,
             // ChildGroups.
             $recursion,
             // Serialized.
@@ -1975,4 +1975,4 @@ switch ($tab) {
             $('.subsubmenu').hide("fast");
         },15000);
     }
-</script>
\ No newline at end of file
+</script>

From f3d6dafad2972326749a10af7a3cfd08c4657766 Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Tue, 25 May 2021 01:00:38 +0200
Subject: [PATCH 71/93] 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 045e64391c..1ad6b6641b 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.754-210524
+Version: 7.0NG.754-210525
 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 f3df492a0a..093a808276 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.754-210524"
+pandora_version="7.0NG.754-210525"
 
 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 021ee8e55d..66492e4f70 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -1015,7 +1015,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.754';
-use constant AGENT_BUILD => '210524';
+use constant AGENT_BUILD => '210525';
 
 # 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 874752b725..bab69faca4 100644
--- a/pandora_agents/unix/pandora_agent.redhat.spec
+++ b/pandora_agents/unix/pandora_agent.redhat.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     7.0NG.754
-%define release     210524
+%define release     210525
 
 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 1439223b1f..6c968a7eff 100644
--- a/pandora_agents/unix/pandora_agent.spec
+++ b/pandora_agents/unix/pandora_agent.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     7.0NG.754
-%define release     210524
+%define release     210525
 
 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 7450490f02..95c8e48240 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.754"
-PI_BUILD="210524"
+PI_BUILD="210525"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index dd496ed43f..756b2ebe26 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{210524}
+{210525}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 9d89f4aa72..dae380d06d 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.754 Build 210524")
+#define PANDORA_VERSION ("7.0NG.754 Build 210525")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index f603ecfefb..4a1723f4a9 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.754(Build 210524))"
+      VALUE "ProductVersion", "(7.0NG.754(Build 210525))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 5d77e0a847..dd03c46298 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.754-210524
+Version: 7.0NG.754-210525
 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 263a5d1387..2ad5dbadee 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.754-210524"
+pandora_version="7.0NG.754-210525"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index a542a6a4fe..a39f00aea1 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 = 'PC210524';
+$build_version = 'PC210525';
 $pandora_version = 'v7.0NG.754';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 1298209bb4..477defe75f 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -129,7 +129,7 @@
         <div style='height: 10px'>
             <?php
             $version = '7.0NG.754';
-            $build = '210524';
+            $build = '210525';
             $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 587c6c790d..391fb3a8d0 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.754
-%define release     210524
+%define release     210525
 
 # 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 3a885aae7f..f7546bd7de 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.754
-%define release     210524
+%define release     210525
 
 # 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 cb7e5c6578..4833ff92bb 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.754
-%define release     210524
+%define release     210525
 %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 6627e82df5..da1fd3cbd9 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.754-210524
+Version: 7.0NG.754-210525
 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 762fc17f74..04c5a6dcfc 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.754-210524"
+pandora_version="7.0NG.754-210525"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index e52e4764b1..215c9a9c8e 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@@ -45,7 +45,7 @@ our @EXPORT = qw(
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.754";
-my $pandora_build = "210524";
+my $pandora_build = "210525";
 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 0776ee36d7..c5a2af2e09 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.754";
-my $pandora_build = "210524";
+my $pandora_build = "210525";
 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 af1008efd8..a8ecef6ff8 100644
--- a/pandora_server/pandora_server.redhat.spec
+++ b/pandora_server/pandora_server.redhat.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     7.0NG.754
-%define release     210524
+%define release     210525
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index deba06403b..9f0ef65b3f 100644
--- a/pandora_server/pandora_server.spec
+++ b/pandora_server/pandora_server.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     7.0NG.754
-%define release     210524
+%define release     210525
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 2745df7b03..5792617ef8 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.754"
-PI_BUILD="210524"
+PI_BUILD="210525"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 3696fde9d6..2a78ef6e4f 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.754 Build 210524";
+my $version = "7.0NG.754 Build 210525";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 7a9990f240..28d7d61b70 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.754 Build 210524";
+my $version = "7.0NG.754 Build 210525";
 
 # save program name for logging
 my $progname = basename($0);

From d95eec0188748df718ab6e8dea0969f11f92268d Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Tue, 25 May 2021 09:57:23 +0200
Subject: [PATCH 72/93] Enlarge numeric data fields

---
 .../extras/pandoradb_migrate_6.0_to_7.0.mysql.sql      | 10 +++++-----
 pandora_console/pandoradb.sql                          | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql b/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
index 6096c8143d..1335550ef7 100644
--- a/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
+++ b/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
@@ -1019,7 +1019,7 @@ CREATE TABLE IF NOT EXISTS `tmetaconsole_event` (
 -- Criticity: 5 - Minor
 -- Criticity: 6 - Major
 
-ALTER TABLE `tmetaconsole_event` ADD COLUMN `data` double(22,5) default NULL;
+ALTER TABLE `tmetaconsole_event` ADD COLUMN `data` double(50,5) default NULL;
 ALTER TABLE `tmetaconsole_event` ADD COLUMN `module_status` int(4) NOT NULL default '0';
 ALTER TABLE `tmetaconsole_event` ADD INDEX `server_id` (`server_id`);
 ALTER TABLE `tmetaconsole_event` ADD INDEX `tme_timestamp_idx` (`timestamp`);
@@ -1072,7 +1072,7 @@ CREATE TABLE IF NOT EXISTS `tmetaconsole_event_history` (
 -- Criticity: 5 - Minor
 -- Criticity: 6 - Major
 
-ALTER TABLE `tmetaconsole_event_history` ADD COLUMN `data` double(22,5) default NULL;
+ALTER TABLE `tmetaconsole_event_history` ADD COLUMN `data` double(50,5) default NULL;
 ALTER TABLE `tmetaconsole_event_history` ADD COLUMN `module_status` int(4) NOT NULL default '0';
 ALTER TABLE `tmetaconsole_event_history` ADD INDEX `tmeh_estado_idx` (`estado`);
 ALTER TABLE `tmetaconsole_event_history` ADD INDEX `tmeh_timestamp_idx` (`timestamp`);
@@ -1556,7 +1556,7 @@ ALTER TABLE `tagente_modulo` ADD COLUMN `debug_content` varchar(200);
 -- ---------------------------------------------------------------------
 -- Table `tagente_datos`
 -- ---------------------------------------------------------------------
-ALTER TABLE tagente_datos MODIFY `datos` double(22,5);
+ALTER TABLE tagente_datos MODIFY `datos` double(50,5);
 ALTER TABLE `tagente_datos` DROP INDEX `data_index1`, ADD INDEX `data_index1` (`id_agente_modulo`, `utimestamp`);
 
 -- ---------------------------------------------------------------------
@@ -1567,7 +1567,7 @@ ALTER TABLE `tagente_datos_string` MODIFY COLUMN `datos` mediumtext NOT NULL, DR
 -- ---------------------------------------------------------------------
 -- Table `tagente_datos_inc`
 -- ---------------------------------------------------------------------
-ALTER TABLE tagente_datos_inc MODIFY `datos` double(22,5);
+ALTER TABLE tagente_datos_inc MODIFY `datos` double(50,5);
 
 -- ---------------------------------------------------------------------
 -- Table `tnetwork_component`
@@ -2341,7 +2341,7 @@ CREATE TABLE IF NOT EXISTS `tagent_custom_fields_filter` (
 -- ---------------------------------------------------------------------
 -- Table `tevento`
 -- ---------------------------------------------------------------------
-ALTER TABLE `tevento` ADD COLUMN `data` double(22,5) default NULL;
+ALTER TABLE `tevento` ADD COLUMN `data` double(50,5) default NULL;
 
 ALTER TABLE `tevento` ADD COLUMN `module_status` int(4) NOT NULL default '0';
 
diff --git a/pandora_console/pandoradb.sql b/pandora_console/pandoradb.sql
index cbbda24ab5..ec7d1a2072 100644
--- a/pandora_console/pandoradb.sql
+++ b/pandora_console/pandoradb.sql
@@ -100,7 +100,7 @@ CREATE TABLE IF NOT EXISTS `tagente` (
 -- ---------------------------------------------------------------------
 CREATE TABLE IF NOT EXISTS `tagente_datos` (
 	`id_agente_modulo` int(10) unsigned NOT NULL default '0',
-	`datos` double(22,5) default NULL,
+	`datos` double(50,5) default NULL,
 	`utimestamp` bigint(20) default '0',
 	KEY `data_index1` (`id_agente_modulo`, `utimestamp`),
 	KEY `idx_utimestamp` USING BTREE (`utimestamp`)
@@ -111,7 +111,7 @@ CREATE TABLE IF NOT EXISTS `tagente_datos` (
 -- ---------------------------------------------------------------------
 CREATE TABLE IF NOT EXISTS `tagente_datos_inc` (
 	`id_agente_modulo` int(10) unsigned NOT NULL default '0',
-	`datos` double(22,5) default NULL,
+	`datos` double(50,5) default NULL,
 	`utimestamp` int(20) unsigned default '0',
 	KEY `data_inc_index_1` (`id_agente_modulo`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
@@ -681,7 +681,7 @@ CREATE TABLE IF NOT EXISTS `tevento` (
 	`owner_user` VARCHAR(100) NOT NULL DEFAULT '',
 	`ack_utimestamp` BIGINT(20) NOT NULL DEFAULT '0',
 	`custom_data` TEXT NOT NULL,
-	`data` double(22,5) default NULL,
+	`data` double(50,5) default NULL,
 	`module_status` int(4) NOT NULL default '0',
 	PRIMARY KEY  (`id_evento`),
 	KEY `idx_agente` (`id_agente`),
@@ -3275,7 +3275,7 @@ CREATE TABLE IF NOT EXISTS `tmetaconsole_event` (
 	`ack_utimestamp` BIGINT(20) NOT NULL DEFAULT '0',
 	`server_id` int(10) NOT NULL,
 	`custom_data` TEXT NOT NULL DEFAULT '',
-	`data` double(22,5) default NULL,
+	`data` double(50,5) default NULL,
 	`module_status` int(4) NOT NULL default '0',
 	PRIMARY KEY  (`id_evento`),
 	KEY `idx_agente` (`id_agente`),
@@ -3328,7 +3328,7 @@ CREATE TABLE IF NOT EXISTS `tmetaconsole_event_history` (
 	`ack_utimestamp` BIGINT(20) NOT NULL DEFAULT '0',
 	`server_id` int(10) NOT NULL,
 	`custom_data` TEXT NOT NULL DEFAULT '',
-	`data` double(22,5) default NULL,
+	`data` double(50,5) default NULL,
 	`module_status` int(4) NOT NULL default '0',
 	PRIMARY KEY  (`id_evento`),
 	KEY `idx_agente` (`id_agente`),

From e6713c2f2c6abb1735c3df133d8615a17985cf6f Mon Sep 17 00:00:00 2001
From: Daniel Maya <daniel.maya@artica.es>
Date: Tue, 25 May 2021 09:58:18 +0000
Subject: [PATCH 73/93] #6917 metaconsole config changes

---
 pandora_console/extras/mr/47.sql              | 10 +++++
 pandora_console/include/functions_config.php  | 38 +++++++++++++++----
 .../include/styles/meta_dashboards.css        |  2 +-
 .../operation/dashboard/dashboard.php         |  8 ++++
 4 files changed, 49 insertions(+), 9 deletions(-)

diff --git a/pandora_console/extras/mr/47.sql b/pandora_console/extras/mr/47.sql
index aa07478947..9a7bf687a7 100644
--- a/pandora_console/extras/mr/47.sql
+++ b/pandora_console/extras/mr/47.sql
@@ -11,4 +11,14 @@ ALTER TABLE `talert_snmp_action` ADD COLUMN `al_field18` TEXT NOT NULL AFTER `al
 ALTER TABLE `talert_snmp_action` ADD COLUMN `al_field19` TEXT NOT NULL AFTER `al_field18`;
 ALTER TABLE `talert_snmp_action` ADD COLUMN `al_field20` TEXT NOT NULL AFTER `al_field19`;
 
+SET @st_oum755 = (SELECT IF(
+    (SELECT COUNT(*) FROM tconfig WHERE token LIKE 'meta_custom_logo' AND value like 'logo_pandora_metaconsola.png') > 0,
+    "UPDATE `tconfig` set value = 'pandoraFMS_metaconsole_full.svg' WHERE token LIKE 'meta_custom_logo'",
+	"SELECT 1"
+));
+
+PREPARE pr_oum755 FROM @st_oum755;
+EXECUTE pr_oum755;
+DEALLOCATE PREPARE pr_oum755;
+
 COMMIT;
diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php
index 676a6fbeb0..3920109890 100644
--- a/pandora_console/include/functions_config.php
+++ b/pandora_console/include/functions_config.php
@@ -1032,6 +1032,14 @@ function config_update_config()
                         $error_update[] = __('Custom subtitle header');
                     }
 
+                    if (!config_update_value('meta_custom_title_header', (string) get_parameter('meta_custom_title_header'))) {
+                        $error_update[] = __('Meta custom title header');
+                    }
+
+                    if (!config_update_value('meta_custom_subtitle_header', (string) get_parameter('meta_custom_subtitle_header'))) {
+                        $error_update[] = __('Meta custom subtitle header');
+                    }
+
                     if (!config_update_value('custom_title1_login', (string) get_parameter('custom_title1_login'))) {
                         $error_update[] = __('Custom title1 login');
                     }
@@ -1060,10 +1068,6 @@ function config_update_config()
                         $error_update[] = __('Copyright notice');
                     }
 
-                    if (!config_update_value('meta_custom_logo', (string) get_parameter('meta_custom_logo'))) {
-                        $error_update[] = __('Custom logo metaconsole');
-                    }
-
                     if (!config_update_value('meta_custom_logo_white_bg', (string) get_parameter('meta_custom_logo_white_bg'))) {
                         $error_update[] = __('Custom logo metaconsole (white background)');
                     }
@@ -2291,6 +2295,20 @@ function config_process_config()
         config_update_value('custom_logo_collapsed', 'pandora_logo_green_collapsed.png');
     }
 
+    if (is_metaconsole()) {
+        if (!isset($config['meta_custom_logo'])) {
+            config_update_value('meta_custom_logo', 'pandoraFMS_metaconsole_full.svg');
+        }
+
+        if (!isset($config['meta_custom_logo_collapsed'])) {
+            config_update_value('meta_custom_logo_collapsed', 'pandoraFMS_metaconsole_collapse.svg');
+        }
+
+        if (!isset($config['meta_menu_type'])) {
+            config_update_value('meta_menu_type', 'classic');
+        }
+    }
+
     if (!isset($config['custom_logo_white_bg'])) {
         config_update_value('custom_logo_white_bg', 'pandora_logo_head_white_bg.png');
     }
@@ -2327,6 +2345,14 @@ function config_process_config()
         config_update_value('custom_subtitle_header', __('the Flexible Monitoring System'));
     }
 
+    if (!isset($config['meta_custom_title_header'])) {
+        config_update_value('meta_custom_title_header', __('PandoraFMS Metaconsole'));
+    }
+
+    if (!isset($config['meta_custom_subtitle_header'])) {
+        config_update_value('meta_custom_subtitle_header', __('Centralized operation console'));
+    }
+
     if (!isset($config['custom_title1_login'])) {
         config_update_value('custom_title1_login', __('PANDORA FMS'));
     }
@@ -2359,10 +2385,6 @@ function config_process_config()
         config_update_value('meta_custom_support_url', 'https://support.pandorafms.com');
     }
 
-    if (!isset($config['meta_custom_logo'])) {
-        config_update_value('meta_custom_logo', 'logo_pandora_metaconsola.png');
-    }
-
     if (!isset($config['meta_custom_logo_white_bg'])) {
         config_update_value('pandora_logo_head_white_bg', 'pandora_logo_head_white_bg.png');
     }
diff --git a/pandora_console/include/styles/meta_dashboards.css b/pandora_console/include/styles/meta_dashboards.css
index 1b24b3bce5..a5b2736110 100644
--- a/pandora_console/include/styles/meta_dashboards.css
+++ b/pandora_console/include/styles/meta_dashboards.css
@@ -1,5 +1,5 @@
 div#page {
-  width: 90% !important;
+  width: auto;
   margin: 0 auto;
 }
 
diff --git a/pandora_console/operation/dashboard/dashboard.php b/pandora_console/operation/dashboard/dashboard.php
index 3b081cfc7a..a3379565b7 100644
--- a/pandora_console/operation/dashboard/dashboard.php
+++ b/pandora_console/operation/dashboard/dashboard.php
@@ -70,6 +70,14 @@ if (is_ajax() === true) {
         }
     }
 } else {
+    if ((bool) is_metaconsole() === true) {
+        echo '<div class="meta_container_dashboard">';
+    }
+
     // Run.
     $cs->run();
+
+    if ((bool) is_metaconsole() === true) {
+        echo '</div>';
+    }
 }

From e69f258f8a07be029e71b8e7a44b9ee3d1da4563 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Gonz=C3=A1lez?= <jose.gonzalez@pandorafms.com>
Date: Tue, 25 May 2021 12:50:25 +0200
Subject: [PATCH 74/93] Fixed issue with webserver modules

---
 pandora_console/include/lib/Module.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pandora_console/include/lib/Module.php b/pandora_console/include/lib/Module.php
index 3e11480c3e..4a49bd5435 100644
--- a/pandora_console/include/lib/Module.php
+++ b/pandora_console/include/lib/Module.php
@@ -706,6 +706,13 @@ class Module extends Entity
         $updates = $this->fields;
         $updates['id_tipo_modulo'] = $this->moduleType()->id_tipo();
 
+        // In the case of the webserver modules, debug_content special characters must be handled.
+        if ($updates['id_tipo_modulo'] >= MODULE_TYPE_WEB_ANALYSIS
+            && $updates['id_tipo_modulo'] <= MODULE_TYPE_WEB_CONTENT_STRING
+        ) {
+            $updates['debug_content'] = io_safe_input($updates['debug_content']);
+        }
+
         if ($this->fields['id_agente_modulo'] > 0) {
             // Update.
             $rs = \db_process_sql_update(

From 7eaaa1f37149a3bcc9a14268d894ed17ed5baf49 Mon Sep 17 00:00:00 2001
From: Daniel Maya <daniel.maya@artica.es>
Date: Tue, 25 May 2021 13:40:33 +0000
Subject: [PATCH 75/93] =?UTF-8?q?Ent=204991=20api=20editar=20scheduled=20d?=
 =?UTF-8?q?owntimes=20y=20a=C3=B1adir=20eliminar=20agentes=20de=20ellas?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pandora_console/include/functions_api.php | 299 ++++++++++++++++++++++
 1 file changed, 299 insertions(+)

diff --git a/pandora_console/include/functions_api.php b/pandora_console/include/functions_api.php
index 411b847e56..03fb8b9be2 100644
--- a/pandora_console/include/functions_api.php
+++ b/pandora_console/include/functions_api.php
@@ -7541,6 +7541,305 @@ function api_set_planned_downtimes_additem($id, $thrash1, $other, $thrash3)
 }
 
 
+/**
+ * Edit planned Downtime.
+ * e.g.: api.php?op=set&op2=planned_downtimes_edit&apipass=1234&user=admin&pass=pandora&id=2&other=testing2|test2|2021/05/10|2021/06/12|19:03:03|19:55:00|0|0|0|0|0|0|0|0|1|31|quiet|once|weekly&other_mode=url_encode_separator_|
+ *
+ * @param $id id of planned downtime.
+ * @param $thrash1 Don't use.
+ * @param array                     $other
+ * The first index contains a list of agent Ids.
+ * The second index contains a list of module names.
+ * The list separator is the character ';'.
+ * @param $thrash3 Don't use.
+ */
+function api_set_planned_downtimes_edit($id, $thrash1, $other, $thrash3)
+{
+    global $config;
+
+    if (defined('METACONSOLE')) {
+        return;
+    }
+
+    if (!check_acl($config['id_user'], 0, 'PM')) {
+        returnError('forbidden', 'string');
+        return;
+    }
+
+    if ($id == '') {
+        returnError(
+            'id cannot be left blank.'
+        );
+        return;
+    }
+
+    if (db_get_value('id', 'tplanned_downtime', 'id', $id) === false) {
+        returnError(
+            'id does not exist'
+        );
+        return;
+    }
+
+    if ($other['data'] == '') {
+        returnError(
+            'data cannot be left blank.'
+        );
+        return;
+    }
+
+    $values = [];
+    if (!empty($other['data'][0])) {
+        $values['name'] = io_safe_input($other['data'][0]);
+    }
+
+    if (!empty($other['data'][1])) {
+        $values['description'] = io_safe_input($other['data'][1]);
+    }
+
+    if (!empty($other['data'][2]) && !empty($other['data'][4])) {
+        $date_from = strtotime(html_entity_decode($other['data'][2].' '.$other['data'][4]));
+        $values['date_from'] = io_safe_input($date_from);
+    }
+
+    if (!empty($other['data'][4])) {
+        $values['periodically_time_from'] = io_safe_input($other['data'][4]);
+    }
+
+    if (!empty($other['data'][3]) && !empty($other['data'][5])) {
+        $date_to = strtotime(html_entity_decode($other['data'][3].' '.$other['data'][5]));
+        $values['date_to'] = io_safe_input($date_to);
+    }
+
+    if (!empty($other['data'][5])) {
+        $values['periodically_time_to'] = io_safe_input($other['data'][5]);
+    }
+
+    if ($other['data'][6] != '') {
+        $values['id_group'] = io_safe_input($other['data'][6]);
+    }
+
+    if ($other['data'][7] != '') {
+        $values['monday'] = io_safe_input($other['data'][7]);
+    }
+
+    if ($other['data'][8] != '') {
+        $values['tuesday'] = io_safe_input($other['data'][8]);
+    }
+
+    if ($other['data'][9] != '') {
+        $values['wednesday'] = io_safe_input($other['data'][9]);
+    }
+
+    if ($other['data'][10] != '') {
+        $values['thursday'] = io_safe_input($other['data'][10]);
+    }
+
+    if ($other['data'][11] != '') {
+        $values['friday'] = io_safe_input($other['data'][11]);
+    }
+
+    if ($other['data'][12] != '') {
+        $values['saturday'] = io_safe_input($other['data'][12]);
+    }
+
+    if ($other['data'][13] != '') {
+        $values['sunday'] = io_safe_input($other['data'][13]);
+    }
+
+    if (!empty($other['data'][14])) {
+        $values['periodically_day_from'] = io_safe_input($other['data'][14]);
+    }
+
+    if (!empty($other['data'][15])) {
+        $values['periodically_day_to'] = io_safe_input($other['data'][15]);
+    }
+
+    if (!empty($other['data'][16])) {
+        $values['type_downtime'] = io_safe_input($other['data'][16]);
+    }
+
+    if (!empty($other['data'][17])) {
+        $values['type_execution'] = io_safe_input($other['data'][17]);
+    }
+
+    if (!empty($other['data'][18])) {
+        $values['type_periodicity'] = io_safe_input($other['data'][18]);
+    }
+
+    $res = db_process_sql_update('tplanned_downtime', $values, ['id' => $id]);
+
+    if ($res === false) {
+        returnError('Planned downtime could not be updated');
+    } else {
+        returnData(
+            'string',
+            [
+                'type' => 'string',
+                'data' => __('Planned downtime updated'),
+            ]
+        );
+    }
+}
+
+
+/**
+ * Delete agents in planned Downtime.
+ * e.g.: pi.php?op=set&op2=planned_downtimes_delete_agents&apipass=1234&user=admin&pass=pandora&id=4&other=1;2;3&other_mode=url_encode_separator_|
+ *
+ * @param $id id of planned downtime.
+ * @param $thrash1 Don't use.
+ * @param array                     $other
+ * The first index contains a list of agent Ids.
+ * The list separator is the character ';'.
+ * @param $thrash3 Don't use.
+ */
+function api_set_planned_downtimes_delete_agents($id, $thrash1, $other, $thrash3)
+{
+    global $config;
+
+    if (defined('METACONSOLE')) {
+        return;
+    }
+
+    if (!check_acl($config['id_user'], 0, 'PM')) {
+        returnError('forbidden', 'string');
+        return;
+    }
+
+    if ($id == '') {
+        returnError(
+            'id cannot be left blank.'
+        );
+        return;
+    }
+
+    if (db_get_value('id', 'tplanned_downtime', 'id', $id) === false) {
+        returnError(
+            'id does not exist'
+        );
+        return;
+    }
+
+    if ($other['data'] == '') {
+        returnError(
+            'data cannot be left blank.'
+        );
+        return;
+    }
+
+    if (!empty($other['data'][0])) {
+        $agents = io_safe_input($other['data']);
+        $agents = explode(';', $agents);
+        $results = false;
+        foreach ($agents as $agent) {
+            if (db_get_value_sql(sprintf('SELECT id from tplanned_downtime_agents WHERE id_agent = %d AND id_downtime = %d', $agent, $id)) !== false) {
+                $result = db_process_sql_delete('tplanned_downtime_agents', ['id_agent' => $agent]);
+                db_process_sql_delete('tplanned_downtime_modules', ['id_agent' => $agent]);
+
+                if ($result == false) {
+                    returnError(" Agent $agent could not be deleted.");
+                } else {
+                    $results = true;
+                }
+            } else {
+                returnError(" Agent $agent is not in planned downtime.");
+            }
+        }
+
+        if ($results) {
+            returnData(
+                'string',
+                [
+                    'type' => 'string',
+                    'data' => __(' Agents deleted'),
+                ]
+            );
+        }
+    }
+}
+
+
+/**
+ * Add agents planned Downtime.
+ * e.g.: api.php?op=set&op2=planned_downtimes_add_agents&apipass=1234&user=admin&pass=pandora&id=4&other=1;2;3&other_mode=url_encode_separator_|
+ *
+ * @param $id id of planned downtime.
+ * @param $thrash1 Don't use.
+ * @param array                     $other
+ * The first index contains a list of agent Ids.
+ * The list separator is the character ';'.
+ * @param $thrash3 Don't use.
+ */
+function api_set_planned_downtimes_add_agents($id, $thrash1, $other, $thrash3)
+{
+    global $config;
+
+    if (defined('METACONSOLE')) {
+        return;
+    }
+
+    if (!check_acl($config['id_user'], 0, 'PM')) {
+        returnError('forbidden', 'string');
+        return;
+    }
+
+    if ($id == '') {
+        returnError(
+            'id cannot be left blank.'
+        );
+        return;
+    }
+
+    if (db_get_value('id', 'tplanned_downtime', 'id', $id) === false) {
+        returnError(
+            'id does not exist'
+        );
+        return;
+    }
+
+    if ($other['data'] == '') {
+        returnError(
+            'data cannot be left blank.'
+        );
+        return;
+    }
+
+    if (!empty($other['data'][0])) {
+        $agents = io_safe_input($other['data']);
+        $agents = explode(';', $agents);
+        $results = false;
+        foreach ($agents as $agent) {
+            if (db_get_value_sql(sprintf('SELECT id from tplanned_downtime_agents tpd WHERE tpd.id_agent = %d AND id_downtime = %d', $agent, $id)) === false) {
+                $res = db_process_sql_insert(
+                    'tplanned_downtime_agents',
+                    [
+                        'id_agent'          => $agent,
+                        'id_downtime'       => $id,
+                        'all_modules'       => 0,
+                        'manually_disabled' => 0,
+                    ]
+                );
+                if ($res) {
+                    $results = true;
+                }
+            } else {
+                returnError(" Agent $agent is already at the planned downtime.");
+            }
+        }
+
+        if ($results) {
+            returnData(
+                'string',
+                [
+                    'type' => 'string',
+                    'data' => __(' Agents added'),
+                ]
+            );
+        }
+    }
+}
+
+
 /**
  * Update data module in policy. And return id from new module.
  *

From a36718c72472f2b8d615e6e8efb7941e2a298da4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Gonz=C3=A1lez?= <jose.gonzalez@pandorafms.com>
Date: Tue, 25 May 2021 16:19:41 +0200
Subject: [PATCH 76/93] Improve code and fix issue with modal

---
 .../include/functions_update_manager.php      | 194 ++++++++++++------
 1 file changed, 128 insertions(+), 66 deletions(-)

diff --git a/pandora_console/include/functions_update_manager.php b/pandora_console/include/functions_update_manager.php
index 3c9d23f86c..0b9e755c1d 100755
--- a/pandora_console/include/functions_update_manager.php
+++ b/pandora_console/include/functions_update_manager.php
@@ -755,43 +755,47 @@ function newsletter_wiz_modal(
     );
 
     // Avoid to show default email.
-    if ($email == 'admin@example.com') {
+    if ($email === 'admin@example.com') {
         $email = '';
     }
 
-    $output .= '<div id="newsletter_wizard" title="';
-    $output .= __('Do you want to be up to date?');
-    $output .= '" class="invisible">';
-    $output .= '<div class="register_update_manager">';
-    $output .= html_print_image('images/pandora_circle_big.png', true);
-    $output .= '</div>';
-
-    $output .= '<div class="newsletter_div">';
-    $output .= __(
-        'Subscribe to our newsletter',
-        $product_name
-    );
-    $output .= '</div>';
-
-    $output .= '<div class="license_text both">';
-    $output .= '<p>Stay up to date with updates, upgrades and promotions by subscribing to our newsletter.</p>';
-    $output .= '<p>';
-    $output .= __(
-        'By subscribing to the newsletter, you accept that your email will be transferred to a database owned by %s. These data will be used only to provide you with information about %s and will not be given to third parties. You can unsubscribe from this database at any time from the newsletter subscription options.',
-        $product_name,
-        $product_name
+    $modalContent = html_print_div(
+        [
+            'class'   => 'register_update_manager',
+            'content' => html_print_image(
+                'images/pandora_circle_big.png',
+                true
+            ),
+        ],
+        true
     );
 
-    $output .= '</p>';
+    $modalContent .= html_print_div(
+        [
+            'class'   => 'newsletter_div',
+            'content' => __('Subscribe to our newsletter'),
+        ],
+        true
+    );
 
-    $output .= '</div>';
-    // Show regiter to newsletter state.
-    $show_newsletter = ($display_newsletter !== true) ? 'inline-block' : 'none';
+    $modalContent .= html_print_div(
+        [
+            'class'   => 'license_text both',
+            'content' => sprintf(
+                '<p>%s</p><p>%s</p>',
+                __('Stay up to date with updates, upgrades and promotions by subscribing to our newsletter.'),
+                __(
+                    'By subscribing to the newsletter, you accept that your email will be transferred to a database owned by %s. These data will be used only to provide you with information about %s and will not be given to third parties. You can unsubscribe from this database at any time from the newsletter subscription options.',
+                    $product_name,
+                    $product_name
+                )
+            ),
+        ],
+        true
+    );
 
-    $output .= '<div class="mrgn_lft_4em">';
-    $output .= '<div id="box_newsletter">';
-    $output .= '<span id="label-email-newsletter">'.__('Email').' </span>';
-    $output .= html_print_input_text_extended(
+    // Email Input case.
+    $emailInputCase = '<span id="label-email-newsletter">'.__('Email').' </span>'.html_print_input_text_extended(
         'email-newsletter',
         $email,
         'text-email-newsletter',
@@ -800,52 +804,110 @@ function newsletter_wiz_modal(
         255,
         false,
         '',
-        ['style' => 'display:'.$show_newsletter.'; width: 200px;'],
+        ['style' => 'display: inline-block; width: 200px;'],
         true
     );
-    $output .= '</div><br /><br />';
 
-    $output .= '<div class="submit_buttons_container">';
-    $output .= '<div class="left">';
-    $output .= html_print_submit_button(
-        __('Cancel'),
-        'cancel_newsletter',
-        false,
-        'class="ui-widget ui-state-default ui-corner-all ui-button-text-only sub upd submit-cancel w100px"',
+    // Generate the submit buttons.
+    // Cancel Button.
+    $submitButtons = html_print_div(
+        [
+            'class'   => 'left',
+            'content' => html_print_submit_button(
+                __('Cancel'),
+                'cancel_newsletter',
+                false,
+                'class="ui-widget ui-state-default ui-corner-all ui-button-text-only sub upd submit-cancel w100px"',
+                true
+            ),
+        ],
         true
     );
-    $output .= '</div>';
-    $output .= '<div class="right">';
-    $output .= html_print_submit_button(
-        __('OK!'),
-        'newsletter',
-        false,
-        'class="ui-widget ui-state-default ui-corner-all ui-button-text-only sub ok submit-next w100px"',
-        true
-    );
-    $output .= '</div>';
-    $output .= '</div>';
 
-    $output .= '<div id="both"></div>';
-    $output .= '<br/>';
-    $output .= '</div>';
-    $output .= '</div>';
+    // OK Button.
+    $submitButtons .= html_print_div(
+        [
+            'class'   => 'right',
+            'content' => html_print_submit_button(
+                __('OK!'),
+                'newsletter',
+                false,
+                'class="ui-widget ui-state-default ui-corner-all ui-button-text-only sub ok submit-next w100px"',
+                true
+            ),
+        ],
+        true
+    );
+
+    $submitButtonsCase = html_print_div(
+        [
+            'class'   => 'submit_buttons_container',
+            'content' => $submitButtons,
+        ],
+        true
+    );
+
+    $modalContent .= html_print_div(
+        [
+            'class'   => 'mrgn_lft_4em',
+            'content' => html_print_div(
+                [
+                    'id'      => 'box_newsletter',
+                    'content' => $emailInputCase.$submitButtonsCase.'<div id="both"></div><br />',
+                ],
+                true
+            ),
+        ],
+        true
+    );
+
+    $output .= html_print_div(
+        [
+            'id'      => 'newsletter_wizard',
+            'style'   => 'display: none;',
+            'title'   => __('Do you want to be up to date?'),
+            'content' => $modalContent,
+        ],
+        true
+    );
 
     // Verification modal.
-    $output .= '<div id="news_ensure_cancel" title="Confirmation Required" class="invisible">';
-    $output .= '<div class="font_12_20">';
-    $output .= __('Are you sure you don\'t want to subscribe?');
-    $output .= '<p>';
-    $output .= __('You will miss all news about amazing features and fixes!');
-    $output .= '</p>';
-    $output .= '</div>';
-    $output .= '</div>';
+    $verificationContent = html_print_div(
+        [
+            'class'   => 'font_12_20',
+            'content' => __('Are you sure you don\'t want to subscribe?').'<p>'.__('You will miss all news about amazing features and fixes!').'</p>',
+        ],
+        true
+    );
+
+    $output .= html_print_div(
+        [
+            'id'      => 'news_ensure_cancel',
+            'style'   => 'display: none;',
+            'title'   => 'Confirmation Required',
+            'content' => $verificationContent,
+        ],
+        true
+    );
 
     // Results modal.
-    $output .= '<div id="news_result" title="Subscription process result" class="invisible">';
-    $output .= '<div id="news_result_content" class="font_12_20">';
-    $output .= '</div>';
-    $output .= '</div>';
+    $resultsContent = html_print_div(
+        [
+            'id'    => 'news_result_content',
+            'class' => 'font_12_20',
+        ],
+        true
+    );
+
+    $output .= html_print_div(
+        [
+            'id'      => 'news_result',
+            'style'   => 'display: none;',
+            'title'   => 'Subscription process result',
+            'content' => $resultsContent,
+        ],
+        true
+    );
 
     ob_start();
     ?>

From eb54ce9a62eb7d8ba93b63d5ab92d1b66815fac1 Mon Sep 17 00:00:00 2001
From: Luis <luis.calvo@artica.es>
Date: Tue, 25 May 2021 15:53:41 +0000
Subject: [PATCH 77/93] Ent 7492 bug visual vista agents alerts no alerts

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

diff --git a/pandora_console/include/class/AgentsAlerts.class.php b/pandora_console/include/class/AgentsAlerts.class.php
index f566e3a4d9..3a6d35b519 100644
--- a/pandora_console/include/class/AgentsAlerts.class.php
+++ b/pandora_console/include/class/AgentsAlerts.class.php
@@ -488,7 +488,7 @@ class AgentsAlerts extends HTML
 
         $nagents = count(agents_get_agents($filter_count));
 
-        if ($agents == false) {
+        if ($agents === false || empty($agents_with_alerts) === true) {
             ui_print_info_message(
                 [
                     'no_close' => true,

From 22a9043378bc691511e981ca582c3be082c890b9 Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Wed, 26 May 2021 01:00:45 +0200
Subject: [PATCH 78/93] 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 1ad6b6641b..49d7fdf0be 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.754-210525
+Version: 7.0NG.754-210526
 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 093a808276..7a897f8e2e 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.754-210525"
+pandora_version="7.0NG.754-210526"
 
 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 66492e4f70..d0f0215b3c 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -1015,7 +1015,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.754';
-use constant AGENT_BUILD => '210525';
+use constant AGENT_BUILD => '210526';
 
 # 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 bab69faca4..a67bab24f6 100644
--- a/pandora_agents/unix/pandora_agent.redhat.spec
+++ b/pandora_agents/unix/pandora_agent.redhat.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     7.0NG.754
-%define release     210525
+%define release     210526
 
 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 6c968a7eff..a4517a8991 100644
--- a/pandora_agents/unix/pandora_agent.spec
+++ b/pandora_agents/unix/pandora_agent.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     7.0NG.754
-%define release     210525
+%define release     210526
 
 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 95c8e48240..ad558299f3 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.754"
-PI_BUILD="210525"
+PI_BUILD="210526"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index 756b2ebe26..aaef0fff6d 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{210525}
+{210526}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index dae380d06d..0feac30278 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.754 Build 210525")
+#define PANDORA_VERSION ("7.0NG.754 Build 210526")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index 4a1723f4a9..0ac1fb8558 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.754(Build 210525))"
+      VALUE "ProductVersion", "(7.0NG.754(Build 210526))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index dd03c46298..fd079bacc4 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.754-210525
+Version: 7.0NG.754-210526
 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 2ad5dbadee..4dcb761bf4 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.754-210525"
+pandora_version="7.0NG.754-210526"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index a39f00aea1..47819cd94d 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 = 'PC210525';
+$build_version = 'PC210526';
 $pandora_version = 'v7.0NG.754';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 477defe75f..55634ae415 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -129,7 +129,7 @@
         <div style='height: 10px'>
             <?php
             $version = '7.0NG.754';
-            $build = '210525';
+            $build = '210526';
             $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 391fb3a8d0..72b1ef0a28 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.754
-%define release     210525
+%define release     210526
 
 # 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 f7546bd7de..11a6deba1b 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.754
-%define release     210525
+%define release     210526
 
 # 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 4833ff92bb..39cc9c6b80 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.754
-%define release     210525
+%define release     210526
 %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 da1fd3cbd9..d1a1235f55 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.754-210525
+Version: 7.0NG.754-210526
 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 04c5a6dcfc..89156d46e9 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.754-210525"
+pandora_version="7.0NG.754-210526"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 215c9a9c8e..ecda040705 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@@ -45,7 +45,7 @@ our @EXPORT = qw(
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.754";
-my $pandora_build = "210525";
+my $pandora_build = "210526";
 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 c5a2af2e09..b0cb5d8cc6 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.754";
-my $pandora_build = "210525";
+my $pandora_build = "210526";
 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 a8ecef6ff8..5ee36c080f 100644
--- a/pandora_server/pandora_server.redhat.spec
+++ b/pandora_server/pandora_server.redhat.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     7.0NG.754
-%define release     210525
+%define release     210526
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 9f0ef65b3f..0bcc7953bd 100644
--- a/pandora_server/pandora_server.spec
+++ b/pandora_server/pandora_server.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     7.0NG.754
-%define release     210525
+%define release     210526
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 5792617ef8..d96930aac6 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.754"
-PI_BUILD="210525"
+PI_BUILD="210526"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 2a78ef6e4f..f83cb1ca8e 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.754 Build 210525";
+my $version = "7.0NG.754 Build 210526";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 28d7d61b70..65f2ff75ee 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.754 Build 210525";
+my $version = "7.0NG.754 Build 210526";
 
 # save program name for logging
 my $progname = basename($0);

From e7b59ab472d8d227dc968f7a2b9dbbb7a7d3333a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Gonz=C3=A1lez?= <jose.gonzalez@pandorafms.com>
Date: Wed, 26 May 2021 10:16:23 +0200
Subject: [PATCH 79/93] Added standarized headers

---
 .../godmode/reporting/graph_container.php     | 64 ++++++++++++++-----
 .../godmode/reporting/map_builder.php         |  2 +-
 .../operation/agentes/interface_view.php      | 51 +++++++++++----
 3 files changed, 88 insertions(+), 29 deletions(-)

diff --git a/pandora_console/godmode/reporting/graph_container.php b/pandora_console/godmode/reporting/graph_container.php
index 0c8e2a58a1..765e93ea60 100644
--- a/pandora_console/godmode/reporting/graph_container.php
+++ b/pandora_console/godmode/reporting/graph_container.php
@@ -1,19 +1,35 @@
 <?php
-// Pandora FMS - http://pandorafms.com
-// ==================================================
-// Copyright (c) 2005-2021 Artica Soluciones Tecnologicas
-// Please see http://pandorafms.org for full contribution list
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation for version 2.
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// Load global variables
+/**
+ * Custom graph containers
+ *
+ * @category   Reporting
+ * @package    Pandora FMS
+ * @subpackage Community
+ * @version    1.0.0
+ * @license    See below
+ *
+ *    ______                 ___                    _______ _______ ________
+ *   |   __ \.-----.--.--.--|  |.-----.----.-----. |    ___|   |   |     __|
+ *  |    __/|  _  |     |  _  ||  _  |   _|  _  | |    ___|       |__     |
+ * |___|   |___._|__|__|_____||_____|__| |___._| |___|   |__|_|__|_______|
+ *
+ * ============================================================================
+ * Copyright (c) 2007-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.
+ * ============================================================================
+ */
+
+// Begin.
 global $config;
 
-// Check user credentials
+// Check user credentials.
 check_login();
 
 if (! check_acl($config['id_user'], 0, 'RR') || enterprise_installed() === false) {
@@ -87,8 +103,26 @@ $buttons['graph_container'] = [
         ]
     ).'</a>',
 ];
-// Header
-ui_print_page_header(__('Graph container'), '', false, '', false, $buttons);
+
+// Header.
+ui_print_standard_header(
+    __('Graph container'),
+    '',
+    false,
+    '',
+    false,
+    $buttons,
+    [
+        [
+            'link'  => '',
+            'label' => __('Reporting'),
+        ],
+        [
+            'link'  => '',
+            'label' => __('Custom graphs'),
+        ],
+    ]
+);
 
 $container = folder_get_folders();
 
diff --git a/pandora_console/godmode/reporting/map_builder.php b/pandora_console/godmode/reporting/map_builder.php
index 192c6be218..b0a8803336 100644
--- a/pandora_console/godmode/reporting/map_builder.php
+++ b/pandora_console/godmode/reporting/map_builder.php
@@ -118,7 +118,7 @@ if ($is_enterprise !== ENTERPRISE_NOT_HOOK && $vconsoles_manage) {
 
 if ($is_metaconsole === false) {
     ui_print_standard_header(
-        __('Visual Favourite List'),
+        __('Visual Console List'),
         'images/op_reporting.png',
         false,
         '',
diff --git a/pandora_console/operation/agentes/interface_view.php b/pandora_console/operation/agentes/interface_view.php
index a24788edd0..4f20c459f3 100644
--- a/pandora_console/operation/agentes/interface_view.php
+++ b/pandora_console/operation/agentes/interface_view.php
@@ -1,18 +1,32 @@
 <?php
 /**
- *  Pandora FMS - http://pandorafms.com
- *  ==================================================
- *  Copyright (c) 2005-2021 Artica Soluciones Tecnologicas
- *  Please see http://pandorafms.org for full contribution list
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU General Public License
- *  as published by the Free Software Foundation; 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.
+ * Interfaces view.
+ *
+ * @category   Monitoring
+ * @package    Pandora FMS
+ * @subpackage Community
+ * @version    1.0.0
+ * @license    See below
+ *
+ *    ______                 ___                    _______ _______ ________
+ *   |   __ \.-----.--.--.--|  |.-----.----.-----. |    ___|   |   |     __|
+ *  |    __/|  _  |     |  _  ||  _  |   _|  _  | |    ___|       |__     |
+ * |___|   |___._|__|__|_____||_____|__| |___._| |___|   |__|_|__|_______|
+ *
+ * ============================================================================
+ * Copyright (c) 2007-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.
+ * ============================================================================
  */
 
+// Begin.
 global $config;
 
 check_login();
@@ -45,12 +59,23 @@ $sec = (string) get_parameter('sec', 'view');
 $agent_id = (int) get_parameter('id_agente', 0);
 
 if ($sec === 'view') {
-    ui_print_page_header(
+    ui_print_standard_header(
         __('Interface view').$subpage,
         '',
         false,
         '',
-        true
+        true,
+        [],
+        [
+            [
+                'link'  => '',
+                'label' => __('Monitoring'),
+            ],
+            [
+                'link'  => '',
+                'label' => __('Views'),
+            ],
+        ]
     );
 }
 

From 8c100e880947c8ce9ab057d3b209092ee396211e Mon Sep 17 00:00:00 2001
From: Luis <luis.calvo@artica.es>
Date: Wed, 26 May 2021 13:39:25 +0000
Subject: [PATCH 80/93] Resize vertical on textarea web/data server modules css

---
 .../godmode/agentes/module_manager_editor_web.php            | 3 ++-
 pandora_console/include/styles/pandora.css                   | 5 +++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/pandora_console/godmode/agentes/module_manager_editor_web.php b/pandora_console/godmode/agentes/module_manager_editor_web.php
index 3d02289160..b12fb5f1cc 100644
--- a/pandora_console/godmode/agentes/module_manager_editor_web.php
+++ b/pandora_console/godmode/agentes/module_manager_editor_web.php
@@ -108,7 +108,8 @@ if ((bool) $adopt === false) {
         65,
         $plugin_parameter,
         $disabledTextBecauseInPolicy,
-        true
+        true,
+        'resizev'
     );
 } else {
     $data[1] = html_print_textarea(
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index 7a3232f27b..f924330bfd 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -2163,6 +2163,11 @@ div.loading {
 div.loading img {
   float: right;
 }
+
+textarea.resizev {
+  resize: vertical;
+}
+
 /* Tablesorter jQuery pager */
 div.pager {
   margin-left: 10px;

From 50242d3030eb120684e4667091ab86ff37a76ec7 Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Wed, 26 May 2021 17:55:30 +0200
Subject: [PATCH 81/93] OID fixes while retrieving from remote Satellite server

---
 pandora_console/include/class/AgentWizard.class.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pandora_console/include/class/AgentWizard.class.php b/pandora_console/include/class/AgentWizard.class.php
index d42538187a..bcc7719c23 100644
--- a/pandora_console/include/class/AgentWizard.class.php
+++ b/pandora_console/include/class/AgentWizard.class.php
@@ -1951,6 +1951,10 @@ class AgentWizard extends HTML
                     || $candidate['execution_type'] === EXECUTION_TYPE_NETWORK
                 ) {
                     if ($this->serverType === SERVER_TYPE_ENTERPRISE_SATELLITE) {
+                        if (substr($candidate['value'], 0, 1) !== '.') {
+                            $candidate['value'] = '.'.$candidate['value'];
+                        }
+
                         $tmp->module_interval(300);
                         $tmp->id_modulo(MODULE_DATA);
                         $tmp->updateConfigurationData(

From 9103f671e24e1feb7d4a2dd7fc8377a61902427b Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Thu, 27 May 2021 01:00:43 +0200
Subject: [PATCH 82/93] 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 49d7fdf0be..68fed537b4 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.754-210526
+Version: 7.0NG.754-210527
 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 7a897f8e2e..1a3b93590f 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.754-210526"
+pandora_version="7.0NG.754-210527"
 
 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 d0f0215b3c..2dc59f129b 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -1015,7 +1015,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.754';
-use constant AGENT_BUILD => '210526';
+use constant AGENT_BUILD => '210527';
 
 # 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 a67bab24f6..3b3ea1d6ec 100644
--- a/pandora_agents/unix/pandora_agent.redhat.spec
+++ b/pandora_agents/unix/pandora_agent.redhat.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     7.0NG.754
-%define release     210526
+%define release     210527
 
 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 a4517a8991..b940c8b585 100644
--- a/pandora_agents/unix/pandora_agent.spec
+++ b/pandora_agents/unix/pandora_agent.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     7.0NG.754
-%define release     210526
+%define release     210527
 
 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 ad558299f3..c761574ac4 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.754"
-PI_BUILD="210526"
+PI_BUILD="210527"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index aaef0fff6d..0d7d94ede5 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{210526}
+{210527}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 0feac30278..014db5cebb 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.754 Build 210526")
+#define PANDORA_VERSION ("7.0NG.754 Build 210527")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index 0ac1fb8558..69bafa9a00 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.754(Build 210526))"
+      VALUE "ProductVersion", "(7.0NG.754(Build 210527))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index fd079bacc4..e96ee4632a 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.754-210526
+Version: 7.0NG.754-210527
 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 4dcb761bf4..352fe3bf0c 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.754-210526"
+pandora_version="7.0NG.754-210527"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 47819cd94d..430ca593b6 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 = 'PC210526';
+$build_version = 'PC210527';
 $pandora_version = 'v7.0NG.754';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 55634ae415..ad0f399c50 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -129,7 +129,7 @@
         <div style='height: 10px'>
             <?php
             $version = '7.0NG.754';
-            $build = '210526';
+            $build = '210527';
             $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 72b1ef0a28..ae26406065 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.754
-%define release     210526
+%define release     210527
 
 # 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 11a6deba1b..7b344e9745 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.754
-%define release     210526
+%define release     210527
 
 # 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 39cc9c6b80..8f9f40c163 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.754
-%define release     210526
+%define release     210527
 %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 d1a1235f55..dcd18d1004 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.754-210526
+Version: 7.0NG.754-210527
 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 89156d46e9..861dcea8df 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.754-210526"
+pandora_version="7.0NG.754-210527"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index ecda040705..a270cb9d34 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@@ -45,7 +45,7 @@ our @EXPORT = qw(
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.754";
-my $pandora_build = "210526";
+my $pandora_build = "210527";
 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 b0cb5d8cc6..e54ad48fe6 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.754";
-my $pandora_build = "210526";
+my $pandora_build = "210527";
 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 5ee36c080f..a72bdc6256 100644
--- a/pandora_server/pandora_server.redhat.spec
+++ b/pandora_server/pandora_server.redhat.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     7.0NG.754
-%define release     210526
+%define release     210527
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 0bcc7953bd..12c3a8577b 100644
--- a/pandora_server/pandora_server.spec
+++ b/pandora_server/pandora_server.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     7.0NG.754
-%define release     210526
+%define release     210527
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index d96930aac6..3ac49eb4ad 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.754"
-PI_BUILD="210526"
+PI_BUILD="210527"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index f83cb1ca8e..a8a231fbb3 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.754 Build 210526";
+my $version = "7.0NG.754 Build 210527";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 65f2ff75ee..f5ac53a2d9 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.754 Build 210526";
+my $version = "7.0NG.754 Build 210527";
 
 # save program name for logging
 my $progname = basename($0);

From bda83046c9abfdc682d060e4b2d3cdc8021aaffd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81rtica?= <sergio.gomez@artica.es>
Date: Thu, 27 May 2021 13:19:28 +0200
Subject: [PATCH 83/93] API errors fixed, some typos fixed

---
 .../.vscode/settings.json                     |  3 ---
 .../discord/pandora_discord_cli.py            | 20 +++++++-------
 .../gchat/pandora-gchat-cli.py                |  4 +--
 .../slack/pandora-slack-cli.py                | 26 +++++++++----------
 4 files changed, 25 insertions(+), 28 deletions(-)
 delete mode 100644 pandora_plugins/message_app_connectors/.vscode/settings.json

diff --git a/pandora_plugins/message_app_connectors/.vscode/settings.json b/pandora_plugins/message_app_connectors/.vscode/settings.json
deleted file mode 100644
index cf160325ad..0000000000
--- a/pandora_plugins/message_app_connectors/.vscode/settings.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "python.pythonPath": "slack/venv/bin/python"
-}
diff --git a/pandora_plugins/message_app_connectors/discord/pandora_discord_cli.py b/pandora_plugins/message_app_connectors/discord/pandora_discord_cli.py
index 5a278a0e6b..522f5fb75e 100644
--- a/pandora_plugins/message_app_connectors/discord/pandora_discord_cli.py
+++ b/pandora_plugins/message_app_connectors/discord/pandora_discord_cli.py
@@ -21,7 +21,7 @@ parser.add_argument('--author_icon_url', help='Alert custom author icon url ', d
 parser.add_argument('--thumb', help='Custom thumbnail url', default='')
 parser.add_argument('--api_conf', help='Api configuration parameters in coma separate keypairs. EX "user=admin,pass=pandora,api_pass=1234,api_url=http://test.artica.es/pandora_console/include/api.php"')
 parser.add_argument('--module_graph', help='Uses pandora API to generate a module graph and attach it to the alert needs module_id and interval parameters in coma separate keypairs. EX "module_id=55,interval=3600"')
-parser.add_argument('--tmp_dir', help='Temporary path to store grph images', default='/tmp')
+parser.add_argument('--tmp_dir', help='Temporary path to store graph images', default='/tmp')
 
 
 args = parser.parse_args()
@@ -50,15 +50,15 @@ def parse_api_conf(cConf):
         apid = parse_dic(cConf)
         
         if apid.get("user") is None:
-            print ("Error no user defined in api_conf keypairs, skiping graph generation.")
+            print ("Error no user defined in api_conf keypairs, skipping graph generation.")
             return
         
         if apid.get("pass") is None:
-            print ("Error no password defined in api_conf keypairs, skiping graph generation.")
+            print ("Error no password defined in api_conf keypairs, skipping graph generation.")
             return
 
         if apid.get("api_pass") is None:
-            print ("Error no Api pass defined in api_conf keypairs, skiping graph generation.")
+            print ("Error no Api pass defined in api_conf keypairs, skipping graph generation.")
             return
 
         if apid.get("api_url") is None:
@@ -78,7 +78,7 @@ def parse_graph_conf(cGraph):
     # Parse Api config
         graphd = parse_dic(cGraph)
         if graphd.get("module_id") is None:
-            print ("error no module_id defined in module_graph keypairs, skiping graph generation.")
+            print ("error no module_id defined in module_graph keypairs, skipping graph generation.")
             return
         
         if graphd.get("interval") is None:
@@ -91,19 +91,19 @@ def parse_graph_conf(cGraph):
 def get_graph_by_moduleid (baseUrl,pUser, pPass, apiPass, moduleId, graphInterval) : 
     sep="url_encode_separator_%7C"
     try:
-        url = f"{baseUrl}?op=get&op2=module_graph&id={moduleId}&other={graphInterval}%7C1&other_mode={sep}C&apipass={apiPass}&api=1&user={pUser}&pass={pPass}"
+        url = f"{baseUrl}?op=get&op2=module_graph&id={moduleId}&other={graphInterval}%7C1&other_mode={sep}&apipass={apiPass}&api=1&user={pUser}&pass={pPass}"
         graph = requests.get(url)
         if graph.status_code != 200:
-            print (f"Error requested api url, status code: {graph.status_code}. Skiping graph generation")
+            print (f"Error requested api url, status code: {graph.status_code}. skipping graph generation")
             return None
         if graph.text == "auth error":
-            print (f"Error requested Pandora api url, status code: {graph.text}. Skiping graph generation")
+            print (f"Error requested Pandora api url, status code: {graph.text}. skipping graph generation")
             return None
         if graph.text == "Id does not exist in database.":
-            print (f"Error requested Pandora api url, status code: {graph.text}. Skiping graph generation")
+            print (f"Error requested Pandora api url, status code: {graph.text}. skipping graph generation")
             return None
     except:
-        print("Error requested api url. Skiping graph generation")
+        print("Error requested api url. skipping graph generation")
         return None
 
     return graph
diff --git a/pandora_plugins/message_app_connectors/gchat/pandora-gchat-cli.py b/pandora_plugins/message_app_connectors/gchat/pandora-gchat-cli.py
index 5e2a47b3f8..4584768ec7 100644
--- a/pandora_plugins/message_app_connectors/gchat/pandora-gchat-cli.py
+++ b/pandora_plugins/message_app_connectors/gchat/pandora-gchat-cli.py
@@ -88,9 +88,9 @@ def sendMessage(url, message):
         header = {'Content-Type': 'application/json; charset: UTF-8'}
         response = requests.post(url, headers=header, data=message)
 
-        print(f"Mesage sent succefuly: {response.status_code}")
+        print(f"Message sent successfully: {response.status_code}")
     except:
-        print("Error requested api url. Skiping graph generation")
+        print("Error requested api url. skipping graph generation")
         return None
     return response
 
diff --git a/pandora_plugins/message_app_connectors/slack/pandora-slack-cli.py b/pandora_plugins/message_app_connectors/slack/pandora-slack-cli.py
index 31cfa97811..b09938b885 100644
--- a/pandora_plugins/message_app_connectors/slack/pandora-slack-cli.py
+++ b/pandora_plugins/message_app_connectors/slack/pandora-slack-cli.py
@@ -21,7 +21,7 @@ parser.add_argument('-D', '--desc', help='Slack description message', default=''
 parser.add_argument('-F','--footer', help='Custom footer, default: PandoraFMS', default='PandoraFMS')
 parser.add_argument('--api_conf', help='Api configuration parameters in coma separate keypairs. EX "user=admin,pass=pandora,api_pass=1234,api_url=http://test.artica.es/pandora_console/include/api.php"')
 parser.add_argument('--module_graph', help='Uses pandora API to generate a module graph and attach it to the alert needs module_id and interval parameters in coma separate keypairs. EX "module_id=55,interval=3600"')
-parser.add_argument('--tmp_dir', help='Temporary path to store grph images', default='/tmp')
+parser.add_argument('--tmp_dir', help='Temporary path to store graph images', default='/tmp')
 
 args = parser.parse_args()
 filename = None
@@ -49,22 +49,22 @@ def compose_message (values, tittle, emoji, message, footer):
     return m
 
 def parse_api_conf(cConf):
-    """Check apiconfiguration parameters """
+    """Check api configuration parameters """
     if args.api_conf :
     # Parse Api config
         print ("Api config enable")
         apid = parse_dic(cConf)
         
         if apid.get("user") is None:
-            print ("Warning. no user defined in api_conf keypairs, skiping graph generation.")
+            print ("Warning. no user defined in api_conf keypairs, skipping graph generation.")
             return None
         
         if apid.get("pass") is None:
-            print ("Warning. no password defined in api_conf keypairs, skiping graph generation.")
+            print ("Warning. no password defined in api_conf keypairs, skipping graph generation.")
             return None
 
         if apid.get("api_pass") is None:
-            print ("Warning. no api pass defined in api_conf keypairs, skiping graph generation.")
+            print ("Warning. no api pass defined in api_conf keypairs, skipping graph generation.")
             return None
 
         if apid.get("api_url") is None:
@@ -81,7 +81,7 @@ def parse_graph_conf(cGraph):
     # Parse Api config
         graphd = parse_dic(cGraph)
         if graphd.get("module_id") is None:
-            print ("Warning. no module_id defined in module_graph keypairs, skiping graph generation.")
+            print ("Warning. no module_id defined in module_graph keypairs, skipping graph generation.")
             return
         
         if graphd.get("interval") is None:
@@ -89,26 +89,26 @@ def parse_graph_conf(cGraph):
         
         return graphd
     else:
-        print("Warning. no module_graph keypairs defined, skiping graph generation")
+        print("Warning. no module_graph keypairs defined, skipping graph generation")
         return None
 
 def get_graph_by_moduleid (baseUrl,pUser, pPass, apiPass, moduleId, graphInterval, sep="url_encode_separator_%7C") : 
     """Call Pandorafms api to get graph"""
     try:
-        url = f"{baseUrl}?op=get&op2=module_graph&id={moduleId}&other={graphInterval}%7C1&other_mode={sep}C&apipass={apiPass}&api=1&user={pUser}&pass={pPass}"
+        url = f"{baseUrl}?op=get&op2=module_graph&id={moduleId}&other={graphInterval}%7C1&other_mode={sep}&apipass={apiPass}&api=1&user={pUser}&pass={pPass}"
         graph = requests.get(url)
         if graph.status_code != 200:
-            print (f"Error requested api url, status code: {graph.status_code}. Skiping graph generation")
+            print (f"Error requested api url, status code: {graph.status_code}. skipping graph generation")
             return None
         if graph.text == "auth error":
-            print (f"Error requested Pandora api url, status code: {graph.text}. Skiping graph generation")
+            print (f"Error requested Pandora api url, status code: {graph.text}. skipping graph generation")
             return None
         if graph.text == "Id does not exist in database.":
-            print (f"Error requested Pandora api url, status code: {graph.text}. Skiping graph generation")
+            print (f"Error requested Pandora api url, status code: {graph.text}. skipping graph generation")
             return None
         
     except:
-        print("Error requested api url. Skiping graph generation")
+        print("Error requested api url. skipping graph generation")
         return None
     return graph
 
@@ -166,7 +166,7 @@ if args.api_conf :
             else: filename = None
                 
 # Send message
-send_message(messageString, args.channel, client, "> Mesage sent succefuly")            
+send_message(messageString, args.channel, client, "> Message sent successfully")            
 if filename is not None:
     if os.path.isfile(filename): send_image(filename, args.channel, client)
 if args.footer: send_message(args.footer, args.channel, client)

From 94cd3960724433323be5006d97473eca2c23503b Mon Sep 17 00:00:00 2001
From: marcos <marcos.alconada@artica.es>
Date: Thu, 27 May 2021 15:49:20 +0200
Subject: [PATCH 84/93] changed button position

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

diff --git a/pandora_console/index.php b/pandora_console/index.php
index 462d08d2f9..b42fb3e1fb 100755
--- a/pandora_console/index.php
+++ b/pandora_console/index.php
@@ -1277,6 +1277,7 @@ if ($config['pure'] == 0) {
     // Container div.
     echo '</div>';
     echo '<div id="both"></div>';
+    echo '</div>';
 
     echo '<div id="foot">';
     include 'general/footer.php';

From 87dd11f99c5e24ff70117d58a527b765ae96413a Mon Sep 17 00:00:00 2001
From: Marcos Alconada <marcos.alconada@artica.es>
Date: Thu, 27 May 2021 16:17:47 +0000
Subject: [PATCH 85/93] fixed visual error with update manager online open

---
 pandora_console/general/alert_enterprise.php | 6 +++---
 pandora_console/include/styles/pandora.css   | 5 +++++
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/pandora_console/general/alert_enterprise.php b/pandora_console/general/alert_enterprise.php
index 8946b5e1f8..90a1bc5d4d 100644
--- a/pandora_console/general/alert_enterprise.php
+++ b/pandora_console/general/alert_enterprise.php
@@ -192,15 +192,15 @@ if (check_login()) {
     echo "
 
 </div>
-<div class='right height_30px'>
-</div>
+<div class='btn_update_online_open height_30px'>
+
 <div class='modalokbutton cerrar'>
 <span class='modalokbuttontext'>OK</span>
 </div>";
     if ($open) {
         echo "<div class='modalgobutton gopandora'>
 <span class='modalgobuttontext'>About Enterprise</span>
-</div>";
+</div></div>";
     }
 }
 
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index 7a3232f27b..8a66253ccd 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -8506,3 +8506,8 @@ div.stat-win-spinner img {
   width: 100px !important;
   margin-left: 20px;
 }
+
+.btn_update_online_open {
+  float: right;
+  margin-bottom: 20px;
+}

From 6681d9fd6755906307c007062f80c6f8b9b1b664 Mon Sep 17 00:00:00 2001
From: Luis <luis.calvo@artica.es>
Date: Thu, 27 May 2021 16:21:17 +0000
Subject: [PATCH 86/93] Integria tickets table visual fix

---
 .../operation/incidents/list_integriaims_incidents.php          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pandora_console/operation/incidents/list_integriaims_incidents.php b/pandora_console/operation/incidents/list_integriaims_incidents.php
index eadf892b04..7d597a980e 100644
--- a/pandora_console/operation/incidents/list_integriaims_incidents.php
+++ b/pandora_console/operation/incidents/list_integriaims_incidents.php
@@ -275,7 +275,7 @@ foreach ($incidents_paginated as $key => $value) {
 
     $table->data[$i][0] = '#'.$array_get_incidents[$key][0];
     $table->data[$i][1] = '<a href="'.ui_get_full_url('index.php?sec=incident&sec2=operation/incidents/dashboard_detail_integriaims_incident&incident_id='.$array_get_incidents[$key][0]).'">';
-    $table->data[$i][1] .= $array_get_incidents[$key][3];
+    $table->data[$i][1] .= ui_print_truncate_text($array_get_incidents[$key][3], 160, false);
     $table->data[$i][1] .= '</a>';
     $table->data[$i][2] = $group_incident[$array_get_incidents[$key][8]];
     $table->data[$i][3] = $status_incident[$array_get_incidents[$key][6]].' / '.$resolution_incident[$array_get_incidents[$key][12]];

From e2cfc5d615d128203fbe10c4feb76b323e9076af Mon Sep 17 00:00:00 2001
From: Marcos Alconada <marcos.alconada@artica.es>
Date: Thu, 27 May 2021 16:22:19 +0000
Subject: [PATCH 87/93] fixed visual error on alerts black theme

---
 .../godmode/snmpconsole/snmp_alert.php        | 40 +++++++++++++++++--
 .../include/styles/pandora_black.css          |  8 ++++
 2 files changed, 45 insertions(+), 3 deletions(-)

diff --git a/pandora_console/godmode/snmpconsole/snmp_alert.php b/pandora_console/godmode/snmpconsole/snmp_alert.php
index f806096ea9..0dc5f20a8e 100755
--- a/pandora_console/godmode/snmpconsole/snmp_alert.php
+++ b/pandora_console/godmode/snmpconsole/snmp_alert.php
@@ -1257,7 +1257,14 @@ if ($create_alert || $update_alert) {
             foreach ($other_actions as $action) {
                 $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', true, ['border' => '0', 'alt' => __('Delete')]).'</a> </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',
+                    true,
+                    [
+                        'border' => '0',
+                        'alt'    => __('Delete'),
+                    ]
+                ).'</a> </td>';
                 $data[1] .= '</tr>';
             }
         }
@@ -1278,7 +1285,34 @@ if ($create_alert || $update_alert) {
         }
 
         if (check_acl_restricted_all($config['id_user'], $row['id_group'], 'LW')) {
-                $data[8] = '<a href="index.php?'.'sec=snmpconsole&'.'sec2=godmode/snmpconsole/snmp_alert&'.'duplicate_alert=1&'.'id_alert_snmp='.$row['id_as'].'">'.html_print_image('images/copy.png', true, ['alt' => __('Duplicate'), 'title' => __('Duplicate'), 'class' => 'invert_filter']).'</a>'.'<a href="index.php?'.'sec=snmpconsole&'.'sec2=godmode/snmpconsole/snmp_alert&'.'update_alert=1&'.'id_alert_snmp='.$row['id_as'].'">'.html_print_image('images/config.png', true, ['border' => '0', 'alt' => __('Update'), 'class' => 'invert_filter']).'</a>'.'<a href="javascript:show_add_action_snmp(\''.$row['id_as'].'\');">'.html_print_image('images/add.png', true, ['title' => __('Add action'), 'class' => 'invert_filter']).'</a>'.'<a href="index.php?sec=snmpconsole&sec2=godmode/snmpconsole/snmp_alert&delete_alert='.$row['id_as'].'" onClick="javascript:return confirm(\''.__('Are you sure?').'\')">'.html_print_image('images/cross.png', true, ['border' => '0', 'class' => 'invert_filter', 'alt' => __('Delete')]).'</a>';
+                $data[8] = '<a href="index.php?'.'sec=snmpconsole&'.'sec2=godmode/snmpconsole/snmp_alert&'.'duplicate_alert=1&'.'id_alert_snmp='.$row['id_as'].'">'.html_print_image(
+                    'images/copy.png',
+                    true,
+                    [
+                        'alt'   => __('Duplicate'),
+                        'title' => __('Duplicate'),
+                    ]
+                ).'</a>'.'<a href="index.php?'.'sec=snmpconsole&'.'sec2=godmode/snmpconsole/snmp_alert&'.'update_alert=1&'.'id_alert_snmp='.$row['id_as'].'">'.html_print_image(
+                    'images/config.png',
+                    true,
+                    [
+                        'border' => '0',
+                        'alt'    => __('Update'),
+                    ]
+                ).'</a>'.'<a href="javascript:show_add_action_snmp(\''.$row['id_as'].'\');">'.html_print_image(
+                    'images/add.png',
+                    true,
+                    [
+                        'title' => __('Add action'),
+                    ]
+                ).'</a>'.'<a href="index.php?sec=snmpconsole&sec2=godmode/snmpconsole/snmp_alert&delete_alert='.$row['id_as'].'" onClick="javascript:return confirm(\''.__('Are you sure?').'\')">'.html_print_image(
+                    'images/cross.png',
+                    true,
+                    [
+                        'border' => '0',
+                        'alt'    => __('Delete'),
+                    ]
+                ).'</a>';
 
 
                 $data[9] = html_print_checkbox_extended(
@@ -1409,7 +1443,7 @@ if ($create_alert || $update_alert) {
 
                     echo '<div class="right mrgn_lft_10px;">';
                     html_print_input_hidden('multiple_delete', 1);
-                    html_print_submit_button(__('Delete selected'), 'delete_button', false, 'class="sub delete"');
+                    html_print_submit_button(__('Delete selected'), 'delete_button', false, 'class="sub delete mrgn_btn_10px"');
                     echo '</div>';
                     echo '</form>';
                 }
diff --git a/pandora_console/include/styles/pandora_black.css b/pandora_console/include/styles/pandora_black.css
index f5e971c065..09393879ba 100644
--- a/pandora_console/include/styles/pandora_black.css
+++ b/pandora_console/include/styles/pandora_black.css
@@ -1019,3 +1019,11 @@ li.ui-tabs-tab.ui-corner-top.ui-state-default.ui-tab {
   margin: 20px auto;
   border-radius: 3px;
 }
+
+table.alternate tr:nth-child(2n + 1) td {
+  background-color: #222;
+}
+
+table.alternate tr:nth-child(2n) td {
+  background-color: #111;
+}

From cb6f130ab0f4cec05e508b82e420721cbfd444ed Mon Sep 17 00:00:00 2001
From: Luis <luis.calvo@artica.es>
Date: Thu, 27 May 2021 16:22:47 +0000
Subject: [PATCH 88/93] Fixed not showing agents with not init modules on os
 treeview

---
 pandora_console/include/class/Tree.class.php  | 28 +++++++++++--------
 .../include/class/TreeModuleGroup.class.php   |  2 ++
 .../include/class/TreeTag.class.php           |  2 ++
 3 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/pandora_console/include/class/Tree.class.php b/pandora_console/include/class/Tree.class.php
index dc0dca6df4..6050bffa2e 100644
--- a/pandora_console/include/class/Tree.class.php
+++ b/pandora_console/include/class/Tree.class.php
@@ -279,8 +279,10 @@ class Tree
 
     protected function getTagJoin()
     {
-        return 'INNER JOIN ttag_module ttm
-			ON tam.id_agente_modulo = ttm.id_agente_modulo';
+        return 'INNER JOIN tagente_modulo tam 
+                    ON ta.id_agente = tam.id_agente
+                INNER JOIN ttag_module ttm
+			        ON tam.id_agente_modulo = ttm.id_agente_modulo';
     }
 
 
@@ -931,11 +933,16 @@ class Tree
         $agent_status_filter = $this->getAgentStatusFilter();
         $module_search_filter = $this->getModuleSearchFilter();
         $module_status_inner = '';
-        $module_status_filter = $this->getModuleStatusFilterFromTestado();
-        if (!empty($module_status_filter)) {
-            $module_status_inner = '
-				INNER JOIN tagente_estado tae
-					ON tae.id_agente_modulo = tam.id_agente_modulo';
+        $module_search_inner = '';
+        $module_search_filter = '';
+        if (!empty($this->filter['searchModule'])) {
+            $module_search_inner = '
+                INNER JOIN tagente_modulo tam
+                    ON ta.id_agente = tam.id_agente
+                INNER JOIN tagente_estado tae
+                    ON tae.id_agente_modulo = tam.id_agente_modulo';
+            $module_search_filter = "AND tam.disabled = 0
+                AND tam.nombre LIKE '%%".$this->filter['searchModule']."%%' ".$this->getModuleStatusFilterFromTestado();
         }
 
         $sql_model = "SELECT %s FROM
@@ -944,13 +951,11 @@ class Tree
 					FROM tagente ta
 					LEFT JOIN tagent_secondary_group tasg
 						ON ta.id_agente = tasg.id_agent
-					INNER JOIN tagente_modulo tam
-						ON ta.id_agente = tam.id_agente
 					$inner_inside
 					$module_status_inner
 					$group_inner
+                    $module_search_inner
 					WHERE ta.disabled = 0
-						AND tam.disabled = 0
 						%s
 						$agent_search_filter
 						$agent_status_filter
@@ -973,6 +978,7 @@ class Tree
 			$inner
 			GROUP BY g
 			ORDER BY $order_by_final";
+            hd($sql, true);
         return $sql;
     }
 
@@ -1020,7 +1026,7 @@ class Tree
         $agent_search_filter = $this->getAgentSearchFilter();
         $agent_status_filter = $this->getAgentStatusFilter();
         $module_search_filter = $this->getModuleSearchFilter();
-        $module_status_filter = $this->getModuleStatusFilterFromTestado($this->filter['statusModule']);
+        $module_status_filter = $this->getModuleStatusFilter();
 
         $condition = $this->L2condition;
         $condition_inside = $this->L2conditionInside;
diff --git a/pandora_console/include/class/TreeModuleGroup.class.php b/pandora_console/include/class/TreeModuleGroup.class.php
index b5cec41370..9b8d39fd6f 100644
--- a/pandora_console/include/class/TreeModuleGroup.class.php
+++ b/pandora_console/include/class/TreeModuleGroup.class.php
@@ -31,6 +31,8 @@ class TreeModuleGroup extends Tree
             'tmg.id_mg AS id',
         ];
         $this->L1inner = 'INNER JOIN tmodule_group tmg ON tmg.id_mg = x2.g';
+        $this->L1innerInside = 'INNER JOIN tagente_modulo tam 
+                                    ON ta.id_agente = tam.id_agente';
         $this->L1orderByFinal = 'tmg.name';
 
         $this->L2condition = 'AND tam.id_module_group = '.$this->rootID;
diff --git a/pandora_console/include/class/TreeTag.class.php b/pandora_console/include/class/TreeTag.class.php
index 280d34fa2b..87d05a644b 100644
--- a/pandora_console/include/class/TreeTag.class.php
+++ b/pandora_console/include/class/TreeTag.class.php
@@ -27,6 +27,8 @@ class TreeTag extends Tree
         $this->L1fieldName = 'id_tag';
         $this->L1fieldNameSql = 'ttm.id_tag';
         $this->L1innerInside = '
+            INNER JOIN tagente_modulo tam 
+                ON ta.id_agente = tam.id_agente
 			INNER JOIN ttag_module ttm
 				ON ttm.id_agente_modulo = tam.id_agente_modulo
 		';

From db306a30b953e6e5ce2ca9de0e4066c072853ea0 Mon Sep 17 00:00:00 2001
From: Luis <luis.calvo@artica.es>
Date: Thu, 27 May 2021 16:23:20 +0000
Subject: [PATCH 89/93] Fixed report exception item with not ok on meta

---
 pandora_console/godmode/reporting/reporting_builder.php | 2 +-
 pandora_console/include/functions_reporting.php         | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/pandora_console/godmode/reporting/reporting_builder.php b/pandora_console/godmode/reporting/reporting_builder.php
index d96d239417..29a7260848 100755
--- a/pandora_console/godmode/reporting/reporting_builder.php
+++ b/pandora_console/godmode/reporting/reporting_builder.php
@@ -2486,7 +2486,7 @@ switch ($action) {
                             0
                         );
                         $values['exception_condition'] = (int) get_parameter(
-                            'radiobutton_exception_condition',
+                            'exception_condition',
                             0
                         );
                         $values['exception_condition_value'] = get_parameter(
diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php
index b2d1edb62d..0842cff2bd 100755
--- a/pandora_console/include/functions_reporting.php
+++ b/pandora_console/include/functions_reporting.php
@@ -2711,6 +2711,7 @@ function reporting_exception(
             // Metaconsole connection.
             $server_name = $exc['server_name'];
             if (($config['metaconsole'] == 1) && $server_name != '' && is_metaconsole()) {
+                metaconsole_restore_db();
                 $connection = metaconsole_get_connection($server_name);
                 if (metaconsole_load_external_db($connection) != NOERR) {
                     // ui_print_error_message ("Error connecting to ".$server_name);

From 91e870edbc30c8b11d56a5ef965cb11520e4e7cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Gonz=C3=A1lez?= <jose.gonzalez@pandorafms.com>
Date: Thu, 27 May 2021 22:06:58 +0200
Subject: [PATCH 90/93] Fixed issue with id_plugin with bandwidth modules

---
 .../include/class/AgentWizard.class.php       | 51 ++++++++++++-------
 1 file changed, 33 insertions(+), 18 deletions(-)

diff --git a/pandora_console/include/class/AgentWizard.class.php b/pandora_console/include/class/AgentWizard.class.php
index b72b2985f9..7c27f34525 100644
--- a/pandora_console/include/class/AgentWizard.class.php
+++ b/pandora_console/include/class/AgentWizard.class.php
@@ -312,7 +312,7 @@ class AgentWizard extends HTML
         $this->idPolicy = get_parameter('id', '');
         $this->targetIp = get_parameter('targetIp', '');
 
-        if (!empty($this->idAgent)) {
+        if (empty($this->idAgent) === false) {
             $array_aux = db_get_all_rows_sql(
                 sprintf(
                     'SELECT ip FROM taddress ta
@@ -1687,28 +1687,43 @@ class AgentWizard extends HTML
                             )
                         );
 
-                        if ($fieldsPlugin !== false) {
-                            $fieldsPlugin = json_decode($fieldsPlugin, true);
-                            $i = 1;
-                            foreach ($infoMacros as $key => $value) {
-                                if (empty(preg_match('/_snmp_field/', $key)) === false) {
-                                    $new_macros = [];
-                                    foreach ($fieldsPlugin as $k => $v) {
-                                        if ($v['macro'] === preg_replace('/_snmp_field/', '', $key)) {
-                                            $fieldsPlugin[$k]['value'] = $this->replacementMacrosPlugin(
-                                                $value,
-                                                $infoMacros['macros']
-                                            );
-                                            $i++;
-                                            continue;
+                        if ($this->wizardSection === 'snmp_interfaces_explorer'
+                            && empty($candidate['macros']) === false
+                        ) {
+                            // Use definition provided.
+                            $values['id_plugin'] = $candidate['id_plugin'];
+                            $values['macros'] = base64_decode($candidate['macros']);
+                        } else {
+                            $fieldsPlugin = db_get_value_sql(
+                                sprintf(
+                                    'SELECT macros FROM tplugin WHERE id=%d',
+                                    (int) $infoMacros['server_plugin']
+                                )
+                            );
+
+                            if ($fieldsPlugin !== false) {
+                                $fieldsPlugin = json_decode($fieldsPlugin, true);
+                                $i = 1;
+                                foreach ($infoMacros as $key => $value) {
+                                    if (empty(preg_match('/_snmp_field/', $key)) === false) {
+                                        $new_macros = [];
+                                        foreach ($fieldsPlugin as $k => $v) {
+                                            if ($v['macro'] === preg_replace('/_snmp_field/', '', $key)) {
+                                                $fieldsPlugin[$k]['value'] = $this->replacementMacrosPlugin(
+                                                    $value,
+                                                    $infoMacros['macros']
+                                                );
+                                                $i++;
+                                                continue;
+                                            }
                                         }
                                     }
                                 }
                             }
-                        }
 
-                        $values['id_plugin'] = $infoMacros['server_plugin'];
-                        $values['macros'] = json_encode($fieldsPlugin);
+                            $values['id_plugin'] = $infoMacros['server_plugin'];
+                            $values['macros'] = json_encode($fieldsPlugin);
+                        }
                     }
                 }
             } else if ($this->protocol === 'wmi') {

From 059b14dbf657ab6b19ddfa89d866ec422e562bb0 Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Fri, 28 May 2021 01:00:43 +0200
Subject: [PATCH 91/93] 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 68fed537b4..5199a030ae 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.754-210527
+Version: 7.0NG.754-210528
 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 1a3b93590f..f01b00ee29 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.754-210527"
+pandora_version="7.0NG.754-210528"
 
 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 2dc59f129b..0329fd8a41 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -1015,7 +1015,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.754';
-use constant AGENT_BUILD => '210527';
+use constant AGENT_BUILD => '210528';
 
 # 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 3b3ea1d6ec..b094bd0ae7 100644
--- a/pandora_agents/unix/pandora_agent.redhat.spec
+++ b/pandora_agents/unix/pandora_agent.redhat.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     7.0NG.754
-%define release     210527
+%define release     210528
 
 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 b940c8b585..d71828b386 100644
--- a/pandora_agents/unix/pandora_agent.spec
+++ b/pandora_agents/unix/pandora_agent.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     7.0NG.754
-%define release     210527
+%define release     210528
 
 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 c761574ac4..c64d01b09e 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.754"
-PI_BUILD="210527"
+PI_BUILD="210528"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index 0d7d94ede5..01fba38997 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{210527}
+{210528}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 014db5cebb..83d167d56d 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.754 Build 210527")
+#define PANDORA_VERSION ("7.0NG.754 Build 210528")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index 69bafa9a00..bc907eca4b 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.754(Build 210527))"
+      VALUE "ProductVersion", "(7.0NG.754(Build 210528))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index e96ee4632a..f56c42c5e2 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.754-210527
+Version: 7.0NG.754-210528
 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 352fe3bf0c..15edaa640e 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.754-210527"
+pandora_version="7.0NG.754-210528"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 430ca593b6..d18146b678 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 = 'PC210527';
+$build_version = 'PC210528';
 $pandora_version = 'v7.0NG.754';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index ad0f399c50..b423e99b20 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -129,7 +129,7 @@
         <div style='height: 10px'>
             <?php
             $version = '7.0NG.754';
-            $build = '210527';
+            $build = '210528';
             $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 ae26406065..86e48653f6 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.754
-%define release     210527
+%define release     210528
 
 # 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 7b344e9745..e5dcbf63ce 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.754
-%define release     210527
+%define release     210528
 
 # 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 8f9f40c163..38ea611d43 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.754
-%define release     210527
+%define release     210528
 %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 dcd18d1004..abc97a4a1f 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.754-210527
+Version: 7.0NG.754-210528
 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 861dcea8df..338f41f060 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.754-210527"
+pandora_version="7.0NG.754-210528"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index a270cb9d34..85c2fd20f8 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@@ -45,7 +45,7 @@ our @EXPORT = qw(
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.754";
-my $pandora_build = "210527";
+my $pandora_build = "210528";
 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 e54ad48fe6..ba539d94e6 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.754";
-my $pandora_build = "210527";
+my $pandora_build = "210528";
 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 a72bdc6256..e0c3bd5aab 100644
--- a/pandora_server/pandora_server.redhat.spec
+++ b/pandora_server/pandora_server.redhat.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     7.0NG.754
-%define release     210527
+%define release     210528
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 12c3a8577b..1597fac0db 100644
--- a/pandora_server/pandora_server.spec
+++ b/pandora_server/pandora_server.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     7.0NG.754
-%define release     210527
+%define release     210528
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 3ac49eb4ad..d896afab15 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.754"
-PI_BUILD="210527"
+PI_BUILD="210528"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index a8a231fbb3..32ff1f6268 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.754 Build 210527";
+my $version = "7.0NG.754 Build 210528";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index f5ac53a2d9..ab5f85af33 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.754 Build 210527";
+my $version = "7.0NG.754 Build 210528";
 
 # save program name for logging
 my $progname = basename($0);

From 84902a5d3d5956cc90a845f76e40c6f96d24d41d Mon Sep 17 00:00:00 2001
From: Jose Gonzalez <jose.gonzalez@artica.es>
Date: Fri, 28 May 2021 13:20:16 +0200
Subject: [PATCH 92/93] Fixed code

---
 pandora_console/extensions/module_groups.php  |  1 +
 .../extensions/resource_registration.php      | 70 ++++++++++++-------
 .../agentes/module_manager_editor_common.php  | 50 +++++++++----
 3 files changed, 82 insertions(+), 39 deletions(-)

diff --git a/pandora_console/extensions/module_groups.php b/pandora_console/extensions/module_groups.php
index 4e1f0e791c..054eabb73d 100644
--- a/pandora_console/extensions/module_groups.php
+++ b/pandora_console/extensions/module_groups.php
@@ -196,6 +196,7 @@ function mainModuleGroups()
                     ON ta.id_agente = tam.id_agente
                 WHERE ta.disabled = 0
                     AND tam.disabled = 0
+                    AND tam.id_modulo <> 0
                     AND tam.delete_pending = 0
                     AND ta.id_grupo IN (%s)
                 GROUP BY tam.id_agente_modulo
diff --git a/pandora_console/extensions/resource_registration.php b/pandora_console/extensions/resource_registration.php
index 2f904dbf9f..f1fc645179 100755
--- a/pandora_console/extensions/resource_registration.php
+++ b/pandora_console/extensions/resource_registration.php
@@ -1,29 +1,43 @@
 <?php
+/**
+ * Resource registration.
+ *
+ * @category   Extensions
+ * @package    Pandora FMS
+ * @subpackage Community
+ * @version    1.0.0
+ * @license    See below
+ *
+ *    ______                 ___                    _______ _______ ________
+ *   |   __ \.-----.--.--.--|  |.-----.----.-----. |    ___|   |   |     __|
+ *  |    __/|  _  |     |  _  ||  _  |   _|  _  | |    ___|       |__     |
+ * |___|   |___._|__|__|_____||_____|__| |___._| |___|   |__|_|__|_______|
+ *
+ * ============================================================================
+ * Copyright (c) 2005-2021 Artica Soluciones Tecnologicas
+ * Please see http://pandorafms.org for full contribution list
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation for version 2.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * ============================================================================
+ */
 
-// Pandora FMS - http://pandorafms.com
-// ==================================================
-// Copyright (c) 2005-2021 Artica Soluciones Tecnologicas
-// Please see http://pandorafms.org for full contribution list
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; version 2
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-// Remember the hard-coded values
-/*
-    -- id_modulo now uses tmodule
-    -- ---------------------------
-    -- 1 - Data server modules (agent related modules)
-    -- 2 - Network server modules
-    -- 4 - Plugin server
-    -- 5 - Predictive server
-    -- 6 - WMI server
-    -- 7 - WEB Server (enteprise)
-
-    In the xml is the tag "module_source"
-*/
+/**
+ * Remember the hard-coded values.
+ *  -- id_modulo now uses tmodule.
+ *  -- ---------------------------.
+ *  -- 1 - Data server modules (agent related modules)
+ *  -- 2 - Network server modules
+ *  -- 4 - Plugin server
+ *  -- 5 - Predictive server
+ *  -- 6 - WMI server
+ *  -- 7 - WEB Server (enteprise)
+ *  In the xml is the tag "module_source"
+ */
 
 require_once $config['homedir'].'/include/functions_agents.php';
 enterprise_include_once('include/functions_local_components.php');
@@ -1097,7 +1111,13 @@ function resource_registration_extension_main()
 
     $xml = simplexml_load_file($_FILES['resource_upload']['tmp_name'], null, LIBXML_NOCDATA);
 
-    process_upload_xml($xml);
+    if ($xml === false) {
+        ui_print_error_message(
+            __('Error uploading resource. Check if the selected file is a valid resource template in .ptr format')
+        );
+    } else {
+        process_upload_xml($xml);
+    }
 }
 
 
diff --git a/pandora_console/godmode/agentes/module_manager_editor_common.php b/pandora_console/godmode/agentes/module_manager_editor_common.php
index 9844a34fa3..5e994499f3 100644
--- a/pandora_console/godmode/agentes/module_manager_editor_common.php
+++ b/pandora_console/godmode/agentes/module_manager_editor_common.php
@@ -1,17 +1,32 @@
 <?php
+/**
+ * Common editor fields.
+ *
+ * @category   Module manager
+ * @package    Pandora FMS
+ * @subpackage Community
+ * @version    1.0.0
+ * @license    See below
+ *
+ *    ______                 ___                    _______ _______ ________
+ *   |   __ \.-----.--.--.--|  |.-----.----.-----. |    ___|   |   |     __|
+ *  |    __/|  _  |     |  _  ||  _  |   _|  _  | |    ___|       |__     |
+ * |___|   |___._|__|__|_____||_____|__| |___._| |___|   |__|_|__|_______|
+ *
+ * ============================================================================
+ * Copyright (c) 2005-2021 Artica Soluciones Tecnologicas
+ * Please see http://pandorafms.org for full contribution list
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation for version 2.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * ============================================================================
+ */
 
-
-// Pandora FMS - http://pandorafms.com
-// ==================================================
-// Copyright (c) 2005-2021 Artica Soluciones Tecnologicas
-// Please see http://pandorafms.org for full contribution list
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation for version 2.
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
+// Begin
 require_once $config['homedir'].'/include/functions_modules.php';
 require_once $config['homedir'].'/include/functions_categories.php';
 require_once $config['homedir'].'/include/graphs/functions_d3.php';
@@ -19,7 +34,9 @@ require_once $config['homedir'].'/include/graphs/functions_d3.php';
 include_javascript_d3();
 
 
-global $config;function prepend_table_simple($row, $id=false)
+global $config;
+
+function prepend_table_simple($row, $id=false)
 {
     global $table_simple;
 
@@ -115,7 +132,12 @@ function add_component_selection($id_network_component_type)
         '',
         '---'.__('Manual setup').'---',
         0,
-        true
+        true,
+        false,
+        true,
+        '',
+        false,
+        'width: 460px; '
     );
     $data[1] .= '</span>';
     $data[1] .= ' <span id="component_loading" class="invisible">';

From cf358341fbab764c016c36db9a1a8ba17a6bc8e2 Mon Sep 17 00:00:00 2001
From: Jose Gonzalez <jose.gonzalez@artica.es>
Date: Fri, 28 May 2021 13:47:14 +0200
Subject: [PATCH 93/93] Fixed issue with css file in meta

---
 pandora_console/include/functions_ui.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index f4d0dff15e..ecd985d5c3 100755
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -27,6 +27,8 @@
  */
 
 // Begin.
+global $config;
+
 // Check to avoid error when load this library in error screen situations.
 if (isset($config['homedir'])) {
     include_once $config['homedir'].'/include/functions_agents.php';
@@ -35,8 +37,6 @@ if (isset($config['homedir'])) {
     include_once $config['homedir'].'/include/functions_groups.php';
     include_once $config['homedir'].'/include/functions_users.php';
     include_once $config['homedir'].'/include/functions_html.php';
-    // For standard breadcrumbs.
-    ui_require_css_file('discovery');
 }
 
 
@@ -4353,6 +4353,8 @@ function ui_print_standard_header(
     array $options=[],
     array $breadcrumbs=[]
 ) {
+    // For standard breadcrumbs.
+    ui_require_css_file('discovery');
     // Create the breadcrumb.
     $headerInformation = new HTML();
     $headerInformation->setBreadcrum([]);