nextcloud / server

settings/personal.php

Indentation +79 added lines, -79 removed lines

@@ -41,9 +41,9 @@ 
 $defaults = \OC::$server->getThemingDefaults();
 $certificateManager = \OC::$server->getCertificateManager();
 $accountManager = new \OC\Accounts\AccountManager(
-	\OC::$server->getDatabaseConnection(),
-	\OC::$server->getEventDispatcher(),
-	\OC::$server->getJobList()
+    \OC::$server->getDatabaseConnection(),
+    \OC::$server->getEventDispatcher(),
+    \OC::$server->getJobList()
 );
 $config = \OC::$server->getConfig();
 $urlGenerator = \OC::$server->getURLGenerator();
@@ -78,72 +78,72 @@ 
 
 // array of common languages
 $commonLangCodes = array(
-	'en', 'es', 'fr', 'de', 'de_DE', 'ja', 'ar', 'ru', 'nl', 'it', 'pt_BR', 'pt_PT', 'da', 'fi_FI', 'nb_NO', 'sv', 'tr', 'zh_CN', 'ko'
+    'en', 'es', 'fr', 'de', 'de_DE', 'ja', 'ar', 'ru', 'nl', 'it', 'pt_BR', 'pt_PT', 'da', 'fi_FI', 'nb_NO', 'sv', 'tr', 'zh_CN', 'ko'
 );
 
 $languages=array();
 $commonLanguages = array();
 foreach($languageCodes as $lang) {
-	$l = \OC::$server->getL10N('settings', $lang);
-	// TRANSLATORS this is the language name for the language switcher in the personal settings and should be the localized version
-	$potentialName = (string) $l->t('__language_name__');
-	if($l->getLanguageCode() === $lang && substr($potentialName, 0, 1) !== '_') {//first check if the language name is in the translation file
-		$ln = array('code' => $lang, 'name' => $potentialName);
-	} elseif ($lang === 'en') {
-		$ln = ['code' => $lang, 'name' => 'English (US)'];
-	}else{//fallback to language code
-		$ln=array('code'=>$lang, 'name'=>$lang);
-	}
-
-	// put appropriate languages into appropriate arrays, to print them sorted
-	// used language -> common languages -> divider -> other languages
-	if ($lang === $userLang) {
-		$userLang = $ln;
-	} elseif (in_array($lang, $commonLangCodes)) {
-		$commonLanguages[array_search($lang, $commonLangCodes)]=$ln;
-	} else {
-		$languages[]=$ln;
-	}
+    $l = \OC::$server->getL10N('settings', $lang);
+    // TRANSLATORS this is the language name for the language switcher in the personal settings and should be the localized version
+    $potentialName = (string) $l->t('__language_name__');
+    if($l->getLanguageCode() === $lang && substr($potentialName, 0, 1) !== '_') {//first check if the language name is in the translation file
+        $ln = array('code' => $lang, 'name' => $potentialName);
+    } elseif ($lang === 'en') {
+        $ln = ['code' => $lang, 'name' => 'English (US)'];
+    }else{//fallback to language code
+        $ln=array('code'=>$lang, 'name'=>$lang);
+    }
+
+    // put appropriate languages into appropriate arrays, to print them sorted
+    // used language -> common languages -> divider -> other languages
+    if ($lang === $userLang) {
+        $userLang = $ln;
+    } elseif (in_array($lang, $commonLangCodes)) {
+        $commonLanguages[array_search($lang, $commonLangCodes)]=$ln;
+    } else {
+        $languages[]=$ln;
+    }
 }
 
 // if user language is not available but set somehow: show the actual code as name
 if (!is_array($userLang)) {
-	$userLang = [
-		'code' => $userLang,
-		'name' => $userLang,
-	];
+    $userLang = [
+        'code' => $userLang,
+        'name' => $userLang,
+    ];
 }
 
 ksort($commonLanguages);
 
 // sort now by displayed language not the iso-code
 usort( $languages, function ($a, $b) {
-	if ($a['code'] === $a['name'] && $b['code'] !== $b['name']) {
-		// If a doesn't have a name, but b does, list b before a
-		return 1;
-	}
-	if ($a['code'] !== $a['name'] && $b['code'] === $b['name']) {
-		// If a does have a name, but b doesn't, list a before b
-		return -1;
-	}
-	// Otherwise compare the names
-	return strcmp($a['name'], $b['name']);
+    if ($a['code'] === $a['name'] && $b['code'] !== $b['name']) {
+        // If a doesn't have a name, but b does, list b before a
+        return 1;
+    }
+    if ($a['code'] !== $a['name'] && $b['code'] === $b['name']) {
+        // If a does have a name, but b doesn't, list a before b
+        return -1;
+    }
+    // Otherwise compare the names
+    return strcmp($a['name'], $b['name']);
 });
 
 //links to clients
 $clients = array(
-	'desktop' => $config->getSystemValue('customclient_desktop', $defaults->getSyncClientUrl()),
-	'android' => $config->getSystemValue('customclient_android', $defaults->getAndroidClientUrl()),
-	'ios'     => $config->getSystemValue('customclient_ios', $defaults->getiOSClientUrl())
+    'desktop' => $config->getSystemValue('customclient_desktop', $defaults->getSyncClientUrl()),
+    'android' => $config->getSystemValue('customclient_android', $defaults->getAndroidClientUrl()),
+    'ios'     => $config->getSystemValue('customclient_ios', $defaults->getiOSClientUrl())
 );
 
 // only show root certificate import if external storages are enabled
 $enableCertImport = false;
 $externalStorageEnabled = \OC::$server->getAppManager()->isEnabledForUser('files_external');
 if ($externalStorageEnabled) {
-	/** @var \OCA\Files_External\Service\BackendService $backendService */
-	$backendService = \OC_Mount_Config::$app->getContainer()->query('\OCA\Files_External\Service\BackendService');
-	$enableCertImport = $backendService->isUserMountingAllowed();
+    /** @var \OCA\Files_External\Service\BackendService $backendService */
+    $backendService = \OC_Mount_Config::$app->getContainer()->query('\OCA\Files_External\Service\BackendService');
+    $enableCertImport = $backendService->isUserMountingAllowed();
 }
 
 
@@ -152,9 +152,9 @@ 
 $tmpl = new OC_Template( 'settings', 'personal', 'user');
 $tmpl->assign('usage', OC_Helper::humanFileSize($storageInfo['used']));
 if ($storageInfo['quota'] === \OCP\Files\FileInfo::SPACE_UNLIMITED) {
-	$totalSpace = $l->t('Unlimited');
+    $totalSpace = $l->t('Unlimited');
 } else {
-	$totalSpace = OC_Helper::humanFileSize($storageInfo['total']);
+    $totalSpace = OC_Helper::humanFileSize($storageInfo['total']);
 }
 
 $uid = $user->getUID();
@@ -193,18 +193,18 @@ 
 
 foreach ($needVerifyMessage as $property) {
 
-	switch ($userData[$property]['verified']) {
-		case \OC\Accounts\AccountManager::VERIFIED:
-			$message = $l->t('Verifying');
-			break;
-		case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS:
-			$message = $l->t('Verifying …');
-			break;
-		default:
-			$message = $l->t('Verify');
-	}
-
-	$tmpl->assign($property . 'Message', $message);
+    switch ($userData[$property]['verified']) {
+        case \OC\Accounts\AccountManager::VERIFIED:
+            $message = $l->t('Verifying');
+            break;
+        case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS:
+            $message = $l->t('Verifying …');
+            break;
+        default:
+            $message = $l->t('Verify');
+    }
+
+    $tmpl->assign($property . 'Message', $message);
 }
 
 $tmpl->assign('avatarChangeSupported', OC_User::canUserChangeAvatar(OC_User::getUser()));
@@ -234,30 +234,30 @@ 
 
 // add bottom hardcoded forms from the template
 if ($enableCertImport) {
-	$certificatesTemplate = new OC_Template('settings', 'certificates');
-	$certificatesTemplate->assign('type', 'personal');
-	$certificatesTemplate->assign('uploadRoute', 'settings.Certificate.addPersonalRootCertificate');
-	$certificatesTemplate->assign('certs', $certificateManager->listCertificates());
-	$certificatesTemplate->assign('urlGenerator', $urlGenerator);
-	$forms[] = $certificatesTemplate->fetchPage();
+    $certificatesTemplate = new OC_Template('settings', 'certificates');
+    $certificatesTemplate->assign('type', 'personal');
+    $certificatesTemplate->assign('uploadRoute', 'settings.Certificate.addPersonalRootCertificate');
+    $certificatesTemplate->assign('certs', $certificateManager->listCertificates());
+    $certificatesTemplate->assign('urlGenerator', $urlGenerator);
+    $forms[] = $certificatesTemplate->fetchPage();
 }
 
 $formsMap = array_map(function($form){
-	if (preg_match('%(<h2(?P<class>[^>]*)>.*?</h2>)%i', $form, $regs)) {
-		$sectionName = str_replace('<h2'.$regs['class'].'>', '', $regs[0]);
-		$sectionName = str_replace('</h2>', '', $sectionName);
-		$anchor = strtolower($sectionName);
-		$anchor = str_replace(' ', '-', $anchor);
-
-		return array(
-			'anchor' => $anchor,
-			'section-name' => $sectionName,
-			'form' => $form
-		);
-	}
-	return array(
-		'form' => $form
-	);
+    if (preg_match('%(<h2(?P<class>[^>]*)>.*?</h2>)%i', $form, $regs)) {
+        $sectionName = str_replace('<h2'.$regs['class'].'>', '', $regs[0]);
+        $sectionName = str_replace('</h2>', '', $sectionName);
+        $anchor = strtolower($sectionName);
+        $anchor = str_replace(' ', '-', $anchor);
+
+        return array(
+            'anchor' => $anchor,
+            'section-name' => $sectionName,
+            'form' => $form
+        );
+    }
+    return array(
+        'form' => $form
+    );
 }, $forms);
 
 $formsAndMore = array_merge($formsAndMore, $formsMap);

Spacing +19 added lines, -19 removed lines

@@ -57,7 +57,7 @@ 
 OC_Util::addScript('settings', 'federationscopemenu');
 OC_Util::addScript('settings', 'personal');
 OC_Util::addScript('settings', 'certificates');
-OC_Util::addStyle( 'settings', 'settings' );
+OC_Util::addStyle('settings', 'settings');
 \OC_Util::addVendorScript('strengthify/jquery.strengthify');
 \OC_Util::addVendorStyle('strengthify/strengthify');
 \OC_Util::addScript('files', 'jquery.fileupload');
@@ -69,11 +69,11 @@ 
 // Highlight navigation entry
 OC::$server->getNavigationManager()->setActiveEntry('personal');
 
-$storageInfo=OC_Helper::getStorageInfo('/');
+$storageInfo = OC_Helper::getStorageInfo('/');
 
 $user = OC::$server->getUserManager()->get(OC_User::getUser());
 
-$userLang=$config->getUserValue( OC_User::getUser(), 'core', 'lang', \OC::$server->getL10NFactory()->findLanguage() );
+$userLang = $config->getUserValue(OC_User::getUser(), 'core', 'lang', \OC::$server->getL10NFactory()->findLanguage());
 $languageCodes = \OC::$server->getL10NFactory()->findAvailableLanguages();
 
 // array of common languages
@@ -81,18 +81,18 @@ 
 	'en', 'es', 'fr', 'de', 'de_DE', 'ja', 'ar', 'ru', 'nl', 'it', 'pt_BR', 'pt_PT', 'da', 'fi_FI', 'nb_NO', 'sv', 'tr', 'zh_CN', 'ko'
 );
 
-$languages=array();
+$languages = array();
 $commonLanguages = array();
-foreach($languageCodes as $lang) {
+foreach ($languageCodes as $lang) {
 	$l = \OC::$server->getL10N('settings', $lang);
 	// TRANSLATORS this is the language name for the language switcher in the personal settings and should be the localized version
 	$potentialName = (string) $l->t('__language_name__');
-	if($l->getLanguageCode() === $lang && substr($potentialName, 0, 1) !== '_') {//first check if the language name is in the translation file
+	if ($l->getLanguageCode() === $lang && substr($potentialName, 0, 1) !== '_') {//first check if the language name is in the translation file
 		$ln = array('code' => $lang, 'name' => $potentialName);
 	} elseif ($lang === 'en') {
 		$ln = ['code' => $lang, 'name' => 'English (US)'];
-	}else{//fallback to language code
-		$ln=array('code'=>$lang, 'name'=>$lang);
+	} else {//fallback to language code
+		$ln = array('code'=>$lang, 'name'=>$lang);
 	}
 
 	// put appropriate languages into appropriate arrays, to print them sorted
@@ -100,9 +100,9 @@ 
 	if ($lang === $userLang) {
 		$userLang = $ln;
 	} elseif (in_array($lang, $commonLangCodes)) {
-		$commonLanguages[array_search($lang, $commonLangCodes)]=$ln;
+		$commonLanguages[array_search($lang, $commonLangCodes)] = $ln;
 	} else {
-		$languages[]=$ln;
+		$languages[] = $ln;
 	}
 }
 
@@ -117,7 +117,7 @@ 
 ksort($commonLanguages);
 
 // sort now by displayed language not the iso-code
-usort( $languages, function ($a, $b) {
+usort($languages, function($a, $b) {
 	if ($a['code'] === $a['name'] && $b['code'] !== $b['name']) {
 		// If a doesn't have a name, but b does, list b before a
 		return 1;
@@ -149,7 +149,7 @@ 
 
 // Return template
 $l = \OC::$server->getL10N('settings');
-$tmpl = new OC_Template( 'settings', 'personal', 'user');
+$tmpl = new OC_Template('settings', 'personal', 'user');
 $tmpl->assign('usage', OC_Helper::humanFileSize($storageInfo['used']));
 if ($storageInfo['quota'] === \OCP\Files\FileInfo::SPACE_UNLIMITED) {
 	$totalSpace = $l->t('Unlimited');
@@ -204,7 +204,7 @@ 
 			$message = $l->t('Verify');
 	}
 
-	$tmpl->assign($property . 'Message', $message);
+	$tmpl->assign($property.'Message', $message);
 }
 
 $tmpl->assign('avatarChangeSupported', OC_User::canUserChangeAvatar(OC_User::getUser()));
@@ -224,12 +224,12 @@ 
 
 // add hardcoded forms from the template
 $formsAndMore = [];
-$formsAndMore[]= ['anchor' => 'personal-settings', 'section-name' => $l->t('Personal info')];
-$formsAndMore[]= ['anchor' => 'sessions', 'section-name' => $l->t('Sessions')];
-$formsAndMore[]= ['anchor' => 'apppasswords', 'section-name' => $l->t('App passwords')];
-$formsAndMore[]= ['anchor' => 'clientsbox', 'section-name' => $l->t('Sync clients')];
+$formsAndMore[] = ['anchor' => 'personal-settings', 'section-name' => $l->t('Personal info')];
+$formsAndMore[] = ['anchor' => 'sessions', 'section-name' => $l->t('Sessions')];
+$formsAndMore[] = ['anchor' => 'apppasswords', 'section-name' => $l->t('App passwords')];
+$formsAndMore[] = ['anchor' => 'clientsbox', 'section-name' => $l->t('Sync clients')];
 
-$forms=OC_App::getForms('personal');
+$forms = OC_App::getForms('personal');
 
 
 // add bottom hardcoded forms from the template
@@ -242,7 +242,7 @@ 
 	$forms[] = $certificatesTemplate->fetchPage();
 }
 
-$formsMap = array_map(function($form){
+$formsMap = array_map(function($form) {
 	if (preg_match('%(<h2(?P<class>[^>]*)>.*?</h2>)%i', $form, $regs)) {
 		$sectionName = str_replace('<h2'.$regs['class'].'>', '', $regs[0]);
 		$sectionName = str_replace('</h2>', '', $sectionName);

apps/lookup_server_connector/lib/BackgroundJobs/RetryJob.php

Indentation +49 added lines, -49 removed lines

@@ -29,61 +29,61 @@
 use OCP\ILogger;
 
 class RetryJob extends Job {
-	/** @var IClientService */
-	private $clientService;
-	/** @var IJobList */
-	private $jobList;
-	/** @var string */
-	private $lookupServer = 'https://lookup.nextcloud.com/users';
+    /** @var IClientService */
+    private $clientService;
+    /** @var IJobList */
+    private $jobList;
+    /** @var string */
+    private $lookupServer = 'https://lookup.nextcloud.com/users';
 
-	/**
-	 * @param IClientService $clientService
-	 * @param IJobList $jobList
-	 */
-	public function __construct(IClientService $clientService,
-								IJobList $jobList) {
-		$this->clientService = $clientService;
-		$this->jobList = $jobList;
-	}
+    /**
+     * @param IClientService $clientService
+     * @param IJobList $jobList
+     */
+    public function __construct(IClientService $clientService,
+                                IJobList $jobList) {
+        $this->clientService = $clientService;
+        $this->jobList = $jobList;
+    }
 
-	/**
-	 * run the job, then remove it from the jobList
-	 *
-	 * @param JobList $jobList
-	 * @param ILogger $logger
-	 */
-	public function execute($jobList, ILogger $logger = null) {
+    /**
+     * run the job, then remove it from the jobList
+     *
+     * @param JobList $jobList
+     * @param ILogger $logger
+     */
+    public function execute($jobList, ILogger $logger = null) {
 
-		if ($this->shouldRun($this->argument)) {
-			parent::execute($jobList, $logger);
-			$jobList->remove($this, $this->argument);
-		}
+        if ($this->shouldRun($this->argument)) {
+            parent::execute($jobList, $logger);
+            $jobList->remove($this, $this->argument);
+        }
 
-	}
+    }
 
-	protected function run($argument) {
-		if($argument['retryNo'] === 5) {
-			return;
-		}
+    protected function run($argument) {
+        if($argument['retryNo'] === 5) {
+            return;
+        }
 
-		$client = $this->clientService->newClient();
+        $client = $this->clientService->newClient();
 
-		try {
-			$client->post($this->lookupServer,
-				[
-					'body' => json_encode($argument['dataArray']),
-					'timeout' => 10,
-					'connect_timeout' => 3,
-				]
-			);
-		} catch (\Exception $e) {
-			$this->jobList->add(RetryJob::class,
-				[
-					'dataArray' => $argument['dataArray'],
-					'retryNo' => $argument['retryNo'] + 1,
-				]
-			);
+        try {
+            $client->post($this->lookupServer,
+                [
+                    'body' => json_encode($argument['dataArray']),
+                    'timeout' => 10,
+                    'connect_timeout' => 3,
+                ]
+            );
+        } catch (\Exception $e) {
+            $this->jobList->add(RetryJob::class,
+                [
+                    'dataArray' => $argument['dataArray'],
+                    'retryNo' => $argument['retryNo'] + 1,
+                ]
+            );
 
-		}
-	}
+        }
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -62,7 +62,7 @@
 	}
 
 	protected function run($argument) {
-		if($argument['retryNo'] === 5) {
+		if ($argument['retryNo'] === 5) {
 			return;
 		}
 

settings/templates/personal.php

Indentation +54 added lines, -54 removed lines

@@ -11,14 +11,14 @@ 
 <div id="app-navigation">
 	<ul class="with-icon">
 	<?php foreach($_['forms'] as $form) {
-		if (isset($form['anchor'])) {
-			$anchor = '#' . $form['anchor'];
-			$class = 'nav-icon-' . $form['anchor'];
-			$sectionName = $form['section-name'];
-			print_unescaped(sprintf("<li><a href='%s' class='%s'>%s</a></li>", \OCP\Util::sanitizeHTML($anchor),
-			\OCP\Util::sanitizeHTML($class), \OCP\Util::sanitizeHTML($sectionName)));
-		}
-	}?>
+        if (isset($form['anchor'])) {
+            $anchor = '#' . $form['anchor'];
+            $class = 'nav-icon-' . $form['anchor'];
+            $sectionName = $form['section-name'];
+            print_unescaped(sprintf("<li><a href='%s' class='%s'>%s</a></li>", \OCP\Util::sanitizeHTML($anchor),
+            \OCP\Util::sanitizeHTML($class), \OCP\Util::sanitizeHTML($sectionName)));
+        }
+    }?>
 	</ul>
 </div>
 
@@ -30,10 +30,10 @@ 
 		<p id="quotatext">
 			<?php if ($_['quota'] === \OCP\Files\FileInfo::SPACE_UNLIMITED): ?>
 				<?php print_unescaped($l->t('You are using <strong>%s</strong> of <strong>%s</strong>',
-					[$_['usage'], $_['total_space']]));?>
+                    [$_['usage'], $_['total_space']]));?>
 			<?php else: ?>
 				<?php print_unescaped($l->t('You are using <strong>%s</strong> of <strong>%s</strong> (<strong>%s %%</strong>)',
-					[$_['usage'], $_['total_space'],  $_['usage_relative']]));?>
+                    [$_['usage'], $_['total_space'],  $_['usage_relative']]));?>
 			<?php endif ?>
 		</p>
 	</div>
@@ -102,17 +102,17 @@ 
 			<div class="verify <?php if ($_['email'] === ''  || $_['emailScope'] !== 'public') p('hidden'); ?>">
 				<img id="verify-email" title="<?php p($_['emailMessage']); ?>" data-status="<?php p($_['emailVerification']) ?>" src="
 				<?php
-				switch($_['emailVerification']) {
-					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($_['emailVerification']) {
+                    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'));
+                }
+                ?>">
 			</div>
 			<input type="email" name="email" id="email" value="<?php p($_['email']); ?>"
 				<?php if(!$_['displayNameChangeSupported']) { print_unescaped('class="hidden"'); } ?>
@@ -169,17 +169,17 @@ 
 			<div class="verify <?php if ($_['website'] === ''  || $_['websiteScope'] !== 'public') 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"') ?>
 				>
 				<div class="verification-dialog popovermenu bubble menu">
@@ -206,17 +206,17 @@ 
 			<div class="verify <?php if ($_['twitter'] === ''  || $_['twitterScope'] !== 'public') 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"') ?>
 				>
 				<div class="verification-dialog popovermenu bubble menu">
@@ -249,7 +249,7 @@ 
 
 <?php
 if($_['passwordChangeSupported']) {
-	script('jquery-showpassword');
+    script('jquery-showpassword');
 ?>
 <form id="passwordform" class="section">
 	<h2 class="inlineblock"><?php p($l->t('Password'));?></h2>
@@ -318,15 +318,15 @@ 
 
 		<p>
 			<?php print_unescaped(str_replace(
-				[
-					'{contributeopen}',
-					'{linkclose}',
-				],
-				[
-					'<a href="https://nextcloud.com/contribute" target="_blank" rel="noreferrer">',
-					'</a>',
-				],
-				$l->t('If you want to support the project {contributeopen}join development{linkclose} or {contributeopen}spread the word{linkclose}!'))); ?>
+                [
+                    '{contributeopen}',
+                    '{linkclose}',
+                ],
+                [
+                    '<a href="https://nextcloud.com/contribute" target="_blank" rel="noreferrer">',
+                    '</a>',
+                ],
+                $l->t('If you want to support the project {contributeopen}join development{linkclose} or {contributeopen}spread the word{linkclose}!'))); ?>
 		</p>
 
 	<?php if(OC_APP::isEnabled('firstrunwizard')) {?>
@@ -387,7 +387,7 @@ 
 </div>
 
 <?php foreach($_['forms'] as $form) {
-	if (isset($form['form'])) {?>
+    if (isset($form['form'])) {?>
 	<div id="<?php isset($form['anchor']) ? p($form['anchor']) : p('');?>"><?php print_unescaped($form['form']);?></div>
 	<?php }
 };?>

Spacing +62 added lines, -62 removed lines

@@ -10,10 +10,10 @@ 
 
 <div id="app-navigation">
 	<ul class="with-icon">
-	<?php foreach($_['forms'] as $form) {
+	<?php foreach ($_['forms'] as $form) {
 		if (isset($form['anchor'])) {
-			$anchor = '#' . $form['anchor'];
-			$class = 'nav-icon-' . $form['anchor'];
+			$anchor = '#'.$form['anchor'];
+			$class = 'nav-icon-'.$form['anchor'];
 			$sectionName = $form['section-name'];
 			print_unescaped(sprintf("<li><a href='%s' class='%s'>%s</a></li>", \OCP\Util::sanitizeHTML($anchor),
 			\OCP\Util::sanitizeHTML($class), \OCP\Util::sanitizeHTML($sectionName)));
@@ -25,15 +25,15 @@ 
 <div id="app-content">
 
 <div id="quota" class="section">
-	<div style="width:<?php p($_['usage_relative']);?>%"
-		<?php if($_['usage_relative'] > 80): ?> class="quota-warning" <?php endif; ?>>
+	<div style="width:<?php p($_['usage_relative']); ?>%"
+		<?php if ($_['usage_relative'] > 80): ?> class="quota-warning" <?php endif; ?>>
 		<p id="quotatext">
 			<?php if ($_['quota'] === \OCP\Files\FileInfo::SPACE_UNLIMITED): ?>
 				<?php print_unescaped($l->t('You are using <strong>%s</strong> of <strong>%s</strong>',
-					[$_['usage'], $_['total_space']]));?>
+					[$_['usage'], $_['total_space']])); ?>
 			<?php else: ?>
 				<?php print_unescaped($l->t('You are using <strong>%s</strong> of <strong>%s</strong> (<strong>%s %%</strong>)',
-					[$_['usage'], $_['total_space'],  $_['usage_relative']]));?>
+					[$_['usage'], $_['total_space'], $_['usage_relative']])); ?>
 			<?php endif ?>
 		</p>
 	</div>
@@ -67,7 +67,7 @@ 
 			</div>
 		</div>
 		<span class="icon-checkmark hidden"/>
-		<?php if($_['lookupServerUploadEnabled']) { ?>
+		<?php if ($_['lookupServerUploadEnabled']) { ?>
 		<input type="hidden" id="avatarscope" value="<?php p($_['avatarScope']) ?>">
 		<?php } ?>
 	</form>
@@ -81,14 +81,14 @@ 
 				<span class="icon-password"/>
 			</h2>
 			<input type="text" id="displayname" name="displayname"
-				<?php if(!$_['displayNameChangeSupported']) { print_unescaped('class="hidden"'); } ?>
+				<?php if (!$_['displayNameChangeSupported']) { 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>
+			<?php if (!$_['displayNameChangeSupported']) { ?>
+				<span><?php if (isset($_['displayName']) && !empty($_['displayName'])) { p($_['displayName']); } else { p($l->t('No display name set')); } ?></span>
 			<?php } ?>
 			<span class="icon-checkmark hidden"/>
-			<?php if($_['lookupServerUploadEnabled']) { ?>
+			<?php if ($_['lookupServerUploadEnabled']) { ?>
 			<input type="hidden" id="displaynamescope" value="<?php p($_['displayNameScope']) ?>">
 			<?php } ?>
 		</form>
@@ -99,10 +99,10 @@ 
 				<label for="email"><?php p($l->t('Email')); ?></label>
 				<span class="icon-password"/>
 			</h2>
-			<div class="verify <?php if ($_['email'] === ''  || $_['emailScope'] !== 'public') p('hidden'); ?>">
+			<div class="verify <?php if ($_['email'] === '' || $_['emailScope'] !== 'public') p('hidden'); ?>">
 				<img id="verify-email" title="<?php p($_['emailMessage']); ?>" data-status="<?php p($_['emailVerification']) ?>" src="
 				<?php
-				switch($_['emailVerification']) {
+				switch ($_['emailVerification']) {
 					case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS:
 						p(image_path('core', 'actions/verifying.svg'));
 						break;
@@ -115,23 +115,23 @@ 
 				?>">
 			</div>
 			<input type="email" name="email" id="email" value="<?php p($_['email']); ?>"
-				<?php if(!$_['displayNameChangeSupported']) { print_unescaped('class="hidden"'); } ?>
+				<?php if (!$_['displayNameChangeSupported']) { print_unescaped('class="hidden"'); } ?>
 				placeholder="<?php p($l->t('Your email address')); ?>"
 				autocomplete="on" autocapitalize="none" autocorrect="off" />
-			<?php if(!$_['displayNameChangeSupported']) { ?>
-				<span><?php if(isset($_['email']) && !empty($_['email'])) { p($_['email']); } else { p($l->t('No email address set')); }?></span>
+			<?php if (!$_['displayNameChangeSupported']) { ?>
+				<span><?php if (isset($_['email']) && !empty($_['email'])) { p($_['email']); } else { p($l->t('No email address set')); }?></span>
 			<?php } ?>
-			<?php if($_['displayNameChangeSupported']) { ?>
+			<?php if ($_['displayNameChangeSupported']) { ?>
 				<br />
 				<em><?php p($l->t('For password reset and notifications')); ?></em>
 			<?php } ?>
 			<span class="icon-checkmark hidden"/>
-			<?php if($_['lookupServerUploadEnabled']) { ?>
+			<?php if ($_['lookupServerUploadEnabled']) { ?>
 			<input type="hidden" id="emailscope" value="<?php p($_['emailScope']) ?>">
 			<?php } ?>
 		</form>
 	</div>
-	<?php if($_['lookupServerUploadEnabled']) { ?>
+	<?php if ($_['lookupServerUploadEnabled']) { ?>
 	<div class="personal-settings-setting-box">
 		<form id="phoneform" class="section">
 			<h2>
@@ -166,10 +166,10 @@ 
 				<label for="website"><?php p($l->t('Website')); ?></label>
 				<span class="icon-password"/>
 			</h2>
-			<div class="verify <?php if ($_['website'] === ''  || $_['websiteScope'] !== 'public') p('hidden'); ?>">
+			<div class="verify <?php if ($_['website'] === '' || $_['websiteScope'] !== 'public') p('hidden'); ?>">
 				<img id="verify-website" title="<?php p($_['websiteMessage']); ?>" data-status="<?php p($_['websiteVerification']) ?>" src="
 				<?php
-				switch($_['websiteVerification']) {
+				switch ($_['websiteVerification']) {
 					case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS:
 						p(image_path('core', 'actions/verifying.svg'));
 						break;
@@ -180,13 +180,13 @@ 
 						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"') ?>
+				<?php if ($_['websiteVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS || $_['websiteVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) print_unescaped(' class="verify-action"') ?>
 				>
 				<div class="verification-dialog popovermenu bubble menu">
 					<div class="verification-dialog-content">
 						<p class="explainVerification"></p>
 						<p class="verificationCode"></p>
-						<p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.'));?></p>
+						<p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.')); ?></p>
 					</div>
 				</div>
 			</div>
@@ -203,10 +203,10 @@ 
 				<label for="twitter"><?php p($l->t('Twitter')); ?></label>
 				<span class="icon-password"/>
 			</h2>
-			<div class="verify <?php if ($_['twitter'] === ''  || $_['twitterScope'] !== 'public') p('hidden'); ?>">
+			<div class="verify <?php if ($_['twitter'] === '' || $_['twitterScope'] !== 'public') p('hidden'); ?>">
 				<img id="verify-twitter" title="<?php p($_['twitterMessage']); ?>" data-status="<?php p($_['twitterVerification']) ?>" src="
 				<?php
-				switch($_['twitterVerification']) {
+				switch ($_['twitterVerification']) {
 					case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS:
 						p(image_path('core', 'actions/verifying.svg'));
 						break;
@@ -217,13 +217,13 @@ 
 						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"') ?>
+				<?php if ($_['twitterVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS || $_['twitterVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) print_unescaped(' class="verify-action"') ?>
 				>
 				<div class="verification-dialog popovermenu bubble menu">
 					<div class="verification-dialog-content">
 						<p class="explainVerification"></p>
 						<p class="verificationCode"></p>
-						<p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.'));?></p>
+						<p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.')); ?></p>
 					</div>
 				</div>
 			</div>
@@ -248,19 +248,19 @@ 
 </div>
 
 <?php
-if($_['passwordChangeSupported']) {
+if ($_['passwordChangeSupported']) {
 	script('jquery-showpassword');
 ?>
 <form id="passwordform" class="section">
-	<h2 class="inlineblock"><?php p($l->t('Password'));?></h2>
+	<h2 class="inlineblock"><?php p($l->t('Password')); ?></h2>
 	<div id="password-error-msg" class="msg success inlineblock" style="display: none;">Saved</div>
 	<br>
 	<label for="pass1" class="hidden-visually"><?php p($l->t('Current password')); ?>: </label>
 	<input type="password" id="pass1" name="oldpassword"
-		placeholder="<?php p($l->t('Current password'));?>"
+		placeholder="<?php p($l->t('Current password')); ?>"
 		autocomplete="off" autocapitalize="none" autocorrect="off" />
 	<div class="personal-show-container">
-		<label for="pass2" class="hidden-visually"><?php p($l->t('New password'));?>: </label>
+		<label for="pass2" class="hidden-visually"><?php p($l->t('New password')); ?>: </label>
 		<input type="password" id="pass2" name="newpassword"
 			placeholder="<?php p($l->t('New password')); ?>"
 			data-typetoggle="#personal-show"
@@ -276,44 +276,44 @@ 
 
 <form id="language" class="section">
 	<h2>
-		<label for="languageinput"><?php p($l->t('Language'));?></label>
+		<label for="languageinput"><?php p($l->t('Language')); ?></label>
 	</h2>
-	<select id="languageinput" name="lang" data-placeholder="<?php p($l->t('Language'));?>">
-		<option value="<?php p($_['activelanguage']['code']);?>">
-			<?php p($_['activelanguage']['name']);?>
+	<select id="languageinput" name="lang" data-placeholder="<?php p($l->t('Language')); ?>">
+		<option value="<?php p($_['activelanguage']['code']); ?>">
+			<?php p($_['activelanguage']['name']); ?>
 		</option>
-		<?php foreach($_['commonlanguages'] as $language):?>
-			<option value="<?php p($language['code']);?>">
-				<?php p($language['name']);?>
+		<?php foreach ($_['commonlanguages'] as $language):?>
+			<option value="<?php p($language['code']); ?>">
+				<?php p($language['name']); ?>
 			</option>
-		<?php endforeach;?>
+		<?php endforeach; ?>
 		<optgroup label="––––––––––"></optgroup>
-		<?php foreach($_['languages'] as $language):?>
-			<option value="<?php p($language['code']);?>">
-				<?php p($language['name']);?>
+		<?php foreach ($_['languages'] as $language):?>
+			<option value="<?php p($language['code']); ?>">
+				<?php p($language['name']); ?>
 			</option>
-		<?php endforeach;?>
+		<?php endforeach; ?>
 	</select>
 	<a href="https://www.transifex.com/nextcloud/nextcloud/"
 		target="_blank" rel="noreferrer">
-		<em><?php p($l->t('Help translate'));?></em>
+		<em><?php p($l->t('Help translate')); ?></em>
 	</a>
 </form>
 
 
 <div id="clientsbox" class="section clientsbox">
-	<h2><?php p($l->t('Get the apps to sync your files'));?></h2>
+	<h2><?php p($l->t('Get the apps to sync your files')); ?></h2>
 	<a href="<?php p($_['clients']['desktop']); ?>" rel="noreferrer" target="_blank">
 		<img src="<?php print_unescaped(image_path('core', 'desktopapp.svg')); ?>"
-			 alt="<?php p($l->t('Desktop client'));?>" />
+			 alt="<?php p($l->t('Desktop client')); ?>" />
 	</a>
 	<a href="<?php p($_['clients']['android']); ?>" rel="noreferrer" target="_blank">
 		<img src="<?php print_unescaped(image_path('core', 'googleplay.png')); ?>"
-			 alt="<?php p($l->t('Android app'));?>" />
+			 alt="<?php p($l->t('Android app')); ?>" />
 	</a>
 	<a href="<?php p($_['clients']['ios']); ?>" rel="noreferrer" target="_blank">
 		<img src="<?php print_unescaped(image_path('core', 'appstore.svg')); ?>"
-			 alt="<?php p($l->t('iOS app'));?>" />
+			 alt="<?php p($l->t('iOS app')); ?>" />
 	</a>
 
 		<p>
@@ -329,19 +329,19 @@ 
 				$l->t('If you want to support the project {contributeopen}join development{linkclose} or {contributeopen}spread the word{linkclose}!'))); ?>
 		</p>
 
-	<?php if(OC_APP::isEnabled('firstrunwizard')) {?>
-		<p><a class="button" href="#" id="showWizard"><?php p($l->t('Show First Run Wizard again'));?></a></p>
+	<?php if (OC_APP::isEnabled('firstrunwizard')) {?>
+		<p><a class="button" href="#" id="showWizard"><?php p($l->t('Show First Run Wizard again')); ?></a></p>
 	<?php }?>
 </div>
 
 <div id="sessions" class="section">
-	<h2><?php p($l->t('Sessions'));?></h2>
-	<p class="settings-hint hidden-when-empty"><?php p($l->t('Web, desktop and mobile clients currently logged in to your account.'));?></span>
+	<h2><?php p($l->t('Sessions')); ?></h2>
+	<p class="settings-hint hidden-when-empty"><?php p($l->t('Web, desktop and mobile clients currently logged in to your account.')); ?></span>
 	<table class="icon-loading">
 		<thead class="token-list-header">
 			<tr>
-				<th><?php p($l->t('Device'));?></th>
-				<th><?php p($l->t('Last activity'));?></th>
+				<th><?php p($l->t('Device')); ?></th>
+				<th><?php p($l->t('Last activity')); ?></th>
 				<th></th>
 			</tr>
 		</thead>
@@ -351,13 +351,13 @@ 
 </div>
 
 <div id="apppasswords" class="section">
-	<h2><?php p($l->t('App passwords'));?></h2>
-	<p class="settings-hint"><?php p($l->t('Here you can generate individual passwords for apps so you don’t have to give out your password. You can revoke them individually too.'));?></p>
+	<h2><?php p($l->t('App passwords')); ?></h2>
+	<p class="settings-hint"><?php p($l->t('Here you can generate individual passwords for apps so you don’t have to give out your password. You can revoke them individually too.')); ?></p>
 	<table class="icon-loading">
 		<thead class="hidden-when-empty">
 			<tr>
-				<th><?php p($l->t('Name'));?></th>
-				<th><?php p($l->t('Last activity'));?></th>
+				<th><?php p($l->t('Name')); ?></th>
+				<th><?php p($l->t('Last activity')); ?></th>
 				<th></th>
 			</tr>
 		</thead>
@@ -386,14 +386,14 @@ 
 	</div>
 </div>
 
-<?php foreach($_['forms'] as $form) {
+<?php foreach ($_['forms'] as $form) {
 	if (isset($form['form'])) {?>
-	<div id="<?php isset($form['anchor']) ? p($form['anchor']) : p('');?>"><?php print_unescaped($form['form']);?></div>
+	<div id="<?php isset($form['anchor']) ? p($form['anchor']) : p(''); ?>"><?php print_unescaped($form['form']); ?></div>
 	<?php }
 };?>
 
 <div class="section">
-	<h2><?php p($l->t('Version'));?></h2>
+	<h2><?php p($l->t('Version')); ?></h2>
 	<p><a href="<?php print_unescaped($theme->getBaseUrl()); ?>" target="_blank"><?php p($theme->getTitle()); ?></a> <?php p(OC_Util::getHumanVersion()) ?></p>
 	<p><?php include('settings.development.notice.php'); ?></p>
 </div>

Braces +32 added lines, -11 removed lines

@@ -31,9 +31,12 @@ 
 			<?php if ($_['quota'] === \OCP\Files\FileInfo::SPACE_UNLIMITED): ?>
 				<?php print_unescaped($l->t('You are using <strong>%s</strong> of <strong>%s</strong>',
 					[$_['usage'], $_['total_space']]));?>
-			<?php else: ?>
+			<?php else {
+    : ?>
 				<?php print_unescaped($l->t('You are using <strong>%s</strong> of <strong>%s</strong> (<strong>%s %%</strong>)',
-					[$_['usage'], $_['total_space'],  $_['usage_relative']]));?>
+					[$_['usage'], $_['total_space'],  $_['usage_relative']]));
+}
+?>
 			<?php endif ?>
 		</p>
 	</div>
@@ -55,8 +58,11 @@ 
 				<div class="hidden button icon-delete svg" id="removeavatar" title="<?php p($l->t('Remove image')); ?>"></div>
 				<input type="file" name="files[]" id="uploadavatar" class="hiddenuploadfield">
 				<p><em><?php p($l->t('png or jpg, max. 20 MB')); ?></em></p>
-			<?php else: ?>
-				<?php p($l->t('Picture provided by original account')); ?>
+			<?php else {
+    : ?>
+				<?php p($l->t('Picture provided by original account'));
+}
+?>
 			<?php endif; ?>
 		</div>
 
@@ -99,7 +105,10 @@ 
 				<label for="email"><?php p($l->t('Email')); ?></label>
 				<span class="icon-password"/>
 			</h2>
-			<div class="verify <?php if ($_['email'] === ''  || $_['emailScope'] !== 'public') p('hidden'); ?>">
+			<div class="verify <?php if ($_['email'] === ''  || $_['emailScope'] !== 'public') {
+    p('hidden');
+}
+?>">
 				<img id="verify-email" title="<?php p($_['emailMessage']); ?>" data-status="<?php p($_['emailVerification']) ?>" src="
 				<?php
 				switch($_['emailVerification']) {
@@ -166,7 +175,10 @@ 
 				<label for="website"><?php p($l->t('Website')); ?></label>
 				<span class="icon-password"/>
 			</h2>
-			<div class="verify <?php if ($_['website'] === ''  || $_['websiteScope'] !== 'public') p('hidden'); ?>">
+			<div class="verify <?php if ($_['website'] === ''  || $_['websiteScope'] !== 'public') {
+    p('hidden');
+}
+?>">
 				<img id="verify-website" title="<?php p($_['websiteMessage']); ?>" data-status="<?php p($_['websiteVerification']) ?>" src="
 				<?php
 				switch($_['websiteVerification']) {
@@ -180,13 +192,16 @@ 
 						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"') ?>
+				<?php if($_['websiteVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS || $_['websiteVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) {
+    print_unescaped(' class="verify-action"') ?>
 				>
 				<div class="verification-dialog popovermenu bubble menu">
 					<div class="verification-dialog-content">
 						<p class="explainVerification"></p>
 						<p class="verificationCode"></p>
-						<p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.'));?></p>
+						<p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.'));
+}
+?></p>
 					</div>
 				</div>
 			</div>
@@ -203,7 +218,10 @@ 
 				<label for="twitter"><?php p($l->t('Twitter')); ?></label>
 				<span class="icon-password"/>
 			</h2>
-			<div class="verify <?php if ($_['twitter'] === ''  || $_['twitterScope'] !== 'public') p('hidden'); ?>">
+			<div class="verify <?php if ($_['twitter'] === ''  || $_['twitterScope'] !== 'public') {
+    p('hidden');
+}
+?>">
 				<img id="verify-twitter" title="<?php p($_['twitterMessage']); ?>" data-status="<?php p($_['twitterVerification']) ?>" src="
 				<?php
 				switch($_['twitterVerification']) {
@@ -217,13 +235,16 @@ 
 						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"') ?>
+				<?php if($_['twitterVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS || $_['twitterVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) {
+    print_unescaped(' class="verify-action"') ?>
 				>
 				<div class="verification-dialog popovermenu bubble menu">
 					<div class="verification-dialog-content">
 						<p class="explainVerification"></p>
 						<p class="verificationCode"></p>
-						<p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.'));?></p>
+						<p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.'));
+}
+?></p>
 					</div>
 				</div>
 			</div>

settings/BackgroundJobs/VerifyUserData.php

Indentation +234 added lines, -234 removed lines

@@ -35,239 +35,239 @@
 
 class VerifyUserData extends Job {
 
-	/** @var  bool */
-	private $retainJob = true;
-
-	/** @var int max number of attempts to send the request */
-	private $maxTry = 24;
-
-	/** @var int how much time should be between two tries (1 hour) */
-	private $interval = 3600;
-
-	/** @var AccountManager */
-	private $accountManager;
-
-	/** @var IUserManager */
-	private $userManager;
-
-	/** @var IClientService */
-	private $httpClientService;
-
-	/** @var ILogger */
-	private $logger;
-
-	/** @var string */
-	private $lookupServerUrl;
-
-	/**
-	 * VerifyUserData constructor.
-	 *
-	 * @param AccountManager $accountManager
-	 * @param IUserManager $userManager
-	 * @param IClientService $clientService
-	 * @param ILogger $logger
-	 * @param IConfig $config
-	 */
-	public function __construct(AccountManager $accountManager,
-								IUserManager $userManager,
-								IClientService $clientService,
-								ILogger $logger,
-								IConfig $config
-	) {
-		$this->accountManager = $accountManager;
-		$this->userManager = $userManager;
-		$this->httpClientService = $clientService;
-		$this->logger = $logger;
-
-		$lookupServerUrl = $config->getSystemValue('lookup_server', 'https://lookup.nextcloud.com');
-		$this->lookupServerUrl = rtrim($lookupServerUrl, '/');
-	}
-
-	/**
-	 * run the job, then remove it from the jobList
-	 *
-	 * @param JobList $jobList
-	 * @param ILogger $logger
-	 */
-	public function execute($jobList, ILogger $logger = null) {
-
-		if ($this->shouldRun($this->argument)) {
-			parent::execute($jobList, $logger);
-			$jobList->remove($this, $this->argument);
-			if ($this->retainJob) {
-				$this->reAddJob($jobList, $this->argument);
-			}
-		}
-
-	}
-
-	protected function run($argument) {
-
-		$try = (int)$argument['try'] + 1;
-
-		switch($argument['type']) {
-			case AccountManager::PROPERTY_WEBSITE:
-				$result = $this->verifyWebsite($argument);
-				break;
-			case AccountManager::PROPERTY_TWITTER:
-			case AccountManager::PROPERTY_EMAIL:
-				$result = $this->verifyViaLookupServer($argument, $argument['type']);
-				break;
-			default:
-				// no valid type given, no need to retry
-				$this->logger->error($argument['type'] . ' is no valid type for user account data.');
-				$result = true;
-		}
-
-		if ($result === true || $try > $this->maxTry) {
-			$this->retainJob = false;
-		}
-	}
-
-	/**
-	 * verify web page
-	 *
-	 * @param array $argument
-	 * @return bool true if we could check the verification code, otherwise false
-	 */
-	protected function verifyWebsite(array $argument) {
-
-		$result = false;
-
-		$url = rtrim($argument['data'], '/') . '/.well-known/' . 'CloudIdVerificationCode.txt';
-
-		$client = $this->httpClientService->newClient();
-		try {
-			$response = $client->get($url);
-		} catch (\Exception $e) {
-			return false;
-		}
-
-		if ($response->getStatusCode() === Http::STATUS_OK) {
-			$result = true;
-			$publishedCode = $response->getBody();
-			// remove new lines and spaces
-			$publishedCodeSanitized = trim(preg_replace('/\s\s+/', ' ', $publishedCode));
-			$user = $this->userManager->get($argument['uid']);
-			// we don't check a valid user -> give up
-			if ($user === null) {
-				$this->logger->error($argument['uid'] . ' doesn\'t exist, can\'t verify user data.');
-				return $result;
-			}
-			$userData = $this->accountManager->getUser($user);
-
-			if ($publishedCodeSanitized === $argument['verificationCode']) {
-				$userData[AccountManager::PROPERTY_WEBSITE]['verified'] = AccountManager::VERIFIED;
-			} else {
-				$userData[AccountManager::PROPERTY_WEBSITE]['verified'] = AccountManager::NOT_VERIFIED;
-			}
-
-			$this->accountManager->updateUser($user, $userData);
-		}
-
-		return $result;
-	}
-
-	/**
-	 * verify email address
-	 *
-	 * @param array $argument
-	 * @param string $dataType
-	 * @return bool true if we could check the verification code, otherwise false
-	 */
-	protected function verifyViaLookupServer(array $argument, $dataType) {
-
-		$user = $this->userManager->get($argument['uid']);
-
-		// we don't check a valid user -> give up
-		if ($user === null) {
-			$this->logger->error($argument['uid'] . ' doesn\'t exist, can\'t verify user data.');
-			return true;
-		}
-
-		$localUserData = $this->accountManager->getUser($user);
-		$cloudId = $user->getCloudId();
-
-		// ask lookup-server for user data
-		$lookupServerData = $this->queryLookupServer($cloudId);
-
-		// for some reasons we couldn't read any data from the lookup server, try again later
-		if (empty($lookupServerData)) {
-			return false;
-		}
-
-		// lookup server has verification data for wrong user data (e.g. email address), try again later
-		if ($lookupServerData[$dataType]['value'] !== $argument['data']) {
-			return false;
-		}
-
-		// lookup server hasn't verified the email address so far, try again later
-		if ($lookupServerData[$dataType]['verified'] === AccountManager::NOT_VERIFIED) {
-			return false;
-		}
-
-		$localUserData[$dataType]['verified'] = AccountManager::VERIFIED;
-		$this->accountManager->updateUser($user, $localUserData);
-
-		return true;
-	}
-
-	/**
-	 * @param string $cloudId
-	 * @return array
-	 */
-	protected function queryLookupServer($cloudId) {
-		try {
-			$client = $this->httpClientService->newClient();
-			$response = $client->get(
-				$this->lookupServerUrl . '/users?search=' . urlencode($cloudId) . '&exactCloudId=1',
-				[
-					'timeout' => 10,
-					'connect_timeout' => 3,
-				]
-			);
-
-			$body = json_decode($response->getBody(), true);
-
-			if ($body['federationId'] === $cloudId) {
-				return $body;
-			}
-
-		} catch (\Exception $e) {
-			// do nothing, we will just re-try later
-		}
-
-		return [];
-	}
-
-	/**
-	 * re-add background job with new arguments
-	 *
-	 * @param IJobList $jobList
-	 * @param array $argument
-	 */
-	protected function reAddJob(IJobList $jobList, array $argument) {
-		$jobList->add('OC\Settings\BackgroundJobs\VerifyUserData',
-			[
-				'verificationCode' => $argument['verificationCode'],
-				'data' => $argument['data'],
-				'type' => $argument['type'],
-				'uid' => $argument['uid'],
-				'try' => (int)$argument['try'] + 1,
-				'lastRun' => time()
-			]
-		);
-	}
-
-	/**
-	 * test if it is time for the next run
-	 *
-	 * @param array $argument
-	 * @return bool
-	 */
-	protected function shouldRun(array $argument) {
-		$lastRun = (int)$argument['lastRun'];
-		return ((time() - $lastRun) > $this->interval);
-	}
+    /** @var  bool */
+    private $retainJob = true;
+
+    /** @var int max number of attempts to send the request */
+    private $maxTry = 24;
+
+    /** @var int how much time should be between two tries (1 hour) */
+    private $interval = 3600;
+
+    /** @var AccountManager */
+    private $accountManager;
+
+    /** @var IUserManager */
+    private $userManager;
+
+    /** @var IClientService */
+    private $httpClientService;
+
+    /** @var ILogger */
+    private $logger;
+
+    /** @var string */
+    private $lookupServerUrl;
+
+    /**
+     * VerifyUserData constructor.
+     *
+     * @param AccountManager $accountManager
+     * @param IUserManager $userManager
+     * @param IClientService $clientService
+     * @param ILogger $logger
+     * @param IConfig $config
+     */
+    public function __construct(AccountManager $accountManager,
+                                IUserManager $userManager,
+                                IClientService $clientService,
+                                ILogger $logger,
+                                IConfig $config
+    ) {
+        $this->accountManager = $accountManager;
+        $this->userManager = $userManager;
+        $this->httpClientService = $clientService;
+        $this->logger = $logger;
+
+        $lookupServerUrl = $config->getSystemValue('lookup_server', 'https://lookup.nextcloud.com');
+        $this->lookupServerUrl = rtrim($lookupServerUrl, '/');
+    }
+
+    /**
+     * run the job, then remove it from the jobList
+     *
+     * @param JobList $jobList
+     * @param ILogger $logger
+     */
+    public function execute($jobList, ILogger $logger = null) {
+
+        if ($this->shouldRun($this->argument)) {
+            parent::execute($jobList, $logger);
+            $jobList->remove($this, $this->argument);
+            if ($this->retainJob) {
+                $this->reAddJob($jobList, $this->argument);
+            }
+        }
+
+    }
+
+    protected function run($argument) {
+
+        $try = (int)$argument['try'] + 1;
+
+        switch($argument['type']) {
+            case AccountManager::PROPERTY_WEBSITE:
+                $result = $this->verifyWebsite($argument);
+                break;
+            case AccountManager::PROPERTY_TWITTER:
+            case AccountManager::PROPERTY_EMAIL:
+                $result = $this->verifyViaLookupServer($argument, $argument['type']);
+                break;
+            default:
+                // no valid type given, no need to retry
+                $this->logger->error($argument['type'] . ' is no valid type for user account data.');
+                $result = true;
+        }
+
+        if ($result === true || $try > $this->maxTry) {
+            $this->retainJob = false;
+        }
+    }
+
+    /**
+     * verify web page
+     *
+     * @param array $argument
+     * @return bool true if we could check the verification code, otherwise false
+     */
+    protected function verifyWebsite(array $argument) {
+
+        $result = false;
+
+        $url = rtrim($argument['data'], '/') . '/.well-known/' . 'CloudIdVerificationCode.txt';
+
+        $client = $this->httpClientService->newClient();
+        try {
+            $response = $client->get($url);
+        } catch (\Exception $e) {
+            return false;
+        }
+
+        if ($response->getStatusCode() === Http::STATUS_OK) {
+            $result = true;
+            $publishedCode = $response->getBody();
+            // remove new lines and spaces
+            $publishedCodeSanitized = trim(preg_replace('/\s\s+/', ' ', $publishedCode));
+            $user = $this->userManager->get($argument['uid']);
+            // we don't check a valid user -> give up
+            if ($user === null) {
+                $this->logger->error($argument['uid'] . ' doesn\'t exist, can\'t verify user data.');
+                return $result;
+            }
+            $userData = $this->accountManager->getUser($user);
+
+            if ($publishedCodeSanitized === $argument['verificationCode']) {
+                $userData[AccountManager::PROPERTY_WEBSITE]['verified'] = AccountManager::VERIFIED;
+            } else {
+                $userData[AccountManager::PROPERTY_WEBSITE]['verified'] = AccountManager::NOT_VERIFIED;
+            }
+
+            $this->accountManager->updateUser($user, $userData);
+        }
+
+        return $result;
+    }
+
+    /**
+     * verify email address
+     *
+     * @param array $argument
+     * @param string $dataType
+     * @return bool true if we could check the verification code, otherwise false
+     */
+    protected function verifyViaLookupServer(array $argument, $dataType) {
+
+        $user = $this->userManager->get($argument['uid']);
+
+        // we don't check a valid user -> give up
+        if ($user === null) {
+            $this->logger->error($argument['uid'] . ' doesn\'t exist, can\'t verify user data.');
+            return true;
+        }
+
+        $localUserData = $this->accountManager->getUser($user);
+        $cloudId = $user->getCloudId();
+
+        // ask lookup-server for user data
+        $lookupServerData = $this->queryLookupServer($cloudId);
+
+        // for some reasons we couldn't read any data from the lookup server, try again later
+        if (empty($lookupServerData)) {
+            return false;
+        }
+
+        // lookup server has verification data for wrong user data (e.g. email address), try again later
+        if ($lookupServerData[$dataType]['value'] !== $argument['data']) {
+            return false;
+        }
+
+        // lookup server hasn't verified the email address so far, try again later
+        if ($lookupServerData[$dataType]['verified'] === AccountManager::NOT_VERIFIED) {
+            return false;
+        }
+
+        $localUserData[$dataType]['verified'] = AccountManager::VERIFIED;
+        $this->accountManager->updateUser($user, $localUserData);
+
+        return true;
+    }
+
+    /**
+     * @param string $cloudId
+     * @return array
+     */
+    protected function queryLookupServer($cloudId) {
+        try {
+            $client = $this->httpClientService->newClient();
+            $response = $client->get(
+                $this->lookupServerUrl . '/users?search=' . urlencode($cloudId) . '&exactCloudId=1',
+                [
+                    'timeout' => 10,
+                    'connect_timeout' => 3,
+                ]
+            );
+
+            $body = json_decode($response->getBody(), true);
+
+            if ($body['federationId'] === $cloudId) {
+                return $body;
+            }
+
+        } catch (\Exception $e) {
+            // do nothing, we will just re-try later
+        }
+
+        return [];
+    }
+
+    /**
+     * re-add background job with new arguments
+     *
+     * @param IJobList $jobList
+     * @param array $argument
+     */
+    protected function reAddJob(IJobList $jobList, array $argument) {
+        $jobList->add('OC\Settings\BackgroundJobs\VerifyUserData',
+            [
+                'verificationCode' => $argument['verificationCode'],
+                'data' => $argument['data'],
+                'type' => $argument['type'],
+                'uid' => $argument['uid'],
+                'try' => (int)$argument['try'] + 1,
+                'lastRun' => time()
+            ]
+        );
+    }
+
+    /**
+     * test if it is time for the next run
+     *
+     * @param array $argument
+     * @return bool
+     */
+    protected function shouldRun(array $argument) {
+        $lastRun = (int)$argument['lastRun'];
+        return ((time() - $lastRun) > $this->interval);
+    }
 
 }

Spacing +9 added lines, -9 removed lines

@@ -103,9 +103,9 @@ 
 
 	protected function run($argument) {
 
-		$try = (int)$argument['try'] + 1;
+		$try = (int) $argument['try'] + 1;
 
-		switch($argument['type']) {
+		switch ($argument['type']) {
 			case AccountManager::PROPERTY_WEBSITE:
 				$result = $this->verifyWebsite($argument);
 				break;
@@ -115,7 +115,7 @@ 
 				break;
 			default:
 				// no valid type given, no need to retry
-				$this->logger->error($argument['type'] . ' is no valid type for user account data.');
+				$this->logger->error($argument['type'].' is no valid type for user account data.');
 				$result = true;
 		}
 
@@ -134,7 +134,7 @@ 
 
 		$result = false;
 
-		$url = rtrim($argument['data'], '/') . '/.well-known/' . 'CloudIdVerificationCode.txt';
+		$url = rtrim($argument['data'], '/').'/.well-known/'.'CloudIdVerificationCode.txt';
 
 		$client = $this->httpClientService->newClient();
 		try {
@@ -151,7 +151,7 @@ 
 			$user = $this->userManager->get($argument['uid']);
 			// we don't check a valid user -> give up
 			if ($user === null) {
-				$this->logger->error($argument['uid'] . ' doesn\'t exist, can\'t verify user data.');
+				$this->logger->error($argument['uid'].' doesn\'t exist, can\'t verify user data.');
 				return $result;
 			}
 			$userData = $this->accountManager->getUser($user);
@@ -181,7 +181,7 @@ 
 
 		// we don't check a valid user -> give up
 		if ($user === null) {
-			$this->logger->error($argument['uid'] . ' doesn\'t exist, can\'t verify user data.');
+			$this->logger->error($argument['uid'].' doesn\'t exist, can\'t verify user data.');
 			return true;
 		}
 
@@ -220,7 +220,7 @@ 
 		try {
 			$client = $this->httpClientService->newClient();
 			$response = $client->get(
-				$this->lookupServerUrl . '/users?search=' . urlencode($cloudId) . '&exactCloudId=1',
+				$this->lookupServerUrl.'/users?search='.urlencode($cloudId).'&exactCloudId=1',
 				[
 					'timeout' => 10,
 					'connect_timeout' => 3,
@@ -253,7 +253,7 @@ 
 				'data' => $argument['data'],
 				'type' => $argument['type'],
 				'uid' => $argument['uid'],
-				'try' => (int)$argument['try'] + 1,
+				'try' => (int) $argument['try'] + 1,
 				'lastRun' => time()
 			]
 		);
@@ -266,7 +266,7 @@ 
 	 * @return bool
 	 */
 	protected function shouldRun(array $argument) {
-		$lastRun = (int)$argument['lastRun'];
+		$lastRun = (int) $argument['lastRun'];
 		return ((time() - $lastRun) > $this->interval);
 	}