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

Take review comments into consideration for pr #18042 / issue #17759

This commit is contained in:
Frédéric Fortier 2015-08-04 11:19:57 -04:00
parent 7604bcb3cb
commit e0469d0013
1 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
apps/user_ldap/group_ldap.php
View File

@ -182,8 +182,8 @@ class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface {
}
/**
* @param string $dnGroup
* @param array &$seen
* @param string $DN
* @param array|null &$seen
* @return array
*/
private function _getGroupDNsFromMemberOf($DN, &$seen = null) {
@ -196,22 +196,19 @@ class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface {
}
$seen[$DN] = 1;
$groups = $this->access->readAttribute($DN, 'memberOf');
if (is_array($groups)) {
$groups = $this->access->groupsMatchFilter($groups);
$allGroups = $groups;
foreach ($groups as $group) {
$nestedGroups = $this->access->connection->ldapNestedGroups;
if (!empty($nestedGroups)) {
$subGroups = $this->_getGroupDNsFromMemberOf($group, $seen);
if ($subGroups) {
$allGroups = array_merge($allGroups, $subGroups);
}
}
}
return $allGroups;
} else {
if (!is_array($groups)) {
return array();
}
$groups = $this->access->groupsMatchFilter($groups);
$allGroups = $groups;
foreach ($groups as $group) {
$nestedGroups = $this->access->connection->ldapNestedGroups;
if (!empty($nestedGroups)) {
$subGroups = $this->_getGroupDNsFromMemberOf($group, $seen);
$allGroups = array_merge($allGroups, $subGroups);
}
}
return $allGroups;
}
/**