Inspection of "show input fields if they are not empty but disabl..." - nextcloud/server - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Pull Request — master (#5287)

by Björn

created 2017-06-07 13:06 UTC

Status

Braces +48 added lines, -15 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>
 
@@ -99,7 +105,10 @@  discard block
 block discarded – undo
 				<label for="email"><?php p($l->t('Email')); ?></label>
 				<span class="icon-password"/>
 			</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']) {
@@ -138,7 +147,10 @@  discard block
 block discarded – undo
 				<label for="phone"><?php p($l->t('Phone number')); ?></label>
 				<span class="icon-password"/>
 			</h2>
-			<input type="tel" id="phone" name="phone" <?php if(!$_['lookupServerUploadEnabled']) p('disabled="1"'); ?>
+			<input type="tel" id="phone" name="phone" <?php if(!$_['lookupServerUploadEnabled']) {
+    p('disabled="1"');
+}
+?>
 				   value="<?php p($_['phone']) ?>"
 				   placeholder="<?php p($l->t('Your phone number')); ?>"
 			       autocomplete="on" autocapitalize="none" autocorrect="off" />
@@ -156,7 +168,10 @@  discard block
 block discarded – undo
 				<label for="address"><?php p($l->t('Address')); ?></label>
 				<span class="icon-password"/>
 			</h2>
-			<input type="text" id="address" name="address" <?php if(!$_['lookupServerUploadEnabled']) p('disabled="1"');  ?>
+			<input type="text" id="address" name="address" <?php if(!$_['lookupServerUploadEnabled']) {
+    p('disabled="1"');
+}
+?>
 				   placeholder="<?php p($l->t('Your postal address')); ?>"
 				   value="<?php p($_['address']) ?>"
 				   autocomplete="on" autocapitalize="none" autocorrect="off" />
@@ -175,7 +190,10 @@  discard block
 block discarded – undo
 				<span class="icon-password"/>
 			</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']) {
@@ -189,13 +207,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>
@@ -203,7 +224,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']) p('disabled="1"');  ?>
+				   <?php if(!$_['lookupServerUploadEnabled']) {
+    p('disabled="1"');
+}
+?>
 			/>
 			<span class="icon-checkmark hidden"/>
 			<?php if($_['lookupServerUploadEnabled']) { ?>
@@ -220,7 +244,10 @@  discard block
 block discarded – undo
 				<span class="icon-password"/>
 			</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']) {
@@ -234,13 +261,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>
@@ -248,7 +278,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']) p('disabled="1"');  ?>
+				   <?php if(!$_['lookupServerUploadEnabled']) {
+    p('disabled="1"');
+}
+?>
 			/>
 			<span class="icon-checkmark hidden"/>
 			<?php if($_['lookupServerUploadEnabled']) { ?>

Please login to merge, or discard this patch.

		@@ -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
		@@ -99,7 +105,10 @@ discard block
		block discarded – undo
99	105	<label for="email"><?php p($l->t('Email')); ?></label>
100	106	<span class="icon-password"/>
101	107	</h2>
102		- <div class="verify <?php if ($_['email'] === '' \|\| $_['emailScope'] !== 'public') p('hidden'); ?>">
	108	+ <div class="verify <?php if ($_['email'] === '' \|\| $_['emailScope'] !== 'public') {
	109	+ p('hidden');
	110	+}
	111	+?>">
103	112	<img id="verify-email" title="<?php p($_['emailMessage']); ?>" data-status="<?php p($_['emailVerification']) ?>" src="
104	113	<?php
105	114	switch($_['emailVerification']) {
		@@ -138,7 +147,10 @@ discard block
		block discarded – undo
138	147	<label for="phone"><?php p($l->t('Phone number')); ?></label>
139	148	<span class="icon-password"/>
140	149	</h2>
141		- <input type="tel" id="phone" name="phone" <?php if(!$_['lookupServerUploadEnabled']) p('disabled="1"'); ?>
	150	+ <input type="tel" id="phone" name="phone" <?php if(!$_['lookupServerUploadEnabled']) {
	151	+ p('disabled="1"');
	152	+}
	153	+?>
142	154	value="<?php p($_['phone']) ?>"
143	155	placeholder="<?php p($l->t('Your phone number')); ?>"
144	156	autocomplete="on" autocapitalize="none" autocorrect="off" />
		@@ -156,7 +168,10 @@ discard block
		block discarded – undo
156	168	<label for="address"><?php p($l->t('Address')); ?></label>
157	169	<span class="icon-password"/>
158	170	</h2>
159		- <input type="text" id="address" name="address" <?php if(!$_['lookupServerUploadEnabled']) p('disabled="1"'); ?>
	171	+ <input type="text" id="address" name="address" <?php if(!$_['lookupServerUploadEnabled']) {
	172	+ p('disabled="1"');
	173	+}
	174	+?>
160	175	placeholder="<?php p($l->t('Your postal address')); ?>"
161	176	value="<?php p($_['address']) ?>"
162	177	autocomplete="on" autocapitalize="none" autocorrect="off" />
		@@ -175,7 +190,10 @@ discard block
		block discarded – undo
175	190	<span class="icon-password"/>
176	191	</h2>
177	192	<?php if($_['lookupServerUploadEnabled']) { ?>
178		- <div class="verify <?php if ($_['website'] === '' \|\| $_['websiteScope'] !== 'public') p('hidden'); ?>">
	193	+ <div class="verify <?php if ($_['website'] === '' \|\| $_['websiteScope'] !== 'public') {
	194	+ p('hidden');
	195	+}
	196	+?>">
179	197	<img id="verify-website" title="<?php p($_['websiteMessage']); ?>" data-status="<?php p($_['websiteVerification']) ?>" src="
180	198	<?php
181	199	switch($_['websiteVerification']) {
		@@ -189,13 +207,16 @@ discard block
		block discarded – undo
189	207	p(image_path('core', 'actions/verify.svg'));
190	208	}
191	209	?>"
192		- <?php if($_['websiteVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS \|\| $_['websiteVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) print_unescaped(' class="verify-action"') ?>
	210	+ <?php if($_['websiteVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS \|\| $_['websiteVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) {
	211	+ print_unescaped(' class="verify-action"') ?>
193	212	>
194	213	<div class="verification-dialog popovermenu bubble menu">
195	214	<div class="verification-dialog-content">
196	215	<p class="explainVerification"></p>
197	216	<p class="verificationCode"></p>
198		- <p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.'));?></p>
	217	+ <p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.'));
	218	+}
	219	+?></p>
199	220	</div>
200	221	</div>
201	222	</div>
		@@ -203,7 +224,10 @@ discard block
		block discarded – undo
203	224	<input type="text" name="website" id="website" value="<?php p($_['website']); ?>"
204	225	placeholder="<?php p($l->t('Link https://…')); ?>"
205	226	autocomplete="on" autocapitalize="none" autocorrect="off"
206		- <?php if(!$_['lookupServerUploadEnabled']) p('disabled="1"'); ?>
	227	+ <?php if(!$_['lookupServerUploadEnabled']) {
	228	+ p('disabled="1"');
	229	+}
	230	+?>
207	231	/>
208	232	<span class="icon-checkmark hidden"/>
209	233	<?php if($_['lookupServerUploadEnabled']) { ?>
		@@ -220,7 +244,10 @@ discard block
		block discarded – undo
220	244	<span class="icon-password"/>
221	245	</h2>
222	246	<?php if($_['lookupServerUploadEnabled']) { ?>
223		- <div class="verify <?php if ($_['twitter'] === '' \|\| $_['twitterScope'] !== 'public') p('hidden'); ?>">
	247	+ <div class="verify <?php if ($_['twitter'] === '' \|\| $_['twitterScope'] !== 'public') {
	248	+ p('hidden');
	249	+}
	250	+?>">
224	251	<img id="verify-twitter" title="<?php p($_['twitterMessage']); ?>" data-status="<?php p($_['twitterVerification']) ?>" src="
225	252	<?php
226	253	switch($_['twitterVerification']) {
		@@ -234,13 +261,16 @@ discard block
		block discarded – undo
234	261	p(image_path('core', 'actions/verify.svg'));
235	262	}
236	263	?>"
237		- <?php if($_['twitterVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS \|\| $_['twitterVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) print_unescaped(' class="verify-action"') ?>
	264	+ <?php if($_['twitterVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS \|\| $_['twitterVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) {
	265	+ print_unescaped(' class="verify-action"') ?>
238	266	>
239	267	<div class="verification-dialog popovermenu bubble menu">
240	268	<div class="verification-dialog-content">
241	269	<p class="explainVerification"></p>
242	270	<p class="verificationCode"></p>
243		- <p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.'));?></p>
	271	+ <p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.'));
	272	+}
	273	+?></p>
244	274	</div>
245	275	</div>
246	276	</div>
		@@ -248,7 +278,10 @@ discard block
		block discarded – undo
248	278	<input type="text" name="twitter" id="twitter" value="<?php p($_['twitter']); ?>"
249	279	placeholder="<?php p($l->t('Twitter handle @…')); ?>"
250	280	autocomplete="on" autocapitalize="none" autocorrect="off"
251		- <?php if(!$_['lookupServerUploadEnabled']) p('disabled="1"'); ?>
	281	+ <?php if(!$_['lookupServerUploadEnabled']) {
	282	+ p('disabled="1"');
	283	+}
	284	+?>
252	285	/>
253	286	<span class="icon-checkmark hidden"/>
254	287	<?php if($_['lookupServerUploadEnabled']) { ?>

nextcloud / server

Pull Request — master (#5287)

Status

Category

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