@@ -160,7 +160,7 @@ discard block |
||
| 160 | 160 | try { |
| 161 | 161 | $result = $this->getConnection()->listObjects([ |
| 162 | 162 | 'Bucket' => $this->bucket, |
| 163 | - 'Prefix' => rtrim($path, '/') . '/', |
|
| 163 | + 'Prefix' => rtrim($path, '/').'/', |
|
| 164 | 164 | 'MaxKeys' => 1, |
| 165 | 165 | ]); |
| 166 | 166 | $this->directoryCache[$path] = $result['Contents'] || $result['CommonPrefixes']; |
@@ -182,7 +182,7 @@ discard block |
||
| 182 | 182 | * @param array $params |
| 183 | 183 | */ |
| 184 | 184 | public function updateLegacyId(array $params) { |
| 185 | - $oldId = 'amazon::' . $params['key'] . md5($params['secret']); |
|
| 185 | + $oldId = 'amazon::'.$params['key'].md5($params['secret']); |
|
| 186 | 186 | |
| 187 | 187 | // find by old id or bucket |
| 188 | 188 | $stmt = \OC::$server->getDatabaseConnection()->prepare( |
@@ -234,7 +234,7 @@ discard block |
||
| 234 | 234 | try { |
| 235 | 235 | $this->getConnection()->putObject(array( |
| 236 | 236 | 'Bucket' => $this->bucket, |
| 237 | - 'Key' => $path . '/', |
|
| 237 | + 'Key' => $path.'/', |
|
| 238 | 238 | 'Body' => '', |
| 239 | 239 | 'ContentType' => 'httpd/unix-directory' |
| 240 | 240 | )); |
@@ -285,7 +285,7 @@ discard block |
||
| 285 | 285 | 'Bucket' => $this->bucket |
| 286 | 286 | ); |
| 287 | 287 | if ($path !== null) { |
| 288 | - $params['Prefix'] = $path . '/'; |
|
| 288 | + $params['Prefix'] = $path.'/'; |
|
| 289 | 289 | } |
| 290 | 290 | try { |
| 291 | 291 | $connection = $this->getConnection(); |
@@ -351,9 +351,9 @@ discard block |
||
| 351 | 351 | $files[] = $file; |
| 352 | 352 | |
| 353 | 353 | // store this information for later usage |
| 354 | - $this->filesCache[$path . $file] = [ |
|
| 354 | + $this->filesCache[$path.$file] = [ |
|
| 355 | 355 | 'ContentLength' => $object['Size'], |
| 356 | - 'LastModified' => (string)$object['LastModified'], |
|
| 356 | + 'LastModified' => (string) $object['LastModified'], |
|
| 357 | 357 | ]; |
| 358 | 358 | } |
| 359 | 359 | } |
@@ -512,7 +512,7 @@ discard block |
||
| 512 | 512 | $tmpFile = \OC::$server->getTempManager()->getTemporaryFile(); |
| 513 | 513 | |
| 514 | 514 | $handle = fopen($tmpFile, 'w'); |
| 515 | - return CallbackWrapper::wrap($handle, null, null, function () use ($path, $tmpFile) { |
|
| 515 | + return CallbackWrapper::wrap($handle, null, null, function() use ($path, $tmpFile) { |
|
| 516 | 516 | $this->writeBack($tmpFile, $path); |
| 517 | 517 | }); |
| 518 | 518 | case 'a': |
@@ -537,7 +537,7 @@ discard block |
||
| 537 | 537 | } |
| 538 | 538 | |
| 539 | 539 | $handle = fopen($tmpFile, $mode); |
| 540 | - return CallbackWrapper::wrap($handle, null, null, function () use ($path, $tmpFile) { |
|
| 540 | + return CallbackWrapper::wrap($handle, null, null, function() use ($path, $tmpFile) { |
|
| 541 | 541 | $this->writeBack($tmpFile, $path); |
| 542 | 542 | }); |
| 543 | 543 | } |
@@ -565,7 +565,7 @@ discard block |
||
| 565 | 565 | 'Bucket' => $this->bucket, |
| 566 | 566 | 'Key' => $this->cleanKey($path), |
| 567 | 567 | 'Metadata' => $metadata, |
| 568 | - 'CopySource' => $this->bucket . '/' . $path, |
|
| 568 | + 'CopySource' => $this->bucket.'/'.$path, |
|
| 569 | 569 | 'MetadataDirective' => 'REPLACE', |
| 570 | 570 | ]); |
| 571 | 571 | $this->testTimeout(); |
@@ -599,7 +599,7 @@ discard block |
||
| 599 | 599 | $this->getConnection()->copyObject(array( |
| 600 | 600 | 'Bucket' => $this->bucket, |
| 601 | 601 | 'Key' => $this->cleanKey($path2), |
| 602 | - 'CopySource' => S3Client::encodeKey($this->bucket . '/' . $path1) |
|
| 602 | + 'CopySource' => S3Client::encodeKey($this->bucket.'/'.$path1) |
|
| 603 | 603 | )); |
| 604 | 604 | $this->testTimeout(); |
| 605 | 605 | } catch (S3Exception $e) { |
@@ -612,8 +612,8 @@ discard block |
||
| 612 | 612 | try { |
| 613 | 613 | $this->getConnection()->copyObject(array( |
| 614 | 614 | 'Bucket' => $this->bucket, |
| 615 | - 'Key' => $path2 . '/', |
|
| 616 | - 'CopySource' => S3Client::encodeKey($this->bucket . '/' . $path1 . '/') |
|
| 615 | + 'Key' => $path2.'/', |
|
| 616 | + 'CopySource' => S3Client::encodeKey($this->bucket.'/'.$path1.'/') |
|
| 617 | 617 | )); |
| 618 | 618 | $this->testTimeout(); |
| 619 | 619 | } catch (S3Exception $e) { |
@@ -628,8 +628,8 @@ discard block |
||
| 628 | 628 | continue; |
| 629 | 629 | } |
| 630 | 630 | |
| 631 | - $source = $path1 . '/' . $file; |
|
| 632 | - $target = $path2 . '/' . $file; |
|
| 631 | + $source = $path1.'/'.$file; |
|
| 632 | + $target = $path2.'/'.$file; |
|
| 633 | 633 | $this->copy($source, $target); |
| 634 | 634 | } |
| 635 | 635 | } |