nextcloud / server

apps/settings/templates/settings/personal/personal.info.php

Indentation +6 added lines, -6 removed lines

@@ -27,12 +27,12 @@
 /** @var array $_ */
 
 script('settings', [
-	'usersettings',
-	'templates',
-	'federationsettingsview',
-	'federationscopemenu',
-	'settings/personalInfo',
-	'vue-settings-personal-info',
+    'usersettings',
+    'templates',
+    'federationsettingsview',
+    'federationscopemenu',
+    'settings/personalInfo',
+    'vue-settings-personal-info',
 ]);
 ?>
 <?php if (!$_['isFairUseOfFreePushService']) : ?>

Braces +5 added lines, -2 removed lines

@@ -53,11 +53,14 @@
 		<div class="personal-settings-setting-box personal-settings-setting-box-detail">
 			<div id="vue-details-section"></div>
 		</div>
-	<?php else: ?>
+	<?php else {
+    : ?>
 		<div class="personal-settings-setting-box personal-settings-setting-box-detail--without-profile">
 			<div id="vue-details-section"></div>
 		</div>
-	<?php endif; ?>
+	<?php endif;
+}
+?>
 	<div class="personal-settings-setting-box">
 		<div id="vue-displayname-section"></div>
 	</div>

lib/public/Dashboard/IOptionWidget.php

Indentation +5 added lines, -5 removed lines

@@ -30,9 +30,9 @@
  * @since 25.0.0
  */
 interface IOptionWidget extends IWidget {
-	/**
-	 * Get additional options for the widget
-	 * @since 25.0.0
-	 */
-	public function getWidgetOptions(): WidgetOptions;
+    /**
+     * Get additional options for the widget
+     * @since 25.0.0
+     */
+    public function getWidgetOptions(): WidgetOptions;
 }

lib/public/Dashboard/Model/WidgetOptions.php

Indentation +26 added lines, -26 removed lines

@@ -29,33 +29,33 @@
  * @since 25.0.0
  */
 class WidgetOptions {
-	private bool $roundItemIcons;
+    private bool $roundItemIcons;
 
-	/**
-	 * @param bool $roundItemIcons
-	 * @since 25.0.0
-	 */
-	public function __construct(bool $roundItemIcons) {
-		$this->roundItemIcons = $roundItemIcons;
-	}
+    /**
+     * @param bool $roundItemIcons
+     * @since 25.0.0
+     */
+    public function __construct(bool $roundItemIcons) {
+        $this->roundItemIcons = $roundItemIcons;
+    }
 
-	/**
-	 * Get the default set of options
-	 *
-	 * @return WidgetOptions
-	 * @since 25.0.0
-	 */
-	public static function getDefault(): WidgetOptions {
-		return new WidgetOptions(false);
-	}
+    /**
+     * Get the default set of options
+     *
+     * @return WidgetOptions
+     * @since 25.0.0
+     */
+    public static function getDefault(): WidgetOptions {
+        return new WidgetOptions(false);
+    }
 
-	/**
-	 * Whether the clients should render icons for widget items as round icons
-	 *
-	 * @return bool
-	 * @since 25.0.0
-	 */
-	public function withRoundItemIcons(): bool {
-		return $this->roundItemIcons;
-	}
+    /**
+     * Whether the clients should render icons for widget items as round icons
+     *
+     * @return bool
+     * @since 25.0.0
+     */
+    public function withRoundItemIcons(): bool {
+        return $this->roundItemIcons;
+    }
 }

apps/settings/lib/Settings/Personal/PersonalInfo.php

Spacing +4 added lines, -4 removed lines

@@ -234,7 +234,7 @@ 
 	 */
 	private function getGroups(IUser $user): array {
 		$groups = array_map(
-			static function (IGroup $group) {
+			static function(IGroup $group) {
 				return $group->getDisplayName();
 			},
 			$this->groupManager->getUserGroups($user)
@@ -257,7 +257,7 @@ 
 		];
 
 		$additionalEmails = array_map(
-			function (IAccountProperty $property) {
+			function(IAccountProperty $property) {
 				return [
 					'name' => $property->getName(),
 					'value' => $property->getValue(),
@@ -272,7 +272,7 @@ 
 		$emailMap = [
 			'primaryEmail' => $systemEmail,
 			'additionalEmails' => $additionalEmails,
-			'notificationEmail' => (string)$account->getUser()->getPrimaryEMailAddress(),
+			'notificationEmail' => (string) $account->getUser()->getPrimaryEMailAddress(),
 		];
 
 		return $emailMap;
@@ -366,7 +366,7 @@ 
 				default:
 					$message = $this->l->t('Verify');
 			}
-			$messageParameters[$property . 'Message'] = $message;
+			$messageParameters[$property.'Message'] = $message;
 		}
 		return $messageParameters;
 	}

Indentation +285 added lines, -285 removed lines

@@ -33,289 +33,289 @@
 
 class PersonalInfo implements ISettings {
 
-	/** @var ProfileManager */
-	private $profileManager;
-
-	public function __construct(
-		private IConfig $config,
-		private IUserManager $userManager,
-		private IGroupManager $groupManager,
-		private IAccountManager $accountManager,
-		ProfileManager $profileManager,
-		private IAppManager $appManager,
-		private IFactory $l10nFactory,
-		private IL10N $l,
-		private IInitialState $initialStateService,
-		private IManager $manager,
-	) {
-		$this->profileManager = $profileManager;
-	}
-
-	public function getForm(): TemplateResponse {
-		$federationEnabled = $this->appManager->isEnabledForUser('federation');
-		$federatedFileSharingEnabled = $this->appManager->isEnabledForUser('federatedfilesharing');
-		$lookupServerUploadEnabled = false;
-		if ($federatedFileSharingEnabled) {
-			/** @var FederatedShareProvider $shareProvider */
-			$shareProvider = Server::get(FederatedShareProvider::class);
-			$lookupServerUploadEnabled = $shareProvider->isLookupServerUploadEnabled();
-		}
-
-		$uid = \OC_User::getUser();
-		$user = $this->userManager->get($uid);
-		$account = $this->accountManager->getAccount($user);
-
-		// make sure FS is setup before querying storage related stuff...
-		\OC_Util::setupFS($user->getUID());
-
-		$storageInfo = \OC_Helper::getStorageInfo('/');
-		if ($storageInfo['quota'] === FileInfo::SPACE_UNLIMITED) {
-			$totalSpace = $this->l->t('Unlimited');
-		} else {
-			$totalSpace = Util::humanFileSize($storageInfo['total']);
-		}
-
-		$messageParameters = $this->getMessageParameters($account);
-
-		$parameters = [
-			'lookupServerUploadEnabled' => $lookupServerUploadEnabled,
-			'isFairUseOfFreePushService' => $this->isFairUseOfFreePushService(),
-			'profileEnabledGlobally' => $this->profileManager->isProfileEnabled(),
-		] + $messageParameters;
-
-		$personalInfoParameters = [
-			'userId' => $uid,
-			'avatar' => $this->getProperty($account, IAccountManager::PROPERTY_AVATAR),
-			'groups' => $this->getGroups($user),
-			'quota' => $storageInfo['quota'],
-			'totalSpace' => $totalSpace,
-			'usage' => Util::humanFileSize($storageInfo['used']),
-			'usageRelative' => round($storageInfo['relative']),
-			'displayName' => $this->getProperty($account, IAccountManager::PROPERTY_DISPLAYNAME),
-			'emailMap' => $this->getEmailMap($account),
-			'phone' => $this->getProperty($account, IAccountManager::PROPERTY_PHONE),
-			'defaultPhoneRegion' => $this->config->getSystemValueString('default_phone_region'),
-			'location' => $this->getProperty($account, IAccountManager::PROPERTY_ADDRESS),
-			'website' => $this->getProperty($account, IAccountManager::PROPERTY_WEBSITE),
-			'twitter' => $this->getProperty($account, IAccountManager::PROPERTY_TWITTER),
-			'bluesky' => $this->getProperty($account, IAccountManager::PROPERTY_BLUESKY),
-			'fediverse' => $this->getProperty($account, IAccountManager::PROPERTY_FEDIVERSE),
-			'languageMap' => $this->getLanguageMap($user),
-			'localeMap' => $this->getLocaleMap($user),
-			'profileEnabledGlobally' => $this->profileManager->isProfileEnabled(),
-			'profileEnabled' => $this->profileManager->isProfileEnabled($user),
-			'organisation' => $this->getProperty($account, IAccountManager::PROPERTY_ORGANISATION),
-			'role' => $this->getProperty($account, IAccountManager::PROPERTY_ROLE),
-			'headline' => $this->getProperty($account, IAccountManager::PROPERTY_HEADLINE),
-			'biography' => $this->getProperty($account, IAccountManager::PROPERTY_BIOGRAPHY),
-			'birthdate' => $this->getProperty($account, IAccountManager::PROPERTY_BIRTHDATE),
-			'firstDayOfWeek' => $this->config->getUserValue($uid, 'core', AUserDataOCSController::USER_FIELD_FIRST_DAY_OF_WEEK),
-			'timezone' => $this->config->getUserValue($uid, 'core', 'timezone', ''),
-			'pronouns' => $this->getProperty($account, IAccountManager::PROPERTY_PRONOUNS),
-		];
-
-		$accountParameters = [
-			'avatarChangeSupported' => $user->canChangeAvatar(),
-			'displayNameChangeSupported' => $user->canChangeDisplayName(),
-			'emailChangeSupported' => $user->canChangeEmail(),
-			'federationEnabled' => $federationEnabled,
-			'lookupServerUploadEnabled' => $lookupServerUploadEnabled,
-		];
-
-		$profileParameters = [
-			'profileConfig' => $this->profileManager->getProfileConfigWithMetadata($user, $user),
-		];
-
-		$this->initialStateService->provideInitialState('profileEnabledGlobally', $this->profileManager->isProfileEnabled());
-		$this->initialStateService->provideInitialState('personalInfoParameters', $personalInfoParameters);
-		$this->initialStateService->provideInitialState('accountParameters', $accountParameters);
-		$this->initialStateService->provideInitialState('profileParameters', $profileParameters);
-
-		return new TemplateResponse('settings', 'settings/personal/personal.info', $parameters, '');
-	}
-
-	/**
-	 * Check if is fair use of free push service
-	 * @return boolean
-	 */
-	private function isFairUseOfFreePushService(): bool {
-		return $this->manager->isFairUseOfFreePushService();
-	}
-
-	/**
-	 * returns the property data in an
-	 * associative array
-	 */
-	private function getProperty(IAccount $account, string $property): array {
-		$property = [
-			'name' => $account->getProperty($property)->getName(),
-			'value' => $account->getProperty($property)->getValue(),
-			'scope' => $account->getProperty($property)->getScope(),
-			'verified' => $account->getProperty($property)->getVerified(),
-		];
-
-		return $property;
-	}
-
-	/**
-	 * returns the section ID string, e.g. 'sharing'
-	 * @since 9.1
-	 */
-	public function getSection(): string {
-		return 'personal-info';
-	}
-
-	/**
-	 * @return int whether the form should be rather on the top or bottom of
-	 *             the admin section. The forms are arranged in ascending order of the
-	 *             priority values. It is required to return a value between 0 and 100.
-	 *
-	 * E.g.: 70
-	 * @since 9.1
-	 */
-	public function getPriority(): int {
-		return 10;
-	}
-
-	/**
-	 * returns a sorted list of the user's group GIDs
-	 */
-	private function getGroups(IUser $user): array {
-		$groups = array_map(
-			static function (IGroup $group) {
-				return $group->getDisplayName();
-			},
-			$this->groupManager->getUserGroups($user)
-		);
-		sort($groups);
-
-		return $groups;
-	}
-
-	/**
-	 * returns the primary email and additional emails in an
-	 * associative array
-	 */
-	private function getEmailMap(IAccount $account): array {
-		$systemEmail = [
-			'name' => $account->getProperty(IAccountManager::PROPERTY_EMAIL)->getName(),
-			'value' => $account->getProperty(IAccountManager::PROPERTY_EMAIL)->getValue(),
-			'scope' => $account->getProperty(IAccountManager::PROPERTY_EMAIL)->getScope(),
-			'verified' => $account->getProperty(IAccountManager::PROPERTY_EMAIL)->getVerified(),
-		];
-
-		$additionalEmails = array_map(
-			function (IAccountProperty $property) {
-				return [
-					'name' => $property->getName(),
-					'value' => $property->getValue(),
-					'scope' => $property->getScope(),
-					'verified' => $property->getVerified(),
-					'locallyVerified' => $property->getLocallyVerified(),
-				];
-			},
-			$account->getPropertyCollection(IAccountManager::COLLECTION_EMAIL)->getProperties(),
-		);
-
-		$emailMap = [
-			'primaryEmail' => $systemEmail,
-			'additionalEmails' => $additionalEmails,
-			'notificationEmail' => (string)$account->getUser()->getPrimaryEMailAddress(),
-		];
-
-		return $emailMap;
-	}
-
-	/**
-	 * returns the user's active language, common languages, and other languages in an
-	 * associative array
-	 */
-	private function getLanguageMap(IUser $user): array {
-		$forceLanguage = $this->config->getSystemValue('force_language', false);
-		if ($forceLanguage !== false) {
-			return [];
-		}
-
-		$uid = $user->getUID();
-
-		$userConfLang = $this->config->getUserValue($uid, 'core', 'lang', $this->l10nFactory->findLanguage());
-		$languages = $this->l10nFactory->getLanguages();
-
-		// associate the user language with the proper array
-		$userLangIndex = array_search($userConfLang, array_column($languages['commonLanguages'], 'code'));
-		$userLang = $languages['commonLanguages'][$userLangIndex];
-		// search in the other languages
-		if ($userLangIndex === false) {
-			$userLangIndex = array_search($userConfLang, array_column($languages['otherLanguages'], 'code'));
-			$userLang = $languages['otherLanguages'][$userLangIndex];
-		}
-		// if user language is not available but set somehow: show the actual code as name
-		if (!is_array($userLang)) {
-			$userLang = [
-				'code' => $userConfLang,
-				'name' => $userConfLang,
-			];
-		}
-
-		return array_merge(
-			['activeLanguage' => $userLang],
-			$languages
-		);
-	}
-
-	private function getLocaleMap(IUser $user): array {
-		$forceLanguage = $this->config->getSystemValue('force_locale', false);
-		if ($forceLanguage !== false) {
-			return [];
-		}
-
-		$uid = $user->getUID();
-		$userLang = $this->config->getUserValue($uid, 'core', 'lang', $this->l10nFactory->findLanguage());
-		$userLocaleString = $this->config->getUserValue($uid, 'core', 'locale', $this->l10nFactory->findLocale($userLang));
-		$localeCodes = $this->l10nFactory->findAvailableLocales();
-		$userLocale = array_filter($localeCodes, fn ($value) => $userLocaleString === $value['code']);
-
-		if (!empty($userLocale)) {
-			$userLocale = reset($userLocale);
-		}
-
-		$localesForLanguage = array_values(array_filter($localeCodes, fn ($localeCode) => str_starts_with($localeCode['code'], $userLang)));
-		$otherLocales = array_values(array_filter($localeCodes, fn ($localeCode) => !str_starts_with($localeCode['code'], $userLang)));
-
-		if (!$userLocale) {
-			$userLocale = [
-				'code' => 'en',
-				'name' => 'English'
-			];
-		}
-
-		return [
-			'activeLocaleLang' => $userLocaleString,
-			'activeLocale' => $userLocale,
-			'localesForLanguage' => $localesForLanguage,
-			'otherLocales' => $otherLocales,
-		];
-	}
-
-	/**
-	 * returns the message parameters
-	 */
-	private function getMessageParameters(IAccount $account): array {
-		$needVerifyMessage = [IAccountManager::PROPERTY_EMAIL, IAccountManager::PROPERTY_WEBSITE, IAccountManager::PROPERTY_TWITTER];
-		$messageParameters = [];
-		foreach ($needVerifyMessage as $property) {
-			switch ($account->getProperty($property)->getVerified()) {
-				case IAccountManager::VERIFIED:
-					$message = $this->l->t('Verifying');
-					break;
-				case IAccountManager::VERIFICATION_IN_PROGRESS:
-					$message = $this->l->t('Verifying …');
-					break;
-				default:
-					$message = $this->l->t('Verify');
-			}
-			$messageParameters[$property . 'Message'] = $message;
-		}
-		return $messageParameters;
-	}
+    /** @var ProfileManager */
+    private $profileManager;
+
+    public function __construct(
+        private IConfig $config,
+        private IUserManager $userManager,
+        private IGroupManager $groupManager,
+        private IAccountManager $accountManager,
+        ProfileManager $profileManager,
+        private IAppManager $appManager,
+        private IFactory $l10nFactory,
+        private IL10N $l,
+        private IInitialState $initialStateService,
+        private IManager $manager,
+    ) {
+        $this->profileManager = $profileManager;
+    }
+
+    public function getForm(): TemplateResponse {
+        $federationEnabled = $this->appManager->isEnabledForUser('federation');
+        $federatedFileSharingEnabled = $this->appManager->isEnabledForUser('federatedfilesharing');
+        $lookupServerUploadEnabled = false;
+        if ($federatedFileSharingEnabled) {
+            /** @var FederatedShareProvider $shareProvider */
+            $shareProvider = Server::get(FederatedShareProvider::class);
+            $lookupServerUploadEnabled = $shareProvider->isLookupServerUploadEnabled();
+        }
+
+        $uid = \OC_User::getUser();
+        $user = $this->userManager->get($uid);
+        $account = $this->accountManager->getAccount($user);
+
+        // make sure FS is setup before querying storage related stuff...
+        \OC_Util::setupFS($user->getUID());
+
+        $storageInfo = \OC_Helper::getStorageInfo('/');
+        if ($storageInfo['quota'] === FileInfo::SPACE_UNLIMITED) {
+            $totalSpace = $this->l->t('Unlimited');
+        } else {
+            $totalSpace = Util::humanFileSize($storageInfo['total']);
+        }
+
+        $messageParameters = $this->getMessageParameters($account);
+
+        $parameters = [
+            'lookupServerUploadEnabled' => $lookupServerUploadEnabled,
+            'isFairUseOfFreePushService' => $this->isFairUseOfFreePushService(),
+            'profileEnabledGlobally' => $this->profileManager->isProfileEnabled(),
+        ] + $messageParameters;
+
+        $personalInfoParameters = [
+            'userId' => $uid,
+            'avatar' => $this->getProperty($account, IAccountManager::PROPERTY_AVATAR),
+            'groups' => $this->getGroups($user),
+            'quota' => $storageInfo['quota'],
+            'totalSpace' => $totalSpace,
+            'usage' => Util::humanFileSize($storageInfo['used']),
+            'usageRelative' => round($storageInfo['relative']),
+            'displayName' => $this->getProperty($account, IAccountManager::PROPERTY_DISPLAYNAME),
+            'emailMap' => $this->getEmailMap($account),
+            'phone' => $this->getProperty($account, IAccountManager::PROPERTY_PHONE),
+            'defaultPhoneRegion' => $this->config->getSystemValueString('default_phone_region'),
+            'location' => $this->getProperty($account, IAccountManager::PROPERTY_ADDRESS),
+            'website' => $this->getProperty($account, IAccountManager::PROPERTY_WEBSITE),
+            'twitter' => $this->getProperty($account, IAccountManager::PROPERTY_TWITTER),
+            'bluesky' => $this->getProperty($account, IAccountManager::PROPERTY_BLUESKY),
+            'fediverse' => $this->getProperty($account, IAccountManager::PROPERTY_FEDIVERSE),
+            'languageMap' => $this->getLanguageMap($user),
+            'localeMap' => $this->getLocaleMap($user),
+            'profileEnabledGlobally' => $this->profileManager->isProfileEnabled(),
+            'profileEnabled' => $this->profileManager->isProfileEnabled($user),
+            'organisation' => $this->getProperty($account, IAccountManager::PROPERTY_ORGANISATION),
+            'role' => $this->getProperty($account, IAccountManager::PROPERTY_ROLE),
+            'headline' => $this->getProperty($account, IAccountManager::PROPERTY_HEADLINE),
+            'biography' => $this->getProperty($account, IAccountManager::PROPERTY_BIOGRAPHY),
+            'birthdate' => $this->getProperty($account, IAccountManager::PROPERTY_BIRTHDATE),
+            'firstDayOfWeek' => $this->config->getUserValue($uid, 'core', AUserDataOCSController::USER_FIELD_FIRST_DAY_OF_WEEK),
+            'timezone' => $this->config->getUserValue($uid, 'core', 'timezone', ''),
+            'pronouns' => $this->getProperty($account, IAccountManager::PROPERTY_PRONOUNS),
+        ];
+
+        $accountParameters = [
+            'avatarChangeSupported' => $user->canChangeAvatar(),
+            'displayNameChangeSupported' => $user->canChangeDisplayName(),
+            'emailChangeSupported' => $user->canChangeEmail(),
+            'federationEnabled' => $federationEnabled,
+            'lookupServerUploadEnabled' => $lookupServerUploadEnabled,
+        ];
+
+        $profileParameters = [
+            'profileConfig' => $this->profileManager->getProfileConfigWithMetadata($user, $user),
+        ];
+
+        $this->initialStateService->provideInitialState('profileEnabledGlobally', $this->profileManager->isProfileEnabled());
+        $this->initialStateService->provideInitialState('personalInfoParameters', $personalInfoParameters);
+        $this->initialStateService->provideInitialState('accountParameters', $accountParameters);
+        $this->initialStateService->provideInitialState('profileParameters', $profileParameters);
+
+        return new TemplateResponse('settings', 'settings/personal/personal.info', $parameters, '');
+    }
+
+    /**
+     * Check if is fair use of free push service
+     * @return boolean
+     */
+    private function isFairUseOfFreePushService(): bool {
+        return $this->manager->isFairUseOfFreePushService();
+    }
+
+    /**
+     * returns the property data in an
+     * associative array
+     */
+    private function getProperty(IAccount $account, string $property): array {
+        $property = [
+            'name' => $account->getProperty($property)->getName(),
+            'value' => $account->getProperty($property)->getValue(),
+            'scope' => $account->getProperty($property)->getScope(),
+            'verified' => $account->getProperty($property)->getVerified(),
+        ];
+
+        return $property;
+    }
+
+    /**
+     * returns the section ID string, e.g. 'sharing'
+     * @since 9.1
+     */
+    public function getSection(): string {
+        return 'personal-info';
+    }
+
+    /**
+     * @return int whether the form should be rather on the top or bottom of
+     *             the admin section. The forms are arranged in ascending order of the
+     *             priority values. It is required to return a value between 0 and 100.
+     *
+     * E.g.: 70
+     * @since 9.1
+     */
+    public function getPriority(): int {
+        return 10;
+    }
+
+    /**
+     * returns a sorted list of the user's group GIDs
+     */
+    private function getGroups(IUser $user): array {
+        $groups = array_map(
+            static function (IGroup $group) {
+                return $group->getDisplayName();
+            },
+            $this->groupManager->getUserGroups($user)
+        );
+        sort($groups);
+
+        return $groups;
+    }
+
+    /**
+     * returns the primary email and additional emails in an
+     * associative array
+     */
+    private function getEmailMap(IAccount $account): array {
+        $systemEmail = [
+            'name' => $account->getProperty(IAccountManager::PROPERTY_EMAIL)->getName(),
+            'value' => $account->getProperty(IAccountManager::PROPERTY_EMAIL)->getValue(),
+            'scope' => $account->getProperty(IAccountManager::PROPERTY_EMAIL)->getScope(),
+            'verified' => $account->getProperty(IAccountManager::PROPERTY_EMAIL)->getVerified(),
+        ];
+
+        $additionalEmails = array_map(
+            function (IAccountProperty $property) {
+                return [
+                    'name' => $property->getName(),
+                    'value' => $property->getValue(),
+                    'scope' => $property->getScope(),
+                    'verified' => $property->getVerified(),
+                    'locallyVerified' => $property->getLocallyVerified(),
+                ];
+            },
+            $account->getPropertyCollection(IAccountManager::COLLECTION_EMAIL)->getProperties(),
+        );
+
+        $emailMap = [
+            'primaryEmail' => $systemEmail,
+            'additionalEmails' => $additionalEmails,
+            'notificationEmail' => (string)$account->getUser()->getPrimaryEMailAddress(),
+        ];
+
+        return $emailMap;
+    }
+
+    /**
+     * returns the user's active language, common languages, and other languages in an
+     * associative array
+     */
+    private function getLanguageMap(IUser $user): array {
+        $forceLanguage = $this->config->getSystemValue('force_language', false);
+        if ($forceLanguage !== false) {
+            return [];
+        }
+
+        $uid = $user->getUID();
+
+        $userConfLang = $this->config->getUserValue($uid, 'core', 'lang', $this->l10nFactory->findLanguage());
+        $languages = $this->l10nFactory->getLanguages();
+
+        // associate the user language with the proper array
+        $userLangIndex = array_search($userConfLang, array_column($languages['commonLanguages'], 'code'));
+        $userLang = $languages['commonLanguages'][$userLangIndex];
+        // search in the other languages
+        if ($userLangIndex === false) {
+            $userLangIndex = array_search($userConfLang, array_column($languages['otherLanguages'], 'code'));
+            $userLang = $languages['otherLanguages'][$userLangIndex];
+        }
+        // if user language is not available but set somehow: show the actual code as name
+        if (!is_array($userLang)) {
+            $userLang = [
+                'code' => $userConfLang,
+                'name' => $userConfLang,
+            ];
+        }
+
+        return array_merge(
+            ['activeLanguage' => $userLang],
+            $languages
+        );
+    }
+
+    private function getLocaleMap(IUser $user): array {
+        $forceLanguage = $this->config->getSystemValue('force_locale', false);
+        if ($forceLanguage !== false) {
+            return [];
+        }
+
+        $uid = $user->getUID();
+        $userLang = $this->config->getUserValue($uid, 'core', 'lang', $this->l10nFactory->findLanguage());
+        $userLocaleString = $this->config->getUserValue($uid, 'core', 'locale', $this->l10nFactory->findLocale($userLang));
+        $localeCodes = $this->l10nFactory->findAvailableLocales();
+        $userLocale = array_filter($localeCodes, fn ($value) => $userLocaleString === $value['code']);
+
+        if (!empty($userLocale)) {
+            $userLocale = reset($userLocale);
+        }
+
+        $localesForLanguage = array_values(array_filter($localeCodes, fn ($localeCode) => str_starts_with($localeCode['code'], $userLang)));
+        $otherLocales = array_values(array_filter($localeCodes, fn ($localeCode) => !str_starts_with($localeCode['code'], $userLang)));
+
+        if (!$userLocale) {
+            $userLocale = [
+                'code' => 'en',
+                'name' => 'English'
+            ];
+        }
+
+        return [
+            'activeLocaleLang' => $userLocaleString,
+            'activeLocale' => $userLocale,
+            'localesForLanguage' => $localesForLanguage,
+            'otherLocales' => $otherLocales,
+        ];
+    }
+
+    /**
+     * returns the message parameters
+     */
+    private function getMessageParameters(IAccount $account): array {
+        $needVerifyMessage = [IAccountManager::PROPERTY_EMAIL, IAccountManager::PROPERTY_WEBSITE, IAccountManager::PROPERTY_TWITTER];
+        $messageParameters = [];
+        foreach ($needVerifyMessage as $property) {
+            switch ($account->getProperty($property)->getVerified()) {
+                case IAccountManager::VERIFIED:
+                    $message = $this->l->t('Verifying');
+                    break;
+                case IAccountManager::VERIFICATION_IN_PROGRESS:
+                    $message = $this->l->t('Verifying …');
+                    break;
+                default:
+                    $message = $this->l->t('Verify');
+            }
+            $messageParameters[$property . 'Message'] = $message;
+        }
+        return $messageParameters;
+    }
 }

lib/private/User/Listeners/BeforeUserDeletedListener.php

Spacing +1 added lines, -1 removed lines

@@ -57,7 +57,7 @@
 			// no avatar to remove
 		} catch (\Exception $e) {
 			// Ignore exceptions
-			$this->logger->info('Could not cleanup avatar of ' . $user->getUID(), [
+			$this->logger->info('Could not cleanup avatar of '.$user->getUID(), [
 				'exception' => $e,
 			]);
 		}

Indentation +32 added lines, -32 removed lines

@@ -20,36 +20,36 @@
  * @template-implements IEventListener<BeforeUserDeletedEvent>
  */
 class BeforeUserDeletedListener implements IEventListener {
-	private IAvatarManager $avatarManager;
-	private ICredentialsManager $credentialsManager;
-	private LoggerInterface $logger;
-
-	public function __construct(LoggerInterface $logger, IAvatarManager $avatarManager, ICredentialsManager $credentialsManager) {
-		$this->avatarManager = $avatarManager;
-		$this->credentialsManager = $credentialsManager;
-		$this->logger = $logger;
-	}
-
-	public function handle(Event $event): void {
-		if (!($event instanceof BeforeUserDeletedEvent)) {
-			return;
-		}
-
-		$user = $event->getUser();
-
-		// Delete avatar on user deletion
-		try {
-			$avatar = $this->avatarManager->getAvatar($user->getUID());
-			$avatar->remove(true);
-		} catch (NotFoundException $e) {
-			// no avatar to remove
-		} catch (\Exception $e) {
-			// Ignore exceptions
-			$this->logger->info('Could not cleanup avatar of ' . $user->getUID(), [
-				'exception' => $e,
-			]);
-		}
-		// Delete storages credentials on user deletion
-		$this->credentialsManager->erase($user->getUID());
-	}
+    private IAvatarManager $avatarManager;
+    private ICredentialsManager $credentialsManager;
+    private LoggerInterface $logger;
+
+    public function __construct(LoggerInterface $logger, IAvatarManager $avatarManager, ICredentialsManager $credentialsManager) {
+        $this->avatarManager = $avatarManager;
+        $this->credentialsManager = $credentialsManager;
+        $this->logger = $logger;
+    }
+
+    public function handle(Event $event): void {
+        if (!($event instanceof BeforeUserDeletedEvent)) {
+            return;
+        }
+
+        $user = $event->getUser();
+
+        // Delete avatar on user deletion
+        try {
+            $avatar = $this->avatarManager->getAvatar($user->getUID());
+            $avatar->remove(true);
+        } catch (NotFoundException $e) {
+            // no avatar to remove
+        } catch (\Exception $e) {
+            // Ignore exceptions
+            $this->logger->info('Could not cleanup avatar of ' . $user->getUID(), [
+                'exception' => $e,
+            ]);
+        }
+        // Delete storages credentials on user deletion
+        $this->credentialsManager->erase($user->getUID());
+    }
 }

lib/private/TagManager.php

Spacing +1 added lines, -1 removed lines

@@ -123,7 +123,7 @@
 			return;
 		}
 
-		$tagsIds = array_map(fn (array $row) => (int)$row['id'], $result->fetchAll());
+		$tagsIds = array_map(fn (array $row) => (int) $row['id'], $result->fetchAll());
 		$result->closeCursor();
 
 		if (count($tagsIds) === 0) {

Indentation +98 added lines, -98 removed lines

@@ -25,113 +25,113 @@
  */
 class TagManager implements ITagManager, IEventListener {
 
-	public function __construct(
-		private TagMapper $mapper,
-		private IUserSession $userSession,
-		private IDBConnection $connection,
-		private LoggerInterface $logger,
-		private IEventDispatcher $dispatcher,
-	) {
-	}
+    public function __construct(
+        private TagMapper $mapper,
+        private IUserSession $userSession,
+        private IDBConnection $connection,
+        private LoggerInterface $logger,
+        private IEventDispatcher $dispatcher,
+    ) {
+    }
 
-	/**
-	 * Create a new \OCP\ITags instance and load tags from db.
-	 *
-	 * @see \OCP\ITags
-	 * @param string $type The type identifier e.g. 'contact' or 'event'.
-	 * @param array $defaultTags An array of default tags to be used if none are stored.
-	 * @param boolean $includeShared Whether to include tags for items shared with this user by others.
-	 * @param string $userId user for which to retrieve the tags, defaults to the currently
-	 *                       logged in user
-	 * @return \OCP\ITags
-	 *
-	 * since 20.0.0 $includeShared isn't used anymore
-	 */
-	public function load($type, $defaultTags = [], $includeShared = false, $userId = null) {
-		if (is_null($userId)) {
-			$user = $this->userSession->getUser();
-			if ($user === null) {
-				// nothing we can do without a user
-				return null;
-			}
-			$userId = $this->userSession->getUser()->getUId();
-		}
-		return new Tags($this->mapper, $userId, $type, $this->logger, $this->connection, $this->dispatcher, $this->userSession, $defaultTags);
-	}
+    /**
+     * Create a new \OCP\ITags instance and load tags from db.
+     *
+     * @see \OCP\ITags
+     * @param string $type The type identifier e.g. 'contact' or 'event'.
+     * @param array $defaultTags An array of default tags to be used if none are stored.
+     * @param boolean $includeShared Whether to include tags for items shared with this user by others.
+     * @param string $userId user for which to retrieve the tags, defaults to the currently
+     *                       logged in user
+     * @return \OCP\ITags
+     *
+     * since 20.0.0 $includeShared isn't used anymore
+     */
+    public function load($type, $defaultTags = [], $includeShared = false, $userId = null) {
+        if (is_null($userId)) {
+            $user = $this->userSession->getUser();
+            if ($user === null) {
+                // nothing we can do without a user
+                return null;
+            }
+            $userId = $this->userSession->getUser()->getUId();
+        }
+        return new Tags($this->mapper, $userId, $type, $this->logger, $this->connection, $this->dispatcher, $this->userSession, $defaultTags);
+    }
 
-	/**
-	 * Get all users who favorited an object
-	 *
-	 * @param string $objectType
-	 * @param int $objectId
-	 * @return array
-	 */
-	public function getUsersFavoritingObject(string $objectType, int $objectId): array {
-		$query = $this->connection->getQueryBuilder();
-		$query->select('uid')
-			->from('vcategory_to_object', 'o')
-			->innerJoin('o', 'vcategory', 'c', $query->expr()->eq('o.categoryid', 'c.id'))
-			->where($query->expr()->eq('objid', $query->createNamedParameter($objectId, IQueryBuilder::PARAM_INT)))
-			->andWhere($query->expr()->eq('c.type', $query->createNamedParameter($objectType)))
-			->andWhere($query->expr()->eq('c.category', $query->createNamedParameter(ITags::TAG_FAVORITE)));
+    /**
+     * Get all users who favorited an object
+     *
+     * @param string $objectType
+     * @param int $objectId
+     * @return array
+     */
+    public function getUsersFavoritingObject(string $objectType, int $objectId): array {
+        $query = $this->connection->getQueryBuilder();
+        $query->select('uid')
+            ->from('vcategory_to_object', 'o')
+            ->innerJoin('o', 'vcategory', 'c', $query->expr()->eq('o.categoryid', 'c.id'))
+            ->where($query->expr()->eq('objid', $query->createNamedParameter($objectId, IQueryBuilder::PARAM_INT)))
+            ->andWhere($query->expr()->eq('c.type', $query->createNamedParameter($objectType)))
+            ->andWhere($query->expr()->eq('c.category', $query->createNamedParameter(ITags::TAG_FAVORITE)));
 
-		$result = $query->execute();
-		$users = $result->fetchAll(\PDO::FETCH_COLUMN);
-		$result->closeCursor();
+        $result = $query->execute();
+        $users = $result->fetchAll(\PDO::FETCH_COLUMN);
+        $result->closeCursor();
 
-		return $users;
-	}
+        return $users;
+    }
 
-	public function handle(Event $event): void {
-		if (!($event instanceof UserDeletedEvent)) {
-			return;
-		}
+    public function handle(Event $event): void {
+        if (!($event instanceof UserDeletedEvent)) {
+            return;
+        }
 
-		// Find all objectid/tagId pairs.
-		$user = $event->getUser();
-		$qb = $this->connection->getQueryBuilder();
-		$qb->select('id')
-			->from('vcategory')
-			->where($qb->expr()->eq('uid', $qb->createNamedParameter($user->getUID())));
-		try {
-			$result = $qb->executeQuery();
-		} catch (DBException $e) {
-			$this->logger->error($e->getMessage(), [
-				'app' => 'core',
-				'exception' => $e,
-			]);
-			return;
-		}
+        // Find all objectid/tagId pairs.
+        $user = $event->getUser();
+        $qb = $this->connection->getQueryBuilder();
+        $qb->select('id')
+            ->from('vcategory')
+            ->where($qb->expr()->eq('uid', $qb->createNamedParameter($user->getUID())));
+        try {
+            $result = $qb->executeQuery();
+        } catch (DBException $e) {
+            $this->logger->error($e->getMessage(), [
+                'app' => 'core',
+                'exception' => $e,
+            ]);
+            return;
+        }
 
-		$tagsIds = array_map(fn (array $row) => (int)$row['id'], $result->fetchAll());
-		$result->closeCursor();
+        $tagsIds = array_map(fn (array $row) => (int)$row['id'], $result->fetchAll());
+        $result->closeCursor();
 
-		if (count($tagsIds) === 0) {
-			return;
-		}
+        if (count($tagsIds) === 0) {
+            return;
+        }
 
-		// Clean vcategory_to_object table
-		$qb = $this->connection->getQueryBuilder();
-		$qb = $qb->delete('vcategory_to_object')
-			->where($qb->expr()->in('categoryid', $qb->createParameter('chunk')));
+        // Clean vcategory_to_object table
+        $qb = $this->connection->getQueryBuilder();
+        $qb = $qb->delete('vcategory_to_object')
+            ->where($qb->expr()->in('categoryid', $qb->createParameter('chunk')));
 
-		// Clean vcategory
-		$qb1 = $this->connection->getQueryBuilder();
-		$qb1 = $qb1->delete('vcategory')
-			->where($qb1->expr()->in('uid', $qb1->createParameter('chunk')));
+        // Clean vcategory
+        $qb1 = $this->connection->getQueryBuilder();
+        $qb1 = $qb1->delete('vcategory')
+            ->where($qb1->expr()->in('uid', $qb1->createParameter('chunk')));
 
-		foreach (array_chunk($tagsIds, 1000) as $tagChunk) {
-			$qb->setParameter('chunk', $tagChunk, IQueryBuilder::PARAM_INT_ARRAY);
-			$qb1->setParameter('chunk', $tagChunk, IQueryBuilder::PARAM_INT_ARRAY);
-			try {
-				$qb->executeStatement();
-				$qb1->executeStatement();
-			} catch (DBException $e) {
-				$this->logger->error($e->getMessage(), [
-					'app' => 'core',
-					'exception' => $e,
-				]);
-			}
-		}
-	}
+        foreach (array_chunk($tagsIds, 1000) as $tagChunk) {
+            $qb->setParameter('chunk', $tagChunk, IQueryBuilder::PARAM_INT_ARRAY);
+            $qb1->setParameter('chunk', $tagChunk, IQueryBuilder::PARAM_INT_ARRAY);
+            try {
+                $qb->executeStatement();
+                $qb1->executeStatement();
+            } catch (DBException $e) {
+                $this->logger->error($e->getMessage(), [
+                    'app' => 'core',
+                    'exception' => $e,
+                ]);
+            }
+        }
+    }
 }

apps/files/lib/Controller/OpenLocalEditorController.php

Spacing +1 added lines, -1 removed lines

@@ -100,7 +100,7 @@
 			}
 		}
 
-		$this->logger->error('Giving up after ' . self::TOKEN_RETRIES . ' retries to generate a unique local editor token for path hash: ' . $pathHash);
+		$this->logger->error('Giving up after '.self::TOKEN_RETRIES.' retries to generate a unique local editor token for path hash: '.$pathHash);
 		return new DataResponse([], Http::STATUS_INTERNAL_SERVER_ERROR);
 	}
 

Indentation +99 added lines, -99 removed lines

@@ -25,104 +25,104 @@
 use Psr\Log\LoggerInterface;
 
 class OpenLocalEditorController extends OCSController {
-	public const TOKEN_LENGTH = 128;
-	public const TOKEN_DURATION = 600; // 10 Minutes
-	public const TOKEN_RETRIES = 50;
-
-	public function __construct(
-		string $appName,
-		IRequest $request,
-		protected ITimeFactory $timeFactory,
-		protected OpenLocalEditorMapper $mapper,
-		protected ISecureRandom $secureRandom,
-		protected LoggerInterface $logger,
-		protected ?string $userId,
-	) {
-		parent::__construct($appName, $request);
-	}
-
-	/**
-	 * Create a local editor
-	 *
-	 * @param string $path Path of the file
-	 *
-	 * @return DataResponse<Http::STATUS_OK, array{userId: ?string, pathHash: string, expirationTime: int, token: string}, array{}>|DataResponse<Http::STATUS_INTERNAL_SERVER_ERROR, list<empty>, array{}>
-	 *
-	 * 200: Local editor returned
-	 */
-	#[NoAdminRequired]
-	#[UserRateLimit(limit: 10, period: 120)]
-	public function create(string $path): DataResponse {
-		$pathHash = sha1($path);
-
-		$entity = new OpenLocalEditor();
-		$entity->setUserId($this->userId);
-		$entity->setPathHash($pathHash);
-		$entity->setExpirationTime($this->timeFactory->getTime() + self::TOKEN_DURATION); // Expire in 10 minutes
-
-		for ($i = 1; $i <= self::TOKEN_RETRIES; $i++) {
-			$token = $this->secureRandom->generate(self::TOKEN_LENGTH, ISecureRandom::CHAR_ALPHANUMERIC);
-			$entity->setToken($token);
-
-			try {
-				$this->mapper->insert($entity);
-
-				return new DataResponse([
-					'userId' => $this->userId,
-					'pathHash' => $pathHash,
-					'expirationTime' => $entity->getExpirationTime(),
-					'token' => $entity->getToken(),
-				]);
-			} catch (Exception $e) {
-				if ($e->getCode() !== Exception::REASON_UNIQUE_CONSTRAINT_VIOLATION) {
-					// Only retry on unique constraint violation
-					throw $e;
-				}
-			}
-		}
-
-		$this->logger->error('Giving up after ' . self::TOKEN_RETRIES . ' retries to generate a unique local editor token for path hash: ' . $pathHash);
-		return new DataResponse([], Http::STATUS_INTERNAL_SERVER_ERROR);
-	}
-
-	/**
-	 * Validate a local editor
-	 *
-	 * @param string $path Path of the file
-	 * @param string $token Token of the local editor
-	 *
-	 * @return DataResponse<Http::STATUS_OK, array{userId: string, pathHash: string, expirationTime: int, token: string}, array{}>|DataResponse<Http::STATUS_NOT_FOUND, list<empty>, array{}>
-	 *
-	 * 200: Local editor validated successfully
-	 * 404: Local editor not found
-	 */
-	#[NoAdminRequired]
-	#[BruteForceProtection(action: 'openLocalEditor')]
-	public function validate(string $path, string $token): DataResponse {
-		$pathHash = sha1($path);
-
-		try {
-			$entity = $this->mapper->verifyToken($this->userId, $pathHash, $token);
-		} catch (DoesNotExistException $e) {
-			$response = new DataResponse([], Http::STATUS_NOT_FOUND);
-			$response->throttle(['userId' => $this->userId, 'pathHash' => $pathHash]);
-			return $response;
-		}
-
-		$this->mapper->delete($entity);
-
-		if ($entity->getExpirationTime() <= $this->timeFactory->getTime()) {
-			$response = new DataResponse([], Http::STATUS_NOT_FOUND);
-			$response->throttle(['userId' => $this->userId, 'pathHash' => $pathHash]);
-			return $response;
-		}
-
-		return new DataResponse([
-			'userId' => $this->userId,
-			'pathHash' => $pathHash,
-			'expirationTime' => $entity->getExpirationTime(),
-			'token' => $entity->getToken(),
-		]);
-	}
+    public const TOKEN_LENGTH = 128;
+    public const TOKEN_DURATION = 600; // 10 Minutes
+    public const TOKEN_RETRIES = 50;
+
+    public function __construct(
+        string $appName,
+        IRequest $request,
+        protected ITimeFactory $timeFactory,
+        protected OpenLocalEditorMapper $mapper,
+        protected ISecureRandom $secureRandom,
+        protected LoggerInterface $logger,
+        protected ?string $userId,
+    ) {
+        parent::__construct($appName, $request);
+    }
+
+    /**
+     * Create a local editor
+     *
+     * @param string $path Path of the file
+     *
+     * @return DataResponse<Http::STATUS_OK, array{userId: ?string, pathHash: string, expirationTime: int, token: string}, array{}>|DataResponse<Http::STATUS_INTERNAL_SERVER_ERROR, list<empty>, array{}>
+     *
+     * 200: Local editor returned
+     */
+    #[NoAdminRequired]
+    #[UserRateLimit(limit: 10, period: 120)]
+    public function create(string $path): DataResponse {
+        $pathHash = sha1($path);
+
+        $entity = new OpenLocalEditor();
+        $entity->setUserId($this->userId);
+        $entity->setPathHash($pathHash);
+        $entity->setExpirationTime($this->timeFactory->getTime() + self::TOKEN_DURATION); // Expire in 10 minutes
+
+        for ($i = 1; $i <= self::TOKEN_RETRIES; $i++) {
+            $token = $this->secureRandom->generate(self::TOKEN_LENGTH, ISecureRandom::CHAR_ALPHANUMERIC);
+            $entity->setToken($token);
+
+            try {
+                $this->mapper->insert($entity);
+
+                return new DataResponse([
+                    'userId' => $this->userId,
+                    'pathHash' => $pathHash,
+                    'expirationTime' => $entity->getExpirationTime(),
+                    'token' => $entity->getToken(),
+                ]);
+            } catch (Exception $e) {
+                if ($e->getCode() !== Exception::REASON_UNIQUE_CONSTRAINT_VIOLATION) {
+                    // Only retry on unique constraint violation
+                    throw $e;
+                }
+            }
+        }
+
+        $this->logger->error('Giving up after ' . self::TOKEN_RETRIES . ' retries to generate a unique local editor token for path hash: ' . $pathHash);
+        return new DataResponse([], Http::STATUS_INTERNAL_SERVER_ERROR);
+    }
+
+    /**
+     * Validate a local editor
+     *
+     * @param string $path Path of the file
+     * @param string $token Token of the local editor
+     *
+     * @return DataResponse<Http::STATUS_OK, array{userId: string, pathHash: string, expirationTime: int, token: string}, array{}>|DataResponse<Http::STATUS_NOT_FOUND, list<empty>, array{}>
+     *
+     * 200: Local editor validated successfully
+     * 404: Local editor not found
+     */
+    #[NoAdminRequired]
+    #[BruteForceProtection(action: 'openLocalEditor')]
+    public function validate(string $path, string $token): DataResponse {
+        $pathHash = sha1($path);
+
+        try {
+            $entity = $this->mapper->verifyToken($this->userId, $pathHash, $token);
+        } catch (DoesNotExistException $e) {
+            $response = new DataResponse([], Http::STATUS_NOT_FOUND);
+            $response->throttle(['userId' => $this->userId, 'pathHash' => $pathHash]);
+            return $response;
+        }
+
+        $this->mapper->delete($entity);
+
+        if ($entity->getExpirationTime() <= $this->timeFactory->getTime()) {
+            $response = new DataResponse([], Http::STATUS_NOT_FOUND);
+            $response->throttle(['userId' => $this->userId, 'pathHash' => $pathHash]);
+            return $response;
+        }
+
+        return new DataResponse([
+            'userId' => $this->userId,
+            'pathHash' => $pathHash,
+            'expirationTime' => $entity->getExpirationTime(),
+            'token' => $entity->getToken(),
+        ]);
+    }
 
 }

apps/files/lib/Db/OpenLocalEditor.php

Indentation +14 added lines, -14 removed lines

@@ -39,22 +39,22 @@
  * @method string getToken()
  */
 class OpenLocalEditor extends Entity {
-	/** @var string */
-	protected $userId;
+    /** @var string */
+    protected $userId;
 
-	/** @var string */
-	protected $pathHash;
+    /** @var string */
+    protected $pathHash;
 
-	/** @var int */
-	protected $expirationTime;
+    /** @var int */
+    protected $expirationTime;
 
-	/** @var string */
-	protected $token;
+    /** @var string */
+    protected $token;
 
-	public function __construct() {
-		$this->addType('userId', 'string');
-		$this->addType('pathHash', 'string');
-		$this->addType('expirationTime', 'integer');
-		$this->addType('token', 'string');
-	}
+    public function __construct() {
+        $this->addType('userId', 'string');
+        $this->addType('pathHash', 'string');
+        $this->addType('expirationTime', 'integer');
+        $this->addType('token', 'string');
+    }
 }

apps/user_status/lib/Db/UserStatusMapper.php

Spacing +3 added lines, -3 removed lines

@@ -83,7 +83,7 @@ 
 					$qb->expr()->isNotNull('custom_icon'),
 					$qb->expr()->isNotNull('custom_message'),
 				),
-				$qb->expr()->notLike('user_id', $qb->createNamedParameter($this->db->escapeLikeParameter('_') . '%'))
+				$qb->expr()->notLike('user_id', $qb->createNamedParameter($this->db->escapeLikeParameter('_').'%'))
 			));
 
 		if ($limit !== null) {
@@ -106,7 +106,7 @@ 
 		$qb
 			->select('*')
 			->from($this->tableName)
-			->where($qb->expr()->eq('user_id', $qb->createNamedParameter($isBackup ? '_' . $userId : $userId, IQueryBuilder::PARAM_STR)));
+			->where($qb->expr()->eq('user_id', $qb->createNamedParameter($isBackup ? '_'.$userId : $userId, IQueryBuilder::PARAM_STR)));
 
 		return $this->findEntity($qb);
 	}
@@ -195,7 +195,7 @@ 
 		$qb = $this->db->getQueryBuilder();
 		$qb->update($this->tableName)
 			->set('is_backup', $qb->createNamedParameter(true, IQueryBuilder::PARAM_BOOL))
-			->set('user_id', $qb->createNamedParameter('_' . $userId))
+			->set('user_id', $qb->createNamedParameter('_'.$userId))
 			->where($qb->expr()->eq('user_id', $qb->createNamedParameter($userId)));
 		return $qb->executeStatement() > 0;
 	}

Indentation +174 added lines, -174 removed lines

@@ -20,178 +20,178 @@
  */
 class UserStatusMapper extends QBMapper {
 
-	/**
-	 * @param IDBConnection $db
-	 */
-	public function __construct(IDBConnection $db) {
-		parent::__construct($db, 'user_status');
-	}
-
-	/**
-	 * @param int|null $limit
-	 * @param int|null $offset
-	 * @return UserStatus[]
-	 */
-	public function findAll(?int $limit = null, ?int $offset = null):array {
-		$qb = $this->db->getQueryBuilder();
-		$qb
-			->select('*')
-			->from($this->tableName);
-
-		if ($limit !== null) {
-			$qb->setMaxResults($limit);
-		}
-		if ($offset !== null) {
-			$qb->setFirstResult($offset);
-		}
-
-		return $this->findEntities($qb);
-	}
-
-	/**
-	 * @param int|null $limit
-	 * @param int|null $offset
-	 * @return array
-	 */
-	public function findAllRecent(?int $limit = null, ?int $offset = null): array {
-		$qb = $this->db->getQueryBuilder();
-
-		$qb
-			->select('*')
-			->from($this->tableName)
-			->orderBy('status_message_timestamp', 'DESC')
-			->where($qb->expr()->andX(
-				$qb->expr()->neq('status_message_timestamp', $qb->createNamedParameter(0, IQueryBuilder::PARAM_INT), IQueryBuilder::PARAM_INT),
-				$qb->expr()->orX(
-					$qb->expr()->notIn('status', $qb->createNamedParameter([IUserStatus::ONLINE, IUserStatus::AWAY, IUserStatus::OFFLINE], IQueryBuilder::PARAM_STR_ARRAY)),
-					$qb->expr()->isNotNull('message_id'),
-					$qb->expr()->isNotNull('custom_icon'),
-					$qb->expr()->isNotNull('custom_message'),
-				),
-				$qb->expr()->notLike('user_id', $qb->createNamedParameter($this->db->escapeLikeParameter('_') . '%'))
-			));
-
-		if ($limit !== null) {
-			$qb->setMaxResults($limit);
-		}
-		if ($offset !== null) {
-			$qb->setFirstResult($offset);
-		}
-
-		return $this->findEntities($qb);
-	}
-
-	/**
-	 * @param string $userId
-	 * @return UserStatus
-	 * @throws DoesNotExistException
-	 */
-	public function findByUserId(string $userId, bool $isBackup = false): UserStatus {
-		$qb = $this->db->getQueryBuilder();
-		$qb
-			->select('*')
-			->from($this->tableName)
-			->where($qb->expr()->eq('user_id', $qb->createNamedParameter($isBackup ? '_' . $userId : $userId, IQueryBuilder::PARAM_STR)));
-
-		return $this->findEntity($qb);
-	}
-
-	/**
-	 * @param array $userIds
-	 * @return array
-	 */
-	public function findByUserIds(array $userIds): array {
-		$qb = $this->db->getQueryBuilder();
-		$qb
-			->select('*')
-			->from($this->tableName)
-			->where($qb->expr()->in('user_id', $qb->createNamedParameter($userIds, IQueryBuilder::PARAM_STR_ARRAY)));
-
-		return $this->findEntities($qb);
-	}
-
-	/**
-	 * @param int $olderThan
-	 * @param int $now
-	 */
-	public function clearStatusesOlderThan(int $olderThan, int $now): void {
-		$qb = $this->db->getQueryBuilder();
-		$qb->update($this->tableName)
-			->set('status', $qb->createNamedParameter(IUserStatus::OFFLINE))
-			->set('is_user_defined', $qb->createNamedParameter(false, IQueryBuilder::PARAM_BOOL))
-			->set('status_timestamp', $qb->createNamedParameter($now, IQueryBuilder::PARAM_INT))
-			->where($qb->expr()->lte('status_timestamp', $qb->createNamedParameter($olderThan, IQueryBuilder::PARAM_INT)))
-			->andWhere($qb->expr()->neq('status', $qb->createNamedParameter(IUserStatus::OFFLINE)))
-			->andWhere($qb->expr()->orX(
-				$qb->expr()->eq('is_user_defined', $qb->createNamedParameter(false, IQueryBuilder::PARAM_BOOL), IQueryBuilder::PARAM_BOOL),
-				$qb->expr()->eq('status', $qb->createNamedParameter(IUserStatus::ONLINE))
-			));
-
-		$qb->executeStatement();
-	}
-
-	/**
-	 * Clear all statuses older than a given timestamp
-	 *
-	 * @param int $timestamp
-	 */
-	public function clearOlderThanClearAt(int $timestamp): void {
-		$qb = $this->db->getQueryBuilder();
-		$qb->delete($this->tableName)
-			->where($qb->expr()->isNotNull('clear_at'))
-			->andWhere($qb->expr()->lte('clear_at', $qb->createNamedParameter($timestamp, IQueryBuilder::PARAM_INT)));
-
-		$qb->executeStatement();
-	}
-
-
-	/**
-	 * Deletes a user status so we can restore the backup
-	 *
-	 * @param string $userId
-	 * @param string $messageId
-	 * @return bool True if an entry was deleted
-	 */
-	public function deleteCurrentStatusToRestoreBackup(string $userId, string $messageId): bool {
-		$qb = $this->db->getQueryBuilder();
-		$qb->delete($this->tableName)
-			->where($qb->expr()->eq('user_id', $qb->createNamedParameter($userId)))
-			->andWhere($qb->expr()->eq('message_id', $qb->createNamedParameter($messageId)))
-			->andWhere($qb->expr()->eq('is_backup', $qb->createNamedParameter(false, IQueryBuilder::PARAM_BOOL)));
-		return $qb->executeStatement() > 0;
-	}
-
-	public function deleteByIds(array $ids): void {
-		$qb = $this->db->getQueryBuilder();
-		$qb->delete($this->tableName)
-			->where($qb->expr()->in('id', $qb->createNamedParameter($ids, IQueryBuilder::PARAM_INT_ARRAY)));
-		$qb->executeStatement();
-	}
-
-	/**
-	 * @param string $userId
-	 * @return bool
-	 * @throws \OCP\DB\Exception
-	 */
-	public function createBackupStatus(string $userId): bool {
-		// Prefix user account with an underscore because user_id is marked as unique
-		// in the table. Starting a username with an underscore is not allowed so this
-		// shouldn't create any trouble.
-		$qb = $this->db->getQueryBuilder();
-		$qb->update($this->tableName)
-			->set('is_backup', $qb->createNamedParameter(true, IQueryBuilder::PARAM_BOOL))
-			->set('user_id', $qb->createNamedParameter('_' . $userId))
-			->where($qb->expr()->eq('user_id', $qb->createNamedParameter($userId)));
-		return $qb->executeStatement() > 0;
-	}
-
-	public function restoreBackupStatuses(array $ids): void {
-		$qb = $this->db->getQueryBuilder();
-		$qb->update($this->tableName)
-			->set('is_backup', $qb->createNamedParameter(false, IQueryBuilder::PARAM_BOOL))
-			->set('user_id', $qb->func()->substring('user_id', $qb->createNamedParameter(2, IQueryBuilder::PARAM_INT)))
-			->where($qb->expr()->in('id', $qb->createNamedParameter($ids, IQueryBuilder::PARAM_INT_ARRAY)));
-
-		$qb->executeStatement();
-	}
+    /**
+     * @param IDBConnection $db
+     */
+    public function __construct(IDBConnection $db) {
+        parent::__construct($db, 'user_status');
+    }
+
+    /**
+     * @param int|null $limit
+     * @param int|null $offset
+     * @return UserStatus[]
+     */
+    public function findAll(?int $limit = null, ?int $offset = null):array {
+        $qb = $this->db->getQueryBuilder();
+        $qb
+            ->select('*')
+            ->from($this->tableName);
+
+        if ($limit !== null) {
+            $qb->setMaxResults($limit);
+        }
+        if ($offset !== null) {
+            $qb->setFirstResult($offset);
+        }
+
+        return $this->findEntities($qb);
+    }
+
+    /**
+     * @param int|null $limit
+     * @param int|null $offset
+     * @return array
+     */
+    public function findAllRecent(?int $limit = null, ?int $offset = null): array {
+        $qb = $this->db->getQueryBuilder();
+
+        $qb
+            ->select('*')
+            ->from($this->tableName)
+            ->orderBy('status_message_timestamp', 'DESC')
+            ->where($qb->expr()->andX(
+                $qb->expr()->neq('status_message_timestamp', $qb->createNamedParameter(0, IQueryBuilder::PARAM_INT), IQueryBuilder::PARAM_INT),
+                $qb->expr()->orX(
+                    $qb->expr()->notIn('status', $qb->createNamedParameter([IUserStatus::ONLINE, IUserStatus::AWAY, IUserStatus::OFFLINE], IQueryBuilder::PARAM_STR_ARRAY)),
+                    $qb->expr()->isNotNull('message_id'),
+                    $qb->expr()->isNotNull('custom_icon'),
+                    $qb->expr()->isNotNull('custom_message'),
+                ),
+                $qb->expr()->notLike('user_id', $qb->createNamedParameter($this->db->escapeLikeParameter('_') . '%'))
+            ));
+
+        if ($limit !== null) {
+            $qb->setMaxResults($limit);
+        }
+        if ($offset !== null) {
+            $qb->setFirstResult($offset);
+        }
+
+        return $this->findEntities($qb);
+    }
+
+    /**
+     * @param string $userId
+     * @return UserStatus
+     * @throws DoesNotExistException
+     */
+    public function findByUserId(string $userId, bool $isBackup = false): UserStatus {
+        $qb = $this->db->getQueryBuilder();
+        $qb
+            ->select('*')
+            ->from($this->tableName)
+            ->where($qb->expr()->eq('user_id', $qb->createNamedParameter($isBackup ? '_' . $userId : $userId, IQueryBuilder::PARAM_STR)));
+
+        return $this->findEntity($qb);
+    }
+
+    /**
+     * @param array $userIds
+     * @return array
+     */
+    public function findByUserIds(array $userIds): array {
+        $qb = $this->db->getQueryBuilder();
+        $qb
+            ->select('*')
+            ->from($this->tableName)
+            ->where($qb->expr()->in('user_id', $qb->createNamedParameter($userIds, IQueryBuilder::PARAM_STR_ARRAY)));
+
+        return $this->findEntities($qb);
+    }
+
+    /**
+     * @param int $olderThan
+     * @param int $now
+     */
+    public function clearStatusesOlderThan(int $olderThan, int $now): void {
+        $qb = $this->db->getQueryBuilder();
+        $qb->update($this->tableName)
+            ->set('status', $qb->createNamedParameter(IUserStatus::OFFLINE))
+            ->set('is_user_defined', $qb->createNamedParameter(false, IQueryBuilder::PARAM_BOOL))
+            ->set('status_timestamp', $qb->createNamedParameter($now, IQueryBuilder::PARAM_INT))
+            ->where($qb->expr()->lte('status_timestamp', $qb->createNamedParameter($olderThan, IQueryBuilder::PARAM_INT)))
+            ->andWhere($qb->expr()->neq('status', $qb->createNamedParameter(IUserStatus::OFFLINE)))
+            ->andWhere($qb->expr()->orX(
+                $qb->expr()->eq('is_user_defined', $qb->createNamedParameter(false, IQueryBuilder::PARAM_BOOL), IQueryBuilder::PARAM_BOOL),
+                $qb->expr()->eq('status', $qb->createNamedParameter(IUserStatus::ONLINE))
+            ));
+
+        $qb->executeStatement();
+    }
+
+    /**
+     * Clear all statuses older than a given timestamp
+     *
+     * @param int $timestamp
+     */
+    public function clearOlderThanClearAt(int $timestamp): void {
+        $qb = $this->db->getQueryBuilder();
+        $qb->delete($this->tableName)
+            ->where($qb->expr()->isNotNull('clear_at'))
+            ->andWhere($qb->expr()->lte('clear_at', $qb->createNamedParameter($timestamp, IQueryBuilder::PARAM_INT)));
+
+        $qb->executeStatement();
+    }
+
+
+    /**
+     * Deletes a user status so we can restore the backup
+     *
+     * @param string $userId
+     * @param string $messageId
+     * @return bool True if an entry was deleted
+     */
+    public function deleteCurrentStatusToRestoreBackup(string $userId, string $messageId): bool {
+        $qb = $this->db->getQueryBuilder();
+        $qb->delete($this->tableName)
+            ->where($qb->expr()->eq('user_id', $qb->createNamedParameter($userId)))
+            ->andWhere($qb->expr()->eq('message_id', $qb->createNamedParameter($messageId)))
+            ->andWhere($qb->expr()->eq('is_backup', $qb->createNamedParameter(false, IQueryBuilder::PARAM_BOOL)));
+        return $qb->executeStatement() > 0;
+    }
+
+    public function deleteByIds(array $ids): void {
+        $qb = $this->db->getQueryBuilder();
+        $qb->delete($this->tableName)
+            ->where($qb->expr()->in('id', $qb->createNamedParameter($ids, IQueryBuilder::PARAM_INT_ARRAY)));
+        $qb->executeStatement();
+    }
+
+    /**
+     * @param string $userId
+     * @return bool
+     * @throws \OCP\DB\Exception
+     */
+    public function createBackupStatus(string $userId): bool {
+        // Prefix user account with an underscore because user_id is marked as unique
+        // in the table. Starting a username with an underscore is not allowed so this
+        // shouldn't create any trouble.
+        $qb = $this->db->getQueryBuilder();
+        $qb->update($this->tableName)
+            ->set('is_backup', $qb->createNamedParameter(true, IQueryBuilder::PARAM_BOOL))
+            ->set('user_id', $qb->createNamedParameter('_' . $userId))
+            ->where($qb->expr()->eq('user_id', $qb->createNamedParameter($userId)));
+        return $qb->executeStatement() > 0;
+    }
+
+    public function restoreBackupStatuses(array $ids): void {
+        $qb = $this->db->getQueryBuilder();
+        $qb->update($this->tableName)
+            ->set('is_backup', $qb->createNamedParameter(false, IQueryBuilder::PARAM_BOOL))
+            ->set('user_id', $qb->func()->substring('user_id', $qb->createNamedParameter(2, IQueryBuilder::PARAM_INT)))
+            ->where($qb->expr()->in('id', $qb->createNamedParameter($ids, IQueryBuilder::PARAM_INT_ARRAY)));
+
+        $qb->executeStatement();
+    }
 }