@@ -36,8 +36,8 @@ discard block |
||
| 36 | 36 | |
| 37 | 37 | namespace OCA\Files_External\Lib\Storage; |
| 38 | 38 | |
| 39 | -set_include_path(get_include_path() . PATH_SEPARATOR . |
|
| 40 | - \OC_App::getAppPath('files_external') . '/3rdparty/aws-sdk-php'); |
|
| 39 | +set_include_path(get_include_path().PATH_SEPARATOR. |
|
| 40 | + \OC_App::getAppPath('files_external').'/3rdparty/aws-sdk-php'); |
|
| 41 | 41 | require_once 'aws-autoloader.php'; |
| 42 | 42 | |
| 43 | 43 | use Aws\S3\S3Client; |
@@ -95,8 +95,8 @@ discard block |
||
| 95 | 95 | * |
| 96 | 96 | * @param array $params |
| 97 | 97 | */ |
| 98 | - public function updateLegacyId (array $params) { |
|
| 99 | - $oldId = 'amazon::' . $params['key'] . md5($params['secret']); |
|
| 98 | + public function updateLegacyId(array $params) { |
|
| 99 | + $oldId = 'amazon::'.$params['key'].md5($params['secret']); |
|
| 100 | 100 | |
| 101 | 101 | // find by old id or bucket |
| 102 | 102 | $stmt = \OC::$server->getDatabaseConnection()->prepare( |
@@ -148,7 +148,7 @@ discard block |
||
| 148 | 148 | try { |
| 149 | 149 | $this->getConnection()->putObject(array( |
| 150 | 150 | 'Bucket' => $this->bucket, |
| 151 | - 'Key' => $path . '/', |
|
| 151 | + 'Key' => $path.'/', |
|
| 152 | 152 | 'Body' => '', |
| 153 | 153 | 'ContentType' => 'httpd/unix-directory' |
| 154 | 154 | )); |
@@ -191,12 +191,12 @@ discard block |
||
| 191 | 191 | return false; |
| 192 | 192 | } |
| 193 | 193 | |
| 194 | - private function batchDelete ($path = null) { |
|
| 194 | + private function batchDelete($path = null) { |
|
| 195 | 195 | $params = array( |
| 196 | 196 | 'Bucket' => $this->bucket |
| 197 | 197 | ); |
| 198 | 198 | if ($path !== null) { |
| 199 | - $params['Prefix'] = $path . '/'; |
|
| 199 | + $params['Prefix'] = $path.'/'; |
|
| 200 | 200 | } |
| 201 | 201 | try { |
| 202 | 202 | // Since there are no real directories on S3, we need |
@@ -279,7 +279,7 @@ discard block |
||
| 279 | 279 | $stat['atime'] = time(); |
| 280 | 280 | |
| 281 | 281 | return $stat; |
| 282 | - } catch(S3Exception $e) { |
|
| 282 | + } catch (S3Exception $e) { |
|
| 283 | 283 | \OCP\Util::logException('files_external', $e); |
| 284 | 284 | return false; |
| 285 | 285 | } |
@@ -394,14 +394,14 @@ discard block |
||
| 394 | 394 | $fileType = $this->filetype($path); |
| 395 | 395 | try { |
| 396 | 396 | if ($fileType !== false) { |
| 397 | - if ($fileType === 'dir' && ! $this->isRoot($path)) { |
|
| 397 | + if ($fileType === 'dir' && !$this->isRoot($path)) { |
|
| 398 | 398 | $path .= '/'; |
| 399 | 399 | } |
| 400 | 400 | $this->getConnection()->copyObject([ |
| 401 | 401 | 'Bucket' => $this->bucket, |
| 402 | 402 | 'Key' => $this->cleanKey($path), |
| 403 | 403 | 'Metadata' => $metadata, |
| 404 | - 'CopySource' => $this->bucket . '/' . $path, |
|
| 404 | + 'CopySource' => $this->bucket.'/'.$path, |
|
| 405 | 405 | 'MetadataDirective' => 'REPLACE', |
| 406 | 406 | ]); |
| 407 | 407 | $this->testTimeout(); |
@@ -434,7 +434,7 @@ discard block |
||
| 434 | 434 | $this->getConnection()->copyObject(array( |
| 435 | 435 | 'Bucket' => $this->bucket, |
| 436 | 436 | 'Key' => $this->cleanKey($path2), |
| 437 | - 'CopySource' => S3Client::encodeKey($this->bucket . '/' . $path1) |
|
| 437 | + 'CopySource' => S3Client::encodeKey($this->bucket.'/'.$path1) |
|
| 438 | 438 | )); |
| 439 | 439 | $this->testTimeout(); |
| 440 | 440 | } catch (S3Exception $e) { |
@@ -447,8 +447,8 @@ discard block |
||
| 447 | 447 | try { |
| 448 | 448 | $this->getConnection()->copyObject(array( |
| 449 | 449 | 'Bucket' => $this->bucket, |
| 450 | - 'Key' => $path2 . '/', |
|
| 451 | - 'CopySource' => S3Client::encodeKey($this->bucket . '/' . $path1 . '/') |
|
| 450 | + 'Key' => $path2.'/', |
|
| 451 | + 'CopySource' => S3Client::encodeKey($this->bucket.'/'.$path1.'/') |
|
| 452 | 452 | )); |
| 453 | 453 | $this->testTimeout(); |
| 454 | 454 | } catch (S3Exception $e) { |
@@ -463,8 +463,8 @@ discard block |
||
| 463 | 463 | continue; |
| 464 | 464 | } |
| 465 | 465 | |
| 466 | - $source = $path1 . '/' . $file; |
|
| 467 | - $target = $path2 . '/' . $file; |
|
| 466 | + $source = $path1.'/'.$file; |
|
| 467 | + $target = $path2.'/'.$file; |
|
| 468 | 468 | $this->copy($source, $target); |
| 469 | 469 | } |
| 470 | 470 | } |
@@ -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> |