mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #8998 from macjohnny/master 

drastic speedup for nested ldap groups
This commit is contained in:
macjohnny 2014-06-12 14:49:15 +02:00
parent 354cace14a e8e2e47e68
commit 482eded8b3
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/private/group.php
View File

@ -187,12 +187,7 @@ class OC_Group {
public static function getUserGroups($uid) { public static function getUserGroups($uid) {
$user = self::$userManager->get($uid); $user = self::$userManager->get($uid);
if ($user) { if ($user) {
$groups = self::getManager()->getUserGroups($user); return self::getManager()->getUserGroupIds($user);
$groupIds = array();
foreach ($groups as $group) {
$groupIds[] = $group->getGID();
}
return $groupIds;
} else { } else {
return array(); return array();
} }

12
lib/private/group/manager.php
View File

@ -182,6 +182,18 @@ class Manager extends PublicEmitter {
$this->cachedUserGroups[$uid] = array_values($groups); $this->cachedUserGroups[$uid] = array_values($groups);
return $this->cachedUserGroups[$uid]; return $this->cachedUserGroups[$uid];
} }
/**
* @param \OC\User\User $user
* @return array with group names
*/
public function getUserGroupIds($user) {
$groupIds = array();
foreach ($this->backends as $backend) {
$groupIds = array_merge($groupIds, $backend->getUserGroups($user->getUID()));
}
return $groupIds;
}
/** /**
* get a list of all display names in a group * get a list of all display names in a group