Inspection of "Merge pull request #8135 from coliff/patch-3" - nextcloud/server - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( 0225ea...1424b3 )

by Morris

created 2018-02-05 11:15 UTC

Status

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

@@ -39,16 +39,16 @@  discard block
 block discarded – undo
 
 <div id="quota" class="section">
 	<progress value="<?php p($_['usage_relative']); ?>" max="100"
-	<?php if($_['usage_relative'] > 80): ?> class="warn" <?php endif; ?>></progress>
+	<?php if ($_['usage_relative'] > 80): ?> class="warn" <?php endif; ?>></progress>
 
-	<div style="width:<?php p($_['usage_relative']);?>%" class="quotatext-fg">
+	<div style="width:<?php p($_['usage_relative']); ?>%" class="quotatext-fg">
 		<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>
@@ -56,10 +56,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>
@@ -95,7 +95,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>
@@ -112,15 +112,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>
@@ -133,10 +133,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;
@@ -149,18 +149,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>
@@ -174,12 +174,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>
@@ -194,12 +194,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>
@@ -214,11 +214,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;
@@ -229,13 +229,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>
@@ -243,10 +243,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>
@@ -261,11 +261,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;
@@ -276,13 +276,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>
@@ -290,10 +290,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>
@@ -320,47 +320,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 +53 added lines, -17 removed lines patch added patch discarded remove patch

@@ -46,9 +46,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>
@@ -57,9 +60,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>
@@ -83,8 +89,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>
 
@@ -133,7 +142,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']) {
@@ -174,7 +186,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" />
@@ -194,7 +209,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" />
@@ -215,7 +233,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']) {
@@ -229,13 +250,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>
@@ -243,7 +267,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']) { ?>
@@ -262,7 +289,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']) {
@@ -276,13 +306,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>
@@ -290,7 +323,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.

		@@ -39,16 +39,16 @@ discard block
		block discarded – undo
39	39
40	40	<div id="quota" class="section">
41	41	<progress value="<?php p($_['usage_relative']); ?>" max="100"
42		- <?php if($_['usage_relative'] > 80): ?> class="warn" <?php endif; ?>></progress>
	42	+ <?php if ($_['usage_relative'] > 80): ?> class="warn" <?php endif; ?>></progress>
43	43
44		- <div style="width:<?php p($_['usage_relative']);?>%" class="quotatext-fg">
	44	+ <div style="width:<?php p($_['usage_relative']); ?>%" class="quotatext-fg">
45	45	<p class="quotatext">
46	46	<?php if ($_['quota'] === \OCP\Files\FileInfo::SPACE_UNLIMITED): ?>
47	47	<?php print_unescaped($l->t('You are using <strong>%s</strong> of <strong>%s</strong>',
48		- [$_['usage'], $_['total_space']]));?>
	48	+ [$_['usage'], $_['total_space']])); ?>
49	49	<?php else: ?>
50	50	<?php print_unescaped($l->t('You are using <strong>%s</strong> of <strong>%s</strong> (<strong>%s %%</strong>)',
51		- [$_['usage'], $_['total_space'], $_['usage_relative']]));?>
	51	+ [$_['usage'], $_['total_space'], $_['usage_relative']])); ?>
52	52	<?php endif ?>
53	53	</p>
54	54	</div>
		@@ -56,10 +56,10 @@ discard block
		block discarded – undo
56	56	<p class="quotatext">
57	57	<?php if ($_['quota'] === \OCP\Files\FileInfo::SPACE_UNLIMITED): ?>
58	58	<?php print_unescaped($l->t('You are using <strong>%s</strong> of <strong>%s</strong>',
59		- [$_['usage'], $_['total_space']]));?>
	59	+ [$_['usage'], $_['total_space']])); ?>
60	60	<?php else: ?>
61	61	<?php print_unescaped($l->t('You are using <strong>%s</strong> of <strong>%s</strong> (<strong>%s %%</strong>)',
62		- [$_['usage'], $_['total_space'], $_['usage_relative']]));?>
	62	+ [$_['usage'], $_['total_space'], $_['usage_relative']])); ?>
63	63	<?php endif ?>
64	64	</p>
65	65	</div>
		@@ -95,7 +95,7 @@ discard block
		block discarded – undo
95	95	</div>
96	96	</div>
97	97	<span class="icon-checkmark hidden"></span>
98		- <?php if($_['lookupServerUploadEnabled']) { ?>
	98	+ <?php if ($_['lookupServerUploadEnabled']) { ?>
99	99	<input type="hidden" id="avatarscope" value="<?php p($_['avatarScope']) ?>">
100	100	<?php } ?>
101	101	</form>
		@@ -112,15 +112,15 @@ discard block
		block discarded – undo
112	112	</span>
113	113	</h2>
114	114	<input type="text" id="displayname" name="displayname"
115		- <?php if(!$_['displayNameChangeSupported']) { print_unescaped('class="hidden"'); } ?>
	115	+ <?php if (!$_['displayNameChangeSupported']) { print_unescaped('class="hidden"'); } ?>
116	116	value="<?php p($_['displayName']) ?>"
117	117	autocomplete="on" autocapitalize="none" autocorrect="off" />
118		- <?php if(!$_['displayNameChangeSupported']) { ?>
119		- <span><?php if(isset($_['displayName']) && !empty($_['displayName'])) { p($_['displayName']); } else { p($l->t('No display name set')); } ?></span>
	118	+ <?php if (!$_['displayNameChangeSupported']) { ?>
	119	+ <span><?php if (isset($_['displayName']) && !empty($_['displayName'])) { p($_['displayName']); } else { p($l->t('No display name set')); } ?></span>
120	120	<?php } ?>
121	121	<span class="icon-checkmark hidden"></span>
122	122	<span class="icon-error hidden" ></span>
123		- <?php if($_['lookupServerUploadEnabled']) { ?>
	123	+ <?php if ($_['lookupServerUploadEnabled']) { ?>
124	124	<input type="hidden" id="displaynamescope" value="<?php p($_['displayNameScope']) ?>">
125	125	<?php } ?>
126	126	</form>
		@@ -133,10 +133,10 @@ discard block
		block discarded – undo
133	133	<span class="icon-triangle-s"></span>
134	134	</span>
135	135	</h2>
136		- <div class="verify <?php if ($_['email'] === '' \|\| $_['emailScope'] !== 'public') p('hidden'); ?>">
	136	+ <div class="verify <?php if ($_['email'] === '' \|\| $_['emailScope'] !== 'public') p('hidden'); ?>">
137	137	<img id="verify-email" title="<?php p($_['emailMessage']); ?>" data-status="<?php p($_['emailVerification']) ?>" src="
138	138	<?php
139		- switch($_['emailVerification']) {
	139	+ switch ($_['emailVerification']) {
140	140	case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS:
141	141	p(image_path('core', 'actions/verifying.svg'));
142	142	break;
		@@ -149,18 +149,18 @@ discard block
		block discarded – undo
149	149	?>">
150	150	</div>
151	151	<input type="email" name="email" id="email" value="<?php p($_['email']); ?>"
152		- <?php if(!$_['displayNameChangeSupported']) { print_unescaped('class="hidden"'); } ?>
	152	+ <?php if (!$_['displayNameChangeSupported']) { print_unescaped('class="hidden"'); } ?>
153	153	placeholder="<?php p($l->t('Your email address')); ?>"
154	154	autocomplete="on" autocapitalize="none" autocorrect="off" />
155	155	<span class="icon-checkmark hidden"></span>
156	156	<span class="icon-error hidden" ></span>
157		- <?php if(!$_['displayNameChangeSupported']) { ?>
158		- <span><?php if(isset($_['email']) && !empty($_['email'])) { p($_['email']); } else { p($l->t('No email address set')); }?></span>
	157	+ <?php if (!$_['displayNameChangeSupported']) { ?>
	158	+ <span><?php if (isset($_['email']) && !empty($_['email'])) { p($_['email']); } else { p($l->t('No email address set')); }?></span>
159	159	<?php } ?>
160		- <?php if($_['displayNameChangeSupported']) { ?>
	160	+ <?php if ($_['displayNameChangeSupported']) { ?>
161	161	<em><?php p($l->t('For password reset and notifications')); ?></em>
162	162	<?php } ?>
163		- <?php if($_['lookupServerUploadEnabled']) { ?>
	163	+ <?php if ($_['lookupServerUploadEnabled']) { ?>
164	164	<input type="hidden" id="emailscope" value="<?php p($_['emailScope']) ?>">
165	165	<?php } ?>
166	166	</form>
		@@ -174,12 +174,12 @@ discard block
		block discarded – undo
174	174	<span class="icon-triangle-s"></span>
175	175	</span>
176	176	</h2>
177		- <input type="tel" id="phone" name="phone" <?php if(!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"'); ?>
	177	+ <input type="tel" id="phone" name="phone" <?php if (!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"'); ?>
178	178	value="<?php p($_['phone']) ?>"
179	179	placeholder="<?php p($l->t('Your phone number')); ?>"
180	180	autocomplete="on" autocapitalize="none" autocorrect="off" />
181	181	<span class="icon-checkmark hidden"></span>
182		- <?php if($_['lookupServerUploadEnabled']) { ?>
	182	+ <?php if ($_['lookupServerUploadEnabled']) { ?>
183	183	<input type="hidden" id="phonescope" value="<?php p($_['phoneScope']) ?>">
184	184	<?php } ?>
185	185	</form>
		@@ -194,12 +194,12 @@ discard block
		block discarded – undo
194	194	<span class="icon-triangle-s"></span>
195	195	</span>
196	196	</h2>
197		- <input type="text" id="address" name="address" <?php if(!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"'); ?>
	197	+ <input type="text" id="address" name="address" <?php if (!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"'); ?>
198	198	placeholder="<?php p($l->t('Your postal address')); ?>"
199	199	value="<?php p($_['address']) ?>"
200	200	autocomplete="on" autocapitalize="none" autocorrect="off" />
201	201	<span class="icon-checkmark hidden"></span>
202		- <?php if($_['lookupServerUploadEnabled']) { ?>
	202	+ <?php if ($_['lookupServerUploadEnabled']) { ?>
203	203	<input type="hidden" id="addressscope" value="<?php p($_['addressScope']) ?>">
204	204	<?php } ?>
205	205	</form>
		@@ -214,11 +214,11 @@ discard block
		block discarded – undo
214	214	<span class="icon-triangle-s"></span>
215	215	</span>
216	216	</h2>
217		- <?php if($_['lookupServerUploadEnabled']) { ?>
218		- <div class="verify <?php if ($_['website'] === '' \|\| $_['websiteScope'] !== 'public') p('hidden'); ?>">
	217	+ <?php if ($_['lookupServerUploadEnabled']) { ?>
	218	+ <div class="verify <?php if ($_['website'] === '' \|\| $_['websiteScope'] !== 'public') p('hidden'); ?>">
219	219	<img id="verify-website" title="<?php p($_['websiteMessage']); ?>" data-status="<?php p($_['websiteVerification']) ?>" src="
220	220	<?php
221		- switch($_['websiteVerification']) {
	221	+ switch ($_['websiteVerification']) {
222	222	case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS:
223	223	p(image_path('core', 'actions/verifying.svg'));
224	224	break;
		@@ -229,13 +229,13 @@ discard block
		block discarded – undo
229	229	p(image_path('core', 'actions/verify.svg'));
230	230	}
231	231	?>"
232		- <?php if($_['websiteVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS \|\| $_['websiteVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) print_unescaped(' class="verify-action"') ?>
	232	+ <?php if ($_['websiteVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS \|\| $_['websiteVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) print_unescaped(' class="verify-action"') ?>
233	233	>
234	234	<div class="verification-dialog popovermenu bubble menu">
235	235	<div class="verification-dialog-content">
236	236	<p class="explainVerification"></p>
237	237	<p class="verificationCode"></p>
238		- <p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.'));?></p>
	238	+ <p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.')); ?></p>
239	239	</div>
240	240	</div>
241	241	</div>
		@@ -243,10 +243,10 @@ discard block
		block discarded – undo
243	243	<input type="url" name="website" id="website" value="<?php p($_['website']); ?>"
244	244	placeholder="<?php p($l->t('Link https://…')); ?>"
245	245	autocomplete="on" autocapitalize="none" autocorrect="off"
246		- <?php if(!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"'); ?>
	246	+ <?php if (!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"'); ?>
247	247	/>
248	248	<span class="icon-checkmark hidden"></span>
249		- <?php if($_['lookupServerUploadEnabled']) { ?>
	249	+ <?php if ($_['lookupServerUploadEnabled']) { ?>
250	250	<input type="hidden" id="websitescope" value="<?php p($_['websiteScope']) ?>">
251	251	<?php } ?>
252	252	</form>
		@@ -261,11 +261,11 @@ discard block
		block discarded – undo
261	261	<span class="icon-triangle-s"></span>
262	262	</span>
263	263	</h2>
264		- <?php if($_['lookupServerUploadEnabled']) { ?>
265		- <div class="verify <?php if ($_['twitter'] === '' \|\| $_['twitterScope'] !== 'public') p('hidden'); ?>">
	264	+ <?php if ($_['lookupServerUploadEnabled']) { ?>
	265	+ <div class="verify <?php if ($_['twitter'] === '' \|\| $_['twitterScope'] !== 'public') p('hidden'); ?>">
266	266	<img id="verify-twitter" title="<?php p($_['twitterMessage']); ?>" data-status="<?php p($_['twitterVerification']) ?>" src="
267	267	<?php
268		- switch($_['twitterVerification']) {
	268	+ switch ($_['twitterVerification']) {
269	269	case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS:
270	270	p(image_path('core', 'actions/verifying.svg'));
271	271	break;
		@@ -276,13 +276,13 @@ discard block
		block discarded – undo
276	276	p(image_path('core', 'actions/verify.svg'));
277	277	}
278	278	?>"
279		- <?php if($_['twitterVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS \|\| $_['twitterVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) print_unescaped(' class="verify-action"') ?>
	279	+ <?php if ($_['twitterVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS \|\| $_['twitterVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) print_unescaped(' class="verify-action"') ?>
280	280	>
281	281	<div class="verification-dialog popovermenu bubble menu">
282	282	<div class="verification-dialog-content">
283	283	<p class="explainVerification"></p>
284	284	<p class="verificationCode"></p>
285		- <p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.'));?></p>
	285	+ <p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.')); ?></p>
286	286	</div>
287	287	</div>
288	288	</div>
		@@ -290,10 +290,10 @@ discard block
		block discarded – undo
290	290	<input type="text" name="twitter" id="twitter" value="<?php p($_['twitter']); ?>"
291	291	placeholder="<?php p($l->t('Twitter handle @…')); ?>"
292	292	autocomplete="on" autocapitalize="none" autocorrect="off"
293		- <?php if(!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"'); ?>
	293	+ <?php if (!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"'); ?>
294	294	/>
295	295	<span class="icon-checkmark hidden"></span>
296		- <?php if($_['lookupServerUploadEnabled']) { ?>
	296	+ <?php if ($_['lookupServerUploadEnabled']) { ?>
297	297	<input type="hidden" id="twitterscope" value="<?php p($_['twitterScope']) ?>">
298	298	<?php } ?>
299	299	</form>
		@@ -320,47 +320,47 @@ discard block
		block discarded – undo
320	320	<?php if (isset($_['activelanguage'])) { ?>
321	321	<form id="language" class="section">
322	322	<h2>
323		- <label for="languageinput"><?php p($l->t('Language'));?></label>
	323	+ <label for="languageinput"><?php p($l->t('Language')); ?></label>
324	324	</h2>
325		- <select id="languageinput" name="lang" data-placeholder="<?php p($l->t('Language'));?>">
326		- <option value="<?php p($_['activelanguage']['code']);?>">
327		- <?php p($_['activelanguage']['name']);?>
	325	+ <select id="languageinput" name="lang" data-placeholder="<?php p($l->t('Language')); ?>">
	326	+ <option value="<?php p($_['activelanguage']['code']); ?>">
	327	+ <?php p($_['activelanguage']['name']); ?>
328	328	</option>
329		- <?php foreach($_['commonlanguages'] as $language):?>
330		- <option value="<?php p($language['code']);?>">
331		- <?php p($language['name']);?>
	329	+ <?php foreach ($_['commonlanguages'] as $language):?>
	330	+ <option value="<?php p($language['code']); ?>">
	331	+ <?php p($language['name']); ?>
332	332	</option>
333		- <?php endforeach;?>
	333	+ <?php endforeach; ?>
334	334	<optgroup label="––––––––––"></optgroup>
335		- <?php foreach($_['languages'] as $language):?>
336		- <option value="<?php p($language['code']);?>">
337		- <?php p($language['name']);?>
	335	+ <?php foreach ($_['languages'] as $language):?>
	336	+ <option value="<?php p($language['code']); ?>">
	337	+ <?php p($language['name']); ?>
338	338	</option>
339		- <?php endforeach;?>
	339	+ <?php endforeach; ?>
340	340	</select>
341	341	<a href="https://www.transifex.com/nextcloud/nextcloud/"
342	342	target="_blank" rel="noreferrer noopener">
343		- <em><?php p($l->t('Help translate'));?></em>
	343	+ <em><?php p($l->t('Help translate')); ?></em>
344	344	</a>
345	345	</form>
346	346	<?php } ?>
347	347	</div>
348	348	<div class="personal-settings-setting-box personal-settings-password-box">
349	349	<?php
350		- if($_['passwordChangeSupported']) {
	350	+ if ($_['passwordChangeSupported']) {
351	351	script('jquery-showpassword');
352	352	?>
353	353	<form id="passwordform" class="section">
354		- <h2 class="inlineblock"><?php p($l->t('Password'));?></h2>
	354	+ <h2 class="inlineblock"><?php p($l->t('Password')); ?></h2>
355	355	<div id="password-error-msg" class="msg success inlineblock" style="display: none;">Saved</div>
356	356
357	357	<label for="pass1" class="hidden-visually"><?php p($l->t('Current password')); ?>: </label>
358	358	<input type="password" id="pass1" name="oldpassword"
359		- placeholder="<?php p($l->t('Current password'));?>"
	359	+ placeholder="<?php p($l->t('Current password')); ?>"
360	360	autocomplete="off" autocapitalize="none" autocorrect="off" />
361	361
362	362	<div class="personal-show-container">
363		- <label for="pass2" class="hidden-visually"><?php p($l->t('New password'));?>: </label>
	363	+ <label for="pass2" class="hidden-visually"><?php p($l->t('New password')); ?>: </label>
364	364	<input type="password" id="pass2" name="newpassword"
365	365	placeholder="<?php p($l->t('New password')); ?>"
366	366	data-typetoggle="#personal-show"

		@@ -46,9 +46,12 @@ discard block
		block discarded – undo
46	46	<?php if ($_['quota'] === \OCP\Files\FileInfo::SPACE_UNLIMITED): ?>
47	47	<?php print_unescaped($l->t('You are using <strong>%s</strong> of <strong>%s</strong>',
48	48	[$_['usage'], $_['total_space']]));?>
49		- <?php else: ?>
	49	+ <?php else {
	50	+ : ?>
50	51	<?php print_unescaped($l->t('You are using <strong>%s</strong> of <strong>%s</strong> (<strong>%s %%</strong>)',
51		- [$_['usage'], $_['total_space'], $_['usage_relative']]));?>
	52	+ [$_['usage'], $_['total_space'], $_['usage_relative']]));
	53	+}
	54	+?>
52	55	<?php endif ?>
53	56	</p>
54	57	</div>
		@@ -57,9 +60,12 @@ discard block
		block discarded – undo
57	60	<?php if ($_['quota'] === \OCP\Files\FileInfo::SPACE_UNLIMITED): ?>
58	61	<?php print_unescaped($l->t('You are using <strong>%s</strong> of <strong>%s</strong>',
59	62	[$_['usage'], $_['total_space']]));?>
60		- <?php else: ?>
	63	+ <?php else {
	64	+ : ?>
61	65	<?php print_unescaped($l->t('You are using <strong>%s</strong> of <strong>%s</strong> (<strong>%s %%</strong>)',
62		- [$_['usage'], $_['total_space'], $_['usage_relative']]));?>
	66	+ [$_['usage'], $_['total_space'], $_['usage_relative']]));
	67	+}
	68	+?>
63	69	<?php endif ?>
64	70	</p>
65	71	</div>
		@@ -83,8 +89,11 @@ discard block
		block discarded – undo
83	89	<div class="hidden button icon-delete svg" id="removeavatar" title="<?php p($l->t('Remove image')); ?>"></div>
84	90	<input type="file" name="files[]" id="uploadavatar" class="hiddenuploadfield">
85	91	<p><em><?php p($l->t('png or jpg, max. 20 MB')); ?></em></p>
86		- <?php else: ?>
87		- <?php p($l->t('Picture provided by original account')); ?>
	92	+ <?php else {
	93	+ : ?>
	94	+ <?php p($l->t('Picture provided by original account'));
	95	+}
	96	+?>
88	97	<?php endif; ?>
89	98	</div>
90	99
		@@ -133,7 +142,10 @@ discard block
		block discarded – undo
133	142	<span class="icon-triangle-s"></span>
134	143	</span>
135	144	</h2>
136		- <div class="verify <?php if ($_['email'] === '' \|\| $_['emailScope'] !== 'public') p('hidden'); ?>">
	145	+ <div class="verify <?php if ($_['email'] === '' \|\| $_['emailScope'] !== 'public') {
	146	+ p('hidden');
	147	+}
	148	+?>">
137	149	<img id="verify-email" title="<?php p($_['emailMessage']); ?>" data-status="<?php p($_['emailVerification']) ?>" src="
138	150	<?php
139	151	switch($_['emailVerification']) {
		@@ -174,7 +186,10 @@ discard block
		block discarded – undo
174	186	<span class="icon-triangle-s"></span>
175	187	</span>
176	188	</h2>
177		- <input type="tel" id="phone" name="phone" <?php if(!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"'); ?>
	189	+ <input type="tel" id="phone" name="phone" <?php if(!$_['lookupServerUploadEnabled']) {
	190	+ print_unescaped('disabled="1"');
	191	+}
	192	+?>
178	193	value="<?php p($_['phone']) ?>"
179	194	placeholder="<?php p($l->t('Your phone number')); ?>"
180	195	autocomplete="on" autocapitalize="none" autocorrect="off" />
		@@ -194,7 +209,10 @@ discard block
		block discarded – undo
194	209	<span class="icon-triangle-s"></span>
195	210	</span>
196	211	</h2>
197		- <input type="text" id="address" name="address" <?php if(!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"'); ?>
	212	+ <input type="text" id="address" name="address" <?php if(!$_['lookupServerUploadEnabled']) {
	213	+ print_unescaped('disabled="1"');
	214	+}
	215	+?>
198	216	placeholder="<?php p($l->t('Your postal address')); ?>"
199	217	value="<?php p($_['address']) ?>"
200	218	autocomplete="on" autocapitalize="none" autocorrect="off" />
		@@ -215,7 +233,10 @@ discard block
		block discarded – undo
215	233	</span>
216	234	</h2>
217	235	<?php if($_['lookupServerUploadEnabled']) { ?>
218		- <div class="verify <?php if ($_['website'] === '' \|\| $_['websiteScope'] !== 'public') p('hidden'); ?>">
	236	+ <div class="verify <?php if ($_['website'] === '' \|\| $_['websiteScope'] !== 'public') {
	237	+ p('hidden');
	238	+}
	239	+?>">
219	240	<img id="verify-website" title="<?php p($_['websiteMessage']); ?>" data-status="<?php p($_['websiteVerification']) ?>" src="
220	241	<?php
221	242	switch($_['websiteVerification']) {
		@@ -229,13 +250,16 @@ discard block
		block discarded – undo
229	250	p(image_path('core', 'actions/verify.svg'));
230	251	}
231	252	?>"
232		- <?php if($_['websiteVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS \|\| $_['websiteVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) print_unescaped(' class="verify-action"') ?>
	253	+ <?php if($_['websiteVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS \|\| $_['websiteVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) {
	254	+ print_unescaped(' class="verify-action"') ?>
233	255	>
234	256	<div class="verification-dialog popovermenu bubble menu">
235	257	<div class="verification-dialog-content">
236	258	<p class="explainVerification"></p>
237	259	<p class="verificationCode"></p>
238		- <p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.'));?></p>
	260	+ <p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.'));
	261	+}
	262	+?></p>
239	263	</div>
240	264	</div>
241	265	</div>
		@@ -243,7 +267,10 @@ discard block
		block discarded – undo
243	267	<input type="url" name="website" id="website" value="<?php p($_['website']); ?>"
244	268	placeholder="<?php p($l->t('Link https://…')); ?>"
245	269	autocomplete="on" autocapitalize="none" autocorrect="off"
246		- <?php if(!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"'); ?>
	270	+ <?php if(!$_['lookupServerUploadEnabled']) {
	271	+ print_unescaped('disabled="1"');
	272	+}
	273	+?>
247	274	/>
248	275	<span class="icon-checkmark hidden"></span>
249	276	<?php if($_['lookupServerUploadEnabled']) { ?>
		@@ -262,7 +289,10 @@ discard block
		block discarded – undo
262	289	</span>
263	290	</h2>
264	291	<?php if($_['lookupServerUploadEnabled']) { ?>
265		- <div class="verify <?php if ($_['twitter'] === '' \|\| $_['twitterScope'] !== 'public') p('hidden'); ?>">
	292	+ <div class="verify <?php if ($_['twitter'] === '' \|\| $_['twitterScope'] !== 'public') {
	293	+ p('hidden');
	294	+}
	295	+?>">
266	296	<img id="verify-twitter" title="<?php p($_['twitterMessage']); ?>" data-status="<?php p($_['twitterVerification']) ?>" src="
267	297	<?php
268	298	switch($_['twitterVerification']) {
		@@ -276,13 +306,16 @@ discard block
		block discarded – undo
276	306	p(image_path('core', 'actions/verify.svg'));
277	307	}
278	308	?>"
279		- <?php if($_['twitterVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS \|\| $_['twitterVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) print_unescaped(' class="verify-action"') ?>
	309	+ <?php if($_['twitterVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS \|\| $_['twitterVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) {
	310	+ print_unescaped(' class="verify-action"') ?>
280	311	>
281	312	<div class="verification-dialog popovermenu bubble menu">
282	313	<div class="verification-dialog-content">
283	314	<p class="explainVerification"></p>
284	315	<p class="verificationCode"></p>
285		- <p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.'));?></p>
	316	+ <p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.'));
	317	+}
	318	+?></p>
286	319	</div>
287	320	</div>
288	321	</div>
		@@ -290,7 +323,10 @@ discard block
		block discarded – undo
290	323	<input type="text" name="twitter" id="twitter" value="<?php p($_['twitter']); ?>"
291	324	placeholder="<?php p($l->t('Twitter handle @…')); ?>"
292	325	autocomplete="on" autocapitalize="none" autocorrect="off"
293		- <?php if(!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"'); ?>
	326	+ <?php if(!$_['lookupServerUploadEnabled']) {
	327	+ print_unescaped('disabled="1"');
	328	+}
	329	+?>
294	330	/>
295	331	<span class="icon-checkmark hidden"></span>
296	332	<?php if($_['lookupServerUploadEnabled']) { ?>

nextcloud / server

Push — master ( 0225ea...1424b3 )

Status

Category

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

Braces +53 added lines, -17 removed lines patch added patch discarded remove patch