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

Completed

Pull Request — master (#9332)

by Julius

created 2018-05-03 08:32 UTC

Status

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

@@ -25,10 +25,10 @@  discard block
 block discarded – undo
 /** @var array $_ */
 
 script('settings', [
-	'usersettings',
-	'federationsettingsview',
-	'federationscopemenu',
-	'settings/personalInfo',
+    'usersettings',
+    'federationsettingsview',
+    'federationscopemenu',
+    'settings/personalInfo',
 ]);
 vendor_script('strengthify/jquery.strengthify');
 vendor_style('strengthify/strengthify');
@@ -85,10 +85,10 @@  discard block
 block discarded – undo
 					<p class="quotatext">
 						<?php if ($_['quota'] === \OCP\Files\FileInfo::SPACE_UNLIMITED): ?>
 							<?php print_unescaped($l->t('You are using <strong>%s</strong> of <strong>%s</strong>',
-								[$_['usage'], $_['total_space']]));?>
+                                [$_['usage'], $_['total_space']]));?>
 						<?php else: ?>
 							<?php print_unescaped($l->t('You are using <strong>%s</strong> of <strong>%s</strong> (<strong>%s %%</strong>)',
-								[$_['usage'], $_['total_space'],  $_['usage_relative']]));?>
+                                [$_['usage'], $_['total_space'],  $_['usage_relative']]));?>
 						<?php endif ?>
 					</p>
 				</div>
@@ -131,17 +131,17 @@  discard block
 block discarded – undo
 				<div class="verify <?php if ($_['email'] === ''  || $_['emailScope'] !== 'public') p('hidden'); ?>">
 					<img id="verify-email" title="<?php p($_['emailMessage']); ?>" data-status="<?php p($_['emailVerification']) ?>" src="
 				<?php
-					switch($_['emailVerification']) {
-						case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS:
-							p(image_path('core', 'actions/verifying.svg'));
-							break;
-						case \OC\Accounts\AccountManager::VERIFIED:
-							p(image_path('core', 'actions/verified.svg'));
-							break;
-						default:
-							p(image_path('core', 'actions/verify.svg'));
-					}
-					?>">
+                    switch($_['emailVerification']) {
+                        case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS:
+                            p(image_path('core', 'actions/verifying.svg'));
+                            break;
+                        case \OC\Accounts\AccountManager::VERIFIED:
+                            p(image_path('core', 'actions/verified.svg'));
+                            break;
+                        default:
+                            p(image_path('core', 'actions/verify.svg'));
+                    }
+                    ?>">
 				</div>
 				<input type="email" name="email" id="email" value="<?php p($_['email']); ?>"
 					<?php if(!$_['displayNameChangeSupported']) { print_unescaped('class="hidden"'); } ?>
@@ -213,17 +213,17 @@  discard block
 block discarded – undo
 				<div class="verify <?php if ($_['website'] === ''  || $_['websiteScope'] !== 'public') p('hidden'); ?>">
 					<img id="verify-website" title="<?php p($_['websiteMessage']); ?>" data-status="<?php p($_['websiteVerification']) ?>" src="
 					<?php
-					switch($_['websiteVerification']) {
-						case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS:
-							p(image_path('core', 'actions/verifying.svg'));
-							break;
-						case \OC\Accounts\AccountManager::VERIFIED:
-							p(image_path('core', 'actions/verified.svg'));
-							break;
-						default:
-							p(image_path('core', 'actions/verify.svg'));
-					}
-					?>"
+                    switch($_['websiteVerification']) {
+                        case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS:
+                            p(image_path('core', 'actions/verifying.svg'));
+                            break;
+                        case \OC\Accounts\AccountManager::VERIFIED:
+                            p(image_path('core', 'actions/verified.svg'));
+                            break;
+                        default:
+                            p(image_path('core', 'actions/verify.svg'));
+                    }
+                    ?>"
 					<?php if($_['websiteVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS || $_['websiteVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) print_unescaped(' class="verify-action"') ?>
 					>
 					<div class="verification-dialog popovermenu bubble menu">
@@ -260,17 +260,17 @@  discard block
 block discarded – undo
 				<div class="verify <?php if ($_['twitter'] === ''  || $_['twitterScope'] !== 'public') p('hidden'); ?>">
 					<img id="verify-twitter" title="<?php p($_['twitterMessage']); ?>" data-status="<?php p($_['twitterVerification']) ?>" src="
 					<?php
-					switch($_['twitterVerification']) {
-						case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS:
-							p(image_path('core', 'actions/verifying.svg'));
-							break;
-						case \OC\Accounts\AccountManager::VERIFIED:
-							p(image_path('core', 'actions/verified.svg'));
-							break;
-						default:
-							p(image_path('core', 'actions/verify.svg'));
-					}
-					?>"
+                    switch($_['twitterVerification']) {
+                        case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS:
+                            p(image_path('core', 'actions/verifying.svg'));
+                            break;
+                        case \OC\Accounts\AccountManager::VERIFIED:
+                            p(image_path('core', 'actions/verified.svg'));
+                            break;
+                        default:
+                            p(image_path('core', 'actions/verify.svg'));
+                    }
+                    ?>"
 					<?php if($_['twitterVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS || $_['twitterVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) print_unescaped(' class="verify-action"') ?>
 					>
 					<div class="verification-dialog popovermenu bubble menu">
@@ -328,9 +328,9 @@  discard block
 block discarded – undo
 		</div>
 		<div class="personal-settings-setting-box personal-settings-password-box">
 			<?php
-			if($_['passwordChangeSupported']) {
-				script('jquery-showpassword');
-				?>
+            if($_['passwordChangeSupported']) {
+                script('jquery-showpassword');
+                ?>
 				<form id="passwordform" class="section">
 					<h2 class="inlineblock"><?php p($l->t('Password'));?></h2>
 					<div id="password-error-msg" class="msg success inlineblock" style="display: none;">Saved</div>
@@ -353,8 +353,8 @@  discard block
 block discarded – undo
 
 				</form>
 				<?php
-			}
-			?>
+            }
+            ?>
 		</div>
 		<span class="msg"></span>
 	</div>

Please login to merge, or discard this patch.

apps/files/templates/appnavigation.php 1 patch

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

@@ -2,8 +2,8 @@  discard block
 block discarded – undo
 	<ul class="with-icon">
 	<?php $pinned = 0 ?>
 		<?php foreach ($_['navigationItems'] as $item) {
-			strpos($item['classes'], 'pinned')!==false ? $pinned++ : '';
-		?>
+            strpos($item['classes'], 'pinned')!==false ? $pinned++ : '';
+        ?>
 		<li data-id="<?php p($item['id']) ?>" class="nav-<?php p($item['id']) ?> <?php p($item['classes']) ?> <?php p($pinned===1?'first-pinned':'') ?>">
 			<a href="<?php p(isset($item['href']) ? $item['href'] : '#') ?>"
 				class="nav-icon-<?php p($item['icon'] !== '' ? $item['icon'] : $item['id']) ?> svg">
@@ -12,16 +12,16 @@  discard block
 block discarded – undo
 		</li>
 		<?php } ?>
 		<li id="quota" class="pinned <?php p($pinned===0?'first-pinned ':'') ?><?php
-		if ($_['quota'] !== \OCP\Files\FileInfo::SPACE_UNLIMITED) {
-			?>has-tooltip" title="<?php p($_['usage_relative'] . '%');
-		} ?>">
+        if ($_['quota'] !== \OCP\Files\FileInfo::SPACE_UNLIMITED) {
+            ?>has-tooltip" title="<?php p($_['usage_relative'] . '%');
+        } ?>">
 			<a href="#" class="icon-quota svg">
 				<p id="quotatext"><?php
-					if ($_['quota'] !== \OCP\Files\FileInfo::SPACE_UNLIMITED) {
-						p($l->t('%s of %s used', [$_['usage'], $_['total_space']]));
-					} else {
-						p($l->t('%s used', [$_['usage']]));
-					} ?></p>
+                    if ($_['quota'] !== \OCP\Files\FileInfo::SPACE_UNLIMITED) {
+                        p($l->t('%s of %s used', [$_['usage'], $_['total_space']]));
+                    } else {
+                        p($l->t('%s used', [$_['usage']]));
+                    } ?></p>
 				<div class="quota-container">
 					<progress value="<?php p($_['usage_relative']); ?>" max="100"
 						<?php if($_['usage_relative'] > 80): ?> class="warn" <?php endif; ?>></progress>

Please login to merge, or discard this patch.

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

		@@ -2,8 +2,8 @@ discard block
		block discarded – undo
2	2	<ul class="with-icon">
3	3	<?php $pinned = 0 ?>
4	4	<?php foreach ($_['navigationItems'] as $item) {
5		- strpos($item['classes'], 'pinned')!==false ? $pinned++ : '';
6		- ?>
	5	+ strpos($item['classes'], 'pinned')!==false ? $pinned++ : '';
	6	+ ?>
7	7	<li data-id="<?php p($item['id']) ?>" class="nav-<?php p($item['id']) ?> <?php p($item['classes']) ?> <?php p($pinned===1?'first-pinned':'') ?>">
8	8	<a href="<?php p(isset($item['href']) ? $item['href'] : '#') ?>"
9	9	class="nav-icon-<?php p($item['icon'] !== '' ? $item['icon'] : $item['id']) ?> svg">
		@@ -12,16 +12,16 @@ discard block
		block discarded – undo
12	12	</li>
13	13	<?php } ?>
14	14	<li id="quota" class="pinned <?php p($pinned===0?'first-pinned ':'') ?><?php
15		- if ($_['quota'] !== \OCP\Files\FileInfo::SPACE_UNLIMITED) {
16		- ?>has-tooltip" title="<?php p($_['usage_relative'] . '%');
17		- } ?>">
	15	+ if ($_['quota'] !== \OCP\Files\FileInfo::SPACE_UNLIMITED) {
	16	+ ?>has-tooltip" title="<?php p($_['usage_relative'] . '%');
	17	+ } ?>">
18	18	<a href="#" class="icon-quota svg">
19	19	<p id="quotatext"><?php
20		- if ($_['quota'] !== \OCP\Files\FileInfo::SPACE_UNLIMITED) {
21		- p($l->t('%s of %s used', [$_['usage'], $_['total_space']]));
22		- } else {
23		- p($l->t('%s used', [$_['usage']]));
24		- } ?></p>
	20	+ if ($_['quota'] !== \OCP\Files\FileInfo::SPACE_UNLIMITED) {
	21	+ p($l->t('%s of %s used', [$_['usage'], $_['total_space']]));
	22	+ } else {
	23	+ p($l->t('%s used', [$_['usage']]));
	24	+ } ?></p>
25	25	<div class="quota-container">
26	26	<progress value="<?php p($_['usage_relative']); ?>" max="100"
27	27	<?php if($_['usage_relative'] > 80): ?> class="warn" <?php endif; ?>></progress>

nextcloud / server

Pull Request — master (#9332)

Status

Category

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

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