Inspection of "Add user locale/region setting" - nextcloud/server - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Pull Request — master (#5623)

by Thomas

created 2017-07-07 09:18 UTC

Status

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

@@ -39,15 +39,15 @@  discard block
 block discarded – undo
 ?>
 
 <div id="quota" class="section">
-	<div style="width:<?php p($_['usage_relative']);?>%"
-		<?php if($_['usage_relative'] > 80): ?> class="quota-warning" <?php endif; ?>>
+	<div style="width:<?php p($_['usage_relative']); ?>%"
+		<?php if ($_['usage_relative'] > 80): ?> class="quota-warning" <?php endif; ?>>
 		<p id="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>
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
 				</div>
 			</div>
 			<span class="icon-checkmark hidden"/>
-			<?php if($_['lookupServerUploadEnabled']) { ?>
+			<?php if ($_['lookupServerUploadEnabled']) { ?>
 				<input type="hidden" id="avatarscope" value="<?php p($_['avatarScope']) ?>">
 			<?php } ?>
 		</form>
@@ -95,14 +95,14 @@  discard block
 block discarded – undo
 					<span class="icon-password"/>
 				</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"/>
-				<?php if($_['lookupServerUploadEnabled']) { ?>
+				<?php if ($_['lookupServerUploadEnabled']) { ?>
 					<input type="hidden" id="displaynamescope" value="<?php p($_['displayNameScope']) ?>">
 				<?php } ?>
 			</form>
@@ -113,10 +113,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']) {
+					switch ($_['emailVerification']) {
 						case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS:
 							p(image_path('core', 'actions/verifying.svg'));
 							break;
@@ -129,23 +129,23 @@  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" />
-				<?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']) { ?>
 					<br />
 					<em><?php p($l->t('For password reset and notifications')); ?></em>
 				<?php } ?>
 				<span class="icon-checkmark hidden"/>
-				<?php if($_['lookupServerUploadEnabled']) { ?>
+				<?php if ($_['lookupServerUploadEnabled']) { ?>
 					<input type="hidden" id="emailscope" value="<?php p($_['emailScope']) ?>">
 				<?php } ?>
 			</form>
 		</div>
-		<?php if($_['lookupServerUploadEnabled']) { ?>
+		<?php if ($_['lookupServerUploadEnabled']) { ?>
 			<div class="personal-settings-setting-box">
 				<form id="phoneform" class="section">
 					<h2>
@@ -180,10 +180,10 @@  discard block
 block discarded – undo
 						<label for="website"><?php p($l->t('Website')); ?></label>
 						<span class="icon-password"/>
 					</h2>
-					<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']) {
+						switch ($_['websiteVerification']) {
 							case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS:
 								p(image_path('core', 'actions/verifying.svg'));
 								break;
@@ -194,13 +194,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>
@@ -217,10 +217,10 @@  discard block
 block discarded – undo
 						<label for="twitter"><?php p($l->t('Twitter')); ?></label>
 						<span class="icon-password"/>
 					</h2>
-					<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']) {
+						switch ($_['twitterVerification']) {
 							case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS:
 								p(image_path('core', 'actions/verifying.svg'));
 								break;
@@ -231,13 +231,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>
@@ -262,19 +262,19 @@  discard block
 block discarded – undo
 </div>
 
 <?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>
 		<br>
 		<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"
@@ -291,27 +291,27 @@  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">
-		<em><?php p($l->t('Help translate'));?></em>
+		<em><?php p($l->t('Help translate')); ?></em>
 	</a>
 </form>
 <?php } ?>
@@ -319,27 +319,27 @@  discard block
 block discarded – undo
 <?php if (isset($_['activelocale'])) { ?>
 <form id="locale" class="section">
 	<h2>
-		<label for="localeinput"><?php p($l->t('Locale'));?></label>
+		<label for="localeinput"><?php p($l->t('Locale')); ?></label>
 	</h2>
-	<select id="localeinput" name="lang" data-placeholder="<?php p($l->t('Locale'));?>">
-		<option value="<?php p($_['activelocale']['code']);?>">
-			<?php p($_['activelocale']['name']);?>
+	<select id="localeinput" name="lang" data-placeholder="<?php p($l->t('Locale')); ?>">
+		<option value="<?php p($_['activelocale']['code']); ?>">
+			<?php p($_['activelocale']['name']); ?>
 		</option>
 		<optgroup label="––––––––––"></optgroup>
-		<?php foreach($_['localesforlanguage'] as $locale):?>
-			<option value="<?php p($locale['code']);?>">
-				<?php p($locale['name']);?>
+		<?php foreach ($_['localesforlanguage'] as $locale):?>
+			<option value="<?php p($locale['code']); ?>">
+				<?php p($locale['name']); ?>
 			</option>
-		<?php endforeach;?>
+		<?php endforeach; ?>
 		<optgroup label="––––––––––"></optgroup>
-		<option value="<?php p($_['activelocale']['code']);?>">
-			<?php p($_['activelocale']['name']);?>
+		<option value="<?php p($_['activelocale']['code']); ?>">
+			<?php p($_['activelocale']['name']); ?>
 		</option>
-		<?php foreach($_['locales'] as $locale):?>
-			<option value="<?php p($locale['code']);?>">
-				<?php p($locale['name']);?>
+		<?php foreach ($_['locales'] as $locale):?>
+			<option value="<?php p($locale['code']); ?>">
+				<?php p($locale['name']); ?>
 			</option>
-		<?php endforeach;?>
+		<?php endforeach; ?>
 	</select>
 </form>
 <?php } ?>

Please login to merge, or discard this patch.

		@@ -39,15 +39,15 @@ discard block
		block discarded – undo
39	39	?>
40	40
41	41	<div id="quota" class="section">
42		- <div style="width:<?php p($_['usage_relative']);?>%"
43		- <?php if($_['usage_relative'] > 80): ?> class="quota-warning" <?php endif; ?>>
	42	+ <div style="width:<?php p($_['usage_relative']); ?>%"
	43	+ <?php if ($_['usage_relative'] > 80): ?> class="quota-warning" <?php endif; ?>>
44	44	<p id="quotatext">
45	45	<?php if ($_['quota'] === \OCP\Files\FileInfo::SPACE_UNLIMITED): ?>
46	46	<?php print_unescaped($l->t('You are using <strong>%s</strong> of <strong>%s</strong>',
47		- [$_['usage'], $_['total_space']]));?>
	47	+ [$_['usage'], $_['total_space']])); ?>
48	48	<?php else: ?>
49	49	<?php print_unescaped($l->t('You are using <strong>%s</strong> of <strong>%s</strong> (<strong>%s %%</strong>)',
50		- [$_['usage'], $_['total_space'], $_['usage_relative']]));?>
	50	+ [$_['usage'], $_['total_space'], $_['usage_relative']])); ?>
51	51	<?php endif ?>
52	52	</p>
53	53	</div>
		@@ -81,7 +81,7 @@ discard block
		block discarded – undo
81	81	</div>
82	82	</div>
83	83	<span class="icon-checkmark hidden"/>
84		- <?php if($_['lookupServerUploadEnabled']) { ?>
	84	+ <?php if ($_['lookupServerUploadEnabled']) { ?>
85	85	<input type="hidden" id="avatarscope" value="<?php p($_['avatarScope']) ?>">
86	86	<?php } ?>
87	87	</form>
		@@ -95,14 +95,14 @@ discard block
		block discarded – undo
95	95	<span class="icon-password"/>
96	96	</h2>
97	97	<input type="text" id="displayname" name="displayname"
98		- <?php if(!$_['displayNameChangeSupported']) { print_unescaped('class="hidden"'); } ?>
	98	+ <?php if (!$_['displayNameChangeSupported']) { print_unescaped('class="hidden"'); } ?>
99	99	value="<?php p($_['displayName']) ?>"
100	100	autocomplete="on" autocapitalize="none" autocorrect="off" />
101		- <?php if(!$_['displayNameChangeSupported']) { ?>
102		- <span><?php if(isset($_['displayName']) && !empty($_['displayName'])) { p($_['displayName']); } else { p($l->t('No display name set')); } ?></span>
	101	+ <?php if (!$_['displayNameChangeSupported']) { ?>
	102	+ <span><?php if (isset($_['displayName']) && !empty($_['displayName'])) { p($_['displayName']); } else { p($l->t('No display name set')); } ?></span>
103	103	<?php } ?>
104	104	<span class="icon-checkmark hidden"/>
105		- <?php if($_['lookupServerUploadEnabled']) { ?>
	105	+ <?php if ($_['lookupServerUploadEnabled']) { ?>
106	106	<input type="hidden" id="displaynamescope" value="<?php p($_['displayNameScope']) ?>">
107	107	<?php } ?>
108	108	</form>
		@@ -113,10 +113,10 @@ discard block
		block discarded – undo
113	113	<label for="email"><?php p($l->t('Email')); ?></label>
114	114	<span class="icon-password"/>
115	115	</h2>
116		- <div class="verify <?php if ($_['email'] === '' \|\| $_['emailScope'] !== 'public') p('hidden'); ?>">
	116	+ <div class="verify <?php if ($_['email'] === '' \|\| $_['emailScope'] !== 'public') p('hidden'); ?>">
117	117	<img id="verify-email" title="<?php p($_['emailMessage']); ?>" data-status="<?php p($_['emailVerification']) ?>" src="
118	118	<?php
119		- switch($_['emailVerification']) {
	119	+ switch ($_['emailVerification']) {
120	120	case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS:
121	121	p(image_path('core', 'actions/verifying.svg'));
122	122	break;
		@@ -129,23 +129,23 @@ discard block
		block discarded – undo
129	129	?>">
130	130	</div>
131	131	<input type="email" name="email" id="email" value="<?php p($_['email']); ?>"
132		- <?php if(!$_['displayNameChangeSupported']) { print_unescaped('class="hidden"'); } ?>
	132	+ <?php if (!$_['displayNameChangeSupported']) { print_unescaped('class="hidden"'); } ?>
133	133	placeholder="<?php p($l->t('Your email address')); ?>"
134	134	autocomplete="on" autocapitalize="none" autocorrect="off" />
135		- <?php if(!$_['displayNameChangeSupported']) { ?>
136		- <span><?php if(isset($_['email']) && !empty($_['email'])) { p($_['email']); } else { p($l->t('No email address set')); }?></span>
	135	+ <?php if (!$_['displayNameChangeSupported']) { ?>
	136	+ <span><?php if (isset($_['email']) && !empty($_['email'])) { p($_['email']); } else { p($l->t('No email address set')); }?></span>
137	137	<?php } ?>
138		- <?php if($_['displayNameChangeSupported']) { ?>
	138	+ <?php if ($_['displayNameChangeSupported']) { ?>
139	139	<br />
140	140	<em><?php p($l->t('For password reset and notifications')); ?></em>
141	141	<?php } ?>
142	142	<span class="icon-checkmark hidden"/>
143		- <?php if($_['lookupServerUploadEnabled']) { ?>
	143	+ <?php if ($_['lookupServerUploadEnabled']) { ?>
144	144	<input type="hidden" id="emailscope" value="<?php p($_['emailScope']) ?>">
145	145	<?php } ?>
146	146	</form>
147	147	</div>
148		- <?php if($_['lookupServerUploadEnabled']) { ?>
	148	+ <?php if ($_['lookupServerUploadEnabled']) { ?>
149	149	<div class="personal-settings-setting-box">
150	150	<form id="phoneform" class="section">
151	151	<h2>
		@@ -180,10 +180,10 @@ discard block
		block discarded – undo
180	180	<label for="website"><?php p($l->t('Website')); ?></label>
181	181	<span class="icon-password"/>
182	182	</h2>
183		- <div class="verify <?php if ($_['website'] === '' \|\| $_['websiteScope'] !== 'public') p('hidden'); ?>">
	183	+ <div class="verify <?php if ($_['website'] === '' \|\| $_['websiteScope'] !== 'public') p('hidden'); ?>">
184	184	<img id="verify-website" title="<?php p($_['websiteMessage']); ?>" data-status="<?php p($_['websiteVerification']) ?>" src="
185	185	<?php
186		- switch($_['websiteVerification']) {
	186	+ switch ($_['websiteVerification']) {
187	187	case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS:
188	188	p(image_path('core', 'actions/verifying.svg'));
189	189	break;
		@@ -194,13 +194,13 @@ discard block
		block discarded – undo
194	194	p(image_path('core', 'actions/verify.svg'));
195	195	}
196	196	?>"
197		- <?php if($_['websiteVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS \|\| $_['websiteVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) print_unescaped(' class="verify-action"') ?>
	197	+ <?php if ($_['websiteVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS \|\| $_['websiteVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) print_unescaped(' class="verify-action"') ?>
198	198	>
199	199	<div class="verification-dialog popovermenu bubble menu">
200	200	<div class="verification-dialog-content">
201	201	<p class="explainVerification"></p>
202	202	<p class="verificationCode"></p>
203		- <p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.'));?></p>
	203	+ <p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.')); ?></p>
204	204	</div>
205	205	</div>
206	206	</div>
		@@ -217,10 +217,10 @@ discard block
		block discarded – undo
217	217	<label for="twitter"><?php p($l->t('Twitter')); ?></label>
218	218	<span class="icon-password"/>
219	219	</h2>
220		- <div class="verify <?php if ($_['twitter'] === '' \|\| $_['twitterScope'] !== 'public') p('hidden'); ?>">
	220	+ <div class="verify <?php if ($_['twitter'] === '' \|\| $_['twitterScope'] !== 'public') p('hidden'); ?>">
221	221	<img id="verify-twitter" title="<?php p($_['twitterMessage']); ?>" data-status="<?php p($_['twitterVerification']) ?>" src="
222	222	<?php
223		- switch($_['twitterVerification']) {
	223	+ switch ($_['twitterVerification']) {
224	224	case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS:
225	225	p(image_path('core', 'actions/verifying.svg'));
226	226	break;
		@@ -231,13 +231,13 @@ discard block
		block discarded – undo
231	231	p(image_path('core', 'actions/verify.svg'));
232	232	}
233	233	?>"
234		- <?php if($_['twitterVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS \|\| $_['twitterVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) print_unescaped(' class="verify-action"') ?>
	234	+ <?php if ($_['twitterVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS \|\| $_['twitterVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) print_unescaped(' class="verify-action"') ?>
235	235	>
236	236	<div class="verification-dialog popovermenu bubble menu">
237	237	<div class="verification-dialog-content">
238	238	<p class="explainVerification"></p>
239	239	<p class="verificationCode"></p>
240		- <p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.'));?></p>
	240	+ <p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.')); ?></p>
241	241	</div>
242	242	</div>
243	243	</div>
		@@ -262,19 +262,19 @@ discard block
		block discarded – undo
262	262	</div>
263	263
264	264	<?php
265		-if($_['passwordChangeSupported']) {
	265	+if ($_['passwordChangeSupported']) {
266	266	script('jquery-showpassword');
267	267	?>
268	268	<form id="passwordform" class="section">
269		- <h2 class="inlineblock"><?php p($l->t('Password'));?></h2>
	269	+ <h2 class="inlineblock"><?php p($l->t('Password')); ?></h2>
270	270	<div id="password-error-msg" class="msg success inlineblock" style="display: none;">Saved</div>
271	271	<br>
272	272	<label for="pass1" class="hidden-visually"><?php p($l->t('Current password')); ?>: </label>
273	273	<input type="password" id="pass1" name="oldpassword"
274		- placeholder="<?php p($l->t('Current password'));?>"
	274	+ placeholder="<?php p($l->t('Current password')); ?>"
275	275	autocomplete="off" autocapitalize="none" autocorrect="off" />
276	276	<div class="personal-show-container">
277		- <label for="pass2" class="hidden-visually"><?php p($l->t('New password'));?>: </label>
	277	+ <label for="pass2" class="hidden-visually"><?php p($l->t('New password')); ?>: </label>
278	278	<input type="password" id="pass2" name="newpassword"
279	279	placeholder="<?php p($l->t('New password')); ?>"
280	280	data-typetoggle="#personal-show"
		@@ -291,27 +291,27 @@ discard block
		block discarded – undo
291	291	<?php if (isset($_['activelanguage'])) { ?>
292	292	<form id="language" class="section">
293	293	<h2>
294		- <label for="languageinput"><?php p($l->t('Language'));?></label>
	294	+ <label for="languageinput"><?php p($l->t('Language')); ?></label>
295	295	</h2>
296		- <select id="languageinput" name="lang" data-placeholder="<?php p($l->t('Language'));?>">
297		- <option value="<?php p($_['activelanguage']['code']);?>">
298		- <?php p($_['activelanguage']['name']);?>
	296	+ <select id="languageinput" name="lang" data-placeholder="<?php p($l->t('Language')); ?>">
	297	+ <option value="<?php p($_['activelanguage']['code']); ?>">
	298	+ <?php p($_['activelanguage']['name']); ?>
299	299	</option>
300		- <?php foreach($_['commonlanguages'] as $language):?>
301		- <option value="<?php p($language['code']);?>">
302		- <?php p($language['name']);?>
	300	+ <?php foreach ($_['commonlanguages'] as $language):?>
	301	+ <option value="<?php p($language['code']); ?>">
	302	+ <?php p($language['name']); ?>
303	303	</option>
304		- <?php endforeach;?>
	304	+ <?php endforeach; ?>
305	305	<optgroup label="––––––––––"></optgroup>
306		- <?php foreach($_['languages'] as $language):?>
307		- <option value="<?php p($language['code']);?>">
308		- <?php p($language['name']);?>
	306	+ <?php foreach ($_['languages'] as $language):?>
	307	+ <option value="<?php p($language['code']); ?>">
	308	+ <?php p($language['name']); ?>
309	309	</option>
310		- <?php endforeach;?>
	310	+ <?php endforeach; ?>
311	311	</select>
312	312	<a href="https://www.transifex.com/nextcloud/nextcloud/"
313	313	target="_blank" rel="noreferrer">
314		- <em><?php p($l->t('Help translate'));?></em>
	314	+ <em><?php p($l->t('Help translate')); ?></em>
315	315	</a>
316	316	</form>
317	317	<?php } ?>
		@@ -319,27 +319,27 @@ discard block
		block discarded – undo
319	319	<?php if (isset($_['activelocale'])) { ?>
320	320	<form id="locale" class="section">
321	321	<h2>
322		- <label for="localeinput"><?php p($l->t('Locale'));?></label>
	322	+ <label for="localeinput"><?php p($l->t('Locale')); ?></label>
323	323	</h2>
324		- <select id="localeinput" name="lang" data-placeholder="<?php p($l->t('Locale'));?>">
325		- <option value="<?php p($_['activelocale']['code']);?>">
326		- <?php p($_['activelocale']['name']);?>
	324	+ <select id="localeinput" name="lang" data-placeholder="<?php p($l->t('Locale')); ?>">
	325	+ <option value="<?php p($_['activelocale']['code']); ?>">
	326	+ <?php p($_['activelocale']['name']); ?>
327	327	</option>
328	328	<optgroup label="––––––––––"></optgroup>
329		- <?php foreach($_['localesforlanguage'] as $locale):?>
330		- <option value="<?php p($locale['code']);?>">
331		- <?php p($locale['name']);?>
	329	+ <?php foreach ($_['localesforlanguage'] as $locale):?>
	330	+ <option value="<?php p($locale['code']); ?>">
	331	+ <?php p($locale['name']); ?>
332	332	</option>
333		- <?php endforeach;?>
	333	+ <?php endforeach; ?>
334	334	<optgroup label="––––––––––"></optgroup>
335		- <option value="<?php p($_['activelocale']['code']);?>">
336		- <?php p($_['activelocale']['name']);?>
	335	+ <option value="<?php p($_['activelocale']['code']); ?>">
	336	+ <?php p($_['activelocale']['name']); ?>
337	337	</option>
338		- <?php foreach($_['locales'] as $locale):?>
339		- <option value="<?php p($locale['code']);?>">
340		- <?php p($locale['name']);?>
	338	+ <?php foreach ($_['locales'] as $locale):?>
	339	+ <option value="<?php p($locale['code']); ?>">
	340	+ <?php p($locale['name']); ?>
341	341	</option>
342		- <?php endforeach;?>
	342	+ <?php endforeach; ?>
343	343	</select>
344	344	</form>
345	345	<?php } ?>

nextcloud / server

Pull Request — master (#5623)

Status

Category

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