Port of #9584

Fixes #9583

lib/private/group/metadata.php: For subadmins also return an array of groups, indexed by their GIDs.
settings/users.php: Convert array of arrays to array of GIDs before calling into OC_Group::displayNamesInGroups.

Signed-off-by: Stephan Peijnik <speijnik@anexia-it.com>

Fix indentation.

Signed-off-by: Stephan Peijnik <speijnik@anexia-it.com>

Renamed $grp to $group in foreach loop.

Signed-off-by: Stephan Peijnik <speijnik@anexia-it.com>

Use is_null() instead of empty() when checking the return value of GroupManager::get().

Additionally, $grp was renamed to $group inside
 \OC\Group\MetaData::fetchGroups().

Signed-off-by: Stephan Peijnik <speijnik@anexia-it.com>

Updated code to reflect changes introduced to \OC\Group\MetaData.

Now that fetchGroups() does not exist anymore and getGroups() is called
directory, the 'groups' property does not exist anymore.
Instead, we now generate that array on the fly and return it from getGroups.

Signed-off-by: Stephan Peijnik <speijnik@anexia-it.com>

lib/private/group/metadata.php

@@ -168,7 +168,21 @@ class MetaData {
 		if($this->isAdmin) {
 			return $this->groupManager->search($search);
 		} else {
-			return \OC_SubAdmin::getSubAdminsGroups($this->user);
+			$groupIds = \OC_SubAdmin::getSubAdminsGroups($this->user);
+
+			/* \OC_SubAdmin::getSubAdminsGroups() returns an array of GIDs, but this
+			* method is expected to return an array with the GIDs as keys and group objects as
+			* values, so we need to convert this information.
+			*/
+			$groups = array();
+			foreach($groupIds as $gid) {
+				$group = $this->groupManager->get($gid);
+				if (!is_null($group)) {
+					$groups[$gid] = $group;
+				}
+			}
+
+			return $groups;
 		}
 	}
 }

settings/users.php

@@ -35,7 +35,14 @@ if($isAdmin) {
 	$accessibleUsers = OC_User::getDisplayNames('', 30);
 	$subadmins = OC_SubAdmin::getAllSubAdmins();
 }else{
-	$accessibleUsers = OC_Group::displayNamesInGroups($groups, '', 30);
+	/* Retrieve group IDs from $groups array, so we can pass that information into OC_Group::displayNamesInGroups() */
+	$gids = array();
+	foreach($groups as $group) {
+		if (isset($group['id'])) {
+			$gids[] = $group['id'];
+		}
+	}
+	$accessibleUsers = OC_Group::displayNamesInGroups($gids, '', 30);
 	$subadmins = false;
 }