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

Spacing +53 added lines, -53 removed lines patch added patch discarded remove patch

@@ -39,16 +39,16 @@  discard block
 block discarded – undo
 
 <div id="quota" class="section">
 	<progress value="<?php p($_['usage_relative']); ?>" max="100"
-	<?php if($_['usage_relative'] > 80): ?> class="warn" <?php endif; ?>></progress>
+	<?php if ($_['usage_relative'] > 80): ?> class="warn" <?php endif; ?>></progress>
 
-	<div style="width:<?php p($_['usage_relative']);?>%" class="quotatext-fg">
+	<div style="width:<?php p($_['usage_relative']); ?>%" class="quotatext-fg">
 		<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>
@@ -95,7 +95,7 @@  discard block
 block discarded – undo
 					</div>
 				</div>
 				<span class="icon-checkmark hidden"></span>
-				<?php if($_['lookupServerUploadEnabled']) { ?>
+				<?php if ($_['lookupServerUploadEnabled']) { ?>
 				<input type="hidden" id="avatarscope" value="<?php p($_['avatarScope']) ?>">
 				<?php } ?>
 			</form>
@@ -121,15 +121,15 @@  discard block
 block discarded – undo
 					</span>
 				</h2>
 				<input type="text" id="displayname" name="displayname"
-					<?php if(!$_['displayNameChangeSupported']) { print_unescaped('class="hidden"'); } ?>
+					<?php if (!$_['displayNameChangeSupported']) { print_unescaped('class="hidden"'); } ?>
 					   value="<?php p($_['displayName']) ?>"
 					   autocomplete="on" autocapitalize="none" autocorrect="off" />
-				<?php if(!$_['displayNameChangeSupported']) { ?>
-					<span><?php if(isset($_['displayName']) && !empty($_['displayName'])) { p($_['displayName']); } else { p($l->t('No display name set')); } ?></span>
+				<?php if (!$_['displayNameChangeSupported']) { ?>
+					<span><?php if (isset($_['displayName']) && !empty($_['displayName'])) { p($_['displayName']); } else { p($l->t('No display name set')); } ?></span>
 				<?php } ?>
 				<span class="icon-checkmark hidden"></span>
 				<span class="icon-error hidden" ></span>
-				<?php if($_['lookupServerUploadEnabled']) { ?>
+				<?php if ($_['lookupServerUploadEnabled']) { ?>
 					<input type="hidden" id="displaynamescope" value="<?php p($_['displayNameScope']) ?>">
 				<?php } ?>
 			</form>
@@ -142,10 +142,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']) {
+					switch ($_['emailVerification']) {
 						case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS:
 							p(image_path('core', 'actions/verifying.svg'));
 							break;
@@ -158,18 +158,18 @@  discard block
 block discarded – undo
 					?>">
 				</div>
 				<input type="email" name="email" id="email" value="<?php p($_['email']); ?>"
-					<?php if(!$_['displayNameChangeSupported']) { print_unescaped('class="hidden"'); } ?>
+					<?php if (!$_['displayNameChangeSupported']) { print_unescaped('class="hidden"'); } ?>
 					   placeholder="<?php p($l->t('Your email address')); ?>"
 					   autocomplete="on" autocapitalize="none" autocorrect="off" />
 			   	<span class="icon-checkmark hidden"></span>
 				<span class="icon-error hidden" ></span>
-				<?php if(!$_['displayNameChangeSupported']) { ?>
-					<span><?php if(isset($_['email']) && !empty($_['email'])) { p($_['email']); } else { p($l->t('No email address set')); }?></span>
+				<?php if (!$_['displayNameChangeSupported']) { ?>
+					<span><?php if (isset($_['email']) && !empty($_['email'])) { p($_['email']); } else { p($l->t('No email address set')); }?></span>
 				<?php } ?>
-				<?php if($_['displayNameChangeSupported']) { ?>
+				<?php if ($_['displayNameChangeSupported']) { ?>
 					<em><?php p($l->t('For password reset and notifications')); ?></em>
 				<?php } ?>
-				<?php if($_['lookupServerUploadEnabled']) { ?>
+				<?php if ($_['lookupServerUploadEnabled']) { ?>
 					<input type="hidden" id="emailscope" value="<?php p($_['emailScope']) ?>">
 				<?php } ?>
 			</form>
@@ -183,12 +183,12 @@  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" />
 				<span class="icon-checkmark hidden"></span>
-				<?php if($_['lookupServerUploadEnabled']) { ?>
+				<?php if ($_['lookupServerUploadEnabled']) { ?>
 				<input type="hidden" id="phonescope" value="<?php p($_['phoneScope']) ?>">
 				<?php } ?>
 			</form>
@@ -203,12 +203,12 @@  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" />
 				<span class="icon-checkmark hidden"></span>
-				<?php if($_['lookupServerUploadEnabled']) { ?>
+				<?php if ($_['lookupServerUploadEnabled']) { ?>
 				<input type="hidden" id="addressscope" value="<?php p($_['addressScope']) ?>">
 				<?php } ?>
 			</form>
@@ -223,11 +223,11 @@  discard block
 block discarded – undo
 						<span class="icon-triangle-s"></span>
 					</span>
 				</h2>
-				<?php if($_['lookupServerUploadEnabled']) { ?>
-				<div class="verify <?php if ($_['website'] === ''  || $_['websiteScope'] !== 'public') p('hidden'); ?>">
+				<?php if ($_['lookupServerUploadEnabled']) { ?>
+				<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']) {
+					switch ($_['websiteVerification']) {
 						case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS:
 							p(image_path('core', 'actions/verifying.svg'));
 							break;
@@ -238,13 +238,13 @@  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>
@@ -252,10 +252,10 @@  discard block
 block discarded – undo
 				<input type="url" 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']) { ?>
+				<?php if ($_['lookupServerUploadEnabled']) { ?>
 				<input type="hidden" id="websitescope" value="<?php p($_['websiteScope']) ?>">
 				<?php } ?>
 			</form>
@@ -270,11 +270,11 @@  discard block
 block discarded – undo
 						<span class="icon-triangle-s"></span>
 					</span>
 				</h2>
-				<?php if($_['lookupServerUploadEnabled']) { ?>
-				<div class="verify <?php if ($_['twitter'] === ''  || $_['twitterScope'] !== 'public') p('hidden'); ?>">
+				<?php if ($_['lookupServerUploadEnabled']) { ?>
+				<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']) {
+					switch ($_['twitterVerification']) {
 						case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS:
 							p(image_path('core', 'actions/verifying.svg'));
 							break;
@@ -285,13 +285,13 @@  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>
@@ -299,10 +299,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']) { ?>
+				<?php if ($_['lookupServerUploadEnabled']) { ?>
 				<input type="hidden" id="twitterscope" value="<?php p($_['twitterScope']) ?>">
 				<?php } ?>
 			</form>
@@ -315,47 +315,47 @@  discard block
 block discarded – undo
 			<?php if (isset($_['activelanguage'])) { ?>
 				<form id="language" class="section">
 					<h2>
-						<label for="languageinput"><?php p($l->t('Language'));?></label>
+						<label for="languageinput"><?php p($l->t('Language')); ?></label>
 					</h2>
-					<select id="languageinput" name="lang" data-placeholder="<?php p($l->t('Language'));?>">
-						<option value="<?php p($_['activelanguage']['code']);?>">
-							<?php p($_['activelanguage']['name']);?>
+					<select id="languageinput" name="lang" data-placeholder="<?php p($l->t('Language')); ?>">
+						<option value="<?php p($_['activelanguage']['code']); ?>">
+							<?php p($_['activelanguage']['name']); ?>
 						</option>
-						<?php foreach($_['commonlanguages'] as $language):?>
-							<option value="<?php p($language['code']);?>">
-								<?php p($language['name']);?>
+						<?php foreach ($_['commonlanguages'] as $language):?>
+							<option value="<?php p($language['code']); ?>">
+								<?php p($language['name']); ?>
 							</option>
-						<?php endforeach;?>
+						<?php endforeach; ?>
 						<optgroup label="––––––––––"></optgroup>
-						<?php foreach($_['languages'] as $language):?>
-							<option value="<?php p($language['code']);?>">
-								<?php p($language['name']);?>
+						<?php foreach ($_['languages'] as $language):?>
+							<option value="<?php p($language['code']); ?>">
+								<?php p($language['name']); ?>
 							</option>
-						<?php endforeach;?>
+						<?php endforeach; ?>
 					</select>
 					<a href="https://www.transifex.com/nextcloud/nextcloud/"
 					   target="_blank" rel="noreferrer noopener">
-						<em><?php p($l->t('Help translate'));?></em>
+						<em><?php p($l->t('Help translate')); ?></em>
 					</a>
 				</form>
 			<?php } ?>
 		</div>
 		<div class="personal-settings-setting-box personal-settings-password-box">
 			<?php
-			if($_['passwordChangeSupported']) {
+			if ($_['passwordChangeSupported']) {
 				script('jquery-showpassword');
 				?>
 				<form id="passwordform" class="section">
-					<h2 class="inlineblock"><?php p($l->t('Password'));?></h2>
+					<h2 class="inlineblock"><?php p($l->t('Password')); ?></h2>
 					<div id="password-error-msg" class="msg success inlineblock" style="display: none;">Saved</div>
 
 					<label for="pass1" class="hidden-visually"><?php p($l->t('Current password')); ?>: </label>
 					<input type="password" id="pass1" name="oldpassword"
-						   placeholder="<?php p($l->t('Current password'));?>"
+						   placeholder="<?php p($l->t('Current password')); ?>"
 						   autocomplete="off" autocapitalize="none" autocorrect="off" />
 
 					<div class="personal-show-container">
-						<label for="pass2" class="hidden-visually"><?php p($l->t('New password'));?>: </label>
+						<label for="pass2" class="hidden-visually"><?php p($l->t('New password')); ?>: </label>
 						<input type="password" id="pass2" name="newpassword"
 							   placeholder="<?php p($l->t('New password')); ?>"
 							   data-typetoggle="#personal-show"

Please login to merge, or discard this patch.

		@@ -39,16 +39,16 @@ discard block
		block discarded – undo
39	39
40	40	<div id="quota" class="section">
41	41	<progress value="<?php p($_['usage_relative']); ?>" max="100"
42		- <?php if($_['usage_relative'] > 80): ?> class="warn" <?php endif; ?>></progress>
	42	+ <?php if ($_['usage_relative'] > 80): ?> class="warn" <?php endif; ?>></progress>
43	43
44		- <div style="width:<?php p($_['usage_relative']);?>%" class="quotatext-fg">
	44	+ <div style="width:<?php p($_['usage_relative']); ?>%" class="quotatext-fg">
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>
		@@ -95,7 +95,7 @@ discard block
		block discarded – undo
95	95	</div>
96	96	</div>
97	97	<span class="icon-checkmark hidden"></span>
98		- <?php if($_['lookupServerUploadEnabled']) { ?>
	98	+ <?php if ($_['lookupServerUploadEnabled']) { ?>
99	99	<input type="hidden" id="avatarscope" value="<?php p($_['avatarScope']) ?>">
100	100	<?php } ?>
101	101	</form>
		@@ -121,15 +121,15 @@ discard block
		block discarded – undo
121	121	</span>
122	122	</h2>
123	123	<input type="text" id="displayname" name="displayname"
124		- <?php if(!$_['displayNameChangeSupported']) { print_unescaped('class="hidden"'); } ?>
	124	+ <?php if (!$_['displayNameChangeSupported']) { print_unescaped('class="hidden"'); } ?>
125	125	value="<?php p($_['displayName']) ?>"
126	126	autocomplete="on" autocapitalize="none" autocorrect="off" />
127		- <?php if(!$_['displayNameChangeSupported']) { ?>
128		- <span><?php if(isset($_['displayName']) && !empty($_['displayName'])) { p($_['displayName']); } else { p($l->t('No display name set')); } ?></span>
	127	+ <?php if (!$_['displayNameChangeSupported']) { ?>
	128	+ <span><?php if (isset($_['displayName']) && !empty($_['displayName'])) { p($_['displayName']); } else { p($l->t('No display name set')); } ?></span>
129	129	<?php } ?>
130	130	<span class="icon-checkmark hidden"></span>
131	131	<span class="icon-error hidden" ></span>
132		- <?php if($_['lookupServerUploadEnabled']) { ?>
	132	+ <?php if ($_['lookupServerUploadEnabled']) { ?>
133	133	<input type="hidden" id="displaynamescope" value="<?php p($_['displayNameScope']) ?>">
134	134	<?php } ?>
135	135	</form>
		@@ -142,10 +142,10 @@ discard block
		block discarded – undo
142	142	<span class="icon-triangle-s"></span>
143	143	</span>
144	144	</h2>
145		- <div class="verify <?php if ($_['email'] === '' \|\| $_['emailScope'] !== 'public') p('hidden'); ?>">
	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']) {
	148	+ switch ($_['emailVerification']) {
149	149	case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS:
150	150	p(image_path('core', 'actions/verifying.svg'));
151	151	break;
		@@ -158,18 +158,18 @@ discard block
		block discarded – undo
158	158	?>">
159	159	</div>
160	160	<input type="email" name="email" id="email" value="<?php p($_['email']); ?>"
161		- <?php if(!$_['displayNameChangeSupported']) { print_unescaped('class="hidden"'); } ?>
	161	+ <?php if (!$_['displayNameChangeSupported']) { print_unescaped('class="hidden"'); } ?>
162	162	placeholder="<?php p($l->t('Your email address')); ?>"
163	163	autocomplete="on" autocapitalize="none" autocorrect="off" />
164	164	<span class="icon-checkmark hidden"></span>
165	165	<span class="icon-error hidden" ></span>
166		- <?php if(!$_['displayNameChangeSupported']) { ?>
167		- <span><?php if(isset($_['email']) && !empty($_['email'])) { p($_['email']); } else { p($l->t('No email address set')); }?></span>
	166	+ <?php if (!$_['displayNameChangeSupported']) { ?>
	167	+ <span><?php if (isset($_['email']) && !empty($_['email'])) { p($_['email']); } else { p($l->t('No email address set')); }?></span>
168	168	<?php } ?>
169		- <?php if($_['displayNameChangeSupported']) { ?>
	169	+ <?php if ($_['displayNameChangeSupported']) { ?>
170	170	<em><?php p($l->t('For password reset and notifications')); ?></em>
171	171	<?php } ?>
172		- <?php if($_['lookupServerUploadEnabled']) { ?>
	172	+ <?php if ($_['lookupServerUploadEnabled']) { ?>
173	173	<input type="hidden" id="emailscope" value="<?php p($_['emailScope']) ?>">
174	174	<?php } ?>
175	175	</form>
		@@ -183,12 +183,12 @@ discard block
		block discarded – undo
183	183	<span class="icon-triangle-s"></span>
184	184	</span>
185	185	</h2>
186		- <input type="tel" id="phone" name="phone" <?php if(!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"'); ?>
	186	+ <input type="tel" id="phone" name="phone" <?php if (!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"'); ?>
187	187	value="<?php p($_['phone']) ?>"
188	188	placeholder="<?php p($l->t('Your phone number')); ?>"
189	189	autocomplete="on" autocapitalize="none" autocorrect="off" />
190	190	<span class="icon-checkmark hidden"></span>
191		- <?php if($_['lookupServerUploadEnabled']) { ?>
	191	+ <?php if ($_['lookupServerUploadEnabled']) { ?>
192	192	<input type="hidden" id="phonescope" value="<?php p($_['phoneScope']) ?>">
193	193	<?php } ?>
194	194	</form>
		@@ -203,12 +203,12 @@ discard block
		block discarded – undo
203	203	<span class="icon-triangle-s"></span>
204	204	</span>
205	205	</h2>
206		- <input type="text" id="address" name="address" <?php if(!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"'); ?>
	206	+ <input type="text" id="address" name="address" <?php if (!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"'); ?>
207	207	placeholder="<?php p($l->t('Your postal address')); ?>"
208	208	value="<?php p($_['address']) ?>"
209	209	autocomplete="on" autocapitalize="none" autocorrect="off" />
210	210	<span class="icon-checkmark hidden"></span>
211		- <?php if($_['lookupServerUploadEnabled']) { ?>
	211	+ <?php if ($_['lookupServerUploadEnabled']) { ?>
212	212	<input type="hidden" id="addressscope" value="<?php p($_['addressScope']) ?>">
213	213	<?php } ?>
214	214	</form>
		@@ -223,11 +223,11 @@ discard block
		block discarded – undo
223	223	<span class="icon-triangle-s"></span>
224	224	</span>
225	225	</h2>
226		- <?php if($_['lookupServerUploadEnabled']) { ?>
227		- <div class="verify <?php if ($_['website'] === '' \|\| $_['websiteScope'] !== 'public') p('hidden'); ?>">
	226	+ <?php if ($_['lookupServerUploadEnabled']) { ?>
	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']) {
	230	+ switch ($_['websiteVerification']) {
231	231	case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS:
232	232	p(image_path('core', 'actions/verifying.svg'));
233	233	break;
		@@ -238,13 +238,13 @@ discard block
		block discarded – undo
238	238	p(image_path('core', 'actions/verify.svg'));
239	239	}
240	240	?>"
241		- <?php if($_['websiteVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS \|\| $_['websiteVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) print_unescaped(' class="verify-action"') ?>
	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">
244	244	<div class="verification-dialog-content">
245	245	<p class="explainVerification"></p>
246	246	<p class="verificationCode"></p>
247		- <p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.'));?></p>
	247	+ <p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.')); ?></p>
248	248	</div>
249	249	</div>
250	250	</div>
		@@ -252,10 +252,10 @@ discard block
		block discarded – undo
252	252	<input type="url" name="website" id="website" value="<?php p($_['website']); ?>"
253	253	placeholder="<?php p($l->t('Link https://…')); ?>"
254	254	autocomplete="on" autocapitalize="none" autocorrect="off"
255		- <?php if(!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"'); ?>
	255	+ <?php if (!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"'); ?>
256	256	/>
257	257	<span class="icon-checkmark hidden"></span>
258		- <?php if($_['lookupServerUploadEnabled']) { ?>
	258	+ <?php if ($_['lookupServerUploadEnabled']) { ?>
259	259	<input type="hidden" id="websitescope" value="<?php p($_['websiteScope']) ?>">
260	260	<?php } ?>
261	261	</form>
		@@ -270,11 +270,11 @@ discard block
		block discarded – undo
270	270	<span class="icon-triangle-s"></span>
271	271	</span>
272	272	</h2>
273		- <?php if($_['lookupServerUploadEnabled']) { ?>
274		- <div class="verify <?php if ($_['twitter'] === '' \|\| $_['twitterScope'] !== 'public') p('hidden'); ?>">
	273	+ <?php if ($_['lookupServerUploadEnabled']) { ?>
	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']) {
	277	+ switch ($_['twitterVerification']) {
278	278	case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS:
279	279	p(image_path('core', 'actions/verifying.svg'));
280	280	break;
		@@ -285,13 +285,13 @@ discard block
		block discarded – undo
285	285	p(image_path('core', 'actions/verify.svg'));
286	286	}
287	287	?>"
288		- <?php if($_['twitterVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS \|\| $_['twitterVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) print_unescaped(' class="verify-action"') ?>
	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">
291	291	<div class="verification-dialog-content">
292	292	<p class="explainVerification"></p>
293	293	<p class="verificationCode"></p>
294		- <p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.'));?></p>
	294	+ <p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.')); ?></p>
295	295	</div>
296	296	</div>
297	297	</div>
		@@ -299,10 +299,10 @@ discard block
		block discarded – undo
299	299	<input type="text" name="twitter" id="twitter" value="<?php p($_['twitter']); ?>"
300	300	placeholder="<?php p($l->t('Twitter handle @…')); ?>"
301	301	autocomplete="on" autocapitalize="none" autocorrect="off"
302		- <?php if(!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"'); ?>
	302	+ <?php if (!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"'); ?>
303	303	/>
304	304	<span class="icon-checkmark hidden"></span>
305		- <?php if($_['lookupServerUploadEnabled']) { ?>
	305	+ <?php if ($_['lookupServerUploadEnabled']) { ?>
306	306	<input type="hidden" id="twitterscope" value="<?php p($_['twitterScope']) ?>">
307	307	<?php } ?>
308	308	</form>
		@@ -315,47 +315,47 @@ discard block
		block discarded – undo
315	315	<?php if (isset($_['activelanguage'])) { ?>
316	316	<form id="language" class="section">
317	317	<h2>
318		- <label for="languageinput"><?php p($l->t('Language'));?></label>
	318	+ <label for="languageinput"><?php p($l->t('Language')); ?></label>
319	319	</h2>
320		- <select id="languageinput" name="lang" data-placeholder="<?php p($l->t('Language'));?>">
321		- <option value="<?php p($_['activelanguage']['code']);?>">
322		- <?php p($_['activelanguage']['name']);?>
	320	+ <select id="languageinput" name="lang" data-placeholder="<?php p($l->t('Language')); ?>">
	321	+ <option value="<?php p($_['activelanguage']['code']); ?>">
	322	+ <?php p($_['activelanguage']['name']); ?>
323	323	</option>
324		- <?php foreach($_['commonlanguages'] as $language):?>
325		- <option value="<?php p($language['code']);?>">
326		- <?php p($language['name']);?>
	324	+ <?php foreach ($_['commonlanguages'] as $language):?>
	325	+ <option value="<?php p($language['code']); ?>">
	326	+ <?php p($language['name']); ?>
327	327	</option>
328		- <?php endforeach;?>
	328	+ <?php endforeach; ?>
329	329	<optgroup label="––––––––––"></optgroup>
330		- <?php foreach($_['languages'] as $language):?>
331		- <option value="<?php p($language['code']);?>">
332		- <?php p($language['name']);?>
	330	+ <?php foreach ($_['languages'] as $language):?>
	331	+ <option value="<?php p($language['code']); ?>">
	332	+ <?php p($language['name']); ?>
333	333	</option>
334		- <?php endforeach;?>
	334	+ <?php endforeach; ?>
335	335	</select>
336	336	<a href="https://www.transifex.com/nextcloud/nextcloud/"
337	337	target="_blank" rel="noreferrer noopener">
338		- <em><?php p($l->t('Help translate'));?></em>
	338	+ <em><?php p($l->t('Help translate')); ?></em>
339	339	</a>
340	340	</form>
341	341	<?php } ?>
342	342	</div>
343	343	<div class="personal-settings-setting-box personal-settings-password-box">
344	344	<?php
345		- if($_['passwordChangeSupported']) {
	345	+ if ($_['passwordChangeSupported']) {
346	346	script('jquery-showpassword');
347	347	?>
348	348	<form id="passwordform" class="section">
349		- <h2 class="inlineblock"><?php p($l->t('Password'));?></h2>
	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>
351	351
352	352	<label for="pass1" class="hidden-visually"><?php p($l->t('Current password')); ?>: </label>
353	353	<input type="password" id="pass1" name="oldpassword"
354		- placeholder="<?php p($l->t('Current password'));?>"
	354	+ placeholder="<?php p($l->t('Current password')); ?>"
355	355	autocomplete="off" autocapitalize="none" autocorrect="off" />
356	356
357	357	<div class="personal-show-container">
358		- <label for="pass2" class="hidden-visually"><?php p($l->t('New password'));?>: </label>
	358	+ <label for="pass2" class="hidden-visually"><?php p($l->t('New password')); ?>: </label>
359	359	<input type="password" id="pass2" name="newpassword"
360	360	placeholder="<?php p($l->t('New password')); ?>"
361	361	data-typetoggle="#personal-show"

nextcloud / server

Pull Request — master (#9218)

Status

Category

Spacing +53 added lines, -53 removed lines patch added patch discarded remove patch