@@ -84,7 +84,7 @@ discard block |
||
| 84 | 84 | |
| 85 | 85 | $this->root = isset($params['root']) ? $params['root'] : '/'; |
| 86 | 86 | if (!$this->root || $this->root[0] != '/') { |
| 87 | - $this->root = '/' . $this->root; |
|
| 87 | + $this->root = '/'.$this->root; |
|
| 88 | 88 | } |
| 89 | 89 | if (substr($this->root, -1, 1) != '/') { |
| 90 | 90 | $this->root .= '/'; |
@@ -102,7 +102,7 @@ discard block |
||
| 102 | 102 | // FIXME: double slash to keep compatible with the old storage ids, |
| 103 | 103 | // failure to do so will lead to creation of a new storage id and |
| 104 | 104 | // loss of shares from the storage |
| 105 | - return 'smb::' . $this->server->getUser() . '@' . $this->server->getHost() . '//' . $this->share->getName() . '/' . $this->root; |
|
| 105 | + return 'smb::'.$this->server->getUser().'@'.$this->server->getHost().'//'.$this->share->getName().'/'.$this->root; |
|
| 106 | 106 | } |
| 107 | 107 | |
| 108 | 108 | /** |
@@ -110,7 +110,7 @@ discard block |
||
| 110 | 110 | * @return string |
| 111 | 111 | */ |
| 112 | 112 | protected function buildPath($path) { |
| 113 | - return Filesystem::normalizePath($this->root . '/' . $path, true, false, true); |
|
| 113 | + return Filesystem::normalizePath($this->root.'/'.$path, true, false, true); |
|
| 114 | 114 | } |
| 115 | 115 | |
| 116 | 116 | protected function relativePath($fullPath) { |
@@ -150,9 +150,9 @@ discard block |
||
| 150 | 150 | $path = $this->buildPath($path); |
| 151 | 151 | $files = $this->share->dir($path); |
| 152 | 152 | foreach ($files as $file) { |
| 153 | - $this->statCache[$path . '/' . $file->getName()] = $file; |
|
| 153 | + $this->statCache[$path.'/'.$file->getName()] = $file; |
|
| 154 | 154 | } |
| 155 | - return array_filter($files, function (IFileInfo $file) { |
|
| 155 | + return array_filter($files, function(IFileInfo $file) { |
|
| 156 | 156 | return !$file->isHidden(); |
| 157 | 157 | }); |
| 158 | 158 | } catch (ConnectException $e) { |
@@ -297,7 +297,7 @@ discard block |
||
| 297 | 297 | case 'w': |
| 298 | 298 | case 'wb': |
| 299 | 299 | $source = $this->share->write($fullPath); |
| 300 | - return CallBackWrapper::wrap($source, null, null, function () use ($fullPath) { |
|
| 300 | + return CallBackWrapper::wrap($source, null, null, function() use ($fullPath) { |
|
| 301 | 301 | unset($this->statCache[$fullPath]); |
| 302 | 302 | }); |
| 303 | 303 | case 'a': |
@@ -329,7 +329,7 @@ discard block |
||
| 329 | 329 | } |
| 330 | 330 | $source = fopen($tmpFile, $mode); |
| 331 | 331 | $share = $this->share; |
| 332 | - return CallbackWrapper::wrap($source, null, null, function () use ($tmpFile, $fullPath, $share) { |
|
| 332 | + return CallbackWrapper::wrap($source, null, null, function() use ($tmpFile, $fullPath, $share) { |
|
| 333 | 333 | unset($this->statCache[$fullPath]); |
| 334 | 334 | $share->put($tmpFile, $fullPath); |
| 335 | 335 | unlink($tmpFile); |
@@ -351,7 +351,7 @@ discard block |
||
| 351 | 351 | $content = $this->share->dir($this->buildPath($path)); |
| 352 | 352 | foreach ($content as $file) { |
| 353 | 353 | if ($file->isDirectory()) { |
| 354 | - $this->rmdir($path . '/' . $file->getName()); |
|
| 354 | + $this->rmdir($path.'/'.$file->getName()); |
|
| 355 | 355 | } else { |
| 356 | 356 | $this->share->del($file->getPath()); |
| 357 | 357 | } |
@@ -388,7 +388,7 @@ discard block |
||
| 388 | 388 | } catch (ForbiddenException $e) { |
| 389 | 389 | return false; |
| 390 | 390 | } |
| 391 | - $names = array_map(function ($info) { |
|
| 391 | + $names = array_map(function($info) { |
|
| 392 | 392 | /** @var \Icewind\SMB\IFileInfo $info */ |
| 393 | 393 | return $info->getName(); |
| 394 | 394 | }, $files); |
@@ -470,7 +470,7 @@ discard block |
||
| 470 | 470 | */ |
| 471 | 471 | public static function checkDependencies() { |
| 472 | 472 | return ( |
| 473 | - (bool)\OC_Helper::findBinaryPath('smbclient') |
|
| 473 | + (bool) \OC_Helper::findBinaryPath('smbclient') |
|
| 474 | 474 | || Server::NativeAvailable() |
| 475 | 475 | ) ? true : ['smbclient']; |
| 476 | 476 | } |
@@ -489,7 +489,7 @@ discard block |
||
| 489 | 489 | } |
| 490 | 490 | |
| 491 | 491 | public function listen($path, callable $callback) { |
| 492 | - $this->notify($path)->listen(function (IChange $change) use ($callback) { |
|
| 492 | + $this->notify($path)->listen(function(IChange $change) use ($callback) { |
|
| 493 | 493 | if ($change instanceof IRenameChange) { |
| 494 | 494 | return $callback($change->getType(), $change->getPath(), $change->getTargetPath()); |
| 495 | 495 | } else { |
@@ -499,7 +499,7 @@ discard block |
||
| 499 | 499 | } |
| 500 | 500 | |
| 501 | 501 | public function notify($path) { |
| 502 | - $path = '/' . ltrim($path, '/'); |
|
| 502 | + $path = '/'.ltrim($path, '/'); |
|
| 503 | 503 | $shareNotifyHandler = $this->share->notify($this->buildPath($path)); |
| 504 | 504 | return new SMBNotifyHandler($shareNotifyHandler, $this->root); |
| 505 | 505 | } |
@@ -36,7 +36,7 @@ discard block |
||
| 36 | 36 | use Icewind\Streams\RetryWrapper; |
| 37 | 37 | use OCP\Files\StorageNotAvailableException; |
| 38 | 38 | |
| 39 | -require_once __DIR__ . '/../../../3rdparty/Dropbox/autoload.php'; |
|
| 39 | +require_once __DIR__.'/../../../3rdparty/Dropbox/autoload.php'; |
|
| 40 | 40 | |
| 41 | 41 | class Dropbox extends \OC\Files\Storage\Common { |
| 42 | 42 | |
@@ -54,7 +54,7 @@ discard block |
||
| 54 | 54 | && isset($params['token_secret']) |
| 55 | 55 | ) { |
| 56 | 56 | $this->root = isset($params['root']) ? $params['root'] : ''; |
| 57 | - $this->id = 'dropbox::'.$params['app_key'] . $params['token']. '/' . $this->root; |
|
| 57 | + $this->id = 'dropbox::'.$params['app_key'].$params['token'].'/'.$this->root; |
|
| 58 | 58 | $this->oauth = new \Dropbox_OAuth_Curl($params['app_key'], $params['app_secret']); |
| 59 | 59 | $this->oauth->setToken($params['token'], $params['token_secret']); |
| 60 | 60 | // note: Dropbox_API connection is lazy |
@@ -89,7 +89,7 @@ discard block |
||
| 89 | 89 | */ |
| 90 | 90 | private function getDropBoxMetaData($path, $list = false) { |
| 91 | 91 | $path = ltrim($this->root.$path, '/'); |
| 92 | - if ( ! $list && isset($this->metaData[$path])) { |
|
| 92 | + if (!$list && isset($this->metaData[$path])) { |
|
| 93 | 93 | return $this->metaData[$path]; |
| 94 | 94 | } else { |
| 95 | 95 | if ($list) { |
@@ -144,7 +144,7 @@ discard block |
||
| 144 | 144 | } |
| 145 | 145 | } |
| 146 | 146 | |
| 147 | - public function getId(){ |
|
| 147 | + public function getId() { |
|
| 148 | 148 | return $this->id; |
| 149 | 149 | } |
| 150 | 150 | |
@@ -259,7 +259,7 @@ discard block |
||
| 259 | 259 | try { |
| 260 | 260 | // slashes need to stay |
| 261 | 261 | $encodedPath = str_replace('%2F', '/', rawurlencode(trim($path, '/'))); |
| 262 | - $downloadUrl = 'https://api-content.dropbox.com/1/files/auto/' . $encodedPath; |
|
| 262 | + $downloadUrl = 'https://api-content.dropbox.com/1/files/auto/'.$encodedPath; |
|
| 263 | 263 | $headers = $this->oauth->getOAuthHeader($downloadUrl, [], 'GET'); |
| 264 | 264 | |
| 265 | 265 | $client = \OC::$server->getHTTPClientService()->newClient(); |
@@ -309,7 +309,7 @@ discard block |
||
| 309 | 309 | file_put_contents($tmpFile, $source); |
| 310 | 310 | } |
| 311 | 311 | $handle = fopen($tmpFile, $mode); |
| 312 | - return CallbackWrapper::wrap($handle, null, null, function () use ($path, $tmpFile) { |
|
| 312 | + return CallbackWrapper::wrap($handle, null, null, function() use ($path, $tmpFile) { |
|
| 313 | 313 | $this->writeBack($tmpFile, $path); |
| 314 | 314 | }); |
| 315 | 315 | } |
@@ -51,7 +51,7 @@ |
||
| 51 | 51 | * @throws InsufficientDataForMeaningfulAnswerException |
| 52 | 52 | * @throws StorageNotAvailableException |
| 53 | 53 | */ |
| 54 | - public function manipulateStorageConfig(StorageConfig &$storage, IUser $user = null) { |
|
| 54 | + public function manipulateStorageConfig(StorageConfig & $storage, IUser $user = null) { |
|
| 55 | 55 | } |
| 56 | 56 | |
| 57 | 57 | /** |
@@ -64,7 +64,7 @@ |
||
| 64 | 64 | |
| 65 | 65 | public function listen(callable $callback) { |
| 66 | 66 | $oldRenamePath = null; |
| 67 | - $this->shareNotifyHandler->listen(function (\Icewind\SMB\Change $shareChange) use ($callback) { |
|
| 67 | + $this->shareNotifyHandler->listen(function(\Icewind\SMB\Change $shareChange) use ($callback) { |
|
| 68 | 68 | $change = $this->mapChange($shareChange); |
| 69 | 69 | if (!is_null($change)) { |
| 70 | 70 | return $callback($change); |
@@ -182,7 +182,7 @@ discard block |
||
| 182 | 182 | * @param Backend $backend |
| 183 | 183 | */ |
| 184 | 184 | public function setBackend(Backend $backend) { |
| 185 | - $this->backend= $backend; |
|
| 185 | + $this->backend = $backend; |
|
| 186 | 186 | } |
| 187 | 187 | |
| 188 | 188 | /** |
@@ -214,13 +214,13 @@ discard block |
||
| 214 | 214 | * @param array $backendOptions backend options |
| 215 | 215 | */ |
| 216 | 216 | public function setBackendOptions($backendOptions) { |
| 217 | - if($this->getBackend() instanceof Backend) { |
|
| 217 | + if ($this->getBackend() instanceof Backend) { |
|
| 218 | 218 | $parameters = $this->getBackend()->getParameters(); |
| 219 | - foreach($backendOptions as $key => $value) { |
|
| 220 | - if(isset($parameters[$key])) { |
|
| 219 | + foreach ($backendOptions as $key => $value) { |
|
| 220 | + if (isset($parameters[$key])) { |
|
| 221 | 221 | switch ($parameters[$key]->getType()) { |
| 222 | 222 | case \OCA\Files_External\Lib\DefinitionParameter::VALUE_BOOLEAN: |
| 223 | - $value = (bool)$value; |
|
| 223 | + $value = (bool) $value; |
|
| 224 | 224 | break; |
| 225 | 225 | } |
| 226 | 226 | $backendOptions[$key] = $value; |
@@ -426,7 +426,7 @@ discard block |
||
| 426 | 426 | $result['statusMessage'] = $this->statusMessage; |
| 427 | 427 | } |
| 428 | 428 | $result['userProvided'] = $this->authMechanism instanceof IUserProvided; |
| 429 | - $result['type'] = ($this->getType() === self::MOUNT_TYPE_PERSONAl) ? 'personal': 'system'; |
|
| 429 | + $result['type'] = ($this->getType() === self::MOUNT_TYPE_PERSONAl) ? 'personal' : 'system'; |
|
| 430 | 430 | return $result; |
| 431 | 431 | } |
| 432 | 432 | } |
@@ -60,7 +60,7 @@ |
||
| 60 | 60 | * @param StorageConfig $storage |
| 61 | 61 | * @param IUser $user |
| 62 | 62 | */ |
| 63 | - public function manipulateStorageConfig(StorageConfig &$storage, IUser $user = null) { |
|
| 63 | + public function manipulateStorageConfig(StorageConfig & $storage, IUser $user = null) { |
|
| 64 | 64 | $user = $storage->getBackendOption('user'); |
| 65 | 65 | if ($domain = $storage->getBackendOption('domain')) { |
| 66 | 66 | $storage->setBackendOption('user', $domain.'\\'.$user); |
@@ -61,11 +61,11 @@ |
||
| 61 | 61 | ; |
| 62 | 62 | } |
| 63 | 63 | |
| 64 | - public function manipulateStorageConfig(StorageConfig &$storage, IUser $user = null) { |
|
| 64 | + public function manipulateStorageConfig(StorageConfig & $storage, IUser $user = null) { |
|
| 65 | 65 | $username_as_share = ($storage->getBackendOption('username_as_share') === true); |
| 66 | 66 | |
| 67 | 67 | if ($username_as_share) { |
| 68 | - $share = '/' . $storage->getBackendOption('user'); |
|
| 68 | + $share = '/'.$storage->getBackendOption('user'); |
|
| 69 | 69 | $storage->setBackendOption('share', $share); |
| 70 | 70 | } |
| 71 | 71 | } |
@@ -60,7 +60,7 @@ discard block |
||
| 60 | 60 | 'path' => $path, |
| 61 | 61 | 'type' => 'dir', |
| 62 | 62 | 'backend' => $mountConfig['backend'], |
| 63 | - 'scope' => ( $isSystemMount ? 'system' : 'personal' ), |
|
| 63 | + 'scope' => ($isSystemMount ? 'system' : 'personal'), |
|
| 64 | 64 | 'permissions' => $permissions, |
| 65 | 65 | 'id' => $mountConfig['id'], |
| 66 | 66 | 'class' => $mountConfig['class'] |
@@ -79,7 +79,7 @@ discard block |
||
| 79 | 79 | $user = \OC::$server->getUserSession()->getUser()->getUID(); |
| 80 | 80 | |
| 81 | 81 | $mounts = \OC_Mount_Config::getAbsoluteMountPoints($user); |
| 82 | - foreach($mounts as $mountPoint => $mount) { |
|
| 82 | + foreach ($mounts as $mountPoint => $mount) { |
|
| 83 | 83 | $entries[] = self::formatMount($mountPoint, $mount); |
| 84 | 84 | } |
| 85 | 85 | |
@@ -18,14 +18,14 @@ |
||
| 18 | 18 | <tr> |
| 19 | 19 | <th id='headerName' class="hidden column-name"> |
| 20 | 20 | <div id="headerName-container"> |
| 21 | - <a class="name sort columntitle" data-sort="name"><span><?php p($l->t( 'Name' )); ?></span><span class="sort-indicator"></span></a> |
|
| 21 | + <a class="name sort columntitle" data-sort="name"><span><?php p($l->t('Name')); ?></span><span class="sort-indicator"></span></a> |
|
| 22 | 22 | </div> |
| 23 | 23 | </th> |
| 24 | 24 | <th id="headerSize" class="hidden column-size"> |
| 25 | 25 | <a class="size sort columntitle" data-sort="size"><span><?php p($l->t('Size')); ?></span><span class="sort-indicator"></span></a> |
| 26 | 26 | </th> |
| 27 | 27 | <th id="headerDate" class="hidden column-mtime"> |
| 28 | - <a id="modified" class="columntitle" data-sort="mtime"><span><?php p($l->t( 'Modified' )); ?></span><span class="sort-indicator"></span></a> |
|
| 28 | + <a id="modified" class="columntitle" data-sort="mtime"><span><?php p($l->t('Modified')); ?></span><span class="sort-indicator"></span></a> |
|
| 29 | 29 | </th> |
| 30 | 30 | </tr> |
| 31 | 31 | </thead> |