Completed
Pull Request — master (#4212)
by Individual IT
13:52
created
apps/encryption/templates/settings-admin.php 1 patch
Braces   +9 added lines, -3 removed lines patch added patch discarded remove patch
@@ -9,10 +9,13 @@  discard block
 block discarded – undo
9 9
 	<h3><?php p($l->t("Default encryption module")); ?></h3>
10 10
 	<?php if(!$_["initStatus"]): ?>
11 11
 		<?php p($l->t("Encryption app is enabled but your keys are not initialized, please log-out and log-in again")); ?>
12
-	<?php else: ?>
12
+	<?php else {
13
+    : ?>
13 14
 		<p id="encryptHomeStorageSetting">
14 15
 			<input type="checkbox" class="checkbox" name="encrypt_home_storage" id="encryptHomeStorage"
15
-				   value="1" <?php if ($_['encryptHomeStorage']) print_unescaped('checked="checked"'); ?> />
16
+				   value="1" <?php if ($_['encryptHomeStorage']) print_unescaped('checked="checked"');
17
+}
18
+?> />
16 19
 			<label for="encryptHomeStorage"><?php p($l->t('Encrypt the home storage'));?></label></br>
17 20
 			<em><?php p( $l->t( "Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" ) ); ?></em>
18 21
 		</p>
@@ -42,7 +45,10 @@  discard block
 block discarded – undo
42 45
 			</p>
43 46
 			<br/><br/>
44 47
 
45
-			<p name="changeRecoveryPasswordBlock" id="encryptionChangeRecoveryKey" <?php if($_['recoveryEnabled'] === '0') print_unescaped('class="hidden"');?>>
48
+			<p name="changeRecoveryPasswordBlock" id="encryptionChangeRecoveryKey" <?php if($_['recoveryEnabled'] === '0') {
49
+    print_unescaped('class="hidden"');
50
+}
51
+?>>
46 52
 				<?php p($l->t("Change recovery key password:")); ?>
47 53
 				<span class="msg"></span>
48 54
 				<br/>
Please login to merge, or discard this patch.
apps/encryption/lib/Migration.php 1 patch
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -348,8 +348,9 @@
 block discarded – undo
348 348
 			$systemMountPoints = $this->getSystemMountPoints();
349 349
 			foreach ($systemMountPoints as $mountPoint) {
350 350
 				$normalizedMountPoint = \OC\Files\Filesystem::normalizePath($mountPoint['mountpoint']) . '/';
351
-				if (strpos($normalized, $normalizedMountPoint) === 0)
352
-					return $targetDir;
351
+				if (strpos($normalized, $normalizedMountPoint) === 0) {
352
+									return $targetDir;
353
+				}
353 354
 			}
354 355
 		} else if ($trash === false && $this->view->file_exists('/' . $user. '/files/' . $filePath)) {
355 356
 			return $targetDir;
Please login to merge, or discard this patch.
apps/files_trashbin/ajax/delete.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -40,8 +40,7 @@
 block discarded – undo
40 40
 		$list[] = $folder;
41 41
 		$folder = dirname($folder);
42 42
 	}
43
-}
44
-else {
43
+} else {
45 44
 	$deleteAll = false;
46 45
 	$files = (string)$_POST['files'];
47 46
 	$list = json_decode($files);
Please login to merge, or discard this patch.
apps/federatedfilesharing/templates/settings-admin.php 1 patch
Braces   +12 added lines, -3 removed lines patch added patch discarded remove patch
@@ -12,7 +12,10 @@  discard block
 block discarded – undo
12 12
 
13 13
 	<p>
14 14
 		<input type="checkbox" name="outgoing_server2server_share_enabled" id="outgoingServer2serverShareEnabled" class="checkbox"
15
-			   value="1" <?php if ($_['outgoingServer2serverShareEnabled']) print_unescaped('checked="checked"'); ?> />
15
+			   value="1" <?php if ($_['outgoingServer2serverShareEnabled']) {
16
+    print_unescaped('checked="checked"');
17
+}
18
+?> />
16 19
 		<label for="outgoingServer2serverShareEnabled">
17 20
 			<?php p($l->t('Allow users on this server to send shares to other servers'));?>
18 21
 		</label>
@@ -20,14 +23,20 @@  discard block
 block discarded – undo
20 23
 
21 24
 	<p>
22 25
 		<input type="checkbox" name="incoming_server2server_share_enabled" id="incomingServer2serverShareEnabled" class="checkbox"
23
-			   value="1" <?php if ($_['incomingServer2serverShareEnabled']) print_unescaped('checked="checked"'); ?> />
26
+			   value="1" <?php if ($_['incomingServer2serverShareEnabled']) {
27
+    print_unescaped('checked="checked"');
28
+}
29
+?> />
24 30
 		<label for="incomingServer2serverShareEnabled">
25 31
 			<?php p($l->t('Allow users on this server to receive shares from other servers'));?>
26 32
 		</label><br/>
27 33
 	</p>
28 34
 	<p>
29 35
 		<input type="checkbox" name="lookupServerEnabled" id="lookupServerEnabled" class="checkbox"
30
-			   value="1" <?php if ($_['lookupServerEnabled']) print_unescaped('checked="checked"'); ?> />
36
+			   value="1" <?php if ($_['lookupServerEnabled']) {
37
+    print_unescaped('checked="checked"');
38
+}
39
+?> />
31 40
 		<label for="lookupServerEnabled">
32 41
 			<?php p($l->t('Search global and public address book for users'));?>
33 42
 		</label><br/>
Please login to merge, or discard this patch.
apps/federation/templates/settings-admin.php 1 patch
Braces   +4 added lines, -1 removed lines patch added patch discarded remove patch
@@ -11,7 +11,10 @@
 block discarded – undo
11 11
 	<em><?php p($l->t('Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing.')); ?></em>
12 12
 
13 13
 	<p>
14
-		<input id="autoAddServers" type="checkbox" class="checkbox" <?php if($_['autoAddServers']) p('checked'); ?> />
14
+		<input id="autoAddServers" type="checkbox" class="checkbox" <?php if($_['autoAddServers']) {
15
+    p('checked');
16
+}
17
+?> />
15 18
 		<label for="autoAddServers"><?php p($l->t('Add server automatically once a federated share was created successfully')); ?></label>
16 19
 	</p>
17 20
 
Please login to merge, or discard this patch.
apps/federation/lib/BackgroundJob/GetSharedSecret.php 1 patch
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -177,7 +177,7 @@
 block discarded – undo
177 177
 			&& $status !== Http::STATUS_FORBIDDEN
178 178
 		) {
179 179
 			$this->retainJob = true;
180
-		}  else {
180
+		} else {
181 181
 			// reset token if we received a valid response
182 182
 			$this->dbHandler->addToken($target, '');
183 183
 		}
Please login to merge, or discard this patch.
apps/dav/lib/DAV/Sharing/Plugin.php 1 patch
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -119,8 +119,9 @@
 block discarded – undo
119 119
 
120 120
 		// Only handling xml
121 121
 		$contentType = $request->getHeader('Content-Type');
122
-		if (strpos($contentType, 'application/xml') === false && strpos($contentType, 'text/xml') === false)
123
-			return;
122
+		if (strpos($contentType, 'application/xml') === false && strpos($contentType, 'text/xml') === false) {
123
+					return;
124
+		}
124 125
 
125 126
 		// Making sure the node exists
126 127
 		try {
Please login to merge, or discard this patch.
apps/dav/lib/Connector/Sabre/FilesPlugin.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -245,7 +245,9 @@
 block discarded – undo
245 245
 	function httpGet(RequestInterface $request, ResponseInterface $response) {
246 246
 		// Only handle valid files
247 247
 		$node = $this->tree->getNodeForPath($request->getPath());
248
-		if (!($node instanceof IFile)) return;
248
+		if (!($node instanceof IFile)) {
249
+		    return;
250
+		}
249 251
 
250 252
 		// adds a 'Content-Disposition: attachment' header in case no disposition
251 253
 		// header has been set before
Please login to merge, or discard this patch.
apps/dav/lib/Connector/LegacyDAVACL.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -38,7 +38,9 @@
 block discarded – undo
38 38
 	public function getCurrentUserPrincipals() {
39 39
 		$principalV2 = $this->getCurrentUserPrincipal();
40 40
 
41
-		if (is_null($principalV2)) return [];
41
+		if (is_null($principalV2)) {
42
+		    return [];
43
+		}
42 44
 
43 45
 		$principalV1 = $this->convertPrincipal($principalV2, false);
44 46
 		return array_merge(
Please login to merge, or discard this patch.