From b67f73539ff6cece292992fdcd40e933d138b4b3 Mon Sep 17 00:00:00 2001
From: Daniel Barbero <daniel.barbero@artica.es>
Date: Thu, 15 Sep 2022 12:07:05 +0200
Subject: [PATCH 01/22] fixed tree view services pandora_enterprise#9493

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

diff --git a/pandora_console/include/functions_modules.php b/pandora_console/include/functions_modules.php
index 6c265e8e0f..3f1644693d 100755
--- a/pandora_console/include/functions_modules.php
+++ b/pandora_console/include/functions_modules.php
@@ -4191,6 +4191,11 @@ function modules_get_counter_by_states($state)
 
 function modules_get_state_condition($state, $prefix='tae')
 {
+    // Not  use empty state 0 -> AGENT_MODULE_STATUS_NORMAL.
+    if ($state === '') {
+        return '1=1';
+    }
+
     switch ($state) {
         case AGENT_MODULE_STATUS_CRITICAL_ALERT:
         case AGENT_MODULE_STATUS_CRITICAL_BAD:

From 181a480b9d7b3a696622b312596d91081cc0ca00 Mon Sep 17 00:00:00 2001
From: "alejandro.campos@artica.es" <alejandro.campos@artica.es>
Date: Mon, 19 Sep 2022 10:44:25 +0200
Subject: [PATCH 02/22] fixed api methods for creating and deleting scheduled
 downtimes agents

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

diff --git a/pandora_console/include/functions_api.php b/pandora_console/include/functions_api.php
index d711432ef9..2eb053e83a 100644
--- a/pandora_console/include/functions_api.php
+++ b/pandora_console/include/functions_api.php
@@ -7685,8 +7685,7 @@ function api_set_planned_downtimes_delete_agents($id, $thrash1, $other, $thrash3
     }
 
     if (!empty($other['data'][0])) {
-        $agents = io_safe_input($other['data']);
-        $agents = explode(';', $agents);
+        $agents = $other['data'];
         $results = false;
         foreach ($agents as $agent) {
             if (db_get_value_sql(sprintf('SELECT id from tplanned_downtime_agents WHERE id_agent = %d AND id_downtime = %d', $agent, $id)) !== false) {
@@ -7762,8 +7761,7 @@ function api_set_planned_downtimes_add_agents($id, $thrash1, $other, $thrash3)
     }
 
     if (!empty($other['data'][0])) {
-        $agents = io_safe_input($other['data']);
-        $agents = explode(';', $agents);
+        $agents = $other['data'];
         $results = false;
         foreach ($agents as $agent) {
             if (db_get_value_sql(sprintf('SELECT id from tplanned_downtime_agents tpd WHERE tpd.id_agent = %d AND id_downtime = %d', $agent, $id)) === false) {

From 9e90c8da07a2f361fc8c0649c8fc8e91d008d63d Mon Sep 17 00:00:00 2001
From: Daniel Maya <daniel.maya@pandorafms.com>
Date: Tue, 20 Sep 2022 13:56:36 +0200
Subject: [PATCH 03/22] #9506 Changes in user profiles

---
 pandora_console/godmode/users/user_list.php | 113 +++++++++++++++-----
 1 file changed, 85 insertions(+), 28 deletions(-)

diff --git a/pandora_console/godmode/users/user_list.php b/pandora_console/godmode/users/user_list.php
index efc3321c2c..b0dda31890 100644
--- a/pandora_console/godmode/users/user_list.php
+++ b/pandora_console/godmode/users/user_list.php
@@ -52,6 +52,8 @@ if (is_ajax()) {
     $method = get_parameter('method');
     $group_id = get_parameter('group_id');
     $group_recursion = (bool) get_parameter('group_recursion', 0);
+    $get_user_profile_group = (bool) get_parameter('get_user_profile_group', false);
+
     $return_all = false;
 
     if ($group_id == -1) {
@@ -93,6 +95,37 @@ if (is_ajax()) {
         echo json_encode($ret_id);
         return;
     }
+
+    if ($get_user_profile_group === true) {
+        $id_user = get_parameter('id_user');
+
+        $user_profiles = [];
+
+        // User profiles.
+        if (users_is_admin()) {
+            $user_profiles = db_get_all_rows_field_filter(
+                'tusuario_perfil',
+                'id_usuario',
+                $id_user
+            );
+        } else {
+            $user_profiles_aux = users_get_user_profile($id_user);
+            foreach ($group_um as $key => $value) {
+                if (isset($user_profiles_aux[$key]) === true) {
+                    $user_profiles[$key] = $user_profiles_aux[$key];
+                    unset($user_profiles_aux[$key]);
+                }
+            }
+        }
+
+        foreach ($user_profiles as $key => $value) {
+            $user_profiles[$key]['id_perfil'] = profile_get_name($value['id_perfil']);
+            $user_profiles[$key]['id_grupo'] = groups_get_name($value['id_grupo'], true);
+        }
+
+        echo json_encode($user_profiles);
+        return;
+    }
 }
 
 $sortField = get_parameter('sort_field');
@@ -588,10 +621,8 @@ $cont = 0;
 foreach ($info as $user_id => $user_info) {
     // User profiles.
     if ($user_is_admin || $user_id == $config['id_user'] || isset($group_um[0])) {
-        $user_profiles = db_get_all_rows_field_filter(
-            'tusuario_perfil',
-            'id_usuario',
-            $user_id
+        $user_profiles = db_get_all_rows_sql(
+            'SELECT * FROM tusuario_perfil where id_usuario LIKE "'.$user_id.'" LIMIT 5'
         );
     } else {
         $user_profiles_aux = users_get_user_profile($user_id);
@@ -674,9 +705,9 @@ foreach ($info as $user_id => $user_info) {
     if ($user_profiles !== false) {
         $total_profile = 0;
 
-            $data[4] .= '<div class="text_end">';
+        $data[4] .= '<div class="text_end" id="profiles_'.$user_profiles[0]['id_usuario'].'">';
         foreach ($user_profiles as $row) {
-            if ($total_profile <= 5) {
+            if ($total_profile < 5) {
                 $data[4] .= "<div class='float-left'>";
                 $data[4] .= profile_get_name($row['id_perfil']);
                 $data[4] .= ' / </div>';
@@ -685,8 +716,7 @@ foreach ($info as $user_id => $user_info) {
                 $data[4] .= '</div>';
 
                 if ($total_profile == 0 && count($user_profiles) >= 5) {
-                    $data[4] .= '<span onclick="showGroups()" class="pdd_l_15px">
-            '.html_print_image(
+                    $data[4] .= '<span onclick="showGroups(`'.$row['id_usuario'].'`)" class="pdd_l_15px">'.html_print_image(
                         'images/zoom.png',
                         true,
                         [
@@ -694,16 +724,15 @@ foreach ($info as $user_id => $user_info) {
                             'class' => 'invert_filter',
                         ]
                     ).'</span>';
+
+                    $data[4] .= html_print_input_hidden(
+                        'show_groups_'.$row['id_usuario'],
+                        -1,
+                        true
+                    );
                 }
 
-                $data[4] .= '<br />';
-                $data[4] .= '<br />';
-                $data[4] .= '</div>';
-            } else {
-                $data[4] .= "<div id='groups_list' class='invisible'>";
-                $data[4] .= '<div >';
-                $data[4] .= profile_get_name($row['id_perfil']);
-                $data[4] .= ' / '.groups_get_name($row['id_grupo'], true).'</div>';
+                $data[4] .= '<br/>';
                 $data[4] .= '<br/>';
             }
 
@@ -882,16 +911,44 @@ echo '</div>';
 
 enterprise_hook('close_meta_frame');
 
-echo '<script type="text/javascript">
-function showGroups(){
-var groups_list = document.getElementById("groups_list");
+?>;
+<script type="text/javascript">
+    function showGroups(id_user) {
+        if ($(`#hidden-show_groups_${id_user}`).val() === '-1') {
+            var request = $.ajax({
+                url: "<?php echo ui_get_full_url('ajax.php', false, false, false); ?>",
+                type: 'GET',
+                dataType: 'JSON',
+                data: {
+                    page: 'godmode/users/user_list',
+                    get_user_profile_group: 1,
+                    id_user: id_user
+                },
+                success: function (data, textStatus, xhr) {
+                    let count = 1;
+                    data.forEach( function(valor, indice, array) {
+                        if (count >= 6) {
+                            let main_div = $(`#profiles_${id_user}`);
+                            main_div.append(
+                                `<div id="left_${id_user}_${count}" class='float-left'>${valor.id_perfil} / </div>`,
+                                `<div id="right_${id_user}_${count}" class='float-left pdd_l_5px'>${valor.id_grupo}</div>`,
+                                `<br/><br/>`
+                            );
+                        }
+                        count ++;
+                    });
+                }
+            });
+            $(`#hidden-show_groups_${id_user}`).val('1');
+        } else if ($(`#hidden-show_groups_${id_user}`).val() === '1') {
+            $(`#hidden-show_groups_${id_user}`).val('0');
+            $(`div[id^=left_${id_user}_]`).hide();
+            $(`div[id^=right_${id_user}_]`).hide();
+        } else {
+            $(`#hidden-show_groups_${id_user}`).val('1');
+            $(`div[id^=left_${id_user}_]`).show();
+            $(`div[id^=right_${id_user}_]`).show();
+        }
+    }
 
-if(groups_list.style.display == "none"){
-    document.querySelectorAll("[id=groups_list]").forEach(element=> 
-    element.style.display = "block");
-}else{
-    document.querySelectorAll("[id=groups_list]").forEach(element=> 
-    element.style.display = "none");
-};
-}
-</script>';
+</script>;

From 9b79ea79128db9cd8b19f9c49e0f9d5177d7f404 Mon Sep 17 00:00:00 2001
From: Daniel Maya <daniel.maya@pandorafms.com>
Date: Tue, 20 Sep 2022 16:05:27 +0200
Subject: [PATCH 04/22] #9506 Fixed um

---
 pandora_console/godmode/users/user_list.php | 14 ++++++++++----
 pandora_console/include/functions_users.php |  7 ++++---
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/pandora_console/godmode/users/user_list.php b/pandora_console/godmode/users/user_list.php
index b0dda31890..d282ff05af 100644
--- a/pandora_console/godmode/users/user_list.php
+++ b/pandora_console/godmode/users/user_list.php
@@ -99,10 +99,16 @@ if (is_ajax()) {
     if ($get_user_profile_group === true) {
         $id_user = get_parameter('id_user');
 
+        $user_is_admin = users_is_admin();
+
         $user_profiles = [];
 
+        if ($user_is_admin === false) {
+            $group_um = users_get_groups_UM($config['id_user']);
+        }
+
         // User profiles.
-        if (users_is_admin()) {
+        if ($user_is_admin || $id_user == $config['id_user'] || isset($group_um[0])) {
             $user_profiles = db_get_all_rows_field_filter(
                 'tusuario_perfil',
                 'id_usuario',
@@ -625,7 +631,7 @@ foreach ($info as $user_id => $user_info) {
             'SELECT * FROM tusuario_perfil where id_usuario LIKE "'.$user_id.'" LIMIT 5'
         );
     } else {
-        $user_profiles_aux = users_get_user_profile($user_id);
+        $user_profiles_aux = users_get_user_profile($user_id, 'LIMIT 5');
         $user_profiles = [];
         foreach ($group_um as $key => $value) {
             if (isset($user_profiles_aux[$key]) === true) {
@@ -911,7 +917,7 @@ echo '</div>';
 
 enterprise_hook('close_meta_frame');
 
-?>;
+?>
 <script type="text/javascript">
     function showGroups(id_user) {
         if ($(`#hidden-show_groups_${id_user}`).val() === '-1') {
@@ -951,4 +957,4 @@ enterprise_hook('close_meta_frame');
         }
     }
 
-</script>;
+</script>
diff --git a/pandora_console/include/functions_users.php b/pandora_console/include/functions_users.php
index f4e6e25be8..5db489377a 100755
--- a/pandora_console/include/functions_users.php
+++ b/pandora_console/include/functions_users.php
@@ -838,13 +838,14 @@ function users_has_profile_without_UM($id_user, $id_groups)
 }
 
 
-function users_get_user_profile($id_user)
+function users_get_user_profile($id_user, $limit='')
 {
     $sql = sprintf(
         "SELECT * FROM tusuario_perfil
         INNER JOIN tperfil ON tperfil.id_perfil = tusuario_perfil.id_perfil
-        WHERE tusuario_perfil.id_usuario like '%s'",
-        $id_user
+        WHERE tusuario_perfil.id_usuario like '%s' %s",
+        $id_user,
+        $limit
     );
 
     $aux = db_get_all_rows_sql($sql);

From 29c06a17f7c7b94d7de377d427feb0b228996cd0 Mon Sep 17 00:00:00 2001
From: Daniel Maya <daniel.maya@pandorafms.com>
Date: Wed, 21 Sep 2022 11:19:00 +0200
Subject: [PATCH 05/22] #9506 Fixed show profiles

---
 pandora_console/godmode/users/user_list.php | 59 ++++++++++-----------
 1 file changed, 29 insertions(+), 30 deletions(-)

diff --git a/pandora_console/godmode/users/user_list.php b/pandora_console/godmode/users/user_list.php
index d282ff05af..85a95a8f22 100644
--- a/pandora_console/godmode/users/user_list.php
+++ b/pandora_console/godmode/users/user_list.php
@@ -711,37 +711,35 @@ foreach ($info as $user_id => $user_info) {
     if ($user_profiles !== false) {
         $total_profile = 0;
 
-        $data[4] .= '<div class="text_end" id="profiles_'.$user_profiles[0]['id_usuario'].'">';
+        $data[4] .= '<div class="text_end">';
         foreach ($user_profiles as $row) {
-            if ($total_profile < 5) {
-                $data[4] .= "<div class='float-left'>";
-                $data[4] .= profile_get_name($row['id_perfil']);
-                $data[4] .= ' / </div>';
-                $data[4] .= "<div class='float-left pdd_l_5px'>";
-                $data[4] .= groups_get_name($row['id_grupo'], true);
-                $data[4] .= '</div>';
+            $data[4] .= "<div class='float-left'>";
+            $data[4] .= profile_get_name($row['id_perfil']);
+            $data[4] .= ' / </div>';
+            $data[4] .= "<div class='float-left pdd_l_5px'>";
+            $data[4] .= groups_get_name($row['id_grupo'], true);
+            $data[4] .= '</div>';
 
-                if ($total_profile == 0 && count($user_profiles) >= 5) {
-                    $data[4] .= '<span onclick="showGroups(`'.$row['id_usuario'].'`)" class="pdd_l_15px">'.html_print_image(
-                        'images/zoom.png',
-                        true,
-                        [
-                            'title' => __('Show'),
-                            'class' => 'invert_filter',
-                        ]
-                    ).'</span>';
+            if ($total_profile == 0 && count($user_profiles) >= 5) {
+                $data[4] .= '<span onclick="showGroups(`'.$row['id_usuario'].'`)">'.html_print_image(
+                    'images/zoom.png',
+                    true,
+                    [
+                        'title' => __('Show profiles'),
+                        'class' => 'invert_filter',
+                    ]
+                ).'</span>';
 
-                    $data[4] .= html_print_input_hidden(
-                        'show_groups_'.$row['id_usuario'],
-                        -1,
-                        true
-                    );
-                }
-
-                $data[4] .= '<br/>';
-                $data[4] .= '<br/>';
+                $data[4] .= html_print_input_hidden(
+                    'show_groups_'.$row['id_usuario'],
+                    -1,
+                    true
+                );
             }
 
+            $data[4] .= '<br/>';
+            $data[4] .= '<br/>';
+
             $total_profile++;
         }
 
@@ -754,6 +752,8 @@ foreach ($info as $user_id => $user_info) {
         }
 
         $data[4] .= '</div>';
+        $data[4] .= '<div class="invisible" id="profiles_'.$user_profiles[0]['id_usuario'].'">';
+        $data[4] .= '</div>';
     } else {
         $data[4] .= __('The user doesn\'t have any assigned profile/group');
     }
@@ -946,14 +946,13 @@ enterprise_hook('close_meta_frame');
                 }
             });
             $(`#hidden-show_groups_${id_user}`).val('1');
+            $(`#profiles_${id_user}`).show();
         } else if ($(`#hidden-show_groups_${id_user}`).val() === '1') {
             $(`#hidden-show_groups_${id_user}`).val('0');
-            $(`div[id^=left_${id_user}_]`).hide();
-            $(`div[id^=right_${id_user}_]`).hide();
+            $(`#profiles_${id_user}`).hide();
         } else {
             $(`#hidden-show_groups_${id_user}`).val('1');
-            $(`div[id^=left_${id_user}_]`).show();
-            $(`div[id^=right_${id_user}_]`).show();
+            $(`#profiles_${id_user}`).show();
         }
     }
 

From eed28bc668504e382d6800ec9d76954dc6770ff7 Mon Sep 17 00:00:00 2001
From: Calvo <luis.calvo@artica.es>
Date: Thu, 22 Sep 2022 17:07:43 +0200
Subject: [PATCH 06/22] Fix user form reset if profile fails

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

diff --git a/pandora_console/godmode/users/configure_user.php b/pandora_console/godmode/users/configure_user.php
index 3ed36f8737..d98fc1d944 100644
--- a/pandora_console/godmode/users/configure_user.php
+++ b/pandora_console/godmode/users/configure_user.php
@@ -512,6 +512,14 @@ if ($create_user) {
 
                         $result_profile = profile_create_user_profile($id, $profile2, $group2, false, $tags, $no_hierarchy);
 
+                        if ($result_profile === false) {
+                            $is_err = true;
+                            $user_info = $values;
+                            $password_new = '';
+                            $password_confirm = '';
+                            $new_user = true;
+                        }
+
                         ui_print_result_message(
                             $result_profile,
                             __('Profile added successfully'),

From 225646cd9dca32b59c56a092e254b95b2d81f79b Mon Sep 17 00:00:00 2001
From: Daniel Barbero <daniel.barbero@artica.es>
Date: Fri, 23 Sep 2022 13:55:01 +0200
Subject: [PATCH 07/22] fixed response events pandora_enterprise#9423

---
 pandora_console/include/ajax/events.php       | 317 +++++-----
 pandora_console/include/functions_events.php  | 105 +++-
 pandora_console/include/functions_ui.php      |   7 +-
 .../include/javascript/pandora_events.js      | 551 +++++++-----------
 pandora_console/include/styles/events.css     |  33 ++
 5 files changed, 479 insertions(+), 534 deletions(-)

diff --git a/pandora_console/include/ajax/events.php b/pandora_console/include/ajax/events.php
index c902a6479a..0d9dbda151 100644
--- a/pandora_console/include/ajax/events.php
+++ b/pandora_console/include/ajax/events.php
@@ -64,7 +64,8 @@ $add_comment = (bool) get_parameter('add_comment');
 $dialogue_event_response = (bool) get_parameter('dialogue_event_response');
 $perform_event_response = (bool) get_parameter('perform_event_response');
 $get_response = (bool) get_parameter('get_response');
-$get_response_target = (bool) get_parameter('get_response_target');
+$get_response_massive = (bool) get_parameter('get_response_massive');
+$get_row_response_action = (bool) get_parameter('get_row_response_action');
 $get_response_params = (bool) get_parameter('get_response_params');
 $get_response_description = (bool) get_parameter('get_response_description');
 $meta = get_parameter('meta', 0);
@@ -1090,50 +1091,6 @@ if ($get_response_params) {
     return;
 }
 
-if ($get_response_target === true) {
-    if (! check_acl($config['id_user'], 0, 'EW')) {
-        echo 'unauthorized';
-        return;
-    }
-
-    $response_id = (int) get_parameter('response_id');
-    $event_id = (int) get_parameter('event_id');
-    $server_id = (int) get_parameter('server_id');
-
-    try {
-        if (is_metaconsole() === true
-            && $server_id > 0
-        ) {
-            $node = new Node($server_id);
-            $node->connect();
-        }
-
-        $event_response = db_get_row('tevent_response', 'id', $response_id);
-
-        if (empty($event_response) === true) {
-            return;
-        }
-
-        echo events_get_response_target($event_id, $response_id);
-    } catch (\Exception $e) {
-        // Unexistent agent.
-        if (is_metaconsole() === true
-            && $server_id > 0
-        ) {
-            $node->disconnect();
-        }
-
-        return;
-    } finally {
-        if (is_metaconsole() === true
-            && $server_id > 0
-        ) {
-            $node->disconnect();
-        }
-    }
-
-    return;
-}
 
 if ($get_response === true) {
     if (! check_acl($config['id_user'], 0, 'EW')) {
@@ -1142,62 +1099,21 @@ if ($get_response === true) {
     }
 
     $response_id = get_parameter('response_id');
-    $server_id = (int) get_parameter('server_id');
+    $server_id = (int) get_parameter('server_id', 0);
+    $event_id = (int) get_parameter('event_id', 0);
 
-    try {
-        if (is_metaconsole() === true
-            && $server_id > 0
-        ) {
-            $node = new Node($server_id);
-            $node->connect();
-        }
-
-        $event_response = db_get_row(
-            'tevent_response',
-            'id',
-            $response_id
-        );
-    } catch (\Exception $e) {
-        // Unexistent agent.
-        if (is_metaconsole() === true
-            && $server_id > 0
-        ) {
-            $node->disconnect();
-        }
-
-        return;
-    } finally {
-        if (is_metaconsole() === true
-            && $server_id > 0
-        ) {
-            $node->disconnect();
-        }
-    }
+    $event_response = db_get_row(
+        'tevent_response',
+        'id',
+        $response_id
+    );
 
     if (empty($event_response) === true) {
-        return;
+        return [];
     }
 
-    echo json_encode($event_response);
 
-    return;
-}
-
-if ($perform_event_response === true) {
-    global $config;
-
-    if (! check_acl($config['id_user'], 0, 'EW')) {
-        echo 'unauthorized';
-        return;
-    }
-
-    $target = get_parameter('target', '');
-    $response_id = get_parameter('response_id');
-    $event_id = (int) get_parameter('event_id');
-    $server_id = (int) get_parameter('server_id', 0);
-
-    $event_response = false;
-    if (empty($target) === true) {
+    if (empty($event_id) === false) {
         try {
             if (is_metaconsole() === true
                 && $server_id > 0
@@ -1206,20 +1122,9 @@ if ($perform_event_response === true) {
                 $node->connect();
             }
 
-            $event_response = db_get_row(
-                'tevent_response',
-                'id',
-                $response_id
-            );
-
-            if (empty($event_response) === true) {
-                return;
-            }
-
-            $command = events_get_response_target(
+            $event_response['target'] = events_get_response_target(
                 $event_id,
-                $response_id,
-                $server_id
+                $event_response
             );
         } catch (\Exception $e) {
             // Unexistent agent.
@@ -1237,10 +1142,121 @@ if ($perform_event_response === true) {
                 $node->disconnect();
             }
         }
-    } else {
-        $command = $target;
     }
 
+    echo json_encode($event_response);
+
+    return;
+}
+
+
+if ($get_response_massive === true) {
+    if (! check_acl($config['id_user'], 0, 'EW')) {
+        echo 'unauthorized';
+        return;
+    }
+
+    $response_id = get_parameter('response_id');
+
+    $event_response = db_get_row(
+        'tevent_response',
+        'id',
+        $response_id
+    );
+
+    if (empty($event_response) === true) {
+        return [];
+    }
+
+
+    $events = json_decode(
+        io_safe_output(
+            get_parameter('events', '')
+        ),
+        true
+    );
+
+    $event_response_targets = [];
+    if (is_metaconsole() === true) {
+        foreach ($events as $server_id => $idEvents) {
+            foreach ($idEvents as $idEvent) {
+                $event_response_targets[$idEvent.'|'.$server_id]['target'] = get_events_get_response_target(
+                    $idEvent,
+                    $event_response,
+                    $server_id
+                );
+            }
+        }
+    } else {
+        foreach ($idEvents as $idEvent) {
+            $event_response_targets[$idEvent]['target'] = get_events_get_response_target(
+                $idEvent,
+                $event_response
+            );
+        }
+    }
+
+    $result = [
+        'event_response'         => $event_response,
+        'event_response_targets' => $event_response_targets,
+    ];
+
+    echo json_encode($result);
+
+    return;
+}
+
+if ($get_row_response_action === true) {
+    $response_id = get_parameter('response_id');
+    $response = json_decode(
+        io_safe_output(
+            get_parameter('response', '')
+        ),
+        true
+    );
+
+    $end = (bool) get_parameter('end', false);
+    $index = $response['event_id'];
+    if (is_metaconsole() === true) {
+        $index .= '-'.$response['server_id'];
+    }
+
+    echo get_row_response_action(
+        $response,
+        $response_id,
+        $end,
+        $index
+    );
+
+    return;
+}
+
+if ($perform_event_response === true) {
+    global $config;
+
+    if (! check_acl($config['id_user'], 0, 'EW')) {
+        echo __('unauthorized');
+        return;
+    }
+
+    $target = get_parameter('target', '');
+    $response_id = get_parameter('response_id');
+    $event_id = (int) get_parameter('event_id');
+    $server_id = (int) get_parameter('server_id', 0);
+    $response = json_decode(
+        io_safe_output(
+            get_parameter('response', '')
+        ),
+        true
+    );
+
+    $event_response = $response;
+    if (empty($event_response) === true) {
+        echo __('No data');
+        return;
+    }
+
+    $command = $event_response['target'];
     $command_timeout = ($event_response !== false) ? $event_response['command_timeout'] : 90;
     if (enterprise_installed() === true) {
         if ($event_response !== false
@@ -1320,7 +1336,7 @@ if ($perform_event_response === true) {
             break;
         }
 
-            system($timeout_bin.' '.$command_timeout.' '.io_safe_output($command).' 2>&1', $ret_val);
+        system($timeout_bin.' '.$command_timeout.' '.io_safe_output($command).' 2>&1', $ret_val);
     }
 
     if ($ret_val != 0) {
@@ -1343,78 +1359,19 @@ if ($dialogue_event_response) {
     $event_id = get_parameter('event_id');
     $response_id = get_parameter('response_id');
     $command = get_parameter('target');
-    $massive = get_parameter('massive');
-    $end = get_parameter('end');
-    $show_execute_again_btn = get_parameter('show_execute_again_btn');
-    $out_iterator = get_parameter('out_iterator');
-    $event_response = db_get_row('tevent_response', 'id', $response_id);
-    $server_id = get_parameter('server_id');
+    $event_response = json_decode(
+        io_safe_output(
+            get_parameter('response', '')
+        ),
+        true
+    );
 
-    $event = db_get_row('tevento', 'id_evento', $event_id);
-
-    $prompt = '<br>> ';
     switch ($event_response['type']) {
         case 'command':
-            $display_command = (bool) $event_response['display_command'];
-            $command_str = ($display_command === true) ? $command : '';
-
-            if ($massive) {
-                echo "<div class='left'>";
-                echo $prompt.sprintf(
-                    '(Event #'.$event_id.') '.__(
-                        'Executing command: %s',
-                        $command_str
-                    )
-                );
-                echo '</div><br>';
-
-                echo "<div id='response_loading_command_".$out_iterator."' style='display: none'>";
-                echo html_print_image(
-                    'images/spinner.gif',
-                    true
-                );
-                echo '</div><br>';
-                echo "<br><div id='response_out_".$out_iterator."'><br><br></div><br>";
-
-                if ($end) {
-                    echo "<br><div id='re_exec_command_".$out_iterator."' style='display: none'><br>";
-                    html_print_button(
-                        __('Execute again'),
-                        'btn_str',
-                        false,
-                        'execute_event_response(false);',
-                        "class='sub next'"
-                    );
-                    echo "<span id='execute_again_loading' style='display: none'>";
-                    echo html_print_image(
-                        'images/spinner.gif',
-                        true
-                    );
-                    echo '</span>';
-                    echo '</div>';
-                }
-            } else {
-                echo "<div class='left'>";
-
-                echo $prompt.'Executing command: '.$command_str;
-                echo '</div><br>';
-
-                echo "<div id='response_loading_command' style='display:none'>";
-                echo html_print_image('images/spinner.gif', true);
-                echo '</div>';
-                echo "<br><br><br><div id='response_out' class='left'></div>";
-
-                echo "<br><div id='re_exec_command' style='display:none'><br><br>";
-                html_print_button(
-                    __('Execute again'),
-                    'btn_str',
-                    false,
-                    "perform_response({'target':'".$command."','event_id':".$event_id.",'server_id':".$server_id.'}, '.$response_id.');',
-                    "class='sub next'"
-                );
-
-                echo '</div>';
-            }
+            echo get_row_response_action(
+                $event_response,
+                $response_id
+            );
         break;
 
         case 'url':
diff --git a/pandora_console/include/functions_events.php b/pandora_console/include/functions_events.php
index c36536348f..5537a7b521 100644
--- a/pandora_console/include/functions_events.php
+++ b/pandora_console/include/functions_events.php
@@ -3430,7 +3430,7 @@ function events_page_responses($event)
             __('Execute'),
             'custom_response_button',
             false,
-            'execute_response('.$event['id_evento'].','.$server_id.')',
+            'execute_response('.$event['id_evento'].','.$server_id.',0)',
             "class='sub next w70p'",
             true
         );
@@ -3438,6 +3438,7 @@ function events_page_responses($event)
 
     $table_responses->data[] = $data;
 
+    // TODO quitar el async: false. get_response_params and get_response_description.
     $responses_js = "<script>
 			$('#select_custom_response').change(function() {
 				var id_response = $('#select_custom_response').val();
@@ -3477,7 +3478,7 @@ function events_page_responses($event)
  */
 function events_get_response_target(
     int $event_id,
-    int $response_id
+    array $event_response
 ) {
     global $config;
 
@@ -3490,9 +3491,7 @@ function events_get_response_target(
     }
 
     $event = db_get_row('tevento', 'id_evento', $event_id);
-    $event_response = db_get_row('tevent_response', 'id', $response_id);
     $target = io_safe_output($event_response['target']);
-
     if (strpos($target, '_agent_alias_') !== false) {
         $agente_table_name = 'tagente';
         $filter = ['id_agente' => $event['id_agente']];
@@ -5464,3 +5463,101 @@ function events_get_criticity_class($criticity)
         return 'datos_blue';
     }
 }
+
+
+// TODO
+function get_row_response_action(
+    array $event_response,
+    ?int $response_id,
+    $end=false,
+    $index=null
+) {
+    $output = '<div class="container-massive-events-response-cell">';
+    $display_command = (bool) $event_response['display_command'];
+    $command_str = ($display_command === true) ? $event_response['target'] : '';
+
+    // String command.
+    $output .= '<div class="container-massive-events-response-command">';
+    $output .= '<b>';
+    $output .= __('Event # %d', $event_response['event_id']);
+    if (empty($command_str) === false) {
+        $output .= ' ';
+        $output .= __('Executing command: ');
+    }
+
+    $output .= '</b>';
+    $output .= '<span>'.$command_str.'</span>';
+    $output .= '</div>';
+
+    // Spinner.
+    $output .= '<div id="response_loading_command'.$index.'" style="display:none">';
+    $output .= html_print_image(
+        'images/spinner.gif',
+        true
+    );
+    $output .= '</div>';
+
+    // Output.
+    $output .= '<div id="response_out'.$index.'" class="container-massive-events-response-output"></div>';
+
+    // Butom.
+    $output .= '<div id="re_exec_command'.$index.'" style="display:none" class="container-massive-events-response-execute">';
+    $output .= html_print_button(
+        __('Execute again'),
+        'btn_str',
+        false,
+        'perform_response(\''.base64_encode(json_encode($event_response)).'\','.$response_id.',\''.trim($index).'\')',
+        "class='sub next'",
+        true
+    );
+    $output .= '</div>';
+
+    $output .= '</div>';
+
+    return $output;
+}
+
+
+/**
+ * Get evet get response target.
+ *
+ * @param integer $event_id       Id event.
+ * @param array   $event_response Response.
+ * @param integer $server_id      Server id.
+ *
+ * @return string
+ */
+function get_events_get_response_target(
+    $event_id,
+    $event_response,
+    $server_id=0
+) {
+    try {
+        if (is_metaconsole() === true
+            && $server_id > 0
+        ) {
+            $node = new Node($server_id);
+            $node->connect();
+        }
+
+        return events_get_response_target(
+            $event_id,
+            $event_response
+        );
+    } catch (\Exception $e) {
+        // Unexistent agent.
+        if (is_metaconsole() === true
+            && $server_id > 0
+        ) {
+            $node->disconnect();
+        }
+
+        return '';
+    } finally {
+        if (is_metaconsole() === true
+            && $server_id > 0
+        ) {
+            $node->disconnect();
+        }
+    }
+}
diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index 9db7f80fb7..8bd84d0e02 100755
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -3402,7 +3402,7 @@ function ui_print_datatable(array $parameters)
         $filter .= '</li>';
 
         $filter .= '</ul><div id="both"></div></form>';
-        if (isset($parameters['form']['no_toggle']) === false && ($parameters['form']['no_toggle'] !== true)) {
+        if (isset($parameters['form']['no_toggle']) === false) {
             $filter = ui_toggle(
                 $filter,
                 __('Filter'),
@@ -3466,7 +3466,10 @@ function ui_print_datatable(array $parameters)
     foreach ($names as $column) {
         if (is_array($column)) {
             $table .= '<th id="'.$column['id'].'" class="'.$column['class'].'" ';
-            $table .= 'title="'.__($column['title']).'" ';
+            if (isset($column['title']) === true) {
+                $table .= 'title="'.__($column['title']).'" ';
+            }
+
             $table .= ' style="'.$column['style'].'">'.__($column['text']);
             $table .= $column['extra'];
             $table .= '</th>';
diff --git a/pandora_console/include/javascript/pandora_events.js b/pandora_console/include/javascript/pandora_events.js
index b7f4170afa..5e0ec83920 100644
--- a/pandora_console/include/javascript/pandora_events.js
+++ b/pandora_console/include/javascript/pandora_events.js
@@ -85,29 +85,6 @@ function show_event_dialog(event, dialog_page) {
       $("#refrcounter").countdown("pause");
       $("div.vc-countdown").countdown("pause");
 
-      /*
-      switch (result) {
-        case "comment_ok":
-          $("#notification_comment_success").show();
-          break;
-        case "comment_error":
-          $("#notification_comment_error").show();
-          break;
-        case "status_ok":
-          $("#notification_status_success").show();
-          break;
-        case "status_error":
-          $("#notification_status_error").show();
-          break;
-        case "owner_ok":
-          $("#notification_owner_success").show();
-          break;
-        case "owner_error":
-          $("#notification_owner_error").show();
-          break;
-      }
-      */
-
       forced_title_callback();
     },
     "html"
@@ -119,37 +96,129 @@ function show_event_dialog(event, dialog_page) {
 function execute_response(event_id, server_id) {
   var response_id = $("#select_custom_response option:selected").val();
 
-  var response = get_response(response_id, server_id);
+  var params = [];
+  params.push({ name: "page", value: "include/ajax/events" });
+  params.push({ name: "get_response", value: 1 });
+  params.push({ name: "response_id", value: response_id });
+  params.push({ name: "server_id", value: server_id });
+  params.push({ name: "event_id", value: event_id });
 
-  // If cannot get response abort it
-  if (response == null) {
-    return;
-  }
+  jQuery.ajax({
+    data: params,
+    type: "POST",
+    url: $("#hidden-ajax_file").val(),
+    dataType: "json",
+    success: function(response) {
+      // If cannot get response abort it
+      if (response == null) {
+        return [];
+      }
 
-  response["target"] = get_response_target(event_id, response_id, server_id);
-  response["event_id"] = event_id;
-  response["server_id"] = server_id;
+      response["event_id"] = event_id;
+      response["server_id"] = server_id;
+      if (response["type"] == "url" && response["new_window"] == 1) {
+        window.open(response["target"], "_blank");
+      } else {
+        show_response_dialog(response_id, response);
+      }
+    }
+  });
+}
 
-  if (response["type"] == "url" && response["new_window"] == 1) {
-    window.open(response["target"], "_blank");
-  } else {
-    show_response_dialog(response_id, response);
-  }
+// Check the response type and open it in a modal dialog or new window
+function execute_response_massive(events, response_id) {
+  var params = [];
+  params.push({ name: "page", value: "include/ajax/events" });
+  params.push({ name: "get_response_massive", value: 1 });
+  params.push({ name: "response_id", value: response_id });
+  params.push({ name: "events", value: JSON.stringify(events) });
+
+  jQuery.ajax({
+    data: params,
+    type: "POST",
+    url: $("#hidden-ajax_file").val(),
+    dataType: "json",
+    success: function(data) {
+      // If cannot get response abort it
+      if (data == null) {
+        return [];
+      }
+
+      $(".container-massive-events-response").empty();
+
+      // Convert to array.
+      var array_data = Object.entries(data.event_response_targets);
+      var total_count = array_data.length;
+
+      // Each input checkeds.
+      array_data.forEach(function(element, index) {
+        var id = element[0];
+        var target = element[1].target;
+        var meta = $("#hidden-meta").val();
+        var event_id = id;
+        var server_id = 0;
+        if (meta != 0) {
+          var split_id = id.split("|");
+          event_id = split_id[0];
+          server_id = split_id[1];
+        }
+
+        var end = 0;
+        if (total_count - 1 === index) {
+          end = 1;
+        }
+
+        var response = data.event_response;
+        response["event_id"] = event_id;
+        response["server_id"] = server_id;
+        response["target"] = target;
+        if (response["type"] == "url" && response["new_window"] == 1) {
+          window.open(response["target"], "_blank");
+        } else {
+          var params = [];
+          params.push({ name: "page", value: "include/ajax/events" });
+          params.push({ name: "get_row_response_action", value: 1 });
+          params.push({ name: "response_id", value: response_id });
+          params.push({ name: "server_id", value: response.server_id });
+          params.push({ name: "end", value: end });
+          params.push({ name: "response", value: JSON.stringify(response) });
+
+          jQuery.ajax({
+            data: params,
+            type: "POST",
+            url: $("#hidden-ajax_file").val(),
+            dataType: "html",
+            success: function(data) {
+              $(".container-massive-events-response").append(data);
+              response["event_id"] = event_id;
+              response["server_id"] = server_id;
+              response["target"] = target;
+              perform_response(
+                btoa(JSON.stringify(response)),
+                response_id,
+                event_id + "-" + server_id
+              );
+            }
+          });
+        }
+      });
+    }
+  });
 }
 
 //Show the modal window of an event response
 function show_response_dialog(response_id, response) {
   var params = [];
-  params.push("page=include/ajax/events");
-  params.push("dialogue_event_response=1");
-  params.push("massive=0");
-  params.push("event_id=" + response["event_id"]);
-  params.push("target=" + encodeURIComponent(response["target"]));
-  params.push("response_id=" + response_id);
-  params.push("server_id=" + response["server_id"]);
+  params.push({ name: "page", value: "include/ajax/events" });
+  params.push({ name: "dialogue_event_response", value: 1 });
+  params.push({ name: "event_id", value: response.event_id });
+  params.push({ name: "target", value: response.target });
+  params.push({ name: "response_id", value: response_id });
+  params.push({ name: "server_id", value: response.server_id });
+  params.push({ name: "response", value: JSON.stringify(response) });
 
   jQuery.ajax({
-    data: params.join("&"),
+    data: params,
     type: "POST",
     url: $("#hidden-ajax_file").val(),
     dataType: "html",
@@ -164,7 +233,7 @@ function show_response_dialog(response_id, response) {
           draggable: true,
           modal: false,
           open: function() {
-            perform_response(response, response_id);
+            perform_response(btoa(JSON.stringify(response)), response_id, "");
           },
           width: response["modal_width"],
           height: response["modal_height"]
@@ -174,89 +243,6 @@ function show_response_dialog(response_id, response) {
   });
 }
 
-//Show the modal window of event responses when multiple events are selected
-function show_massive_response_dialog(
-  response_id,
-  response,
-  out_iterator,
-  end
-) {
-  var params = [];
-  params.push("page=include/ajax/events");
-  params.push("dialogue_event_response=1");
-  params.push("massive=1");
-  params.push("end=" + end);
-  params.push("out_iterator=" + out_iterator);
-  params.push("event_id=" + response["event_id"]);
-  params.push("target=" + response["target"]);
-  params.push("response_id=" + response_id);
-  params.push("server_id=" + response["server_id"]);
-
-  jQuery.ajax({
-    data: params.join("&"),
-    response_tg: response,
-    response_id: response_id,
-    out_iterator: out_iterator,
-    type: "POST",
-    url: $("#hidden-ajax_file").val(),
-    dataType: "html",
-    success: function(data) {
-      if (out_iterator === 0) $("#event_response_window").empty();
-
-      $("#event_response_window")
-        .hide()
-        .append(data)
-        .dialog({
-          title: $("#select_custom_response option:selected").html(),
-          resizable: true,
-          draggable: true,
-          modal: false,
-          open: function() {
-            $("#response_loading_dialog").hide();
-            $("#button-submit_event_response").show();
-          },
-          close: function() {
-            $("#checkbox-all_validate_box").prop("checked", false);
-            $(".chk_val").prop("checked", false);
-          },
-          width: response["modal_width"],
-          height: response["modal_height"]
-        })
-        .show();
-
-      perform_response_massive(
-        this.response_tg,
-        this.response_id,
-        this.out_iterator
-      );
-    }
-  });
-}
-
-// Get an event response from db
-function get_response(response_id, server_id) {
-  var response = "";
-
-  var params = [];
-  params.push("page=include/ajax/events");
-  params.push("get_response=1");
-  params.push("response_id=" + response_id);
-  params.push("server_id=" + server_id);
-
-  jQuery.ajax({
-    data: params.join("&"),
-    type: "POST",
-    url: $("#hidden-ajax_file").val(),
-    async: false,
-    dataType: "json",
-    success: function(data) {
-      response = data;
-    }
-  });
-
-  return response;
-}
-
 // Get an event response params from db
 function get_response_params(response_id) {
   var response_params;
@@ -315,120 +301,38 @@ function add_row_param(id_table, param) {
   );
 }
 
-// Get an event response from db
-function get_response_target(
-  event_id,
-  response_id,
-  server_id,
-  response_command
-) {
-  var target = "";
+// Perform a response and put the output into a div
+function perform_response(response, response_id, index) {
+  $("#re_exec_command" + index).hide();
+  $("#response_loading_command" + index).show();
+  $("#response_out" + index).html("");
 
-  // Replace the main macros
-  var params = [];
-  params.push("page=include/ajax/events");
-  params.push("get_response_target=1");
-  params.push("event_id=" + event_id);
-  params.push("response_id=" + response_id);
-  params.push("server_id=" + server_id);
-
-  jQuery.ajax({
-    data: params.join("&"),
-    type: "POST",
-    url: $("#hidden-ajax_file").val(),
-    async: false,
-    dataType: "html",
-    success: function(data) {
-      target = data;
-    }
-  });
-
-  // Replace the custom params macros.
-  var response_params = get_response_params(response_id);
-  if (response_params.length > 1 || response_params[0] != "") {
-    for (var i = 0; i < response_params.length; i++) {
-      if (!response_command) {
-        var response_param = "_" + response_params[i] + "_";
-
-        if (
-          response_params[i].startsWith("_") &&
-          response_params[i].endsWith("_")
-        ) {
-          response_param = response_params[i];
-        }
-
-        target = target.replace(
-          response_param,
-          $("#" + response_params[i]).val()
-        );
-      } else {
-        target = target.replace(
-          "_" + response_params[i] + "_",
-          response_command[response_params[i] + "-" + i]
-        );
-      }
-    }
+  try {
+    response = JSON.parse(atob(response));
+  } catch (e) {
+    console.error(e);
+    return;
   }
 
-  return target;
-}
-
-// Perform a response and put the output into a div
-function perform_response(response, response_id) {
-  $("#re_exec_command").hide();
-  $("#response_loading_command").show();
-  $("#response_out").html("");
-
   var params = [];
-  params.push("page=include/ajax/events");
-  params.push("perform_event_response=1");
-  params.push("target=" + encodeURIComponent(response["target"]));
-  params.push("response_id=" + response_id);
-  params.push("event_id=" + response["event_id"]);
-  params.push("server_id=" + response["server_id"]);
+  params.push({ name: "page", value: "include/ajax/events" });
+  params.push({ name: "perform_event_response", value: 1 });
+  params.push({ name: "target", value: response["target"] });
+  params.push({ name: "response_id", value: response_id });
+  params.push({ name: "event_id", value: response["event_id"] });
+  params.push({ name: "server_id", value: response["server_id"] });
+  params.push({ name: "response", value: JSON.stringify(response) });
 
   jQuery.ajax({
-    data: params.join("&"),
+    data: params,
     type: "POST",
     url: $("#hidden-ajax_file").val(),
-    async: true,
     dataType: "html",
     success: function(data) {
       var out = data.replace(/[\n|\r]/g, "<br>");
-      $("#response_out").html(out);
-      $("#response_loading_command").hide();
-      $("#re_exec_command").show();
-    }
-  });
-
-  return false;
-}
-
-// Perform a response and put the output into a div
-function perform_response_massive(response, response_id, out_iterator) {
-  $("#re_exec_command").hide();
-  $("#response_loading_command_" + out_iterator).show();
-  $("#response_out_" + out_iterator).html("");
-
-  var params = [];
-  params.push("page=include/ajax/events");
-  params.push("perform_event_response=1");
-  params.push("target=" + response["target"]);
-  params.push("response_id=" + response_id);
-  params.push("event_id=" + response["event_id"]);
-  params.push("server_id=" + response["server_id"]);
-
-  jQuery.ajax({
-    data: params.join("&"),
-    type: "POST",
-    url: $("#hidden-ajax_file").val(),
-    async: true,
-    dataType: "html",
-    success: function(data) {
-      var out = data.replace(/[\n|\r]/g, "<br>");
-      $("#response_out_" + out_iterator).html(out);
-      $("#response_loading_command_" + out_iterator).hide();
-      $("#re_exec_command_" + out_iterator).show();
+      $("#response_out" + index).html(out);
+      $("#response_loading_command" + index).hide();
+      $("#re_exec_command" + index).show();
     }
   });
 
@@ -594,54 +498,6 @@ function event_comment(current_event) {
   return false;
 }
 
-function show_event_response_command_dialog(id, response, total_checked) {
-  var params = [];
-  params.push("page=include/ajax/events");
-  params.push("get_table_response_command=1");
-  params.push("event_response_id=" + id);
-
-  jQuery.ajax({
-    data: params.join("&"),
-    type: "POST",
-    url: $("#hidden-ajax_file").val(),
-    dataType: "html",
-    success: function(data) {
-      $("#event_response_command_window")
-        .hide()
-        .empty()
-        .append(data)
-        .dialog({
-          resizable: true,
-          draggable: true,
-          modal: false,
-          open: function() {
-            $("#response_loading_dialog").hide();
-            $("#button-submit_event_response").show();
-          },
-          width: 600,
-          height: 300
-        })
-        .show();
-
-      $("#submit-enter_command").on("click", function(e) {
-        e.preventDefault();
-        var response_command = [];
-
-        $(".response_command_input").each(function() {
-          response_command[$(this).attr("name")] = $(this).val();
-        });
-
-        check_massive_response_event(
-          id,
-          response,
-          total_checked,
-          response_command
-        );
-      });
-    }
-  });
-}
-
 var processed = 0;
 function update_event(table, id_evento, type, event_rep, row, server_id) {
   var inputs = $("#events_form :input");
@@ -838,58 +694,14 @@ function execute_event_response(event_list_btn) {
       }
 
       if (!isNaN(response_id)) {
-        // It is a custom response
-        var response = get_response(response_id);
-
-        // If cannot get response abort it
-        if (response == null) {
-          return;
-        }
-
-        // Limit number of events to apply custom responses
-        // due performance reasons.
-        if (total_checked > $("#max_execution_event_response").val()) {
-          $("#max_custom_event_resp_msg").show();
-          return;
-        }
-
-        var response_command = [];
-        $(".response_command_input").each(function() {
-          response_command[$(this).attr("name")] = $(this).val();
-        });
-
         if (event_list_btn) {
           $("#button-submit_event_response").hide(function() {
             $("#response_loading_dialog").show(function() {
-              var check_params = get_response_params(response_id);
-
-              if (check_params[0] !== "") {
-                show_event_response_command_dialog(
-                  response_id,
-                  response,
-                  total_checked
-                );
-              } else {
-                check_massive_response_event(
-                  response_id,
-                  response,
-                  total_checked,
-                  response_command
-                );
-              }
+              show_response_dialog_massive(response_id);
             });
           });
         } else {
-          $("#button-btn_str").hide(function() {
-            $("#execute_again_loading").show(function() {
-              check_massive_response_event(
-                response_id,
-                response,
-                total_checked,
-                response_command
-              );
-            });
-          });
+          check_execute_response_massive(response_id);
         }
       } else {
         // It is not a custom response
@@ -964,15 +776,63 @@ function execute_event_response(event_list_btn) {
   });
 }
 
-function check_massive_response_event(
-  response_id,
-  response,
-  total_checked,
-  response_command
-) {
-  var counter = 0;
-  var end = 0;
+function show_response_dialog_massive(response_id) {
+  var params = [];
+  params.push({ name: "page", value: "include/ajax/events" });
+  params.push({ name: "get_response", value: 1 });
+  params.push({ name: "response_id", value: response_id });
 
+  jQuery.ajax({
+    data: params,
+    type: "POST",
+    url: $("#hidden-ajax_file").val(),
+    dataType: "json",
+    success: function(response) {
+      // If cannot get response abort it
+      if (response == null) {
+        return [];
+      }
+
+      $("#event_response_window")
+        .hide()
+        .empty()
+        .append('<div class="container-massive-events-response"></div>')
+        .dialog({
+          title: $("#response_id option:selected").html(),
+          resizable: true,
+          draggable: true,
+          modal: false,
+          open: function() {
+            check_execute_response_massive(response_id);
+          },
+          close: function() {
+            $("#checkbox-all_validate_box").prop("checked", false);
+            $(".chk_val").prop("checked", false);
+            $("#response_loading_dialog").hide();
+            $("#button-submit_event_response").show();
+          },
+          buttons: [
+            {
+              text: "Execute All",
+              id: "execute-again-all",
+              class:
+                "ui-widget ui-state-default ui-corner-all ui-button-text-only sub ok submit-next",
+              click: function() {
+                execute_event_response(false);
+              }
+            }
+          ],
+          width: response["modal_width"],
+          height: response["modal_height"]
+        })
+        .show();
+    }
+  });
+}
+
+function check_execute_response_massive(response_id) {
+  var events = [];
+  $(".container-massive-events-response").empty();
   $(".chk_val:checked").each(function() {
     var event_id = $(this).val();
     var meta = $("#hidden-meta").val();
@@ -981,23 +841,18 @@ function check_massive_response_event(
       var split_id = event_id.split("|");
       event_id = split_id[0];
       server_id = split_id[1];
+
+      if (events[server_id] === undefined) {
+        events[server_id] = [];
+      }
+
+      events[server_id].push(event_id);
+    } else {
+      events.push(event_id);
     }
-
-    response["target"] = get_response_target(
-      event_id,
-      response_id,
-      server_id,
-      response_command
-    );
-    response["server_id"] = server_id;
-    response["event_id"] = event_id;
-
-    if (total_checked - 1 === counter) end = 1;
-
-    show_massive_response_dialog(response_id, response, counter, end);
-
-    counter++;
   });
+
+  execute_response_massive(events, response_id);
 }
 
 function event_widget_options() {
diff --git a/pandora_console/include/styles/events.css b/pandora_console/include/styles/events.css
index 2e92c0d302..5ad4579f61 100644
--- a/pandora_console/include/styles/events.css
+++ b/pandora_console/include/styles/events.css
@@ -396,3 +396,36 @@ div.multi-response-buttons {
 .white_table_graph_header {
   align-items: center;
 }
+
+.container-massive-events-response {
+  display: flex;
+  flex-direction: column;
+  justify-content: flex-start;
+  align-items: flex-start;
+}
+
+.container-massive-events-response-cell {
+  margin-bottom: 10px;
+  width: 100%;
+  display: flex;
+  flex-direction: column;
+  justify-content: flex-start;
+  align-content: flex-start;
+}
+
+.container-massive-events-response-command > span {
+  font-style: italic;
+}
+
+.container-massive-events-response-output {
+  /*border: 2px dashed #ddd;*/
+  /*padding: 10px;*/
+  margin: 10px;
+}
+
+.container-massive-events-response-execute {
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-end;
+  align-items: center;
+}

From bf5a5e16dc4e36d460cc144cdb7ce169d1282b34 Mon Sep 17 00:00:00 2001
From: Calvo <luis.calvo@artica.es>
Date: Mon, 26 Sep 2022 12:49:00 +0200
Subject: [PATCH 08/22] Fix agent edtion unique ip issues

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

diff --git a/pandora_console/godmode/agentes/configurar_agente.php b/pandora_console/godmode/agentes/configurar_agente.php
index af29579055..ace8b9c106 100644
--- a/pandora_console/godmode/agentes/configurar_agente.php
+++ b/pandora_console/godmode/agentes/configurar_agente.php
@@ -1047,7 +1047,7 @@ if ($update_agent) {
         // If there is an agent with the same name, but a different ID.
     }
 
-    if ($unique_ip && $direccion_agente != '') {
+    if ($direccion_agente !== $address_list && (bool) $unique_ip === true && $direccion_agente != '') {
         $sql = 'SELECT direccion FROM tagente WHERE direccion = "'.$direccion_agente.'"';
         $exists_ip  = db_get_row_sql($sql);
     }

From fbce8b7533ae507407eb91eea4389151114caa8d Mon Sep 17 00:00:00 2001
From: Daniel Barbero <daniel.barbero@artica.es>
Date: Tue, 27 Sep 2022 09:51:37 +0200
Subject: [PATCH 09/22] fixed response events pandora_enterprise#9423

---
 pandora_console/include/ajax/events.php       | 138 ++++++++++-----
 pandora_console/include/functions_events.php  |  77 ++++++---
 .../include/javascript/pandora_events.js      | 163 ++++++++++--------
 pandora_console/include/styles/events.css     |  23 +++
 .../agentes/estado_generalagente.php          |   5 +-
 5 files changed, 267 insertions(+), 139 deletions(-)

diff --git a/pandora_console/include/ajax/events.php b/pandora_console/include/ajax/events.php
index 0d9dbda151..dbb7924517 100644
--- a/pandora_console/include/ajax/events.php
+++ b/pandora_console/include/ajax/events.php
@@ -66,8 +66,7 @@ $perform_event_response = (bool) get_parameter('perform_event_response');
 $get_response = (bool) get_parameter('get_response');
 $get_response_massive = (bool) get_parameter('get_response_massive');
 $get_row_response_action = (bool) get_parameter('get_row_response_action');
-$get_response_params = (bool) get_parameter('get_response_params');
-$get_response_description = (bool) get_parameter('get_response_description');
+$draw_row_response_info = (bool) get_parameter('draw_row_response_info', false);
 $meta = get_parameter('meta', 0);
 $history = get_parameter('history', 0);
 $table_events = get_parameter('table_events', 0);
@@ -1055,43 +1054,6 @@ $(document).ready(function (){
 }
 
 
-if ($get_response_description) {
-    $response_id = get_parameter('response_id');
-
-    $description = db_get_value('description', 'tevent_response', 'id', $response_id);
-
-    if ($description === false) {
-        return;
-    }
-
-    $description = io_safe_output($description);
-    $description = str_replace("\r\n", '<br>', $description);
-
-    echo $description;
-
-    return;
-}
-
-if ($get_response_params) {
-    if (! check_acl($config['id_user'], 0, 'EW')) {
-        echo 'unauthorized';
-        return;
-    }
-
-    $response_id = get_parameter('response_id');
-
-    $params = db_get_value('params', 'tevent_response', 'id', $response_id);
-
-    if ($params === false) {
-        return;
-    }
-
-    echo json_encode(explode(',', $params));
-
-    return;
-}
-
-
 if ($get_response === true) {
     if (! check_acl($config['id_user'], 0, 'EW')) {
         echo 'unauthorized';
@@ -1101,6 +1063,12 @@ if ($get_response === true) {
     $response_id = get_parameter('response_id');
     $server_id = (int) get_parameter('server_id', 0);
     $event_id = (int) get_parameter('event_id', 0);
+    $response_parameters = json_decode(
+        io_safe_output(
+            get_parameter('response_parameters', '')
+        ),
+        true
+    );
 
     $event_response = db_get_row(
         'tevent_response',
@@ -1124,7 +1092,8 @@ if ($get_response === true) {
 
             $event_response['target'] = events_get_response_target(
                 $event_id,
-                $event_response
+                $event_response,
+                $response_parameters
             );
         } catch (\Exception $e) {
             // Unexistent agent.
@@ -1168,7 +1137,6 @@ if ($get_response_massive === true) {
         return [];
     }
 
-
     $events = json_decode(
         io_safe_output(
             get_parameter('events', '')
@@ -1176,6 +1144,13 @@ if ($get_response_massive === true) {
         true
     );
 
+    $response_parameters = json_decode(
+        io_safe_output(
+            get_parameter('response_parameters', '')
+        ),
+        true
+    );
+
     $event_response_targets = [];
     if (is_metaconsole() === true) {
         foreach ($events as $server_id => $idEvents) {
@@ -1183,15 +1158,18 @@ if ($get_response_massive === true) {
                 $event_response_targets[$idEvent.'|'.$server_id]['target'] = get_events_get_response_target(
                     $idEvent,
                     $event_response,
-                    $server_id
+                    $server_id,
+                    $response_parameters
                 );
             }
         }
     } else {
-        foreach ($idEvents as $idEvent) {
+        foreach ($events as $idEvent) {
             $event_response_targets[$idEvent]['target'] = get_events_get_response_target(
                 $idEvent,
-                $event_response
+                $event_response,
+                0,
+                $response_parameters
             );
         }
     }
@@ -2491,3 +2469,75 @@ if ($get_events_fired) {
     echo io_json_mb_encode($return);
     return;
 }
+
+if ($draw_row_response_info === true) {
+    $event_response = json_decode(
+        io_safe_output(
+            get_parameter('response', '')
+        ),
+        true
+    );
+
+    $massive = (bool) get_parameter('massive', false);
+
+    $output .= '';
+    if ($massive === true) {
+        $output .= '<div>';
+        $output .= '<h5>';
+        $output .= $event_response['description'];
+        $output .= '</h5>';
+        $output .= '</div>';
+    } else {
+        $output .= '<tr class="params_rows">';
+        $output .= '<td>';
+        $output .= __('Description');
+        $output .= '</td>';
+        $output .= '<td class="height_30px" colspan="2">';
+        $output .= $event_response['description'];
+        $output .= '</td>';
+        $output .= '</tr>';
+    }
+
+    if (empty($event_response['params']) === false) {
+        $response_params = explode(',', $event_response['params']);
+        if (is_array($response_params) === true) {
+            if ($massive === true) {
+                $output .= '<div>';
+            } else {
+                $output .= '<tr class="params_rows">';
+                $output .= '<td class="left pdd_l_20px height_30px" colspan="3">';
+                $output .= __('Parameters');
+                $output .= '</td>';
+                $output .= '</tr>';
+            }
+
+            foreach ($response_params as $param) {
+                $param = trim(io_safe_output($param));
+                if ($massive === true) {
+                    $output .= '<div>';
+                    $output .= '<label>';
+                    $output .= $param;
+                    $output .= '</label>';
+                    $output .= '<input type="text" name="values_params_'.$param.'" />';
+                    $output .= '</div>';
+                } else {
+                    $output .= '<tr class="params_rows">';
+                    $output .= '<td style="text-align:left; padding-left:40px; font-weight: normal; font-style: italic;">';
+                    $output .= $param;
+                    $output .= '</td>';
+                    $output .= '<td style="text-align:left" colspan="2">';
+                    $output .= '<input type="text" name="values_params_'.$param.'" />';
+                    $output .= '</td>';
+                    $output .= '</tr>';
+                }
+            }
+
+            if ($massive === true) {
+                $output .= '</div>';
+            }
+        }
+    }
+
+    echo $output;
+    return;
+}
diff --git a/pandora_console/include/functions_events.php b/pandora_console/include/functions_events.php
index 5537a7b521..c3345cf9db 100644
--- a/pandora_console/include/functions_events.php
+++ b/pandora_console/include/functions_events.php
@@ -3438,31 +3438,18 @@ function events_page_responses($event)
 
     $table_responses->data[] = $data;
 
-    // TODO quitar el async: false. get_response_params and get_response_description.
     $responses_js = "<script>
 			$('#select_custom_response').change(function() {
 				var id_response = $('#select_custom_response').val();
-				var params = get_response_params(id_response);
-				var description = get_response_description(id_response);
-				$('.params_rows').remove();
-				$('#responses_table')
-					.append('<tr class=\"params_rows\"><td>".__('Description')."</td><td class=\"height_30px\" colspan=\"2\">'+description+'</td></tr>');
-
-				if (params.length == 1 && params[0] == '') {
-					return;
-				}
-
-				$('#responses_table')
-					.append('<tr class=\"params_rows\"><td class=\"left pdd_l_20px height_30px\" colspan=\"3\">".__('Parameters')."</td></tr>');
-
-				for (i = 0; i < params.length; i++) {
-					add_row_param('responses_table',params[i]);
-				}
+                table_info_response_event(id_response,".$event['id_evento'].','.$event['server_id'].");
 			});
 			$('#select_custom_response').trigger('change');
 			</script>";
 
-    $responses = '<div id="extended_event_responses_page" class="extended_event_pages">'.html_print_table($table_responses, true).$responses_js.'</div>';
+    $responses = '<div id="extended_event_responses_page" class="extended_event_pages">';
+    $responses .= html_print_table($table_responses, true);
+    $responses .= $responses_js;
+    $responses .= '</div>';
 
     return $responses;
 }
@@ -3471,14 +3458,16 @@ function events_page_responses($event)
 /**
  * Replace macros in the target of a response and return it.
  *
- * @param integer $event_id    Event identifier.
- * @param integer $response_id Event response identifier.
+ * @param integer    $event_id            Event identifier.
+ * @param array      $event_response      Event Response.
+ * @param array|null $response_parameters If parameters response values.
  *
  * @return string The response text with the macros applied.
  */
 function events_get_response_target(
     int $event_id,
-    array $event_response
+    array $event_response,
+    ?array $response_parameters=null
 ) {
     global $config;
 
@@ -3492,6 +3481,35 @@ function events_get_response_target(
 
     $event = db_get_row('tevento', 'id_evento', $event_id);
     $target = io_safe_output($event_response['target']);
+
+    // Replace parameters response.
+    if (isset($response_parameters) === true
+        && empty($response_parameters) === false
+    ) {
+        $response_parameters = array_reduce(
+            $response_parameters,
+            function ($carry, $item) {
+                $carry[$item['name']] = $item['value'];
+                return $carry;
+            }
+        );
+    }
+
+    if (empty($event_response['params']) === false) {
+        $response_params = explode(',', $event_response['params']);
+        if (is_array($response_params) === true) {
+            foreach ($response_params as $param) {
+                $param = trim(io_safe_output($param));
+                $target = str_replace(
+                    '_'.$param.'_',
+                    $response_parameters['values_params_'.$param],
+                    $target
+                );
+            }
+        }
+    }
+
+    // Replace macros.
     if (strpos($target, '_agent_alias_') !== false) {
         $agente_table_name = 'tagente';
         $filter = ['id_agente' => $event['id_agente']];
@@ -5465,7 +5483,16 @@ function events_get_criticity_class($criticity)
 }
 
 
-// TODO
+/**
+ * Draw row response events.
+ *
+ * @param array        $event_response Response.
+ * @param integer|null $response_id    Id .
+ * @param boolean      $end            End block.
+ * @param integer|null $index          Index block.
+ *
+ * @return string Html output.
+ */
 function get_row_response_action(
     array $event_response,
     ?int $response_id,
@@ -5530,7 +5557,8 @@ function get_row_response_action(
 function get_events_get_response_target(
     $event_id,
     $event_response,
-    $server_id=0
+    $server_id=0,
+    $response_parameters=[]
 ) {
     try {
         if (is_metaconsole() === true
@@ -5542,7 +5570,8 @@ function get_events_get_response_target(
 
         return events_get_response_target(
             $event_id,
-            $event_response
+            $event_response,
+            $response_parameters
         );
     } catch (\Exception $e) {
         // Unexistent agent.
diff --git a/pandora_console/include/javascript/pandora_events.js b/pandora_console/include/javascript/pandora_events.js
index 5e0ec83920..17fac351f3 100644
--- a/pandora_console/include/javascript/pandora_events.js
+++ b/pandora_console/include/javascript/pandora_events.js
@@ -96,12 +96,28 @@ function show_event_dialog(event, dialog_page) {
 function execute_response(event_id, server_id) {
   var response_id = $("#select_custom_response option:selected").val();
 
+  var response_parameters_list = $('input[name^="values_params_"]');
+  var response_parameters = [];
+  if (response_parameters_list.length > 0) {
+    response_parameters_list.each(function() {
+      var acum = {
+        name: $(this).attr("name"),
+        value: $(this).val()
+      };
+      response_parameters.push(acum);
+    });
+  }
+
   var params = [];
   params.push({ name: "page", value: "include/ajax/events" });
   params.push({ name: "get_response", value: 1 });
   params.push({ name: "response_id", value: response_id });
   params.push({ name: "server_id", value: server_id });
   params.push({ name: "event_id", value: event_id });
+  params.push({
+    name: "response_parameters",
+    value: JSON.stringify(response_parameters)
+  });
 
   jQuery.ajax({
     data: params,
@@ -126,12 +142,13 @@ function execute_response(event_id, server_id) {
 }
 
 // Check the response type and open it in a modal dialog or new window
-function execute_response_massive(events, response_id) {
+function execute_response_massive(events, response_id, response_parameters) {
   var params = [];
   params.push({ name: "page", value: "include/ajax/events" });
   params.push({ name: "get_response_massive", value: 1 });
   params.push({ name: "response_id", value: response_id });
   params.push({ name: "events", value: JSON.stringify(events) });
+  params.push({ name: "response_parameters", value: response_parameters });
 
   jQuery.ajax({
     data: params,
@@ -193,10 +210,16 @@ function execute_response_massive(events, response_id) {
               response["event_id"] = event_id;
               response["server_id"] = server_id;
               response["target"] = target;
+
+              var indexstr = event_id;
+              if (meta != 0) {
+                indexstr += "-" + server_id;
+              }
+
               perform_response(
                 btoa(JSON.stringify(response)),
                 response_id,
-                event_id + "-" + server_id
+                indexstr
               );
             }
           });
@@ -236,71 +259,14 @@ function show_response_dialog(response_id, response) {
             perform_response(btoa(JSON.stringify(response)), response_id, "");
           },
           width: response["modal_width"],
-          height: response["modal_height"]
+          height: response["modal_height"],
+          buttons: []
         })
         .show();
     }
   });
 }
 
-// Get an event response params from db
-function get_response_params(response_id) {
-  var response_params;
-
-  var params = [];
-  params.push("page=include/ajax/events");
-  params.push("get_response_params=1");
-  params.push("response_id=" + response_id);
-
-  jQuery.ajax({
-    data: params.join("&"),
-    type: "POST",
-    url: $("#hidden-ajax_file").val(),
-    async: false,
-    dataType: "json",
-    success: function(data) {
-      response_params = data;
-    }
-  });
-
-  return response_params;
-}
-
-// Get an event response description from db
-function get_response_description(response_id) {
-  var response_description = "";
-
-  var params = [];
-  params.push("page=include/ajax/events");
-  params.push("get_response_description=1");
-  params.push("response_id=" + response_id);
-
-  jQuery.ajax({
-    data: params.join("&"),
-    type: "POST",
-    url: $("#hidden-ajax_file").val(),
-    async: false,
-    dataType: "html",
-    success: function(data) {
-      response_description = data;
-    }
-  });
-
-  return response_description;
-}
-
-function add_row_param(id_table, param) {
-  $("#" + id_table).append(
-    '<tr class="params_rows"><td style="text-align:left; padding-left:40px; font-weight: normal; font-style: italic;">' +
-      param +
-      '</td><td style="text-align:left" colspan="2"><input type="text" name="' +
-      param +
-      '" id="' +
-      param +
-      '"></td></tr>'
-  );
-}
-
 // Perform a response and put the output into a div
 function perform_response(response, response_id, index) {
   $("#re_exec_command" + index).hide();
@@ -670,8 +636,13 @@ function execute_delete_event_reponse(
 
 // Imported from old files.
 function execute_event_response(event_list_btn) {
+  var response_id = $("select[name=response_id]").val();
+  if (!isNaN(response_id)) {
+    table_info_response_event(response_id, 0, 0, true);
+  }
+
   var message =
-    "<h4 style = 'text-align: center; color:black' > Are you sure?</h4> ";
+    "<h4 style = 'text-align: center; color:black' > Are you sure?</h4> <div id='massive-parameters-response'></div> ";
   confirmDialog({
     title: "ATTENTION",
     message: message,
@@ -683,8 +654,6 @@ function execute_event_response(event_list_btn) {
       $("#max_custom_event_resp_msg").hide();
       $("#max_custom_selected").hide();
 
-      var response_id = $("select[name=response_id]").val();
-
       var total_checked = $(".chk_val:checked").length;
 
       // Check select an event.
@@ -694,14 +663,28 @@ function execute_event_response(event_list_btn) {
       }
 
       if (!isNaN(response_id)) {
+        var response_parameters_list = $('input[name^="values_params_"]');
+        var response_parameters = [];
+        if (response_parameters_list.length > 0) {
+          response_parameters_list.each(function() {
+            var acum = {
+              name: $(this).attr("name"),
+              value: $(this).val()
+            };
+            response_parameters.push(acum);
+          });
+        }
+
+        response_parameters = JSON.stringify(response_parameters);
+
         if (event_list_btn) {
           $("#button-submit_event_response").hide(function() {
             $("#response_loading_dialog").show(function() {
-              show_response_dialog_massive(response_id);
+              show_response_dialog_massive(response_id, response_parameters);
             });
           });
         } else {
-          check_execute_response_massive(response_id);
+          check_execute_response_massive(response_id, response_parameters);
         }
       } else {
         // It is not a custom response
@@ -776,7 +759,7 @@ function execute_event_response(event_list_btn) {
   });
 }
 
-function show_response_dialog_massive(response_id) {
+function show_response_dialog_massive(response_id, response_parameters) {
   var params = [];
   params.push({ name: "page", value: "include/ajax/events" });
   params.push({ name: "get_response", value: 1 });
@@ -803,7 +786,7 @@ function show_response_dialog_massive(response_id) {
           draggable: true,
           modal: false,
           open: function() {
-            check_execute_response_massive(response_id);
+            check_execute_response_massive(response_id, response_parameters);
           },
           close: function() {
             $("#checkbox-all_validate_box").prop("checked", false);
@@ -830,7 +813,7 @@ function show_response_dialog_massive(response_id) {
   });
 }
 
-function check_execute_response_massive(response_id) {
+function check_execute_response_massive(response_id, response_parameters) {
   var events = [];
   $(".container-massive-events-response").empty();
   $(".chk_val:checked").each(function() {
@@ -852,7 +835,7 @@ function check_execute_response_massive(response_id) {
     }
   });
 
-  execute_response_massive(events, response_id);
+  execute_response_massive(events, response_id, response_parameters);
 }
 
 function event_widget_options() {
@@ -1136,3 +1119,43 @@ function check_event_sound(settings) {
     "json"
   );
 }
+
+function table_info_response_event(response_id, event_id, server_id, massive) {
+  var params = [];
+  params.push({ name: "page", value: "include/ajax/events" });
+  params.push({ name: "get_response", value: 1 });
+  params.push({ name: "response_id", value: response_id });
+  params.push({ name: "server_id", value: server_id });
+  params.push({ name: "event_id", value: event_id });
+
+  jQuery.ajax({
+    data: params,
+    type: "POST",
+    url: $("#hidden-ajax_file").val(),
+    dataType: "json",
+    success: function(response) {
+      if (response) {
+        var params = [];
+        params.push({ name: "page", value: "include/ajax/events" });
+        params.push({ name: "draw_row_response_info", value: 1 });
+        params.push({ name: "massive", value: massive === true ? 1 : 0 });
+        params.push({ name: "response", value: JSON.stringify(response) });
+
+        jQuery.ajax({
+          data: params,
+          type: "POST",
+          url: $("#hidden-ajax_file").val(),
+          dataType: "html",
+          success: function(output) {
+            if (massive === true) {
+              $("#massive-parameters-response").append(output);
+            } else {
+              $(".params_rows").remove();
+              $("#responses_table").append(output);
+            }
+          }
+        });
+      }
+    }
+  });
+}
diff --git a/pandora_console/include/styles/events.css b/pandora_console/include/styles/events.css
index 5ad4579f61..a235861c27 100644
--- a/pandora_console/include/styles/events.css
+++ b/pandora_console/include/styles/events.css
@@ -429,3 +429,26 @@ div.multi-response-buttons {
   justify-content: flex-end;
   align-items: center;
 }
+
+#massive-parameters-response {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+}
+
+#massive-parameters-response > div {
+  width: 80%;
+}
+
+#massive-parameters-response > div h5 {
+  text-align: center;
+}
+
+#massive-parameters-response > div div {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  align-items: center;
+  margin-bottom: 5px;
+}
diff --git a/pandora_console/operation/agentes/estado_generalagente.php b/pandora_console/operation/agentes/estado_generalagente.php
index 42d325e7f0..91714803f9 100755
--- a/pandora_console/operation/agentes/estado_generalagente.php
+++ b/pandora_console/operation/agentes/estado_generalagente.php
@@ -564,7 +564,10 @@ for ($i = 0; $i < $custom_fields_count; $i++) {
         $columns = array_merge($first_column, $second_column);
     } else {
         $columns = $first_column;
-        $filas = count($table_data->data);
+        if ($table_data->data !== null) {
+            $filas = count($table_data->data);
+        }
+
         $table_data->colspan[$filas][1] = 3;
     }
 

From 8d8140faa46149f932de170ea6309ccbe27a3d38 Mon Sep 17 00:00:00 2001
From: Daniel Barbero <daniel.barbero@artica.es>
Date: Wed, 28 Sep 2022 09:30:30 +0200
Subject: [PATCH 10/22] add new macros response events pandora_enterprise#9423

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

diff --git a/pandora_console/include/ajax/events.php b/pandora_console/include/ajax/events.php
index dbb7924517..7075016c64 100644
--- a/pandora_console/include/ajax/events.php
+++ b/pandora_console/include/ajax/events.php
@@ -1093,7 +1093,9 @@ if ($get_response === true) {
             $event_response['target'] = events_get_response_target(
                 $event_id,
                 $event_response,
-                $response_parameters
+                $response_parameters,
+                $server_id,
+                ($server_id !== 0) ? $node->server_name() : 'Metaconsole'
             );
         } catch (\Exception $e) {
             // Unexistent agent.
diff --git a/pandora_console/include/functions_events.php b/pandora_console/include/functions_events.php
index a91868a2c2..cdbd930972 100644
--- a/pandora_console/include/functions_events.php
+++ b/pandora_console/include/functions_events.php
@@ -3522,16 +3522,20 @@ function events_page_responses($event)
 /**
  * Replace macros in the target of a response and return it.
  *
- * @param integer    $event_id            Event identifier.
- * @param array      $event_response      Event Response.
- * @param array|null $response_parameters If parameters response values.
+ * @param integer      $event_id            Event identifier.
+ * @param array        $event_response      Event Response.
+ * @param array|null   $response_parameters If parameters response values.
+ * @param integer|null $server_id           Server Id.
+ * @param string|null  $server_name         Name server.
  *
  * @return string The response text with the macros applied.
  */
 function events_get_response_target(
     int $event_id,
     array $event_response,
-    ?array $response_parameters=null
+    ?array $response_parameters=null,
+    ?int $server_id=0,
+    ?string $server_name=''
 ) {
     global $config;
 
@@ -3899,6 +3903,26 @@ function events_get_response_target(
         );
     }
 
+    if (is_metaconsole() === true
+        && strpos($target, '_node_id_') !== false
+    ) {
+        $target = str_replace(
+            '_node_id_',
+            $server_id,
+            $target
+        );
+    }
+
+    if (is_metaconsole() === true
+        && strpos($target, '_node_name_') !== false
+    ) {
+        $target = str_replace(
+            '_node_name_',
+            $server_name,
+            $target
+        );
+    }
+
     return $target;
 }
 
@@ -5635,7 +5659,9 @@ function get_events_get_response_target(
         return events_get_response_target(
             $event_id,
             $event_response,
-            $response_parameters
+            $response_parameters,
+            $server_id,
+            ($server_id !== 0) ? $node->server_name() : 'Metaconsole'
         );
     } catch (\Exception $e) {
         // Unexistent agent.

From 429cefcf2be2e5dcaf9bb83d51e7eb5a9b993149 Mon Sep 17 00:00:00 2001
From: sergio <sergio.bravo@pandorafms.com>
Date: Fri, 30 Sep 2022 09:59:53 +0200
Subject: [PATCH 11/22] #9300 label change

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

diff --git a/pandora_console/include/lib/Dashboard/Widgets/service_map.php b/pandora_console/include/lib/Dashboard/Widgets/service_map.php
index 0fa8d13f10..9dfe181fd8 100644
--- a/pandora_console/include/lib/Dashboard/Widgets/service_map.php
+++ b/pandora_console/include/lib/Dashboard/Widgets/service_map.php
@@ -328,7 +328,7 @@ class ServiceMapWidget extends Widget
         ];
 
         $inputs[] = [
-            'label'     => __('Enable sunburst'),
+            'label'     => __('Show sunburst by default'),
             'arguments' => [
                 'type'   => 'switch',
                 'name'   => 'sunburst',

From 9f800df03465522e1fea8c1199743bc0f047ae6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Gonz=C3=A1lez?= <jose.gonzalez@pandorafms.com>
Date: Mon, 3 Oct 2022 12:41:55 +0200
Subject: [PATCH 12/22] Added default definition for SNMP Interface Wizard

---
 pandora_console/godmode/setup/performance.php | 27 ++++++++
 .../include/class/AgentWizard.class.php       | 62 +++++++++++--------
 pandora_console/include/functions_config.php  | 36 +++++++++++
 3 files changed, 98 insertions(+), 27 deletions(-)

diff --git a/pandora_console/godmode/setup/performance.php b/pandora_console/godmode/setup/performance.php
index 89b745cfca..ba965f026f 100644
--- a/pandora_console/godmode/setup/performance.php
+++ b/pandora_console/godmode/setup/performance.php
@@ -701,6 +701,28 @@ if (enterprise_installed() === true) {
     );
 }
 
+// Agent Wizard defaults.
+$defaultAgentWizardOptions = json_decode(io_safe_output($config['agent_wizard_defaults']));
+$tableSnmpWizard = new stdClass();
+$tableSnmpWizard->width = '100%';
+$tableSnmpWizard->class = 'databox filters';
+$tableSnmpWizard->data = [];
+$tableSnmpWizard->style[0] = 'font-weight: bold';
+$tableSnmpWizard->style[2] = 'font-weight: bold';
+$tableSnmpWizard->size[0] = '30%';
+$tableSnmpWizard->size[2] = '30%';
+
+$i = 0;
+$j = 0;
+foreach ($defaultAgentWizardOptions as $key => $value) {
+    $tableSnmpWizard->data[$i][$j++] = $key;
+    $tableSnmpWizard->data[$i][$j++] = html_print_checkbox_switch('agent_wizard_defaults_'.$key, 1, $value, true);
+    if ($j >= 3) {
+        $j = 0;
+        $i++;
+    }
+}
+
 echo '<form id="form_setup" method="post">';
 
 echo '<fieldset class="full-column">';
@@ -725,6 +747,11 @@ echo '<fieldset>';
     html_print_table($table_other);
 echo '</fieldset>';
 
+echo '<fieldset>';
+    echo '<legend>'.__('Agent SNMP Interface Wizard defaults').' '.ui_print_help_icon('agent_snmp_wizard_options_tab', true).'</legend>';
+    html_print_table($tableSnmpWizard);
+echo '</fieldset>';
+
 echo '<div class="action-buttons" style="width: '.$table->width.'">';
 html_print_input_hidden('update_config', 1);
 html_print_submit_button(
diff --git a/pandora_console/include/class/AgentWizard.class.php b/pandora_console/include/class/AgentWizard.class.php
index f97324dfc4..46a974a0d5 100644
--- a/pandora_console/include/class/AgentWizard.class.php
+++ b/pandora_console/include/class/AgentWizard.class.php
@@ -14,7 +14,7 @@
  * |___|   |___._|__|__|_____||_____|__| |___._| |___|   |__|_|__|_______|
  *
  * ============================================================================
- * Copyright (c) 2005-2021 Artica Soluciones Tecnologicas
+ * Copyright (c) 2005-2022 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
@@ -285,6 +285,13 @@ class AgentWizard extends HTML
      */
     private $wmiBinary = '';
 
+    /**
+     * Default values for SNMP Interfaces.
+     *
+     * @var string
+     */
+    private $defaultSNMPValues = [];
+
 
     /**
      * Constructor
@@ -319,6 +326,7 @@ class AgentWizard extends HTML
         $this->idPolicy = get_parameter('id', '');
         $this->targetIp = get_parameter('targetIp', '');
         $this->wmiBinary = $config['wmiBinary'];
+        $this->defaultSNMPValues = (array) json_decode(io_safe_output($config['agent_wizard_defaults']));
 
         if (empty($this->idAgent) === false) {
             $array_aux = db_get_all_rows_sql(
@@ -330,7 +338,7 @@ class AgentWizard extends HTML
                 )
             );
 
-            if (!empty($array_aux)) {
+            if (empty($array_aux) === false) {
                 $this->datalist = [];
                 foreach ($array_aux as $key => $value) {
                     $this->datalist[] = $value['ip'];
@@ -547,7 +555,7 @@ class AgentWizard extends HTML
         // Fill with servers to perform the discover.
         $fieldsServers = [];
         $fieldsServers[0] = __('Local console');
-        if (enterprise_installed()) {
+        if (enterprise_installed() === true) {
             enterprise_include_once('include/functions_satellite.php');
             // Get the servers.
             $rows = get_proxy_servers();
@@ -607,7 +615,7 @@ class AgentWizard extends HTML
             ],
         ];
 
-        if (!empty($this->datalist)) {
+        if (empty($this->datalist) === false) {
             $inputs[] = [
                 'id'        => 'li_address_list',
                 'arguments' => [
@@ -4701,7 +4709,7 @@ class AgentWizard extends HTML
             'execution_type'     => 'network',
             'value'              => '1.3.6.1.2.1.2.2.1.8.'.$value,
             'module_unit'        => '',
-            'default_enabled'    => true,
+            'default_enabled'    => (bool) $this->defaultSNMPValues['ifOperStatus'],
             'module_enabled'     => false,
             'module_thresholds'  => [
                 'min_warning'   => $min_warning,
@@ -4758,7 +4766,7 @@ class AgentWizard extends HTML
             'execution_type'     => 'network',
             'value'              => '1.3.6.1.4.1.9.2.2.1.1.12.'.$value,
             'module_unit'        => 'packets/s',
-            'default_enabled'    => true,
+            'default_enabled'    => (bool) $this->defaultSNMPValues['locIfInCRC'],
             'module_enabled'     => false,
             'module_thresholds'  => [
                 'min_warning'   => '0',
@@ -4812,7 +4820,7 @@ class AgentWizard extends HTML
                 'module_info'        => 'Indicates whether the port is operating in half-duplex, full-duplex, disagree or auto negotiation mode. If the port could not agree with the far end on port duplex, the port will be in disagree(3) mode.',
                 'execution_type'     => 'network',
                 'value'              => $duplexMismatchOID,
-                'default_enabled'    => true,
+                'default_enabled'    => (bool) $this->defaultSNMPValues['DuplexMismatch'],
                 'module_enabled'     => false,
                 'module_thresholds'  => [
                     'min_warning'   => '0',
@@ -4901,7 +4909,7 @@ class AgentWizard extends HTML
                     'id_plugin'          => $plugin_id,
                     'id_modulo'          => MODULE_PLUGIN,
                     'macros'             => json_encode($macros),
-                    'default_enabled'    => true,
+                    'default_enabled'    => (bool) $this->defaultSNMPValues['Bandwidth'],
                     'module_enabled'     => false,
                     'module_unit'        => '%',
                     'module_thresholds'  => [
@@ -4940,7 +4948,7 @@ class AgentWizard extends HTML
                     'id_plugin'          => $plugin_id,
                     'id_modulo'          => MODULE_PLUGIN,
                     'macros'             => json_encode($macros),
-                    'default_enabled'    => true,
+                    'default_enabled'    => (bool) $this->defaultSNMPValues['inUsage'],
                     'module_enabled'     => false,
                     'module_unit'        => '%',
                     'module_thresholds'  => [
@@ -4979,7 +4987,7 @@ class AgentWizard extends HTML
                     'id_plugin'          => $plugin_id,
                     'id_modulo'          => MODULE_PLUGIN,
                     'macros'             => json_encode($macros),
-                    'default_enabled'    => true,
+                    'default_enabled'    => (bool) $this->defaultSNMPValues['outUsage'],
                     'module_enabled'     => false,
                     'module_unit'        => '%',
                     'module_thresholds'  => [
@@ -5011,7 +5019,7 @@ class AgentWizard extends HTML
             'execution_type'     => 'network',
             'value'              => '1.3.6.1.2.1.2.2.1.7.'.$value,
             'module_unit'        => '',
-            'default_enabled'    => false,
+            'default_enabled'    => (bool) $this->defaultSNMPValues['ifAdminStatus'],
             'module_enabled'     => false,
             'module_thresholds'  => [
                 'min_warning'   => '0',
@@ -5038,7 +5046,7 @@ class AgentWizard extends HTML
             'execution_type'     => 'network',
             'value'              => '1.3.6.1.2.1.2.2.1.13.'.$value,
             'module_unit'        => 'packets/s',
-            'default_enabled'    => false,
+            'default_enabled'    => (bool) $this->defaultSNMPValues['ifInDiscards'],
             'module_enabled'     => false,
             'module_thresholds'  => [
                 'min_warning'   => '0',
@@ -5065,7 +5073,7 @@ class AgentWizard extends HTML
             'execution_type'     => 'network',
             'value'              => '1.3.6.1.2.1.2.2.1.19.'.$value,
             'module_unit'        => 'packets/s',
-            'default_enabled'    => false,
+            'default_enabled'    => (bool) $this->defaultSNMPValues['ifOutDiscards'],
             'module_enabled'     => false,
             'module_thresholds'  => [
                 'min_warning'   => '0',
@@ -5092,7 +5100,7 @@ class AgentWizard extends HTML
             'execution_type'     => 'network',
             'value'              => '1.3.6.1.2.1.2.2.1.14.'.$value,
             'module_unit'        => 'packets/s',
-            'default_enabled'    => false,
+            'default_enabled'    => (bool) $this->defaultSNMPValues['ifInErrors'],
             'module_enabled'     => false,
             'module_thresholds'  => [
                 'min_warning'   => '0',
@@ -5119,7 +5127,7 @@ class AgentWizard extends HTML
             'execution_type'     => 'network',
             'value'              => '1.3.6.1.2.1.2.2.1.20.'.$value,
             'module_unit'        => 'packets/s',
-            'default_enabled'    => false,
+            'default_enabled'    => (bool) $this->defaultSNMPValues['ifOutErrors'],
             'module_enabled'     => false,
             'module_thresholds'  => [
                 'min_warning'   => '0',
@@ -5189,7 +5197,7 @@ class AgentWizard extends HTML
             'execution_type'     => 'network',
             'value'              => '1.3.6.1.2.1.2.2.1.10.'.$value,
             'module_unit'        => 'bytes/s',
-            'default_enabled'    => true,
+            'default_enabled'    => (bool) $this->defaultSNMPValues['ifInOctets'],
             'module_enabled'     => false,
             'module_thresholds'  => [
                 'min_warning'   => '0',
@@ -5217,7 +5225,7 @@ class AgentWizard extends HTML
             'execution_type'     => 'network',
             'value'              => '1.3.6.1.2.1.2.2.1.16.'.$value,
             'module_unit'        => 'bytes/s',
-            'default_enabled'    => true,
+            'default_enabled'    => (bool) $this->defaultSNMPValues['ifOutOctets'],
             'module_enabled'     => false,
             'module_thresholds'  => [
                 'min_warning'   => '0',
@@ -5245,7 +5253,7 @@ class AgentWizard extends HTML
             'execution_type'     => 'network',
             'value'              => '1.3.6.1.2.1.2.2.1.11.'.$value,
             'module_unit'        => 'packets/s',
-            'default_enabled'    => false,
+            'default_enabled'    => (bool) $this->defaultSNMPValues['ifInUcastPkts'],
             'module_enabled'     => false,
             'module_thresholds'  => [
                 'min_warning'   => '0',
@@ -5272,7 +5280,7 @@ class AgentWizard extends HTML
             'execution_type'     => 'network',
             'value'              => '1.3.6.1.2.1.2.2.1.17.'.$value,
             'module_unit'        => 'packets/s',
-            'default_enabled'    => false,
+            'default_enabled'    => (bool) $this->defaultSNMPValues['ifOutUcastPkts'],
             'module_enabled'     => false,
             'module_thresholds'  => [
                 'min_warning'   => '0',
@@ -5299,7 +5307,7 @@ class AgentWizard extends HTML
             'execution_type'     => 'network',
             'value'              => '1.3.6.1.2.1.2.2.1.12.'.$value,
             'module_unit'        => 'packets/s',
-            'default_enabled'    => false,
+            'default_enabled'    => (bool) $this->defaultSNMPValues['ifInNUcastPkts'],
             'module_enabled'     => false,
             'module_thresholds'  => [
                 'min_warning'   => '0',
@@ -5326,7 +5334,7 @@ class AgentWizard extends HTML
             'execution_type'     => 'network',
             'value'              => '1.3.6.1.2.1.2.2.1.18.'.$value,
             'module_unit'        => 'packets/s',
-            'default_enabled'    => false,
+            'default_enabled'    => (bool) $this->defaultSNMPValues['ifOutNUcastPkts'],
             'module_enabled'     => false,
             'module_thresholds'  => [
                 'min_warning'   => '0',
@@ -5396,7 +5404,7 @@ class AgentWizard extends HTML
             'execution_type'     => 'network',
             'value'              => '1.3.6.1.2.1.31.1.1.1.6.'.$value,
             'module_unit'        => 'bytes/s',
-            'default_enabled'    => true,
+            'default_enabled'    => (bool) $this->defaultSNMPValues['ifHCInOctets'],
             'module_enabled'     => false,
             'module_thresholds'  => [
                 'min_warning'   => '0',
@@ -5424,7 +5432,7 @@ class AgentWizard extends HTML
             'execution_type'     => 'network',
             'value'              => '1.3.6.1.2.1.31.1.1.1.10.'.$value,
             'module_unit'        => 'bytes/s',
-            'default_enabled'    => true,
+            'default_enabled'    => (bool) $this->defaultSNMPValues['ifHCOutOctets'],
             'module_enabled'     => false,
             'module_thresholds'  => [
                 'min_warning'   => '0',
@@ -5452,7 +5460,7 @@ class AgentWizard extends HTML
             'execution_type'     => 'network',
             'value'              => '1.3.6.1.2.1.31.1.1.1.7.'.$value,
             'module_unit'        => 'packets/s',
-            'default_enabled'    => false,
+            'default_enabled'    => (bool) $this->defaultSNMPValues['ifHCInUcastPkts'],
             'module_enabled'     => false,
             'module_thresholds'  => [
                 'min_warning'   => '0',
@@ -5480,7 +5488,7 @@ class AgentWizard extends HTML
             'execution_type'     => 'network',
             'value'              => '1.3.6.1.2.1.31.1.1.1.11.'.$value,
             'module_unit'        => 'packets/s',
-            'default_enabled'    => false,
+            'default_enabled'    => (bool) $this->defaultSNMPValues['ifHCOutUcastPkts'],
             'module_enabled'     => false,
             'module_thresholds'  => [
                 'min_warning'   => '0',
@@ -5507,7 +5515,7 @@ class AgentWizard extends HTML
             'execution_type'     => 'network',
             'value'              => '1.3.6.1.2.1.31.1.1.1.7.'.$value,
             'module_unit'        => 'packets/s',
-            'default_enabled'    => false,
+            'default_enabled'    => (bool) $this->defaultSNMPValues['ifHCInNUcastPkts'],
             'module_enabled'     => false,
             'module_thresholds'  => [
                 'min_warning'   => '0',
@@ -5534,7 +5542,7 @@ class AgentWizard extends HTML
             'execution_type'     => 'network',
             'value'              => '1.3.6.1.2.1.31.1.1.1.11.'.$value,
             'module_unit'        => 'packets/s',
-            'default_enabled'    => false,
+            'default_enabled'    => (bool) $this->defaultSNMPValues['ifHCOutNUcastPkts'],
             'module_enabled'     => false,
             'module_thresholds'  => [
                 'min_warning'   => '0',
diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php
index 647b719ae3..8793784147 100644
--- a/pandora_console/include/functions_config.php
+++ b/pandora_console/include/functions_config.php
@@ -916,6 +916,16 @@ function config_update_config()
                         $error_update[] = __('Default WMI Binary');
                     }
 
+                    // Walk the array with defaults.
+                    $defaultAgentWizardOptions = json_decode(io_safe_output($config['agent_wizard_defaults']));
+                    foreach ($defaultAgentWizardOptions as $key => $value) {
+                        $selectedAgentWizardOptions[$key] = get_parameter_switch('agent_wizard_defaults_'.$key);
+                    }
+
+                    if (config_update_value('agent_wizard_defaults', json_encode($selectedAgentWizardOptions), true) === false) {
+                        $error_update[] = __('SNMP Interface Agent Wizard');
+                    }
+
                     $pjs = get_parameter('phantomjs_cache_interval');
                     switch ($pjs) {
                         case $config['phantomjs_cache_interval']:
@@ -2255,6 +2265,32 @@ function config_process_config()
         config_update_value('2Fa_auth', '');
     }
 
+    if (isset($config['agent_wizard_defaults']) === false) {
+        config_update_value(
+            'agent_wizard_defaults',
+            json_encode(
+                [
+                    'ifOperStatus'    => 1,
+                    'ifInOctets'      => 1,
+                    'ifOutOctets'     => 1,
+                    'ifInUcastPkts'   => 0,
+                    'ifOutUcastPkts'  => 0,
+                    'ifInNUcastPkts'  => 0,
+                    'ifOutNUcastPkts' => 0,
+                    'locIfInCRC'      => 1,
+                    'Bandwidth'       => 1,
+                    'inUsage'         => 1,
+                    'outUsage'        => 1,
+                    'ifAdminStatus'   => 0,
+                    'ifInDiscards'    => 0,
+                    'ifOutDiscards'   => 0,
+                    'ifInErrors'      => 0,
+                    'ifOutErrors'     => 0,
+                ],
+            )
+        );
+    }
+
     /*
      * Parse the ACL IP list for access API
      */

From b5dcc5936e214bcb729f9d09d013a10fb43dc057 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Gonz=C3=A1lez?= <jose.gonzalez@pandorafms.com>
Date: Tue, 4 Oct 2022 16:59:25 +0200
Subject: [PATCH 13/22] Fix issue

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

diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php
index 647b719ae3..f333b77680 100644
--- a/pandora_console/include/functions_config.php
+++ b/pandora_console/include/functions_config.php
@@ -467,7 +467,7 @@ function config_update_config()
                 break;
 
                 case 'pass':
-                    if (isset($config['enterprise_installed']) === true && (bool) $config['enterprise_installed'] === 1) {
+                    if (isset($config['enterprise_installed']) === true && (bool) $config['enterprise_installed'] === true) {
                         if (config_update_value('enable_pass_policy', get_parameter('enable_pass_policy'), true) === false) {
                             $error_update[] = __('Enable password policy');
                         }

From 83ac81ab2336a7182c1f905e341eeb6b9d5b4ccb Mon Sep 17 00:00:00 2001
From: Daniel Maya <daniel.maya@pandorafms.com>
Date: Fri, 7 Oct 2022 10:56:12 +0200
Subject: [PATCH 14/22] #9506 Fixed meta

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

diff --git a/pandora_console/godmode/users/user_list.php b/pandora_console/godmode/users/user_list.php
index 85a95a8f22..e99a5648b1 100644
--- a/pandora_console/godmode/users/user_list.php
+++ b/pandora_console/godmode/users/user_list.php
@@ -31,8 +31,6 @@ global $config;
 
 check_login();
 
-enterprise_hook('open_meta_frame');
-
 require_once $config['homedir'].'/include/functions_profile.php';
 require_once $config['homedir'].'/include/functions_users.php';
 require_once $config['homedir'].'/include/functions_groups.php';
@@ -134,6 +132,8 @@ if (is_ajax()) {
     }
 }
 
+enterprise_hook('open_meta_frame');
+
 $sortField = get_parameter('sort_field');
 $sort = get_parameter('sort', 'none');
 $tab = get_parameter('tab', 'user');
@@ -924,7 +924,7 @@ enterprise_hook('close_meta_frame');
             var request = $.ajax({
                 url: "<?php echo ui_get_full_url('ajax.php', false, false, false); ?>",
                 type: 'GET',
-                dataType: 'JSON',
+                dataType: 'json',
                 data: {
                     page: 'godmode/users/user_list',
                     get_user_profile_group: 1,
@@ -943,6 +943,9 @@ enterprise_hook('close_meta_frame');
                         }
                         count ++;
                     });
+                },
+                error: function (e, textStatus) {
+                    console.error(textStatus);
                 }
             });
             $(`#hidden-show_groups_${id_user}`).val('1');

From 1c157ba2e4349b5448da9ee3f21146f9e151a85f Mon Sep 17 00:00:00 2001
From: Calvo <luis.calvo@artica.es>
Date: Fri, 7 Oct 2022 13:15:44 +0200
Subject: [PATCH 15/22] Fix reset user creation form on error

---
 .../godmode/users/configure_user.php          |  6 ++---
 pandora_console/include/functions_profile.php | 23 ++++++++++++++++---
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/pandora_console/godmode/users/configure_user.php b/pandora_console/godmode/users/configure_user.php
index d98fc1d944..800f738394 100644
--- a/pandora_console/godmode/users/configure_user.php
+++ b/pandora_console/godmode/users/configure_user.php
@@ -1444,7 +1444,7 @@ html_print_input_hidden('json_profile', '');
 echo '</form>';
 
 
-profile_print_profile_table($id);
+profile_print_profile_table($id, io_safe_output($json_profile));
 
 echo '<br />';
 
@@ -1560,11 +1560,11 @@ $(document).ready (function () {
         switch_ehorus_conf();
     });
     $('#checkbox-ehorus_user_level_enabled').trigger('change');
-
     var img_delete = '<?php echo $delete_image; ?>';
     var id_user = '<?php echo io_safe_output($id); ?>';
     var is_metaconsole = '<?php echo $meta; ?>';
     var user_is_global_admin = '<?php echo users_is_admin($id); ?>';
+    var is_err = '<?php echo $is_err; ?>';
     var data = [];
 
     $('input:image[name="add"]').click(function (e) {
@@ -1588,7 +1588,7 @@ $(document).ready (function () {
             return;
         }
 
-        if (id_user === '') {
+        if (id_user === '' || is_err === 1) {
             let new_json = `{"profile":${profile},"group":${group},"tags":[${tags}],"hierarchy":${hierarchy}}`;
             data.push(new_json);
             json_profile.val('['+data+']');
diff --git a/pandora_console/include/functions_profile.php b/pandora_console/include/functions_profile.php
index a16772c49e..c6a62c4c9d 100644
--- a/pandora_console/include/functions_profile.php
+++ b/pandora_console/include/functions_profile.php
@@ -181,7 +181,7 @@ function profile_delete_profile_and_clean_users($id_profile)
  * @param int User id
  * @param bool Show the tags select or not
  */
-function profile_print_profile_table($id)
+function profile_print_profile_table($id, $json_profile=false)
 {
     global $config;
 
@@ -243,7 +243,19 @@ function profile_print_profile_table($id)
     }
 
     if ($result === false) {
-        $result = [];
+        if ($json_profile !== false && empty($json_profile) !== true) {
+            $profile_decoded = json_decode($json_profile);
+            foreach ($profile_decoded as $profile) {
+                        $result[] = [
+                            'id_grupo'  => $profile->group,
+                            'id_perfil' => $profile->profile,
+                            'tags'      => $profile->tags,
+                            'hierarchy' => $profile->hierarchy,
+                        ];
+            }
+        } else {
+            $result = [];
+        }
     }
 
     foreach ($result as $profile) {
@@ -268,7 +280,12 @@ function profile_print_profile_table($id)
         if (empty($profile['tags'])) {
             $data['tags'] = '';
         } else {
-            $tags_ids = explode(',', $profile['tags']);
+            if (is_array($profile['tags'] === false)) {
+                $tags_ids = explode(',', $profile['tags']);
+            } else {
+                $tags_ids = $profile['tags'];
+            }
+
             $tags = tags_get_tags($tags_ids);
             $data['tags'] = tags_get_tags_formatted($tags);
         }

From fc37d9919c7dadf34ad4cb2811467d988271b894 Mon Sep 17 00:00:00 2001
From: "jose.gonzalez@pandorafms.com" <jose.gonzalez@pandorafms.com>
Date: Thu, 13 Oct 2022 12:06:04 +0200
Subject: [PATCH 16/22] Fix javascript injection in agent names

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

diff --git a/pandora_console/godmode/agentes/configurar_agente.php b/pandora_console/godmode/agentes/configurar_agente.php
index af29579055..f71ead533b 100644
--- a/pandora_console/godmode/agentes/configurar_agente.php
+++ b/pandora_console/godmode/agentes/configurar_agente.php
@@ -181,7 +181,7 @@ $module_macros = [];
 // Create agent.
 if ($create_agent) {
     $mssg_warning = 0;
-    $alias_safe_output = io_safe_output(get_parameter('alias', ''));
+    $alias_safe_output = strip_tags(io_safe_output(get_parameter('alias', '')));
     $alias = io_safe_input(trim(preg_replace('/[\/\\\|%#&$]/', '', $alias_safe_output)));
     $alias_as_name = (int) get_parameter_post('alias_as_name', 0);
     $direccion_agente = (string) get_parameter_post('direccion', '');
@@ -935,7 +935,7 @@ if ($update_agent) {
     $mssg_warning = 0;
     $id_agente = (int) get_parameter_post('id_agente');
     $nombre_agente = str_replace('`', '&lsquo;', (string) get_parameter_post('agente', ''));
-    $alias_safe_output = io_safe_output(get_parameter('alias', ''));
+    $alias_safe_output = strip_tags(io_safe_output(get_parameter('alias', '')));
     $alias = io_safe_input(trim(preg_replace('/[\/\\\|%#&$]/', '', $alias_safe_output)));
     $alias_as_name = (int) get_parameter_post('alias_as_name', 0);
     $direccion_agente = (string) get_parameter_post('direccion', '');

From f3bc5427baee7575a38a42db35a75e56ee9b8ec0 Mon Sep 17 00:00:00 2001
From: Daniel Maya <daniel.maya@pandorafms.com>
Date: Thu, 13 Oct 2022 13:22:36 +0200
Subject: [PATCH 17/22] #9506 Fixed meta ajax

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

diff --git a/pandora_console/godmode/users/user_list.php b/pandora_console/godmode/users/user_list.php
index e99a5648b1..a5ec875334 100644
--- a/pandora_console/godmode/users/user_list.php
+++ b/pandora_console/godmode/users/user_list.php
@@ -54,6 +54,43 @@ if (is_ajax()) {
 
     $return_all = false;
 
+    if ($get_user_profile_group === true) {
+        $id_user = get_parameter('id_user');
+
+        $user_is_admin = users_is_admin();
+
+        $user_profiles = [];
+
+        if ($user_is_admin === false) {
+            $group_um = users_get_groups_UM($config['id_user']);
+        }
+
+        // User profiles.
+        if ($user_is_admin || $id_user == $config['id_user'] || isset($group_um[0])) {
+            $user_profiles = db_get_all_rows_field_filter(
+                'tusuario_perfil',
+                'id_usuario',
+                $id_user
+            );
+        } else {
+            $user_profiles_aux = users_get_user_profile($id_user);
+            foreach ($group_um as $key => $value) {
+                if (isset($user_profiles_aux[$key]) === true) {
+                    $user_profiles[$key] = $user_profiles_aux[$key];
+                    unset($user_profiles_aux[$key]);
+                }
+            }
+        }
+
+        foreach ($user_profiles as $key => $value) {
+            $user_profiles[$key]['id_perfil'] = profile_get_name($value['id_perfil']);
+            $user_profiles[$key]['id_grupo'] = groups_get_name($value['id_grupo'], true);
+        }
+
+        echo json_encode($user_profiles);
+        return;
+    }
+
     if ($group_id == -1) {
         $sql = 'SELECT tusuario.id_user FROM tusuario 
                         LEFT OUTER JOIN tusuario_perfil
@@ -93,43 +130,6 @@ if (is_ajax()) {
         echo json_encode($ret_id);
         return;
     }
-
-    if ($get_user_profile_group === true) {
-        $id_user = get_parameter('id_user');
-
-        $user_is_admin = users_is_admin();
-
-        $user_profiles = [];
-
-        if ($user_is_admin === false) {
-            $group_um = users_get_groups_UM($config['id_user']);
-        }
-
-        // User profiles.
-        if ($user_is_admin || $id_user == $config['id_user'] || isset($group_um[0])) {
-            $user_profiles = db_get_all_rows_field_filter(
-                'tusuario_perfil',
-                'id_usuario',
-                $id_user
-            );
-        } else {
-            $user_profiles_aux = users_get_user_profile($id_user);
-            foreach ($group_um as $key => $value) {
-                if (isset($user_profiles_aux[$key]) === true) {
-                    $user_profiles[$key] = $user_profiles_aux[$key];
-                    unset($user_profiles_aux[$key]);
-                }
-            }
-        }
-
-        foreach ($user_profiles as $key => $value) {
-            $user_profiles[$key]['id_perfil'] = profile_get_name($value['id_perfil']);
-            $user_profiles[$key]['id_grupo'] = groups_get_name($value['id_grupo'], true);
-        }
-
-        echo json_encode($user_profiles);
-        return;
-    }
 }
 
 enterprise_hook('open_meta_frame');

From b31240a3cc06553eee5f88bfe2e6dfa03103e13e Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Sat, 15 Oct 2022 01:00:23 +0200
Subject: [PATCH 18/22] 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 4018039f20..963f9e92d1 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.765-221014
+Version: 7.0NG.765-221015
 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 44889d501d..e3fea972e1 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.765-221014"
+pandora_version="7.0NG.765-221015"
 
 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 2f5e6417a9..c152c996de 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.765';
-use constant AGENT_BUILD => '221014';
+use constant AGENT_BUILD => '221015';
 
 # 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 2fffcc1d23..b4b02b5113 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.765
-%define release     221014
+%define release     221015
 
 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 51c0844ab9..db992fdae3 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.765
-%define release     221014
+%define release     221015
 
 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 4221c2f2b2..c8a6306ffe 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.765"
-PI_BUILD="221014"
+PI_BUILD="221015"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index 2f669dbbf9..9f17f24e64 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{221014}
+{221015}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 30860fc1d2..e9af8777f2 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.765 Build 221014")
+#define PANDORA_VERSION ("7.0NG.765 Build 221015")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index b6193a0aed..d946eeb14d 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.765(Build 221014))"
+      VALUE "ProductVersion", "(7.0NG.765(Build 221015))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 3019355c3f..adaf607dc9 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.765-221014
+Version: 7.0NG.765-221015
 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 f532ec4147..340a8ef6f6 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.765-221014"
+pandora_version="7.0NG.765-221015"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index ad8c93d54a..4c8bdbc88d 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 = 'PC221014';
+$build_version = 'PC221015';
 $pandora_version = 'v7.0NG.765';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index d7d1442226..83d0e95ae1 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -129,7 +129,7 @@
         <div style='height: 10px'>
             <?php
             $version = '7.0NG.765';
-            $build = '221014';
+            $build = '221015';
             $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 6217be599f..ec137cecfb 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.765
-%define release     221014
+%define release     221015
 
 # 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 511a26cd56..b9de628094 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.765
-%define release     221014
+%define release     221015
 
 # 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 cb62e2f4a6..63f32d7d61 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.765
-%define release     221014
+%define release     221015
 %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 7dd36b5048..f8bfb01363 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.765-221014
+Version: 7.0NG.765-221015
 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 add783e6e3..473865ed44 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.765-221014"
+pandora_version="7.0NG.765-221015"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 85b7db6ac4..6cf33fef75 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@@ -46,7 +46,7 @@ our @EXPORT = qw(
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.765";
-my $pandora_build = "221014";
+my $pandora_build = "221015";
 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 980dc84d9d..7fcc2ebd97 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.765";
-my $pandora_build = "221014";
+my $pandora_build = "221015";
 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 b26554742d..60090c75de 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.765
-%define release     221014
+%define release     221015
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 1c705de963..90b3c86c99 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.765
-%define release     221014
+%define release     221015
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 7aa8c6f4de..967e304f3f 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.765"
-PI_BUILD="221014"
+PI_BUILD="221015"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 21efbbd6a4..ed707ec9d8 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.765 Build 221014";
+my $version = "7.0NG.765 Build 221015";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index f7c72111b2..bc6562221f 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.765 Build 221014";
+my $version = "7.0NG.765 Build 221015";
 
 # save program name for logging
 my $progname = basename($0);

From 92f0e4b709e9f5cd8907cece0e282fd4f60f1f31 Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Sun, 16 Oct 2022 01:00:17 +0200
Subject: [PATCH 19/22] 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 963f9e92d1..76d7898ad8 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.765-221015
+Version: 7.0NG.765-221016
 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 e3fea972e1..de627a9852 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.765-221015"
+pandora_version="7.0NG.765-221016"
 
 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 c152c996de..42496307c4 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.765';
-use constant AGENT_BUILD => '221015';
+use constant AGENT_BUILD => '221016';
 
 # 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 b4b02b5113..9ad80766f8 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.765
-%define release     221015
+%define release     221016
 
 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 db992fdae3..4e502da95c 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.765
-%define release     221015
+%define release     221016
 
 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 c8a6306ffe..c9e2bf612b 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.765"
-PI_BUILD="221015"
+PI_BUILD="221016"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index 9f17f24e64..d163f8892c 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{221015}
+{221016}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index e9af8777f2..caed117ba1 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.765 Build 221015")
+#define PANDORA_VERSION ("7.0NG.765 Build 221016")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index d946eeb14d..e86d6bc5f4 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.765(Build 221015))"
+      VALUE "ProductVersion", "(7.0NG.765(Build 221016))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index adaf607dc9..b49afec11f 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.765-221015
+Version: 7.0NG.765-221016
 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 340a8ef6f6..7a175debaa 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.765-221015"
+pandora_version="7.0NG.765-221016"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 4c8bdbc88d..784d3b7750 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 = 'PC221015';
+$build_version = 'PC221016';
 $pandora_version = 'v7.0NG.765';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 83d0e95ae1..c061d760bb 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -129,7 +129,7 @@
         <div style='height: 10px'>
             <?php
             $version = '7.0NG.765';
-            $build = '221015';
+            $build = '221016';
             $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 ec137cecfb..b41d5c200a 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.765
-%define release     221015
+%define release     221016
 
 # 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 b9de628094..a227099479 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.765
-%define release     221015
+%define release     221016
 
 # 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 63f32d7d61..6df46f8da6 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.765
-%define release     221015
+%define release     221016
 %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 f8bfb01363..fde05dbc52 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.765-221015
+Version: 7.0NG.765-221016
 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 473865ed44..c3d5305197 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.765-221015"
+pandora_version="7.0NG.765-221016"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 6cf33fef75..f973996b9e 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@@ -46,7 +46,7 @@ our @EXPORT = qw(
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.765";
-my $pandora_build = "221015";
+my $pandora_build = "221016";
 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 7fcc2ebd97..3f269cb1b0 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.765";
-my $pandora_build = "221015";
+my $pandora_build = "221016";
 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 60090c75de..30241fc5a4 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.765
-%define release     221015
+%define release     221016
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 90b3c86c99..b87320bd03 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.765
-%define release     221015
+%define release     221016
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 967e304f3f..f0d822337b 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.765"
-PI_BUILD="221015"
+PI_BUILD="221016"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index ed707ec9d8..d1d9f82626 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.765 Build 221015";
+my $version = "7.0NG.765 Build 221016";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index bc6562221f..e1506f7cf2 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.765 Build 221015";
+my $version = "7.0NG.765 Build 221016";
 
 # save program name for logging
 my $progname = basename($0);

From b79b7e5d57a02f5e7ea91e3450100ab6ad500deb Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Mon, 17 Oct 2022 01:00:17 +0200
Subject: [PATCH 20/22] 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 76d7898ad8..c0a043b65f 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.765-221016
+Version: 7.0NG.765-221017
 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 de627a9852..376ee10fb8 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.765-221016"
+pandora_version="7.0NG.765-221017"
 
 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 42496307c4..45dbf33561 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.765';
-use constant AGENT_BUILD => '221016';
+use constant AGENT_BUILD => '221017';
 
 # 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 9ad80766f8..611d497c2e 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.765
-%define release     221016
+%define release     221017
 
 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 4e502da95c..7c0f1de9c9 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.765
-%define release     221016
+%define release     221017
 
 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 c9e2bf612b..a9a7fb7350 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.765"
-PI_BUILD="221016"
+PI_BUILD="221017"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index d163f8892c..164fdc29e5 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{221016}
+{221017}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index caed117ba1..42a66fda57 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.765 Build 221016")
+#define PANDORA_VERSION ("7.0NG.765 Build 221017")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index e86d6bc5f4..55b05dbc59 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.765(Build 221016))"
+      VALUE "ProductVersion", "(7.0NG.765(Build 221017))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index b49afec11f..64689dd755 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.765-221016
+Version: 7.0NG.765-221017
 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 7a175debaa..94ff4318f3 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.765-221016"
+pandora_version="7.0NG.765-221017"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 784d3b7750..0823f278b7 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 = 'PC221016';
+$build_version = 'PC221017';
 $pandora_version = 'v7.0NG.765';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index c061d760bb..11cd881e99 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -129,7 +129,7 @@
         <div style='height: 10px'>
             <?php
             $version = '7.0NG.765';
-            $build = '221016';
+            $build = '221017';
             $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 b41d5c200a..db5324e114 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.765
-%define release     221016
+%define release     221017
 
 # 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 a227099479..e887679dbd 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.765
-%define release     221016
+%define release     221017
 
 # 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 6df46f8da6..de18fc1c64 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.765
-%define release     221016
+%define release     221017
 %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 fde05dbc52..ed66eb51f8 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.765-221016
+Version: 7.0NG.765-221017
 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 c3d5305197..a74c12ae4a 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.765-221016"
+pandora_version="7.0NG.765-221017"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index f973996b9e..022b6c8ab5 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@@ -46,7 +46,7 @@ our @EXPORT = qw(
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.765";
-my $pandora_build = "221016";
+my $pandora_build = "221017";
 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 3f269cb1b0..9bf3ac8dab 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.765";
-my $pandora_build = "221016";
+my $pandora_build = "221017";
 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 30241fc5a4..c2d2d779f8 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.765
-%define release     221016
+%define release     221017
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index b87320bd03..84cc39b429 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.765
-%define release     221016
+%define release     221017
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index f0d822337b..ddd4b97d4e 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.765"
-PI_BUILD="221016"
+PI_BUILD="221017"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index d1d9f82626..e6e49316ab 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.765 Build 221016";
+my $version = "7.0NG.765 Build 221017";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index e1506f7cf2..ba59b8b2c1 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.765 Build 221016";
+my $version = "7.0NG.765 Build 221017";
 
 # save program name for logging
 my $progname = basename($0);

From 2251062d3060a239c4e9cc1bfd366f262fba51f4 Mon Sep 17 00:00:00 2001
From: Calvo <luis.calvo@pandorafms.com>
Date: Mon, 17 Oct 2022 12:26:38 +0200
Subject: [PATCH 21/22] Fix user profile add bugs

---
 .../godmode/users/configure_user.php          | 27 ++++++++++++++++---
 pandora_console/include/functions_profile.php | 11 +++++---
 .../include/javascript/pandora_ui.js          | 23 ++++++++++++++++
 3 files changed, 54 insertions(+), 7 deletions(-)

diff --git a/pandora_console/godmode/users/configure_user.php b/pandora_console/godmode/users/configure_user.php
index 800f738394..945bea5edd 100644
--- a/pandora_console/godmode/users/configure_user.php
+++ b/pandora_console/godmode/users/configure_user.php
@@ -489,6 +489,10 @@ if ($create_user) {
             if (!empty($json_profile)) {
                 $json_profile = json_decode(io_safe_output($json_profile), true);
                 foreach ($json_profile as $key => $profile) {
+                    if (is_array($profile) === false) {
+                        $profile = json_decode($profile, true);
+                    }
+
                     if (!empty($profile)) {
                         $group2 = $profile['group'];
                         $profile2 = $profile['profile'];
@@ -806,6 +810,10 @@ if ($add_profile && empty($json_profile)) {
         'Profile: '.$profile2.' Group: '.$group2.' Tags: '.$tags
     );
     $return = profile_create_user_profile($id2, $profile2, $group2, false, $tags, $no_hierarchy);
+    if ($return === false) {
+        $is_err = true;
+    }
+
     ui_print_result_message(
         $return,
         __('Profile added successfully'),
@@ -1439,7 +1447,7 @@ if ($config['admin_can_add_user']) {
 
 echo '</div>';
 
-html_print_input_hidden('json_profile', '');
+html_print_input_hidden('json_profile', $json_profile);
 
 echo '</form>';
 
@@ -1566,7 +1574,12 @@ $(document).ready (function () {
     var user_is_global_admin = '<?php echo users_is_admin($id); ?>';
     var is_err = '<?php echo $is_err; ?>';
     var data = [];
+    var aux = 0;
 
+    if(json_profile.val() != '') {
+        var data = JSON.parse(json_profile.val());
+    }
+    
     $('input:image[name="add"]').click(function (e) {
         e.preventDefault();
         var profile = $('#assign_profile').val();
@@ -1588,10 +1601,14 @@ $(document).ready (function () {
             return;
         }
 
-        if (id_user === '' || is_err === 1) {
+        if (id_user == '' || is_err == 1) {
             let new_json = `{"profile":${profile},"group":${group},"tags":[${tags}],"hierarchy":${hierarchy}}`;
             data.push(new_json);
-            json_profile.val('['+data+']');
+            json_profile.val(JSON.stringify(data));
+            profile_text = `<a href="index.php?sec2=godmode/users/configure_profile&id=${profile}">${profile_text}</a>`;
+            group_img = `<img id="img_group_${aux}" src="" data-title="${group_text}" data-use_title_for_force_title="1" class="bot forced_title" alt="${group_text}"/>`;
+            group_text = `<a href="index.php?sec=estado&sec2=operation/agentes/estado_agente&refr=60&group_id=${group}">${group_img}${group_text}</a>`;
+
             $('#table_profiles tr:last').before(
                 `<tr>
                     <td>${profile_text}</td>
@@ -1601,6 +1618,10 @@ $(document).ready (function () {
                     <td>${img_delete}</td>
                 </tr>`
             );
+
+            getGroupIcon(group, $(`#img_group_${aux}`));
+            aux++;
+
         } else {
             this.form.submit();
         }
diff --git a/pandora_console/include/functions_profile.php b/pandora_console/include/functions_profile.php
index c6a62c4c9d..ad052dadbd 100644
--- a/pandora_console/include/functions_profile.php
+++ b/pandora_console/include/functions_profile.php
@@ -181,7 +181,7 @@ function profile_delete_profile_and_clean_users($id_profile)
  * @param int User id
  * @param bool Show the tags select or not
  */
-function profile_print_profile_table($id, $json_profile=false)
+function profile_print_profile_table($id, $json_profile=false, $return=false)
 {
     global $config;
 
@@ -246,6 +246,10 @@ function profile_print_profile_table($id, $json_profile=false)
         if ($json_profile !== false && empty($json_profile) !== true) {
             $profile_decoded = json_decode($json_profile);
             foreach ($profile_decoded as $profile) {
+                if (is_object($profile) === false) {
+                    $profile = json_decode($profile);
+                }
+
                         $result[] = [
                             'id_grupo'  => $profile->group,
                             'id_perfil' => $profile->profile,
@@ -293,10 +297,10 @@ function profile_print_profile_table($id, $json_profile=false)
         $data['hierarchy'] = $profile['no_hierarchy'] ? __('Yes') : __('No');
 
         $data['actions'] = '<form method="post" onsubmit="if (!confirm (\''.__('Are you sure?').'\')) return false">';
+        $data['actions'] .= html_print_input_image('del', 'images/cross.png', 1, ['class' => 'invert_filter'], true);
         $data['actions'] .= html_print_input_hidden('delete_profile', 1, true);
         $data['actions'] .= html_print_input_hidden('id_user_profile', $profile['id_up'], true);
         $data['actions'] .= html_print_input_hidden('id_user', $id, true);
-        $data['actions'] .= html_print_input_image('del', 'images/cross.png', 1, ['class' => 'invert_filter'], true);
         $data['actions'] .= '</form>';
 
         array_push($table->data, $data);
@@ -362,8 +366,7 @@ function profile_print_profile_table($id, $json_profile=false)
     $data['actions'] .= '</form>';
 
     array_push($table->data, $data);
-
-    html_print_table($table);
+    html_print_table($table, $return);
     if (!is_metaconsole()) {
         echo '</div>';
     }
diff --git a/pandora_console/include/javascript/pandora_ui.js b/pandora_console/include/javascript/pandora_ui.js
index eeeb5fcfd5..ecb23827d9 100644
--- a/pandora_console/include/javascript/pandora_ui.js
+++ b/pandora_console/include/javascript/pandora_ui.js
@@ -740,3 +740,26 @@ function reveal_password(name) {
     revealElement.attr("src", imagesPath + "eye_show.png");
   }
 }
+
+/**
+ * Returns html img group icon.
+ * @param {int} $id_group
+ */
+function getGroupIcon(id_group, img_container) {
+  $.ajax({
+    type: "POST",
+    url: "ajax.php",
+    dataType: "json",
+    data: {
+      page: "godmode/groups/group_list",
+      get_group_json: 1,
+      id_group: id_group
+    },
+    success: function(data) {
+      img_container.attr("src", "images/groups_small/" + data["icon"] + ".png");
+    },
+    error: function() {
+      img_container.attr("src", "");
+    }
+  });
+}

From ed8b6678cd2a9439d5bdf45d6cf0ea7c5e7cfb9f Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Tue, 18 Oct 2022 01:00:21 +0200
Subject: [PATCH 22/22] 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 c0a043b65f..1e38797198 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.765-221017
+Version: 7.0NG.765-221018
 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 376ee10fb8..e7662144c6 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.765-221017"
+pandora_version="7.0NG.765-221018"
 
 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 45dbf33561..bf7572f67c 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.765';
-use constant AGENT_BUILD => '221017';
+use constant AGENT_BUILD => '221018';
 
 # 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 611d497c2e..6074ba5280 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.765
-%define release     221017
+%define release     221018
 
 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 7c0f1de9c9..b4081b677d 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.765
-%define release     221017
+%define release     221018
 
 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 a9a7fb7350..c7c2027a81 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.765"
-PI_BUILD="221017"
+PI_BUILD="221018"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index 164fdc29e5..9af1e6a8c9 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{221017}
+{221018}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 42a66fda57..04eea8f5e8 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.765 Build 221017")
+#define PANDORA_VERSION ("7.0NG.765 Build 221018")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index 55b05dbc59..3192279b81 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.765(Build 221017))"
+      VALUE "ProductVersion", "(7.0NG.765(Build 221018))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 64689dd755..fce3f648cf 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.765-221017
+Version: 7.0NG.765-221018
 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 94ff4318f3..bb0fe38433 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.765-221017"
+pandora_version="7.0NG.765-221018"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 0823f278b7..28a11a0f1c 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 = 'PC221017';
+$build_version = 'PC221018';
 $pandora_version = 'v7.0NG.765';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 11cd881e99..0d925f107e 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -129,7 +129,7 @@
         <div style='height: 10px'>
             <?php
             $version = '7.0NG.765';
-            $build = '221017';
+            $build = '221018';
             $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 db5324e114..5afb98159f 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.765
-%define release     221017
+%define release     221018
 
 # 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 e887679dbd..21ddaf5adc 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.765
-%define release     221017
+%define release     221018
 
 # 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 de18fc1c64..503fc0383b 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.765
-%define release     221017
+%define release     221018
 %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 ed66eb51f8..bbcc24efdf 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.765-221017
+Version: 7.0NG.765-221018
 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 a74c12ae4a..4dab9e00b9 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.765-221017"
+pandora_version="7.0NG.765-221018"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 022b6c8ab5..acf6f53651 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@@ -46,7 +46,7 @@ our @EXPORT = qw(
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.765";
-my $pandora_build = "221017";
+my $pandora_build = "221018";
 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 9bf3ac8dab..a0d72e02cf 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.765";
-my $pandora_build = "221017";
+my $pandora_build = "221018";
 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 c2d2d779f8..cfcfd49b42 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.765
-%define release     221017
+%define release     221018
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 84cc39b429..d90c6cf9fc 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.765
-%define release     221017
+%define release     221018
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index ddd4b97d4e..52487caa93 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.765"
-PI_BUILD="221017"
+PI_BUILD="221018"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index e6e49316ab..e4a5c8b726 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.765 Build 221017";
+my $version = "7.0NG.765 Build 221018";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index ba59b8b2c1..3ec677ac1f 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.765 Build 221017";
+my $version = "7.0NG.765 Build 221018";
 
 # save program name for logging
 my $progname = basename($0);