Completed
Push — master ( a89f9a...3036b1 )
by Morris
29:19 queued 12:13
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.
apps/files_sharing/lib/Controller/ShareAPIController.php 1 patch
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -465,7 +465,7 @@
 block discarded – undo
465 465
 
466 466
 			$share->setSharedWith($shareWith);
467 467
 			$share->setPermissions($permissions);
468
-		}  else if ($shareType === Share::SHARE_TYPE_REMOTE_GROUP) {
468
+		} else if ($shareType === Share::SHARE_TYPE_REMOTE_GROUP) {
469 469
 			if (!$this->shareManager->outgoingServer2ServerGroupSharesAllowed()) {
470 470
 				throw new OCSForbiddenException($this->l->t('Sharing %s failed because the back end does not allow shares from type %s', [$path->getPath(), $shareType]));
471 471
 			}
Please login to merge, or discard this patch.