tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed in the function 'agents_get_group_agents' get agents with noACL flag is setted. TICKET: #3166 

(cherry picked from commit a2b97333ce508cd087aa88420bf0cb3ebe3f411c)
This commit is contained in:
mdtrooper 2015-12-31 12:35:07 +01:00
parent b5bff5aedc
commit 5877eef17c
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pandora_console/include/functions_agents.php
View File

@ -823,13 +823,18 @@ function agents_get_group_agents ($id_group = 0, $search = false,
if ($childGroups) { if ($childGroups) {
if (is_array($id_group)) { if (is_array($id_group)) {
foreach ($id_group as $parent) { foreach ($id_group as $parent) {
$id_group = array_merge($id_group, groups_get_id_recursive($parent, true)); $id_group = array_merge($id_group,
groups_get_id_recursive($parent, true));
} }
} }
else { else {
$id_group = groups_get_id_recursive($id_group, true); $id_group = groups_get_id_recursive($id_group, true);
} }
$id_group = array_keys(users_get_groups(false, "AR", true, false, (array)$id_group));
if (!$noACL) {
$id_group = array_keys(
users_get_groups(false, "AR", true, false, (array)$id_group));
}
} }
if (!empty($id_group)) { if (!empty($id_group)) {