Passed
Push — master ( 995692...3b92af )
by Roeland
31:08 queued 18:55
created
apps/federatedfilesharing/templates/settings-admin.php 1 patch
Braces   +24 added lines, -6 removed lines patch added patch discarded remove patch
@@ -18,14 +18,20 @@  discard block
 block discarded – undo
18 18
 
19 19
 	<p>
20 20
 		<input type="checkbox" name="outgoing_server2server_share_enabled" id="outgoingServer2serverShareEnabled" class="checkbox"
21
-			   value="1" <?php if ($_['outgoingServer2serverShareEnabled']) print_unescaped('checked="checked"'); ?> />
21
+			   value="1" <?php if ($_['outgoingServer2serverShareEnabled']) {
22
+    print_unescaped('checked="checked"');
23
+}
24
+?> />
22 25
 		<label for="outgoingServer2serverShareEnabled">
23 26
 			<?php p($l->t('Allow users on this server to send shares to other servers'));?>
24 27
 		</label>
25 28
 	</p>
26 29
 	<p>
27 30
 		<input type="checkbox" name="incoming_server2server_share_enabled" id="incomingServer2serverShareEnabled" class="checkbox"
28
-			   value="1" <?php if ($_['incomingServer2serverShareEnabled']) print_unescaped('checked="checked"'); ?> />
31
+			   value="1" <?php if ($_['incomingServer2serverShareEnabled']) {
32
+    print_unescaped('checked="checked"');
33
+}
34
+?> />
29 35
 		<label for="incomingServer2serverShareEnabled">
30 36
 			<?php p($l->t('Allow users on this server to receive shares from other servers'));?>
31 37
 		</label><br/>
@@ -33,14 +39,20 @@  discard block
 block discarded – undo
33 39
 	<?php if($_['federatedGroupSharingSupported']): ?>
34 40
 	<p>
35 41
 		<input type="checkbox" name="outgoing_server2server_group_share_enabled" id="outgoingServer2serverGroupShareEnabled" class="checkbox"
36
-			   value="1" <?php if ($_['outgoingServer2serverGroupShareEnabled']) print_unescaped('checked="checked"'); ?> />
42
+			   value="1" <?php if ($_['outgoingServer2serverGroupShareEnabled']) {
43
+    print_unescaped('checked="checked"');
44
+}
45
+?> />
37 46
 		<label for="outgoingServer2serverGroupShareEnabled">
38 47
 			<?php p($l->t('Allow users on this server to send shares to groups on other servers'));?>
39 48
 		</label>
40 49
 	</p>
41 50
 	<p>
42 51
 		<input type="checkbox" name="incoming_server2server_group_share_enabled" id="incomingServer2serverGroupShareEnabled" class="checkbox"
43
-			   value="1" <?php if ($_['incomingServer2serverGroupShareEnabled']) print_unescaped('checked="checked"'); ?> />
52
+			   value="1" <?php if ($_['incomingServer2serverGroupShareEnabled']) {
53
+    print_unescaped('checked="checked"');
54
+}
55
+?> />
44 56
 		<label for="incomingServer2serverGroupShareEnabled">
45 57
 			<?php p($l->t('Allow users on this server to receive group shares from other servers'));?>
46 58
 		</label><br/>
@@ -48,14 +60,20 @@  discard block
 block discarded – undo
48 60
 	<?php endif; ?>
49 61
 	<p>
50 62
 		<input type="checkbox" name="lookupServerEnabled" id="lookupServerEnabled" class="checkbox"
51
-			   value="1" <?php if ($_['lookupServerEnabled']) print_unescaped('checked="checked"'); ?> />
63
+			   value="1" <?php if ($_['lookupServerEnabled']) {
64
+    print_unescaped('checked="checked"');
65
+}
66
+?> />
52 67
 		<label for="lookupServerEnabled">
53 68
 			<?php p($l->t('Search global and public address book for users'));?>
54 69
 		</label><br/>
55 70
 	</p>
56 71
 	<p>
57 72
 		<input type="checkbox" name="lookupServerUploadEnabled" id="lookupServerUploadEnabled" class="checkbox"
58
-			   value="1" <?php if ($_['lookupServerUploadEnabled']) print_unescaped('checked="checked"'); ?> />
73
+			   value="1" <?php if ($_['lookupServerUploadEnabled']) {
74
+    print_unescaped('checked="checked"');
75
+}
76
+?> />
59 77
 		<label for="lookupServerUploadEnabled">
60 78
 			<?php p($l->t('Allow users to publish their data to a global and public address book'));?>
61 79
 		</label><br/>
Please login to merge, or discard this patch.
lib/private/Share20/Manager.php 1 patch
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -226,7 +226,7 @@
 block discarded – undo
226 226
 			if ($share->getSharedWith() === null) {
227 227
 				throw new \InvalidArgumentException('SharedWith should not be empty');
228 228
 			}
229
-		}  else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_REMOTE_GROUP) {
229
+		} else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_REMOTE_GROUP) {
230 230
 			if ($share->getSharedWith() === null) {
231 231
 				throw new \InvalidArgumentException('SharedWith should not be empty');
232 232
 			}
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.
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.
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.
lib/base.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -864,8 +864,7 @@
 block discarded – undo
864 864
 				$restrictions = array_values($restrictions);
865 865
 				if (empty($restrictions)) {
866 866
 					$appManager->disableApp($appId);
867
-				}
868
-				else{
867
+				} else{
869 868
 					$appManager->enableAppForGroups($appId, $restrictions);
870 869
 				}
871 870
 
Please login to merge, or discard this patch.
apps/settings/templates/certificates.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -23,8 +23,11 @@
 block discarded – undo
23 23
 					<?php p($rootCert->getIssuerName()) ?>
24 24
 				</td>
25 25
 				<td <?php if ($rootCert != ''): ?>class="remove"
26
-					<?php else: ?>style="visibility:hidden;"
27
-					<?php endif; ?>><img alt="<?php p($l->t('Delete')); ?>"
26
+					<?php else {
27
+    : ?>style="visibility:hidden;"
28
+					<?php endif;
29
+}
30
+?>><img alt="<?php p($l->t('Delete')); ?>"
28 31
 										 title="<?php p($l->t('Delete')); ?>"
29 32
 										 class="action"
30 33
 										 src="<?php print_unescaped(image_path('core', 'actions/delete.svg')); ?>"/>
Please login to merge, or discard this patch.
apps/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/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.