|
@@ -52,13 +52,13 @@ discard block |
|
|
block discarded – undo |
|
52
|
52
|
throw new \Exception("Access Key, Secret and Bucket have to be configured."); |
|
53
|
53
|
} |
|
54
|
54
|
|
|
55
|
|
- $this->id = 'amazon::' . $params['bucket']; |
|
|
55
|
+ $this->id = 'amazon::'.$params['bucket']; |
|
56
|
56
|
|
|
57
|
57
|
$this->test = isset($params['test']); |
|
58
|
58
|
$this->bucket = $params['bucket']; |
|
59
|
59
|
$this->timeout = !isset($params['timeout']) ? 15 : $params['timeout']; |
|
60
|
60
|
$params['region'] = empty($params['region']) ? 'eu-west-1' : $params['region']; |
|
61
|
|
- $params['hostname'] = empty($params['hostname']) ? 's3.' . $params['region'] . '.amazonaws.com' : $params['hostname']; |
|
|
61
|
+ $params['hostname'] = empty($params['hostname']) ? 's3.'.$params['region'].'.amazonaws.com' : $params['hostname']; |
|
62
|
62
|
if (!isset($params['port']) || $params['port'] === '') { |
|
63
|
63
|
$params['port'] = (isset($params['use_ssl']) && $params['use_ssl'] === false) ? 80 : 443; |
|
64
|
64
|
} |
|
@@ -78,7 +78,7 @@ discard block |
|
|
block discarded – undo |
|
78
|
78
|
} |
|
79
|
79
|
|
|
80
|
80
|
$scheme = (isset($this->params['use_ssl']) && $this->params['use_ssl'] === false) ? 'http' : 'https'; |
|
81
|
|
- $base_url = $scheme . '://' . $this->params['hostname'] . ':' . $this->params['port'] . '/'; |
|
|
81
|
+ $base_url = $scheme.'://'.$this->params['hostname'].':'.$this->params['port'].'/'; |
|
82
|
82
|
|
|
83
|
83
|
$options = [ |
|
84
|
84
|
'version' => isset($this->params['version']) ? $this->params['version'] : 'latest', |
|
@@ -101,16 +101,16 @@ discard block |
|
|
block discarded – undo |
|
101
|
101
|
|
|
102
|
102
|
if (!$this->connection->isBucketDnsCompatible($this->bucket)) { |
|
103
|
103
|
$logger = \OC::$server->getLogger(); |
|
104
|
|
- $logger->debug('Bucket "' . $this->bucket . '" This bucket name is not dns compatible, it may contain invalid characters.', |
|
|
104
|
+ $logger->debug('Bucket "'.$this->bucket.'" This bucket name is not dns compatible, it may contain invalid characters.', |
|
105
|
105
|
['app' => 'objectstore']); |
|
106
|
106
|
} |
|
107
|
107
|
|
|
108
|
108
|
if (!$this->connection->doesBucketExist($this->bucket)) { |
|
109
|
109
|
$logger = \OC::$server->getLogger(); |
|
110
|
110
|
try { |
|
111
|
|
- $logger->info('Bucket "' . $this->bucket . '" does not exist - creating it.', ['app' => 'objectstore']); |
|
|
111
|
+ $logger->info('Bucket "'.$this->bucket.'" does not exist - creating it.', ['app' => 'objectstore']); |
|
112
|
112
|
if (!$this->connection->isBucketDnsCompatible($this->bucket)) { |
|
113
|
|
- throw new \Exception("The bucket will not be created because the name is not dns compatible, please correct it: " . $this->bucket); |
|
|
113
|
+ throw new \Exception("The bucket will not be created because the name is not dns compatible, please correct it: ".$this->bucket); |
|
114
|
114
|
} |
|
115
|
115
|
$this->connection->createBucket(array('Bucket' => $this->bucket)); |
|
116
|
116
|
$this->testTimeout(); |
|
@@ -120,7 +120,7 @@ discard block |
|
|
block discarded – undo |
|
120
|
120
|
'level' => ILogger::DEBUG, |
|
121
|
121
|
'app' => 'objectstore', |
|
122
|
122
|
]); |
|
123
|
|
- throw new \Exception('Creation of bucket "' . $this->bucket . '" failed. ' . $e->getMessage()); |
|
|
123
|
+ throw new \Exception('Creation of bucket "'.$this->bucket.'" failed. '.$e->getMessage()); |
|
124
|
124
|
} |
|
125
|
125
|
} |
|
126
|
126
|
|
nextcloud /
server
