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-28 16:27 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.

		@@ -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	};?>

nextcloud / server

Pull Request — master (#5550)

Status

Category

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