From 4fe9bdb9a53c60605adcb39aaf7bd0afbd33f6c6 Mon Sep 17 00:00:00 2001
From: Luis Calvo <luis.calvo@artica.es>
Date: Wed, 30 Dec 2020 18:39:56 +0100
Subject: [PATCH 01/44] Fixed session close on api

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

diff --git a/pandora_console/include/api.php b/pandora_console/include/api.php
index 944c3a710c..eccad7ad70 100644
--- a/pandora_console/include/api.php
+++ b/pandora_console/include/api.php
@@ -311,7 +311,7 @@ if ($correctLogin) {
 }
 
 // Logout.
-if (session_status() === PHP_SESSION_ACTIVE) {
+if (session_status() !== PHP_SESSION_DISABLED) {
     $_SESSION = [];
     // Could give a warning if no session file is created. Ignore.
     @session_destroy();

From d9f360016b8ab211fc5dbb0b01abafe5231c94c5 Mon Sep 17 00:00:00 2001
From: Daniel Maya <daniel.maya@artica.es>
Date: Tue, 26 Jan 2021 09:06:49 +0100
Subject: [PATCH 02/44] user_list optimization

---
 pandora_console/godmode/users/user_list.php | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/pandora_console/godmode/users/user_list.php b/pandora_console/godmode/users/user_list.php
index 5178cce690..a297811c8d 100644
--- a/pandora_console/godmode/users/user_list.php
+++ b/pandora_console/godmode/users/user_list.php
@@ -412,17 +412,21 @@ if (!defined('METACONSOLE')) {
     $table->valign[6] = 'top';
 }
 
-$group_um = users_get_groups_UM($config['id_user']);
-
 $info1 = [];
 
 $user_is_admin = users_is_admin();
-// Is admin or has group permissions all.
-if ($user_is_admin || isset($group_um[0])) {
+
+if ($user_is_admin) {
     $info1 = get_users($order);
 } else {
-    foreach ($group_um as $group => $value) {
-        $info1 = array_merge($info1, users_get_users_by_group($group, $value));
+    $group_um = users_get_groups_UM($config['id_user']);
+    // 0 is the group 'all'.
+    if (isset($group_um[0])) {
+        $info1 = get_users($order);
+    } else {
+        foreach ($group_um as $group => $value) {
+            $info1 = array_merge($info1, users_get_users_by_group($group, $value));
+        }
     }
 }
 

From 9454ed2ff3114c38cf9e5f52376a6fb59ffff656 Mon Sep 17 00:00:00 2001
From: marcos <marcos.alconada@artica.es>
Date: Mon, 1 Feb 2021 12:11:39 +0100
Subject: [PATCH 03/44] unsort template items

---
 pandora_console/include/functions_reporting.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php
index 0d4b19efc0..face94f8e9 100755
--- a/pandora_console/include/functions_reporting.php
+++ b/pandora_console/include/functions_reporting.php
@@ -189,6 +189,14 @@ function reporting_make_reporting_data(
 
     $metaconsole_on = is_metaconsole();
     $index_content = 0;
+
+    usort(
+        $contents,
+        function ($a, $b) {
+            return ($a['order'] <=> $b['order']);
+        }
+    );
+
     foreach ($contents as $content) {
         $content['name'] = io_safe_input($content['name']);
         $content['description'] = io_safe_input($content['description']);

From 6a9587bff875e5e0771b71726b7e124873341551 Mon Sep 17 00:00:00 2001
From: Daniel Maya <daniel.maya@artica.es>
Date: Mon, 1 Feb 2021 13:54:57 +0100
Subject: [PATCH 04/44] #4536 autocomplete = off by default

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

diff --git a/pandora_console/include/functions_html.php b/pandora_console/include/functions_html.php
index df1efd0703..538f0a23de 100644
--- a/pandora_console/include/functions_html.php
+++ b/pandora_console/include/functions_html.php
@@ -2095,7 +2095,7 @@ function html_print_input_text_extended(
         'list',
     ];
 
-    $output = '<input '.($password ? 'type="password" autocomplete="'.$autocomplete.'" ' : 'type="text" ');
+    $output = '<input '.($password ? 'type="password" autocomplete="'.$autocomplete.'" ' : 'type="text" autocomplete="'.$autocomplete.'"');
 
     if ($readonly && (!is_array($attributes) || !array_key_exists('readonly', $attributes))) {
         $output .= 'readonly="readonly" ';
@@ -2362,7 +2362,7 @@ function html_print_input_text(
     $function='',
     $class='',
     $onChange='',
-    $autocomplete='',
+    $autocomplete='off',
     $autofocus=false,
     $onKeyDown='',
     $formTo='',
@@ -2401,10 +2401,6 @@ function html_print_input_text(
         $attr['onkeyup'] = $onKeyUp;
     }
 
-    if ($autocomplete !== '') {
-        $attr['autocomplete'] = $autocomplete;
-    }
-
     if ($autofocus === true) {
         $attr['autofocus'] = $autofocus;
     }
@@ -2430,7 +2426,7 @@ function html_print_input_text(
         $return,
         false,
         $function,
-        'off',
+        $autocomplete,
         $disabled
     );
 }
@@ -2502,6 +2498,10 @@ function html_print_input_email(array $settings):string
                 $settings['size'] = 255;
             }
 
+            if (isset($settings['autocomplete']) === false) {
+                $settings['autocomplete'] = 'off';
+            }
+
             foreach ($settings as $attribute => $attr_value) {
                 // Check valid attribute.
                 if (in_array($attribute, $valid_attrs) === false) {
@@ -2581,6 +2581,10 @@ function html_print_input_number(array $settings):string
                 $settings['maxlength'] = 255;
             }
 
+            if (isset($settings['autocomplete']) === false) {
+                $settings['autocomplete'] = 'off';
+            }
+
             foreach ($settings as $attribute => $attr_value) {
                 // Check valid attribute.
                 if (in_array($attribute, $valid_attrs) === false) {
@@ -4357,7 +4361,7 @@ function html_print_input($data, $wrapper='div', $input_only=false)
                 ((isset($data['function']) === true) ? $data['function'] : ''),
                 ((isset($data['class']) === true) ? $data['class'] : ''),
                 ((isset($data['onChange']) === true) ? $data['onChange'] : ''),
-                ((isset($data['autocomplete']) === true) ? $data['autocomplete'] : ''),
+                ((isset($data['autocomplete']) === true) ? $data['autocomplete'] : 'off'),
                 ((isset($data['autofocus']) === true) ? $data['autofocus'] : false),
                 ((isset($data['onKeyDown']) === true) ? $data['onKeyDown'] : ''),
                 ((isset($data['form']) === true) ? $data['form'] : ''),

From 28445e3decc55f7a899dca18c99b8113673c7f98 Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Tue, 2 Feb 2021 15:45:47 +0100
Subject: [PATCH 05/44] API get license, get license_remaining

---
 pandora_console/include/api.php           |  1 +
 pandora_console/include/functions_api.php | 96 +++++++++++++++++++++++
 2 files changed, 97 insertions(+)

diff --git a/pandora_console/include/api.php b/pandora_console/include/api.php
index 944c3a710c..5182a87d25 100644
--- a/pandora_console/include/api.php
+++ b/pandora_console/include/api.php
@@ -36,6 +36,7 @@ define('DEBUG', 0);
 define('VERBOSE', 0);
 
 // TESTING THE UPDATE MANAGER.
+enterprise_include_once('load_enterprise.php');
 enterprise_include_once('include/functions_enterprise_api.php');
 
 $ipOrigin = $_SERVER['REMOTE_ADDR'];
diff --git a/pandora_console/include/functions_api.php b/pandora_console/include/functions_api.php
index d30da4cc4c..843ae291cb 100644
--- a/pandora_console/include/functions_api.php
+++ b/pandora_console/include/functions_api.php
@@ -375,6 +375,102 @@ function api_get_test_event_replication_db()
 
 
 // -------------------------DEFINED OPERATIONS FUNCTIONS-----------------
+
+
+/**
+ * Example: http://localhost/pandora_console/include/api.php?op=get&op2=license&user=admin&apipass=1234&pass=pandora&return_type=json
+ * Retrieve license information.
+ *
+ * @param null   $trash1     Not used.
+ * @param null   $trash1     Not used.
+ * @param null   $trash1     Not used.
+ * @param string $returnType Return type (string, json...).
+ *
+ * @return void
+ */
+function api_get_license($trash1, $trash2, $trash3, $returnType='json')
+{
+    global $config;
+    check_login();
+
+    if (! check_acl($config['id_user'], 0, 'PM')) {
+        returnError('forbidden', $returnType);
+        return;
+    }
+
+    enterprise_include_once('include/functions_license.php');
+    $license = enterprise_hook('license_get_info');
+    if ($license === ENTERPRISE_NOT_HOOK) {
+        // Not an enterprise environment?
+        if (license_free()) {
+            $license = 'PANDORA_FREE';
+        }
+
+        returnData(
+            $returnType,
+            [
+                'type' => 'array',
+                'data' => ['license_mode' => $license],
+            ]
+        );
+        return;
+    }
+
+    returnData(
+        $returnType,
+        [
+            'type' => 'array',
+            'data' => $license,
+        ]
+    );
+
+}
+
+
+/**
+ * Retrieve license status agents or modules left.
+ *
+ * @param null   $trash1     Not used.
+ * @param null   $trash1     Not used.
+ * @param null   $trash1     Not used.
+ * @param string $returnType Return type (string, json...).
+ *
+ * @return void
+ */
+function api_get_license_remaining(
+    $trash1,
+    $trash2,
+    $trash3,
+    $returnType='json'
+) {
+    enterprise_include_once('include/functions_license.php');
+    $license = enterprise_hook('license_get_info');
+    if ($license === ENTERPRISE_NOT_HOOK) {
+        if (license_free()) {
+            returnData(
+                $returnType,
+                [
+                    'type' => 'integer',
+                    'data' => PHP_INT_MAX,
+                ]
+            );
+        } else {
+            returnError('get-license', 'Failed to verify license.');
+        }
+
+        return;
+    }
+
+    returnData(
+        $returnType,
+        [
+            'type' => 'integer',
+            'data' => ($license['limit'] - $license['count_enabled']),
+        ]
+    );
+}
+
+
 function api_get_groups($thrash1, $thrash2, $other, $returnType, $user_in_db)
 {
     $returnAllGroup = true;

From f47eefdeec202d67665d578185521718457f97bf Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Tue, 2 Feb 2021 15:55:01 +0100
Subject: [PATCH 06/44] Minor fix

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

diff --git a/pandora_console/include/functions_api.php b/pandora_console/include/functions_api.php
index 843ae291cb..9d616da4b7 100644
--- a/pandora_console/include/functions_api.php
+++ b/pandora_console/include/functions_api.php
@@ -428,6 +428,7 @@ function api_get_license($trash1, $trash2, $trash3, $returnType='json')
 
 
 /**
+ * Example: http://localhost/pandora_console/include/api.php?op=get&op2=license_remaining&user=admin&apipass=1234&pass=pandora&return_type=json
  * Retrieve license status agents or modules left.
  *
  * @param null   $trash1     Not used.

From 7017c6136eb0dd9bd8fa72c3372a3b668c3f763d Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Wed, 10 Feb 2021 10:21:39 +0100
Subject: [PATCH 07/44] Avoid events while ceasing alerts

---
 pandora_server/lib/PandoraFMS/Core.pm | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm
index 24b89ce1f1..aa63bba6d8 100644
--- a/pandora_server/lib/PandoraFMS/Core.pm
+++ b/pandora_server/lib/PandoraFMS/Core.pm
@@ -679,7 +679,12 @@ sub pandora_process_alert ($$$$$$$$;$$) {
 		$alert->{'critical_instructions'} = $critical_instructions;
 		$alert->{'warning_instructions'} = $warning_instructions;
 		$alert->{'unknown_instructions'} = $unknown_instructions;
-		
+
+		# Generate event only if not quieted by module or agent.
+		return if ((ref($module) eq 'HASH' && $module->{'quiet'} != "0")
+			|| (ref($agent) eq 'HASH' && $agent->{'quiet'} != "0")
+			|| (ref($alert) eq 'HASH' && $alert->{'disable_event'} != "0"));
+
 		# Generate an event
 		if ($table eq 'tevent_alert') {
 			pandora_event ($pa_config, "Alert ceased (" .

From b44d9980347c80bc178ef6a9960f304f74681515 Mon Sep 17 00:00:00 2001
From: marcos <marcos.alconada@artica.es>
Date: Wed, 10 Feb 2021 16:27:29 +0100
Subject: [PATCH 08/44] add deafult header

---
 pandora_console/general/first_task/cluster_builder.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pandora_console/general/first_task/cluster_builder.php b/pandora_console/general/first_task/cluster_builder.php
index f2bee5e687..019dae1e94 100644
--- a/pandora_console/general/first_task/cluster_builder.php
+++ b/pandora_console/general/first_task/cluster_builder.php
@@ -24,6 +24,14 @@ if (! check_acl($config['id_user'], 0, 'AR') && ! check_acl($config['id_user'],
     return;
 }
 
+\ui_print_page_header(
+    __('Monitoring').' &raquo; '.__('Clusters'),
+    'images/chart.png',
+    false,
+    '',
+    false
+);
+
 ui_require_css_file('first_task');
 ?>
 <?php

From 514b3fca0953d2ffc2f61085e424eae5eb42858d Mon Sep 17 00:00:00 2001
From: Luis Calvo <luis.calvo@artica.es>
Date: Mon, 15 Feb 2021 12:55:35 +0100
Subject: [PATCH 09/44] Fixed module library download links

---
 .../include/javascript/module_library.js            | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/pandora_console/include/javascript/module_library.js b/pandora_console/include/javascript/module_library.js
index 4d5be47f8c..c4f2f89eea 100644
--- a/pandora_console/include/javascript/module_library.js
+++ b/pandora_console/include/javascript/module_library.js
@@ -409,7 +409,7 @@ function print_excerpt(id_div, response) {
             category_names(elem.categories) +
             "</span></p>" +
             updated +
-            elem.content.rendered +
+            format_download_link(elem.content.rendered) +
             '<div class="view_web"><a href="' +
             elem.link +
             '" target="_blank"><button class="sub next">' +
@@ -516,3 +516,14 @@ function show_error_msg(selector, message_error) {
     $(selector).append("<div id='empty_result'>" + message_error + "</div>");
   }
 }
+
+function format_download_link(html) {
+  const regex = /href="(?!\bhttps?:\/\/\b)(?!pandorafms.com)(.*)"/gm;
+  var str = html;
+  const subst = `href="https://pandorafms.com$1"`;
+
+  // The substituted value will be contained in the result variable
+  const result = str.replace(regex, subst);
+
+  return result;
+}

From e258069c3978cf03f996e60470e529e139762f59 Mon Sep 17 00:00:00 2001
From: Luis Calvo <luis.calvo@artica.es>
Date: Tue, 23 Feb 2021 11:50:35 +0100
Subject: [PATCH 10/44] Fixed data always formatting to date in sys uptime snmp
 modules

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

diff --git a/pandora_console/include/functions_modules.php b/pandora_console/include/functions_modules.php
index 28b3e36a4c..b06bbbc256 100755
--- a/pandora_console/include/functions_modules.php
+++ b/pandora_console/include/functions_modules.php
@@ -2307,7 +2307,10 @@ function modules_get_agentmodule_data_for_humans($module)
                     switch ($module['id_tipo_modulo']) {
                         case 15:
                             $value = db_get_value('snmp_oid', 'tagente_modulo', 'id_agente_modulo', $module['id_agente_modulo']);
-                            if ($value == '.1.3.6.1.2.1.1.3.0' || $value == '.1.3.6.1.2.1.25.1.1.0') {
+                            if (($value == '.1.3.6.1.2.1.1.3.0'
+                                || $value == '.1.3.6.1.2.1.25.1.1.0')
+                                && modules_get_unit_macro($module['data'], $module['unit']) === true
+                            ) {
                                 if ($module['post_process'] > 0) {
                                     $salida = human_milliseconds_to_string(($module['datos'] / $module['post_process']));
                                 } else {
@@ -2328,7 +2331,10 @@ function modules_get_agentmodule_data_for_humans($module)
             switch ($module['id_tipo_modulo']) {
                 case 15:
                     $value = db_get_value('snmp_oid', 'tagente_modulo', 'id_agente_modulo', $module['id_agente_modulo']);
-                    if ($value == '.1.3.6.1.2.1.1.3.0' || $value == '.1.3.6.1.2.1.25.1.1.0') {
+                    if (($value == '.1.3.6.1.2.1.1.3.0'
+                        || $value == '.1.3.6.1.2.1.25.1.1.0')
+                        && modules_get_unit_macro($module['data'], $module['unit']) === true
+                    ) {
                         if ($module['post_process'] > 0) {
                             $salida = human_milliseconds_to_string(($module['datos'] / $module['post_process']));
                         } else {

From e68d2bfe5cd1758d98c1c43daec1282f3d79e8e9 Mon Sep 17 00:00:00 2001
From: Jose Gonzalez <jose.gonzalez@artica.es>
Date: Tue, 23 Feb 2021 14:32:51 +0100
Subject: [PATCH 11/44] Fixed issue with URLs

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

diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index b9d75f69c6..9511d967e6 100755
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -4235,16 +4235,16 @@ function ui_get_full_url($url='', $no_proxy=false, $add_name_php_file=false, $me
         }
     } else {
         if ($proxy) {
+            if (is_metaconsole() && $metaconsole_root) {
+                $fullurl .= ENTERPRISE_DIR.'/meta';
+            }
+
             $fullurl .= '/';
         } else {
             if ($add_name_php_file) {
                 $fullurl .= $_SERVER['SCRIPT_NAME'];
             } else {
                 $fullurl .= $config['homeurl_static'].'/';
-
-                if (is_metaconsole() && $metaconsole_root) {
-                    $fullurl .= 'enterprise/meta/';
-                }
             }
         }
     }

From f8d9c0018395bed15f69c423dcd1745425cb4d4c Mon Sep 17 00:00:00 2001
From: Luis Calvo <luis.calvo@artica.es>
Date: Thu, 4 Mar 2021 20:15:40 +0100
Subject: [PATCH 12/44] Fixed alert detail filter and tactical view counter for
 disabled alers/agents/modules

---
 pandora_console/include/functions_alerts.php   | 12 +++++++-----
 pandora_console/include/functions_tactical.php | 10 ++++++----
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/pandora_console/include/functions_alerts.php b/pandora_console/include/functions_alerts.php
index df12801680..0f3a3de09b 100644
--- a/pandora_console/include/functions_alerts.php
+++ b/pandora_console/include/functions_alerts.php
@@ -2125,8 +2125,6 @@ function get_group_alerts(
         $disabled = $filter;
     }
 
-    $filter .= ' AND talert_template_modules.disabled = 0 ';
-
     switch ($disabled) {
         case 'notfired':
             $filter .= ' AND times_fired = 0 AND talert_template_modules.disabled = 0';
@@ -2144,9 +2142,13 @@ function get_group_alerts(
             $filter .= ' AND talert_template_modules.disabled = 0';
         break;
 
-        default:
+        case 'all':
             $filter .= '';
         break;
+
+        default:
+            $filter .= ' AND talert_template_modules.disabled = 0 ';
+        break;
     }
 
     // WHEN SELECT ALL TAGS TO FILTER ALERTS
@@ -2186,8 +2188,8 @@ function get_group_alerts(
                         WHERE 1 = 0';
                 } else {
                     $subQuery = 'SELECT id_agente_modulo
-						FROM tagente_modulo
-						WHERE delete_pending = 0
+						FROM tagente_modulo tam
+						WHERE delete_pending = 0 AND tam.disabled = 0
 							AND id_agente IN (SELECT id_agente
 								FROM tagente ta
 								LEFT JOIN tagent_secondary_group tasg
diff --git a/pandora_console/include/functions_tactical.php b/pandora_console/include/functions_tactical.php
index 9cc891b1f1..2456f83491 100644
--- a/pandora_console/include/functions_tactical.php
+++ b/pandora_console/include/functions_tactical.php
@@ -458,7 +458,7 @@ function tactical_monitor_alerts($group_array, $strict_user=false, $id_group_str
         $sql = "SELECT COUNT(talert_template_modules.id)
 			FROM talert_template_modules, tagente_modulo, tagente_estado, tagente
 			WHERE tagente.id_grupo IN $group_clause_strict AND tagente_modulo.id_agente = tagente.id_agente
-            AND tagente.disabled = 0
+            AND tagente.disabled = 0 AND tagente_modulo.disabled = 0
             AND talert_template_modules.disabled = 0
 				AND tagente_estado.id_agente_modulo = tagente_modulo.id_agente_modulo
 				AND talert_template_modules.id_agent_module = tagente_modulo.id_agente_modulo";
@@ -470,7 +470,7 @@ function tactical_monitor_alerts($group_array, $strict_user=false, $id_group_str
             "SELECT COUNT(talert_template_modules.id)
 			FROM talert_template_modules, tagente_modulo, tagente_estado, tagente
 			WHERE tagente.id_grupo IN $group_clause AND tagente_modulo.id_agente = tagente.id_agente
-            AND tagente.disabled = 0
+            AND tagente.disabled = 0 AND tagente_modulo.disabled = 0
             AND talert_template_modules.disabled = 0
 				AND tagente_estado.id_agente_modulo = tagente_modulo.id_agente_modulo
 				AND talert_template_modules.id_agent_module = tagente_modulo.id_agente_modulo"
@@ -499,7 +499,8 @@ function tactical_monitor_fired_alerts($group_array, $strict_user=false, $id_gro
 		WHERE tagente.id_grupo IN $group_clause_strict AND tagente_modulo.id_agente = tagente.id_agente
 			AND tagente_estado.id_agente_modulo = tagente_modulo.id_agente_modulo
 			AND talert_template_modules.id_agent_module = tagente_modulo.id_agente_modulo 
-			AND times_fired > 0 AND talert_template_modules.disabled = 0";
+			AND times_fired > 0 AND talert_template_modules.disabled = 0
+            AND tagente.disabled = 0 AND tagente_modulo.disabled = 0";
 
         $count = db_get_sql($sql);
         return $count;
@@ -511,7 +512,8 @@ function tactical_monitor_fired_alerts($group_array, $strict_user=false, $id_gro
 			WHERE tagente.id_grupo IN $group_clause AND tagente_modulo.id_agente = tagente.id_agente
 				AND tagente_estado.id_agente_modulo = tagente_modulo.id_agente_modulo
 				AND talert_template_modules.id_agent_module = tagente_modulo.id_agente_modulo 
-				AND times_fired > 0 AND talert_template_modules.disabled = 0"
+				AND times_fired > 0 AND talert_template_modules.disabled = 0
+                AND tagente.disabled = 0 AND tagente_modulo.disabled = 0"
         );
     }
 

From f83342969539eb1d2d67353e3aabb194dd1324d5 Mon Sep 17 00:00:00 2001
From: "alejandro.campos@artica.es" <alejandro.campos@artica.es>
Date: Thu, 11 Mar 2021 12:38:42 +0100
Subject: [PATCH 13/44] restricted action creation on alerts created from
 policy

---
 pandora_console/godmode/alerts/alert_list.list.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pandora_console/godmode/alerts/alert_list.list.php b/pandora_console/godmode/alerts/alert_list.list.php
index 5f25b79a10..51624effc3 100644
--- a/pandora_console/godmode/alerts/alert_list.list.php
+++ b/pandora_console/godmode/alerts/alert_list.list.php
@@ -844,9 +844,11 @@ foreach ($simple_alerts as $alert) {
                     ['title' => __('Add action')]
                 );
             } else {
-                $data[4] .= '<a href="javascript:show_add_action(\''.$alert['id'].'\');">';
-                $data[4] .= html_print_image('images/add.png', true, ['title' => __('Add action')]);
-                $data[4] .= '</a>';
+                if ((int) $alert['id_policy_alerts'] === 0) {
+                    $data[4] .= '<a href="javascript:show_add_action(\''.$alert['id'].'\');">';
+                    $data[4] .= html_print_image('images/add.png', true, ['title' => __('Add action')]);
+                    $data[4] .= '</a>';
+                }
             }
         }
 

From bf4710ba93a6e7c3d224c38b33b4f21f17211391 Mon Sep 17 00:00:00 2001
From: Daniel Barbero Martin <daniel.barbero@artica.es>
Date: Mon, 15 Mar 2021 13:26:29 +0100
Subject: [PATCH 14/44] fixed error events reports

---
 pandora_console/include/functions_events.php  | 23 ++++++++++++++++---
 .../include/functions_reporting.php           | 14 +++++------
 2 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/pandora_console/include/functions_events.php b/pandora_console/include/functions_events.php
index 543fe06a13..110b153eec 100644
--- a/pandora_console/include/functions_events.php
+++ b/pandora_console/include/functions_events.php
@@ -3088,7 +3088,7 @@ function events_get_agent(
     } else {
         return events_get_events_no_grouped(
             $sql_where,
-            (is_metaconsole() && $id_server) ? true : false,
+            (is_metaconsole() === true && $id_server === false) ? true : false,
             $history
         );
     }
@@ -5263,16 +5263,22 @@ function events_get_count_events_by_agent(
 
     $tagente = 'tagente';
     $tevento = 'tevento';
+    $field_type = 'ta.id_agente';
+    if ($dbmeta === true) {
+        $tagente = 'tmetaconsole_agent';
+        $tevento = 'tmetaconsole_event';
+        $field_type = 'ta.id_tagente';
+    }
 
     $sql = sprintf(
-        'SELECT 
+        'SELECT
           ta.id_agente,
           ta.alias as agent_name,
           count(*) as count
         FROM %s te
         %s
         INNER JOIN %s ta
-            ON te.id_agente = ta.id_agente
+            ON te.id_agente = %s
         INNER JOIN tgrupo tg
             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))
@@ -5281,6 +5287,7 @@ function events_get_count_events_by_agent(
         $tevento,
         events_get_secondary_groups_left_join($tevento),
         $tagente,
+        $field_type,
         implode(',', $id_group),
         implode(',', $id_group),
         $datelimit,
@@ -5338,6 +5345,9 @@ function events_get_count_events_validated_by_user(
 ) {
     global $config;
     $tevento = 'tevento';
+    if ($dbmeta === true) {
+        $tevento = 'tmetaconsole_event';
+    }
 
     // Group.
     $tgroup_join = '';
@@ -5360,6 +5370,7 @@ function events_get_count_events_validated_by_user(
         );
     }
 
+    $sql_filter = '';
     if (!empty($filter['id_agent'])) {
         $sql_filter .= sprintf(' AND id_agente = %d ', $filter['id_agent']);
     }
@@ -5534,6 +5545,9 @@ function events_get_count_events_by_criticity(
     global $config;
 
     $tevento = 'tevento';
+    if ($dbmeta === true) {
+        $tevento = 'tmetaconsole_event';
+    }
 
     $sql_filter = '';
     $tgroup_join = '';
@@ -5721,6 +5735,9 @@ function events_get_count_events_validated(
 ) {
     global $config;
     $tevento = 'tevento';
+    if ($dbmeta === true) {
+        $tevento = 'tmetaconsole_event';
+    }
 
     // Group.
     $sql_filter = '';
diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php
index 8e0aafe5fb..9990b7ed94 100755
--- a/pandora_console/include/functions_reporting.php
+++ b/pandora_console/include/functions_reporting.php
@@ -1836,9 +1836,8 @@ function reporting_event_report_group(
         $content['name'] = __('Event Report Group');
     }
 
-    if ($config['metaconsole']) {
+    if (is_metaconsole() === true && empty($content['server_name']) === false) {
         $id_meta = metaconsole_get_id_server($content['server_name']);
-
         $server = metaconsole_get_connection_by_id($id_meta);
         metaconsole_connect($server);
     }
@@ -1932,7 +1931,7 @@ function reporting_event_report_group(
         $filter_event_filter_exclude
     );
 
-    if (empty($data)) {
+    if (empty($data) === true) {
         $return['failed'] = __('No events');
     } else {
         $return['data'] = array_reverse($data);
@@ -1960,10 +1959,9 @@ function reporting_event_report_group(
     $return['chart']['by_criticity'] = null;
     $return['chart']['validated_vs_unvalidated'] = null;
     $server_name = $content['server_name'];
-    if (is_metaconsole() && $server_name != '') {
+    $metaconsole_dbtable = false;
+    if (is_metaconsole() === true && empty($server_name) === true) {
         $metaconsole_dbtable = true;
-    } else {
-        $metaconsole_dbtable = false;
     }
 
     if ($event_graph_by_agent) {
@@ -2073,11 +2071,11 @@ function reporting_event_report_group(
         );
     }
 
-    if ($config['metaconsole']) {
+    if (is_metaconsole() === true) {
         metaconsole_restore_db();
     }
 
-    // total_events.
+    // Total events.
     if ($return['data'] != '') {
         $return['total_events'] = count($return['data']);
     } else {

From b78f4093acddf03b2dbeec458195065ebee089ac Mon Sep 17 00:00:00 2001
From: Daniel Barbero Martin <daniel.barbero@artica.es>
Date: Mon, 15 Mar 2021 13:31:24 +0100
Subject: [PATCH 15/44] fixed error tree groups agent edition metaconsole

---
 pandora_console/godmode/groups/group_list.php | 228 +++++++++++-------
 pandora_console/include/ajax/tree.ajax.php    | 143 ++++++++---
 pandora_console/include/class/Tree.class.php  |  37 ++-
 .../include/class/TreeGroup.class.php         | 187 ++++++++++----
 .../include/class/TreeGroupEdition.class.php  | 142 ++++++++---
 5 files changed, 538 insertions(+), 199 deletions(-)

diff --git a/pandora_console/godmode/groups/group_list.php b/pandora_console/godmode/groups/group_list.php
index f1a0cd607e..137796cd6e 100644
--- a/pandora_console/godmode/groups/group_list.php
+++ b/pandora_console/godmode/groups/group_list.php
@@ -39,14 +39,14 @@ require_once $config['homedir'].'/include/functions_groups.php';
 require_once $config['homedir'].'/include/functions_agents.php';
 require_once $config['homedir'].'/include/functions_users.php';
 
-if (is_metaconsole()) {
+if (is_metaconsole() === true) {
     enterprise_include_once('include/functions_metaconsole.php');
     enterprise_include_once('meta/include/functions_agents_meta.php');
     enterprise_hook('open_meta_frame');
 }
 
-if (is_ajax()) {
-    if (! check_acl($config['id_user'], 0, 'AR')) {
+if (is_ajax() === true) {
+    if (check_acl($config['id_user'], 0, 'AR') === false) {
         db_pandora_audit('ACL Violation', 'Trying to access Group Management');
         include 'general/noaccess.php';
         return;
@@ -56,10 +56,10 @@ if (is_ajax()) {
     $get_group_agents = (bool) get_parameter('get_group_agents');
     $get_is_disabled = (bool) get_parameter('get_is_disabled');
 
-    if ($get_group_json) {
+    if ($get_group_json === true) {
         $id_group = (int) get_parameter('id_group');
 
-        if ($id_group == 0) {
+        if ($id_group === 0) {
             $group = [
                 'id_grupo'  => 0,
                 'nombre'    => 'All',
@@ -72,7 +72,7 @@ if (is_ajax()) {
             return;
         }
 
-        if (! check_acl($config['id_user'], $id_group, 'AR')) {
+        if (check_acl($config['id_user'], $id_group, 'AR') === false) {
             db_pandora_audit(
                 'ACL Violation',
                 'Trying to access Alert Management'
@@ -87,7 +87,7 @@ if (is_ajax()) {
         return;
     }
 
-    if ($get_group_agents) {
+    if ($get_group_agents === true) {
         ob_clean();
         $id_group = (int) get_parameter('id_group');
         $disabled = (int) get_parameter('disabled', 0);
@@ -108,10 +108,13 @@ if (is_ajax()) {
         // (by default and for compatibility show void agents).
         $show_void_agents = (int) get_parameter('show_void_agents', 1);
         $serialized = (bool) get_parameter('serialized', false);
-        $serialized_separator = (string) get_parameter('serialized_separator', '|');
+        $serialized_separator = (string) get_parameter(
+            'serialized_separator',
+            '|'
+        );
         $force_serialized = (bool) get_parameter('force_serialized', false);
 
-        if (! check_acl($config['id_user'], $id_group, 'AR')) {
+        if (check_acl($config['id_user'], $id_group, 'AR') === false) {
             db_pandora_audit(
                 'ACL Violation',
                 'Trying to access Alert Management'
@@ -120,12 +123,15 @@ if (is_ajax()) {
             return;
         }
 
-        if (https_is_running()) {
+        if (https_is_running() === true) {
             header('Content-type: application/json');
         }
 
         if ($filter_agents_json != '') {
-            $filter['id_agente'] = json_decode(io_safe_output($filter_agents_json), true);
+            $filter['id_agente'] = json_decode(
+                io_safe_output($filter_agents_json),
+                true
+            );
         }
 
         if ($all_agents) {
@@ -142,7 +148,6 @@ if (is_ajax()) {
             $filter['status'] = $status_agents;
         }
 
-        // Juanma (22/05/2014) Fix: If remove void agents set.
         $_sql_post = ' 1=1 ';
         if ($show_void_agents == 0) {
             $_sql_post .= ' AND id_agente IN (SELECT a.id_agente FROM tagente a, tagente_modulo b WHERE a.id_agente=b.id_agente AND b.delete_pending=0) AND \'1\'';
@@ -172,7 +177,7 @@ if (is_ajax()) {
 
         $agents_aux = [];
         foreach ($agents as $key => $value) {
-            if (preg_match('/'.$search.'/', io_safe_output($value))) {
+            if (preg_match('/'.$search.'/', io_safe_output($value)) === true) {
                 $agents_aux[$key] = $value;
             }
         }
@@ -197,7 +202,10 @@ if (is_ajax()) {
                                 'id_tmetaconsole_setup' => $agent_info[0],
                             ]
                         );
-                    } else if ($serialized && !is_metaconsole() && $force_serialized) {
+                    } else if ($serialized
+                        && is_metaconsole() === false
+                        && $force_serialized
+                    ) {
                         $agent_info = explode($serialized_separator, $k);
                         $agent_disabled = db_get_value_filter(
                             'disabled',
@@ -233,10 +241,14 @@ if (is_ajax()) {
         return;
     }
 
-    if ($get_is_disabled) {
+    if ($get_is_disabled === true) {
         $index = get_parameter('id_agent');
 
-        $agent_disabled = db_get_value_filter('disabled', 'tagente', ['id_agente' => $index]);
+        $agent_disabled = db_get_value_filter(
+            'disabled',
+            'tagente',
+            ['id_agente' => $index]
+        );
 
         $return['disabled'] = $agent_disabled;
         $return['id_agent'] = $index;
@@ -268,8 +280,8 @@ if ($tab != 'credbox' && ! check_acl(
     include 'general/noaccess.php';
     return;
 } else if ($tab == 'credbox'
-    && !check_acl($config['id_user'], 0, 'UM')
-    && !check_acl($config['id_user'], 0, 'PM')
+    && check_acl($config['id_user'], 0, 'UM') === false
+    && check_acl($config['id_user'], 0, 'PM') === false
 ) {
     db_pandora_audit(
         'ACL Violation',
@@ -339,7 +351,7 @@ switch ($tab) {
 }
 
 // Header.
-if (defined('METACONSOLE')) {
+if (is_metaconsole() === true) {
     agents_meta_print_header();
     echo '<div class="notify">';
     echo __('Edit or delete groups can cause problems with synchronization');
@@ -368,7 +380,7 @@ $delete_group = (bool) get_parameter('delete_group');
 $pure = get_parameter('pure', 0);
 
 // Create group.
-if (($create_group) && (check_acl($config['id_user'], 0, 'PM'))) {
+if (($create_group) && (check_acl($config['id_user'], 0, 'PM') === true)) {
     $name = (string) get_parameter('name');
     $icon = (string) get_parameter('icon');
     $id_parent = (int) get_parameter('id_parent');
@@ -492,7 +504,7 @@ if ($update_group) {
 }
 
 // Delete group.
-if (($delete_group) && (check_acl($config['id_user'], 0, 'PM'))) {
+if (($delete_group) && (check_acl($config['id_user'], 0, 'PM') === true)) {
     $id_group = (int) get_parameter('id_group');
 
     $usedGroup = groups_check_used($id_group);
@@ -508,28 +520,42 @@ if (($delete_group) && (check_acl($config['id_user'], 0, 'PM'))) {
             $success_nodes = [];
             $error_nodes = [];
             // Check if the group can be deleted or not.
-            foreach ($servers as $server) {
-                if (metaconsole_connect($server) == NOERR) {
-                    $result_exist_group = db_get_row_filter('tgrupo', ['nombre' => $group_name, 'id_grupo' => $id_group]);
-                    if ($result_exist_group !== false) {
-                        $used_group = groups_check_used($id_group);
-                        // Save the names of the nodes that are empty and can be deleted, and those that cannot.
-                        if (!$used_group['return']) {
-                            $success_nodes[] .= $server['server_name'];
-                            $success_counter++;
-                        } else {
-                            $error_nodes[] .= $server['server_name'];
-                            $error_counter++;
+            if (isset($servers) === true
+                && is_array($servers) === true
+            ) {
+                foreach ($servers as $server) {
+                    if (metaconsole_connect($server) == NOERR) {
+                        $result_exist_group = db_get_row_filter(
+                            'tgrupo',
+                            [
+                                'nombre'   => $group_name,
+                                'id_grupo' => $id_group,
+                            ]
+                        );
+                        if ($result_exist_group !== false) {
+                            $used_group = groups_check_used($id_group);
+                            // Save the names of the nodes that are empty
+                            // and can be deleted, and those that cannot.
+                            if (!$used_group['return']) {
+                                $success_nodes[] .= $server['server_name'];
+                                $success_counter++;
+                            } else {
+                                $error_nodes[] .= $server['server_name'];
+                                $error_counter++;
+                            }
                         }
                     }
-                }
 
-                metaconsole_restore_db();
+                    metaconsole_restore_db();
+                }
             }
 
             if ($error_counter > 0) {
                 ui_print_error_message(
-                    __('The group %s could not be deleted because it is not empty in the nodes', $group_name).': '.implode(', ', $error_nodes)
+                    __(
+                        'The group %s could not be deleted because it is not empty in the nodes',
+                        $group_name
+                    ).': '.implode(', ', $error_nodes)
                 );
                 $errors_meta = true;
             } else {
@@ -540,60 +566,80 @@ if (($delete_group) && (check_acl($config['id_user'], 0, 'PM'))) {
                     $success_deleting = [];
                     $error_connecting_node = [];
                     // Delete the group in the nodes.
-                    foreach ($servers as $server) {
-                        if (metaconsole_connect($server) == NOERR) {
-                            $group = db_get_row_filter(
-                                'tgrupo',
-                                ['id_grupo' => $id_group]
-                            );
+                    if (isset($servers) === true
+                        && is_array($servers) === true
+                    ) {
+                        foreach ($servers as $server) {
+                            if (metaconsole_connect($server) == NOERR) {
+                                $group = db_get_row_filter(
+                                    'tgrupo',
+                                    ['id_grupo' => $id_group]
+                                );
 
-                            db_process_sql_update(
-                                'tgrupo',
-                                ['parent' => $group['parent']],
-                                ['parent' => $id_group]
-                            );
+                                db_process_sql_update(
+                                    'tgrupo',
+                                    ['parent' => $group['parent']],
+                                    ['parent' => $id_group]
+                                );
 
-                            db_process_sql_delete(
-                                'tgroup_stat',
-                                ['id_group' => $id_group]
-                            );
+                                db_process_sql_delete(
+                                    'tgroup_stat',
+                                    ['id_group' => $id_group]
+                                );
 
-                            $result = db_process_sql_delete(
-                                'tgrupo',
-                                ['id_grupo' => $id_group]
-                            );
+                                $result = db_process_sql_delete(
+                                    'tgrupo',
+                                    ['id_grupo' => $id_group]
+                                );
 
-                            if ($result === false) {
-                                $error_deleting[] .= $server['server_name'];
-                                $error_deleting_counter++;
+                                if ($result === false) {
+                                    $error_deleting[] .= $server['server_name'];
+                                    $error_deleting_counter++;
+                                } else {
+                                    $success_deleting[] .= $server['server_name'];
+                                    $success_deleting_counter++;
+                                }
                             } else {
-                                $success_deleting[] .= $server['server_name'];
-                                $success_deleting_counter++;
+                                $error_deleting_counter++;
+                                $error_connecting_node[] .= $server['server_name'];
                             }
-                        } else {
-                            $error_deleting_counter++;
-                            $error_connecting_node[] .= $server['server_name'];
-                        }
 
-                        metaconsole_restore_db();
+                            metaconsole_restore_db();
+                        }
                     }
 
-                    // If the group could not be deleted in any node, do not delete it in meta.
+                    // If the group could not be deleted in any node,
+                    // do not delete it in meta.
                     if ($error_deleting_counter > 0) {
                         $errors_meta = true;
-                        if (!empty($error_connecting_node)) {
-                            ui_print_error_message(__('Error connecting to %s', implode(', ', $error_connecting_node).'. The group has not been deleted in the metaconsole.'));
+                        if (empty($error_connecting_node) === false) {
+                            ui_print_error_message(
+                                __(
+                                    'Error connecting to %s',
+                                    implode(
+                                        ', ',
+                                        $error_connecting_node
+                                    ).'. The group has not been deleted in the metaconsole.'
+                                )
+                            );
                         }
 
-                        if (!empty($error_deleting)) {
+                        if (empty($error_deleting) === false) {
                             ui_print_error_message(
-                                __('The group has not been deleted in the metaconsole due to an error in the node database').': '.implode(', ', $error_deleting)
+                                __(
+                                    'The group has not been deleted in the metaconsole due to an error in the node database'
+                                ).': '.implode(', ', $error_deleting)
                             );
                         }
                     }
 
                     if ($success_deleting_counter > 0) {
-                        ui_print_success_message(__('The group %s has been deleted in the nodes', $group_name).': '.implode(', ', $success_deleting));
+                        ui_print_success_message(
+                            __(
+                                'The group %s has been deleted in the nodes',
+                                $group_name
+                            ).': '.implode(', ', $success_deleting)
+                        );
                     }
                 }
             }
@@ -624,12 +670,17 @@ if (($delete_group) && (check_acl($config['id_user'], 0, 'PM'))) {
             if ($result && (!$usedGroup['return'])) {
                 ui_print_success_message(__('Group successfully deleted'));
             } else {
-                ui_print_error_message(__('There was a problem deleting group'));
+                ui_print_error_message(
+                    __('There was a problem deleting group')
+                );
             }
         }
     } else {
         ui_print_error_message(
-            sprintf(__('The group is not empty. It is use in %s.'), implode(', ', $usedGroup['tables']))
+            sprintf(
+                __('The group is not empty. It is use in %s.'),
+                implode(', ', $usedGroup['tables'])
+            )
         );
     }
 }
@@ -662,14 +713,14 @@ if ($tab == 'tree') {
     $search = (string) get_parameter('search', '');
     $block_size = $config['block_size'];
 
-    if (!empty($search)) {
+    if (empty($search) === false) {
         $search_name = 'AND t.nombre LIKE "%'.$search.'%"';
     }
 
-    if (!users_can_manage_group_all('AR')) {
+    if (users_can_manage_group_all('AR') === false) {
         $user_groups_acl = users_get_groups(false, 'AR');
         $groups_acl = implode(',', $user_groups_ACL);
-        if (empty($groups_acl)) {
+        if (empty($groups_acl) === true) {
             return ui_print_info_message(
                 [
                     'no_close' => true,
@@ -684,7 +735,14 @@ if ($tab == 'tree') {
     $form = "<form method='post' action=''>";
         $form .= "<table class='databox filters bolder' width='100%'>";
             $form .= '<tr><td>'.__('Search').'&nbsp;';
-                $form .= html_print_input_text('search', $search, '', 100, 100, true);
+                $form .= html_print_input_text(
+                    'search',
+                    $search,
+                    '',
+                    100,
+                    100,
+                    true
+                );
             $form .= '</td><td>';
                 $form .= "<input name='find' type='submit' class='sub search' value='".__('Search')."'>";
             $form .= '<td></tr>';
@@ -713,7 +771,7 @@ if ($tab == 'tree') {
 
     $groups = db_get_all_rows_sql($groups_sql);
 
-    if (!empty($groups)) {
+    if (empty($groups) === false) {
         // Count all groups for pagination only saw user and filters.
         $groups_sql_count = sprintf(
             'SELECT count(*)
@@ -799,7 +857,7 @@ if ($tab == 'tree') {
                 ]
             ).'</a>';
 
-            if (is_metaconsole()) {
+            if (is_metaconsole() === true) {
                 $confirm_message = __('Are you sure? This group will also be deleted in all the nodes.');
             } else {
                 $confirm_message = __('Are you sure?');
@@ -841,11 +899,16 @@ if ($tab == 'tree') {
             'pagination-bottom'
         );
     } else {
-        ui_print_info_message(['no_close' => true, 'message' => __('There are no defined groups') ]);
+        ui_print_info_message(
+            [
+                'no_close' => true,
+                'message'  => __('There are no defined groups'),
+            ]
+        );
     }
 }
 
-if (check_acl($config['id_user'], 0, 'PM')) {
+if (check_acl($config['id_user'], 0, 'PM') === true) {
     echo '<form method="post" action="index.php?sec='.$sec.'&sec2=godmode/groups/configure_group">';
         echo '<div class="action-buttons w100p">';
             html_print_submit_button(__('Create group'), 'crt', false, 'class="sub next"');
@@ -860,7 +923,7 @@ $tab = 'group_edition';
 
 ?>
 
-<?php if (!is_metaconsole()) { ?>
+<?php if (is_metaconsole() === false) { ?>
     <script type="text/javascript" src="include/javascript/fixed-bottom-box.js"></script>
 <?php } else { ?>
     <script type="text/javascript" src="../../include/javascript/fixed-bottom-box.js"></script>
@@ -900,7 +963,6 @@ $tab = 'group_edition';
 
                     treeController.init({
                         recipient: $("div#tree-controller-recipient"),
-                        //detailRecipient: $.fixedBottomBox({ width: 400, height: window.innerHeight * 0.9 }),
                         page: parameters['page'],
                         emptyMessage: "<?php echo __('No data found'); ?>",
                         foundMessage: "<?php echo __('Found groups'); ?>",
diff --git a/pandora_console/include/ajax/tree.ajax.php b/pandora_console/include/ajax/tree.ajax.php
index 27ce2fc7d6..448b4cfb71 100644
--- a/pandora_console/include/ajax/tree.ajax.php
+++ b/pandora_console/include/ajax/tree.ajax.php
@@ -1,17 +1,32 @@
 <?php
-// Pandora FMS - http://pandorafms.com
-// ==================================================
-// Copyright (c) 2005-2021 Artica Soluciones Tecnologicas
-// Please see http://pandorafms.org for full contribution list
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the  GNU Lesser General Public License
-// as published by the Free Software Foundation; version 2
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// Only accesible by ajax
-if (is_ajax()) {
+/**
+ * Tree view.
+ *
+ * @category   Tree
+ * @package    Pandora FMS
+ * @subpackage Community
+ * @version    1.0.0
+ * @license    See below
+ *
+ *    ______                 ___                    _______ _______ ________
+ *   |   __ \.-----.--.--.--|  |.-----.----.-----. |    ___|   |   |     __|
+ *  |    __/|  _  |     |  _  ||  _  |   _|  _  | |    ___|       |__     |
+ * |___|   |___._|__|__|_____||_____|__| |___._| |___|   |__|_|__|_______|
+ *
+ * ============================================================================
+ * Copyright (c) 2005-2021 Artica Soluciones Tecnologicas
+ * Please see http://pandorafms.org for full contribution list
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation for version 2.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * ============================================================================
+ */
+
+if (is_ajax() === true) {
     global $config;
 
     // Login check.
@@ -34,7 +49,7 @@ if (is_ajax()) {
     $getGroupStatus = (bool) get_parameter('getGroupStatus', 0);
     $getDetail = (bool) get_parameter('getDetail');
 
-    if ($getChildren) {
+    if ($getChildren === true) {
         $type = get_parameter('type', 'group');
         $rootType = get_parameter('rootType', '');
         $id = get_parameter('id', -1);
@@ -55,47 +70,111 @@ if (is_ajax()) {
 
         $agent_a = check_acl($config['id_user'], 0, 'AR');
         $agent_w = check_acl($config['id_user'], 0, 'AW');
-        $access = ($agent_a == true) ? 'AR' : (($agent_w == true) ? 'AW' : 'AR');
-        $switch_type = !empty($rootType) ? $rootType : $type;
+        $access = ($agent_a === true) ? 'AR' : (($agent_w === true) ? 'AW' : 'AR');
+        $switch_type = (empty($rootType) === false) ? $rootType : $type;
         switch ($switch_type) {
             case 'os':
-                $tree = new TreeOS($type, $rootType, $id, $rootID, $serverID, $childrenMethod, $access);
+                $tree = new TreeOS(
+                    $type,
+                    $rootType,
+                    $id,
+                    $rootID,
+                    $serverID,
+                    $childrenMethod,
+                    $access
+                );
             break;
 
             case 'module_group':
-                $tree = new TreeModuleGroup($type, $rootType, $id, $rootID, $serverID, $childrenMethod, $access);
+                $tree = new TreeModuleGroup(
+                    $type,
+                    $rootType,
+                    $id,
+                    $rootID,
+                    $serverID,
+                    $childrenMethod,
+                    $access
+                );
             break;
 
             case 'module':
-                $tree = new TreeModule($type, $rootType, $id, $rootID, $serverID, $childrenMethod, $access);
+                $tree = new TreeModule(
+                    $type,
+                    $rootType,
+                    $id,
+                    $rootID,
+                    $serverID,
+                    $childrenMethod,
+                    $access
+                );
             break;
 
             case 'tag':
-                $tree = new TreeTag($type, $rootType, $id, $rootID, $serverID, $childrenMethod, $access);
+                $tree = new TreeTag(
+                    $type,
+                    $rootType,
+                    $id,
+                    $rootID,
+                    $serverID,
+                    $childrenMethod,
+                    $access
+                );
             break;
 
             case 'group':
-                if (is_metaconsole()) {
-                    if (!class_exists('TreeGroupMeta')) {
+                if (is_metaconsole() === true) {
+                    if (class_exists('TreeGroupMeta') === false) {
                         break;
                     }
 
-                    $tree = new TreeGroupMeta($type, $rootType, $id, $rootID, $serverID, $childrenMethod, $access);
+                    $tree = new TreeGroupMeta(
+                        $type,
+                        $rootType,
+                        $id,
+                        $rootID,
+                        $serverID,
+                        $childrenMethod,
+                        $access
+                    );
                 } else {
-                    $tree = new TreeGroup($type, $rootType, $id, $rootID, $serverID, $childrenMethod, $access);
+                    $tree = new TreeGroup(
+                        $type,
+                        $rootType,
+                        $id,
+                        $rootID,
+                        $serverID,
+                        $childrenMethod,
+                        $access
+                    );
                 }
             break;
 
             case 'policies':
-                if (!class_exists('TreePolicies')) {
+                if (class_exists('TreePolicies') === false) {
                     break;
                 }
 
-                $tree = new TreePolicies($type, $rootType, $id, $rootID, $serverID, $childrenMethod, $access);
+                $tree = new TreePolicies(
+                    $type,
+                    $rootType,
+                    $id,
+                    $rootID,
+                    $serverID,
+                    $childrenMethod,
+                    $access
+                );
             break;
 
             case 'group_edition':
-                $tree = new TreeGroupEdition($type, $rootType, $id, $rootID, $serverID, $childrenMethod, $access);
+                $tree = new TreeGroupEdition(
+                    $type,
+                    $rootType,
+                    $id,
+                    $rootID,
+                    $serverID,
+                    $childrenMethod,
+                    $access
+                );
             break;
 
             case 'services':
@@ -112,7 +191,7 @@ if (is_ajax()) {
             break;
 
             default:
-                // FIXME. No error handler
+                // No error handler.
             return;
         }
 
@@ -123,14 +202,14 @@ if (is_ajax()) {
         return;
     }
 
-    if ($getDetail) {
+    if ($getDetail === true) {
         include_once $config['homedir'].'/include/functions_treeview.php';
 
         $id = (int) get_parameter('id');
         $type = (string) get_parameter('type');
 
         $server = [];
-        if (is_metaconsole()) {
+        if (is_metaconsole() === true) {
             $server_id = (int) get_parameter('serverID');
             $server = metaconsole_get_servers($server_id);
         }
@@ -142,7 +221,7 @@ if (is_ajax()) {
         echo '</style>';
 
         echo '<div class="left_align backgrund_primary_important">';
-        if (!empty($id) && !empty($type)) {
+        if (empty($id) === false && empty($type) === false) {
             switch ($type) {
                 case 'agent':
                     treeview_printTable($id, $server, true);
@@ -157,7 +236,7 @@ if (is_ajax()) {
                 break;
 
                 default:
-                    // Nothing
+                    // Nothing.
                 break;
             }
         }
diff --git a/pandora_console/include/class/Tree.class.php b/pandora_console/include/class/Tree.class.php
index 9ef583d574..05b5fec775 100644
--- a/pandora_console/include/class/Tree.class.php
+++ b/pandora_console/include/class/Tree.class.php
@@ -1,15 +1,30 @@
 <?php
-// Pandora FMS- http://pandorafms.com
-// ==================================================
-// Copyright (c) 2005-2021 Artica Soluciones Tecnologicas
-// Please see http://pandorafms.org for full contribution list
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the  GNU Lesser General Public License
-// as published by the Free Software Foundation; version 2
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
+/**
+ * Tree view.
+ *
+ * @category   Tree
+ * @package    Pandora FMS
+ * @subpackage Community
+ * @version    1.0.0
+ * @license    See below
+ *
+ *    ______                 ___                    _______ _______ ________
+ *   |   __ \.-----.--.--.--|  |.-----.----.-----. |    ___|   |   |     __|
+ *  |    __/|  _  |     |  _  ||  _  |   _|  _  | |    ___|       |__     |
+ * |___|   |___._|__|__|_____||_____|__| |___._| |___|   |__|_|__|_______|
+ *
+ * ============================================================================
+ * Copyright (c) 2005-2021 Artica Soluciones Tecnologicas
+ * Please see http://pandorafms.org for full contribution list
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation for version 2.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * ============================================================================
+ */
 class Tree
 {
 
diff --git a/pandora_console/include/class/TreeGroup.class.php b/pandora_console/include/class/TreeGroup.class.php
index 53d7f510f6..4b94cf8405 100644
--- a/pandora_console/include/class/TreeGroup.class.php
+++ b/pandora_console/include/class/TreeGroup.class.php
@@ -1,32 +1,86 @@
 <?php
-// Pandora FMS- http://pandorafms.com
-// ==================================================
-// Copyright (c) 2005-2021 Artica Soluciones Tecnologicas
-// Please see http://pandorafms.org for full contribution list
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the  GNU Lesser General Public License
-// as published by the Free Software Foundation; version 2
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
+/**
+ * Tree view.
+ *
+ * @category   Tree
+ * @package    Pandora FMS
+ * @subpackage Community
+ * @version    1.0.0
+ * @license    See below
+ *
+ *    ______                 ___                    _______ _______ ________
+ *   |   __ \.-----.--.--.--|  |.-----.----.-----. |    ___|   |   |     __|
+ *  |    __/|  _  |     |  _  ||  _  |   _|  _  | |    ___|       |__     |
+ * |___|   |___._|__|__|_____||_____|__| |___._| |___|   |__|_|__|_______|
+ *
+ * ============================================================================
+ * Copyright (c) 2005-2021 Artica Soluciones Tecnologicas
+ * Please see http://pandorafms.org for full contribution list
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation for version 2.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * ============================================================================
+ */
+
 global $config;
 
 require_once $config['homedir'].'/include/class/Tree.class.php';
-
+/**
+ * Tree group class.
+ */
 class TreeGroup extends Tree
 {
 
+    /**
+     * Propagate ACL.
+     *
+     * @var boolean
+     */
     protected $propagateCounters = true;
 
+    /**
+     * Display all groups.
+     *
+     * @var boolean
+     */
     protected $displayAllGroups = false;
 
 
-    public function __construct($type, $rootType='', $id=-1, $rootID=-1, $serverID=false, $childrenMethod='on_demand', $access='AR')
-    {
+    /**
+     * Construct.
+     *
+     * @param string  $type           Type.
+     * @param string  $rootType       Root.
+     * @param integer $id             Id.
+     * @param integer $rootID         Root Id.
+     * @param boolean $serverID       Server.
+     * @param string  $childrenMethod Method children.
+     * @param string  $access         Access ACL.
+     */
+    public function __construct(
+        $type,
+        $rootType='',
+        $id=-1,
+        $rootID=-1,
+        $serverID=false,
+        $childrenMethod='on_demand',
+        $access='AR'
+    ) {
         global $config;
 
-        parent::__construct($type, $rootType, $id, $rootID, $serverID, $childrenMethod, $access);
+        parent::__construct(
+            $type,
+            $rootType,
+            $id,
+            $rootID,
+            $serverID,
+            $childrenMethod,
+            $access
+        );
 
         $this->L1fieldName = 'id_group';
         $this->L1extraFields = [
@@ -42,18 +96,37 @@ class TreeGroup extends Tree
     }
 
 
+    /**
+     * Setter propagate counters.
+     *
+     * @param boolean $value True or ffalse.
+     *
+     * @return void
+     */
     public function setPropagateCounters($value)
     {
         $this->propagateCounters = (bool) $value;
     }
 
 
+    /**
+     * Setter all groups.
+     *
+     * @param boolean $value True or ffalse.
+     *
+     * @return void
+     */
     public function setDisplayAllGroups($value)
     {
         $this->displayAllGroups = (bool) $value;
     }
 
 
+    /**
+     * Get data.
+     *
+     * @return void
+     */
     protected function getData()
     {
         if ($this->id == -1) {
@@ -66,22 +139,36 @@ class TreeGroup extends Tree
     }
 
 
+    /**
+     * Filter search groups.
+     *
+     * @return string
+     */
     protected function getGroupSearchFilter()
     {
         return '';
     }
 
 
+    /**
+     * First level tree.
+     *
+     * @return void
+     */
     protected function getFirstLevel()
     {
         $processed_items = $this->getProcessedGroups();
 
-        if (!empty($processed_items)) {
-            // Filter by group name. This should be done after rerieving the items cause we need the possible items descendants
-            if (!empty($this->filter['searchGroup'])) {
-                // Save the groups which intersect with the user groups
-                $groups = db_get_all_rows_filter('tgrupo', ['nombre' => '%'.$this->filter['searchGroup'].'%']);
-                if ($groups == false) {
+        if (empty($processed_items) === false) {
+            // Filter by group name. This should be done after rerieving
+            // the items cause we need the possible items descendants.
+            if (empty($this->filter['searchGroup']) === false) {
+                // Save the groups which intersect with the user groups.
+                $groups = db_get_all_rows_filter(
+                    'tgrupo',
+                    ['nombre' => '%'.$this->filter['searchGroup'].'%']
+                );
+                if ($groups === false) {
                     $groups = [];
                 }
 
@@ -90,7 +177,7 @@ class TreeGroup extends Tree
                     $groups,
                     function ($userGroups, $group) use ($userGroupsACL) {
                         $group_id = $group['id_grupo'];
-                        if (isset($userGroupsACL[$group_id])) {
+                        if (isset($userGroupsACL[$group_id]) === true) {
                             $userGroups[$group_id] = $userGroupsACL[$group_id];
                         }
 
@@ -99,14 +186,22 @@ class TreeGroup extends Tree
                     []
                 );
 
-                $result = self::extractGroupsWithIDs($processed_items, $ids_hash);
+                $result = self::extractGroupsWithIDs(
+                    $processed_items,
+                    $ids_hash
+                );
 
                 $processed_items = ($result === false) ? [] : $result;
             }
 
-            // groupID filter. To access the view from tactical views f.e.
-            if (!empty($this->filter['groupID'])) {
-                $result = self::extractItemWithID($processed_items, $this->filter['groupID'], 'group', $this->strictACL);
+            // GroupID filter. To access the view from tactical views f.e.
+            if (empty($this->filter['groupID']) === false) {
+                $result = self::extractItemWithID(
+                    $processed_items,
+                    $this->filter['groupID'],
+                    'group',
+                    $this->strictACL
+                );
 
                 $processed_items = ($result === false) ? [] : [$result];
             }
@@ -116,56 +211,64 @@ class TreeGroup extends Tree
     }
 
 
+    /**
+     * Process group
+     *
+     * @return mixed
+     */
     protected function getProcessedGroups()
     {
         $processed_groups = [];
-        // Index and process the groups
+        // Index and process the groups.
         $groups = $this->getGroupCounters();
 
         // If user have not permissions in parent, set parent node to 0 (all)
-        // Avoid to do foreach for admins
-        if (!users_can_manage_group_all('AR')) {
+        // Avoid to do foreach for admins.
+        if (users_can_manage_group_all('AR') === false) {
             foreach ($groups as $id => $group) {
-                if (!isset($this->userGroups[$groups[$id]['parent']])) {
+                if (isset($this->userGroups[$groups[$id]['parent']]) === false) {
                     $groups[$id]['parent'] = 0;
                 }
             }
         }
 
-        // Build the group hierarchy
+        // Build the group hierarchy.
         foreach ($groups as $id => $group) {
-            if (isset($groups[$id]['parent']) && ($groups[$id]['parent'] != 0)) {
+            if (isset($groups[$id]['parent']) === true
+                && ($groups[$id]['parent'] != 0)
+            ) {
                 $parent = $groups[$id]['parent'];
-                // Parent exists
-                if (!isset($groups[$parent]['children'])) {
+                // Parent exists.
+                if (isset($groups[$parent]['children']) === false) {
                     $groups[$parent]['children'] = [];
                 }
 
-                // Store a reference to the group into the parent
+                // Store a reference to the group into the parent.
                 $groups[$parent]['children'][] = &$groups[$id];
-                // This group was introduced into a parent
+                // This group was introduced into a parent.
                 $groups[$id]['have_parent'] = true;
             }
         }
 
-        // Sort the children groups
+        // Sort the children groups.
         foreach ($groups as $id => $group) {
-            if (isset($groups[$id]['children'])) {
+            if (isset($groups[$id]['children']) === true) {
                 usort($groups[$id]['children'], ['Tree', 'cmpSortNames']);
             }
         }
 
-        // Filter groups and eliminates the reference to children groups out of her parent
+        // Filter groups and eliminates the reference to
+        // children groups out of her parent.
         $groups = array_filter(
             $groups,
             function ($group) {
                 return !$group['have_parent'];
             }
         );
-        // Propagate child counters to her parents
-        if ($this->propagateCounters) {
+        // Propagate child counters to her parents.
+        if ($this->propagateCounters === true) {
             self::processCounters($groups);
-            // Filter groups and eliminates the reference to empty groups
+            // Filter groups and eliminates the reference to empty groups.
             $groups = $this->deleteEmptyGroups($groups);
         } else {
             $groups = $this->deleteEmptyGroupsNotPropagate($groups);
diff --git a/pandora_console/include/class/TreeGroupEdition.class.php b/pandora_console/include/class/TreeGroupEdition.class.php
index f9be10ebaf..9aa6effb5b 100644
--- a/pandora_console/include/class/TreeGroupEdition.class.php
+++ b/pandora_console/include/class/TreeGroupEdition.class.php
@@ -1,31 +1,81 @@
 <?php
-// Pandora FMS- http://pandorafms.com
-// ==================================================
-// Copyright (c) 2005-2021 Artica Soluciones Tecnologicas
-// Please see http://pandorafms.org for full contribution list
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the  GNU Lesser General Public License
-// as published by the Free Software Foundation; version 2
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
+/**
+ * Tree view.
+ *
+ * @category   Tree
+ * @package    Pandora FMS
+ * @subpackage Community
+ * @version    1.0.0
+ * @license    See below
+ *
+ *    ______                 ___                    _______ _______ ________
+ *   |   __ \.-----.--.--.--|  |.-----.----.-----. |    ___|   |   |     __|
+ *  |    __/|  _  |     |  _  ||  _  |   _|  _  | |    ___|       |__     |
+ * |___|   |___._|__|__|_____||_____|__| |___._| |___|   |__|_|__|_______|
+ *
+ * ============================================================================
+ * Copyright (c) 2005-2021 Artica Soluciones Tecnologicas
+ * Please see http://pandorafms.org for full contribution list
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation for version 2.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * ============================================================================
+ */
+
 global $config;
 
 require_once $config['homedir'].'/include/class/Tree.class.php';
 
+/**
+ * Tree group edition.
+ */
 class TreeGroupEdition extends TreeGroup
 {
 
 
-    public function __construct($type, $rootType='', $id=-1, $rootID=-1, $serverID=false, $childrenMethod='on_demand', $access='AR')
-    {
+    /**
+     * Construct.
+     *
+     * @param string  $type           Type.
+     * @param string  $rootType       Root.
+     * @param integer $id             Id.
+     * @param integer $rootID         Root Id.
+     * @param boolean $serverID       Server.
+     * @param string  $childrenMethod Method children.
+     * @param string  $access         Access ACL.
+     */
+    public function __construct(
+        $type,
+        $rootType='',
+        $id=-1,
+        $rootID=-1,
+        $serverID=false,
+        $childrenMethod='on_demand',
+        $access='AR'
+    ) {
         global $config;
 
-        parent::__construct($type, $rootType, $id, $rootID, $serverID, $childrenMethod, $access);
+        parent::__construct(
+            $type,
+            $rootType,
+            $id,
+            $rootID,
+            $serverID,
+            $childrenMethod,
+            $access
+        );
     }
 
 
+    /**
+     * Get data.
+     *
+     * @return void
+     */
     protected function getData()
     {
         if ($this->id == -1) {
@@ -34,46 +84,54 @@ class TreeGroupEdition extends TreeGroup
     }
 
 
+    /**
+     * Get process group.
+     *
+     * @return mixed
+     */
     protected function getProcessedGroups()
     {
         $processed_groups = [];
-        // Index and process the groups
+        // Index and process the groups.
         $groups = $this->getGroupCounters();
 
         // If user have not permissions in parent, set parent node to 0 (all)
-        // Avoid to do foreach for admins
-        if (!users_can_manage_group_all('AR')) {
+        // Avoid to do foreach for admins.
+        if (users_can_manage_group_all('AR') === false) {
             foreach ($groups as $id => $group) {
-                if (!isset($this->userGroups[$groups[$id]['parent']])) {
+                if (isset($this->userGroups[$groups[$id]['parent']]) === false) {
                     $groups[$id]['parent'] = 0;
                 }
             }
         }
 
-        // Build the group hierarchy
+        // Build the group hierarchy.
         foreach ($groups as $id => $group) {
-            if (isset($groups[$id]['parent']) && ($groups[$id]['parent'] != 0)) {
+            if (isset($groups[$id]['parent']) === true
+                && ($groups[$id]['parent'] != 0)
+            ) {
                 $parent = $groups[$id]['parent'];
-                // Parent exists
-                if (!isset($groups[$parent]['children'])) {
+                // Parent exists.
+                if (isset($groups[$parent]['children']) === false) {
                     $groups[$parent]['children'] = [];
                 }
 
-                // Store a reference to the group into the parent
+                // Store a reference to the group into the parent.
                 $groups[$parent]['children'][] = &$groups[$id];
-                // This group was introduced into a parent
+                // This group was introduced into a parent.
                 $groups[$id]['have_parent'] = true;
             }
         }
 
-        // Sort the children groups
+        // Sort the children groups.
         foreach ($groups as $id => $group) {
-            if (isset($groups[$id]['children'])) {
+            if (isset($groups[$id]['children']) === true) {
                 usort($groups[$id]['children'], ['Tree', 'cmpSortNames']);
             }
         }
 
-        // Filter groups and eliminates the reference to children groups out of her parent
+        // Filter groups and eliminates the reference
+        // to children groups out of her parent.
         $groups = array_filter(
             $groups,
             function ($group) {
@@ -86,6 +144,11 @@ class TreeGroupEdition extends TreeGroup
     }
 
 
+    /**
+     * Get group counters.
+     *
+     * @return mixed
+     */
     protected function getGroupCounters()
     {
         $messages = [
@@ -93,10 +156,25 @@ class TreeGroupEdition extends TreeGroup
             'cancel'  => __('Cancel'),
             'messg'   => __('Are you sure?'),
         ];
-        $sql = 'SELECT id_grupo AS gid,
-			nombre as name, parent, icon
+
+        $group_acl = '';
+        if (users_can_manage_group_all('AR') === false) {
+            $user_groups_str = implode(',', $this->userGroupsArray);
+            $group_acl = sprintf(
+                'AND id_grupo IN (%s)',
+                $user_groups_str
+            );
+        }
+
+        $sql = sprintf(
+            'SELECT id_grupo AS gid,
+			nombre as name,
+            parent,
+            icon
 			FROM tgrupo
-		';
+            WHERE 1=1 %s',
+            $group_acl
+        );
 
         $stats = db_get_all_rows_sql($sql);
         $group_stats = [];
@@ -107,7 +185,9 @@ class TreeGroupEdition extends TreeGroup
             $group_stats[$group['gid']]['id']     = $group['gid'];
             $group_stats[$group['gid']]['type']   = 'group';
 
-            $group_stats[$group['gid']] = $this->getProcessedItem($group_stats[$group['gid']]);
+            $group_stats[$group['gid']] = $this->getProcessedItem(
+                $group_stats[$group['gid']]
+            );
             $group_stats[$group['gid']]['delete']['messages'] = $messages;
             $group_stats[$group['gid']]['edit']   = 1;
             $group_stats[$group['gid']]['alerts'] = '';

From c20c206a5f1247839685879d00c69e39c29f1a85 Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Mon, 15 Mar 2021 14:37:08 +0100
Subject: [PATCH 16/44] Fixed task edit url when nof fully defined
 (custom-script)

---
 pandora_console/godmode/wizards/DiscoveryTaskList.class.php | 4 +++-
 pandora_console/include/class/CustomNetScan.class.php       | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/pandora_console/godmode/wizards/DiscoveryTaskList.class.php b/pandora_console/godmode/wizards/DiscoveryTaskList.class.php
index a62507b7b7..95562ad0e5 100644
--- a/pandora_console/godmode/wizards/DiscoveryTaskList.class.php
+++ b/pandora_console/godmode/wizards/DiscoveryTaskList.class.php
@@ -1060,7 +1060,9 @@ class DiscoveryTaskList extends HTML
      */
     public function getTargetWiz($task, $script=false)
     {
-        if ($script !== false) {
+        if ($script !== false
+            || (int) $task['type'] === DISCOVERY_HOSTDEVICES_CUSTOM
+        ) {
             switch ($script['type']) {
                 case DISCOVERY_SCRIPT_APP_VMWARE:
                 return 'wiz=app&mode=vmware&page=0';
diff --git a/pandora_console/include/class/CustomNetScan.class.php b/pandora_console/include/class/CustomNetScan.class.php
index 2d22d1b7fc..90a07cc781 100644
--- a/pandora_console/include/class/CustomNetScan.class.php
+++ b/pandora_console/include/class/CustomNetScan.class.php
@@ -185,6 +185,7 @@ class CustomNetScan extends Wizard
                 $this->task['id_recon_server'] = $server_id;
                 $this->task['id_group'] = $id_group;
                 $this->task['interval_sweep'] = $interval;
+                $this->task['type'] = DISCOVERY_HOSTDEVICES_CUSTOM;
 
                 if (isset($this->task['id_rt']) === false) {
                     // Create.

From 02b2eec65d18f6127f76087a048487d4d1797c1c Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Mon, 15 Mar 2021 15:16:49 +0100
Subject: [PATCH 17/44] Modules alphabetically sorted in Discovery review

---
 pandora_console/godmode/wizards/DiscoveryTaskList.class.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pandora_console/godmode/wizards/DiscoveryTaskList.class.php b/pandora_console/godmode/wizards/DiscoveryTaskList.class.php
index a62507b7b7..bfebb9873e 100644
--- a/pandora_console/godmode/wizards/DiscoveryTaskList.class.php
+++ b/pandora_console/godmode/wizards/DiscoveryTaskList.class.php
@@ -1524,6 +1524,9 @@ class DiscoveryTaskList extends HTML
                 $simple_data[] = $tmp;
 
                 if (is_array($data['modules'])) {
+                    // Alphabetically sort.
+                    ksort($data['modules']);
+
                     $simple_data = array_merge(
                         $simple_data,
                         array_reduce(

From 373ab32bb5b7d787f51178330ccb445f7c7e945b Mon Sep 17 00:00:00 2001
From: "alejandro.campos@artica.es" <alejandro.campos@artica.es>
Date: Tue, 16 Mar 2021 11:54:40 +0100
Subject: [PATCH 18/44] Add pagination to commands view

---
 .../godmode/alerts/alert_commands.php         | 21 ++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/pandora_console/godmode/alerts/alert_commands.php b/pandora_console/godmode/alerts/alert_commands.php
index 8407a88f97..517af45387 100644
--- a/pandora_console/godmode/alerts/alert_commands.php
+++ b/pandora_console/godmode/alerts/alert_commands.php
@@ -46,6 +46,8 @@ $create_command = (bool) get_parameter('create_command');
 $delete_command = (bool) get_parameter('delete_command');
 $copy_command = (bool) get_parameter('copy_command');
 
+$url = 'index.php?sec='.$sec.'&sec2=godmode/alerts/alert_commands';
+
 if (is_ajax()) {
     $get_alert_command = (bool) get_parameter('get_alert_command');
     if ($get_alert_command) {
@@ -634,6 +636,12 @@ if ($commands === false) {
     $commands = [];
 }
 
+// Pagination.
+$total_commands = count($commands);
+$offset = (int) get_parameter('offset');
+$limit = (int) $config['block_size'];
+$commands = array_slice($commands, $offset, $limit);
+
 foreach ($commands as $command) {
     $data = [];
 
@@ -678,10 +686,17 @@ foreach ($commands as $command) {
     array_push($table->data, $data);
 }
 
-if (count($table->data) > 0) {
+ui_pagination($total_commands, $url);
+if (isset($data) === true && count($table->data) > 0) {
     html_print_table($table);
+    ui_pagination($total_commands, $url, 0, 0, false, 'offset', true, 'pagination-bottom');
 } else {
-    ui_print_info_message(['no_close' => true, 'message' => __('No alert commands configured') ]);
+    ui_print_info_message(
+        [
+            'no_close' => true,
+            'message'  => __('No alert commands configured'),
+        ]
+    );
 }
 
 if ($is_central_policies_on_node === false && check_acl_restricted_all($config['id_user'], $command['id_group'], 'PM')) {
@@ -716,4 +731,4 @@ enterprise_hook('close_meta_frame');
         });
     }
 
-</script>
\ No newline at end of file
+</script>

From 2862afb7f57ea8b621d928c1994467d4e8469342 Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Tue, 16 Mar 2021 13:00:24 +0100
Subject: [PATCH 19/44] Multicolumn setup for performance and visual settings

---
 pandora_console/godmode/setup/performance.php |    5 +-
 .../godmode/setup/setup_visuals.php           | 1884 +++++++++--------
 .../include/styles/setup.multicolumn.css      |   24 +
 3 files changed, 976 insertions(+), 937 deletions(-)
 create mode 100644 pandora_console/include/styles/setup.multicolumn.css

diff --git a/pandora_console/godmode/setup/performance.php b/pandora_console/godmode/setup/performance.php
index 995ef3365e..f7f723422e 100644
--- a/pandora_console/godmode/setup/performance.php
+++ b/pandora_console/godmode/setup/performance.php
@@ -41,6 +41,9 @@ if (! check_acl($config['id_user'], 0, 'PM')
     return;
 }
 
+// Load needed resources.
+ui_require_css_file('setup.multicolumn');
+
 $update_config = get_parameter('update_config', 0);
 if ($update_config == 1 && $config['history_db_enabled'] == 1) {
     if (! isset($config['history_db_connection'])
@@ -679,7 +682,7 @@ $table_other->data[16][1] = html_print_input_text(
 
 echo '<form id="form_setup" method="post">';
 
-echo '<fieldset>';
+echo '<fieldset class="full-column">';
     echo '<legend>'.__('Database maintenance status').' '.ui_print_help_icon('database_maintenance_status_tab', true).'</legend>';
     html_print_table($table_status);
 echo '</fieldset>';
diff --git a/pandora_console/godmode/setup/setup_visuals.php b/pandora_console/godmode/setup/setup_visuals.php
index dc5e04d018..c0438e8a37 100755
--- a/pandora_console/godmode/setup/setup_visuals.php
+++ b/pandora_console/godmode/setup/setup_visuals.php
@@ -23,14 +23,17 @@ if (! check_acl($config['id_user'], 0, 'PM') && ! is_user_admin($config['id_user
 }
 
 // FIX: this constant is declared to in godmode/reporting/reporting_builder.phps
-// Constant with fonts directory
+// Constant with fonts directory.
 define('_MPDF_TTFONTPATH', $config['homedir'].'/include/fonts/');
 
 require_once 'include/functions_post_process.php';
 
-// Load enterprise extensions
+// Load enterprise extensions.
 enterprise_include('godmode/setup/setup_visuals.php');
 
+// Load needed resources.
+ui_require_css_file('setup.multicolumn');
+
 /*
     NOTICE FOR DEVELOPERS:
 
@@ -116,10 +119,6 @@ if (enterprise_installed()) {
     $row++;
 }
 
-echo '<fieldset>';
-echo '<legend>'.__('Behaviour configuration').' '.ui_print_help_icon('behavoir_conf_tab', true).'</legend>';
-html_print_table($table_behaviour);
-echo '</fieldset>';
 // ----------------------------------------------------------------------
 // ----------------------------------------------------------------------
 // STYLE CONFIGURATION
@@ -535,1024 +534,1037 @@ $table_styles->data[$row][1] = html_print_checkbox_switch(
 $row++;
 
 
-    // For 5.1 Autohidden menu feature
-    $table_styles->data['autohidden'][0] = __('Automatically hide submenu');
-    $table_styles->data['autohidden'][1] = html_print_checkbox_switch(
-        'autohidden_menu',
-        1,
-        $config['autohidden_menu'],
-        true
-    );
+// For 5.1 Autohidden menu feature
+$table_styles->data['autohidden'][0] = __('Automatically hide submenu');
+$table_styles->data['autohidden'][1] = html_print_checkbox_switch(
+    'autohidden_menu',
+    1,
+    $config['autohidden_menu'],
+    true
+);
 
-    $table_styles->data[$row][0] = __('Visual effects and animation');
-    $table_styles->data[$row][1] = html_print_checkbox_switch(
-        'visual_animation',
-        1,
-        $config['visual_animation'],
-        true
-    );
+$table_styles->data[$row][0] = __('Visual effects and animation');
+$table_styles->data[$row][1] = html_print_checkbox_switch(
+    'visual_animation',
+    1,
+    $config['visual_animation'],
+    true
+);
 
 
-    echo '<fieldset>';
-    echo '<legend>'.__('Style configuration').' '.ui_print_help_icon('style_conf_tab', true).'</legend>';
-    html_print_table($table_styles);
-    echo '</fieldset>';
-    // ----------------------------------------------------------------------
-    // ----------------------------------------------------------------------
-    // GIS CONFIGURATION
-    // ----------------------------------------------------------------------
-    $table_gis = new stdClass();
-    $table_gis->width = '100%';
-    $table_gis->class = 'databox filters';
-    $table_gis->style[0] = 'font-weight: bold;';
-    $table_gis->size[0] = '50%';
-    $table_gis->data = [];
+// ----------------------------------------------------------------------
+// ----------------------------------------------------------------------
+// GIS CONFIGURATION
+// ----------------------------------------------------------------------
+$table_gis = new stdClass();
+$table_gis->width = '100%';
+$table_gis->class = 'databox filters';
+$table_gis->style[0] = 'font-weight: bold;';
+$table_gis->size[0] = '50%';
+$table_gis->data = [];
 
-    $table_gis->data[$row][0] = __('GIS Labels');
-    $table_gis->data[$row][1] = html_print_checkbox_switch(
-        'gis_label',
-        1,
-        $config['gis_label'],
-        true
-    );
-    $row++;
+$table_gis->data[$row][0] = __('GIS Labels');
+$table_gis->data[$row][1] = html_print_checkbox_switch(
+    'gis_label',
+    1,
+    $config['gis_label'],
+    true
+);
+$row++;
 
-    $listIcons = gis_get_array_list_icons();
-    $arraySelectIcon = [];
-    foreach ($listIcons as $index => $value) {
-        $arraySelectIcon[$index] = $index;
-    }
+$listIcons = gis_get_array_list_icons();
+$arraySelectIcon = [];
+foreach ($listIcons as $index => $value) {
+    $arraySelectIcon[$index] = $index;
+}
 
-    $table_gis->data[$row][0] = __('Default icon in GIS');
-    $table_gis->data[$row][1] = html_print_select(
-        $arraySelectIcon,
-        'gis_default_icon',
-        $config['gis_default_icon'],
-        '',
-        __('Agent icon group'),
-        '',
-        true
-    );
-    $table_gis->data[$row][1] .= '&nbsp;'.html_print_button(__('View'), 'gis_icon_preview', false, '', 'class="sub camera logo_preview"', true);
-    $row++;
+$table_gis->data[$row][0] = __('Default icon in GIS');
+$table_gis->data[$row][1] = html_print_select(
+    $arraySelectIcon,
+    'gis_default_icon',
+    $config['gis_default_icon'],
+    '',
+    __('Agent icon group'),
+    '',
+    true
+);
+$table_gis->data[$row][1] .= '&nbsp;'.html_print_button(__('View'), 'gis_icon_preview', false, '', 'class="sub camera logo_preview"', true);
+$row++;
 
-    echo '<fieldset>';
-    echo '<legend>'.__('GIS configuration').' '.ui_print_help_icon('gis_conf_tab', true).'</legend>';
-    html_print_table($table_gis);
-    echo '</fieldset>';
-    // ----------------------------------------------------------------------
-    // ----------------------------------------------------------------------
-    // FONT AND TEXT CONFIGURATION
-    // ----------------------------------------------------------------------
-    $table_font = new stdClass();
-    $table_font->width = '100%';
-    $table_font->class = 'databox filters';
-    $table_font->style[0] = 'font-weight: bold;';
-    $table_font->size[0] = '50%';
-    $table_font->data = [];
+// ----------------------------------------------------------------------
+// ----------------------------------------------------------------------
+// FONT AND TEXT CONFIGURATION
+// ----------------------------------------------------------------------
+$table_font = new stdClass();
+$table_font->width = '100%';
+$table_font->class = 'databox filters';
+$table_font->style[0] = 'font-weight: bold;';
+$table_font->size[0] = '50%';
+$table_font->data = [];
 
-    $table_font->data[$row][0] = __('Graphs font family');
+$table_font->data[$row][0] = __('Graphs font family');
 
-    // Load font families.
-    $fonts = [];
-    $dirFonts = scandir(_MPDF_TTFONTPATH);
-    foreach ($dirFonts as $entryDir) {
-        if (strstr($entryDir, '.ttf') !== false) {
-            $explode = explode('-', $entryDir);
-            if (count($explode) === 1) {
-                $fonts[$entryDir] = substr($entryDir, 0, (strlen($entryDir) - 4));
-            }
+// Load font families.
+$fonts = [];
+$dirFonts = scandir(_MPDF_TTFONTPATH);
+foreach ($dirFonts as $entryDir) {
+    if (strstr($entryDir, '.ttf') !== false) {
+        $explode = explode('-', $entryDir);
+        if (count($explode) === 1) {
+            $fonts[$entryDir] = substr($entryDir, 0, (strlen($entryDir) - 4));
+        }
 
-            if ($explode[1] === 'Regular.ttf') {
-                $fonts[$explode[0].'.ttf'] = $explode[0];
-            }
+        if ($explode[1] === 'Regular.ttf') {
+            $fonts[$explode[0].'.ttf'] = $explode[0];
         }
     }
+}
 
-    $table_font->data[$row][1] = html_print_select(
-        $fonts,
-        'fontpath',
-        io_safe_output($config['fontpath']),
-        '',
-        '',
-        0,
-        true
-    );
+$table_font->data[$row][1] = html_print_select(
+    $fonts,
+    'fontpath',
+    io_safe_output($config['fontpath']),
+    '',
+    '',
+    0,
+    true
+);
 
-    $row++;
+$row++;
 
-    $table_font->data[$row][0] = __('Graphs font size');
+$table_font->data[$row][0] = __('Graphs font size');
 
-    $font_size_array = [
-        1  => 1,
-        2  => 2,
-        3  => 3,
-        4  => 4,
-        5  => 5,
-        6  => 6,
-        7  => 7,
-        8  => 8,
-        9  => 9,
-        10 => 10,
-        11 => 11,
-        12 => 12,
-        13 => 13,
-        14 => 14,
-        15 => 15,
-    ];
+$font_size_array = [
+    1  => 1,
+    2  => 2,
+    3  => 3,
+    4  => 4,
+    5  => 5,
+    6  => 6,
+    7  => 7,
+    8  => 8,
+    9  => 9,
+    10 => 10,
+    11 => 11,
+    12 => 12,
+    13 => 13,
+    14 => 14,
+    15 => 15,
+];
 
-    $table_font->data[$row][1] = html_print_select(
-        $font_size_array,
-        'font_size',
-        $config['font_size'],
-        '',
-        '',
-        0,
-        true
-    );
-    $row++;
+$table_font->data[$row][1] = html_print_select(
+    $font_size_array,
+    'font_size',
+    $config['font_size'],
+    '',
+    '',
+    0,
+    true
+);
+$row++;
 
-    $table_font->data[$row][0] = __('Agent size text');
-    $table_font->data[$row][1] = __('Small:').html_print_input_text('agent_size_text_small', $config['agent_size_text_small'], '', 3, 3, true);
-    $table_font->data[$row][1] .= ' '.__('Normal:').html_print_input_text('agent_size_text_medium', $config['agent_size_text_medium'], '', 3, 3, true);
-    $row++;
+$table_font->data[$row][0] = __('Agent size text');
+$table_font->data[$row][1] = __('Small:').html_print_input_text('agent_size_text_small', $config['agent_size_text_small'], '', 3, 3, true);
+$table_font->data[$row][1] .= ' '.__('Normal:').html_print_input_text('agent_size_text_medium', $config['agent_size_text_medium'], '', 3, 3, true);
+$row++;
 
-    $table_font->data[$row][0] = __('Module size text');
-    $table_font->data[$row][1] = __('Small:').html_print_input_text('module_size_text_small', $config['module_size_text_small'], '', 3, 3, true);
-    $table_font->data[$row][1] .= ' '.__('Normal:').html_print_input_text('module_size_text_medium', $config['module_size_text_medium'], '', 3, 3, true);
-    $row++;
+$table_font->data[$row][0] = __('Module size text');
+$table_font->data[$row][1] = __('Small:').html_print_input_text('module_size_text_small', $config['module_size_text_small'], '', 3, 3, true);
+$table_font->data[$row][1] .= ' '.__('Normal:').html_print_input_text('module_size_text_medium', $config['module_size_text_medium'], '', 3, 3, true);
+$row++;
 
-    $table_font->data[$row][0] = __('Description size text');
-    $table_font->data[$row][1] = html_print_input_text('description_size_text', $config['description_size_text'], '', 3, 3, true);
-    $row++;
+$table_font->data[$row][0] = __('Description size text');
+$table_font->data[$row][1] = html_print_input_text('description_size_text', $config['description_size_text'], '', 3, 3, true);
+$row++;
 
-    $table_font->data[$row][0] = __('Item title size text');
-    $table_font->data[$row][1] = html_print_input_text(
-        'item_title_size_text',
-        $config['item_title_size_text'],
-        '',
-        3,
-        3,
-        true
-    );
-    $row++;
+$table_font->data[$row][0] = __('Item title size text');
+$table_font->data[$row][1] = html_print_input_text(
+    'item_title_size_text',
+    $config['item_title_size_text'],
+    '',
+    3,
+    3,
+    true
+);
+$row++;
 
-    $table_font->data[$row][0] = __('Show unit along with value in reports');
-    $table_font->data[$row][1] = html_print_checkbox_switch(
-        'simple_module_value',
-        1,
-        $config['simple_module_value'],
-        true
-    );
-    $row++;
+$table_font->data[$row][0] = __('Show unit along with value in reports');
+$table_font->data[$row][1] = html_print_checkbox_switch(
+    'simple_module_value',
+    1,
+    $config['simple_module_value'],
+    true
+);
+$row++;
 
-    echo '<fieldset>';
-    echo '<legend>'.__('Font and Text configuration').' '.ui_print_help_icon('front_and_text_conf_tab', true).'</legend>';
-    html_print_table($table_font);
-    echo '</fieldset>';
-    // ----------------------------------------------------------------------
-    // ----------------------------------------------------------------------
-    // CHARS CONFIGURATION
-    // ----------------------------------------------------------------------
-    $table_chars = new stdClass();
-    $table_chars->width = '100%';
-    $table_chars->class = 'databox filters';
-    $table_chars->style[0] = 'font-weight: bold;';
-    $table_chars->size[0] = '50%';
-    $table_chars->data = [];
+// ----------------------------------------------------------------------
+// ----------------------------------------------------------------------
+// CHARS CONFIGURATION
+// ----------------------------------------------------------------------
+$table_chars = new stdClass();
+$table_chars->width = '100%';
+$table_chars->class = 'databox filters';
+$table_chars->style[0] = 'font-weight: bold;';
+$table_chars->size[0] = '50%';
+$table_chars->data = [];
 
-    $table_chars->data[$row][0] = __('Graph color #1');
-    $table_chars->data[$row][1] = html_print_input_text(
-        'graph_color1',
-        $config['graph_color1'],
-        '',
-        8,
-        8,
-        true
-    );
-    $row++;
+$table_chars->data[$row][0] = __('Graph color #1');
+$table_chars->data[$row][1] = html_print_input_text(
+    'graph_color1',
+    $config['graph_color1'],
+    '',
+    8,
+    8,
+    true
+);
+$row++;
 
-    $table_chars->data[$row][0] = __('Graph color #2');
-    $table_chars->data[$row][1] = html_print_input_text(
-        'graph_color2',
-        $config['graph_color2'],
-        '',
-        8,
-        8,
-        true
-    );
-    $row++;
+$table_chars->data[$row][0] = __('Graph color #2');
+$table_chars->data[$row][1] = html_print_input_text(
+    'graph_color2',
+    $config['graph_color2'],
+    '',
+    8,
+    8,
+    true
+);
+$row++;
 
-    $table_chars->data[$row][0] = __('Graph color #3');
-    $table_chars->data[$row][1] = html_print_input_text(
-        'graph_color3',
-        $config['graph_color3'],
-        '',
-        8,
-        8,
-        true
-    );
-    $row++;
+$table_chars->data[$row][0] = __('Graph color #3');
+$table_chars->data[$row][1] = html_print_input_text(
+    'graph_color3',
+    $config['graph_color3'],
+    '',
+    8,
+    8,
+    true
+);
+$row++;
 
-    $table_chars->data[$row][0] = __('Graph color #4');
-    $table_chars->data[$row][1] = html_print_input_text(
-        'graph_color4',
-        $config['graph_color4'],
-        '',
-        8,
-        8,
-        true
-    );
-    $row++;
+$table_chars->data[$row][0] = __('Graph color #4');
+$table_chars->data[$row][1] = html_print_input_text(
+    'graph_color4',
+    $config['graph_color4'],
+    '',
+    8,
+    8,
+    true
+);
+$row++;
 
-    $table_chars->data[$row][0] = __('Graph color #5');
-    $table_chars->data[$row][1] = html_print_input_text(
-        'graph_color5',
-        $config['graph_color5'],
-        '',
-        8,
-        8,
-        true
-    );
-    $row++;
+$table_chars->data[$row][0] = __('Graph color #5');
+$table_chars->data[$row][1] = html_print_input_text(
+    'graph_color5',
+    $config['graph_color5'],
+    '',
+    8,
+    8,
+    true
+);
+$row++;
 
-    $table_chars->data[$row][0] = __('Graph color #6');
-    $table_chars->data[$row][1] = html_print_input_text(
-        'graph_color6',
-        $config['graph_color6'],
-        '',
-        8,
-        8,
-        true
-    );
-    $row++;
+$table_chars->data[$row][0] = __('Graph color #6');
+$table_chars->data[$row][1] = html_print_input_text(
+    'graph_color6',
+    $config['graph_color6'],
+    '',
+    8,
+    8,
+    true
+);
+$row++;
 
-    $table_chars->data[$row][0] = __('Graph color #7');
-    $table_chars->data[$row][1] = html_print_input_text(
-        'graph_color7',
-        $config['graph_color7'],
-        '',
-        8,
-        8,
-        true
-    );
-    $row++;
+$table_chars->data[$row][0] = __('Graph color #7');
+$table_chars->data[$row][1] = html_print_input_text(
+    'graph_color7',
+    $config['graph_color7'],
+    '',
+    8,
+    8,
+    true
+);
+$row++;
 
-    $table_chars->data[$row][0] = __('Graph color #8');
-    $table_chars->data[$row][1] = html_print_input_text(
-        'graph_color8',
-        $config['graph_color8'],
-        '',
-        8,
-        8,
-        true
-    );
-    $row++;
+$table_chars->data[$row][0] = __('Graph color #8');
+$table_chars->data[$row][1] = html_print_input_text(
+    'graph_color8',
+    $config['graph_color8'],
+    '',
+    8,
+    8,
+    true
+);
+$row++;
 
-    $table_chars->data[$row][0] = __('Graph color #9');
-    $table_chars->data[$row][1] = html_print_input_text(
-        'graph_color9',
-        $config['graph_color9'],
-        '',
-        8,
-        8,
-        true
-    );
-    $row++;
+$table_chars->data[$row][0] = __('Graph color #9');
+$table_chars->data[$row][1] = html_print_input_text(
+    'graph_color9',
+    $config['graph_color9'],
+    '',
+    8,
+    8,
+    true
+);
+$row++;
 
-    $table_chars->data[$row][0] = __('Graph color #10');
-    $table_chars->data[$row][1] = html_print_input_text(
-        'graph_color10',
-        $config['graph_color10'],
-        '',
-        8,
-        8,
-        true
-    );
-    $row++;
+$table_chars->data[$row][0] = __('Graph color #10');
+$table_chars->data[$row][1] = html_print_input_text(
+    'graph_color10',
+    $config['graph_color10'],
+    '',
+    8,
+    8,
+    true
+);
+$row++;
 
-    $table_chars->data[$row][0] = __('Value to interface graphics');
-    $table_chars->data[$row][1] = html_print_input_text(
-        'interface_unit',
-        $config['interface_unit'],
-        '',
-        20,
-        20,
-        true
-    );
-    $row++;
+$table_chars->data[$row][0] = __('Value to interface graphics');
+$table_chars->data[$row][1] = html_print_input_text(
+    'interface_unit',
+    $config['interface_unit'],
+    '',
+    20,
+    20,
+    true
+);
+$row++;
 
-    $disabled_graph_precision = false;
-    if (enterprise_installed() === false) {
-        $disabled_graph_precision = true;
+$disabled_graph_precision = false;
+if (enterprise_installed() === false) {
+    $disabled_graph_precision = true;
+}
+
+$table_chars->data[$row][0] = __('Data precision');
+$table_chars->data[$row][1] = html_print_input_text(
+    'graph_precision',
+    $config['graph_precision'],
+    '',
+    5,
+    5,
+    true,
+    $disabled_graph_precision,
+    false,
+    'onChange="change_precision()"'
+);
+$row++;
+
+if (isset($config['short_module_graph_data']) === false) {
+    $config['short_module_graph_data'] = true;
+}
+
+$table_chars->data[$row][0] = __('Data precision in graphs');
+$table_chars->data[$row][1] = html_print_input_text(
+    'short_module_graph_data',
+    $config['short_module_graph_data'],
+    '',
+    5,
+    5,
+    true,
+    $disabled_graph_precision,
+    false,
+    'onChange="change_precision()"'
+);
+$row++;
+
+$table_chars->data[$row][0] = __(
+    'Default line thickness for the Custom Graph.'
+);
+$table_chars->data[$row][1] = html_print_input_text(
+    'custom_graph_width',
+    $config['custom_graph_width'],
+    '',
+    5,
+    5,
+    true
+);
+$row++;
+
+$table_chars->data[$row][0] = __('Number of elements in Custom Graph');
+$table_chars->data[$row][1] = html_print_input_text(
+    'items_combined_charts',
+    $config['items_combined_charts'],
+    '',
+    5,
+    5,
+    true,
+    false,
+    false,
+    ''
+);
+$row++;
+
+$table_chars->data[$row][0] = __('Use round corners');
+$table_chars->data[$row][1] = html_print_checkbox_switch(
+    'round_corner',
+    1,
+    $config['round_corner'],
+    true
+);
+$row++;
+
+$table_chars->data[$row][0] = __('Chart fit to content');
+$table_chars->data[$row][1] = html_print_checkbox_switch(
+    'maximum_y_axis',
+    1,
+    $config['maximum_y_axis'],
+    true
+);
+$row++;
+
+$table_chars->data[$row][0] = __('Type of module charts');
+$table_chars->data[$row][1] = __('Area').'&nbsp;'.html_print_radio_button(
+    'type_module_charts',
+    'area',
+    '',
+    $config['type_module_charts'] == 'area',
+    true
+).'&nbsp;&nbsp;';
+$table_chars->data[$row][1] .= __('Line').'&nbsp;'.html_print_radio_button(
+    'type_module_charts',
+    'line',
+    '',
+    $config['type_module_charts'] != 'area',
+    true
+);
+$row++;
+
+$table_chars->data[$row][0] = __('Type of interface charts');
+$table_chars->data[$row][1] = __('Area').'&nbsp;'.html_print_radio_button(
+    'type_interface_charts',
+    'area',
+    '',
+    $config['type_interface_charts'] == 'area',
+    true
+).'&nbsp;&nbsp;';
+$table_chars->data[$row][1] .= __('Line').'&nbsp;'.html_print_radio_button(
+    'type_interface_charts',
+    'line',
+    '',
+    $config['type_interface_charts'] != 'area',
+    true
+);
+$row++;
+
+$table_chars->data[$row][0] = __('Percentile');
+$table_chars->data[$row][1] = html_print_input_text(
+    'percentil',
+    $config['percentil'],
+    '',
+    20,
+    20,
+    true
+);
+$row++;
+
+$table_chars->data[$row][0] = __('Graph TIP view:');
+
+$options_full_escale    = [];
+$options_full_escale[0] = __('None');
+$options_full_escale[1] = __('All');
+$options_full_escale[2] = __('On Boolean graphs');
+
+$table_chars->data[$row][1] = html_print_select(
+    $options_full_escale,
+    'full_scale_option',
+    $config['full_scale_option'],
+    '',
+    '',
+    0,
+    true,
+    false,
+    false
+);
+$row++;
+
+
+$table_chars->data[$row][0] = __('Graph mode');
+
+$options_soft_graphs    = [];
+$options_soft_graphs[0] = __('Show only average by default');
+$options_soft_graphs[1] = __('Show MAX/AVG/MIN by default');
+
+$table_chars->data[$row][1] = html_print_select(
+    $options_soft_graphs,
+    'type_mode_graph',
+    $config['type_mode_graph'],
+    '',
+    '',
+    0,
+    true,
+    false,
+    false
+);
+$row++;
+
+$table_chars->data[$row][0] = __('Zoom graphs:');
+
+$options_zoom_graphs    = [];
+$options_zoom_graphs[1] = 'x1';
+$options_zoom_graphs[2] = 'x2';
+$options_zoom_graphs[3] = 'x3';
+$options_zoom_graphs[4] = 'x4';
+$options_zoom_graphs[5] = 'x5';
+
+$table_chars->data[$row][1] = html_print_select(
+    $options_zoom_graphs,
+    'zoom_graph',
+    $config['zoom_graph'],
+    '',
+    '',
+    0,
+    true,
+    false,
+    false
+);
+$row++;
+
+// ----------------------------------------------------------------------
+// ----------------------------------------------------------------------
+// Visual Consoles
+// ----------------------------------------------------------------------
+$table_vc = new stdClass();
+$table_vc->width = '100%';
+$table_vc->class = 'databox filters';
+$table_vc->style[0] = 'font-weight: bold';
+$table_vc->size[0] = '50%';
+$table_vc->data = [];
+
+// Remove when the new view reaches rock solid stability.
+$table_vc->data[$row][0] = __('Legacy Visual Console View');
+$table_vc->data[$row][1] = html_print_checkbox_switch(
+    'legacy_vc',
+    1,
+    (bool) $config['legacy_vc'],
+    true
+);
+$row++;
+
+$intervals = [
+    10   => '10 '.__('seconds'),
+    30   => '30 '.__('seconds'),
+    60   => '1 '.__('minutes'),
+    300  => '5 '.__('minutes'),
+    900  => '15 '.__('minutes'),
+    1800 => '30 '.__('minutes'),
+    3600 => '1 '.__('hour'),
+];
+$table_vc->data[$row][0] = __('Default cache expiration');
+$table_vc->data[$row][1] = html_print_extended_select_for_time(
+    'vc_default_cache_expiration',
+    $config['vc_default_cache_expiration'],
+    '',
+    __('No cache'),
+    0,
+    false,
+    true,
+    false,
+    false,
+    '',
+    false,
+    $intervals
+);
+$row++;
+
+$table_vc->data[$row][0] = __('Default interval for refresh on Visual Console');
+$table_vc->data[$row][1] = html_print_select($values, 'vc_refr', (int) $config['vc_refr'], '', 'N/A', 0, true, false, false);
+$row++;
+
+$vc_favourite_view_array[0] = __('Classic view');
+$vc_favourite_view_array[1] = __('View of favorites');
+$table_vc->data[$row][0] = __('Type of view of visual consoles');
+$table_vc->data[$row][1] = html_print_select($vc_favourite_view_array, 'vc_favourite_view', $config['vc_favourite_view'], '', '', 0, true);
+$row++;
+
+$table_vc->data[$row][0] = __('Number of favorite visual consoles to show in the menu');
+$table_vc->data[$row][1] = "<input type ='number' value=".$config['vc_menu_items']." size='5' name='vc_menu_items' min='0' max='25'>";
+$row++;
+
+$table_vc->data[$row][0] = __('Default line thickness for the Visual Console');
+$table_vc->data[$row][1] = html_print_input_text('vc_line_thickness', (int) $config['vc_line_thickness'], '', 5, 5, true);
+
+
+// ----------------------------------------------------------------------
+// Services
+// ----------------------------------------------------------------------
+$table_ser = new stdClass();
+$table_ser->width = '100%';
+$table_ser->class = 'databox filters';
+$table_ser->style[0] = 'font-weight: bold';
+$table_ser->size[0] = '50%';
+$table_ser->data = [];
+
+$table_ser->data['number'][0] = __('Number of favorite services to show in the menu');
+$table_ser->data['number'][1] = "<input type ='number' value=".$config['ser_menu_items']." size='5' name='ser_menu_items' min='0' max='25'>";
+
+// ----------------------------------------------------------------------
+// Reports
+// ----------------------------------------------------------------------
+$table_report = new stdClass();
+$table_report->width = '100%';
+$table_report->class = 'databox filters';
+$table_report->style[0] = 'font-weight: bold;';
+$table_report->size[0] = '20%';
+
+$table_report->data = [];
+
+$table_report->data[$row][0] = __('Show report info with description');
+$table_report->data[$row][1] = html_print_checkbox_switch(
+    'custom_report_info',
+    1,
+    $config['custom_report_info'],
+    true
+);
+$row++;
+
+$table_report->data[$row][0] = __('Custom report front page');
+$table_report->data[$row][1] = html_print_checkbox_switch(
+    'custom_report_front',
+    1,
+    $config['custom_report_front'],
+    true
+);
+
+$row++;
+
+$table_report->data[$row][0] = __('PDF font size (px)');
+$table_report->data[$row][1] = "<input type ='number' value=".$config['global_font_size_report']." name='global_font_size_report' min='1' max='50' step='1'>";
+
+$row++;
+
+$table_report->data[$row][0] = __('HTML font size for SLA (em)');
+$table_report->data[$row][1] = "<input type ='number' value=".$config['font_size_item_report']." name='font_size_item_report' min='1' max='9' step='0.1'>";
+
+$row++;
+
+$table_report->data[$row][0] = __('PDF font family');
+$table_report->data[$row][1] = html_print_select(
+    $fonts,
+    'custom_report_front_font',
+    $config['custom_report_front_font'],
+    false,
+    __('Default'),
+    '',
+    true
+);
+
+$row++;
+
+
+$table_report->data[$row][0] = __('Graph image height for HTML reports');
+$table_report->data[$row][1] = html_print_input_text('graph_image_height', $config['graph_image_height'], '', 20, 20, true);
+
+$row++;
+
+$interval_description = [
+    'large' => 'Long',
+    'tiny'  => 'Short',
+];
+$table_report->data[$row][0] = __('Interval description');
+$table_report->data[$row][1] = html_print_select($interval_description, 'interval_description', $config['interval_description'], '', '', '', true, false, false);
+
+$row++;
+
+// ----------------------------------------------------------------------
+$dirItems = scandir($config['homedir'].'/images/custom_logo');
+foreach ($dirItems as $entryDir) {
+    if (strstr($entryDir, '.jpg') !== false || strstr($entryDir, '.png') !== false) {
+        $customLogos['images/custom_logo/'.$entryDir] = $entryDir;
     }
+}
 
-    $table_chars->data[$row][0] = __('Data precision');
-    $table_chars->data[$row][1] = html_print_input_text(
-        'graph_precision',
-        $config['graph_precision'],
-        '',
-        5,
-        5,
-        true,
-        $disabled_graph_precision,
-        false,
-        'onChange="change_precision()"'
-    );
-    $row++;
+// Logo.
+$table_report->data['custom_report_front-logo'][0] = __('Custom report front').' - '.__('Custom logo').ui_print_help_tip(
+    __("The dir of custom logos is in your www Console in 'images/custom_logo'. You can upload more files (ONLY JPEG AND PNG) in upload tool in console."),
+    true
+);
 
-    if (isset($config['short_module_graph_data']) === false) {
-        $config['short_module_graph_data'] = true;
-    }
+$table_report->data['custom_report_front-logo'][1] = html_print_select(
+    $customLogos,
+    'custom_report_front_logo',
+    io_safe_output($config['custom_report_front_logo']),
+    'showPreview()',
+    __('Default'),
+    '',
+    true
+);
+// Preview.
+$table_report->data['custom_report_front-preview'][0] = __('Custom report front').' - '.'Preview';
+if (empty($config['custom_report_front_logo'])) {
+    $config['custom_report_front_logo'] = 'images/pandora_logo_white.jpg';
+}
 
-    $table_chars->data[$row][0] = __('Data precision in graphs');
-    $table_chars->data[$row][1] = html_print_input_text(
-        'short_module_graph_data',
-        $config['short_module_graph_data'],
-        '',
-        5,
-        5,
-        true,
-        $disabled_graph_precision,
-        false,
-        'onChange="change_precision()"'
-    );
-    $row++;
+$table_report->data['custom_report_front-preview'][1] = '<span id="preview_image">'.html_print_image($config['custom_report_front_logo'], true).'</span>';
 
-    $table_chars->data[$row][0] = __(
-        'Default line thickness for the Custom Graph.'
-    );
-    $table_chars->data[$row][1] = html_print_input_text(
-        'custom_graph_width',
-        $config['custom_graph_width'],
-        '',
-        5,
-        5,
-        true
-    );
-    $row++;
+// Header.
+$table_report->data['custom_report_front-header'][0] = __('Custom report front').' - '.__('Header');
 
-    $table_chars->data[$row][0] = __('Number of elements in Custom Graph');
-    $table_chars->data[$row][1] = html_print_input_text(
-        'items_combined_charts',
-        $config['items_combined_charts'],
-        '',
-        5,
-        5,
-        true,
-        false,
-        false,
-        ''
-    );
-    $row++;
+// Do not remove io_safe_output in textarea. TinyMCE avoids XSS injection.
+$table_report->data['custom_report_front-header'][1] = html_print_textarea(
+    'custom_report_front_header',
+    5,
+    15,
+    io_safe_output($config['custom_report_front_header']),
+    'class="w90p height_300px"',
+    true
+);
 
-    $table_chars->data[$row][0] = __('Use round corners');
-    $table_chars->data[$row][1] = html_print_checkbox_switch(
-        'round_corner',
-        1,
-        $config['round_corner'],
-        true
-    );
-    $row++;
+// First page.
+// Do not remove io_safe_output in textarea. TinyMCE avoids XSS injection.
+if ($config['custom_report_front']) {
+    $firstpage_content = $config['custom_report_front_firstpage'];
+} else {
+    $firstpage_content = io_safe_output($config['custom_report_front_firstpage']);
+}
 
-    $table_chars->data[$row][0] = __('Chart fit to content');
-    $table_chars->data[$row][1] = html_print_checkbox_switch(
-        'maximum_y_axis',
-        1,
-        $config['maximum_y_axis'],
-        true
-    );
-    $row++;
+$table_report->data['custom_report_front-first_page'][0] = __('Custom report front').' - '.__('First page');
+$custom_report_front_firstpage = str_replace(
+    '(_URLIMAGE_)',
+    ui_get_full_url(false, true, false, false),
+    io_safe_output($firstpage_content)
+);
+$table_report->data['custom_report_front-first_page'][1] = html_print_textarea(
+    'custom_report_front_firstpage',
+    15,
+    15,
+    $custom_report_front_firstpage,
+    'class="w90p height_300px"',
+    true
+);
 
-    $table_chars->data[$row][0] = __('Type of module charts');
-    $table_chars->data[$row][1] = __('Area').'&nbsp;'.html_print_radio_button(
-        'type_module_charts',
-        'area',
-        '',
-        $config['type_module_charts'] == 'area',
-        true
-    ).'&nbsp;&nbsp;';
-    $table_chars->data[$row][1] .= __('Line').'&nbsp;'.html_print_radio_button(
-        'type_module_charts',
-        'line',
-        '',
-        $config['type_module_charts'] != 'area',
-        true
-    );
-    $row++;
+// Footer.
+$table_report->data['custom_report_front-footer'][0] = __('Custom report front').' - '.__('Footer');
 
-    $table_chars->data[$row][0] = __('Type of interface charts');
-    $table_chars->data[$row][1] = __('Area').'&nbsp;'.html_print_radio_button(
-        'type_interface_charts',
-        'area',
-        '',
-        $config['type_interface_charts'] == 'area',
-        true
-    ).'&nbsp;&nbsp;';
-    $table_chars->data[$row][1] .= __('Line').'&nbsp;'.html_print_radio_button(
-        'type_interface_charts',
-        'line',
-        '',
-        $config['type_interface_charts'] != 'area',
-        true
-    );
-    $row++;
-
-    $table_chars->data[$row][0] = __('Percentile');
-    $table_chars->data[$row][1] = html_print_input_text(
-        'percentil',
-        $config['percentil'],
-        '',
-        20,
-        20,
-        true
-    );
-    $row++;
-
-    $table_chars->data[$row][0] = __('Graph TIP view:');
-
-    $options_full_escale    = [];
-    $options_full_escale[0] = __('None');
-    $options_full_escale[1] = __('All');
-    $options_full_escale[2] = __('On Boolean graphs');
-
-    $table_chars->data[$row][1] = html_print_select(
-        $options_full_escale,
-        'full_scale_option',
-        $config['full_scale_option'],
-        '',
-        '',
-        0,
-        true,
-        false,
-        false
-    );
-    $row++;
+// Do not remove io_safe_output in textarea. TinyMCE avoids XSS injection.
+$table_report->data['custom_report_front-footer'][1] = html_print_textarea(
+    'custom_report_front_footer',
+    5,
+    15,
+    io_safe_output($config['custom_report_front_footer']),
+    'class="w90p height_300px""',
+    true
+);
 
 
-    $table_chars->data[$row][0] = __('Graph mode');
+// ----------------------------------------------------------------------
+// OTHER CONFIGURATION
+// ----------------------------------------------------------------------
+$table_other = new stdClass();
+$table_other->width = '100%';
+$table_other->class = 'databox filters';
+$table_other->style[0] = 'font-weight: bold;';
+$table_other->size[0] = '50%';
+$table_other->size[1] = '26%';
+$table_other->size[2] = '12%';
+$table_other->size[3] = '12%';
+$table_other->data = [];
 
-    $options_soft_graphs    = [];
-    $options_soft_graphs[0] = __('Show only average by default');
-    $options_soft_graphs[1] = __('Show MAX/AVG/MIN by default');
+$row++;
 
-    $table_chars->data[$row][1] = html_print_select(
-        $options_soft_graphs,
-        'type_mode_graph',
-        $config['type_mode_graph'],
-        '',
-        '',
-        0,
-        true,
-        false,
-        false
-    );
-    $row++;
+$table_other->data[$row][0] = __('Networkmap max width');
+$table_other->data[$row][1] = html_print_input_text(
+    'networkmap_max_width',
+    $config['networkmap_max_width'],
+    '',
+    10,
+    20,
+    true
+);
+$row++;
 
-    $table_chars->data[$row][0] = __('Zoom graphs:');
+$table_other->data[$row][0] = __('Show only the group name');
+$table_other->data[$row][1] = html_print_checkbox_switch(
+    'show_group_name',
+    1,
+    $config['show_group_name'],
+    true
+);
+$row++;
 
-    $options_zoom_graphs    = [];
-    $options_zoom_graphs[1] = 'x1';
-    $options_zoom_graphs[2] = 'x2';
-    $options_zoom_graphs[3] = 'x3';
-    $options_zoom_graphs[4] = 'x4';
-    $options_zoom_graphs[5] = 'x5';
+$table_other->data[$row][0] = __('Date format string');
+$table_other->data[$row][1] = '<em>'.__('Example').'</em> '.date($config['date_format']);
+$table_other->data[$row][1] .= html_print_input_text('date_format', $config['date_format'], '', 30, 100, true);
+$row++;
 
-    $table_chars->data[$row][1] = html_print_select(
-        $options_zoom_graphs,
-        'zoom_graph',
-        $config['zoom_graph'],
-        '',
-        '',
-        0,
-        true,
-        false,
-        false
-    );
-    $row++;
+if ($config['prominent_time'] == 'comparation') {
+    $timestamp = false;
+    $comparation = true;
+    $compact = false;
+} else if ($config['prominent_time'] == 'timestamp') {
+    $timestamp = true;
+    $comparation = false;
+    $compact = false;
+} else if ($config['prominent_time'] == 'compact') {
+    $timestamp = false;
+    $comparation = false;
+    $compact = true;
+}
 
-    echo '<fieldset>';
-    echo '<legend>'.__('Charts configuration').' '.ui_print_help_icon('charts_conf_tab', true).'</legend>';
-    html_print_table($table_chars);
-    echo '</fieldset>';
-    // ----------------------------------------------------------------------
-    // ----------------------------------------------------------------------
-    // Visual Consoles
-    // ----------------------------------------------------------------------
-    $table_vc = new stdClass();
-    $table_vc->width = '100%';
-    $table_vc->class = 'databox filters';
-    $table_vc->style[0] = 'font-weight: bold';
-    $table_vc->size[0] = '50%';
-    $table_vc->data = [];
+$table_other->data[$row][0] = __('Timestamp, time comparison, or compact mode');
+$table_other->data[$row][1] = '<div class="switch_radio_button">';
+$table_other->data[$row][1] .= html_print_radio_button('prominent_time', 'comparation', __('Comparation in rollover'), $comparation, true);
+$table_other->data[$row][1] .= html_print_radio_button('prominent_time', 'timestamp', __('Timestamp in rollover'), $timestamp, true);
+$table_other->data[$row][1] .= html_print_radio_button('prominent_time', 'compact', __('Compact mode'), $compact, true);
+$table_other->data[$row][1] .= '</div>';
 
-    // Remove when the new view reaches rock solid stability.
-    $table_vc->data[$row][0] = __('Legacy Visual Console View');
-    $table_vc->data[$row][1] = html_print_checkbox_switch(
-        'legacy_vc',
-        1,
-        (bool) $config['legacy_vc'],
-        true
-    );
-    $row++;
+$row++;
 
-    $intervals = [
-        10   => '10 '.__('seconds'),
-        30   => '30 '.__('seconds'),
-        60   => '1 '.__('minutes'),
-        300  => '5 '.__('minutes'),
-        900  => '15 '.__('minutes'),
-        1800 => '30 '.__('minutes'),
-        3600 => '1 '.__('hour'),
-    ];
-    $table_vc->data[$row][0] = __('Default cache expiration');
-    $table_vc->data[$row][1] = html_print_extended_select_for_time(
-        'vc_default_cache_expiration',
-        $config['vc_default_cache_expiration'],
-        '',
-        __('No cache'),
-        0,
-        false,
-        true,
-        false,
-        false,
-        '',
-        false,
-        $intervals
-    );
-    $row++;
+// ----------------------------------------------------------------------
+// CUSTOM VALUES POST PROCESS
+// ----------------------------------------------------------------------
+$table_other->data[$row][0] = __('Custom values post process');
+$table_other->data[$row][1] = __('Value').':&nbsp;'.html_print_input_text('custom_value', '', '', 25, 50, true);
+$table_other->data[$row][2] = __('Text').':&nbsp;'.html_print_input_text('custom_text', '', '', 15, 50, true);
+$table_other->data[$row][2] .= '&nbsp;';
+$table_other->data[$row][2] .= html_print_input_hidden(
+    'custom_value_add',
+    '',
+    true
+);
+$table_other->data[$row][3] = html_print_button(
+    __('Add'),
+    'custom_value_add_btn',
+    false,
+    '',
+    'class="sub next"',
+    true
+);
 
-    $table_vc->data[$row][0] = __('Default interval for refresh on Visual Console');
-    $table_vc->data[$row][1] = html_print_select($values, 'vc_refr', (int) $config['vc_refr'], '', 'N/A', 0, true, false, false);
-    $row++;
+$row++;
 
-    $vc_favourite_view_array[0] = __('Classic view');
-    $vc_favourite_view_array[1] = __('View of favorites');
-    $table_vc->data[$row][0] = __('Type of view of visual consoles');
-    $table_vc->data[$row][1] = html_print_select($vc_favourite_view_array, 'vc_favourite_view', $config['vc_favourite_view'], '', '', 0, true);
-    $row++;
+$table_other->data[$row][0] = '';
+$table_other->data[$row][1] = __('Delete custom values').': ';
+$table_other->data[$row][2] = html_print_select(
+    post_process_get_custom_values(),
+    'custom_values',
+    '',
+    '',
+    '',
+    '',
+    true
+);
+$count_custom_postprocess = post_process_get_custom_values();
+$table_other->data[$row][3] = html_print_button(
+    __('Delete'),
+    'custom_values_del_btn',
+    empty($count_custom_postprocess),
+    '',
+    'class="sub cancel"',
+    true
+);
+// This hidden field will be filled from jQuery before submit
+$table_other->data[$row][1] .= html_print_input_hidden(
+    'custom_value_to_delete',
+    '',
+    true
+);
+$table_other->data[$row][3] .= '<br><br>';
 
-    $table_vc->data[$row][0] = __('Number of favorite visual consoles to show in the menu');
-    $table_vc->data[$row][1] = "<input type ='number' value=".$config['vc_menu_items']." size='5' name='vc_menu_items' min='0' max='25'>";
-    $row++;
+// ----------------------------------------------------------------------
+// ----------------------------------------------------------------------
+// CUSTOM INTERVAL VALUES
+// ----------------------------------------------------------------------
+$row++;
+$table_other->data[$row][0] = __('Interval values');
+$units = [
+    1               => __('seconds'),
+    SECONDS_1MINUTE => __('minutes'),
+    SECONDS_1HOUR   => __('hours'),
+    SECONDS_1DAY    => __('days'),
+    SECONDS_1MONTH  => __('months'),
+    SECONDS_1YEAR   => __('years'),
+];
+$table_other->data[$row][1] = __('Value').': ';
+$table_other->data[$row][1] .= html_print_input_text('interval_value', '', '', 5, 5, true);
+$table_other->data[$row][2] = html_print_select($units, 'interval_unit', 1, '', '', '', true, false, false);
+$table_other->data[$row][3] = html_print_button(__('Add'), 'interval_add_btn', false, '', 'class="sub next"', true);
 
-    $table_vc->data[$row][0] = __('Default line thickness for the Visual Console');
-    $table_vc->data[$row][1] = html_print_input_text('vc_line_thickness', (int) $config['vc_line_thickness'], '', 5, 5, true);
+$row++;
 
+$table_other->data[$row][0] = '';
+$table_other->data[$row][1] = __('Delete interval').': ';
+$table_other->data[$row][2] = html_print_select(get_periods(false, false), 'intervals', '', '', '', '', true);
+$table_other->data[$row][3] = html_print_button(__('Delete'), 'interval_del_btn', empty($config['interval_values']), '', 'class="sub cancel"', true);
 
-    echo '<fieldset>';
-    echo '<legend>'.__('Visual consoles configuration').' '.ui_print_help_icon('visual_consoles_conf_tab', true).'</legend>';
-    html_print_table($table_vc);
-    echo '</fieldset>';
+$table_other->data[$row][1] .= html_print_input_hidden('interval_values', $config['interval_values'], true);
+// This hidden field will be filled from jQuery before submit
+$table_other->data[$row][1] .= html_print_input_hidden('interval_to_delete', '', true);
+$table_other->data[$row][3] .= '<br><br>';
+// ----------------------------------------------------------------------
+$row++;
 
-    // ----------------------------------------------------------------------
-    // Services
-    // ----------------------------------------------------------------------
-    $table_ser = new stdClass();
-    $table_ser->width = '100%';
-    $table_ser->class = 'databox filters';
-    $table_ser->style[0] = 'font-weight: bold';
-    $table_ser->size[0] = '50%';
-    $table_ser->data = [];
+$table_other->data[$row][0] = __('Module units');
+$table_other->data[$row][1] = __('Value').': ';
+$table_other->data[$row][1] .= html_print_input_text('custom_module_unit', '', '', 15, 50, true);
+$table_other->data[$row][2] = '';
+$table_other->data[$row][3] = html_print_button(__('Add'), 'module_unit_add_btn', false, '', 'class="sub next"', true);
 
-    $table_ser->data['number'][0] = __('Number of favorite services to show in the menu');
-    $table_ser->data['number'][1] = "<input type ='number' value=".$config['ser_menu_items']." size='5' name='ser_menu_items' min='0' max='25'>";
+$row++;
+$table_other->data[$row][0] = '';
+$table_other->data[$row][1] = __('Delete custom values').': ';
+$table_other->data[$row][2] = html_print_select(get_custom_module_units(), 'module_units', '', '', '', '', true, false, true, 'w100p');
+$table_other->data[$row][3] = html_print_button(
+    __('Delete'),
+    'custom_module_unit_del_btn',
+    empty($count_custom_postprocess),
+    '',
+    'class="sub cancel"',
+    true
+);
 
-    echo '<fieldset>';
-    echo '<legend>'.__('Services configuration').' '.ui_print_help_icon('services_conf_tab', true).'</legend>';
-    html_print_table($table_ser);
-    echo '</fieldset>';
+$table_other->data[$row][3] .= html_print_input_hidden(
+    'custom_module_unit_to_delete',
+    '',
+    true
+);
 
-    // ----------------------------------------------------------------------
-    // Reports
-    // ----------------------------------------------------------------------
-    $table_report = new stdClass();
-    $table_report->width = '100%';
-    $table_report->class = 'databox filters';
-    $table_report->style[0] = 'font-weight: bold;';
-    $table_report->size[0] = '20%';
+$row++;
 
-    $table_report->data = [];
-
-    $table_report->data[$row][0] = __('Show report info with description');
-    $table_report->data[$row][1] = html_print_checkbox_switch(
-        'custom_report_info',
-        1,
-        $config['custom_report_info'],
-        true
-    );
-    $row++;
-
-    $table_report->data[$row][0] = __('Custom report front page');
-    $table_report->data[$row][1] = html_print_checkbox_switch(
-        'custom_report_front',
-        1,
-        $config['custom_report_front'],
-        true
-    );
-
-    $row++;
-
-    $table_report->data[$row][0] = __('PDF font size (px)');
-    $table_report->data[$row][1] = "<input type ='number' value=".$config['global_font_size_report']." name='global_font_size_report' min='1' max='50' step='1'>";
-
-    $row++;
-
-    $table_report->data[$row][0] = __('HTML font size for SLA (em)');
-    $table_report->data[$row][1] = "<input type ='number' value=".$config['font_size_item_report']." name='font_size_item_report' min='1' max='9' step='0.1'>";
-
-    $row++;
-
-    $table_report->data[$row][0] = __('PDF font family');
-    $table_report->data[$row][1] = html_print_select(
-        $fonts,
-        'custom_report_front_font',
-        $config['custom_report_front_font'],
-        false,
-        __('Default'),
-        '',
-        true
-    );
-
-    $row++;
-
-
-    $table_report->data[$row][0] = __('Graph image height for HTML reports');
-    $table_report->data[$row][1] = html_print_input_text('graph_image_height', $config['graph_image_height'], '', 20, 20, true);
-
-    $row++;
-
-    $interval_description = [
-        'large' => 'Long',
-        'tiny'  => 'Short',
-    ];
-    $table_report->data[$row][0] = __('Interval description');
-    $table_report->data[$row][1] = html_print_select($interval_description, 'interval_description', $config['interval_description'], '', '', '', true, false, false);
-
-    $row++;
-
-    // ----------------------------------------------------------------------
-    $dirItems = scandir($config['homedir'].'/images/custom_logo');
-    foreach ($dirItems as $entryDir) {
-        if (strstr($entryDir, '.jpg') !== false || strstr($entryDir, '.png') !== false) {
-            $customLogos['images/custom_logo/'.$entryDir] = $entryDir;
-        }
-    }
-
-    // Logo.
-    $table_report->data['custom_report_front-logo'][0] = __('Custom report front').' - '.__('Custom logo').ui_print_help_tip(
-        __("The dir of custom logos is in your www Console in 'images/custom_logo'. You can upload more files (ONLY JPEG AND PNG) in upload tool in console."),
-        true
-    );
-
-    $table_report->data['custom_report_front-logo'][1] = html_print_select(
-        $customLogos,
-        'custom_report_front_logo',
-        io_safe_output($config['custom_report_front_logo']),
-        'showPreview()',
-        __('Default'),
-        '',
-        true
-    );
-    // Preview.
-    $table_report->data['custom_report_front-preview'][0] = __('Custom report front').' - '.'Preview';
-    if (empty($config['custom_report_front_logo'])) {
-        $config['custom_report_front_logo'] = 'images/pandora_logo_white.jpg';
-    }
-
-    $table_report->data['custom_report_front-preview'][1] = '<span id="preview_image">'.html_print_image($config['custom_report_front_logo'], true).'</span>';
-
-    // Header.
-    $table_report->data['custom_report_front-header'][0] = __('Custom report front').' - '.__('Header');
-
-    // Do not remove io_safe_output in textarea. TinyMCE avoids XSS injection.
-    $table_report->data['custom_report_front-header'][1] = html_print_textarea(
-        'custom_report_front_header',
-        5,
-        15,
-        io_safe_output($config['custom_report_front_header']),
-        'class="w90p height_300px"',
-        true
-    );
-
-    // First page.
-    // Do not remove io_safe_output in textarea. TinyMCE avoids XSS injection.
-    if ($config['custom_report_front']) {
-        $firstpage_content = $config['custom_report_front_firstpage'];
-    } else {
-        $firstpage_content = io_safe_output($config['custom_report_front_firstpage']);
-    }
-
-    $table_report->data['custom_report_front-first_page'][0] = __('Custom report front').' - '.__('First page');
-    $custom_report_front_firstpage = str_replace(
-        '(_URLIMAGE_)',
-        ui_get_full_url(false, true, false, false),
-        io_safe_output($firstpage_content)
-    );
-    $table_report->data['custom_report_front-first_page'][1] = html_print_textarea(
-        'custom_report_front_firstpage',
-        15,
-        15,
-        $custom_report_front_firstpage,
-        'class="w90p height_300px"',
-        true
-    );
-
-    // Footer.
-    $table_report->data['custom_report_front-footer'][0] = __('Custom report front').' - '.__('Footer');
-
-    // Do not remove io_safe_output in textarea. TinyMCE avoids XSS injection.
-    $table_report->data['custom_report_front-footer'][1] = html_print_textarea(
-        'custom_report_front_footer',
-        5,
-        15,
-        io_safe_output($config['custom_report_front_footer']),
-        'class="w90p height_300px""',
-        true
-    );
-
-    echo '<fieldset>';
-    echo '<legend>'.__('Reports configuration ').ui_print_help_icon('reports_configuration_tab', true).'</legend>';
-    html_print_table($table_report);
-    echo '</fieldset>';
-
-    // ----------------------------------------------------------------------
-    // OTHER CONFIGURATION
-    // ----------------------------------------------------------------------
-    $table_other = new stdClass();
-    $table_other->width = '100%';
-    $table_other->class = 'databox filters';
-    $table_other->style[0] = 'font-weight: bold;';
-    $table_other->size[0] = '50%';
-    $table_other->size[1] = '26%';
-    $table_other->size[2] = '12%';
-    $table_other->size[3] = '12%';
-    $table_other->data = [];
-
-    $row++;
-
-    $table_other->data[$row][0] = __('Networkmap max width');
+$common_dividers = [
+    ';' => ';',
+    ',' => ',',
+    '|' => '|',
+];
+$table_other->data[$row][0] = __('CSV divider');
+if ($config['csv_divider'] != ';' && $config['csv_divider'] != ',' && $config['csv_divider'] != '|') {
     $table_other->data[$row][1] = html_print_input_text(
-        'networkmap_max_width',
-        $config['networkmap_max_width'],
+        'csv_divider',
+        $config['csv_divider'],
         '',
-        10,
         20,
+        255,
         true
     );
-    $row++;
-
-    $table_other->data[$row][0] = __('Show only the group name');
-    $table_other->data[$row][1] = html_print_checkbox_switch(
-        'show_group_name',
-        1,
-        $config['show_group_name'],
-        true
-    );
-    $row++;
-
-    $table_other->data[$row][0] = __('Date format string');
-    $table_other->data[$row][1] = '<em>'.__('Example').'</em> '.date($config['date_format']);
-    $table_other->data[$row][1] .= html_print_input_text('date_format', $config['date_format'], '', 30, 100, true);
-    $row++;
-
-    if ($config['prominent_time'] == 'comparation') {
-        $timestamp = false;
-        $comparation = true;
-        $compact = false;
-    } else if ($config['prominent_time'] == 'timestamp') {
-        $timestamp = true;
-        $comparation = false;
-        $compact = false;
-    } else if ($config['prominent_time'] == 'compact') {
-        $timestamp = false;
-        $comparation = false;
-        $compact = true;
-    }
-
-    $table_other->data[$row][0] = __('Timestamp, time comparison, or compact mode');
-    $table_other->data[$row][1] = '<div class="switch_radio_button">';
-    $table_other->data[$row][1] .= html_print_radio_button('prominent_time', 'comparation', __('Comparation in rollover'), $comparation, true);
-    $table_other->data[$row][1] .= html_print_radio_button('prominent_time', 'timestamp', __('Timestamp in rollover'), $timestamp, true);
-    $table_other->data[$row][1] .= html_print_radio_button('prominent_time', 'compact', __('Compact mode'), $compact, true);
-    $table_other->data[$row][1] .= '</div>';
-
-    $row++;
-
-    // ----------------------------------------------------------------------
-    // CUSTOM VALUES POST PROCESS
-    // ----------------------------------------------------------------------
-    $table_other->data[$row][0] = __('Custom values post process');
-    $table_other->data[$row][1] = __('Value').':&nbsp;'.html_print_input_text('custom_value', '', '', 25, 50, true);
-    $table_other->data[$row][2] = __('Text').':&nbsp;'.html_print_input_text('custom_text', '', '', 15, 50, true);
-    $table_other->data[$row][2] .= '&nbsp;';
-    $table_other->data[$row][2] .= html_print_input_hidden(
-        'custom_value_add',
+    $table_other->data[$row][1] .= '<a id="csv_divider_custom" onclick="javascript: edit_csv_divider();">'.html_print_image(
+        'images/list.png',
+        true,
+        [
+            'id'    => 'select',
+            'class' => 'invert_filter',
+        ]
+    ).'</a>';
+} else {
+    $table_other->data[$row][1] = html_print_select(
+        $common_dividers,
+        'csv_divider',
+        $config['csv_divider'],
         '',
-        true
-    );
-    $table_other->data[$row][3] = html_print_button(
-        __('Add'),
-        'custom_value_add_btn',
+        '',
+        '',
+        true,
         false,
-        '',
-        'class="sub next"',
-        true
+        false
     );
+    $table_other->data[$row][1] .= '<a id="csv_divider_custom" onclick="javascript: edit_csv_divider();">'.html_print_image(
+        'images/pencil.png',
+        true,
+        [
+            'id'    => 'pencil',
+            'class' => 'invert_filter',
+        ]
+    ).'</a>';
+}
 
-    $row++;
+$row++;
 
-    $table_other->data[$row][0] = '';
-    $table_other->data[$row][1] = __('Delete custom values').': ';
-    $table_other->data[$row][2] = html_print_select(
-        post_process_get_custom_values(),
-        'custom_values',
-        '',
-        '',
-        '',
-        '',
-        true
-    );
-    $count_custom_postprocess = post_process_get_custom_values();
-    $table_other->data[$row][3] = html_print_button(
-        __('Delete'),
-        'custom_values_del_btn',
-        empty($count_custom_postprocess),
-        '',
-        'class="sub cancel"',
-        true
-    );
-    // This hidden field will be filled from jQuery before submit
-    $table_other->data[$row][1] .= html_print_input_hidden(
-        'custom_value_to_delete',
-        '',
-        true
-    );
-    $table_other->data[$row][3] .= '<br><br>';
+$decimal_separator = [
+    '.' => '.',
+    ',' => ',',
+];
+$table_other->data[$row][0] = __('CSV decimal separator');
+$table_other->data[$row][1] = html_print_select($decimal_separator, 'csv_decimal_separator', $config['csv_decimal_separator'], '', '', '', true, false, false);
 
-    // ----------------------------------------------------------------------
-    // ----------------------------------------------------------------------
-    // CUSTOM INTERVAL VALUES
-    // ----------------------------------------------------------------------
-    $row++;
-    $table_other->data[$row][0] = __('Interval values');
-    $units = [
-        1               => __('seconds'),
-        SECONDS_1MINUTE => __('minutes'),
-        SECONDS_1HOUR   => __('hours'),
-        SECONDS_1DAY    => __('days'),
-        SECONDS_1MONTH  => __('months'),
-        SECONDS_1YEAR   => __('years'),
-    ];
-    $table_other->data[$row][1] = __('Value').': ';
-    $table_other->data[$row][1] .= html_print_input_text('interval_value', '', '', 5, 5, true);
-    $table_other->data[$row][2] = html_print_select($units, 'interval_unit', 1, '', '', '', true, false, false);
-    $table_other->data[$row][3] = html_print_button(__('Add'), 'interval_add_btn', false, '', 'class="sub next"', true);
+$row++;
 
-    $row++;
-
-    $table_other->data[$row][0] = '';
-    $table_other->data[$row][1] = __('Delete interval').': ';
-    $table_other->data[$row][2] = html_print_select(get_periods(false, false), 'intervals', '', '', '', '', true);
-    $table_other->data[$row][3] = html_print_button(__('Delete'), 'interval_del_btn', empty($config['interval_values']), '', 'class="sub cancel"', true);
-
-    $table_other->data[$row][1] .= html_print_input_hidden('interval_values', $config['interval_values'], true);
-    // This hidden field will be filled from jQuery before submit
-    $table_other->data[$row][1] .= html_print_input_hidden('interval_to_delete', '', true);
-    $table_other->data[$row][3] .= '<br><br>';
-    // ----------------------------------------------------------------------
-    $row++;
-
-    $table_other->data[$row][0] = __('Module units');
-    $table_other->data[$row][1] = __('Value').': ';
-    $table_other->data[$row][1] .= html_print_input_text('custom_module_unit', '', '', 15, 50, true);
-    $table_other->data[$row][2] = '';
-    $table_other->data[$row][3] = html_print_button(__('Add'), 'module_unit_add_btn', false, '', 'class="sub next"', true);
-
-    $row++;
-    $table_other->data[$row][0] = '';
-    $table_other->data[$row][1] = __('Delete custom values').': ';
-    $table_other->data[$row][2] = html_print_select(get_custom_module_units(), 'module_units', '', '', '', '', true, false, true, 'w100p');
-    $table_other->data[$row][3] = html_print_button(
-        __('Delete'),
-        'custom_module_unit_del_btn',
-        empty($count_custom_postprocess),
-        '',
-        'class="sub cancel"',
-        true
-    );
-
-    $table_other->data[$row][3] .= html_print_input_hidden(
-        'custom_module_unit_to_delete',
-        '',
-        true
-    );
-
-    $row++;
-
-    $common_dividers = [
-        ';' => ';',
-        ',' => ',',
-        '|' => '|',
-    ];
-    $table_other->data[$row][0] = __('CSV divider');
-    if ($config['csv_divider'] != ';' && $config['csv_divider'] != ',' && $config['csv_divider'] != '|') {
-        $table_other->data[$row][1] = html_print_input_text(
-            'csv_divider',
-            $config['csv_divider'],
-            '',
-            20,
-            255,
-            true
-        );
-        $table_other->data[$row][1] .= '<a id="csv_divider_custom" onclick="javascript: edit_csv_divider();">'.html_print_image(
-            'images/list.png',
-            true,
-            [
-                'id'    => 'select',
-                'class' => 'invert_filter',
-            ]
-        ).'</a>';
-    } else {
-        $table_other->data[$row][1] = html_print_select(
-            $common_dividers,
-            'csv_divider',
-            $config['csv_divider'],
-            '',
-            '',
-            '',
-            true,
-            false,
-            false
-        );
-        $table_other->data[$row][1] .= '<a id="csv_divider_custom" onclick="javascript: edit_csv_divider();">'.html_print_image(
-            'images/pencil.png',
-            true,
-            [
-                'id'    => 'pencil',
-                'class' => 'invert_filter',
-            ]
-        ).'</a>';
-    }
-
-    $row++;
-
-    $decimal_separator = [
-        '.' => '.',
-        ',' => ',',
-    ];
-    $table_other->data[$row][0] = __('CSV decimal separator');
-    $table_other->data[$row][1] = html_print_select($decimal_separator, 'csv_decimal_separator', $config['csv_decimal_separator'], '', '', '', true, false, false);
-
-    $row++;
-
-    $table_other->data[$row][0] = __('Data multiplier to use in graphs/data');
-    $options_data_multiplier = [];
-    $options_data_multiplier[0] = __('Use 1024 when module unit are bytes');
-    $options_data_multiplier[1] = __('Use always 1000');
-    $options_data_multiplier[2] = __('Use always 1024');
-
-    $table_other->data[$row][1] = html_print_select($options_data_multiplier, 'use_data_multiplier', $config['use_data_multiplier'], '', '', 1, true, false, false);
+$table_other->data[$row][0] = __('Data multiplier to use in graphs/data');
+$options_data_multiplier = [];
+$options_data_multiplier[0] = __('Use 1024 when module unit are bytes');
+$options_data_multiplier[1] = __('Use always 1000');
+$options_data_multiplier[2] = __('Use always 1024');
 
 
-    echo '<fieldset>';
-    echo '<legend>'.__('Other configuration').' '.ui_print_help_icon('other_conf_tab', true).'</legend>';
-    html_print_table($table_other);
-    echo '</fieldset>';
+$table_other->data[$row][1] = html_print_select($options_data_multiplier, 'use_data_multiplier', $config['use_data_multiplier'], '', '', 1, true, false, false);function load_fonts()
+{
+    global $config;
 
+    $home = str_replace('\\', '/', $config['homedir']);
+    $dir = scandir($home.'/include/fonts/');
 
-    echo '<div class="action-buttons" style="width: '.$table_other->width.'">';
-    html_print_submit_button(__('Update'), 'update_button', false, 'class="sub upd"');
-    echo '</div>';
-    echo '</form>';
+    $fonts = [];
 
-    ui_require_css_file('color-picker', 'include/styles/js/');
-    ui_require_jquery_file('colorpicker');
-
-
-    function load_fonts()
-    {
-        global $config;
-
-        $home = str_replace('\\', '/', $config['homedir']);
-        $dir = scandir($home.'/include/fonts/');
-
-        $fonts = [];
-
-        foreach ($dir as $file) {
-            if (strstr($file, '.ttf') !== false) {
-                $fonts[$home.'/include/fonts/'.$file] = $file;
-            }
+    foreach ($dir as $file) {
+        if (strstr($file, '.ttf') !== false) {
+            $fonts[$home.'/include/fonts/'.$file] = $file;
         }
-
-        return $fonts;
     }
 
+    return $fonts;
+}
 
-    ui_require_javascript_file('tiny_mce', 'include/javascript/tiny_mce/');
-    ui_require_javascript_file('pandora');
 
-    ?>
+/*
+ *
+ * PAINT HTML.
+ *
+ */
+
+echo '<fieldset>';
+echo '<legend>'.__('Behaviour configuration').' '.ui_print_help_icon('behavoir_conf_tab', true).'</legend>';
+html_print_table($table_behaviour);
+echo '</fieldset>';
+
+echo '<fieldset>';
+echo '<legend>'.__('GIS configuration').' '.ui_print_help_icon('gis_conf_tab', true).'</legend>';
+html_print_table($table_gis);
+echo '</fieldset>';
+
+echo '<fieldset>';
+echo '<legend>'.__('Style configuration').' '.ui_print_help_icon('style_conf_tab', true).'</legend>';
+html_print_table($table_styles);
+echo '</fieldset>';
+
+echo '<fieldset>';
+echo '<legend>'.__('Charts configuration').' '.ui_print_help_icon('charts_conf_tab', true).'</legend>';
+html_print_table($table_chars);
+echo '</fieldset>';
+
+echo '<fieldset>';
+echo '<legend>'.__('Font and Text configuration').' '.ui_print_help_icon('front_and_text_conf_tab', true).'</legend>';
+html_print_table($table_font);
+echo '</fieldset>';
+
+echo '<fieldset>';
+echo '<legend>'.__('Visual consoles configuration').' '.ui_print_help_icon('visual_consoles_conf_tab', true).'</legend>';
+html_print_table($table_vc);
+echo '</fieldset>';
+
+echo '<fieldset>';
+echo '<legend>'.__('Reports configuration ').ui_print_help_icon('reports_configuration_tab', true).'</legend>';
+html_print_table($table_report);
+echo '</fieldset>';
+
+echo '<fieldset>';
+echo '<legend>'.__('Services configuration').' '.ui_print_help_icon('services_conf_tab', true).'</legend>';
+html_print_table($table_ser);
+echo '</fieldset>';
+
+echo '<fieldset>';
+echo '<legend>'.__('Other configuration').' '.ui_print_help_icon('other_conf_tab', true).'</legend>';
+html_print_table($table_other);
+echo '</fieldset>';
+
+echo '<div class="action-buttons" style="width: '.$table_other->width.'">';
+html_print_submit_button(__('Update'), 'update_button', false, 'class="sub upd"');
+echo '</div>';
+echo '</form>';
+
+
+ui_require_css_file('color-picker', 'include/styles/js/');
+ui_require_jquery_file('colorpicker');
+
+ui_require_javascript_file('tiny_mce', 'include/javascript/tiny_mce/');
+ui_require_javascript_file('pandora');
+
+?>
 <script language="javascript" type="text/javascript">
 
 function edit_csv_divider () {
diff --git a/pandora_console/include/styles/setup.multicolumn.css b/pandora_console/include/styles/setup.multicolumn.css
new file mode 100644
index 0000000000..4502ac4a46
--- /dev/null
+++ b/pandora_console/include/styles/setup.multicolumn.css
@@ -0,0 +1,24 @@
+#form_setup {
+  display: flex;
+  flex-direction: row;
+  justify-items: baseline;
+  justify-content: space-between;
+  flex-wrap: wrap;
+}
+
+fieldset {
+  background-color: #fff;
+  border: 1px solid #e2e2e2;
+  padding: 0.5em;
+  margin: 0px 1em;
+  margin-bottom: 20px;
+  position: relative;
+  border-radius: 5px;
+  flex: 1 1 700px;
+}
+
+.full-column {
+  width: 100%;
+  flex: none;
+  margin: 0 0 20px;
+}

From 024640bcaeeba7c9d9b475c617b9f216aa29da09 Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Fri, 26 Mar 2021 11:55:44 +0100
Subject: [PATCH 20/44] Added a searchbox for module list in mobile/agent

---
 pandora_console/mobile/include/style/main.css |  5 ++
 pandora_console/mobile/operation/agent.php    | 82 +++++++++++++++++++
 pandora_console/mobile/operation/modules.php  | 14 ++++
 3 files changed, 101 insertions(+)

diff --git a/pandora_console/mobile/include/style/main.css b/pandora_console/mobile/include/style/main.css
index b3e066c893..6a5fa0ed5d 100755
--- a/pandora_console/mobile/include/style/main.css
+++ b/pandora_console/mobile/include/style/main.css
@@ -1086,6 +1086,11 @@ li.ui-btn {
   border-radius: 0px;
 }
 
+.center {
+  margin: 0 auto;
+  text-align: center;
+}
+
 /* For mobiles */
 @media screen and (max-width: 750px) {
   .ui-content > .ui-btn {
diff --git a/pandora_console/mobile/operation/agent.php b/pandora_console/mobile/operation/agent.php
index e26d22ee15..0d2b327de2 100644
--- a/pandora_console/mobile/operation/agent.php
+++ b/pandora_console/mobile/operation/agent.php
@@ -286,9 +286,28 @@ class Agent
                 ];
             }
 
+            // Module searchbox.
+            $ui->beginForm('javascript:agent_filter_modules();');
+            $ui->formAddInput(
+                [
+                    'id'   => 'filter-modules',
+                    'name' => 'filter-modules',
+                ]
+            );
+            $ui->formAddInput(
+                [
+                    'id'    => 'filter-modules',
+                    'name'  => 'filter-modules',
+                    'type'  => 'submit',
+                    'value' => __('Search'),
+                ]
+            );
+            $filtering = $ui->getEndForm();
+
             $modules->setFilters($filters);
             $modules->disabledColumns(['agent']);
             $ui->contentBeginCollapsible(__('Modules'));
+            $ui->contentCollapsibleAddItem($filtering);
             $ui->contentCollapsibleAddItem($modules->listModulesHtml(0, true));
             $ui->contentEndCollapsible();
 
@@ -389,6 +408,33 @@ class Agent
 					set_same_heigth();
 				}
 			});
+
+            function agent_filter_modules() {
+                $.mobile.showPageLoadingMsg();
+                $.ajax ({
+                    type: 'POST',
+                    url: 'index.php',
+                    dataType: 'text',
+                    data: {
+                        'action': 'ajax',
+                        'parameter1': 'agent',
+                        'id': ".$this->id.",
+                        'parameter2': 'filter-modules',
+                        'filter': $('#filter-modules').val()
+                    },
+                    success: function(r) {
+                        $.mobile.hidePageLoadingMsg();
+                        var className = $('#list_agent_Modules').attr('class');
+                        $('#list_agent_Modules').parent().html(r);
+                        $('#list_agent_Modules').addClass(className);
+                    },
+                    error: function(r, t, e) {
+                        $.mobile.hidePageLoadingMsg();
+                        console.error(e);
+                    }
+                });
+            }
+
 			</script>"
         );
 
@@ -397,4 +443,40 @@ class Agent
     }
 
 
+    /**
+     * Bob do something!
+     *
+     * @return void
+     */
+    public function ajax($parameter2=null)
+    {
+        $system = System::getInstance();
+
+        if ($parameter2 === 'filter-modules') {
+            $name_filter = $system->getRequest('filter', '');
+            $modules = new Modules();
+
+            if ($system->getConfig('metaconsole')) {
+                $filters = [
+                    'id_agent'    => $this->agent['id_tagente'],
+                    'all_modules' => true,
+                    'status'      => -1,
+                    'name'        => $name_filter,
+                ];
+            } else {
+                $filters = [
+                    'id_agent'    => $this->id,
+                    'all_modules' => true,
+                    'status'      => -1,
+                    'name'        => $name_filter,
+                ];
+            }
+
+            $modules->setFilters($filters);
+            $modules->disabledColumns(['agent']);
+            echo $modules->listModulesHtml(0, true);
+        }
+    }
+
+
 }
diff --git a/pandora_console/mobile/operation/modules.php b/pandora_console/mobile/operation/modules.php
index ddac149c74..052c6aa619 100644
--- a/pandora_console/mobile/operation/modules.php
+++ b/pandora_console/mobile/operation/modules.php
@@ -27,6 +27,8 @@ class Modules
 
     private $free_search = '';
 
+    private $name = '';
+
     private $module_group = -1;
 
     private $tag = '';
@@ -106,6 +108,10 @@ class Modules
         if (isset($filters['status'])) {
             $this->status = $filters['status'];
         }
+
+        if (isset($filters['name'])) {
+            $this->name = $filters['name'];
+        }
     }
 
 
@@ -374,6 +380,14 @@ class Modules
             );
         }
 
+        // Search by module name.
+        if ($this->name != '') {
+            $sql_conditions .= sprintf(
+                " AND lower(tagente_modulo.nombre) LIKE lower('%%%s%%') ",
+                $this->name
+            );
+        }
+
         // Part SQL fro Status
         if ($this->status == AGENT_MODULE_STATUS_NORMAL) {
             // Normal

From 3b185d3a70668156bcb5fb028759400638c51fd5 Mon Sep 17 00:00:00 2001
From: Calvo <luis.calvo@artica.es>
Date: Fri, 26 Mar 2021 14:33:48 +0100
Subject: [PATCH 21/44] Added missing classes to main.css mobile

---
 pandora_console/mobile/include/style/main.css | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pandora_console/mobile/include/style/main.css b/pandora_console/mobile/include/style/main.css
index b3e066c893..960cf37b36 100755
--- a/pandora_console/mobile/include/style/main.css
+++ b/pandora_console/mobile/include/style/main.css
@@ -18,6 +18,14 @@ body {
   font-size: 10px !important;
 }
 
+.center {
+  text-align: center;
+}
+
+.invisible {
+  display: none;
+}
+
 .ui-header .ui-title {
   font-size: 14px !important;
 }

From 847fc44b14d26c85c217695571a9fdc2ed80e928 Mon Sep 17 00:00:00 2001
From: Calvo <luis.calvo@artica.es>
Date: Tue, 30 Mar 2021 13:34:38 +0200
Subject: [PATCH 22/44] Fixed user/profile newline on users_list

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

diff --git a/pandora_console/godmode/users/user_list.php b/pandora_console/godmode/users/user_list.php
index 5134ad0a0b..a89373088d 100644
--- a/pandora_console/godmode/users/user_list.php
+++ b/pandora_console/godmode/users/user_list.php
@@ -591,10 +591,10 @@ foreach ($info as $user_id => $user_info) {
             $data[4] .= '<div class="text_end">';
         foreach ($user_profiles as $row) {
             if ($total_profile <= 5) {
-                $data[4] .= "<div class='left'>";
+                $data[4] .= "<div class='float-left'>";
                 $data[4] .= profile_get_name($row['id_perfil']);
                 $data[4] .= ' / </div>';
-                $data[4] .= "<div class='left pdd_l_5px'>";
+                $data[4] .= "<div class='float-left pdd_l_5px'>";
                 $data[4] .= groups_get_name($row['id_grupo'], true);
                 $data[4] .= '</div>';
 

From f004cfc27648d7813dd977ceedcf30d431f1d302 Mon Sep 17 00:00:00 2001
From: Daniel Maya <daniel.maya@artica.es>
Date: Tue, 30 Mar 2021 16:20:46 +0200
Subject: [PATCH 23/44] trace removed

---
 pandora_console/include/rest-api/index.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pandora_console/include/rest-api/index.php b/pandora_console/include/rest-api/index.php
index 493125778b..48560ad2a4 100644
--- a/pandora_console/include/rest-api/index.php
+++ b/pandora_console/include/rest-api/index.php
@@ -125,7 +125,6 @@ if ($getVisualConsole === true) {
     } catch (Throwable $e) {
         // Bad params.
         http_response_code(400);
-        hd($e);
         return;
     }
 

From 321fc8aa05b1fd6a09313800ed05311948e0e3d3 Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Wed, 31 Mar 2021 01:00:44 +0200
Subject: [PATCH 24/44] 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 1702ba40e0..be3f825ba3 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.753-210330
+Version: 7.0NG.753-210331
 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 e7aa071815..a22d931121 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.753-210330"
+pandora_version="7.0NG.753-210331"
 
 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 bf76858723..c110eddf7d 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -1016,7 +1016,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.753';
-use constant AGENT_BUILD => '210330';
+use constant AGENT_BUILD => '210331';
 
 # 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 a190459153..cf041bde21 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.753
-%define release     210330
+%define release     210331
 
 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 f235de2b53..4302c24f91 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.753
-%define release     210330
+%define release     210331
 
 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 ef9b1bdf5b..35b54f9323 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.753"
-PI_BUILD="210330"
+PI_BUILD="210331"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index d19f17758b..c18c7047d8 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{210330}
+{210331}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 872071af8e..e01b4a8ee7 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.753(Build 210330)")
+#define PANDORA_VERSION ("7.0NG.753(Build 210331)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index 310bdbd8e0..398651a3cc 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.753(Build 210330))"
+      VALUE "ProductVersion", "(7.0NG.753(Build 210331))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 8be915a7ed..0f93c81017 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.753-210330
+Version: 7.0NG.753-210331
 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 4c1fde485b..5d0018e066 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.753-210330"
+pandora_version="7.0NG.753-210331"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 64493975bd..01a5f08ab8 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 = 'PC210330';
+$build_version = 'PC210331';
 $pandora_version = 'v7.0NG.753';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 89ece9a51c..c52a7e5958 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -129,7 +129,7 @@
         <div style='height: 10px'>
             <?php
             $version = '7.0NG.753';
-            $build = '210330';
+            $build = '210331';
             $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 d19a55ab1f..1c8ac54ad5 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.753
-%define release     210330
+%define release     210331
 
 # 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 e97c1c66f1..775db90383 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.753
-%define release     210330
+%define release     210331
 
 # 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 df3604adc3..1845147b46 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.753
-%define release     210330
+%define release     210331
 %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 877abbc1ac..e37061e135 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.753-210330
+Version: 7.0NG.753-210331
 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 e0c8750519..0486643788 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.753-210330"
+pandora_version="7.0NG.753-210331"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 1f86a41d36..c7c80bdcd1 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.753";
-my $pandora_build = "210330";
+my $pandora_build = "210331";
 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 5c7e19b0a1..4077fe1442 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.753";
-my $pandora_build = "210330";
+my $pandora_build = "210331";
 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 3a794efa14..79f207ce33 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.753
-%define release     210330
+%define release     210331
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index e56f6cf53e..7299f99f84 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.753
-%define release     210330
+%define release     210331
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index c52a208bf1..7e16a9f00d 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.753"
-PI_BUILD="210330"
+PI_BUILD="210331"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index b9b9eda215..03d8a86630 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.753 PS210330";
+my $version = "7.0NG.753 PS210331";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 0f46af4b43..98c64115e2 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.753 PS210330";
+my $version = "7.0NG.753 PS210331";
 
 # save program name for logging
 my $progname = basename($0);

From 8352e4d18d1c59f117cafa922f9b73bf0e8f0df6 Mon Sep 17 00:00:00 2001
From: Calvo <luis.calvo@artica.es>
Date: Wed, 31 Mar 2021 10:54:58 +0200
Subject: [PATCH 25/44] restored bell and module icon with plus on agent
 edition view

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

diff --git a/pandora_console/godmode/agentes/configurar_agente.php b/pandora_console/godmode/agentes/configurar_agente.php
index f7ff804b50..63b9e03131 100644
--- a/pandora_console/godmode/agentes/configurar_agente.php
+++ b/pandora_console/godmode/agentes/configurar_agente.php
@@ -400,7 +400,7 @@ if ($id_agente) {
 
     // Module tab.
     $moduletab['text'] = '<a href="index.php?sec=gagente&amp;sec2=godmode/agentes/configurar_agente&amp;tab=module&amp;id_agente='.$id_agente.'">'.html_print_image(
-        'images/module.png',
+        'images/gm_modules.png',
         true,
         [
             'title' => __('Modules'),
@@ -416,7 +416,7 @@ if ($id_agente) {
 
     // Alert tab.
     $alerttab['text'] = '<a href="index.php?sec=gagente&amp;sec2=godmode/agentes/configurar_agente&amp;tab=alert&amp;id_agente='.$id_agente.'">'.html_print_image(
-        'images/bell.png',
+        'images/gm_alerts.png',
         true,
         [
             'title' => __('Alerts'),

From 10ea68f33f66a75f704938665dd4b5a32e295f8f Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Thu, 1 Apr 2021 01:00:11 +0200
Subject: [PATCH 26/44] 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 be3f825ba3..d5ff0edb21 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.753-210331
+Version: 7.0NG.753-210401
 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 a22d931121..cf854d2e1b 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.753-210331"
+pandora_version="7.0NG.753-210401"
 
 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 c110eddf7d..52897c066e 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -1016,7 +1016,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.753';
-use constant AGENT_BUILD => '210331';
+use constant AGENT_BUILD => '210401';
 
 # 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 cf041bde21..b608da98ef 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.753
-%define release     210331
+%define release     210401
 
 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 4302c24f91..e3e960d450 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.753
-%define release     210331
+%define release     210401
 
 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 35b54f9323..3cd35f285e 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.753"
-PI_BUILD="210331"
+PI_BUILD="210401"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index c18c7047d8..320075c4e8 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{210331}
+{210401}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index e01b4a8ee7..7c880c21d1 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.753(Build 210331)")
+#define PANDORA_VERSION ("7.0NG.753(Build 210401)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index 398651a3cc..72e7a98e66 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.753(Build 210331))"
+      VALUE "ProductVersion", "(7.0NG.753(Build 210401))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 0f93c81017..b4aeca52c2 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.753-210331
+Version: 7.0NG.753-210401
 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 5d0018e066..a371707c73 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.753-210331"
+pandora_version="7.0NG.753-210401"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 01a5f08ab8..3cbc7b4f95 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 = 'PC210331';
+$build_version = 'PC210401';
 $pandora_version = 'v7.0NG.753';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index c52a7e5958..bdec4f4fa0 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -129,7 +129,7 @@
         <div style='height: 10px'>
             <?php
             $version = '7.0NG.753';
-            $build = '210331';
+            $build = '210401';
             $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 1c8ac54ad5..db658ee5bd 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.753
-%define release     210331
+%define release     210401
 
 # 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 775db90383..bed021f0cf 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.753
-%define release     210331
+%define release     210401
 
 # 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 1845147b46..50b3a88dfb 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.753
-%define release     210331
+%define release     210401
 %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 e37061e135..a70ca8a879 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.753-210331
+Version: 7.0NG.753-210401
 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 0486643788..553407df60 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.753-210331"
+pandora_version="7.0NG.753-210401"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index c7c80bdcd1..fa6f5f7bf0 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.753";
-my $pandora_build = "210331";
+my $pandora_build = "210401";
 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 4077fe1442..23827137c4 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.753";
-my $pandora_build = "210331";
+my $pandora_build = "210401";
 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 79f207ce33..7f6d2d2e78 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.753
-%define release     210331
+%define release     210401
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 7299f99f84..51a1052715 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.753
-%define release     210331
+%define release     210401
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 7e16a9f00d..be84a5f1ed 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.753"
-PI_BUILD="210331"
+PI_BUILD="210401"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 03d8a86630..9cc3e6e258 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.753 PS210331";
+my $version = "7.0NG.753 PS210401";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 98c64115e2..950356aa58 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.753 PS210331";
+my $version = "7.0NG.753 PS210401";
 
 # save program name for logging
 my $progname = basename($0);

From 2f4eaacb6aec8d173eceb250b7bf8c502a07d46f Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Fri, 2 Apr 2021 01:00:33 +0200
Subject: [PATCH 27/44] 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 d5ff0edb21..26849931ad 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.753-210401
+Version: 7.0NG.753-210402
 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 cf854d2e1b..9d0ed87500 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.753-210401"
+pandora_version="7.0NG.753-210402"
 
 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 52897c066e..a6f67aeca8 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -1016,7 +1016,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.753';
-use constant AGENT_BUILD => '210401';
+use constant AGENT_BUILD => '210402';
 
 # 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 b608da98ef..d8c0cd9afd 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.753
-%define release     210401
+%define release     210402
 
 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 e3e960d450..ce91970145 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.753
-%define release     210401
+%define release     210402
 
 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 3cd35f285e..e7ada008ea 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.753"
-PI_BUILD="210401"
+PI_BUILD="210402"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index 320075c4e8..bc8dbfe762 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{210401}
+{210402}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 7c880c21d1..a58cdf97fc 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.753(Build 210401)")
+#define PANDORA_VERSION ("7.0NG.753(Build 210402)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index 72e7a98e66..627feae892 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.753(Build 210401))"
+      VALUE "ProductVersion", "(7.0NG.753(Build 210402))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index b4aeca52c2..f0e534efe4 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.753-210401
+Version: 7.0NG.753-210402
 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 a371707c73..684b812218 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.753-210401"
+pandora_version="7.0NG.753-210402"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 3cbc7b4f95..a1e507a9c4 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 = 'PC210401';
+$build_version = 'PC210402';
 $pandora_version = 'v7.0NG.753';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index bdec4f4fa0..b61e680374 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -129,7 +129,7 @@
         <div style='height: 10px'>
             <?php
             $version = '7.0NG.753';
-            $build = '210401';
+            $build = '210402';
             $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 db658ee5bd..4ee143477c 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.753
-%define release     210401
+%define release     210402
 
 # 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 bed021f0cf..3b7b8ff257 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.753
-%define release     210401
+%define release     210402
 
 # 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 50b3a88dfb..50c2693606 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.753
-%define release     210401
+%define release     210402
 %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 a70ca8a879..c4f4ac35e1 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.753-210401
+Version: 7.0NG.753-210402
 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 553407df60..abafb0fa4f 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.753-210401"
+pandora_version="7.0NG.753-210402"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index fa6f5f7bf0..8b6f106a05 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.753";
-my $pandora_build = "210401";
+my $pandora_build = "210402";
 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 23827137c4..e390ea907c 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.753";
-my $pandora_build = "210401";
+my $pandora_build = "210402";
 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 7f6d2d2e78..6e84ff9cde 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.753
-%define release     210401
+%define release     210402
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 51a1052715..e9e405f19c 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.753
-%define release     210401
+%define release     210402
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index be84a5f1ed..406a97818e 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.753"
-PI_BUILD="210401"
+PI_BUILD="210402"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 9cc3e6e258..8ca8741580 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.753 PS210401";
+my $version = "7.0NG.753 PS210402";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 950356aa58..7dea2b6a9e 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.753 PS210401";
+my $version = "7.0NG.753 PS210402";
 
 # save program name for logging
 my $progname = basename($0);

From 95e437252b45f3e5ccbc26481cc4ce9b136a0e20 Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Sat, 3 Apr 2021 01:00:36 +0200
Subject: [PATCH 28/44] 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 26849931ad..153932bf15 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.753-210402
+Version: 7.0NG.753-210403
 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 9d0ed87500..c6f570b5d8 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.753-210402"
+pandora_version="7.0NG.753-210403"
 
 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 a6f67aeca8..ee0cd49fb0 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -1016,7 +1016,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.753';
-use constant AGENT_BUILD => '210402';
+use constant AGENT_BUILD => '210403';
 
 # 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 d8c0cd9afd..8eb1c7385d 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.753
-%define release     210402
+%define release     210403
 
 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 ce91970145..40ca972e74 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.753
-%define release     210402
+%define release     210403
 
 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 e7ada008ea..9d2bd8e480 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.753"
-PI_BUILD="210402"
+PI_BUILD="210403"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index bc8dbfe762..a481330c8b 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{210402}
+{210403}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index a58cdf97fc..f353603724 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.753(Build 210402)")
+#define PANDORA_VERSION ("7.0NG.753(Build 210403)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index 627feae892..31318f9019 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.753(Build 210402))"
+      VALUE "ProductVersion", "(7.0NG.753(Build 210403))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index f0e534efe4..0b3874e261 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.753-210402
+Version: 7.0NG.753-210403
 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 684b812218..8df47d48f9 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.753-210402"
+pandora_version="7.0NG.753-210403"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index a1e507a9c4..11b9a6a750 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 = 'PC210402';
+$build_version = 'PC210403';
 $pandora_version = 'v7.0NG.753';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index b61e680374..45bb6680c1 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -129,7 +129,7 @@
         <div style='height: 10px'>
             <?php
             $version = '7.0NG.753';
-            $build = '210402';
+            $build = '210403';
             $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 4ee143477c..433041c6c1 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.753
-%define release     210402
+%define release     210403
 
 # 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 3b7b8ff257..bdf4b5147a 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.753
-%define release     210402
+%define release     210403
 
 # 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 50c2693606..e72b5f9777 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.753
-%define release     210402
+%define release     210403
 %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 c4f4ac35e1..b1aac2c589 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.753-210402
+Version: 7.0NG.753-210403
 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 abafb0fa4f..feebb9ee52 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.753-210402"
+pandora_version="7.0NG.753-210403"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 8b6f106a05..2807d58045 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.753";
-my $pandora_build = "210402";
+my $pandora_build = "210403";
 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 e390ea907c..a9c65583ca 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.753";
-my $pandora_build = "210402";
+my $pandora_build = "210403";
 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 6e84ff9cde..604db66a70 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.753
-%define release     210402
+%define release     210403
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index e9e405f19c..b0726f80d1 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.753
-%define release     210402
+%define release     210403
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 406a97818e..7c848cdcbb 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.753"
-PI_BUILD="210402"
+PI_BUILD="210403"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 8ca8741580..dde67d8242 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.753 PS210402";
+my $version = "7.0NG.753 PS210403";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 7dea2b6a9e..9c55d27bbf 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.753 PS210402";
+my $version = "7.0NG.753 PS210403";
 
 # save program name for logging
 my $progname = basename($0);

From 4811e45bf25a88f9198b754bebceb5203c42cbe6 Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Sun, 4 Apr 2021 01:00:37 +0200
Subject: [PATCH 29/44] 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 153932bf15..28751eddfe 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.753-210403
+Version: 7.0NG.753-210404
 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 c6f570b5d8..5797e6df32 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.753-210403"
+pandora_version="7.0NG.753-210404"
 
 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 ee0cd49fb0..f212fae3e1 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -1016,7 +1016,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.753';
-use constant AGENT_BUILD => '210403';
+use constant AGENT_BUILD => '210404';
 
 # 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 8eb1c7385d..1c13042aae 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.753
-%define release     210403
+%define release     210404
 
 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 40ca972e74..fdffda6720 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.753
-%define release     210403
+%define release     210404
 
 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 9d2bd8e480..153815ccc9 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.753"
-PI_BUILD="210403"
+PI_BUILD="210404"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index a481330c8b..ae59b85341 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{210403}
+{210404}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index f353603724..18f322be32 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.753(Build 210403)")
+#define PANDORA_VERSION ("7.0NG.753(Build 210404)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index 31318f9019..25ab2f303c 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.753(Build 210403))"
+      VALUE "ProductVersion", "(7.0NG.753(Build 210404))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 0b3874e261..d59582dce1 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.753-210403
+Version: 7.0NG.753-210404
 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 8df47d48f9..b50fa67ac8 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.753-210403"
+pandora_version="7.0NG.753-210404"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 11b9a6a750..7c317dfbea 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 = 'PC210403';
+$build_version = 'PC210404';
 $pandora_version = 'v7.0NG.753';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 45bb6680c1..f79bd0df0f 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -129,7 +129,7 @@
         <div style='height: 10px'>
             <?php
             $version = '7.0NG.753';
-            $build = '210403';
+            $build = '210404';
             $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 433041c6c1..62b579ce32 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.753
-%define release     210403
+%define release     210404
 
 # 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 bdf4b5147a..ca441f5d4e 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.753
-%define release     210403
+%define release     210404
 
 # 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 e72b5f9777..fd72c6b2eb 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.753
-%define release     210403
+%define release     210404
 %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 b1aac2c589..b59604f5a6 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.753-210403
+Version: 7.0NG.753-210404
 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 feebb9ee52..5a9b49280e 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.753-210403"
+pandora_version="7.0NG.753-210404"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 2807d58045..555871d197 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.753";
-my $pandora_build = "210403";
+my $pandora_build = "210404";
 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 a9c65583ca..2fee23a66f 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.753";
-my $pandora_build = "210403";
+my $pandora_build = "210404";
 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 604db66a70..e79e6c06d4 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.753
-%define release     210403
+%define release     210404
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index b0726f80d1..c924fd35ac 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.753
-%define release     210403
+%define release     210404
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 7c848cdcbb..35e99e5af5 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.753"
-PI_BUILD="210403"
+PI_BUILD="210404"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index dde67d8242..b4056402aa 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.753 PS210403";
+my $version = "7.0NG.753 PS210404";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 9c55d27bbf..f54109c3d0 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.753 PS210403";
+my $version = "7.0NG.753 PS210404";
 
 # save program name for logging
 my $progname = basename($0);

From 31a8fd6c5513821a84f123bf2ca19836d0a8cbcf Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Mon, 5 Apr 2021 01:00:42 +0200
Subject: [PATCH 30/44] 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 28751eddfe..7fd2f37789 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.753-210404
+Version: 7.0NG.753-210405
 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 5797e6df32..668f5c79aa 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.753-210404"
+pandora_version="7.0NG.753-210405"
 
 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 f212fae3e1..7243f885b8 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -1016,7 +1016,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.753';
-use constant AGENT_BUILD => '210404';
+use constant AGENT_BUILD => '210405';
 
 # 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 1c13042aae..b2d350599a 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.753
-%define release     210404
+%define release     210405
 
 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 fdffda6720..a7f7f7528f 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.753
-%define release     210404
+%define release     210405
 
 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 153815ccc9..6283609ee8 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.753"
-PI_BUILD="210404"
+PI_BUILD="210405"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index ae59b85341..3c2bbefbf5 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{210404}
+{210405}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 18f322be32..e2fb7366a1 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.753(Build 210404)")
+#define PANDORA_VERSION ("7.0NG.753(Build 210405)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index 25ab2f303c..218fd291d6 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.753(Build 210404))"
+      VALUE "ProductVersion", "(7.0NG.753(Build 210405))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index d59582dce1..29642e88f2 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.753-210404
+Version: 7.0NG.753-210405
 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 b50fa67ac8..ca32bd2475 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.753-210404"
+pandora_version="7.0NG.753-210405"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 7c317dfbea..1f92250e35 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 = 'PC210404';
+$build_version = 'PC210405';
 $pandora_version = 'v7.0NG.753';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index f79bd0df0f..a91597bef7 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -129,7 +129,7 @@
         <div style='height: 10px'>
             <?php
             $version = '7.0NG.753';
-            $build = '210404';
+            $build = '210405';
             $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 62b579ce32..1c5307d332 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.753
-%define release     210404
+%define release     210405
 
 # 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 ca441f5d4e..a8861381e1 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.753
-%define release     210404
+%define release     210405
 
 # 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 fd72c6b2eb..39b0e2f5db 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.753
-%define release     210404
+%define release     210405
 %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 b59604f5a6..569a7a3586 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.753-210404
+Version: 7.0NG.753-210405
 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 5a9b49280e..5aa9a47ee2 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.753-210404"
+pandora_version="7.0NG.753-210405"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 555871d197..923cf5dad5 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.753";
-my $pandora_build = "210404";
+my $pandora_build = "210405";
 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 2fee23a66f..e8b11ee584 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.753";
-my $pandora_build = "210404";
+my $pandora_build = "210405";
 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 e79e6c06d4..f3f107491f 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.753
-%define release     210404
+%define release     210405
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index c924fd35ac..74a7062fed 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.753
-%define release     210404
+%define release     210405
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 35e99e5af5..4883322442 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.753"
-PI_BUILD="210404"
+PI_BUILD="210405"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index b4056402aa..3eed49b947 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.753 PS210404";
+my $version = "7.0NG.753 PS210405";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index f54109c3d0..d8da44b218 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.753 PS210404";
+my $version = "7.0NG.753 PS210405";
 
 # save program name for logging
 my $progname = basename($0);

From 98b7a9c66aceb50c326f38d94a3dc1d82b84630b Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Mon, 5 Apr 2021 14:05:53 +0000
Subject: [PATCH 31/44] Update DiscoveryTaskList.class.php

---
 pandora_console/godmode/wizards/DiscoveryTaskList.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pandora_console/godmode/wizards/DiscoveryTaskList.class.php b/pandora_console/godmode/wizards/DiscoveryTaskList.class.php
index bfebb9873e..832c967aa7 100644
--- a/pandora_console/godmode/wizards/DiscoveryTaskList.class.php
+++ b/pandora_console/godmode/wizards/DiscoveryTaskList.class.php
@@ -1525,7 +1525,7 @@ class DiscoveryTaskList extends HTML
 
                 if (is_array($data['modules'])) {
                     // Alphabetically sort.
-                    ksort($data['modules']);
+                    ksort($data['modules'], SORT_STRING | SORT_FLAG_CASE);
 
                     $simple_data = array_merge(
                         $simple_data,

From 247343c0b6b997a2756f33dd334cdcb34adda670 Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Tue, 6 Apr 2021 01:02:48 +0200
Subject: [PATCH 32/44] 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 7fd2f37789..dcf79622a6 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.753-210405
+Version: 7.0NG.753-210406
 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 668f5c79aa..26417b0bf5 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.753-210405"
+pandora_version="7.0NG.753-210406"
 
 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 7243f885b8..f5afa49715 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -1016,7 +1016,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.753';
-use constant AGENT_BUILD => '210405';
+use constant AGENT_BUILD => '210406';
 
 # 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 b2d350599a..c0eeaae6f1 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.753
-%define release     210405
+%define release     210406
 
 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 a7f7f7528f..182a3d23a9 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.753
-%define release     210405
+%define release     210406
 
 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 6283609ee8..f24a1c4b8b 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.753"
-PI_BUILD="210405"
+PI_BUILD="210406"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index 3c2bbefbf5..a915f9e388 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{210405}
+{210406}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index e2fb7366a1..3ae4fb5ac7 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.753(Build 210405)")
+#define PANDORA_VERSION ("7.0NG.753(Build 210406)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index 218fd291d6..8b68d53ead 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.753(Build 210405))"
+      VALUE "ProductVersion", "(7.0NG.753(Build 210406))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 29642e88f2..833854a2ee 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.753-210405
+Version: 7.0NG.753-210406
 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 ca32bd2475..261acf026b 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.753-210405"
+pandora_version="7.0NG.753-210406"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 1f92250e35..a94ffa0fbd 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 = 'PC210405';
+$build_version = 'PC210406';
 $pandora_version = 'v7.0NG.753';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index a91597bef7..f91e264aaa 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -129,7 +129,7 @@
         <div style='height: 10px'>
             <?php
             $version = '7.0NG.753';
-            $build = '210405';
+            $build = '210406';
             $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 1c5307d332..ecbc8d0a0f 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.753
-%define release     210405
+%define release     210406
 
 # 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 a8861381e1..39cc29c891 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.753
-%define release     210405
+%define release     210406
 
 # 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 39b0e2f5db..631410d42e 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.753
-%define release     210405
+%define release     210406
 %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 569a7a3586..6349b90e35 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.753-210405
+Version: 7.0NG.753-210406
 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 5aa9a47ee2..a1755a33ce 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.753-210405"
+pandora_version="7.0NG.753-210406"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 923cf5dad5..dea01df0fa 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.753";
-my $pandora_build = "210405";
+my $pandora_build = "210406";
 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 e8b11ee584..f5e167abb0 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.753";
-my $pandora_build = "210405";
+my $pandora_build = "210406";
 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 f3f107491f..3817169e79 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.753
-%define release     210405
+%define release     210406
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 74a7062fed..23dfa0fdf4 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.753
-%define release     210405
+%define release     210406
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 4883322442..524ca97c04 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.753"
-PI_BUILD="210405"
+PI_BUILD="210406"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 3eed49b947..af71f3b955 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.753 PS210405";
+my $version = "7.0NG.753 PS210406";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index d8da44b218..1eefa0ad02 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.753 PS210405";
+my $version = "7.0NG.753 PS210406";
 
 # save program name for logging
 my $progname = basename($0);

From 4b9f8ce2026ccae9f1599073a1571a644b330a7f Mon Sep 17 00:00:00 2001
From: Luis <luis.calvo@artica.es>
Date: Tue, 6 Apr 2021 16:51:14 +0000
Subject: [PATCH 33/44] Added custom fields combo larger params

---
 pandora_console/extras/mr/46.sql              |   6 +
 .../pandoradb_migrate_6.0_to_7.0.mysql.sql    |   2 +-
 .../godmode/agentes/agent_manager.php         |  31 ++--
 .../godmode/agentes/configure_field.php       |  12 +-
 .../godmode/massive/massive_edit_agents.php   |  29 ++-
 pandora_console/include/functions_html.php    | 166 ++++++++++++++++++
 pandora_console/pandoradb.sql                 |   2 +-
 7 files changed, 204 insertions(+), 44 deletions(-)
 create mode 100644 pandora_console/extras/mr/46.sql

diff --git a/pandora_console/extras/mr/46.sql b/pandora_console/extras/mr/46.sql
new file mode 100644
index 0000000000..63e0bf5843
--- /dev/null
+++ b/pandora_console/extras/mr/46.sql
@@ -0,0 +1,6 @@
+START TRANSACTION;
+
+ALTER TABLE `tagent_custom_fields` MODIFY COLUMN `combo_values` TEXT NOT NULL DEFAULT '';
+
+
+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 a72fffdc53..7945e60204 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
@@ -2519,7 +2519,7 @@ INSERT INTO `trecon_script` (`name`,`description`,`script`,`macros`) VALUES ('Di
 -- ----------------------------------------------------------------------
 -- Add column in table `tagent_custom_fields`
 -- ----------------------------------------------------------------------
-ALTER TABLE tagent_custom_fields ADD COLUMN `combo_values` VARCHAR(255) DEFAULT '';
+ALTER TABLE tagent_custom_fields ADD COLUMN `combo_values` TEXT NOT NULL DEFAULT '';
 
 -- ----------------------------------------------------------------------
 -- Add column in table `tnetflow_filter`
diff --git a/pandora_console/godmode/agentes/agent_manager.php b/pandora_console/godmode/agentes/agent_manager.php
index 326dde3207..bc8d247994 100644
--- a/pandora_console/godmode/agentes/agent_manager.php
+++ b/pandora_console/godmode/agentes/agent_manager.php
@@ -931,24 +931,19 @@ foreach ($fields as $field) {
     }
 
     if ($field['combo_values'] !== '') {
-        $data_field[1] = html_print_select(
-            $combo_values,
-            'customvalue_'.$field['id_field'],
-            $custom_value,
-            '',
-            __('None'),
-            '',
-            true,
-            false,
-            false,
-            '',
-            false,
-            false,
-            false,
-            false,
-            false,
-            '',
-            false
+        $data_field[1] = html_print_input(
+            [
+                'type'              => 'select_search',
+                'fields'            => $combo_values,
+                'name'              => 'customvalue_'.$field['id_field'],
+                'selected'          => $custom_value,
+                'nothing'           => __('None'),
+                'nothing_value'     => '',
+                'return'            => true,
+                'sort'              => false,
+                'size'              => '400px',
+                'dropdownAutoWidth' => true,
+            ]
         );
     };
 
diff --git a/pandora_console/godmode/agentes/configure_field.php b/pandora_console/godmode/agentes/configure_field.php
index 4a6b086d63..0f7a42820a 100755
--- a/pandora_console/godmode/agentes/configure_field.php
+++ b/pandora_console/godmode/agentes/configure_field.php
@@ -33,7 +33,7 @@ if ($id_field) {
     $name = $field['name'];
     $display_on_front = $field['display_on_front'];
     $is_password_type = $field['is_password_type'];
-    $combo_values = $field['combo_values'];
+    $combo_values = $field['combo_values'] ? $field['combo_values'] : '';
     $is_combo_enable = $config['is_combo_enable'];
     ui_print_page_header(__('Update agent custom field'), 'images/custom_field.png', false, '', true, '');
 } else {
@@ -116,12 +116,12 @@ $table->data[4][0] = __('Combo values').ui_print_help_tip(
     __('Set values separated by comma'),
     true
 );
-$table->data[4][1] = html_print_input_text(
+$table->data[4][1] = html_print_textarea(
     'combo_values',
+    3,
+    65,
     io_safe_output($combo_values),
     '',
-    35,
-    200,
     true
 );
 
@@ -144,7 +144,7 @@ echo '</form>';
 
 <script>
 $(document).ready (function () {
-    if($('input[type=hidden][name=update_field]').val() == 1 && $('input[type=text][name=combo_values]').val() != ''){
+    if($('input[type=hidden][name=update_field]').val() == 1 && $('#textarea_combo_values').val() != ''){
         $('input[type=checkbox][name=is_combo_enable]').prop('checked', true);
         $('#configure_field-4').show();
         $('input[type=checkbox][name=is_password_type]').change(function (e) {
@@ -155,7 +155,7 @@ $(document).ready (function () {
             e.preventDefault();
     });
     $('input[type=checkbox][name=is_combo_enable]').change(function (e) {
-        if($('input[type=text][name=combo_values]').val() != '' &&  $('input[type=checkbox][name=is_combo_enable]').prop('checked', true)){
+        if($('#textarea_combo_values').val() != '' &&  $('input[type=checkbox][name=is_combo_enable]').prop('checked', true)){
             dialog_message("#message_set_combo");
             $('input[type=checkbox][name=is_combo_enable]').prop('checked', true);
             $('#configure_field-4').show();
diff --git a/pandora_console/godmode/massive/massive_edit_agents.php b/pandora_console/godmode/massive/massive_edit_agents.php
index 1a0326fd21..bde5b42dfc 100755
--- a/pandora_console/godmode/massive/massive_edit_agents.php
+++ b/pandora_console/godmode/massive/massive_edit_agents.php
@@ -819,24 +819,17 @@ foreach ($fields as $field) {
     }
 
     if ($field['combo_values'] !== '') {
-        $data[1] = html_print_select(
-            $combo_values,
-            'customvalue_'.$field['id_field'],
-            $custom_value,
-            '',
-            __('No change'),
-            '',
-            true,
-            false,
-            false,
-            '',
-            false,
-            false,
-            false,
-            false,
-            false,
-            '',
-            false
+        $data[1] = html_print_input(
+            [
+                'type'          => 'select_search',
+                'fields'        => $combo_values,
+                'name'          => 'customvalue_'.$field['id_field'],
+                'selected'      => $custom_value,
+                'nothing'       => __('No change'),
+                'nothing_value' => '',
+                'return'        => true,
+                'sort'          => false,
+            ]
         );
     };
 
diff --git a/pandora_console/include/functions_html.php b/pandora_console/include/functions_html.php
index e80fa6f9fd..fc05e9ef62 100644
--- a/pandora_console/include/functions_html.php
+++ b/pandora_console/include/functions_html.php
@@ -4605,6 +4605,28 @@ function html_print_input($data, $wrapper='div', $input_only=false)
             );
         break;
 
+        case 'select_search':
+            $output .= html_print_select_search(
+                $data['fields'],
+                $data['name'],
+                ((isset($data['selected']) === true) ? $data['selected'] : ''),
+                ((isset($data['script']) === true) ? $data['script'] : ''),
+                ((isset($data['nothing']) === true) ? $data['nothing'] : ''),
+                ((isset($data['nothing_value']) === true) ? $data['nothing_value'] : 0),
+                ((isset($data['return']) === true) ? $data['return'] : false),
+                ((isset($data['multiple']) === true) ? $data['multiple'] : false),
+                ((isset($data['sort']) === true) ? $data['sort'] : true),
+                ((isset($data['class']) === true) ? $data['class'] : ''),
+                ((isset($data['disabled']) === true) ? $data['disabled'] : false),
+                ((isset($data['style']) === true) ? $data['style'] : false),
+                ((isset($data['option_style']) === true) ? $data['option_style'] : false),
+                ((isset($data['size']) === true) ? $data['size'] : false),
+                ((isset($data['modal']) === true) ? $data['modal'] : false),
+                ((isset($data['message']) === true) ? $data['message'] : ''),
+                ((isset($data['dropdownAutoWidth']) === true) ? $data['dropdownAutoWidth'] : false)
+            );
+        break;
+
         case 'select_metaconsole_nodes':
             $output .= html_print_select_from_sql(
                 'SELECT `id`, `server_name` FROM `tmetaconsole_setup`',
@@ -5154,3 +5176,147 @@ function html_print_datalist(
         echo $result;
     }
 }
+
+
+/**
+ * Print or return selector with search bar.
+ *
+ * @param string  $fields                  Select fields
+ * @param boolean $name                    Name of input field.
+ * @param array   $selected                Array with dropdown values. Example:
+ *                                         $fields["value"] = "label".
+ * @param string  $script                  Javascript onChange code.
+ * @param mixed   $nothing                 Label when nothing is selected.
+ * @param array   $nothing_value           Value when nothing is selected.
+ * @param string  $return                  Return string or dump to output.
+ * @param boolean $multiple                Enable multiple select.
+ * @param mixed   $sort                    Sort values or not (default false).
+ * @param boolean $class                   CSS classes to apply.
+ * @param boolean $disabled                Disabled or enabled.
+ * @param boolean $style                   CSS inline style.
+ * @param string  $option_style            CSS inline style in array format.
+ * @param string  $size                    Style, size (width) of element.
+ * @param boolean $simple_multiple_options Discovery simple multiple inputs.
+ * @param boolean $required                Required input.
+ * @param boolean $dropdownAutoWidth       Set dropdown auto width.
+ *
+ * @return string HTML code if return parameter is true.
+ */
+function html_print_select_search(
+    $fields=[],
+    $name=null,
+    $selected='',
+    $script='',
+    $nothing='',
+    $nothing_value=0,
+    $return=false,
+    $multiple=false,
+    $sort=false,
+    $class='',
+    $disabled=false,
+    $style=false,
+    $option_style=false,
+    $size=false,
+    $simple_multiple_options=false,
+    $required=false,
+    $dropdownAutoWidth=false
+) {
+    $output = '';
+
+    ui_require_css_file('select2.min');
+    ui_require_javascript_file('select2.min');
+
+    if ($name === null) {
+        static $idcounter = [];
+        if (isset($idcounter[$name]) === true) {
+            $idcounter[$name]++;
+        } else {
+            $idcounter[$name] = 0;
+        }
+
+        $name = 'select'.$idcounter[$name];
+    }
+
+    if (empty($nothing) === false) {
+        $fields[$nothing_value] = $nothing;
+    }
+
+    $output .= html_print_select(
+        $fields,
+        $name,
+        $selected,
+        $script,
+        $nothing,
+        $nothing_value,
+        $return,
+        $multiple,
+        $sort,
+        $class,
+        $disabled,
+        $style,
+        $option_style,
+        $size,
+        false,
+        '',
+        false,
+        $simple_multiple_options,
+        $required
+    );
+
+    if (empty($size) === true) {
+        $size = '100%';
+    }
+
+    ob_start();
+    ?>
+    <style type="text/css">
+    .select2-search__field {
+        background: url('<?php echo ui_get_full_url('images/zoom.png'); ?>') no-repeat;
+        background-position: right 10px center;
+        background-size: 1em;
+    }
+
+    </style>
+
+<script type="text/javascript">
+        $(document).ready(function() {
+            $('select[name="<?php echo $name; ?>"]').each(
+                function() {
+                    $(this).select2({
+                        multiple: <?php echo ($multiple) ? 'true' : 'false'; ?>,
+                        placeholder: "<?php echo __('Please select...'); ?>",
+                        debug: 0,
+                        width: '<?php echo $size; ?>',
+                        dropdownAutoWidth : '<?php echo $dropdownAutoWidth; ?>',
+                        templateResult: function(node) {
+                            if (!node.id) {
+                                return node.text;
+                            }
+                            return $('<span style="padding-left:' + (5 * node.level) + 'px;">' + node.text + '</span>');
+                        }
+                    });
+                }
+            );
+
+    <?php
+    if (empty($fields) === true) {
+        ?>
+            $('select[name="<?php echo $name; ?>"]').val(null).trigger("change");
+            $('select[name="<?php echo $name; ?>"] option[value=""]').each(function() {
+                $(this).remove();
+            });
+        <?php
+    }
+    ?>
+        });
+    </script>
+
+    <?php
+    $output .= ob_get_clean();
+
+    if ($return) {
+        return $output;
+    } else {
+        echo $output;
+    }
+}
\ No newline at end of file
diff --git a/pandora_console/pandoradb.sql b/pandora_console/pandoradb.sql
index 02eac23def..f6196562ee 100644
--- a/pandora_console/pandoradb.sql
+++ b/pandora_console/pandoradb.sql
@@ -2050,7 +2050,7 @@ CREATE TABLE IF NOT EXISTS `tagent_custom_fields` (
 	`name` varchar(45) NOT NULL default '',
 	`display_on_front` tinyint(1) NOT NULL default 0,
 	`is_password_type` tinyint(1) NOT NULL default 0,
-	`combo_values` VARCHAR(255) DEFAULT '',
+	`combo_values` TEXT NOT NULL DEFAULT '',
 	PRIMARY KEY  (`id_field`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 

From 654a4ebbd00b5676db1cc63282c534e08e8cadb5 Mon Sep 17 00:00:00 2001
From: Marcos Alconada <marcos.alconada@artica.es>
Date: Tue, 6 Apr 2021 16:58:05 +0000
Subject: [PATCH 34/44] remove entities when add comment

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

diff --git a/pandora_console/include/functions_events.php b/pandora_console/include/functions_events.php
index e7f9c993b1..68e23b2a63 100644
--- a/pandora_console/include/functions_events.php
+++ b/pandora_console/include/functions_events.php
@@ -5152,7 +5152,8 @@ function events_page_comments($event, $ajax=false)
         $childrens_ids
     ))) && $config['show_events_in_local'] == false || $config['event_replication'] == false
     ) {
-        $comments_form = '<br><div id="comments_form" class="w98p">';
+        $event['evento'] = io_safe_output($event['evento']);
+        $comments_form = '<br><div id="comments_form" style="width:98%;">';
         $comments_form .= html_print_textarea(
             'comment',
             3,

From 4944820aed10570bf2c3af1b6ef1a198e95d40e4 Mon Sep 17 00:00:00 2001
From: Luis <luis.calvo@artica.es>
Date: Tue, 6 Apr 2021 17:06:40 +0000
Subject: [PATCH 35/44] Fixed centralized management warnin on module
 management meta

---
 .../godmode/modules/manage_nc_groups.php       | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pandora_console/godmode/modules/manage_nc_groups.php b/pandora_console/godmode/modules/manage_nc_groups.php
index dce3b40dda..56e316aa96 100644
--- a/pandora_console/godmode/modules/manage_nc_groups.php
+++ b/pandora_console/godmode/modules/manage_nc_groups.php
@@ -46,7 +46,7 @@ if (defined('METACONSOLE')) {
     $sec = 'gmodules';
 }
 
-if (is_management_allowed() === true) {
+if (is_management_allowed() === true || is_metaconsole()) {
     $create = (bool) get_parameter('create');
     $update = (bool) get_parameter('update');
     $delete = (bool) get_parameter('delete');
@@ -125,7 +125,7 @@ if ($delete) {
         ['id_sg' => $id]
     );
 
-    if (($result !== false) and ($result1 !== false)) {
+    if (($result !== false) && ($result1 !== false)) {
         $result = true;
     } else {
         $result = false;
@@ -187,7 +187,7 @@ if ($multiple_delete) {
     );
 }
 
-if (($id || $new) && !$delete && !$multiple_delete && is_management_allowed() === true) {
+if (($id || $new) && !$delete && !$multiple_delete && (is_management_allowed() === true || is_metaconsole())) {
     include_once 'manage_nc_groups_form.php';
     return;
 }
@@ -230,7 +230,7 @@ $table->class = 'info_table';
 $table->head = [];
 $table->head['checkbox'] = html_print_checkbox('all_delete', 0, false, true, false);
 $table->head[0] = __('Name');
-if (is_management_allowed() === true) {
+if (is_management_allowed() === true || is_metaconsole()) {
     $table->head[1] = __('Action');
 }
 
@@ -262,15 +262,15 @@ foreach ($groups as $group) {
     }
 
     $table->cellclass[][1] = 'action_buttons';
-    if (is_management_allowed() === true) {
+    if (is_management_allowed() === true || is_metaconsole()) {
         $data[1] = "<a onclick='if(confirm(\"".__('Are you sure?')."\")) return true; else return false;' 
-        href='index.php?sec=".$sec.'&sec2=godmode/modules/manage_nc_groups&delete=1&id='.$group['id_sg']."&offset=0'>".html_print_image('images/cross.png', true, ['title' => __('Delete'), 'class' => 'invert_filter']).'</a>';
+        href='index.php?sec=".$sec.'&sec2=godmode/modules/manage_nc_groups&delete=1&id='.$group['id_sg']."&offset=0'>".html_print_image('images/cross.png', true, ['title' => __('Delete')]).'</a>';
     }
 
     array_push($table->data, $data);
 }
 
-if (is_management_allowed() === false) {
+if (is_management_allowed() === false && !is_metaconsole()) {
     ui_print_warning_message(__('This node is configured with centralized mode. This page is for read only. Go to metaconsole to manage the component groups.'));
 }
 
@@ -278,7 +278,7 @@ if (isset($data)) {
     echo "<form method='post' action='index.php?sec=".$sec."&sec2=godmode/modules/manage_nc_groups'>";
     html_print_input_hidden('multiple_delete', 1);
     html_print_table($table);
-    if (is_management_allowed() === true) {
+    if (is_management_allowed() === true || is_metaconsole()) {
         echo "<div class='pdd_l_10px float-right mrgn_btn_15px'>";
         html_print_submit_button(__('Delete'), 'delete_btn', false, 'class="sub delete"');
         echo '</div>';
@@ -289,7 +289,7 @@ if (isset($data)) {
     ui_print_info_message(['no_close' => true, 'message' => __('There are no defined component groups') ]);
 }
 
-if (is_management_allowed() === true) {
+if (is_management_allowed() === true || is_metaconsole()) {
     echo '<form method="post" action='.$url.'>';
     echo '<div class="float-right">';
         html_print_input_hidden('new', 1);

From 89ffb05466571a6d05ee5b4a3f61fed020bb6c54 Mon Sep 17 00:00:00 2001
From: daniel <daniel.barbero@artica.es>
Date: Tue, 6 Apr 2021 17:11:37 +0000
Subject: [PATCH 36/44] fixed errors sound events

---
 pandora_console/include/ajax/events.php       |  13 +-
 pandora_console/include/functions_alerts.php  |  17 +-
 pandora_console/include/functions_api.php     |   1 +
 .../operation/events/sound_events.php         | 207 ++++++++++++++----
 4 files changed, 194 insertions(+), 44 deletions(-)

diff --git a/pandora_console/include/ajax/events.php b/pandora_console/include/ajax/events.php
index 9476b41718..706a875eec 100644
--- a/pandora_console/include/ajax/events.php
+++ b/pandora_console/include/ajax/events.php
@@ -1865,11 +1865,12 @@ if ($get_table_response_command) {
 }
 
 if ($get_events_fired) {
+    global $config;
     $id = get_parameter('id_row');
     $idGroup = get_parameter('id_group');
     $agents = get_parameter('agents', null);
 
-    $query = ' AND id_evento > '.$id;
+    $query = ' AND id_evento >= '.$id;
 
     $type = [];
     $alert = get_parameter('alert_fired');
@@ -1889,7 +1890,10 @@ if ($get_events_fired) {
     if ($critical == 'true') {
         $resultCritical = alerts_get_event_status_group(
             $idGroup,
-            'going_up_critical',
+            [
+                'going_up_critical',
+                'going_down_critical',
+            ],
             $query,
             $agents
         );
@@ -1899,7 +1903,10 @@ if ($get_events_fired) {
     if ($warning == 'true') {
         $resultWarning = alerts_get_event_status_group(
             $idGroup,
-            'going_up_warning',
+            [
+                'going_up_warning',
+                'going_down_warning',
+            ],
             $query,
             $agents
         );
diff --git a/pandora_console/include/functions_alerts.php b/pandora_console/include/functions_alerts.php
index 9e27001d15..68e0a16923 100644
--- a/pandora_console/include/functions_alerts.php
+++ b/pandora_console/include/functions_alerts.php
@@ -173,13 +173,22 @@ function alerts_get_event_status_group($idGroup, $type='alert_fired', $query='AN
         $idAgents = array_values($agents);
     }
 
-    $result = db_get_all_rows_sql(
+    $sql = sprintf(
         'SELECT id_evento
-		FROM tevento
-		WHERE estado = 0 AND id_agente IN (0,'.implode(',', $idAgents).') '.$typeWhere.$query.'
-		ORDER BY id_evento DESC LIMIT 1'
+        FROM tevento
+        WHERE estado = 0
+            AND id_agente IN (0, %s)
+            %s
+            %s
+        ORDER BY id_evento DESC
+        LIMIT 1',
+        implode(',', $idAgents),
+        $typeWhere,
+        $query
     );
 
+    $result = db_get_all_rows_sql($sql);
+
     if ($result === false) {
         return false;
     }
diff --git a/pandora_console/include/functions_api.php b/pandora_console/include/functions_api.php
index aebef6c06b..ca0a633d6a 100644
--- a/pandora_console/include/functions_api.php
+++ b/pandora_console/include/functions_api.php
@@ -12423,6 +12423,7 @@ function api_set_create_tag($id, $trash1, $other, $returnType)
 
 
 // http://127.0.0.1/pandora_console/include/api.php?op=set&op2=create_event&id=name_event&other=2|system|3|admin|2|1|10|0|comments||Pandora||critical_inst|warning_inst|unknown_inst|other||&other_mode=url_encode_separator_|&apipass=1234&user=admin&pass=pandora
+// http://127.0.0.1/pandora_console/include/api.php?op=set&op2=create_event&id=name_event&other=textodelevento|10|2|0|admin|going_down_critical|4|&other_mode=url_encode_separator_|&apipass=1234&user=admin&pass=pandora
 function api_set_create_event($id, $trash1, $other, $returnType)
 {
     global $config;
diff --git a/pandora_console/operation/events/sound_events.php b/pandora_console/operation/events/sound_events.php
index 5a7fc45f0f..3881f468ae 100644
--- a/pandora_console/operation/events/sound_events.php
+++ b/pandora_console/operation/events/sound_events.php
@@ -1,18 +1,31 @@
 <?php
+/**
+ * Events sounds.
+ *
+ * @category   Sounds
+ * @package    Pandora FMS
+ * @subpackage Community
+ * @version    1.0.0
+ * @license    See below
+ *
+ *    ______                 ___                    _______ _______ ________
+ *   |   __ \.-----.--.--.--|  |.-----.----.-----. |    ___|   |   |     __|
+ *  |    __/|  _  |     |  _  ||  _  |   _|  _  | |    ___|       |__     |
+ * |___|   |___._|__|__|_____||_____|__| |___._| |___|   |__|_|__|_______|
+ *
+ * ============================================================================
+ * Copyright (c) 2005-2021 Artica Soluciones Tecnologicas
+ * Please see http://pandorafms.org for full contribution list
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation for version 2.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * ============================================================================
+ */
 
-// Pandora FMS - http://pandorafms.com
-// ==================================================
-// Copyright (c) 2005-2021 Artica Soluciones Tecnologicas
-// Please see http://pandorafms.org for full contribution list
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation for version 2.
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// Don't start a session before this import.
-// The session is configured and started inside the config process.
 require_once '../../include/config.php';
 require_once '../../include/functions.php';
 require_once '../../include/functions_db.php';
@@ -20,7 +33,7 @@ require_once '../../include/auth/mysql.php';
 
 global $config;
 
-// Check user
+// Check user.
 check_login();
 $config['id_user'] = $_SESSION['id_usuario'];
 
@@ -29,7 +42,10 @@ $event_w = check_acl($config['id_user'], 0, 'EW');
 $event_m = check_acl($config['id_user'], 0, 'EM');
 $access = ($event_a == true) ? 'ER' : (($event_w == true) ? 'EW' : (($event_m == true) ? 'EM' : 'ER'));
 
-if (! check_acl($config['id_user'], 0, 'ER') && ! check_acl($config['id_user'], 0, 'EW') && ! check_acl($config['id_user'], 0, 'EM')) {
+if (check_acl($config['id_user'], 0, 'ER') === false
+    && check_acl($config['id_user'], 0, 'EW') === false
+    && check_acl($config['id_user'], 0, 'EM') === false
+) {
     db_pandora_audit('ACL Violation', 'Trying to access event viewer');
     include 'general/noaccess.php';
 
@@ -49,7 +65,7 @@ echo '<title>'.__('Sound Events').'</title>';
         margin: 0;
         padding: 0;
     }
-    
+
     img {
         border: 0;
     }
@@ -72,7 +88,12 @@ $conn_title = __('Connection with server has been lost');
 $conn_text = __('Connection to the server has been lost. Please check your internet connection or contact with administrator.');
 ui_require_javascript_file('connection_check');
 set_js_value('absolute_homeurl', ui_get_full_url(false, false, false, false));
-ui_print_message_dialog($conn_title, $conn_text, 'connection', '/images/error_1.png');
+ui_print_message_dialog(
+    $conn_title,
+    $conn_text,
+    'connection',
+    '/images/error_1.png'
+);
 
 $table = new StdClass;
 $table->width = '100%';
@@ -83,16 +104,91 @@ $table->rowclass[1] = 'bold_top';
 $table->rowclass[2] = 'bold_top';
 
 $table->data[0][0] = __('Group');
-$table->data[0][1] = html_print_select_groups(false, $access, true, 'group', '', 'changeGroup();', '', 0, true, false, true, '', false, 'max-width:200px;').'<br />'.'<br />';
+$table->data[0][1] = html_print_select_groups(
+    false,
+    $access,
+    true,
+    'group',
+    '',
+    'changeGroup();',
+    '',
+    0,
+    true,
+    false,
+    true,
+    '',
+    false,
+    'max-width:200px;'
+).'<br /><br />';
 
 $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[0][3] = html_print_checkbox(
+    'alert_fired',
+    'alert_fired',
+    true,
+    true,
+    false,
+    'changeType();'
+);
+$table->data[0][3] .= __('Alert fired').'<br />';
+$table->data[0][3] .= html_print_checkbox(
+    'critical',
+    'critical',
+    true,
+    true,
+    false,
+    'changeType();'
+);
+$table->data[0][3] .= __('Monitor critical').'<br />';
+$table->data[0][3] .= html_print_checkbox(
+    'unknown',
+    'unknown',
+    true,
+    true,
+    false,
+    'changeType();'
+);
+$table->data[0][3] .= __('Monitor unknown').'<br />';
+$table->data[0][3] .= html_print_checkbox(
+    'warning',
+    'warning',
+    true,
+    true,
+    false,
+    'changeType();'
+);
+$table->data[0][3] .= __('Monitor warning').'<br />';
 
 $table->data[1][0] = __('Agent');
-$table->data[1][1] = html_print_select($agents, 'id_agents[]', true, false, '', '', true, true, '', '', '', 'max-width:200px; 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; resize:none;"', true);
+$table->data[1][3] = html_print_textarea(
+    'events_fired',
+    200,
+    20,
+    '',
+    'readonly="readonly" style="max-height:100px; resize:none;"',
+    true
+);
 
 html_print_table($table);
 
@@ -100,13 +196,41 @@ $table = new StdClass;
 $table->width = '100%';
 $table->class = 'w16px sound_div_background text_center';
 
-$table->data[0][0] = '<a href="javascript: toggleButton();">'.html_print_image('images/play.button.png', true, ['id' => 'button']).'</a>';
+$table->data[0][0] = '<a href="javascript: toggleButton();">';
+$table->data[0][0] .= html_print_image(
+    'images/play.button.png',
+    true,
+    ['id' => 'button']
+);
+$table->data[0][0] .= '</a>';
 
-$table->data[0][1] .= '<a href="javascript: ok();">'.html_print_image('images/ok.button.png', true, ['style' => 'margin-left: 15px;']).'</a>';
+$table->data[0][1] = '<a href="javascript: ok();">';
+$table->data[0][1] .= html_print_image(
+    'images/ok.button.png',
+    true,
+    ['style' => 'margin-left: 15px;']
+);
+$table->data[0][1] .= '</a>';
 
-$table->data[0][2] .= '<a href="javascript: test_sound_button();">'.html_print_image('images/icono_test.png', true, ['id' => 'button_try', 'style' => 'margin-left: 15px;']).'</a>';
+$table->data[0][2] = '<a href="javascript: test_sound_button();">';
+$table->data[0][2] .= html_print_image(
+    'images/icono_test.png',
+    true,
+    [
+        'id'    => 'button_try',
+        'style' => 'margin-left: 15px;',
+    ]
+);
+$table->data[0][2] .= '</a>';
 
-$table->data[0][3] .= html_print_image('images/tick_sound_events.png', true, ['id' => 'button_status', 'style' => 'margin-left: 15px;']);
+$table->data[0][3] = html_print_image(
+    'images/tick_sound_events.png',
+    true,
+    [
+        'id'    => 'button_status',
+        'style' => 'margin-left: 15px;',
+    ]
+);
 
 html_print_table($table);
 ?>
@@ -149,10 +273,12 @@ function changeGroup() {
         },
         function (data) {
             $("#id_agents").empty();
-            
             jQuery.each (data, function (id, value) {
                 if (value != "") {
-                    $("#id_agents").append('<option value="' + id + '">' + value + '</option>');
+                    $("#id_agents")
+                        .append(
+                            '<option value="' + id + '">' + value + '</option>'
+                        );
                 }
             });
         },
@@ -187,14 +313,14 @@ function toggleButton() {
     if (button_play_status == 'pause') {
         $("#button").attr('src', '../../images/play.button.png');
         stopSound();
-        
+
         button_play_status = 'play';
     }
     else {
         $("#button").attr('src', '../../images/pause.button.png');
         forgetPreviousEvents();
         startSound();
-        
+
         button_play_status = 'pause';
     }
 }
@@ -207,9 +333,7 @@ function ok() {
 
 function stopSound() {
     $('audio').remove();
-    
     $('body').css('background', '#494949');
-    
     running = false;
 }
 
@@ -263,13 +387,21 @@ function check_event() {
                     var actual_text = $('#textarea_events_fired').val();
                     if (actual_text == "") {
                         $('#textarea_events_fired').val(data['message'] + "\n");
+                    } else {
+                        $('#textarea_events_fired')
+                            .val(actual_text + "\n" + data['message'] + "\n");
                     }
-                    else {
-                        $('#textarea_events_fired').val(actual_text + "\n" + data['message'] + "\n");
-                    }
-                    $('#button_status').attr('src','../../images/sound_events_console_alert.gif');
+                    $('#button_status')
+                        .attr(
+                            'src','../../images/sound_events_console_alert.gif'
+                        );
                     $('audio').remove();
-                    $('body').append("<audio src='../../" + data['sound'] + "' autoplay='true' hidden='true' loop='true'>");
+                    if(data['sound'] == '') {
+                        data['sound'] = 'include/sounds/Star_Trek_emergency_simulation.wav';
+                    }
+
+                    $('body')
+                        .append("<audio src='../../" + data['sound'] + "' autoplay='true' hidden='true' loop='true'>");
                 }
             },
             "json"
@@ -278,7 +410,8 @@ function check_event() {
 }
 
 $(document).ready (function () {
-    setInterval("check_event()", (10 * 1000)); //10 seconds between ajax request
+    //10 seconds between ajax request
+    setInterval("check_event()", (10 * 1000));
 });
 
 </script>

From f2efb6a39b9768cbbe3a55c476f360884156307a Mon Sep 17 00:00:00 2001
From: Marcos Alconada <marcos.alconada@artica.es>
Date: Tue, 6 Apr 2021 17:15:41 +0000
Subject: [PATCH 37/44] fixed lost icon

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

diff --git a/pandora_console/include/functions_update_manager.php b/pandora_console/include/functions_update_manager.php
index b641448af5..0b7b9d1235 100755
--- a/pandora_console/include/functions_update_manager.php
+++ b/pandora_console/include/functions_update_manager.php
@@ -763,7 +763,7 @@ function newsletter_wiz_modal(
     $output .= __('Do you want to be up to date?');
     $output .= '" class="invisible">';
     $output .= '<div class="register_update_manager">';
-    $output .= html_print_image('image/pandora_big_circle.png', true);
+    $output .= html_print_image('images/pandora_circle_big.png', true);
     $output .= '</div>';
 
     $output .= '<div class="newsletter_div">';

From 6dac9039d4693481d842f48ebfd74275df08c0f6 Mon Sep 17 00:00:00 2001
From: Luis <luis.calvo@artica.es>
Date: Tue, 6 Apr 2021 17:21:56 +0000
Subject: [PATCH 38/44] Ent 4475 validar alertas api cli

---
 pandora_console/include/functions_api.php | 130 ++++++++++++++++++++
 pandora_server/util/pandora_manage.pl     | 140 ++++++++++++++++++++++
 2 files changed, 270 insertions(+)

diff --git a/pandora_console/include/functions_api.php b/pandora_console/include/functions_api.php
index d30da4cc4c..5a583231a0 100644
--- a/pandora_console/include/functions_api.php
+++ b/pandora_console/include/functions_api.php
@@ -6159,6 +6159,136 @@ function api_set_delete_module_template_by_names($id, $id2, $other, $trash1)
 }
 
 
+/**
+ * Validate an alert
+ *
+ * @param  string $id1    Alert template name (eg. 'Warning condition')
+ * @param  string $trash1 Do nnot use.
+ * @param  array  $other  [1] id/name agent.
+ *                       [2] id/name module
+ *                       [3] Use agent/module alias.
+ * @param  string $trash2 Do not use
+ * @return void
+ */
+function api_set_validate_alert($id1, $trash1, $other, $trash2)
+{
+    global $config;
+
+    if (defined('METACONSOLE')) {
+        return;
+    }
+
+    if (!check_acl($config['id_user'], 0, 'LW')) {
+        returnError('forbidden');
+        return;
+    }
+
+    if ($id1 === '') {
+        returnError(
+            'error_validate_alert',
+            __('Error validating alert. Id_template cannot be left blank.')
+        );
+        return;
+    }
+
+    if ($other['data'][0] == '') {
+        returnError(
+            'error_validate_alert',
+            __('Error validating alert. Id_agent cannot be left blank.')
+        );
+        return;
+    }
+
+    if ($other['data'][1] == '') {
+        returnError(
+            'error_validate_alert',
+            __('Error validating alert. Id_module cannot be left blank.')
+        );
+        return;
+    }
+
+    if ($other['data'][2] == 1) {
+        $use_alias = true;
+    }
+
+    $values = [
+        'alert_name'      => $id1,
+        'id_agent'        => $other['data'][0],
+        'id_agent_module' => $other['data'][1],
+    ];
+
+    if ($use_alias === true) {
+        $id_agents = agents_get_agent_id_by_alias($values['id_agent']);
+
+        foreach ($id_agents as $id) {
+            $values['id_agent'] = $id['id_agente'];
+            $values['id_agent_module'] = db_get_value_filter(
+                'id_agente_modulo as id_module',
+                'tagente_modulo',
+                [
+                    'id_agente' => $values['id_agent'],
+                    'nombre'    => $values['id_agent_module'],
+                ]
+            );
+
+            $id_template = db_get_value_filter(
+                'id as id_template',
+                'talert_templates',
+                [
+                    'name' => $values['alert_name'],
+                ]
+            );
+
+             // Get alert id.
+            $id_alert = db_get_value_filter(
+                'id as id_alert',
+                'talert_template_modules',
+                [
+                    'id_agent_module'   => $values['id_agent_module'],
+                    'id_alert_template' => $id_template,
+                ]
+            );
+        }
+
+        $result = alerts_validate_alert_agent_module($id_alert);
+    } else {
+        $id_template = db_get_value_filter(
+            'id as id_template',
+            'talert_templates',
+            [
+                'name' => $values['alert_name'],
+            ]
+        );
+
+        // Get alert id.
+        $id_alert = db_get_value_filter(
+            'id as id_alert',
+            'talert_template_modules',
+            [
+                'id_agent_module'   => $values['id_agent_module'],
+                'id_alert_template' => $id_template,
+            ]
+        );
+
+        if ($id_alert === false) {
+            returnError(
+                'error_validate_alert',
+                __('Error validating alert. Specified alert does not exist.')
+            );
+            return;
+        }
+
+        $result = alerts_validate_alert_agent_module($id_alert);
+    }
+
+    if ($result) {
+        returnData('string', ['type' => 'string', 'data' => 'Alert succesfully validated']);
+    } else {
+        returnData('string', ['type' => 'string', 'data' => __('Error validating alert')]);
+    }
+}
+
+
 /**
  * Validate all alerts. And return a message with the result of the operation.
  *
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index c91166483f..76cc34a673 100755
--- a/pandora_server/util/pandora_manage.pl
+++ b/pandora_server/util/pandora_manage.pl
@@ -176,6 +176,7 @@ sub help_screen{
 	help_screen_line('--get_alert_actions_meta', '[<server_name> <action_name> <separator> <return_type>]', 'get all alert actions in nodes');
 	help_screen_line('--update_alert_template', "<template_name> <field_to_change> \n\t  <new_value>", 'Update a field of an alert template');
 	help_screen_line('--validate_all_alerts', '', 'Validate all the alerts');
+	help_screen_line('--validate_alert', '<template_name> <agent_id> <module_id> [<use_alias>]', 'Validate alert given angent, module and alert');
 	help_screen_line('--create_special_day', "<special_day> <same_day> <description> <group>", 'Create special day');
 	help_screen_line('--delete_special_day', '<special_day>', 'Delete special day');
 	help_screen_line('--update_special_day', "<special_day> <field_to_change> <new_value>", 'Update a field of a special day');
@@ -4549,6 +4550,86 @@ sub cli_validate_all_alerts() {
 	}
 }
 
+##############################################################################
+# Validate all the alerts
+# Related option: --validate_alert
+##############################################################################
+
+sub cli_validate_alert() {
+		my ($template_name, $agent_id, $module_id, $use_alias) = @ARGV[2..6];
+	my $id_agent = '';
+	my $id_agentmodule = '';
+
+	my $result = 0;
+
+	if (defined $use_alias and $use_alias eq 'use_alias') {
+		my @id_agents = get_agent_ids_from_alias($dbh,$agent_id);
+			if(!@id_agents) {
+				print (STDERR "[ERROR] Error: The agent '$agent_id' not exists.\n\n");
+		}
+
+		foreach my $id (@id_agents) {
+			if(defined($agent_id) && $agent_id ne '') {
+				$id_agent = $id->{'id_agente'};
+				exist_check($id_agent,'agent',$agent_id);
+				
+				if($module_id ne '') {
+					$module_id = get_agent_module_id($dbh, $module_id, $id_agent);
+					if ($module_id eq -1) {
+						next;
+					}
+				}
+			}
+
+
+			my $id_alert_agent_module = '';
+			
+			if(defined($template_name) && $template_name ne '') {
+				my $id_template = get_template_id($dbh,$template_name);
+				exist_check($id_template,'template',$template_name);
+				$id_alert_agent_module = get_template_module_id($dbh,$module_id,$id_template);
+				exist_check($id_alert_agent_module,'template module',$template_name);
+			}
+
+
+			$result = pandora_validate_alert_id($id_alert_agent_module, $id, $module_id, $template_name);
+			print_log "[INFO] Validating alert for agent '$id->{'nombre'}'\n\n";
+		}
+	} else {
+		if(defined($agent_id) && $agent_id ne '') {
+			my $agent_name = get_agent_name($dbh,$agent_id);
+			exist_check($agent_id,'agent',$agent_name);
+			
+			if($module_id ne '') {
+				my $module_name = get_module_name($dbh, $module_id);
+				exist_check($module_id,'module',$module_name);
+			}
+		}
+
+		my $id_alert_agent_module = '';
+		
+		if(defined($template_name) && $template_name ne '') {
+			my $id_template = get_template_id($dbh,$template_name);
+			exist_check($id_template,'template',$template_name);
+			$id_alert_agent_module = get_template_module_id($dbh,$module_id,$id_template);
+			exist_check($id_alert_agent_module,'template module',$template_name);
+		}
+					
+			$result = pandora_validate_alert_id($id_alert_agent_module, $id_agent, $module_id, $template_name);
+			print_log "[INFO] Validating alert for agent '$agent_id'\n\n";
+	}
+
+if($result == 0) {
+		print_log "[ERROR] Alert could not be validated\n\n";
+	}
+	else {
+			print_log "[INFO] Alert succesfully validated\n\n";
+;
+	}
+
+}
+
+
 ##############################################################################
 # Validate the alerts of a given policy
 # Related option: --validate_policy_alerts
@@ -7526,6 +7607,10 @@ sub pandora_manage_main ($$$) {
 			param_check($ltotal, 0);
 			cli_validate_all_alerts();
 		}
+		elsif ($param eq '--validate_alert') {
+			param_check($ltotal, 5,4);
+			cli_validate_alert();
+		}
 		elsif ($param eq '--validate_policy_alerts') {
 			param_check($ltotal, 1);
 			cli_validate_policy_alerts();
@@ -8437,4 +8522,59 @@ sub cli_event_in_progress() {
 	);
 
 	print "\n$result\n";
+}
+
+##############################################################################
+# Validates an alert given id alert, id module, id angent and template name.
+##############################################################################
+sub pandora_validate_alert_id($$$$) {
+	my ($id_alert_agent_module, $agent_id, $id_agent_module, $template_name) = @_;
+
+
+  my $group_id = get_agent_group($dbh, $agent_id);
+
+	my $critical_instructions = get_db_value($dbh, 'SELECT critical_instructions from tagente_modulo WHERE id_agente_modulo = ?', $agent_id);
+	my $warning_instructions = get_db_value($dbh, 'SELECT warning_instructions from tagente_modulo WHERE id_agente_modulo = ?', $agent_id);
+	my $unknown_instructions = get_db_value($dbh, 'SELECT unknown_instructions from tagente_modulo WHERE id_agente_modulo = ?', $agent_id);
+
+	my $parameters = {
+		'times_fired' => 0,
+		'internal_counter' => 0,
+		};
+
+	my $result = db_process_update($dbh, 'talert_template_modules', $parameters,{'id' => $id_alert_agent_module});
+
+	return 0 unless $result != 0;
+
+  my $module_name = safe_output(get_db_value($dbh, 'SELECT nombre FROM tagente_modulo WHERE id_agente_modulo = ?', $id_agent_module));
+
+
+		# Update fired alert count on the agent
+		db_process_update($dbh, 'tagente', {'update_alert_count' => 1}, {'id_agente' => $agent_id});
+
+		my $event = 'Manual validation of alert '.$template_name.' assigned to '.$module_name.'';
+
+		pandora_event(
+			$conf,
+			$event,
+			$group_id, 
+			$agent_id,
+			0,
+			$id_alert_agent_module,
+			$id_agent_module,
+			'alert_manual_validation',
+			1,
+			$dbh,
+			0,
+			'',
+			'',
+			'',
+			'',
+			$critical_instructions,
+			$warning_instructions,
+			$unknown_instructions,
+			''
+		);
+
+    return 1;
 }
\ No newline at end of file

From 8734494b7feb165368607191d52b6fc397d24ed3 Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Wed, 7 Apr 2021 01:00:38 +0200
Subject: [PATCH 39/44] 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 dcf79622a6..1e6c6854a6 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.753-210406
+Version: 7.0NG.753-210407
 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 26417b0bf5..50959f54d6 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.753-210406"
+pandora_version="7.0NG.753-210407"
 
 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 f5afa49715..f0ef08baa5 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -1016,7 +1016,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.753';
-use constant AGENT_BUILD => '210406';
+use constant AGENT_BUILD => '210407';
 
 # 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 c0eeaae6f1..0d9669e329 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.753
-%define release     210406
+%define release     210407
 
 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 182a3d23a9..ec53b3c1f0 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.753
-%define release     210406
+%define release     210407
 
 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 f24a1c4b8b..9a51acb1c8 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.753"
-PI_BUILD="210406"
+PI_BUILD="210407"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index a915f9e388..35fde32cab 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{210406}
+{210407}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 3ae4fb5ac7..7bfc42d7d0 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.753(Build 210406)")
+#define PANDORA_VERSION ("7.0NG.753(Build 210407)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index 8b68d53ead..4a88adf11d 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.753(Build 210406))"
+      VALUE "ProductVersion", "(7.0NG.753(Build 210407))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 833854a2ee..979f6b9ea9 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.753-210406
+Version: 7.0NG.753-210407
 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 261acf026b..e26fa1a9ef 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.753-210406"
+pandora_version="7.0NG.753-210407"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index a94ffa0fbd..b19214f67e 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 = 'PC210406';
+$build_version = 'PC210407';
 $pandora_version = 'v7.0NG.753';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index f91e264aaa..17df1a2744 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -129,7 +129,7 @@
         <div style='height: 10px'>
             <?php
             $version = '7.0NG.753';
-            $build = '210406';
+            $build = '210407';
             $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 ecbc8d0a0f..5423306523 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.753
-%define release     210406
+%define release     210407
 
 # 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 39cc29c891..e50419826b 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.753
-%define release     210406
+%define release     210407
 
 # 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 631410d42e..8ac39f9417 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.753
-%define release     210406
+%define release     210407
 %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 6349b90e35..514b157867 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.753-210406
+Version: 7.0NG.753-210407
 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 a1755a33ce..0524495776 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.753-210406"
+pandora_version="7.0NG.753-210407"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index dea01df0fa..2ddf89c619 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.753";
-my $pandora_build = "210406";
+my $pandora_build = "210407";
 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 f5e167abb0..3789b2c624 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.753";
-my $pandora_build = "210406";
+my $pandora_build = "210407";
 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 3817169e79..ecff8ac1c0 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.753
-%define release     210406
+%define release     210407
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 23dfa0fdf4..fd74b3f9b2 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.753
-%define release     210406
+%define release     210407
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 524ca97c04..c325c07c17 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.753"
-PI_BUILD="210406"
+PI_BUILD="210407"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index af71f3b955..dea039834d 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.753 PS210406";
+my $version = "7.0NG.753 PS210407";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index fd5db32831..d84e8a8bd4 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.753 PS210406";
+my $version = "7.0NG.753 PS210407";
 
 # save program name for logging
 my $progname = basename($0);

From 4ab7b1a135c66ad11f8b0b297ac506cffd1b7568 Mon Sep 17 00:00:00 2001
From: Luis <luis.calvo@artica.es>
Date: Wed, 7 Apr 2021 08:11:35 +0000
Subject: [PATCH 40/44] Ent 6952 bug group creation user admin no all

---
 pandora_console/godmode/groups/configure_group.php | 12 +++++++-----
 pandora_console/godmode/groups/group_list.php      | 14 +++++++-------
 .../godmode/wizards/DiscoveryTaskList.class.php    |  2 +-
 .../include/class/TreeGroupEdition.class.php       |  9 +++++++++
 4 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/pandora_console/godmode/groups/configure_group.php b/pandora_console/godmode/groups/configure_group.php
index 7b9b43ed41..08e2c2e9f3 100644
--- a/pandora_console/godmode/groups/configure_group.php
+++ b/pandora_console/godmode/groups/configure_group.php
@@ -149,12 +149,12 @@ if ($id_group) {
         $table->data[2][1] .= html_print_select_groups(
             false,
             'AR',
-            true,
+            false,
             'id_parent',
             $id_parent,
             '',
-            '',
-            '',
+            __('None'),
+            -1,
             true,
             false,
             true,
@@ -174,7 +174,9 @@ if ($id_group) {
             'name'           => 'id_parent',
             'selected'       => $id_parent,
             'return'         => true,
-            'returnAllGroup' => true,
+            'returnAllGroup' => false,
+            'nothing'        => __('None'),
+            'nothing_value'  => -1,
         ]
     );
     $table->data[2][1] .= '</div>';
@@ -182,7 +184,7 @@ if ($id_group) {
 
 if ($acl_parent) {
     $table->data[2][1] .= ' <span id="parent_preview">';
-    $table->data[2][1] .= html_print_image('images/groups_small/'.groups_get_icon($id_parent).'.png', true);
+    $table->data[2][1] .= html_print_image('images/groups_small/'.( $id_parent != 0 ? groups_get_icon($id_parent) : 'without_group').'.png', true);
     $table->data[2][1] .= '</span>';
 }
 
diff --git a/pandora_console/godmode/groups/group_list.php b/pandora_console/godmode/groups/group_list.php
index 137796cd6e..74ea0af8fe 100644
--- a/pandora_console/godmode/groups/group_list.php
+++ b/pandora_console/godmode/groups/group_list.php
@@ -59,11 +59,11 @@ if (is_ajax() === true) {
     if ($get_group_json === true) {
         $id_group = (int) get_parameter('id_group');
 
-        if ($id_group === 0) {
+        if ($id_group === 0 || $id_group === -1) {
             $group = [
                 'id_grupo'  => 0,
-                'nombre'    => 'All',
-                'icon'      => 'world',
+                'nombre'    => 'None',
+                'icon'      => '',
                 'parent'    => 0,
                 'disabled'  => 0,
                 'custom_id' => null,
@@ -472,7 +472,7 @@ if ($update_group) {
                 $values = [
                     'nombre'      => $name,
                     'icon'        => empty($icon) ? '' : substr($icon, 0, -4),
-                    'parent'      => $id_parent,
+                    'parent'      => $id_parent == -1 ? 0 : $id_parent,
                     'disabled'    => !$alerts_enabled,
                     'custom_id'   => $custom_id,
                     'id_skin'     => $skin,
@@ -719,7 +719,7 @@ if ($tab == 'tree') {
 
     if (users_can_manage_group_all('AR') === false) {
         $user_groups_acl = users_get_groups(false, 'AR');
-        $groups_acl = implode(',', $user_groups_ACL);
+        $groups_acl = implode('","', $user_groups_acl);
         if (empty($groups_acl) === true) {
             return ui_print_info_message(
                 [
@@ -729,7 +729,7 @@ if ($tab == 'tree') {
             );
         }
 
-        $acl = 'AND t.id_grupo IN ('.$groups_acl.')';
+        $acl = 'AND t.nombre IN ("'.$groups_acl.'")';
     }
 
     $form = "<form method='post' action=''>";
@@ -908,7 +908,7 @@ if ($tab == 'tree') {
     }
 }
 
-if (check_acl($config['id_user'], 0, 'PM') === true) {
+if ((bool) check_acl($config['id_user'], 0, 'PM') === true) {
     echo '<form method="post" action="index.php?sec='.$sec.'&sec2=godmode/groups/configure_group">';
         echo '<div class="action-buttons w100p">';
             html_print_submit_button(__('Create group'), 'crt', false, 'class="sub next"');
diff --git a/pandora_console/godmode/wizards/DiscoveryTaskList.class.php b/pandora_console/godmode/wizards/DiscoveryTaskList.class.php
index f94c3f0e8a..384abd4db4 100644
--- a/pandora_console/godmode/wizards/DiscoveryTaskList.class.php
+++ b/pandora_console/godmode/wizards/DiscoveryTaskList.class.php
@@ -1494,7 +1494,7 @@ class DiscoveryTaskList extends HTML
 
                 if (is_array($data['modules'])) {
                     // Alphabetically sort.
-                    ksort($data['modules'], SORT_STRING | SORT_FLAG_CASE);
+                    ksort($data['modules'], (SORT_STRING | SORT_FLAG_CASE));
 
                     $simple_data = array_merge(
                         $simple_data,
diff --git a/pandora_console/include/class/TreeGroupEdition.class.php b/pandora_console/include/class/TreeGroupEdition.class.php
index 9aa6effb5b..490a682865 100644
--- a/pandora_console/include/class/TreeGroupEdition.class.php
+++ b/pandora_console/include/class/TreeGroupEdition.class.php
@@ -139,6 +139,15 @@ class TreeGroupEdition extends TreeGroup
             }
         );
 
+        // Filter groups that user has permission.
+        $groups = array_filter(
+            $groups,
+            function ($group) {
+                global $config;
+                return check_acl($config['id_user'], $group['id'], 'AR');
+            }
+        );
+
         usort($groups, ['Tree', 'cmpSortNames']);
         return $groups;
     }

From 4920dc96217dfd5a54161914863835870bfbda4a Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Wed, 7 Apr 2021 10:17:32 +0200
Subject: [PATCH 41/44] Revert "Merge branch 'ent-7040-forzar-URL-publica-meta'
 into 'develop'"

This reverts merge request !3860
---
 pandora_console/include/functions_ui.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index b35d7d74a2..e90b88a146 100755
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -4272,16 +4272,16 @@ function ui_get_full_url($url='', $no_proxy=false, $add_name_php_file=false, $me
         }
     } else {
         if ($proxy) {
-            if (is_metaconsole() && $metaconsole_root) {
-                $fullurl .= ENTERPRISE_DIR.'/meta';
-            }
-
             $fullurl .= '/';
         } else {
             if ($add_name_php_file) {
                 $fullurl .= $_SERVER['SCRIPT_NAME'];
             } else {
                 $fullurl .= $config['homeurl_static'].'/';
+
+                if (is_metaconsole() && $metaconsole_root) {
+                    $fullurl .= 'enterprise/meta/';
+                }
             }
         }
     }

From 4a808ba387130362c91ca2aae80bb6e4c52f0374 Mon Sep 17 00:00:00 2001
From: Ramon Novoa <rnovoa@artica.es>
Date: Wed, 7 Apr 2021 11:09:44 +0200
Subject: [PATCH 42/44] Test the post-receive hook.

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 3187ac8487..15db18aa00 100644
--- a/README.md
+++ b/README.md
@@ -46,3 +46,4 @@ Pandora FMS is a monitoring tool that not only measures if a parameter is right
 <br />
 <br />
 ![screenshot 4](http://wolf359.artica.es/public_images/pandora6.0sp3-sample-visual-console.png)
+

From 5c28b5aa00d95ce4aba9ea45279edbe708a09b82 Mon Sep 17 00:00:00 2001
From: Ramon Novoa <rnovoa@artica.es>
Date: Wed, 7 Apr 2021 12:37:21 +0200
Subject: [PATCH 43/44] Revert "Test the post-receive hook."

This reverts commit 4a808ba387130362c91ca2aae80bb6e4c52f0374.
---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index 15db18aa00..3187ac8487 100644
--- a/README.md
+++ b/README.md
@@ -46,4 +46,3 @@ Pandora FMS is a monitoring tool that not only measures if a parameter is right
 <br />
 <br />
 ![screenshot 4](http://wolf359.artica.es/public_images/pandora6.0sp3-sample-visual-console.png)
-

From 10a7420928ff400d1441ac0f8c99810eb68179c9 Mon Sep 17 00:00:00 2001
From: Ramon Novoa <rnovoa@artica.es>
Date: Wed, 7 Apr 2021 12:40:11 +0200
Subject: [PATCH 44/44] Revert "Revert "Test the post-receive hook.""

This reverts commit 5c28b5aa00d95ce4aba9ea45279edbe708a09b82.
---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 3187ac8487..15db18aa00 100644
--- a/README.md
+++ b/README.md
@@ -46,3 +46,4 @@ Pandora FMS is a monitoring tool that not only measures if a parameter is right
 <br />
 <br />
 ![screenshot 4](http://wolf359.artica.es/public_images/pandora6.0sp3-sample-visual-console.png)
+