nextcloud / server

lib/private/App/CompareVersion.php

Indentation +57 added lines, -57 removed lines

@@ -29,69 +29,69 @@
 use function explode;
 
 class CompareVersion {
-	private const REGEX_MAJOR = '/^\d+$/';
-	private const REGEX_MAJOR_MINOR = '/^\d+\.\d+$/';
-	private const REGEX_MAJOR_MINOR_PATCH = '/^\d+\.\d+\.\d+(?!\.\d+)/';
-	private const REGEX_ACTUAL = '/^\d+(\.\d+){1,2}/';
+    private const REGEX_MAJOR = '/^\d+$/';
+    private const REGEX_MAJOR_MINOR = '/^\d+\.\d+$/';
+    private const REGEX_MAJOR_MINOR_PATCH = '/^\d+\.\d+\.\d+(?!\.\d+)/';
+    private const REGEX_ACTUAL = '/^\d+(\.\d+){1,2}/';
 
-	/**
-	 * Checks if the given server version fulfills the given (app) version requirements.
-	 *
-	 * Version requirements can be 'major.minor.patch', 'major.minor' or just 'major',
-	 * so '13.0.1', '13.0' and '13' are valid.
-	 *
-	 * @param string $actual version as major.minor.patch notation
-	 * @param string $required version where major is required and minor and patch are optional
-	 * @param string $comparator passed to `version_compare`
-	 * @return bool whether the requirement is fulfilled
-	 * @throws InvalidArgumentException if versions specified in an invalid format
-	 */
-	public function isCompatible(string $actual, string $required,
-		string $comparator = '>='): bool {
-		if (!preg_match(self::REGEX_ACTUAL, $actual, $matches)) {
-			throw new InvalidArgumentException("version specification $actual is invalid");
-		}
-		$cleanActual = $matches[0];
+    /**
+     * Checks if the given server version fulfills the given (app) version requirements.
+     *
+     * Version requirements can be 'major.minor.patch', 'major.minor' or just 'major',
+     * so '13.0.1', '13.0' and '13' are valid.
+     *
+     * @param string $actual version as major.minor.patch notation
+     * @param string $required version where major is required and minor and patch are optional
+     * @param string $comparator passed to `version_compare`
+     * @return bool whether the requirement is fulfilled
+     * @throws InvalidArgumentException if versions specified in an invalid format
+     */
+    public function isCompatible(string $actual, string $required,
+        string $comparator = '>='): bool {
+        if (!preg_match(self::REGEX_ACTUAL, $actual, $matches)) {
+            throw new InvalidArgumentException("version specification $actual is invalid");
+        }
+        $cleanActual = $matches[0];
 
-		if (preg_match(self::REGEX_MAJOR, $required) === 1) {
-			return $this->compareMajor($cleanActual, $required, $comparator);
-		} elseif (preg_match(self::REGEX_MAJOR_MINOR, $required) === 1) {
-			return $this->compareMajorMinor($cleanActual, $required, $comparator);
-		} elseif (preg_match(self::REGEX_MAJOR_MINOR_PATCH, $required) === 1) {
-			return $this->compareMajorMinorPatch($cleanActual, $required, $comparator);
-		} else {
-			throw new InvalidArgumentException("required version $required is invalid");
-		}
-	}
+        if (preg_match(self::REGEX_MAJOR, $required) === 1) {
+            return $this->compareMajor($cleanActual, $required, $comparator);
+        } elseif (preg_match(self::REGEX_MAJOR_MINOR, $required) === 1) {
+            return $this->compareMajorMinor($cleanActual, $required, $comparator);
+        } elseif (preg_match(self::REGEX_MAJOR_MINOR_PATCH, $required) === 1) {
+            return $this->compareMajorMinorPatch($cleanActual, $required, $comparator);
+        } else {
+            throw new InvalidArgumentException("required version $required is invalid");
+        }
+    }
 
-	private function compareMajor(string $actual, string $required,
-		string $comparator) {
-		$actualMajor = explode('.', $actual)[0];
-		$requiredMajor = explode('.', $required)[0];
+    private function compareMajor(string $actual, string $required,
+        string $comparator) {
+        $actualMajor = explode('.', $actual)[0];
+        $requiredMajor = explode('.', $required)[0];
 
-		return version_compare($actualMajor, $requiredMajor, $comparator);
-	}
+        return version_compare($actualMajor, $requiredMajor, $comparator);
+    }
 
-	private function compareMajorMinor(string $actual, string $required,
-		string $comparator) {
-		$actualMajor = explode('.', $actual)[0];
-		$actualMinor = explode('.', $actual)[1];
-		$requiredMajor = explode('.', $required)[0];
-		$requiredMinor = explode('.', $required)[1];
+    private function compareMajorMinor(string $actual, string $required,
+        string $comparator) {
+        $actualMajor = explode('.', $actual)[0];
+        $actualMinor = explode('.', $actual)[1];
+        $requiredMajor = explode('.', $required)[0];
+        $requiredMinor = explode('.', $required)[1];
 
-		return version_compare("$actualMajor.$actualMinor",
-			"$requiredMajor.$requiredMinor", $comparator);
-	}
+        return version_compare("$actualMajor.$actualMinor",
+            "$requiredMajor.$requiredMinor", $comparator);
+    }
 
-	private function compareMajorMinorPatch($actual, $required, $comparator) {
-		$actualMajor = explode('.', $actual)[0];
-		$actualMinor = explode('.', $actual)[1];
-		$actualPatch = explode('.', $actual)[2];
-		$requiredMajor = explode('.', $required)[0];
-		$requiredMinor = explode('.', $required)[1];
-		$requiredPatch = explode('.', $required)[2];
+    private function compareMajorMinorPatch($actual, $required, $comparator) {
+        $actualMajor = explode('.', $actual)[0];
+        $actualMinor = explode('.', $actual)[1];
+        $actualPatch = explode('.', $actual)[2];
+        $requiredMajor = explode('.', $required)[0];
+        $requiredMinor = explode('.', $required)[1];
+        $requiredPatch = explode('.', $required)[2];
 
-		return version_compare("$actualMajor.$actualMinor.$actualPatch",
-			"$requiredMajor.$requiredMinor.$requiredPatch", $comparator);
-	}
+        return version_compare("$actualMajor.$actualMinor.$actualPatch",
+            "$requiredMajor.$requiredMinor.$requiredPatch", $comparator);
+    }
 }

lib/private/App/AppStore/Bundles/HubBundle.php

Indentation +17 added lines, -17 removed lines

@@ -27,24 +27,24 @@
 namespace OC\App\AppStore\Bundles;
 
 class HubBundle extends Bundle {
-	public function getName() {
-		return $this->l10n->t('Hub bundle');
-	}
+    public function getName() {
+        return $this->l10n->t('Hub bundle');
+    }
 
-	public function getAppIdentifiers() {
-		$hubApps = [
-			'spreed',
-			'contacts',
-			'calendar',
-			'mail',
-		];
+    public function getAppIdentifiers() {
+        $hubApps = [
+            'spreed',
+            'contacts',
+            'calendar',
+            'mail',
+        ];
 
-		$architecture = function_exists('php_uname') ? php_uname('m') : null;
-		if (isset($architecture) && PHP_OS_FAMILY === 'Linux' && in_array($architecture, ['x86_64', 'aarch64'])) {
-			$hubApps[] = 'richdocuments';
-			$hubApps[] = 'richdocumentscode' . ($architecture === 'aarch64' ? '_arm64' : '');
-		}
+        $architecture = function_exists('php_uname') ? php_uname('m') : null;
+        if (isset($architecture) && PHP_OS_FAMILY === 'Linux' && in_array($architecture, ['x86_64', 'aarch64'])) {
+            $hubApps[] = 'richdocuments';
+            $hubApps[] = 'richdocumentscode' . ($architecture === 'aarch64' ? '_arm64' : '');
+        }
 
-		return $hubApps;
-	}
+        return $hubApps;
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
 		$architecture = function_exists('php_uname') ? php_uname('m') : null;
 		if (isset($architecture) && PHP_OS_FAMILY === 'Linux' && in_array($architecture, ['x86_64', 'aarch64'])) {
 			$hubApps[] = 'richdocuments';
-			$hubApps[] = 'richdocumentscode' . ($architecture === 'aarch64' ? '_arm64' : '');
+			$hubApps[] = 'richdocumentscode'.($architecture === 'aarch64' ? '_arm64' : '');
 		}
 
 		return $hubApps;

lib/private/Accounts/AccountManager.php

Spacing +3 added lines, -3 removed lines

@@ -371,7 +371,7 @@ 
 
 	public function searchUsers(string $property, array $values): array {
 		// the value col is limited to 255 bytes. It is used for searches only.
-		$values = array_map(function (string $value) {
+		$values = array_map(function(string $value) {
 			return Util::shortenMultibyteString($value, 255);
 		}, $values);
 		$chunks = array_chunk($values, 500);
@@ -451,7 +451,7 @@ 
 	protected function sendEmailVerificationEmail(IUser $user, string $email): bool {
 		$ref = \substr(hash('sha256', $email), 0, 8);
 		$key = $this->crypto->encrypt($email);
-		$token = $this->verificationToken->create($user, 'verifyMail' . $ref, $email);
+		$token = $this->verificationToken->create($user, 'verifyMail'.$ref, $email);
 
 		$link = $this->urlGenerator->linkToRouteAbsolute(
 			'provisioning_api.Verification.verifyMail',
@@ -669,7 +669,7 @@ 
 	 * build default user record in case not data set exists yet
 	 */
 	protected function buildDefaultUserRecord(IUser $user): array {
-		$scopes = array_merge(self::DEFAULT_SCOPES, array_filter($this->config->getSystemValue('account_manager.default_property_scope', []), static function (string $scope, string $property) {
+		$scopes = array_merge(self::DEFAULT_SCOPES, array_filter($this->config->getSystemValue('account_manager.default_property_scope', []), static function(string $scope, string $property) {
 			return in_array($property, self::ALLOWED_PROPERTIES, true) && in_array($scope, self::ALLOWED_SCOPES, true);
 		}, ARRAY_FILTER_USE_BOTH));
 

Indentation +845 added lines, -845 removed lines

@@ -52,849 +52,849 @@
  * @package OC\Accounts
  */
 class AccountManager implements IAccountManager {
-	use TAccountsHelper;
-
-	use TProfileHelper;
-
-	private string $table = 'accounts';
-	private string $dataTable = 'accounts_data';
-	private ?IL10N $l10n = null;
-	private CappedMemoryCache $internalCache;
-
-	/**
-	 * The list of default scopes for each property.
-	 */
-	public const DEFAULT_SCOPES = [
-		self::PROPERTY_ADDRESS => self::SCOPE_LOCAL,
-		self::PROPERTY_AVATAR => self::SCOPE_FEDERATED,
-		self::PROPERTY_BIOGRAPHY => self::SCOPE_LOCAL,
-		self::PROPERTY_BIRTHDATE => self::SCOPE_LOCAL,
-		self::PROPERTY_DISPLAYNAME => self::SCOPE_FEDERATED,
-		self::PROPERTY_EMAIL => self::SCOPE_FEDERATED,
-		self::PROPERTY_FEDIVERSE => self::SCOPE_LOCAL,
-		self::PROPERTY_HEADLINE => self::SCOPE_LOCAL,
-		self::PROPERTY_ORGANISATION => self::SCOPE_LOCAL,
-		self::PROPERTY_PHONE => self::SCOPE_LOCAL,
-		self::PROPERTY_PRONOUNS => self::SCOPE_FEDERATED,
-		self::PROPERTY_ROLE => self::SCOPE_LOCAL,
-		self::PROPERTY_TWITTER => self::SCOPE_LOCAL,
-		self::PROPERTY_BLUESKY => self::SCOPE_LOCAL,
-		self::PROPERTY_WEBSITE => self::SCOPE_LOCAL,
-	];
-
-	public function __construct(
-		private IDBConnection $connection,
-		private IConfig $config,
-		private IEventDispatcher $dispatcher,
-		private IJobList $jobList,
-		private LoggerInterface $logger,
-		private IVerificationToken $verificationToken,
-		private IMailer $mailer,
-		private Defaults $defaults,
-		private IFactory $l10nFactory,
-		private IURLGenerator $urlGenerator,
-		private ICrypto $crypto,
-		private IPhoneNumberUtil $phoneNumberUtil,
-		private IClientService $clientService,
-	) {
-		$this->internalCache = new CappedMemoryCache();
-	}
-
-	/**
-	 * @param IAccountProperty[] $properties
-	 */
-	protected function testValueLengths(array $properties, bool $throwOnData = false): void {
-		foreach ($properties as $property) {
-			if (strlen($property->getValue()) > 2048) {
-				if ($throwOnData) {
-					throw new InvalidArgumentException($property->getName());
-				} else {
-					$property->setValue('');
-				}
-			}
-		}
-	}
-
-	protected function testPropertyScope(IAccountProperty $property, array $allowedScopes, bool $throwOnData): void {
-		if ($throwOnData && !in_array($property->getScope(), $allowedScopes, true)) {
-			throw new InvalidArgumentException('scope');
-		}
-
-		if (
-			$property->getScope() === self::SCOPE_PRIVATE
-			&& in_array($property->getName(), [self::PROPERTY_DISPLAYNAME, self::PROPERTY_EMAIL])
-		) {
-			if ($throwOnData) {
-				// v2-private is not available for these fields
-				throw new InvalidArgumentException('scope');
-			} else {
-				// default to local
-				$property->setScope(self::SCOPE_LOCAL);
-			}
-		} else {
-			// migrate scope values to the new format
-			// invalid scopes are mapped to a default value
-			$property->setScope(AccountProperty::mapScopeToV2($property->getScope()));
-		}
-	}
-
-	protected function updateUser(IUser $user, array $data, ?array $oldUserData, bool $throwOnData = false): array {
-		if ($oldUserData === null) {
-			$oldUserData = $this->getUser($user, false);
-		}
-
-		$updated = true;
-
-		if ($oldUserData !== $data) {
-			$this->updateExistingUser($user, $data, $oldUserData);
-		} else {
-			// nothing needs to be done if new and old data set are the same
-			$updated = false;
-		}
-
-		if ($updated) {
-			$this->dispatcher->dispatchTyped(new UserUpdatedEvent(
-				$user,
-				$data,
-			));
-		}
-
-		return $data;
-	}
-
-	/**
-	 * delete user from accounts table
-	 */
-	public function deleteUser(IUser $user): void {
-		$uid = $user->getUID();
-		$query = $this->connection->getQueryBuilder();
-		$query->delete($this->table)
-			->where($query->expr()->eq('uid', $query->createNamedParameter($uid)))
-			->executeStatement();
-
-		$this->deleteUserData($user);
-	}
-
-	/**
-	 * delete user from accounts table
-	 */
-	public function deleteUserData(IUser $user): void {
-		$uid = $user->getUID();
-		$query = $this->connection->getQueryBuilder();
-		$query->delete($this->dataTable)
-			->where($query->expr()->eq('uid', $query->createNamedParameter($uid)))
-			->executeStatement();
-	}
-
-	/**
-	 * get stored data from a given user
-	 */
-	protected function getUser(IUser $user, bool $insertIfNotExists = true): array {
-		$uid = $user->getUID();
-		$query = $this->connection->getQueryBuilder();
-		$query->select('data')
-			->from($this->table)
-			->where($query->expr()->eq('uid', $query->createParameter('uid')))
-			->setParameter('uid', $uid);
-		$result = $query->executeQuery();
-		$accountData = $result->fetchAll();
-		$result->closeCursor();
-
-		if (empty($accountData)) {
-			$userData = $this->buildDefaultUserRecord($user);
-			if ($insertIfNotExists) {
-				$this->insertNewUser($user, $userData);
-			}
-			return $userData;
-		}
-
-		$userDataArray = $this->importFromJson($accountData[0]['data'], $uid);
-		if ($userDataArray === null || $userDataArray === []) {
-			return $this->buildDefaultUserRecord($user);
-		}
-
-		return $this->addMissingDefaultValues($userDataArray, $this->buildDefaultUserRecord($user));
-	}
-
-	public function searchUsers(string $property, array $values): array {
-		// the value col is limited to 255 bytes. It is used for searches only.
-		$values = array_map(function (string $value) {
-			return Util::shortenMultibyteString($value, 255);
-		}, $values);
-		$chunks = array_chunk($values, 500);
-		$query = $this->connection->getQueryBuilder();
-		$query->select('*')
-			->from($this->dataTable)
-			->where($query->expr()->eq('name', $query->createNamedParameter($property)))
-			->andWhere($query->expr()->in('value', $query->createParameter('values')));
-
-		$matches = [];
-		foreach ($chunks as $chunk) {
-			$query->setParameter('values', $chunk, IQueryBuilder::PARAM_STR_ARRAY);
-			$result = $query->executeQuery();
-
-			while ($row = $result->fetch()) {
-				$matches[$row['uid']] = $row['value'];
-			}
-			$result->closeCursor();
-		}
-
-		$result = array_merge($matches, $this->searchUsersForRelatedCollection($property, $values));
-
-		return array_flip($result);
-	}
-
-	protected function searchUsersForRelatedCollection(string $property, array $values): array {
-		return match ($property) {
-			IAccountManager::PROPERTY_EMAIL => array_flip($this->searchUsers(IAccountManager::COLLECTION_EMAIL, $values)),
-			default => [],
-		};
-	}
-
-	/**
-	 * check if we need to ask the server for email verification, if yes we create a cronjob
-	 */
-	protected function checkEmailVerification(IAccount $updatedAccount, array $oldData): void {
-		try {
-			$property = $updatedAccount->getProperty(self::PROPERTY_EMAIL);
-		} catch (PropertyDoesNotExistException $e) {
-			return;
-		}
-
-		$oldMailIndex = array_search(self::PROPERTY_EMAIL, array_column($oldData, 'name'), true);
-		$oldMail = $oldMailIndex !== false ? $oldData[$oldMailIndex]['value'] : '';
-
-		if ($oldMail !== $property->getValue()) {
-			$this->jobList->add(
-				VerifyUserData::class,
-				[
-					'verificationCode' => '',
-					'data' => $property->getValue(),
-					'type' => self::PROPERTY_EMAIL,
-					'uid' => $updatedAccount->getUser()->getUID(),
-					'try' => 0,
-					'lastRun' => time()
-				]
-			);
-
-			$property->setVerified(self::VERIFICATION_IN_PROGRESS);
-		}
-	}
-
-	protected function checkLocalEmailVerification(IAccount $updatedAccount, array $oldData): void {
-		$mailCollection = $updatedAccount->getPropertyCollection(self::COLLECTION_EMAIL);
-		foreach ($mailCollection->getProperties() as $property) {
-			if ($property->getLocallyVerified() !== self::NOT_VERIFIED) {
-				continue;
-			}
-			if ($this->sendEmailVerificationEmail($updatedAccount->getUser(), $property->getValue())) {
-				$property->setLocallyVerified(self::VERIFICATION_IN_PROGRESS);
-			}
-		}
-	}
-
-	protected function sendEmailVerificationEmail(IUser $user, string $email): bool {
-		$ref = \substr(hash('sha256', $email), 0, 8);
-		$key = $this->crypto->encrypt($email);
-		$token = $this->verificationToken->create($user, 'verifyMail' . $ref, $email);
-
-		$link = $this->urlGenerator->linkToRouteAbsolute(
-			'provisioning_api.Verification.verifyMail',
-			[
-				'userId' => $user->getUID(),
-				'token' => $token,
-				'key' => $key
-			]
-		);
-
-		$emailTemplate = $this->mailer->createEMailTemplate('core.EmailVerification', [
-			'link' => $link,
-		]);
-
-		if (!$this->l10n) {
-			$this->l10n = $this->l10nFactory->get('core');
-		}
-
-		$emailTemplate->setSubject($this->l10n->t('%s email verification', [$this->defaults->getName()]));
-		$emailTemplate->addHeader();
-		$emailTemplate->addHeading($this->l10n->t('Email verification'));
-
-		$emailTemplate->addBodyText(
-			htmlspecialchars($this->l10n->t('Click the following button to confirm your email.')),
-			$this->l10n->t('Click the following link to confirm your email.')
-		);
-
-		$emailTemplate->addBodyButton(
-			htmlspecialchars($this->l10n->t('Confirm your email')),
-			$link,
-			false
-		);
-		$emailTemplate->addFooter();
-
-		try {
-			$message = $this->mailer->createMessage();
-			$message->setTo([$email => $user->getDisplayName()]);
-			$message->setFrom([Util::getDefaultEmailAddress('verification-noreply') => $this->defaults->getName()]);
-			$message->useTemplate($emailTemplate);
-			$this->mailer->send($message);
-		} catch (Exception $e) {
-			// Log the exception and continue
-			$this->logger->info('Failed to send verification mail', [
-				'app' => 'core',
-				'exception' => $e
-			]);
-			return false;
-		}
-		return true;
-	}
-
-	/**
-	 * Make sure that all expected data are set
-	 */
-	protected function addMissingDefaultValues(array $userData, array $defaultUserData): array {
-		foreach ($defaultUserData as $defaultDataItem) {
-			// If property does not exist, initialize it
-			$userDataIndex = array_search($defaultDataItem['name'], array_column($userData, 'name'));
-			if ($userDataIndex === false) {
-				$userData[] = $defaultDataItem;
-				continue;
-			}
-
-			// Merge and extend default missing values
-			$userData[$userDataIndex] = array_merge($defaultDataItem, $userData[$userDataIndex]);
-		}
-
-		return $userData;
-	}
-
-	protected function updateVerificationStatus(IAccount $updatedAccount, array $oldData): void {
-		static $propertiesVerifiableByLookupServer = [
-			self::PROPERTY_TWITTER,
-			self::PROPERTY_FEDIVERSE,
-			self::PROPERTY_WEBSITE,
-			self::PROPERTY_EMAIL,
-		];
-
-		foreach ($propertiesVerifiableByLookupServer as $propertyName) {
-			try {
-				$property = $updatedAccount->getProperty($propertyName);
-			} catch (PropertyDoesNotExistException $e) {
-				continue;
-			}
-			$wasVerified = isset($oldData[$propertyName])
-				&& isset($oldData[$propertyName]['verified'])
-				&& $oldData[$propertyName]['verified'] === self::VERIFIED;
-			if ((!isset($oldData[$propertyName])
-					|| !isset($oldData[$propertyName]['value'])
-					|| $property->getValue() !== $oldData[$propertyName]['value'])
-				&& ($property->getVerified() !== self::NOT_VERIFIED
-					|| $wasVerified)
-			) {
-				$property->setVerified(self::NOT_VERIFIED);
-			}
-		}
-	}
-
-	/**
-	 * add new user to accounts table
-	 */
-	protected function insertNewUser(IUser $user, array $data): void {
-		$uid = $user->getUID();
-		$jsonEncodedData = $this->prepareJson($data);
-		$query = $this->connection->getQueryBuilder();
-		$query->insert($this->table)
-			->values(
-				[
-					'uid' => $query->createNamedParameter($uid),
-					'data' => $query->createNamedParameter($jsonEncodedData),
-				]
-			)
-			->executeStatement();
-
-		$this->deleteUserData($user);
-		$this->writeUserData($user, $data);
-	}
-
-	protected function prepareJson(array $data): string {
-		$preparedData = [];
-		foreach ($data as $dataRow) {
-			$propertyName = $dataRow['name'];
-			unset($dataRow['name']);
-
-			if (isset($dataRow['locallyVerified']) && $dataRow['locallyVerified'] === self::NOT_VERIFIED) {
-				// do not write default value, save DB space
-				unset($dataRow['locallyVerified']);
-			}
-
-			if (!$this->isCollection($propertyName)) {
-				$preparedData[$propertyName] = $dataRow;
-				continue;
-			}
-			if (!isset($preparedData[$propertyName])) {
-				$preparedData[$propertyName] = [];
-			}
-			$preparedData[$propertyName][] = $dataRow;
-		}
-		return json_encode($preparedData);
-	}
-
-	protected function importFromJson(string $json, string $userId): ?array {
-		$result = [];
-		$jsonArray = json_decode($json, true);
-		$jsonError = json_last_error();
-		if ($jsonError !== JSON_ERROR_NONE) {
-			$this->logger->critical(
-				'User data of {uid} contained invalid JSON (error {json_error}), hence falling back to a default user record',
-				[
-					'uid' => $userId,
-					'json_error' => $jsonError
-				]
-			);
-			return null;
-		}
-		foreach ($jsonArray as $propertyName => $row) {
-			if (!$this->isCollection($propertyName)) {
-				$result[] = array_merge($row, ['name' => $propertyName]);
-				continue;
-			}
-			foreach ($row as $singleRow) {
-				$result[] = array_merge($singleRow, ['name' => $propertyName]);
-			}
-		}
-		return $result;
-	}
-
-	/**
-	 * Update existing user in accounts table
-	 */
-	protected function updateExistingUser(IUser $user, array $data, array $oldData): void {
-		$uid = $user->getUID();
-		$jsonEncodedData = $this->prepareJson($data);
-		$query = $this->connection->getQueryBuilder();
-		$query->update($this->table)
-			->set('data', $query->createNamedParameter($jsonEncodedData))
-			->where($query->expr()->eq('uid', $query->createNamedParameter($uid)))
-			->executeStatement();
-
-		$this->deleteUserData($user);
-		$this->writeUserData($user, $data);
-	}
-
-	protected function writeUserData(IUser $user, array $data): void {
-		$query = $this->connection->getQueryBuilder();
-		$query->insert($this->dataTable)
-			->values(
-				[
-					'uid' => $query->createNamedParameter($user->getUID()),
-					'name' => $query->createParameter('name'),
-					'value' => $query->createParameter('value'),
-				]
-			);
-		$this->writeUserDataProperties($query, $data);
-	}
-
-	protected function writeUserDataProperties(IQueryBuilder $query, array $data): void {
-		foreach ($data as $property) {
-			if ($property['name'] === self::PROPERTY_AVATAR) {
-				continue;
-			}
-
-			// the value col is limited to 255 bytes. It is used for searches only.
-			$value = $property['value'] ? Util::shortenMultibyteString($property['value'], 255) : '';
-
-			$query->setParameter('name', $property['name'])
-				->setParameter('value', $value);
-			$query->executeStatement();
-		}
-	}
-
-	/**
-	 * build default user record in case not data set exists yet
-	 */
-	protected function buildDefaultUserRecord(IUser $user): array {
-		$scopes = array_merge(self::DEFAULT_SCOPES, array_filter($this->config->getSystemValue('account_manager.default_property_scope', []), static function (string $scope, string $property) {
-			return in_array($property, self::ALLOWED_PROPERTIES, true) && in_array($scope, self::ALLOWED_SCOPES, true);
-		}, ARRAY_FILTER_USE_BOTH));
-
-		return [
-			[
-				'name' => self::PROPERTY_DISPLAYNAME,
-				'value' => $user->getDisplayName(),
-				// Display name must be at least SCOPE_LOCAL
-				'scope' => $scopes[self::PROPERTY_DISPLAYNAME] === self::SCOPE_PRIVATE ? self::SCOPE_LOCAL : $scopes[self::PROPERTY_DISPLAYNAME],
-				'verified' => self::NOT_VERIFIED,
-			],
-
-			[
-				'name' => self::PROPERTY_ADDRESS,
-				'value' => '',
-				'scope' => $scopes[self::PROPERTY_ADDRESS],
-				'verified' => self::NOT_VERIFIED,
-			],
-
-			[
-				'name' => self::PROPERTY_WEBSITE,
-				'value' => '',
-				'scope' => $scopes[self::PROPERTY_WEBSITE],
-				'verified' => self::NOT_VERIFIED,
-			],
-
-			[
-				'name' => self::PROPERTY_EMAIL,
-				'value' => $user->getEMailAddress(),
-				// Email must be at least SCOPE_LOCAL
-				'scope' => $scopes[self::PROPERTY_EMAIL] === self::SCOPE_PRIVATE ? self::SCOPE_LOCAL : $scopes[self::PROPERTY_EMAIL],
-				'verified' => self::NOT_VERIFIED,
-			],
-
-			[
-				'name' => self::PROPERTY_AVATAR,
-				'scope' => $scopes[self::PROPERTY_AVATAR],
-			],
-
-			[
-				'name' => self::PROPERTY_PHONE,
-				'value' => '',
-				'scope' => $scopes[self::PROPERTY_PHONE],
-				'verified' => self::NOT_VERIFIED,
-			],
-
-			[
-				'name' => self::PROPERTY_TWITTER,
-				'value' => '',
-				'scope' => $scopes[self::PROPERTY_TWITTER],
-				'verified' => self::NOT_VERIFIED,
-			],
-
-			[
-				'name' => self::PROPERTY_BLUESKY,
-				'value' => '',
-				'scope' => $scopes[self::PROPERTY_BLUESKY],
-				'verified' => self::NOT_VERIFIED,
-			],
-
-			[
-				'name' => self::PROPERTY_FEDIVERSE,
-				'value' => '',
-				'scope' => $scopes[self::PROPERTY_FEDIVERSE],
-				'verified' => self::NOT_VERIFIED,
-			],
-
-			[
-				'name' => self::PROPERTY_ORGANISATION,
-				'value' => '',
-				'scope' => $scopes[self::PROPERTY_ORGANISATION],
-			],
-
-			[
-				'name' => self::PROPERTY_ROLE,
-				'value' => '',
-				'scope' => $scopes[self::PROPERTY_ROLE],
-			],
-
-			[
-				'name' => self::PROPERTY_HEADLINE,
-				'value' => '',
-				'scope' => $scopes[self::PROPERTY_HEADLINE],
-			],
-
-			[
-				'name' => self::PROPERTY_BIOGRAPHY,
-				'value' => '',
-				'scope' => $scopes[self::PROPERTY_BIOGRAPHY],
-			],
-
-			[
-				'name' => self::PROPERTY_BIRTHDATE,
-				'value' => '',
-				'scope' => $scopes[self::PROPERTY_BIRTHDATE],
-			],
-
-			[
-				'name' => self::PROPERTY_PROFILE_ENABLED,
-				'value' => $this->isProfileEnabledByDefault($this->config) ? '1' : '0',
-			],
-
-			[
-				'name' => self::PROPERTY_PRONOUNS,
-				'value' => '',
-				'scope' => $scopes[self::PROPERTY_PRONOUNS],
-			],
-		];
-	}
-
-	private function arrayDataToCollection(IAccount $account, array $data): IAccountPropertyCollection {
-		$collection = $account->getPropertyCollection($data['name']);
-
-		$p = new AccountProperty(
-			$data['name'],
-			$data['value'] ?? '',
-			$data['scope'] ?? self::SCOPE_LOCAL,
-			$data['verified'] ?? self::NOT_VERIFIED,
-			''
-		);
-		$p->setLocallyVerified($data['locallyVerified'] ?? self::NOT_VERIFIED);
-		$collection->addProperty($p);
-
-		return $collection;
-	}
-
-	private function parseAccountData(IUser $user, $data): Account {
-		$account = new Account($user);
-		foreach ($data as $accountData) {
-			if ($this->isCollection($accountData['name'])) {
-				$account->setPropertyCollection($this->arrayDataToCollection($account, $accountData));
-			} else {
-				$account->setProperty($accountData['name'], $accountData['value'] ?? '', $accountData['scope'] ?? self::SCOPE_LOCAL, $accountData['verified'] ?? self::NOT_VERIFIED);
-				if (isset($accountData['locallyVerified'])) {
-					$property = $account->getProperty($accountData['name']);
-					$property->setLocallyVerified($accountData['locallyVerified']);
-				}
-			}
-		}
-		return $account;
-	}
-
-	public function getAccount(IUser $user): IAccount {
-		$cached = $this->internalCache->get($user->getUID());
-		if ($cached !== null) {
-			return $cached;
-		}
-		$account = $this->parseAccountData($user, $this->getUser($user));
-		if ($user->getBackend() instanceof IGetDisplayNameBackend) {
-			$property = $account->getProperty(self::PROPERTY_DISPLAYNAME);
-			$account->setProperty(self::PROPERTY_DISPLAYNAME, $user->getDisplayName(), $property->getScope(), $property->getVerified());
-		}
-		$this->internalCache->set($user->getUID(), $account);
-		return $account;
-	}
-
-	/**
-	 * Converts value (phone number) in E.164 format when it was a valid number
-	 * @throws InvalidArgumentException When the phone number was invalid or no default region is set and the number doesn't start with a country code
-	 */
-	protected function sanitizePropertyPhoneNumber(IAccountProperty $property): void {
-		$defaultRegion = $this->config->getSystemValueString('default_phone_region', '');
-
-		if ($defaultRegion === '') {
-			// When no default region is set, only +49… numbers are valid
-			if (!str_starts_with($property->getValue(), '+')) {
-				throw new InvalidArgumentException(self::PROPERTY_PHONE);
-			}
-
-			$defaultRegion = 'EN';
-		}
-
-		$phoneNumber = $this->phoneNumberUtil->convertToStandardFormat($property->getValue(), $defaultRegion);
-		if ($phoneNumber === null) {
-			throw new InvalidArgumentException(self::PROPERTY_PHONE);
-		}
-		$property->setValue($phoneNumber);
-	}
-
-	/**
-	 * @throws InvalidArgumentException When the website did not have http(s) as protocol or the host name was empty
-	 */
-	private function sanitizePropertyWebsite(IAccountProperty $property): void {
-		$parts = parse_url($property->getValue());
-		if (!isset($parts['scheme']) || ($parts['scheme'] !== 'https' && $parts['scheme'] !== 'http')) {
-			throw new InvalidArgumentException(self::PROPERTY_WEBSITE);
-		}
-
-		if (!isset($parts['host']) || $parts['host'] === '') {
-			throw new InvalidArgumentException(self::PROPERTY_WEBSITE);
-		}
-	}
-
-	/**
-	 * @throws InvalidArgumentException If the property value is not a valid user handle according to X's rules
-	 */
-	private function sanitizePropertyTwitter(IAccountProperty $property): void {
-		if ($property->getName() === self::PROPERTY_TWITTER) {
-			$matches = [];
-			// twitter handles only contain alpha numeric characters and the underscore and must not be longer than 15 characters
-			if (preg_match('/^@?([a-zA-Z0-9_]{2,15})$/', $property->getValue(), $matches) !== 1) {
-				throw new InvalidArgumentException(self::PROPERTY_TWITTER);
-			}
-
-			// drop the leading @ if any to make it the valid handle
-			$property->setValue($matches[1]);
-
-		}
-	}
-
-	private function validateBlueSkyHandle(string $text): bool {
-		if ($text === '') {
-			return true;
-		}
-
-		$lowerText = strtolower($text);
-
-		if ($lowerText === 'bsky.social') {
-			// "bsky.social" itself is not a valid handle
-			return false;
-		}
-
-		if (str_ends_with($lowerText, '.bsky.social')) {
-			$parts = explode('.', $lowerText);
-
-			// Must be exactly: username.bsky.social → 3 parts
-			if (count($parts) !== 3 || $parts[1] !== 'bsky' || $parts[2] !== 'social') {
-				return false;
-			}
-
-			$username = $parts[0];
-
-			// Must be 3–18 chars, alphanumeric/hyphen, no start/end hyphen
-			return preg_match('/^[a-z0-9][a-z0-9-]{2,17}$/', $username) === 1;
-		}
-
-		// Allow custom domains (Bluesky handle via personal domain)
-		return filter_var($text, FILTER_VALIDATE_DOMAIN, FILTER_FLAG_HOSTNAME) !== false;
-	}
-
-
-	private function sanitizePropertyBluesky(IAccountProperty $property): void {
-		if ($property->getName() === self::PROPERTY_BLUESKY) {
-			if (!$this->validateBlueSkyHandle($property->getValue())) {
-				throw new InvalidArgumentException(self::PROPERTY_BLUESKY);
-			}
-
-			$property->setValue($property->getValue());
-		}
-	}
-
-	/**
-	 * @throws InvalidArgumentException If the property value is not a valid fediverse handle (username@instance where instance is a valid domain)
-	 */
-	private function sanitizePropertyFediverse(IAccountProperty $property): void {
-		if ($property->getName() === self::PROPERTY_FEDIVERSE) {
-			$matches = [];
-			if (preg_match('/^@?([^@\s\/\\\]+)@([^\s\/\\\]+)$/', trim($property->getValue()), $matches) !== 1) {
-				throw new InvalidArgumentException(self::PROPERTY_FEDIVERSE);
-			}
-
-			[, $username, $instance] = $matches;
-			$validated = filter_var($instance, FILTER_VALIDATE_DOMAIN, FILTER_FLAG_HOSTNAME);
-			if ($validated !== $instance) {
-				throw new InvalidArgumentException(self::PROPERTY_FEDIVERSE);
-			}
-
-			if ($this->config->getSystemValueBool('has_internet_connection', true)) {
-				$client = $this->clientService->newClient();
-
-				try {
-					// try the public account lookup API of mastodon
-					$response = $client->get("https://{$instance}/.well-known/webfinger?resource=acct:{$username}@{$instance}");
-					// should be a json response with account information
-					$data = $response->getBody();
-					if (is_resource($data)) {
-						$data = stream_get_contents($data);
-					}
-					$decoded = json_decode($data, true);
-					// ensure the username is the same the user passed
-					// in this case we can assume this is a valid fediverse server and account
-					if (!is_array($decoded) || ($decoded['subject'] ?? '') !== "acct:{$username}@{$instance}") {
-						throw new InvalidArgumentException();
-					}
-					// check for activitypub link
-					if (is_array($decoded['links']) && isset($decoded['links'])) {
-						$found = false;
-						foreach ($decoded['links'] as $link) {
-							// have application/activity+json or application/ld+json
-							if (isset($link['type']) && (
-								$link['type'] === 'application/activity+json'
-								|| $link['type'] === 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"'
-							)) {
-								$found = true;
-								break;
-							}
-						}
-						if (!$found) {
-							throw new InvalidArgumentException();
-						}
-					}
-				} catch (InvalidArgumentException) {
-					throw new InvalidArgumentException(self::PROPERTY_FEDIVERSE);
-				} catch (\Exception $error) {
-					$this->logger->error('Could not verify fediverse account', ['exception' => $error, 'instance' => $instance]);
-					throw new InvalidArgumentException(self::PROPERTY_FEDIVERSE);
-				}
-			}
-
-			$property->setValue("$username@$instance");
-		}
-	}
-
-	public function updateAccount(IAccount $account): void {
-		$this->testValueLengths(iterator_to_array($account->getAllProperties()), true);
-		try {
-			$property = $account->getProperty(self::PROPERTY_PHONE);
-			if ($property->getValue() !== '') {
-				$this->sanitizePropertyPhoneNumber($property);
-			}
-		} catch (PropertyDoesNotExistException $e) {
-			//  valid case, nothing to do
-		}
-
-		try {
-			$property = $account->getProperty(self::PROPERTY_WEBSITE);
-			if ($property->getValue() !== '') {
-				$this->sanitizePropertyWebsite($property);
-			}
-		} catch (PropertyDoesNotExistException $e) {
-			//  valid case, nothing to do
-		}
-
-		try {
-			$property = $account->getProperty(self::PROPERTY_TWITTER);
-			if ($property->getValue() !== '') {
-				$this->sanitizePropertyTwitter($property);
-			}
-		} catch (PropertyDoesNotExistException $e) {
-			//  valid case, nothing to do
-		}
-
-		try {
-			$property = $account->getProperty(self::PROPERTY_BLUESKY);
-			if ($property->getValue() !== '') {
-				$this->sanitizePropertyBluesky($property);
-			}
-		} catch (PropertyDoesNotExistException $e) {
-			//  valid case, nothing to do
-		}
-
-		try {
-			$property = $account->getProperty(self::PROPERTY_FEDIVERSE);
-			if ($property->getValue() !== '') {
-				$this->sanitizePropertyFediverse($property);
-			}
-		} catch (PropertyDoesNotExistException $e) {
-			//  valid case, nothing to do
-		}
-
-		foreach ($account->getAllProperties() as $property) {
-			$this->testPropertyScope($property, self::ALLOWED_SCOPES, true);
-		}
-
-		$oldData = $this->getUser($account->getUser(), false);
-		$this->updateVerificationStatus($account, $oldData);
-		$this->checkEmailVerification($account, $oldData);
-		$this->checkLocalEmailVerification($account, $oldData);
-
-		$data = [];
-		foreach ($account->getAllProperties() as $property) {
-			/** @var IAccountProperty $property */
-			$data[] = [
-				'name' => $property->getName(),
-				'value' => $property->getValue(),
-				'scope' => $property->getScope(),
-				'verified' => $property->getVerified(),
-				'locallyVerified' => $property->getLocallyVerified(),
-			];
-		}
-
-		$this->updateUser($account->getUser(), $data, $oldData, true);
-		$this->internalCache->set($account->getUser()->getUID(), $account);
-	}
+    use TAccountsHelper;
+
+    use TProfileHelper;
+
+    private string $table = 'accounts';
+    private string $dataTable = 'accounts_data';
+    private ?IL10N $l10n = null;
+    private CappedMemoryCache $internalCache;
+
+    /**
+     * The list of default scopes for each property.
+     */
+    public const DEFAULT_SCOPES = [
+        self::PROPERTY_ADDRESS => self::SCOPE_LOCAL,
+        self::PROPERTY_AVATAR => self::SCOPE_FEDERATED,
+        self::PROPERTY_BIOGRAPHY => self::SCOPE_LOCAL,
+        self::PROPERTY_BIRTHDATE => self::SCOPE_LOCAL,
+        self::PROPERTY_DISPLAYNAME => self::SCOPE_FEDERATED,
+        self::PROPERTY_EMAIL => self::SCOPE_FEDERATED,
+        self::PROPERTY_FEDIVERSE => self::SCOPE_LOCAL,
+        self::PROPERTY_HEADLINE => self::SCOPE_LOCAL,
+        self::PROPERTY_ORGANISATION => self::SCOPE_LOCAL,
+        self::PROPERTY_PHONE => self::SCOPE_LOCAL,
+        self::PROPERTY_PRONOUNS => self::SCOPE_FEDERATED,
+        self::PROPERTY_ROLE => self::SCOPE_LOCAL,
+        self::PROPERTY_TWITTER => self::SCOPE_LOCAL,
+        self::PROPERTY_BLUESKY => self::SCOPE_LOCAL,
+        self::PROPERTY_WEBSITE => self::SCOPE_LOCAL,
+    ];
+
+    public function __construct(
+        private IDBConnection $connection,
+        private IConfig $config,
+        private IEventDispatcher $dispatcher,
+        private IJobList $jobList,
+        private LoggerInterface $logger,
+        private IVerificationToken $verificationToken,
+        private IMailer $mailer,
+        private Defaults $defaults,
+        private IFactory $l10nFactory,
+        private IURLGenerator $urlGenerator,
+        private ICrypto $crypto,
+        private IPhoneNumberUtil $phoneNumberUtil,
+        private IClientService $clientService,
+    ) {
+        $this->internalCache = new CappedMemoryCache();
+    }
+
+    /**
+     * @param IAccountProperty[] $properties
+     */
+    protected function testValueLengths(array $properties, bool $throwOnData = false): void {
+        foreach ($properties as $property) {
+            if (strlen($property->getValue()) > 2048) {
+                if ($throwOnData) {
+                    throw new InvalidArgumentException($property->getName());
+                } else {
+                    $property->setValue('');
+                }
+            }
+        }
+    }
+
+    protected function testPropertyScope(IAccountProperty $property, array $allowedScopes, bool $throwOnData): void {
+        if ($throwOnData && !in_array($property->getScope(), $allowedScopes, true)) {
+            throw new InvalidArgumentException('scope');
+        }
+
+        if (
+            $property->getScope() === self::SCOPE_PRIVATE
+            && in_array($property->getName(), [self::PROPERTY_DISPLAYNAME, self::PROPERTY_EMAIL])
+        ) {
+            if ($throwOnData) {
+                // v2-private is not available for these fields
+                throw new InvalidArgumentException('scope');
+            } else {
+                // default to local
+                $property->setScope(self::SCOPE_LOCAL);
+            }
+        } else {
+            // migrate scope values to the new format
+            // invalid scopes are mapped to a default value
+            $property->setScope(AccountProperty::mapScopeToV2($property->getScope()));
+        }
+    }
+
+    protected function updateUser(IUser $user, array $data, ?array $oldUserData, bool $throwOnData = false): array {
+        if ($oldUserData === null) {
+            $oldUserData = $this->getUser($user, false);
+        }
+
+        $updated = true;
+
+        if ($oldUserData !== $data) {
+            $this->updateExistingUser($user, $data, $oldUserData);
+        } else {
+            // nothing needs to be done if new and old data set are the same
+            $updated = false;
+        }
+
+        if ($updated) {
+            $this->dispatcher->dispatchTyped(new UserUpdatedEvent(
+                $user,
+                $data,
+            ));
+        }
+
+        return $data;
+    }
+
+    /**
+     * delete user from accounts table
+     */
+    public function deleteUser(IUser $user): void {
+        $uid = $user->getUID();
+        $query = $this->connection->getQueryBuilder();
+        $query->delete($this->table)
+            ->where($query->expr()->eq('uid', $query->createNamedParameter($uid)))
+            ->executeStatement();
+
+        $this->deleteUserData($user);
+    }
+
+    /**
+     * delete user from accounts table
+     */
+    public function deleteUserData(IUser $user): void {
+        $uid = $user->getUID();
+        $query = $this->connection->getQueryBuilder();
+        $query->delete($this->dataTable)
+            ->where($query->expr()->eq('uid', $query->createNamedParameter($uid)))
+            ->executeStatement();
+    }
+
+    /**
+     * get stored data from a given user
+     */
+    protected function getUser(IUser $user, bool $insertIfNotExists = true): array {
+        $uid = $user->getUID();
+        $query = $this->connection->getQueryBuilder();
+        $query->select('data')
+            ->from($this->table)
+            ->where($query->expr()->eq('uid', $query->createParameter('uid')))
+            ->setParameter('uid', $uid);
+        $result = $query->executeQuery();
+        $accountData = $result->fetchAll();
+        $result->closeCursor();
+
+        if (empty($accountData)) {
+            $userData = $this->buildDefaultUserRecord($user);
+            if ($insertIfNotExists) {
+                $this->insertNewUser($user, $userData);
+            }
+            return $userData;
+        }
+
+        $userDataArray = $this->importFromJson($accountData[0]['data'], $uid);
+        if ($userDataArray === null || $userDataArray === []) {
+            return $this->buildDefaultUserRecord($user);
+        }
+
+        return $this->addMissingDefaultValues($userDataArray, $this->buildDefaultUserRecord($user));
+    }
+
+    public function searchUsers(string $property, array $values): array {
+        // the value col is limited to 255 bytes. It is used for searches only.
+        $values = array_map(function (string $value) {
+            return Util::shortenMultibyteString($value, 255);
+        }, $values);
+        $chunks = array_chunk($values, 500);
+        $query = $this->connection->getQueryBuilder();
+        $query->select('*')
+            ->from($this->dataTable)
+            ->where($query->expr()->eq('name', $query->createNamedParameter($property)))
+            ->andWhere($query->expr()->in('value', $query->createParameter('values')));
+
+        $matches = [];
+        foreach ($chunks as $chunk) {
+            $query->setParameter('values', $chunk, IQueryBuilder::PARAM_STR_ARRAY);
+            $result = $query->executeQuery();
+
+            while ($row = $result->fetch()) {
+                $matches[$row['uid']] = $row['value'];
+            }
+            $result->closeCursor();
+        }
+
+        $result = array_merge($matches, $this->searchUsersForRelatedCollection($property, $values));
+
+        return array_flip($result);
+    }
+
+    protected function searchUsersForRelatedCollection(string $property, array $values): array {
+        return match ($property) {
+            IAccountManager::PROPERTY_EMAIL => array_flip($this->searchUsers(IAccountManager::COLLECTION_EMAIL, $values)),
+            default => [],
+        };
+    }
+
+    /**
+     * check if we need to ask the server for email verification, if yes we create a cronjob
+     */
+    protected function checkEmailVerification(IAccount $updatedAccount, array $oldData): void {
+        try {
+            $property = $updatedAccount->getProperty(self::PROPERTY_EMAIL);
+        } catch (PropertyDoesNotExistException $e) {
+            return;
+        }
+
+        $oldMailIndex = array_search(self::PROPERTY_EMAIL, array_column($oldData, 'name'), true);
+        $oldMail = $oldMailIndex !== false ? $oldData[$oldMailIndex]['value'] : '';
+
+        if ($oldMail !== $property->getValue()) {
+            $this->jobList->add(
+                VerifyUserData::class,
+                [
+                    'verificationCode' => '',
+                    'data' => $property->getValue(),
+                    'type' => self::PROPERTY_EMAIL,
+                    'uid' => $updatedAccount->getUser()->getUID(),
+                    'try' => 0,
+                    'lastRun' => time()
+                ]
+            );
+
+            $property->setVerified(self::VERIFICATION_IN_PROGRESS);
+        }
+    }
+
+    protected function checkLocalEmailVerification(IAccount $updatedAccount, array $oldData): void {
+        $mailCollection = $updatedAccount->getPropertyCollection(self::COLLECTION_EMAIL);
+        foreach ($mailCollection->getProperties() as $property) {
+            if ($property->getLocallyVerified() !== self::NOT_VERIFIED) {
+                continue;
+            }
+            if ($this->sendEmailVerificationEmail($updatedAccount->getUser(), $property->getValue())) {
+                $property->setLocallyVerified(self::VERIFICATION_IN_PROGRESS);
+            }
+        }
+    }
+
+    protected function sendEmailVerificationEmail(IUser $user, string $email): bool {
+        $ref = \substr(hash('sha256', $email), 0, 8);
+        $key = $this->crypto->encrypt($email);
+        $token = $this->verificationToken->create($user, 'verifyMail' . $ref, $email);
+
+        $link = $this->urlGenerator->linkToRouteAbsolute(
+            'provisioning_api.Verification.verifyMail',
+            [
+                'userId' => $user->getUID(),
+                'token' => $token,
+                'key' => $key
+            ]
+        );
+
+        $emailTemplate = $this->mailer->createEMailTemplate('core.EmailVerification', [
+            'link' => $link,
+        ]);
+
+        if (!$this->l10n) {
+            $this->l10n = $this->l10nFactory->get('core');
+        }
+
+        $emailTemplate->setSubject($this->l10n->t('%s email verification', [$this->defaults->getName()]));
+        $emailTemplate->addHeader();
+        $emailTemplate->addHeading($this->l10n->t('Email verification'));
+
+        $emailTemplate->addBodyText(
+            htmlspecialchars($this->l10n->t('Click the following button to confirm your email.')),
+            $this->l10n->t('Click the following link to confirm your email.')
+        );
+
+        $emailTemplate->addBodyButton(
+            htmlspecialchars($this->l10n->t('Confirm your email')),
+            $link,
+            false
+        );
+        $emailTemplate->addFooter();
+
+        try {
+            $message = $this->mailer->createMessage();
+            $message->setTo([$email => $user->getDisplayName()]);
+            $message->setFrom([Util::getDefaultEmailAddress('verification-noreply') => $this->defaults->getName()]);
+            $message->useTemplate($emailTemplate);
+            $this->mailer->send($message);
+        } catch (Exception $e) {
+            // Log the exception and continue
+            $this->logger->info('Failed to send verification mail', [
+                'app' => 'core',
+                'exception' => $e
+            ]);
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Make sure that all expected data are set
+     */
+    protected function addMissingDefaultValues(array $userData, array $defaultUserData): array {
+        foreach ($defaultUserData as $defaultDataItem) {
+            // If property does not exist, initialize it
+            $userDataIndex = array_search($defaultDataItem['name'], array_column($userData, 'name'));
+            if ($userDataIndex === false) {
+                $userData[] = $defaultDataItem;
+                continue;
+            }
+
+            // Merge and extend default missing values
+            $userData[$userDataIndex] = array_merge($defaultDataItem, $userData[$userDataIndex]);
+        }
+
+        return $userData;
+    }
+
+    protected function updateVerificationStatus(IAccount $updatedAccount, array $oldData): void {
+        static $propertiesVerifiableByLookupServer = [
+            self::PROPERTY_TWITTER,
+            self::PROPERTY_FEDIVERSE,
+            self::PROPERTY_WEBSITE,
+            self::PROPERTY_EMAIL,
+        ];
+
+        foreach ($propertiesVerifiableByLookupServer as $propertyName) {
+            try {
+                $property = $updatedAccount->getProperty($propertyName);
+            } catch (PropertyDoesNotExistException $e) {
+                continue;
+            }
+            $wasVerified = isset($oldData[$propertyName])
+                && isset($oldData[$propertyName]['verified'])
+                && $oldData[$propertyName]['verified'] === self::VERIFIED;
+            if ((!isset($oldData[$propertyName])
+                    || !isset($oldData[$propertyName]['value'])
+                    || $property->getValue() !== $oldData[$propertyName]['value'])
+                && ($property->getVerified() !== self::NOT_VERIFIED
+                    || $wasVerified)
+            ) {
+                $property->setVerified(self::NOT_VERIFIED);
+            }
+        }
+    }
+
+    /**
+     * add new user to accounts table
+     */
+    protected function insertNewUser(IUser $user, array $data): void {
+        $uid = $user->getUID();
+        $jsonEncodedData = $this->prepareJson($data);
+        $query = $this->connection->getQueryBuilder();
+        $query->insert($this->table)
+            ->values(
+                [
+                    'uid' => $query->createNamedParameter($uid),
+                    'data' => $query->createNamedParameter($jsonEncodedData),
+                ]
+            )
+            ->executeStatement();
+
+        $this->deleteUserData($user);
+        $this->writeUserData($user, $data);
+    }
+
+    protected function prepareJson(array $data): string {
+        $preparedData = [];
+        foreach ($data as $dataRow) {
+            $propertyName = $dataRow['name'];
+            unset($dataRow['name']);
+
+            if (isset($dataRow['locallyVerified']) && $dataRow['locallyVerified'] === self::NOT_VERIFIED) {
+                // do not write default value, save DB space
+                unset($dataRow['locallyVerified']);
+            }
+
+            if (!$this->isCollection($propertyName)) {
+                $preparedData[$propertyName] = $dataRow;
+                continue;
+            }
+            if (!isset($preparedData[$propertyName])) {
+                $preparedData[$propertyName] = [];
+            }
+            $preparedData[$propertyName][] = $dataRow;
+        }
+        return json_encode($preparedData);
+    }
+
+    protected function importFromJson(string $json, string $userId): ?array {
+        $result = [];
+        $jsonArray = json_decode($json, true);
+        $jsonError = json_last_error();
+        if ($jsonError !== JSON_ERROR_NONE) {
+            $this->logger->critical(
+                'User data of {uid} contained invalid JSON (error {json_error}), hence falling back to a default user record',
+                [
+                    'uid' => $userId,
+                    'json_error' => $jsonError
+                ]
+            );
+            return null;
+        }
+        foreach ($jsonArray as $propertyName => $row) {
+            if (!$this->isCollection($propertyName)) {
+                $result[] = array_merge($row, ['name' => $propertyName]);
+                continue;
+            }
+            foreach ($row as $singleRow) {
+                $result[] = array_merge($singleRow, ['name' => $propertyName]);
+            }
+        }
+        return $result;
+    }
+
+    /**
+     * Update existing user in accounts table
+     */
+    protected function updateExistingUser(IUser $user, array $data, array $oldData): void {
+        $uid = $user->getUID();
+        $jsonEncodedData = $this->prepareJson($data);
+        $query = $this->connection->getQueryBuilder();
+        $query->update($this->table)
+            ->set('data', $query->createNamedParameter($jsonEncodedData))
+            ->where($query->expr()->eq('uid', $query->createNamedParameter($uid)))
+            ->executeStatement();
+
+        $this->deleteUserData($user);
+        $this->writeUserData($user, $data);
+    }
+
+    protected function writeUserData(IUser $user, array $data): void {
+        $query = $this->connection->getQueryBuilder();
+        $query->insert($this->dataTable)
+            ->values(
+                [
+                    'uid' => $query->createNamedParameter($user->getUID()),
+                    'name' => $query->createParameter('name'),
+                    'value' => $query->createParameter('value'),
+                ]
+            );
+        $this->writeUserDataProperties($query, $data);
+    }
+
+    protected function writeUserDataProperties(IQueryBuilder $query, array $data): void {
+        foreach ($data as $property) {
+            if ($property['name'] === self::PROPERTY_AVATAR) {
+                continue;
+            }
+
+            // the value col is limited to 255 bytes. It is used for searches only.
+            $value = $property['value'] ? Util::shortenMultibyteString($property['value'], 255) : '';
+
+            $query->setParameter('name', $property['name'])
+                ->setParameter('value', $value);
+            $query->executeStatement();
+        }
+    }
+
+    /**
+     * build default user record in case not data set exists yet
+     */
+    protected function buildDefaultUserRecord(IUser $user): array {
+        $scopes = array_merge(self::DEFAULT_SCOPES, array_filter($this->config->getSystemValue('account_manager.default_property_scope', []), static function (string $scope, string $property) {
+            return in_array($property, self::ALLOWED_PROPERTIES, true) && in_array($scope, self::ALLOWED_SCOPES, true);
+        }, ARRAY_FILTER_USE_BOTH));
+
+        return [
+            [
+                'name' => self::PROPERTY_DISPLAYNAME,
+                'value' => $user->getDisplayName(),
+                // Display name must be at least SCOPE_LOCAL
+                'scope' => $scopes[self::PROPERTY_DISPLAYNAME] === self::SCOPE_PRIVATE ? self::SCOPE_LOCAL : $scopes[self::PROPERTY_DISPLAYNAME],
+                'verified' => self::NOT_VERIFIED,
+            ],
+
+            [
+                'name' => self::PROPERTY_ADDRESS,
+                'value' => '',
+                'scope' => $scopes[self::PROPERTY_ADDRESS],
+                'verified' => self::NOT_VERIFIED,
+            ],
+
+            [
+                'name' => self::PROPERTY_WEBSITE,
+                'value' => '',
+                'scope' => $scopes[self::PROPERTY_WEBSITE],
+                'verified' => self::NOT_VERIFIED,
+            ],
+
+            [
+                'name' => self::PROPERTY_EMAIL,
+                'value' => $user->getEMailAddress(),
+                // Email must be at least SCOPE_LOCAL
+                'scope' => $scopes[self::PROPERTY_EMAIL] === self::SCOPE_PRIVATE ? self::SCOPE_LOCAL : $scopes[self::PROPERTY_EMAIL],
+                'verified' => self::NOT_VERIFIED,
+            ],
+
+            [
+                'name' => self::PROPERTY_AVATAR,
+                'scope' => $scopes[self::PROPERTY_AVATAR],
+            ],
+
+            [
+                'name' => self::PROPERTY_PHONE,
+                'value' => '',
+                'scope' => $scopes[self::PROPERTY_PHONE],
+                'verified' => self::NOT_VERIFIED,
+            ],
+
+            [
+                'name' => self::PROPERTY_TWITTER,
+                'value' => '',
+                'scope' => $scopes[self::PROPERTY_TWITTER],
+                'verified' => self::NOT_VERIFIED,
+            ],
+
+            [
+                'name' => self::PROPERTY_BLUESKY,
+                'value' => '',
+                'scope' => $scopes[self::PROPERTY_BLUESKY],
+                'verified' => self::NOT_VERIFIED,
+            ],
+
+            [
+                'name' => self::PROPERTY_FEDIVERSE,
+                'value' => '',
+                'scope' => $scopes[self::PROPERTY_FEDIVERSE],
+                'verified' => self::NOT_VERIFIED,
+            ],
+
+            [
+                'name' => self::PROPERTY_ORGANISATION,
+                'value' => '',
+                'scope' => $scopes[self::PROPERTY_ORGANISATION],
+            ],
+
+            [
+                'name' => self::PROPERTY_ROLE,
+                'value' => '',
+                'scope' => $scopes[self::PROPERTY_ROLE],
+            ],
+
+            [
+                'name' => self::PROPERTY_HEADLINE,
+                'value' => '',
+                'scope' => $scopes[self::PROPERTY_HEADLINE],
+            ],
+
+            [
+                'name' => self::PROPERTY_BIOGRAPHY,
+                'value' => '',
+                'scope' => $scopes[self::PROPERTY_BIOGRAPHY],
+            ],
+
+            [
+                'name' => self::PROPERTY_BIRTHDATE,
+                'value' => '',
+                'scope' => $scopes[self::PROPERTY_BIRTHDATE],
+            ],
+
+            [
+                'name' => self::PROPERTY_PROFILE_ENABLED,
+                'value' => $this->isProfileEnabledByDefault($this->config) ? '1' : '0',
+            ],
+
+            [
+                'name' => self::PROPERTY_PRONOUNS,
+                'value' => '',
+                'scope' => $scopes[self::PROPERTY_PRONOUNS],
+            ],
+        ];
+    }
+
+    private function arrayDataToCollection(IAccount $account, array $data): IAccountPropertyCollection {
+        $collection = $account->getPropertyCollection($data['name']);
+
+        $p = new AccountProperty(
+            $data['name'],
+            $data['value'] ?? '',
+            $data['scope'] ?? self::SCOPE_LOCAL,
+            $data['verified'] ?? self::NOT_VERIFIED,
+            ''
+        );
+        $p->setLocallyVerified($data['locallyVerified'] ?? self::NOT_VERIFIED);
+        $collection->addProperty($p);
+
+        return $collection;
+    }
+
+    private function parseAccountData(IUser $user, $data): Account {
+        $account = new Account($user);
+        foreach ($data as $accountData) {
+            if ($this->isCollection($accountData['name'])) {
+                $account->setPropertyCollection($this->arrayDataToCollection($account, $accountData));
+            } else {
+                $account->setProperty($accountData['name'], $accountData['value'] ?? '', $accountData['scope'] ?? self::SCOPE_LOCAL, $accountData['verified'] ?? self::NOT_VERIFIED);
+                if (isset($accountData['locallyVerified'])) {
+                    $property = $account->getProperty($accountData['name']);
+                    $property->setLocallyVerified($accountData['locallyVerified']);
+                }
+            }
+        }
+        return $account;
+    }
+
+    public function getAccount(IUser $user): IAccount {
+        $cached = $this->internalCache->get($user->getUID());
+        if ($cached !== null) {
+            return $cached;
+        }
+        $account = $this->parseAccountData($user, $this->getUser($user));
+        if ($user->getBackend() instanceof IGetDisplayNameBackend) {
+            $property = $account->getProperty(self::PROPERTY_DISPLAYNAME);
+            $account->setProperty(self::PROPERTY_DISPLAYNAME, $user->getDisplayName(), $property->getScope(), $property->getVerified());
+        }
+        $this->internalCache->set($user->getUID(), $account);
+        return $account;
+    }
+
+    /**
+     * Converts value (phone number) in E.164 format when it was a valid number
+     * @throws InvalidArgumentException When the phone number was invalid or no default region is set and the number doesn't start with a country code
+     */
+    protected function sanitizePropertyPhoneNumber(IAccountProperty $property): void {
+        $defaultRegion = $this->config->getSystemValueString('default_phone_region', '');
+
+        if ($defaultRegion === '') {
+            // When no default region is set, only +49… numbers are valid
+            if (!str_starts_with($property->getValue(), '+')) {
+                throw new InvalidArgumentException(self::PROPERTY_PHONE);
+            }
+
+            $defaultRegion = 'EN';
+        }
+
+        $phoneNumber = $this->phoneNumberUtil->convertToStandardFormat($property->getValue(), $defaultRegion);
+        if ($phoneNumber === null) {
+            throw new InvalidArgumentException(self::PROPERTY_PHONE);
+        }
+        $property->setValue($phoneNumber);
+    }
+
+    /**
+     * @throws InvalidArgumentException When the website did not have http(s) as protocol or the host name was empty
+     */
+    private function sanitizePropertyWebsite(IAccountProperty $property): void {
+        $parts = parse_url($property->getValue());
+        if (!isset($parts['scheme']) || ($parts['scheme'] !== 'https' && $parts['scheme'] !== 'http')) {
+            throw new InvalidArgumentException(self::PROPERTY_WEBSITE);
+        }
+
+        if (!isset($parts['host']) || $parts['host'] === '') {
+            throw new InvalidArgumentException(self::PROPERTY_WEBSITE);
+        }
+    }
+
+    /**
+     * @throws InvalidArgumentException If the property value is not a valid user handle according to X's rules
+     */
+    private function sanitizePropertyTwitter(IAccountProperty $property): void {
+        if ($property->getName() === self::PROPERTY_TWITTER) {
+            $matches = [];
+            // twitter handles only contain alpha numeric characters and the underscore and must not be longer than 15 characters
+            if (preg_match('/^@?([a-zA-Z0-9_]{2,15})$/', $property->getValue(), $matches) !== 1) {
+                throw new InvalidArgumentException(self::PROPERTY_TWITTER);
+            }
+
+            // drop the leading @ if any to make it the valid handle
+            $property->setValue($matches[1]);
+
+        }
+    }
+
+    private function validateBlueSkyHandle(string $text): bool {
+        if ($text === '') {
+            return true;
+        }
+
+        $lowerText = strtolower($text);
+
+        if ($lowerText === 'bsky.social') {
+            // "bsky.social" itself is not a valid handle
+            return false;
+        }
+
+        if (str_ends_with($lowerText, '.bsky.social')) {
+            $parts = explode('.', $lowerText);
+
+            // Must be exactly: username.bsky.social → 3 parts
+            if (count($parts) !== 3 || $parts[1] !== 'bsky' || $parts[2] !== 'social') {
+                return false;
+            }
+
+            $username = $parts[0];
+
+            // Must be 3–18 chars, alphanumeric/hyphen, no start/end hyphen
+            return preg_match('/^[a-z0-9][a-z0-9-]{2,17}$/', $username) === 1;
+        }
+
+        // Allow custom domains (Bluesky handle via personal domain)
+        return filter_var($text, FILTER_VALIDATE_DOMAIN, FILTER_FLAG_HOSTNAME) !== false;
+    }
+
+
+    private function sanitizePropertyBluesky(IAccountProperty $property): void {
+        if ($property->getName() === self::PROPERTY_BLUESKY) {
+            if (!$this->validateBlueSkyHandle($property->getValue())) {
+                throw new InvalidArgumentException(self::PROPERTY_BLUESKY);
+            }
+
+            $property->setValue($property->getValue());
+        }
+    }
+
+    /**
+     * @throws InvalidArgumentException If the property value is not a valid fediverse handle (username@instance where instance is a valid domain)
+     */
+    private function sanitizePropertyFediverse(IAccountProperty $property): void {
+        if ($property->getName() === self::PROPERTY_FEDIVERSE) {
+            $matches = [];
+            if (preg_match('/^@?([^@\s\/\\\]+)@([^\s\/\\\]+)$/', trim($property->getValue()), $matches) !== 1) {
+                throw new InvalidArgumentException(self::PROPERTY_FEDIVERSE);
+            }
+
+            [, $username, $instance] = $matches;
+            $validated = filter_var($instance, FILTER_VALIDATE_DOMAIN, FILTER_FLAG_HOSTNAME);
+            if ($validated !== $instance) {
+                throw new InvalidArgumentException(self::PROPERTY_FEDIVERSE);
+            }
+
+            if ($this->config->getSystemValueBool('has_internet_connection', true)) {
+                $client = $this->clientService->newClient();
+
+                try {
+                    // try the public account lookup API of mastodon
+                    $response = $client->get("https://{$instance}/.well-known/webfinger?resource=acct:{$username}@{$instance}");
+                    // should be a json response with account information
+                    $data = $response->getBody();
+                    if (is_resource($data)) {
+                        $data = stream_get_contents($data);
+                    }
+                    $decoded = json_decode($data, true);
+                    // ensure the username is the same the user passed
+                    // in this case we can assume this is a valid fediverse server and account
+                    if (!is_array($decoded) || ($decoded['subject'] ?? '') !== "acct:{$username}@{$instance}") {
+                        throw new InvalidArgumentException();
+                    }
+                    // check for activitypub link
+                    if (is_array($decoded['links']) && isset($decoded['links'])) {
+                        $found = false;
+                        foreach ($decoded['links'] as $link) {
+                            // have application/activity+json or application/ld+json
+                            if (isset($link['type']) && (
+                                $link['type'] === 'application/activity+json'
+                                || $link['type'] === 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"'
+                            )) {
+                                $found = true;
+                                break;
+                            }
+                        }
+                        if (!$found) {
+                            throw new InvalidArgumentException();
+                        }
+                    }
+                } catch (InvalidArgumentException) {
+                    throw new InvalidArgumentException(self::PROPERTY_FEDIVERSE);
+                } catch (\Exception $error) {
+                    $this->logger->error('Could not verify fediverse account', ['exception' => $error, 'instance' => $instance]);
+                    throw new InvalidArgumentException(self::PROPERTY_FEDIVERSE);
+                }
+            }
+
+            $property->setValue("$username@$instance");
+        }
+    }
+
+    public function updateAccount(IAccount $account): void {
+        $this->testValueLengths(iterator_to_array($account->getAllProperties()), true);
+        try {
+            $property = $account->getProperty(self::PROPERTY_PHONE);
+            if ($property->getValue() !== '') {
+                $this->sanitizePropertyPhoneNumber($property);
+            }
+        } catch (PropertyDoesNotExistException $e) {
+            //  valid case, nothing to do
+        }
+
+        try {
+            $property = $account->getProperty(self::PROPERTY_WEBSITE);
+            if ($property->getValue() !== '') {
+                $this->sanitizePropertyWebsite($property);
+            }
+        } catch (PropertyDoesNotExistException $e) {
+            //  valid case, nothing to do
+        }
+
+        try {
+            $property = $account->getProperty(self::PROPERTY_TWITTER);
+            if ($property->getValue() !== '') {
+                $this->sanitizePropertyTwitter($property);
+            }
+        } catch (PropertyDoesNotExistException $e) {
+            //  valid case, nothing to do
+        }
+
+        try {
+            $property = $account->getProperty(self::PROPERTY_BLUESKY);
+            if ($property->getValue() !== '') {
+                $this->sanitizePropertyBluesky($property);
+            }
+        } catch (PropertyDoesNotExistException $e) {
+            //  valid case, nothing to do
+        }
+
+        try {
+            $property = $account->getProperty(self::PROPERTY_FEDIVERSE);
+            if ($property->getValue() !== '') {
+                $this->sanitizePropertyFediverse($property);
+            }
+        } catch (PropertyDoesNotExistException $e) {
+            //  valid case, nothing to do
+        }
+
+        foreach ($account->getAllProperties() as $property) {
+            $this->testPropertyScope($property, self::ALLOWED_SCOPES, true);
+        }
+
+        $oldData = $this->getUser($account->getUser(), false);
+        $this->updateVerificationStatus($account, $oldData);
+        $this->checkEmailVerification($account, $oldData);
+        $this->checkLocalEmailVerification($account, $oldData);
+
+        $data = [];
+        foreach ($account->getAllProperties() as $property) {
+            /** @var IAccountProperty $property */
+            $data[] = [
+                'name' => $property->getName(),
+                'value' => $property->getValue(),
+                'scope' => $property->getScope(),
+                'verified' => $property->getVerified(),
+                'locallyVerified' => $property->getLocallyVerified(),
+            ];
+        }
+
+        $this->updateUser($account->getUser(), $data, $oldData, true);
+        $this->internalCache->set($account->getUser()->getUID(), $account);
+    }
 }

lib/private/Diagnostics/EventLogger.php

Spacing +4 added lines, -4 removed lines

@@ -60,8 +60,8 @@ 
 	}
 
 	public function isLoggingActivated(): bool {
-		$systemValue = (bool)$this->config->getValue('diagnostics.logging', false)
-			|| (bool)$this->config->getValue('profiler', false);
+		$systemValue = (bool) $this->config->getValue('diagnostics.logging', false)
+			|| (bool) $this->config->getValue('profiler', false);
 
 		if ($systemValue && $this->config->getValue('debug', false)) {
 			return true;
@@ -125,12 +125,12 @@ 
 			$duration = $event->getDuration();
 			$timeInMs = round($duration * 1000, 4);
 
-			$loggingMinimum = (int)$this->config->getValue('diagnostics.logging.threshold', 0);
+			$loggingMinimum = (int) $this->config->getValue('diagnostics.logging.threshold', 0);
 			if ($loggingMinimum === 0 || $timeInMs < $loggingMinimum) {
 				return;
 			}
 
-			$message = microtime() . ' - ' . $event->getId() . ': ' . $timeInMs . ' (' . $event->getDescription() . ')';
+			$message = microtime().' - '.$event->getId().': '.$timeInMs.' ('.$event->getDescription().')';
 			$this->logger->debug($message, ['app' => 'diagnostics']);
 		}
 	}

Indentation +102 added lines, -102 removed lines

@@ -13,106 +13,106 @@
 use Psr\Log\LoggerInterface;
 
 class EventLogger implements IEventLogger {
-	/** @var Event[] */
-	private $events = [];
-
-	/** @var SystemConfig */
-	private $config;
-
-	/** @var LoggerInterface */
-	private $logger;
-
-	/** @var Log */
-	private $internalLogger;
-
-	/**
-	 * @var bool - Module needs to be activated by some app
-	 */
-	private $activated = false;
-
-	public function __construct(SystemConfig $config, LoggerInterface $logger, Log $internalLogger) {
-		$this->config = $config;
-		$this->logger = $logger;
-		$this->internalLogger = $internalLogger;
-
-		if ($this->isLoggingActivated()) {
-			$this->activate();
-		}
-	}
-
-	public function isLoggingActivated(): bool {
-		$systemValue = (bool)$this->config->getValue('diagnostics.logging', false)
-			|| (bool)$this->config->getValue('profiler', false);
-
-		if ($systemValue && $this->config->getValue('debug', false)) {
-			return true;
-		}
-
-		$isDebugLevel = $this->internalLogger->getLogLevel([], '') === Log::DEBUG;
-		return $systemValue && $isDebugLevel;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function start($id, $description = '') {
-		if ($this->activated) {
-			$this->events[$id] = new Event($id, $description, microtime(true));
-			$this->writeLog($this->events[$id]);
-		}
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function end($id) {
-		if ($this->activated && isset($this->events[$id])) {
-			$timing = $this->events[$id];
-			$timing->end(microtime(true));
-			$this->writeLog($timing);
-		}
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function log($id, $description, $start, $end) {
-		if ($this->activated) {
-			$this->events[$id] = new Event($id, $description, $start);
-			$this->events[$id]->end($end);
-			$this->writeLog($this->events[$id]);
-		}
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getEvents() {
-		return $this->events;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function activate() {
-		$this->activated = true;
-	}
-
-	private function writeLog(IEvent $event) {
-		if ($this->activated) {
-			if ($event->getEnd() === null) {
-				return;
-			}
-			$duration = $event->getDuration();
-			$timeInMs = round($duration * 1000, 4);
-
-			$loggingMinimum = (int)$this->config->getValue('diagnostics.logging.threshold', 0);
-			if ($loggingMinimum === 0 || $timeInMs < $loggingMinimum) {
-				return;
-			}
-
-			$message = microtime() . ' - ' . $event->getId() . ': ' . $timeInMs . ' (' . $event->getDescription() . ')';
-			$this->logger->debug($message, ['app' => 'diagnostics']);
-		}
-	}
+    /** @var Event[] */
+    private $events = [];
+
+    /** @var SystemConfig */
+    private $config;
+
+    /** @var LoggerInterface */
+    private $logger;
+
+    /** @var Log */
+    private $internalLogger;
+
+    /**
+     * @var bool - Module needs to be activated by some app
+     */
+    private $activated = false;
+
+    public function __construct(SystemConfig $config, LoggerInterface $logger, Log $internalLogger) {
+        $this->config = $config;
+        $this->logger = $logger;
+        $this->internalLogger = $internalLogger;
+
+        if ($this->isLoggingActivated()) {
+            $this->activate();
+        }
+    }
+
+    public function isLoggingActivated(): bool {
+        $systemValue = (bool)$this->config->getValue('diagnostics.logging', false)
+            || (bool)$this->config->getValue('profiler', false);
+
+        if ($systemValue && $this->config->getValue('debug', false)) {
+            return true;
+        }
+
+        $isDebugLevel = $this->internalLogger->getLogLevel([], '') === Log::DEBUG;
+        return $systemValue && $isDebugLevel;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function start($id, $description = '') {
+        if ($this->activated) {
+            $this->events[$id] = new Event($id, $description, microtime(true));
+            $this->writeLog($this->events[$id]);
+        }
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function end($id) {
+        if ($this->activated && isset($this->events[$id])) {
+            $timing = $this->events[$id];
+            $timing->end(microtime(true));
+            $this->writeLog($timing);
+        }
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function log($id, $description, $start, $end) {
+        if ($this->activated) {
+            $this->events[$id] = new Event($id, $description, $start);
+            $this->events[$id]->end($end);
+            $this->writeLog($this->events[$id]);
+        }
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getEvents() {
+        return $this->events;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function activate() {
+        $this->activated = true;
+    }
+
+    private function writeLog(IEvent $event) {
+        if ($this->activated) {
+            if ($event->getEnd() === null) {
+                return;
+            }
+            $duration = $event->getDuration();
+            $timeInMs = round($duration * 1000, 4);
+
+            $loggingMinimum = (int)$this->config->getValue('diagnostics.logging.threshold', 0);
+            if ($loggingMinimum === 0 || $timeInMs < $loggingMinimum) {
+                return;
+            }
+
+            $message = microtime() . ' - ' . $event->getId() . ': ' . $timeInMs . ' (' . $event->getDescription() . ')';
+            $this->logger->debug($message, ['app' => 'diagnostics']);
+        }
+    }
 }

lib/private/Files/SimpleFS/SimpleFolder.php

Spacing +1 added lines, -1 removed lines

@@ -52,7 +52,7 @@
 	public function getDirectoryListing(): array {
 		$listing = $this->folder->getDirectoryListing();
 
-		$fileListing = array_map(function (Node $file) {
+		$fileListing = array_map(function(Node $file) {
 			if ($file instanceof File) {
 				return new SimpleFile($file);
 			}

Indentation +73 added lines, -73 removed lines

@@ -13,77 +13,77 @@
 use OCP\Files\SimpleFS\ISimpleFolder;
 
 class SimpleFolder implements ISimpleFolder {
-	/** @var Folder */
-	private $folder;
-
-	/**
-	 * Folder constructor.
-	 *
-	 * @param Folder $folder
-	 */
-	public function __construct(Folder $folder) {
-		$this->folder = $folder;
-	}
-
-	public function getName(): string {
-		return $this->folder->getName();
-	}
-
-	public function getDirectoryListing(): array {
-		$listing = $this->folder->getDirectoryListing();
-
-		$fileListing = array_map(function (Node $file) {
-			if ($file instanceof File) {
-				return new SimpleFile($file);
-			}
-			return null;
-		}, $listing);
-
-		$fileListing = array_filter($fileListing);
-
-		return array_values($fileListing);
-	}
-
-	public function delete(): void {
-		$this->folder->delete();
-	}
-
-	public function fileExists(string $name): bool {
-		return $this->folder->nodeExists($name);
-	}
-
-	public function getFile(string $name): ISimpleFile {
-		$file = $this->folder->get($name);
-
-		if (!($file instanceof File)) {
-			throw new NotFoundException();
-		}
-
-		return new SimpleFile($file);
-	}
-
-	public function newFile(string $name, $content = null): ISimpleFile {
-		if ($content === null) {
-			// delay creating the file until it's written to
-			return new NewSimpleFile($this->folder, $name);
-		} else {
-			$file = $this->folder->newFile($name, $content);
-			return new SimpleFile($file);
-		}
-	}
-
-	public function getFolder(string $name): ISimpleFolder {
-		$folder = $this->folder->get($name);
-
-		if (!($folder instanceof Folder)) {
-			throw new NotFoundException();
-		}
-
-		return new SimpleFolder($folder);
-	}
-
-	public function newFolder(string $path): ISimpleFolder {
-		$folder = $this->folder->newFolder($path);
-		return new SimpleFolder($folder);
-	}
+    /** @var Folder */
+    private $folder;
+
+    /**
+     * Folder constructor.
+     *
+     * @param Folder $folder
+     */
+    public function __construct(Folder $folder) {
+        $this->folder = $folder;
+    }
+
+    public function getName(): string {
+        return $this->folder->getName();
+    }
+
+    public function getDirectoryListing(): array {
+        $listing = $this->folder->getDirectoryListing();
+
+        $fileListing = array_map(function (Node $file) {
+            if ($file instanceof File) {
+                return new SimpleFile($file);
+            }
+            return null;
+        }, $listing);
+
+        $fileListing = array_filter($fileListing);
+
+        return array_values($fileListing);
+    }
+
+    public function delete(): void {
+        $this->folder->delete();
+    }
+
+    public function fileExists(string $name): bool {
+        return $this->folder->nodeExists($name);
+    }
+
+    public function getFile(string $name): ISimpleFile {
+        $file = $this->folder->get($name);
+
+        if (!($file instanceof File)) {
+            throw new NotFoundException();
+        }
+
+        return new SimpleFile($file);
+    }
+
+    public function newFile(string $name, $content = null): ISimpleFile {
+        if ($content === null) {
+            // delay creating the file until it's written to
+            return new NewSimpleFile($this->folder, $name);
+        } else {
+            $file = $this->folder->newFile($name, $content);
+            return new SimpleFile($file);
+        }
+    }
+
+    public function getFolder(string $name): ISimpleFolder {
+        $folder = $this->folder->get($name);
+
+        if (!($folder instanceof Folder)) {
+            throw new NotFoundException();
+        }
+
+        return new SimpleFolder($folder);
+    }
+
+    public function newFolder(string $path): ISimpleFolder {
+        $folder = $this->folder->newFolder($path);
+        return new SimpleFolder($folder);
+    }
 }

core/templates/loginflowv2/grant.php

Indentation +6 added lines, -6 removed lines

@@ -31,15 +31,15 @@
 	<h2><?php p($l->t('Account access')) ?></h2>
 	<p class="info">
 		<?php p($l->t('Currently logged in as %1$s (%2$s).', [
-			$_['userDisplayName'],
-			$_['userId'],
-		])) ?>
+            $_['userDisplayName'],
+            $_['userId'],
+        ])) ?>
 	</p>
 	<p class="info">
 		<?php print_unescaped($l->t('You are about to grant %1$s access to your %2$s account.', [
-			'<strong>' . \OCP\Util::sanitizeHTML($_['client']) . '</strong>',
-			\OCP\Util::sanitizeHTML($_['instanceName'])
-		])) ?>
+            '<strong>' . \OCP\Util::sanitizeHTML($_['client']) . '</strong>',
+            \OCP\Util::sanitizeHTML($_['instanceName'])
+        ])) ?>
 	</p>
 
 	<br/>

Spacing +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
 	</p>
 	<p class="info">
 		<?php print_unescaped($l->t('You are about to grant %1$s access to your %2$s account.', [
-			'<strong>' . \OCP\Util::sanitizeHTML($_['client']) . '</strong>',
+			'<strong>'.\OCP\Util::sanitizeHTML($_['client']).'</strong>',
 			\OCP\Util::sanitizeHTML($_['instanceName'])
 		])) ?>
 	</p>

apps/federatedfilesharing/lib/BackgroundJob/RetryJob.php

Spacing +3 added lines, -3 removed lines

@@ -75,7 +75,7 @@ 
 		$token = $argument['token'];
 		$action = $argument['action'];
 		$data = json_decode($argument['data'], true);
-		$try = (int)$argument['try'] + 1;
+		$try = (int) $argument['try'] + 1;
 
 		$result = $this->notifications->sendUpdateToRemote($remote, $remoteId, $token, $action, $data, $try);
 
@@ -95,7 +95,7 @@ 
 				'token' => $argument['token'],
 				'data' => $argument['data'],
 				'action' => $argument['action'],
-				'try' => (int)$argument['try'] + 1,
+				'try' => (int) $argument['try'] + 1,
 				'lastRun' => $this->time->getTime()
 			]
 		);
@@ -105,7 +105,7 @@ 
 	 * Test if it is time for the next run
 	 */
 	protected function shouldRun(array $argument): bool {
-		$lastRun = (int)$argument['lastRun'];
+		$lastRun = (int) $argument['lastRun'];
 		return (($this->time->getTime() - $lastRun) > $this->interval);
 	}
 }

Indentation +58 added lines, -58 removed lines

@@ -21,71 +21,71 @@
  * @package OCA\FederatedFileSharing\BackgroundJob
  */
 class RetryJob extends Job {
-	private bool $retainJob = true;
+    private bool $retainJob = true;
 
-	/** @var int max number of attempts to send the request */
-	private int $maxTry = 20;
+    /** @var int max number of attempts to send the request */
+    private int $maxTry = 20;
 
-	/** @var int how much time should be between two tries (10 minutes) */
-	private int $interval = 600;
+    /** @var int how much time should be between two tries (10 minutes) */
+    private int $interval = 600;
 
-	public function __construct(
-		private Notifications $notifications,
-		ITimeFactory $time,
-	) {
-		parent::__construct($time);
-	}
+    public function __construct(
+        private Notifications $notifications,
+        ITimeFactory $time,
+    ) {
+        parent::__construct($time);
+    }
 
-	/**
-	 * Run the job, then remove it from the jobList
-	 */
-	public function start(IJobList $jobList): void {
-		if ($this->shouldRun($this->argument)) {
-			parent::start($jobList);
-			$jobList->remove($this, $this->argument);
-			if ($this->retainJob) {
-				$this->reAddJob($jobList, $this->argument);
-			}
-		}
-	}
+    /**
+     * Run the job, then remove it from the jobList
+     */
+    public function start(IJobList $jobList): void {
+        if ($this->shouldRun($this->argument)) {
+            parent::start($jobList);
+            $jobList->remove($this, $this->argument);
+            if ($this->retainJob) {
+                $this->reAddJob($jobList, $this->argument);
+            }
+        }
+    }
 
-	protected function run($argument) {
-		$remote = $argument['remote'];
-		$remoteId = $argument['remoteId'];
-		$token = $argument['token'];
-		$action = $argument['action'];
-		$data = json_decode($argument['data'], true);
-		$try = (int)$argument['try'] + 1;
+    protected function run($argument) {
+        $remote = $argument['remote'];
+        $remoteId = $argument['remoteId'];
+        $token = $argument['token'];
+        $action = $argument['action'];
+        $data = json_decode($argument['data'], true);
+        $try = (int)$argument['try'] + 1;
 
-		$result = $this->notifications->sendUpdateToRemote($remote, $remoteId, $token, $action, $data, $try);
+        $result = $this->notifications->sendUpdateToRemote($remote, $remoteId, $token, $action, $data, $try);
 
-		if ($result === true || $try > $this->maxTry) {
-			$this->retainJob = false;
-		}
-	}
+        if ($result === true || $try > $this->maxTry) {
+            $this->retainJob = false;
+        }
+    }
 
-	/**
-	 * Re-add background job with new arguments
-	 */
-	protected function reAddJob(IJobList $jobList, array $argument): void {
-		$jobList->add(RetryJob::class,
-			[
-				'remote' => $argument['remote'],
-				'remoteId' => $argument['remoteId'],
-				'token' => $argument['token'],
-				'data' => $argument['data'],
-				'action' => $argument['action'],
-				'try' => (int)$argument['try'] + 1,
-				'lastRun' => $this->time->getTime()
-			]
-		);
-	}
+    /**
+     * Re-add background job with new arguments
+     */
+    protected function reAddJob(IJobList $jobList, array $argument): void {
+        $jobList->add(RetryJob::class,
+            [
+                'remote' => $argument['remote'],
+                'remoteId' => $argument['remoteId'],
+                'token' => $argument['token'],
+                'data' => $argument['data'],
+                'action' => $argument['action'],
+                'try' => (int)$argument['try'] + 1,
+                'lastRun' => $this->time->getTime()
+            ]
+        );
+    }
 
-	/**
-	 * Test if it is time for the next run
-	 */
-	protected function shouldRun(array $argument): bool {
-		$lastRun = (int)$argument['lastRun'];
-		return (($this->time->getTime() - $lastRun) > $this->interval);
-	}
+    /**
+     * Test if it is time for the next run
+     */
+    protected function shouldRun(array $argument): bool {
+        $lastRun = (int)$argument['lastRun'];
+        return (($this->time->getTime() - $lastRun) > $this->interval);
+    }
 }

lib/public/IBinaryFinder.php

Indentation +7 added lines, -7 removed lines

@@ -31,11 +31,11 @@
  * @since 25.0.0
  */
 interface IBinaryFinder {
-	/**
-	 * Try to find a program
-	 *
-	 * @return false|string
-	 * @since 25.0.0
-	 */
-	public function findBinaryPath(string $program);
+    /**
+     * Try to find a program
+     *
+     * @return false|string
+     * @since 25.0.0
+     */
+    public function findBinaryPath(string $program);
 }

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 /**
  * SPDX-FileCopyrightText: 2022 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later

apps/settings/lib/Controller/HelpController.php

Spacing +1 added lines, -1 removed lines

@@ -79,7 +79,7 @@
 		}
 
 		$documentationUrl = $this->urlGenerator->getAbsoluteURL(
-			$this->urlGenerator->linkTo('', 'core/doc/' . $mode . '/index.html')
+			$this->urlGenerator->linkTo('', 'core/doc/'.$mode.'/index.html')
 		);
 
 		$urlUserDocs = $this->urlGenerator->linkToRoute('settings.Help.help', ['mode' => 'user']);

Indentation +57 added lines, -57 removed lines

@@ -25,67 +25,67 @@
 #[OpenAPI(scope: OpenAPI::SCOPE_IGNORE)]
 class HelpController extends Controller {
 
-	public function __construct(
-		string $appName,
-		IRequest $request,
-		private INavigationManager $navigationManager,
-		private IURLGenerator $urlGenerator,
-		/** @var string */
-		private ?string $userId,
-		private IGroupManager $groupManager,
-		private IL10N $l10n,
-		private IConfig $config,
-		private IAppConfig $appConfig,
-	) {
-		parent::__construct($appName, $request);
-	}
+    public function __construct(
+        string $appName,
+        IRequest $request,
+        private INavigationManager $navigationManager,
+        private IURLGenerator $urlGenerator,
+        /** @var string */
+        private ?string $userId,
+        private IGroupManager $groupManager,
+        private IL10N $l10n,
+        private IConfig $config,
+        private IAppConfig $appConfig,
+    ) {
+        parent::__construct($appName, $request);
+    }
 
-	/**
-	 * @return TemplateResponse
-	 *
-	 * @NoSubAdminRequired
-	 */
-	#[NoCSRFRequired]
-	#[NoAdminRequired]
-	public function help(string $mode = 'user'): TemplateResponse {
-		$this->navigationManager->setActiveEntry('help');
-		$pageTitle = $this->l10n->t('Administrator documentation');
-		if ($mode !== 'admin') {
-			$pageTitle = $this->l10n->t('User documentation');
-			$mode = 'user';
-		}
+    /**
+     * @return TemplateResponse
+     *
+     * @NoSubAdminRequired
+     */
+    #[NoCSRFRequired]
+    #[NoAdminRequired]
+    public function help(string $mode = 'user'): TemplateResponse {
+        $this->navigationManager->setActiveEntry('help');
+        $pageTitle = $this->l10n->t('Administrator documentation');
+        if ($mode !== 'admin') {
+            $pageTitle = $this->l10n->t('User documentation');
+            $mode = 'user';
+        }
 
-		$documentationUrl = $this->urlGenerator->getAbsoluteURL(
-			$this->urlGenerator->linkTo('', 'core/doc/' . $mode . '/index.html')
-		);
+        $documentationUrl = $this->urlGenerator->getAbsoluteURL(
+            $this->urlGenerator->linkTo('', 'core/doc/' . $mode . '/index.html')
+        );
 
-		$urlUserDocs = $this->urlGenerator->linkToRoute('settings.Help.help', ['mode' => 'user']);
-		$urlAdminDocs = $this->urlGenerator->linkToRoute('settings.Help.help', ['mode' => 'admin']);
+        $urlUserDocs = $this->urlGenerator->linkToRoute('settings.Help.help', ['mode' => 'user']);
+        $urlAdminDocs = $this->urlGenerator->linkToRoute('settings.Help.help', ['mode' => 'admin']);
 
-		$knowledgebaseEmbedded = $this->config->getSystemValueBool('knowledgebase.embedded', false);
-		if (!$knowledgebaseEmbedded) {
-			$pageTitle = $this->l10n->t('Nextcloud help overview');
-			$urlUserDocs = $this->urlGenerator->linkToDocs('user');
-			$urlAdminDocs = $this->urlGenerator->linkToDocs('admin');
-		}
+        $knowledgebaseEmbedded = $this->config->getSystemValueBool('knowledgebase.embedded', false);
+        if (!$knowledgebaseEmbedded) {
+            $pageTitle = $this->l10n->t('Nextcloud help overview');
+            $urlUserDocs = $this->urlGenerator->linkToDocs('user');
+            $urlAdminDocs = $this->urlGenerator->linkToDocs('admin');
+        }
 
-		$legalNoticeUrl = $this->appConfig->getValueString('theming', 'imprintUrl');
-		$privacyUrl = $this->appConfig->getValueString('theming', 'privacyUrl');
+        $legalNoticeUrl = $this->appConfig->getValueString('theming', 'imprintUrl');
+        $privacyUrl = $this->appConfig->getValueString('theming', 'privacyUrl');
 
-		$response = new TemplateResponse('settings', 'help', [
-			'admin' => $this->groupManager->isAdmin($this->userId),
-			'url' => $documentationUrl,
-			'urlUserDocs' => $urlUserDocs,
-			'urlAdminDocs' => $urlAdminDocs,
-			'mode' => $mode,
-			'pageTitle' => $pageTitle,
-			'knowledgebaseEmbedded' => $knowledgebaseEmbedded,
-			'legalNoticeUrl' => $legalNoticeUrl,
-			'privacyUrl' => $privacyUrl,
-		]);
-		$policy = new ContentSecurityPolicy();
-		$policy->addAllowedFrameDomain('\'self\'');
-		$response->setContentSecurityPolicy($policy);
-		return $response;
-	}
+        $response = new TemplateResponse('settings', 'help', [
+            'admin' => $this->groupManager->isAdmin($this->userId),
+            'url' => $documentationUrl,
+            'urlUserDocs' => $urlUserDocs,
+            'urlAdminDocs' => $urlAdminDocs,
+            'mode' => $mode,
+            'pageTitle' => $pageTitle,
+            'knowledgebaseEmbedded' => $knowledgebaseEmbedded,
+            'legalNoticeUrl' => $legalNoticeUrl,
+            'privacyUrl' => $privacyUrl,
+        ]);
+        $policy = new ContentSecurityPolicy();
+        $policy->addAllowedFrameDomain('\'self\'');
+        $response->setContentSecurityPolicy($policy);
+        return $response;
+    }
 }