@@ -119,9 +119,9 @@ |
||
119 | 119 | $elements = explode(' ', $fullName); |
120 | 120 | $result = ['', '', '', '', '']; |
121 | 121 | if (count($elements) > 2) { |
122 | - $result[0] = implode(' ', array_slice($elements, count($elements)-1)); |
|
122 | + $result[0] = implode(' ', array_slice($elements, count($elements) - 1)); |
|
123 | 123 | $result[1] = $elements[0]; |
124 | - $result[2] = implode(' ', array_slice($elements, 1, count($elements)-2)); |
|
124 | + $result[2] = implode(' ', array_slice($elements, 1, count($elements) - 2)); |
|
125 | 125 | } elseif (count($elements) === 2) { |
126 | 126 | $result[0] = $elements[1]; |
127 | 127 | $result[1] = $elements[0]; |
@@ -33,10 +33,10 @@ |
||
33 | 33 | } |
34 | 34 | |
35 | 35 | public function setupDatabase($username) { |
36 | - $datadir = $this->config->getValue('datadirectory', \OC::$SERVERROOT . '/data'); |
|
36 | + $datadir = $this->config->getValue('datadirectory', \OC::$SERVERROOT.'/data'); |
|
37 | 37 | |
38 | 38 | //delete the old sqlite database first, might cause infinte loops otherwise |
39 | - if(file_exists("$datadir/owncloud.db")) { |
|
39 | + if (file_exists("$datadir/owncloud.db")) { |
|
40 | 40 | unlink("$datadir/owncloud.db"); |
41 | 41 | } |
42 | 42 | //in case of sqlite, we can always fill the database |
@@ -57,9 +57,9 @@ |
||
57 | 57 | * @return false |
58 | 58 | */ |
59 | 59 | function httpGet(RequestInterface $request, ResponseInterface $response) { |
60 | - $string = 'This is the WebDAV interface. It can only be accessed by ' . |
|
60 | + $string = 'This is the WebDAV interface. It can only be accessed by '. |
|
61 | 61 | 'WebDAV clients such as the Nextcloud desktop sync client.'; |
62 | - $stream = fopen('php://memory','r+'); |
|
62 | + $stream = fopen('php://memory', 'r+'); |
|
63 | 63 | fwrite($stream, $string); |
64 | 64 | rewind($stream); |
65 | 65 |
@@ -106,11 +106,11 @@ discard block |
||
106 | 106 | $values = $this->appConfig->getValues(false, 'enabled'); |
107 | 107 | |
108 | 108 | $alwaysEnabledApps = $this->getAlwaysEnabledApps(); |
109 | - foreach($alwaysEnabledApps as $appId) { |
|
109 | + foreach ($alwaysEnabledApps as $appId) { |
|
110 | 110 | $values[$appId] = 'yes'; |
111 | 111 | } |
112 | 112 | |
113 | - $this->installedAppsCache = array_filter($values, function ($value) { |
|
113 | + $this->installedAppsCache = array_filter($values, function($value) { |
|
114 | 114 | return $value !== 'no'; |
115 | 115 | }); |
116 | 116 | ksort($this->installedAppsCache); |
@@ -135,7 +135,7 @@ discard block |
||
135 | 135 | */ |
136 | 136 | public function getEnabledAppsForUser(IUser $user) { |
137 | 137 | $apps = $this->getInstalledAppsValues(); |
138 | - $appsForUser = array_filter($apps, function ($enabled) use ($user) { |
|
138 | + $appsForUser = array_filter($apps, function($enabled) use ($user) { |
|
139 | 139 | return $this->checkAppForUser($enabled, $user); |
140 | 140 | }); |
141 | 141 | return array_keys($appsForUser); |
@@ -174,7 +174,7 @@ discard block |
||
174 | 174 | } elseif ($user === null) { |
175 | 175 | return false; |
176 | 176 | } else { |
177 | - if(empty($enabled)){ |
|
177 | + if (empty($enabled)) { |
|
178 | 178 | return false; |
179 | 179 | } |
180 | 180 | |
@@ -182,7 +182,7 @@ discard block |
||
182 | 182 | |
183 | 183 | if (!is_array($groupIds)) { |
184 | 184 | $jsonError = json_last_error(); |
185 | - \OC::$server->getLogger()->warning('AppManger::checkAppForUser - can\'t decode group IDs: ' . print_r($enabled, true) . ' - json error code: ' . $jsonError, ['app' => 'lib']); |
|
185 | + \OC::$server->getLogger()->warning('AppManger::checkAppForUser - can\'t decode group IDs: '.print_r($enabled, true).' - json error code: '.$jsonError, ['app' => 'lib']); |
|
186 | 186 | return false; |
187 | 187 | } |
188 | 188 | |
@@ -256,7 +256,7 @@ discard block |
||
256 | 256 | } |
257 | 257 | } |
258 | 258 | |
259 | - $groupIds = array_map(function ($group) { |
|
259 | + $groupIds = array_map(function($group) { |
|
260 | 260 | /** @var \OCP\IGroup $group */ |
261 | 261 | return $group->getGID(); |
262 | 262 | }, $groups); |
@@ -295,8 +295,8 @@ discard block |
||
295 | 295 | */ |
296 | 296 | public function getAppPath($appId) { |
297 | 297 | $appPath = \OC_App::getAppPath($appId); |
298 | - if($appPath === false) { |
|
299 | - throw new AppPathNotFoundException('Could not find path for ' . $appId); |
|
298 | + if ($appPath === false) { |
|
299 | + throw new AppPathNotFoundException('Could not find path for '.$appId); |
|
300 | 300 | } |
301 | 301 | return $appPath; |
302 | 302 | } |
@@ -389,7 +389,7 @@ discard block |
||
389 | 389 | |
390 | 390 | private function loadShippedJson() { |
391 | 391 | if ($this->shippedApps === null) { |
392 | - $shippedJson = \OC::$SERVERROOT . '/core/shipped.json'; |
|
392 | + $shippedJson = \OC::$SERVERROOT.'/core/shipped.json'; |
|
393 | 393 | if (!file_exists($shippedJson)) { |
394 | 394 | throw new \Exception("File not found: $shippedJson"); |
395 | 395 | } |
@@ -74,7 +74,7 @@ discard block |
||
74 | 74 | $shares = array_merge($shares, $this->shareManager->getSharedWith($user->getUID(), \OCP\Share::SHARE_TYPE_CIRCLE, null, -1)); |
75 | 75 | |
76 | 76 | // filter out excluded shares and group shares that includes self |
77 | - $shares = array_filter($shares, function (\OCP\Share\IShare $share) use ($user) { |
|
77 | + $shares = array_filter($shares, function(\OCP\Share\IShare $share) use ($user) { |
|
78 | 78 | return $share->getPermissions() > 0 && $share->getShareOwner() !== $user->getUID(); |
79 | 79 | }); |
80 | 80 | |
@@ -186,7 +186,7 @@ discard block |
||
186 | 186 | // null groups which usually appear with group backend |
187 | 187 | // caching inconsistencies |
188 | 188 | $this->logger->debug( |
189 | - 'Could not adjust share target for share ' . $share->getId() . ' to make it consistent: ' . $e->getMessage(), |
|
189 | + 'Could not adjust share target for share '.$share->getId().' to make it consistent: '.$e->getMessage(), |
|
190 | 190 | ['app' => 'files_sharing'] |
191 | 191 | ); |
192 | 192 | } |
@@ -99,24 +99,24 @@ discard block |
||
99 | 99 | * Remove "apps/" from inclusion path for smooth migration to multi app dir |
100 | 100 | */ |
101 | 101 | if (strpos(\OC::$CLASSPATH[$class], 'apps/') === 0) { |
102 | - \OCP\Util::writeLog('core', 'include path for class "' . $class . '" starts with "apps/"', \OCP\Util::DEBUG); |
|
102 | + \OCP\Util::writeLog('core', 'include path for class "'.$class.'" starts with "apps/"', \OCP\Util::DEBUG); |
|
103 | 103 | $paths[] = str_replace('apps/', '', \OC::$CLASSPATH[$class]); |
104 | 104 | } |
105 | 105 | } elseif (strpos($class, 'OC_') === 0) { |
106 | - $paths[] = \OC::$SERVERROOT . '/lib/private/legacy/' . strtolower(str_replace('_', '/', substr($class, 3)) . '.php'); |
|
106 | + $paths[] = \OC::$SERVERROOT.'/lib/private/legacy/'.strtolower(str_replace('_', '/', substr($class, 3)).'.php'); |
|
107 | 107 | } elseif (strpos($class, 'OCA\\') === 0) { |
108 | 108 | list(, $app, $rest) = explode('\\', $class, 3); |
109 | 109 | $app = strtolower($app); |
110 | 110 | $appPath = \OC_App::getAppPath($app); |
111 | 111 | if ($appPath && stream_resolve_include_path($appPath)) { |
112 | - $paths[] = $appPath . '/' . strtolower(str_replace('\\', '/', $rest) . '.php'); |
|
112 | + $paths[] = $appPath.'/'.strtolower(str_replace('\\', '/', $rest).'.php'); |
|
113 | 113 | // If not found in the root of the app directory, insert '/lib' after app id and try again. |
114 | - $paths[] = $appPath . '/lib/' . strtolower(str_replace('\\', '/', $rest) . '.php'); |
|
114 | + $paths[] = $appPath.'/lib/'.strtolower(str_replace('\\', '/', $rest).'.php'); |
|
115 | 115 | } |
116 | 116 | } elseif ($class === 'Test\\TestCase') { |
117 | 117 | // This File is considered public API, so we make sure that the class |
118 | 118 | // can still be loaded, although the PSR-4 paths have not been loaded. |
119 | - $paths[] = \OC::$SERVERROOT . '/tests/lib/TestCase.php'; |
|
119 | + $paths[] = \OC::$SERVERROOT.'/tests/lib/TestCase.php'; |
|
120 | 120 | } |
121 | 121 | return $paths; |
122 | 122 | } |
@@ -127,7 +127,7 @@ discard block |
||
127 | 127 | */ |
128 | 128 | protected function isValidPath($fullPath) { |
129 | 129 | foreach ($this->validRoots as $root => $true) { |
130 | - if (substr($fullPath, 0, strlen($root) + 1) === $root . '/') { |
|
130 | + if (substr($fullPath, 0, strlen($root) + 1) === $root.'/') { |
|
131 | 131 | return true; |
132 | 132 | } |
133 | 133 | } |
@@ -146,7 +146,7 @@ discard block |
||
146 | 146 | $pathsToRequire = $this->memoryCache->get($class); |
147 | 147 | } |
148 | 148 | |
149 | - if(class_exists($class, false)) { |
|
149 | + if (class_exists($class, false)) { |
|
150 | 150 | return false; |
151 | 151 | } |
152 | 152 |
@@ -96,7 +96,7 @@ discard block |
||
96 | 96 | * @return bool |
97 | 97 | */ |
98 | 98 | public function isCodeCheckEnforced() { |
99 | - $notSignedChannels = [ '', 'git']; |
|
99 | + $notSignedChannels = ['', 'git']; |
|
100 | 100 | if (in_array($this->environmentHelper->getChannel(), $notSignedChannels, true)) { |
101 | 101 | return false; |
102 | 102 | } |
@@ -131,7 +131,7 @@ discard block |
||
131 | 131 | $folderToIterate, |
132 | 132 | \RecursiveDirectoryIterator::SKIP_DOTS |
133 | 133 | ); |
134 | - if($root === '') { |
|
134 | + if ($root === '') { |
|
135 | 135 | $root = \OC::$SERVERROOT; |
136 | 136 | } |
137 | 137 | $root = rtrim($root, '/'); |
@@ -160,9 +160,9 @@ discard block |
||
160 | 160 | $tmpFolder = ''; |
161 | 161 | |
162 | 162 | $baseDirectoryLength = strlen($path); |
163 | - foreach($iterator as $filename => $data) { |
|
163 | + foreach ($iterator as $filename => $data) { |
|
164 | 164 | /** @var \DirectoryIterator $data */ |
165 | - if($data->isDir()) { |
|
165 | + if ($data->isDir()) { |
|
166 | 166 | continue; |
167 | 167 | } |
168 | 168 | |
@@ -170,11 +170,11 @@ discard block |
||
170 | 170 | $relativeFileName = ltrim($relativeFileName, '/'); |
171 | 171 | |
172 | 172 | // Exclude signature.json files in the appinfo and root folder |
173 | - if($relativeFileName === 'appinfo/signature.json') { |
|
173 | + if ($relativeFileName === 'appinfo/signature.json') { |
|
174 | 174 | continue; |
175 | 175 | } |
176 | 176 | // Exclude signature.json files in the appinfo and core folder |
177 | - if($relativeFileName === 'core/signature.json') { |
|
177 | + if ($relativeFileName === 'core/signature.json') { |
|
178 | 178 | continue; |
179 | 179 | } |
180 | 180 | |
@@ -183,18 +183,18 @@ discard block |
||
183 | 183 | // to ensure that this will not lead to false positives this will |
184 | 184 | // copy the file to a temporary folder and reset it to the default |
185 | 185 | // values. |
186 | - if($filename === $this->environmentHelper->getServerRoot() . '/.htaccess' |
|
187 | - || $filename === $this->environmentHelper->getServerRoot() . '/.user.ini') { |
|
186 | + if ($filename === $this->environmentHelper->getServerRoot().'/.htaccess' |
|
187 | + || $filename === $this->environmentHelper->getServerRoot().'/.user.ini') { |
|
188 | 188 | |
189 | - if(!$copiedWebserverSettingFiles) { |
|
189 | + if (!$copiedWebserverSettingFiles) { |
|
190 | 190 | $tmpFolder = rtrim($this->tempManager->getTemporaryFolder(), '/'); |
191 | - copy($this->environmentHelper->getServerRoot() . '/.htaccess', $tmpFolder . '/.htaccess'); |
|
192 | - copy($this->environmentHelper->getServerRoot() . '/.user.ini', $tmpFolder . '/.user.ini'); |
|
191 | + copy($this->environmentHelper->getServerRoot().'/.htaccess', $tmpFolder.'/.htaccess'); |
|
192 | + copy($this->environmentHelper->getServerRoot().'/.user.ini', $tmpFolder.'/.user.ini'); |
|
193 | 193 | \OC_Files::setUploadLimit( |
194 | 194 | \OCP\Util::computerFileSize('511MB'), |
195 | 195 | [ |
196 | - '.htaccess' => $tmpFolder . '/.htaccess', |
|
197 | - '.user.ini' => $tmpFolder . '/.user.ini', |
|
196 | + '.htaccess' => $tmpFolder.'/.htaccess', |
|
197 | + '.user.ini' => $tmpFolder.'/.user.ini', |
|
198 | 198 | ] |
199 | 199 | ); |
200 | 200 | } |
@@ -202,8 +202,8 @@ discard block |
||
202 | 202 | |
203 | 203 | // The .user.ini file can contain custom modifications to the file size |
204 | 204 | // as well. |
205 | - if($filename === $this->environmentHelper->getServerRoot() . '/.user.ini') { |
|
206 | - $fileContent = file_get_contents($tmpFolder . '/.user.ini'); |
|
205 | + if ($filename === $this->environmentHelper->getServerRoot().'/.user.ini') { |
|
206 | + $fileContent = file_get_contents($tmpFolder.'/.user.ini'); |
|
207 | 207 | $hashes[$relativeFileName] = hash('sha512', $fileContent); |
208 | 208 | continue; |
209 | 209 | } |
@@ -215,10 +215,10 @@ discard block |
||
215 | 215 | // Thus we ignore everything below the first occurrence of |
216 | 216 | // "#### DO NOT CHANGE ANYTHING ABOVE THIS LINE ####" and have the |
217 | 217 | // hash generated based on this. |
218 | - if($filename === $this->environmentHelper->getServerRoot() . '/.htaccess') { |
|
219 | - $fileContent = file_get_contents($tmpFolder . '/.htaccess'); |
|
218 | + if ($filename === $this->environmentHelper->getServerRoot().'/.htaccess') { |
|
219 | + $fileContent = file_get_contents($tmpFolder.'/.htaccess'); |
|
220 | 220 | $explodedArray = explode('#### DO NOT CHANGE ANYTHING ABOVE THIS LINE ####', $fileContent); |
221 | - if(count($explodedArray) === 2) { |
|
221 | + if (count($explodedArray) === 2) { |
|
222 | 222 | $hashes[$relativeFileName] = hash('sha512', $explodedArray[0]); |
223 | 223 | continue; |
224 | 224 | } |
@@ -267,7 +267,7 @@ discard block |
||
267 | 267 | public function writeAppSignature($path, |
268 | 268 | X509 $certificate, |
269 | 269 | RSA $privateKey) { |
270 | - $appInfoDir = $path . '/appinfo'; |
|
270 | + $appInfoDir = $path.'/appinfo'; |
|
271 | 271 | try { |
272 | 272 | $this->fileAccessHelper->assertDirectoryExists($appInfoDir); |
273 | 273 | |
@@ -275,12 +275,12 @@ discard block |
||
275 | 275 | $hashes = $this->generateHashes($iterator, $path); |
276 | 276 | $signature = $this->createSignatureData($hashes, $certificate, $privateKey); |
277 | 277 | $this->fileAccessHelper->file_put_contents( |
278 | - $appInfoDir . '/signature.json', |
|
278 | + $appInfoDir.'/signature.json', |
|
279 | 279 | json_encode($signature, JSON_PRETTY_PRINT) |
280 | 280 | ); |
281 | - } catch (\Exception $e){ |
|
281 | + } catch (\Exception $e) { |
|
282 | 282 | if (!$this->fileAccessHelper->is_writable($appInfoDir)) { |
283 | - throw new \Exception($appInfoDir . ' is not writable'); |
|
283 | + throw new \Exception($appInfoDir.' is not writable'); |
|
284 | 284 | } |
285 | 285 | throw $e; |
286 | 286 | } |
@@ -297,7 +297,7 @@ discard block |
||
297 | 297 | public function writeCoreSignature(X509 $certificate, |
298 | 298 | RSA $rsa, |
299 | 299 | $path) { |
300 | - $coreDir = $path . '/core'; |
|
300 | + $coreDir = $path.'/core'; |
|
301 | 301 | try { |
302 | 302 | |
303 | 303 | $this->fileAccessHelper->assertDirectoryExists($coreDir); |
@@ -305,12 +305,12 @@ discard block |
||
305 | 305 | $hashes = $this->generateHashes($iterator, $path); |
306 | 306 | $signatureData = $this->createSignatureData($hashes, $certificate, $rsa); |
307 | 307 | $this->fileAccessHelper->file_put_contents( |
308 | - $coreDir . '/signature.json', |
|
308 | + $coreDir.'/signature.json', |
|
309 | 309 | json_encode($signatureData, JSON_PRETTY_PRINT) |
310 | 310 | ); |
311 | - } catch (\Exception $e){ |
|
311 | + } catch (\Exception $e) { |
|
312 | 312 | if (!$this->fileAccessHelper->is_writable($coreDir)) { |
313 | - throw new \Exception($coreDir . ' is not writable'); |
|
313 | + throw new \Exception($coreDir.' is not writable'); |
|
314 | 314 | } |
315 | 315 | throw $e; |
316 | 316 | } |
@@ -327,12 +327,12 @@ discard block |
||
327 | 327 | * @throws \Exception |
328 | 328 | */ |
329 | 329 | private function verify($signaturePath, $basePath, $certificateCN) { |
330 | - if(!$this->isCodeCheckEnforced()) { |
|
330 | + if (!$this->isCodeCheckEnforced()) { |
|
331 | 331 | return []; |
332 | 332 | } |
333 | 333 | |
334 | 334 | $signatureData = json_decode($this->fileAccessHelper->file_get_contents($signaturePath), true); |
335 | - if(!is_array($signatureData)) { |
|
335 | + if (!is_array($signatureData)) { |
|
336 | 336 | throw new InvalidSignatureException('Signature data not found.'); |
337 | 337 | } |
338 | 338 | |
@@ -346,11 +346,11 @@ discard block |
||
346 | 346 | $rootCertificatePublicKey = $this->fileAccessHelper->file_get_contents($this->environmentHelper->getServerRoot().'/resources/codesigning/root.crt'); |
347 | 347 | $x509->loadCA($rootCertificatePublicKey); |
348 | 348 | $x509->loadX509($certificate); |
349 | - if(!$x509->validateSignature()) { |
|
349 | + if (!$x509->validateSignature()) { |
|
350 | 350 | throw new InvalidSignatureException('Certificate is not valid.'); |
351 | 351 | } |
352 | 352 | // Verify if certificate has proper CN. "core" CN is always trusted. |
353 | - if($x509->getDN(X509::DN_OPENSSL)['CN'] !== $certificateCN && $x509->getDN(X509::DN_OPENSSL)['CN'] !== 'core') { |
|
353 | + if ($x509->getDN(X509::DN_OPENSSL)['CN'] !== $certificateCN && $x509->getDN(X509::DN_OPENSSL)['CN'] !== 'core') { |
|
354 | 354 | throw new InvalidSignatureException( |
355 | 355 | sprintf('Certificate is not valid for required scope. (Requested: %s, current: CN=%s)', $certificateCN, $x509->getDN(true)['CN']) |
356 | 356 | ); |
@@ -363,7 +363,7 @@ discard block |
||
363 | 363 | $rsa->setMGFHash('sha512'); |
364 | 364 | // See https://tools.ietf.org/html/rfc3447#page-38 |
365 | 365 | $rsa->setSaltLength(0); |
366 | - if(!$rsa->verify(json_encode($expectedHashes), $signature)) { |
|
366 | + if (!$rsa->verify(json_encode($expectedHashes), $signature)) { |
|
367 | 367 | throw new InvalidSignatureException('Signature could not get verified.'); |
368 | 368 | } |
369 | 369 | |
@@ -372,9 +372,9 @@ discard block |
||
372 | 372 | // |
373 | 373 | // Due to this reason we exclude the whole updater/ folder from the code |
374 | 374 | // integrity check. |
375 | - if($basePath === $this->environmentHelper->getServerRoot()) { |
|
376 | - foreach($expectedHashes as $fileName => $hash) { |
|
377 | - if(strpos($fileName, 'updater/') === 0) { |
|
375 | + if ($basePath === $this->environmentHelper->getServerRoot()) { |
|
376 | + foreach ($expectedHashes as $fileName => $hash) { |
|
377 | + if (strpos($fileName, 'updater/') === 0) { |
|
378 | 378 | unset($expectedHashes[$fileName]); |
379 | 379 | } |
380 | 380 | } |
@@ -386,23 +386,23 @@ discard block |
||
386 | 386 | $differencesB = array_diff($currentInstanceHashes, $expectedHashes); |
387 | 387 | $differences = array_unique(array_merge($differencesA, $differencesB)); |
388 | 388 | $differenceArray = []; |
389 | - foreach($differences as $filename => $hash) { |
|
389 | + foreach ($differences as $filename => $hash) { |
|
390 | 390 | // Check if file should not exist in the new signature table |
391 | - if(!array_key_exists($filename, $expectedHashes)) { |
|
391 | + if (!array_key_exists($filename, $expectedHashes)) { |
|
392 | 392 | $differenceArray['EXTRA_FILE'][$filename]['expected'] = ''; |
393 | 393 | $differenceArray['EXTRA_FILE'][$filename]['current'] = $hash; |
394 | 394 | continue; |
395 | 395 | } |
396 | 396 | |
397 | 397 | // Check if file is missing |
398 | - if(!array_key_exists($filename, $currentInstanceHashes)) { |
|
398 | + if (!array_key_exists($filename, $currentInstanceHashes)) { |
|
399 | 399 | $differenceArray['FILE_MISSING'][$filename]['expected'] = $expectedHashes[$filename]; |
400 | 400 | $differenceArray['FILE_MISSING'][$filename]['current'] = ''; |
401 | 401 | continue; |
402 | 402 | } |
403 | 403 | |
404 | 404 | // Check if hash does mismatch |
405 | - if($expectedHashes[$filename] !== $currentInstanceHashes[$filename]) { |
|
405 | + if ($expectedHashes[$filename] !== $currentInstanceHashes[$filename]) { |
|
406 | 406 | $differenceArray['INVALID_HASH'][$filename]['expected'] = $expectedHashes[$filename]; |
407 | 407 | $differenceArray['INVALID_HASH'][$filename]['current'] = $currentInstanceHashes[$filename]; |
408 | 408 | continue; |
@@ -422,7 +422,7 @@ discard block |
||
422 | 422 | */ |
423 | 423 | public function hasPassedCheck() { |
424 | 424 | $results = $this->getResults(); |
425 | - if(empty($results)) { |
|
425 | + if (empty($results)) { |
|
426 | 426 | return true; |
427 | 427 | } |
428 | 428 | |
@@ -434,7 +434,7 @@ discard block |
||
434 | 434 | */ |
435 | 435 | public function getResults() { |
436 | 436 | $cachedResults = $this->cache->get(self::CACHE_KEY); |
437 | - if(!is_null($cachedResults)) { |
|
437 | + if (!is_null($cachedResults)) { |
|
438 | 438 | return json_decode($cachedResults, true); |
439 | 439 | } |
440 | 440 | |
@@ -453,7 +453,7 @@ discard block |
||
453 | 453 | private function storeResults($scope, array $result) { |
454 | 454 | $resultArray = $this->getResults(); |
455 | 455 | unset($resultArray[$scope]); |
456 | - if(!empty($result)) { |
|
456 | + if (!empty($result)) { |
|
457 | 457 | $resultArray[$scope] = $result; |
458 | 458 | } |
459 | 459 | if ($this->config !== null) { |
@@ -505,11 +505,11 @@ discard block |
||
505 | 505 | */ |
506 | 506 | public function verifyAppSignature($appId, $path = '') { |
507 | 507 | try { |
508 | - if($path === '') { |
|
508 | + if ($path === '') { |
|
509 | 509 | $path = $this->appLocator->getAppPath($appId); |
510 | 510 | } |
511 | 511 | $result = $this->verify( |
512 | - $path . '/appinfo/signature.json', |
|
512 | + $path.'/appinfo/signature.json', |
|
513 | 513 | $path, |
514 | 514 | $appId |
515 | 515 | ); |
@@ -559,7 +559,7 @@ discard block |
||
559 | 559 | public function verifyCoreSignature() { |
560 | 560 | try { |
561 | 561 | $result = $this->verify( |
562 | - $this->environmentHelper->getServerRoot() . '/core/signature.json', |
|
562 | + $this->environmentHelper->getServerRoot().'/core/signature.json', |
|
563 | 563 | $this->environmentHelper->getServerRoot(), |
564 | 564 | 'core' |
565 | 565 | ); |
@@ -584,18 +584,18 @@ discard block |
||
584 | 584 | $this->cleanResults(); |
585 | 585 | $this->verifyCoreSignature(); |
586 | 586 | $appIds = $this->appLocator->getAllApps(); |
587 | - foreach($appIds as $appId) { |
|
587 | + foreach ($appIds as $appId) { |
|
588 | 588 | // If an application is shipped a valid signature is required |
589 | 589 | $isShipped = $this->appManager->isShipped($appId); |
590 | 590 | $appNeedsToBeChecked = false; |
591 | 591 | if ($isShipped) { |
592 | 592 | $appNeedsToBeChecked = true; |
593 | - } elseif ($this->fileAccessHelper->file_exists($this->appLocator->getAppPath($appId) . '/appinfo/signature.json')) { |
|
593 | + } elseif ($this->fileAccessHelper->file_exists($this->appLocator->getAppPath($appId).'/appinfo/signature.json')) { |
|
594 | 594 | // Otherwise only if the application explicitly ships a signature.json file |
595 | 595 | $appNeedsToBeChecked = true; |
596 | 596 | } |
597 | 597 | |
598 | - if($appNeedsToBeChecked) { |
|
598 | + if ($appNeedsToBeChecked) { |
|
599 | 599 | $this->verifyAppSignature($appId); |
600 | 600 | } |
601 | 601 | } |
@@ -53,10 +53,10 @@ discard block |
||
53 | 53 | * the transformed app id, defaults to OCA\ |
54 | 54 | * @return string the starting namespace for the app |
55 | 55 | */ |
56 | - public static function buildAppNamespace($appId, $topNamespace='OCA\\') { |
|
56 | + public static function buildAppNamespace($appId, $topNamespace = 'OCA\\') { |
|
57 | 57 | // Hit the cache! |
58 | 58 | if (isset(self::$nameSpaceCache[$appId])) { |
59 | - return $topNamespace . self::$nameSpaceCache[$appId]; |
|
59 | + return $topNamespace.self::$nameSpaceCache[$appId]; |
|
60 | 60 | } |
61 | 61 | |
62 | 62 | $appInfo = \OC_App::getAppInfo($appId); |
@@ -67,7 +67,7 @@ discard block |
||
67 | 67 | self::$nameSpaceCache[$appId] = ucfirst($appId); |
68 | 68 | } |
69 | 69 | |
70 | - return $topNamespace . self::$nameSpaceCache[$appId]; |
|
70 | + return $topNamespace.self::$nameSpaceCache[$appId]; |
|
71 | 71 | } |
72 | 72 | |
73 | 73 | |
@@ -90,7 +90,7 @@ discard block |
||
90 | 90 | // first try $controllerName then go for \OCA\AppName\Controller\$controllerName |
91 | 91 | try { |
92 | 92 | $controller = $container->query($controllerName); |
93 | - } catch(QueryException $e) { |
|
93 | + } catch (QueryException $e) { |
|
94 | 94 | if ($appName === 'core') { |
95 | 95 | $appNameSpace = 'OC\\Core'; |
96 | 96 | } else if ($appName === 'settings') { |
@@ -98,7 +98,7 @@ discard block |
||
98 | 98 | } else { |
99 | 99 | $appNameSpace = self::buildAppNamespace($appName); |
100 | 100 | } |
101 | - $controllerName = $appNameSpace . '\\Controller\\' . $controllerName; |
|
101 | + $controllerName = $appNameSpace.'\\Controller\\'.$controllerName; |
|
102 | 102 | $controller = $container->query($controllerName); |
103 | 103 | } |
104 | 104 | |
@@ -116,17 +116,17 @@ discard block |
||
116 | 116 | |
117 | 117 | $io = $container['OCP\\AppFramework\\Http\\IOutput']; |
118 | 118 | |
119 | - if(!is_null($httpHeaders)) { |
|
119 | + if (!is_null($httpHeaders)) { |
|
120 | 120 | $io->setHeader($httpHeaders); |
121 | 121 | } |
122 | 122 | |
123 | - foreach($responseHeaders as $name => $value) { |
|
124 | - $io->setHeader($name . ': ' . $value); |
|
123 | + foreach ($responseHeaders as $name => $value) { |
|
124 | + $io->setHeader($name.': '.$value); |
|
125 | 125 | } |
126 | 126 | |
127 | - foreach($responseCookies as $name => $value) { |
|
127 | + foreach ($responseCookies as $name => $value) { |
|
128 | 128 | $expireDate = null; |
129 | - if($value['expireDate'] instanceof \DateTime) { |
|
129 | + if ($value['expireDate'] instanceof \DateTime) { |
|
130 | 130 | $expireDate = $value['expireDate']->getTimestamp(); |
131 | 131 | } |
132 | 132 | $io->setCookie( |
@@ -150,7 +150,7 @@ discard block |
||
150 | 150 | if ($response instanceof ICallbackResponse) { |
151 | 151 | $response->callback($io); |
152 | 152 | } else if (!is_null($output)) { |
153 | - $io->setHeader('Content-Length: ' . strlen($output)); |
|
153 | + $io->setHeader('Content-Length: '.strlen($output)); |
|
154 | 154 | $io->setOutput($output); |
155 | 155 | } |
156 | 156 | } |
@@ -170,14 +170,14 @@ discard block |
||
170 | 170 | * @param DIContainer $container an instance of a pimple container. |
171 | 171 | */ |
172 | 172 | public static function part($controllerName, $methodName, array $urlParams, |
173 | - DIContainer $container){ |
|
173 | + DIContainer $container) { |
|
174 | 174 | |
175 | 175 | $container['urlParams'] = $urlParams; |
176 | 176 | $controller = $container[$controllerName]; |
177 | 177 | |
178 | 178 | $dispatcher = $container['Dispatcher']; |
179 | 179 | |
180 | - list(, , $output) = $dispatcher->dispatch($controller, $methodName); |
|
180 | + list(,, $output) = $dispatcher->dispatch($controller, $methodName); |
|
181 | 181 | return $output; |
182 | 182 | } |
183 | 183 |
@@ -74,13 +74,13 @@ discard block |
||
74 | 74 | */ |
75 | 75 | public function getMountsForUser(IUser $user) { |
76 | 76 | $loader = $this->loader; |
77 | - $mounts = array_map(function (IMountProvider $provider) use ($user, $loader) { |
|
77 | + $mounts = array_map(function(IMountProvider $provider) use ($user, $loader) { |
|
78 | 78 | return $provider->getMountsForUser($user, $loader); |
79 | 79 | }, $this->providers); |
80 | - $mounts = array_filter($mounts, function ($result) { |
|
80 | + $mounts = array_filter($mounts, function($result) { |
|
81 | 81 | return is_array($result); |
82 | 82 | }); |
83 | - return array_reduce($mounts, function (array $mounts, array $providerMounts) { |
|
83 | + return array_reduce($mounts, function(array $mounts, array $providerMounts) { |
|
84 | 84 | return array_merge($mounts, $providerMounts); |
85 | 85 | }, array()); |
86 | 86 | } |
@@ -89,10 +89,10 @@ discard block |
||
89 | 89 | // shared mount provider gets to go last since it needs to know existing files |
90 | 90 | // to check for name collisions |
91 | 91 | $firstMounts = []; |
92 | - $firstProviders = array_filter($this->providers, function (IMountProvider $provider) { |
|
92 | + $firstProviders = array_filter($this->providers, function(IMountProvider $provider) { |
|
93 | 93 | return (get_class($provider) !== 'OCA\Files_Sharing\MountProvider'); |
94 | 94 | }); |
95 | - $lastProviders = array_filter($this->providers, function (IMountProvider $provider) { |
|
95 | + $lastProviders = array_filter($this->providers, function(IMountProvider $provider) { |
|
96 | 96 | return (get_class($provider) === 'OCA\Files_Sharing\MountProvider'); |
97 | 97 | }); |
98 | 98 | foreach ($firstProviders as $provider) { |
@@ -128,11 +128,11 @@ discard block |
||
128 | 128 | $providers = array_reverse($this->homeProviders); // call the latest registered provider first to give apps an opportunity to overwrite builtin |
129 | 129 | foreach ($providers as $homeProvider) { |
130 | 130 | if ($mount = $homeProvider->getHomeMountForUser($user, $this->loader)) { |
131 | - $mount->setMountPoint('/' . $user->getUID()); //make sure the mountpoint is what we expect |
|
131 | + $mount->setMountPoint('/'.$user->getUID()); //make sure the mountpoint is what we expect |
|
132 | 132 | return $mount; |
133 | 133 | } |
134 | 134 | } |
135 | - throw new \Exception('No home storage configured for user ' . $user); |
|
135 | + throw new \Exception('No home storage configured for user '.$user); |
|
136 | 136 | } |
137 | 137 | |
138 | 138 | /** |