From e0469d001384eb9c4125ca16d9babdf673be57ee Mon Sep 17 00:00:00 2001
From: Frédéric Fortier <frederic.fortier@oronospolytechnique.com>
Date: Tue, 4 Aug 2015 11:19:57 -0400
Subject: Take review comments into consideration for pr #18042 / issue #17759

---
 apps/user_ldap/group_ldap.php | 29 +++++++++++++----------------
 1 file changed, 13 insertions(+), 16 deletions(-)

(limited to 'apps')

diff --git a/apps/user_ldap/group_ldap.php b/apps/user_ldap/group_ldap.php
index 44b0ceac7eb..a592913c8f5 100644
--- a/apps/user_ldap/group_ldap.php
+++ b/apps/user_ldap/group_ldap.php
@@ -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;	
 	}
 
 	/**
-- 
cgit v1.2.3