Inspection of "Cleaned up personal settings page" - nextcloud/server - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Pull Request — master (#5550)

by Andreas

created 2017-07-15 07:34 UTC

Status

Indentation +44 added lines, -44 removed lines patch added patch discarded remove patch

@@ -25,10 +25,10 @@  discard block
 block discarded – undo
 /** @var array $_ */
 
 script('settings', [
-	'usersettings',
-	'federationsettingsview',
-	'federationscopemenu',
-	'settings/personalInfo',
+    'usersettings',
+    'federationsettingsview',
+    'federationscopemenu',
+    'settings/personalInfo',
 ]);
 vendor_script('strengthify/jquery.strengthify');
 vendor_style('strengthify/strengthify');
@@ -43,10 +43,10 @@  discard block
 block discarded – undo
 		<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>
@@ -115,17 +115,17 @@  discard block
 block discarded – undo
 				<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"'); } ?>
@@ -191,17 +191,17 @@  discard block
 block discarded – undo
 				<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">
@@ -236,17 +236,17 @@  discard block
 block discarded – undo
 				<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">
@@ -318,9 +318,9 @@  discard block
 block discarded – undo
 		</div>
 		<div class="personal-settings-setting-box personal-settings-password-box">
 			<?php
-			if($_['passwordChangeSupported']) {
-				script('jquery-showpassword');
-			?>
+            if($_['passwordChangeSupported']) {
+                script('jquery-showpassword');
+            ?>
 			<form id="passwordform" class="section">
 				<h2 class="inlineblock"><?php p($l->t('Password'));?></h2>
 				<div id="password-error-msg" class="msg success inlineblock" style="display: none;">Saved</div>
@@ -343,8 +343,8 @@  discard block
 block discarded – undo
 				<br/>
 			</form>
 			<?php
-			}
-			?>
+            }
+            ?>
 		</div>
 		<span class="msg"></span>
 	</div>

Please login to merge, or discard this patch.

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

@@ -38,15 +38,15 @@  discard block
 block discarded – undo
 ?>
 
 <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>
@@ -80,7 +80,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>
@@ -94,14 +94,14 @@  discard block
 block discarded – undo
 					<span class="icon-federation-menu icon-password">&#9662;<span/>
 				</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>
@@ -112,10 +112,10 @@  discard block
 block discarded – undo
 					<label for="email"><?php p($l->t('Email')); ?></label>
 					<span class="icon-federation-menu icon-password">&#9662;<span/>
 				</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;
@@ -128,18 +128,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>
@@ -151,12 +151,12 @@  discard block
 block discarded – undo
 					<label for="phone"><?php p($l->t('Phone number')); ?></label>
 					<span class="icon-federation-menu icon-password">&#9662;<span/>
 				</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>
@@ -169,12 +169,12 @@  discard block
 block discarded – undo
 					<label for="address"><?php p($l->t('Address')); ?></label>
 					<span class="icon-federation-menu icon-password">&#9662;<span/>
 				</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>
@@ -187,11 +187,11 @@  discard block
 block discarded – undo
 					<label for="website"><?php p($l->t('Website')); ?></label>
 					<span class="icon-federation-menu icon-password">&#9662;<span/>
 				</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;
@@ -202,13 +202,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>
@@ -216,10 +216,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>
@@ -232,11 +232,11 @@  discard block
 block discarded – undo
 					<label for="twitter"><?php p($l->t('Twitter')); ?></label>
 					<span class="icon-federation-menu icon-password">&#9662;<span/>
 				</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;
@@ -247,13 +247,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>
@@ -261,10 +261,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>
@@ -290,48 +290,48 @@  discard block
 block discarded – undo
 			<?php if (isset($_['activelanguage'])) { ?>
 			<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>
 				<br>
 				<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>
 			<?php } ?>
 		</div>
 		<div class="personal-settings-setting-box personal-settings-password-box">
 			<?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" />
 				<br>
 				<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"

Please login to merge, or discard this patch.

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

@@ -44,9 +44,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>
@@ -68,8 +71,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>
 
@@ -112,7 +118,10 @@  discard block
 block discarded – undo
 					<label for="email"><?php p($l->t('Email')); ?></label>
 					<span class="icon-federation-menu icon-password">&#9662;<span/>
 				</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']) {
@@ -151,7 +160,10 @@  discard block
 block discarded – undo
 					<label for="phone"><?php p($l->t('Phone number')); ?></label>
 					<span class="icon-federation-menu icon-password">&#9662;<span/>
 				</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" />
@@ -169,7 +181,10 @@  discard block
 block discarded – undo
 					<label for="address"><?php p($l->t('Address')); ?></label>
 					<span class="icon-federation-menu icon-password">&#9662;<span/>
 				</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" />
@@ -188,7 +203,10 @@  discard block
 block discarded – undo
 					<span class="icon-federation-menu icon-password">&#9662;<span/>
 				</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']) {
@@ -202,13 +220,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>
@@ -216,7 +237,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']) { ?>
@@ -233,7 +257,10 @@  discard block
 block discarded – undo
 					<span class="icon-federation-menu icon-password">&#9662;<span/>
 				</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']) {
@@ -247,13 +274,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>
@@ -261,7 +291,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.

		@@ -25,10 +25,10 @@ discard block
		block discarded – undo
25	25	/** @var array $_ */
26	26
27	27	script('settings', [
28		- 'usersettings',
29		- 'federationsettingsview',
30		- 'federationscopemenu',
31		- 'settings/personalInfo',
	28	+ 'usersettings',
	29	+ 'federationsettingsview',
	30	+ 'federationscopemenu',
	31	+ 'settings/personalInfo',
32	32	]);
33	33	vendor_script('strengthify/jquery.strengthify');
34	34	vendor_style('strengthify/strengthify');
		@@ -43,10 +43,10 @@ discard block
		block discarded – undo
43	43	<p id="quotatext">
44	44	<?php if ($_['quota'] === \OCP\Files\FileInfo::SPACE_UNLIMITED): ?>
45	45	<?php print_unescaped($l->t('You are using <strong>%s</strong> of <strong>%s</strong>',
46		- [$_['usage'], $_['total_space']]));?>
	46	+ [$_['usage'], $_['total_space']]));?>
47	47	<?php else: ?>
48	48	<?php print_unescaped($l->t('You are using <strong>%s</strong> of <strong>%s</strong> (<strong>%s %%</strong>)',
49		- [$_['usage'], $_['total_space'], $_['usage_relative']]));?>
	49	+ [$_['usage'], $_['total_space'], $_['usage_relative']]));?>
50	50	<?php endif ?>
51	51	</p>
52	52	</div>
		@@ -115,17 +115,17 @@ discard block
		block discarded – undo
115	115	<div class="verify <?php if ($_['email'] === '' \|\| $_['emailScope'] !== 'public') p('hidden'); ?>">
116	116	<img id="verify-email" title="<?php p($_['emailMessage']); ?>" data-status="<?php p($_['emailVerification']) ?>" src="
117	117	<?php
118		- switch($_['emailVerification']) {
119		- case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS:
120		- p(image_path('core', 'actions/verifying.svg'));
121		- break;
122		- case \OC\Accounts\AccountManager::VERIFIED:
123		- p(image_path('core', 'actions/verified.svg'));
124		- break;
125		- default:
126		- p(image_path('core', 'actions/verify.svg'));
127		- }
128		- ?>">
	118	+ switch($_['emailVerification']) {
	119	+ case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS:
	120	+ p(image_path('core', 'actions/verifying.svg'));
	121	+ break;
	122	+ case \OC\Accounts\AccountManager::VERIFIED:
	123	+ p(image_path('core', 'actions/verified.svg'));
	124	+ break;
	125	+ default:
	126	+ p(image_path('core', 'actions/verify.svg'));
	127	+ }
	128	+ ?>">
129	129	</div>
130	130	<input type="email" name="email" id="email" value="<?php p($_['email']); ?>"
131	131	<?php if(!$_['displayNameChangeSupported']) { print_unescaped('class="hidden"'); } ?>
		@@ -191,17 +191,17 @@ discard block
		block discarded – undo
191	191	<div class="verify <?php if ($_['website'] === '' \|\| $_['websiteScope'] !== 'public') p('hidden'); ?>">
192	192	<img id="verify-website" title="<?php p($_['websiteMessage']); ?>" data-status="<?php p($_['websiteVerification']) ?>" src="
193	193	<?php
194		- switch($_['websiteVerification']) {
195		- case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS:
196		- p(image_path('core', 'actions/verifying.svg'));
197		- break;
198		- case \OC\Accounts\AccountManager::VERIFIED:
199		- p(image_path('core', 'actions/verified.svg'));
200		- break;
201		- default:
202		- p(image_path('core', 'actions/verify.svg'));
203		- }
204		- ?>"
	194	+ switch($_['websiteVerification']) {
	195	+ case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS:
	196	+ p(image_path('core', 'actions/verifying.svg'));
	197	+ break;
	198	+ case \OC\Accounts\AccountManager::VERIFIED:
	199	+ p(image_path('core', 'actions/verified.svg'));
	200	+ break;
	201	+ default:
	202	+ p(image_path('core', 'actions/verify.svg'));
	203	+ }
	204	+ ?>"
205	205	<?php if($_['websiteVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS \|\| $_['websiteVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) print_unescaped(' class="verify-action"') ?>
206	206	>
207	207	<div class="verification-dialog popovermenu bubble menu">
		@@ -236,17 +236,17 @@ discard block
		block discarded – undo
236	236	<div class="verify <?php if ($_['twitter'] === '' \|\| $_['twitterScope'] !== 'public') p('hidden'); ?>">
237	237	<img id="verify-twitter" title="<?php p($_['twitterMessage']); ?>" data-status="<?php p($_['twitterVerification']) ?>" src="
238	238	<?php
239		- switch($_['twitterVerification']) {
240		- case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS:
241		- p(image_path('core', 'actions/verifying.svg'));
242		- break;
243		- case \OC\Accounts\AccountManager::VERIFIED:
244		- p(image_path('core', 'actions/verified.svg'));
245		- break;
246		- default:
247		- p(image_path('core', 'actions/verify.svg'));
248		- }
249		- ?>"
	239	+ switch($_['twitterVerification']) {
	240	+ case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS:
	241	+ p(image_path('core', 'actions/verifying.svg'));
	242	+ break;
	243	+ case \OC\Accounts\AccountManager::VERIFIED:
	244	+ p(image_path('core', 'actions/verified.svg'));
	245	+ break;
	246	+ default:
	247	+ p(image_path('core', 'actions/verify.svg'));
	248	+ }
	249	+ ?>"
250	250	<?php if($_['twitterVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS \|\| $_['twitterVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) print_unescaped(' class="verify-action"') ?>
251	251	>
252	252	<div class="verification-dialog popovermenu bubble menu">
		@@ -318,9 +318,9 @@ discard block
		block discarded – undo
318	318	</div>
319	319	<div class="personal-settings-setting-box personal-settings-password-box">
320	320	<?php
321		- if($_['passwordChangeSupported']) {
322		- script('jquery-showpassword');
323		- ?>
	321	+ if($_['passwordChangeSupported']) {
	322	+ script('jquery-showpassword');
	323	+ ?>
324	324	<form id="passwordform" class="section">
325	325	<h2 class="inlineblock"><?php p($l->t('Password'));?></h2>
326	326	<div id="password-error-msg" class="msg success inlineblock" style="display: none;">Saved</div>
		@@ -343,8 +343,8 @@ discard block
		block discarded – undo
343	343	<br/>
344	344	</form>
345	345	<?php
346		- }
347		- ?>
	346	+ }
	347	+ ?>
348	348	</div>
349	349	<span class="msg"></span>
350	350	</div>

		@@ -38,15 +38,15 @@ discard block
		block discarded – undo
38	38	?>
39	39
40	40	<div id="quota" class="section">
41		- <div style="width:<?php p($_['usage_relative']);?>%"
42		- <?php if($_['usage_relative'] > 80): ?> class="quota-warning" <?php endif; ?>>
	41	+ <div style="width:<?php p($_['usage_relative']); ?>%"
	42	+ <?php if ($_['usage_relative'] > 80): ?> class="quota-warning" <?php endif; ?>>
43	43	<p id="quotatext">
44	44	<?php if ($_['quota'] === \OCP\Files\FileInfo::SPACE_UNLIMITED): ?>
45	45	<?php print_unescaped($l->t('You are using <strong>%s</strong> of <strong>%s</strong>',
46		- [$_['usage'], $_['total_space']]));?>
	46	+ [$_['usage'], $_['total_space']])); ?>
47	47	<?php else: ?>
48	48	<?php print_unescaped($l->t('You are using <strong>%s</strong> of <strong>%s</strong> (<strong>%s %%</strong>)',
49		- [$_['usage'], $_['total_space'], $_['usage_relative']]));?>
	49	+ [$_['usage'], $_['total_space'], $_['usage_relative']])); ?>
50	50	<?php endif ?>
51	51	</p>
52	52	</div>
		@@ -80,7 +80,7 @@ discard block
		block discarded – undo
80	80	</div>
81	81	</div>
82	82	<span class="icon-checkmark hidden"/>
83		- <?php if($_['lookupServerUploadEnabled']) { ?>
	83	+ <?php if ($_['lookupServerUploadEnabled']) { ?>
84	84	<input type="hidden" id="avatarscope" value="<?php p($_['avatarScope']) ?>">
85	85	<?php } ?>
86	86	</form>
		@@ -94,14 +94,14 @@ discard block
		block discarded – undo
94	94	<span class="icon-federation-menu icon-password">▾<span/>
95	95	</h2>
96	96	<input type="text" id="displayname" name="displayname"
97		- <?php if(!$_['displayNameChangeSupported']) { print_unescaped('class="hidden"'); } ?>
	97	+ <?php if (!$_['displayNameChangeSupported']) { print_unescaped('class="hidden"'); } ?>
98	98	value="<?php p($_['displayName']) ?>"
99	99	autocomplete="on" autocapitalize="none" autocorrect="off" />
100		- <?php if(!$_['displayNameChangeSupported']) { ?>
101		- <span><?php if(isset($_['displayName']) && !empty($_['displayName'])) { p($_['displayName']); } else { p($l->t('No display name set')); } ?></span>
	100	+ <?php if (!$_['displayNameChangeSupported']) { ?>
	101	+ <span><?php if (isset($_['displayName']) && !empty($_['displayName'])) { p($_['displayName']); } else { p($l->t('No display name set')); } ?></span>
102	102	<?php } ?>
103	103	<span class="icon-checkmark hidden"/>
104		- <?php if($_['lookupServerUploadEnabled']) { ?>
	104	+ <?php if ($_['lookupServerUploadEnabled']) { ?>
105	105	<input type="hidden" id="displaynamescope" value="<?php p($_['displayNameScope']) ?>">
106	106	<?php } ?>
107	107	</form>
		@@ -112,10 +112,10 @@ discard block
		block discarded – undo
112	112	<label for="email"><?php p($l->t('Email')); ?></label>
113	113	<span class="icon-federation-menu icon-password">▾<span/>
114	114	</h2>
115		- <div class="verify <?php if ($_['email'] === '' \|\| $_['emailScope'] !== 'public') p('hidden'); ?>">
	115	+ <div class="verify <?php if ($_['email'] === '' \|\| $_['emailScope'] !== 'public') p('hidden'); ?>">
116	116	<img id="verify-email" title="<?php p($_['emailMessage']); ?>" data-status="<?php p($_['emailVerification']) ?>" src="
117	117	<?php
118		- switch($_['emailVerification']) {
	118	+ switch ($_['emailVerification']) {
119	119	case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS:
120	120	p(image_path('core', 'actions/verifying.svg'));
121	121	break;
		@@ -128,18 +128,18 @@ discard block
		block discarded – undo
128	128	?>">
129	129	</div>
130	130	<input type="email" name="email" id="email" value="<?php p($_['email']); ?>"
131		- <?php if(!$_['displayNameChangeSupported']) { print_unescaped('class="hidden"'); } ?>
	131	+ <?php if (!$_['displayNameChangeSupported']) { print_unescaped('class="hidden"'); } ?>
132	132	placeholder="<?php p($l->t('Your email address')); ?>"
133	133	autocomplete="on" autocapitalize="none" autocorrect="off" />
134		- <?php if(!$_['displayNameChangeSupported']) { ?>
135		- <span><?php if(isset($_['email']) && !empty($_['email'])) { p($_['email']); } else { p($l->t('No email address set')); }?></span>
	134	+ <?php if (!$_['displayNameChangeSupported']) { ?>
	135	+ <span><?php if (isset($_['email']) && !empty($_['email'])) { p($_['email']); } else { p($l->t('No email address set')); }?></span>
136	136	<?php } ?>
137		- <?php if($_['displayNameChangeSupported']) { ?>
	137	+ <?php if ($_['displayNameChangeSupported']) { ?>
138	138	<br />
139	139	<em><?php p($l->t('For password reset and notifications')); ?></em>
140	140	<?php } ?>
141	141	<span class="icon-checkmark hidden"/>
142		- <?php if($_['lookupServerUploadEnabled']) { ?>
	142	+ <?php if ($_['lookupServerUploadEnabled']) { ?>
143	143	<input type="hidden" id="emailscope" value="<?php p($_['emailScope']) ?>">
144	144	<?php } ?>
145	145	</form>
		@@ -151,12 +151,12 @@ discard block
		block discarded – undo
151	151	<label for="phone"><?php p($l->t('Phone number')); ?></label>
152	152	<span class="icon-federation-menu icon-password">▾<span/>
153	153	</h2>
154		- <input type="tel" id="phone" name="phone" <?php if(!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"'); ?>
	154	+ <input type="tel" id="phone" name="phone" <?php if (!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"'); ?>
155	155	value="<?php p($_['phone']) ?>"
156	156	placeholder="<?php p($l->t('Your phone number')); ?>"
157	157	autocomplete="on" autocapitalize="none" autocorrect="off" />
158	158	<span class="icon-checkmark hidden"/>
159		- <?php if($_['lookupServerUploadEnabled']) { ?>
	159	+ <?php if ($_['lookupServerUploadEnabled']) { ?>
160	160	<input type="hidden" id="phonescope" value="<?php p($_['phoneScope']) ?>">
161	161	<?php } ?>
162	162	</form>
		@@ -169,12 +169,12 @@ discard block
		block discarded – undo
169	169	<label for="address"><?php p($l->t('Address')); ?></label>
170	170	<span class="icon-federation-menu icon-password">▾<span/>
171	171	</h2>
172		- <input type="text" id="address" name="address" <?php if(!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"'); ?>
	172	+ <input type="text" id="address" name="address" <?php if (!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"'); ?>
173	173	placeholder="<?php p($l->t('Your postal address')); ?>"
174	174	value="<?php p($_['address']) ?>"
175	175	autocomplete="on" autocapitalize="none" autocorrect="off" />
176	176	<span class="icon-checkmark hidden"/>
177		- <?php if($_['lookupServerUploadEnabled']) { ?>
	177	+ <?php if ($_['lookupServerUploadEnabled']) { ?>
178	178	<input type="hidden" id="addressscope" value="<?php p($_['addressScope']) ?>">
179	179	<?php } ?>
180	180	</form>
		@@ -187,11 +187,11 @@ discard block
		block discarded – undo
187	187	<label for="website"><?php p($l->t('Website')); ?></label>
188	188	<span class="icon-federation-menu icon-password">▾<span/>
189	189	</h2>
190		- <?php if($_['lookupServerUploadEnabled']) { ?>
191		- <div class="verify <?php if ($_['website'] === '' \|\| $_['websiteScope'] !== 'public') p('hidden'); ?>">
	190	+ <?php if ($_['lookupServerUploadEnabled']) { ?>
	191	+ <div class="verify <?php if ($_['website'] === '' \|\| $_['websiteScope'] !== 'public') p('hidden'); ?>">
192	192	<img id="verify-website" title="<?php p($_['websiteMessage']); ?>" data-status="<?php p($_['websiteVerification']) ?>" src="
193	193	<?php
194		- switch($_['websiteVerification']) {
	194	+ switch ($_['websiteVerification']) {
195	195	case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS:
196	196	p(image_path('core', 'actions/verifying.svg'));
197	197	break;
		@@ -202,13 +202,13 @@ discard block
		block discarded – undo
202	202	p(image_path('core', 'actions/verify.svg'));
203	203	}
204	204	?>"
205		- <?php if($_['websiteVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS \|\| $_['websiteVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) print_unescaped(' class="verify-action"') ?>
	205	+ <?php if ($_['websiteVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS \|\| $_['websiteVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) print_unescaped(' class="verify-action"') ?>
206	206	>
207	207	<div class="verification-dialog popovermenu bubble menu">
208	208	<div class="verification-dialog-content">
209	209	<p class="explainVerification"></p>
210	210	<p class="verificationCode"></p>
211		- <p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.'));?></p>
	211	+ <p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.')); ?></p>
212	212	</div>
213	213	</div>
214	214	</div>
		@@ -216,10 +216,10 @@ discard block
		block discarded – undo
216	216	<input type="text" name="website" id="website" value="<?php p($_['website']); ?>"
217	217	placeholder="<?php p($l->t('Link https://…')); ?>"
218	218	autocomplete="on" autocapitalize="none" autocorrect="off"
219		- <?php if(!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"'); ?>
	219	+ <?php if (!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"'); ?>
220	220	/>
221	221	<span class="icon-checkmark hidden"/>
222		- <?php if($_['lookupServerUploadEnabled']) { ?>
	222	+ <?php if ($_['lookupServerUploadEnabled']) { ?>
223	223	<input type="hidden" id="websitescope" value="<?php p($_['websiteScope']) ?>">
224	224	<?php } ?>
225	225	</form>
		@@ -232,11 +232,11 @@ discard block
		block discarded – undo
232	232	<label for="twitter"><?php p($l->t('Twitter')); ?></label>
233	233	<span class="icon-federation-menu icon-password">▾<span/>
234	234	</h2>
235		- <?php if($_['lookupServerUploadEnabled']) { ?>
236		- <div class="verify <?php if ($_['twitter'] === '' \|\| $_['twitterScope'] !== 'public') p('hidden'); ?>">
	235	+ <?php if ($_['lookupServerUploadEnabled']) { ?>
	236	+ <div class="verify <?php if ($_['twitter'] === '' \|\| $_['twitterScope'] !== 'public') p('hidden'); ?>">
237	237	<img id="verify-twitter" title="<?php p($_['twitterMessage']); ?>" data-status="<?php p($_['twitterVerification']) ?>" src="
238	238	<?php
239		- switch($_['twitterVerification']) {
	239	+ switch ($_['twitterVerification']) {
240	240	case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS:
241	241	p(image_path('core', 'actions/verifying.svg'));
242	242	break;
		@@ -247,13 +247,13 @@ discard block
		block discarded – undo
247	247	p(image_path('core', 'actions/verify.svg'));
248	248	}
249	249	?>"
250		- <?php if($_['twitterVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS \|\| $_['twitterVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) print_unescaped(' class="verify-action"') ?>
	250	+ <?php if ($_['twitterVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS \|\| $_['twitterVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) print_unescaped(' class="verify-action"') ?>
251	251	>
252	252	<div class="verification-dialog popovermenu bubble menu">
253	253	<div class="verification-dialog-content">
254	254	<p class="explainVerification"></p>
255	255	<p class="verificationCode"></p>
256		- <p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.'));?></p>
	256	+ <p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.')); ?></p>
257	257	</div>
258	258	</div>
259	259	</div>
		@@ -261,10 +261,10 @@ discard block
		block discarded – undo
261	261	<input type="text" name="twitter" id="twitter" value="<?php p($_['twitter']); ?>"
262	262	placeholder="<?php p($l->t('Twitter handle @…')); ?>"
263	263	autocomplete="on" autocapitalize="none" autocorrect="off"
264		- <?php if(!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"'); ?>
	264	+ <?php if (!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"'); ?>
265	265	/>
266	266	<span class="icon-checkmark hidden"/>
267		- <?php if($_['lookupServerUploadEnabled']) { ?>
	267	+ <?php if ($_['lookupServerUploadEnabled']) { ?>
268	268	<input type="hidden" id="twitterscope" value="<?php p($_['twitterScope']) ?>">
269	269	<?php } ?>
270	270	</form>
		@@ -290,48 +290,48 @@ discard block
		block discarded – undo
290	290	<?php if (isset($_['activelanguage'])) { ?>
291	291	<form id="language" class="section">
292	292	<h2>
293		- <label for="languageinput"><?php p($l->t('Language'));?></label>
	293	+ <label for="languageinput"><?php p($l->t('Language')); ?></label>
294	294	</h2>
295		- <select id="languageinput" name="lang" data-placeholder="<?php p($l->t('Language'));?>">
296		- <option value="<?php p($_['activelanguage']['code']);?>">
297		- <?php p($_['activelanguage']['name']);?>
	295	+ <select id="languageinput" name="lang" data-placeholder="<?php p($l->t('Language')); ?>">
	296	+ <option value="<?php p($_['activelanguage']['code']); ?>">
	297	+ <?php p($_['activelanguage']['name']); ?>
298	298	</option>
299		- <?php foreach($_['commonlanguages'] as $language):?>
300		- <option value="<?php p($language['code']);?>">
301		- <?php p($language['name']);?>
	299	+ <?php foreach ($_['commonlanguages'] as $language):?>
	300	+ <option value="<?php p($language['code']); ?>">
	301	+ <?php p($language['name']); ?>
302	302	</option>
303		- <?php endforeach;?>
	303	+ <?php endforeach; ?>
304	304	<optgroup label="––––––––––"></optgroup>
305		- <?php foreach($_['languages'] as $language):?>
306		- <option value="<?php p($language['code']);?>">
307		- <?php p($language['name']);?>
	305	+ <?php foreach ($_['languages'] as $language):?>
	306	+ <option value="<?php p($language['code']); ?>">
	307	+ <?php p($language['name']); ?>
308	308	</option>
309		- <?php endforeach;?>
	309	+ <?php endforeach; ?>
310	310	</select>
311	311	<br>
312	312	<a href="https://www.transifex.com/nextcloud/nextcloud/"
313	313	target="_blank" rel="noreferrer">
314		- <em><?php p($l->t('Help translate'));?></em>
	314	+ <em><?php p($l->t('Help translate')); ?></em>
315	315	</a>
316	316	</form>
317	317	<?php } ?>
318	318	</div>
319	319	<div class="personal-settings-setting-box personal-settings-password-box">
320	320	<?php
321		- if($_['passwordChangeSupported']) {
	321	+ if ($_['passwordChangeSupported']) {
322	322	script('jquery-showpassword');
323	323	?>
324	324	<form id="passwordform" class="section">
325		- <h2 class="inlineblock"><?php p($l->t('Password'));?></h2>
	325	+ <h2 class="inlineblock"><?php p($l->t('Password')); ?></h2>
326	326	<div id="password-error-msg" class="msg success inlineblock" style="display: none;">Saved</div>
327	327	<br>
328	328	<label for="pass1" class="hidden-visually"><?php p($l->t('Current password')); ?>: </label>
329	329	<input type="password" id="pass1" name="oldpassword"
330		- placeholder="<?php p($l->t('Current password'));?>"
	330	+ placeholder="<?php p($l->t('Current password')); ?>"
331	331	autocomplete="off" autocapitalize="none" autocorrect="off" />
332	332	<br>
333	333	<div class="personal-show-container">
334		- <label for="pass2" class="hidden-visually"><?php p($l->t('New password'));?>: </label>
	334	+ <label for="pass2" class="hidden-visually"><?php p($l->t('New password')); ?>: </label>
335	335	<input type="password" id="pass2" name="newpassword"
336	336	placeholder="<?php p($l->t('New password')); ?>"
337	337	data-typetoggle="#personal-show"

		@@ -44,9 +44,12 @@ discard block
		block discarded – undo
44	44	<?php if ($_['quota'] === \OCP\Files\FileInfo::SPACE_UNLIMITED): ?>
45	45	<?php print_unescaped($l->t('You are using <strong>%s</strong> of <strong>%s</strong>',
46	46	[$_['usage'], $_['total_space']]));?>
47		- <?php else: ?>
	47	+ <?php else {
	48	+ : ?>
48	49	<?php print_unescaped($l->t('You are using <strong>%s</strong> of <strong>%s</strong> (<strong>%s %%</strong>)',
49		- [$_['usage'], $_['total_space'], $_['usage_relative']]));?>
	50	+ [$_['usage'], $_['total_space'], $_['usage_relative']]));
	51	+}
	52	+?>
50	53	<?php endif ?>
51	54	</p>
52	55	</div>
		@@ -68,8 +71,11 @@ discard block
		block discarded – undo
68	71	<div class="hidden button icon-delete svg" id="removeavatar" title="<?php p($l->t('Remove image')); ?>"></div>
69	72	<input type="file" name="files[]" id="uploadavatar" class="hiddenuploadfield">
70	73	<p><em><?php p($l->t('png or jpg, max. 20 MB')); ?></em></p>
71		- <?php else: ?>
72		- <?php p($l->t('Picture provided by original account')); ?>
	74	+ <?php else {
	75	+ : ?>
	76	+ <?php p($l->t('Picture provided by original account'));
	77	+}
	78	+?>
73	79	<?php endif; ?>
74	80	</div>
75	81
		@@ -112,7 +118,10 @@ discard block
		block discarded – undo
112	118	<label for="email"><?php p($l->t('Email')); ?></label>
113	119	<span class="icon-federation-menu icon-password">▾<span/>
114	120	</h2>
115		- <div class="verify <?php if ($_['email'] === '' \|\| $_['emailScope'] !== 'public') p('hidden'); ?>">
	121	+ <div class="verify <?php if ($_['email'] === '' \|\| $_['emailScope'] !== 'public') {
	122	+ p('hidden');
	123	+}
	124	+?>">
116	125	<img id="verify-email" title="<?php p($_['emailMessage']); ?>" data-status="<?php p($_['emailVerification']) ?>" src="
117	126	<?php
118	127	switch($_['emailVerification']) {
		@@ -151,7 +160,10 @@ discard block
		block discarded – undo
151	160	<label for="phone"><?php p($l->t('Phone number')); ?></label>
152	161	<span class="icon-federation-menu icon-password">▾<span/>
153	162	</h2>
154		- <input type="tel" id="phone" name="phone" <?php if(!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"'); ?>
	163	+ <input type="tel" id="phone" name="phone" <?php if(!$_['lookupServerUploadEnabled']) {
	164	+ print_unescaped('disabled="1"');
	165	+}
	166	+?>
155	167	value="<?php p($_['phone']) ?>"
156	168	placeholder="<?php p($l->t('Your phone number')); ?>"
157	169	autocomplete="on" autocapitalize="none" autocorrect="off" />
		@@ -169,7 +181,10 @@ discard block
		block discarded – undo
169	181	<label for="address"><?php p($l->t('Address')); ?></label>
170	182	<span class="icon-federation-menu icon-password">▾<span/>
171	183	</h2>
172		- <input type="text" id="address" name="address" <?php if(!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"'); ?>
	184	+ <input type="text" id="address" name="address" <?php if(!$_['lookupServerUploadEnabled']) {
	185	+ print_unescaped('disabled="1"');
	186	+}
	187	+?>
173	188	placeholder="<?php p($l->t('Your postal address')); ?>"
174	189	value="<?php p($_['address']) ?>"
175	190	autocomplete="on" autocapitalize="none" autocorrect="off" />
		@@ -188,7 +203,10 @@ discard block
		block discarded – undo
188	203	<span class="icon-federation-menu icon-password">▾<span/>
189	204	</h2>
190	205	<?php if($_['lookupServerUploadEnabled']) { ?>
191		- <div class="verify <?php if ($_['website'] === '' \|\| $_['websiteScope'] !== 'public') p('hidden'); ?>">
	206	+ <div class="verify <?php if ($_['website'] === '' \|\| $_['websiteScope'] !== 'public') {
	207	+ p('hidden');
	208	+}
	209	+?>">
192	210	<img id="verify-website" title="<?php p($_['websiteMessage']); ?>" data-status="<?php p($_['websiteVerification']) ?>" src="
193	211	<?php
194	212	switch($_['websiteVerification']) {
		@@ -202,13 +220,16 @@ discard block
		block discarded – undo
202	220	p(image_path('core', 'actions/verify.svg'));
203	221	}
204	222	?>"
205		- <?php if($_['websiteVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS \|\| $_['websiteVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) print_unescaped(' class="verify-action"') ?>
	223	+ <?php if($_['websiteVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS \|\| $_['websiteVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) {
	224	+ print_unescaped(' class="verify-action"') ?>
206	225	>
207	226	<div class="verification-dialog popovermenu bubble menu">
208	227	<div class="verification-dialog-content">
209	228	<p class="explainVerification"></p>
210	229	<p class="verificationCode"></p>
211		- <p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.'));?></p>
	230	+ <p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.'));
	231	+}
	232	+?></p>
212	233	</div>
213	234	</div>
214	235	</div>
		@@ -216,7 +237,10 @@ discard block
		block discarded – undo
216	237	<input type="text" name="website" id="website" value="<?php p($_['website']); ?>"
217	238	placeholder="<?php p($l->t('Link https://…')); ?>"
218	239	autocomplete="on" autocapitalize="none" autocorrect="off"
219		- <?php if(!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"'); ?>
	240	+ <?php if(!$_['lookupServerUploadEnabled']) {
	241	+ print_unescaped('disabled="1"');
	242	+}
	243	+?>
220	244	/>
221	245	<span class="icon-checkmark hidden"/>
222	246	<?php if($_['lookupServerUploadEnabled']) { ?>
		@@ -233,7 +257,10 @@ discard block
		block discarded – undo
233	257	<span class="icon-federation-menu icon-password">▾<span/>
234	258	</h2>
235	259	<?php if($_['lookupServerUploadEnabled']) { ?>
236		- <div class="verify <?php if ($_['twitter'] === '' \|\| $_['twitterScope'] !== 'public') p('hidden'); ?>">
	260	+ <div class="verify <?php if ($_['twitter'] === '' \|\| $_['twitterScope'] !== 'public') {
	261	+ p('hidden');
	262	+}
	263	+?>">
237	264	<img id="verify-twitter" title="<?php p($_['twitterMessage']); ?>" data-status="<?php p($_['twitterVerification']) ?>" src="
238	265	<?php
239	266	switch($_['twitterVerification']) {
		@@ -247,13 +274,16 @@ discard block
		block discarded – undo
247	274	p(image_path('core', 'actions/verify.svg'));
248	275	}
249	276	?>"
250		- <?php if($_['twitterVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS \|\| $_['twitterVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) print_unescaped(' class="verify-action"') ?>
	277	+ <?php if($_['twitterVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS \|\| $_['twitterVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) {
	278	+ print_unescaped(' class="verify-action"') ?>
251	279	>
252	280	<div class="verification-dialog popovermenu bubble menu">
253	281	<div class="verification-dialog-content">
254	282	<p class="explainVerification"></p>
255	283	<p class="verificationCode"></p>
256		- <p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.'));?></p>
	284	+ <p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.'));
	285	+}
	286	+?></p>
257	287	</div>
258	288	</div>
259	289	</div>
		@@ -261,7 +291,10 @@ discard block
		block discarded – undo
261	291	<input type="text" name="twitter" id="twitter" value="<?php p($_['twitter']); ?>"
262	292	placeholder="<?php p($l->t('Twitter handle @…')); ?>"
263	293	autocomplete="on" autocapitalize="none" autocorrect="off"
264		- <?php if(!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"'); ?>
	294	+ <?php if(!$_['lookupServerUploadEnabled']) {
	295	+ print_unescaped('disabled="1"');
	296	+}
	297	+?>
265	298	/>
266	299	<span class="icon-checkmark hidden"/>
267	300	<?php if($_['lookupServerUploadEnabled']) { ?>

nextcloud / server

Pull Request — master (#5550)

Status

Category

Indentation +44 added lines, -44 removed lines patch added patch discarded remove patch

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

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