nextcloud / server

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

Indentation +44 added lines, -44 removed lines

@@ -26,12 +26,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',
 ]);
 ?>
 
@@ -85,10 +85,10 @@ 
 					<p class="quotatext">
 						<?php if ($_['quota'] === \OCP\Files\FileInfo::SPACE_UNLIMITED): ?>
 							<?php print_unescaped($l->t('You are using <strong>%s</strong>',
-								[$_['usage']]));?>
+                                [$_['usage']]));?>
 						<?php else: ?>
 							<?php print_unescaped($l->t('You are using <strong>%1$s</strong> of <strong>%2$s</strong> (<strong>%3$s %%</strong>)',
-								[$_['usage'], $_['total_space'],  $_['usage_relative']]));?>
+                                [$_['usage'], $_['total_space'],  $_['usage_relative']]));?>
 						<?php endif ?>
 					</p>
 				</div>
@@ -110,16 +110,16 @@ 
 				</h3>
 				<input type="text" id="displayname" name="displayname"
 					<?php if (!$_['displayNameChangeSupported']) {
-									print_unescaped('class="hidden"');
-								} ?>
+                                    print_unescaped('class="hidden"');
+                                } ?>
 					   value="<?php p($_['displayName']) ?>"
 					   autocomplete="on" autocapitalize="none" autocorrect="off" />
 				<?php if (!$_['displayNameChangeSupported']) { ?>
 					<span><?php if (isset($_['displayName']) && !empty($_['displayName'])) {
-									p($_['displayName']);
-								} else {
-									p($l->t('No display name set'));
-								} ?></span>
+                                    p($_['displayName']);
+                                } else {
+                                    p($l->t('No display name set'));
+                                } ?></span>
 				<?php } ?>
 				<span class="icon-checkmark hidden"></span>
 				<span class="icon-error hidden" ></span>
@@ -179,24 +179,24 @@ 
 				</h3>
 				<?php if ($_['lookupServerUploadEnabled']) { ?>
 				<div class="verify <?php if ($_['website'] === '' || $_['websiteScope'] !== 'public') {
-									p('hidden');
-								} ?>">
+                                    p('hidden');
+                                } ?>">
 					<img id="verify-website" title="<?php p($_['websiteMessage']); ?>" data-status="<?php p($_['websiteVerification']) ?>" src="
 					<?php
-					switch ($_['websiteVerification']) {
-						case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS:
-							p(image_path('core', 'actions/verifying.svg'));
-							break;
-						case \OC\Accounts\AccountManager::VERIFIED:
-							p(image_path('core', 'actions/verified.svg'));
-							break;
-						default:
-							p(image_path('core', 'actions/verify.svg'));
-					}
-					?>"
+                    switch ($_['websiteVerification']) {
+                        case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS:
+                            p(image_path('core', 'actions/verifying.svg'));
+                            break;
+                        case \OC\Accounts\AccountManager::VERIFIED:
+                            p(image_path('core', 'actions/verified.svg'));
+                            break;
+                        default:
+                            p(image_path('core', 'actions/verify.svg'));
+                    }
+                    ?>"
 					<?php if ($_['websiteVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS || $_['websiteVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) {
-						print_unescaped(' class="verify-action"');
-					} ?>
+                        print_unescaped(' class="verify-action"');
+                    } ?>
 					>
 					<div class="verification-dialog popovermenu bubble menu">
 						<div class="verification-dialog-content">
@@ -228,24 +228,24 @@ 
 				</h3>
 				<?php if ($_['lookupServerUploadEnabled']) { ?>
 				<div class="verify <?php if ($_['twitter'] === '' || $_['twitterScope'] !== 'public') {
-						p('hidden');
-					} ?>">
+                        p('hidden');
+                    } ?>">
 					<img id="verify-twitter" title="<?php p($_['twitterMessage']); ?>" data-status="<?php p($_['twitterVerification']) ?>" src="
 					<?php
-					switch ($_['twitterVerification']) {
-						case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS:
-							p(image_path('core', 'actions/verifying.svg'));
-							break;
-						case \OC\Accounts\AccountManager::VERIFIED:
-							p(image_path('core', 'actions/verified.svg'));
-							break;
-						default:
-							p(image_path('core', 'actions/verify.svg'));
-					}
-					?>"
+                    switch ($_['twitterVerification']) {
+                        case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS:
+                            p(image_path('core', 'actions/verifying.svg'));
+                            break;
+                        case \OC\Accounts\AccountManager::VERIFIED:
+                            p(image_path('core', 'actions/verified.svg'));
+                            break;
+                        default:
+                            p(image_path('core', 'actions/verify.svg'));
+                    }
+                    ?>"
 					<?php if ($_['twitterVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS || $_['twitterVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) {
-						print_unescaped(' class="verify-action"');
-					} ?>
+                        print_unescaped(' class="verify-action"');
+                    } ?>
 					>
 					<div class="verification-dialog popovermenu bubble menu">
 						<div class="verification-dialog-content">

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

Indentation +277 added lines, -277 removed lines

@@ -54,281 +54,281 @@
 
 class PersonalInfo implements ISettings {
 
-	/** @var IConfig */
-	private $config;
-	/** @var IUserManager */
-	private $userManager;
-	/** @var IAccountManager */
-	private $accountManager;
-	/** @var IGroupManager */
-	private $groupManager;
-	/** @var IAppManager */
-	private $appManager;
-	/** @var IFactory */
-	private $l10nFactory;
-	/** @var IL10N */
-	private $l;
-	/** @var IInitialState */
-	private $initialStateService;
-
-	public function __construct(
-		IConfig $config,
-		IUserManager $userManager,
-		IGroupManager $groupManager,
-		IAccountManager $accountManager,
-		IAppManager $appManager,
-		IFactory $l10nFactory,
-		IL10N $l,
-		IInitialState $initialStateService
-	) {
-		$this->config = $config;
-		$this->userManager = $userManager;
-		$this->accountManager = $accountManager;
-		$this->groupManager = $groupManager;
-		$this->appManager = $appManager;
-		$this->l10nFactory = $l10nFactory;
-		$this->l = $l;
-		$this->initialStateService = $initialStateService;
-	}
-
-	public function getForm(): TemplateResponse {
-		$federatedFileSharingEnabled = $this->appManager->isEnabledForUser('federatedfilesharing');
-		$lookupServerUploadEnabled = false;
-		if ($federatedFileSharingEnabled) {
-			/** @var FederatedShareProvider $shareProvider */
-			$shareProvider = \OC::$server->query(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 = \OC_Helper::humanFileSize($storageInfo['total']);
-		}
-
-		$languageParameters = $this->getLanguages($user);
-		$localeParameters = $this->getLocales($user);
-		$messageParameters = $this->getMessageParameters($account);
-
-		$parameters = [
-			'total_space' => $totalSpace,
-			'usage' => \OC_Helper::humanFileSize($storageInfo['used']),
-			'usage_relative' => round($storageInfo['relative']),
-			'quota' => $storageInfo['quota'],
-			'avatarChangeSupported' => $user->canChangeAvatar(),
-			'lookupServerUploadEnabled' => $lookupServerUploadEnabled,
-			'avatarScope' => $account->getProperty(IAccountManager::PROPERTY_AVATAR)->getScope(),
-			'displayNameChangeSupported' => $user->canChangeDisplayName(),
-			'displayName' => $account->getProperty(IAccountManager::PROPERTY_DISPLAYNAME)->getValue(),
-			'displayNameScope' => $account->getProperty(IAccountManager::PROPERTY_DISPLAYNAME)->getScope(),
-			'email' => $account->getProperty(IAccountManager::PROPERTY_EMAIL)->getValue(),
-			'emailScope' => $account->getProperty(IAccountManager::PROPERTY_EMAIL)->getScope(),
-			'emailVerification' => $account->getProperty(IAccountManager::PROPERTY_EMAIL)->getVerified(),
-			'phone' => $account->getProperty(IAccountManager::PROPERTY_PHONE)->getValue(),
-			'phoneScope' => $account->getProperty(IAccountManager::PROPERTY_PHONE)->getScope(),
-			'address' => $account->getProperty(IAccountManager::PROPERTY_ADDRESS)->getValue(),
-			'addressScope' => $account->getProperty(IAccountManager::PROPERTY_ADDRESS)->getScope(),
-			'website' => $account->getProperty(IAccountManager::PROPERTY_WEBSITE)->getValue(),
-			'websiteScope' => $account->getProperty(IAccountManager::PROPERTY_WEBSITE)->getScope(),
-			'websiteVerification' => $account->getProperty(IAccountManager::PROPERTY_WEBSITE)->getVerified(),
-			'twitter' => $account->getProperty(IAccountManager::PROPERTY_TWITTER)->getValue(),
-			'twitterScope' => $account->getProperty(IAccountManager::PROPERTY_TWITTER)->getScope(),
-			'twitterVerification' => $account->getProperty(IAccountManager::PROPERTY_TWITTER)->getVerified(),
-			'groups' => $this->getGroups($user),
-		] + $messageParameters + $languageParameters + $localeParameters;
-
-		$emails = $this->getEmails($account);
-
-		$accountParameters = [
-			'displayNameChangeSupported' => $user->canChangeDisplayName(),
-		];
-
-		$this->initialStateService->provideInitialState('emails', $emails);
-		$this->initialStateService->provideInitialState('accountParameters', $accountParameters);
-
-		return new TemplateResponse('settings', 'settings/personal/personal.info', $parameters, '');
-	}
-
-	/**
-	 * @return string the section ID, 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
-	 *
-	 * @param IUser $user
-	 * @return array
-	 */
-	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
-	 *
-	 * @param IAccount $account
-	 * @return array
-	 */
-	private function getEmails(IAccount $account): array {
-		$primaryEmail = [
-			'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 [
-					'value' => $property->getValue(),
-					'scope' => $property->getScope(),
-					'verified' => $property->getVerified(),
-				];
-			},
-			$account->getPropertyCollection(IAccountManager::COLLECTION_EMAIL)->getProperties()
-		);
-
-		$emails = [
-			'primaryEmail' => $primaryEmail,
-			'additionalEmails' => $additionalEmails,
-		];
-
-		return $emails;
-	}
-
-	/**
-	 * returns the user language, common language and other languages in an
-	 * associative array
-	 *
-	 * @param IUser $user
-	 * @return array
-	 */
-	private function getLanguages(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['languages'], 'code'));
-			$userLang = $languages['languages'][$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 getLocales(IUser $user): array {
-		$forceLanguage = $this->config->getSystemValue('force_locale', false);
-		if ($forceLanguage !== false) {
-			return [];
-		}
-
-		$uid = $user->getUID();
-
-		$userLocaleString = $this->config->getUserValue($uid, 'core', 'locale', $this->l10nFactory->findLocale());
-
-		$userLang = $this->config->getUserValue($uid, 'core', 'lang', $this->l10nFactory->findLanguage());
-
-		$localeCodes = $this->l10nFactory->findAvailableLocales();
-
-		$userLocale = array_filter($localeCodes, function ($value) use ($userLocaleString) {
-			return $userLocaleString === $value['code'];
-		});
-
-		if (!empty($userLocale)) {
-			$userLocale = reset($userLocale);
-		}
-
-		$localesForLanguage = array_filter($localeCodes, function ($localeCode) use ($userLang) {
-			return 0 === strpos($localeCode['code'], $userLang);
-		});
-
-		if (!$userLocale) {
-			$userLocale = [
-				'code' => 'en',
-				'name' => 'English'
-			];
-		}
-
-		return [
-			'activelocaleLang' => $userLocaleString,
-			'activelocale' => $userLocale,
-			'locales' => $localeCodes,
-			'localesForLanguage' => $localesForLanguage,
-		];
-	}
-
-	/**
-	 * @param IAccount $account
-	 * @return array
-	 */
-	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 IConfig */
+    private $config;
+    /** @var IUserManager */
+    private $userManager;
+    /** @var IAccountManager */
+    private $accountManager;
+    /** @var IGroupManager */
+    private $groupManager;
+    /** @var IAppManager */
+    private $appManager;
+    /** @var IFactory */
+    private $l10nFactory;
+    /** @var IL10N */
+    private $l;
+    /** @var IInitialState */
+    private $initialStateService;
+
+    public function __construct(
+        IConfig $config,
+        IUserManager $userManager,
+        IGroupManager $groupManager,
+        IAccountManager $accountManager,
+        IAppManager $appManager,
+        IFactory $l10nFactory,
+        IL10N $l,
+        IInitialState $initialStateService
+    ) {
+        $this->config = $config;
+        $this->userManager = $userManager;
+        $this->accountManager = $accountManager;
+        $this->groupManager = $groupManager;
+        $this->appManager = $appManager;
+        $this->l10nFactory = $l10nFactory;
+        $this->l = $l;
+        $this->initialStateService = $initialStateService;
+    }
+
+    public function getForm(): TemplateResponse {
+        $federatedFileSharingEnabled = $this->appManager->isEnabledForUser('federatedfilesharing');
+        $lookupServerUploadEnabled = false;
+        if ($federatedFileSharingEnabled) {
+            /** @var FederatedShareProvider $shareProvider */
+            $shareProvider = \OC::$server->query(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 = \OC_Helper::humanFileSize($storageInfo['total']);
+        }
+
+        $languageParameters = $this->getLanguages($user);
+        $localeParameters = $this->getLocales($user);
+        $messageParameters = $this->getMessageParameters($account);
+
+        $parameters = [
+            'total_space' => $totalSpace,
+            'usage' => \OC_Helper::humanFileSize($storageInfo['used']),
+            'usage_relative' => round($storageInfo['relative']),
+            'quota' => $storageInfo['quota'],
+            'avatarChangeSupported' => $user->canChangeAvatar(),
+            'lookupServerUploadEnabled' => $lookupServerUploadEnabled,
+            'avatarScope' => $account->getProperty(IAccountManager::PROPERTY_AVATAR)->getScope(),
+            'displayNameChangeSupported' => $user->canChangeDisplayName(),
+            'displayName' => $account->getProperty(IAccountManager::PROPERTY_DISPLAYNAME)->getValue(),
+            'displayNameScope' => $account->getProperty(IAccountManager::PROPERTY_DISPLAYNAME)->getScope(),
+            'email' => $account->getProperty(IAccountManager::PROPERTY_EMAIL)->getValue(),
+            'emailScope' => $account->getProperty(IAccountManager::PROPERTY_EMAIL)->getScope(),
+            'emailVerification' => $account->getProperty(IAccountManager::PROPERTY_EMAIL)->getVerified(),
+            'phone' => $account->getProperty(IAccountManager::PROPERTY_PHONE)->getValue(),
+            'phoneScope' => $account->getProperty(IAccountManager::PROPERTY_PHONE)->getScope(),
+            'address' => $account->getProperty(IAccountManager::PROPERTY_ADDRESS)->getValue(),
+            'addressScope' => $account->getProperty(IAccountManager::PROPERTY_ADDRESS)->getScope(),
+            'website' => $account->getProperty(IAccountManager::PROPERTY_WEBSITE)->getValue(),
+            'websiteScope' => $account->getProperty(IAccountManager::PROPERTY_WEBSITE)->getScope(),
+            'websiteVerification' => $account->getProperty(IAccountManager::PROPERTY_WEBSITE)->getVerified(),
+            'twitter' => $account->getProperty(IAccountManager::PROPERTY_TWITTER)->getValue(),
+            'twitterScope' => $account->getProperty(IAccountManager::PROPERTY_TWITTER)->getScope(),
+            'twitterVerification' => $account->getProperty(IAccountManager::PROPERTY_TWITTER)->getVerified(),
+            'groups' => $this->getGroups($user),
+        ] + $messageParameters + $languageParameters + $localeParameters;
+
+        $emails = $this->getEmails($account);
+
+        $accountParameters = [
+            'displayNameChangeSupported' => $user->canChangeDisplayName(),
+        ];
+
+        $this->initialStateService->provideInitialState('emails', $emails);
+        $this->initialStateService->provideInitialState('accountParameters', $accountParameters);
+
+        return new TemplateResponse('settings', 'settings/personal/personal.info', $parameters, '');
+    }
+
+    /**
+     * @return string the section ID, 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
+     *
+     * @param IUser $user
+     * @return array
+     */
+    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
+     *
+     * @param IAccount $account
+     * @return array
+     */
+    private function getEmails(IAccount $account): array {
+        $primaryEmail = [
+            '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 [
+                    'value' => $property->getValue(),
+                    'scope' => $property->getScope(),
+                    'verified' => $property->getVerified(),
+                ];
+            },
+            $account->getPropertyCollection(IAccountManager::COLLECTION_EMAIL)->getProperties()
+        );
+
+        $emails = [
+            'primaryEmail' => $primaryEmail,
+            'additionalEmails' => $additionalEmails,
+        ];
+
+        return $emails;
+    }
+
+    /**
+     * returns the user language, common language and other languages in an
+     * associative array
+     *
+     * @param IUser $user
+     * @return array
+     */
+    private function getLanguages(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['languages'], 'code'));
+            $userLang = $languages['languages'][$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 getLocales(IUser $user): array {
+        $forceLanguage = $this->config->getSystemValue('force_locale', false);
+        if ($forceLanguage !== false) {
+            return [];
+        }
+
+        $uid = $user->getUID();
+
+        $userLocaleString = $this->config->getUserValue($uid, 'core', 'locale', $this->l10nFactory->findLocale());
+
+        $userLang = $this->config->getUserValue($uid, 'core', 'lang', $this->l10nFactory->findLanguage());
+
+        $localeCodes = $this->l10nFactory->findAvailableLocales();
+
+        $userLocale = array_filter($localeCodes, function ($value) use ($userLocaleString) {
+            return $userLocaleString === $value['code'];
+        });
+
+        if (!empty($userLocale)) {
+            $userLocale = reset($userLocale);
+        }
+
+        $localesForLanguage = array_filter($localeCodes, function ($localeCode) use ($userLang) {
+            return 0 === strpos($localeCode['code'], $userLang);
+        });
+
+        if (!$userLocale) {
+            $userLocale = [
+                'code' => 'en',
+                'name' => 'English'
+            ];
+        }
+
+        return [
+            'activelocaleLang' => $userLocaleString,
+            'activelocale' => $userLocale,
+            'locales' => $localeCodes,
+            'localesForLanguage' => $localesForLanguage,
+        ];
+    }
+
+    /**
+     * @param IAccount $account
+     * @return array
+     */
+    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;
+    }
 }

Spacing +5 added lines, -5 removed lines

@@ -185,7 +185,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)
@@ -210,7 +210,7 @@ 
 		];
 
 		$additionalEmails = array_map(
-			function (IAccountProperty $property) {
+			function(IAccountProperty $property) {
 				return [
 					'value' => $property->getValue(),
 					'scope' => $property->getScope(),
@@ -282,7 +282,7 @@ 
 
 		$localeCodes = $this->l10nFactory->findAvailableLocales();
 
-		$userLocale = array_filter($localeCodes, function ($value) use ($userLocaleString) {
+		$userLocale = array_filter($localeCodes, function($value) use ($userLocaleString) {
 			return $userLocaleString === $value['code'];
 		});
 
@@ -290,7 +290,7 @@ 
 			$userLocale = reset($userLocale);
 		}
 
-		$localesForLanguage = array_filter($localeCodes, function ($localeCode) use ($userLang) {
+		$localesForLanguage = array_filter($localeCodes, function($localeCode) use ($userLang) {
 			return 0 === strpos($localeCode['code'], $userLang);
 		});
 
@@ -327,7 +327,7 @@ 
 				default:
 					$message = $this->l->t('Verify');
 			}
-			$messageParameters[$property . 'Message'] = $message;
+			$messageParameters[$property.'Message'] = $message;
 		}
 		return $messageParameters;
 	}