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

Completed

Pull Request — master (#5550)

by Andreas

created 2017-06-27 18:30 UTC

Status

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

@@ -11,14 +11,14 @@  discard block
 block discarded – undo
 <div id="app-navigation">
 	<ul class="with-icon">
 	<?php foreach($_['forms'] as $form) {
-		if (isset($form['anchor'])) {
-			$anchor = '#' . $form['anchor'];
-			$class = 'nav-icon-' . $form['anchor'];
-			$sectionName = $form['section-name'];
-			print_unescaped(sprintf("<li><a href='%s' class='%s'>%s</a></li>", \OCP\Util::sanitizeHTML($anchor),
-			\OCP\Util::sanitizeHTML($class), \OCP\Util::sanitizeHTML($sectionName)));
-		}
-	}?>
+        if (isset($form['anchor'])) {
+            $anchor = '#' . $form['anchor'];
+            $class = 'nav-icon-' . $form['anchor'];
+            $sectionName = $form['section-name'];
+            print_unescaped(sprintf("<li><a href='%s' class='%s'>%s</a></li>", \OCP\Util::sanitizeHTML($anchor),
+            \OCP\Util::sanitizeHTML($class), \OCP\Util::sanitizeHTML($sectionName)));
+        }
+    }?>
 	</ul>
 </div>
 
@@ -30,10 +30,10 @@  discard block
 block discarded – undo
 		<p id="quotatext">
 			<?php if ($_['quota'] === \OCP\Files\FileInfo::SPACE_UNLIMITED): ?>
 				<?php print_unescaped($l->t('You are using <strong>%s</strong> of <strong>%s</strong>',
-					[$_['usage'], $_['total_space']]));?>
+                    [$_['usage'], $_['total_space']]));?>
 			<?php else: ?>
 				<?php print_unescaped($l->t('You are using <strong>%s</strong> of <strong>%s</strong> (<strong>%s %%</strong>)',
-					[$_['usage'], $_['total_space'],  $_['usage_relative']]));?>
+                    [$_['usage'], $_['total_space'],  $_['usage_relative']]));?>
 			<?php endif ?>
 		</p>
 	</div>
@@ -99,17 +99,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 if(!$_['displayNameChangeSupported'] && empty($_['email'])) p($l->t('No email address set')); else p($_['email']); ?>"
 				<?php if(!$_['displayNameChangeSupported']) { print_unescaped('disabled="1"'); } ?>
@@ -172,17 +172,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">
@@ -217,17 +217,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">
@@ -292,9 +292,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>
@@ -317,8 +317,8 @@  discard block
 block discarded – undo
 			<br/>
 		</form>
 		<?php
-		}
-		?>
+        }
+        ?>
 	</div>
 	<span class="msg"></span>
 </div>
@@ -344,15 +344,15 @@  discard block
 block discarded – undo
 
 		<p>
 			<?php print_unescaped(str_replace(
-				[
-					'{contributeopen}',
-					'{linkclose}',
-				],
-				[
-					'<a href="https://nextcloud.com/contribute" target="_blank" rel="noreferrer">',
-					'</a>',
-				],
-				$l->t('If you want to support the project {contributeopen}join development{linkclose} or {contributeopen}spread the word{linkclose}!'))); ?>
+                [
+                    '{contributeopen}',
+                    '{linkclose}',
+                ],
+                [
+                    '<a href="https://nextcloud.com/contribute" target="_blank" rel="noreferrer">',
+                    '</a>',
+                ],
+                $l->t('If you want to support the project {contributeopen}join development{linkclose} or {contributeopen}spread the word{linkclose}!'))); ?>
 		</p>
 
 	<?php if(OC_APP::isEnabled('firstrunwizard')) {?>
@@ -401,7 +401,7 @@  discard block
 block discarded – undo
 </div>
 
 <?php foreach($_['forms'] as $form) {
-	if (isset($form['form'])) {?>
+    if (isset($form['form'])) {?>
 	<div id="<?php isset($form['anchor']) ? p($form['anchor']) : p('');?>"><?php print_unescaped($form['form']);?></div>
 	<?php }
 };?>

Please login to merge, or discard this patch.

Braces +54 added lines, -16 removed lines patch added patch discarded remove patch

@@ -31,9 +31,12 @@  discard block
 block discarded – undo
 			<?php if ($_['quota'] === \OCP\Files\FileInfo::SPACE_UNLIMITED): ?>
 				<?php print_unescaped($l->t('You are using <strong>%s</strong> of <strong>%s</strong>',
 					[$_['usage'], $_['total_space']]));?>
-			<?php else: ?>
+			<?php else {
+    : ?>
 				<?php print_unescaped($l->t('You are using <strong>%s</strong> of <strong>%s</strong> (<strong>%s %%</strong>)',
-					[$_['usage'], $_['total_space'],  $_['usage_relative']]));?>
+					[$_['usage'], $_['total_space'],  $_['usage_relative']]));
+}
+?>
 			<?php endif ?>
 		</p>
 	</div>
@@ -55,8 +58,11 @@  discard block
 block discarded – undo
 				<div class="hidden button icon-delete svg" id="removeavatar" title="<?php p($l->t('Remove image')); ?>"></div>
 				<input type="file" name="files[]" id="uploadavatar" class="hiddenuploadfield">
 				<p><em><?php p($l->t('png or jpg, max. 20 MB')); ?></em></p>
-			<?php else: ?>
-				<?php p($l->t('Picture provided by original account')); ?>
+			<?php else {
+    : ?>
+				<?php p($l->t('Picture provided by original account'));
+}
+?>
 			<?php endif; ?>
 		</div>
 
@@ -96,7 +102,10 @@  discard block
 block discarded – undo
 				<label for="email"><?php p($l->t('Email')); ?></label>
 				<span class="icon-federation-menu icon-password">&#9662;<span/>
 			</h2>
-			<div class="verify <?php if ($_['email'] === ''  || $_['emailScope'] !== 'public') p('hidden'); ?>">
+			<div class="verify <?php if ($_['email'] === ''  || $_['emailScope'] !== 'public') {
+    p('hidden');
+}
+?>">
 				<img id="verify-email" title="<?php p($_['emailMessage']); ?>" data-status="<?php p($_['emailVerification']) ?>" src="
 				<?php
 				switch($_['emailVerification']) {
@@ -111,7 +120,12 @@  discard block
 block discarded – undo
 				}
 				?>">
 			</div>
-			<input type="email" name="email" id="email" value="<?php if(!$_['displayNameChangeSupported'] && empty($_['email'])) p($l->t('No email address set')); else p($_['email']); ?>"
+			<input type="email" name="email" id="email" value="<?php if(!$_['displayNameChangeSupported'] && empty($_['email'])) {
+    p($l->t('No email address set'));
+} else {
+    p($_['email']);
+}
+?>"
 				<?php if(!$_['displayNameChangeSupported']) { print_unescaped('disabled="1"'); } ?>
 				placeholder="<?php p($l->t('Your email address')) ?>"
 				autocomplete="on" autocapitalize="none" autocorrect="off" />
@@ -132,7 +146,10 @@  discard block
 block discarded – undo
 				<label for="phone"><?php p($l->t('Phone number')); ?></label>
 				<span class="icon-federation-menu icon-password">&#9662;<span/>
 			</h2>
-			<input type="tel" id="phone" name="phone" <?php if(!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"'); ?>
+			<input type="tel" id="phone" name="phone" <?php if(!$_['lookupServerUploadEnabled']) {
+    print_unescaped('disabled="1"');
+}
+?>
 				   value="<?php p($_['phone']) ?>"
 				   placeholder="<?php p($l->t('Your phone number')); ?>"
 			       autocomplete="on" autocapitalize="none" autocorrect="off" />
@@ -150,7 +167,10 @@  discard block
 block discarded – undo
 				<label for="address"><?php p($l->t('Address')); ?></label>
 				<span class="icon-federation-menu icon-password">&#9662;<span/>
 			</h2>
-			<input type="text" id="address" name="address" <?php if(!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"');  ?>
+			<input type="text" id="address" name="address" <?php if(!$_['lookupServerUploadEnabled']) {
+    print_unescaped('disabled="1"');
+}
+?>
 				   placeholder="<?php p($l->t('Your postal address')); ?>"
 				   value="<?php p($_['address']) ?>"
 				   autocomplete="on" autocapitalize="none" autocorrect="off" />
@@ -169,7 +189,10 @@  discard block
 block discarded – undo
 				<span class="icon-federation-menu icon-password">&#9662;<span/>
 			</h2>
 			<?php if($_['lookupServerUploadEnabled']) { ?>
-			<div class="verify <?php if ($_['website'] === ''  || $_['websiteScope'] !== 'public') p('hidden'); ?>">
+			<div class="verify <?php if ($_['website'] === ''  || $_['websiteScope'] !== 'public') {
+    p('hidden');
+}
+?>">
 				<img id="verify-website" title="<?php p($_['websiteMessage']); ?>" data-status="<?php p($_['websiteVerification']) ?>" src="
 				<?php
 				switch($_['websiteVerification']) {
@@ -183,13 +206,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>
@@ -197,7 +223,10 @@  discard block
 block discarded – undo
 			<input type="text" name="website" id="website" value="<?php p($_['website']); ?>"
 			       placeholder="<?php p($l->t('Link https://…')); ?>"
 			       autocomplete="on" autocapitalize="none" autocorrect="off"
-				   <?php if(!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"');  ?>
+				   <?php if(!$_['lookupServerUploadEnabled']) {
+    print_unescaped('disabled="1"');
+}
+?>
 			/>
 			<span class="icon-checkmark hidden"/>
 			<?php if($_['lookupServerUploadEnabled']) { ?>
@@ -214,7 +243,10 @@  discard block
 block discarded – undo
 				<span class="icon-federation-menu icon-password">&#9662;<span/>
 			</h2>
 			<?php if($_['lookupServerUploadEnabled']) { ?>
-			<div class="verify <?php if ($_['twitter'] === ''  || $_['twitterScope'] !== 'public') p('hidden'); ?>">
+			<div class="verify <?php if ($_['twitter'] === ''  || $_['twitterScope'] !== 'public') {
+    p('hidden');
+}
+?>">
 				<img id="verify-twitter" title="<?php p($_['twitterMessage']); ?>" data-status="<?php p($_['twitterVerification']) ?>" src="
 				<?php
 				switch($_['twitterVerification']) {
@@ -228,13 +260,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>
@@ -242,7 +277,10 @@  discard block
 block discarded – undo
 			<input type="text" name="twitter" id="twitter" value="<?php p($_['twitter']); ?>"
 				   placeholder="<?php p($l->t('Twitter handle @…')); ?>"
 				   autocomplete="on" autocapitalize="none" autocorrect="off"
-				   <?php if(!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"');  ?>
+				   <?php if(!$_['lookupServerUploadEnabled']) {
+    print_unescaped('disabled="1"');
+}
+?>
 			/>
 			<span class="icon-checkmark hidden"/>
 			<?php if($_['lookupServerUploadEnabled']) { ?>

Please login to merge, or discard this patch.

		@@ -11,14 +11,14 @@ discard block
		block discarded – undo
11	11	<div id="app-navigation">
12	12	<ul class="with-icon">
13	13	<?php foreach($_['forms'] as $form) {
14		- if (isset($form['anchor'])) {
15		- $anchor = '#' . $form['anchor'];
16		- $class = 'nav-icon-' . $form['anchor'];
17		- $sectionName = $form['section-name'];
18		- print_unescaped(sprintf("<li><a href='%s' class='%s'>%s</a></li>", \OCP\Util::sanitizeHTML($anchor),
19		- \OCP\Util::sanitizeHTML($class), \OCP\Util::sanitizeHTML($sectionName)));
20		- }
21		- }?>
	14	+ if (isset($form['anchor'])) {
	15	+ $anchor = '#' . $form['anchor'];
	16	+ $class = 'nav-icon-' . $form['anchor'];
	17	+ $sectionName = $form['section-name'];
	18	+ print_unescaped(sprintf("<li><a href='%s' class='%s'>%s</a></li>", \OCP\Util::sanitizeHTML($anchor),
	19	+ \OCP\Util::sanitizeHTML($class), \OCP\Util::sanitizeHTML($sectionName)));
	20	+ }
	21	+ }?>
22	22	</ul>
23	23	</div>
24	24
		@@ -30,10 +30,10 @@ discard block
		block discarded – undo
30	30	<p id="quotatext">
31	31	<?php if ($_['quota'] === \OCP\Files\FileInfo::SPACE_UNLIMITED): ?>
32	32	<?php print_unescaped($l->t('You are using <strong>%s</strong> of <strong>%s</strong>',
33		- [$_['usage'], $_['total_space']]));?>
	33	+ [$_['usage'], $_['total_space']]));?>
34	34	<?php else: ?>
35	35	<?php print_unescaped($l->t('You are using <strong>%s</strong> of <strong>%s</strong> (<strong>%s %%</strong>)',
36		- [$_['usage'], $_['total_space'], $_['usage_relative']]));?>
	36	+ [$_['usage'], $_['total_space'], $_['usage_relative']]));?>
37	37	<?php endif ?>
38	38	</p>
39	39	</div>
		@@ -99,17 +99,17 @@ discard block
		block discarded – undo
99	99	<div class="verify <?php if ($_['email'] === '' \|\| $_['emailScope'] !== 'public') p('hidden'); ?>">
100	100	<img id="verify-email" title="<?php p($_['emailMessage']); ?>" data-status="<?php p($_['emailVerification']) ?>" src="
101	101	<?php
102		- switch($_['emailVerification']) {
103		- case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS:
104		- p(image_path('core', 'actions/verifying.svg'));
105		- break;
106		- case \OC\Accounts\AccountManager::VERIFIED:
107		- p(image_path('core', 'actions/verified.svg'));
108		- break;
109		- default:
110		- p(image_path('core', 'actions/verify.svg'));
111		- }
112		- ?>">
	102	+ switch($_['emailVerification']) {
	103	+ case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS:
	104	+ p(image_path('core', 'actions/verifying.svg'));
	105	+ break;
	106	+ case \OC\Accounts\AccountManager::VERIFIED:
	107	+ p(image_path('core', 'actions/verified.svg'));
	108	+ break;
	109	+ default:
	110	+ p(image_path('core', 'actions/verify.svg'));
	111	+ }
	112	+ ?>">
113	113	</div>
114	114	<input type="email" name="email" id="email" value="<?php if(!$_['displayNameChangeSupported'] && empty($_['email'])) p($l->t('No email address set')); else p($_['email']); ?>"
115	115	<?php if(!$_['displayNameChangeSupported']) { print_unescaped('disabled="1"'); } ?>
		@@ -172,17 +172,17 @@ discard block
		block discarded – undo
172	172	<div class="verify <?php if ($_['website'] === '' \|\| $_['websiteScope'] !== 'public') p('hidden'); ?>">
173	173	<img id="verify-website" title="<?php p($_['websiteMessage']); ?>" data-status="<?php p($_['websiteVerification']) ?>" src="
174	174	<?php
175		- switch($_['websiteVerification']) {
176		- case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS:
177		- p(image_path('core', 'actions/verifying.svg'));
178		- break;
179		- case \OC\Accounts\AccountManager::VERIFIED:
180		- p(image_path('core', 'actions/verified.svg'));
181		- break;
182		- default:
183		- p(image_path('core', 'actions/verify.svg'));
184		- }
185		- ?>"
	175	+ switch($_['websiteVerification']) {
	176	+ case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS:
	177	+ p(image_path('core', 'actions/verifying.svg'));
	178	+ break;
	179	+ case \OC\Accounts\AccountManager::VERIFIED:
	180	+ p(image_path('core', 'actions/verified.svg'));
	181	+ break;
	182	+ default:
	183	+ p(image_path('core', 'actions/verify.svg'));
	184	+ }
	185	+ ?>"
186	186	<?php if($_['websiteVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS \|\| $_['websiteVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) print_unescaped(' class="verify-action"') ?>
187	187	>
188	188	<div class="verification-dialog popovermenu bubble menu">
		@@ -217,17 +217,17 @@ discard block
		block discarded – undo
217	217	<div class="verify <?php if ($_['twitter'] === '' \|\| $_['twitterScope'] !== 'public') p('hidden'); ?>">
218	218	<img id="verify-twitter" title="<?php p($_['twitterMessage']); ?>" data-status="<?php p($_['twitterVerification']) ?>" src="
219	219	<?php
220		- switch($_['twitterVerification']) {
221		- case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS:
222		- p(image_path('core', 'actions/verifying.svg'));
223		- break;
224		- case \OC\Accounts\AccountManager::VERIFIED:
225		- p(image_path('core', 'actions/verified.svg'));
226		- break;
227		- default:
228		- p(image_path('core', 'actions/verify.svg'));
229		- }
230		- ?>"
	220	+ switch($_['twitterVerification']) {
	221	+ case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS:
	222	+ p(image_path('core', 'actions/verifying.svg'));
	223	+ break;
	224	+ case \OC\Accounts\AccountManager::VERIFIED:
	225	+ p(image_path('core', 'actions/verified.svg'));
	226	+ break;
	227	+ default:
	228	+ p(image_path('core', 'actions/verify.svg'));
	229	+ }
	230	+ ?>"
231	231	<?php if($_['twitterVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS \|\| $_['twitterVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) print_unescaped(' class="verify-action"') ?>
232	232	>
233	233	<div class="verification-dialog popovermenu bubble menu">
		@@ -292,9 +292,9 @@ discard block
		block discarded – undo
292	292	</div>
293	293	<div class="personal-settings-setting-box personal-settings-password-box">
294	294	<?php
295		- if($_['passwordChangeSupported']) {
296		- script('jquery-showpassword');
297		- ?>
	295	+ if($_['passwordChangeSupported']) {
	296	+ script('jquery-showpassword');
	297	+ ?>
298	298	<form id="passwordform" class="section">
299	299	<h2 class="inlineblock"><?php p($l->t('Password'));?></h2>
300	300	<div id="password-error-msg" class="msg success inlineblock" style="display: none;">Saved</div>
		@@ -317,8 +317,8 @@ discard block
		block discarded – undo
317	317	<br/>
318	318	</form>
319	319	<?php
320		- }
321		- ?>
	320	+ }
	321	+ ?>
322	322	</div>
323	323	<span class="msg"></span>
324	324	</div>
		@@ -344,15 +344,15 @@ discard block
		block discarded – undo
344	344
345	345	<p>
346	346	<?php print_unescaped(str_replace(
347		- [
348		- '{contributeopen}',
349		- '{linkclose}',
350		- ],
351		- [
352		- '<a href="https://nextcloud.com/contribute" target="_blank" rel="noreferrer">',
353		- '</a>',
354		- ],
355		- $l->t('If you want to support the project {contributeopen}join development{linkclose} or {contributeopen}spread the word{linkclose}!'))); ?>
	347	+ [
	348	+ '{contributeopen}',
	349	+ '{linkclose}',
	350	+ ],
	351	+ [
	352	+ '<a href="https://nextcloud.com/contribute" target="_blank" rel="noreferrer">',
	353	+ '</a>',
	354	+ ],
	355	+ $l->t('If you want to support the project {contributeopen}join development{linkclose} or {contributeopen}spread the word{linkclose}!'))); ?>
356	356	</p>
357	357
358	358	<?php if(OC_APP::isEnabled('firstrunwizard')) {?>
		@@ -401,7 +401,7 @@ discard block
		block discarded – undo
401	401	</div>
402	402
403	403	<?php foreach($_['forms'] as $form) {
404		- if (isset($form['form'])) {?>
	404	+ if (isset($form['form'])) {?>
405	405	<div id="<?php isset($form['anchor']) ? p($form['anchor']) : p('');?>"><?php print_unescaped($form['form']);?></div>
406	406	<?php }
407	407	};?>

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

nextcloud / server

Pull Request — master (#5550)

Status

Category

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

Braces +54 added lines, -16 removed lines patch added patch discarded remove patch