From 2d45c0b39f9c83a3804564bef7e5e4a50aa1299b Mon Sep 17 00:00:00 2001 From: fermin831 <fermin.hernandez@artica.es> Date: Thu, 19 Jul 2018 11:02:20 +0200 Subject: [PATCH] Added serialized to groups ajax calls --- pandora_console/godmode/groups/group_list.php | 25 +++++++++++++------ 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/pandora_console/godmode/groups/group_list.php b/pandora_console/godmode/groups/group_list.php index cda1a32143..aa4e1fbb0d 100644 --- a/pandora_console/godmode/groups/group_list.php +++ b/pandora_console/godmode/groups/group_list.php @@ -82,6 +82,9 @@ if (is_ajax ()) { $status_agents = (int)get_parameter('status_agents', AGENT_STATUS_ALL); // Juanma (22/05/2014) Fix: If setted remove void agents from result (by default and for compatibility show void agents) $show_void_agents = (int)get_parameter('show_void_agents', 1); + $serialized = (bool)get_parameter('serialized', false); + $serialized_separator = (string)get_parameter('serialized_separator', "|"); + $force_serialized = (bool)get_parameter('force_serialized', false); if (! check_acl ($config['id_user'], $id_group, "AR")) { db_pandora_audit("ACL Violation", @@ -121,18 +124,26 @@ if (is_ajax ()) { $filter[$_sql_post] = '1'; } - + + $id_groups_get_agents = $id_group; if ( $id_group == 0 && $privilege != '') { $groups = users_get_groups ($config["id_user"], $privilege, false); // if group ID doesn't matter and $privilege is specified (like 'AW'), // retruns all agents that current user has $privilege privilege for. - $agents = agents_get_group_agents(array_keys($groups), $filter, "none", false, $recursion, false, '|', $add_alert_bulk_op); + $id_groups_get_agents = array_keys($groups); } - else { - $agents = agents_get_group_agents($id_group, $filter, "none", - true, $recursion, false, '|', $add_alert_bulk_op); - } - + $agents = agents_get_group_agents( + $id_groups_get_agents, + $filter, + "none", + false, + $recursion, + $serialized, + $serialized_separator, + $add_alert_bulk_op, + $force_serialized + ); + $agents_disabled = array(); // Add keys prefix if ($keys_prefix !== "") {