oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

- fix [ 1373707 ] File Pile not uploading images

Browse source 
- fix [ 1353425 ] getUsersInGroup includes expired Group of group members (Ed
   van Duinen)
 - fix [ 1373041 ] context menus in Admin Mode don't position correctly in IE
   ( Michele Dell'Aquila)
This commit is contained in:
JT Smith 2005-12-07 00:07:25 +00:00
parent d42cc1aeee
commit 9549d37033
5 changed files with 19 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lib/WebGUI/Grouping.pm
View file

@ -320,10 +320,16 @@ sub getUsersInGroup {
$clause = "expireDate > ".time()." and ";
}
$clause .= "(groupId=".quote($groupId);
if ($recursive) {
if ($recursive) {
my $groups = getGroupsInGroup($groupId,1);
if ($#$groups >= 0) {
$clause .= " or groupId in (".quoteAndJoin($groups).")";
if ($withoutExpired) {
foreach my $groupId (@$groups) {
$clause .= " OR (groupId = ".quote($groupId)." AND expireDate > ".time().") ";
}
} else {
$clause .= " OR groupId IN (".quoteAndJoin(',',@$groups).")";
}
}
}
$clause .= ")";