@@ -21,62 +21,62 @@ |
||
21 | 21 | */ |
22 | 22 | |
23 | 23 | return [ |
24 | - 'routes' => [ |
|
25 | - [ |
|
26 | - 'name' => 'RateLimitTest#userAndAnonProtected', |
|
27 | - 'url' => '/userAndAnonProtected', |
|
28 | - 'verb' => 'GET', |
|
29 | - ], |
|
30 | - [ |
|
31 | - 'name' => 'RateLimitTest#onlyAnonProtected', |
|
32 | - 'url' => '/anonProtected', |
|
33 | - 'verb' => 'GET', |
|
34 | - ], |
|
35 | - ], |
|
24 | + 'routes' => [ |
|
25 | + [ |
|
26 | + 'name' => 'RateLimitTest#userAndAnonProtected', |
|
27 | + 'url' => '/userAndAnonProtected', |
|
28 | + 'verb' => 'GET', |
|
29 | + ], |
|
30 | + [ |
|
31 | + 'name' => 'RateLimitTest#onlyAnonProtected', |
|
32 | + 'url' => '/anonProtected', |
|
33 | + 'verb' => 'GET', |
|
34 | + ], |
|
35 | + ], |
|
36 | 36 | |
37 | - 'ocs' => [ |
|
38 | - [ |
|
39 | - 'name' => 'Config#setAppValue', |
|
40 | - 'url' => '/api/v1/app/{appid}/{configkey}', |
|
41 | - 'verb' => 'POST', |
|
42 | - ], |
|
43 | - [ |
|
44 | - 'name' => 'Config#deleteAppValue', |
|
45 | - 'url' => '/api/v1/app/{appid}/{configkey}', |
|
46 | - 'verb' => 'DELETE', |
|
47 | - ], |
|
48 | - [ |
|
49 | - 'name' => 'Locking#isLockingEnabled', |
|
50 | - 'url' => '/api/v1/lockprovisioning', |
|
51 | - 'verb' => 'GET', |
|
52 | - ], |
|
53 | - [ |
|
54 | - 'name' => 'Locking#isLocked', |
|
55 | - 'url' => '/api/v1/lockprovisioning/{type}/{user}', |
|
56 | - 'verb' => 'GET', |
|
57 | - ], |
|
58 | - [ |
|
59 | - 'name' => 'Locking#acquireLock', |
|
60 | - 'url' => '/api/v1/lockprovisioning/{type}/{user}', |
|
61 | - 'verb' => 'POST', |
|
62 | - ], |
|
63 | - [ |
|
64 | - 'name' => 'Locking#changeLock', |
|
65 | - 'url' => '/api/v1/lockprovisioning/{type}/{user}', |
|
66 | - 'verb' => 'PUT', |
|
67 | - ], |
|
68 | - [ |
|
69 | - 'name' => 'Locking#releaseLock', |
|
70 | - 'url' => '/api/v1/lockprovisioning/{type}/{user}', |
|
71 | - 'verb' => 'DELETE', |
|
72 | - ], |
|
73 | - [ |
|
74 | - 'name' => 'Locking#releaseAll', |
|
75 | - 'url' => '/api/v1/lockprovisioning/{type}', |
|
76 | - 'verb' => 'DELETE', |
|
77 | - 'defaults' => [ |
|
78 | - 'type' => null |
|
79 | - ] |
|
80 | - ], |
|
81 | - ], |
|
37 | + 'ocs' => [ |
|
38 | + [ |
|
39 | + 'name' => 'Config#setAppValue', |
|
40 | + 'url' => '/api/v1/app/{appid}/{configkey}', |
|
41 | + 'verb' => 'POST', |
|
42 | + ], |
|
43 | + [ |
|
44 | + 'name' => 'Config#deleteAppValue', |
|
45 | + 'url' => '/api/v1/app/{appid}/{configkey}', |
|
46 | + 'verb' => 'DELETE', |
|
47 | + ], |
|
48 | + [ |
|
49 | + 'name' => 'Locking#isLockingEnabled', |
|
50 | + 'url' => '/api/v1/lockprovisioning', |
|
51 | + 'verb' => 'GET', |
|
52 | + ], |
|
53 | + [ |
|
54 | + 'name' => 'Locking#isLocked', |
|
55 | + 'url' => '/api/v1/lockprovisioning/{type}/{user}', |
|
56 | + 'verb' => 'GET', |
|
57 | + ], |
|
58 | + [ |
|
59 | + 'name' => 'Locking#acquireLock', |
|
60 | + 'url' => '/api/v1/lockprovisioning/{type}/{user}', |
|
61 | + 'verb' => 'POST', |
|
62 | + ], |
|
63 | + [ |
|
64 | + 'name' => 'Locking#changeLock', |
|
65 | + 'url' => '/api/v1/lockprovisioning/{type}/{user}', |
|
66 | + 'verb' => 'PUT', |
|
67 | + ], |
|
68 | + [ |
|
69 | + 'name' => 'Locking#releaseLock', |
|
70 | + 'url' => '/api/v1/lockprovisioning/{type}/{user}', |
|
71 | + 'verb' => 'DELETE', |
|
72 | + ], |
|
73 | + [ |
|
74 | + 'name' => 'Locking#releaseAll', |
|
75 | + 'url' => '/api/v1/lockprovisioning/{type}', |
|
76 | + 'verb' => 'DELETE', |
|
77 | + 'defaults' => [ |
|
78 | + 'type' => null |
|
79 | + ] |
|
80 | + ], |
|
81 | + ], |
|
82 | 82 | ]; |
@@ -29,31 +29,31 @@ |
||
29 | 29 | */ |
30 | 30 | trait PriorityTrait { |
31 | 31 | |
32 | - /** @var int initial priority */ |
|
33 | - protected $priority = BackendService::PRIORITY_DEFAULT; |
|
32 | + /** @var int initial priority */ |
|
33 | + protected $priority = BackendService::PRIORITY_DEFAULT; |
|
34 | 34 | |
35 | - /** |
|
36 | - * @return int |
|
37 | - */ |
|
38 | - public function getPriority() { |
|
39 | - return $this->priority; |
|
40 | - } |
|
35 | + /** |
|
36 | + * @return int |
|
37 | + */ |
|
38 | + public function getPriority() { |
|
39 | + return $this->priority; |
|
40 | + } |
|
41 | 41 | |
42 | - /** |
|
43 | - * @param int $priority |
|
44 | - * @return self |
|
45 | - */ |
|
46 | - public function setPriority($priority) { |
|
47 | - $this->priority = $priority; |
|
48 | - return $this; |
|
49 | - } |
|
42 | + /** |
|
43 | + * @param int $priority |
|
44 | + * @return self |
|
45 | + */ |
|
46 | + public function setPriority($priority) { |
|
47 | + $this->priority = $priority; |
|
48 | + return $this; |
|
49 | + } |
|
50 | 50 | |
51 | - /** |
|
52 | - * @param PriorityTrait $a |
|
53 | - * @param PriorityTrait $b |
|
54 | - * @return int |
|
55 | - */ |
|
56 | - public static function priorityCompare(PriorityTrait $a, PriorityTrait $b) { |
|
57 | - return ($a->getPriority() - $b->getPriority()); |
|
58 | - } |
|
51 | + /** |
|
52 | + * @param PriorityTrait $a |
|
53 | + * @param PriorityTrait $b |
|
54 | + * @return int |
|
55 | + */ |
|
56 | + public static function priorityCompare(PriorityTrait $a, PriorityTrait $b) { |
|
57 | + return ($a->getPriority() - $b->getPriority()); |
|
58 | + } |
|
59 | 59 | } |
@@ -220,7 +220,7 @@ discard block |
||
220 | 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 | } |
@@ -37,398 +37,398 @@ |
||
37 | 37 | * External storage configuration |
38 | 38 | */ |
39 | 39 | class StorageConfig implements \JsonSerializable { |
40 | - public const MOUNT_TYPE_ADMIN = 1; |
|
41 | - public const MOUNT_TYPE_PERSONAl = 2; |
|
42 | - |
|
43 | - /** |
|
44 | - * Storage config id |
|
45 | - * |
|
46 | - * @var int |
|
47 | - */ |
|
48 | - private $id; |
|
49 | - |
|
50 | - /** |
|
51 | - * Backend |
|
52 | - * |
|
53 | - * @var Backend |
|
54 | - */ |
|
55 | - private $backend; |
|
56 | - |
|
57 | - /** |
|
58 | - * Authentication mechanism |
|
59 | - * |
|
60 | - * @var AuthMechanism |
|
61 | - */ |
|
62 | - private $authMechanism; |
|
63 | - |
|
64 | - /** |
|
65 | - * Backend options |
|
66 | - * |
|
67 | - * @var array |
|
68 | - */ |
|
69 | - private $backendOptions = []; |
|
70 | - |
|
71 | - /** |
|
72 | - * Mount point path, relative to the user's "files" folder |
|
73 | - * |
|
74 | - * @var string |
|
75 | - */ |
|
76 | - private $mountPoint; |
|
77 | - |
|
78 | - /** |
|
79 | - * Storage status |
|
80 | - * |
|
81 | - * @var int |
|
82 | - */ |
|
83 | - private $status; |
|
84 | - |
|
85 | - /** |
|
86 | - * Status message |
|
87 | - * |
|
88 | - * @var string |
|
89 | - */ |
|
90 | - private $statusMessage; |
|
91 | - |
|
92 | - /** |
|
93 | - * Priority |
|
94 | - * |
|
95 | - * @var int |
|
96 | - */ |
|
97 | - private $priority; |
|
98 | - |
|
99 | - /** |
|
100 | - * List of users who have access to this storage |
|
101 | - * |
|
102 | - * @var array |
|
103 | - */ |
|
104 | - private $applicableUsers = []; |
|
105 | - |
|
106 | - /** |
|
107 | - * List of groups that have access to this storage |
|
108 | - * |
|
109 | - * @var array |
|
110 | - */ |
|
111 | - private $applicableGroups = []; |
|
112 | - |
|
113 | - /** |
|
114 | - * Mount-specific options |
|
115 | - * |
|
116 | - * @var array |
|
117 | - */ |
|
118 | - private $mountOptions = []; |
|
119 | - |
|
120 | - /** |
|
121 | - * Whether it's a personal or admin mount |
|
122 | - * |
|
123 | - * @var int |
|
124 | - */ |
|
125 | - private $type; |
|
126 | - |
|
127 | - /** |
|
128 | - * Creates a storage config |
|
129 | - * |
|
130 | - * @param int|null $id config id or null for a new config |
|
131 | - */ |
|
132 | - public function __construct($id = null) { |
|
133 | - $this->id = $id; |
|
134 | - $this->mountOptions['enable_sharing'] = false; |
|
135 | - } |
|
136 | - |
|
137 | - /** |
|
138 | - * Returns the configuration id |
|
139 | - * |
|
140 | - * @return int |
|
141 | - */ |
|
142 | - public function getId() { |
|
143 | - return $this->id; |
|
144 | - } |
|
145 | - |
|
146 | - /** |
|
147 | - * Sets the configuration id |
|
148 | - * |
|
149 | - * @param int $id configuration id |
|
150 | - */ |
|
151 | - public function setId($id) { |
|
152 | - $this->id = $id; |
|
153 | - } |
|
154 | - |
|
155 | - /** |
|
156 | - * Returns mount point path relative to the user's |
|
157 | - * "files" folder. |
|
158 | - * |
|
159 | - * @return string path |
|
160 | - */ |
|
161 | - public function getMountPoint() { |
|
162 | - return $this->mountPoint; |
|
163 | - } |
|
164 | - |
|
165 | - /** |
|
166 | - * Sets mount point path relative to the user's |
|
167 | - * "files" folder. |
|
168 | - * The path will be normalized. |
|
169 | - * |
|
170 | - * @param string $mountPoint path |
|
171 | - */ |
|
172 | - public function setMountPoint($mountPoint) { |
|
173 | - $this->mountPoint = \OC\Files\Filesystem::normalizePath($mountPoint); |
|
174 | - } |
|
175 | - |
|
176 | - /** |
|
177 | - * @return Backend |
|
178 | - */ |
|
179 | - public function getBackend() { |
|
180 | - return $this->backend; |
|
181 | - } |
|
182 | - |
|
183 | - /** |
|
184 | - * @param Backend $backend |
|
185 | - */ |
|
186 | - public function setBackend(Backend $backend) { |
|
187 | - $this->backend = $backend; |
|
188 | - } |
|
189 | - |
|
190 | - /** |
|
191 | - * @return AuthMechanism |
|
192 | - */ |
|
193 | - public function getAuthMechanism() { |
|
194 | - return $this->authMechanism; |
|
195 | - } |
|
196 | - |
|
197 | - /** |
|
198 | - * @param AuthMechanism $authMechanism |
|
199 | - */ |
|
200 | - public function setAuthMechanism(AuthMechanism $authMechanism) { |
|
201 | - $this->authMechanism = $authMechanism; |
|
202 | - } |
|
203 | - |
|
204 | - /** |
|
205 | - * Returns the external storage backend-specific options |
|
206 | - * |
|
207 | - * @return array backend options |
|
208 | - */ |
|
209 | - public function getBackendOptions() { |
|
210 | - return $this->backendOptions; |
|
211 | - } |
|
212 | - |
|
213 | - /** |
|
214 | - * Sets the external storage backend-specific options |
|
215 | - * |
|
216 | - * @param array $backendOptions backend options |
|
217 | - */ |
|
218 | - public function setBackendOptions($backendOptions) { |
|
219 | - if ($this->getBackend() instanceof Backend) { |
|
220 | - $parameters = $this->getBackend()->getParameters(); |
|
221 | - foreach ($backendOptions as $key => $value) { |
|
222 | - if (isset($parameters[$key])) { |
|
223 | - switch ($parameters[$key]->getType()) { |
|
224 | - case \OCA\Files_External\Lib\DefinitionParameter::VALUE_BOOLEAN: |
|
225 | - $value = (bool)$value; |
|
226 | - break; |
|
227 | - } |
|
228 | - $backendOptions[$key] = $value; |
|
229 | - } |
|
230 | - } |
|
231 | - } |
|
232 | - |
|
233 | - $this->backendOptions = $backendOptions; |
|
234 | - } |
|
235 | - |
|
236 | - /** |
|
237 | - * @param string $key |
|
238 | - * @return mixed |
|
239 | - */ |
|
240 | - public function getBackendOption($key) { |
|
241 | - if (isset($this->backendOptions[$key])) { |
|
242 | - return $this->backendOptions[$key]; |
|
243 | - } |
|
244 | - return null; |
|
245 | - } |
|
246 | - |
|
247 | - /** |
|
248 | - * @param string $key |
|
249 | - * @param mixed $value |
|
250 | - */ |
|
251 | - public function setBackendOption($key, $value) { |
|
252 | - $this->backendOptions[$key] = $value; |
|
253 | - } |
|
254 | - |
|
255 | - /** |
|
256 | - * Returns the mount priority |
|
257 | - * |
|
258 | - * @return int priority |
|
259 | - */ |
|
260 | - public function getPriority() { |
|
261 | - return $this->priority; |
|
262 | - } |
|
263 | - |
|
264 | - /** |
|
265 | - * Sets the mount priotity |
|
266 | - * |
|
267 | - * @param int $priority priority |
|
268 | - */ |
|
269 | - public function setPriority($priority) { |
|
270 | - $this->priority = $priority; |
|
271 | - } |
|
272 | - |
|
273 | - /** |
|
274 | - * Returns the users for which to mount this storage |
|
275 | - * |
|
276 | - * @return array applicable users |
|
277 | - */ |
|
278 | - public function getApplicableUsers() { |
|
279 | - return $this->applicableUsers; |
|
280 | - } |
|
281 | - |
|
282 | - /** |
|
283 | - * Sets the users for which to mount this storage |
|
284 | - * |
|
285 | - * @param array|null $applicableUsers applicable users |
|
286 | - */ |
|
287 | - public function setApplicableUsers($applicableUsers) { |
|
288 | - if (is_null($applicableUsers)) { |
|
289 | - $applicableUsers = []; |
|
290 | - } |
|
291 | - $this->applicableUsers = $applicableUsers; |
|
292 | - } |
|
293 | - |
|
294 | - /** |
|
295 | - * Returns the groups for which to mount this storage |
|
296 | - * |
|
297 | - * @return array applicable groups |
|
298 | - */ |
|
299 | - public function getApplicableGroups() { |
|
300 | - return $this->applicableGroups; |
|
301 | - } |
|
302 | - |
|
303 | - /** |
|
304 | - * Sets the groups for which to mount this storage |
|
305 | - * |
|
306 | - * @param array|null $applicableGroups applicable groups |
|
307 | - */ |
|
308 | - public function setApplicableGroups($applicableGroups) { |
|
309 | - if (is_null($applicableGroups)) { |
|
310 | - $applicableGroups = []; |
|
311 | - } |
|
312 | - $this->applicableGroups = $applicableGroups; |
|
313 | - } |
|
314 | - |
|
315 | - /** |
|
316 | - * Returns the mount-specific options |
|
317 | - * |
|
318 | - * @return array mount specific options |
|
319 | - */ |
|
320 | - public function getMountOptions() { |
|
321 | - return $this->mountOptions; |
|
322 | - } |
|
323 | - |
|
324 | - /** |
|
325 | - * Sets the mount-specific options |
|
326 | - * |
|
327 | - * @param array $mountOptions applicable groups |
|
328 | - */ |
|
329 | - public function setMountOptions($mountOptions) { |
|
330 | - if (is_null($mountOptions)) { |
|
331 | - $mountOptions = []; |
|
332 | - } |
|
333 | - $this->mountOptions = $mountOptions; |
|
334 | - } |
|
335 | - |
|
336 | - /** |
|
337 | - * @param string $key |
|
338 | - * @return mixed |
|
339 | - */ |
|
340 | - public function getMountOption($key) { |
|
341 | - if (isset($this->mountOptions[$key])) { |
|
342 | - return $this->mountOptions[$key]; |
|
343 | - } |
|
344 | - return null; |
|
345 | - } |
|
346 | - |
|
347 | - /** |
|
348 | - * @param string $key |
|
349 | - * @param mixed $value |
|
350 | - */ |
|
351 | - public function setMountOption($key, $value) { |
|
352 | - $this->mountOptions[$key] = $value; |
|
353 | - } |
|
354 | - |
|
355 | - /** |
|
356 | - * Gets the storage status, whether the config worked last time |
|
357 | - * |
|
358 | - * @return int $status status |
|
359 | - */ |
|
360 | - public function getStatus() { |
|
361 | - return $this->status; |
|
362 | - } |
|
363 | - |
|
364 | - /** |
|
365 | - * Gets the message describing the storage status |
|
366 | - * |
|
367 | - * @return string|null |
|
368 | - */ |
|
369 | - public function getStatusMessage() { |
|
370 | - return $this->statusMessage; |
|
371 | - } |
|
372 | - |
|
373 | - /** |
|
374 | - * Sets the storage status, whether the config worked last time |
|
375 | - * |
|
376 | - * @param int $status status |
|
377 | - * @param string|null $message optional message |
|
378 | - */ |
|
379 | - public function setStatus($status, $message = null) { |
|
380 | - $this->status = $status; |
|
381 | - $this->statusMessage = $message; |
|
382 | - } |
|
383 | - |
|
384 | - /** |
|
385 | - * @return int self::MOUNT_TYPE_ADMIN or self::MOUNT_TYPE_PERSONAl |
|
386 | - */ |
|
387 | - public function getType() { |
|
388 | - return $this->type; |
|
389 | - } |
|
390 | - |
|
391 | - /** |
|
392 | - * @param int $type self::MOUNT_TYPE_ADMIN or self::MOUNT_TYPE_PERSONAl |
|
393 | - */ |
|
394 | - public function setType($type) { |
|
395 | - $this->type = $type; |
|
396 | - } |
|
397 | - |
|
398 | - /** |
|
399 | - * Serialize config to JSON |
|
400 | - * |
|
401 | - * @return array |
|
402 | - */ |
|
403 | - public function jsonSerialize() { |
|
404 | - $result = []; |
|
405 | - if (!is_null($this->id)) { |
|
406 | - $result['id'] = $this->id; |
|
407 | - } |
|
408 | - $result['mountPoint'] = $this->mountPoint; |
|
409 | - $result['backend'] = $this->backend->getIdentifier(); |
|
410 | - $result['authMechanism'] = $this->authMechanism->getIdentifier(); |
|
411 | - $result['backendOptions'] = $this->backendOptions; |
|
412 | - if (!is_null($this->priority)) { |
|
413 | - $result['priority'] = $this->priority; |
|
414 | - } |
|
415 | - if (!empty($this->applicableUsers)) { |
|
416 | - $result['applicableUsers'] = $this->applicableUsers; |
|
417 | - } |
|
418 | - if (!empty($this->applicableGroups)) { |
|
419 | - $result['applicableGroups'] = $this->applicableGroups; |
|
420 | - } |
|
421 | - if (!empty($this->mountOptions)) { |
|
422 | - $result['mountOptions'] = $this->mountOptions; |
|
423 | - } |
|
424 | - if (!is_null($this->status)) { |
|
425 | - $result['status'] = $this->status; |
|
426 | - } |
|
427 | - if (!is_null($this->statusMessage)) { |
|
428 | - $result['statusMessage'] = $this->statusMessage; |
|
429 | - } |
|
430 | - $result['userProvided'] = $this->authMechanism instanceof IUserProvided; |
|
431 | - $result['type'] = ($this->getType() === self::MOUNT_TYPE_PERSONAl) ? 'personal': 'system'; |
|
432 | - return $result; |
|
433 | - } |
|
40 | + public const MOUNT_TYPE_ADMIN = 1; |
|
41 | + public const MOUNT_TYPE_PERSONAl = 2; |
|
42 | + |
|
43 | + /** |
|
44 | + * Storage config id |
|
45 | + * |
|
46 | + * @var int |
|
47 | + */ |
|
48 | + private $id; |
|
49 | + |
|
50 | + /** |
|
51 | + * Backend |
|
52 | + * |
|
53 | + * @var Backend |
|
54 | + */ |
|
55 | + private $backend; |
|
56 | + |
|
57 | + /** |
|
58 | + * Authentication mechanism |
|
59 | + * |
|
60 | + * @var AuthMechanism |
|
61 | + */ |
|
62 | + private $authMechanism; |
|
63 | + |
|
64 | + /** |
|
65 | + * Backend options |
|
66 | + * |
|
67 | + * @var array |
|
68 | + */ |
|
69 | + private $backendOptions = []; |
|
70 | + |
|
71 | + /** |
|
72 | + * Mount point path, relative to the user's "files" folder |
|
73 | + * |
|
74 | + * @var string |
|
75 | + */ |
|
76 | + private $mountPoint; |
|
77 | + |
|
78 | + /** |
|
79 | + * Storage status |
|
80 | + * |
|
81 | + * @var int |
|
82 | + */ |
|
83 | + private $status; |
|
84 | + |
|
85 | + /** |
|
86 | + * Status message |
|
87 | + * |
|
88 | + * @var string |
|
89 | + */ |
|
90 | + private $statusMessage; |
|
91 | + |
|
92 | + /** |
|
93 | + * Priority |
|
94 | + * |
|
95 | + * @var int |
|
96 | + */ |
|
97 | + private $priority; |
|
98 | + |
|
99 | + /** |
|
100 | + * List of users who have access to this storage |
|
101 | + * |
|
102 | + * @var array |
|
103 | + */ |
|
104 | + private $applicableUsers = []; |
|
105 | + |
|
106 | + /** |
|
107 | + * List of groups that have access to this storage |
|
108 | + * |
|
109 | + * @var array |
|
110 | + */ |
|
111 | + private $applicableGroups = []; |
|
112 | + |
|
113 | + /** |
|
114 | + * Mount-specific options |
|
115 | + * |
|
116 | + * @var array |
|
117 | + */ |
|
118 | + private $mountOptions = []; |
|
119 | + |
|
120 | + /** |
|
121 | + * Whether it's a personal or admin mount |
|
122 | + * |
|
123 | + * @var int |
|
124 | + */ |
|
125 | + private $type; |
|
126 | + |
|
127 | + /** |
|
128 | + * Creates a storage config |
|
129 | + * |
|
130 | + * @param int|null $id config id or null for a new config |
|
131 | + */ |
|
132 | + public function __construct($id = null) { |
|
133 | + $this->id = $id; |
|
134 | + $this->mountOptions['enable_sharing'] = false; |
|
135 | + } |
|
136 | + |
|
137 | + /** |
|
138 | + * Returns the configuration id |
|
139 | + * |
|
140 | + * @return int |
|
141 | + */ |
|
142 | + public function getId() { |
|
143 | + return $this->id; |
|
144 | + } |
|
145 | + |
|
146 | + /** |
|
147 | + * Sets the configuration id |
|
148 | + * |
|
149 | + * @param int $id configuration id |
|
150 | + */ |
|
151 | + public function setId($id) { |
|
152 | + $this->id = $id; |
|
153 | + } |
|
154 | + |
|
155 | + /** |
|
156 | + * Returns mount point path relative to the user's |
|
157 | + * "files" folder. |
|
158 | + * |
|
159 | + * @return string path |
|
160 | + */ |
|
161 | + public function getMountPoint() { |
|
162 | + return $this->mountPoint; |
|
163 | + } |
|
164 | + |
|
165 | + /** |
|
166 | + * Sets mount point path relative to the user's |
|
167 | + * "files" folder. |
|
168 | + * The path will be normalized. |
|
169 | + * |
|
170 | + * @param string $mountPoint path |
|
171 | + */ |
|
172 | + public function setMountPoint($mountPoint) { |
|
173 | + $this->mountPoint = \OC\Files\Filesystem::normalizePath($mountPoint); |
|
174 | + } |
|
175 | + |
|
176 | + /** |
|
177 | + * @return Backend |
|
178 | + */ |
|
179 | + public function getBackend() { |
|
180 | + return $this->backend; |
|
181 | + } |
|
182 | + |
|
183 | + /** |
|
184 | + * @param Backend $backend |
|
185 | + */ |
|
186 | + public function setBackend(Backend $backend) { |
|
187 | + $this->backend = $backend; |
|
188 | + } |
|
189 | + |
|
190 | + /** |
|
191 | + * @return AuthMechanism |
|
192 | + */ |
|
193 | + public function getAuthMechanism() { |
|
194 | + return $this->authMechanism; |
|
195 | + } |
|
196 | + |
|
197 | + /** |
|
198 | + * @param AuthMechanism $authMechanism |
|
199 | + */ |
|
200 | + public function setAuthMechanism(AuthMechanism $authMechanism) { |
|
201 | + $this->authMechanism = $authMechanism; |
|
202 | + } |
|
203 | + |
|
204 | + /** |
|
205 | + * Returns the external storage backend-specific options |
|
206 | + * |
|
207 | + * @return array backend options |
|
208 | + */ |
|
209 | + public function getBackendOptions() { |
|
210 | + return $this->backendOptions; |
|
211 | + } |
|
212 | + |
|
213 | + /** |
|
214 | + * Sets the external storage backend-specific options |
|
215 | + * |
|
216 | + * @param array $backendOptions backend options |
|
217 | + */ |
|
218 | + public function setBackendOptions($backendOptions) { |
|
219 | + if ($this->getBackend() instanceof Backend) { |
|
220 | + $parameters = $this->getBackend()->getParameters(); |
|
221 | + foreach ($backendOptions as $key => $value) { |
|
222 | + if (isset($parameters[$key])) { |
|
223 | + switch ($parameters[$key]->getType()) { |
|
224 | + case \OCA\Files_External\Lib\DefinitionParameter::VALUE_BOOLEAN: |
|
225 | + $value = (bool)$value; |
|
226 | + break; |
|
227 | + } |
|
228 | + $backendOptions[$key] = $value; |
|
229 | + } |
|
230 | + } |
|
231 | + } |
|
232 | + |
|
233 | + $this->backendOptions = $backendOptions; |
|
234 | + } |
|
235 | + |
|
236 | + /** |
|
237 | + * @param string $key |
|
238 | + * @return mixed |
|
239 | + */ |
|
240 | + public function getBackendOption($key) { |
|
241 | + if (isset($this->backendOptions[$key])) { |
|
242 | + return $this->backendOptions[$key]; |
|
243 | + } |
|
244 | + return null; |
|
245 | + } |
|
246 | + |
|
247 | + /** |
|
248 | + * @param string $key |
|
249 | + * @param mixed $value |
|
250 | + */ |
|
251 | + public function setBackendOption($key, $value) { |
|
252 | + $this->backendOptions[$key] = $value; |
|
253 | + } |
|
254 | + |
|
255 | + /** |
|
256 | + * Returns the mount priority |
|
257 | + * |
|
258 | + * @return int priority |
|
259 | + */ |
|
260 | + public function getPriority() { |
|
261 | + return $this->priority; |
|
262 | + } |
|
263 | + |
|
264 | + /** |
|
265 | + * Sets the mount priotity |
|
266 | + * |
|
267 | + * @param int $priority priority |
|
268 | + */ |
|
269 | + public function setPriority($priority) { |
|
270 | + $this->priority = $priority; |
|
271 | + } |
|
272 | + |
|
273 | + /** |
|
274 | + * Returns the users for which to mount this storage |
|
275 | + * |
|
276 | + * @return array applicable users |
|
277 | + */ |
|
278 | + public function getApplicableUsers() { |
|
279 | + return $this->applicableUsers; |
|
280 | + } |
|
281 | + |
|
282 | + /** |
|
283 | + * Sets the users for which to mount this storage |
|
284 | + * |
|
285 | + * @param array|null $applicableUsers applicable users |
|
286 | + */ |
|
287 | + public function setApplicableUsers($applicableUsers) { |
|
288 | + if (is_null($applicableUsers)) { |
|
289 | + $applicableUsers = []; |
|
290 | + } |
|
291 | + $this->applicableUsers = $applicableUsers; |
|
292 | + } |
|
293 | + |
|
294 | + /** |
|
295 | + * Returns the groups for which to mount this storage |
|
296 | + * |
|
297 | + * @return array applicable groups |
|
298 | + */ |
|
299 | + public function getApplicableGroups() { |
|
300 | + return $this->applicableGroups; |
|
301 | + } |
|
302 | + |
|
303 | + /** |
|
304 | + * Sets the groups for which to mount this storage |
|
305 | + * |
|
306 | + * @param array|null $applicableGroups applicable groups |
|
307 | + */ |
|
308 | + public function setApplicableGroups($applicableGroups) { |
|
309 | + if (is_null($applicableGroups)) { |
|
310 | + $applicableGroups = []; |
|
311 | + } |
|
312 | + $this->applicableGroups = $applicableGroups; |
|
313 | + } |
|
314 | + |
|
315 | + /** |
|
316 | + * Returns the mount-specific options |
|
317 | + * |
|
318 | + * @return array mount specific options |
|
319 | + */ |
|
320 | + public function getMountOptions() { |
|
321 | + return $this->mountOptions; |
|
322 | + } |
|
323 | + |
|
324 | + /** |
|
325 | + * Sets the mount-specific options |
|
326 | + * |
|
327 | + * @param array $mountOptions applicable groups |
|
328 | + */ |
|
329 | + public function setMountOptions($mountOptions) { |
|
330 | + if (is_null($mountOptions)) { |
|
331 | + $mountOptions = []; |
|
332 | + } |
|
333 | + $this->mountOptions = $mountOptions; |
|
334 | + } |
|
335 | + |
|
336 | + /** |
|
337 | + * @param string $key |
|
338 | + * @return mixed |
|
339 | + */ |
|
340 | + public function getMountOption($key) { |
|
341 | + if (isset($this->mountOptions[$key])) { |
|
342 | + return $this->mountOptions[$key]; |
|
343 | + } |
|
344 | + return null; |
|
345 | + } |
|
346 | + |
|
347 | + /** |
|
348 | + * @param string $key |
|
349 | + * @param mixed $value |
|
350 | + */ |
|
351 | + public function setMountOption($key, $value) { |
|
352 | + $this->mountOptions[$key] = $value; |
|
353 | + } |
|
354 | + |
|
355 | + /** |
|
356 | + * Gets the storage status, whether the config worked last time |
|
357 | + * |
|
358 | + * @return int $status status |
|
359 | + */ |
|
360 | + public function getStatus() { |
|
361 | + return $this->status; |
|
362 | + } |
|
363 | + |
|
364 | + /** |
|
365 | + * Gets the message describing the storage status |
|
366 | + * |
|
367 | + * @return string|null |
|
368 | + */ |
|
369 | + public function getStatusMessage() { |
|
370 | + return $this->statusMessage; |
|
371 | + } |
|
372 | + |
|
373 | + /** |
|
374 | + * Sets the storage status, whether the config worked last time |
|
375 | + * |
|
376 | + * @param int $status status |
|
377 | + * @param string|null $message optional message |
|
378 | + */ |
|
379 | + public function setStatus($status, $message = null) { |
|
380 | + $this->status = $status; |
|
381 | + $this->statusMessage = $message; |
|
382 | + } |
|
383 | + |
|
384 | + /** |
|
385 | + * @return int self::MOUNT_TYPE_ADMIN or self::MOUNT_TYPE_PERSONAl |
|
386 | + */ |
|
387 | + public function getType() { |
|
388 | + return $this->type; |
|
389 | + } |
|
390 | + |
|
391 | + /** |
|
392 | + * @param int $type self::MOUNT_TYPE_ADMIN or self::MOUNT_TYPE_PERSONAl |
|
393 | + */ |
|
394 | + public function setType($type) { |
|
395 | + $this->type = $type; |
|
396 | + } |
|
397 | + |
|
398 | + /** |
|
399 | + * Serialize config to JSON |
|
400 | + * |
|
401 | + * @return array |
|
402 | + */ |
|
403 | + public function jsonSerialize() { |
|
404 | + $result = []; |
|
405 | + if (!is_null($this->id)) { |
|
406 | + $result['id'] = $this->id; |
|
407 | + } |
|
408 | + $result['mountPoint'] = $this->mountPoint; |
|
409 | + $result['backend'] = $this->backend->getIdentifier(); |
|
410 | + $result['authMechanism'] = $this->authMechanism->getIdentifier(); |
|
411 | + $result['backendOptions'] = $this->backendOptions; |
|
412 | + if (!is_null($this->priority)) { |
|
413 | + $result['priority'] = $this->priority; |
|
414 | + } |
|
415 | + if (!empty($this->applicableUsers)) { |
|
416 | + $result['applicableUsers'] = $this->applicableUsers; |
|
417 | + } |
|
418 | + if (!empty($this->applicableGroups)) { |
|
419 | + $result['applicableGroups'] = $this->applicableGroups; |
|
420 | + } |
|
421 | + if (!empty($this->mountOptions)) { |
|
422 | + $result['mountOptions'] = $this->mountOptions; |
|
423 | + } |
|
424 | + if (!is_null($this->status)) { |
|
425 | + $result['status'] = $this->status; |
|
426 | + } |
|
427 | + if (!is_null($this->statusMessage)) { |
|
428 | + $result['statusMessage'] = $this->statusMessage; |
|
429 | + } |
|
430 | + $result['userProvided'] = $this->authMechanism instanceof IUserProvided; |
|
431 | + $result['type'] = ($this->getType() === self::MOUNT_TYPE_PERSONAl) ? 'personal': 'system'; |
|
432 | + return $result; |
|
433 | + } |
|
434 | 434 | } |
@@ -50,7 +50,7 @@ |
||
50 | 50 | ->setFlag(DefinitionParameter::FLAG_OPTIONAL), |
51 | 51 | ]) |
52 | 52 | ->addAuthScheme(AuthMechanism::SCHEME_OPENSTACK) |
53 | - ->setLegacyAuthMechanismCallback(function (array $params) use ($openstackAuth, $rackspaceAuth) { |
|
53 | + ->setLegacyAuthMechanismCallback(function(array $params) use ($openstackAuth, $rackspaceAuth) { |
|
54 | 54 | if (isset($params['options']['key']) && $params['options']['key']) { |
55 | 55 | return $rackspaceAuth; |
56 | 56 | } |
@@ -33,29 +33,29 @@ |
||
33 | 33 | use OCP\IL10N; |
34 | 34 | |
35 | 35 | class Swift extends Backend { |
36 | - use LegacyDependencyCheckPolyfill; |
|
36 | + use LegacyDependencyCheckPolyfill; |
|
37 | 37 | |
38 | - public function __construct(IL10N $l, OpenStackV2 $openstackAuth, Rackspace $rackspaceAuth) { |
|
39 | - $this |
|
40 | - ->setIdentifier('swift') |
|
41 | - ->addIdentifierAlias('\OC\Files\Storage\Swift') // legacy compat |
|
42 | - ->setStorageClass('\OCA\Files_External\Lib\Storage\Swift') |
|
43 | - ->setText($l->t('OpenStack Object Storage')) |
|
44 | - ->addParameters([ |
|
45 | - (new DefinitionParameter('service_name', $l->t('Service name'))) |
|
46 | - ->setFlag(DefinitionParameter::FLAG_OPTIONAL), |
|
47 | - new DefinitionParameter('region', $l->t('Region')), |
|
48 | - new DefinitionParameter('bucket', $l->t('Bucket')), |
|
49 | - (new DefinitionParameter('timeout', $l->t('Request timeout (seconds)'))) |
|
50 | - ->setFlag(DefinitionParameter::FLAG_OPTIONAL), |
|
51 | - ]) |
|
52 | - ->addAuthScheme(AuthMechanism::SCHEME_OPENSTACK) |
|
53 | - ->setLegacyAuthMechanismCallback(function (array $params) use ($openstackAuth, $rackspaceAuth) { |
|
54 | - if (isset($params['options']['key']) && $params['options']['key']) { |
|
55 | - return $rackspaceAuth; |
|
56 | - } |
|
57 | - return $openstackAuth; |
|
58 | - }) |
|
59 | - ; |
|
60 | - } |
|
38 | + public function __construct(IL10N $l, OpenStackV2 $openstackAuth, Rackspace $rackspaceAuth) { |
|
39 | + $this |
|
40 | + ->setIdentifier('swift') |
|
41 | + ->addIdentifierAlias('\OC\Files\Storage\Swift') // legacy compat |
|
42 | + ->setStorageClass('\OCA\Files_External\Lib\Storage\Swift') |
|
43 | + ->setText($l->t('OpenStack Object Storage')) |
|
44 | + ->addParameters([ |
|
45 | + (new DefinitionParameter('service_name', $l->t('Service name'))) |
|
46 | + ->setFlag(DefinitionParameter::FLAG_OPTIONAL), |
|
47 | + new DefinitionParameter('region', $l->t('Region')), |
|
48 | + new DefinitionParameter('bucket', $l->t('Bucket')), |
|
49 | + (new DefinitionParameter('timeout', $l->t('Request timeout (seconds)'))) |
|
50 | + ->setFlag(DefinitionParameter::FLAG_OPTIONAL), |
|
51 | + ]) |
|
52 | + ->addAuthScheme(AuthMechanism::SCHEME_OPENSTACK) |
|
53 | + ->setLegacyAuthMechanismCallback(function (array $params) use ($openstackAuth, $rackspaceAuth) { |
|
54 | + if (isset($params['options']['key']) && $params['options']['key']) { |
|
55 | + return $rackspaceAuth; |
|
56 | + } |
|
57 | + return $openstackAuth; |
|
58 | + }) |
|
59 | + ; |
|
60 | + } |
|
61 | 61 | } |
@@ -36,101 +36,101 @@ |
||
36 | 36 | */ |
37 | 37 | trait VisibilityTrait { |
38 | 38 | |
39 | - /** @var int visibility */ |
|
40 | - protected $visibility = BackendService::VISIBILITY_DEFAULT; |
|
39 | + /** @var int visibility */ |
|
40 | + protected $visibility = BackendService::VISIBILITY_DEFAULT; |
|
41 | 41 | |
42 | - /** @var int allowed visibilities */ |
|
43 | - protected $allowedVisibility = BackendService::VISIBILITY_DEFAULT; |
|
42 | + /** @var int allowed visibilities */ |
|
43 | + protected $allowedVisibility = BackendService::VISIBILITY_DEFAULT; |
|
44 | 44 | |
45 | - /** |
|
46 | - * @return int |
|
47 | - */ |
|
48 | - public function getVisibility() { |
|
49 | - return $this->visibility; |
|
50 | - } |
|
45 | + /** |
|
46 | + * @return int |
|
47 | + */ |
|
48 | + public function getVisibility() { |
|
49 | + return $this->visibility; |
|
50 | + } |
|
51 | 51 | |
52 | - /** |
|
53 | - * Check if the backend is visible for a user type |
|
54 | - * |
|
55 | - * @param int $visibility |
|
56 | - * @return bool |
|
57 | - */ |
|
58 | - public function isVisibleFor($visibility) { |
|
59 | - if ($this->visibility & $visibility) { |
|
60 | - return true; |
|
61 | - } |
|
62 | - return false; |
|
63 | - } |
|
52 | + /** |
|
53 | + * Check if the backend is visible for a user type |
|
54 | + * |
|
55 | + * @param int $visibility |
|
56 | + * @return bool |
|
57 | + */ |
|
58 | + public function isVisibleFor($visibility) { |
|
59 | + if ($this->visibility & $visibility) { |
|
60 | + return true; |
|
61 | + } |
|
62 | + return false; |
|
63 | + } |
|
64 | 64 | |
65 | - /** |
|
66 | - * @param int $visibility |
|
67 | - * @return self |
|
68 | - */ |
|
69 | - public function setVisibility($visibility) { |
|
70 | - $this->visibility = $visibility; |
|
71 | - $this->allowedVisibility |= $visibility; |
|
72 | - return $this; |
|
73 | - } |
|
65 | + /** |
|
66 | + * @param int $visibility |
|
67 | + * @return self |
|
68 | + */ |
|
69 | + public function setVisibility($visibility) { |
|
70 | + $this->visibility = $visibility; |
|
71 | + $this->allowedVisibility |= $visibility; |
|
72 | + return $this; |
|
73 | + } |
|
74 | 74 | |
75 | - /** |
|
76 | - * @param int $visibility |
|
77 | - * @return self |
|
78 | - */ |
|
79 | - public function addVisibility($visibility) { |
|
80 | - return $this->setVisibility($this->visibility | $visibility); |
|
81 | - } |
|
75 | + /** |
|
76 | + * @param int $visibility |
|
77 | + * @return self |
|
78 | + */ |
|
79 | + public function addVisibility($visibility) { |
|
80 | + return $this->setVisibility($this->visibility | $visibility); |
|
81 | + } |
|
82 | 82 | |
83 | - /** |
|
84 | - * @param int $visibility |
|
85 | - * @return self |
|
86 | - */ |
|
87 | - public function removeVisibility($visibility) { |
|
88 | - return $this->setVisibility($this->visibility & ~$visibility); |
|
89 | - } |
|
83 | + /** |
|
84 | + * @param int $visibility |
|
85 | + * @return self |
|
86 | + */ |
|
87 | + public function removeVisibility($visibility) { |
|
88 | + return $this->setVisibility($this->visibility & ~$visibility); |
|
89 | + } |
|
90 | 90 | |
91 | - /** |
|
92 | - * @return int |
|
93 | - */ |
|
94 | - public function getAllowedVisibility() { |
|
95 | - return $this->allowedVisibility; |
|
96 | - } |
|
91 | + /** |
|
92 | + * @return int |
|
93 | + */ |
|
94 | + public function getAllowedVisibility() { |
|
95 | + return $this->allowedVisibility; |
|
96 | + } |
|
97 | 97 | |
98 | - /** |
|
99 | - * Check if the backend is allowed to be visible for a user type |
|
100 | - * |
|
101 | - * @param int $allowedVisibility |
|
102 | - * @return bool |
|
103 | - */ |
|
104 | - public function isAllowedVisibleFor($allowedVisibility) { |
|
105 | - if ($this->allowedVisibility & $allowedVisibility) { |
|
106 | - return true; |
|
107 | - } |
|
108 | - return false; |
|
109 | - } |
|
98 | + /** |
|
99 | + * Check if the backend is allowed to be visible for a user type |
|
100 | + * |
|
101 | + * @param int $allowedVisibility |
|
102 | + * @return bool |
|
103 | + */ |
|
104 | + public function isAllowedVisibleFor($allowedVisibility) { |
|
105 | + if ($this->allowedVisibility & $allowedVisibility) { |
|
106 | + return true; |
|
107 | + } |
|
108 | + return false; |
|
109 | + } |
|
110 | 110 | |
111 | - /** |
|
112 | - * @param int $allowedVisibility |
|
113 | - * @return self |
|
114 | - */ |
|
115 | - public function setAllowedVisibility($allowedVisibility) { |
|
116 | - $this->allowedVisibility = $allowedVisibility; |
|
117 | - $this->visibility &= $allowedVisibility; |
|
118 | - return $this; |
|
119 | - } |
|
111 | + /** |
|
112 | + * @param int $allowedVisibility |
|
113 | + * @return self |
|
114 | + */ |
|
115 | + public function setAllowedVisibility($allowedVisibility) { |
|
116 | + $this->allowedVisibility = $allowedVisibility; |
|
117 | + $this->visibility &= $allowedVisibility; |
|
118 | + return $this; |
|
119 | + } |
|
120 | 120 | |
121 | - /** |
|
122 | - * @param int $allowedVisibility |
|
123 | - * @return self |
|
124 | - */ |
|
125 | - public function addAllowedVisibility($allowedVisibility) { |
|
126 | - return $this->setAllowedVisibility($this->allowedVisibility | $allowedVisibility); |
|
127 | - } |
|
121 | + /** |
|
122 | + * @param int $allowedVisibility |
|
123 | + * @return self |
|
124 | + */ |
|
125 | + public function addAllowedVisibility($allowedVisibility) { |
|
126 | + return $this->setAllowedVisibility($this->allowedVisibility | $allowedVisibility); |
|
127 | + } |
|
128 | 128 | |
129 | - /** |
|
130 | - * @param int $allowedVisibility |
|
131 | - * @return self |
|
132 | - */ |
|
133 | - public function removeAllowedVisibility($allowedVisibility) { |
|
134 | - return $this->setAllowedVisibility($this->allowedVisibility & ~$allowedVisibility); |
|
135 | - } |
|
129 | + /** |
|
130 | + * @param int $allowedVisibility |
|
131 | + * @return self |
|
132 | + */ |
|
133 | + public function removeAllowedVisibility($allowedVisibility) { |
|
134 | + return $this->setAllowedVisibility($this->allowedVisibility & ~$allowedVisibility); |
|
135 | + } |
|
136 | 136 | } |
@@ -28,11 +28,11 @@ |
||
28 | 28 | * Builtin authentication mechanism, for legacy backends |
29 | 29 | */ |
30 | 30 | class Builtin extends AuthMechanism { |
31 | - public function __construct(IL10N $l) { |
|
32 | - $this |
|
33 | - ->setIdentifier('builtin::builtin') |
|
34 | - ->setScheme(self::SCHEME_BUILTIN) |
|
35 | - ->setText($l->t('Builtin')) |
|
36 | - ; |
|
37 | - } |
|
31 | + public function __construct(IL10N $l) { |
|
32 | + $this |
|
33 | + ->setIdentifier('builtin::builtin') |
|
34 | + ->setScheme(self::SCHEME_BUILTIN) |
|
35 | + ->setText($l->t('Builtin')) |
|
36 | + ; |
|
37 | + } |
|
38 | 38 | } |
@@ -28,11 +28,11 @@ |
||
28 | 28 | * Null authentication mechanism |
29 | 29 | */ |
30 | 30 | class NullMechanism extends AuthMechanism { |
31 | - public function __construct(IL10N $l) { |
|
32 | - $this |
|
33 | - ->setIdentifier('null::null') |
|
34 | - ->setScheme(self::SCHEME_NULL) |
|
35 | - ->setText($l->t('None')) |
|
36 | - ; |
|
37 | - } |
|
31 | + public function __construct(IL10N $l) { |
|
32 | + $this |
|
33 | + ->setIdentifier('null::null') |
|
34 | + ->setScheme(self::SCHEME_NULL) |
|
35 | + ->setText($l->t('None')) |
|
36 | + ; |
|
37 | + } |
|
38 | 38 | } |
@@ -41,48 +41,48 @@ |
||
41 | 41 | $is_optional = $parameter->isFlagSet(DefinitionParameter::FLAG_OPTIONAL); |
42 | 42 | |
43 | 43 | switch ($parameter->getType()) { |
44 | - case DefinitionParameter::VALUE_PASSWORD: ?> |
|
45 | - <?php if ($is_optional) { |
|
46 | - $classes[] = 'optional'; |
|
47 | - } ?> |
|
48 | - <input type="password" |
|
44 | + case DefinitionParameter::VALUE_PASSWORD: ?> |
|
45 | + <?php if ($is_optional) { |
|
46 | + $classes[] = 'optional'; |
|
47 | + } ?> |
|
48 | + <input type="password" |
|
49 | 49 | <?php if (!empty($classes)): ?> class="<?php p(implode(' ', $classes)); ?>"<?php endif; ?> |
50 | - data-parameter="<?php p($parameter->getName()); ?>" |
|
50 | + data-parameter="<?php p($parameter->getName()); ?>" |
|
51 | 51 | value="<?php p($value); ?>" |
52 | 52 | placeholder="<?php p($placeholder); ?>" |
53 | 53 | /> |
54 | 54 | <?php |
55 | - break; |
|
56 | - case DefinitionParameter::VALUE_BOOLEAN: ?> |
|
57 | - <?php $checkboxId = uniqid("checkbox_"); ?> |
|
55 | + break; |
|
56 | + case DefinitionParameter::VALUE_BOOLEAN: ?> |
|
57 | + <?php $checkboxId = uniqid("checkbox_"); ?> |
|
58 | 58 | <div> |
59 | 59 | <label> |
60 | 60 | <input type="checkbox" |
61 | 61 | id="<?php p($checkboxId); ?>" |
62 | 62 | <?php if (!empty($classes)): ?> class="checkbox <?php p(implode(' ', $classes)); ?>"<?php endif; ?> |
63 | - data-parameter="<?php p($parameter->getName()); ?>" |
|
63 | + data-parameter="<?php p($parameter->getName()); ?>" |
|
64 | 64 | <?php if ($value === true): ?> checked="checked"<?php endif; ?> |
65 | - /> |
|
65 | + /> |
|
66 | 66 | <?php p($placeholder); ?> |
67 | 67 | </label> |
68 | 68 | </div> |
69 | 69 | <?php |
70 | - break; |
|
71 | - case DefinitionParameter::VALUE_HIDDEN: ?> |
|
72 | - <input type="hidden" |
|
70 | + break; |
|
71 | + case DefinitionParameter::VALUE_HIDDEN: ?> |
|
72 | + <input type="hidden" |
|
73 | 73 | <?php if (!empty($classes)): ?> class="<?php p(implode(' ', $classes)); ?>"<?php endif; ?> |
74 | - data-parameter="<?php p($parameter->getName()); ?>" |
|
74 | + data-parameter="<?php p($parameter->getName()); ?>" |
|
75 | 75 | value="<?php p($value); ?>" |
76 | 76 | /> |
77 | 77 | <?php |
78 | - break; |
|
79 | - default: ?> |
|
80 | - <?php if ($is_optional) { |
|
81 | - $classes[] = 'optional'; |
|
82 | - } ?> |
|
83 | - <input type="text" |
|
78 | + break; |
|
79 | + default: ?> |
|
80 | + <?php if ($is_optional) { |
|
81 | + $classes[] = 'optional'; |
|
82 | + } ?> |
|
83 | + <input type="text" |
|
84 | 84 | <?php if (!empty($classes)): ?> class="<?php p(implode(' ', $classes)); ?>"<?php endif; ?> |
85 | - data-parameter="<?php p($parameter->getName()); ?>" |
|
85 | + data-parameter="<?php p($parameter->getName()); ?>" |
|
86 | 86 | value="<?php p($value); ?>" |
87 | 87 | placeholder="<?php p($placeholder); ?>" |
88 | 88 | /> |
@@ -194,8 +194,11 @@ |
||
194 | 194 | <?php $i = 0; foreach ($userBackends as $backend): ?> |
195 | 195 | <?php if ($deprecateTo = $backend->getDeprecateTo()): ?> |
196 | 196 | <input type="hidden" id="allowUserMountingBackends<?php p($i); ?>" name="allowUserMountingBackends[]" value="<?php p($backend->getIdentifier()); ?>" data-deprecate-to="<?php p($deprecateTo->getIdentifier()); ?>" /> |
197 | - <?php else: ?> |
|
198 | - <input type="checkbox" id="allowUserMountingBackends<?php p($i); ?>" class="checkbox" name="allowUserMountingBackends[]" value="<?php p($backend->getIdentifier()); ?>" <?php if ($backend->isVisibleFor(BackendService::VISIBILITY_PERSONAL)) { |
|
197 | + <?php else { |
|
198 | + : ?> |
|
199 | + <input type="checkbox" id="allowUserMountingBackends<?php p($i); |
|
200 | +} |
|
201 | +?>" class="checkbox" name="allowUserMountingBackends[]" value="<?php p($backend->getIdentifier()); ?>" <?php if ($backend->isVisibleFor(BackendService::VISIBILITY_PERSONAL)) { |
|
199 | 202 | print_unescaped(' checked="checked"'); |
200 | 203 | } ?> /> |
201 | 204 | <label for="allowUserMountingBackends<?php p($i); ?>"><?php p($backend->getText()); ?></label> <br /> |
@@ -1,54 +1,54 @@ discard block |
||
1 | 1 | <?php |
2 | - use \OCA\Files_External\Lib\Backend\Backend; |
|
2 | + use \OCA\Files_External\Lib\Backend\Backend; |
|
3 | 3 | use \OCA\Files_External\Lib\Auth\AuthMechanism; |
4 | 4 | use \OCA\Files_External\Lib\DefinitionParameter; |
5 | 5 | use \OCA\Files_External\Service\BackendService; |
6 | 6 | |
7 | 7 | $canCreateMounts = $_['visibilityType'] === BackendService::VISIBILITY_ADMIN || $_['allowUserMounting']; |
8 | 8 | |
9 | - $l->t("Enable encryption"); |
|
10 | - $l->t("Enable previews"); |
|
11 | - $l->t("Enable sharing"); |
|
12 | - $l->t("Check for changes"); |
|
13 | - $l->t("Never"); |
|
14 | - $l->t("Once every direct access"); |
|
15 | - $l->t('Read only'); |
|
9 | + $l->t("Enable encryption"); |
|
10 | + $l->t("Enable previews"); |
|
11 | + $l->t("Enable sharing"); |
|
12 | + $l->t("Check for changes"); |
|
13 | + $l->t("Never"); |
|
14 | + $l->t("Once every direct access"); |
|
15 | + $l->t('Read only'); |
|
16 | 16 | |
17 | - script('files_external', [ |
|
18 | - 'settings', |
|
19 | - 'templates' |
|
20 | - ]); |
|
21 | - style('files_external', 'settings'); |
|
17 | + script('files_external', [ |
|
18 | + 'settings', |
|
19 | + 'templates' |
|
20 | + ]); |
|
21 | + style('files_external', 'settings'); |
|
22 | 22 | |
23 | - // load custom JS |
|
24 | - foreach ($_['backends'] as $backend) { |
|
25 | - /** @var Backend $backend */ |
|
26 | - $scripts = $backend->getCustomJs(); |
|
27 | - foreach ($scripts as $script) { |
|
28 | - script('files_external', $script); |
|
29 | - } |
|
30 | - } |
|
31 | - foreach ($_['authMechanisms'] as $authMechanism) { |
|
32 | - /** @var AuthMechanism $authMechanism */ |
|
33 | - $scripts = $authMechanism->getCustomJs(); |
|
34 | - foreach ($scripts as $script) { |
|
35 | - script('files_external', $script); |
|
36 | - } |
|
37 | - } |
|
23 | + // load custom JS |
|
24 | + foreach ($_['backends'] as $backend) { |
|
25 | + /** @var Backend $backend */ |
|
26 | + $scripts = $backend->getCustomJs(); |
|
27 | + foreach ($scripts as $script) { |
|
28 | + script('files_external', $script); |
|
29 | + } |
|
30 | + } |
|
31 | + foreach ($_['authMechanisms'] as $authMechanism) { |
|
32 | + /** @var AuthMechanism $authMechanism */ |
|
33 | + $scripts = $authMechanism->getCustomJs(); |
|
34 | + foreach ($scripts as $script) { |
|
35 | + script('files_external', $script); |
|
36 | + } |
|
37 | + } |
|
38 | 38 | |
39 | - function writeParameterInput($parameter, $options, $classes = []) { |
|
40 | - $value = ''; |
|
41 | - if (isset($options[$parameter->getName()])) { |
|
42 | - $value = $options[$parameter->getName()]; |
|
43 | - } |
|
44 | - $placeholder = $parameter->getText(); |
|
45 | - $is_optional = $parameter->isFlagSet(DefinitionParameter::FLAG_OPTIONAL); |
|
39 | + function writeParameterInput($parameter, $options, $classes = []) { |
|
40 | + $value = ''; |
|
41 | + if (isset($options[$parameter->getName()])) { |
|
42 | + $value = $options[$parameter->getName()]; |
|
43 | + } |
|
44 | + $placeholder = $parameter->getText(); |
|
45 | + $is_optional = $parameter->isFlagSet(DefinitionParameter::FLAG_OPTIONAL); |
|
46 | 46 | |
47 | - switch ($parameter->getType()) { |
|
48 | - case DefinitionParameter::VALUE_PASSWORD: ?> |
|
47 | + switch ($parameter->getType()) { |
|
48 | + case DefinitionParameter::VALUE_PASSWORD: ?> |
|
49 | 49 | <?php if ($is_optional) { |
50 | - $classes[] = 'optional'; |
|
51 | - } ?> |
|
50 | + $classes[] = 'optional'; |
|
51 | + } ?> |
|
52 | 52 | <input type="password" |
53 | 53 | <?php if (!empty($classes)): ?> class="<?php p(implode(' ', $classes)); ?>"<?php endif; ?> |
54 | 54 | data-parameter="<?php p($parameter->getName()); ?>" |
@@ -56,8 +56,8 @@ discard block |
||
56 | 56 | placeholder="<?php p($placeholder); ?>" |
57 | 57 | /> |
58 | 58 | <?php |
59 | - break; |
|
60 | - case DefinitionParameter::VALUE_BOOLEAN: ?> |
|
59 | + break; |
|
60 | + case DefinitionParameter::VALUE_BOOLEAN: ?> |
|
61 | 61 | <?php $checkboxId = uniqid("checkbox_"); ?> |
62 | 62 | <div> |
63 | 63 | <label> |
@@ -71,19 +71,19 @@ discard block |
||
71 | 71 | </label> |
72 | 72 | </div> |
73 | 73 | <?php |
74 | - break; |
|
75 | - case DefinitionParameter::VALUE_HIDDEN: ?> |
|
74 | + break; |
|
75 | + case DefinitionParameter::VALUE_HIDDEN: ?> |
|
76 | 76 | <input type="hidden" |
77 | 77 | <?php if (!empty($classes)): ?> class="<?php p(implode(' ', $classes)); ?>"<?php endif; ?> |
78 | 78 | data-parameter="<?php p($parameter->getName()); ?>" |
79 | 79 | value="<?php p($value); ?>" |
80 | 80 | /> |
81 | 81 | <?php |
82 | - break; |
|
83 | - default: ?> |
|
82 | + break; |
|
83 | + default: ?> |
|
84 | 84 | <?php if ($is_optional) { |
85 | - $classes[] = 'optional'; |
|
86 | - } ?> |
|
85 | + $classes[] = 'optional'; |
|
86 | + } ?> |
|
87 | 87 | <input type="text" |
88 | 88 | <?php if (!empty($classes)): ?> class="<?php p(implode(' ', $classes)); ?>"<?php endif; ?> |
89 | 89 | data-parameter="<?php p($parameter->getName()); ?>" |
@@ -91,8 +91,8 @@ discard block |
||
91 | 91 | placeholder="<?php p($placeholder); ?>" |
92 | 92 | /> |
93 | 93 | <?php |
94 | - } |
|
95 | - } |
|
94 | + } |
|
95 | + } |
|
96 | 96 | ?> |
97 | 97 | |
98 | 98 | <div id="emptycontent" class="hidden"> |
@@ -105,7 +105,7 @@ discard block |
||
105 | 105 | <a target="_blank" rel="noreferrer" class="icon-info" title="<?php p($l->t('Open documentation'));?>" href="<?php p(link_to_docs('admin-external-storage')); ?>"></a> |
106 | 106 | <p class="settings-hint"><?php p($l->t('External storage enables you to mount external storage services and devices as secondary Nextcloud storage devices. You may also allow users to mount their own external storage services.')); ?></p> |
107 | 107 | <?php if (isset($_['dependencies']) and ($_['dependencies'] !== '') and $canCreateMounts) { |
108 | - print_unescaped(''.$_['dependencies'].''); |
|
108 | + print_unescaped(''.$_['dependencies'].''); |
|
109 | 109 | } ?> |
110 | 110 | <table id="externalStorage" class="grid" data-admin='<?php print_unescaped(json_encode($_['visibilityType'] === BackendService::VISIBILITY_ADMIN)); ?>'> |
111 | 111 | <thead> |
@@ -116,7 +116,7 @@ discard block |
||
116 | 116 | <th><?php p($l->t('Authentication')); ?></th> |
117 | 117 | <th><?php p($l->t('Configuration')); ?></th> |
118 | 118 | <?php if ($_['visibilityType'] === BackendService::VISIBILITY_ADMIN) { |
119 | - print_unescaped('<th>'.$l->t('Available for').'</th>'); |
|
119 | + print_unescaped('<th>'.$l->t('Available for').'</th>'); |
|
120 | 120 | } ?> |
121 | 121 | <th> </th> |
122 | 122 | <th> </th> |
@@ -142,17 +142,17 @@ discard block |
||
142 | 142 | <?php p($l->t('Add storage')); ?> |
143 | 143 | </option> |
144 | 144 | <?php |
145 | - $sortedBackends = array_filter($_['backends'], function ($backend) use ($_) { |
|
146 | - return $backend->isVisibleFor($_['visibilityType']); |
|
147 | - }); |
|
148 | - uasort($sortedBackends, function ($a, $b) { |
|
149 | - return strcasecmp($a->getText(), $b->getText()); |
|
150 | - }); |
|
151 | - ?> |
|
145 | + $sortedBackends = array_filter($_['backends'], function ($backend) use ($_) { |
|
146 | + return $backend->isVisibleFor($_['visibilityType']); |
|
147 | + }); |
|
148 | + uasort($sortedBackends, function ($a, $b) { |
|
149 | + return strcasecmp($a->getText(), $b->getText()); |
|
150 | + }); |
|
151 | + ?> |
|
152 | 152 | <?php foreach ($sortedBackends as $backend): ?> |
153 | 153 | <?php if ($backend->getDeprecateTo()) { |
154 | - continue; |
|
155 | - } // ignore deprecated backends?> |
|
154 | + continue; |
|
155 | + } // ignore deprecated backends?> |
|
156 | 156 | <option value="<?php p($backend->getIdentifier()); ?>"><?php p($backend->getText()); ?></option> |
157 | 157 | <?php endforeach; ?> |
158 | 158 | </select> |
@@ -178,23 +178,23 @@ discard block |
||
178 | 178 | <?php if ($_['visibilityType'] === BackendService::VISIBILITY_ADMIN): ?> |
179 | 179 | <input type="checkbox" name="allowUserMounting" id="allowUserMounting" class="checkbox" |
180 | 180 | value="1" <?php if ($_['allowUserMounting']) { |
181 | - print_unescaped(' checked="checked"'); |
|
182 | - } ?> /> |
|
181 | + print_unescaped(' checked="checked"'); |
|
182 | + } ?> /> |
|
183 | 183 | <label for="allowUserMounting"><?php p($l->t('Allow users to mount external storage')); ?></label> <span id="userMountingMsg" class="msg"></span> |
184 | 184 | |
185 | 185 | <p id="userMountingBackends"<?php if (!$_['allowUserMounting']): ?> class="hidden"<?php endif; ?>> |
186 | 186 | <?php |
187 | - $userBackends = array_filter($_['backends'], function ($backend) { |
|
188 | - return $backend->isAllowedVisibleFor(BackendService::VISIBILITY_PERSONAL); |
|
189 | - }); |
|
190 | - ?> |
|
187 | + $userBackends = array_filter($_['backends'], function ($backend) { |
|
188 | + return $backend->isAllowedVisibleFor(BackendService::VISIBILITY_PERSONAL); |
|
189 | + }); |
|
190 | + ?> |
|
191 | 191 | <?php $i = 0; foreach ($userBackends as $backend): ?> |
192 | 192 | <?php if ($deprecateTo = $backend->getDeprecateTo()): ?> |
193 | 193 | <input type="hidden" id="allowUserMountingBackends<?php p($i); ?>" name="allowUserMountingBackends[]" value="<?php p($backend->getIdentifier()); ?>" data-deprecate-to="<?php p($deprecateTo->getIdentifier()); ?>" /> |
194 | 194 | <?php else: ?> |
195 | 195 | <input type="checkbox" id="allowUserMountingBackends<?php p($i); ?>" class="checkbox" name="allowUserMountingBackends[]" value="<?php p($backend->getIdentifier()); ?>" <?php if ($backend->isVisibleFor(BackendService::VISIBILITY_PERSONAL)) { |
196 | - print_unescaped(' checked="checked"'); |
|
197 | - } ?> /> |
|
196 | + print_unescaped(' checked="checked"'); |
|
197 | + } ?> /> |
|
198 | 198 | <label for="allowUserMountingBackends<?php p($i); ?>"><?php p($backend->getText()); ?></label> <br /> |
199 | 199 | <?php endif; ?> |
200 | 200 | <?php $i++; ?> |
@@ -100,9 +100,9 @@ discard block |
||
100 | 100 | <h2><?php p($l->t('No external storage configured or you don\'t have the permission to configure them')); ?></h2> |
101 | 101 | </div> |
102 | 102 | |
103 | -<form data-can-create="<?php echo $canCreateMounts?'true':'false' ?>" id="files_external" class="section" data-encryption-enabled="<?php echo $_['encryptionEnabled']?'true': 'false'; ?>"> |
|
103 | +<form data-can-create="<?php echo $canCreateMounts ? 'true' : 'false' ?>" id="files_external" class="section" data-encryption-enabled="<?php echo $_['encryptionEnabled'] ? 'true' : 'false'; ?>"> |
|
104 | 104 | <h2 class="inlineblock" data-anchor-name="external-storage"><?php p($l->t('External storages')); ?></h2> |
105 | - <a target="_blank" rel="noreferrer" class="icon-info" title="<?php p($l->t('Open documentation'));?>" href="<?php p(link_to_docs('admin-external-storage')); ?>"></a> |
|
105 | + <a target="_blank" rel="noreferrer" class="icon-info" title="<?php p($l->t('Open documentation')); ?>" href="<?php p(link_to_docs('admin-external-storage')); ?>"></a> |
|
106 | 106 | <p class="settings-hint"><?php p($l->t('External storage enables you to mount external storage services and devices as secondary Nextcloud storage devices. You may also allow users to mount their own external storage services.')); ?></p> |
107 | 107 | <?php if (isset($_['dependencies']) and ($_['dependencies'] !== '') and $canCreateMounts) { |
108 | 108 | print_unescaped(''.$_['dependencies'].''); |
@@ -142,10 +142,10 @@ discard block |
||
142 | 142 | <?php p($l->t('Add storage')); ?> |
143 | 143 | </option> |
144 | 144 | <?php |
145 | - $sortedBackends = array_filter($_['backends'], function ($backend) use ($_) { |
|
145 | + $sortedBackends = array_filter($_['backends'], function($backend) use ($_) { |
|
146 | 146 | return $backend->isVisibleFor($_['visibilityType']); |
147 | 147 | }); |
148 | - uasort($sortedBackends, function ($a, $b) { |
|
148 | + uasort($sortedBackends, function($a, $b) { |
|
149 | 149 | return strcasecmp($a->getText(), $b->getText()); |
150 | 150 | }); |
151 | 151 | ?> |
@@ -184,7 +184,7 @@ discard block |
||
184 | 184 | |
185 | 185 | <p id="userMountingBackends"<?php if (!$_['allowUserMounting']): ?> class="hidden"<?php endif; ?>> |
186 | 186 | <?php |
187 | - $userBackends = array_filter($_['backends'], function ($backend) { |
|
187 | + $userBackends = array_filter($_['backends'], function($backend) { |
|
188 | 188 | return $backend->isAllowedVisibleFor(BackendService::VISIBILITY_PERSONAL); |
189 | 189 | }); |
190 | 190 | ?> |
@@ -25,24 +25,24 @@ |
||
25 | 25 | |
26 | 26 | class Hooks { |
27 | 27 | |
28 | - /** @var TrustedServers */ |
|
29 | - private $trustedServers; |
|
28 | + /** @var TrustedServers */ |
|
29 | + private $trustedServers; |
|
30 | 30 | |
31 | - public function __construct(TrustedServers $trustedServers) { |
|
32 | - $this->trustedServers = $trustedServers; |
|
33 | - } |
|
31 | + public function __construct(TrustedServers $trustedServers) { |
|
32 | + $this->trustedServers = $trustedServers; |
|
33 | + } |
|
34 | 34 | |
35 | - /** |
|
36 | - * add servers to the list of trusted servers once a federated share was established |
|
37 | - * |
|
38 | - * @param array $params |
|
39 | - */ |
|
40 | - public function addServerHook($params) { |
|
41 | - if ( |
|
42 | - $this->trustedServers->getAutoAddServers() === true && |
|
43 | - $this->trustedServers->isTrustedServer($params['server']) === false |
|
44 | - ) { |
|
45 | - $this->trustedServers->addServer($params['server']); |
|
46 | - } |
|
47 | - } |
|
35 | + /** |
|
36 | + * add servers to the list of trusted servers once a federated share was established |
|
37 | + * |
|
38 | + * @param array $params |
|
39 | + */ |
|
40 | + public function addServerHook($params) { |
|
41 | + if ( |
|
42 | + $this->trustedServers->getAutoAddServers() === true && |
|
43 | + $this->trustedServers->isTrustedServer($params['server']) === false |
|
44 | + ) { |
|
45 | + $this->trustedServers->addServer($params['server']); |
|
46 | + } |
|
47 | + } |
|
48 | 48 | } |