nextcloud / server

apps/user_ldap/lib/Mapping/AbstractMapping.php

Spacing +13 added lines, -13 removed lines

@@ -78,7 +78,7 @@ 
 		}
 
 		$section = \str_contains($this->getTableName(), 'user') ? 'u/' : 'g/';
-		$this->localNameToDnCache = $this->cacheFactory->createLocal('ldap/map/' . $section);
+		$this->localNameToDnCache = $this->cacheFactory->createLocal('ldap/map/'.$section);
 
 		// We use the cache as well to store whether it shall be used. If the
 		// answer was no, we unset it again.
@@ -101,7 +101,7 @@ 
 		$row = $result->fetch();
 		$result->closeCursor();
 
-		$use = (int)$row['count'] <= self::LOCAL_CACHE_OBJECT_THRESHOLD;
+		$use = (int) $row['count'] <= self::LOCAL_CACHE_OBJECT_THRESHOLD;
 		$this->localNameToDnCache->set('use', $use, self::LOCAL_USER_COUNT_TTL);
 		return $use;
 	}
@@ -175,7 +175,7 @@ 
 	/**
 	 * Gets the LDAP DN based on the provided name.
 	 */
-	public function getDNByName(string $name): string|false {
+	public function getDNByName(string $name): string | false {
 		$dn = array_search($name, $this->cache, true);
 		if ($dn === false) {
 			$dn = $this->localNameToDnCache?->get($name);
@@ -200,7 +200,7 @@ 
 	public function setDNbyUUID($fdn, $uuid) {
 		$oldDn = $this->getDnByUUID($uuid);
 		$statement = $this->dbc->prepare('
-			UPDATE `' . $this->getTableName() . '`
+			UPDATE `' . $this->getTableName().'`
 			SET `ldap_dn_hash` = ?, `ldap_dn` = ?
 			WHERE `directory_uuid` = ?
 		');
@@ -232,7 +232,7 @@ 
 	 */
 	public function setUUIDbyDN($uuid, $fdn): bool {
 		$statement = $this->dbc->prepare('
-			UPDATE `' . $this->getTableName() . '`
+			UPDATE `' . $this->getTableName().'`
 			SET `directory_uuid` = ?
 			WHERE `ldap_dn_hash` = ?
 		');
@@ -335,12 +335,12 @@ 
 	public function getNamesBySearch(string $search, string $prefixMatch = '', string $postfixMatch = ''): array {
 		$statement = $this->dbc->prepare('
 			SELECT `owncloud_name`
-			FROM `' . $this->getTableName() . '`
+			FROM `' . $this->getTableName().'`
 			WHERE `owncloud_name` LIKE ?
 		');
 
 		try {
-			$res = $statement->execute([$prefixMatch . $this->dbc->escapeLikeParameter($search) . $postfixMatch]);
+			$res = $statement->execute([$prefixMatch.$this->dbc->escapeLikeParameter($search).$postfixMatch]);
 		} catch (Exception $e) {
 			return [];
 		}
@@ -425,12 +425,12 @@ 
 
 		try {
 			$result = $this->dbc->insertIfNotExist($this->getTableName(), $row);
-			if ((bool)$result === true) {
+			if ((bool) $result === true) {
 				$this->cache[$fdn] = $name;
 				$this->localNameToDnCache?->set($name, $fdn, self::LOCAL_CACHE_TTL);
 			}
 			// insertIfNotExist returns values as int
-			return (bool)$result;
+			return (bool) $result;
 		} catch (\Exception $e) {
 			return false;
 		}
@@ -444,7 +444,7 @@ 
 	 */
 	public function unmap($name) {
 		$statement = $this->dbc->prepare('
-			DELETE FROM `' . $this->getTableName() . '`
+			DELETE FROM `' . $this->getTableName().'`
 			WHERE `owncloud_name` = ?');
 
 		$dn = array_search($name, $this->cache);
@@ -464,7 +464,7 @@ 
 	public function clear() {
 		$sql = $this->dbc
 			->getDatabasePlatform()
-			->getTruncateTableSQL('`' . $this->getTableName() . '`');
+			->getTruncateTableSQL('`'.$this->getTableName().'`');
 		try {
 			$this->dbc->executeQuery($sql);
 			$this->localNameToDnCache?->clear();
@@ -513,7 +513,7 @@ 
 		$res = $query->executeQuery();
 		$count = $res->fetchOne();
 		$res->closeCursor();
-		return (int)$count;
+		return (int) $count;
 	}
 
 	public function countInvalidated(): int {
@@ -524,6 +524,6 @@ 
 		$res = $query->executeQuery();
 		$count = $res->fetchOne();
 		$res->closeCursor();
-		return (int)$count;
+		return (int) $count;
 	}
 }

apps/user_ldap/lib/User_LDAP.php

Spacing +29 added lines, -29 removed lines

@@ -68,7 +68,7 @@ 
 	 * @throws \Exception
 	 */
 	public function loginName2UserName($loginName, bool $forceLdapRefetch = false) {
-		$cacheKey = 'loginName2UserName-' . $loginName;
+		$cacheKey = 'loginName2UserName-'.$loginName;
 		$username = $this->access->connection->getFromCache($cacheKey);
 		$knownDn = $username ? $this->access->username2dn($username) : false;
 
@@ -121,7 +121,7 @@ 
 		$users = $this->access->fetchUsersByLoginName($loginName, $attrs);
 		if (count($users) < 1) {
 			throw new NotOnLDAP('No user available for the given login name on '
-				. $this->access->connection->ldapHost . ':' . $this->access->connection->ldapPort);
+				. $this->access->connection->ldapHost.':'.$this->access->connection->ldapPort);
 		}
 		return $users[0];
 	}
@@ -153,7 +153,7 @@ 
 
 		if (!$user instanceof User) {
 			$this->logger->warning(
-				'LDAP Login: Could not get user object for DN ' . $dn
+				'LDAP Login: Could not get user object for DN '.$dn
 				. '. Maybe the LDAP entry has no set display name attribute?',
 				['app' => 'user_ldap']
 			);
@@ -188,13 +188,13 @@ 
 		$user = $this->access->userManager->get($uid);
 
 		if (!$user instanceof User) {
-			throw new \Exception('LDAP setPassword: Could not get user object for uid ' . $uid
+			throw new \Exception('LDAP setPassword: Could not get user object for uid '.$uid
 				. '. Maybe the LDAP entry has no set display name attribute?');
 		}
 		if ($user->getUsername() !== false && $this->access->setPassword($user->getDN(), $password)) {
 			$ldapDefaultPPolicyDN = $this->access->connection->ldapDefaultPPolicyDN;
 			$turnOnPasswordChange = $this->access->connection->turnOnPasswordChange;
-			if (!empty($ldapDefaultPPolicyDN) && ((int)$turnOnPasswordChange === 1)) {
+			if (!empty($ldapDefaultPPolicyDN) && ((int) $turnOnPasswordChange === 1)) {
 				//remove last password expiry warning if any
 				$notification = $this->notificationManager->createNotification();
 				$notification->setApp('user_ldap')
@@ -219,7 +219,7 @@ 
 	 */
 	public function getUsers($search = '', $limit = 10, $offset = 0) {
 		$search = $this->access->escapeFilterPart($search, true);
-		$cachekey = 'getUsers-' . $search . '-' . $limit . '-' . $offset;
+		$cachekey = 'getUsers-'.$search.'-'.$limit.'-'.$offset;
 
 		//check if users are cached, if so return
 		$ldap_users = $this->access->connection->getFromCache($cachekey);
@@ -234,12 +234,12 @@ 
 		}
 		$filter = $this->access->combineFilterWithAnd([
 			$this->access->connection->ldapUserFilter,
-			$this->access->connection->ldapUserDisplayName . '=*',
+			$this->access->connection->ldapUserDisplayName.'=*',
 			$this->access->getFilterPartForUserSearch($search)
 		]);
 
 		$this->logger->debug(
-			'getUsers: Options: search ' . $search . ' limit ' . $limit . ' offset ' . $offset . ' Filter: ' . $filter,
+			'getUsers: Options: search '.$search.' limit '.$limit.' offset '.$offset.' Filter: '.$filter,
 			['app' => 'user_ldap']
 		);
 		//do the search and translate results to Nextcloud names
@@ -249,7 +249,7 @@ 
 			$limit, $offset);
 		$ldap_users = $this->access->nextcloudUserNames($ldap_users);
 		$this->logger->debug(
-			'getUsers: ' . count($ldap_users) . ' Users found',
+			'getUsers: '.count($ldap_users).' Users found',
 			['app' => 'user_ldap']
 		);
 
@@ -273,11 +273,11 @@ 
 			return false;
 		}
 		$uid = $user instanceof User ? $user->getUsername() : $user->getOCName();
-		$cacheKey = 'userExistsOnLDAP' . $uid;
+		$cacheKey = 'userExistsOnLDAP'.$uid;
 		if (!$ignoreCache) {
 			$userExists = $this->access->connection->getFromCache($cacheKey);
 			if (!is_null($userExists)) {
-				return (bool)$userExists;
+				return (bool) $userExists;
 			}
 		}
 
@@ -320,22 +320,22 @@ 
 	 * @throws \Exception when connection could not be established
 	 */
 	public function userExists($uid) {
-		$userExists = $this->access->connection->getFromCache('userExists' . $uid);
+		$userExists = $this->access->connection->getFromCache('userExists'.$uid);
 		if (!is_null($userExists)) {
-			return (bool)$userExists;
+			return (bool) $userExists;
 		}
 		$userExists = $this->access->userManager->exists($uid);
 
 		if (!$userExists) {
 			$this->logger->debug(
-				'No DN found for ' . $uid . ' on ' . $this->access->connection->ldapHost,
+				'No DN found for '.$uid.' on '.$this->access->connection->ldapHost,
 				['app' => 'user_ldap']
 			);
-			$this->access->connection->writeToCache('userExists' . $uid, false);
+			$this->access->connection->writeToCache('userExists'.$uid, false);
 			return false;
 		}
 
-		$this->access->connection->writeToCache('userExists' . $uid, true);
+		$this->access->connection->writeToCache('userExists'.$uid, true);
 		return true;
 	}
 
@@ -369,13 +369,13 @@ 
 			}
 			if (!$marked) {
 				$this->logger->notice(
-					'User ' . $uid . ' is not marked as deleted, not cleaning up.',
+					'User '.$uid.' is not marked as deleted, not cleaning up.',
 					['app' => 'user_ldap']
 				);
 				return false;
 			}
 		}
-		$this->logger->info('Cleaning up after user ' . $uid,
+		$this->logger->info('Cleaning up after user '.$uid,
 			['app' => 'user_ldap']);
 
 		$this->access->getUserMapper()->unmap($uid); // we don't emit unassign signals here, since it is implicit to delete signals fired from core
@@ -402,7 +402,7 @@ 
 			return $this->userPluginManager->getHome($uid);
 		}
 
-		$cacheKey = 'getHome' . $uid;
+		$cacheKey = 'getHome'.$uid;
 		$path = $this->access->connection->getFromCache($cacheKey);
 		if (!is_null($path)) {
 			return $path;
@@ -413,7 +413,7 @@ 
 		if ($user instanceof User || $user instanceof OfflineUser) {
 			$path = $user->getHomePath() ?: false;
 		} else {
-			throw new NoUserException($uid . ' is not a valid user anymore');
+			throw new NoUserException($uid.' is not a valid user anymore');
 		}
 
 		$this->access->cacheUserHome($uid, $path);
@@ -434,7 +434,7 @@ 
 			return false;
 		}
 
-		$cacheKey = 'getDisplayName' . $uid;
+		$cacheKey = 'getDisplayName'.$uid;
 		if (!is_null($displayName = $this->access->connection->getFromCache($cacheKey))) {
 			return $displayName;
 		}
@@ -461,7 +461,7 @@ 
 
 			$user = $this->access->userManager->get($uid);
 			if ($user instanceof User) {
-				$displayName = $user->composeAndStoreDisplayName($displayName, (string)$displayName2);
+				$displayName = $user->composeAndStoreDisplayName($displayName, (string) $displayName2);
 				$this->access->connection->writeToCache($cacheKey, $displayName);
 			}
 			if ($user instanceof OfflineUser) {
@@ -497,7 +497,7 @@ 
 	 * @return array an array of all displayNames (value) and the corresponding uids (key)
 	 */
 	public function getDisplayNames($search = '', $limit = null, $offset = null) {
-		$cacheKey = 'getDisplayNames-' . $search . '-' . $limit . '-' . $offset;
+		$cacheKey = 'getDisplayNames-'.$search.'-'.$limit.'-'.$offset;
 		if (!is_null($displayNames = $this->access->connection->getFromCache($cacheKey))) {
 			return $displayNames;
 		}
@@ -520,12 +520,12 @@ 
 	 * compared with \OC\User\Backend::CREATE_USER etc.
 	 */
 	public function implementsActions($actions) {
-		return (bool)((Backend::CHECK_PASSWORD
+		return (bool) ((Backend::CHECK_PASSWORD
 			| Backend::GET_HOME
 			| Backend::GET_DISPLAYNAME
 			| (($this->access->connection->ldapUserAvatarRule !== 'none') ? Backend::PROVIDE_AVATAR : 0)
 			| Backend::COUNT_USERS
-			| (((int)$this->access->connection->turnOnPasswordChange === 1)? Backend::SET_PASSWORD :0)
+			| (((int) $this->access->connection->turnOnPasswordChange === 1) ? Backend::SET_PASSWORD : 0)
 			| $this->userPluginManager->getImplementedActions())
 			& $actions);
 	}
@@ -540,13 +540,13 @@ 
 	/**
 	 * counts the users in LDAP
 	 */
-	public function countUsers(int $limit = 0): int|false {
+	public function countUsers(int $limit = 0): int | false {
 		if ($this->userPluginManager->implementsActions(Backend::COUNT_USERS)) {
 			return $this->userPluginManager->countUsers();
 		}
 
 		$filter = $this->access->getFilterForUserCount();
-		$cacheKey = 'countUsers-' . $filter . '-' . $limit;
+		$cacheKey = 'countUsers-'.$filter.'-'.$limit;
 		if (!is_null($entries = $this->access->connection->getFromCache($cacheKey))) {
 			return $entries;
 		}
@@ -622,13 +622,13 @@ 
 					throw new \UnexpectedValueException('LDAP Plugin: Method createUser changed to return the user DN instead of boolean.');
 				}
 			}
-			return (bool)$dn;
+			return (bool) $dn;
 		}
 		return false;
 	}
 
 	public function isUserEnabled(string $uid, callable $queryDatabaseValue): bool {
-		if ($this->deletedUsersIndex->isUserMarked($uid) && ((int)$this->access->connection->markRemnantsAsDisabled === 1)) {
+		if ($this->deletedUsersIndex->isUserMarked($uid) && ((int) $this->access->connection->markRemnantsAsDisabled === 1)) {
 			return false;
 		} else {
 			return $queryDatabaseValue();