Inspection of "show input fields if they are not empty but disabl..." - nextcloud/server - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Pull Request — master (#5287)

by Björn

created 2017-06-07 15:14 UTC

Status

Spacing +69 added lines, -69 removed lines patch added patch discarded remove patch

@@ -10,10 +10,10 @@  discard block
 block discarded – undo
 
 <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 @@  discard block
 block discarded – undo
 <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 @@  discard block
 block discarded – undo
 			</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 @@  discard block
 block discarded – undo
 				<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 @@  discard block
 block discarded – undo
 				<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,18 +115,18 @@  discard block
 block discarded – undo
 				?>">
 			</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>
@@ -138,12 +138,12 @@  discard block
 block discarded – undo
 				<label for="phone"><?php p($l->t('Phone number')); ?></label>
 				<span class="icon-password"/>
 			</h2>
-			<input type="tel" id="phone" name="phone" <?php if(!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"'); ?>
+			<input type="tel" id="phone" name="phone" <?php if (!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"'); ?>
 				   value="<?php p($_['phone']) ?>"
 				   placeholder="<?php p($l->t('Your phone number')); ?>"
 			       autocomplete="on" autocapitalize="none" autocorrect="off" />
 			<span class="icon-checkmark hidden"/>
-			<?php if($_['lookupServerUploadEnabled']) { ?>
+			<?php if ($_['lookupServerUploadEnabled']) { ?>
 			<input type="hidden" id="phonescope" value="<?php p($_['phoneScope']) ?>">
 			<?php } ?>
 		</form>
@@ -156,12 +156,12 @@  discard block
 block discarded – undo
 				<label for="address"><?php p($l->t('Address')); ?></label>
 				<span class="icon-password"/>
 			</h2>
-			<input type="text" id="address" name="address" <?php if(!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"');  ?>
+			<input type="text" id="address" name="address" <?php if (!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"'); ?>
 				   placeholder="<?php p($l->t('Your postal address')); ?>"
 				   value="<?php p($_['address']) ?>"
 				   autocomplete="on" autocapitalize="none" autocorrect="off" />
 			<span class="icon-checkmark hidden"/>
-			<?php if($_['lookupServerUploadEnabled']) { ?>
+			<?php if ($_['lookupServerUploadEnabled']) { ?>
 			<input type="hidden" id="addressscope" value="<?php p($_['addressScope']) ?>">
 			<?php } ?>
 		</form>
@@ -174,11 +174,11 @@  discard block
 block discarded – undo
 				<label for="website"><?php p($l->t('Website')); ?></label>
 				<span class="icon-password"/>
 			</h2>
-			<?php if($_['lookupServerUploadEnabled']) { ?>
-			<div class="verify <?php if ($_['website'] === ''  || $_['websiteScope'] !== 'public') p('hidden'); ?>">
+			<?php if ($_['lookupServerUploadEnabled']) { ?>
+			<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;
@@ -189,13 +189,13 @@  discard block
 block discarded – undo
 						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 @@  discard block
 block discarded – undo
 			<input type="text" name="website" id="website" value="<?php p($_['website']); ?>"
 			       placeholder="<?php p($l->t('Link https://…')); ?>"
 			       autocomplete="on" autocapitalize="none" autocorrect="off"
-				   <?php if(!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"');  ?>
+				   <?php if (!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"'); ?>
 			/>
 			<span class="icon-checkmark hidden"/>
-			<?php if($_['lookupServerUploadEnabled']) { ?>
+			<?php if ($_['lookupServerUploadEnabled']) { ?>
 			<input type="hidden" id="websitescope" value="<?php p($_['websiteScope']) ?>">
 			<?php } ?>
 		</form>
@@ -219,11 +219,11 @@  discard block
 block discarded – undo
 				<label for="twitter"><?php p($l->t('Twitter')); ?></label>
 				<span class="icon-password"/>
 			</h2>
-			<?php if($_['lookupServerUploadEnabled']) { ?>
-			<div class="verify <?php if ($_['twitter'] === ''  || $_['twitterScope'] !== 'public') p('hidden'); ?>">
+			<?php if ($_['lookupServerUploadEnabled']) { ?>
+			<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;
@@ -234,13 +234,13 @@  discard block
 block discarded – undo
 						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,10 +248,10 @@  discard block
 block discarded – undo
 			<input type="text" name="twitter" id="twitter" value="<?php p($_['twitter']); ?>"
 				   placeholder="<?php p($l->t('Twitter handle @…')); ?>"
 				   autocomplete="on" autocapitalize="none" autocorrect="off"
-				   <?php if(!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"');  ?>
+				   <?php if (!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"'); ?>
 			/>
 			<span class="icon-checkmark hidden"/>
-			<?php if($_['lookupServerUploadEnabled']) { ?>
+			<?php if ($_['lookupServerUploadEnabled']) { ?>
 			<input type="hidden" id="twitterscope" value="<?php p($_['twitterScope']) ?>">
 			<?php } ?>
 		</form>
@@ -272,19 +272,19 @@  discard block
 block discarded – undo
 <?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"
@@ -300,44 +300,44 @@  discard block
 block discarded – undo
 
 <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>
@@ -353,19 +353,19 @@  discard block
 block discarded – undo
 				$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>
@@ -373,8 +373,8 @@  discard block
 block discarded – undo
 		</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')); ?>">
@@ -398,14 +398,14 @@  discard block
 block discarded – undo
 	</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>

Please login to merge, or discard this patch.

Braces +48 added lines, -15 removed lines patch added patch discarded remove patch

@@ -31,9 +31,12 @@  discard block
 block discarded – undo
 			<?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 @@  discard block
 block discarded – undo
 				<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 @@  discard block
 block discarded – undo
 				<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']) {
@@ -138,7 +147,10 @@  discard block
 block discarded – undo
 				<label for="phone"><?php p($l->t('Phone number')); ?></label>
 				<span class="icon-password"/>
 			</h2>
-			<input type="tel" id="phone" name="phone" <?php if(!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"'); ?>
+			<input type="tel" id="phone" name="phone" <?php if(!$_['lookupServerUploadEnabled']) {
+    print_unescaped('disabled="1"');
+}
+?>
 				   value="<?php p($_['phone']) ?>"
 				   placeholder="<?php p($l->t('Your phone number')); ?>"
 			       autocomplete="on" autocapitalize="none" autocorrect="off" />
@@ -156,7 +168,10 @@  discard block
 block discarded – undo
 				<label for="address"><?php p($l->t('Address')); ?></label>
 				<span class="icon-password"/>
 			</h2>
-			<input type="text" id="address" name="address" <?php if(!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"');  ?>
+			<input type="text" id="address" name="address" <?php if(!$_['lookupServerUploadEnabled']) {
+    print_unescaped('disabled="1"');
+}
+?>
 				   placeholder="<?php p($l->t('Your postal address')); ?>"
 				   value="<?php p($_['address']) ?>"
 				   autocomplete="on" autocapitalize="none" autocorrect="off" />
@@ -175,7 +190,10 @@  discard block
 block discarded – undo
 				<span class="icon-password"/>
 			</h2>
 			<?php if($_['lookupServerUploadEnabled']) { ?>
-			<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']) {
@@ -189,13 +207,16 @@  discard block
 block discarded – undo
 						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 +224,10 @@  discard block
 block discarded – undo
 			<input type="text" name="website" id="website" value="<?php p($_['website']); ?>"
 			       placeholder="<?php p($l->t('Link https://…')); ?>"
 			       autocomplete="on" autocapitalize="none" autocorrect="off"
-				   <?php if(!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"');  ?>
+				   <?php if(!$_['lookupServerUploadEnabled']) {
+    print_unescaped('disabled="1"');
+}
+?>
 			/>
 			<span class="icon-checkmark hidden"/>
 			<?php if($_['lookupServerUploadEnabled']) { ?>
@@ -220,7 +244,10 @@  discard block
 block discarded – undo
 				<span class="icon-password"/>
 			</h2>
 			<?php if($_['lookupServerUploadEnabled']) { ?>
-			<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']) {
@@ -234,13 +261,16 @@  discard block
 block discarded – undo
 						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,7 +278,10 @@  discard block
 block discarded – undo
 			<input type="text" name="twitter" id="twitter" value="<?php p($_['twitter']); ?>"
 				   placeholder="<?php p($l->t('Twitter handle @…')); ?>"
 				   autocomplete="on" autocapitalize="none" autocorrect="off"
-				   <?php if(!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"');  ?>
+				   <?php if(!$_['lookupServerUploadEnabled']) {
+    print_unescaped('disabled="1"');
+}
+?>
 			/>
 			<span class="icon-checkmark hidden"/>
 			<?php if($_['lookupServerUploadEnabled']) { ?>

Please login to merge, or discard this patch.

		@@ -10,10 +10,10 @@ discard block
		block discarded – undo
10	10
11	11	<div id="app-navigation">
12	12	<ul class="with-icon">
13		- <?php foreach($_['forms'] as $form) {
	13	+ <?php foreach ($_['forms'] as $form) {
14	14	if (isset($form['anchor'])) {
15		- $anchor = '#' . $form['anchor'];
16		- $class = 'nav-icon-' . $form['anchor'];
	15	+ $anchor = '#'.$form['anchor'];
	16	+ $class = 'nav-icon-'.$form['anchor'];
17	17	$sectionName = $form['section-name'];
18	18	print_unescaped(sprintf("<li><a href='%s' class='%s'>%s</a></li>", \OCP\Util::sanitizeHTML($anchor),
19	19	\OCP\Util::sanitizeHTML($class), \OCP\Util::sanitizeHTML($sectionName)));
		@@ -25,15 +25,15 @@ discard block
		block discarded – undo
25	25	<div id="app-content">
26	26
27	27	<div id="quota" class="section">
28		- <div style="width:<?php p($_['usage_relative']);?>%"
29		- <?php if($_['usage_relative'] > 80): ?> class="quota-warning" <?php endif; ?>>
	28	+ <div style="width:<?php p($_['usage_relative']); ?>%"
	29	+ <?php if ($_['usage_relative'] > 80): ?> class="quota-warning" <?php endif; ?>>
30	30	<p id="quotatext">
31	31	<?php if ($_['quota'] === \OCP\Files\FileInfo::SPACE_UNLIMITED): ?>
32	32	<?php print_unescaped($l->t('You are using <strong>%s</strong> of <strong>%s</strong>',
33		- [$_['usage'], $_['total_space']]));?>
	33	+ [$_['usage'], $_['total_space']])); ?>
34	34	<?php else: ?>
35	35	<?php print_unescaped($l->t('You are using <strong>%s</strong> of <strong>%s</strong> (<strong>%s %%</strong>)',
36		- [$_['usage'], $_['total_space'], $_['usage_relative']]));?>
	36	+ [$_['usage'], $_['total_space'], $_['usage_relative']])); ?>
37	37	<?php endif ?>
38	38	</p>
39	39	</div>
		@@ -67,7 +67,7 @@ discard block
		block discarded – undo
67	67	</div>
68	68	</div>
69	69	<span class="icon-checkmark hidden"/>
70		- <?php if($_['lookupServerUploadEnabled']) { ?>
	70	+ <?php if ($_['lookupServerUploadEnabled']) { ?>
71	71	<input type="hidden" id="avatarscope" value="<?php p($_['avatarScope']) ?>">
72	72	<?php } ?>
73	73	</form>
		@@ -81,14 +81,14 @@ discard block
		block discarded – undo
81	81	<span class="icon-password"/>
82	82	</h2>
83	83	<input type="text" id="displayname" name="displayname"
84		- <?php if(!$_['displayNameChangeSupported']) { print_unescaped('class="hidden"'); } ?>
	84	+ <?php if (!$_['displayNameChangeSupported']) { print_unescaped('class="hidden"'); } ?>
85	85	value="<?php p($_['displayName']) ?>"
86	86	autocomplete="on" autocapitalize="none" autocorrect="off" />
87		- <?php if(!$_['displayNameChangeSupported']) { ?>
88		- <span><?php if(isset($_['displayName']) && !empty($_['displayName'])) { p($_['displayName']); } else { p($l->t('No display name set')); } ?></span>
	87	+ <?php if (!$_['displayNameChangeSupported']) { ?>
	88	+ <span><?php if (isset($_['displayName']) && !empty($_['displayName'])) { p($_['displayName']); } else { p($l->t('No display name set')); } ?></span>
89	89	<?php } ?>
90	90	<span class="icon-checkmark hidden"/>
91		- <?php if($_['lookupServerUploadEnabled']) { ?>
	91	+ <?php if ($_['lookupServerUploadEnabled']) { ?>
92	92	<input type="hidden" id="displaynamescope" value="<?php p($_['displayNameScope']) ?>">
93	93	<?php } ?>
94	94	</form>
		@@ -99,10 +99,10 @@ discard block
		block discarded – undo
99	99	<label for="email"><?php p($l->t('Email')); ?></label>
100	100	<span class="icon-password"/>
101	101	</h2>
102		- <div class="verify <?php if ($_['email'] === '' \|\| $_['emailScope'] !== 'public') p('hidden'); ?>">
	102	+ <div class="verify <?php if ($_['email'] === '' \|\| $_['emailScope'] !== 'public') p('hidden'); ?>">
103	103	<img id="verify-email" title="<?php p($_['emailMessage']); ?>" data-status="<?php p($_['emailVerification']) ?>" src="
104	104	<?php
105		- switch($_['emailVerification']) {
	105	+ switch ($_['emailVerification']) {
106	106	case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS:
107	107	p(image_path('core', 'actions/verifying.svg'));
108	108	break;
		@@ -115,18 +115,18 @@ discard block
		block discarded – undo
115	115	?>">
116	116	</div>
117	117	<input type="email" name="email" id="email" value="<?php p($_['email']); ?>"
118		- <?php if(!$_['displayNameChangeSupported']) { print_unescaped('class="hidden"'); } ?>
	118	+ <?php if (!$_['displayNameChangeSupported']) { print_unescaped('class="hidden"'); } ?>
119	119	placeholder="<?php p($l->t('Your email address')); ?>"
120	120	autocomplete="on" autocapitalize="none" autocorrect="off" />
121		- <?php if(!$_['displayNameChangeSupported']) { ?>
122		- <span><?php if(isset($_['email']) && !empty($_['email'])) { p($_['email']); } else { p($l->t('No email address set')); }?></span>
	121	+ <?php if (!$_['displayNameChangeSupported']) { ?>
	122	+ <span><?php if (isset($_['email']) && !empty($_['email'])) { p($_['email']); } else { p($l->t('No email address set')); }?></span>
123	123	<?php } ?>
124		- <?php if($_['displayNameChangeSupported']) { ?>
	124	+ <?php if ($_['displayNameChangeSupported']) { ?>
125	125	<br />
126	126	<em><?php p($l->t('For password reset and notifications')); ?></em>
127	127	<?php } ?>
128	128	<span class="icon-checkmark hidden"/>
129		- <?php if($_['lookupServerUploadEnabled']) { ?>
	129	+ <?php if ($_['lookupServerUploadEnabled']) { ?>
130	130	<input type="hidden" id="emailscope" value="<?php p($_['emailScope']) ?>">
131	131	<?php } ?>
132	132	</form>
		@@ -138,12 +138,12 @@ discard block
		block discarded – undo
138	138	<label for="phone"><?php p($l->t('Phone number')); ?></label>
139	139	<span class="icon-password"/>
140	140	</h2>
141		- <input type="tel" id="phone" name="phone" <?php if(!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"'); ?>
	141	+ <input type="tel" id="phone" name="phone" <?php if (!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"'); ?>
142	142	value="<?php p($_['phone']) ?>"
143	143	placeholder="<?php p($l->t('Your phone number')); ?>"
144	144	autocomplete="on" autocapitalize="none" autocorrect="off" />
145	145	<span class="icon-checkmark hidden"/>
146		- <?php if($_['lookupServerUploadEnabled']) { ?>
	146	+ <?php if ($_['lookupServerUploadEnabled']) { ?>
147	147	<input type="hidden" id="phonescope" value="<?php p($_['phoneScope']) ?>">
148	148	<?php } ?>
149	149	</form>
		@@ -156,12 +156,12 @@ discard block
		block discarded – undo
156	156	<label for="address"><?php p($l->t('Address')); ?></label>
157	157	<span class="icon-password"/>
158	158	</h2>
159		- <input type="text" id="address" name="address" <?php if(!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"'); ?>
	159	+ <input type="text" id="address" name="address" <?php if (!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"'); ?>
160	160	placeholder="<?php p($l->t('Your postal address')); ?>"
161	161	value="<?php p($_['address']) ?>"
162	162	autocomplete="on" autocapitalize="none" autocorrect="off" />
163	163	<span class="icon-checkmark hidden"/>
164		- <?php if($_['lookupServerUploadEnabled']) { ?>
	164	+ <?php if ($_['lookupServerUploadEnabled']) { ?>
165	165	<input type="hidden" id="addressscope" value="<?php p($_['addressScope']) ?>">
166	166	<?php } ?>
167	167	</form>
		@@ -174,11 +174,11 @@ discard block
		block discarded – undo
174	174	<label for="website"><?php p($l->t('Website')); ?></label>
175	175	<span class="icon-password"/>
176	176	</h2>
177		- <?php if($_['lookupServerUploadEnabled']) { ?>
178		- <div class="verify <?php if ($_['website'] === '' \|\| $_['websiteScope'] !== 'public') p('hidden'); ?>">
	177	+ <?php if ($_['lookupServerUploadEnabled']) { ?>
	178	+ <div class="verify <?php if ($_['website'] === '' \|\| $_['websiteScope'] !== 'public') p('hidden'); ?>">
179	179	<img id="verify-website" title="<?php p($_['websiteMessage']); ?>" data-status="<?php p($_['websiteVerification']) ?>" src="
180	180	<?php
181		- switch($_['websiteVerification']) {
	181	+ switch ($_['websiteVerification']) {
182	182	case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS:
183	183	p(image_path('core', 'actions/verifying.svg'));
184	184	break;
		@@ -189,13 +189,13 @@ discard block
		block discarded – undo
189	189	p(image_path('core', 'actions/verify.svg'));
190	190	}
191	191	?>"
192		- <?php if($_['websiteVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS \|\| $_['websiteVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) print_unescaped(' class="verify-action"') ?>
	192	+ <?php if ($_['websiteVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS \|\| $_['websiteVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) print_unescaped(' class="verify-action"') ?>
193	193	>
194	194	<div class="verification-dialog popovermenu bubble menu">
195	195	<div class="verification-dialog-content">
196	196	<p class="explainVerification"></p>
197	197	<p class="verificationCode"></p>
198		- <p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.'));?></p>
	198	+ <p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.')); ?></p>
199	199	</div>
200	200	</div>
201	201	</div>
		@@ -203,10 +203,10 @@ discard block
		block discarded – undo
203	203	<input type="text" name="website" id="website" value="<?php p($_['website']); ?>"
204	204	placeholder="<?php p($l->t('Link https://…')); ?>"
205	205	autocomplete="on" autocapitalize="none" autocorrect="off"
206		- <?php if(!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"'); ?>
	206	+ <?php if (!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"'); ?>
207	207	/>
208	208	<span class="icon-checkmark hidden"/>
209		- <?php if($_['lookupServerUploadEnabled']) { ?>
	209	+ <?php if ($_['lookupServerUploadEnabled']) { ?>
210	210	<input type="hidden" id="websitescope" value="<?php p($_['websiteScope']) ?>">
211	211	<?php } ?>
212	212	</form>
		@@ -219,11 +219,11 @@ discard block
		block discarded – undo
219	219	<label for="twitter"><?php p($l->t('Twitter')); ?></label>
220	220	<span class="icon-password"/>
221	221	</h2>
222		- <?php if($_['lookupServerUploadEnabled']) { ?>
223		- <div class="verify <?php if ($_['twitter'] === '' \|\| $_['twitterScope'] !== 'public') p('hidden'); ?>">
	222	+ <?php if ($_['lookupServerUploadEnabled']) { ?>
	223	+ <div class="verify <?php if ($_['twitter'] === '' \|\| $_['twitterScope'] !== 'public') p('hidden'); ?>">
224	224	<img id="verify-twitter" title="<?php p($_['twitterMessage']); ?>" data-status="<?php p($_['twitterVerification']) ?>" src="
225	225	<?php
226		- switch($_['twitterVerification']) {
	226	+ switch ($_['twitterVerification']) {
227	227	case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS:
228	228	p(image_path('core', 'actions/verifying.svg'));
229	229	break;
		@@ -234,13 +234,13 @@ discard block
		block discarded – undo
234	234	p(image_path('core', 'actions/verify.svg'));
235	235	}
236	236	?>"
237		- <?php if($_['twitterVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS \|\| $_['twitterVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) print_unescaped(' class="verify-action"') ?>
	237	+ <?php if ($_['twitterVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS \|\| $_['twitterVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) print_unescaped(' class="verify-action"') ?>
238	238	>
239	239	<div class="verification-dialog popovermenu bubble menu">
240	240	<div class="verification-dialog-content">
241	241	<p class="explainVerification"></p>
242	242	<p class="verificationCode"></p>
243		- <p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.'));?></p>
	243	+ <p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.')); ?></p>
244	244	</div>
245	245	</div>
246	246	</div>
		@@ -248,10 +248,10 @@ discard block
		block discarded – undo
248	248	<input type="text" name="twitter" id="twitter" value="<?php p($_['twitter']); ?>"
249	249	placeholder="<?php p($l->t('Twitter handle @…')); ?>"
250	250	autocomplete="on" autocapitalize="none" autocorrect="off"
251		- <?php if(!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"'); ?>
	251	+ <?php if (!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"'); ?>
252	252	/>
253	253	<span class="icon-checkmark hidden"/>
254		- <?php if($_['lookupServerUploadEnabled']) { ?>
	254	+ <?php if ($_['lookupServerUploadEnabled']) { ?>
255	255	<input type="hidden" id="twitterscope" value="<?php p($_['twitterScope']) ?>">
256	256	<?php } ?>
257	257	</form>
		@@ -272,19 +272,19 @@ discard block
		block discarded – undo
272	272	<?php endif; ?>
273	273
274	274	<?php
275		-if($_['passwordChangeSupported']) {
	275	+if ($_['passwordChangeSupported']) {
276	276	script('jquery-showpassword');
277	277	?>
278	278	<form id="passwordform" class="section">
279		- <h2 class="inlineblock"><?php p($l->t('Password'));?></h2>
	279	+ <h2 class="inlineblock"><?php p($l->t('Password')); ?></h2>
280	280	<div id="password-error-msg" class="msg success inlineblock" style="display: none;">Saved</div>
281	281	<br>
282	282	<label for="pass1" class="hidden-visually"><?php p($l->t('Current password')); ?>: </label>
283	283	<input type="password" id="pass1" name="oldpassword"
284		- placeholder="<?php p($l->t('Current password'));?>"
	284	+ placeholder="<?php p($l->t('Current password')); ?>"
285	285	autocomplete="off" autocapitalize="none" autocorrect="off" />
286	286	<div class="personal-show-container">
287		- <label for="pass2" class="hidden-visually"><?php p($l->t('New password'));?>: </label>
	287	+ <label for="pass2" class="hidden-visually"><?php p($l->t('New password')); ?>: </label>
288	288	<input type="password" id="pass2" name="newpassword"
289	289	placeholder="<?php p($l->t('New password')); ?>"
290	290	data-typetoggle="#personal-show"
		@@ -300,44 +300,44 @@ discard block
		block discarded – undo
300	300
301	301	<form id="language" class="section">
302	302	<h2>
303		- <label for="languageinput"><?php p($l->t('Language'));?></label>
	303	+ <label for="languageinput"><?php p($l->t('Language')); ?></label>
304	304	</h2>
305		- <select id="languageinput" name="lang" data-placeholder="<?php p($l->t('Language'));?>">
306		- <option value="<?php p($_['activelanguage']['code']);?>">
307		- <?php p($_['activelanguage']['name']);?>
	305	+ <select id="languageinput" name="lang" data-placeholder="<?php p($l->t('Language')); ?>">
	306	+ <option value="<?php p($_['activelanguage']['code']); ?>">
	307	+ <?php p($_['activelanguage']['name']); ?>
308	308	</option>
309		- <?php foreach($_['commonlanguages'] as $language):?>
310		- <option value="<?php p($language['code']);?>">
311		- <?php p($language['name']);?>
	309	+ <?php foreach ($_['commonlanguages'] as $language):?>
	310	+ <option value="<?php p($language['code']); ?>">
	311	+ <?php p($language['name']); ?>
312	312	</option>
313		- <?php endforeach;?>
	313	+ <?php endforeach; ?>
314	314	<optgroup label="––––––––––"></optgroup>
315		- <?php foreach($_['languages'] as $language):?>
316		- <option value="<?php p($language['code']);?>">
317		- <?php p($language['name']);?>
	315	+ <?php foreach ($_['languages'] as $language):?>
	316	+ <option value="<?php p($language['code']); ?>">
	317	+ <?php p($language['name']); ?>
318	318	</option>
319		- <?php endforeach;?>
	319	+ <?php endforeach; ?>
320	320	</select>
321	321	<a href="https://www.transifex.com/nextcloud/nextcloud/"
322	322	target="_blank" rel="noreferrer">
323		- <em><?php p($l->t('Help translate'));?></em>
	323	+ <em><?php p($l->t('Help translate')); ?></em>
324	324	</a>
325	325	</form>
326	326
327	327
328	328	<div id="clientsbox" class="section clientsbox">
329		- <h2><?php p($l->t('Get the apps to sync your files'));?></h2>
	329	+ <h2><?php p($l->t('Get the apps to sync your files')); ?></h2>
330	330	<a href="<?php p($_['clients']['desktop']); ?>" rel="noreferrer" target="_blank">
331	331	<img src="<?php print_unescaped(image_path('core', 'desktopapp.svg')); ?>"
332		- alt="<?php p($l->t('Desktop client'));?>" />
	332	+ alt="<?php p($l->t('Desktop client')); ?>" />
333	333	</a>
334	334	<a href="<?php p($_['clients']['android']); ?>" rel="noreferrer" target="_blank">
335	335	<img src="<?php print_unescaped(image_path('core', 'googleplay.png')); ?>"
336		- alt="<?php p($l->t('Android app'));?>" />
	336	+ alt="<?php p($l->t('Android app')); ?>" />
337	337	</a>
338	338	<a href="<?php p($_['clients']['ios']); ?>" rel="noreferrer" target="_blank">
339	339	<img src="<?php print_unescaped(image_path('core', 'appstore.svg')); ?>"
340		- alt="<?php p($l->t('iOS app'));?>" />
	340	+ alt="<?php p($l->t('iOS app')); ?>" />
341	341	</a>
342	342
343	343	<p>
		@@ -353,19 +353,19 @@ discard block
		block discarded – undo
353	353	$l->t('If you want to support the project {contributeopen}join development{linkclose} or {contributeopen}spread the word{linkclose}!'))); ?>
354	354	</p>
355	355
356		- <?php if(OC_APP::isEnabled('firstrunwizard')) {?>
357		- <p><a class="button" href="#" id="showWizard"><?php p($l->t('Show First Run Wizard again'));?></a></p>
	356	+ <?php if (OC_APP::isEnabled('firstrunwizard')) {?>
	357	+ <p><a class="button" href="#" id="showWizard"><?php p($l->t('Show First Run Wizard again')); ?></a></p>
358	358	<?php }?>
359	359	</div>
360	360
361	361	<div id="security" class="section">
362		- <h2><?php p($l->t('Security'));?></h2>
363		- <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>
	362	+ <h2><?php p($l->t('Security')); ?></h2>
	363	+ <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>
364	364	<table class="icon-loading">
365	365	<thead class="token-list-header">
366	366	<tr>
367		- <th><?php p($l->t('Device'));?></th>
368		- <th><?php p($l->t('Last activity'));?></th>
	367	+ <th><?php p($l->t('Device')); ?></th>
	368	+ <th><?php p($l->t('Last activity')); ?></th>
369	369	<th></th>
370	370	</tr>
371	371	</thead>
		@@ -373,8 +373,8 @@ discard block
		block discarded – undo
373	373	</tbody>
374	374	</table>
375	375
376		- <h3><?php p($l->t('App passwords'));?></h3>
377		- <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>
	376	+ <h3><?php p($l->t('App passwords')); ?></h3>
	377	+ <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>
378	378
379	379	<div id="app-password-form">
380	380	<input id="app-password-name" type="text" placeholder="<?php p($l->t('App name')); ?>">
		@@ -398,14 +398,14 @@ discard block
		block discarded – undo
398	398	</div>
399	399	</div>
400	400
401		-<?php foreach($_['forms'] as $form) {
	401	+<?php foreach ($_['forms'] as $form) {
402	402	if (isset($form['form'])) {?>
403		- <div id="<?php isset($form['anchor']) ? p($form['anchor']) : p('');?>"><?php print_unescaped($form['form']);?></div>
	403	+ <div id="<?php isset($form['anchor']) ? p($form['anchor']) : p(''); ?>"><?php print_unescaped($form['form']); ?></div>
404	404	<?php }
405	405	};?>
406	406
407	407	<div class="section">
408		- <h2><?php p($l->t('Version'));?></h2>
	408	+ <h2><?php p($l->t('Version')); ?></h2>
409	409	<p><a href="<?php print_unescaped($theme->getBaseUrl()); ?>" target="_blank"><?php p($theme->getTitle()); ?></a> <?php p(OC_Util::getHumanVersion()) ?></p>
410	410	<p><?php include('settings.development.notice.php'); ?></p>
411	411	</div>

		@@ -31,9 +31,12 @@ discard block
		block discarded – undo
31	31	<?php if ($_['quota'] === \OCP\Files\FileInfo::SPACE_UNLIMITED): ?>
32	32	<?php print_unescaped($l->t('You are using <strong>%s</strong> of <strong>%s</strong>',
33	33	[$_['usage'], $_['total_space']]));?>
34		- <?php else: ?>
	34	+ <?php else {
	35	+ : ?>
35	36	<?php print_unescaped($l->t('You are using <strong>%s</strong> of <strong>%s</strong> (<strong>%s %%</strong>)',
36		- [$_['usage'], $_['total_space'], $_['usage_relative']]));?>
	37	+ [$_['usage'], $_['total_space'], $_['usage_relative']]));
	38	+}
	39	+?>
37	40	<?php endif ?>
38	41	</p>
39	42	</div>
		@@ -55,8 +58,11 @@ discard block
		block discarded – undo
55	58	<div class="hidden button icon-delete svg" id="removeavatar" title="<?php p($l->t('Remove image')); ?>"></div>
56	59	<input type="file" name="files[]" id="uploadavatar" class="hiddenuploadfield">
57	60	<p><em><?php p($l->t('png or jpg, max. 20 MB')); ?></em></p>
58		- <?php else: ?>
59		- <?php p($l->t('Picture provided by original account')); ?>
	61	+ <?php else {
	62	+ : ?>
	63	+ <?php p($l->t('Picture provided by original account'));
	64	+}
	65	+?>
60	66	<?php endif; ?>
61	67	</div>
62	68
		@@ -99,7 +105,10 @@ discard block
		block discarded – undo
99	105	<label for="email"><?php p($l->t('Email')); ?></label>
100	106	<span class="icon-password"/>
101	107	</h2>
102		- <div class="verify <?php if ($_['email'] === '' \|\| $_['emailScope'] !== 'public') p('hidden'); ?>">
	108	+ <div class="verify <?php if ($_['email'] === '' \|\| $_['emailScope'] !== 'public') {
	109	+ p('hidden');
	110	+}
	111	+?>">
103	112	<img id="verify-email" title="<?php p($_['emailMessage']); ?>" data-status="<?php p($_['emailVerification']) ?>" src="
104	113	<?php
105	114	switch($_['emailVerification']) {
		@@ -138,7 +147,10 @@ discard block
		block discarded – undo
138	147	<label for="phone"><?php p($l->t('Phone number')); ?></label>
139	148	<span class="icon-password"/>
140	149	</h2>
141		- <input type="tel" id="phone" name="phone" <?php if(!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"'); ?>
	150	+ <input type="tel" id="phone" name="phone" <?php if(!$_['lookupServerUploadEnabled']) {
	151	+ print_unescaped('disabled="1"');
	152	+}
	153	+?>
142	154	value="<?php p($_['phone']) ?>"
143	155	placeholder="<?php p($l->t('Your phone number')); ?>"
144	156	autocomplete="on" autocapitalize="none" autocorrect="off" />
		@@ -156,7 +168,10 @@ discard block
		block discarded – undo
156	168	<label for="address"><?php p($l->t('Address')); ?></label>
157	169	<span class="icon-password"/>
158	170	</h2>
159		- <input type="text" id="address" name="address" <?php if(!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"'); ?>
	171	+ <input type="text" id="address" name="address" <?php if(!$_['lookupServerUploadEnabled']) {
	172	+ print_unescaped('disabled="1"');
	173	+}
	174	+?>
160	175	placeholder="<?php p($l->t('Your postal address')); ?>"
161	176	value="<?php p($_['address']) ?>"
162	177	autocomplete="on" autocapitalize="none" autocorrect="off" />
		@@ -175,7 +190,10 @@ discard block
		block discarded – undo
175	190	<span class="icon-password"/>
176	191	</h2>
177	192	<?php if($_['lookupServerUploadEnabled']) { ?>
178		- <div class="verify <?php if ($_['website'] === '' \|\| $_['websiteScope'] !== 'public') p('hidden'); ?>">
	193	+ <div class="verify <?php if ($_['website'] === '' \|\| $_['websiteScope'] !== 'public') {
	194	+ p('hidden');
	195	+}
	196	+?>">
179	197	<img id="verify-website" title="<?php p($_['websiteMessage']); ?>" data-status="<?php p($_['websiteVerification']) ?>" src="
180	198	<?php
181	199	switch($_['websiteVerification']) {
		@@ -189,13 +207,16 @@ discard block
		block discarded – undo
189	207	p(image_path('core', 'actions/verify.svg'));
190	208	}
191	209	?>"
192		- <?php if($_['websiteVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS \|\| $_['websiteVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) print_unescaped(' class="verify-action"') ?>
	210	+ <?php if($_['websiteVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS \|\| $_['websiteVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) {
	211	+ print_unescaped(' class="verify-action"') ?>
193	212	>
194	213	<div class="verification-dialog popovermenu bubble menu">
195	214	<div class="verification-dialog-content">
196	215	<p class="explainVerification"></p>
197	216	<p class="verificationCode"></p>
198		- <p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.'));?></p>
	217	+ <p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.'));
	218	+}
	219	+?></p>
199	220	</div>
200	221	</div>
201	222	</div>
		@@ -203,7 +224,10 @@ discard block
		block discarded – undo
203	224	<input type="text" name="website" id="website" value="<?php p($_['website']); ?>"
204	225	placeholder="<?php p($l->t('Link https://…')); ?>"
205	226	autocomplete="on" autocapitalize="none" autocorrect="off"
206		- <?php if(!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"'); ?>
	227	+ <?php if(!$_['lookupServerUploadEnabled']) {
	228	+ print_unescaped('disabled="1"');
	229	+}
	230	+?>
207	231	/>
208	232	<span class="icon-checkmark hidden"/>
209	233	<?php if($_['lookupServerUploadEnabled']) { ?>
		@@ -220,7 +244,10 @@ discard block
		block discarded – undo
220	244	<span class="icon-password"/>
221	245	</h2>
222	246	<?php if($_['lookupServerUploadEnabled']) { ?>
223		- <div class="verify <?php if ($_['twitter'] === '' \|\| $_['twitterScope'] !== 'public') p('hidden'); ?>">
	247	+ <div class="verify <?php if ($_['twitter'] === '' \|\| $_['twitterScope'] !== 'public') {
	248	+ p('hidden');
	249	+}
	250	+?>">
224	251	<img id="verify-twitter" title="<?php p($_['twitterMessage']); ?>" data-status="<?php p($_['twitterVerification']) ?>" src="
225	252	<?php
226	253	switch($_['twitterVerification']) {
		@@ -234,13 +261,16 @@ discard block
		block discarded – undo
234	261	p(image_path('core', 'actions/verify.svg'));
235	262	}
236	263	?>"
237		- <?php if($_['twitterVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS \|\| $_['twitterVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) print_unescaped(' class="verify-action"') ?>
	264	+ <?php if($_['twitterVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS \|\| $_['twitterVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) {
	265	+ print_unescaped(' class="verify-action"') ?>
238	266	>
239	267	<div class="verification-dialog popovermenu bubble menu">
240	268	<div class="verification-dialog-content">
241	269	<p class="explainVerification"></p>
242	270	<p class="verificationCode"></p>
243		- <p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.'));?></p>
	271	+ <p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.'));
	272	+}
	273	+?></p>
244	274	</div>
245	275	</div>
246	276	</div>
		@@ -248,7 +278,10 @@ discard block
		block discarded – undo
248	278	<input type="text" name="twitter" id="twitter" value="<?php p($_['twitter']); ?>"
249	279	placeholder="<?php p($l->t('Twitter handle @…')); ?>"
250	280	autocomplete="on" autocapitalize="none" autocorrect="off"
251		- <?php if(!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"'); ?>
	281	+ <?php if(!$_['lookupServerUploadEnabled']) {
	282	+ print_unescaped('disabled="1"');
	283	+}
	284	+?>
252	285	/>
253	286	<span class="icon-checkmark hidden"/>
254	287	<?php if($_['lookupServerUploadEnabled']) { ?>

nextcloud / server

Pull Request — master (#5287)

Status

Category

Spacing +69 added lines, -69 removed lines patch added patch discarded remove patch

Braces +48 added lines, -15 removed lines patch added patch discarded remove patch