Inspection of "Fix style of federation scope menu triangles, simp..." - nextcloud/server - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Pull Request — master (#6666)

by Jan-Christoph

created 2017-09-27 10:25 UTC

Status

Braces +48 added lines, -15 removed lines patch added patch discarded remove patch

@@ -44,9 +44,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>
@@ -69,8 +72,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>
 
@@ -118,7 +124,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']) {
@@ -159,7 +168,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" />
@@ -179,7 +191,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" />
@@ -200,7 +215,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']) {
@@ -214,13 +232,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>
@@ -228,7 +249,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"></span>
 				<?php if($_['lookupServerUploadEnabled']) { ?>
@@ -247,7 +271,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']) {
@@ -261,13 +288,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>
@@ -275,7 +305,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.

		@@ -44,9 +44,12 @@ discard block
		block discarded – undo
44	44	<?php if ($_['quota'] === \OCP\Files\FileInfo::SPACE_UNLIMITED): ?>
45	45	<?php print_unescaped($l->t('You are using <strong>%s</strong> of <strong>%s</strong>',
46	46	[$_['usage'], $_['total_space']]));?>
47		- <?php else: ?>
	47	+ <?php else {
	48	+ : ?>
48	49	<?php print_unescaped($l->t('You are using <strong>%s</strong> of <strong>%s</strong> (<strong>%s %%</strong>)',
49		- [$_['usage'], $_['total_space'], $_['usage_relative']]));?>
	50	+ [$_['usage'], $_['total_space'], $_['usage_relative']]));
	51	+}
	52	+?>
50	53	<?php endif ?>
51	54	</p>
52	55	</div>
		@@ -69,8 +72,11 @@ discard block
		block discarded – undo
69	72	<div class="hidden button icon-delete svg" id="removeavatar" title="<?php p($l->t('Remove image')); ?>"></div>
70	73	<input type="file" name="files[]" id="uploadavatar" class="hiddenuploadfield">
71	74	<p><em><?php p($l->t('png or jpg, max. 20 MB')); ?></em></p>
72		- <?php else: ?>
73		- <?php p($l->t('Picture provided by original account')); ?>
	75	+ <?php else {
	76	+ : ?>
	77	+ <?php p($l->t('Picture provided by original account'));
	78	+}
	79	+?>
74	80	<?php endif; ?>
75	81	</div>
76	82
		@@ -118,7 +124,10 @@ discard block
		block discarded – undo
118	124	<span class="icon-triangle-s"></span>
119	125	</span>
120	126	</h2>
121		- <div class="verify <?php if ($_['email'] === '' \|\| $_['emailScope'] !== 'public') p('hidden'); ?>">
	127	+ <div class="verify <?php if ($_['email'] === '' \|\| $_['emailScope'] !== 'public') {
	128	+ p('hidden');
	129	+}
	130	+?>">
122	131	<img id="verify-email" title="<?php p($_['emailMessage']); ?>" data-status="<?php p($_['emailVerification']) ?>" src="
123	132	<?php
124	133	switch($_['emailVerification']) {
		@@ -159,7 +168,10 @@ discard block
		block discarded – undo
159	168	<span class="icon-triangle-s"></span>
160	169	</span>
161	170	</h2>
162		- <input type="tel" id="phone" name="phone" <?php if(!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"'); ?>
	171	+ <input type="tel" id="phone" name="phone" <?php if(!$_['lookupServerUploadEnabled']) {
	172	+ print_unescaped('disabled="1"');
	173	+}
	174	+?>
163	175	value="<?php p($_['phone']) ?>"
164	176	placeholder="<?php p($l->t('Your phone number')); ?>"
165	177	autocomplete="on" autocapitalize="none" autocorrect="off" />
		@@ -179,7 +191,10 @@ discard block
		block discarded – undo
179	191	<span class="icon-triangle-s"></span>
180	192	</span>
181	193	</h2>
182		- <input type="text" id="address" name="address" <?php if(!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"'); ?>
	194	+ <input type="text" id="address" name="address" <?php if(!$_['lookupServerUploadEnabled']) {
	195	+ print_unescaped('disabled="1"');
	196	+}
	197	+?>
183	198	placeholder="<?php p($l->t('Your postal address')); ?>"
184	199	value="<?php p($_['address']) ?>"
185	200	autocomplete="on" autocapitalize="none" autocorrect="off" />
		@@ -200,7 +215,10 @@ discard block
		block discarded – undo
200	215	</span>
201	216	</h2>
202	217	<?php if($_['lookupServerUploadEnabled']) { ?>
203		- <div class="verify <?php if ($_['website'] === '' \|\| $_['websiteScope'] !== 'public') p('hidden'); ?>">
	218	+ <div class="verify <?php if ($_['website'] === '' \|\| $_['websiteScope'] !== 'public') {
	219	+ p('hidden');
	220	+}
	221	+?>">
204	222	<img id="verify-website" title="<?php p($_['websiteMessage']); ?>" data-status="<?php p($_['websiteVerification']) ?>" src="
205	223	<?php
206	224	switch($_['websiteVerification']) {
		@@ -214,13 +232,16 @@ discard block
		block discarded – undo
214	232	p(image_path('core', 'actions/verify.svg'));
215	233	}
216	234	?>"
217		- <?php if($_['websiteVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS \|\| $_['websiteVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) print_unescaped(' class="verify-action"') ?>
	235	+ <?php if($_['websiteVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS \|\| $_['websiteVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) {
	236	+ print_unescaped(' class="verify-action"') ?>
218	237	>
219	238	<div class="verification-dialog popovermenu bubble menu">
220	239	<div class="verification-dialog-content">
221	240	<p class="explainVerification"></p>
222	241	<p class="verificationCode"></p>
223		- <p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.'));?></p>
	242	+ <p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.'));
	243	+}
	244	+?></p>
224	245	</div>
225	246	</div>
226	247	</div>
		@@ -228,7 +249,10 @@ discard block
		block discarded – undo
228	249	<input type="text" name="website" id="website" value="<?php p($_['website']); ?>"
229	250	placeholder="<?php p($l->t('Link https://…')); ?>"
230	251	autocomplete="on" autocapitalize="none" autocorrect="off"
231		- <?php if(!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"'); ?>
	252	+ <?php if(!$_['lookupServerUploadEnabled']) {
	253	+ print_unescaped('disabled="1"');
	254	+}
	255	+?>
232	256	/>
233	257	<span class="icon-checkmark hidden"></span>
234	258	<?php if($_['lookupServerUploadEnabled']) { ?>
		@@ -247,7 +271,10 @@ discard block
		block discarded – undo
247	271	</span>
248	272	</h2>
249	273	<?php if($_['lookupServerUploadEnabled']) { ?>
250		- <div class="verify <?php if ($_['twitter'] === '' \|\| $_['twitterScope'] !== 'public') p('hidden'); ?>">
	274	+ <div class="verify <?php if ($_['twitter'] === '' \|\| $_['twitterScope'] !== 'public') {
	275	+ p('hidden');
	276	+}
	277	+?>">
251	278	<img id="verify-twitter" title="<?php p($_['twitterMessage']); ?>" data-status="<?php p($_['twitterVerification']) ?>" src="
252	279	<?php
253	280	switch($_['twitterVerification']) {
		@@ -261,13 +288,16 @@ discard block
		block discarded – undo
261	288	p(image_path('core', 'actions/verify.svg'));
262	289	}
263	290	?>"
264		- <?php if($_['twitterVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS \|\| $_['twitterVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) print_unescaped(' class="verify-action"') ?>
	291	+ <?php if($_['twitterVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS \|\| $_['twitterVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) {
	292	+ print_unescaped(' class="verify-action"') ?>
265	293	>
266	294	<div class="verification-dialog popovermenu bubble menu">
267	295	<div class="verification-dialog-content">
268	296	<p class="explainVerification"></p>
269	297	<p class="verificationCode"></p>
270		- <p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.'));?></p>
	298	+ <p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.'));
	299	+}
	300	+?></p>
271	301	</div>
272	302	</div>
273	303	</div>
		@@ -275,7 +305,10 @@ discard block
		block discarded – undo
275	305	<input type="text" name="twitter" id="twitter" value="<?php p($_['twitter']); ?>"
276	306	placeholder="<?php p($l->t('Twitter handle @…')); ?>"
277	307	autocomplete="on" autocapitalize="none" autocorrect="off"
278		- <?php if(!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"'); ?>
	308	+ <?php if(!$_['lookupServerUploadEnabled']) {
	309	+ print_unescaped('disabled="1"');
	310	+}
	311	+?>
279	312	/>
280	313	<span class="icon-checkmark hidden"></span>
281	314	<?php if($_['lookupServerUploadEnabled']) { ?>

nextcloud / server

Pull Request — master (#6666)

Status

Category

Braces +48 added lines, -15 removed lines patch added patch discarded remove patch