nextcloud / server

settings/personal.php

Spacing +18 added lines, -18 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()));
@@ -230,11 +230,11 @@ 
 
 // add hardcoded forms from the template
 $formsAndMore = [];
-$formsAndMore[]= ['anchor' => 'personal-settings', 'section-name' => $l->t('Personal info')];
-$formsAndMore[]= ['anchor' => 'security', 'section-name' => $l->t('Security')];
-$formsAndMore[]= ['anchor' => 'clientsbox', 'section-name' => $l->t('Sync clients')];
+$formsAndMore[] = ['anchor' => 'personal-settings', 'section-name' => $l->t('Personal info')];
+$formsAndMore[] = ['anchor' => 'security', 'section-name' => $l->t('Security')];
+$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
@@ -247,7 +247,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);

settings/templates/personal.php

Spacing +60 added lines, -60 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>
@@ -250,19 +250,19 @@ 
 <?php endif; ?>
 
 <?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"
@@ -278,44 +278,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>
@@ -331,19 +331,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="security" class="section">
-	<h2><?php p($l->t('Security'));?></h2>
-	<p class="settings-hint hidden-when-empty"><?php p($l->t('Web, desktop, mobile clients and app specific passwords that currently have access to your account.'));?></p>
+	<h2><?php p($l->t('Security')); ?></h2>
+	<p class="settings-hint hidden-when-empty"><?php p($l->t('Web, desktop, mobile clients and app specific passwords that currently have access to your account.')); ?></p>
 	<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,8 +351,8 @@ 
 		</tbody>
 	</table>
 
-	<h3><?php p($l->t('App passwords'));?></h3>
-	<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>
+	<h3><?php p($l->t('App passwords')); ?></h3>
+	<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>
 	
 	<div id="app-password-form">
 		<input id="app-password-name" type="text" placeholder="<?php p($l->t('App name')); ?>">
@@ -376,14 +376,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>