tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-31 01:35:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

2011-07-08 Junichi Satoh <junichi@rworks.jp>

Browse Source 
* include/functions_agents.php: Fixed agents_get_group_agents()
	does not work correctly with $childGroups enabled.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4529 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
jsatoh 2011-07-08 02:20:38 +00:00
parent ee74f5e15f
commit 8b53e84ce2
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_console/ChangeLog
View File

@ -1,3 +1,8 @@
2011-07-08 Junichi Satoh <junichi@rworks.jp>
* include/functions_agents.php: Fixed agents_get_group_agents()
does not work correctly with $childGroups enabled.
2011-07-07 Sergio Martin <sergio.martin@artica.es> 2011-07-07 Sergio Martin <sergio.martin@artica.es>
* godmode/groups/group_list.php: Added code for get agent filter * godmode/groups/group_list.php: Added code for get agent filter

8
pandora_console/include/functions_agents.php
View File

@ -756,6 +756,14 @@ function agents_get_group_agents ($id_group = 0, $search = false, $case = "lower
} }
if ($childGroups) { if ($childGroups) {
if (is_array($id_group)) {
foreach ($id_group as $parent) {
$id_group = array_merge($id_group, groups_get_id_recursive($parent, true));
}
}
else {
$id_group = groups_get_id_recursive($id_group, true);
}
$id_group = array_keys(users_get_groups(false, "AR", true, false, (array)$id_group)); $id_group = array_keys(users_get_groups(false, "AR", true, false, (array)$id_group));
} }