@@ -348,8 +348,9 @@ |
||
| 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; |
@@ -40,8 +40,7 @@ |
||
| 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); |
@@ -11,7 +11,10 @@ |
||
| 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 | |
@@ -177,7 +177,7 @@ |
||
| 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 | } |
@@ -119,8 +119,9 @@ |
||
| 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 { |
@@ -245,7 +245,9 @@ |
||
| 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 |
@@ -38,7 +38,9 @@ |
||
| 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( |
@@ -808,7 +808,9 @@ |
||
| 808 | 808 | $stmt = $query->execute(); |
| 809 | 809 | $row = $stmt->fetch(\PDO::FETCH_ASSOC); |
| 810 | 810 | |
| 811 | - if(!$row) return null; |
|
| 811 | + if(!$row) { |
|
| 812 | + return null; |
|
| 813 | + } |
|
| 812 | 814 | |
| 813 | 815 | return [ |
| 814 | 816 | 'id' => $row['id'], |
@@ -745,7 +745,9 @@ |
||
| 745 | 745 | $stmt->execute([ $addressBookId ]); |
| 746 | 746 | $currentToken = $stmt->fetchColumn(0); |
| 747 | 747 | |
| 748 | - if (is_null($currentToken)) return null; |
|
| 748 | + if (is_null($currentToken)) { |
|
| 749 | + return null; |
|
| 750 | + } |
|
| 749 | 751 | |
| 750 | 752 | $result = [ |
| 751 | 753 | 'syncToken' => $currentToken, |