From 8da6eca4aba0c75a1e0db300fd911c6c8af5c186 Mon Sep 17 00:00:00 2001 From: fermin831 Date: Mon, 9 Apr 2018 12:40:52 +0200 Subject: [PATCH] [Secondary groups] Fixed get agents function to works properly with groups view --- pandora_console/include/functions_agents.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pandora_console/include/functions_agents.php b/pandora_console/include/functions_agents.php index 1a88eed5ff..f06108c040 100644 --- a/pandora_console/include/functions_agents.php +++ b/pandora_console/include/functions_agents.php @@ -375,7 +375,6 @@ function agents_get_agents ($filter = false, $fields = false, if (empty ($filter['id_grupo'])) { $all_groups = true; $filter['id_grupo'] = $groups; - $filter['id_group'] = $groups; } elseif (! is_array ($filter['id_grupo'])) { $all_groups = false; @@ -384,7 +383,6 @@ function agents_get_agents ($filter = false, $fields = false, return false; } $filter['id_grupo'] = (array) $filter['id_grupo']; //Make an array - $filter['id_group'] = (array) $filter['id_grupo']; //Make an array } else { $all_groups = true; @@ -398,8 +396,8 @@ function agents_get_agents ($filter = false, $fields = false, if (count ($filter['id_grupo']) == 0) { return false; } - $filter['id_group'] = $filter['id_grupo']; } + $filter['id_group'] = $filter['id_grupo']; if (in_array (0, $filter['id_grupo'])) { unset ($filter['id_grupo']); @@ -438,6 +436,8 @@ function agents_get_agents ($filter = false, $fields = false, ) , 'OR', ''); unset($filter['id_group']); unset($filter['id_grupo']); + unset($filter_nogroup['id_grupo']); + unset($filter_nogroup['id_group']); } // Add the group filter to $where = db_format_array_where_clause_sql ($filter, 'AND', "(" . $where_secondary . ") AND "); @@ -484,7 +484,6 @@ function agents_get_agents ($filter = false, $fields = false, $limit_sql = " LIMIT $offset, $limit "; } $sql = sprintf("%s %s", $sql, $limit_sql); - if ($return) return $sql; else $agents = db_get_all_rows_sql($sql);