Inspection of "Move personal settings to css grid layout" - nextcloud/server - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Pull Request — master (#9218)

by Julius

created 2018-04-17 20:43 UTC

Status

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

@@ -25,10 +25,10 @@  discard block
 block discarded – undo
 /** @var array $_ */
 
 script('settings', [
-	'usersettings',
-	'federationsettingsview',
-	'federationscopemenu',
-	'settings/personalInfo',
+    'usersettings',
+    'federationsettingsview',
+    'federationscopemenu',
+    'settings/personalInfo',
 ]);
 vendor_script('strengthify/jquery.strengthify');
 vendor_style('strengthify/strengthify');
@@ -45,10 +45,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>
@@ -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>
@@ -145,17 +145,17 @@  discard block
 block discarded – undo
 				<div class="verify <?php if ($_['email'] === ''  || $_['emailScope'] !== 'public') p('hidden'); ?>">
 					<img id="verify-email" title="<?php p($_['emailMessage']); ?>" data-status="<?php p($_['emailVerification']) ?>" src="
 				<?php
-					switch($_['emailVerification']) {
-						case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS:
-							p(image_path('core', 'actions/verifying.svg'));
-							break;
-						case \OC\Accounts\AccountManager::VERIFIED:
-							p(image_path('core', 'actions/verified.svg'));
-							break;
-						default:
-							p(image_path('core', 'actions/verify.svg'));
-					}
-					?>">
+                    switch($_['emailVerification']) {
+                        case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS:
+                            p(image_path('core', 'actions/verifying.svg'));
+                            break;
+                        case \OC\Accounts\AccountManager::VERIFIED:
+                            p(image_path('core', 'actions/verified.svg'));
+                            break;
+                        default:
+                            p(image_path('core', 'actions/verify.svg'));
+                    }
+                    ?>">
 				</div>
 				<input type="email" name="email" id="email" value="<?php p($_['email']); ?>"
 					<?php if(!$_['displayNameChangeSupported']) { print_unescaped('class="hidden"'); } ?>
@@ -227,17 +227,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">
@@ -274,17 +274,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">
@@ -342,9 +342,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>
@@ -367,8 +367,8 @@  discard block
 block discarded – undo
 
 				</form>
 				<?php
-			}
-			?>
+            }
+            ?>
 		</div>
 		<span class="msg"></span>
 	</div>

Please login to merge, or discard this patch.

		@@ -25,10 +25,10 @@ discard block
		block discarded – undo
25	25	/** @var array $_ */
26	26
27	27	script('settings', [
28		- 'usersettings',
29		- 'federationsettingsview',
30		- 'federationscopemenu',
31		- 'settings/personalInfo',
	28	+ 'usersettings',
	29	+ 'federationsettingsview',
	30	+ 'federationscopemenu',
	31	+ 'settings/personalInfo',
32	32	]);
33	33	vendor_script('strengthify/jquery.strengthify');
34	34	vendor_style('strengthify/strengthify');
		@@ -45,10 +45,10 @@ discard block
		block discarded – undo
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>
		@@ -145,17 +145,17 @@ discard block
		block discarded – undo
145	145	<div class="verify <?php if ($_['email'] === '' \|\| $_['emailScope'] !== 'public') p('hidden'); ?>">
146	146	<img id="verify-email" title="<?php p($_['emailMessage']); ?>" data-status="<?php p($_['emailVerification']) ?>" src="
147	147	<?php
148		- switch($_['emailVerification']) {
149		- case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS:
150		- p(image_path('core', 'actions/verifying.svg'));
151		- break;
152		- case \OC\Accounts\AccountManager::VERIFIED:
153		- p(image_path('core', 'actions/verified.svg'));
154		- break;
155		- default:
156		- p(image_path('core', 'actions/verify.svg'));
157		- }
158		- ?>">
	148	+ switch($_['emailVerification']) {
	149	+ case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS:
	150	+ p(image_path('core', 'actions/verifying.svg'));
	151	+ break;
	152	+ case \OC\Accounts\AccountManager::VERIFIED:
	153	+ p(image_path('core', 'actions/verified.svg'));
	154	+ break;
	155	+ default:
	156	+ p(image_path('core', 'actions/verify.svg'));
	157	+ }
	158	+ ?>">
159	159	</div>
160	160	<input type="email" name="email" id="email" value="<?php p($_['email']); ?>"
161	161	<?php if(!$_['displayNameChangeSupported']) { print_unescaped('class="hidden"'); } ?>
		@@ -227,17 +227,17 @@ discard block
		block discarded – undo
227	227	<div class="verify <?php if ($_['website'] === '' \|\| $_['websiteScope'] !== 'public') p('hidden'); ?>">
228	228	<img id="verify-website" title="<?php p($_['websiteMessage']); ?>" data-status="<?php p($_['websiteVerification']) ?>" src="
229	229	<?php
230		- switch($_['websiteVerification']) {
231		- case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS:
232		- p(image_path('core', 'actions/verifying.svg'));
233		- break;
234		- case \OC\Accounts\AccountManager::VERIFIED:
235		- p(image_path('core', 'actions/verified.svg'));
236		- break;
237		- default:
238		- p(image_path('core', 'actions/verify.svg'));
239		- }
240		- ?>"
	230	+ switch($_['websiteVerification']) {
	231	+ case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS:
	232	+ p(image_path('core', 'actions/verifying.svg'));
	233	+ break;
	234	+ case \OC\Accounts\AccountManager::VERIFIED:
	235	+ p(image_path('core', 'actions/verified.svg'));
	236	+ break;
	237	+ default:
	238	+ p(image_path('core', 'actions/verify.svg'));
	239	+ }
	240	+ ?>"
241	241	<?php if($_['websiteVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS \|\| $_['websiteVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) print_unescaped(' class="verify-action"') ?>
242	242	>
243	243	<div class="verification-dialog popovermenu bubble menu">
		@@ -274,17 +274,17 @@ discard block
		block discarded – undo
274	274	<div class="verify <?php if ($_['twitter'] === '' \|\| $_['twitterScope'] !== 'public') p('hidden'); ?>">
275	275	<img id="verify-twitter" title="<?php p($_['twitterMessage']); ?>" data-status="<?php p($_['twitterVerification']) ?>" src="
276	276	<?php
277		- switch($_['twitterVerification']) {
278		- case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS:
279		- p(image_path('core', 'actions/verifying.svg'));
280		- break;
281		- case \OC\Accounts\AccountManager::VERIFIED:
282		- p(image_path('core', 'actions/verified.svg'));
283		- break;
284		- default:
285		- p(image_path('core', 'actions/verify.svg'));
286		- }
287		- ?>"
	277	+ switch($_['twitterVerification']) {
	278	+ case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS:
	279	+ p(image_path('core', 'actions/verifying.svg'));
	280	+ break;
	281	+ case \OC\Accounts\AccountManager::VERIFIED:
	282	+ p(image_path('core', 'actions/verified.svg'));
	283	+ break;
	284	+ default:
	285	+ p(image_path('core', 'actions/verify.svg'));
	286	+ }
	287	+ ?>"
288	288	<?php if($_['twitterVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS \|\| $_['twitterVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) print_unescaped(' class="verify-action"') ?>
289	289	>
290	290	<div class="verification-dialog popovermenu bubble menu">
		@@ -342,9 +342,9 @@ discard block
		block discarded – undo
342	342	</div>
343	343	<div class="personal-settings-setting-box personal-settings-password-box">
344	344	<?php
345		- if($_['passwordChangeSupported']) {
346		- script('jquery-showpassword');
347		- ?>
	345	+ if($_['passwordChangeSupported']) {
	346	+ script('jquery-showpassword');
	347	+ ?>
348	348	<form id="passwordform" class="section">
349	349	<h2 class="inlineblock"><?php p($l->t('Password'));?></h2>
350	350	<div id="password-error-msg" class="msg success inlineblock" style="display: none;">Saved</div>
		@@ -367,8 +367,8 @@ discard block
		block discarded – undo
367	367
368	368	</form>
369	369	<?php
370		- }
371		- ?>
	370	+ }
	371	+ ?>
372	372	</div>
373	373	<span class="msg"></span>
374	374	</div>

nextcloud / server

Pull Request — master (#9218)

Status

Category

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