@@ -103,10 +103,10 @@ discard block |
||
103 | 103 | $meta['status'] = $this->succeeded() ? 'ok' : 'failure'; |
104 | 104 | $meta['statuscode'] = $this->statusCode; |
105 | 105 | $meta['message'] = $this->message; |
106 | - if(isset($this->items)) { |
|
106 | + if (isset($this->items)) { |
|
107 | 107 | $meta['totalitems'] = $this->items; |
108 | 108 | } |
109 | - if(isset($this->perPage)) { |
|
109 | + if (isset($this->perPage)) { |
|
110 | 110 | $meta['itemsperpage'] = $this->perPage; |
111 | 111 | } |
112 | 112 | return $meta; |
@@ -136,11 +136,11 @@ discard block |
||
136 | 136 | * @return $this |
137 | 137 | */ |
138 | 138 | public function addHeader($name, $value) { |
139 | - $name = trim($name); // always remove leading and trailing whitespace |
|
139 | + $name = trim($name); // always remove leading and trailing whitespace |
|
140 | 140 | // to be able to reliably check for security |
141 | 141 | // headers |
142 | 142 | |
143 | - if(is_null($value)) { |
|
143 | + if (is_null($value)) { |
|
144 | 144 | unset($this->headers[$name]); |
145 | 145 | } else { |
146 | 146 | $this->headers[$name] = $value; |
@@ -43,7 +43,7 @@ discard block |
||
43 | 43 | $app = addslashes(strip_tags($parameters['app'])); |
44 | 44 | $key = isset($parameters['key']) ? addslashes(strip_tags($parameters['key'])) : null; |
45 | 45 | |
46 | - if(empty($key)) { |
|
46 | + if (empty($key)) { |
|
47 | 47 | $query = \OCP\DB::prepare('SELECT `key`, `app`, `value` FROM `*PREFIX*privatedata` WHERE `user` = ? AND `app` = ? '); |
48 | 48 | $result = $query->execute(array($user, $app)); |
49 | 49 | } else { |
@@ -53,10 +53,10 @@ discard block |
||
53 | 53 | |
54 | 54 | $xml = array(); |
55 | 55 | while ($row = $result->fetchRow()) { |
56 | - $data=array(); |
|
57 | - $data['key']=$row['key']; |
|
58 | - $data['app']=$row['app']; |
|
59 | - $data['value']=$row['value']; |
|
56 | + $data = array(); |
|
57 | + $data['key'] = $row['key']; |
|
58 | + $data['app'] = $row['app']; |
|
59 | + $data['value'] = $row['value']; |
|
60 | 60 | $xml[] = $data; |
61 | 61 | } |
62 | 62 | |
@@ -73,7 +73,7 @@ discard block |
||
73 | 73 | $user = \OC_User::getUser(); |
74 | 74 | $app = addslashes(strip_tags($parameters['app'])); |
75 | 75 | $key = addslashes(strip_tags($parameters['key'])); |
76 | - $value = (string)$_POST['value']; |
|
76 | + $value = (string) $_POST['value']; |
|
77 | 77 | |
78 | 78 | // update in DB |
79 | 79 | $query = \OCP\DB::prepare('UPDATE `*PREFIX*privatedata` SET `value` = ? WHERE `user` = ? AND `app` = ? AND `key` = ?'); |
@@ -81,7 +81,7 @@ discard block |
||
81 | 81 | |
82 | 82 | if ($numRows === false || $numRows === 0) { |
83 | 83 | // store in DB |
84 | - $query = \OCP\DB::prepare('INSERT INTO `*PREFIX*privatedata` (`user`, `app`, `key`, `value`)' . ' VALUES(?, ?, ?, ?)'); |
|
84 | + $query = \OCP\DB::prepare('INSERT INTO `*PREFIX*privatedata` (`user`, `app`, `key`, `value`)'.' VALUES(?, ?, ?, ?)'); |
|
85 | 85 | $query->execute(array($user, $app, $key, $value)); |
86 | 86 | } |
87 | 87 | |
@@ -106,7 +106,7 @@ discard block |
||
106 | 106 | |
107 | 107 | // delete in DB |
108 | 108 | $query = \OCP\DB::prepare('DELETE FROM `*PREFIX*privatedata` WHERE `user` = ? AND `app` = ? AND `key` = ? '); |
109 | - $query->execute(array($user, $app, $key )); |
|
109 | + $query->execute(array($user, $app, $key)); |
|
110 | 110 | |
111 | 111 | return new Result(null, 100); |
112 | 112 | } |
@@ -87,7 +87,7 @@ discard block |
||
87 | 87 | * @param \OCP\Files\Mount\IMountPoint $mount |
88 | 88 | * @param \OCP\IUser|null $owner |
89 | 89 | */ |
90 | - public function __construct($path, $storage, $internalPath, $data, $mount, $owner= null) { |
|
90 | + public function __construct($path, $storage, $internalPath, $data, $mount, $owner = null) { |
|
91 | 91 | $this->path = $path; |
92 | 92 | $this->storage = $storage; |
93 | 93 | $this->internalPath = $internalPath; |
@@ -181,7 +181,7 @@ discard block |
||
181 | 181 | public function getEtag() { |
182 | 182 | $this->updateEntryfromSubMounts(); |
183 | 183 | if (count($this->childEtags) > 0) { |
184 | - $combinedEtag = $this->data['etag'] . '::' . implode('::', $this->childEtags); |
|
184 | + $combinedEtag = $this->data['etag'].'::'.implode('::', $this->childEtags); |
|
185 | 185 | return md5($combinedEtag); |
186 | 186 | } else { |
187 | 187 | return $this->data['etag']; |
@@ -377,7 +377,7 @@ discard block |
||
377 | 377 | $relativeEntryPath = substr($entryPath, strlen($this->getPath())); |
378 | 378 | // attach the permissions to propagate etag on permision changes of submounts |
379 | 379 | $permissions = isset($data['permissions']) ? $data['permissions'] : 0; |
380 | - $this->childEtags[] = $relativeEntryPath . '/' . $data['etag'] . $permissions; |
|
380 | + $this->childEtags[] = $relativeEntryPath.'/'.$data['etag'].$permissions; |
|
381 | 381 | } |
382 | 382 | } |
383 | 383 |
@@ -372,12 +372,12 @@ |
||
372 | 372 | \OC\Files\Filesystem::initMountPoints($userId); |
373 | 373 | |
374 | 374 | try { |
375 | - $folder = $this->get('/' . $userId . '/files'); |
|
375 | + $folder = $this->get('/'.$userId.'/files'); |
|
376 | 376 | } catch (NotFoundException $e) { |
377 | - if (!$this->nodeExists('/' . $userId)) { |
|
378 | - $this->newFolder('/' . $userId); |
|
377 | + if (!$this->nodeExists('/'.$userId)) { |
|
378 | + $this->newFolder('/'.$userId); |
|
379 | 379 | } |
380 | - $folder = $this->newFolder('/' . $userId . '/files'); |
|
380 | + $folder = $this->newFolder('/'.$userId.'/files'); |
|
381 | 381 | } |
382 | 382 | |
383 | 383 | $this->userFolderCache->set($userId, $folder); |
@@ -288,7 +288,7 @@ discard block |
||
288 | 288 | $path = str_replace('\\', '/', $path); |
289 | 289 | //add leading slash |
290 | 290 | if ($path[0] !== '/') { |
291 | - $path = '/' . $path; |
|
291 | + $path = '/'.$path; |
|
292 | 292 | } |
293 | 293 | //remove duplicate slashes |
294 | 294 | while (strpos($path, '//') !== false) { |
@@ -308,7 +308,7 @@ discard block |
||
308 | 308 | */ |
309 | 309 | public function isValidPath($path) { |
310 | 310 | if (!$path || $path[0] !== '/') { |
311 | - $path = '/' . $path; |
|
311 | + $path = '/'.$path; |
|
312 | 312 | } |
313 | 313 | if (strstr($path, '/../') || strrchr($path, '/') === '/..') { |
314 | 314 | return false; |
@@ -389,14 +389,14 @@ discard block |
||
389 | 389 | $this->root->emit('\OC\Files', 'preCopy', [$this, $nonExisting]); |
390 | 390 | $this->root->emit('\OC\Files', 'preWrite', [$nonExisting]); |
391 | 391 | if (!$this->view->copy($this->path, $targetPath)) { |
392 | - throw new NotPermittedException('Could not copy ' . $this->path . ' to ' . $targetPath); |
|
392 | + throw new NotPermittedException('Could not copy '.$this->path.' to '.$targetPath); |
|
393 | 393 | } |
394 | 394 | $targetNode = $this->root->get($targetPath); |
395 | 395 | $this->root->emit('\OC\Files', 'postCopy', [$this, $targetNode]); |
396 | 396 | $this->root->emit('\OC\Files', 'postWrite', [$targetNode]); |
397 | 397 | return $targetNode; |
398 | 398 | } else { |
399 | - throw new NotPermittedException('No permission to copy to path ' . $targetPath); |
|
399 | + throw new NotPermittedException('No permission to copy to path '.$targetPath); |
|
400 | 400 | } |
401 | 401 | } |
402 | 402 | |
@@ -413,7 +413,7 @@ discard block |
||
413 | 413 | $this->root->emit('\OC\Files', 'preRename', [$this, $nonExisting]); |
414 | 414 | $this->root->emit('\OC\Files', 'preWrite', [$nonExisting]); |
415 | 415 | if (!$this->view->rename($this->path, $targetPath)) { |
416 | - throw new NotPermittedException('Could not move ' . $this->path . ' to ' . $targetPath); |
|
416 | + throw new NotPermittedException('Could not move '.$this->path.' to '.$targetPath); |
|
417 | 417 | } |
418 | 418 | $targetNode = $this->root->get($targetPath); |
419 | 419 | $this->root->emit('\OC\Files', 'postRename', [$this, $targetNode]); |
@@ -421,7 +421,7 @@ discard block |
||
421 | 421 | $this->path = $targetPath; |
422 | 422 | return $targetNode; |
423 | 423 | } else { |
424 | - throw new NotPermittedException('No permission to move to path ' . $targetPath); |
|
424 | + throw new NotPermittedException('No permission to move to path '.$targetPath); |
|
425 | 425 | } |
426 | 426 | } |
427 | 427 |
@@ -55,13 +55,13 @@ |
||
55 | 55 | public function getMountsForUser(IUser $user, IStorageFactory $loader) { |
56 | 56 | $cacheBaseDir = $this->config->getSystemValue('cache_path', ''); |
57 | 57 | if ($cacheBaseDir !== '') { |
58 | - $cacheDir = rtrim($cacheBaseDir, '/') . '/' . $user->getUID(); |
|
58 | + $cacheDir = rtrim($cacheBaseDir, '/').'/'.$user->getUID(); |
|
59 | 59 | if (!file_exists($cacheDir)) { |
60 | 60 | mkdir($cacheDir, 0770, true); |
61 | 61 | } |
62 | 62 | |
63 | 63 | return [ |
64 | - new MountPoint('\OC\Files\Storage\Local', '/' . $user->getUID() . '/cache', ['datadir' => $cacheDir, $loader]) |
|
64 | + new MountPoint('\OC\Files\Storage\Local', '/'.$user->getUID().'/cache', ['datadir' => $cacheDir, $loader]) |
|
65 | 65 | ]; |
66 | 66 | } else { |
67 | 67 | return []; |
@@ -64,7 +64,7 @@ |
||
64 | 64 | return null; |
65 | 65 | } |
66 | 66 | |
67 | - return new MountPoint('\OC\Files\ObjectStore\HomeObjectStoreStorage', '/' . $user->getUID(), $config['arguments'], $loader); |
|
67 | + return new MountPoint('\OC\Files\ObjectStore\HomeObjectStoreStorage', '/'.$user->getUID(), $config['arguments'], $loader); |
|
68 | 68 | } |
69 | 69 | |
70 | 70 | /** |
@@ -105,7 +105,7 @@ discard block |
||
105 | 105 | } else { |
106 | 106 | // Update old classes to new namespace |
107 | 107 | if (strpos($storage, 'OC_Filestorage_') !== false) { |
108 | - $storage = '\OC\Files\Storage\\' . substr($storage, 15); |
|
108 | + $storage = '\OC\Files\Storage\\'.substr($storage, 15); |
|
109 | 109 | } |
110 | 110 | $this->class = $storage; |
111 | 111 | $this->arguments = $arguments; |
@@ -157,7 +157,7 @@ discard block |
||
157 | 157 | return; |
158 | 158 | } |
159 | 159 | } else { |
160 | - \OCP\Util::writeLog('core', 'storage backend ' . $this->class . ' not found', \OCP\Util::ERROR); |
|
160 | + \OCP\Util::writeLog('core', 'storage backend '.$this->class.' not found', \OCP\Util::ERROR); |
|
161 | 161 | $this->invalidStorage = true; |
162 | 162 | return; |
163 | 163 | } |
@@ -207,13 +207,13 @@ discard block |
||
207 | 207 | */ |
208 | 208 | public function getInternalPath($path) { |
209 | 209 | $path = Filesystem::normalizePath($path, true, false, true); |
210 | - if ($this->mountPoint === $path or $this->mountPoint . '/' === $path) { |
|
210 | + if ($this->mountPoint === $path or $this->mountPoint.'/' === $path) { |
|
211 | 211 | $internalPath = ''; |
212 | 212 | } else { |
213 | 213 | $internalPath = substr($path, strlen($this->mountPoint)); |
214 | 214 | } |
215 | 215 | // substr returns false instead of an empty string, we always want a string |
216 | - return (string)$internalPath; |
|
216 | + return (string) $internalPath; |
|
217 | 217 | } |
218 | 218 | |
219 | 219 | /** |
@@ -266,7 +266,7 @@ discard block |
||
266 | 266 | */ |
267 | 267 | public function getStorageRootId() { |
268 | 268 | if (is_null($this->rootId)) { |
269 | - $this->rootId = (int)$this->getStorage()->getCache()->getId(''); |
|
269 | + $this->rootId = (int) $this->getStorage()->getCache()->getId(''); |
|
270 | 270 | } |
271 | 271 | return $this->rootId; |
272 | 272 | } |
@@ -39,6 +39,6 @@ |
||
39 | 39 | */ |
40 | 40 | public function getHomeMountForUser(IUser $user, IStorageFactory $loader) { |
41 | 41 | $arguments = ['user' => $user]; |
42 | - return new MountPoint('\OC\Files\Storage\Home', '/' . $user->getUID(), $arguments, $loader); |
|
42 | + return new MountPoint('\OC\Files\Storage\Home', '/'.$user->getUID(), $arguments, $loader); |
|
43 | 43 | } |
44 | 44 | } |