diff options
Diffstat (limited to 'lib/private/User')
-rw-r--r-- | lib/private/User/Backend.php | 48 | ||||
-rw-r--r-- | lib/private/User/Database.php | 14 | ||||
-rw-r--r-- | lib/private/User/Manager.php | 6 | ||||
-rw-r--r-- | lib/private/User/Session.php | 4 | ||||
-rw-r--r-- | lib/private/User/User.php | 2 |
5 files changed, 36 insertions, 38 deletions
diff --git a/lib/private/User/Backend.php b/lib/private/User/Backend.php index 8fa2f3018b2..e90cfdc2e3d 100644 --- a/lib/private/User/Backend.php +++ b/lib/private/User/Backend.php @@ -60,15 +60,15 @@ abstract class Backend implements UserInterface { ]; /** - * Get all supported actions - * @return int bitwise-or'ed actions - * - * Returns the supported actions as int to be - * compared with self::CREATE_USER etc. - */ + * Get all supported actions + * @return int bitwise-or'ed actions + * + * Returns the supported actions as int to be + * compared with self::CREATE_USER etc. + */ public function getSupportedActions() { $actions = 0; - foreach($this->possibleActions AS $action => $methodName) { + foreach($this->possibleActions as $action => $methodName) { if(method_exists($this, $methodName)) { $actions |= $action; } @@ -78,13 +78,13 @@ abstract class Backend implements UserInterface { } /** - * Check if backend implements actions - * @param int $actions bitwise-or'ed actions - * @return boolean - * - * Returns the supported actions as int to be - * compared with self::CREATE_USER etc. - */ + * Check if backend implements actions + * @param int $actions bitwise-or'ed actions + * @return boolean + * + * Returns the supported actions as int to be + * compared with self::CREATE_USER etc. + */ public function implementsActions($actions) { return (bool)($this->getSupportedActions() & $actions); } @@ -96,7 +96,7 @@ abstract class Backend implements UserInterface { * * Deletes a user */ - public function deleteUser( $uid ) { + public function deleteUser($uid) { return false; } @@ -113,19 +113,19 @@ abstract class Backend implements UserInterface { } /** - * check if a user exists - * @param string $uid the username - * @return boolean - */ + * check if a user exists + * @param string $uid the username + * @return boolean + */ public function userExists($uid) { return false; } /** - * get the user's home directory - * @param string $uid the username - * @return boolean - */ + * get the user's home directory + * @param string $uid the username + * @return boolean + */ public function getHome($uid) { return false; } @@ -150,7 +150,7 @@ abstract class Backend implements UserInterface { public function getDisplayNames($search = '', $limit = null, $offset = null) { $displayNames = []; $users = $this->getUsers($search, $limit, $offset); - foreach ( $users as $user) { + foreach ($users as $user) { $displayNames[$user] = $user; } return $displayNames; diff --git a/lib/private/User/Database.php b/lib/private/User/Database.php index 856959a4596..c89d3ce3690 100644 --- a/lib/private/User/Database.php +++ b/lib/private/User/Database.php @@ -78,13 +78,13 @@ use OCP\User\Backend\ISetPasswordBackend; */ class Database extends ABackend implements ICreateUserBackend, - ISetPasswordBackend, - ISetDisplayNameBackend, - IGetDisplayNameBackend, - ICheckPasswordBackend, - IGetHomeBackend, - ICountUsersBackend, - IGetRealUIDBackend { + ISetPasswordBackend, + ISetDisplayNameBackend, + IGetDisplayNameBackend, + ICheckPasswordBackend, + IGetHomeBackend, + ICountUsersBackend, + IGetRealUIDBackend { /** @var CappedMemoryCache */ private $cache; diff --git a/lib/private/User/Manager.php b/lib/private/User/Manager.php index 2dd12cf916d..1ab335eeea6 100644 --- a/lib/private/User/Manager.php +++ b/lib/private/User/Manager.php @@ -422,7 +422,7 @@ class Manager extends PublicEmitter implements IUserManager { public function countUsersOfGroups(array $groups) { $users = []; foreach($groups as $group) { - $usersIds = array_map(function($user) { + $usersIds = array_map(function ($user) { return $user->getUID(); }, $group->getUsers()); $users = array_merge($users, $usersIds); @@ -618,11 +618,11 @@ class Manager extends PublicEmitter implements IUserManager { public function getByEmail($email) { $userIds = $this->config->getUsersForUserValueCaseInsensitive('settings', 'email', $email); - $users = array_map(function($uid) { + $users = array_map(function ($uid) { return $this->get($uid); }, $userIds); - return array_values(array_filter($users, function($u) { + return array_values(array_filter($users, function ($u) { return ($u instanceof IUser); })); } diff --git a/lib/private/User/Session.php b/lib/private/User/Session.php index 9129fb7054b..7b129a393e3 100644 --- a/lib/private/User/Session.php +++ b/lib/private/User/Session.php @@ -51,7 +51,6 @@ use OC_User; use OC_Util; use OCA\DAV\Connector\Sabre\Auth; use OCP\AppFramework\Utility\ITimeFactory; -use OCP\Authentication\Events\LoginFailedEvent; use OCP\EventDispatcher\IEventDispatcher; use OCP\Files\NotPermittedException; use OCP\IConfig; @@ -59,7 +58,6 @@ use OCP\ILogger; use OCP\IRequest; use OCP\ISession; use OCP\IUser; -use OCP\IUserManager; use OCP\IUserSession; use OCP\Lockdown\ILockdownManager; use OCP\Security\ISecureRandom; @@ -461,7 +459,7 @@ class Session implements IUserSession, Emitter { } // Try to login with this username and password - if (!$this->login($user, $password) ) { + if (!$this->login($user, $password)) { // Failed, maybe the user used their email address $users = $this->manager->getByEmail($user); diff --git a/lib/private/User/User.php b/lib/private/User/User.php index 0f17af3063e..bc492a6df29 100644 --- a/lib/private/User/User.php +++ b/lib/private/User/User.php @@ -449,7 +449,7 @@ class User implements IUser { public function getCloudId() { $uid = $this->getUID(); $server = $this->urlGenerator->getAbsoluteURL('/'); - $server = rtrim( $this->removeProtocolFromUrl($server), '/'); + $server = rtrim($this->removeProtocolFromUrl($server), '/'); return \OC::$server->getCloudIdManager()->getCloudId($uid, $server)->getId(); } |