From 001b547fb0483398ab4433e45f6b131cc14f8d83 Mon Sep 17 00:00:00 2001
From: Jose Gonzalez <jose.gonzalez@artica.es>
Date: Mon, 29 Mar 2021 14:07:57 +0200
Subject: [PATCH 01/32] Fixed issue with duplicate web server modules

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

diff --git a/pandora_console/include/functions_modules.php b/pandora_console/include/functions_modules.php
index 9466b15aa1..7455319abb 100755
--- a/pandora_console/include/functions_modules.php
+++ b/pandora_console/include/functions_modules.php
@@ -639,6 +639,14 @@ function modules_create_agent_module(
         );
     }
 
+    // Only for Web server modules.
+    if (isset($values['id_tipo_modulo'])
+        && ($values['id_tipo_modulo'] >= MODULE_TYPE_WEB_ANALYSIS
+        && $values['id_tipo_modulo'] <= MODULE_TYPE_WEB_CONTENT_STRING)
+    ) {
+        $values['debug_content'] = io_safe_input($values['debug_content']);
+    }
+
     $id_agent_module = db_process_sql_insert('tagente_modulo', $values);
 
     if ($id_agent_module === false) {

From 5e125a33c3527486959977419c209a855a4cf471 Mon Sep 17 00:00:00 2001
From: Jose Gonzalez <jose.gonzalez@artica.es>
Date: Mon, 29 Mar 2021 14:42:51 +0200
Subject: [PATCH 02/32] Fixed lints

---
 pandora_console/include/functions_modules.php | 105 ++++++++++--------
 1 file changed, 59 insertions(+), 46 deletions(-)

diff --git a/pandora_console/include/functions_modules.php b/pandora_console/include/functions_modules.php
index 7455319abb..43fce6681a 100755
--- a/pandora_console/include/functions_modules.php
+++ b/pandora_console/include/functions_modules.php
@@ -1,22 +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.
-
 /**
- * @package    Include
- * @subpackage Modules
+ * Functions for modules.
+ *
+ * @category   Functions script.
+ * @package    Pandora FMS
+ * @subpackage Modules.
+ * @version    1.0.0
+ * @license    See below
+ *
+ *    ______                 ___                    _______ _______ ________
+ *   |   __ \.-----.--.--.--|  |.-----.----.-----. |    ___|   |   |     __|
+ *  |    __/|  _  |     |  _  ||  _  |   _|  _  | |    ___|       |__     |
+ * |___|   |___._|__|__|_____||_____|__| |___._| |___|   |__|_|__|_______|
+ *
+ * ============================================================================
+ * Copyright (c) 2005-2021 Artica Soluciones Tecnologicas
+ * Please see http://pandorafms.org for full contribution list
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation for version 2.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * ============================================================================
  */
 
+// Begin.
 require_once $config['homedir'].'/include/functions_agents.php';
 require_once $config['homedir'].'/include/functions_users.php';
 require_once $config['homedir'].'/include/functions_tags.php';
@@ -570,40 +580,41 @@ function modules_update_agent_module(
  * @param integer $name       Module name id.
  * @param array   $values     Extra values for the module.
  * @param boolean $disableACL Disable the ACL checking, for default false.
- * @param mixed   $tags       Array with tag's ids or false.
+ * @param array   $tags       Array with tag's ids or false.
  *
  * @return New module id if the module was created. False if not.
  */
 function modules_create_agent_module(
-    $id_agent,
-    $name,
-    $values=false,
-    $disableACL=false,
-    $tags=false
+    int $id_agent,
+    int $name,
+    array $values=[],
+    bool $disableACL=false,
+    array $tags=false
 ) {
     global $config;
 
-    if (!$disableACL) {
-        if (!users_is_admin() && (empty($id_agent)
-            || !users_access_to_agent($id_agent, 'AW'))
+    if ((bool) $disableACL === false) {
+        if ((bool) users_is_admin() === false
+            && (empty($id_agent) === true
+            || users_access_to_agent($id_agent, 'AW') === false)
         ) {
             return false;
         }
     }
 
-    if (empty($name)) {
+    if (empty($name) === true) {
         return ERR_INCOMPLETE;
     }
 
     // Check for non valid characters in module name.
-    if (mb_ereg_match('[\xc2\xa1\xc2\xbf\xc3\xb7\xc2\xba\xc2\xaa]', io_safe_output($name)) !== false) {
+    if (mb_ereg_match(
+        '[\xc2\xa1\xc2\xbf\xc3\xb7\xc2\xba\xc2\xaa]',
+        io_safe_output($name)
+    ) !== false
+    ) {
         return ERR_GENERIC;
     }
 
-    if (! is_array($values)) {
-        $values = [];
-    }
-
     $values['nombre'] = $name;
     $values['id_agente'] = (int) $id_agent;
 
@@ -616,23 +627,25 @@ function modules_create_agent_module(
         ]
     );
 
-    if ($exists) {
+    if ($exists === true) {
         return ERR_EXIST;
     }
 
     // Encrypt passwords.
-    if (isset($values['plugin_pass'])) {
-        // Avoid two times encryption
+    if (isset($values['plugin_pass']) === true) {
+        // Avoid two times encryption.
         $plugin_pass = io_safe_output($values['plugin_pass']);
 
         $values['plugin_pass'] = io_input_password($plugin_pass);
     }
 
     // Encrypt SNMPv3 passwords.
-    if (isset($values['id_tipo_modulo']) && ($values['id_tipo_modulo'] >= 15
-        && $values['id_tipo_modulo'] <= 18)
-        && isset($values['tcp_send']) && ($values['tcp_send'] == 3)
-        && isset($values['custom_string_2'])
+    if (isset($values['id_tipo_modulo']) === true
+        && ((int) $values['id_tipo_modulo'] >= MODULE_TYPE_REMOTE_SNMP
+        && (int) $values['id_tipo_modulo'] <= MODULE_TYPE_REMOTE_SNMP_PROC)
+        && isset($values['tcp_send']) === true
+        && ((int) $values['tcp_send'] === 3)
+        && isset($values['custom_string_2']) === true
     ) {
         $values['custom_string_2'] = io_input_password(
             $values['custom_string_2']
@@ -640,7 +653,7 @@ function modules_create_agent_module(
     }
 
     // Only for Web server modules.
-    if (isset($values['id_tipo_modulo'])
+    if (isset($values['id_tipo_modulo']) === true
         && ($values['id_tipo_modulo'] >= MODULE_TYPE_WEB_ANALYSIS
         && $values['id_tipo_modulo'] <= MODULE_TYPE_WEB_CONTENT_STRING)
     ) {
@@ -654,7 +667,7 @@ function modules_create_agent_module(
     }
 
     $return_tag = true;
-    if (($tags !== false) || (empty($tags))) {
+    if (($tags !== false) || (empty($tags) === true)) {
         $return_tag = tags_insert_module_tag($id_agent_module, $tags);
     }
 
@@ -667,10 +680,10 @@ function modules_create_agent_module(
         return ERR_DB;
     }
 
-    if (isset($values['id_tipo_modulo'])
-        && ($values['id_tipo_modulo'] == 21
-        || $values['id_tipo_modulo'] == 22
-        || $values['id_tipo_modulo'] == 23)
+    if (isset($values['id_tipo_modulo']) === true
+        && ((int) $values['id_tipo_modulo'] === MODULE_TYPE_ASYNC_PROC
+        || (int) $values['id_tipo_modulo'] === MODULE_TYPE_ASYNC_DATA
+        || (int) $values['id_tipo_modulo'] === MODULE_TYPE_ASYNC_STRING)
     ) {
         // Async modules start in normal status.
         $status = AGENT_MODULE_STATUS_NORMAL;
@@ -714,8 +727,8 @@ function modules_create_agent_module(
     }
 
     // Update module status count if the module is not created disabled.
-    if (!isset($values['disabled']) || $values['disabled'] == 0) {
-        if ($status == 0) {
+    if (isset($values['disabled']) === false || (int) $values['disabled'] === 0) {
+        if ((int) $status === AGENT_MODULE_STATUS_NORMAL) {
             db_process_sql(
                 'UPDATE tagente
                 SET total_count=total_count+1, normal_count=normal_count+1
@@ -2364,7 +2377,7 @@ function modules_get_agentmodule_data_for_humans($module)
         }
     } else {
         $data_macro = modules_get_unit_macro($module['datos'], $module['unit']);
-        if ($data_macro) {
+        if ($data_macro !== false) {
             $salida = $data_macro;
         } else {
             $salida = ui_print_module_string_value(

From d0bddbe27c06616118e733c5ecd0a93fc759d851 Mon Sep 17 00:00:00 2001
From: Calvo <luis.calvo@artica.es>
Date: Wed, 31 Mar 2021 10:30:18 +0200
Subject: [PATCH 03/32] Fixed metaconsole ACL on module graphs view

---
 .../operation/agentes/stat_win.php            | 25 ++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/pandora_console/operation/agentes/stat_win.php b/pandora_console/operation/agentes/stat_win.php
index aa9dc6e68f..4c403595bc 100644
--- a/pandora_console/operation/agentes/stat_win.php
+++ b/pandora_console/operation/agentes/stat_win.php
@@ -145,11 +145,34 @@ ui_print_message_dialog(
 
         // ACL.
         $all_groups = agents_get_all_groups_agent($agent_id);
-        if (!check_acl_one_of_groups($config['id_user'], $all_groups, 'AR')) {
+
+        // If in metaconsole, resotre DB to check meta user acl.
+        if (is_metaconsole()) {
+            metaconsole_restore_db();
+        }
+
+        if (check_acl_one_of_groups($config['id_user'], $all_groups, 'AR') !== true) {
             include $config['homedir'].'/general/noaccess.php';
             exit;
         }
 
+        // Metaconsole connection to the node.
+        $server_id = (int) get_parameter('server', 0);
+        if (is_metaconsole() === true && empty($server_id) === false) {
+            $server = metaconsole_get_connection_by_id($server_id);
+            // Error connecting.
+            if (metaconsole_connect($server) !== NOERR) {
+                echo '<html>';
+                    echo '<body>';
+                ui_print_error_message(
+                    __('There was a problem connecting with the node')
+                );
+                    echo '</body>';
+                echo '</html>';
+                exit;
+            }
+        }
+
         $draw_alerts = get_parameter('draw_alerts', 0);
 
         $period = get_parameter('period');

From 14b364baecff14d417fac3106f797369e0ca1540 Mon Sep 17 00:00:00 2001
From: Jose Gonzalez <jose.gonzalez@artica.es>
Date: Wed, 31 Mar 2021 12:37:02 +0200
Subject: [PATCH 04/32] Fixed issue with execution without correct params

---
 pandora_server/lib/PandoraFMS/Config.pm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index c7c80bdcd1..51c6a2d9d2 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@@ -117,9 +117,9 @@ sub pandora_init {
 			($pa_config->{"pandora_path"} = $parametro);
 		}
 	}
-	if ($pa_config->{"pandora_path"} eq ""){
-		print " [ERROR] I need at least one parameter: Complete path to " . pandora_get_initial_product_name() . " configuration file. \n";
-		print "		For example: ./pandora_server /etc/pandora/pandora_server.conf \n\n";
+	if (!defined ($pa_config->{"pandora_path"}) || $pa_config->{"pandora_path"} eq ""){
+		print "[ERROR] I need at least one parameter: Complete path to " . pandora_get_initial_product_name() . " configuration file. \n";
+		print "For example: ./pandora_server /etc/pandora/pandora_server.conf \n\n";
 		exit;
 	}
 }

From 01a037e2d3fe8f2dafabc17199c9df5e16e080fe Mon Sep 17 00:00:00 2001
From: Jose Gonzalez <jose.gonzalez@artica.es>
Date: Wed, 31 Mar 2021 13:27:58 +0200
Subject: [PATCH 05/32] Changed method of send id parameter

---
 pandora_console/operation/users/user_edit.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pandora_console/operation/users/user_edit.php b/pandora_console/operation/users/user_edit.php
index 7f17cedb19..95ad8f34ae 100644
--- a/pandora_console/operation/users/user_edit.php
+++ b/pandora_console/operation/users/user_edit.php
@@ -31,8 +31,8 @@ global $config;
 
 // Load the header.
 require $config['homedir'].'/operation/users/user_edit_header.php';
-
-if (!is_metaconsole()) {
+hd($_REQUEST);
+if (is_metaconsole() === false) {
     date_default_timezone_set('UTC');
     include 'include/javascript/timezonepicker/includes/parser.inc';
 
@@ -646,9 +646,11 @@ foreach ($timezones as $timezone_name => $tz) {
 if (is_metaconsole()) {
     echo '<form name="user_mod" method="post" action="'.ui_get_full_url('index.php?sec=advanced&sec2=advanced/users_setup').'&amp;tab=user_edit&amp;modified=1&amp;id='.$id.'&amp;pure='.$config['pure'].'">';
 } else {
-    echo '<form name="user_mod" method="post" action="'.ui_get_full_url('index.php?sec=workspace&sec2=operation/users/user_edit').'&amp;modified=1&amp;id='.$id.'&amp;pure='.$config['pure'].'">';
+    echo '<form name="user_mod" method="post" action="'.ui_get_full_url('index.php?sec=workspace&sec2=operation/users/user_edit').'&amp;modified=1&amp;pure='.$config['pure'].'">';
 }
 
+    html_print_input_hidden('id', $id, false, false, false, 'id');
+
     echo '<div id="user_form">
             <div class="user_edit_first_row">
                 <div class="edit_user_info white_box">

From 0308fdbdc290d7313bc6c890403585d6c979d2be Mon Sep 17 00:00:00 2001
From: Jose Gonzalez <jose.gonzalez@artica.es>
Date: Wed, 31 Mar 2021 13:29:09 +0200
Subject: [PATCH 06/32] Clean debug lines

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

diff --git a/pandora_console/operation/users/user_edit.php b/pandora_console/operation/users/user_edit.php
index 95ad8f34ae..8b67ba53ab 100644
--- a/pandora_console/operation/users/user_edit.php
+++ b/pandora_console/operation/users/user_edit.php
@@ -31,7 +31,7 @@ global $config;
 
 // Load the header.
 require $config['homedir'].'/operation/users/user_edit_header.php';
-hd($_REQUEST);
+
 if (is_metaconsole() === false) {
     date_default_timezone_set('UTC');
     include 'include/javascript/timezonepicker/includes/parser.inc';

From 2a7aa8c1e5d6e167d6b17741f1972bf38d5fa803 Mon Sep 17 00:00:00 2001
From: Jose Gonzalez <jose.gonzalez@artica.es>
Date: Tue, 6 Apr 2021 15:25:43 +0200
Subject: [PATCH 07/32] Fix bugs with SLA item reports

---
 .../reporting_builder.item_editor.php         |  7 ++++--
 pandora_console/include/functions_ui.php      | 24 ++++++++++++-------
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/pandora_console/godmode/reporting/reporting_builder.item_editor.php b/pandora_console/godmode/reporting/reporting_builder.item_editor.php
index b94237d6a3..3251f0118d 100755
--- a/pandora_console/godmode/reporting/reporting_builder.item_editor.php
+++ b/pandora_console/godmode/reporting/reporting_builder.item_editor.php
@@ -3335,6 +3335,7 @@ function print_SLA_list($width, $action, $idItem=null)
                                 $params['javascript_is_function_select'] = true;
                                 $params['selectbox_id'] = 'id_agent_module_sla';
                                 $params['add_none_module'] = false;
+                                $params['check_only_empty_javascript_on_blur_function'] = true;
                                 if ($meta) {
                                     $params['use_input_id_server'] = true;
                                     $params['input_id_server_id'] = 'hidden-id_server';
@@ -4733,8 +4734,10 @@ function addSLARow() {
     var serviceId = $("select#id_service>option:selected").val();
     var serviceName = $("select#id_service>option:selected").text();
 
-    if (((idAgent != '') && (slaMin != '') && (slaMax != '')
-        && (slaLimit != '')) || serviceId != '') {
+    if ((((idAgent != '') && (idAgent > 0))
+        && ((idModule != '') && (idModule > 0)))
+        || serviceId != null)
+    {
             if (nameAgent != '') {
                 //Truncate nameAgent
                 var params = [];
diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index e90b88a146..3664f15d04 100755
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -5451,15 +5451,23 @@ function ui_print_agent_autocomplete_input($parameters)
 				return;
 			}
 			
-			if ('.((int) $check_only_empty_javascript_on_blur_function).') {
-				return
-			}
-			
-			
 			if (select_item_click) {
+                select_item_click = 0;
+                $("#'.$input_id.'")
+                .css("background",
+                    "url(\"'.$icon_image.'\") right center no-repeat");
 				return;
-			}
-			
+			} else {
+                // Clear selectbox if item is not selected.
+                $("#'.$selectbox_id.'").empty();
+                $("#'.$selectbox_id.'").append($("<option value=0>'.__('Select an Agent first').'</option>"));
+                $("#'.$selectbox_id.'").attr("disabled", "disabled");
+                // Not allow continue on blur .
+                if ('.((int) $check_only_empty_javascript_on_blur_function).') {
+                    return
+                }
+            }
+
 			//Set loading
 			$("#'.$input_id.'")
 				.css("background",
@@ -5533,7 +5541,7 @@ function ui_print_agent_autocomplete_input($parameters)
 						if ('.((int) !empty($javascript_function_action_after_select_js_call)).') {
 							'.$javascript_function_action_after_select_js_call.'
 						}
-						
+
 						//Set icon
 						$("#'.$input_id.'")
 							.css("background",

From c3313848bdab554d1c82f243a14a22631d41b064 Mon Sep 17 00:00:00 2001
From: "alejandro.campos@artica.es" <alejandro.campos@artica.es>
Date: Tue, 20 Apr 2021 11:36:26 +0200
Subject: [PATCH 08/32] Added new field in api call

---
 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 03dba95653..78fb22779b 100644
--- a/pandora_console/include/functions_api.php
+++ b/pandora_console/include/functions_api.php
@@ -8412,6 +8412,7 @@ function api_set_create_group($id, $thrash1, $other, $thrash3)
     $values['contact'] = $safe_other_data[6];
     $values['other'] = $safe_other_data[7];
     $values['max_agents'] = $safe_other_data[8];
+    $values['password'] = $safe_other_data[9];
 
     $id_group = groups_create_group($group_name, $values);
 

From 9f3ad33b28dc4c82f4b942428ae303ec2e0ca61e Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Tue, 27 Apr 2021 18:44:06 +0200
Subject: [PATCH 09/32] Reference to base public_dashboard url

---
 pandora_console/views/dashboard/header.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pandora_console/views/dashboard/header.php b/pandora_console/views/dashboard/header.php
index 64626056dd..c04e22023a 100644
--- a/pandora_console/views/dashboard/header.php
+++ b/pandora_console/views/dashboard/header.php
@@ -128,7 +128,10 @@ $queryPublic = [
     'pure'        => 1,
 ];
 $publicUrl = ui_get_full_url(
-    'operation/dashboard/public_dashboard.php?'.http_build_query($queryPublic)
+    'operation/dashboard/public_dashboard.php?'.http_build_query($queryPublic),
+    false,
+    false,
+    false
 );
 $publiclink['text'] = '<a id="public_link" href="'.$publicUrl.'" target="_blank">';
 $publiclink['text'] .= html_print_image(

From e1810cc36fbcc7360185cc6b7a076008dce4ca18 Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Wed, 28 Apr 2021 09:50:04 +0200
Subject: [PATCH 10/32] Different way to fix public dashboard

---
 pandora_console/views/dashboard/header.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pandora_console/views/dashboard/header.php b/pandora_console/views/dashboard/header.php
index c04e22023a..64626056dd 100644
--- a/pandora_console/views/dashboard/header.php
+++ b/pandora_console/views/dashboard/header.php
@@ -128,10 +128,7 @@ $queryPublic = [
     'pure'        => 1,
 ];
 $publicUrl = ui_get_full_url(
-    'operation/dashboard/public_dashboard.php?'.http_build_query($queryPublic),
-    false,
-    false,
-    false
+    'operation/dashboard/public_dashboard.php?'.http_build_query($queryPublic)
 );
 $publiclink['text'] = '<a id="public_link" href="'.$publicUrl.'" target="_blank">';
 $publiclink['text'] .= html_print_image(

From a19323427005719d3f692adad831713552a1c68e Mon Sep 17 00:00:00 2001
From: Daniel Maya <daniel.maya@artica.es>
Date: Wed, 28 Apr 2021 16:46:27 +0200
Subject: [PATCH 11/32] #7453 Fixed id alert_list

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

diff --git a/pandora_console/operation/agentes/alerts_status.php b/pandora_console/operation/agentes/alerts_status.php
index 34688e5b10..3f45a7a42c 100755
--- a/pandora_console/operation/agentes/alerts_status.php
+++ b/pandora_console/operation/agentes/alerts_status.php
@@ -688,7 +688,7 @@ if (!empty($table->data)) {
         );
     }
 
-    echo '<div id="alerts_list w100p">';
+    echo '<div id="alerts_list" class="w100p">';
     html_print_table($table);
     echo '</div>';
 

From e28c6377de25cd2b3179e486acf9849cc79291a0 Mon Sep 17 00:00:00 2001
From: "alejandro.campos@artica.es" <alejandro.campos@artica.es>
Date: Wed, 5 May 2021 10:35:00 +0200
Subject: [PATCH 12/32] remove log input

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

diff --git a/pandora_console/include/rest-api/models/VisualConsole/Item.php b/pandora_console/include/rest-api/models/VisualConsole/Item.php
index dee99ebc73..c391917731 100644
--- a/pandora_console/include/rest-api/models/VisualConsole/Item.php
+++ b/pandora_console/include/rest-api/models/VisualConsole/Item.php
@@ -1078,7 +1078,6 @@ class Item extends CachedModel
             $mobile_navigation = true;
         }
 
-        error_log(obhd($_SERVER['PHP_SELF']));
         // Load side libraries.
         include_once $config['homedir'].'/include/functions_ui.php';
         if (\is_metaconsole() === true) {

From 6570441fd257ba3125b3dff514ca9ead37e99a3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Gonz=C3=A1lez?= <jose.gonzalez@pandorafms.com>
Date: Wed, 5 May 2021 12:05:06 +0200
Subject: [PATCH 13/32] Fixed issue with type

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

diff --git a/pandora_console/include/functions_modules.php b/pandora_console/include/functions_modules.php
index 6c5325a15b..abbdfcee2c 100755
--- a/pandora_console/include/functions_modules.php
+++ b/pandora_console/include/functions_modules.php
@@ -580,7 +580,7 @@ function modules_update_agent_module(
  * @param integer $name       Module name id.
  * @param array   $values     Extra values for the module.
  * @param boolean $disableACL Disable the ACL checking, for default false.
- * @param array   $tags       Array with tag's ids or false.
+ * @param mixed   $tags       Array with tag's ids or false.
  *
  * @return New module id if the module was created. False if not.
  */
@@ -589,7 +589,7 @@ function modules_create_agent_module(
     int $name,
     array $values=[],
     bool $disableACL=false,
-    array $tags=false
+    $tags=false
 ) {
     global $config;
 

From ce5934b9a1aa5984f0e2847f59704877e55108e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Gonz=C3=A1lez?= <jose.gonzalez@pandorafms.com>
Date: Thu, 6 May 2021 14:46:58 +0200
Subject: [PATCH 14/32] Added form-type buttons for user-actions

---
 pandora_console/godmode/users/user_list.php   | 132 ++++++++++++++++--
 pandora_console/include/functions_html.php    |   2 +
 pandora_console/operation/users/user_edit.php |   2 +-
 3 files changed, 122 insertions(+), 14 deletions(-)

diff --git a/pandora_console/godmode/users/user_list.php b/pandora_console/godmode/users/user_list.php
index 5134ad0a0b..fd4507f739 100644
--- a/pandora_console/godmode/users/user_list.php
+++ b/pandora_console/godmode/users/user_list.php
@@ -233,8 +233,7 @@ if (defined('METACONSOLE')) {
 
 
 $disable_user = get_parameter('disable_user', false);
-
-if (isset($_GET['user_del'])) {
+if ((bool) get_parameter('user_del', false) === true) {
     // delete user
     $id_user = get_parameter('delete_user', 0);
     // Only allow delete user if is not the actual user
@@ -312,13 +311,13 @@ if (isset($_GET['user_del'])) {
         $result = false;
     }
 
-    if ($disable_user == 1) {
+    if ($disable_user === 1) {
         ui_print_result_message(
             $result,
             __('Successfully disabled'),
             __('There was a problem disabling user')
         );
-    } else {
+    } else if ($disable_user === 0) {
         ui_print_result_message(
             $result,
             __('Successfully enabled'),
@@ -558,7 +557,7 @@ foreach ($info as $user_id => $user_info) {
     $iterator++;
 
     if ($user_is_admin || $config['id_user'] == $user_info['id_user'] || (!$user_info['is_admin'] && (!isset($user_info['edit']) || isset($group_um[0]) || (isset($user_info['edit']) && $user_info['edit'])))) {
-        $data[0] = '<a href="index.php?sec='.$sec.'&amp;sec2=godmode/users/configure_user&pure='.$pure.'&amp;id='.$user_id.'">'.$user_id.'</a>';
+        $data[0] = '<a href="#" onclick="document.forms[\'edit_user_form_'.$user_info['id_user'].'\'].submit();">'.$user_id.'</a>';
     } else {
         $data[0] = $user_id;
     }
@@ -638,19 +637,126 @@ foreach ($info as $user_id => $user_info) {
     $table->cellclass[][6] = 'action_buttons';
     $data[6] = '';
     if ($user_is_admin || $config['id_user'] == $user_info['id_user'] || isset($group_um[0]) || (!$user_info['is_admin'] && (!isset($user_info['edit']) || (isset($user_info['edit']) && $user_info['edit'])))) {
-        if (!isset($user_info['not_delete'])) {
+        // Disable / Enable user.
+        if (isset($user_info['not_delete']) === false) {
             if ($user_info['disabled'] == 0) {
-                $data[6] = '<a href="index.php?sec='.$sec.'&amp;sec2=godmode/users/user_list&amp;disable_user=1&pure='.$pure.'&amp;id='.$user_info['id_user'].'">'.html_print_image('images/lightbulb.png', true, ['title' => __('Disable'), 'class' => 'invert_filter']).'</a>';
+                $toDoString = __('Disable');
+                $toDoAction = '1';
+                $toDoImage  = 'images/lightbulb.png';
             } else {
-                $data[6] = '<a href="index.php?sec='.$sec.'&amp;sec2=godmode/users/user_list&amp;disable_user=0&pure='.$pure.'&amp;id='.$user_info['id_user'].'">'.html_print_image('images/lightbulb_off.png', true, ['title' => __('Enable')]).'</a>';
+                $toDoString = __('Enable');
+                $toDoAction = '0';
+                $toDoImage  = 'images/lightbulb_off.png';
             }
+
+            $data[6] = '<form method="POST" action="index.php?sec='.$sec.'&amp;sec2=godmode/users/user_list&amp;pure='.$pure.'" class="inline">';
+            $data[6] .= html_print_input_hidden(
+                'id',
+                $user_info['id_user'],
+                true
+            );
+            $data[6] .= html_print_input_hidden(
+                'disable_user',
+                $toDoAction,
+                true
+            );
+            $data[6] .= html_print_input_image(
+                'submit_disable_enable',
+                $toDoImage,
+                '',
+                '',
+                true,
+                [
+                    'data-title'                     => $toDoString,
+                    'data-use_title_for_force_title' => '1',
+                    'class'                          => 'forced_title no-padding',
+                ]
+            );
+            $data[6] .= '</form>';
         }
 
-        $data[6] .= '<a href="index.php?sec='.$sec.'&amp;sec2=godmode/users/configure_user&pure='.$pure.'&amp;id='.$user_id.'">'.html_print_image('images/config.png', true, ['title' => __('Edit'), 'class' => 'invert_filter']).'</a>';
-        if ($config['admin_can_delete_user'] && $user_info['id_user'] != $config['id_user'] && !isset($user_info['not_delete'])) {
-            $data[6] .= "<a href='index.php?sec=".$sec.'&sec2=godmode/users/user_list&user_del=1&pure='.$pure.'&delete_user='.$user_info['id_user']."'>".html_print_image('images/cross.png', true, ['class' => 'invert_filter', 'title' => __('Delete'), 'onclick' => "if (! confirm ('".__('Deleting User').' '.$user_info['id_user'].'. '.__('Are you sure?')."')) return false"]).'</a>';
-            if (defined('METACONSOLE')) {
-                $data[6] .= "<a href='index.php?sec=".$sec.'&sec2=godmode/users/user_list&user_del=1&pure='.$pure.'&delete_user='.$user_info['id_user']."&delete_all=1'>".html_print_image('images/cross_double.png', true, ['class' => 'invert_filter', 'title' => __('Delete from all consoles'), 'onclick' => "if (! confirm ('".__('Deleting User %s from all consoles', $user_info['id_user']).'. '.__('Are you sure?')."')) return false"]).'</a>';
+        // Edit user.
+        $data[6] .= '<form method="POST" action="index.php?sec='.$sec.'&amp;sec2=godmode/users/configure_user&pure='.$pure.'" id="edit_user_form_'.$user_info['id_user'].'" class="inline">';
+        $data[6] .= html_print_input_hidden(
+            'id_user',
+            $user_info['id_user'],
+            true
+        );
+        $data[6] .= html_print_input_hidden(
+            'edit_user',
+            '1',
+            true
+        );
+        $data[6] .= html_print_input_image(
+            'submit_edit_user',
+            'images/config.png',
+            '',
+            'padding:0',
+            true,
+            [
+                'data-title'                     => __('Edit'),
+                'data-use_title_for_force_title' => '1',
+                'class'                          => 'forced_title no-padding',
+            ]
+        );
+        $data[6] .= '</form>';
+
+        if ($config['admin_can_delete_user'] && $user_info['id_user'] != $config['id_user'] && isset($user_info['not_delete']) === false) {
+            $data[6] .= '<form method="POST" action="index.php?sec='.$sec.'&amp;sec2=godmode/users/user_list&amp;pure='.$pure.'" class="inline">';
+            $data[6] .= html_print_input_hidden(
+                'delete_user',
+                $user_info['id_user'],
+                true
+            );
+            $data[6] .= html_print_input_hidden(
+                'user_del',
+                '1',
+                true
+            );
+            $data[6] .= html_print_input_image(
+                'submit_delete_user',
+                'images/cross.png',
+                '',
+                'padding:0',
+                true,
+                [
+                    'data-title'                     => __('Delete'),
+                    'data-use_title_for_force_title' => '1',
+                    'class'                          => 'forced_title no-padding',
+                ]
+            );
+            $data[6] .= '</form>';
+
+            if (is_metaconsole() === true) {
+                $data[6] .= '<form method="POST" action="index.php?sec='.$sec.'&amp;sec2=godmode/users/user_list&amp;pure='.$pure.'" class="inline">';
+                $data[6] .= html_print_input_hidden(
+                    'delete_user',
+                    $user_info['id_user'],
+                    true
+                );
+                $data[6] .= html_print_input_hidden(
+                    'user_del',
+                    '1',
+                    true
+                );
+                $data[6] .= html_print_input_hidden(
+                    'delete_all',
+                    '1',
+                    true
+                );
+                $data[6] .= html_print_input_image(
+                    'submit_delete_all',
+                    'images/cross_double.png',
+                    '',
+                    '',
+                    true,
+                    [
+                        'data-title'                     => __('Delete from all consoles'),
+                        'data-use_title_for_force_title' => '1',
+                        'class'                          => 'forced_title no-padding',
+                    ]
+                );
+                $data[6] .= '</form>';
             }
         } else {
             $data[6] .= '';
diff --git a/pandora_console/include/functions_html.php b/pandora_console/include/functions_html.php
index e80fa6f9fd..0a9c3217ab 100644
--- a/pandora_console/include/functions_html.php
+++ b/pandora_console/include/functions_html.php
@@ -2698,6 +2698,8 @@ function html_print_input_image($name, $src, $value, $style='', $return=false, $
         'lang',
         'tabindex',
         'title',
+        'data-title',
+        'data-use_title_for_force_title',
         'xml:lang',
         'onclick',
         'ondblclick',
diff --git a/pandora_console/operation/users/user_edit.php b/pandora_console/operation/users/user_edit.php
index 8b67ba53ab..435e6b7a85 100644
--- a/pandora_console/operation/users/user_edit.php
+++ b/pandora_console/operation/users/user_edit.php
@@ -644,7 +644,7 @@ foreach ($timezones as $timezone_name => $tz) {
 }
 
 if (is_metaconsole()) {
-    echo '<form name="user_mod" method="post" action="'.ui_get_full_url('index.php?sec=advanced&sec2=advanced/users_setup').'&amp;tab=user_edit&amp;modified=1&amp;id='.$id.'&amp;pure='.$config['pure'].'">';
+    echo '<form name="user_mod" method="post" action="'.ui_get_full_url('index.php?sec=advanced&sec2=advanced/users_setup').'&amp;tab=user_edit&amp;modified=1&amp;pure='.$config['pure'].'">';
 } else {
     echo '<form name="user_mod" method="post" action="'.ui_get_full_url('index.php?sec=workspace&sec2=operation/users/user_edit').'&amp;modified=1&amp;pure='.$config['pure'].'">';
 }

From 3359b21d5b37386be71ed9ee6921757b8825be4e Mon Sep 17 00:00:00 2001
From: Calvo <luis.calvo@artica.es>
Date: Thu, 6 May 2021 16:06:21 +0200
Subject: [PATCH 15/32] Event responses buttons visual bug

---
 pandora_console/godmode/events/event_responses.editor.php | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/pandora_console/godmode/events/event_responses.editor.php b/pandora_console/godmode/events/event_responses.editor.php
index 4ba244b12c..e044528cba 100644
--- a/pandora_console/godmode/events/event_responses.editor.php
+++ b/pandora_console/godmode/events/event_responses.editor.php
@@ -200,11 +200,7 @@ $table->data[5] = $data;
 if ($event_response_id == 0) {
     echo '<form method="post" action="index.php?sec=geventos&sec2=godmode/events/events&section=responses&mode=list&action=create_response&amp;pure='.$config['pure'].'">';
     html_print_table($table);
-    if (!defined('METACONSOLE')) {
         echo '<div class="w100p right_align">';
-    } else {
-        echo '<div class="w100p right">';
-    }
 
     html_print_submit_button(__('Create'), 'create_response_button', false, ['class' => 'sub next']);
     echo '</div>';
@@ -212,11 +208,7 @@ if ($event_response_id == 0) {
 } else {
     echo '<form method="post" action="index.php?sec=geventos&sec2=godmode/events/events&section=responses&mode=list&action=update_response&amp;pure='.$config['pure'].'">';
     html_print_table($table);
-    if (!defined('METACONSOLE')) {
         echo '<div class="w100p right_align">';
-    } else {
-        echo '<div class="w100p right">';
-    }
 
     html_print_submit_button(__('Update'), 'update_response_button', false, ['class' => 'sub next']);
     echo '</div>';

From 9288a31e58a3f324a7c3a1094d78ad5117c5ac04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Gonz=C3=A1lez?= <jose.gonzalez@pandorafms.com>
Date: Thu, 6 May 2021 17:44:32 +0200
Subject: [PATCH 16/32] Fixed error with types

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

diff --git a/pandora_console/include/functions_modules.php b/pandora_console/include/functions_modules.php
index abbdfcee2c..0a643480f7 100755
--- a/pandora_console/include/functions_modules.php
+++ b/pandora_console/include/functions_modules.php
@@ -577,7 +577,7 @@ function modules_update_agent_module(
  * Creates a module in an agent.
  *
  * @param integer $id_agent   Agent id.
- * @param integer $name       Module name id.
+ * @param string  $name       Module name id.
  * @param array   $values     Extra values for the module.
  * @param boolean $disableACL Disable the ACL checking, for default false.
  * @param mixed   $tags       Array with tag's ids or false.
@@ -586,7 +586,7 @@ function modules_update_agent_module(
  */
 function modules_create_agent_module(
     int $id_agent,
-    int $name,
+    string $name,
     array $values=[],
     bool $disableACL=false,
     $tags=false

From 2fb54dabf102bf11c3d38fdb0557e84785fdfafd Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Fri, 7 May 2021 10:47:05 +0200
Subject: [PATCH 17/32] Avoid change path while adding resources in certain
 situations

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

diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index 2e2e4b5958..7ce7a090f8 100755
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -1483,7 +1483,7 @@ function ui_require_css_file($name, $path='include/styles/', $echo_tag=false)
         return false;
     }
 
-    if (is_metaconsole()) {
+    if (is_metaconsole() && $config['requirements_use_base_url'] === false) {
         $config['css'][$name] = '/../../'.$filename;
     } else {
         $config['css'][$name] = $filename;
@@ -1535,7 +1535,7 @@ function ui_require_javascript_file($name, $path='include/javascript/', $echo_ta
         return false;
     }
 
-    if (is_metaconsole()) {
+    if (is_metaconsole() && $config['requirements_use_base_url'] === false) {
         $config['js'][$name] = '../../'.$filename;
     } else {
         $config['js'][$name] = $filename;

From fe932a0dd6508d8de8c6f48c7a9498556dfc84ec Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Fri, 7 May 2021 10:50:25 +0200
Subject: [PATCH 18/32] avoid some warnings

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

diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index 7ce7a090f8..68f19d01e0 100755
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -1483,7 +1483,10 @@ function ui_require_css_file($name, $path='include/styles/', $echo_tag=false)
         return false;
     }
 
-    if (is_metaconsole() && $config['requirements_use_base_url'] === false) {
+    if (is_metaconsole()
+        && (isset($config['requirements_use_base_url']) === false
+        || $config['requirements_use_base_url'] === false)
+    ) {
         $config['css'][$name] = '/../../'.$filename;
     } else {
         $config['css'][$name] = $filename;
@@ -1535,7 +1538,10 @@ function ui_require_javascript_file($name, $path='include/javascript/', $echo_ta
         return false;
     }
 
-    if (is_metaconsole() && $config['requirements_use_base_url'] === false) {
+    if (is_metaconsole()
+        && (isset($config['requirements_use_base_url']) === false
+        || $config['requirements_use_base_url'] === false)
+    ) {
         $config['js'][$name] = '../../'.$filename;
     } else {
         $config['js'][$name] = $filename;

From 856186ee5971409b675bd77ac569c3dfa2baf099 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Gonz=C3=A1lez?= <jose.gonzalez@pandorafms.com>
Date: Fri, 7 May 2021 11:17:20 +0200
Subject: [PATCH 19/32] Added function for control icon changes

---
 pandora_console/include/functions_ui.php | 42 +++++++++++++-----------
 1 file changed, 23 insertions(+), 19 deletions(-)

diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index 2e2e4b5958..2c128a32b0 100755
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -5178,6 +5178,11 @@ function ui_print_agent_autocomplete_input($parameters)
     $javascript_function_change = '';
     // Default value.
     $javascript_function_change .= '
+        function setInputBackground(inputId, image) {
+            $("#"+inputId)
+            .css("background","url(\'"+image+"\') right center no-repeat");
+        }
+
 		function set_functions_change_autocomplete_'.$input_name.'() {
 			var cache_'.$input_name.' = {};
 			
@@ -5194,8 +5199,7 @@ function ui_print_agent_autocomplete_input($parameters)
 					}
 					
 					//Set loading
-					$("#'.$input_id.'")
-						.css("background","url(\"'.$spinner_image.'\") right center no-repeat");
+                    setInputBackground("'.$input_id.'", "'.$spinner_image.'");
 					
 					//Function to call when the source
 					if ('.((int) !empty($javascript_function_action_into_source_js_call)).') {
@@ -5209,8 +5213,7 @@ function ui_print_agent_autocomplete_input($parameters)
 						response(cache_'.$input_name.'[groupId][term]);
 						
 						//Set icon
-						$("#'.$input_id.'")
-							.css("background","url(\"'.$icon_image.'\") right center no-repeat '.$icon_image.'");
+                        setInputBackground("'.$input_id.'", "'.$icon_image.'");
 						return;
 					}
 					else {
@@ -5228,7 +5231,9 @@ function ui_print_agent_autocomplete_input($parameters)
 									response(cache_'.$input_name.'[groupId][oldterm]);
 									
 									found = true;
-									
+
+                                    //Set icon
+                                    setInputBackground("'.$input_id.'", "'.$icon_image.'");
 									return;
 								}
 							});
@@ -5237,6 +5242,11 @@ function ui_print_agent_autocomplete_input($parameters)
 								break;
 							}
 						}
+
+                        //Set icon
+						setInputBackground("'.$input_id.'", "'.$icon_image.'");
+						return;
+
 						*/
 					}
 					//==================================================
@@ -5244,11 +5254,8 @@ function ui_print_agent_autocomplete_input($parameters)
 					
 					if (found) {
 						//Set icon
-						$("#'.$input_id.'")
-							.css("background","url(\"'.$icon_image.'\") right center no-repeat");
-						
+						setInputBackground("'.$input_id.'", "'.$icon_image.'");
 						select_item_click = 0;
-						
 						return;
 					}
 					
@@ -5259,20 +5266,17 @@ function ui_print_agent_autocomplete_input($parameters)
 						dataType: "json",
 						success: function (data) {
 								cache_'.$input_name.'[groupId][term] = data; //Save the cache
-								
 								response(data);
-								
-								//Set icon
-								$("#'.$input_id.'")
-									.css("background",
-										"url(\"'.$icon_image.'\") right center no-repeat");
-								
-								select_item_click = 0;
-								
+
+                                //Set icon
+                                setInputBackground("'.$input_id.'", "'.$icon_image.'");
+                                select_item_click = 0;
 								return;
 							}
 						});
-					
+
+                        setInputBackground("'.$input_id.'", "'.$icon_image.'");
+
 					return;
 				},
 				//---END source-----------------------------------------

From 5b709e63311d4bd09258f4549c692f9588d64f12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Gonz=C3=A1lez?= <jose.gonzalez@pandorafms.com>
Date: Fri, 7 May 2021 11:53:42 +0200
Subject: [PATCH 20/32] Aditional control for agent autocomplete input icon'

---
 .../godmode/reporting/reporting_builder.item_editor.php     | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pandora_console/godmode/reporting/reporting_builder.item_editor.php b/pandora_console/godmode/reporting/reporting_builder.item_editor.php
index a64a08b86e..eb1e8081c9 100755
--- a/pandora_console/godmode/reporting/reporting_builder.item_editor.php
+++ b/pandora_console/godmode/reporting/reporting_builder.item_editor.php
@@ -3326,6 +3326,9 @@ function print_SLA_list($width, $action, $idItem=null)
                                 <input id="hidden-id_agent_sla" name="id_agent_sla" value="" type="hidden">
                                 <input id="hidden-id_server" name="id_server" value="" type="hidden">
                                 <?php
+                                // Set autocomplete image.
+                                $autocompleteImage = html_print_image(($config['style'] === 'pandora_black') ? 'images/agent_mc.menu.png' : 'images/search_agent.png', true, false, true);
+                                // Params for agent autocomplete input.
                                 $params = [];
                                 $params['show_helptip'] = true;
                                 $params['input_name'] = 'agent_sla';
@@ -3335,6 +3338,7 @@ function print_SLA_list($width, $action, $idItem=null)
                                 $params['javascript_is_function_select'] = true;
                                 $params['selectbox_id'] = 'id_agent_module_sla';
                                 $params['add_none_module'] = false;
+                                $params['icon_image'] = $autocompleteImage;
                                 if ($meta) {
                                     $params['use_input_id_server'] = true;
                                     $params['input_id_server_id'] = 'hidden-id_server';
@@ -3370,6 +3374,7 @@ function print_SLA_list($width, $action, $idItem=null)
                                     $params['javascript_is_function_select'] = true;
                                     $params['selectbox_id'] = 'id_agent_module_failover';
                                     $params['add_none_module'] = false;
+                                    $params['icon_image'] = $autocompleteImage;
                                     if ($meta) {
                                         $params['use_input_id_server'] = true;
                                         $params['input_id_server_id'] = 'hidden-id_server';
@@ -4892,6 +4897,7 @@ function addSLARow() {
                         $("input[name=id_agent_failover]").val('');
                         $("input[name=id_server]").val('');
                         $("input[name=agent_sla]").val('');
+                        $("input[name=agent_sla]").css("background","url('<?php echo $autocompleteImage; ?>') right center no-repeat")
                         $("input[name=agent_failover]").val('');
                         $("#id_agent_module_sla").empty();
                         $("#id_agent_module_sla").attr('disabled', 'true');

From 0a7c9606302a8d602b5ff84b945678e71d5dfd33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Gonz=C3=A1lez?= <jose.gonzalez@pandorafms.com>
Date: Fri, 7 May 2021 12:40:38 +0200
Subject: [PATCH 21/32] Added control for autocomplete input icon

---
 .../reporting_builder.item_editor.php         |  6 ++++
 pandora_console/include/functions_ui.php      | 29 ++++++++++---------
 2 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/pandora_console/godmode/reporting/reporting_builder.item_editor.php b/pandora_console/godmode/reporting/reporting_builder.item_editor.php
index 3251f0118d..cf55754771 100755
--- a/pandora_console/godmode/reporting/reporting_builder.item_editor.php
+++ b/pandora_console/godmode/reporting/reporting_builder.item_editor.php
@@ -3326,6 +3326,9 @@ function print_SLA_list($width, $action, $idItem=null)
                                 <input id="hidden-id_agent_sla" name="id_agent_sla" value="" type="hidden">
                                 <input id="hidden-id_server" name="id_server" value="" type="hidden">
                                 <?php
+                                // Set autocomplete image.
+                                $autocompleteImage = html_print_image(($config['style'] === 'pandora_black') ? 'images/agent_mc.menu.png' : 'images/search_agent.png', true, false, true);
+                                // Params for agent autocomplete input.
                                 $params = [];
                                 $params['show_helptip'] = true;
                                 $params['input_name'] = 'agent_sla';
@@ -3336,6 +3339,7 @@ function print_SLA_list($width, $action, $idItem=null)
                                 $params['selectbox_id'] = 'id_agent_module_sla';
                                 $params['add_none_module'] = false;
                                 $params['check_only_empty_javascript_on_blur_function'] = true;
+                                $params['icon_image'] = $autocompleteImage;
                                 if ($meta) {
                                     $params['use_input_id_server'] = true;
                                     $params['input_id_server_id'] = 'hidden-id_server';
@@ -3371,6 +3375,7 @@ function print_SLA_list($width, $action, $idItem=null)
                                     $params['javascript_is_function_select'] = true;
                                     $params['selectbox_id'] = 'id_agent_module_failover';
                                     $params['add_none_module'] = false;
+                                    $params['icon_image'] = $autocompleteImage;
                                     if ($meta) {
                                         $params['use_input_id_server'] = true;
                                         $params['input_id_server_id'] = 'hidden-id_server';
@@ -4894,6 +4899,7 @@ function addSLARow() {
                         $("input[name=id_agent_failover]").val('');
                         $("input[name=id_server]").val('');
                         $("input[name=agent_sla]").val('');
+                        $("input[name=agent_sla]").css("background","url('<?php echo $autocompleteImage; ?>') right center no-repeat")
                         $("input[name=agent_failover]").val('');
                         $("#id_agent_module_sla").empty();
                         $("#id_agent_module_sla").attr('disabled', 'true');
diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index 3664f15d04..75436ac51c 100755
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -5178,6 +5178,11 @@ function ui_print_agent_autocomplete_input($parameters)
     $javascript_function_change = '';
     // Default value.
     $javascript_function_change .= '
+        function setInputBackground(inputId, image) {
+            $("#"+inputId)
+            .css("background","url(\'"+image+"\') right center no-repeat");
+        }
+
 		function set_functions_change_autocomplete_'.$input_name.'() {
 			var cache_'.$input_name.' = {};
 			
@@ -5194,8 +5199,7 @@ function ui_print_agent_autocomplete_input($parameters)
 					}
 					
 					//Set loading
-					$("#'.$input_id.'")
-						.css("background","url(\"'.$spinner_image.'\") right center no-repeat");
+                    setInputBackground("'.$input_id.'", "'.$spinner_image.'");
 					
 					//Function to call when the source
 					if ('.((int) !empty($javascript_function_action_into_source_js_call)).') {
@@ -5209,8 +5213,7 @@ function ui_print_agent_autocomplete_input($parameters)
 						response(cache_'.$input_name.'[groupId][term]);
 						
 						//Set icon
-						$("#'.$input_id.'")
-							.css("background","url(\"'.$icon_image.'\") right center no-repeat '.$icon_image.'");
+						setInputBackground("'.$input_id.'", "'.$icon_image.'");
 						return;
 					}
 					else {
@@ -5228,7 +5231,9 @@ function ui_print_agent_autocomplete_input($parameters)
 									response(cache_'.$input_name.'[groupId][oldterm]);
 									
 									found = true;
-									
+
+									//Set icon
+                                    setInputBackground("'.$input_id.'", "'.$icon_image.'");
 									return;
 								}
 							});
@@ -5244,8 +5249,7 @@ function ui_print_agent_autocomplete_input($parameters)
 					
 					if (found) {
 						//Set icon
-						$("#'.$input_id.'")
-							.css("background","url(\"'.$icon_image.'\") right center no-repeat");
+                        setInputBackground("'.$input_id.'", "'.$icon_image.'");
 						
 						select_item_click = 0;
 						
@@ -5263,16 +5267,15 @@ function ui_print_agent_autocomplete_input($parameters)
 								response(data);
 								
 								//Set icon
-								$("#'.$input_id.'")
-									.css("background",
-										"url(\"'.$icon_image.'\") right center no-repeat");
-								
-								select_item_click = 0;
+                                setInputBackground("'.$input_id.'", "'.$icon_image.'");
+                                select_item_click = 0;
 								
 								return;
 							}
 						});
-					
+
+                        setInputBackground("'.$input_id.'", "'.$icon_image.'");
+
 					return;
 				},
 				//---END source-----------------------------------------

From c0e6bef13668ea8c3626e18198f909e0bf89ea4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Gonz=C3=A1lez?= <jose.gonzalez@pandorafms.com>
Date: Fri, 7 May 2021 13:05:39 +0200
Subject: [PATCH 22/32] Revert

---
 pandora_console/include/functions_ui.php | 25 ++++++++++--------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index 2c128a32b0..1b9ecd7483 100755
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -5178,11 +5178,6 @@ function ui_print_agent_autocomplete_input($parameters)
     $javascript_function_change = '';
     // Default value.
     $javascript_function_change .= '
-        function setInputBackground(inputId, image) {
-            $("#"+inputId)
-            .css("background","url(\'"+image+"\') right center no-repeat");
-        }
-
 		function set_functions_change_autocomplete_'.$input_name.'() {
 			var cache_'.$input_name.' = {};
 			
@@ -5199,7 +5194,8 @@ function ui_print_agent_autocomplete_input($parameters)
 					}
 					
 					//Set loading
-                    setInputBackground("'.$input_id.'", "'.$spinner_image.'");
+                    $("#'.$input_id.'")
+						.css("background","url(\"'.$spinner_image.'\") right center no-repeat");
 					
 					//Function to call when the source
 					if ('.((int) !empty($javascript_function_action_into_source_js_call)).') {
@@ -5213,7 +5209,8 @@ function ui_print_agent_autocomplete_input($parameters)
 						response(cache_'.$input_name.'[groupId][term]);
 						
 						//Set icon
-                        setInputBackground("'.$input_id.'", "'.$icon_image.'");
+                        $("#'.$input_id.'")
+							.css("background","url(\"'.$icon_image.'\") right center no-repeat '.$icon_image.'");
 						return;
 					}
 					else {
@@ -5232,8 +5229,6 @@ function ui_print_agent_autocomplete_input($parameters)
 									
 									found = true;
 
-                                    //Set icon
-                                    setInputBackground("'.$input_id.'", "'.$icon_image.'");
 									return;
 								}
 							});
@@ -5243,10 +5238,6 @@ function ui_print_agent_autocomplete_input($parameters)
 							}
 						}
 
-                        //Set icon
-						setInputBackground("'.$input_id.'", "'.$icon_image.'");
-						return;
-
 						*/
 					}
 					//==================================================
@@ -5254,7 +5245,9 @@ function ui_print_agent_autocomplete_input($parameters)
 					
 					if (found) {
 						//Set icon
-						setInputBackground("'.$input_id.'", "'.$icon_image.'");
+                        $("#'.$input_id.'")
+                        .css("background","url(\"'.$icon_image.'\") right center no-repeat");
+                    
 						select_item_click = 0;
 						return;
 					}
@@ -5275,7 +5268,9 @@ function ui_print_agent_autocomplete_input($parameters)
 							}
 						});
 
-                        setInputBackground("'.$input_id.'", "'.$icon_image.'");
+                        $("#'.$input_id.'")
+                        .css("background",
+                            "url(\"'.$icon_image.'\") right center no-repeat");
 
 					return;
 				},

From c7bb5ad4305862a63bb82705c1643cba69d0903a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Gonz=C3=A1lez?= <jose.gonzalez@pandorafms.com>
Date: Fri, 7 May 2021 13:07:35 +0200
Subject: [PATCH 23/32] Revert 2

---
 .../godmode/reporting/reporting_builder.item_editor.php     | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/pandora_console/godmode/reporting/reporting_builder.item_editor.php b/pandora_console/godmode/reporting/reporting_builder.item_editor.php
index eb1e8081c9..a64a08b86e 100755
--- a/pandora_console/godmode/reporting/reporting_builder.item_editor.php
+++ b/pandora_console/godmode/reporting/reporting_builder.item_editor.php
@@ -3326,9 +3326,6 @@ function print_SLA_list($width, $action, $idItem=null)
                                 <input id="hidden-id_agent_sla" name="id_agent_sla" value="" type="hidden">
                                 <input id="hidden-id_server" name="id_server" value="" type="hidden">
                                 <?php
-                                // Set autocomplete image.
-                                $autocompleteImage = html_print_image(($config['style'] === 'pandora_black') ? 'images/agent_mc.menu.png' : 'images/search_agent.png', true, false, true);
-                                // Params for agent autocomplete input.
                                 $params = [];
                                 $params['show_helptip'] = true;
                                 $params['input_name'] = 'agent_sla';
@@ -3338,7 +3335,6 @@ function print_SLA_list($width, $action, $idItem=null)
                                 $params['javascript_is_function_select'] = true;
                                 $params['selectbox_id'] = 'id_agent_module_sla';
                                 $params['add_none_module'] = false;
-                                $params['icon_image'] = $autocompleteImage;
                                 if ($meta) {
                                     $params['use_input_id_server'] = true;
                                     $params['input_id_server_id'] = 'hidden-id_server';
@@ -3374,7 +3370,6 @@ function print_SLA_list($width, $action, $idItem=null)
                                     $params['javascript_is_function_select'] = true;
                                     $params['selectbox_id'] = 'id_agent_module_failover';
                                     $params['add_none_module'] = false;
-                                    $params['icon_image'] = $autocompleteImage;
                                     if ($meta) {
                                         $params['use_input_id_server'] = true;
                                         $params['input_id_server_id'] = 'hidden-id_server';
@@ -4897,7 +4892,6 @@ function addSLARow() {
                         $("input[name=id_agent_failover]").val('');
                         $("input[name=id_server]").val('');
                         $("input[name=agent_sla]").val('');
-                        $("input[name=agent_sla]").css("background","url('<?php echo $autocompleteImage; ?>') right center no-repeat")
                         $("input[name=agent_failover]").val('');
                         $("#id_agent_module_sla").empty();
                         $("#id_agent_module_sla").attr('disabled', 'true');

From 214535bdaa46843b6605045e9549716bb70bd6f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Gonz=C3=A1lez?=
 <79-jose.gonzalez@users.noreply.brutus.artica.es>
Date: Fri, 7 May 2021 11:11:36 +0000
Subject: [PATCH 24/32] Revert functions_ui

---
 pandora_console/include/functions_ui.php | 33 ++++++++++++------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index 1b9ecd7483..18aa21f1bc 100755
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -5194,7 +5194,7 @@ function ui_print_agent_autocomplete_input($parameters)
 					}
 					
 					//Set loading
-                    $("#'.$input_id.'")
+					$("#'.$input_id.'")
 						.css("background","url(\"'.$spinner_image.'\") right center no-repeat");
 					
 					//Function to call when the source
@@ -5209,7 +5209,7 @@ function ui_print_agent_autocomplete_input($parameters)
 						response(cache_'.$input_name.'[groupId][term]);
 						
 						//Set icon
-                        $("#'.$input_id.'")
+						$("#'.$input_id.'")
 							.css("background","url(\"'.$icon_image.'\") right center no-repeat '.$icon_image.'");
 						return;
 					}
@@ -5228,7 +5228,7 @@ function ui_print_agent_autocomplete_input($parameters)
 									response(cache_'.$input_name.'[groupId][oldterm]);
 									
 									found = true;
-
+									
 									return;
 								}
 							});
@@ -5237,7 +5237,6 @@ function ui_print_agent_autocomplete_input($parameters)
 								break;
 							}
 						}
-
 						*/
 					}
 					//==================================================
@@ -5245,10 +5244,11 @@ function ui_print_agent_autocomplete_input($parameters)
 					
 					if (found) {
 						//Set icon
-                        $("#'.$input_id.'")
-                        .css("background","url(\"'.$icon_image.'\") right center no-repeat");
-                    
+						$("#'.$input_id.'")
+							.css("background","url(\"'.$icon_image.'\") right center no-repeat");
+						
 						select_item_click = 0;
+      
 						return;
 					}
 					
@@ -5259,19 +5259,20 @@ function ui_print_agent_autocomplete_input($parameters)
 						dataType: "json",
 						success: function (data) {
 								cache_'.$input_name.'[groupId][term] = data; //Save the cache
+								
 								response(data);
-
-                                //Set icon
-                                setInputBackground("'.$input_id.'", "'.$icon_image.'");
-                                select_item_click = 0;
+								
+								//Set icon
+								$("#'.$input_id.'")
+									.css("background",
+										"url(\"'.$icon_image.'\") right center no-repeat");
+								
+								select_item_click = 0;
+								
 								return;
 							}
 						});
-
-                        $("#'.$input_id.'")
-                        .css("background",
-                            "url(\"'.$icon_image.'\") right center no-repeat");
-
+					
 					return;
 				},
 				//---END source-----------------------------------------

From 48e464542af145174ea59d8578e9615e1be7d2ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Gonz=C3=A1lez?= <jose.gonzalez@pandorafms.com>
Date: Fri, 7 May 2021 13:50:28 +0200
Subject: [PATCH 25/32] Fixed missing spinner

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

diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index 75436ac51c..ac0ea5eab1 100755
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -5197,7 +5197,7 @@ function ui_print_agent_autocomplete_input($parameters)
 					if (cache_'.$input_name.'[groupId] == null) {
 						cache_'.$input_name.'[groupId] = {};
 					}
-					
+
 					//Set loading
                     setInputBackground("'.$input_id.'", "'.$spinner_image.'");
 					
@@ -5274,8 +5274,6 @@ function ui_print_agent_autocomplete_input($parameters)
 							}
 						});
 
-                        setInputBackground("'.$input_id.'", "'.$icon_image.'");
-
 					return;
 				},
 				//---END source-----------------------------------------

From a5c5a30bdec73aada55fd238e96b9fac8046a1de Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Fri, 7 May 2021 14:01:42 +0200
Subject: [PATCH 26/32] avoid warnings in old perl versions

---
 pandora_server/lib/PandoraFMS/PluginTools.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pandora_server/lib/PandoraFMS/PluginTools.pm b/pandora_server/lib/PandoraFMS/PluginTools.pm
index 31ec32907d..d5730e8905 100644
--- a/pandora_server/lib/PandoraFMS/PluginTools.pm
+++ b/pandora_server/lib/PandoraFMS/PluginTools.pm
@@ -792,7 +792,8 @@ sub transfer_xml {
 	my $file_name;
 	my $file_path;
 
-	if (! -f $xml) {
+	if ($xml =~ /\n/ || ! -f $xml) {
+		# Not a file, it's content.
 		if (! (empty ($name))) {
 			$file_name = $name . "." . sprintf("%d",getCurrentUTimeMilis(). (rand()*10000)) . ".data";
 		}

From f25256a74d226242293064ad5d61f89eabd19f00 Mon Sep 17 00:00:00 2001
From: Luis <luis.calvo@artica.es>
Date: Mon, 10 May 2021 09:06:43 +0000
Subject: [PATCH 27/32] Unified downtime name as scheduled downtime

---
 .../general/first_task/planned_downtime.php        |  8 ++++----
 .../godmode/agentes/modificar_agente.php           |  4 ++--
 .../godmode/agentes/planned_downtime.editor.php    | 12 ++++++------
 .../agentes/planned_downtime.export_csv.php        |  2 +-
 .../godmode/agentes/planned_downtime.list.php      | 12 ++++++------
 pandora_console/godmode/setup/setup_general.php    |  2 +-
 .../update_manager/update_manager.offline.php      |  2 +-
 pandora_console/include/functions_api.php          |  4 ++--
 pandora_console/include/functions_config.php       |  2 +-
 .../include/functions_planned_downtimes.php        | 14 +++++++-------
 .../include/functions_reporting_html.php           | 10 +++++-----
 .../include/functions_update_manager.php           |  2 +-
 .../operation/agentes/estado_agente.php            |  4 ++--
 .../operation/agentes/estado_generalagente.php     |  4 ++--
 pandora_console/operation/search_agents.php        |  2 +-
 15 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/pandora_console/general/first_task/planned_downtime.php b/pandora_console/general/first_task/planned_downtime.php
index 7a3e323dc4..6bfbe5627b 100644
--- a/pandora_console/general/first_task/planned_downtime.php
+++ b/pandora_console/general/first_task/planned_downtime.php
@@ -15,14 +15,14 @@ global $config;
 check_login();
 ui_require_css_file('first_task');
 ?>
-<?php ui_print_info_message(['no_close' => true, 'message' => __('There are no planned downtime defined yet.') ]); ?>
+<?php ui_print_info_message(['no_close' => true, 'message' => __('There are no scheduled downtime defined yet.') ]); ?>
 
 <div class="new_task">
     <div class="image_task">
-        <?php echo html_print_image('images/first_task/icono_grande_visualconsole.png', true, ['title' => __('Planned Downtime')]); ?>
+        <?php echo html_print_image('images/first_task/icono_grande_visualconsole.png', true, ['title' => __('Scehduled Downtime')]); ?>
     </div>
     <div class="text_task">
-        <h3> <?php echo __('Create Planned Downtime'); ?></h3><p id="description_task"> 
+        <h3> <?php echo __('Create Scheduled Downtime'); ?></h3><p id="description_task"> 
             <?php
             echo __(
                 "%s contains a scheduled downtime management system.
@@ -34,7 +34,7 @@ ui_require_css_file('first_task');
             ?>
       </p>
         <form action="index.php?sec=extensions&amp;sec2=godmode/agentes/planned_downtime.editor" method="post">
-            <input type="submit" class="button_task" value="<?php echo __('Create Planned Downtime'); ?>" />
+            <input type="submit" class="button_task" value="<?php echo __('Create Scheduled Downtime'); ?>" />
         </form>
     </div>
 </div>
diff --git a/pandora_console/godmode/agentes/modificar_agente.php b/pandora_console/godmode/agentes/modificar_agente.php
index 6d9516bad7..3856b1be8c 100644
--- a/pandora_console/godmode/agentes/modificar_agente.php
+++ b/pandora_console/godmode/agentes/modificar_agente.php
@@ -746,9 +746,9 @@ if ($agents !== false) {
 
         if ($in_planned_downtime) {
             ui_print_help_tip(
-                __('Agent in planned downtime'),
+                __('Agent in scheduled downtime'),
                 false,
-                $config['image']['minireloj_16']
+                'images/minireloj-16.png'
             );
 
             echo '</em>';
diff --git a/pandora_console/godmode/agentes/planned_downtime.editor.php b/pandora_console/godmode/agentes/planned_downtime.editor.php
index 10f323ffab..da48e8b26d 100644
--- a/pandora_console/godmode/agentes/planned_downtime.editor.php
+++ b/pandora_console/godmode/agentes/planned_downtime.editor.php
@@ -64,7 +64,7 @@ $buttons = [
 
 // Header.
 ui_print_page_header(
-    __('Planned Downtime'),
+    __('Scheduled Downtime'),
     'images/gm_monitoring.png',
     false,
     '',
@@ -308,12 +308,12 @@ if ($create_downtime || $update_downtime) {
                     );
                 } else {
                     ui_print_error_message(
-                        __('Each planned downtime must have a different name')
+                        __('Each scheduled downtime must have a different name')
                     );
                 }
             } else {
                 ui_print_error_message(
-                    __('Planned downtime must have a name')
+                    __('Scheduled downtime must have a name')
                 );
             }
         } else if ($update_downtime) {
@@ -345,7 +345,7 @@ if ($create_downtime || $update_downtime) {
             $values = [];
             if (trim(io_safe_output($name)) == '') {
                 ui_print_error_message(
-                    __('Planned downtime must have a name')
+                    __('Scheduled downtime must have a name')
                 );
             }
 
@@ -1489,14 +1489,14 @@ function insert_downtime_agent($id_downtime, $user_groups_ad)
             $(this).css ("width", "180px");
         });
 
-        // Warning message about the problems caused updating a past planned downtime
+        // Warning message about the problems caused updating a past scheduled downtime
         var type_execution = "<?php echo $type_execution; ?>";
         var datetime_from = <?php echo json_encode(strtotime($once_date_from.' '.$once_time_from)); ?>;
         var datetime_now = <?php echo json_encode($utimestamp); ?>;
         var create = <?php echo json_encode($create); ?>;
         if (!create && (type_execution == 'periodically' || (type_execution == 'once' && datetime_from < datetime_now))) {
             $("input#submit-updbutton, input#submit-add_item, table#list a").click(function (e) {
-                if (!confirm("<?php echo __('WARNING: If you edit this planned downtime, the data of future SLA reports may be altered'); ?>")) {
+                if (!confirm("<?php echo __('WARNING: If you edit this scheduled downtime, the data of future SLA reports may be altered'); ?>")) {
                     e.preventDefault();
                 }
             });
diff --git a/pandora_console/godmode/agentes/planned_downtime.export_csv.php b/pandora_console/godmode/agentes/planned_downtime.export_csv.php
index b3c2a97a3d..7e0aff8a34 100644
--- a/pandora_console/godmode/agentes/planned_downtime.export_csv.php
+++ b/pandora_console/godmode/agentes/planned_downtime.export_csv.php
@@ -196,5 +196,5 @@ if (!empty($downtimes)) {
         echo chr(13);
     }
 } else {
-    echo '<div class="nf">'.__('No planned downtime').'</div>';
+    echo '<div class="nf">'.__('No scheduled downtime').'</div>';
 }
diff --git a/pandora_console/godmode/agentes/planned_downtime.list.php b/pandora_console/godmode/agentes/planned_downtime.list.php
index 4d9d0d9069..d2e7de8ec9 100755
--- a/pandora_console/godmode/agentes/planned_downtime.list.php
+++ b/pandora_console/godmode/agentes/planned_downtime.list.php
@@ -44,7 +44,7 @@ if ($migrate_malformed) {
 
     if ($migration_result['status'] == false) {
         ui_print_error_message(
-            __('An error occurred while migrating the malformed planned downtimes').'. '.__('Please run the migration again or contact with the administrator')
+            __('An error occurred while migrating the malformed scheduled downtimes').'. '.__('Please run the migration again or contact with the administrator')
         );
         echo '<br>';
     }
@@ -80,7 +80,7 @@ if ($stop_downtime) {
     $result = planned_downtimes_stop($downtime);
 
     if ($result === false) {
-        ui_print_error_message(__('An error occurred stopping the planned downtime'));
+        ui_print_error_message(__('An error occurred stopping the scheduled downtime'));
     } else {
         echo $result['message'];
     }
@@ -103,7 +103,7 @@ if ($delete_downtime) {
 
     // The downtime shouldn't be running!!
     if ($downtime['executed']) {
-        ui_print_error_message(__('This planned downtime is running'));
+        ui_print_error_message(__('This scheduled downtime is running'));
     } else {
         $result = db_process_sql_delete('tplanned_downtime', ['id' => $id_downtime]);
 
@@ -362,7 +362,7 @@ else if (!$downtimes) {
     echo '</form>';
 
     // Info message.
-    echo '<div class="nf">'.__('No planned downtime').'</div>';
+    echo '<div class="nf">'.__('No scheduled downtime').'</div>';
 
     echo '<div class="action-buttons w100p" >';
 
@@ -572,13 +572,13 @@ $(document).ready (function () {
     $.datepicker.setDefaults($.datepicker.regional[ "<?php echo get_user_language(); ?>"]);
 
     $("a#delete_downtime").click(function (e) {
-        if (!confirm("<?php echo __('WARNING: If you delete this planned downtime, it will not be taken into account in future SLA reports'); ?>")) {
+        if (!confirm("<?php echo __('WARNING: If you delete this scheduled downtime, it will not be taken into account in future SLA reports'); ?>")) {
             e.preventDefault();
         }
     });
 
     if (<?php echo json_encode($malformed_downtimes_exist); ?> && <?php echo json_encode($migrate_malformed == false); ?>) {
-        if (confirm("<?php echo __('WARNING: There are malformed planned downtimes').'.\n'.__('Do you want to migrate automatically the malformed items?'); ?>")) {
+        if (confirm("<?php echo __('WARNING: There are malformed scheduled downtimes').'.\n'.__('Do you want to migrate automatically the malformed items?'); ?>")) {
             window.location.href = "index.php?sec=extensions&sec2=godmode/agentes/planned_downtime.list&migrate_malformed=1";
         }
     }
diff --git a/pandora_console/godmode/setup/setup_general.php b/pandora_console/godmode/setup/setup_general.php
index fbd33b8a90..50733b2727 100644
--- a/pandora_console/godmode/setup/setup_general.php
+++ b/pandora_console/godmode/setup/setup_general.php
@@ -420,7 +420,7 @@ $table->data[$i++][1] = html_print_select(
 $config['past_planned_downtimes'] = isset(
     $config['past_planned_downtimes']
 ) ? $config['past_planned_downtimes'] : 1;
-$table->data[$i][0] = __('Allow create planned downtimes in the past');
+$table->data[$i][0] = __('Allow create scheduled downtimes in the past');
 $table->data[$i++][1] = html_print_checkbox_switch(
     'past_planned_downtimes',
     1,
diff --git a/pandora_console/godmode/update_manager/update_manager.offline.php b/pandora_console/godmode/update_manager/update_manager.offline.php
index 959dacf927..eba0fa01c2 100644
--- a/pandora_console/godmode/update_manager/update_manager.offline.php
+++ b/pandora_console/godmode/update_manager/update_manager.offline.php
@@ -94,7 +94,7 @@ is not working on the metaconsole and there is no time to fix it -->
     var mr_available_header = "<?php echo __('There are db changes'); ?>\n";
     var text1_mr_file = "<?php echo __('There are new database changes available to apply. Do you want to start the DB update process?'); ?>\n";
     var text2_mr_file = "<?php echo __('We recommend launching '); ?>\n";
-    var text3_mr_file = "<?php echo __('planned downtime'); ?>\n";
+    var text3_mr_file = "<?php echo __('Scheduled downtime'); ?>\n";
 
     var language = "<?php echo $config['language']; ?>";
     var docsUrl = (language === "es")
diff --git a/pandora_console/include/functions_api.php b/pandora_console/include/functions_api.php
index 6691ccc605..1c2f481922 100644
--- a/pandora_console/include/functions_api.php
+++ b/pandora_console/include/functions_api.php
@@ -6481,7 +6481,7 @@ function api_set_stop_downtime($id, $thrash1, $other, $thrash3)
     $data = db_get_row_sql($sql);
 
     if ($data['type_execution'] == 'periodically' && $data['executed'] == 1) {
-        returnError('error_stop_downtime', __('Error stopping downtime. Periodical and running planned downtime cannot be stopped.'));
+        returnError('error_stop_downtime', __('Error stopping downtime. Periodical and running scheduled downtime cannot be stopped.'));
         return;
     }
 
@@ -6967,7 +6967,7 @@ function api_set_planned_downtimes_additem($id, $thrash1, $other, $thrash3)
     }
 
     if (empty($agents)) {
-        returnError('No agents to create planned downtime items');
+        returnError('No agents to create scheduled downtime items');
     } else {
         if (!empty($returned['bad_modules'])) {
             $bad_modules = __("and this modules are doesn't exists or not applicable a this agents: ").implode(', ', $returned['bad_modules']);
diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php
index 322e630485..f25b148795 100644
--- a/pandora_console/include/functions_config.php
+++ b/pandora_console/include/functions_config.php
@@ -307,7 +307,7 @@ function config_update_config()
                     }
 
                     if (!config_update_value('past_planned_downtimes', get_parameter('past_planned_downtimes'))) {
-                        $error_update[] = __('Allow create planned downtimes in the past');
+                        $error_update[] = __('Allow create scheduled downtimes in the past');
                     }
 
                     if (!config_update_value('limit_parameters_massive', get_parameter('limit_parameters_massive'))) {
diff --git a/pandora_console/include/functions_planned_downtimes.php b/pandora_console/include/functions_planned_downtimes.php
index 116899c834..f49b0df060 100644
--- a/pandora_console/include/functions_planned_downtimes.php
+++ b/pandora_console/include/functions_planned_downtimes.php
@@ -95,12 +95,12 @@ function planned_downtimes_update($values, $downtime_id=0, $check_dates=true)
         $name_exists = (bool) db_get_value('id', 'tplanned_downtime', 'name', $values['name']);
 
         if ($name_exists) {
-            $result['message'] = ui_print_error_message(__('Each planned downtime must have a different name'), '', true);
+            $result['message'] = ui_print_error_message(__('Each scheduled downtime must have a different name'), '', true);
 
             return $result;
         }
     } else {
-        $result['message'] = ui_print_error_message(__('Planned downtime must have a name'), '', true);
+        $result['message'] = ui_print_error_message(__('Scheduled downtime must have a name'), '', true);
 
         return $result;
     }
@@ -811,13 +811,13 @@ function planned_downtimes_created($values)
             } else {
                 return [
                     'return'  => false,
-                    'message' => __('Each planned downtime must have a different name'),
+                    'message' => __('Each scheduled downtime must have a different name'),
                 ];
             }
         } else {
             return [
                 'return'  => false,
-                'message' => __('Planned downtime must have a name'),
+                'message' => __('Scheduled downtime must have a name'),
             ];
         }
 
@@ -904,16 +904,16 @@ function delete_planned_downtimes($filter)
     $downtime_execute = db_get_row_filter('tplanned_downtime', ['id' => $filter['id_downtime']], 'execute');
 
     if ($downtime_execute) {
-        $return = __("This planned downtime are executed now. Can't delete in this moment.");
+        $return = __("This scheduled downtime are executed now. Can't delete in this moment.");
     } else {
         $delete = db_process_sql_delete(
             'tplanned_downtime',
             ['id' => $filter['id_downtime']]
         );
         if ($delete) {
-            $return = __('Deleted this planned downtime successfully.');
+            $return = __('Deleted this scheduled downtime successfully.');
         } else {
-            $return = __('Problems for deleted this planned downtime.');
+            $return = __('Problems for deleted this scheduled downtime.');
         }
     }
 
diff --git a/pandora_console/include/functions_reporting_html.php b/pandora_console/include/functions_reporting_html.php
index 9877842e0a..cb0729d105 100644
--- a/pandora_console/include/functions_reporting_html.php
+++ b/pandora_console/include/functions_reporting_html.php
@@ -849,7 +849,7 @@ function reporting_html_SLA($table, $item, $mini, $pdf=0)
             $table1->size[10] = '2%';
             $table1->data[0][10] = '<img src ="'.$src.'images/square_light_gray.png">';
             $table1->size[11] = '15%';
-            $table1->data[0][11] = '<span>'.__('Planned Downtime').'</span>';
+            $table1->data[0][11] = '<span>'.__('Scheduled Downtime').'</span>';
 
             if ($pdf === 0) {
                 $table->colspan['legend']['cell'] = 2;
@@ -4074,7 +4074,7 @@ function reporting_html_availability_graph($table, $item, $pdf=0)
         $table2->size[10] = '2%';
         $table2->data[0][10] = '<img src ="'.$src.$hack_metaconsole.'images/square_light_gray.png">';
         $table2->size[11] = '15%';
-        $table2->data[0][11] = '<span>'.__('Planned Downtime').'</span>';
+        $table2->data[0][11] = '<span>'.__('Scheduled Downtime').'</span>';
     }
 
     if ($pdf !== 0) {
@@ -5602,8 +5602,8 @@ function reporting_html_planned_downtimes_table($planned_downtimes)
 
     $table = new StdClass();
     $table->width = '99%';
-    $table->title = __('This SLA has been affected by the following planned downtimes').ui_print_help_tip(
-        __('If the duration of the planned downtime is less than 5 minutes it will not be represented in the graph'),
+    $table->title = __('This SLA has been affected by the following scheduled downtimes').ui_print_help_tip(
+        __('If the duration of the scheduled downtime is less than 5 minutes it will not be represented in the graph'),
         true
     );
     $table->head = [];
@@ -5641,7 +5641,7 @@ function reporting_html_planned_downtimes_table($planned_downtimes)
 
     if ($downtime_malformed) {
         $info_malformed = ui_print_error_message(
-            __('This item is affected by a malformed planned downtime').'. '.__('Go to the planned downtimes section to solve this').'.',
+            __('This item is affected by a malformed scheduled downtime').'. '.__('Go to the scheduled downtimes section to solve this').'.',
             '',
             true
         );
diff --git a/pandora_console/include/functions_update_manager.php b/pandora_console/include/functions_update_manager.php
index b641448af5..8b047988ad 100755
--- a/pandora_console/include/functions_update_manager.php
+++ b/pandora_console/include/functions_update_manager.php
@@ -1428,7 +1428,7 @@ function update_manager_check_online_free_packages($is_ajax=true)
                     var mr_available_header = "<?php echo __('There are db changes'); ?>\n";
                     var text1_mr_file = "<?php echo __('There are new database changes available to apply. Do you want to start the DB update process?'); ?>\n";
                     var text2_mr_file = "<?php echo __('We recommend launching '); ?>\n";
-                    var text3_mr_file = "<?php echo __('planned downtime'); ?>\n";
+                    var text3_mr_file = "<?php echo __('Scheduled downtime'); ?>\n";
 
                     var language = "<?php echo $config['language']; ?>";
                     var docsUrl = (language === "es")
diff --git a/pandora_console/operation/agentes/estado_agente.php b/pandora_console/operation/agentes/estado_agente.php
index 6db5feaf7d..73aaa601ff 100644
--- a/pandora_console/operation/agentes/estado_agente.php
+++ b/pandora_console/operation/agentes/estado_agente.php
@@ -808,9 +808,9 @@ foreach ($agents as $agent) {
 
     if ($in_planned_downtime) {
         $data[0] .= ui_print_help_tip(
-            __('Agent in planned downtime'),
+            __('Agent in scheduled downtime'),
             true,
-            $config['image']['minireloj_16']
+            'images/minireloj-16.png'
         );
         $data[0] .= '</em>';
     }
diff --git a/pandora_console/operation/agentes/estado_generalagente.php b/pandora_console/operation/agentes/estado_generalagente.php
index 6a326cf91c..f2b69d5b56 100755
--- a/pandora_console/operation/agentes/estado_generalagente.php
+++ b/pandora_console/operation/agentes/estado_generalagente.php
@@ -137,7 +137,7 @@ if ($agent['disabled']) {
 
 if ($in_planned_downtime && !$agent['disabled'] && !$agent['quiet']) {
     $agent_name .= '<em>&nbsp;'.ui_print_help_tip(
-        __('Agent in planned downtime'),
+        __('Agent in scheduled downtime'),
         true,
         'images/minireloj-16.png'
     ).'</em>';
@@ -145,7 +145,7 @@ if ($in_planned_downtime && !$agent['disabled'] && !$agent['quiet']) {
     || ($in_planned_downtime && !$agent['quiet'])
 ) {
     $agent_name .= '&nbsp;'.ui_print_help_tip(
-        __('Agent in planned downtime'),
+        __('Agent in scheduled downtime'),
         true,
         'images/minireloj-16.png'
     ).'</em>';
diff --git a/pandora_console/operation/search_agents.php b/pandora_console/operation/search_agents.php
index e46a3887f4..9fe7d7f9ce 100755
--- a/pandora_console/operation/search_agents.php
+++ b/pandora_console/operation/search_agents.php
@@ -95,7 +95,7 @@ if (!$agents || !$searchAgents) {
         );
 
         if ($in_planned_downtime) {
-            $cellName .= '<em>'.ui_print_help_tip(__('Agent in planned downtime'), true, 'images/minireloj-16.png');
+            $cellName .= '<em>'.ui_print_help_tip(__('Agent in scheduled downtime'), true, 'images/minireloj-16.png');
             $cellName .= '</em>';
         }
 

From cdf0e1a4f4296d17e17a0905a96d14a9cd32d349 Mon Sep 17 00:00:00 2001
From: Daniel Maya <daniel.maya@artica.es>
Date: Mon, 10 May 2021 09:10:43 +0000
Subject: [PATCH 28/32] =?UTF-8?q?Ent=207284=20warning=20creaci=C3=B3n=20ag?=
 =?UTF-8?q?ente?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pandora_console/godmode/agentes/agent_manager.php b/pandora_console/godmode/agentes/agent_manager.php
index 923a6c20aa..d486be0e7b 100644
--- a/pandora_console/godmode/agentes/agent_manager.php
+++ b/pandora_console/godmode/agentes/agent_manager.php
@@ -1004,9 +1004,9 @@ echo '<div class="action-buttons agent_manager" style="width: '.$table->width.'"
 
 // The context help about the learning mode.
 if ($modo == 0) {
-    echo "<span id='modules_not_learning_mode_context_help pdd_r_10px' '>";
+    echo "<span id='modules_not_learning_mode_context_help' class='pdd_r_10px'>";
 } else {
-    echo "<span id='modules_not_learning_mode_context_help' style='display:none'>";
+    echo "<span id='modules_not_learning_mode_context_help' class='invisible'>";
 }
 
 echo clippy_context_help('modules_not_learning_mode');

From 8f324b942b41f94d16eea157d8fd38d7f02e459b Mon Sep 17 00:00:00 2001
From: Marcos Alconada <marcos.alconada@artica.es>
Date: Mon, 10 May 2021 09:16:19 +0000
Subject: [PATCH 29/32] fixed visual error black theme event modal

---
 pandora_console/include/functions_events.php     | 16 +++++++++-------
 pandora_console/include/styles/pandora_black.css |  3 +++
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/pandora_console/include/functions_events.php b/pandora_console/include/functions_events.php
index e36e2f16e3..1f838f34ba 100644
--- a/pandora_console/include/functions_events.php
+++ b/pandora_console/include/functions_events.php
@@ -4318,10 +4318,6 @@ function events_page_details($event, $server='')
 
     $table_class = 'table_modal_alternate';
 
-    if ($config['style'] === 'pandora_black') {
-        $table_class = 'black_table_modal_alternate';
-    }
-
     // Details.
     $table_details = new stdClass;
     $table_details->width = '100%';
@@ -4526,7 +4522,7 @@ function events_page_details($event, $server='')
             $link = "winopeng_var('".$url.'?'.$graph_params_str."','".$win_handle."', 800, 480)";
 
             $data[1] = '<a href="javascript:'.$link.'">';
-            $data[1] .= html_print_image('images/chart_curve.png', true);
+            $data[1] .= html_print_image('images/chart_curve.png', true, ['class' => 'invert_filter']);
             $data[1] .= '</a>';
             $table_details->data[] = $data;
         }
@@ -4546,13 +4542,19 @@ function events_page_details($event, $server='')
             $data[1] .= html_print_image(
                 'images/bell.png',
                 true,
-                ['title' => __('Go to data overview')]
+                [
+                    'title' => __('Go to data overview'),
+                    'class' => 'invert_filter',
+                ]
             );
         } else {
             $data[1] .= html_print_image(
                 'images/bell_pause.png',
                 true,
-                ['title' => __('Go to data overview')]
+                [
+                    'title' => __('Go to data overview'),
+                    'class' => 'invert_filter',
+                ]
             );
         }
 
diff --git a/pandora_console/include/styles/pandora_black.css b/pandora_console/include/styles/pandora_black.css
index 49d669fd0d..b3342794cf 100644
--- a/pandora_console/include/styles/pandora_black.css
+++ b/pandora_console/include/styles/pandora_black.css
@@ -1000,3 +1000,6 @@ table.databox {
 .tactical_set {
   border-color: #707070;
 }
+li.ui-tabs-tab.ui-corner-top.ui-state-default.ui-tab {
+  border: 1px solid #707070;
+}

From a94c70551df09f59d02a4de600d728f6841f3be8 Mon Sep 17 00:00:00 2001
From: Luis <luis.calvo@artica.es>
Date: Mon, 10 May 2021 09:17:14 +0000
Subject: [PATCH 30/32] Ent 7155 bug edicion tickets integria

---
 pandora_console/include/functions_html.php    | 18 ++++--
 .../configure_integriaims_incident.php        | 56 ++++++++++---------
 2 files changed, 42 insertions(+), 32 deletions(-)

diff --git a/pandora_console/include/functions_html.php b/pandora_console/include/functions_html.php
index e80fa6f9fd..50da74c24c 100644
--- a/pandora_console/include/functions_html.php
+++ b/pandora_console/include/functions_html.php
@@ -4987,10 +4987,13 @@ function html_print_input_multicheck(array $data):string
 /**
  * Print an autocomplete input filled out with Integria IMS users.
  *
- * @param string  $name    The name of ajax control, by default is "users".
- * @param string  $default The default value to show in the ajax control.
- * @param boolean $return  If it is true return a string with the output instead to echo the output.
- * @param string  $size    Size.
+ * @param string  $name     The name of ajax control, by default is "users".
+ * @param string  $default  The default value to show in the ajax control.
+ * @param boolean $return   If it is true return a string with the output instead to echo the output.
+ * @param string  $size     Size.
+ * @param boolean $disable  Disable the button (optional, button enabled by default).
+ * @param boolean $required Attribute required.
+ * @param string  $class    Text inpunt class.
  *
  * @return mixed If the $return is true, return the output as string.
  */
@@ -5000,7 +5003,8 @@ function html_print_autocomplete_users_from_integria(
     $return=false,
     $size='30',
     $disable=false,
-    $required=false
+    $required=false,
+    $class=null
 ) {
     global $config;
 
@@ -5012,6 +5016,10 @@ function html_print_autocomplete_users_from_integria(
         $attrs['required'] = 'required';
     }
 
+    if (empty($class) === false) {
+        $attrs['class'] = $class;
+    }
+
     html_print_input_text_extended(
         $name,
         $default,
diff --git a/pandora_console/operation/incidents/configure_integriaims_incident.php b/pandora_console/operation/incidents/configure_integriaims_incident.php
index 195ee7350f..aeadb5e10a 100644
--- a/pandora_console/operation/incidents/configure_integriaims_incident.php
+++ b/pandora_console/operation/incidents/configure_integriaims_incident.php
@@ -163,32 +163,30 @@ $table->colspan[3][0] = 3;
 
 $help_macros = isset($_GET['from_event']) ? ui_print_help_icon('response_macros', true) : '';
 
-if (isset($_GET['from_event'])) {
-    if ($update) {
-        $input_value_title = $incident_details[3];
-        $input_value_type = $incident_details[17];
-        $input_value_status = $incident_details[6];
-        $input_value_group = $incident_details[8];
-        $input_value_criticity = $incident_details[7];
-        $input_value_owner = $incident_details[5];
-        $input_value_content = $incident_details[4];
-    } else if (isset($_GET['from_event'])) {
-        $input_value_title = $config['cr_incident_title'];
-        $input_value_type = $config['cr_incident_type'];
-        $input_value_status = $config['cr_incident_status'];
-        $input_value_group = $config['cr_default_group'];
-        $input_value_criticity = $config['cr_default_criticity'];
-        $input_value_owner = $config['cr_default_owner'];
-        $input_value_content = $config['cr_incident_content'];
-    } else {
-        $input_value_title = '';
-        $input_value_type = '';
-        $input_value_status = '';
-        $input_value_group = '';
-        $input_value_criticity = '';
-        $input_value_owner = '';
-        $input_value_content = '';
-    }
+if ($update) {
+    $input_value_title = $incident_details[3];
+    $input_value_type = $incident_details[17];
+    $input_value_status = $incident_details[6];
+    $input_value_group = $incident_details[8];
+    $input_value_criticity = $incident_details[7];
+    $input_value_owner = $incident_details[5];
+    $input_value_content = $incident_details[4];
+} else if (isset($_GET['from_event'])) {
+    $input_value_title = $config['cr_incident_title'];
+    $input_value_type = $config['cr_incident_type'];
+    $input_value_status = $config['cr_incident_status'];
+    $input_value_group = $config['cr_default_group'];
+    $input_value_criticity = $config['cr_default_criticity'];
+    $input_value_owner = $config['cr_default_owner'];
+    $input_value_content = $config['cr_incident_content'];
+} else {
+    $input_value_title = '';
+    $input_value_type = '';
+    $input_value_status = '';
+    $input_value_group = '';
+    $input_value_criticity = '';
+    $input_value_owner = '';
+    $input_value_content = '';
 }
 
 $table->data[0][0] = '<div class="label_select"><p class="input_label">'.__('Title').':&nbsp'.$help_macros.'</p>';
@@ -290,7 +288,11 @@ $table->data[2][2] = '<div class="label_select"><p class="input_label">'.__('Own
 $table->data[2][2] .= '<div class="label_select_parent">'.html_print_autocomplete_users_from_integria(
     'owner',
     $input_value_owner,
-    true
+    true,
+    '30',
+    false,
+    false,
+    'w100p'
 ).'</div>';
 
 $table->data[3][0] = '<div class="label_select"><p class="input_label">'.__('Description').':&nbsp'.$help_macros.'</p>';

From 61dc2e833becb5f883437f3bd738848374f62767 Mon Sep 17 00:00:00 2001
From: Luis <luis.calvo@artica.es>
Date: Mon, 10 May 2021 09:49:43 +0000
Subject: [PATCH 31/32] Ent 5680 llamada api set update agent field

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

diff --git a/pandora_console/include/functions_api.php b/pandora_console/include/functions_api.php
index d11356ee27..a39d9da92a 100644
--- a/pandora_console/include/functions_api.php
+++ b/pandora_console/include/functions_api.php
@@ -1614,6 +1614,302 @@ function api_set_update_agent($id_agent, $thrash2, $other, $thrash3)
 }
 
 
+/**
+ * Update an agent by indicating a pair of field - value separated by comma.
+ *
+ * @param integer $id_agent        Id (or alias) agent to upadate.
+ * @param boolean $use_agent_alias Use alias instead of id.
+ * @param array   $params          Pair of parameter/value separated by comma. Available fields are:
+ *  'alias',
+ * 'direccion',
+ * 'id_parent',
+ * 'id_grupo',
+ * 'cascade_protection',
+ * 'cascade_protection_module',
+ * 'intervalo',
+ * 'id_os',
+ * 'server_name',
+ * 'custom_id',
+ * 'modo',
+ * 'disabled',
+ * 'comentarios'
+ *
+ * eg . http://127.0.0.1/pandora_console/include/api.php?op=set&op2=update_agent_field&id=pandora&other=id_os,1|alias,pandora|direccion,192.168.10.16|id_parent,1cascade_protection,1|cascade_protection_module,1|intervalo,5||modo|3|&other_mode=url_encode_separator_|&apipass=1234&user=admin&pass=pandora
+ */
+function api_set_update_agent_field($id_agent, $use_agent_alias, $params)
+{
+    global $config;
+    $return = false;
+
+    if (defined('METACONSOLE')) {
+        return;
+    }
+
+    if (!check_acl($config['id_user'], 0, 'AW')) {
+        returnError('forbidden', 'string');
+        return;
+    }
+
+     // Check the agent.
+    if ((bool) $use_agent_alias === true) {
+        $agents_by_alias = agents_get_agent_id_by_alias($id_agent);
+        if (empty($agents_by_alias) === false) {
+            foreach ($agents_by_alias as $agent) {
+                if (agents_check_access_agent($agent['id_agente'], 'AW') === true) {
+                    $agents[] = $agent['id_agente'];
+                }
+            }
+
+            if (empty($agents) === true) {
+                returnError('forbidden', 'string');
+                return;
+            }
+        } else {
+            returnError('Alias does not match any agent.');
+            return;
+        }
+    } else {
+        if (!util_api_check_agent_and_print_error($id_agent, 'string', 'AW')) {
+            return;
+        }
+
+        $agents[] = $id_agent;
+    }
+
+     // Serialize the data for update.
+    if ($params['type'] === 'array') {
+        // Keys available to change.
+        $available_fields = [
+            'alias',
+            'direccion',
+            'id_parent',
+            'id_grupo',
+            'cascade_protection',
+            'cascade_protection_module',
+            'intervalo',
+            'id_os',
+            'server_name',
+            'custom_id',
+            'modo',
+            'disabled',
+            'comentarios',
+        ];
+
+        foreach ($params['data'] as $key_value) {
+            list($key, $value) = explode(',', $key_value, 2);
+            if (in_array($key, $available_fields) === true) {
+                $fields[$key] = $value;
+            }
+        }
+    }
+
+    if (empty($fields) === true) {
+        returnError('Selected field not available. Please, select one the fields avove');
+        return;
+    }
+
+    // Check fields.
+    foreach ($fields as $field => $data) {
+        switch ($field) {
+            case 'alias':
+                if (empty($data)) {
+                    returnError('No agent alias specified');
+                    return;
+                }
+            break;
+
+            case 'id_grupo':
+                if (db_get_value_sql('SELECT  FROM tgrupo WHERE id_grupo = '.$data) === false) {
+                    returnError('The group doesn`t exist.');
+                    return;
+                }
+            break;
+
+            case 'id_os':
+                if (db_get_value_sql('SELECT id_os FROM tconfig_os WHERE id_os = '.$data) === false) {
+                    returnError('The OS doesn`t exist.');
+                    return;
+                }
+            break;
+
+            case 'server_name':
+                $server_name = db_get_value_sql('SELECT name FROM tserver WHERE BINARY name LIKE "'.$data.'"');
+                if ($server_name === false) {
+                        returnError('The server doesn`t exist.');
+                     return;
+                }
+            break;
+
+            case 'cascade_protection':
+                if ($data == 1) {
+                    if (($field['id_parent'] != 0) && (db_get_value_sql(
+                        'SELECT id_agente_modulo
+                            FROM tagente_modulo
+                            WHERE id_agente = '.$fields['id_parent'].' AND id_agente_modulo = '.$fields['cascade_protection_module']
+                    ) === false)
+                    ) {
+                            returnError('Cascade protection is not applied because it is not a parent module');
+                    }
+                } else {
+                    unset($fields['cascade_protection']);
+                }
+            break;
+
+            case 'id_grupo':
+                // Check ACL group.
+                if (!check_acl($config['id_user'], $data, 'AW')) {
+                    returnError('forbidden', 'string');
+                    return;
+                }
+
+                if ($data == 0) {
+                    $agent_update_error = 'The agent could not be modified. For security reasons, use a group other than 0.';
+                    returnError($agent_update_error);
+                    return;
+                }
+            break;
+
+            case 'id_parent':
+                $parentCheck = agents_check_access_agent($data);
+                if (is_null($parentCheck) === true) {
+                    returnError('The parent agent does not exist.');
+                    return;
+                }
+
+                if ($parentCheck === false) {
+                    returnError('The user cannot access to parent agent.');
+                    return;
+                }
+            break;
+
+            default:
+                // Default empty.
+            break;
+        }
+    }
+
+        // Var applied in case there is more than one agent.
+        $return = false;
+        $applied = 0;
+    foreach ($agents as $agent) {
+        $values_old = db_get_row_filter(
+            'tagente',
+            ['id_agente' => $agent],
+            [
+                'id_grupo',
+                'disabled',
+            ]
+        );
+
+        $tpolicy_group_old = db_get_all_rows_sql(
+            'SELECT id_policy FROM tpolicy_groups
+                WHERE id_group = '.$values_old['id_grupo']
+        );
+
+        $return = db_process_sql_update(
+            'tagente',
+            $fields,
+            ['id_agente' => $agent]
+        );
+
+        if ((count($agents) > 1) && $return !== 0) {
+            $applied += 1;
+        }
+
+        if ($return && !isset($field['direccion'])) {
+            // register ip for this agent in 'taddress'.
+            agents_add_address($agent, $field['direccion']);
+        }
+
+        if ($return) {
+            // Update config file
+            if (isset($field['disabled']) && $values_old['disabled'] != $field['disabled']) {
+                enterprise_hook(
+                    'config_agents_update_config_token',
+                    [
+                        $agent,
+                        'standby',
+                        $field['disabled'],
+                    ]
+                );
+            }
+
+            if ($tpolicy_group_old) {
+                foreach ($tpolicy_group_old as $key => $value) {
+                    $tpolicy_agents_old = db_get_sql(
+                        'SELECT * FROM tpolicy_agents 
+                        WHERE id_policy = '.$value['id_policy'].' AND id_agent = '.$agent
+                    );
+
+                    if ($tpolicy_agents_old) {
+                        $result2 = db_process_sql_update(
+                            'tpolicy_agents',
+                            ['pending_delete' => 1],
+                            [
+                                'id_agent'  => $agent,
+                                'id_policy' => $value['id_policy'],
+                            ]
+                        );
+                    }
+                }
+            }
+
+            $tpolicy_group = db_get_all_rows_sql(
+                'SELECT id_policy FROM tpolicy_groups 
+                WHERE id_group = '.$field['id_grupo']
+            );
+
+            if ($tpolicy_group) {
+                foreach ($tpolicy_group as $key => $value) {
+                    $tpolicy_agents = db_get_sql(
+                        'SELECT * FROM tpolicy_agents 
+                        WHERE id_policy = '.$value['id_policy'].' AND id_agent ='.$agent
+                    );
+
+                    if (!$tpolicy_agents) {
+                        db_process_sql_insert(
+                            'tpolicy_agents',
+                            [
+                                'id_policy' => $value['id_policy'],
+                                'id_agent'  => $agent,
+                            ]
+                        );
+                    } else {
+                        $result3 = db_process_sql_update(
+                            'tpolicy_agents',
+                            ['pending_delete' => 0],
+                            [
+                                'id_agent'  => $agent,
+                                'id_policy' => $value['id_policy'],
+                            ]
+                        );
+                    }
+                }
+            }
+        }
+    }
+
+    if (count($agents) > 1) {
+        returnData(
+            'string',
+            [
+                'type' => 'string',
+                'data' => __('Updated %d/%d agents', $applied, count($agents)),
+            ]
+        );
+    } else {
+        returnData(
+            'string',
+            [
+                'type' => 'string',
+                'data' => __('Agent updated.'),
+            ]
+        );
+    }
+
+}
+
+
 /**
  * Create a new agent, and print the id for new agent.
  *

From 6bdd983755debc4f412a0b813e1d4195f7e4873c Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Tue, 11 May 2021 01:00:46 +0200
Subject: [PATCH 32/32] 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 534ff5be19..76acd4b169 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.754-210510
+Version: 7.0NG.754-210511
 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 81ffd301d3..ba8ff1c9f9 100644
--- a/pandora_agents/unix/DEBIAN/make_deb_package.sh
+++ b/pandora_agents/unix/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.754-210510"
+pandora_version="7.0NG.754-210511"
 
 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 2702989549..b904a3bc42 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -1015,7 +1015,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.754';
-use constant AGENT_BUILD => '210510';
+use constant AGENT_BUILD => '210511';
 
 # 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 57f18f62f0..8984992513 100644
--- a/pandora_agents/unix/pandora_agent.redhat.spec
+++ b/pandora_agents/unix/pandora_agent.redhat.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     7.0NG.754
-%define release     210510
+%define release     210511
 
 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 e1895fe5d9..2124636e4f 100644
--- a/pandora_agents/unix/pandora_agent.spec
+++ b/pandora_agents/unix/pandora_agent.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     7.0NG.754
-%define release     210510
+%define release     210511
 
 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 1c40d15a32..e2fe704edb 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.754"
-PI_BUILD="210510"
+PI_BUILD="210511"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index cb2afa514a..39f0e0ea99 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{210510}
+{210511}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 467d3d6a04..5df547c181 100644
--- a/pandora_agents/win32/pandora.cc
+++ b/pandora_agents/win32/pandora.cc
@@ -30,7 +30,7 @@ using namespace Pandora;
 using namespace Pandora_Strutils;
 
 #define PATH_SIZE    _MAX_PATH+1
-#define PANDORA_VERSION ("7.0NG.754(Build 210510)")
+#define PANDORA_VERSION ("7.0NG.754(Build 210511)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index 15756ba8f0..84320d0433 100644
--- a/pandora_agents/win32/versioninfo.rc
+++ b/pandora_agents/win32/versioninfo.rc
@@ -11,7 +11,7 @@ BEGIN
       VALUE "LegalCopyright", "Artica ST"
       VALUE "OriginalFilename", "PandoraAgent.exe"
       VALUE "ProductName", "Pandora FMS Windows Agent"
-      VALUE "ProductVersion", "(7.0NG.754(Build 210510))"
+      VALUE "ProductVersion", "(7.0NG.754(Build 210511))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index dc9a610360..ca82b95067 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.754-210510
+Version: 7.0NG.754-210511
 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 9c76d31b44..6d9f92c008 100644
--- a/pandora_console/DEBIAN/make_deb_package.sh
+++ b/pandora_console/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.754-210510"
+pandora_version="7.0NG.754-210511"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 23fcfe8a3c..1cd5f34cd9 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 = 'PC210510';
+$build_version = 'PC210511';
 $pandora_version = 'v7.0NG.754';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 877216b9a1..cbd529980a 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -129,7 +129,7 @@
         <div style='height: 10px'>
             <?php
             $version = '7.0NG.754';
-            $build = '210510';
+            $build = '210511';
             $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 7eaa5fcad5..e23b3dfe89 100644
--- a/pandora_console/pandora_console.redhat.spec
+++ b/pandora_console/pandora_console.redhat.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.754
-%define release     210510
+%define release     210511
 
 # 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 82b2605bef..32c150fd95 100644
--- a/pandora_console/pandora_console.rhel7.spec
+++ b/pandora_console/pandora_console.rhel7.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.754
-%define release     210510
+%define release     210511
 
 # 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 3494b8e145..9a64b22aca 100644
--- a/pandora_console/pandora_console.spec
+++ b/pandora_console/pandora_console.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.754
-%define release     210510
+%define release     210511
 %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 4a7242bcf9..570248af2c 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.754-210510
+Version: 7.0NG.754-210511
 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 2586050247..66c1fe0559 100644
--- a/pandora_server/DEBIAN/make_deb_package.sh
+++ b/pandora_server/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.754-210510"
+pandora_version="7.0NG.754-210511"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 30e7c59d5c..d6205b006e 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@@ -45,7 +45,7 @@ our @EXPORT = qw(
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.754";
-my $pandora_build = "210510";
+my $pandora_build = "210511";
 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 f3e7153a37..b9caadbd8f 100644
--- a/pandora_server/lib/PandoraFMS/PluginTools.pm
+++ b/pandora_server/lib/PandoraFMS/PluginTools.pm
@@ -34,7 +34,7 @@ our @ISA = qw(Exporter);
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.754";
-my $pandora_build = "210510";
+my $pandora_build = "210511";
 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 f8c3e4efb5..35726363dd 100644
--- a/pandora_server/pandora_server.redhat.spec
+++ b/pandora_server/pandora_server.redhat.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     7.0NG.754
-%define release     210510
+%define release     210511
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 9b74a4cce8..8fc4aece9f 100644
--- a/pandora_server/pandora_server.spec
+++ b/pandora_server/pandora_server.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     7.0NG.754
-%define release     210510
+%define release     210511
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 7202d3c8d2..be07ace396 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.754"
-PI_BUILD="210510"
+PI_BUILD="210511"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index a1e0360b4f..a601c8a258 100755
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -35,7 +35,7 @@ use PandoraFMS::Config;
 use PandoraFMS::DB;
 
 # version: define current version
-my $version = "7.0NG.754 PS210510";
+my $version = "7.0NG.754 PS210511";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index a8d5e47d7e..78815064ac 100755
--- a/pandora_server/util/pandora_manage.pl
+++ b/pandora_server/util/pandora_manage.pl
@@ -36,7 +36,7 @@ use Encode::Locale;
 Encode::Locale::decode_argv;
 
 # version: define current version
-my $version = "7.0NG.754 PS210510";
+my $version = "7.0NG.754 PS210511";
 
 # save program name for logging
 my $progname = basename($0);