From 498a353a29eb9e42c27da017197318afe89529b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Gonz=C3=A1lez?= <jose.gonzalez@pandorafms.com>
Date: Fri, 2 Jul 2021 12:20:53 +0200
Subject: [PATCH 1/2] Improve code for get secondary groups

---
 pandora_console/godmode/agentes/agent_manager.php | 5 ++++-
 pandora_console/include/functions_events.php      | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/pandora_console/godmode/agentes/agent_manager.php b/pandora_console/godmode/agentes/agent_manager.php
index 8e314f0293..f34fb3e15d 100644
--- a/pandora_console/godmode/agentes/agent_manager.php
+++ b/pandora_console/godmode/agentes/agent_manager.php
@@ -500,7 +500,10 @@ if (enterprise_installed()) {
         false,
         // Delete_groups.
         // Do not show the primary group in this selection.
-        array_merge(($secondary_groups_selected['plain'] ?? []), [$agent['id_grupo']])
+        array_merge(
+            (empty($secondary_groups_selected['plain']) === false) ? $secondary_groups_selected['plain'] : [],
+            [$agent['id_grupo']]
+        )
         // Include_groups.
         // Size.
         // Simple_multiple_options.
diff --git a/pandora_console/include/functions_events.php b/pandora_console/include/functions_events.php
index c1d7aeb404..0d8d4183e9 100644
--- a/pandora_console/include/functions_events.php
+++ b/pandora_console/include/functions_events.php
@@ -4843,7 +4843,7 @@ function events_page_general($event)
     if (isset($event['id_agente']) && $event['id_agente'] > 0) {
         enterprise_include_once('include/functions_agents.php');
         $secondary_groups_selected = enterprise_hook('agents_get_secondary_groups', [$event['id_agente'], is_metaconsole()]);
-        if (!empty($secondary_groups_selected)) {
+        if (empty($secondary_groups_selected['for_select']) === false) {
             $secondary_groups = implode(', ', $secondary_groups_selected['for_select']);
         }
     }

From a9075463ac7346c167e91ddf0eedca566892e39e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Gonz=C3=A1lez?= <jose.gonzalez@pandorafms.com>
Date: Fri, 2 Jul 2021 13:48:59 +0200
Subject: [PATCH 2/2] Missed change

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

diff --git a/pandora_console/operation/agentes/estado_generalagente.php b/pandora_console/operation/agentes/estado_generalagente.php
index f2b69d5b56..702159bf14 100755
--- a/pandora_console/operation/agentes/estado_generalagente.php
+++ b/pandora_console/operation/agentes/estado_generalagente.php
@@ -395,7 +395,7 @@ $table_contact->data[] = $data;
 $data = [];
 $data[0] = '<b>'.__('Secondary groups').'</b>';
 $secondary_groups = enterprise_hook('agents_get_secondary_groups', [$id_agente]);
-if (!$secondary_groups) {
+if (empty($secondary_groups['for_select']) === true) {
     $data[1] = '<em>'.__('N/A').'</em>';
 } else {
     $secondary_links = [];