nextcloud / server

apps/provisioning_api/lib/Controller/UsersController.php

Spacing +40 added lines, -40 removed lines

@@ -292,7 +292,7 @@ 
 		$matches = [];
 		foreach ($userMatches as $phone => $userId) {
 			// Not using the ICloudIdManager as that would run a search for each contact to find the display name in the address book
-			$matches[$normalizedNumberToKey[$phone]] = $userId . '@' . $cloudUrl;
+			$matches[$normalizedNumberToKey[$phone]] = $userId.'@'.$cloudUrl;
 			$this->knownUserService->storeIsKnownToUser($knownTo, $userId);
 		}
 
@@ -355,10 +355,10 @@ 
 		if ($groups !== []) {
 			foreach ($groups as $group) {
 				if (!$this->groupManager->groupExists($group)) {
-					throw new OCSException('group ' . $group . ' does not exist', 104);
+					throw new OCSException('group '.$group.' does not exist', 104);
 				}
 				if (!$isAdmin && !$subAdminManager->isSubAdminOfGroup($user, $this->groupManager->get($group))) {
-					throw new OCSException('insufficient privileges for group ' . $group, 105);
+					throw new OCSException('insufficient privileges for group '.$group, 105);
 				}
 			}
 		} else {
@@ -417,11 +417,11 @@ 
 
 		try {
 			$newUser = $this->userManager->createUser($userid, $password);
-			$this->logger->info('Successful addUser call with userid: ' . $userid, ['app' => 'ocs_api']);
+			$this->logger->info('Successful addUser call with userid: '.$userid, ['app' => 'ocs_api']);
 
 			foreach ($groups as $group) {
 				$this->groupManager->get($group)->addUser($newUser);
-				$this->logger->info('Added userid ' . $userid . ' to group ' . $group, ['app' => 'ocs_api']);
+				$this->logger->info('Added userid '.$userid.' to group '.$group, ['app' => 'ocs_api']);
 			}
 			foreach ($subadminGroups as $group) {
 				$subAdminManager->createSubAdmin($newUser, $group);
@@ -661,7 +661,7 @@ 
 		if ($targetUser->getUID() === $currentLoggedInUser->getUID()) {
 			// Editing self (display, email)
 			$permittedFields[] = IAccountManager::COLLECTION_EMAIL;
-			$permittedFields[] = IAccountManager::COLLECTION_EMAIL . self::SCOPE_SUFFIX;
+			$permittedFields[] = IAccountManager::COLLECTION_EMAIL.self::SCOPE_SUFFIX;
 		} else {
 			// Check if admin / subadmin
 			if ($isAdminOrSubadmin) {
@@ -694,7 +694,7 @@ 
 				$this->accountManager->updateAccount($userAccount);
 				break;
 
-			case IAccountManager::COLLECTION_EMAIL . self::SCOPE_SUFFIX:
+			case IAccountManager::COLLECTION_EMAIL.self::SCOPE_SUFFIX:
 				$userAccount = $this->accountManager->getAccount($targetUser);
 				$mailCollection = $userAccount->getPropertyCollection(IAccountManager::COLLECTION_EMAIL);
 				$targetProperty = null;
@@ -757,8 +757,8 @@ 
 				$permittedFields[] = IAccountManager::PROPERTY_EMAIL;
 			}
 
-			$permittedFields[] = IAccountManager::PROPERTY_DISPLAYNAME . self::SCOPE_SUFFIX;
-			$permittedFields[] = IAccountManager::PROPERTY_EMAIL . self::SCOPE_SUFFIX;
+			$permittedFields[] = IAccountManager::PROPERTY_DISPLAYNAME.self::SCOPE_SUFFIX;
+			$permittedFields[] = IAccountManager::PROPERTY_EMAIL.self::SCOPE_SUFFIX;
 
 			$permittedFields[] = IAccountManager::COLLECTION_EMAIL;
 
@@ -788,18 +788,18 @@ 
 			$permittedFields[] = IAccountManager::PROPERTY_HEADLINE;
 			$permittedFields[] = IAccountManager::PROPERTY_BIOGRAPHY;
 			$permittedFields[] = IAccountManager::PROPERTY_PROFILE_ENABLED;
-			$permittedFields[] = IAccountManager::PROPERTY_PHONE . self::SCOPE_SUFFIX;
-			$permittedFields[] = IAccountManager::PROPERTY_ADDRESS . self::SCOPE_SUFFIX;
-			$permittedFields[] = IAccountManager::PROPERTY_WEBSITE . self::SCOPE_SUFFIX;
-			$permittedFields[] = IAccountManager::PROPERTY_TWITTER . self::SCOPE_SUFFIX;
-			$permittedFields[] = IAccountManager::PROPERTY_FEDIVERSE . self::SCOPE_SUFFIX;
-			$permittedFields[] = IAccountManager::PROPERTY_ORGANISATION . self::SCOPE_SUFFIX;
-			$permittedFields[] = IAccountManager::PROPERTY_ROLE . self::SCOPE_SUFFIX;
-			$permittedFields[] = IAccountManager::PROPERTY_HEADLINE . self::SCOPE_SUFFIX;
-			$permittedFields[] = IAccountManager::PROPERTY_BIOGRAPHY . self::SCOPE_SUFFIX;
-			$permittedFields[] = IAccountManager::PROPERTY_PROFILE_ENABLED . self::SCOPE_SUFFIX;
-
-			$permittedFields[] = IAccountManager::PROPERTY_AVATAR . self::SCOPE_SUFFIX;
+			$permittedFields[] = IAccountManager::PROPERTY_PHONE.self::SCOPE_SUFFIX;
+			$permittedFields[] = IAccountManager::PROPERTY_ADDRESS.self::SCOPE_SUFFIX;
+			$permittedFields[] = IAccountManager::PROPERTY_WEBSITE.self::SCOPE_SUFFIX;
+			$permittedFields[] = IAccountManager::PROPERTY_TWITTER.self::SCOPE_SUFFIX;
+			$permittedFields[] = IAccountManager::PROPERTY_FEDIVERSE.self::SCOPE_SUFFIX;
+			$permittedFields[] = IAccountManager::PROPERTY_ORGANISATION.self::SCOPE_SUFFIX;
+			$permittedFields[] = IAccountManager::PROPERTY_ROLE.self::SCOPE_SUFFIX;
+			$permittedFields[] = IAccountManager::PROPERTY_HEADLINE.self::SCOPE_SUFFIX;
+			$permittedFields[] = IAccountManager::PROPERTY_BIOGRAPHY.self::SCOPE_SUFFIX;
+			$permittedFields[] = IAccountManager::PROPERTY_PROFILE_ENABLED.self::SCOPE_SUFFIX;
+
+			$permittedFields[] = IAccountManager::PROPERTY_AVATAR.self::SCOPE_SUFFIX;
 
 			// If admin they can edit their own quota
 			if ($this->groupManager->isAdmin($currentLoggedInUser->getUID())) {
@@ -865,14 +865,14 @@ 
 						$quota = \OCP\Util::computerFileSize($quota);
 					}
 					if ($quota === false) {
-						throw new OCSException('Invalid quota value ' . $value, 102);
+						throw new OCSException('Invalid quota value '.$value, 102);
 					}
 					if ($quota === -1) {
 						$quota = 'none';
 					} else {
 						$maxQuota = (int) $this->config->getAppValue('files', 'max_quota', '-1');
 						if ($maxQuota !== -1 && $quota > $maxQuota) {
-							throw new OCSException('Invalid quota value. ' . $value . ' is exceeding the maximum quota', 102);
+							throw new OCSException('Invalid quota value. '.$value.' is exceeding the maximum quota', 102);
 						}
 						$quota = \OCP\Util::humanFileSize($quota);
 					}
@@ -973,7 +973,7 @@ 
 								$this->knownUserService->deleteByContactUserId($targetUser->getUID());
 							}
 						} catch (InvalidArgumentException $e) {
-							throw new OCSException('Invalid ' . $e->getMessage(), 102);
+							throw new OCSException('Invalid '.$e->getMessage(), 102);
 						}
 					}
 				} catch (PropertyDoesNotExistException $e) {
@@ -982,7 +982,7 @@ 
 				try {
 					$this->accountManager->updateAccount($userAccount);
 				} catch (InvalidArgumentException $e) {
-					throw new OCSException('Invalid ' . $e->getMessage(), 102);
+					throw new OCSException('Invalid '.$e->getMessage(), 102);
 				}
 				break;
 			case IAccountManager::PROPERTY_PROFILE_ENABLED:
@@ -997,19 +997,19 @@ 
 				}
 				$this->accountManager->updateAccount($userAccount);
 				break;
-			case IAccountManager::PROPERTY_DISPLAYNAME . self::SCOPE_SUFFIX:
-			case IAccountManager::PROPERTY_EMAIL . self::SCOPE_SUFFIX:
-			case IAccountManager::PROPERTY_PHONE . self::SCOPE_SUFFIX:
-			case IAccountManager::PROPERTY_ADDRESS . self::SCOPE_SUFFIX:
-			case IAccountManager::PROPERTY_WEBSITE . self::SCOPE_SUFFIX:
-			case IAccountManager::PROPERTY_TWITTER . self::SCOPE_SUFFIX:
-			case IAccountManager::PROPERTY_FEDIVERSE . self::SCOPE_SUFFIX:
-			case IAccountManager::PROPERTY_ORGANISATION . self::SCOPE_SUFFIX:
-			case IAccountManager::PROPERTY_ROLE . self::SCOPE_SUFFIX:
-			case IAccountManager::PROPERTY_HEADLINE . self::SCOPE_SUFFIX:
-			case IAccountManager::PROPERTY_BIOGRAPHY . self::SCOPE_SUFFIX:
-			case IAccountManager::PROPERTY_PROFILE_ENABLED . self::SCOPE_SUFFIX:
-			case IAccountManager::PROPERTY_AVATAR . self::SCOPE_SUFFIX:
+			case IAccountManager::PROPERTY_DISPLAYNAME.self::SCOPE_SUFFIX:
+			case IAccountManager::PROPERTY_EMAIL.self::SCOPE_SUFFIX:
+			case IAccountManager::PROPERTY_PHONE.self::SCOPE_SUFFIX:
+			case IAccountManager::PROPERTY_ADDRESS.self::SCOPE_SUFFIX:
+			case IAccountManager::PROPERTY_WEBSITE.self::SCOPE_SUFFIX:
+			case IAccountManager::PROPERTY_TWITTER.self::SCOPE_SUFFIX:
+			case IAccountManager::PROPERTY_FEDIVERSE.self::SCOPE_SUFFIX:
+			case IAccountManager::PROPERTY_ORGANISATION.self::SCOPE_SUFFIX:
+			case IAccountManager::PROPERTY_ROLE.self::SCOPE_SUFFIX:
+			case IAccountManager::PROPERTY_HEADLINE.self::SCOPE_SUFFIX:
+			case IAccountManager::PROPERTY_BIOGRAPHY.self::SCOPE_SUFFIX:
+			case IAccountManager::PROPERTY_PROFILE_ENABLED.self::SCOPE_SUFFIX:
+			case IAccountManager::PROPERTY_AVATAR.self::SCOPE_SUFFIX:
 				$propertyName = substr($key, 0, strlen($key) - strlen(self::SCOPE_SUFFIX));
 				$userAccount = $this->accountManager->getAccount($targetUser);
 				$userProperty = $userAccount->getProperty($propertyName);
@@ -1018,7 +1018,7 @@ 
 						$userProperty->setScope($value);
 						$this->accountManager->updateAccount($userAccount);
 					} catch (InvalidArgumentException $e) {
-						throw new OCSException('Invalid ' . $e->getMessage(), 102);
+						throw new OCSException('Invalid '.$e->getMessage(), 102);
 					}
 				}
 				break;
@@ -1273,7 +1273,7 @@ 
 		} elseif (!$this->groupManager->isAdmin($loggedInUser->getUID())) {
 			/** @var IGroup[] $subAdminGroups */
 			$subAdminGroups = $subAdminManager->getSubAdminsGroups($loggedInUser);
-			$subAdminGroups = array_map(function (IGroup $subAdminGroup) {
+			$subAdminGroups = array_map(function(IGroup $subAdminGroup) {
 				return $subAdminGroup->getGID();
 			}, $subAdminGroups);
 			$userGroups = $this->groupManager->getUserGroupIds($targetUser);

lib/private/User/User.php

Spacing +10 added lines, -10 removed lines

@@ -254,7 +254,7 @@ 
 		if ($now - $previousLogin > 60) {
 			$this->lastLogin = time();
 			$this->config->setUserValue(
-				$this->uid, 'login', 'lastLogin', (string)$this->lastLogin);
+				$this->uid, 'login', 'lastLogin', (string) $this->lastLogin);
 		}
 
 		return $firstTimeLogin;
@@ -267,7 +267,7 @@ 
 	 */
 	public function delete() {
 		/** @deprecated 21.0.0 use BeforeUserDeletedEvent event with the IEventDispatcher instead */
-		$this->legacyDispatcher->dispatch(IUser::class . '::preDelete', new GenericEvent($this));
+		$this->legacyDispatcher->dispatch(IUser::class.'::preDelete', new GenericEvent($this));
 		if ($this->emitter) {
 			/** @deprecated 21.0.0 use BeforeUserDeletedEvent event with the IEventDispatcher instead */
 			$this->emitter->emit('\OC\User', 'preDelete', [$this]);
@@ -306,7 +306,7 @@ 
 			$accountManager->deleteUser($this);
 
 			/** @deprecated 21.0.0 use UserDeletedEvent event with the IEventDispatcher instead */
-			$this->legacyDispatcher->dispatch(IUser::class . '::postDelete', new GenericEvent($this));
+			$this->legacyDispatcher->dispatch(IUser::class.'::postDelete', new GenericEvent($this));
 			if ($this->emitter) {
 				/** @deprecated 21.0.0 use UserDeletedEvent event with the IEventDispatcher instead */
 				$this->emitter->emit('\OC\User', 'postDelete', [$this]);
@@ -324,7 +324,7 @@ 
 	 * @return bool
 	 */
 	public function setPassword($password, $recoveryPassword = null) {
-		$this->legacyDispatcher->dispatch(IUser::class . '::preSetPassword', new GenericEvent($this, [
+		$this->legacyDispatcher->dispatch(IUser::class.'::preSetPassword', new GenericEvent($this, [
 			'password' => $password,
 			'recoveryPassword' => $recoveryPassword,
 		]));
@@ -337,7 +337,7 @@ 
 			$result = $backend->setPassword($this->uid, $password);
 
 			if ($result !== false) {
-				$this->legacyDispatcher->dispatch(IUser::class . '::postSetPassword', new GenericEvent($this, [
+				$this->legacyDispatcher->dispatch(IUser::class.'::postSetPassword', new GenericEvent($this, [
 					'password' => $password,
 					'recoveryPassword' => $recoveryPassword,
 				]));
@@ -363,9 +363,9 @@ 
 			if (($this->backend instanceof IGetHomeBackend || $this->backend->implementsActions(Backend::GET_HOME)) && $home = $this->backend->getHome($this->uid)) {
 				$this->home = $home;
 			} elseif ($this->config) {
-				$this->home = $this->config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data') . '/' . $this->uid;
+				$this->home = $this->config->getSystemValue('datadirectory', \OC::$SERVERROOT.'/data').'/'.$this->uid;
 			} else {
-				$this->home = \OC::$SERVERROOT . '/data/' . $this->uid;
+				$this->home = \OC::$SERVERROOT.'/data/'.$this->uid;
 			}
 		}
 		return $this->home;
@@ -529,7 +529,7 @@ 
 			$this->config->setUserValue($this->uid, 'files', 'quota', $quota);
 			$this->triggerChange('quota', $quota, $oldQuota);
 		}
-		\OC_Helper::clearStorageInfo('/' . $this->uid . '/files');
+		\OC_Helper::clearStorageInfo('/'.$this->uid.'/files');
 	}
 
 	/**
@@ -567,7 +567,7 @@ 
 			$server = substr($server, 0, -10);
 		}
 		$server = $this->removeProtocolFromUrl($server);
-		return $uid . '@' . $server;
+		return $uid.'@'.$server;
 	}
 
 	private function removeProtocolFromUrl(string $url): string {
@@ -579,7 +579,7 @@ 
 	}
 
 	public function triggerChange($feature, $value = null, $oldValue = null) {
-		$this->legacyDispatcher->dispatch(IUser::class . '::changeUser', new GenericEvent($this, [
+		$this->legacyDispatcher->dispatch(IUser::class.'::changeUser', new GenericEvent($this, [
 			'feature' => $feature,
 			'value' => $value,
 			'oldValue' => $oldValue,

lib/private/legacy/OC_Helper.php

Spacing +14 added lines, -14 removed lines

@@ -65,7 +65,7 @@ 
 	 *
 	 * Makes 2048 to 2 kB.
 	 */
-	public static function humanFileSize(int|float $bytes): string {
+	public static function humanFileSize(int | float $bytes): string {
 		if ($bytes < 0) {
 			return "?";
 		}
@@ -102,7 +102,7 @@ 
 	 *
 	 * Inspired by: https://www.php.net/manual/en/function.filesize.php#92418
 	 */
-	public static function computerFileSize(string $str): false|int|float {
+	public static function computerFileSize(string $str): false | int | float {
 		$str = strtolower($str);
 		if (is_numeric($str)) {
 			return Util::numericToNumber($str);
@@ -122,7 +122,7 @@ 
 			'p' => 1024 * 1024 * 1024 * 1024 * 1024,
 		];
 
-		$bytes = (float)$str;
+		$bytes = (float) $str;
 
 		if (preg_match('#([kmgtp]?b?)$#si', $str, $matches) && !empty($bytes_array[$matches[1]])) {
 			$bytes *= $bytes_array[$matches[1]];
@@ -235,7 +235,7 @@ 
 		}
 		foreach ($dirs as $dir) {
 			foreach ($exts as $ext) {
-				if ($check_fn("$dir/$name" . $ext)) {
+				if ($check_fn("$dir/$name".$ext)) {
 					return true;
 				}
 			}
@@ -307,7 +307,7 @@ 
 			$ext = '';
 		}
 
-		$newpath = $path . '/' . $filename;
+		$newpath = $path.'/'.$filename;
 		if ($view->file_exists($newpath)) {
 			if (preg_match_all('/\((\d+)\)/', $name, $matches, PREG_OFFSET_CAPTURE)) {
 				//Replace the last "(number)" with "(number+1)"
@@ -323,11 +323,11 @@ 
 			do {
 				if ($offset) {
 					//Replace the last "(number)" with "(number+1)"
-					$newname = substr_replace($name, '(' . $counter . ')', $offset, $match_length);
+					$newname = substr_replace($name, '('.$counter.')', $offset, $match_length);
 				} else {
-					$newname = $name . ' (' . $counter . ')';
+					$newname = $name.' ('.$counter.')';
 				}
-				$newpath = $path . '/' . $newname . $ext;
+				$newpath = $path.'/'.$newname.$ext;
 				$counter++;
 			} while ($view->file_exists($newpath));
 		}
@@ -408,7 +408,7 @@ 
 			$freeSpace = max($freeSpace, 0);
 			return $freeSpace;
 		} else {
-			return (INF > 0)? INF: PHP_INT_MAX; // work around https://bugs.php.net/bug.php?id=69188
+			return (INF > 0) ? INF: PHP_INT_MAX; // work around https://bugs.php.net/bug.php?id=69188
 		}
 	}
 
@@ -475,7 +475,7 @@ 
 		}
 		$fullPath = Filesystem::normalizePath($view->getAbsolutePath($path));
 
-		$cacheKey = $fullPath. '::' . ($includeMountPoints ? 'include' : 'exclude');
+		$cacheKey = $fullPath.'::'.($includeMountPoints ? 'include' : 'exclude');
 		if ($useCache) {
 			$cached = $memcache->get($cacheKey);
 			if ($cached) {
@@ -581,7 +581,7 @@ 
 	/**
 	 * Get storage info including all mount points and quota
 	 */
-	private static function getGlobalStorageInfo(int|float $quota, IUser $user, IMountPoint $mount): array {
+	private static function getGlobalStorageInfo(int | float $quota, IUser $user, IMountPoint $mount): array {
 		$rootInfo = \OC\Files\Filesystem::getFileInfo('', 'ext');
 		$used = $rootInfo['size'];
 		if ($used < 0) {
@@ -624,9 +624,9 @@ 
 		/** @var ICacheFactory $cacheFactory */
 		$cacheFactory = \OC::$server->get(ICacheFactory::class);
 		$memcache = $cacheFactory->createLocal('storage_info');
-		$cacheKeyPrefix = Filesystem::normalizePath($absolutePath) . '::';
-		$memcache->remove($cacheKeyPrefix . 'include');
-		$memcache->remove($cacheKeyPrefix . 'exclude');
+		$cacheKeyPrefix = Filesystem::normalizePath($absolutePath).'::';
+		$memcache->remove($cacheKeyPrefix.'include');
+		$memcache->remove($cacheKeyPrefix.'exclude');
 	}
 
 	/**