Passed
Push — master ( c00d6f...a085a8 )
by Morris
09:54 queued 11s
created
settings/templates/settings/admin/additional-mail.php 1 patch
Braces   +24 added lines, -6 removed lines patch added patch discarded remove patch
@@ -71,11 +71,17 @@  discard block
 block discarded – undo
71 71
 			</select>
72 72
 
73 73
 			<label id="mail_smtpsecure_label" for="mail_smtpsecure"
74
-				<?php if ($_['mail_smtpmode'] !== 'smtp') print_unescaped(' class="hidden"'); ?>>
74
+				<?php if ($_['mail_smtpmode'] !== 'smtp') {
75
+    print_unescaped(' class="hidden"');
76
+}
77
+?>>
75 78
 				<?php p($l->t('Encryption')); ?>
76 79
 			</label>
77 80
 			<select name="mail_smtpsecure" id="mail_smtpsecure"
78
-				<?php if ($_['mail_smtpmode'] !== 'smtp') print_unescaped(' class="hidden"'); ?>>
81
+				<?php if ($_['mail_smtpmode'] !== 'smtp') {
82
+    print_unescaped(' class="hidden"');
83
+}
84
+?>>
79 85
 				<?php foreach ($mail_smtpsecure as $secure => $name):
80 86
 					$selected = '';
81 87
 					if ($secure == $_['mail_smtpsecure']):
@@ -94,7 +100,10 @@  discard block
 block discarded – undo
94 100
 				   value="<?php p($_['mail_domain']) ?>" />
95 101
 		</p>
96 102
 
97
-		<p id="setting_smtpauth" <?php if ($_['mail_smtpmode'] !== 'smtp') print_unescaped(' class="hidden"'); ?>>
103
+		<p id="setting_smtpauth" <?php if ($_['mail_smtpmode'] !== 'smtp') {
104
+    print_unescaped(' class="hidden"');
105
+}
106
+?>>
98 107
 			<label for="mail_smtpauthtype"><?php p($l->t('Authentication method')); ?></label>
99 108
 			<select name="mail_smtpauthtype" id="mail_smtpauthtype">
100 109
 				<?php foreach ($mail_smtpauthtype as $authtype => $name):
@@ -107,11 +116,17 @@  discard block
 block discarded – undo
107 116
 			</select>
108 117
 
109 118
 			<input type="checkbox" name="mail_smtpauth" id="mail_smtpauth" class="checkbox" value="1"
110
-				<?php if ($_['mail_smtpauth']) print_unescaped('checked="checked"'); ?> />
119
+				<?php if ($_['mail_smtpauth']) {
120
+    print_unescaped('checked="checked"');
121
+}
122
+?> />
111 123
 			<label for="mail_smtpauth"><?php p($l->t('Authentication required')); ?></label>
112 124
 		</p>
113 125
 
114
-		<p id="setting_smtphost" <?php if ($_['mail_smtpmode'] !== 'smtp') print_unescaped(' class="hidden"'); ?>>
126
+		<p id="setting_smtphost" <?php if ($_['mail_smtpmode'] !== 'smtp') {
127
+    print_unescaped(' class="hidden"');
128
+}
129
+?>>
115 130
 			<label for="mail_smtphost"><?php p($l->t('Server address')); ?></label>
116 131
 			<input type="text" name="mail_smtphost" id="mail_smtphost" placeholder="smtp.example.com"
117 132
 				   value="<?php p($_['mail_smtphost']) ?>" />
@@ -121,7 +136,10 @@  discard block
 block discarded – undo
121 136
 		</p>
122 137
 	</form>
123 138
 	<form class="mail_settings" id="mail_credentials_settings">
124
-		<p id="mail_credentials" <?php if (!$_['mail_smtpauth'] || $_['mail_smtpmode'] !== 'smtp') print_unescaped(' class="hidden"'); ?>>
139
+		<p id="mail_credentials" <?php if (!$_['mail_smtpauth'] || $_['mail_smtpmode'] !== 'smtp') {
140
+    print_unescaped(' class="hidden"');
141
+}
142
+?>>
125 143
 			<label for="mail_smtpname"><?php p($l->t('Credentials')); ?></label>
126 144
 			<input type="text" name="mail_smtpname" id="mail_smtpname" placeholder="<?php p($l->t('SMTP Username'))?>"
127 145
 				   value="<?php p($_['mail_smtpname']) ?>" />
Please login to merge, or discard this patch.
core/templates/404.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -14,10 +14,13 @@
 block discarded – undo
14 14
 ?>
15 15
 <?php if (isset($_['content'])): ?>
16 16
 	<?php print_unescaped($_['content']) ?>
17
-<?php else: ?>
17
+<?php else {
18
+    : ?>
18 19
 	<div class="body-login-container update">
19 20
 		<div class="icon-big icon-search icon-white"></div>
20
-		<h2><?php p($l->t('File not found')); ?></h2>
21
+		<h2><?php p($l->t('File not found'));
22
+}
23
+?></h2>
21 24
 		<p class="infogroup"><?php p($l->t('The document could not be found on the server. Maybe the share was deleted or has expired?')); ?></p>
22 25
 		<p><a class="button primary" href="<?php p(\OC::$server->getURLGenerator()->linkTo('', 'index.php')) ?>">
23 26
 			<?php p($l->t('Back to %s', array($theme->getName()))); ?>
Please login to merge, or discard this patch.
settings/templates/settings/admin/security.php 1 patch
Braces   +16 added lines, -4 removed lines patch added patch discarded remove patch
@@ -35,7 +35,10 @@  discard block
 block discarded – undo
35 35
 	<p id="enable">
36 36
 		<input type="checkbox"
37 37
 			   id="enableEncryption" class="checkbox"
38
-			   value="1" <?php if ($_['encryptionEnabled']) print_unescaped('checked="checked" disabled="disabled"'); ?> />
38
+			   value="1" <?php if ($_['encryptionEnabled']) {
39
+    print_unescaped('checked="checked" disabled="disabled"');
40
+}
41
+?> />
39 42
 		<label
40 43
 			for="enableEncryption"><?php p($l->t('Enable server-side encryption')); ?> <span id="startmigration_msg" class="msg"></span> </label><br/>
41 44
 	</p>
@@ -54,8 +57,14 @@  discard block
 block discarded – undo
54 57
 																										   value="<?php p($l->t("Enable encryption")); ?>" /></p>
55 58
 	</div>
56 59
 
57
-	<div id="EncryptionSettingsArea" class="<?php if (!$_['encryptionEnabled']) p('hidden'); ?>">
58
-		<div id='selectEncryptionModules' class="<?php if (!$_['encryptionReady']) p('hidden'); ?>">
60
+	<div id="EncryptionSettingsArea" class="<?php if (!$_['encryptionEnabled']) {
61
+    p('hidden');
62
+}
63
+?>">
64
+		<div id='selectEncryptionModules' class="<?php if (!$_['encryptionReady']) {
65
+    p('hidden');
66
+}
67
+?>">
59 68
 			<?php
60 69
 			if (empty($_['encryptionModules'])) {
61 70
 				p($l->t('No encryption module loaded, please enable an encryption module in the app menu.'));
@@ -76,7 +85,10 @@  discard block
 block discarded – undo
76 85
 				</fieldset>
77 86
 			<?php } ?>
78 87
 		</div>
79
-		<div id="migrationWarning" class="<?php if ($_['encryptionReady']) p('hidden'); ?>">
88
+		<div id="migrationWarning" class="<?php if ($_['encryptionReady']) {
89
+    p('hidden');
90
+}
91
+?>">
80 92
 			<?php
81 93
 			if ($_['encryptionReady'] === false && $_['externalBackendsEnabled'] === true) {
82 94
 				p($l->t('You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the "Default encryption module" and run \'occ encryption:migrate\''));
Please login to merge, or discard this patch.
apps/files_sharing/lib/Controller/ShareAPIController.php 1 patch
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -498,7 +498,7 @@
 block discarded – undo
498 498
 
499 499
 			$share->setSharedWith($shareWith);
500 500
 			$share->setPermissions($permissions);
501
-		}  else if ($shareType === Share::SHARE_TYPE_REMOTE_GROUP) {
501
+		} else if ($shareType === Share::SHARE_TYPE_REMOTE_GROUP) {
502 502
 			if (!$this->shareManager->outgoingServer2ServerGroupSharesAllowed()) {
503 503
 				throw new OCSForbiddenException($this->l->t('Sharing %1$s failed because the back end does not allow shares from type %2$s', [$path->getPath(), $shareType]));
504 504
 			}
Please login to merge, or discard this patch.
settings/templates/settings/personal/personal.info.php 1 patch
Braces   +48 added lines, -15 removed lines patch added patch discarded remove patch
@@ -57,8 +57,11 @@  discard block
 block discarded – undo
57 57
 						<div class="hidden button icon-delete svg" id="removeavatar" title="<?php p($l->t('Remove image')); ?>"></div>
58 58
 						<input type="file" name="files[]" id="uploadavatar" class="hiddenuploadfield">
59 59
 						<p><em><?php p($l->t('png or jpg, max. 20 MB')); ?></em></p>
60
-					<?php else: ?>
61
-						<?php p($l->t('Picture provided by original account')); ?>
60
+					<?php else {
61
+    : ?>
62
+						<?php p($l->t('Picture provided by original account'));
63
+}
64
+?>
62 65
 					<?php endif; ?>
63 66
 				</div>
64 67
 
@@ -88,9 +91,12 @@  discard block
 block discarded – undo
88 91
 						<?php if ($_['quota'] === \OCP\Files\FileInfo::SPACE_UNLIMITED): ?>
89 92
 							<?php print_unescaped($l->t('You are using <strong>%s</strong>',
90 93
 								[$_['usage']]));?>
91
-						<?php else: ?>
94
+						<?php else {
95
+    : ?>
92 96
 							<?php print_unescaped($l->t('You are using <strong>%1$s</strong> of <strong>%2$s</strong> (<strong>%3$s %%</strong>)',
93
-								[$_['usage'], $_['total_space'],  $_['usage_relative']]));?>
97
+								[$_['usage'], $_['total_space'],  $_['usage_relative']]));
98
+}
99
+?>
94 100
 						<?php endif ?>
95 101
 					</p>
96 102
 				</div>
@@ -134,7 +140,10 @@  discard block
 block discarded – undo
134 140
 						</span>
135 141
 					</div>
136 142
 				</h3>
137
-				<div class="verify <?php if ($_['email'] === ''  || $_['emailScope'] !== 'public') p('hidden'); ?>">
143
+				<div class="verify <?php if ($_['email'] === ''  || $_['emailScope'] !== 'public') {
144
+    p('hidden');
145
+}
146
+?>">
138 147
 					<img id="verify-email" title="<?php p($_['emailMessage']); ?>" data-status="<?php p($_['emailVerification']) ?>" src="
139 148
 				<?php
140 149
 					switch($_['emailVerification']) {
@@ -177,7 +186,10 @@  discard block
 block discarded – undo
177 186
 						</span>
178 187
 					</div>
179 188
 				</h3>
180
-				<input type="tel" id="phone" name="phone" <?php if(!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"'); ?>
189
+				<input type="tel" id="phone" name="phone" <?php if(!$_['lookupServerUploadEnabled']) {
190
+    print_unescaped('disabled="1"');
191
+}
192
+?>
181 193
 					   value="<?php p($_['phone']) ?>"
182 194
 					   placeholder="<?php p($l->t('Your phone number')); ?>"
183 195
 				       autocomplete="on" autocapitalize="none" autocorrect="off" />
@@ -199,7 +211,10 @@  discard block
 block discarded – undo
199 211
 						</span>
200 212
 					</div>
201 213
 				</h3>
202
-				<input type="text" id="address" name="address" <?php if(!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"');  ?>
214
+				<input type="text" id="address" name="address" <?php if(!$_['lookupServerUploadEnabled']) {
215
+    print_unescaped('disabled="1"');
216
+}
217
+?>
203 218
 					   placeholder="<?php p($l->t('Your postal address')); ?>"
204 219
 					   value="<?php p($_['address']) ?>"
205 220
 					   autocomplete="on" autocapitalize="none" autocorrect="off" />
@@ -222,7 +237,10 @@  discard block
 block discarded – undo
222 237
 					</div>
223 238
 				</h3>
224 239
 				<?php if($_['lookupServerUploadEnabled']) { ?>
225
-				<div class="verify <?php if ($_['website'] === ''  || $_['websiteScope'] !== 'public') p('hidden'); ?>">
240
+				<div class="verify <?php if ($_['website'] === ''  || $_['websiteScope'] !== 'public') {
241
+    p('hidden');
242
+}
243
+?>">
226 244
 					<img id="verify-website" title="<?php p($_['websiteMessage']); ?>" data-status="<?php p($_['websiteVerification']) ?>" src="
227 245
 					<?php
228 246
 					switch($_['websiteVerification']) {
@@ -236,13 +254,16 @@  discard block
 block discarded – undo
236 254
 							p(image_path('core', 'actions/verify.svg'));
237 255
 					}
238 256
 					?>"
239
-					<?php if($_['websiteVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS || $_['websiteVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) print_unescaped(' class="verify-action"') ?>
257
+					<?php if($_['websiteVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS || $_['websiteVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) {
258
+    print_unescaped(' class="verify-action"') ?>
240 259
 					>
241 260
 					<div class="verification-dialog popovermenu bubble menu">
242 261
 						<div class="verification-dialog-content">
243 262
 							<p class="explainVerification"></p>
244 263
 							<p class="verificationCode"></p>
245
-							<p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.'));?></p>
264
+							<p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.'));
265
+}
266
+?></p>
246 267
 						</div>
247 268
 					</div>
248 269
 				</div>
@@ -250,7 +271,10 @@  discard block
 block discarded – undo
250 271
 				<input type="url" name="website" id="website" value="<?php p($_['website']); ?>"
251 272
 				       placeholder="<?php p($l->t('Link https://…')); ?>"
252 273
 				       autocomplete="on" autocapitalize="none" autocorrect="off"
253
-					   <?php if(!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"');  ?>
274
+					   <?php if(!$_['lookupServerUploadEnabled']) {
275
+    print_unescaped('disabled="1"');
276
+}
277
+?>
254 278
 				/>
255 279
 				<span class="icon-checkmark hidden"></span>
256 280
 				<?php if($_['lookupServerUploadEnabled']) { ?>
@@ -271,7 +295,10 @@  discard block
 block discarded – undo
271 295
 					</div>
272 296
 				</h3>
273 297
 				<?php if($_['lookupServerUploadEnabled']) { ?>
274
-				<div class="verify <?php if ($_['twitter'] === ''  || $_['twitterScope'] !== 'public') p('hidden'); ?>">
298
+				<div class="verify <?php if ($_['twitter'] === ''  || $_['twitterScope'] !== 'public') {
299
+    p('hidden');
300
+}
301
+?>">
275 302
 					<img id="verify-twitter" title="<?php p($_['twitterMessage']); ?>" data-status="<?php p($_['twitterVerification']) ?>" src="
276 303
 					<?php
277 304
 					switch($_['twitterVerification']) {
@@ -285,13 +312,16 @@  discard block
 block discarded – undo
285 312
 							p(image_path('core', 'actions/verify.svg'));
286 313
 					}
287 314
 					?>"
288
-					<?php if($_['twitterVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS || $_['twitterVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) print_unescaped(' class="verify-action"') ?>
315
+					<?php if($_['twitterVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS || $_['twitterVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) {
316
+    print_unescaped(' class="verify-action"') ?>
289 317
 					>
290 318
 					<div class="verification-dialog popovermenu bubble menu">
291 319
 						<div class="verification-dialog-content">
292 320
 							<p class="explainVerification"></p>
293 321
 							<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>
322
+							<p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.'));
323
+}
324
+?></p>
295 325
 						</div>
296 326
 					</div>
297 327
 				</div>
@@ -299,7 +329,10 @@  discard block
 block discarded – undo
299 329
 				<input type="text" name="twitter" id="twitter" value="<?php p($_['twitter']); ?>"
300 330
 					   placeholder="<?php p($l->t('Twitter handle @…')); ?>"
301 331
 					   autocomplete="on" autocapitalize="none" autocorrect="off"
302
-					   <?php if(!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"');  ?>
332
+					   <?php if(!$_['lookupServerUploadEnabled']) {
333
+    print_unescaped('disabled="1"');
334
+}
335
+?>
303 336
 				/>
304 337
 				<span class="icon-checkmark hidden"></span>
305 338
 				<?php if($_['lookupServerUploadEnabled']) { ?>
Please login to merge, or discard this patch.
apps/files_sharing/templates/public.php 1 patch
Braces   +10 added lines, -4 removed lines patch added patch discarded remove patch
@@ -50,17 +50,23 @@
 block discarded – undo
50 50
 		<div id="preview">
51 51
 			<?php if (isset($_['folder'])): ?>
52 52
 				<?php print_unescaped($_['folder']); ?>
53
-			<?php else: ?>
53
+			<?php else {
54
+    : ?>
54 55
 				<?php if ($_['previewEnabled'] && substr($_['mimetype'], 0, strpos($_['mimetype'], '/')) == 'audio'): ?>
55 56
 					<div id="imgframe">
56
-						<audio tabindex="0" controls="" preload="none" style="width: 100%; max-width: <?php p($_['previewMaxX']); ?>px; max-height: <?php p($_['previewMaxY']); ?>px">
57
+						<audio tabindex="0" controls="" preload="none" style="width: 100%; max-width: <?php p($_['previewMaxX']);
58
+}
59
+?>px; max-height: <?php p($_['previewMaxY']); ?>px">
57 60
 							<source src="<?php p($_['downloadURL']); ?>" type="<?php p($_['mimetype']); ?>" />
58 61
 						</audio>
59 62
 					</div>
60
-				<?php else: ?>
63
+				<?php else {
64
+    : ?>
61 65
 					<!-- Preview frame is filled via JS to support SVG images for modern browsers -->
62 66
 					<div id="imgframe"></div>
63
-				<?php endif; ?>
67
+				<?php endif;
68
+}
69
+?>
64 70
 				<?php if ($_['previewURL'] === $_['downloadURL'] && !$_['hideDownload']): ?>
65 71
 					<div class="directDownload">
66 72
 						<a href="<?php p($_['downloadURL']); ?>" id="downloadFile" class="button">
Please login to merge, or discard this patch.
core/templates/twofactorselectchallenge.php 1 patch
Braces   +13 added lines, -5 removed lines patch added patch discarded remove patch
@@ -27,11 +27,15 @@  discard block
 block discarded – undo
27 27
 					<?php p($l->t('Set up two-factor authentication')) ?>
28 28
 				</a>
29 29
 			<?php } ?>
30
-		<?php else: ?>
30
+		<?php else {
31
+    : ?>
31 32
 			<strong><?php p($l->t('Two-factor authentication is enforced but has not been configured on your account. Use one of your backup codes to log in or contact your admin for assistance.')) ?></strong>
32
-		<?php endif; ?>
33
+		<?php endif;
34
+}
35
+?>
33 36
 	</p>
34
-	<?php else: ?>
37
+	<?php else {
38
+    : ?>
35 39
 	<ul>
36 40
 	<?php foreach ($_['providers'] as $provider): ?>
37 41
 		<li>
@@ -45,6 +49,7 @@  discard block
 block discarded – undo
45 49
 				<?php
46 50
 				if ($provider instanceof \OCP\Authentication\TwoFactorAuth\IProvidesIcons) {
47 51
 					$icon = $provider->getLightIcon();
52
+}
48 53
 				} else {
49 54
 					$icon = image_path('core', 'actions/password-white.svg');
50 55
 				}
@@ -61,7 +66,8 @@  discard block
 block discarded – undo
61 66
 	<?php endif ?>
62 67
 	<?php if (!is_null($_['backupProvider'])): ?>
63 68
 	<p>
64
-		<a class="<?php if($noProviders): ?>button primary two-factor-primary<?php else: ?>two-factor-secondary<?php endif ?>" href="<?php p(\OC::$server->getURLGenerator()->linkToRoute('core.TwoFactorChallenge.showChallenge',
69
+		<a class="<?php if($noProviders): ?>button primary two-factor-primary<?php else {
70
+    : ?>two-factor-secondary<?php endif ?>" href="<?php p(\OC::$server->getURLGenerator()->linkToRoute('core.TwoFactorChallenge.showChallenge',
65 71
 			[
66 72
 				'challengeProviderId' => $_['backupProvider']->getId(),
67 73
 				'redirect_url' => $_['redirect_url'],
@@ -70,7 +76,9 @@  discard block
 block discarded – undo
70 76
 			<?php p($l->t('Use backup code')) ?>
71 77
 		</a>
72 78
 	</p>
73
-	<?php endif; ?>
79
+	<?php endif;
80
+}
81
+?>
74 82
 	<p><a class="two-factor-secondary" href="<?php print_unescaped($_['logout_url']); ?>">
75 83
 		<?php p($l->t('Cancel log in')) ?>
76 84
 	</a></p>
Please login to merge, or discard this patch.
settings/templates/settings/personal/security.php 1 patch
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -76,16 +76,14 @@
 block discarded – undo
76 76
 			if ($provider instanceof \OCP\Authentication\TwoFactorAuth\IProvidesIcons) {
77 77
 				if ($_['themedark']) {
78 78
 					$icon = $provider->getLightIcon();
79
-				}
80
-				else {
79
+				} else {
81 80
 					$icon = $provider->getDarkIcon();
82 81
 				}
83 82
 				//fallback icon if the 2factor provider doesn't provide an icon.
84 83
 			} else {
85 84
 				if ($_['themedark']) {
86 85
 					$icon = image_path('core', 'actions/password-white.svg');
87
-				}
88
-				else {
86
+				} else {
89 87
 					$icon = image_path('core', 'actions/password.svg');
90 88
 				}
91 89
 
Please login to merge, or discard this patch.
apps/files/templates/appnavigation.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -15,9 +15,12 @@
 block discarded – undo
15 15
 					<p><?php p($l->t('%s used', [$_['usage']])); ?></p>
16 16
 				</a>
17 17
 			</li>
18
-		<?php else: ?>
18
+		<?php else {
19
+    : ?>
19 20
 			<li id="quota" class="has-tooltip pinned <?php p($pinned === 0 ? 'first-pinned ' : '') ?>"
20
-				title="<?php p($l->t('%s%% of %s used', [$_['usage_relative'], $_['total_space']])); ?>">
21
+				title="<?php p($l->t('%s%% of %s used', [$_['usage_relative'], $_['total_space']]));
22
+}
23
+?>">
21 24
 				<a href="#" class="icon-quota svg">
22 25
 					<p id="quotatext"><?php p($l->t('%1$s of %2$s used', [$_['usage'], $_['total_space']])); ?></p>
23 26
 					<div class="quota-container">
Please login to merge, or discard this patch.