@@ -66,10 +66,10 @@ |
||
66 | 66 | } |
67 | 67 | |
68 | 68 | public function stream_seek($offset, $whence = SEEK_SET) { |
69 | - if ($whence === SEEK_END){ |
|
69 | + if ($whence === SEEK_END) { |
|
70 | 70 | // go to the end to find out last position's offset |
71 | 71 | $oldOffset = $this->stream_tell(); |
72 | - if (fseek($this->source, 0, $whence) !== 0){ |
|
72 | + if (fseek($this->source, 0, $whence) !== 0) { |
|
73 | 73 | return false; |
74 | 74 | } |
75 | 75 | $whence = SEEK_SET; |
@@ -24,8 +24,8 @@ |
||
24 | 24 | use OCP\Files\ObjectStore\IObjectStore; |
25 | 25 | |
26 | 26 | // TODO: proper composer |
27 | -set_include_path(get_include_path() . PATH_SEPARATOR . |
|
28 | - \OC_App::getAppPath('files_external') . '/3rdparty/aws-sdk-php'); |
|
27 | +set_include_path(get_include_path().PATH_SEPARATOR. |
|
28 | + \OC_App::getAppPath('files_external').'/3rdparty/aws-sdk-php'); |
|
29 | 29 | require_once 'aws-autoloader.php'; |
30 | 30 | |
31 | 31 | class S3 implements IObjectStore { |
@@ -53,9 +53,9 @@ discard block |
||
53 | 53 | throw new \Exception('missing IObjectStore instance'); |
54 | 54 | } |
55 | 55 | if (isset($params['storageid'])) { |
56 | - $this->id = 'object::store:' . $params['storageid']; |
|
56 | + $this->id = 'object::store:'.$params['storageid']; |
|
57 | 57 | } else { |
58 | - $this->id = 'object::store:' . $this->objectStore->getStorageId(); |
|
58 | + $this->id = 'object::store:'.$this->objectStore->getStorageId(); |
|
59 | 59 | } |
60 | 60 | if (isset($params['objectPrefix'])) { |
61 | 61 | $this->objectPrefix = $params['objectPrefix']; |
@@ -185,7 +185,7 @@ discard block |
||
185 | 185 | $this->objectStore->deleteObject($this->getURN($stat['fileid'])); |
186 | 186 | } catch (\Exception $ex) { |
187 | 187 | if ($ex->getCode() !== 404) { |
188 | - \OCP\Util::writeLog('objectstore', 'Could not delete object: ' . $ex->getMessage(), \OCP\Util::ERROR); |
|
188 | + \OCP\Util::writeLog('objectstore', 'Could not delete object: '.$ex->getMessage(), \OCP\Util::ERROR); |
|
189 | 189 | return false; |
190 | 190 | } else { |
191 | 191 | //removing from cache is ok as it does not exist in the objectstore anyway |
@@ -217,7 +217,7 @@ discard block |
||
217 | 217 | */ |
218 | 218 | protected function getURN($fileId) { |
219 | 219 | if (is_numeric($fileId)) { |
220 | - return $this->objectPrefix . $fileId; |
|
220 | + return $this->objectPrefix.$fileId; |
|
221 | 221 | } |
222 | 222 | return null; |
223 | 223 | } |
@@ -263,7 +263,7 @@ discard block |
||
263 | 263 | try { |
264 | 264 | return $this->objectStore->readObject($this->getURN($stat['fileid'])); |
265 | 265 | } catch (\Exception $ex) { |
266 | - \OCP\Util::writeLog('objectstore', 'Could not get object: ' . $ex->getMessage(), \OCP\Util::ERROR); |
|
266 | + \OCP\Util::writeLog('objectstore', 'Could not get object: '.$ex->getMessage(), \OCP\Util::ERROR); |
|
267 | 267 | return false; |
268 | 268 | } |
269 | 269 | } else { |
@@ -292,7 +292,7 @@ discard block |
||
292 | 292 | file_put_contents($tmpFile, $source); |
293 | 293 | } |
294 | 294 | $handle = fopen($tmpFile, $mode); |
295 | - return CallbackWrapper::wrap($handle, null, null, function () use ($path, $tmpFile) { |
|
295 | + return CallbackWrapper::wrap($handle, null, null, function() use ($path, $tmpFile) { |
|
296 | 296 | $this->writeBack($tmpFile, $path); |
297 | 297 | }); |
298 | 298 | } |
@@ -301,7 +301,7 @@ discard block |
||
301 | 301 | |
302 | 302 | public function file_exists($path) { |
303 | 303 | $path = $this->normalizePath($path); |
304 | - return (bool)$this->stat($path); |
|
304 | + return (bool) $this->stat($path); |
|
305 | 305 | } |
306 | 306 | |
307 | 307 | public function rename($source, $target) { |
@@ -357,7 +357,7 @@ discard block |
||
357 | 357 | $this->objectStore->writeObject($this->getURN($fileId), fopen('php://memory', 'r')); |
358 | 358 | } catch (\Exception $ex) { |
359 | 359 | $this->getCache()->remove($path); |
360 | - \OCP\Util::writeLog('objectstore', 'Could not create object: ' . $ex->getMessage(), \OCP\Util::ERROR); |
|
360 | + \OCP\Util::writeLog('objectstore', 'Could not create object: '.$ex->getMessage(), \OCP\Util::ERROR); |
|
361 | 361 | return false; |
362 | 362 | } |
363 | 363 | } |
@@ -386,7 +386,7 @@ discard block |
||
386 | 386 | $this->objectStore->writeObject($this->getURN($fileId), fopen($tmpFile, 'r')); |
387 | 387 | } catch (\Exception $ex) { |
388 | 388 | $this->getCache()->remove($path); |
389 | - \OCP\Util::writeLog('objectstore', 'Could not create object: ' . $ex->getMessage(), \OCP\Util::ERROR); |
|
389 | + \OCP\Util::writeLog('objectstore', 'Could not create object: '.$ex->getMessage(), \OCP\Util::ERROR); |
|
390 | 390 | throw $ex; // make this bubble up |
391 | 391 | } |
392 | 392 | } |
@@ -33,15 +33,15 @@ |
||
33 | 33 | * @param array $params |
34 | 34 | */ |
35 | 35 | public function __construct($params) { |
36 | - if ( ! isset($params['user']) || ! $params['user'] instanceof User) { |
|
36 | + if (!isset($params['user']) || !$params['user'] instanceof User) { |
|
37 | 37 | throw new \Exception('missing user object in parameters'); |
38 | 38 | } |
39 | 39 | $this->user = $params['user']; |
40 | 40 | parent::__construct($params); |
41 | 41 | } |
42 | 42 | |
43 | - public function getId () { |
|
44 | - return 'object::user:' . $this->user->getUID(); |
|
43 | + public function getId() { |
|
44 | + return 'object::user:'.$this->user->getUID(); |
|
45 | 45 | } |
46 | 46 | |
47 | 47 | /** |
@@ -50,6 +50,6 @@ |
||
50 | 50 | public function getBucket($numBuckets = 64) { |
51 | 51 | $hash = md5($this->user->getUID()); |
52 | 52 | $num = hexdec(substr($hash, 0, 4)); |
53 | - return (string)($num % $numBuckets); |
|
53 | + return (string) ($num % $numBuckets); |
|
54 | 54 | } |
55 | 55 | } |
@@ -47,7 +47,7 @@ discard block |
||
47 | 47 | throw new \Exception("Access Key, Secret and Bucket have to be configured."); |
48 | 48 | } |
49 | 49 | |
50 | - $this->id = 'amazon::' . $params['bucket']; |
|
50 | + $this->id = 'amazon::'.$params['bucket']; |
|
51 | 51 | |
52 | 52 | $this->test = isset($params['test']); |
53 | 53 | $this->bucket = $params['bucket']; |
@@ -73,7 +73,7 @@ discard block |
||
73 | 73 | } |
74 | 74 | |
75 | 75 | $scheme = (isset($this->params['use_ssl']) && $this->params['use_ssl'] === false) ? 'http' : 'https'; |
76 | - $base_url = $scheme . '://' . $this->params['hostname'] . ':' . $this->params['port'] . '/'; |
|
76 | + $base_url = $scheme.'://'.$this->params['hostname'].':'.$this->params['port'].'/'; |
|
77 | 77 | |
78 | 78 | $options = [ |
79 | 79 | 'key' => $this->params['key'], |
@@ -106,7 +106,7 @@ discard block |
||
106 | 106 | $this->testTimeout(); |
107 | 107 | } catch (S3Exception $e) { |
108 | 108 | \OCP\Util::logException('files_external', $e); |
109 | - throw new \Exception('Creation of bucket failed. ' . $e->getMessage()); |
|
109 | + throw new \Exception('Creation of bucket failed. '.$e->getMessage()); |
|
110 | 110 | } |
111 | 111 | } |
112 | 112 |
@@ -102,7 +102,7 @@ discard block |
||
102 | 102 | |
103 | 103 | // Update the alternative mimetypes to avoid having to look them up each time. |
104 | 104 | foreach ($this->mimetypes as $mimeType) { |
105 | - $this->secureMimeTypes[$mimeType[0]] = isset($mimeType[1]) ? $mimeType[1]: $mimeType[0]; |
|
105 | + $this->secureMimeTypes[$mimeType[0]] = isset($mimeType[1]) ? $mimeType[1] : $mimeType[0]; |
|
106 | 106 | } |
107 | 107 | } |
108 | 108 | |
@@ -114,10 +114,10 @@ discard block |
||
114 | 114 | return; |
115 | 115 | } |
116 | 116 | |
117 | - $this->mimeTypeAlias = json_decode(file_get_contents($this->defaultConfigDir . '/mimetypealiases.dist.json'), true); |
|
117 | + $this->mimeTypeAlias = json_decode(file_get_contents($this->defaultConfigDir.'/mimetypealiases.dist.json'), true); |
|
118 | 118 | |
119 | - if (file_exists($this->customConfigDir . '/mimetypealiases.json')) { |
|
120 | - $custom = json_decode(file_get_contents($this->customConfigDir . '/mimetypealiases.json'), true); |
|
119 | + if (file_exists($this->customConfigDir.'/mimetypealiases.json')) { |
|
120 | + $custom = json_decode(file_get_contents($this->customConfigDir.'/mimetypealiases.json'), true); |
|
121 | 121 | $this->mimeTypeAlias = array_merge($this->mimeTypeAlias, $custom); |
122 | 122 | } |
123 | 123 | } |
@@ -138,11 +138,11 @@ discard block |
||
138 | 138 | return; |
139 | 139 | } |
140 | 140 | |
141 | - $mimetypeMapping = json_decode(file_get_contents($this->defaultConfigDir . '/mimetypemapping.dist.json'), true); |
|
141 | + $mimetypeMapping = json_decode(file_get_contents($this->defaultConfigDir.'/mimetypemapping.dist.json'), true); |
|
142 | 142 | |
143 | 143 | //Check if need to load custom mappings |
144 | - if (file_exists($this->customConfigDir . '/mimetypemapping.json')) { |
|
145 | - $custom = json_decode(file_get_contents($this->customConfigDir . '/mimetypemapping.json'), true); |
|
144 | + if (file_exists($this->customConfigDir.'/mimetypemapping.json')) { |
|
145 | + $custom = json_decode(file_get_contents($this->customConfigDir.'/mimetypemapping.json'), true); |
|
146 | 146 | $mimetypeMapping = array_merge($mimetypeMapping, $custom); |
147 | 147 | } |
148 | 148 | |
@@ -306,7 +306,7 @@ discard block |
||
306 | 306 | |
307 | 307 | // Icon exists? |
308 | 308 | try { |
309 | - $this->mimetypeIcons[$mimetype] = $this->urlGenerator->imagePath('core', 'filetypes/' . $icon . '.svg'); |
|
309 | + $this->mimetypeIcons[$mimetype] = $this->urlGenerator->imagePath('core', 'filetypes/'.$icon.'.svg'); |
|
310 | 310 | return $this->mimetypeIcons[$mimetype]; |
311 | 311 | } catch (\RuntimeException $e) { |
312 | 312 | // Specified image not found |
@@ -315,7 +315,7 @@ discard block |
||
315 | 315 | // Try only the first part of the filetype |
316 | 316 | $mimePart = substr($icon, 0, strpos($icon, '-')); |
317 | 317 | try { |
318 | - $this->mimetypeIcons[$mimetype] = $this->urlGenerator->imagePath('core', 'filetypes/' . $mimePart . '.svg'); |
|
318 | + $this->mimetypeIcons[$mimetype] = $this->urlGenerator->imagePath('core', 'filetypes/'.$mimePart.'.svg'); |
|
319 | 319 | return $this->mimetypeIcons[$mimetype]; |
320 | 320 | } catch (\RuntimeException $e) { |
321 | 321 | // Image for the first part of the mimetype not found |
@@ -125,9 +125,9 @@ discard block |
||
125 | 125 | $path = '/'; |
126 | 126 | } |
127 | 127 | if ($path[0] !== '/') { |
128 | - $path = '/' . $path; |
|
128 | + $path = '/'.$path; |
|
129 | 129 | } |
130 | - return $this->fakeRoot . $path; |
|
130 | + return $this->fakeRoot.$path; |
|
131 | 131 | } |
132 | 132 | |
133 | 133 | /** |
@@ -139,7 +139,7 @@ discard block |
||
139 | 139 | public function chroot($fakeRoot) { |
140 | 140 | if (!$fakeRoot == '') { |
141 | 141 | if ($fakeRoot[0] !== '/') { |
142 | - $fakeRoot = '/' . $fakeRoot; |
|
142 | + $fakeRoot = '/'.$fakeRoot; |
|
143 | 143 | } |
144 | 144 | } |
145 | 145 | $this->fakeRoot = $fakeRoot; |
@@ -171,7 +171,7 @@ discard block |
||
171 | 171 | } |
172 | 172 | |
173 | 173 | // missing slashes can cause wrong matches! |
174 | - $root = rtrim($this->fakeRoot, '/') . '/'; |
|
174 | + $root = rtrim($this->fakeRoot, '/').'/'; |
|
175 | 175 | |
176 | 176 | if (strpos($path, $root) !== 0) { |
177 | 177 | return null; |
@@ -277,7 +277,7 @@ discard block |
||
277 | 277 | if ($mount instanceof MoveableMount) { |
278 | 278 | // cut of /user/files to get the relative path to data/user/files |
279 | 279 | $pathParts = explode('/', $path, 4); |
280 | - $relPath = '/' . $pathParts[3]; |
|
280 | + $relPath = '/'.$pathParts[3]; |
|
281 | 281 | $this->lockFile($relPath, ILockingProvider::LOCK_SHARED, true); |
282 | 282 | \OC_Hook::emit( |
283 | 283 | Filesystem::CLASSNAME, "umount", |
@@ -688,7 +688,7 @@ discard block |
||
688 | 688 | } |
689 | 689 | $postFix = (substr($path, -1, 1) === '/') ? '/' : ''; |
690 | 690 | $absolutePath = Filesystem::normalizePath($this->getAbsolutePath($path)); |
691 | - $mount = Filesystem::getMountManager()->find($absolutePath . $postFix); |
|
691 | + $mount = Filesystem::getMountManager()->find($absolutePath.$postFix); |
|
692 | 692 | if ($mount and $mount->getInternalPath($absolutePath) === '') { |
693 | 693 | return $this->removeMount($mount, $absolutePath); |
694 | 694 | } |
@@ -954,7 +954,7 @@ discard block |
||
954 | 954 | $hooks[] = 'write'; |
955 | 955 | break; |
956 | 956 | default: |
957 | - \OCP\Util::writeLog('core', 'invalid mode (' . $mode . ') for ' . $path, \OCP\Util::ERROR); |
|
957 | + \OCP\Util::writeLog('core', 'invalid mode ('.$mode.') for '.$path, \OCP\Util::ERROR); |
|
958 | 958 | } |
959 | 959 | |
960 | 960 | if ($mode !== 'r' && $mode !== 'w') { |
@@ -1058,7 +1058,7 @@ discard block |
||
1058 | 1058 | array(Filesystem::signal_param_path => $this->getHookPath($path)) |
1059 | 1059 | ); |
1060 | 1060 | } |
1061 | - list($storage, $internalPath) = Filesystem::resolvePath($absolutePath . $postFix); |
|
1061 | + list($storage, $internalPath) = Filesystem::resolvePath($absolutePath.$postFix); |
|
1062 | 1062 | if ($storage) { |
1063 | 1063 | $result = $storage->hash($type, $internalPath, $raw); |
1064 | 1064 | return $result; |
@@ -1109,7 +1109,7 @@ discard block |
||
1109 | 1109 | |
1110 | 1110 | $run = $this->runHooks($hooks, $path); |
1111 | 1111 | /** @var \OC\Files\Storage\Storage $storage */ |
1112 | - list($storage, $internalPath) = Filesystem::resolvePath($absolutePath . $postFix); |
|
1112 | + list($storage, $internalPath) = Filesystem::resolvePath($absolutePath.$postFix); |
|
1113 | 1113 | if ($run and $storage) { |
1114 | 1114 | if (in_array('write', $hooks) || in_array('delete', $hooks)) { |
1115 | 1115 | $this->changeLock($path, ILockingProvider::LOCK_EXCLUSIVE); |
@@ -1148,7 +1148,7 @@ discard block |
||
1148 | 1148 | $unlockLater = true; |
1149 | 1149 | // make sure our unlocking callback will still be called if connection is aborted |
1150 | 1150 | ignore_user_abort(true); |
1151 | - $result = CallbackWrapper::wrap($result, null, null, function () use ($hooks, $path) { |
|
1151 | + $result = CallbackWrapper::wrap($result, null, null, function() use ($hooks, $path) { |
|
1152 | 1152 | if (in_array('write', $hooks)) { |
1153 | 1153 | $this->unlockFile($path, ILockingProvider::LOCK_EXCLUSIVE); |
1154 | 1154 | } else if (in_array('read', $hooks)) { |
@@ -1209,7 +1209,7 @@ discard block |
||
1209 | 1209 | return true; |
1210 | 1210 | } |
1211 | 1211 | |
1212 | - return (strlen($fullPath) > strlen($defaultRoot)) && (substr($fullPath, 0, strlen($defaultRoot) + 1) === $defaultRoot . '/'); |
|
1212 | + return (strlen($fullPath) > strlen($defaultRoot)) && (substr($fullPath, 0, strlen($defaultRoot) + 1) === $defaultRoot.'/'); |
|
1213 | 1213 | } |
1214 | 1214 | |
1215 | 1215 | /** |
@@ -1228,7 +1228,7 @@ discard block |
||
1228 | 1228 | if ($hook != 'read') { |
1229 | 1229 | \OC_Hook::emit( |
1230 | 1230 | Filesystem::CLASSNAME, |
1231 | - $prefix . $hook, |
|
1231 | + $prefix.$hook, |
|
1232 | 1232 | array( |
1233 | 1233 | Filesystem::signal_param_run => &$run, |
1234 | 1234 | Filesystem::signal_param_path => $path |
@@ -1237,7 +1237,7 @@ discard block |
||
1237 | 1237 | } elseif (!$post) { |
1238 | 1238 | \OC_Hook::emit( |
1239 | 1239 | Filesystem::CLASSNAME, |
1240 | - $prefix . $hook, |
|
1240 | + $prefix.$hook, |
|
1241 | 1241 | array( |
1242 | 1242 | Filesystem::signal_param_path => $path |
1243 | 1243 | ) |
@@ -1332,7 +1332,7 @@ discard block |
||
1332 | 1332 | return $this->getPartFileInfo($path); |
1333 | 1333 | } |
1334 | 1334 | $relativePath = $path; |
1335 | - $path = Filesystem::normalizePath($this->fakeRoot . '/' . $path); |
|
1335 | + $path = Filesystem::normalizePath($this->fakeRoot.'/'.$path); |
|
1336 | 1336 | |
1337 | 1337 | $mount = Filesystem::getMountManager()->find($path); |
1338 | 1338 | $storage = $mount->getStorage(); |
@@ -1356,7 +1356,7 @@ discard block |
||
1356 | 1356 | //add the sizes of other mount points to the folder |
1357 | 1357 | $extOnly = ($includeMountPoints === 'ext'); |
1358 | 1358 | $mounts = Filesystem::getMountManager()->findIn($path); |
1359 | - $info->setSubMounts(array_filter($mounts, function (IMountPoint $mount) use ($extOnly) { |
|
1359 | + $info->setSubMounts(array_filter($mounts, function(IMountPoint $mount) use ($extOnly) { |
|
1360 | 1360 | $subStorage = $mount->getStorage(); |
1361 | 1361 | return !($extOnly && $subStorage instanceof \OCA\Files_Sharing\SharedStorage); |
1362 | 1362 | })); |
@@ -1403,12 +1403,12 @@ discard block |
||
1403 | 1403 | /** |
1404 | 1404 | * @var \OC\Files\FileInfo[] $files |
1405 | 1405 | */ |
1406 | - $files = array_map(function (ICacheEntry $content) use ($path, $storage, $mount, $sharingDisabled) { |
|
1406 | + $files = array_map(function(ICacheEntry $content) use ($path, $storage, $mount, $sharingDisabled) { |
|
1407 | 1407 | if ($sharingDisabled) { |
1408 | 1408 | $content['permissions'] = $content['permissions'] & ~\OCP\Constants::PERMISSION_SHARE; |
1409 | 1409 | } |
1410 | 1410 | $owner = $this->getUserObjectForOwner($storage->getOwner($content['path'])); |
1411 | - return new FileInfo($path . '/' . $content['name'], $storage, $content['path'], $content, $mount, $owner); |
|
1411 | + return new FileInfo($path.'/'.$content['name'], $storage, $content['path'], $content, $mount, $owner); |
|
1412 | 1412 | }, $contents); |
1413 | 1413 | |
1414 | 1414 | //add a folder for any mountpoint in this directory and add the sizes of other mountpoints to the folders |
@@ -1433,8 +1433,8 @@ discard block |
||
1433 | 1433 | // sometimes when the storage is not available it can be any exception |
1434 | 1434 | \OCP\Util::writeLog( |
1435 | 1435 | 'core', |
1436 | - 'Exception while scanning storage "' . $subStorage->getId() . '": ' . |
|
1437 | - get_class($e) . ': ' . $e->getMessage(), |
|
1436 | + 'Exception while scanning storage "'.$subStorage->getId().'": '. |
|
1437 | + get_class($e).': '.$e->getMessage(), |
|
1438 | 1438 | \OCP\Util::ERROR |
1439 | 1439 | ); |
1440 | 1440 | continue; |
@@ -1471,7 +1471,7 @@ discard block |
||
1471 | 1471 | break; |
1472 | 1472 | } |
1473 | 1473 | } |
1474 | - $rootEntry['path'] = substr(Filesystem::normalizePath($path . '/' . $rootEntry['name']), strlen($user) + 2); // full path without /$user/ |
|
1474 | + $rootEntry['path'] = substr(Filesystem::normalizePath($path.'/'.$rootEntry['name']), strlen($user) + 2); // full path without /$user/ |
|
1475 | 1475 | |
1476 | 1476 | // if sharing was disabled for the user we remove the share permissions |
1477 | 1477 | if (\OCP\Util::isSharingDisabledForUser()) { |
@@ -1479,14 +1479,14 @@ discard block |
||
1479 | 1479 | } |
1480 | 1480 | |
1481 | 1481 | $owner = $this->getUserObjectForOwner($subStorage->getOwner('')); |
1482 | - $files[] = new FileInfo($path . '/' . $rootEntry['name'], $subStorage, '', $rootEntry, $mount, $owner); |
|
1482 | + $files[] = new FileInfo($path.'/'.$rootEntry['name'], $subStorage, '', $rootEntry, $mount, $owner); |
|
1483 | 1483 | } |
1484 | 1484 | } |
1485 | 1485 | } |
1486 | 1486 | } |
1487 | 1487 | |
1488 | 1488 | if ($mimetype_filter) { |
1489 | - $files = array_filter($files, function (FileInfo $file) use ($mimetype_filter) { |
|
1489 | + $files = array_filter($files, function(FileInfo $file) use ($mimetype_filter) { |
|
1490 | 1490 | if (strpos($mimetype_filter, '/')) { |
1491 | 1491 | return $file->getMimetype() === $mimetype_filter; |
1492 | 1492 | } else { |
@@ -1515,7 +1515,7 @@ discard block |
||
1515 | 1515 | if ($data instanceof FileInfo) { |
1516 | 1516 | $data = $data->getData(); |
1517 | 1517 | } |
1518 | - $path = Filesystem::normalizePath($this->fakeRoot . '/' . $path); |
|
1518 | + $path = Filesystem::normalizePath($this->fakeRoot.'/'.$path); |
|
1519 | 1519 | /** |
1520 | 1520 | * @var \OC\Files\Storage\Storage $storage |
1521 | 1521 | * @var string $internalPath |
@@ -1542,7 +1542,7 @@ discard block |
||
1542 | 1542 | * @return FileInfo[] |
1543 | 1543 | */ |
1544 | 1544 | public function search($query) { |
1545 | - return $this->searchCommon('search', array('%' . $query . '%')); |
|
1545 | + return $this->searchCommon('search', array('%'.$query.'%')); |
|
1546 | 1546 | } |
1547 | 1547 | |
1548 | 1548 | /** |
@@ -1593,10 +1593,10 @@ discard block |
||
1593 | 1593 | |
1594 | 1594 | $results = call_user_func_array(array($cache, $method), $args); |
1595 | 1595 | foreach ($results as $result) { |
1596 | - if (substr($mountPoint . $result['path'], 0, $rootLength + 1) === $this->fakeRoot . '/') { |
|
1596 | + if (substr($mountPoint.$result['path'], 0, $rootLength + 1) === $this->fakeRoot.'/') { |
|
1597 | 1597 | $internalPath = $result['path']; |
1598 | - $path = $mountPoint . $result['path']; |
|
1599 | - $result['path'] = substr($mountPoint . $result['path'], $rootLength); |
|
1598 | + $path = $mountPoint.$result['path']; |
|
1599 | + $result['path'] = substr($mountPoint.$result['path'], $rootLength); |
|
1600 | 1600 | $owner = \OC::$server->getUserManager()->get($storage->getOwner($internalPath)); |
1601 | 1601 | $files[] = new FileInfo($path, $storage, $internalPath, $result, $mount, $owner); |
1602 | 1602 | } |
@@ -1614,8 +1614,8 @@ discard block |
||
1614 | 1614 | if ($results) { |
1615 | 1615 | foreach ($results as $result) { |
1616 | 1616 | $internalPath = $result['path']; |
1617 | - $result['path'] = rtrim($relativeMountPoint . $result['path'], '/'); |
|
1618 | - $path = rtrim($mountPoint . $internalPath, '/'); |
|
1617 | + $result['path'] = rtrim($relativeMountPoint.$result['path'], '/'); |
|
1618 | + $path = rtrim($mountPoint.$internalPath, '/'); |
|
1619 | 1619 | $owner = \OC::$server->getUserManager()->get($storage->getOwner($internalPath)); |
1620 | 1620 | $files[] = new FileInfo($path, $storage, $internalPath, $result, $mount, $owner); |
1621 | 1621 | } |
@@ -1636,7 +1636,7 @@ discard block |
||
1636 | 1636 | public function getOwner($path) { |
1637 | 1637 | $info = $this->getFileInfo($path); |
1638 | 1638 | if (!$info) { |
1639 | - throw new NotFoundException($path . ' not found while trying to get owner'); |
|
1639 | + throw new NotFoundException($path.' not found while trying to get owner'); |
|
1640 | 1640 | } |
1641 | 1641 | return $info->getOwner()->getUID(); |
1642 | 1642 | } |
@@ -1670,7 +1670,7 @@ discard block |
||
1670 | 1670 | * @return string |
1671 | 1671 | */ |
1672 | 1672 | public function getPath($id) { |
1673 | - $id = (int)$id; |
|
1673 | + $id = (int) $id; |
|
1674 | 1674 | $manager = Filesystem::getMountManager(); |
1675 | 1675 | $mounts = $manager->findIn($this->fakeRoot); |
1676 | 1676 | $mounts[] = $manager->find($this->fakeRoot); |
@@ -1685,7 +1685,7 @@ discard block |
||
1685 | 1685 | $cache = $mount->getStorage()->getCache(); |
1686 | 1686 | $internalPath = $cache->getPathById($id); |
1687 | 1687 | if (is_string($internalPath)) { |
1688 | - $fullPath = $mount->getMountPoint() . $internalPath; |
|
1688 | + $fullPath = $mount->getMountPoint().$internalPath; |
|
1689 | 1689 | if (!is_null($path = $this->getRelativePath($fullPath))) { |
1690 | 1690 | return $path; |
1691 | 1691 | } |
@@ -1728,10 +1728,10 @@ discard block |
||
1728 | 1728 | } |
1729 | 1729 | |
1730 | 1730 | // note: cannot use the view because the target is already locked |
1731 | - $fileId = (int)$targetStorage->getCache()->getId($targetInternalPath); |
|
1731 | + $fileId = (int) $targetStorage->getCache()->getId($targetInternalPath); |
|
1732 | 1732 | if ($fileId === -1) { |
1733 | 1733 | // target might not exist, need to check parent instead |
1734 | - $fileId = (int)$targetStorage->getCache()->getId(dirname($targetInternalPath)); |
|
1734 | + $fileId = (int) $targetStorage->getCache()->getId(dirname($targetInternalPath)); |
|
1735 | 1735 | } |
1736 | 1736 | |
1737 | 1737 | // check if any of the parents were shared by the current owner (include collections) |
@@ -1831,7 +1831,7 @@ discard block |
||
1831 | 1831 | $resultPath = ''; |
1832 | 1832 | foreach ($parts as $part) { |
1833 | 1833 | if ($part) { |
1834 | - $resultPath .= '/' . $part; |
|
1834 | + $resultPath .= '/'.$part; |
|
1835 | 1835 | $result[] = $resultPath; |
1836 | 1836 | } |
1837 | 1837 | } |
@@ -2081,16 +2081,16 @@ discard block |
||
2081 | 2081 | public function getUidAndFilename($filename) { |
2082 | 2082 | $info = $this->getFileInfo($filename); |
2083 | 2083 | if (!$info instanceof \OCP\Files\FileInfo) { |
2084 | - throw new NotFoundException($this->getAbsolutePath($filename) . ' not found'); |
|
2084 | + throw new NotFoundException($this->getAbsolutePath($filename).' not found'); |
|
2085 | 2085 | } |
2086 | 2086 | $uid = $info->getOwner()->getUID(); |
2087 | 2087 | if ($uid != \OCP\User::getUser()) { |
2088 | 2088 | Filesystem::initMountPoints($uid); |
2089 | - $ownerView = new View('/' . $uid . '/files'); |
|
2089 | + $ownerView = new View('/'.$uid.'/files'); |
|
2090 | 2090 | try { |
2091 | 2091 | $filename = $ownerView->getPath($info['fileid']); |
2092 | 2092 | } catch (NotFoundException $e) { |
2093 | - throw new NotFoundException('File with id ' . $info['fileid'] . ' not found for user ' . $uid); |
|
2093 | + throw new NotFoundException('File with id '.$info['fileid'].' not found for user '.$uid); |
|
2094 | 2094 | } |
2095 | 2095 | } |
2096 | 2096 | return [$uid, $filename]; |
@@ -2107,7 +2107,7 @@ discard block |
||
2107 | 2107 | $directoryParts = array_filter($directoryParts); |
2108 | 2108 | foreach ($directoryParts as $key => $part) { |
2109 | 2109 | $currentPathElements = array_slice($directoryParts, 0, $key); |
2110 | - $currentPath = '/' . implode('/', $currentPathElements); |
|
2110 | + $currentPath = '/'.implode('/', $currentPathElements); |
|
2111 | 2111 | if ($this->is_file($currentPath)) { |
2112 | 2112 | return false; |
2113 | 2113 | } |
@@ -26,7 +26,7 @@ |
||
26 | 26 | use OCP\Files\NotPermittedException; |
27 | 27 | use OCP\Files\SimpleFS\ISimpleFile; |
28 | 28 | |
29 | -class SimpleFile implements ISimpleFile { |
|
29 | +class SimpleFile implements ISimpleFile { |
|
30 | 30 | |
31 | 31 | /** @var File $file */ |
32 | 32 | private $file; |