@@ -27,7 +27,7 @@ |
||
27 | 27 | ->from('share_external'); |
28 | 28 | |
29 | 29 | $result = $qb->execute(); |
30 | - while($row = $result->fetch()) { |
|
30 | + while ($row = $result->fetch()) { |
|
31 | 31 | $this->discoveryService->discover($row['remote'], 'FEDERATED_SHARING', true); |
32 | 32 | } |
33 | 33 | $result->closeCursor(); |
@@ -105,7 +105,7 @@ |
||
105 | 105 | $defaultLogFile = rtrim($dataDir, '/').'/nextcloud.log'; |
106 | 106 | $output->writeln('Log file: '.$this->config->getSystemValue('logfile', $defaultLogFile)); |
107 | 107 | |
108 | - $rotateSize = $this->config->getSystemValue('log_rotate_size', 100*1024*1024); |
|
108 | + $rotateSize = $this->config->getSystemValue('log_rotate_size', 100 * 1024 * 1024); |
|
109 | 109 | if ($rotateSize) { |
110 | 110 | $rotateString = \OCP\Util::humanFileSize($rotateSize); |
111 | 111 | } else { |
@@ -154,7 +154,7 @@ discard block |
||
154 | 154 | } |
155 | 155 | $query = $this->connection->prepare('SELECT `lock` from `*PREFIX*file_locks` WHERE `key` = ?'); |
156 | 156 | $query->execute([$path]); |
157 | - $lockValue = (int)$query->fetchColumn(); |
|
157 | + $lockValue = (int) $query->fetchColumn(); |
|
158 | 158 | if ($type === self::LOCK_SHARED) { |
159 | 159 | if ($this->isLocallyLocked($path)) { |
160 | 160 | // if we have a shared lock we kept open locally but it's released we always have at least 1 shared lock in the db |
@@ -291,7 +291,7 @@ discard block |
||
291 | 291 | } |
292 | 292 | // since we keep shared locks we need to manually clean those |
293 | 293 | $lockedPaths = array_keys($this->sharedLocks); |
294 | - $lockedPaths = array_filter($lockedPaths, function ($path) { |
|
294 | + $lockedPaths = array_filter($lockedPaths, function($path) { |
|
295 | 295 | return $this->sharedLocks[$path]; |
296 | 296 | }); |
297 | 297 |
@@ -59,10 +59,10 @@ |
||
59 | 59 | if (is_array($value)) { |
60 | 60 | $output->writeln(" <comment>>></comment> $key:"); |
61 | 61 | foreach ($value as $subKey => $subValue) { |
62 | - $output->writeln(" <comment>>></comment> $subKey: " . str_repeat(' ', 46 - strlen($subKey)) . $subValue); |
|
62 | + $output->writeln(" <comment>>></comment> $subKey: ".str_repeat(' ', 46 - strlen($subKey)).$subValue); |
|
63 | 63 | } |
64 | 64 | } else { |
65 | - $output->writeln(" <comment>>></comment> $key: " . str_repeat(' ', 50 - strlen($key)) . $value); |
|
65 | + $output->writeln(" <comment>>></comment> $key: ".str_repeat(' ', 50 - strlen($key)).$value); |
|
66 | 66 | } |
67 | 67 | } |
68 | 68 | } |
@@ -92,7 +92,7 @@ discard block |
||
92 | 92 | return; |
93 | 93 | } |
94 | 94 | |
95 | - return $this->checkQuota($parent->getPath() . '/' . basename($uri)); |
|
95 | + return $this->checkQuota($parent->getPath().'/'.basename($uri)); |
|
96 | 96 | } |
97 | 97 | |
98 | 98 | /** |
@@ -152,7 +152,7 @@ discard block |
||
152 | 152 | |
153 | 153 | if ($length) { |
154 | 154 | list($parentPath, $newName) = \Sabre\Uri\split($path); |
155 | - if(is_null($parentPath)) { |
|
155 | + if (is_null($parentPath)) { |
|
156 | 156 | $parentPath = ''; |
157 | 157 | } |
158 | 158 | $req = $this->server->httpRequest; |
@@ -163,7 +163,7 @@ discard block |
||
163 | 163 | // there is still enough space for the remaining chunks |
164 | 164 | $length -= $chunkHandler->getCurrentSize(); |
165 | 165 | // use target file name for free space check in case of shared files |
166 | - $path = rtrim($parentPath, '/') . '/' . $info['name']; |
|
166 | + $path = rtrim($parentPath, '/').'/'.$info['name']; |
|
167 | 167 | } |
168 | 168 | $freeSpace = $this->getFreeSpace($path); |
169 | 169 | if ($freeSpace >= 0 && $length > $freeSpace) { |
@@ -58,7 +58,7 @@ discard block |
||
58 | 58 | ) { |
59 | 59 | $backend = $this->backendService->getBackend($storageOptions['backend']); |
60 | 60 | if (!$backend) { |
61 | - throw new \UnexpectedValueException('Invalid backend ' . $storageOptions['backend']); |
|
61 | + throw new \UnexpectedValueException('Invalid backend '.$storageOptions['backend']); |
|
62 | 62 | } |
63 | 63 | $storageConfig->setBackend($backend); |
64 | 64 | if (isset($storageOptions['authMechanism']) && $storageOptions['authMechanism'] !== 'builtin::builtin') { |
@@ -68,7 +68,7 @@ discard block |
||
68 | 68 | $storageOptions['authMechanism'] = 'null'; // to make error handling easier |
69 | 69 | } |
70 | 70 | if (!$authMechanism) { |
71 | - throw new \UnexpectedValueException('Invalid authentication mechanism ' . $storageOptions['authMechanism']); |
|
71 | + throw new \UnexpectedValueException('Invalid authentication mechanism '.$storageOptions['authMechanism']); |
|
72 | 72 | } |
73 | 73 | $storageConfig->setAuthMechanism($authMechanism); |
74 | 74 | $storageConfig->setBackendOptions($storageOptions['options']); |
@@ -140,7 +140,7 @@ discard block |
||
140 | 140 | $parts = explode('/', ltrim($rootMountPath, '/'), 3); |
141 | 141 | if (count($parts) < 3) { |
142 | 142 | // something went wrong, skip |
143 | - \OC::$server->getLogger()->error('Could not parse mount point "' . $rootMountPath . '"', ['app' => 'files_external']); |
|
143 | + \OC::$server->getLogger()->error('Could not parse mount point "'.$rootMountPath.'"', ['app' => 'files_external']); |
|
144 | 144 | continue; |
145 | 145 | } |
146 | 146 | $relativeMountPath = rtrim($parts[2], '/'); |
@@ -154,7 +154,7 @@ discard block |
||
154 | 154 | $storageOptions['authMechanism'] = null; // ensure config hash works |
155 | 155 | } |
156 | 156 | if (isset($storageOptions['id'])) { |
157 | - $configId = (int)$storageOptions['id']; |
|
157 | + $configId = (int) $storageOptions['id']; |
|
158 | 158 | if (isset($storages[$configId])) { |
159 | 159 | $currentStorage = $storages[$configId]; |
160 | 160 | } |
@@ -47,7 +47,7 @@ discard block |
||
47 | 47 | * |
48 | 48 | * @package OCA\Federation\Controller |
49 | 49 | */ |
50 | -class OCSAuthAPIController extends OCSController{ |
|
50 | +class OCSAuthAPIController extends OCSController { |
|
51 | 51 | |
52 | 52 | /** @var ISecureRandom */ |
53 | 53 | private $secureRandom; |
@@ -143,7 +143,7 @@ discard block |
||
143 | 143 | */ |
144 | 144 | public function requestSharedSecret($url, $token) { |
145 | 145 | if ($this->trustedServers->isTrustedServer($url) === false) { |
146 | - $this->logger->error('remote server not trusted (' . $url . ') while requesting shared secret', ['app' => 'federation']); |
|
146 | + $this->logger->error('remote server not trusted ('.$url.') while requesting shared secret', ['app' => 'federation']); |
|
147 | 147 | throw new OCSForbiddenException(); |
148 | 148 | } |
149 | 149 | |
@@ -152,7 +152,7 @@ discard block |
||
152 | 152 | $localToken = $this->dbHandler->getToken($url); |
153 | 153 | if (strcmp($localToken, $token) > 0) { |
154 | 154 | $this->logger->info( |
155 | - 'remote server (' . $url . ') presented lower token. We will initiate the exchange of the shared secret.', |
|
155 | + 'remote server ('.$url.') presented lower token. We will initiate the exchange of the shared secret.', |
|
156 | 156 | ['app' => 'federation'] |
157 | 157 | ); |
158 | 158 | throw new OCSForbiddenException(); |
@@ -184,14 +184,14 @@ discard block |
||
184 | 184 | public function getSharedSecret($url, $token) { |
185 | 185 | |
186 | 186 | if ($this->trustedServers->isTrustedServer($url) === false) { |
187 | - $this->logger->error('remote server not trusted (' . $url . ') while getting shared secret', ['app' => 'federation']); |
|
187 | + $this->logger->error('remote server not trusted ('.$url.') while getting shared secret', ['app' => 'federation']); |
|
188 | 188 | throw new OCSForbiddenException(); |
189 | 189 | } |
190 | 190 | |
191 | 191 | if ($this->isValidToken($url, $token) === false) { |
192 | 192 | $expectedToken = $this->dbHandler->getToken($url); |
193 | 193 | $this->logger->error( |
194 | - 'remote server (' . $url . ') didn\'t send a valid token (got "' . $token . '" but expected "'. $expectedToken . '") while getting shared secret', |
|
194 | + 'remote server ('.$url.') didn\'t send a valid token (got "'.$token.'" but expected "'.$expectedToken.'") while getting shared secret', |
|
195 | 195 | ['app' => 'federation'] |
196 | 196 | ); |
197 | 197 | throw new OCSForbiddenException(); |
@@ -68,13 +68,13 @@ discard block |
||
68 | 68 | * @param string[] $remove |
69 | 69 | */ |
70 | 70 | public function updateShares(IShareable $shareable, array $add, array $remove) { |
71 | - foreach($add as $element) { |
|
71 | + foreach ($add as $element) { |
|
72 | 72 | $principal = $this->principalBackend->findByUri($element['href'], ''); |
73 | 73 | if ($principal !== '') { |
74 | 74 | $this->shareWith($shareable, $element); |
75 | 75 | } |
76 | 76 | } |
77 | - foreach($remove as $element) { |
|
77 | + foreach ($remove as $element) { |
|
78 | 78 | $principal = $this->principalBackend->findByUri($element, ''); |
79 | 79 | if ($principal !== '') { |
80 | 80 | $this->unshare($shareable, $element); |
@@ -193,9 +193,9 @@ discard block |
||
193 | 193 | ->execute(); |
194 | 194 | |
195 | 195 | $shares = []; |
196 | - while($row = $result->fetch()) { |
|
196 | + while ($row = $result->fetch()) { |
|
197 | 197 | $p = $this->principalBackend->getPrincipalByPath($row['principaluri']); |
198 | - $shares[]= [ |
|
198 | + $shares[] = [ |
|
199 | 199 | 'href' => "principal:${row['principaluri']}", |
200 | 200 | 'commonName' => isset($p['{DAV:}displayname']) ? $p['{DAV:}displayname'] : '', |
201 | 201 | 'status' => 1, |
@@ -221,13 +221,13 @@ discard block |
||
221 | 221 | foreach ($shares as $share) { |
222 | 222 | $acl[] = [ |
223 | 223 | 'privilege' => '{DAV:}read', |
224 | - 'principal' => $share['{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}principal'], |
|
224 | + 'principal' => $share['{'.\OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD.'}principal'], |
|
225 | 225 | 'protected' => true, |
226 | 226 | ]; |
227 | 227 | if (!$share['readOnly']) { |
228 | 228 | $acl[] = [ |
229 | 229 | 'privilege' => '{DAV:}write', |
230 | - 'principal' => $share['{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}principal'], |
|
230 | + 'principal' => $share['{'.\OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD.'}principal'], |
|
231 | 231 | 'protected' => true, |
232 | 232 | ]; |
233 | 233 | } else if ($this->resourceType === 'calendar') { |
@@ -235,7 +235,7 @@ discard block |
||
235 | 235 | // so users can change the visibility. |
236 | 236 | $acl[] = [ |
237 | 237 | 'privilege' => '{DAV:}write-properties', |
238 | - 'principal' => $share['{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}principal'], |
|
238 | + 'principal' => $share['{'.\OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD.'}principal'], |
|
239 | 239 | 'protected' => true, |
240 | 240 | ]; |
241 | 241 | } |
@@ -88,7 +88,7 @@ |
||
88 | 88 | * @param string $mode |
89 | 89 | * @return DataResponse|FileDisplayResponse |
90 | 90 | */ |
91 | - public function getPreview ( |
|
91 | + public function getPreview( |
|
92 | 92 | string $file = '', |
93 | 93 | int $x = 32, |
94 | 94 | int $y = 32, |