Completed
Pull Request — master (#5550)
by Andreas
14:46
created
settings/templates/settings/personal/personal.info.php 2 patches
Indentation   +44 added lines, -44 removed lines patch added patch discarded remove 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');
@@ -43,10 +43,10 @@  discard block
 block discarded – undo
43 43
 		<p id="quotatext">
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
-					[$_['usage'], $_['total_space']]));?>
46
+                    [$_['usage'], $_['total_space']]));?>
47 47
 			<?php else: ?>
48 48
 				<?php print_unescaped($l->t('You are using <strong>%s</strong> of <strong>%s</strong> (<strong>%s %%</strong>)',
49
-					[$_['usage'], $_['total_space'],  $_['usage_relative']]));?>
49
+                    [$_['usage'], $_['total_space'],  $_['usage_relative']]));?>
50 50
 			<?php endif ?>
51 51
 		</p>
52 52
 	</div>
@@ -115,17 +115,17 @@  discard block
 block discarded – undo
115 115
 				<div class="verify <?php if ($_['email'] === ''  || $_['emailScope'] !== 'public') p('hidden'); ?>">
116 116
 					<img id="verify-email" title="<?php p($_['emailMessage']); ?>" data-status="<?php p($_['emailVerification']) ?>" src="
117 117
 				<?php
118
-					switch($_['emailVerification']) {
119
-						case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS:
120
-							p(image_path('core', 'actions/verifying.svg'));
121
-							break;
122
-						case \OC\Accounts\AccountManager::VERIFIED:
123
-							p(image_path('core', 'actions/verified.svg'));
124
-							break;
125
-						default:
126
-							p(image_path('core', 'actions/verify.svg'));
127
-					}
128
-					?>">
118
+                    switch($_['emailVerification']) {
119
+                        case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS:
120
+                            p(image_path('core', 'actions/verifying.svg'));
121
+                            break;
122
+                        case \OC\Accounts\AccountManager::VERIFIED:
123
+                            p(image_path('core', 'actions/verified.svg'));
124
+                            break;
125
+                        default:
126
+                            p(image_path('core', 'actions/verify.svg'));
127
+                    }
128
+                    ?>">
129 129
 				</div>
130 130
 				<input type="email" name="email" id="email" value="<?php p($_['email']); ?>"
131 131
 					<?php if(!$_['displayNameChangeSupported']) { print_unescaped('class="hidden"'); } ?>
@@ -191,17 +191,17 @@  discard block
 block discarded – undo
191 191
 				<div class="verify <?php if ($_['website'] === ''  || $_['websiteScope'] !== 'public') p('hidden'); ?>">
192 192
 					<img id="verify-website" title="<?php p($_['websiteMessage']); ?>" data-status="<?php p($_['websiteVerification']) ?>" src="
193 193
 					<?php
194
-					switch($_['websiteVerification']) {
195
-						case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS:
196
-							p(image_path('core', 'actions/verifying.svg'));
197
-							break;
198
-						case \OC\Accounts\AccountManager::VERIFIED:
199
-							p(image_path('core', 'actions/verified.svg'));
200
-							break;
201
-						default:
202
-							p(image_path('core', 'actions/verify.svg'));
203
-					}
204
-					?>"
194
+                    switch($_['websiteVerification']) {
195
+                        case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS:
196
+                            p(image_path('core', 'actions/verifying.svg'));
197
+                            break;
198
+                        case \OC\Accounts\AccountManager::VERIFIED:
199
+                            p(image_path('core', 'actions/verified.svg'));
200
+                            break;
201
+                        default:
202
+                            p(image_path('core', 'actions/verify.svg'));
203
+                    }
204
+                    ?>"
205 205
 					<?php if($_['websiteVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS || $_['websiteVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) print_unescaped(' class="verify-action"') ?>
206 206
 					>
207 207
 					<div class="verification-dialog popovermenu bubble menu">
@@ -236,17 +236,17 @@  discard block
 block discarded – undo
236 236
 				<div class="verify <?php if ($_['twitter'] === ''  || $_['twitterScope'] !== 'public') p('hidden'); ?>">
237 237
 					<img id="verify-twitter" title="<?php p($_['twitterMessage']); ?>" data-status="<?php p($_['twitterVerification']) ?>" src="
238 238
 					<?php
239
-					switch($_['twitterVerification']) {
240
-						case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS:
241
-							p(image_path('core', 'actions/verifying.svg'));
242
-							break;
243
-						case \OC\Accounts\AccountManager::VERIFIED:
244
-							p(image_path('core', 'actions/verified.svg'));
245
-							break;
246
-						default:
247
-							p(image_path('core', 'actions/verify.svg'));
248
-					}
249
-					?>"
239
+                    switch($_['twitterVerification']) {
240
+                        case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS:
241
+                            p(image_path('core', 'actions/verifying.svg'));
242
+                            break;
243
+                        case \OC\Accounts\AccountManager::VERIFIED:
244
+                            p(image_path('core', 'actions/verified.svg'));
245
+                            break;
246
+                        default:
247
+                            p(image_path('core', 'actions/verify.svg'));
248
+                    }
249
+                    ?>"
250 250
 					<?php if($_['twitterVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS || $_['twitterVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) print_unescaped(' class="verify-action"') ?>
251 251
 					>
252 252
 					<div class="verification-dialog popovermenu bubble menu">
@@ -318,9 +318,9 @@  discard block
 block discarded – undo
318 318
 		</div>
319 319
 		<div class="personal-settings-setting-box personal-settings-password-box">
320 320
 			<?php
321
-			if($_['passwordChangeSupported']) {
322
-				script('jquery-showpassword');
323
-			?>
321
+            if($_['passwordChangeSupported']) {
322
+                script('jquery-showpassword');
323
+            ?>
324 324
 			<form id="passwordform" class="section">
325 325
 				<h2 class="inlineblock"><?php p($l->t('Password'));?></h2>
326 326
 				<div id="password-error-msg" class="msg success inlineblock" style="display: none;">Saved</div>
@@ -343,8 +343,8 @@  discard block
 block discarded – undo
343 343
 				<br/>
344 344
 			</form>
345 345
 			<?php
346
-			}
347
-			?>
346
+            }
347
+            ?>
348 348
 		</div>
349 349
 		<span class="msg"></span>
350 350
 	</div>
Please login to merge, or discard this patch.
Braces   +48 added lines, -15 removed lines patch added patch discarded remove 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>
@@ -68,8 +71,11 @@  discard block
 block discarded – undo
68 71
 					<div class="hidden button icon-delete svg" id="removeavatar" title="<?php p($l->t('Remove image')); ?>"></div>
69 72
 					<input type="file" name="files[]" id="uploadavatar" class="hiddenuploadfield">
70 73
 					<p><em><?php p($l->t('png or jpg, max. 20 MB')); ?></em></p>
71
-				<?php else: ?>
72
-					<?php p($l->t('Picture provided by original account')); ?>
74
+				<?php else {
75
+    : ?>
76
+					<?php p($l->t('Picture provided by original account'));
77
+}
78
+?>
73 79
 				<?php endif; ?>
74 80
 			</div>
75 81
 
@@ -112,7 +118,10 @@  discard block
 block discarded – undo
112 118
 					<label for="email"><?php p($l->t('Email')); ?></label>
113 119
 					<span class="icon-federation-menu icon-password">&#9662;<span/>
114 120
 				</h2>
115
-				<div class="verify <?php if ($_['email'] === ''  || $_['emailScope'] !== 'public') p('hidden'); ?>">
121
+				<div class="verify <?php if ($_['email'] === ''  || $_['emailScope'] !== 'public') {
122
+    p('hidden');
123
+}
124
+?>">
116 125
 					<img id="verify-email" title="<?php p($_['emailMessage']); ?>" data-status="<?php p($_['emailVerification']) ?>" src="
117 126
 				<?php
118 127
 					switch($_['emailVerification']) {
@@ -151,7 +160,10 @@  discard block
 block discarded – undo
151 160
 					<label for="phone"><?php p($l->t('Phone number')); ?></label>
152 161
 					<span class="icon-federation-menu icon-password">&#9662;<span/>
153 162
 				</h2>
154
-				<input type="tel" id="phone" name="phone" <?php if(!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"'); ?>
163
+				<input type="tel" id="phone" name="phone" <?php if(!$_['lookupServerUploadEnabled']) {
164
+    print_unescaped('disabled="1"');
165
+}
166
+?>
155 167
 					   value="<?php p($_['phone']) ?>"
156 168
 					   placeholder="<?php p($l->t('Your phone number')); ?>"
157 169
 				       autocomplete="on" autocapitalize="none" autocorrect="off" />
@@ -169,7 +181,10 @@  discard block
 block discarded – undo
169 181
 					<label for="address"><?php p($l->t('Address')); ?></label>
170 182
 					<span class="icon-federation-menu icon-password">&#9662;<span/>
171 183
 				</h2>
172
-				<input type="text" id="address" name="address" <?php if(!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"');  ?>
184
+				<input type="text" id="address" name="address" <?php if(!$_['lookupServerUploadEnabled']) {
185
+    print_unescaped('disabled="1"');
186
+}
187
+?>
173 188
 					   placeholder="<?php p($l->t('Your postal address')); ?>"
174 189
 					   value="<?php p($_['address']) ?>"
175 190
 					   autocomplete="on" autocapitalize="none" autocorrect="off" />
@@ -188,7 +203,10 @@  discard block
 block discarded – undo
188 203
 					<span class="icon-federation-menu icon-password">&#9662;<span/>
189 204
 				</h2>
190 205
 				<?php if($_['lookupServerUploadEnabled']) { ?>
191
-				<div class="verify <?php if ($_['website'] === ''  || $_['websiteScope'] !== 'public') p('hidden'); ?>">
206
+				<div class="verify <?php if ($_['website'] === ''  || $_['websiteScope'] !== 'public') {
207
+    p('hidden');
208
+}
209
+?>">
192 210
 					<img id="verify-website" title="<?php p($_['websiteMessage']); ?>" data-status="<?php p($_['websiteVerification']) ?>" src="
193 211
 					<?php
194 212
 					switch($_['websiteVerification']) {
@@ -202,13 +220,16 @@  discard block
 block discarded – undo
202 220
 							p(image_path('core', 'actions/verify.svg'));
203 221
 					}
204 222
 					?>"
205
-					<?php if($_['websiteVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS || $_['websiteVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) print_unescaped(' class="verify-action"') ?>
223
+					<?php if($_['websiteVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS || $_['websiteVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) {
224
+    print_unescaped(' class="verify-action"') ?>
206 225
 					>
207 226
 					<div class="verification-dialog popovermenu bubble menu">
208 227
 						<div class="verification-dialog-content">
209 228
 							<p class="explainVerification"></p>
210 229
 							<p class="verificationCode"></p>
211
-							<p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.'));?></p>
230
+							<p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.'));
231
+}
232
+?></p>
212 233
 						</div>
213 234
 					</div>
214 235
 				</div>
@@ -216,7 +237,10 @@  discard block
 block discarded – undo
216 237
 				<input type="text" name="website" id="website" value="<?php p($_['website']); ?>"
217 238
 				       placeholder="<?php p($l->t('Link https://…')); ?>"
218 239
 				       autocomplete="on" autocapitalize="none" autocorrect="off"
219
-					   <?php if(!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"');  ?>
240
+					   <?php if(!$_['lookupServerUploadEnabled']) {
241
+    print_unescaped('disabled="1"');
242
+}
243
+?>
220 244
 				/>
221 245
 				<span class="icon-checkmark hidden"/>
222 246
 				<?php if($_['lookupServerUploadEnabled']) { ?>
@@ -233,7 +257,10 @@  discard block
 block discarded – undo
233 257
 					<span class="icon-federation-menu icon-password">&#9662;<span/>
234 258
 				</h2>
235 259
 				<?php if($_['lookupServerUploadEnabled']) { ?>
236
-				<div class="verify <?php if ($_['twitter'] === ''  || $_['twitterScope'] !== 'public') p('hidden'); ?>">
260
+				<div class="verify <?php if ($_['twitter'] === ''  || $_['twitterScope'] !== 'public') {
261
+    p('hidden');
262
+}
263
+?>">
237 264
 					<img id="verify-twitter" title="<?php p($_['twitterMessage']); ?>" data-status="<?php p($_['twitterVerification']) ?>" src="
238 265
 					<?php
239 266
 					switch($_['twitterVerification']) {
@@ -247,13 +274,16 @@  discard block
 block discarded – undo
247 274
 							p(image_path('core', 'actions/verify.svg'));
248 275
 					}
249 276
 					?>"
250
-					<?php if($_['twitterVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS || $_['twitterVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) print_unescaped(' class="verify-action"') ?>
277
+					<?php if($_['twitterVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS || $_['twitterVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) {
278
+    print_unescaped(' class="verify-action"') ?>
251 279
 					>
252 280
 					<div class="verification-dialog popovermenu bubble menu">
253 281
 						<div class="verification-dialog-content">
254 282
 							<p class="explainVerification"></p>
255 283
 							<p class="verificationCode"></p>
256
-							<p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.'));?></p>
284
+							<p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.'));
285
+}
286
+?></p>
257 287
 						</div>
258 288
 					</div>
259 289
 				</div>
@@ -261,7 +291,10 @@  discard block
 block discarded – undo
261 291
 				<input type="text" name="twitter" id="twitter" value="<?php p($_['twitter']); ?>"
262 292
 					   placeholder="<?php p($l->t('Twitter handle @…')); ?>"
263 293
 					   autocomplete="on" autocapitalize="none" autocorrect="off"
264
-					   <?php if(!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"');  ?>
294
+					   <?php if(!$_['lookupServerUploadEnabled']) {
295
+    print_unescaped('disabled="1"');
296
+}
297
+?>
265 298
 				/>
266 299
 				<span class="icon-checkmark hidden"/>
267 300
 				<?php if($_['lookupServerUploadEnabled']) { ?>
Please login to merge, or discard this patch.