Completed
Pull Request — master (#3869)
by Björn
24:13
created
lib/private/Accounts/AccountManager.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -141,19 +141,19 @@
 block discarded – undo
141 141
 		$websiteVerified = isset($oldData[self::PROPERTY_WEBSITE]['verified']) && $oldData[self::PROPERTY_WEBSITE]['verified'] === self::VERIFIED;
142 142
 		$emailVerified = isset($oldData[self::PROPERTY_EMAIL]['verified']) && $oldData[self::PROPERTY_EMAIL]['verified'] === self::VERIFIED;
143 143
 
144
-		if($twitterVerified &&
144
+		if ($twitterVerified &&
145 145
 			$oldData[self::PROPERTY_TWITTER]['value'] !== $newData[self::PROPERTY_TWITTER]['value']
146 146
 		) {
147 147
 			$newData[self::PROPERTY_TWITTER]['value']['verified'] = self::NOT_VERIFIED;
148 148
 		}
149 149
 
150
-		if($websiteVerified &&
150
+		if ($websiteVerified &&
151 151
 			$oldData[self::PROPERTY_WEBSITE]['value'] !== $newData[self::PROPERTY_WEBSITE]['value']
152 152
 		) {
153 153
 			$newData[self::PROPERTY_WEBSITE]['value']['verified'] = self::NOT_VERIFIED;
154 154
 		}
155 155
 
156
-		if($emailVerified &&
156
+		if ($emailVerified &&
157 157
 			$oldData[self::PROPERTY_EMAIL]['value'] !== $newData[self::PROPERTY_EMAIL]['value']
158 158
 		) {
159 159
 			$newData[self::PROPERTY_EMAIL]['value']['verified'] = self::NOT_VERIFIED;
Please login to merge, or discard this patch.
settings/Controller/UsersController.php 1 patch
Spacing   +45 added lines, -45 removed lines patch added patch discarded remove patch
@@ -150,7 +150,7 @@  discard block
 block discarded – undo
150 150
 
151 151
 		// check for encryption state - TODO see formatUserForIndex
152 152
 		$this->isEncryptionAppEnabled = $appManager->isEnabledForUser('encryption');
153
-		if($this->isEncryptionAppEnabled) {
153
+		if ($this->isEncryptionAppEnabled) {
154 154
 			// putting this directly in empty is possible in PHP 5.5+
155 155
 			$result = $config->getAppValue('encryption', 'recoveryAdminEnabled', 0);
156 156
 			$this->isRestoreEnabled = !empty($result);
@@ -190,7 +190,7 @@  discard block
 block discarded – undo
190 190
 		}
191 191
 
192 192
 		$subAdminGroups = $this->groupManager->getSubAdmin()->getSubAdminsGroups($user);
193
-		foreach($subAdminGroups as $key => $subAdminGroup) {
193
+		foreach ($subAdminGroups as $key => $subAdminGroup) {
194 194
 			$subAdminGroups[$key] = $subAdminGroup->getGID();
195 195
 		}
196 196
 
@@ -247,16 +247,16 @@  discard block
 block discarded – undo
247 247
 	 */
248 248
 	public function index($offset = 0, $limit = 10, $gid = '', $pattern = '', $backend = '') {
249 249
 		// FIXME: The JS sends the group '_everyone' instead of no GID for the "all users" group.
250
-		if($gid === '_everyone') {
250
+		if ($gid === '_everyone') {
251 251
 			$gid = '';
252 252
 		}
253 253
 
254 254
 		// Remove backends
255
-		if(!empty($backend)) {
255
+		if (!empty($backend)) {
256 256
 			$activeBackends = $this->userManager->getBackends();
257 257
 			$this->userManager->clearBackends();
258
-			foreach($activeBackends as $singleActiveBackend) {
259
-				if($backend === get_class($singleActiveBackend)) {
258
+			foreach ($activeBackends as $singleActiveBackend) {
259
+				if ($backend === get_class($singleActiveBackend)) {
260 260
 					$this->userManager->registerBackend($singleActiveBackend);
261 261
 					break;
262 262
 				}
@@ -266,7 +266,7 @@  discard block
 block discarded – undo
266 266
 		$users = [];
267 267
 		if ($this->isAdmin) {
268 268
 
269
-			if($gid !== '') {
269
+			if ($gid !== '') {
270 270
 				$batch = $this->getUsersForUID($this->groupManager->displayNamesInGroup($gid, $pattern, $limit, $offset));
271 271
 			} else {
272 272
 				$batch = $this->userManager->search($pattern, $limit, $offset);
@@ -286,17 +286,17 @@  discard block
 block discarded – undo
286 286
 			$subAdminOfGroups = $gids;
287 287
 
288 288
 			// Set the $gid parameter to an empty value if the subadmin has no rights to access a specific group
289
-			if($gid !== '' && !in_array($gid, $subAdminOfGroups)) {
289
+			if ($gid !== '' && !in_array($gid, $subAdminOfGroups)) {
290 290
 				$gid = '';
291 291
 			}
292 292
 
293 293
 			// Batch all groups the user is subadmin of when a group is specified
294 294
 			$batch = [];
295
-			if($gid === '') {
296
-				foreach($subAdminOfGroups as $group) {
295
+			if ($gid === '') {
296
+				foreach ($subAdminOfGroups as $group) {
297 297
 					$groupUsers = $this->groupManager->displayNamesInGroup($group, $pattern, $limit, $offset);
298 298
 
299
-					foreach($groupUsers as $uid => $displayName) {
299
+					foreach ($groupUsers as $uid => $displayName) {
300 300
 						$batch[$uid] = $displayName;
301 301
 					}
302 302
 				}
@@ -328,11 +328,11 @@  discard block
 block discarded – undo
328 328
 	 * @param string $email
329 329
 	 * @return DataResponse
330 330
 	 */
331
-	public function create($username, $password, array $groups=array(), $email='') {
332
-		if($email !== '' && !$this->mailer->validateMailAddress($email)) {
331
+	public function create($username, $password, array $groups = array(), $email = '') {
332
+		if ($email !== '' && !$this->mailer->validateMailAddress($email)) {
333 333
 			return new DataResponse(
334 334
 				array(
335
-					'message' => (string)$this->l10n->t('Invalid mail address')
335
+					'message' => (string) $this->l10n->t('Invalid mail address')
336 336
 				),
337 337
 				Http::STATUS_UNPROCESSABLE_ENTITY
338 338
 			);
@@ -344,7 +344,7 @@  discard block
 block discarded – undo
344 344
 			if (!empty($groups)) {
345 345
 				foreach ($groups as $key => $group) {
346 346
 					$groupObject = $this->groupManager->get($group);
347
-					if($groupObject === null) {
347
+					if ($groupObject === null) {
348 348
 						unset($groups[$key]);
349 349
 						continue;
350 350
 					}
@@ -368,7 +368,7 @@  discard block
 block discarded – undo
368 368
 		if ($this->userManager->userExists($username)) {
369 369
 			return new DataResponse(
370 370
 				array(
371
-					'message' => (string)$this->l10n->t('A user with that name already exists.')
371
+					'message' => (string) $this->l10n->t('A user with that name already exists.')
372 372
 				),
373 373
 				Http::STATUS_CONFLICT
374 374
 			);
@@ -379,7 +379,7 @@  discard block
 block discarded – undo
379 379
 			if ($email === '') {
380 380
 				return new DataResponse(
381 381
 					array(
382
-						'message' => (string)$this->l10n->t('To send a password link to the user an email address is required.')
382
+						'message' => (string) $this->l10n->t('To send a password link to the user an email address is required.')
383 383
 					),
384 384
 					Http::STATUS_UNPROCESSABLE_ENTITY
385 385
 				);
@@ -404,12 +404,12 @@  discard block
 block discarded – undo
404 404
 			);
405 405
 		}
406 406
 
407
-		if($user instanceof IUser) {
408
-			if($groups !== null) {
409
-				foreach($groups as $groupName) {
407
+		if ($user instanceof IUser) {
408
+			if ($groups !== null) {
409
+				foreach ($groups as $groupName) {
410 410
 					$group = $this->groupManager->get($groupName);
411 411
 
412
-					if(empty($group)) {
412
+					if (empty($group)) {
413 413
 						$group = $this->groupManager->createGroup($groupName);
414 414
 					}
415 415
 					$group->addUser($user);
@@ -418,13 +418,13 @@  discard block
 block discarded – undo
418 418
 			/**
419 419
 			 * Send new user mail only if a mail is set
420 420
 			 */
421
-			if($email !== '') {
421
+			if ($email !== '') {
422 422
 				$user->setEMailAddress($email);
423 423
 				try {
424 424
 					$emailTemplate = $this->newUserMailHelper->generateTemplate($user, $generatePasswordResetToken);
425 425
 					$this->newUserMailHelper->sendMail($user, $emailTemplate);
426
-				} catch(\Exception $e) {
427
-					$this->log->error("Can't send new user mail to $email: " . $e->getMessage(), array('app' => 'settings'));
426
+				} catch (\Exception $e) {
427
+					$this->log->error("Can't send new user mail to $email: ".$e->getMessage(), array('app' => 'settings'));
428 428
 				}
429 429
 			}
430 430
 			// fetch users groups
@@ -438,7 +438,7 @@  discard block
 block discarded – undo
438 438
 
439 439
 		return new DataResponse(
440 440
 			array(
441
-				'message' => (string)$this->l10n->t('Unable to create user.')
441
+				'message' => (string) $this->l10n->t('Unable to create user.')
442 442
 			),
443 443
 			Http::STATUS_FORBIDDEN
444 444
 		);
@@ -456,32 +456,32 @@  discard block
 block discarded – undo
456 456
 		$userId = $this->userSession->getUser()->getUID();
457 457
 		$user = $this->userManager->get($id);
458 458
 
459
-		if($userId === $id) {
459
+		if ($userId === $id) {
460 460
 			return new DataResponse(
461 461
 				array(
462 462
 					'status' => 'error',
463 463
 					'data' => array(
464
-						'message' => (string)$this->l10n->t('Unable to delete user.')
464
+						'message' => (string) $this->l10n->t('Unable to delete user.')
465 465
 					)
466 466
 				),
467 467
 				Http::STATUS_FORBIDDEN
468 468
 			);
469 469
 		}
470 470
 
471
-		if(!$this->isAdmin && !$this->groupManager->getSubAdmin()->isUserAccessible($this->userSession->getUser(), $user)) {
471
+		if (!$this->isAdmin && !$this->groupManager->getSubAdmin()->isUserAccessible($this->userSession->getUser(), $user)) {
472 472
 			return new DataResponse(
473 473
 				array(
474 474
 					'status' => 'error',
475 475
 					'data' => array(
476
-						'message' => (string)$this->l10n->t('Authentication error')
476
+						'message' => (string) $this->l10n->t('Authentication error')
477 477
 					)
478 478
 				),
479 479
 				Http::STATUS_FORBIDDEN
480 480
 			);
481 481
 		}
482 482
 
483
-		if($user) {
484
-			if($user->delete()) {
483
+		if ($user) {
484
+			if ($user->delete()) {
485 485
 				return new DataResponse(
486 486
 					array(
487 487
 						'status' => 'success',
@@ -498,7 +498,7 @@  discard block
 block discarded – undo
498 498
 			array(
499 499
 				'status' => 'error',
500 500
 				'data' => array(
501
-					'message' => (string)$this->l10n->t('Unable to delete user.')
501
+					'message' => (string) $this->l10n->t('Unable to delete user.')
502 502
 				)
503 503
 			),
504 504
 			Http::STATUS_FORBIDDEN
@@ -523,13 +523,13 @@  discard block
 block discarded – undo
523 523
 
524 524
 		$accountData = $this->accountManager->getUser($user);
525 525
 		$cloudId = $user->getCloudId();
526
-		$message = "Use my Federated Cloud ID to share with me: " . $cloudId;
526
+		$message = "Use my Federated Cloud ID to share with me: ".$cloudId;
527 527
 		$privateKey = $this->keyManager->getKey($user)->getPrivate();
528 528
 		openssl_sign(json_encode($message), $signature, $privateKey, OPENSSL_ALGO_SHA512);
529 529
 		$signatureBase64 = base64_encode($signature);
530 530
 
531
-		$code = $message . ' ' . $signatureBase64;
532
-		$codeMd5 = $message . ' ' . md5($signatureBase64);
531
+		$code = $message.' '.$signatureBase64;
532
+		$codeMd5 = $message.' '.md5($signatureBase64);
533 533
 
534 534
 		switch ($account) {
535 535
 			case 'verify-twitter':
@@ -585,12 +585,12 @@  discard block
 block discarded – undo
585 585
 									$twitterScope
586 586
 	) {
587 587
 
588
-		if(!empty($email) && !$this->mailer->validateMailAddress($email)) {
588
+		if (!empty($email) && !$this->mailer->validateMailAddress($email)) {
589 589
 			return new DataResponse(
590 590
 				array(
591 591
 					'status' => 'error',
592 592
 					'data' => array(
593
-						'message' => (string)$this->l10n->t('Invalid mail address')
593
+						'message' => (string) $this->l10n->t('Invalid mail address')
594 594
 					)
595 595
 				),
596 596
 				Http::STATUS_UNPROCESSABLE_ENTITY
@@ -625,7 +625,7 @@  discard block
 block discarded – undo
625 625
 						'websiteScope' => $websiteScope,
626 626
 						'address' => $address,
627 627
 						'addressScope' => $addressScope,
628
-						'message' => (string)$this->l10n->t('Settings saved')
628
+						'message' => (string) $this->l10n->t('Settings saved')
629 629
 					)
630 630
 				),
631 631
 				Http::STATUS_OK
@@ -702,7 +702,7 @@  discard block
 block discarded – undo
702 702
 
703 703
 			$uniqueUsers = [];
704 704
 			foreach ($groups as $group) {
705
-				foreach($group->getUsers() as $uid => $displayName) {
705
+				foreach ($group->getUsers() as $uid => $displayName) {
706 706
 					$uniqueUsers[$uid] = true;
707 707
 				}
708 708
 			}
@@ -796,19 +796,19 @@  discard block
 block discarded – undo
796 796
 				array(
797 797
 					'status' => 'error',
798 798
 					'data' => array(
799
-						'message' => (string)$this->l10n->t('Forbidden')
799
+						'message' => (string) $this->l10n->t('Forbidden')
800 800
 					)
801 801
 				),
802 802
 				Http::STATUS_FORBIDDEN
803 803
 			);
804 804
 		}
805 805
 
806
-		if($mailAddress !== '' && !$this->mailer->validateMailAddress($mailAddress)) {
806
+		if ($mailAddress !== '' && !$this->mailer->validateMailAddress($mailAddress)) {
807 807
 			return new DataResponse(
808 808
 				array(
809 809
 					'status' => 'error',
810 810
 					'data' => array(
811
-						'message' => (string)$this->l10n->t('Invalid mail address')
811
+						'message' => (string) $this->l10n->t('Invalid mail address')
812 812
 					)
813 813
 				),
814 814
 				Http::STATUS_UNPROCESSABLE_ENTITY
@@ -820,7 +820,7 @@  discard block
 block discarded – undo
820 820
 				array(
821 821
 					'status' => 'error',
822 822
 					'data' => array(
823
-						'message' => (string)$this->l10n->t('Invalid user')
823
+						'message' => (string) $this->l10n->t('Invalid user')
824 824
 					)
825 825
 				),
826 826
 				Http::STATUS_UNPROCESSABLE_ENTITY
@@ -833,7 +833,7 @@  discard block
 block discarded – undo
833 833
 				array(
834 834
 					'status' => 'error',
835 835
 					'data' => array(
836
-						'message' => (string)$this->l10n->t('Unable to change mail address')
836
+						'message' => (string) $this->l10n->t('Unable to change mail address')
837 837
 					)
838 838
 				),
839 839
 				Http::STATUS_FORBIDDEN
@@ -851,7 +851,7 @@  discard block
 block discarded – undo
851 851
 					'data' => array(
852 852
 						'username' => $id,
853 853
 						'mailAddress' => $mailAddress,
854
-						'message' => (string)$this->l10n->t('Email saved')
854
+						'message' => (string) $this->l10n->t('Email saved')
855 855
 					)
856 856
 				),
857 857
 				Http::STATUS_OK
Please login to merge, or discard this patch.
settings/templates/personal.php 1 patch
Spacing   +52 added lines, -52 removed lines patch added patch discarded remove patch
@@ -22,10 +22,10 @@  discard block
 block discarded – undo
22 22
 
23 23
 <div id="app-navigation">
24 24
 	<ul class="with-icon">
25
-	<?php foreach($_['forms'] as $form) {
25
+	<?php foreach ($_['forms'] as $form) {
26 26
 		if (isset($form['anchor'])) {
27
-			$anchor = '#' . $form['anchor'];
28
-			$class = 'nav-icon-' . $form['anchor'];
27
+			$anchor = '#'.$form['anchor'];
28
+			$class = 'nav-icon-'.$form['anchor'];
29 29
 			$sectionName = $form['section-name'];
30 30
 			print_unescaped(sprintf("<li><a href='%s' class='%s'>%s</a></li>", \OCP\Util::sanitizeHTML($anchor),
31 31
 			\OCP\Util::sanitizeHTML($class), \OCP\Util::sanitizeHTML($sectionName)));
@@ -37,15 +37,15 @@  discard block
 block discarded – undo
37 37
 <div id="app-content">
38 38
 
39 39
 <div id="quota" class="section">
40
-	<div style="width:<?php p($_['usage_relative']);?>%"
41
-		<?php if($_['usage_relative'] > 80): ?> class="quota-warning" <?php endif; ?>>
40
+	<div style="width:<?php p($_['usage_relative']); ?>%"
41
+		<?php if ($_['usage_relative'] > 80): ?> class="quota-warning" <?php endif; ?>>
42 42
 		<p id="quotatext">
43 43
 			<?php if ($_['quota'] === \OCP\Files\FileInfo::SPACE_UNLIMITED): ?>
44 44
 				<?php print_unescaped($l->t('You are using <strong>%s</strong> of <strong>%s</strong>',
45
-					[$_['usage'], $_['total_space']]));?>
45
+					[$_['usage'], $_['total_space']])); ?>
46 46
 			<?php else: ?>
47 47
 				<?php print_unescaped($l->t('You are using <strong>%s</strong> of <strong>%s</strong> (<strong>%s %%</strong>)',
48
-					[$_['usage'], $_['total_space'],  $_['usage_relative']]));?>
48
+					[$_['usage'], $_['total_space'], $_['usage_relative']])); ?>
49 49
 			<?php endif ?>
50 50
 		</p>
51 51
 	</div>
@@ -79,7 +79,7 @@  discard block
 block discarded – undo
79 79
 			</div>
80 80
 		</div>
81 81
 		<span class="icon-checkmark hidden"/>
82
-		<?php if($_['lookupServerUploadEnabled']) { ?>
82
+		<?php if ($_['lookupServerUploadEnabled']) { ?>
83 83
 		<input type="hidden" id="avatarscope" value="<?php p($_['avatarScope']) ?>">
84 84
 		<?php } ?>
85 85
 	</form>
@@ -93,14 +93,14 @@  discard block
 block discarded – undo
93 93
 				<span class="icon-password"/>
94 94
 			</h2>
95 95
 			<input type="text" id="displayname" name="displayname"
96
-				<?php if(!$_['displayNameChangeSupported']) { print_unescaped('class="hidden"'); } ?>
96
+				<?php if (!$_['displayNameChangeSupported']) { print_unescaped('class="hidden"'); } ?>
97 97
 				value="<?php p($_['displayName']) ?>"
98 98
 				autocomplete="on" autocapitalize="none" autocorrect="off" />
99
-			<?php if(!$_['displayNameChangeSupported']) { ?>
100
-				<span><?php if(isset($_['displayName']) && !empty($_['displayName'])) { p($_['displayName']); } else { p($l->t('No display name set')); } ?></span>
99
+			<?php if (!$_['displayNameChangeSupported']) { ?>
100
+				<span><?php if (isset($_['displayName']) && !empty($_['displayName'])) { p($_['displayName']); } else { p($l->t('No display name set')); } ?></span>
101 101
 			<?php } ?>
102 102
 			<span class="icon-checkmark hidden"/>
103
-			<?php if($_['lookupServerUploadEnabled']) { ?>
103
+			<?php if ($_['lookupServerUploadEnabled']) { ?>
104 104
 			<input type="hidden" id="displaynamescope" value="<?php p($_['displayNameScope']) ?>">
105 105
 			<?php } ?>
106 106
 		</form>
@@ -113,23 +113,23 @@  discard block
 block discarded – undo
113 113
 			</h2>
114 114
 			<span class="verify" id="verify-email">Verify</span>
115 115
 			<input type="email" name="email" id="email" value="<?php p($_['email']); ?>"
116
-				<?php if(!$_['displayNameChangeSupported']) { print_unescaped('class="hidden"'); } ?>
116
+				<?php if (!$_['displayNameChangeSupported']) { print_unescaped('class="hidden"'); } ?>
117 117
 				placeholder="<?php p($l->t('Your email address')); ?>"
118 118
 				autocomplete="on" autocapitalize="none" autocorrect="off" />
119
-			<?php if(!$_['displayNameChangeSupported']) { ?>
120
-				<span><?php if(isset($_['email']) && !empty($_['email'])) { p($_['email']); } else { p($l->t('No email address set')); }?></span>
119
+			<?php if (!$_['displayNameChangeSupported']) { ?>
120
+				<span><?php if (isset($_['email']) && !empty($_['email'])) { p($_['email']); } else { p($l->t('No email address set')); }?></span>
121 121
 			<?php } ?>
122
-			<?php if($_['displayNameChangeSupported']) { ?>
122
+			<?php if ($_['displayNameChangeSupported']) { ?>
123 123
 				<br />
124 124
 				<em><?php p($l->t('For password reset and notifications')); ?></em>
125 125
 			<?php } ?>
126 126
 			<span class="icon-checkmark hidden"/>
127
-			<?php if($_['lookupServerUploadEnabled']) { ?>
127
+			<?php if ($_['lookupServerUploadEnabled']) { ?>
128 128
 			<input type="hidden" id="emailscope" value="<?php p($_['emailScope']) ?>">
129 129
 			<?php } ?>
130 130
 		</form>
131 131
 	</div>
132
-	<?php if($_['lookupServerUploadEnabled']) { ?>
132
+	<?php if ($_['lookupServerUploadEnabled']) { ?>
133 133
 	<div class="personal-settings-setting-box">
134 134
 		<form id="phoneform" class="section">
135 135
 			<h2>
@@ -200,19 +200,19 @@  discard block
 block discarded – undo
200 200
 </div>
201 201
 
202 202
 <?php
203
-if($_['passwordChangeSupported']) {
203
+if ($_['passwordChangeSupported']) {
204 204
 	script('jquery-showpassword');
205 205
 ?>
206 206
 <form id="passwordform" class="section">
207
-	<h2 class="inlineblock"><?php p($l->t('Password'));?></h2>
207
+	<h2 class="inlineblock"><?php p($l->t('Password')); ?></h2>
208 208
 	<div id="password-error-msg" class="msg success inlineblock" style="display: none;">Saved</div>
209 209
 	<br>
210 210
 	<label for="pass1" class="hidden-visually"><?php p($l->t('Current password')); ?>: </label>
211 211
 	<input type="password" id="pass1" name="oldpassword"
212
-		placeholder="<?php p($l->t('Current password'));?>"
212
+		placeholder="<?php p($l->t('Current password')); ?>"
213 213
 		autocomplete="off" autocapitalize="none" autocorrect="off" />
214 214
 	<div class="personal-show-container">
215
-		<label for="pass2" class="hidden-visually"><?php p($l->t('New password'));?>: </label>
215
+		<label for="pass2" class="hidden-visually"><?php p($l->t('New password')); ?>: </label>
216 216
 		<input type="password" id="pass2" name="newpassword"
217 217
 			placeholder="<?php p($l->t('New password')); ?>"
218 218
 			data-typetoggle="#personal-show"
@@ -228,44 +228,44 @@  discard block
 block discarded – undo
228 228
 
229 229
 <form id="language" class="section">
230 230
 	<h2>
231
-		<label for="languageinput"><?php p($l->t('Language'));?></label>
231
+		<label for="languageinput"><?php p($l->t('Language')); ?></label>
232 232
 	</h2>
233
-	<select id="languageinput" name="lang" data-placeholder="<?php p($l->t('Language'));?>">
234
-		<option value="<?php p($_['activelanguage']['code']);?>">
235
-			<?php p($_['activelanguage']['name']);?>
233
+	<select id="languageinput" name="lang" data-placeholder="<?php p($l->t('Language')); ?>">
234
+		<option value="<?php p($_['activelanguage']['code']); ?>">
235
+			<?php p($_['activelanguage']['name']); ?>
236 236
 		</option>
237
-		<?php foreach($_['commonlanguages'] as $language):?>
238
-			<option value="<?php p($language['code']);?>">
239
-				<?php p($language['name']);?>
237
+		<?php foreach ($_['commonlanguages'] as $language):?>
238
+			<option value="<?php p($language['code']); ?>">
239
+				<?php p($language['name']); ?>
240 240
 			</option>
241
-		<?php endforeach;?>
241
+		<?php endforeach; ?>
242 242
 		<optgroup label="––––––––––"></optgroup>
243
-		<?php foreach($_['languages'] as $language):?>
244
-			<option value="<?php p($language['code']);?>">
245
-				<?php p($language['name']);?>
243
+		<?php foreach ($_['languages'] as $language):?>
244
+			<option value="<?php p($language['code']); ?>">
245
+				<?php p($language['name']); ?>
246 246
 			</option>
247
-		<?php endforeach;?>
247
+		<?php endforeach; ?>
248 248
 	</select>
249 249
 	<a href="https://www.transifex.com/nextcloud/nextcloud/"
250 250
 		target="_blank" rel="noreferrer">
251
-		<em><?php p($l->t('Help translate'));?></em>
251
+		<em><?php p($l->t('Help translate')); ?></em>
252 252
 	</a>
253 253
 </form>
254 254
 
255 255
 
256 256
 <div id="clientsbox" class="section clientsbox">
257
-	<h2><?php p($l->t('Get the apps to sync your files'));?></h2>
257
+	<h2><?php p($l->t('Get the apps to sync your files')); ?></h2>
258 258
 	<a href="<?php p($_['clients']['desktop']); ?>" rel="noreferrer" target="_blank">
259 259
 		<img src="<?php print_unescaped(image_path('core', 'desktopapp.svg')); ?>"
260
-			 alt="<?php p($l->t('Desktop client'));?>" />
260
+			 alt="<?php p($l->t('Desktop client')); ?>" />
261 261
 	</a>
262 262
 	<a href="<?php p($_['clients']['android']); ?>" rel="noreferrer" target="_blank">
263 263
 		<img src="<?php print_unescaped(image_path('core', 'googleplay.png')); ?>"
264
-			 alt="<?php p($l->t('Android app'));?>" />
264
+			 alt="<?php p($l->t('Android app')); ?>" />
265 265
 	</a>
266 266
 	<a href="<?php p($_['clients']['ios']); ?>" rel="noreferrer" target="_blank">
267 267
 		<img src="<?php print_unescaped(image_path('core', 'appstore.svg')); ?>"
268
-			 alt="<?php p($l->t('iOS app'));?>" />
268
+			 alt="<?php p($l->t('iOS app')); ?>" />
269 269
 	</a>
270 270
 
271 271
 		<p>
@@ -281,19 +281,19 @@  discard block
 block discarded – undo
281 281
 				$l->t('If you want to support the project {contributeopen}join development{linkclose} or {contributeopen}spread the word{linkclose}!'))); ?>
282 282
 		</p>
283 283
 
284
-	<?php if(OC_APP::isEnabled('firstrunwizard')) {?>
285
-		<p><a class="button" href="#" id="showWizard"><?php p($l->t('Show First Run Wizard again'));?></a></p>
284
+	<?php if (OC_APP::isEnabled('firstrunwizard')) {?>
285
+		<p><a class="button" href="#" id="showWizard"><?php p($l->t('Show First Run Wizard again')); ?></a></p>
286 286
 	<?php }?>
287 287
 </div>
288 288
 
289 289
 <div id="sessions" class="section">
290
-	<h2><?php p($l->t('Sessions'));?></h2>
291
-	<span class="hidden-when-empty"><?php p($l->t('Web, desktop and mobile clients currently logged in to your account.'));?></span>
290
+	<h2><?php p($l->t('Sessions')); ?></h2>
291
+	<span class="hidden-when-empty"><?php p($l->t('Web, desktop and mobile clients currently logged in to your account.')); ?></span>
292 292
 	<table class="icon-loading">
293 293
 		<thead class="token-list-header">
294 294
 			<tr>
295
-				<th><?php p($l->t('Device'));?></th>
296
-				<th><?php p($l->t('Last activity'));?></th>
295
+				<th><?php p($l->t('Device')); ?></th>
296
+				<th><?php p($l->t('Last activity')); ?></th>
297 297
 				<th></th>
298 298
 			</tr>
299 299
 		</thead>
@@ -303,13 +303,13 @@  discard block
 block discarded – undo
303 303
 </div>
304 304
 
305 305
 <div id="apppasswords" class="section">
306
-	<h2><?php p($l->t('App passwords'));?></h2>
307
-	<p><?php p($l->t('Passcodes that give an app or device permissions to access your account.'));?></p>
306
+	<h2><?php p($l->t('App passwords')); ?></h2>
307
+	<p><?php p($l->t('Passcodes that give an app or device permissions to access your account.')); ?></p>
308 308
 	<table class="icon-loading">
309 309
 		<thead class="hidden-when-empty">
310 310
 			<tr>
311
-				<th><?php p($l->t('Name'));?></th>
312
-				<th><?php p($l->t('Last activity'));?></th>
311
+				<th><?php p($l->t('Name')); ?></th>
312
+				<th><?php p($l->t('Last activity')); ?></th>
313 313
 				<th></th>
314 314
 			</tr>
315 315
 		</thead>
@@ -338,14 +338,14 @@  discard block
 block discarded – undo
338 338
 	</div>
339 339
 </div>
340 340
 
341
-<?php foreach($_['forms'] as $form) {
341
+<?php foreach ($_['forms'] as $form) {
342 342
 	if (isset($form['form'])) {?>
343
-	<div id="<?php isset($form['anchor']) ? p($form['anchor']) : p('');?>"><?php print_unescaped($form['form']);?></div>
343
+	<div id="<?php isset($form['anchor']) ? p($form['anchor']) : p(''); ?>"><?php print_unescaped($form['form']); ?></div>
344 344
 	<?php }
345 345
 };?>
346 346
 
347 347
 <div class="section">
348
-	<h2><?php p($l->t('Version'));?></h2>
348
+	<h2><?php p($l->t('Version')); ?></h2>
349 349
 	<p><a href="<?php print_unescaped($theme->getBaseUrl()); ?>" target="_blank"><?php p($theme->getTitle()); ?></a> <?php p(OC_Util::getHumanVersion()) ?></p>
350 350
 	<p><?php include('settings.development.notice.php'); ?></p>
351 351
 </div>
Please login to merge, or discard this patch.