Inspection of "Small improvements for personal settings" - nextcloud/server - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Pull Request — master (#9332)

by Julius

created 2018-04-28 09:49 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');
@@ -85,10 +85,10 @@  discard block
 block discarded – undo
 					<p class="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>
@@ -131,17 +131,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"'); } ?>
@@ -213,17 +213,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">
@@ -260,17 +260,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">
@@ -328,9 +328,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>
@@ -353,8 +353,8 @@  discard block
 block discarded – undo
 
 				</form>
 				<?php
-			}
-			?>
+            }
+            ?>
 		</div>
 		<span class="msg"></span>
 	</div>

Please login to merge, or discard this patch.

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

@@ -67,7 +67,7 @@  discard block
 block discarded – undo
 					</div>
 				</div>
 				<span class="icon-checkmark hidden"></span>
-				<?php if($_['lookupServerUploadEnabled']) { ?>
+				<?php if ($_['lookupServerUploadEnabled']) { ?>
 				<input type="hidden" id="avatarscope" value="<?php p($_['avatarScope']) ?>">
 				<?php } ?>
 			</form>
@@ -85,14 +85,14 @@  discard block
 block discarded – undo
 					<p class="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>
-				<progress value="<?php p($_['usage_relative']); ?>" max="100"<?php if($_['usage_relative'] > 80): ?> class="warn" <?php endif; ?>></progress>
+				<progress value="<?php p($_['usage_relative']); ?>" max="100"<?php if ($_['usage_relative'] > 80): ?> class="warn" <?php endif; ?>></progress>
 			</div>
 		</div>
 	</div>
@@ -107,15 +107,15 @@  discard block
 block discarded – undo
 					</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"></span>
 				<span class="icon-error hidden" ></span>
-				<?php if($_['lookupServerUploadEnabled']) { ?>
+				<?php if ($_['lookupServerUploadEnabled']) { ?>
 					<input type="hidden" id="displaynamescope" value="<?php p($_['displayNameScope']) ?>">
 				<?php } ?>
 			</form>
@@ -128,10 +128,10 @@  discard block
 block discarded – undo
 						<span class="icon-triangle-s"></span>
 					</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;
@@ -144,18 +144,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" />
 			   	<span class="icon-checkmark hidden"></span>
 				<span class="icon-error hidden" ></span>
-				<?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']) { ?>
 					<em><?php p($l->t('For password reset and notifications')); ?></em>
 				<?php } ?>
-				<?php if($_['lookupServerUploadEnabled']) { ?>
+				<?php if ($_['lookupServerUploadEnabled']) { ?>
 					<input type="hidden" id="emailscope" value="<?php p($_['emailScope']) ?>">
 				<?php } ?>
 			</form>
@@ -169,12 +169,12 @@  discard block
 block discarded – undo
 						<span class="icon-triangle-s"></span>
 					</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"></span>
-				<?php if($_['lookupServerUploadEnabled']) { ?>
+				<?php if ($_['lookupServerUploadEnabled']) { ?>
 				<input type="hidden" id="phonescope" value="<?php p($_['phoneScope']) ?>">
 				<?php } ?>
 			</form>
@@ -189,12 +189,12 @@  discard block
 block discarded – undo
 						<span class="icon-triangle-s"></span>
 					</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"></span>
-				<?php if($_['lookupServerUploadEnabled']) { ?>
+				<?php if ($_['lookupServerUploadEnabled']) { ?>
 				<input type="hidden" id="addressscope" value="<?php p($_['addressScope']) ?>">
 				<?php } ?>
 			</form>
@@ -209,11 +209,11 @@  discard block
 block discarded – undo
 						<span class="icon-triangle-s"></span>
 					</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;
@@ -224,13 +224,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>
@@ -238,10 +238,10 @@  discard block
 block discarded – undo
 				<input type="url" 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"></span>
-				<?php if($_['lookupServerUploadEnabled']) { ?>
+				<?php if ($_['lookupServerUploadEnabled']) { ?>
 				<input type="hidden" id="websitescope" value="<?php p($_['websiteScope']) ?>">
 				<?php } ?>
 			</form>
@@ -256,11 +256,11 @@  discard block
 block discarded – undo
 						<span class="icon-triangle-s"></span>
 					</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;
@@ -271,13 +271,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>
@@ -285,10 +285,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"></span>
-				<?php if($_['lookupServerUploadEnabled']) { ?>
+				<?php if ($_['lookupServerUploadEnabled']) { ?>
 				<input type="hidden" id="twitterscope" value="<?php p($_['twitterScope']) ?>">
 				<?php } ?>
 			</form>
@@ -301,47 +301,47 @@  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>
 					<a href="https://www.transifex.com/nextcloud/nextcloud/"
 					   target="_blank" rel="noreferrer noopener">
-						<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>
 
 					<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"

Please login to merge, or discard this patch.

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

@@ -55,8 +55,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>
 
@@ -86,9 +89,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>
@@ -128,7 +134,10 @@  discard block
 block discarded – undo
 						<span class="icon-triangle-s"></span>
 					</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']) {
@@ -169,7 +178,10 @@  discard block
 block discarded – undo
 						<span class="icon-triangle-s"></span>
 					</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" />
@@ -189,7 +201,10 @@  discard block
 block discarded – undo
 						<span class="icon-triangle-s"></span>
 					</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" />
@@ -210,7 +225,10 @@  discard block
 block discarded – undo
 					</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']) {
@@ -224,13 +242,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>
@@ -238,7 +259,10 @@  discard block
 block discarded – undo
 				<input type="url" 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"></span>
 				<?php if($_['lookupServerUploadEnabled']) { ?>
@@ -257,7 +281,10 @@  discard block
 block discarded – undo
 					</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']) {
@@ -271,13 +298,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>
@@ -285,7 +315,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"></span>
 				<?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');
		@@ -85,10 +85,10 @@ discard block
		block discarded – undo
85	85	<p class="quotatext">
86	86	<?php if ($_['quota'] === \OCP\Files\FileInfo::SPACE_UNLIMITED): ?>
87	87	<?php print_unescaped($l->t('You are using <strong>%s</strong> of <strong>%s</strong>',
88		- [$_['usage'], $_['total_space']]));?>
	88	+ [$_['usage'], $_['total_space']]));?>
89	89	<?php else: ?>
90	90	<?php print_unescaped($l->t('You are using <strong>%s</strong> of <strong>%s</strong> (<strong>%s %%</strong>)',
91		- [$_['usage'], $_['total_space'], $_['usage_relative']]));?>
	91	+ [$_['usage'], $_['total_space'], $_['usage_relative']]));?>
92	92	<?php endif ?>
93	93	</p>
94	94	</div>
		@@ -131,17 +131,17 @@ discard block
		block discarded – undo
131	131	<div class="verify <?php if ($_['email'] === '' \|\| $_['emailScope'] !== 'public') p('hidden'); ?>">
132	132	<img id="verify-email" title="<?php p($_['emailMessage']); ?>" data-status="<?php p($_['emailVerification']) ?>" src="
133	133	<?php
134		- switch($_['emailVerification']) {
135		- case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS:
136		- p(image_path('core', 'actions/verifying.svg'));
137		- break;
138		- case \OC\Accounts\AccountManager::VERIFIED:
139		- p(image_path('core', 'actions/verified.svg'));
140		- break;
141		- default:
142		- p(image_path('core', 'actions/verify.svg'));
143		- }
144		- ?>">
	134	+ switch($_['emailVerification']) {
	135	+ case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS:
	136	+ p(image_path('core', 'actions/verifying.svg'));
	137	+ break;
	138	+ case \OC\Accounts\AccountManager::VERIFIED:
	139	+ p(image_path('core', 'actions/verified.svg'));
	140	+ break;
	141	+ default:
	142	+ p(image_path('core', 'actions/verify.svg'));
	143	+ }
	144	+ ?>">
145	145	</div>
146	146	<input type="email" name="email" id="email" value="<?php p($_['email']); ?>"
147	147	<?php if(!$_['displayNameChangeSupported']) { print_unescaped('class="hidden"'); } ?>
		@@ -213,17 +213,17 @@ discard block
		block discarded – undo
213	213	<div class="verify <?php if ($_['website'] === '' \|\| $_['websiteScope'] !== 'public') p('hidden'); ?>">
214	214	<img id="verify-website" title="<?php p($_['websiteMessage']); ?>" data-status="<?php p($_['websiteVerification']) ?>" src="
215	215	<?php
216		- switch($_['websiteVerification']) {
217		- case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS:
218		- p(image_path('core', 'actions/verifying.svg'));
219		- break;
220		- case \OC\Accounts\AccountManager::VERIFIED:
221		- p(image_path('core', 'actions/verified.svg'));
222		- break;
223		- default:
224		- p(image_path('core', 'actions/verify.svg'));
225		- }
226		- ?>"
	216	+ switch($_['websiteVerification']) {
	217	+ case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS:
	218	+ p(image_path('core', 'actions/verifying.svg'));
	219	+ break;
	220	+ case \OC\Accounts\AccountManager::VERIFIED:
	221	+ p(image_path('core', 'actions/verified.svg'));
	222	+ break;
	223	+ default:
	224	+ p(image_path('core', 'actions/verify.svg'));
	225	+ }
	226	+ ?>"
227	227	<?php if($_['websiteVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS \|\| $_['websiteVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) print_unescaped(' class="verify-action"') ?>
228	228	>
229	229	<div class="verification-dialog popovermenu bubble menu">
		@@ -260,17 +260,17 @@ discard block
		block discarded – undo
260	260	<div class="verify <?php if ($_['twitter'] === '' \|\| $_['twitterScope'] !== 'public') p('hidden'); ?>">
261	261	<img id="verify-twitter" title="<?php p($_['twitterMessage']); ?>" data-status="<?php p($_['twitterVerification']) ?>" src="
262	262	<?php
263		- switch($_['twitterVerification']) {
264		- case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS:
265		- p(image_path('core', 'actions/verifying.svg'));
266		- break;
267		- case \OC\Accounts\AccountManager::VERIFIED:
268		- p(image_path('core', 'actions/verified.svg'));
269		- break;
270		- default:
271		- p(image_path('core', 'actions/verify.svg'));
272		- }
273		- ?>"
	263	+ switch($_['twitterVerification']) {
	264	+ case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS:
	265	+ p(image_path('core', 'actions/verifying.svg'));
	266	+ break;
	267	+ case \OC\Accounts\AccountManager::VERIFIED:
	268	+ p(image_path('core', 'actions/verified.svg'));
	269	+ break;
	270	+ default:
	271	+ p(image_path('core', 'actions/verify.svg'));
	272	+ }
	273	+ ?>"
274	274	<?php if($_['twitterVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS \|\| $_['twitterVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) print_unescaped(' class="verify-action"') ?>
275	275	>
276	276	<div class="verification-dialog popovermenu bubble menu">
		@@ -328,9 +328,9 @@ discard block
		block discarded – undo
328	328	</div>
329	329	<div class="personal-settings-setting-box personal-settings-password-box">
330	330	<?php
331		- if($_['passwordChangeSupported']) {
332		- script('jquery-showpassword');
333		- ?>
	331	+ if($_['passwordChangeSupported']) {
	332	+ script('jquery-showpassword');
	333	+ ?>
334	334	<form id="passwordform" class="section">
335	335	<h2 class="inlineblock"><?php p($l->t('Password'));?></h2>
336	336	<div id="password-error-msg" class="msg success inlineblock" style="display: none;">Saved</div>
		@@ -353,8 +353,8 @@ discard block
		block discarded – undo
353	353
354	354	</form>
355	355	<?php
356		- }
357		- ?>
	356	+ }
	357	+ ?>
358	358	</div>
359	359	<span class="msg"></span>
360	360	</div>

		@@ -67,7 +67,7 @@ discard block
		block discarded – undo
67	67	</div>
68	68	</div>
69	69	<span class="icon-checkmark hidden"></span>
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>
		@@ -85,14 +85,14 @@ discard block
		block discarded – undo
85	85	<p class="quotatext">
86	86	<?php if ($_['quota'] === \OCP\Files\FileInfo::SPACE_UNLIMITED): ?>
87	87	<?php print_unescaped($l->t('You are using <strong>%s</strong> of <strong>%s</strong>',
88		- [$_['usage'], $_['total_space']]));?>
	88	+ [$_['usage'], $_['total_space']])); ?>
89	89	<?php else: ?>
90	90	<?php print_unescaped($l->t('You are using <strong>%s</strong> of <strong>%s</strong> (<strong>%s %%</strong>)',
91		- [$_['usage'], $_['total_space'], $_['usage_relative']]));?>
	91	+ [$_['usage'], $_['total_space'], $_['usage_relative']])); ?>
92	92	<?php endif ?>
93	93	</p>
94	94	</div>
95		- <progress value="<?php p($_['usage_relative']); ?>" max="100"<?php if($_['usage_relative'] > 80): ?> class="warn" <?php endif; ?>></progress>
	95	+ <progress value="<?php p($_['usage_relative']); ?>" max="100"<?php if ($_['usage_relative'] > 80): ?> class="warn" <?php endif; ?>></progress>
96	96	</div>
97	97	</div>
98	98	</div>
		@@ -107,15 +107,15 @@ discard block
		block discarded – undo
107	107	</span>
108	108	</h2>
109	109	<input type="text" id="displayname" name="displayname"
110		- <?php if(!$_['displayNameChangeSupported']) { print_unescaped('class="hidden"'); } ?>
	110	+ <?php if (!$_['displayNameChangeSupported']) { print_unescaped('class="hidden"'); } ?>
111	111	value="<?php p($_['displayName']) ?>"
112	112	autocomplete="on" autocapitalize="none" autocorrect="off" />
113		- <?php if(!$_['displayNameChangeSupported']) { ?>
114		- <span><?php if(isset($_['displayName']) && !empty($_['displayName'])) { p($_['displayName']); } else { p($l->t('No display name set')); } ?></span>
	113	+ <?php if (!$_['displayNameChangeSupported']) { ?>
	114	+ <span><?php if (isset($_['displayName']) && !empty($_['displayName'])) { p($_['displayName']); } else { p($l->t('No display name set')); } ?></span>
115	115	<?php } ?>
116	116	<span class="icon-checkmark hidden"></span>
117	117	<span class="icon-error hidden" ></span>
118		- <?php if($_['lookupServerUploadEnabled']) { ?>
	118	+ <?php if ($_['lookupServerUploadEnabled']) { ?>
119	119	<input type="hidden" id="displaynamescope" value="<?php p($_['displayNameScope']) ?>">
120	120	<?php } ?>
121	121	</form>
		@@ -128,10 +128,10 @@ discard block
		block discarded – undo
128	128	<span class="icon-triangle-s"></span>
129	129	</span>
130	130	</h2>
131		- <div class="verify <?php if ($_['email'] === '' \|\| $_['emailScope'] !== 'public') p('hidden'); ?>">
	131	+ <div class="verify <?php if ($_['email'] === '' \|\| $_['emailScope'] !== 'public') p('hidden'); ?>">
132	132	<img id="verify-email" title="<?php p($_['emailMessage']); ?>" data-status="<?php p($_['emailVerification']) ?>" src="
133	133	<?php
134		- switch($_['emailVerification']) {
	134	+ switch ($_['emailVerification']) {
135	135	case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS:
136	136	p(image_path('core', 'actions/verifying.svg'));
137	137	break;
		@@ -144,18 +144,18 @@ discard block
		block discarded – undo
144	144	?>">
145	145	</div>
146	146	<input type="email" name="email" id="email" value="<?php p($_['email']); ?>"
147		- <?php if(!$_['displayNameChangeSupported']) { print_unescaped('class="hidden"'); } ?>
	147	+ <?php if (!$_['displayNameChangeSupported']) { print_unescaped('class="hidden"'); } ?>
148	148	placeholder="<?php p($l->t('Your email address')); ?>"
149	149	autocomplete="on" autocapitalize="none" autocorrect="off" />
150	150	<span class="icon-checkmark hidden"></span>
151	151	<span class="icon-error hidden" ></span>
152		- <?php if(!$_['displayNameChangeSupported']) { ?>
153		- <span><?php if(isset($_['email']) && !empty($_['email'])) { p($_['email']); } else { p($l->t('No email address set')); }?></span>
	152	+ <?php if (!$_['displayNameChangeSupported']) { ?>
	153	+ <span><?php if (isset($_['email']) && !empty($_['email'])) { p($_['email']); } else { p($l->t('No email address set')); }?></span>
154	154	<?php } ?>
155		- <?php if($_['displayNameChangeSupported']) { ?>
	155	+ <?php if ($_['displayNameChangeSupported']) { ?>
156	156	<em><?php p($l->t('For password reset and notifications')); ?></em>
157	157	<?php } ?>
158		- <?php if($_['lookupServerUploadEnabled']) { ?>
	158	+ <?php if ($_['lookupServerUploadEnabled']) { ?>
159	159	<input type="hidden" id="emailscope" value="<?php p($_['emailScope']) ?>">
160	160	<?php } ?>
161	161	</form>
		@@ -169,12 +169,12 @@ discard block
		block discarded – undo
169	169	<span class="icon-triangle-s"></span>
170	170	</span>
171	171	</h2>
172		- <input type="tel" id="phone" name="phone" <?php if(!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"'); ?>
	172	+ <input type="tel" id="phone" name="phone" <?php if (!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"'); ?>
173	173	value="<?php p($_['phone']) ?>"
174	174	placeholder="<?php p($l->t('Your phone number')); ?>"
175	175	autocomplete="on" autocapitalize="none" autocorrect="off" />
176	176	<span class="icon-checkmark hidden"></span>
177		- <?php if($_['lookupServerUploadEnabled']) { ?>
	177	+ <?php if ($_['lookupServerUploadEnabled']) { ?>
178	178	<input type="hidden" id="phonescope" value="<?php p($_['phoneScope']) ?>">
179	179	<?php } ?>
180	180	</form>
		@@ -189,12 +189,12 @@ discard block
		block discarded – undo
189	189	<span class="icon-triangle-s"></span>
190	190	</span>
191	191	</h2>
192		- <input type="text" id="address" name="address" <?php if(!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"'); ?>
	192	+ <input type="text" id="address" name="address" <?php if (!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"'); ?>
193	193	placeholder="<?php p($l->t('Your postal address')); ?>"
194	194	value="<?php p($_['address']) ?>"
195	195	autocomplete="on" autocapitalize="none" autocorrect="off" />
196	196	<span class="icon-checkmark hidden"></span>
197		- <?php if($_['lookupServerUploadEnabled']) { ?>
	197	+ <?php if ($_['lookupServerUploadEnabled']) { ?>
198	198	<input type="hidden" id="addressscope" value="<?php p($_['addressScope']) ?>">
199	199	<?php } ?>
200	200	</form>
		@@ -209,11 +209,11 @@ discard block
		block discarded – undo
209	209	<span class="icon-triangle-s"></span>
210	210	</span>
211	211	</h2>
212		- <?php if($_['lookupServerUploadEnabled']) { ?>
213		- <div class="verify <?php if ($_['website'] === '' \|\| $_['websiteScope'] !== 'public') p('hidden'); ?>">
	212	+ <?php if ($_['lookupServerUploadEnabled']) { ?>
	213	+ <div class="verify <?php if ($_['website'] === '' \|\| $_['websiteScope'] !== 'public') p('hidden'); ?>">
214	214	<img id="verify-website" title="<?php p($_['websiteMessage']); ?>" data-status="<?php p($_['websiteVerification']) ?>" src="
215	215	<?php
216		- switch($_['websiteVerification']) {
	216	+ switch ($_['websiteVerification']) {
217	217	case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS:
218	218	p(image_path('core', 'actions/verifying.svg'));
219	219	break;
		@@ -224,13 +224,13 @@ discard block
		block discarded – undo
224	224	p(image_path('core', 'actions/verify.svg'));
225	225	}
226	226	?>"
227		- <?php if($_['websiteVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS \|\| $_['websiteVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) print_unescaped(' class="verify-action"') ?>
	227	+ <?php if ($_['websiteVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS \|\| $_['websiteVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) print_unescaped(' class="verify-action"') ?>
228	228	>
229	229	<div class="verification-dialog popovermenu bubble menu">
230	230	<div class="verification-dialog-content">
231	231	<p class="explainVerification"></p>
232	232	<p class="verificationCode"></p>
233		- <p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.'));?></p>
	233	+ <p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.')); ?></p>
234	234	</div>
235	235	</div>
236	236	</div>
		@@ -238,10 +238,10 @@ discard block
		block discarded – undo
238	238	<input type="url" name="website" id="website" value="<?php p($_['website']); ?>"
239	239	placeholder="<?php p($l->t('Link https://…')); ?>"
240	240	autocomplete="on" autocapitalize="none" autocorrect="off"
241		- <?php if(!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"'); ?>
	241	+ <?php if (!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"'); ?>
242	242	/>
243	243	<span class="icon-checkmark hidden"></span>
244		- <?php if($_['lookupServerUploadEnabled']) { ?>
	244	+ <?php if ($_['lookupServerUploadEnabled']) { ?>
245	245	<input type="hidden" id="websitescope" value="<?php p($_['websiteScope']) ?>">
246	246	<?php } ?>
247	247	</form>
		@@ -256,11 +256,11 @@ discard block
		block discarded – undo
256	256	<span class="icon-triangle-s"></span>
257	257	</span>
258	258	</h2>
259		- <?php if($_['lookupServerUploadEnabled']) { ?>
260		- <div class="verify <?php if ($_['twitter'] === '' \|\| $_['twitterScope'] !== 'public') p('hidden'); ?>">
	259	+ <?php if ($_['lookupServerUploadEnabled']) { ?>
	260	+ <div class="verify <?php if ($_['twitter'] === '' \|\| $_['twitterScope'] !== 'public') p('hidden'); ?>">
261	261	<img id="verify-twitter" title="<?php p($_['twitterMessage']); ?>" data-status="<?php p($_['twitterVerification']) ?>" src="
262	262	<?php
263		- switch($_['twitterVerification']) {
	263	+ switch ($_['twitterVerification']) {
264	264	case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS:
265	265	p(image_path('core', 'actions/verifying.svg'));
266	266	break;
		@@ -271,13 +271,13 @@ discard block
		block discarded – undo
271	271	p(image_path('core', 'actions/verify.svg'));
272	272	}
273	273	?>"
274		- <?php if($_['twitterVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS \|\| $_['twitterVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) print_unescaped(' class="verify-action"') ?>
	274	+ <?php if ($_['twitterVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS \|\| $_['twitterVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) print_unescaped(' class="verify-action"') ?>
275	275	>
276	276	<div class="verification-dialog popovermenu bubble menu">
277	277	<div class="verification-dialog-content">
278	278	<p class="explainVerification"></p>
279	279	<p class="verificationCode"></p>
280		- <p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.'));?></p>
	280	+ <p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.')); ?></p>
281	281	</div>
282	282	</div>
283	283	</div>
		@@ -285,10 +285,10 @@ discard block
		block discarded – undo
285	285	<input type="text" name="twitter" id="twitter" value="<?php p($_['twitter']); ?>"
286	286	placeholder="<?php p($l->t('Twitter handle @…')); ?>"
287	287	autocomplete="on" autocapitalize="none" autocorrect="off"
288		- <?php if(!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"'); ?>
	288	+ <?php if (!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"'); ?>
289	289	/>
290	290	<span class="icon-checkmark hidden"></span>
291		- <?php if($_['lookupServerUploadEnabled']) { ?>
	291	+ <?php if ($_['lookupServerUploadEnabled']) { ?>
292	292	<input type="hidden" id="twitterscope" value="<?php p($_['twitterScope']) ?>">
293	293	<?php } ?>
294	294	</form>
		@@ -301,47 +301,47 @@ discard block
		block discarded – undo
301	301	<?php if (isset($_['activelanguage'])) { ?>
302	302	<form id="language" class="section">
303	303	<h2>
304		- <label for="languageinput"><?php p($l->t('Language'));?></label>
	304	+ <label for="languageinput"><?php p($l->t('Language')); ?></label>
305	305	</h2>
306		- <select id="languageinput" name="lang" data-placeholder="<?php p($l->t('Language'));?>">
307		- <option value="<?php p($_['activelanguage']['code']);?>">
308		- <?php p($_['activelanguage']['name']);?>
	306	+ <select id="languageinput" name="lang" data-placeholder="<?php p($l->t('Language')); ?>">
	307	+ <option value="<?php p($_['activelanguage']['code']); ?>">
	308	+ <?php p($_['activelanguage']['name']); ?>
309	309	</option>
310		- <?php foreach($_['commonlanguages'] as $language):?>
311		- <option value="<?php p($language['code']);?>">
312		- <?php p($language['name']);?>
	310	+ <?php foreach ($_['commonlanguages'] as $language):?>
	311	+ <option value="<?php p($language['code']); ?>">
	312	+ <?php p($language['name']); ?>
313	313	</option>
314		- <?php endforeach;?>
	314	+ <?php endforeach; ?>
315	315	<optgroup label="––––––––––"></optgroup>
316		- <?php foreach($_['languages'] as $language):?>
317		- <option value="<?php p($language['code']);?>">
318		- <?php p($language['name']);?>
	316	+ <?php foreach ($_['languages'] as $language):?>
	317	+ <option value="<?php p($language['code']); ?>">
	318	+ <?php p($language['name']); ?>
319	319	</option>
320		- <?php endforeach;?>
	320	+ <?php endforeach; ?>
321	321	</select>
322	322	<a href="https://www.transifex.com/nextcloud/nextcloud/"
323	323	target="_blank" rel="noreferrer noopener">
324		- <em><?php p($l->t('Help translate'));?></em>
	324	+ <em><?php p($l->t('Help translate')); ?></em>
325	325	</a>
326	326	</form>
327	327	<?php } ?>
328	328	</div>
329	329	<div class="personal-settings-setting-box personal-settings-password-box">
330	330	<?php
331		- if($_['passwordChangeSupported']) {
	331	+ if ($_['passwordChangeSupported']) {
332	332	script('jquery-showpassword');
333	333	?>
334	334	<form id="passwordform" class="section">
335		- <h2 class="inlineblock"><?php p($l->t('Password'));?></h2>
	335	+ <h2 class="inlineblock"><?php p($l->t('Password')); ?></h2>
336	336	<div id="password-error-msg" class="msg success inlineblock" style="display: none;">Saved</div>
337	337
338	338	<label for="pass1" class="hidden-visually"><?php p($l->t('Current password')); ?>: </label>
339	339	<input type="password" id="pass1" name="oldpassword"
340		- placeholder="<?php p($l->t('Current password'));?>"
	340	+ placeholder="<?php p($l->t('Current password')); ?>"
341	341	autocomplete="off" autocapitalize="none" autocorrect="off" />
342	342
343	343	<div class="personal-show-container">
344		- <label for="pass2" class="hidden-visually"><?php p($l->t('New password'));?>: </label>
	344	+ <label for="pass2" class="hidden-visually"><?php p($l->t('New password')); ?>: </label>
345	345	<input type="password" id="pass2" name="newpassword"
346	346	placeholder="<?php p($l->t('New password')); ?>"
347	347	data-typetoggle="#personal-show"

		@@ -55,8 +55,11 @@ discard block
		block discarded – undo
55	55	<div class="hidden button icon-delete svg" id="removeavatar" title="<?php p($l->t('Remove image')); ?>"></div>
56	56	<input type="file" name="files[]" id="uploadavatar" class="hiddenuploadfield">
57	57	<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')); ?>
	58	+ <?php else {
	59	+ : ?>
	60	+ <?php p($l->t('Picture provided by original account'));
	61	+}
	62	+?>
60	63	<?php endif; ?>
61	64	</div>
62	65
		@@ -86,9 +89,12 @@ discard block
		block discarded – undo
86	89	<?php if ($_['quota'] === \OCP\Files\FileInfo::SPACE_UNLIMITED): ?>
87	90	<?php print_unescaped($l->t('You are using <strong>%s</strong> of <strong>%s</strong>',
88	91	[$_['usage'], $_['total_space']]));?>
89		- <?php else: ?>
	92	+ <?php else {
	93	+ : ?>
90	94	<?php print_unescaped($l->t('You are using <strong>%s</strong> of <strong>%s</strong> (<strong>%s %%</strong>)',
91		- [$_['usage'], $_['total_space'], $_['usage_relative']]));?>
	95	+ [$_['usage'], $_['total_space'], $_['usage_relative']]));
	96	+}
	97	+?>
92	98	<?php endif ?>
93	99	</p>
94	100	</div>
		@@ -128,7 +134,10 @@ discard block
		block discarded – undo
128	134	<span class="icon-triangle-s"></span>
129	135	</span>
130	136	</h2>
131		- <div class="verify <?php if ($_['email'] === '' \|\| $_['emailScope'] !== 'public') p('hidden'); ?>">
	137	+ <div class="verify <?php if ($_['email'] === '' \|\| $_['emailScope'] !== 'public') {
	138	+ p('hidden');
	139	+}
	140	+?>">
132	141	<img id="verify-email" title="<?php p($_['emailMessage']); ?>" data-status="<?php p($_['emailVerification']) ?>" src="
133	142	<?php
134	143	switch($_['emailVerification']) {
		@@ -169,7 +178,10 @@ discard block
		block discarded – undo
169	178	<span class="icon-triangle-s"></span>
170	179	</span>
171	180	</h2>
172		- <input type="tel" id="phone" name="phone" <?php if(!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"'); ?>
	181	+ <input type="tel" id="phone" name="phone" <?php if(!$_['lookupServerUploadEnabled']) {
	182	+ print_unescaped('disabled="1"');
	183	+}
	184	+?>
173	185	value="<?php p($_['phone']) ?>"
174	186	placeholder="<?php p($l->t('Your phone number')); ?>"
175	187	autocomplete="on" autocapitalize="none" autocorrect="off" />
		@@ -189,7 +201,10 @@ discard block
		block discarded – undo
189	201	<span class="icon-triangle-s"></span>
190	202	</span>
191	203	</h2>
192		- <input type="text" id="address" name="address" <?php if(!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"'); ?>
	204	+ <input type="text" id="address" name="address" <?php if(!$_['lookupServerUploadEnabled']) {
	205	+ print_unescaped('disabled="1"');
	206	+}
	207	+?>
193	208	placeholder="<?php p($l->t('Your postal address')); ?>"
194	209	value="<?php p($_['address']) ?>"
195	210	autocomplete="on" autocapitalize="none" autocorrect="off" />
		@@ -210,7 +225,10 @@ discard block
		block discarded – undo
210	225	</span>
211	226	</h2>
212	227	<?php if($_['lookupServerUploadEnabled']) { ?>
213		- <div class="verify <?php if ($_['website'] === '' \|\| $_['websiteScope'] !== 'public') p('hidden'); ?>">
	228	+ <div class="verify <?php if ($_['website'] === '' \|\| $_['websiteScope'] !== 'public') {
	229	+ p('hidden');
	230	+}
	231	+?>">
214	232	<img id="verify-website" title="<?php p($_['websiteMessage']); ?>" data-status="<?php p($_['websiteVerification']) ?>" src="
215	233	<?php
216	234	switch($_['websiteVerification']) {
		@@ -224,13 +242,16 @@ discard block
		block discarded – undo
224	242	p(image_path('core', 'actions/verify.svg'));
225	243	}
226	244	?>"
227		- <?php if($_['websiteVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS \|\| $_['websiteVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) print_unescaped(' class="verify-action"') ?>
	245	+ <?php if($_['websiteVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS \|\| $_['websiteVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) {
	246	+ print_unescaped(' class="verify-action"') ?>
228	247	>
229	248	<div class="verification-dialog popovermenu bubble menu">
230	249	<div class="verification-dialog-content">
231	250	<p class="explainVerification"></p>
232	251	<p class="verificationCode"></p>
233		- <p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.'));?></p>
	252	+ <p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.'));
	253	+}
	254	+?></p>
234	255	</div>
235	256	</div>
236	257	</div>
		@@ -238,7 +259,10 @@ discard block
		block discarded – undo
238	259	<input type="url" name="website" id="website" value="<?php p($_['website']); ?>"
239	260	placeholder="<?php p($l->t('Link https://…')); ?>"
240	261	autocomplete="on" autocapitalize="none" autocorrect="off"
241		- <?php if(!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"'); ?>
	262	+ <?php if(!$_['lookupServerUploadEnabled']) {
	263	+ print_unescaped('disabled="1"');
	264	+}
	265	+?>
242	266	/>
243	267	<span class="icon-checkmark hidden"></span>
244	268	<?php if($_['lookupServerUploadEnabled']) { ?>
		@@ -257,7 +281,10 @@ discard block
		block discarded – undo
257	281	</span>
258	282	</h2>
259	283	<?php if($_['lookupServerUploadEnabled']) { ?>
260		- <div class="verify <?php if ($_['twitter'] === '' \|\| $_['twitterScope'] !== 'public') p('hidden'); ?>">
	284	+ <div class="verify <?php if ($_['twitter'] === '' \|\| $_['twitterScope'] !== 'public') {
	285	+ p('hidden');
	286	+}
	287	+?>">
261	288	<img id="verify-twitter" title="<?php p($_['twitterMessage']); ?>" data-status="<?php p($_['twitterVerification']) ?>" src="
262	289	<?php
263	290	switch($_['twitterVerification']) {
		@@ -271,13 +298,16 @@ discard block
		block discarded – undo
271	298	p(image_path('core', 'actions/verify.svg'));
272	299	}
273	300	?>"
274		- <?php if($_['twitterVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS \|\| $_['twitterVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) print_unescaped(' class="verify-action"') ?>
	301	+ <?php if($_['twitterVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS \|\| $_['twitterVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) {
	302	+ print_unescaped(' class="verify-action"') ?>
275	303	>
276	304	<div class="verification-dialog popovermenu bubble menu">
277	305	<div class="verification-dialog-content">
278	306	<p class="explainVerification"></p>
279	307	<p class="verificationCode"></p>
280		- <p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.'));?></p>
	308	+ <p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.'));
	309	+}
	310	+?></p>
281	311	</div>
282	312	</div>
283	313	</div>
		@@ -285,7 +315,10 @@ discard block
		block discarded – undo
285	315	<input type="text" name="twitter" id="twitter" value="<?php p($_['twitter']); ?>"
286	316	placeholder="<?php p($l->t('Twitter handle @…')); ?>"
287	317	autocomplete="on" autocapitalize="none" autocorrect="off"
288		- <?php if(!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"'); ?>
	318	+ <?php if(!$_['lookupServerUploadEnabled']) {
	319	+ print_unescaped('disabled="1"');
	320	+}
	321	+?>
289	322	/>
290	323	<span class="icon-checkmark hidden"></span>
291	324	<?php if($_['lookupServerUploadEnabled']) { ?>

nextcloud / server

Pull Request — master (#9332)

Status

Category

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

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

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