From 75bb4338b7a36ac09af8639075769a6924b35c9c Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Thu, 22 Oct 2020 18:10:46 +0200
Subject: [PATCH 01/18] fixes in event macros (responses)

---
 pandora_console/include/functions_events.php | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/pandora_console/include/functions_events.php b/pandora_console/include/functions_events.php
index 7a337fbdab..6996157cbb 100644
--- a/pandora_console/include/functions_events.php
+++ b/pandora_console/include/functions_events.php
@@ -3811,7 +3811,7 @@ function events_get_response_target(
     if (strpos($target, '_alert_id_') !== false) {
         $target = str_replace(
             '_alert_id_',
-            empty($event['is_alert_am']) ? __('N/A') : $event['is_alert_am'],
+            empty($event['id_alert_am']) ? __('N/A') : $event['id_alert_am'],
             $target
         );
     }
@@ -3893,6 +3893,15 @@ function events_get_response_target(
         $target = str_replace('_current_user_', $config['id_user'], $target);
     }
 
+    // This will replace the macro with the command timeout value.
+    if (strpos($target, '_command_timeout_') !== false) {
+        $target = str_replace(
+            '_command_timeout_',
+            $event_response['command_timeout'],
+            $target
+        );
+    }
+
     return $target;
 }
 
@@ -6973,7 +6982,7 @@ function events_get_field_value_by_event_id(
     if (strpos($value, '_group_name_') !== false) {
         $value = str_replace(
             '_group_name_',
-            groups_get_name($event['id_grupo'], true),
+            io_safe_output(groups_get_name($event['id_grupo'], true)),
             $value
         );
     }

From 5d812d58596e1d53bbc8c0ba6a02d4ce46fdcdd6 Mon Sep 17 00:00:00 2001
From: alejandro-campos <alejandro.campos@artica.es>
Date: Fri, 23 Oct 2020 09:20:23 +0200
Subject: [PATCH 02/18] added new macros

---
 pandora_console/include/functions_events.php | 32 ++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/pandora_console/include/functions_events.php b/pandora_console/include/functions_events.php
index 7a337fbdab..c150aec85a 100644
--- a/pandora_console/include/functions_events.php
+++ b/pandora_console/include/functions_events.php
@@ -3692,6 +3692,38 @@ function events_get_response_target(
     $event_response = db_get_row('tevent_response', 'id', $response_id);
     $target = io_safe_output($event_response['target']);
 
+    if (strpos($target, '_agent_alias_') !== false) {
+        if ($meta) {
+            $agente_table_name = 'tmetaconsole_agent';
+            $filter = [
+                'id_tagente'            => $event['id_agente'],
+                'id_tmetaconsole_setup' => $server_id,
+            ];
+        } else {
+            $agente_table_name = 'tagente';
+            $filter = ['id_agente' => $event['id_agente']];
+        }
+
+        $alias = db_get_value_filter('alias', $agente_table_name, $filter);
+        $target = str_replace('_agent_alias_', io_safe_output($alias), $target);
+    }
+
+    if (strpos($target, '_agent_name_') !== false) {
+        if ($meta) {
+            $agente_table_name = 'tmetaconsole_agent';
+            $filter = [
+                'id_tagente'            => $event['id_agente'],
+                'id_tmetaconsole_setup' => $server_id,
+            ];
+        } else {
+            $agente_table_name = 'tagente';
+            $filter = ['id_agente' => $event['id_agente']];
+        }
+
+        $name = db_get_value_filter('nombre', $agente_table_name, $filter);
+        $target = str_replace('_agent_name_', io_safe_output($name), $target);
+    }
+
     // Substitute each macro.
     if (strpos($target, '_agent_address_') !== false) {
         if ($meta) {

From bebac548d3946e1d972e5b946a54c3d674fdf931 Mon Sep 17 00:00:00 2001
From: Daniel Barbero Martin <daniel.barbero@artica.es>
Date: Fri, 23 Oct 2020 10:47:03 +0200
Subject: [PATCH 03/18] fix exportation/exportation

---
 .../extensions/resource_exportation.php       |  6 +-
 .../extensions/resource_registration.php      | 83 ++++++++++++++-----
 2 files changed, 65 insertions(+), 24 deletions(-)

diff --git a/pandora_console/extensions/resource_exportation.php b/pandora_console/extensions/resource_exportation.php
index 3946ec053d..16cf674ab6 100755
--- a/pandora_console/extensions/resource_exportation.php
+++ b/pandora_console/extensions/resource_exportation.php
@@ -92,7 +92,11 @@ function output_xml_report($id)
 
     $group = db_get_value('nombre', 'tgrupo', 'id_grupo', $report['id_group']);
     echo '<group><![CDATA['.io_safe_output($group)."]]></group>\n";
-    $items = db_get_all_rows_field_filter('treport_content', 'id_report', $report['id_report']);
+    $items = db_get_all_rows_field_filter(
+        'treport_content',
+        'id_report',
+        $report['id_report']
+    );
     foreach ($items as $item) {
         echo "<item>\n";
             echo '<type>'.io_safe_output($item['type'])."</type>\n";
diff --git a/pandora_console/extensions/resource_registration.php b/pandora_console/extensions/resource_registration.php
index dae61e3a78..80fed2cf6c 100755
--- a/pandora_console/extensions/resource_registration.php
+++ b/pandora_console/extensions/resource_registration.php
@@ -37,8 +37,16 @@ function insert_item_report($report_id, $values)
 
         ui_print_result_message(
             $result,
-            sprintf(__("Success add '%s' item in report '%s'."), $values['type'], $name),
-            sprintf(__("Error create '%s' item in report '%s'."), $values['type'], $name)
+            sprintf(
+                __("Success add '%s' item in report '%s'."),
+                $values['type'],
+                $name
+            ),
+            sprintf(
+                __("Error create '%s' item in report '%s'."),
+                $values['type'],
+                $name
+            )
         );
     }
 }
@@ -55,9 +63,12 @@ function process_upload_xml_report($xml, $group_filter=0)
             $posible_name = $values['name'];
             $exist = true;
             $loops = 30;
-            // Loops to exit or tries
+            // Loops to exit or tries.
             while ($exist && $loops > 0) {
-                $exist = (bool) db_get_row_filter('treport', ['name' => io_safe_input($posible_name)]);
+                $exist = (bool) db_get_row_filter(
+                    'treport',
+                    ['name' => io_safe_input($posible_name)]
+                );
 
                 if ($exist) {
                     $loops--;
@@ -74,7 +85,7 @@ function process_upload_xml_report($xml, $group_filter=0)
                 );
                 break;
             } else if ($loops != 30) {
-                ui_print_error_message(
+                ui_print_warning_message(
                     sprintf(
                         __("Warning create '%s' report, the name exist, the report have a name %s."),
                         $reportElement->name,
@@ -89,13 +100,22 @@ function process_upload_xml_report($xml, $group_filter=0)
             break;
         }
 
-        $id_group = db_get_value('id_grupo', 'tgrupo', 'nombre', $reportElement->group);
-        if ($id_group === false) {
-            ui_print_error_message(__("Error the report haven't group."));
-            break;
+        if (isset($reportElement->group) === true
+            && empty($reportElement->group) === false
+        ) {
+            $id_group = db_get_value(
+                'id_grupo',
+                'tgrupo',
+                'nombre',
+                $reportElement->group
+            );
+            if ($id_group === false) {
+                ui_print_error_message(__("Error the report haven't group."));
+                break;
+            }
         }
 
-        if (isset($reportElement->description)) {
+        if (isset($reportElement->description) === true) {
             $values['description'] = $reportElement->description;
         }
 
@@ -108,9 +128,19 @@ function process_upload_xml_report($xml, $group_filter=0)
         );
 
         if ($id_report) {
-            db_pandora_audit('Report management', 'Create report '.$id_report, false, false);
+            db_pandora_audit(
+                'Report management',
+                'Create report '.$id_report,
+                false,
+                false
+            );
         } else {
-            db_pandora_audit('Report management', 'Fail to create report', false, false);
+            db_pandora_audit(
+                'Report management',
+                'Fail to create report',
+                false,
+                false
+            );
             break;
         }
 
@@ -119,45 +149,52 @@ function process_upload_xml_report($xml, $group_filter=0)
 
             $values = [];
             $values['id_report'] = $id_report;
-            if (isset($item['description'])) {
+            if (isset($item['description']) === true) {
                 $values['description'] = io_safe_input($item['description']);
             }
 
-            if (isset($item['period'])) {
+            if (isset($item['period']) === true) {
                 $values['period'] = io_safe_input($item['period']);
             }
 
-            if (isset($item['type'])) {
+            if (isset($item['type']) === true) {
                 $values['type'] = io_safe_input($item['type']);
             }
 
             $agents_item = [];
-            if (isset($item['agent'])) {
+            if (isset($item['agent']) === true) {
                 $agents = agents_get_agents(
                     ['id_grupo' => $group_filter],
                     [
                         'id_agente',
-                        'nombre',
+                        'alias',
                     ]
                 );
 
-                $agent_clean = str_replace(['[', ']'], '', $item['agent']);
+                $agent_clean = str_replace(
+                    [
+                        '[',
+                        ']',
+                    ],
+                    '',
+                    io_safe_output($item['agent'])
+                );
                 $regular_expresion = ($agent_clean != $item['agent']);
 
                 foreach ($agents as $agent) {
                     if ($regular_expresion) {
-                        if ((bool) preg_match('/'.$agent_clean.'/', io_safe_output($agent['nombre']))) {
-                            $agents_item[$agent['id_agente']]['name'] = $agent['nombre'];
+                        if ((bool) preg_match('/'.$agent_clean.'/', io_safe_output($agent['alias']))) {
+                            $agents_item[$agent['id_agente']]['name'] = $agent['alias'];
                         }
                     } else {
-                        if ($agent_clean == io_safe_output($agent['nombre'])) {
-                            $agents_item[$agent['id_agente']]['name'] = $agent['nombre'];
+                        if ($agent_clean == io_safe_output($agent['alias'])) {
+                            $agents_item[$agent['id_agente']]['name'] = $agent['alias'];
                         }
                     }
                 }
             }
 
-            if (isset($item['module'])) {
+            if (isset($item['module']) === true) {
                 $module_clean = str_replace(['[', ']'], '', $item['module']);
                 $regular_expresion = ($module_clean != $item['module']);
 

From 765d7938f90307a324de6bb865c0832ba9f17f8b Mon Sep 17 00:00:00 2001
From: Jose Gonzalez <jose.gonzalez@artica.es>
Date: Fri, 23 Oct 2020 12:20:20 +0200
Subject: [PATCH 04/18] Handled comments for validated comments

---
 pandora_console/include/ajax/events.php      |  4 ++-
 pandora_console/include/functions_events.php | 36 +++++++++++++-------
 2 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/pandora_console/include/ajax/events.php b/pandora_console/include/ajax/events.php
index 230b55a476..d6a760413b 100644
--- a/pandora_console/include/ajax/events.php
+++ b/pandora_console/include/ajax/events.php
@@ -114,7 +114,9 @@ if ($get_comments) {
             sprintf(
                 ' HAVING max_id_evento = %d',
                 $event['id_evento']
-            )
+            ),
+            // True for show comments of validated events.
+            true
         );
         if ($events !== false) {
             $event = $events[0];
diff --git a/pandora_console/include/functions_events.php b/pandora_console/include/functions_events.php
index 7a337fbdab..8efeff3f2e 100644
--- a/pandora_console/include/functions_events.php
+++ b/pandora_console/include/functions_events.php
@@ -673,15 +673,16 @@ function events_update_status($id_evento, $status, $filter=null, $history=false)
 /**
  * Retrieve all events filtered.
  *
- * @param array   $fields     Fields to retrieve.
- * @param array   $filter     Filters to be applied.
- * @param integer $offset     Offset (pagination).
- * @param integer $limit      Limit (pagination).
- * @param string  $order      Sort order.
- * @param string  $sort_field Sort field.
- * @param boolean $history    Apply on historical table.
- * @param boolean $return_sql Return SQL (true) or execute it (false).
- * @param string  $having     Having filter.
+ * @param array   $fields          Fields to retrieve.
+ * @param array   $filter          Filters to be applied.
+ * @param integer $offset          Offset (pagination).
+ * @param integer $limit           Limit (pagination).
+ * @param string  $order           Sort order.
+ * @param string  $sort_field      Sort field.
+ * @param boolean $history         Apply on historical table.
+ * @param boolean $return_sql      Return SQL (true) or execute it (false).
+ * @param string  $having          Having filter.
+ * @param boolean $validatedEvents If true, evaluate validated events.
  *
  * @return array Events.
  * @throws Exception On error.
@@ -695,7 +696,8 @@ function events_get_all(
     $sort_field=null,
     $history=false,
     $return_sql=false,
-    $having=''
+    $having='',
+    $validatedEvents=false
 ) {
     global $config;
 
@@ -926,10 +928,20 @@ function events_get_all(
             break;
 
             case EVENT_NO_VALIDATED:
+                // Show comments in validated events.
+                $validatedState = '';
+                if ($validatedEvents === true) {
+                    $validatedState = sprintf(
+                        'OR estado = %d',
+                        EVENT_VALIDATE
+                    );
+                }
+
                 $sql_filters[] = sprintf(
-                    ' AND (estado = %d OR estado = %d)',
+                    ' AND (estado = %d OR estado = %d %s)',
                     EVENT_NEW,
-                    EVENT_PROCESS
+                    EVENT_PROCESS,
+                    $validatedState
                 );
             break;
         }

From 4ff09235899f8e8210f1f5144f7dd74cdb9d4790 Mon Sep 17 00:00:00 2001
From: alejandro-campos <alejandro.campos@artica.es>
Date: Fri, 23 Oct 2020 13:53:38 +0200
Subject: [PATCH 05/18] fixed sound events

---
 .../operation/events/sound_events.php         | 29 ++++++++++++++-----
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/pandora_console/operation/events/sound_events.php b/pandora_console/operation/events/sound_events.php
index 4377faaa63..5037e63b22 100644
--- a/pandora_console/operation/events/sound_events.php
+++ b/pandora_console/operation/events/sound_events.php
@@ -77,7 +77,7 @@ $table->data[0][2] = __('Type');
 $table->data[0][3] = html_print_checkbox('alert_fired', 'alert_fired', true, true, false, 'changeType();').__('Alert fired').'<br />'.html_print_checkbox('critical', 'critical', true, true, false, 'changeType();').__('Monitor critical').'<br />'.html_print_checkbox('unknown', 'unknown', true, true, false, 'changeType();').__('Monitor unknown').'<br />'.html_print_checkbox('warning', 'warning', true, true, false, 'changeType();').__('Monitor warning').'<br />';
 
 $table->data[1][0] = __('Agent');
-$table->data[1][1] = html_print_select($agents, 'id_agents[]', true, false, '', '', true, true, '', '', '', 'width:120px; height:100px', '', false, '', '', true);
+$table->data[1][1] = html_print_select($agents, 'id_agents[]', true, false, '', '', true, true, '', '', '', 'max-width:200px; height:100px', '', false, '', '', true);
 
 $table->data[1][2] = __('Event');
 $table->data[1][3] = html_print_textarea('events_fired', 200, 20, '', 'readonly="readonly" style="max-height:100px; background: #ddd; resize:none;"', true);
@@ -152,10 +152,26 @@ function changeGroup() {
 }
 
 function changeType() {
-    alert_fired = $("input[name=alert_fired]").attr('checked');
-    critical = $("input[name=critical]").attr('checked');
-    warning = $("input[name=warning]").attr('checked');
-    unknown = $("input[name=unknown]").attr('checked');
+    alert_fired = false;
+    critical = false;
+    warning = false;
+    unknown = false;
+
+    if($("input[name=alert_fired]").is(':checked') ) {
+        alert_fired = true;
+    }
+
+    if($("input[name=critical]").is(':checked') ) {
+        critical = true;
+    }
+
+    if($("input[name=warning]").is(':checked') ) {
+        warning = true;
+    }
+
+    if($("input[name=unknown]").is(':checked') ) {
+        unknown = true;
+    }
 }
 
 function toggleButton() {
@@ -256,9 +272,6 @@ $(document).ready (function () {
     setInterval("check_event()", (10 * 1000)); //10 seconds between ajax request
     $("#table1").css("background-color", "#fff");
     $("#table2").css("background-color", "#fff");
-
-    group_width = $("#group").width();
-    $("#id_agents").width(group_width + 9);
 });
 
 </script>

From 29174a87ef41d38638f5877feef99bfe57a6c190 Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Mon, 26 Oct 2020 10:14:14 +0100
Subject: [PATCH 06/18] removed strict-user from monitor detail

---
 .../operation/agentes/status_monitor.php      | 25 +------------------
 1 file changed, 1 insertion(+), 24 deletions(-)

diff --git a/pandora_console/operation/agentes/status_monitor.php b/pandora_console/operation/agentes/status_monitor.php
index a49db7b7f4..7be62557f4 100644
--- a/pandora_console/operation/agentes/status_monitor.php
+++ b/pandora_console/operation/agentes/status_monitor.php
@@ -701,7 +701,6 @@ foreach ($custom_fields as $custom_field) {
     $table_custom_fields->data[] = $row;
 }
 
-
 $filters = '<form method="post" action="index.php?sec=view&amp;sec2=operation/agentes/status_monitor&amp;refr='.$refr.'&amp;ag_group='.$ag_group.'&amp;ag_freestring='.$ag_freestring.'&amp;module_option='.$module_option.'&amp;ag_modulename='.$ag_modulename.'&amp;moduletype='.$moduletype.'&amp;datatype='.$datatype.'&amp;status='.$status.'&amp;sort_field='.$sortField.'&amp;sort='.$sort.'&amp;pure='.$config['pure'].$ag_custom_fields_params.'">';
 if (is_metaconsole()) {
     $table->colspan[4][0] = 7;
@@ -1750,24 +1749,13 @@ if (!empty($result)) {
 
 // End Build List Result.
 echo "<div id='monitor_details_window'></div>";
-// Strict user hidden.
-echo '<div id="strict_hidden" style="display:none;">';
-html_print_input_text('strict_user_hidden', $strict_user);
-echo '</div>';
 
 enterprise_hook('close_meta_frame');
 
 ui_require_javascript_file('pandora_modules');
 
 ?>
-<script type='text/javascript'>
-$(document).ready (function () {
-    if ($('#ag_group').val() != 0) {
-        $('#tag_filter').css('display', 'none');
-        $('#tag_td').css('display', 'none');
-    }
-});
-
+<script type="text/javascript">
 
 $('#moduletype').click(function() {
     jQuery.get (
@@ -1789,17 +1777,6 @@ $('#moduletype').click(function() {
     return false;
 });
 
-$('#ag_group').change (function () {
-    strict_user = $('#text-strict_user_hidden').val();
-    
-    if (($('#ag_group').val() != 0) && (strict_user != 0)) {
-        $('#tag_filter').css('display', 'none');
-        $('#tag_td').css('display', 'none');
-    } else {
-        $('#tag_filter').css('display', '');
-        $('#tag_td').css('display', '');
-    }
-});
 
 function toggle_full_value(id) {
     text = $('#hidden_value_module_' + id).html();

From 8b4bcc77ab4954250667e4d147ce8b55e5ec1fbf Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Tue, 27 Oct 2020 13:56:38 +0100
Subject: [PATCH 07/18] Update functions_events.php (io_safe_output over
 _event_date_)

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

diff --git a/pandora_console/include/functions_events.php b/pandora_console/include/functions_events.php
index 6996157cbb..67448d06e6 100644
--- a/pandora_console/include/functions_events.php
+++ b/pandora_console/include/functions_events.php
@@ -3787,7 +3787,7 @@ function events_get_response_target(
     if (strpos($target, '_event_date_') !== false) {
         $target = str_replace(
             '_event_date_',
-            date($config['date_format'], $event['utimestamp']),
+            io_safe_output(date($config['date_format'], $event['utimestamp'])),
             $target
         );
     }

From 9b81da193b42b9f69847a9888021ae46aadf7b6c Mon Sep 17 00:00:00 2001
From: Daniel Barbero Martin <daniel.barbero@artica.es>
Date: Wed, 28 Oct 2020 12:50:15 +0100
Subject: [PATCH 08/18] fix charts

---
 pandora_console/include/functions_graph.php   | 10 +++-------
 .../include/functions_treeview.php            |  2 +-
 .../include/graphs/functions_flot.php         | 19 ++++++-------------
 pandora_console/include/styles/pandora.css    |  8 +++++++-
 .../operation/agentes/stat_win.php            |  1 +
 5 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/pandora_console/include/functions_graph.php b/pandora_console/include/functions_graph.php
index 4fd1439f8f..f40b75e3b2 100644
--- a/pandora_console/include/functions_graph.php
+++ b/pandora_console/include/functions_graph.php
@@ -2541,13 +2541,9 @@ function graphic_agentaccess(
     } else {
         $options['generals']['pdf']['width'] = 350;
         $options['generals']['pdf']['height'] = 125;
-        if (!empty($data_array)) {
-            $imgbase64 = '<img src="data:image/jpg;base64,';
-            $imgbase64 .= vbar_graph($data_array, $options, 2);
-            $imgbase64 .= '" />';
-        } else {
-            $imgbase64 .= vbar_graph($data_array, $options, 2);
-        }
+        $imgbase64 = '<img src="data:image/jpg;base64,';
+        $imgbase64 .= vbar_graph($data_array, $options, 2);
+        $imgbase64 .= '" />';
 
         return $imgbase64;
     }
diff --git a/pandora_console/include/functions_treeview.php b/pandora_console/include/functions_treeview.php
index 25e0f67020..67bed22be3 100755
--- a/pandora_console/include/functions_treeview.php
+++ b/pandora_console/include/functions_treeview.php
@@ -802,7 +802,7 @@ function treeview_printTable($id_agente, $server_data=[], $no_head=false)
     $events_graph = '<div style="width: 100%; height: 90px; display: flex; flex-direction: row; justify-content: center;">';
     $events_graph .= graph_graphic_agentevents(
         $id_agente,
-        '385px;',
+        '340px;margin:0',
         45,
         SECONDS_1DAY,
         '',
diff --git a/pandora_console/include/graphs/functions_flot.php b/pandora_console/include/graphs/functions_flot.php
index dc4e556292..81c9cc79cf 100644
--- a/pandora_console/include/graphs/functions_flot.php
+++ b/pandora_console/include/graphs/functions_flot.php
@@ -346,13 +346,7 @@ function menu_graph(
         $threshold = true;
     }
 
-    $return .= "<div id='general_menu_$graph_id' class='menu_graph' style='
-                    width: 20px;
-                    height: 150px;
-                    left:100%;
-                    position: absolute;
-                    top: 0px;
-                    background-color: tranparent;'>";
+    $return .= "<div id='general_menu_$graph_id' class='menu_graph'>";
     $return .= "<div id='menu_$graph_id' "."style='display: none; ".'text-align: center;'.'position: relative;'."border-bottom: 0px;'>
         <a href='javascript:'><img id='menu_cancelzoom_$graph_id' src='".$params['homeurl']."images/zoom_cross_grey.disabled.png' alt='".__('Cancel zoom')."' title='".__('Cancel zoom')."'></a>";
     if ($threshold) {
@@ -745,13 +739,12 @@ function flot_slicesbar_graph(
 
     // Set some containers to legend, graph, timestamp tooltip, etc.
     $height = ((int) $height + 15);
-    if ($stat_win) {
-        $return = "<div id='$graph_id' class='noresizevc graph $adapt_key' style='width: ".$width.'%; height: '.$height."px; display: inline-block;'></div>";
-    } else {
-        $return = "<div id='$graph_id' class='noresizevc graph $adapt_key' style='width: ".$width.'%; height: '.$height."px;'></div>";
-    }
 
-    $return .= "<div id='value_$graph_id' style='display:none; position:absolute; background:#fff; border: solid 1px #aaa; padding: 2px'></div>";
+    $style = 'width:'.$width.'%;';
+    $style .= 'height:'.$height.'px;';
+    $return = "<div id='".$graph_id."' class='noresizevc graph ".$adapt_key."' style='".$style."'></div>";
+
+    $return .= "<div id='value_".$graph_id."' style='display:none; position:absolute; background:#fff; border: solid 1px #aaa; padding: 2px'></div>";
 
     // Set a weird separator to serialize and unserialize
     // passing data from php to javascript.
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index 6b48ab13ae..d1696d8986 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -3073,6 +3073,12 @@ div#stat-win-module-graph div.nodata_container {
 }
 
 .menu_graph {
+  width: 30px;
+  height: 150px;
+  left: 100%;
+  position: absolute;
+  top: 0px;
+  background-color: transparent;
   -moz-border-top-right-radius: 6px;
   -webkit-border-top-right-radius: 6px;
   border-top-right-radius: 6px;
@@ -5865,7 +5871,7 @@ table.table_modal_alternate tr td:first-child {
 }
 
 .flot-text {
-  width: 101%;
+  width: 100%;
 }
 
 /*Font header feedback*/
diff --git a/pandora_console/operation/agentes/stat_win.php b/pandora_console/operation/agentes/stat_win.php
index 1d26666b57..d5e22eb06b 100644
--- a/pandora_console/operation/agentes/stat_win.php
+++ b/pandora_console/operation/agentes/stat_win.php
@@ -35,6 +35,7 @@ require_once $config['homedir'].'/include/functions_graph.php';
 require_once $config['homedir'].'/include/functions_modules.php';
 require_once $config['homedir'].'/include/functions_agents.php';
 require_once $config['homedir'].'/include/functions_tags.php';
+require_once $config['homedir'].'/include/php_to_js_values.php';
 enterprise_include_once('include/functions_agents.php');
 
 check_login();

From 170ee5b9a551696986357db0d9515247fc55d3ed Mon Sep 17 00:00:00 2001
From: Daniel Barbero Martin <daniel.barbero@artica.es>
Date: Wed, 28 Oct 2020 15:36:38 +0100
Subject: [PATCH 09/18] fixed csv charts

---
 .../flot/jquery.flot.exportdata.pandora.js    | 721 +++++++++---------
 1 file changed, 360 insertions(+), 361 deletions(-)

diff --git a/pandora_console/include/graphs/flot/jquery.flot.exportdata.pandora.js b/pandora_console/include/graphs/flot/jquery.flot.exportdata.pandora.js
index 6466a72835..47b8879ace 100644
--- a/pandora_console/include/graphs/flot/jquery.flot.exportdata.pandora.js
+++ b/pandora_console/include/graphs/flot/jquery.flot.exportdata.pandora.js
@@ -1,425 +1,424 @@
-(function ($) {
-	var options = {
-		export: {
-			export_data: false, // or true
-			labels_long: null,
-			homeurl: "",
-		},
-	};
+(function($) {
+  var options = {
+    export: {
+      export_data: false, // or true
+      labels_long: null,
+      homeurl: ""
+    }
+  };
 
-	function init(plot) {
-		plot.exportDataCSV = function (args) {
-			//amount = plot.getOptions().export.type,
-			//options = options || {};
+  function init(plot) {
+    plot.exportDataCSV = function(args) {
+      //amount = plot.getOptions().export.type,
+      //options = options || {};
 
-			// Options
-			var type = "csv";
-			type = type.toLowerCase().trim();
+      // Options
+      var type = "csv";
+      type = type.toLowerCase().trim();
 
-			var graphData,
-				dataObject,
-				dataObjects = plot.getData(),
-				result = [];
+      var graphData,
+        dataObject,
+        dataObjects = plot.getData(),
+        result = [];
 
-			// Throw errors
-			var retrieveDataOject = function (dataObjects) {
-				var result;
+      // Throw errors
+      var retrieveDataOject = function(dataObjects) {
+        var result;
 
-				if (typeof dataObjects === "undefined")
-					throw new Error("Empty parameter");
+        if (typeof dataObjects === "undefined")
+          throw new Error("Empty parameter");
 
-				// Try to retrieve the avg set (not 100% reliable, I know)
-				if (dataObjects.length == 1) {
-					result = dataObjects.shift();
-				}
-				if (dataObjects.length > 1) {
-					dataObjects.forEach(function (element) {
-						if (/^Avg.:/i.test(element.label)) result = element;
-					});
+        // Try to retrieve the avg set (not 100% reliable, I know)
+        if (dataObjects.length == 1) {
+          result = dataObjects.shift();
+        }
+        if (dataObjects.length > 1) {
+          dataObjects.forEach(function(element) {
+            if (/^Avg.:/i.test(element.label)) result = element;
+          });
 
-					// If the avg set is missing, retrieve the first set
-					if (typeof result === "undefined") result = dataObjects.shift();
-				}
+          // If the avg set is missing, retrieve the first set
+          if (typeof result === "undefined") result = dataObjects.shift();
+        }
 
-				if (typeof result === "undefined") throw new Error("Empty result");
+        if (typeof result === "undefined") throw new Error("Empty result");
 
-				return result;
-			};
+        return result;
+      };
 
-			// Throw errors
-			var processDataObject = function (dataObject) {
-				var result;
+      // Throw errors
+      var processDataObject = function(dataObject) {
+        var result;
 
-				if (typeof dataObject === "undefined")
-					throw new Error("Empty parameter");
+        if (typeof dataObject === "undefined")
+          throw new Error("Empty parameter");
 
-				if (
-					typeof dataObject.data === "undefined" ||
-					!(dataObject.data instanceof Array)
-				)
-					throw new Error("Object malformed");
+        if (
+          typeof dataObject.data === "undefined" ||
+          !(dataObject.data instanceof Array)
+        )
+          throw new Error("Object malformed");
 
-				/* {
-				 *   head: [<column>,<column>,...,<column>],
-				 *   data: [
-				 *     [<data>,<data>,...,<data>],
-				 *     [<data>,<data>,...,<data>],
-				 *     ...,
-				 *     [<data>,<data>,...,<data>],
-				 *   ]
-				 * }
-				 */
-				if (type === "csv") {
-					result = {
-						head: ["timestap", "date", "value", "label"],
-						data: [],
-					};
+        /* {
+         *   head: [<column>,<column>,...,<column>],
+         *   data: [
+         *     [<data>,<data>,...,<data>],
+         *     [<data>,<data>,...,<data>],
+         *     ...,
+         *     [<data>,<data>,...,<data>],
+         *   ]
+         * }
+         */
+        if (type === "csv") {
+          result = {
+            head: ["timestamp", "date", "value", "label"],
+            data: []
+          };
 
-					dataObject.data.forEach(function (item, index) {
-						var timestap = item[0];
+          dataObject.data.forEach(function(item, index) {
+            var timestamp = item[0];
 
-						var d = new Date(item[0]);
-						var monthNames = [
-							"Jan",
-							"Feb",
-							"Mar",
-							"Apr",
-							"May",
-							"Jun",
-							"Jul",
-							"Aug",
-							"Sep",
-							"Oct",
-							"Nov",
-							"Dec",
-						];
+            var d = new Date(item[0]);
+            var monthNames = [
+              "Jan",
+              "Feb",
+              "Mar",
+              "Apr",
+              "May",
+              "Jun",
+              "Jul",
+              "Aug",
+              "Sep",
+              "Oct",
+              "Nov",
+              "Dec"
+            ];
 
-						date_format =
-							(d.getDate() < 10 ? "0" : "") +
-							d.getDate() +
-							" " +
-							monthNames[d.getMonth()] +
-							" " +
-							d.getFullYear() +
-							" " +
-							(d.getHours() < 10 ? "0" : "") +
-							d.getHours() +
-							":" +
-							(d.getMinutes() < 10 ? "0" : "") +
-							d.getMinutes() +
-							":" +
-							(d.getSeconds() < 10 ? "0" : "") +
-							d.getSeconds();
+            date_format =
+              (d.getDate() < 10 ? "0" : "") +
+              d.getDate() +
+              " " +
+              monthNames[d.getMonth()] +
+              " " +
+              d.getFullYear() +
+              " " +
+              (d.getHours() < 10 ? "0" : "") +
+              d.getHours() +
+              ":" +
+              (d.getMinutes() < 10 ? "0" : "") +
+              d.getMinutes() +
+              ":" +
+              (d.getSeconds() < 10 ? "0" : "") +
+              d.getSeconds();
 
-						var date = date_format;
+            var date = date_format;
 
-						var value = item[1];
+            var value = item[1];
 
-						var clean_label = plot.getOptions().export.labels_long[
-							dataObject.label
-						];
-						clean_label = clean_label.replace(new RegExp("&#x20;", "g"), " ");
-						result.data.push([timestap, date, value, clean_label]);
-					});
-				} else if (type === "json") {
-					/* [
-					 *   {
-					 *     'date': <date>,
-					 *     'value': <value>
-					 *   }
-					 * ],
-					 * [
-					 *   {
-					 *     'date': <date>,
-					 *     'value': <value>
-					 *   }
-					 * ],
-					 * ...,
-					 * [
-					 *   {
-					 *     'date': <date>,
-					 *     'value': <value>
-					 *   }
-					 * ]
-					 */
-					result = [];
+            var clean_label = plot.getOptions().export.labels_long[
+              dataObject.label
+            ];
+            clean_label = clean_label.replace(new RegExp("&#x20;", "g"), " ");
+            result.data.push([timestamp, date, value, clean_label]);
+          });
+        } else if (type === "json") {
+          /* [
+           *   {
+           *     'date': <date>,
+           *     'value': <value>
+           *   }
+           * ],
+           * [
+           *   {
+           *     'date': <date>,
+           *     'value': <value>
+           *   }
+           * ],
+           * ...,
+           * [
+           *   {
+           *     'date': <date>,
+           *     'value': <value>
+           *   }
+           * ]
+           */
+          result = [];
 
-					dataObject.data.forEach(function (item, index) {
-						var date = "",
-							value = item[1];
+          dataObject.data.forEach(function(item, index) {
+            var date = "",
+              value = item[1];
 
-						// Long labels are preferred
-						if (typeof labels_long[index] !== "undefined")
-							date = labels_long[index];
-						else if (typeof labels[index] !== "undefined") date = labels[index];
+            // Long labels are preferred
+            if (typeof labels_long[index] !== "undefined")
+              date = labels_long[index];
+            else if (typeof labels[index] !== "undefined") date = labels[index];
 
-						result.push({
-							date: date,
-							value: value,
-							label: dataObject.label,
-						});
-					});
-				}
+            result.push({
+              date: date,
+              value: value,
+              label: dataObject.label
+            });
+          });
+        }
 
-				if (typeof result === "undefined") throw new Error("Empty result");
+        if (typeof result === "undefined") throw new Error("Empty result");
 
-				return result;
-			};
+        return result;
+      };
 
-			try {
-				var elements = [];
-				dataObject = retrieveDataOject(dataObjects);
-				if (dataObject) {
-					elements.push(processDataObject(dataObject));
-				}
-				dataObjects.forEach(function (element) {
-					elements.push(processDataObject(element));
-				});
-				graphData = elements;
+      try {
+        var elements = [];
+        dataObject = retrieveDataOject(dataObjects);
+        if (dataObject) {
+          elements.push(processDataObject(dataObject));
+        }
+        dataObjects.forEach(function(element) {
+          elements.push(processDataObject(element));
+        });
+        graphData = elements;
 
+        // Transform the object data into a string
+        // cause PHP has limitations in the number
+        // of POST params received.
+        var graphDataStr = JSON.stringify(graphData);
 
-				// Transform the object data into a string
-				// cause PHP has limitations in the number
-				// of POST params received.
-				var graphDataStr = JSON.stringify(graphData);
+        // Build form
+        var $form = $("<form></form>"),
+          $dataInput = $("<input>"),
+          $typeInput = $("<input>"),
+          $separatorInput = $("<input>"),
+          $excelInput = $("<input>");
 
-				// Build form
-				var $form = $("<form></form>"),
-					$dataInput = $("<input>"),
-					$typeInput = $("<input>"),
-					$separatorInput = $("<input>"),
-					$excelInput = $("<input>");
+        $dataInput
+          .prop("name", "data")
+          .prop("type", "text")
+          .prop("value", graphDataStr);
 
-				$dataInput
-					.prop("name", "data")
-					.prop("type", "text")
-					.prop("value", graphDataStr);
+        $typeInput
+          .prop("name", "type")
+          .prop("type", "text")
+          .prop("value", type);
 
-				$typeInput
-					.prop("name", "type")
-					.prop("type", "text")
-					.prop("value", type);
+        $separatorInput
+          .prop("name", "separator")
+          .prop("type", "text")
+          .prop("value", ";");
 
-				$separatorInput
-					.prop("name", "separator")
-					.prop("type", "text")
-					.prop("value", ";");
+        $excelInput
+          .prop("name", "excel_encoding")
+          .prop("type", "text")
+          .prop("value", 0);
 
-				$excelInput
-					.prop("name", "excel_encoding")
-					.prop("type", "text")
-					.prop("value", 0);
+        $form
+          .prop("method", "POST")
+          .prop(
+            "action",
+            plot.getOptions().export.homeurl + "include/graphs/export_data.php"
+          )
+          .append($dataInput, $typeInput, $separatorInput, $excelInput)
+          .hide()
+          // Firefox made me write into the DOM for this :(
+          .appendTo("body")
+          .submit();
+      } catch (e) {
+        alert("There was an error exporting the data");
+      }
+    };
 
-				$form
-					.prop("method", "POST")
-					.prop(
-						"action",
-						plot.getOptions().export.homeurl + "include/graphs/export_data.php"
-					)
-					.append($dataInput, $typeInput, $separatorInput, $excelInput)
-					.hide()
-					// Firefox made me write into the DOM for this :(
-					.appendTo("body")
-					.submit();
-			} catch (e) {
-				alert("There was an error exporting the data");
-			}
-		};
+    plot.exportDataJSON = function(args) {
+      //amount = plot.getOptions().export.type,
+      //options = options || {};
 
-		plot.exportDataJSON = function (args) {
-			//amount = plot.getOptions().export.type,
-			//options = options || {};
+      // Options
+      var type = "json";
+      type = type.toLowerCase().trim();
 
-			// Options
-			var type = "json";
-			type = type.toLowerCase().trim();
+      var graphData,
+        dataObject,
+        dataObjects = plot.getData(),
+        result = [];
 
-			var graphData,
-				dataObject,
-				dataObjects = plot.getData(),
-				result = [];
+      // Throw errors
+      var retrieveDataOject = function(dataObjects) {
+        var result;
 
-			// Throw errors
-			var retrieveDataOject = function (dataObjects) {
-				var result;
+        if (typeof dataObjects === "undefined")
+          throw new Error("Empty parameter");
 
-				if (typeof dataObjects === "undefined")
-					throw new Error("Empty parameter");
+        // Try to retrieve the avg set (not 100% reliable, I know)
+        if (dataObjects.length == 1) {
+          result = dataObjects.shift();
+        }
+        if (dataObjects.length > 1) {
+          dataObjects.forEach(function(element) {
+            if (/^Avg.:/i.test(element.label)) result = element;
+          });
 
-				// Try to retrieve the avg set (not 100% reliable, I know)
-				if (dataObjects.length == 1) {
-					result = dataObjects.shift();
-				}
-				if (dataObjects.length > 1) {
-					dataObjects.forEach(function (element) {
-						if (/^Avg.:/i.test(element.label)) result = element;
-					});
+          // If the avg set is missing, retrieve the first set
+          if (typeof result === "undefined") result = dataObjects.shift();
+        }
 
-					// If the avg set is missing, retrieve the first set
-					if (typeof result === "undefined") result = dataObjects.shift();
-				}
+        if (typeof result === "undefined") throw new Error("Empty result");
 
-				if (typeof result === "undefined") throw new Error("Empty result");
+        return result;
+      };
 
-				return result;
-			};
+      // Throw errors
+      var processDataObject = function(dataObject) {
+        var result;
 
-			// Throw errors
-			var processDataObject = function (dataObject) {
-				var result;
+        if (typeof dataObject === "undefined")
+          throw new Error("Empty parameter");
 
-				if (typeof dataObject === "undefined")
-					throw new Error("Empty parameter");
+        if (
+          typeof dataObject.data === "undefined" ||
+          !(dataObject.data instanceof Array)
+        )
+          throw new Error("Object malformed");
 
-				if (
-					typeof dataObject.data === "undefined" ||
-					!(dataObject.data instanceof Array)
-				)
-					throw new Error("Object malformed");
+        /* {
+         *   head: [<column>,<column>,...,<column>],
+         *   data: [
+         *     [<data>,<data>,...,<data>],
+         *     [<data>,<data>,...,<data>],
+         *     ...,
+         *     [<data>,<data>,...,<data>],
+         *   ]
+         * }
+         */
+        if (type === "csv") {
+          result = {
+            head: ["date", "value", "label"],
+            data: []
+          };
 
-				/* {
-				 *   head: [<column>,<column>,...,<column>],
-				 *   data: [
-				 *     [<data>,<data>,...,<data>],
-				 *     [<data>,<data>,...,<data>],
-				 *     ...,
-				 *     [<data>,<data>,...,<data>],
-				 *   ]
-				 * }
-				 */
-				if (type === "csv") {
-					result = {
-						head: ["date", "value", "label"],
-						data: [],
-					};
+          dataObject.data.forEach(function(item, index) {
+            var date = "",
+              value = item[1];
 
-					dataObject.data.forEach(function (item, index) {
-						var date = "",
-							value = item[1];
+            // Long labels are preferred
+            if (
+              typeof plot.getOptions().export.labels_long[index] !== "undefined"
+            )
+              date = plot.getOptions().export.labels_long[index];
+            else if (typeof labels[index] !== "undefined") date = labels[index];
 
-						// Long labels are preferred
-						if (
-							typeof plot.getOptions().export.labels_long[index] !== "undefined"
-						)
-							date = plot.getOptions().export.labels_long[index];
-						else if (typeof labels[index] !== "undefined") date = labels[index];
+            result.data.push([date, value, dataObject.label]);
+          });
+        } else if (type === "json") {
+          /* [
+           *   {
+           *     'date': <date>,
+           *     'value': <value>
+           *   }
+           * ],
+           * [
+           *   {
+           *     'date': <date>,
+           *     'value': <value>
+           *   }
+           * ],
+           * ...,
+           * [
+           *   {
+           *     'date': <date>,
+           *     'value': <value>
+           *   }
+           * ]
+           */
+          result = [];
 
-						result.data.push([date, value, dataObject.label]);
-					});
-				} else if (type === "json") {
-					/* [
-					 *   {
-					 *     'date': <date>,
-					 *     'value': <value>
-					 *   }
-					 * ],
-					 * [
-					 *   {
-					 *     'date': <date>,
-					 *     'value': <value>
-					 *   }
-					 * ],
-					 * ...,
-					 * [
-					 *   {
-					 *     'date': <date>,
-					 *     'value': <value>
-					 *   }
-					 * ]
-					 */
-					result = [];
+          dataObject.data.forEach(function(item, index) {
+            var date = "",
+              value = item[1];
 
-					dataObject.data.forEach(function (item, index) {
-						var date = "",
-							value = item[1];
+            // Long labels are preferred
+            if (typeof labels_long[index] !== "undefined")
+              date = labels_long[index];
+            else if (typeof labels[index] !== "undefined") date = labels[index];
 
-						// Long labels are preferred
-						if (typeof labels_long[index] !== "undefined")
-							date = labels_long[index];
-						else if (typeof labels[index] !== "undefined") date = labels[index];
+            result.push({
+              date: date,
+              value: value,
+              label: dataObject.label
+            });
+          });
+        }
 
-						result.push({
-							date: date,
-							value: value,
-							label: dataObject.label,
-						});
-					});
-				}
+        if (typeof result === "undefined") throw new Error("Empty result");
 
-				if (typeof result === "undefined") throw new Error("Empty result");
+        return result;
+      };
 
-				return result;
-			};
+      try {
+        var elements = [];
+        var custom_graph = $("input:hidden[name=custom_graph]").value;
 
-			try {
-				var elements = [];
-				var custom_graph = $("input:hidden[name=custom_graph]").value;
+        if (custom_graph) {
+          dataObject = retrieveDataOject(dataObjects);
+          dataObjects.forEach(function(element) {
+            elements.push(processDataObject(element));
+          });
+          graphData = elements;
+        } else {
+          dataObject = retrieveDataOject(dataObjects);
+          elements.push(processDataObject(dataObject));
+          graphData = elements;
+        }
 
-				if (custom_graph) {
-					dataObject = retrieveDataOject(dataObjects);
-					dataObjects.forEach(function (element) {
-						elements.push(processDataObject(element));
-					});
-					graphData = elements;
-				} else {
-					dataObject = retrieveDataOject(dataObjects);
-					elements.push(processDataObject(dataObject));
-					graphData = elements;
-				}
+        // Transform the object data into a string
+        // cause PHP has limitations in the number
+        // of POST params received.
+        var graphDataStr = JSON.stringify(graphData);
 
-				// Transform the object data into a string
-				// cause PHP has limitations in the number
-				// of POST params received.
-				var graphDataStr = JSON.stringify(graphData);
+        // Build form
+        var $form = $("<form></form>"),
+          $dataInput = $("<input>"),
+          $typeInput = $("<input>"),
+          $separatorInput = $("<input>"),
+          $excelInput = $("<input>");
 
-				// Build form
-				var $form = $("<form></form>"),
-					$dataInput = $("<input>"),
-					$typeInput = $("<input>"),
-					$separatorInput = $("<input>"),
-					$excelInput = $("<input>");
+        $dataInput
+          .prop("name", "data")
+          .prop("type", "text")
+          .prop("value", graphDataStr);
 
-				$dataInput
-					.prop("name", "data")
-					.prop("type", "text")
-					.prop("value", graphDataStr);
+        $typeInput
+          .prop("name", "type")
+          .prop("type", "text")
+          .prop("value", type);
 
-				$typeInput
-					.prop("name", "type")
-					.prop("type", "text")
-					.prop("value", type);
+        $separatorInput
+          .prop("name", "separator")
+          .prop("type", "text")
+          .prop("value", ";");
 
-				$separatorInput
-					.prop("name", "separator")
-					.prop("type", "text")
-					.prop("value", ";");
+        $excelInput
+          .prop("name", "excel_encoding")
+          .prop("type", "text")
+          .prop("value", 0);
 
-				$excelInput
-					.prop("name", "excel_encoding")
-					.prop("type", "text")
-					.prop("value", 0);
+        $form
+          .prop("method", "POST")
+          .prop(
+            "action",
+            plot.getOptions().export.homeurl + "include/graphs/export_data.php"
+          )
+          .append($dataInput, $typeInput, $separatorInput, $excelInput)
+          .hide()
+          // Firefox made me write into the DOM for this :(
+          .appendTo("body")
+          .submit();
+      } catch (e) {
+        alert("There was an error exporting the data");
+      }
+    };
+  }
 
-				$form
-					.prop("method", "POST")
-					.prop(
-						"action",
-						plot.getOptions().export.homeurl + "include/graphs/export_data.php"
-					)
-					.append($dataInput, $typeInput, $separatorInput, $excelInput)
-					.hide()
-					// Firefox made me write into the DOM for this :(
-					.appendTo("body")
-					.submit();
-			} catch (e) {
-				alert("There was an error exporting the data");
-			}
-		};
-	}
-
-	$.plot.plugins.push({
-		init: init,
-		options: options,
-		name: "exportdata",
-		version: "0.1",
-	});
+  $.plot.plugins.push({
+    init: init,
+    options: options,
+    name: "exportdata",
+    version: "0.1"
+  });
 })(jQuery);

From fe681ba9d78d14a5f52e3ba0f5b86876619af12a Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Thu, 29 Oct 2020 12:13:15 +0100
Subject: [PATCH 10/18] minor style added

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

diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index 6b48ab13ae..6e3df35955 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -462,6 +462,10 @@ select:-internal-list-box {
   width: 120px;
   max-width: 120px;
 }
+.w200px {
+  width: 200px;
+  max-width: 200px;
+}
 .w240px {
   width: 240px;
   max-width: 240px;

From 98a04bfcf8caebaf9622c7649d12fdccd40ccc25 Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Thu, 29 Oct 2020 12:55:44 +0100
Subject: [PATCH 11/18] omg... what a file

---
 .../operation/agentes/status_monitor.php      | 170 +++++++++++++-----
 1 file changed, 122 insertions(+), 48 deletions(-)

diff --git a/pandora_console/operation/agentes/status_monitor.php b/pandora_console/operation/agentes/status_monitor.php
index 7be62557f4..db1e052ab9 100644
--- a/pandora_console/operation/agentes/status_monitor.php
+++ b/pandora_console/operation/agentes/status_monitor.php
@@ -1,6 +1,5 @@
 <?php
-
-
+// This file is an example on how things must NEVER be done.
 // Pandora FMS - http://pandorafms.com
 // ==================================================
 // Copyright (c) 2005-2010 Artica Soluciones Tecnologicas
@@ -41,7 +40,7 @@ if (! defined('METACONSOLE')) {
 
     $buttons['fields'] = [
         'active'    => false,
-        'text'      => '<a href="index.php?sec=view&sec2=operation/agentes/status_monitor&amp;section=fields">'.html_print_image('images/custom_columns.png', true, ['title' => __('Custom fields')]).'</a>',
+        'text'      => '<a href="index.php?sec=view&sec2=operation/agentes/status_monitor&section=fields">'.html_print_image('images/custom_columns.png', true, ['title' => __('Custom fields')]).'</a>',
         'operation' => true,
     ];
 
@@ -79,22 +78,27 @@ if (! defined('METACONSOLE')) {
     ui_meta_print_header(__('Monitor view'));
 }
 
-$ag_freestring         = (string) get_parameter('ag_freestring');
-$moduletype         = (string) get_parameter('moduletype');
-$datatype             = (string) get_parameter('datatype');
-$ag_modulename         = (string) get_parameter('ag_modulename');
-$refr                 = (int) get_parameter('refr', 0);
-$offset             = (int) get_parameter('offset', 0);
-$status             = (int) get_parameter('status', 4);
-$modulegroup         = (int) get_parameter('modulegroup', -1);
-$tag_filter         = (int) get_parameter('tag_filter', 0);
-$min_hours_status         = (string) get_parameter('min_hours_status', '');
-// Sort functionality
-$sortField             = get_parameter('sort_field');
-$sort                 = get_parameter('sort', 'none');
-// When the previous page was a visualmap and show only one module
-$id_module             = (int) get_parameter('id_module', 0);
-$ag_custom_fields     = (array) get_parameter('ag_custom_fields', []);
+$recursion = get_parameter_switch('recursion', false);
+if ($recursion === false) {
+    $recursion = get_parameter('recursion', false);
+}
+
+$ag_freestring = (string) get_parameter('ag_freestring');
+$moduletype = (string) get_parameter('moduletype');
+$datatype = (string) get_parameter('datatype');
+$ag_modulename = (string) get_parameter('ag_modulename');
+$refr = (int) get_parameter('refr', 0);
+$offset = (int) get_parameter('offset', 0);
+$status = (int) get_parameter('status', 4);
+$modulegroup = (int) get_parameter('modulegroup', -1);
+$tag_filter = (int) get_parameter('tag_filter', 0);
+$min_hours_status = (string) get_parameter('min_hours_status', '');
+// Sort functionality.
+$sortField = get_parameter('sort_field');
+$sort = get_parameter('sort', 'none');
+// When the previous page was a visualmap and show only one module.
+$id_module = (int) get_parameter('id_module', 0);
+$ag_custom_fields = (array) get_parameter('ag_custom_fields', []);
 $module_option = (int) get_parameter('module_option', 1);
 $autosearch = false;
 
@@ -161,11 +165,22 @@ if (is_numeric($ag_group)) {
 // Agent group selector
 if (!is_metaconsole()) {
     if ($ag_group > 0 && check_acl($config['id_user'], $ag_group, 'AR')) {
-        $sql_conditions_group = sprintf(
-            ' AND (tagente.id_grupo = %d OR tasg.id_group = %d)',
-            $ag_group,
-            $ag_group
-        );
+        if ($recursion) {
+            $all_groups = groups_get_children_ids($ag_group, true);
+
+            // User has explicit permission on group 1 ?
+            $sql_conditions_group = sprintf(
+                ' AND (tagente.id_grupo IN (%s) OR tasg.id_group IN (%s)) ',
+                implode(',', $all_groups),
+                implode(',', $all_groups)
+            );
+        } else {
+            $sql_conditions_group = sprintf(
+                ' AND (tagente.id_grupo = %d OR tasg.id_group = %d)',
+                $ag_group,
+                $ag_group
+            );
+        }
     } else if ($user_groups != '') {
         // User has explicit permission on group 1 ?
         $sql_conditions_group = ' AND (
@@ -175,11 +190,22 @@ if (!is_metaconsole()) {
     }
 } else {
     if (((int) $ag_group !== 0) && (check_acl($config['id_user'], $id_ag_group, 'AR'))) {
-        $sql_conditions_group = sprintf(
-            ' AND (tagente.id_grupo IN (%s) OR tasg.id_group IN (%s))',
-            $ag_group,
-            $ag_group
-        );
+        if ($recursion) {
+            $all_groups = groups_get_children_ids($ag_group, true);
+
+            // User has explicit permission on group 1 ?
+            $sql_conditions_group = sprintf(
+                ' AND (tagente.id_grupo IN (%s) OR tasg.id_group IN (%s)) ',
+                implode(',', $all_groups),
+                implode(',', $all_groups)
+            );
+        } else {
+            $sql_conditions_group = sprintf(
+                ' AND (tagente.id_grupo IN (%s) OR tasg.id_group IN (%s))',
+                $ag_group,
+                $ag_group
+            );
+        }
     } else if ($user_groups != '') {
         // User has explicit permission on group 1 ?
         $sql_conditions_group = ' AND (
@@ -355,7 +381,8 @@ $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(
+$table->data[0][1] = '<div class="flex flex-row-vcenter w290px"><div class="w200px">';
+$table->data[0][1] .= html_print_select_groups(
     $config['id_user'],
     'AR',
     true,
@@ -375,6 +402,18 @@ $table->data[0][1] = html_print_select_groups(
     'id_grupo',
     false
 );
+$table->data[0][1] .= '</div><div>';
+$table->data[0][1] .= html_print_input(
+    [
+        'type'    => 'checkbox',
+        'name'    => 'recursion',
+        'return'  => true,
+        'checked' => $recursion,
+        'value'   => 1,
+    ]
+);
+$table->data[0][1] .= __('Recursion');
+$table->data[0][1] .= '</div></div>';
 
 $fields = [];
 $fields[AGENT_MODULE_STATUS_NORMAL] = __('Normal');
@@ -701,7 +740,7 @@ foreach ($custom_fields as $custom_field) {
     $table_custom_fields->data[] = $row;
 }
 
-$filters = '<form method="post" action="index.php?sec=view&amp;sec2=operation/agentes/status_monitor&amp;refr='.$refr.'&amp;ag_group='.$ag_group.'&amp;ag_freestring='.$ag_freestring.'&amp;module_option='.$module_option.'&amp;ag_modulename='.$ag_modulename.'&amp;moduletype='.$moduletype.'&amp;datatype='.$datatype.'&amp;status='.$status.'&amp;sort_field='.$sortField.'&amp;sort='.$sort.'&amp;pure='.$config['pure'].$ag_custom_fields_params.'">';
+$filters = '<form method="post" action="index.php?sec=view&sec2=operation/agentes/status_monitor&refr='.$refr.'&ag_group='.$ag_group.'&ag_freestring='.$ag_freestring.'&module_option='.$module_option.'&ag_modulename='.$ag_modulename.'&moduletype='.$moduletype.'&datatype='.$datatype.'&status='.$status.'&sort_field='.$sortField.'&sort='.$sort.'&pure='.$config['pure'].$ag_custom_fields_params.'">';
 if (is_metaconsole()) {
     $table->colspan[4][0] = 7;
     $table->cellstyle[4][0] = 'padding: 10px;';
@@ -969,7 +1008,7 @@ switch ($sortField) {
 }
 
 $sql = 'SELECT
-	(SELECT GROUP_CONCAT(ttag.name SEPARATOR \',\')
+    (SELECT GROUP_CONCAT(ttag.name SEPARATOR \',\')
 		FROM ttag
 		WHERE ttag.id_tag IN (
 			SELECT ttag_module.id_tag
@@ -1013,6 +1052,7 @@ $sql = 'SELECT
 	ORDER BY '.$order['field'].' '.$order['order'].'
 	LIMIT '.$offset.','.$limit_sql;
 
+
 // We do not show the modules until the user searches with the filter
 if ($autosearch) {
     if (! defined('METACONSOLE')) {
@@ -1101,17 +1141,51 @@ if (($config['dbtype'] == 'oracle') && ($result !== false)) {
 
 
 // Urls to sort the table.
-$url_agent_name = 'index.php?sec=view&amp;sec2=operation/agentes/status_monitor&amp;refr='.$refr.'&amp;datatype='.$datatype.'&amp;moduletype='.$moduletype.'&amp;modulegroup='.$modulegroup.'&amp;offset='.$offset.'&amp;ag_group='.$ag_group.'&amp;ag_freestring='.$ag_freestring.'&amp;ag_modulename='.$ag_modulename.'&amp;status='.$status.$ag_custom_fields_params.'&amp;sort_field=agent_alias&amp;sort=';
-$url_type = 'index.php?sec=view&amp;sec2=operation/agentes/status_monitor&amp;datatype='.$datatype.'&amp;moduletype='.$moduletype.'&amp;refr='.$refr.'&amp;modulegroup='.$modulegroup.'&amp;offset='.$offset.'&amp;ag_group='.$ag_group.'&amp;ag_freestring='.$ag_freestring.'&amp;ag_modulename='.$ag_modulename.'&amp;status='.$status.$ag_custom_fields_params.'&amp;sort_field=type&amp;sort=';
-$url_module_name = 'index.php?sec=view&amp;sec2=operation/agentes/status_monitor&amp;datatype='.$datatype.'&amp;moduletype='.$moduletype.'&amp;refr='.$refr.'&amp;modulegroup='.$modulegroup.'&amp;offset='.$offset.'&amp;ag_group='.$ag_group.'&amp;ag_freestring='.$ag_freestring.'&amp;ag_modulename='.$ag_modulename.'&amp;status='.$status.$ag_custom_fields_params.'&amp;sort_field=module_name&amp;sort=';
-$url_server_type = 'index.php?sec=view&amp;sec2=operation/agentes/status_monitor&amp;datatype='.$datatype.'&amp;moduletype='.$moduletype.'&amp;refr='.$refr.'&amp;modulegroup='.$modulegroup.'&amp;offset='.$offset.'&amp;ag_group='.$ag_group.'&amp;ag_freestring='.$ag_freestring.'&amp;ag_modulename='.$ag_modulename.'&amp;status='.$status.$ag_custom_fields_params.'&amp;sort_field=moduletype&amp;sort=';
-$url_interval = 'index.php?sec=view&amp;sec2=operation/agentes/status_monitor&amp;datatype='.$datatype.'&amp;moduletype='.$moduletype.'&amp;refr='.$refr.'&amp;modulegroup='.$modulegroup.'&amp;offset='.$offset.'&amp;ag_group='.$ag_group.'&amp;ag_freestring='.$ag_freestring.'&amp;ag_modulename='.$ag_modulename.'&amp;status='.$status.$ag_custom_fields_params.'&amp;sort_field=interval&amp;sort=';
-$url_status = 'index.php?sec=view&amp;sec2=operation/agentes/status_monitor&amp;datatype='.$datatype.'&amp;moduletype='.$moduletype.'&amp;refr='.$refr.'&amp;modulegroup='.$modulegroup.'&amp;offset='.$offset.'&amp;ag_group='.$ag_group.'&amp;ag_freestring='.$ag_freestring.'&amp;ag_modulename='.$ag_modulename.'&amp;status='.$status.$ag_custom_fields_params.'&amp;sort_field=status&amp;sort=';
-$url_status = 'index.php?sec=view&amp;sec2=operation/agentes/status_monitor&amp;datatype='.$datatype.'&amp;moduletype='.$moduletype.'&amp;refr='.$refr.'&amp;modulegroup='.$modulegroup.'&amp;offset='.$offset.'&amp;ag_group='.$ag_group.'&amp;ag_freestring='.$ag_freestring.'&amp;ag_modulename='.$ag_modulename.'&amp;status='.$status.$ag_custom_fields_params.'&amp;sort_field=last_status_change&amp;sort=';
-$url_data = 'index.php?sec=view&amp;sec2=operation/agentes/status_monitor&amp;datatype='.$datatype.'&amp;moduletype='.$moduletype.'&amp;refr='.$refr.'&amp;modulegroup='.$modulegroup.'&amp;offset='.$offset.'&amp;ag_group='.$ag_group.'&amp;ag_freestring='.$ag_freestring.'&amp;ag_modulename='.$ag_modulename.'&amp;status='.$status.$ag_custom_fields_params.'&amp;sort_field=data&amp;sort=';
-$url_timestamp_up = 'index.php?sec=view&amp;sec2=operation/agentes/status_monitor&amp;datatype='.$datatype.'&amp;moduletype='.$moduletype.'&amp;refr='.$refr.'&amp;offset='.$offset.'&amp;ag_group='.$ag_group.'&amp;ag_freestring='.$ag_freestring.'&amp;ag_modulename='.$ag_modulename.'&amp;status='.$status.$ag_custom_fields_params.'&amp;sort_field=timestamp&amp;sort=up';
-$url_timestamp_down = 'index.php?sec=view&amp;sec2=operation/agentes/status_monitor&amp;datatype='.$datatype.'&amp;moduletype='.$moduletype.'&amp;refr='.$refr.'&amp;modulegroup='.$modulegroup.'&amp;offset='.$offset.'&amp;ag_group='.$ag_group.'&amp;ag_freestring='.$ag_freestring.'&amp;ag_modulename='.$ag_modulename.'&amp;status='.$status.$ag_custom_fields_params.'&amp;sort_field=timestamp&amp;sort=down';
+$url_agent_name = 'index.php?sec=view&sec2=operation/agentes/status_monitor';
+$url_type = 'index.php?sec=view&sec2=operation/agentes/status_monitor';
+$url_module_name = 'index.php?sec=view&sec2=operation/agentes/status_monitor';
+$url_server_type = 'index.php?sec=view&sec2=operation/agentes/status_monitor';
+$url_interval = 'index.php?sec=view&sec2=operation/agentes/status_monitor';
+$url_status = 'index.php?sec=view&sec2=operation/agentes/status_monitor';
+$url_status = 'index.php?sec=view&sec2=operation/agentes/status_monitor';
+$url_data = 'index.php?sec=view&sec2=operation/agentes/status_monitor';
+$url_timestamp_up = 'index.php?sec=view&sec2=operation/agentes/status_monitor';
+$url_timestamp_down = 'index.php?sec=view&sec2=operation/agentes/status_monitor';
 
+$url_agent_name .= '&refr='.$refr.'&datatype='.$datatype.'&moduletype='.$moduletype.'&modulegroup='.$modulegroup.'&offset='.$offset.'&ag_group='.$ag_group.'&ag_freestring='.$ag_freestring.'&ag_modulename='.$ag_modulename.'&status='.$status.$ag_custom_fields_params;
+$url_type .= '&datatype='.$datatype.'&moduletype='.$moduletype.'&refr='.$refr.'&modulegroup='.$modulegroup.'&offset='.$offset.'&ag_group='.$ag_group.'&ag_freestring='.$ag_freestring.'&ag_modulename='.$ag_modulename.'&status='.$status.$ag_custom_fields_params;
+$url_module_name .= '&datatype='.$datatype.'&moduletype='.$moduletype.'&refr='.$refr.'&modulegroup='.$modulegroup.'&offset='.$offset.'&ag_group='.$ag_group.'&ag_freestring='.$ag_freestring.'&ag_modulename='.$ag_modulename.'&status='.$status.$ag_custom_fields_params;
+$url_server_type .= '&datatype='.$datatype.'&moduletype='.$moduletype.'&refr='.$refr.'&modulegroup='.$modulegroup.'&offset='.$offset.'&ag_group='.$ag_group.'&ag_freestring='.$ag_freestring.'&ag_modulename='.$ag_modulename.'&status='.$status.$ag_custom_fields_params;
+$url_interval .= '&datatype='.$datatype.'&moduletype='.$moduletype.'&refr='.$refr.'&modulegroup='.$modulegroup.'&offset='.$offset.'&ag_group='.$ag_group.'&ag_freestring='.$ag_freestring.'&ag_modulename='.$ag_modulename.'&status='.$status.$ag_custom_fields_params;
+$url_status .= '&datatype='.$datatype.'&moduletype='.$moduletype.'&refr='.$refr.'&modulegroup='.$modulegroup.'&offset='.$offset.'&ag_group='.$ag_group.'&ag_freestring='.$ag_freestring.'&ag_modulename='.$ag_modulename.'&status='.$status.$ag_custom_fields_params;
+$url_status .= '&datatype='.$datatype.'&moduletype='.$moduletype.'&refr='.$refr.'&modulegroup='.$modulegroup.'&offset='.$offset.'&ag_group='.$ag_group.'&ag_freestring='.$ag_freestring.'&ag_modulename='.$ag_modulename.'&status='.$status.$ag_custom_fields_params;
+$url_data .= '&datatype='.$datatype.'&moduletype='.$moduletype.'&refr='.$refr.'&modulegroup='.$modulegroup.'&offset='.$offset.'&ag_group='.$ag_group.'&ag_freestring='.$ag_freestring.'&ag_modulename='.$ag_modulename.'&status='.$status.$ag_custom_fields_params;
+$url_timestamp_up .= '&datatype='.$datatype.'&moduletype='.$moduletype.'&refr='.$refr.'&offset='.$offset.'&ag_group='.$ag_group.'&ag_freestring='.$ag_freestring.'&ag_modulename='.$ag_modulename.'&status='.$status.$ag_custom_fields_params;
+$url_timestamp_down .= '&datatype='.$datatype.'&moduletype='.$moduletype.'&refr='.$refr.'&modulegroup='.$modulegroup.'&offset='.$offset.'&ag_group='.$ag_group.'&ag_freestring='.$ag_freestring.'&ag_modulename='.$ag_modulename.'&status='.$status.$ag_custom_fields_params;
+
+// Holy god...
+$url_agent_name .= '&recursion='.$recursion;
+$url_type .= '&recursion='.$recursion;
+$url_module_name .= '&recursion='.$recursion;
+$url_server_type .= '&recursion='.$recursion;
+$url_interval .= '&recursion='.$recursion;
+$url_status .= '&recursion='.$recursion;
+$url_status .= '&recursion='.$recursion;
+$url_data .= '&recursion='.$recursion;
+$url_timestamp_up .= '&recursion='.$recursion;
+$url_timestamp_down .= '&recursion='.$recursion;
+
+
+$url_agent_name .= '&sort_field=agent_alias&sort=';
+$url_type .= '&sort_field=type&sort=';
+$url_module_name .= '&sort_field=module_name&sort=';
+$url_server_type .= '&sort_field=moduletype&sort=';
+$url_interval .= '&sort_field=interval&sort=';
+$url_status .= '&sort_field=status&sort=';
+$url_status .= '&sort_field=last_status_change&sort=';
+$url_data .= '&sort_field=data&sort=';
+$url_timestamp_up .= '&sort_field=timestamp&sort=up';
+$url_timestamp_down .= '&sort_field=timestamp&sort=down';
 
 // Start Build List Result
 if (!empty($result)) {
@@ -1275,9 +1349,9 @@ if (!empty($result)) {
                     }
 
                     if (is_metaconsole()) {
-                        $data[0] = '<a href="?sec=gmodules&amp;sec2=advanced/policymanager&amp;id='.$policyInfo['id_policy'].'">'.html_print_image($img, true, ['title' => $title]).'</a>';
+                        $data[0] = '<a href="?sec=gmodules&sec2=advanced/policymanager&id='.$policyInfo['id_policy'].'">'.html_print_image($img, true, ['title' => $title]).'</a>';
                     } else {
-                        $data[0] = '<a href="?sec=gmodules&amp;sec2=enterprise/godmode/policies/policies&amp;id='.$policyInfo['id_policy'].'">'.html_print_image($img, true, ['title' => $title]).'</a>';
+                        $data[0] = '<a href="?sec=gmodules&sec2=enterprise/godmode/policies/policies&id='.$policyInfo['id_policy'].'">'.html_print_image($img, true, ['title' => $title]).'</a>';
                     }
                 }
 
@@ -1292,7 +1366,7 @@ if (!empty($result)) {
 
             // TODO: Calculate hash access before to use it more simply like other sections. I.E. Events view
             if (defined('METACONSOLE')) {
-                $agent_link = '<a href="'.$row['server_url'].'index.php?'.'sec=estado&amp;'.'sec2=operation/agentes/ver_agente&amp;'.'id_agente='.$row['id_agent'].'&amp;'.'loginhash=auto&amp;'.'loginhash_data='.$row['hashdata'].'&amp;'.'loginhash_user='.str_rot13($row['user']).'">';
+                $agent_link = '<a href="'.$row['server_url'].'index.php?'.'sec=estado&'.'sec2=operation/agentes/ver_agente&'.'id_agente='.$row['id_agent'].'&'.'loginhash=auto&'.'loginhash_data='.$row['hashdata'].'&'.'loginhash_user='.str_rot13($row['user']).'">';
                 $agent_alias = ui_print_truncate_text(
                     $agent_alias,
                     'agent_small',
@@ -1308,7 +1382,7 @@ if (!empty($result)) {
                     $data[1] = $agent_alias;
                 }
             } else {
-                $data[1] = '<strong><a href="index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;id_agente='.$row['id_agent'].'">';
+                $data[1] = '<strong><a href="index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente='.$row['id_agent'].'">';
                 $data[1] .= ui_print_truncate_text($agent_alias, 'agent_medium', false, true, false, '[&hellip;]', 'font-size:7.5pt;');
                 $data[1] .= '</a></strong>';
             }
@@ -1324,9 +1398,9 @@ if (!empty($result)) {
                         $show_edit_icon = false;
                     }
 
-                    $url_edit_module = $row['server_url'].'index.php?'.'sec=gagente&amp;'.'sec2=godmode/agentes/configurar_agente&amp;'.'id_agente='.$row['id_agent'].'&amp;'.'tab=module&amp;'.'id_agent_module='.$row['id_agente_modulo'].'&amp;'.'edit_module=1'.'&amp;loginhash=auto&amp;loginhash_data='.$row['hashdata'].'&amp;loginhash_user='.str_rot13($row['user']);
+                    $url_edit_module = $row['server_url'].'index.php?'.'sec=gagente&'.'sec2=godmode/agentes/configurar_agente&'.'id_agente='.$row['id_agent'].'&'.'tab=module&'.'id_agent_module='.$row['id_agente_modulo'].'&'.'edit_module=1'.'&loginhash=auto&loginhash_data='.$row['hashdata'].'&loginhash_user='.str_rot13($row['user']);
                 } else {
-                    $url_edit_module = 'index.php?'.'sec=gagente&amp;'.'sec2=godmode/agentes/configurar_agente&amp;'.'id_agente='.$row['id_agent'].'&amp;'.'tab=module&amp;'.'id_agent_module='.$row['id_agente_modulo'].'&amp;'.'edit_module=1';
+                    $url_edit_module = 'index.php?'.'sec=gagente&'.'sec2=godmode/agentes/configurar_agente&'.'id_agente='.$row['id_agent'].'&'.'tab=module&'.'id_agent_module='.$row['id_agente_modulo'].'&'.'edit_module=1';
                 }
 
                 if ($show_edit_icon) {

From 26e809dc37ec530d43b9f306e93f406cca52f827 Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Thu, 29 Oct 2020 17:53:34 +0100
Subject: [PATCH 12/18] fix group alert report

---
 pandora_console/include/functions_alerts.php | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/pandora_console/include/functions_alerts.php b/pandora_console/include/functions_alerts.php
index 2566e265be..5f3731164d 100644
--- a/pandora_console/include/functions_alerts.php
+++ b/pandora_console/include/functions_alerts.php
@@ -2871,17 +2871,8 @@ function alerts_get_agent_modules(
         );
         $agent_modules = db_get_all_rows_sql($sql);
     } else {
-        $groups = groups_get_children($id_grupo, true);
-        if (empty($groups) === false) {
-            $groups = array_reduce(
-                $groups,
-                function ($carry, $item) {
-                    $carry[] = $item['id_grupo'];
-                    return $carry;
-                },
-                [$id_grupo]
-            );
-
+        $groups = groups_get_children_ids($id_grupo, true);
+        if (count($groups) > 1) {
             $sql = sprintf(
                 'SELECT distinct(atm.id_agent_module)
                     FROM talert_template_modules atm

From c4d9c0851ab98ab10f6f6b86c9e04c9c25800c0b Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Thu, 29 Oct 2020 18:08:02 +0100
Subject: [PATCH 13/18] safe output in _event_date_ (custom responses)

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

diff --git a/pandora_console/include/functions_events.php b/pandora_console/include/functions_events.php
index 10eb6bf82d..77b1552989 100644
--- a/pandora_console/include/functions_events.php
+++ b/pandora_console/include/functions_events.php
@@ -6988,7 +6988,9 @@ function events_get_field_value_by_event_id(
     if (strpos($value, '_event_date_') !== false) {
         $value = str_replace(
             '_event_date_',
-            date($config['date_format'], $event['utimestamp']),
+            io_safe_output(
+                date($config['date_format'], $event['utimestamp'])
+            ),
             $value
         );
     }

From 8e4c62a0e9cbf3f67967f40b4841ba4e01b03290 Mon Sep 17 00:00:00 2001
From: Marcos Alconada <marcos.alconada@artica.es>
Date: Thu, 29 Oct 2020 18:20:33 +0100
Subject: [PATCH 14/18] fixed error

---
 pandora_console/extras/mr/42.sql                              | 2 ++
 pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql | 1 +
 pandora_console/include/javascript/pandora.js                 | 3 +--
 pandora_console/pandoradb_data.sql                            | 4 ++--
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/pandora_console/extras/mr/42.sql b/pandora_console/extras/mr/42.sql
index 26f20e0f0a..f4bed54d16 100644
--- a/pandora_console/extras/mr/42.sql
+++ b/pandora_console/extras/mr/42.sql
@@ -31,4 +31,6 @@ ALTER TABLE `treport` ADD COLUMN `index_render` tinyint(1) NOT NULL DEFAULT 1;
 ALTER TABLE `treport_template` ADD COLUMN `cover_page_render` tinyint(1) NOT NULL DEFAULT 1;
 ALTER TABLE `treport_template` ADD COLUMN `index_render` tinyint(1) NOT NULL DEFAULT 1;
 
+UPDATE `tconfig` SET value = '{"0.00000038580247":"Seconds&#x20;to&#x20;months","0.00000165343915":"Seconds&#x20;to&#x20;weeks","0.00001157407407":"Seconds&#x20;to&#x20;days","0.01666666666667":"Seconds&#x20;to&#x20;minutes","0.00000000093132":"Bytes&#x20;to&#x20;Gigabytes","0.00000095367432":"Bytes&#x20;to&#x20;Megabytes","0.00097656250000":"Bytes&#x20;to&#x20;Kilobytes","0.00000001653439":"Timeticks&#x20;to&#x20;weeks","0.00000011574074":"Timeticks&#x20;to&#x20;days"}' WHERE token = 'post_process_custom_values';
+
 COMMIT;
\ No newline at end of file
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 664a7749e1..b1e8f60aad 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
@@ -1405,6 +1405,7 @@ INSERT INTO `tconfig` (`token`, `value`) VALUES ('cr_incident_type', '');
 INSERT INTO `tconfig` (`token`, `value`) VALUES ('cr_incident_status', '');
 INSERT INTO `tconfig` (`token`, `value`) VALUES ('cr_incident_title', '');
 INSERT INTO `tconfig` (`token`, `value`) VALUES ('cr_incident_content', '');
+INSERT INTO `tconfig` (`token`, `value`) VALUES ('post_process_custom_values', '{"0.00000038580247":"Seconds&#x20;to&#x20;months","0.00000165343915":"Seconds&#x20;to&#x20;weeks","0.00001157407407":"Seconds&#x20;to&#x20;days","0.01666666666667":"Seconds&#x20;to&#x20;minutes","0.00000000093132":"Bytes&#x20;to&#x20;Gigabytes","0.00000095367432":"Bytes&#x20;to&#x20;Megabytes","0.00097656250000":"Bytes&#x20;to&#x20;Kilobytes","0.00000001653439":"Timeticks&#x20;to&#x20;weeks","0.00000011574074":"Timeticks&#x20;to&#x20;days"}');
 
 -- ---------------------------------------------------------------------
 -- Table `tconfig_os`
diff --git a/pandora_console/include/javascript/pandora.js b/pandora_console/include/javascript/pandora.js
index f99ae01c79..e7f007a425 100644
--- a/pandora_console/include/javascript/pandora.js
+++ b/pandora_console/include/javascript/pandora.js
@@ -786,13 +786,12 @@ function post_process_select_events_unit(name, selected) {
 function post_process_select_events(name) {
   $("." + name + "_toggler").click(function() {
     var value = $("#text-" + name + "_text").val();
-
     var count = $("#" + name + "_select option").filter(function(i, item) {
       if (Number($(item).val()) == Number(value)) return true;
       else return false;
     }).length;
 
-    if (count != 1) {
+    if (count < 1) {
       $("#" + name + "_select").append(
         $("<option>")
           .val(value)
diff --git a/pandora_console/pandoradb_data.sql b/pandora_console/pandoradb_data.sql
index ad20052428..53b1a1027f 100644
--- a/pandora_console/pandoradb_data.sql
+++ b/pandora_console/pandoradb_data.sql
@@ -113,7 +113,7 @@ INSERT INTO `tconfig` (`token`, `value`) VALUES
 ('identification_reminder', 1),
 ('identification_reminder_timestamp', 0),
 ('current_package_enterprise', 750),
-('post_process_custom_values', '{"0.00000038580247":"Seconds&#x20;to&#x20;months","0.00000165343915":"Seconds&#x20;to&#x20;weeks","0.00001157407407":"Seconds&#x20;to&#x20;days","0.01666666666667":"Seconds&#x20;to&#x20;minutes","0.00000000093132":"Bytes&#x20;to&#x20;Gigabytes","0.00000095367432":"Bytes&#x20;to&#x20;Megabytes","0.0009765625":"Bytes&#x20;to&#x20;Kilobytes","0.00000001653439":"Timeticks&#x20;to&#x20;weeks","0.00000011574074":"Timeticks&#x20;to&#x20;days"}'),
+('post_process_custom_values', '{"0.00000038580247":"Seconds&#x20;to&#x20;months","0.00000165343915":"Seconds&#x20;to&#x20;weeks","0.00001157407407":"Seconds&#x20;to&#x20;days","0.01666666666667":"Seconds&#x20;to&#x20;minutes","0.00000000093132":"Bytes&#x20;to&#x20;Gigabytes","0.00000095367432":"Bytes&#x20;to&#x20;Megabytes","0.00097656250000":"Bytes&#x20;to&#x20;Kilobytes","0.00000001653439":"Timeticks&#x20;to&#x20;weeks","0.00000011574074":"Timeticks&#x20;to&#x20;days"}'),
 ('custom_docs_logo', 'default_docs.png'),
 ('custom_support_logo', 'default_support.png'),
 ('custom_logo_white_bg_preview', 'pandora_logo_head_white_bg.png'),
@@ -2747,4 +2747,4 @@ SELECT @plugin_id := `id` FROM `tplugin` WHERE `name` = @plugin_name;
 
 INSERT IGNORE INTO `tnetwork_component` (`id_nc`, `name`, `description`, `id_group`, `type`, `max`, `min`, `module_interval`, `tcp_port`, `tcp_send`, `tcp_rcv`, `snmp_community`, `snmp_oid`, `id_module_group`, `id_modulo`, `id_plugin`, `plugin_user`, `plugin_pass`, `plugin_parameter`, `max_timeout`, `max_retries`, `history_data`, `min_warning`, `max_warning`, `str_warning`, `min_critical`, `max_critical`, `str_critical`, `min_ff_event`, `custom_string_1`, `custom_string_2`, `custom_string_3`, `custom_integer_1`, `custom_integer_2`, `post_process`, `unit`, `wizard_level`, `macros`, `critical_instructions`, `warning_instructions`, `unknown_instructions`, `critical_inverse`, `warning_inverse`, `id_category`, `tags`, `disabled_types_event`, `module_macros`, `min_ff_event_normal`, `min_ff_event_warning`, `min_ff_event_critical`, `ff_type`, `each_ff`, `dynamic_interval`, `dynamic_max`, `dynamic_min`, `dynamic_next`, `dynamic_two_tailed`, `module_type`, `protocol`, `manufacturer_id`, `execution_type`, `scan_type`, `value`, `value_operations`, `module_enabled`, `name_oid`, `query_class`, `query_key_field`, `scan_filters`, `query_filters`, `enabled`) VALUES (@component_id,@component_name,@component_description,@group_id,1,0,0,0,0,'','','','',0,9,0,'','','',0,0,0,80.00,90.00,'',90.00,0.00,'',0,'','','',0,0,0.000000000000000,'%','nowizard',CONCAT('{\"extra_field_1\":\"Size\",\"extra_field_2\":\"FreeSpace\",\"satellite_execution\":\"/etc/pandora/satellite_plugins/wizard_wmi_module&#x20;-host&#x20;&quot;_address_&quot;&#x20;-namespace&#x20;&quot;_namespace_wmi_&quot;&#x20;-user&#x20;&quot;_user_wmi_&quot;&#x20;-pass&#x20;&quot;_pass_wmi_&quot;&#x20;-wmiClass&#x20;&quot;_class_wmi_&quot;&#x20;-fieldsList&#x20;&quot;_field_wmi_1_,_field_wmi_2_&quot;&#x20;-queryFilter&#x20;&quot;DeviceID&#x20;=&#x20;&#039;_DeviceID_&#039;&quot;&#x20;-operation&#x20;&quot;&#40;&#40;_f1_&#x20;-&#x20;_f2_&#41;&#x20;*&#x20;100&#41;&#x20;/&#x20;_f1_&quot;&#x20;-wmicPath&#x20;/usr/bin/wmic\",\"value_operation\":\"&#40;&#40;_Size_&#x20;-&#x20;_FreeSpace_&#41;&#x20;*&#x20;100&#41;&#x20;/&#x20;_Size_\",\"server_plugin\":\"',@plugin_id,'\",\"_field2__wmi_field\":\"_namespace_wmi_\",\"_field1__wmi_field\":\"_address_\",\"_field4__wmi_field\":\"_pass_wmi_\",\"_field3__wmi_field\":\"_user_wmi_\",\"_field6__wmi_field\":\"_field_wmi_1_,_field_wmi_2_\",\"_field5__wmi_field\":\"_class_wmi_\",\"_field8__wmi_field\":\"&#40;&#40;_f1_&#x20;-&#x20;_f2_&#41;&#x20;*&#x20;100&#41;&#x20;/&#x20;_f1_\",\"_field7__wmi_field\":\"DeviceID&#x20;=&#x20;&#039;_DeviceID_&#039;\",\"field0_wmi_field\":\"\"}'),'','','',0,0,0,'','{\"going_unknown\":0}','',0,0,0,0,0,0,0,0,0,0,1,'wmi','',2,2,'','',1,'','Win32_LogicalDisk','DeviceID','','{\"scan\":\"DriveType&#x20;=&#x20;3\",\"execution\":\"\",\"field\":\"\",\"key_string\":\"\"}',1);
 
-INSERT IGNORE INTO `tpen` VALUES (171,'dlink','D-Link Systems, Inc.'),(14988,'mikrotik','MikroTik'),(6486,'alcatel','Alcatel-Lucent Enterprise'),(41112,'ubiquiti','Ubiquiti Networks, Inc.'),(207,'telesis','Allied Telesis, Inc.'),(10002,'frogfoot','Frogfoot Networks'),(2,'ibm','IBM'),(4,'unix','Unix'),(63,'apple','Apple Computer, Inc.'),(674,'dell','Dell Inc.'),(111,'oracle','Oracle'),(116,'hitachi','Hitachi, Ltd.'),(173,'netlink','Netlink'),(188,'ascom','Ascom'),(6574,'synology','Synology Inc.'),(3861,'fujitsu','Fujitsu Network Communications, Inc.'),(53526,'dell','Dell ATC'),(52627,'apple','Apple Inc'),(19464,'hitachi','Hitachi Communication Technologies, Ltd.'),(13062,'ascom','Ascom');
\ No newline at end of file
+INSERT IGNORE INTO `tpen` VALUES (171,'dlink','D-Link Systems, Inc.'),(14988,'mikrotik','MikroTik'),(6486,'alcatel','Alcatel-Lucent Enterprise'),(41112,'ubiquiti','Ubiquiti Networks, Inc.'),(207,'telesis','Allied Telesis, Inc.'),(10002,'frogfoot','Frogfoot Networks'),(2,'ibm','IBM'),(4,'unix','Unix'),(63,'apple','Apple Computer, Inc.'),(674,'dell','Dell Inc.'),(111,'oracle','Oracle'),(116,'hitachi','Hitachi, Ltd.'),(173,'netlink','Netlink'),(188,'ascom','Ascom'),(6574,'synology','Synology Inc.'),(3861,'fujitsu','Fujitsu Network Communications, Inc.'),(53526,'dell','Dell ATC'),(52627,'apple','Apple Inc'),(19464,'hitachi','Hitachi Communication Technologies, Ltd.'),(13062,'ascom','Ascom');

From 8c92e5420d1d7c1e99e0b609dc606e2f3655ca2b Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Fri, 30 Oct 2020 01:00:21 +0100
Subject: [PATCH 15/18] 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 bb54c56b4c..aee5645947 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.750-201029
+Version: 7.0NG.750-201030
 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 7e6e85035c..ebd275a094 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.750-201029"
+pandora_version="7.0NG.750-201030"
 
 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 d55e379f01..3205d7b83a 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -55,7 +55,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.750';
-use constant AGENT_BUILD => '201029';
+use constant AGENT_BUILD => '201030';
 
 # 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 698b2439d2..e4dd2984b0 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.750
-%define release     201029
+%define release     201030
 
 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 8d18a817fe..c25a116188 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.750
-%define release     201029
+%define release     201030
 
 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 81a292285e..90857b204a 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.750"
-PI_BUILD="201029"
+PI_BUILD="201030"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index f6493723fd..1d96fa16cd 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{201029}
+{201030}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index bac75d8cd5..c12b388dfe 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.750(Build 201029)")
+#define PANDORA_VERSION ("7.0NG.750(Build 201030)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index 070d4c6fbd..f8c9df8998 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.750(Build 201029))"
+      VALUE "ProductVersion", "(7.0NG.750(Build 201030))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 304b66c7a6..4e046ce5a6 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.750-201029
+Version: 7.0NG.750-201030
 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 a7ca73a213..1731f3c847 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.750-201029"
+pandora_version="7.0NG.750-201030"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index e490b8d671..7b8578f503 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 = 'PC201029';
+$build_version = 'PC201030';
 $pandora_version = 'v7.0NG.750';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index f706f1dff4..7bf0897508 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -129,7 +129,7 @@
         <div style='height: 10px'>
             <?php
             $version = '7.0NG.750';
-            $build = '201029';
+            $build = '201030';
             $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 37fa8092c2..d6d7f13e72 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.750
-%define release     201029
+%define release     201030
 
 # 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 162aeaef50..f03a5e193a 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.750
-%define release     201029
+%define release     201030
 
 # 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 de5a3f753c..15e0ef43a1 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.750
-%define release     201029
+%define release     201030
 %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 1afd3bd5bb..010b7b5111 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.750-201029
+Version: 7.0NG.750-201030
 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 2aff52280a..cf4ae0cca6 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.750-201029"
+pandora_version="7.0NG.750-201030"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 03f3c1e109..cecadd6c18 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.750";
-my $pandora_build = "201029";
+my $pandora_build = "201030";
 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 17a8779e7f..f750c10cfc 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.750";
-my $pandora_build = "201029";
+my $pandora_build = "201030";
 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 258f820820..95907ab89a 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.750
-%define release     201029
+%define release     201030
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 7b05aea60c..2b9b8df852 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.750
-%define release     201029
+%define release     201030
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 2712d24fd2..5c3be71b82 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.750"
-PI_BUILD="201029"
+PI_BUILD="201030"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index e7a1e7ec12..aaa8bece15 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.750 PS201029";
+my $version = "7.0NG.750 PS201030";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 80771fd543..6757cebf66 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.750 PS201029";
+my $version = "7.0NG.750 PS201030";
 
 # save program name for logging
 my $progname = basename($0);

From 2376ef408bcfb66ef38ce9955b4f0f1dad077d33 Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Fri, 30 Oct 2020 11:22:39 +0100
Subject: [PATCH 16/18] Update functions_events.php resolve entities for
 group_name in event responses

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

diff --git a/pandora_console/include/functions_events.php b/pandora_console/include/functions_events.php
index 77b1552989..4a32fab3c2 100644
--- a/pandora_console/include/functions_events.php
+++ b/pandora_console/include/functions_events.php
@@ -3761,7 +3761,7 @@ function events_get_response_target(
     if (strpos($target, '_group_name_') !== false) {
         $target = str_replace(
             '_group_name_',
-            groups_get_name($event['id_grupo'], true),
+            io_safe_output(groups_get_name($event['id_grupo'], true)),
             $target
         );
     }

From 4e2d5bdf2bccc58bf4ec172ba94277d1143072c0 Mon Sep 17 00:00:00 2001
From: daniel <daniel.barbero@artica.es>
Date: Fri, 30 Oct 2020 13:23:47 +0100
Subject: [PATCH 17/18] fix counter groups child

---
 .../include/javascript/tree/TreeController.js | 34 ++++++++++++++++---
 1 file changed, 29 insertions(+), 5 deletions(-)

diff --git a/pandora_console/include/javascript/tree/TreeController.js b/pandora_console/include/javascript/tree/TreeController.js
index 497e18c266..1aeb7ad799 100644
--- a/pandora_console/include/javascript/tree/TreeController.js
+++ b/pandora_console/include/javascript/tree/TreeController.js
@@ -12,6 +12,8 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
 
+/*global $, _*/
+
 var TreeController = {
   controllers: [],
   getController: function() {
@@ -38,12 +40,35 @@ var TreeController = {
           return;
         }
 
+        function _recursiveGroupsCount(elements, childGroupsLength) {
+          if (typeof childGroupsLength === "undefined") {
+            childGroupsLength = 0;
+          }
+
+          _.each(elements, function(element) {
+            if (typeof element.children !== "undefined") {
+              childGroupsLength = _recursiveGroupsCount(
+                element.children,
+                childGroupsLength
+              );
+              childGroupsLength += element.children.length;
+            }
+          });
+          return childGroupsLength;
+        }
+
         // Load branch
         function _processGroup(container, elements, rootGroup) {
           var $group = $("<ul></ul>");
+          var childGroupsLength = _recursiveGroupsCount(elements);
 
-          // First group
+          // First group.
           if (typeof rootGroup != "undefined" && rootGroup == true) {
+            var messageLength = controller.tree.length;
+            if (childGroupsLength > 0) {
+              messageLength = childGroupsLength + controller.tree.length;
+            }
+
             $group
               .addClass("tree-root")
               .hide()
@@ -54,13 +79,12 @@ var TreeController = {
                   'images/pandora.png" />' +
                   "<span class='margin-left-1'>" +
                   (controller.tree.length > 0
-                    ? controller.foundMessage + ": " + controller.tree.length
+                    ? controller.foundMessage + ": " + messageLength
                     : "") +
                   "</div>"
               );
-          }
-          // Normal group
-          else {
+          } else {
+            // Normal group.
             $group.addClass("tree-group").hide();
           }
 

From b3043c2e0181915d88e2fa9e26116d760f7b56a2 Mon Sep 17 00:00:00 2001
From: daniel <daniel.barbero@artica.es>
Date: Fri, 30 Oct 2020 13:29:50 +0100
Subject: [PATCH 18/18] Fixed template events

---
 pandora_console/include/functions_events.php  | 140 +++++++++++-------
 .../include/functions_reporting.php           |   2 +-
 pandora_console/mobile/operation/events.php   |   2 +-
 .../operation/events/events_list.php          |   4 +-
 4 files changed, 88 insertions(+), 60 deletions(-)

diff --git a/pandora_console/include/functions_events.php b/pandora_console/include/functions_events.php
index 53fb89e6b7..56df5325cd 100644
--- a/pandora_console/include/functions_events.php
+++ b/pandora_console/include/functions_events.php
@@ -1552,26 +1552,18 @@ function events_get_event($id, $fields=false, $meta=false, $history=false)
 /**
  * Retrieve all events ungrouped.
  *
- * @param string  $sql_post   Sql_post.
- * @param integer $offset     Offset.
- * @param integer $pagination Pagination.
- * @param boolean $meta       Meta.
- * @param boolean $history    History.
- * @param boolean $total      Total.
- * @param boolean $history_db History_db.
- * @param string  $order      Order.
+ * @param string  $sql_post  Sql_post.
+ * @param boolean $meta      Meta.
+ * @param boolean $history   History.
+ * @param boolean $returnSql Only Query.
  *
  * @return mixed Array of events or false.
  */
 function events_get_events_no_grouped(
     $sql_post,
-    $offset=0,
-    $pagination=1,
     $meta=false,
     $history=false,
-    $total=false,
-    $history_db=false,
-    $order='ASC'
+    $returnSql=false
 ) {
     global $config;
 
@@ -1581,7 +1573,11 @@ function events_get_events_no_grouped(
     $sql .= events_get_secondary_groups_left_join($table);
     $sql .= $sql_post;
 
-    $events = db_get_all_rows_sql($sql, $history_db);
+    if ($returnSql === true) {
+        return $sql;
+    }
+
+    $events = db_get_all_rows_sql($sql, $history);
 
     return $events;
 }
@@ -1634,29 +1630,59 @@ function events_get_events_grouped(
     $event_lj = events_get_secondary_groups_left_join($table);
     if ($total) {
         $sql = "SELECT COUNT(*) FROM (SELECT id_evento
-            FROM $table te $event_lj
-            WHERE 1=1 ".$sql_post.'
+            FROM $table te $event_lj ".$sql_post.'
             GROUP BY estado, evento, id_agente, id_agentmodule'.$groupby_extra.') AS t';
     } else {
-        $sql = "SELECT *, MAX(id_evento) AS id_evento,
-            GROUP_CONCAT(DISTINCT user_comment SEPARATOR '<br>') AS user_comment,
-            GROUP_CONCAT(DISTINCT id_evento SEPARATOR ',') AS similar_ids,
-            COUNT(id_evento) AS event_rep, MAX(utimestamp) AS timestamp_rep, 
-            MIN(utimestamp) AS timestamp_rep_min,
-            (SELECT owner_user FROM $table WHERE id_evento = MAX(te.id_evento)) owner_user,
-            (SELECT id_usuario FROM $table WHERE id_evento = MAX(te.id_evento)) id_usuario,
-            (SELECT id_agente FROM $table WHERE id_evento = MAX(te.id_evento)) id_agente,
-            (SELECT criticity FROM $table WHERE id_evento = MAX(te.id_evento)) AS criticity,
-            (SELECT ack_utimestamp FROM $table WHERE id_evento = MAX(te.id_evento)) AS ack_utimestamp,
-            (SELECT nombre FROM tagente_modulo WHERE id_agente_modulo = te.id_agentmodule) AS module_name
-            FROM $table te $event_lj
-            WHERE 1=1 ".$sql_post.'
-            GROUP BY estado, evento, id_agente, id_agentmodule'.$groupby_extra;
-        $sql .= ' '.events_get_sql_order($sort_field, $order, 2);
-        $sql .= ' LIMIT '.$offset.','.$pagination;
+        $sql = sprintf(
+            'SELECT *,
+                MAX(id_evento) AS id_evento,
+                GROUP_CONCAT(
+                    DISTINCT user_comment SEPARATOR "<br>"
+                ) AS user_comment,
+                GROUP_CONCAT(
+                    DISTINCT id_evento SEPARATOR ","
+                ) AS similar_ids,
+                COUNT(id_evento) AS event_rep, MAX(utimestamp) AS timestamp_rep,
+                MIN(utimestamp) AS timestamp_rep_min,
+                (SELECT owner_user
+                    FROM %s
+                    WHERE id_evento = MAX(te.id_evento)) AS owner_user,
+                (SELECT id_usuario
+                    FROM %s
+                    WHERE id_evento = MAX(te.id_evento)) AS id_usuario,
+                (SELECT id_agente
+                    FROM %s
+                    WHERE id_evento = MAX(te.id_evento)) AS id_agente,
+                (SELECT criticity
+                    FROM %s
+                    WHERE id_evento = MAX(te.id_evento)) AS criticity,
+                (SELECT ack_utimestamp
+                    FROM %s
+                    WHERE id_evento = MAX(te.id_evento)) AS ack_utimestamp,
+                (SELECT nombre
+                    FROM tagente_modulo
+                    WHERE id_agente_modulo = te.id_agentmodule) AS module_name
+            FROM %s te %s
+            %s
+            GROUP BY estado, evento, id_agente, id_agentmodule %s
+                %s
+            LIMIT %d, %d',
+            $table,
+            $table,
+            $table,
+            $table,
+            $table,
+            $table,
+            $event_lj,
+            $sql_post,
+            $groupby_extra,
+            events_get_sql_order($sort_field, $order, 2),
+            $offset,
+            $pagination
+        );
     }
 
-    // Extract the events by filter (or not) from db
+    // Extract the events by filter (or not) from db.
     $events = db_get_all_rows_sql($sql, $history_db);
 
     if ($total) {
@@ -2971,7 +2997,8 @@ function events_get_agent(
         $type = [];
         foreach ($filter_event_type as $event_type) {
             if ($event_type != '') {
-                // If normal, warning, could be several (going_up_warning, going_down_warning... too complex.
+                // If normal, warning, could be several
+                // (going_up_warning, going_down_warning... too complex.
                 // Shown to user only "warning, critical and normal".
                 if ($event_type == 'warning' || $event_type == 'critical' || $event_type == 'normal') {
                     $type[] = " event_type LIKE '%".$event_type."%' ";
@@ -2991,10 +3018,10 @@ function events_get_agent(
     }
 
     if ($events_group) {
-        $sql_where .= sprintf(
+        $secondary_groups = sprintf(
             ' INNER JOIN tgrupo tg
-               ON  (te.id_grupo = tg.id_grupo AND tg.id_grupo = %s)
-               OR (tg.id_grupo = tasg.id_group AND tasg.id_group = %s)
+               ON  (te.id_grupo = tg.id_grupo AND tg.id_grupo IN (%s))
+               OR (tg.id_grupo = tasg.id_group AND tasg.id_group IN (%s))
             WHERE utimestamp > %d
             AND utimestamp <= %d ',
             join(',', $id_group),
@@ -3002,22 +3029,27 @@ function events_get_agent(
             $datelimit,
             $date
         );
-    } else if ($events_module) {
-        $sql_where .= sprintf(
-            ' AND id_agentmodule = %d AND utimestamp > %d
-			AND utimestamp <= %d ',
-            $id_agent_module,
-            $datelimit,
-            $date
-        );
+        $sql_where = $secondary_groups.' '.$sql_where;
     } else {
-        $sql_where .= sprintf(
-            ' AND id_agente = %d AND utimestamp > %d
-			AND utimestamp <= %d ',
-            $id_agent,
-            $datelimit,
-            $date
-        );
+        $sql_where = ' WHERE 1=1 '.$sql_where;
+
+        if ($events_module) {
+            $sql_where .= sprintf(
+                ' AND id_agentmodule = %d AND utimestamp > %d
+                AND utimestamp <= %d ',
+                $id_agent_module,
+                $datelimit,
+                $date
+            );
+        } else {
+            $sql_where .= sprintf(
+                ' AND id_agente = %d AND utimestamp > %d
+                AND utimestamp <= %d ',
+                $id_agent,
+                $datelimit,
+                $date
+            );
+        }
     }
 
     if (is_metaconsole() && $id_server) {
@@ -3037,11 +3069,7 @@ function events_get_agent(
     } else {
         return events_get_events_no_grouped(
             $sql_where,
-            0,
-            1000,
             (is_metaconsole() && $id_server) ? true : false,
-            false,
-            false,
             $history
         );
     }
diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php
index 539bc46dc6..479adc67c8 100755
--- a/pandora_console/include/functions_reporting.php
+++ b/pandora_console/include/functions_reporting.php
@@ -2957,7 +2957,7 @@ function reporting_group_report($report, $content)
     if (empty($id_group)) {
         $events = [];
     } else {
-        $sql_where = sprintf(' AND id_grupo IN (%s) AND estado<>1 ', implode(',', $id_group));
+        $sql_where = sprintf(' WHERE id_grupo IN (%s) AND estado<>1 ', implode(',', $id_group));
         $events = events_get_events_grouped(
             $sql_where,
             0,
diff --git a/pandora_console/mobile/operation/events.php b/pandora_console/mobile/operation/events.php
index cca5d7d18e..41d078e1eb 100644
--- a/pandora_console/mobile/operation/events.php
+++ b/pandora_console/mobile/operation/events.php
@@ -731,7 +731,7 @@ class Events
         $system = System::getInstance();
 
         // --------------Fill the SQL POST-------------------------------
-        $sql_post = '';
+        $sql_post = ' WHERE 1=1 ';
 
         switch ($this->status) {
             case 0:
diff --git a/pandora_console/operation/events/events_list.php b/pandora_console/operation/events/events_list.php
index ae39dabf3b..239a1934e3 100644
--- a/pandora_console/operation/events/events_list.php
+++ b/pandora_console/operation/events/events_list.php
@@ -311,7 +311,7 @@ if ($user_filter != 0 && empty($id_name) && !$update_from_filter_table) {
 }
 
 // Build the condition of the events query.
-$sql_post = '';
+$sql_post = ' WHERE 1=1 ';
 
 $id_user = $config['id_user'];
 
@@ -1214,7 +1214,7 @@ if ($group_rep == 0) {
     $sql = 'SELECT COUNT(DISTINCT id_evento)
 			FROM $event_table te
 			$event_lj
-			WHERE 1=1 $sql_post';
+			$sql_post';
     $total_events = (int) db_get_sql($sql);
 } else if ($group_rep == 1) {
     $total_events = events_get_events_grouped(