nextcloud / server

lib/private/Group/Group.php

Indentation +265 added lines, -265 removed lines

@@ -35,292 +35,292 @@
 use OCP\Group\Backend\ICountDisabledInGroup;
 
 class Group implements IGroup {
-	/** @var null|string  */
-	protected $displayName;
+    /** @var null|string  */
+    protected $displayName;
 
-	/**
-	 * @var string $id
-	 */
-	private $gid;
+    /**
+     * @var string $id
+     */
+    private $gid;
 
-	/**
-	 * @var \OC\User\User[] $users
-	 */
-	private $users = array();
+    /**
+     * @var \OC\User\User[] $users
+     */
+    private $users = array();
 
-	/**
-	 * @var bool $usersLoaded
-	 */
-	private $usersLoaded;
+    /**
+     * @var bool $usersLoaded
+     */
+    private $usersLoaded;
 
-	/**
-	 * @var \OC\Group\Backend[]|\OC\Group\Database[] $backend
-	 */
-	private $backends;
+    /**
+     * @var \OC\Group\Backend[]|\OC\Group\Database[] $backend
+     */
+    private $backends;
 
-	/**
-	 * @var \OC\Hooks\PublicEmitter $emitter
-	 */
-	private $emitter;
+    /**
+     * @var \OC\Hooks\PublicEmitter $emitter
+     */
+    private $emitter;
 
-	/**
-	 * @var \OC\User\Manager $userManager
-	 */
-	private $userManager;
+    /**
+     * @var \OC\User\Manager $userManager
+     */
+    private $userManager;
 
-	/**
-	 * @param string $gid
-	 * @param \OC\Group\Backend[] $backends
-	 * @param \OC\User\Manager $userManager
-	 * @param \OC\Hooks\PublicEmitter $emitter
-	 * @param string $displayName
-	 */
-	public function __construct($gid, $backends, $userManager, $emitter = null, $displayName = null) {
-		$this->gid = $gid;
-		$this->backends = $backends;
-		$this->userManager = $userManager;
-		$this->emitter = $emitter;
-		$this->displayName = $displayName;
-	}
+    /**
+     * @param string $gid
+     * @param \OC\Group\Backend[] $backends
+     * @param \OC\User\Manager $userManager
+     * @param \OC\Hooks\PublicEmitter $emitter
+     * @param string $displayName
+     */
+    public function __construct($gid, $backends, $userManager, $emitter = null, $displayName = null) {
+        $this->gid = $gid;
+        $this->backends = $backends;
+        $this->userManager = $userManager;
+        $this->emitter = $emitter;
+        $this->displayName = $displayName;
+    }
 
-	public function getGID() {
-		return $this->gid;
-	}
+    public function getGID() {
+        return $this->gid;
+    }
 
-	public function getDisplayName() {
-		if (is_null($this->displayName)) {
-			return $this->gid;
-		}
-		return $this->displayName;
-	}
+    public function getDisplayName() {
+        if (is_null($this->displayName)) {
+            return $this->gid;
+        }
+        return $this->displayName;
+    }
 
-	/**
-	 * get all users in the group
-	 *
-	 * @return \OC\User\User[]
-	 */
-	public function getUsers() {
-		if ($this->usersLoaded) {
-			return $this->users;
-		}
+    /**
+     * get all users in the group
+     *
+     * @return \OC\User\User[]
+     */
+    public function getUsers() {
+        if ($this->usersLoaded) {
+            return $this->users;
+        }
 
-		$userIds = array();
-		foreach ($this->backends as $backend) {
-			$diff = array_diff(
-				$backend->usersInGroup($this->gid),
-				$userIds
-			);
-			if ($diff) {
-				$userIds = array_merge($userIds, $diff);
-			}
-		}
+        $userIds = array();
+        foreach ($this->backends as $backend) {
+            $diff = array_diff(
+                $backend->usersInGroup($this->gid),
+                $userIds
+            );
+            if ($diff) {
+                $userIds = array_merge($userIds, $diff);
+            }
+        }
 
-		$this->users = $this->getVerifiedUsers($userIds);
-		$this->usersLoaded = true;
-		return $this->users;
-	}
+        $this->users = $this->getVerifiedUsers($userIds);
+        $this->usersLoaded = true;
+        return $this->users;
+    }
 
-	/**
-	 * check if a user is in the group
-	 *
-	 * @param IUser $user
-	 * @return bool
-	 */
-	public function inGroup(IUser $user) {
-		if (isset($this->users[$user->getUID()])) {
-			return true;
-		}
-		foreach ($this->backends as $backend) {
-			if ($backend->inGroup($user->getUID(), $this->gid)) {
-				$this->users[$user->getUID()] = $user;
-				return true;
-			}
-		}
-		return false;
-	}
+    /**
+     * check if a user is in the group
+     *
+     * @param IUser $user
+     * @return bool
+     */
+    public function inGroup(IUser $user) {
+        if (isset($this->users[$user->getUID()])) {
+            return true;
+        }
+        foreach ($this->backends as $backend) {
+            if ($backend->inGroup($user->getUID(), $this->gid)) {
+                $this->users[$user->getUID()] = $user;
+                return true;
+            }
+        }
+        return false;
+    }
 
-	/**
-	 * add a user to the group
-	 *
-	 * @param IUser $user
-	 */
-	public function addUser(IUser $user) {
-		if ($this->inGroup($user)) {
-			return;
-		}
+    /**
+     * add a user to the group
+     *
+     * @param IUser $user
+     */
+    public function addUser(IUser $user) {
+        if ($this->inGroup($user)) {
+            return;
+        }
 
-		if ($this->emitter) {
-			$this->emitter->emit('\OC\Group', 'preAddUser', array($this, $user));
-		}
-		foreach ($this->backends as $backend) {
-			if ($backend->implementsActions(\OC\Group\Backend::ADD_TO_GROUP)) {
-				$backend->addToGroup($user->getUID(), $this->gid);
-				if ($this->users) {
-					$this->users[$user->getUID()] = $user;
-				}
-				if ($this->emitter) {
-					$this->emitter->emit('\OC\Group', 'postAddUser', array($this, $user));
-				}
-				return;
-			}
-		}
-	}
+        if ($this->emitter) {
+            $this->emitter->emit('\OC\Group', 'preAddUser', array($this, $user));
+        }
+        foreach ($this->backends as $backend) {
+            if ($backend->implementsActions(\OC\Group\Backend::ADD_TO_GROUP)) {
+                $backend->addToGroup($user->getUID(), $this->gid);
+                if ($this->users) {
+                    $this->users[$user->getUID()] = $user;
+                }
+                if ($this->emitter) {
+                    $this->emitter->emit('\OC\Group', 'postAddUser', array($this, $user));
+                }
+                return;
+            }
+        }
+    }
 
-	/**
-	 * remove a user from the group
-	 *
-	 * @param \OC\User\User $user
-	 */
-	public function removeUser($user) {
-		$result = false;
-		if ($this->emitter) {
-			$this->emitter->emit('\OC\Group', 'preRemoveUser', array($this, $user));
-		}
-		foreach ($this->backends as $backend) {
-			if ($backend->implementsActions(\OC\Group\Backend::REMOVE_FROM_GOUP) and $backend->inGroup($user->getUID(), $this->gid)) {
-				$backend->removeFromGroup($user->getUID(), $this->gid);
-				$result = true;
-			}
-		}
-		if ($result) {
-			if ($this->emitter) {
-				$this->emitter->emit('\OC\Group', 'postRemoveUser', array($this, $user));
-			}
-			if ($this->users) {
-				foreach ($this->users as $index => $groupUser) {
-					if ($groupUser->getUID() === $user->getUID()) {
-						unset($this->users[$index]);
-						return;
-					}
-				}
-			}
-		}
-	}
+    /**
+     * remove a user from the group
+     *
+     * @param \OC\User\User $user
+     */
+    public function removeUser($user) {
+        $result = false;
+        if ($this->emitter) {
+            $this->emitter->emit('\OC\Group', 'preRemoveUser', array($this, $user));
+        }
+        foreach ($this->backends as $backend) {
+            if ($backend->implementsActions(\OC\Group\Backend::REMOVE_FROM_GOUP) and $backend->inGroup($user->getUID(), $this->gid)) {
+                $backend->removeFromGroup($user->getUID(), $this->gid);
+                $result = true;
+            }
+        }
+        if ($result) {
+            if ($this->emitter) {
+                $this->emitter->emit('\OC\Group', 'postRemoveUser', array($this, $user));
+            }
+            if ($this->users) {
+                foreach ($this->users as $index => $groupUser) {
+                    if ($groupUser->getUID() === $user->getUID()) {
+                        unset($this->users[$index]);
+                        return;
+                    }
+                }
+            }
+        }
+    }
 
-	/**
-	 * search for users in the group by userid
-	 *
-	 * @param string $search
-	 * @param int $limit
-	 * @param int $offset
-	 * @return \OC\User\User[]
-	 */
-	public function searchUsers($search, $limit = null, $offset = null) {
-		$users = array();
-		foreach ($this->backends as $backend) {
-			$userIds = $backend->usersInGroup($this->gid, $search, $limit, $offset);
-			$users += $this->getVerifiedUsers($userIds);
-			if (!is_null($limit) and $limit <= 0) {
-				return $users;
-			}
-		}
-		return $users;
-	}
+    /**
+     * search for users in the group by userid
+     *
+     * @param string $search
+     * @param int $limit
+     * @param int $offset
+     * @return \OC\User\User[]
+     */
+    public function searchUsers($search, $limit = null, $offset = null) {
+        $users = array();
+        foreach ($this->backends as $backend) {
+            $userIds = $backend->usersInGroup($this->gid, $search, $limit, $offset);
+            $users += $this->getVerifiedUsers($userIds);
+            if (!is_null($limit) and $limit <= 0) {
+                return $users;
+            }
+        }
+        return $users;
+    }
 
-	/**
-	 * returns the number of users matching the search string
-	 *
-	 * @param string $search
-	 * @return int|bool
-	 */
-	public function count($search = '') {
-		$users = false;
-		foreach ($this->backends as $backend) {
-			if($backend->implementsActions(\OC\Group\Backend::COUNT_USERS)) {
-				if($users === false) {
-					//we could directly add to a bool variable, but this would
-					//be ugly
-					$users = 0;
-				}
-				$users += $backend->countUsersInGroup($this->gid, $search);
-			}
-		}
-		return $users;
-	}
+    /**
+     * returns the number of users matching the search string
+     *
+     * @param string $search
+     * @return int|bool
+     */
+    public function count($search = '') {
+        $users = false;
+        foreach ($this->backends as $backend) {
+            if($backend->implementsActions(\OC\Group\Backend::COUNT_USERS)) {
+                if($users === false) {
+                    //we could directly add to a bool variable, but this would
+                    //be ugly
+                    $users = 0;
+                }
+                $users += $backend->countUsersInGroup($this->gid, $search);
+            }
+        }
+        return $users;
+    }
 
-	/**
-	 * returns the number of disabled users
-	 *
-	 * @return int|bool
-	 */
-	public function countDisabled() {
-		$users = false;
-		foreach ($this->backends as $backend) {
-			if($backend instanceOf ICountDisabledInGroup) {
-				if($users === false) {
-					//we could directly add to a bool variable, but this would
-					//be ugly
-					$users = 0;
-				}
-				$users += $backend->countDisabledInGroup($this->gid);
-			}
-		}
-		return $users;
-	}
+    /**
+     * returns the number of disabled users
+     *
+     * @return int|bool
+     */
+    public function countDisabled() {
+        $users = false;
+        foreach ($this->backends as $backend) {
+            if($backend instanceOf ICountDisabledInGroup) {
+                if($users === false) {
+                    //we could directly add to a bool variable, but this would
+                    //be ugly
+                    $users = 0;
+                }
+                $users += $backend->countDisabledInGroup($this->gid);
+            }
+        }
+        return $users;
+    }
 
-	/**
-	 * search for users in the group by displayname
-	 *
-	 * @param string $search
-	 * @param int $limit
-	 * @param int $offset
-	 * @return \OC\User\User[]
-	 */
-	public function searchDisplayName($search, $limit = null, $offset = null) {
-		$users = array();
-		foreach ($this->backends as $backend) {
-			$userIds = $backend->usersInGroup($this->gid, $search, $limit, $offset);
-			$users = $this->getVerifiedUsers($userIds);
-			if (!is_null($limit) and $limit <= 0) {
-				return array_values($users);
-			}
-		}
-		return array_values($users);
-	}
+    /**
+     * search for users in the group by displayname
+     *
+     * @param string $search
+     * @param int $limit
+     * @param int $offset
+     * @return \OC\User\User[]
+     */
+    public function searchDisplayName($search, $limit = null, $offset = null) {
+        $users = array();
+        foreach ($this->backends as $backend) {
+            $userIds = $backend->usersInGroup($this->gid, $search, $limit, $offset);
+            $users = $this->getVerifiedUsers($userIds);
+            if (!is_null($limit) and $limit <= 0) {
+                return array_values($users);
+            }
+        }
+        return array_values($users);
+    }
 
-	/**
-	 * delete the group
-	 *
-	 * @return bool
-	 */
-	public function delete() {
-		// Prevent users from deleting group admin
-		if ($this->getGID() === 'admin') {
-			return false;
-		}
+    /**
+     * delete the group
+     *
+     * @return bool
+     */
+    public function delete() {
+        // Prevent users from deleting group admin
+        if ($this->getGID() === 'admin') {
+            return false;
+        }
 
-		$result = false;
-		if ($this->emitter) {
-			$this->emitter->emit('\OC\Group', 'preDelete', array($this));
-		}
-		foreach ($this->backends as $backend) {
-			if ($backend->implementsActions(\OC\Group\Backend::DELETE_GROUP)) {
-				$result = true;
-				$backend->deleteGroup($this->gid);
-			}
-		}
-		if ($result and $this->emitter) {
-			$this->emitter->emit('\OC\Group', 'postDelete', array($this));
-		}
-		return $result;
-	}
+        $result = false;
+        if ($this->emitter) {
+            $this->emitter->emit('\OC\Group', 'preDelete', array($this));
+        }
+        foreach ($this->backends as $backend) {
+            if ($backend->implementsActions(\OC\Group\Backend::DELETE_GROUP)) {
+                $result = true;
+                $backend->deleteGroup($this->gid);
+            }
+        }
+        if ($result and $this->emitter) {
+            $this->emitter->emit('\OC\Group', 'postDelete', array($this));
+        }
+        return $result;
+    }
 
-	/**
-	 * returns all the Users from an array that really exists
-	 * @param string[] $userIds an array containing user IDs
-	 * @return \OC\User\User[] an Array with the userId as Key and \OC\User\User as value
-	 */
-	private function getVerifiedUsers($userIds) {
-		if (!is_array($userIds)) {
-			return array();
-		}
-		$users = array();
-		foreach ($userIds as $userId) {
-			$user = $this->userManager->get($userId);
-			if (!is_null($user)) {
-				$users[$userId] = $user;
-			}
-		}
-		return $users;
-	}
+    /**
+     * returns all the Users from an array that really exists
+     * @param string[] $userIds an array containing user IDs
+     * @return \OC\User\User[] an Array with the userId as Key and \OC\User\User as value
+     */
+    private function getVerifiedUsers($userIds) {
+        if (!is_array($userIds)) {
+            return array();
+        }
+        $users = array();
+        foreach ($userIds as $userId) {
+            $user = $this->userManager->get($userId);
+            if (!is_null($user)) {
+                $users[$userId] = $user;
+            }
+        }
+        return $users;
+    }
 }

apps/provisioning_api/lib/Controller/GroupsController.php

Indentation +218 added lines, -218 removed lines

@@ -44,245 +44,245 @@
 
 class GroupsController extends AUserData {
 
-	/** @var ILogger */
-	private $logger;
+    /** @var ILogger */
+    private $logger;
 
-	/**
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param IUserManager $userManager
-	 * @param IConfig $config
-	 * @param IGroupManager $groupManager
-	 * @param IUserSession $userSession
-	 * @param AccountManager $accountManager
-	 * @param ILogger $logger
-	 * @param UsersController $userController
-	 */
-	public function __construct(string $appName,
-								IRequest $request,
-								IUserManager $userManager,
-								IConfig $config,
-								IGroupManager $groupManager,
-								IUserSession $userSession,
-								AccountManager $accountManager,
-								ILogger $logger) {
-		parent::__construct($appName,
-			$request,
-			$userManager,
-			$config,
-			$groupManager,
-			$userSession,
-			$accountManager);
+    /**
+     * @param string $appName
+     * @param IRequest $request
+     * @param IUserManager $userManager
+     * @param IConfig $config
+     * @param IGroupManager $groupManager
+     * @param IUserSession $userSession
+     * @param AccountManager $accountManager
+     * @param ILogger $logger
+     * @param UsersController $userController
+     */
+    public function __construct(string $appName,
+                                IRequest $request,
+                                IUserManager $userManager,
+                                IConfig $config,
+                                IGroupManager $groupManager,
+                                IUserSession $userSession,
+                                AccountManager $accountManager,
+                                ILogger $logger) {
+        parent::__construct($appName,
+            $request,
+            $userManager,
+            $config,
+            $groupManager,
+            $userSession,
+            $accountManager);
 
-		$this->logger = $logger;
-	}
+        $this->logger = $logger;
+    }
 
-	/**
-	 * returns a list of groups
-	 *
-	 * @NoAdminRequired
-	 *
-	 * @param string $search
-	 * @param int $limit
-	 * @param int $offset
-	 * @return DataResponse
-	 */
-	public function getGroups(string $search = '', int $limit = null, int $offset = 0): DataResponse {
-		$groups = $this->groupManager->search($search, $limit, $offset);
-		$groups = array_map(function($group) {
-			/** @var IGroup $group */
-			return $group->getGID();
-		}, $groups);
+    /**
+     * returns a list of groups
+     *
+     * @NoAdminRequired
+     *
+     * @param string $search
+     * @param int $limit
+     * @param int $offset
+     * @return DataResponse
+     */
+    public function getGroups(string $search = '', int $limit = null, int $offset = 0): DataResponse {
+        $groups = $this->groupManager->search($search, $limit, $offset);
+        $groups = array_map(function($group) {
+            /** @var IGroup $group */
+            return $group->getGID();
+        }, $groups);
 
-		return new DataResponse(['groups' => $groups]);
-	}
+        return new DataResponse(['groups' => $groups]);
+    }
 
-	/**
-	 * returns a list of groups details with ids and displaynames
-	 *
-	 * @NoAdminRequired
-	 *
-	 * @param string $search
-	 * @param int $limit
-	 * @param int $offset
-	 * @return DataResponse
-	 */
-	public function getGroupsDetails(string $search = '', int $limit = null, int $offset = 0): DataResponse {
-		$groups = $this->groupManager->search($search, $limit, $offset);
-		$groups = array_map(function($group) {
-			/** @var IGroup $group */
-			return [
-				'id' => $group->getGID(),
-				'displayname' => $group->getDisplayName(),
-				'usercount' => $group->count(),
-				'disabled' => $group->countDisabled()
-			];
-		}, $groups);
+    /**
+     * returns a list of groups details with ids and displaynames
+     *
+     * @NoAdminRequired
+     *
+     * @param string $search
+     * @param int $limit
+     * @param int $offset
+     * @return DataResponse
+     */
+    public function getGroupsDetails(string $search = '', int $limit = null, int $offset = 0): DataResponse {
+        $groups = $this->groupManager->search($search, $limit, $offset);
+        $groups = array_map(function($group) {
+            /** @var IGroup $group */
+            return [
+                'id' => $group->getGID(),
+                'displayname' => $group->getDisplayName(),
+                'usercount' => $group->count(),
+                'disabled' => $group->countDisabled()
+            ];
+        }, $groups);
 
-		return new DataResponse(['groups' => $groups]);
-	}
+        return new DataResponse(['groups' => $groups]);
+    }
 
-	/**
-	 * @NoAdminRequired
-	 *
-	 * @param string $groupId
-	 * @return DataResponse
-	 * @throws OCSException	
-	 *
-	 * @deprecated 14 Use getGroupUsers
-	 */
-	public function getGroup(string $groupId): DataResponse {
-		return $this->getGroupUsers($groupId);
-	}
+    /**
+     * @NoAdminRequired
+     *
+     * @param string $groupId
+     * @return DataResponse
+     * @throws OCSException	
+     *
+     * @deprecated 14 Use getGroupUsers
+     */
+    public function getGroup(string $groupId): DataResponse {
+        return $this->getGroupUsers($groupId);
+    }
 
-	/**
-	 * returns an array of users in the specified group
-	 *
-	 * @NoAdminRequired
-	 *
-	 * @param string $groupId
-	 * @return DataResponse
-	 * @throws OCSException
-	 */
-	public function getGroupUsers(string $groupId): DataResponse {
-		$user = $this->userSession->getUser();
-		$isSubadminOfGroup = false;
+    /**
+     * returns an array of users in the specified group
+     *
+     * @NoAdminRequired
+     *
+     * @param string $groupId
+     * @return DataResponse
+     * @throws OCSException
+     */
+    public function getGroupUsers(string $groupId): DataResponse {
+        $user = $this->userSession->getUser();
+        $isSubadminOfGroup = false;
 
-		// Check the group exists
-		$group = $this->groupManager->get($groupId);
-		if ($group !== null) {
-			$isSubadminOfGroup =$this->groupManager->getSubAdmin()->isSubAdminOfGroup($user, $group);
-		} else {
-			throw new OCSNotFoundException('The requested group could not be found');
-		}
+        // Check the group exists
+        $group = $this->groupManager->get($groupId);
+        if ($group !== null) {
+            $isSubadminOfGroup =$this->groupManager->getSubAdmin()->isSubAdminOfGroup($user, $group);
+        } else {
+            throw new OCSNotFoundException('The requested group could not be found');
+        }
 
-		// Check subadmin has access to this group
-		if($this->groupManager->isAdmin($user->getUID())
-		   || $isSubadminOfGroup) {
-			$users = $this->groupManager->get($groupId)->getUsers();
-			$users =  array_map(function($user) {
-				/** @var IUser $user */
-				return $user->getUID();
-			}, $users);
-			$users = array_values($users);
-			return new DataResponse(['users' => $users]);
-		}
+        // Check subadmin has access to this group
+        if($this->groupManager->isAdmin($user->getUID())
+           || $isSubadminOfGroup) {
+            $users = $this->groupManager->get($groupId)->getUsers();
+            $users =  array_map(function($user) {
+                /** @var IUser $user */
+                return $user->getUID();
+            }, $users);
+            $users = array_values($users);
+            return new DataResponse(['users' => $users]);
+        }
 
-		throw new OCSForbiddenException();
-	}
+        throw new OCSForbiddenException();
+    }
 
-	/**
-	 * returns an array of users details in the specified group
-	 *
-	 * @NoAdminRequired
-	 *
-	 * @param string $groupId
-	 * @param string $search
-	 * @param int $limit
-	 * @param int $offset
-	 * @return DataResponse
-	 * @throws OCSException
-	 */
-	public function getGroupUsersDetails(string $groupId, string $search = '', int $limit = null, int $offset = 0): DataResponse {
-		$user = $this->userSession->getUser();
-		$isSubadminOfGroup = false;
+    /**
+     * returns an array of users details in the specified group
+     *
+     * @NoAdminRequired
+     *
+     * @param string $groupId
+     * @param string $search
+     * @param int $limit
+     * @param int $offset
+     * @return DataResponse
+     * @throws OCSException
+     */
+    public function getGroupUsersDetails(string $groupId, string $search = '', int $limit = null, int $offset = 0): DataResponse {
+        $user = $this->userSession->getUser();
+        $isSubadminOfGroup = false;
 
-		// Check the group exists
-		$group = $this->groupManager->get($groupId);
-		if ($group !== null) {
-			$isSubadminOfGroup =$this->groupManager->getSubAdmin()->isSubAdminOfGroup($user, $group);
-		} else {
-			throw new OCSException('The requested group could not be found', \OCP\API::RESPOND_NOT_FOUND);
-		}
+        // Check the group exists
+        $group = $this->groupManager->get($groupId);
+        if ($group !== null) {
+            $isSubadminOfGroup =$this->groupManager->getSubAdmin()->isSubAdminOfGroup($user, $group);
+        } else {
+            throw new OCSException('The requested group could not be found', \OCP\API::RESPOND_NOT_FOUND);
+        }
 
-		// Check subadmin has access to this group
-		if($this->groupManager->isAdmin($user->getUID())
-		   || $isSubadminOfGroup) {
-			$users = $this->groupManager->get($groupId)->searchUsers($search, $limit, $offset);
+        // Check subadmin has access to this group
+        if($this->groupManager->isAdmin($user->getUID())
+           || $isSubadminOfGroup) {
+            $users = $this->groupManager->get($groupId)->searchUsers($search, $limit, $offset);
 
-			// Extract required number
-			$users = array_keys($users);
-			$usersDetails = [];
-			foreach ($users as $userId) {
-				$userData = $this->getUserData($userId);
-				// Do not insert empty entry
-				if(!empty($userData)) {
-					$usersDetails[$userId] = $userData;
-				} else {
-					// Logged user does not have permissions to see this user
-					// only showing its id
-					$usersDetails[$userId] = ['id' => $userId];
-				}
-			}
-			return new DataResponse(['users' => $usersDetails]);
-		}
+            // Extract required number
+            $users = array_keys($users);
+            $usersDetails = [];
+            foreach ($users as $userId) {
+                $userData = $this->getUserData($userId);
+                // Do not insert empty entry
+                if(!empty($userData)) {
+                    $usersDetails[$userId] = $userData;
+                } else {
+                    // Logged user does not have permissions to see this user
+                    // only showing its id
+                    $usersDetails[$userId] = ['id' => $userId];
+                }
+            }
+            return new DataResponse(['users' => $usersDetails]);
+        }
 
-		throw new OCSException('User does not have access to specified group', \OCP\API::RESPOND_UNAUTHORISED);
-	}
+        throw new OCSException('User does not have access to specified group', \OCP\API::RESPOND_UNAUTHORISED);
+    }
 
-	/**
-	 * creates a new group
-	 *
-	 * @PasswordConfirmationRequired
-	 *
-	 * @param string $groupid
-	 * @return DataResponse
-	 * @throws OCSException
-	 */
-	public function addGroup(string $groupid): DataResponse {
-		// Validate name
-		if(empty($groupid)) {
-			$this->logger->error('Group name not supplied', ['app' => 'provisioning_api']);
-			throw new OCSException('Invalid group name', 101);
-		}
-		// Check if it exists
-		if($this->groupManager->groupExists($groupid)){
-			throw new OCSException('', 102);
-		}
-		$this->groupManager->createGroup($groupid);
-		return new DataResponse();
-	}
+    /**
+     * creates a new group
+     *
+     * @PasswordConfirmationRequired
+     *
+     * @param string $groupid
+     * @return DataResponse
+     * @throws OCSException
+     */
+    public function addGroup(string $groupid): DataResponse {
+        // Validate name
+        if(empty($groupid)) {
+            $this->logger->error('Group name not supplied', ['app' => 'provisioning_api']);
+            throw new OCSException('Invalid group name', 101);
+        }
+        // Check if it exists
+        if($this->groupManager->groupExists($groupid)){
+            throw new OCSException('', 102);
+        }
+        $this->groupManager->createGroup($groupid);
+        return new DataResponse();
+    }
 
-	/**
-	 * @PasswordConfirmationRequired
-	 *
-	 * @param string $groupId
-	 * @return DataResponse
-	 * @throws OCSException
-	 */
-	public function deleteGroup(string $groupId): DataResponse {
-		// Check it exists
-		if(!$this->groupManager->groupExists($groupId)){
-			throw new OCSException('', 101);
-		} else if($groupId === 'admin' || !$this->groupManager->get($groupId)->delete()){
-			// Cannot delete admin group
-			throw new OCSException('', 102);
-		}
+    /**
+     * @PasswordConfirmationRequired
+     *
+     * @param string $groupId
+     * @return DataResponse
+     * @throws OCSException
+     */
+    public function deleteGroup(string $groupId): DataResponse {
+        // Check it exists
+        if(!$this->groupManager->groupExists($groupId)){
+            throw new OCSException('', 101);
+        } else if($groupId === 'admin' || !$this->groupManager->get($groupId)->delete()){
+            // Cannot delete admin group
+            throw new OCSException('', 102);
+        }
 
-		return new DataResponse();
-	}
+        return new DataResponse();
+    }
 
-	/**
-	 * @param string $groupId
-	 * @return DataResponse
-	 * @throws OCSException
-	 */
-	public function getSubAdminsOfGroup(string $groupId): DataResponse {
-		// Check group exists
-		$targetGroup = $this->groupManager->get($groupId);
-		if($targetGroup === null) {
-			throw new OCSException('Group does not exist', 101);
-		}
+    /**
+     * @param string $groupId
+     * @return DataResponse
+     * @throws OCSException
+     */
+    public function getSubAdminsOfGroup(string $groupId): DataResponse {
+        // Check group exists
+        $targetGroup = $this->groupManager->get($groupId);
+        if($targetGroup === null) {
+            throw new OCSException('Group does not exist', 101);
+        }
 
-		/** @var IUser[] $subadmins */
-		$subadmins = $this->groupManager->getSubAdmin()->getGroupsSubAdmins($targetGroup);
-		// New class returns IUser[] so convert back
-		$uids = [];
-		foreach ($subadmins as $user) {
-			$uids[] = $user->getUID();
-		}
+        /** @var IUser[] $subadmins */
+        $subadmins = $this->groupManager->getSubAdmin()->getGroupsSubAdmins($targetGroup);
+        // New class returns IUser[] so convert back
+        $uids = [];
+        foreach ($subadmins as $user) {
+            $uids[] = $user->getUID();
+        }
 
-		return new DataResponse($uids);
-	}
+        return new DataResponse($uids);
+    }
 
 }

Spacing +11 added lines, -11 removed lines

@@ -151,16 +151,16 @@ 
 		// Check the group exists
 		$group = $this->groupManager->get($groupId);
 		if ($group !== null) {
-			$isSubadminOfGroup =$this->groupManager->getSubAdmin()->isSubAdminOfGroup($user, $group);
+			$isSubadminOfGroup = $this->groupManager->getSubAdmin()->isSubAdminOfGroup($user, $group);
 		} else {
 			throw new OCSNotFoundException('The requested group could not be found');
 		}
 
 		// Check subadmin has access to this group
-		if($this->groupManager->isAdmin($user->getUID())
+		if ($this->groupManager->isAdmin($user->getUID())
 		   || $isSubadminOfGroup) {
 			$users = $this->groupManager->get($groupId)->getUsers();
-			$users =  array_map(function($user) {
+			$users = array_map(function($user) {
 				/** @var IUser $user */
 				return $user->getUID();
 			}, $users);
@@ -190,13 +190,13 @@ 
 		// Check the group exists
 		$group = $this->groupManager->get($groupId);
 		if ($group !== null) {
-			$isSubadminOfGroup =$this->groupManager->getSubAdmin()->isSubAdminOfGroup($user, $group);
+			$isSubadminOfGroup = $this->groupManager->getSubAdmin()->isSubAdminOfGroup($user, $group);
 		} else {
 			throw new OCSException('The requested group could not be found', \OCP\API::RESPOND_NOT_FOUND);
 		}
 
 		// Check subadmin has access to this group
-		if($this->groupManager->isAdmin($user->getUID())
+		if ($this->groupManager->isAdmin($user->getUID())
 		   || $isSubadminOfGroup) {
 			$users = $this->groupManager->get($groupId)->searchUsers($search, $limit, $offset);
 
@@ -206,7 +206,7 @@ 
 			foreach ($users as $userId) {
 				$userData = $this->getUserData($userId);
 				// Do not insert empty entry
-				if(!empty($userData)) {
+				if (!empty($userData)) {
 					$usersDetails[$userId] = $userData;
 				} else {
 					// Logged user does not have permissions to see this user
@@ -231,12 +231,12 @@ 
 	 */
 	public function addGroup(string $groupid): DataResponse {
 		// Validate name
-		if(empty($groupid)) {
+		if (empty($groupid)) {
 			$this->logger->error('Group name not supplied', ['app' => 'provisioning_api']);
 			throw new OCSException('Invalid group name', 101);
 		}
 		// Check if it exists
-		if($this->groupManager->groupExists($groupid)){
+		if ($this->groupManager->groupExists($groupid)) {
 			throw new OCSException('', 102);
 		}
 		$this->groupManager->createGroup($groupid);
@@ -252,9 +252,9 @@ 
 	 */
 	public function deleteGroup(string $groupId): DataResponse {
 		// Check it exists
-		if(!$this->groupManager->groupExists($groupId)){
+		if (!$this->groupManager->groupExists($groupId)) {
 			throw new OCSException('', 101);
-		} else if($groupId === 'admin' || !$this->groupManager->get($groupId)->delete()){
+		} else if ($groupId === 'admin' || !$this->groupManager->get($groupId)->delete()) {
 			// Cannot delete admin group
 			throw new OCSException('', 102);
 		}
@@ -270,7 +270,7 @@ 
 	public function getSubAdminsOfGroup(string $groupId): DataResponse {
 		// Check group exists
 		$targetGroup = $this->groupManager->get($groupId);
-		if($targetGroup === null) {
+		if ($targetGroup === null) {
 			throw new OCSException('Group does not exist', 101);
 		}