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

fix coding style to blizzz happy.. ;-)

This commit is contained in:
root 2014-02-12 16:56:17 +01:00
parent 2b127a6ac5
commit d10f6e94dc
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
apps/user_ldap/group_ldap.php
View File

@ -105,10 +105,11 @@ class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface {
$seen[$dnGroup] = 1; $seen[$dnGroup] = 1;
$members = $this->access->readAttribute($dnGroup, $this->access->connection->ldapGroupMemberAssocAttr, $members = $this->access->readAttribute($dnGroup, $this->access->connection->ldapGroupMemberAssocAttr,
$this->access->connection->ldapGroupFilter); $this->access->connection->ldapGroupFilter);
if ($members) { if (is_array($members)) {
foreach ($members as $memberDN) { foreach ($members as $memberDN) {
$allMembers[$memberDN] = 1; $allMembers[$memberDN] = 1;
if ($this->access->connection->ldapNestedGroups) { $nestedGroups = $this->access->connection->ldapNestedGroups;
if (!empty($nestedGroups)) {
$subMembers = $this->_groupMembers($memberDN, $seen); $subMembers = $this->_groupMembers($memberDN, $seen);
if ($subMembers) { if ($subMembers) {
$allMembers = array_merge($allMembers, $subMembers); $allMembers = array_merge($allMembers, $subMembers);
@ -155,14 +156,14 @@ class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface {
$uid = $userDN; $uid = $userDN;
} }
$groups = array_values($this->_getGroupsByMember($uid)); $groups = array_values($this->getGroupsByMember($uid));
$groups = array_unique($this->access->ownCloudGroupNames($groups), SORT_LOCALE_STRING); $groups = array_unique($this->access->ownCloudGroupNames($groups), SORT_LOCALE_STRING);
$this->access->connection->writeToCache($cacheKey, $groups); $this->access->connection->writeToCache($cacheKey, $groups);
return $groups; return $groups;
} }
private function _getGroupsByMember($dn, &$seen = null) { private function getGroupsByMember($dn, &$seen = null) {
if ($seen === null) { if ($seen === null) {
$seen = array(); $seen = array();
} }
@ -178,13 +179,14 @@ class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface {
)); ));
$groups = $this->access->fetchListOfGroups($filter, $groups = $this->access->fetchListOfGroups($filter,
array($this->access->connection->ldapGroupDisplayName, 'dn')); array($this->access->connection->ldapGroupDisplayName, 'dn'));
if ($groups) { if (is_array($groups)) {
foreach ($groups as $groupobj) { foreach ($groups as $groupobj) {
$groupDN = $groupobj['dn']; $groupDN = $groupobj['dn'];
$allGroups[$groupDN] = $groupobj; $allGroups[$groupDN] = $groupobj;
if ($this->access->connection->ldapNestedGroups) { $nestedGroups = $this->access->connection->ldapNestedGroups;
$supergroups = $this->_getGroupsByMember($groupDN, $seen); if (!empty($nestedGroups)) {
if ($supergroups) { $supergroups = $this->getGroupsByMember($groupDN, $seen);
if (is_array($supergroups) && (count($supergroups)>0)) {
$allGroups = array_merge($allGroups, $supergroups); $allGroups = array_merge($allGroups, $supergroups);
} }
} }