@@ -1102,18 +1102,15 @@ public function switchAction($action, $httpVars, $fileVars)
1102
1102
// donothing
1103
1103
break ;
1104
1104
case 'group ' :
1105
- $ allUsers = AuthService::listUsers ($ baseGroup , $ regexp , 0 , $ limit , false );
1106
1105
$ authGroups = AuthService::listChildrenGroups ($ baseGroup );
1107
1106
foreach ($ authGroups as $ gId => $ gName ) {
1108
1107
$ allGroups ["AJXP_GRP_ " . AuthService::filterBaseGroup ($ gId )] = $ gName ;
1109
1108
}
1110
1109
break ;
1111
1110
case 'role ' :
1112
- $ allUsers = AuthService::listUsers ($ baseGroup , $ regexp , 0 , $ limit , false );
1113
1111
$ allGroups = $ this ->getUserRoleList ($ loggedUser , $ rolePrefix , $ includeString , $ excludeString , $ listRoleType );
1114
1112
break ;
1115
1113
case 'rolegroup ' ;
1116
- $ allUsers = AuthService::listUsers ($ baseGroup , $ regexp , 0 , $ limit , false );
1117
1114
$ groups = array ();
1118
1115
$ authGroups = AuthService::listChildrenGroups ($ baseGroup );
1119
1116
foreach ($ authGroups as $ gId => $ gName ) {
@@ -1273,9 +1270,9 @@ public function getUserRoleList($userObject, $rolePrefix, $includeString, $exclu
1273
1270
{
1274
1271
if ($ userObject ) {
1275
1272
if ($ byUserRoles ) {
1276
- $ allUserRoles = $ userObject ->getRoles ();
1273
+ $ allUserRoles = $ userObject ->getRoles ();
1277
1274
} else {
1278
- $ allUserRoles = AuthService::getRolesList ();
1275
+ $ allUserRoles = AuthService::getRolesList (array (), true );
1279
1276
}
1280
1277
$ allRoles = array ();
1281
1278
if (isset ($ allUserRoles )) {
0 commit comments