@@ -32,58 +32,58 @@ |
||
| 32 | 32 | * Person mount points can be moved by the user |
| 33 | 33 | */ |
| 34 | 34 | class PersonalMount extends MountPoint implements MoveableMount { |
| 35 | - /** @var UserStoragesService */ |
|
| 36 | - protected $storagesService; |
|
| 35 | + /** @var UserStoragesService */ |
|
| 36 | + protected $storagesService; |
|
| 37 | 37 | |
| 38 | - /** @var int */ |
|
| 39 | - protected $numericStorageId; |
|
| 38 | + /** @var int */ |
|
| 39 | + protected $numericStorageId; |
|
| 40 | 40 | |
| 41 | - /** |
|
| 42 | - * @param UserStoragesService $storagesService |
|
| 43 | - * @param int $storageId |
|
| 44 | - * @param \OCP\Files\Storage $storage |
|
| 45 | - * @param string $mountpoint |
|
| 46 | - * @param array $arguments (optional) configuration for the storage backend |
|
| 47 | - * @param \OCP\Files\Storage\IStorageFactory $loader |
|
| 48 | - * @param array $mountOptions mount specific options |
|
| 49 | - */ |
|
| 50 | - public function __construct( |
|
| 51 | - UserStoragesService $storagesService, |
|
| 52 | - $storageId, |
|
| 53 | - $storage, |
|
| 54 | - $mountpoint, |
|
| 55 | - $arguments = null, |
|
| 56 | - $loader = null, |
|
| 57 | - $mountOptions = null |
|
| 58 | - ) { |
|
| 59 | - parent::__construct($storage, $mountpoint, $arguments, $loader, $mountOptions); |
|
| 60 | - $this->storagesService = $storagesService; |
|
| 61 | - $this->numericStorageId = $storageId; |
|
| 62 | - } |
|
| 41 | + /** |
|
| 42 | + * @param UserStoragesService $storagesService |
|
| 43 | + * @param int $storageId |
|
| 44 | + * @param \OCP\Files\Storage $storage |
|
| 45 | + * @param string $mountpoint |
|
| 46 | + * @param array $arguments (optional) configuration for the storage backend |
|
| 47 | + * @param \OCP\Files\Storage\IStorageFactory $loader |
|
| 48 | + * @param array $mountOptions mount specific options |
|
| 49 | + */ |
|
| 50 | + public function __construct( |
|
| 51 | + UserStoragesService $storagesService, |
|
| 52 | + $storageId, |
|
| 53 | + $storage, |
|
| 54 | + $mountpoint, |
|
| 55 | + $arguments = null, |
|
| 56 | + $loader = null, |
|
| 57 | + $mountOptions = null |
|
| 58 | + ) { |
|
| 59 | + parent::__construct($storage, $mountpoint, $arguments, $loader, $mountOptions); |
|
| 60 | + $this->storagesService = $storagesService; |
|
| 61 | + $this->numericStorageId = $storageId; |
|
| 62 | + } |
|
| 63 | 63 | |
| 64 | - /** |
|
| 65 | - * Move the mount point to $target |
|
| 66 | - * |
|
| 67 | - * @param string $target the target mount point |
|
| 68 | - * @return bool |
|
| 69 | - */ |
|
| 70 | - public function moveMount($target) { |
|
| 71 | - $storage = $this->storagesService->getStorage($this->numericStorageId); |
|
| 72 | - // remove "/$user/files" prefix |
|
| 73 | - $targetParts = explode('/', trim($target, '/'), 3); |
|
| 74 | - $storage->setMountPoint($targetParts[2]); |
|
| 75 | - $this->storagesService->updateStorage($storage); |
|
| 76 | - $this->setMountPoint($target); |
|
| 77 | - return true; |
|
| 78 | - } |
|
| 64 | + /** |
|
| 65 | + * Move the mount point to $target |
|
| 66 | + * |
|
| 67 | + * @param string $target the target mount point |
|
| 68 | + * @return bool |
|
| 69 | + */ |
|
| 70 | + public function moveMount($target) { |
|
| 71 | + $storage = $this->storagesService->getStorage($this->numericStorageId); |
|
| 72 | + // remove "/$user/files" prefix |
|
| 73 | + $targetParts = explode('/', trim($target, '/'), 3); |
|
| 74 | + $storage->setMountPoint($targetParts[2]); |
|
| 75 | + $this->storagesService->updateStorage($storage); |
|
| 76 | + $this->setMountPoint($target); |
|
| 77 | + return true; |
|
| 78 | + } |
|
| 79 | 79 | |
| 80 | - /** |
|
| 81 | - * Remove the mount points |
|
| 82 | - * |
|
| 83 | - * @return bool |
|
| 84 | - */ |
|
| 85 | - public function removeMount() { |
|
| 86 | - $this->storagesService->removeStorage($this->numericStorageId); |
|
| 87 | - return true; |
|
| 88 | - } |
|
| 80 | + /** |
|
| 81 | + * Remove the mount points |
|
| 82 | + * |
|
| 83 | + * @return bool |
|
| 84 | + */ |
|
| 85 | + public function removeMount() { |
|
| 86 | + $this->storagesService->removeStorage($this->numericStorageId); |
|
| 87 | + return true; |
|
| 88 | + } |
|
| 89 | 89 | } |
@@ -35,398 +35,398 @@ |
||
| 35 | 35 | * External storage configuration |
| 36 | 36 | */ |
| 37 | 37 | class StorageConfig implements \JsonSerializable { |
| 38 | - const MOUNT_TYPE_ADMIN = 1; |
|
| 39 | - const MOUNT_TYPE_PERSONAl = 2; |
|
| 40 | - |
|
| 41 | - /** |
|
| 42 | - * Storage config id |
|
| 43 | - * |
|
| 44 | - * @var int |
|
| 45 | - */ |
|
| 46 | - private $id; |
|
| 47 | - |
|
| 48 | - /** |
|
| 49 | - * Backend |
|
| 50 | - * |
|
| 51 | - * @var Backend |
|
| 52 | - */ |
|
| 53 | - private $backend; |
|
| 54 | - |
|
| 55 | - /** |
|
| 56 | - * Authentication mechanism |
|
| 57 | - * |
|
| 58 | - * @var AuthMechanism |
|
| 59 | - */ |
|
| 60 | - private $authMechanism; |
|
| 61 | - |
|
| 62 | - /** |
|
| 63 | - * Backend options |
|
| 64 | - * |
|
| 65 | - * @var array |
|
| 66 | - */ |
|
| 67 | - private $backendOptions = []; |
|
| 68 | - |
|
| 69 | - /** |
|
| 70 | - * Mount point path, relative to the user's "files" folder |
|
| 71 | - * |
|
| 72 | - * @var string |
|
| 73 | - */ |
|
| 74 | - private $mountPoint; |
|
| 75 | - |
|
| 76 | - /** |
|
| 77 | - * Storage status |
|
| 78 | - * |
|
| 79 | - * @var int |
|
| 80 | - */ |
|
| 81 | - private $status; |
|
| 82 | - |
|
| 83 | - /** |
|
| 84 | - * Status message |
|
| 85 | - * |
|
| 86 | - * @var string |
|
| 87 | - */ |
|
| 88 | - private $statusMessage; |
|
| 89 | - |
|
| 90 | - /** |
|
| 91 | - * Priority |
|
| 92 | - * |
|
| 93 | - * @var int |
|
| 94 | - */ |
|
| 95 | - private $priority; |
|
| 96 | - |
|
| 97 | - /** |
|
| 98 | - * List of users who have access to this storage |
|
| 99 | - * |
|
| 100 | - * @var array |
|
| 101 | - */ |
|
| 102 | - private $applicableUsers = []; |
|
| 103 | - |
|
| 104 | - /** |
|
| 105 | - * List of groups that have access to this storage |
|
| 106 | - * |
|
| 107 | - * @var array |
|
| 108 | - */ |
|
| 109 | - private $applicableGroups = []; |
|
| 110 | - |
|
| 111 | - /** |
|
| 112 | - * Mount-specific options |
|
| 113 | - * |
|
| 114 | - * @var array |
|
| 115 | - */ |
|
| 116 | - private $mountOptions = []; |
|
| 117 | - |
|
| 118 | - /** |
|
| 119 | - * Whether it's a personal or admin mount |
|
| 120 | - * |
|
| 121 | - * @var int |
|
| 122 | - */ |
|
| 123 | - private $type; |
|
| 124 | - |
|
| 125 | - /** |
|
| 126 | - * Creates a storage config |
|
| 127 | - * |
|
| 128 | - * @param int|null $id config id or null for a new config |
|
| 129 | - */ |
|
| 130 | - public function __construct($id = null) { |
|
| 131 | - $this->id = $id; |
|
| 132 | - $this->mountOptions['enable_sharing'] = false; |
|
| 133 | - } |
|
| 134 | - |
|
| 135 | - /** |
|
| 136 | - * Returns the configuration id |
|
| 137 | - * |
|
| 138 | - * @return int |
|
| 139 | - */ |
|
| 140 | - public function getId() { |
|
| 141 | - return $this->id; |
|
| 142 | - } |
|
| 143 | - |
|
| 144 | - /** |
|
| 145 | - * Sets the configuration id |
|
| 146 | - * |
|
| 147 | - * @param int $id configuration id |
|
| 148 | - */ |
|
| 149 | - public function setId($id) { |
|
| 150 | - $this->id = $id; |
|
| 151 | - } |
|
| 152 | - |
|
| 153 | - /** |
|
| 154 | - * Returns mount point path relative to the user's |
|
| 155 | - * "files" folder. |
|
| 156 | - * |
|
| 157 | - * @return string path |
|
| 158 | - */ |
|
| 159 | - public function getMountPoint() { |
|
| 160 | - return $this->mountPoint; |
|
| 161 | - } |
|
| 162 | - |
|
| 163 | - /** |
|
| 164 | - * Sets mount point path relative to the user's |
|
| 165 | - * "files" folder. |
|
| 166 | - * The path will be normalized. |
|
| 167 | - * |
|
| 168 | - * @param string $mountPoint path |
|
| 169 | - */ |
|
| 170 | - public function setMountPoint($mountPoint) { |
|
| 171 | - $this->mountPoint = \OC\Files\Filesystem::normalizePath($mountPoint); |
|
| 172 | - } |
|
| 173 | - |
|
| 174 | - /** |
|
| 175 | - * @return Backend |
|
| 176 | - */ |
|
| 177 | - public function getBackend() { |
|
| 178 | - return $this->backend; |
|
| 179 | - } |
|
| 180 | - |
|
| 181 | - /** |
|
| 182 | - * @param Backend $backend |
|
| 183 | - */ |
|
| 184 | - public function setBackend(Backend $backend) { |
|
| 185 | - $this->backend= $backend; |
|
| 186 | - } |
|
| 187 | - |
|
| 188 | - /** |
|
| 189 | - * @return AuthMechanism |
|
| 190 | - */ |
|
| 191 | - public function getAuthMechanism() { |
|
| 192 | - return $this->authMechanism; |
|
| 193 | - } |
|
| 194 | - |
|
| 195 | - /** |
|
| 196 | - * @param AuthMechanism $authMechanism |
|
| 197 | - */ |
|
| 198 | - public function setAuthMechanism(AuthMechanism $authMechanism) { |
|
| 199 | - $this->authMechanism = $authMechanism; |
|
| 200 | - } |
|
| 201 | - |
|
| 202 | - /** |
|
| 203 | - * Returns the external storage backend-specific options |
|
| 204 | - * |
|
| 205 | - * @return array backend options |
|
| 206 | - */ |
|
| 207 | - public function getBackendOptions() { |
|
| 208 | - return $this->backendOptions; |
|
| 209 | - } |
|
| 210 | - |
|
| 211 | - /** |
|
| 212 | - * Sets the external storage backend-specific options |
|
| 213 | - * |
|
| 214 | - * @param array $backendOptions backend options |
|
| 215 | - */ |
|
| 216 | - public function setBackendOptions($backendOptions) { |
|
| 217 | - if($this->getBackend() instanceof Backend) { |
|
| 218 | - $parameters = $this->getBackend()->getParameters(); |
|
| 219 | - foreach($backendOptions as $key => $value) { |
|
| 220 | - if(isset($parameters[$key])) { |
|
| 221 | - switch ($parameters[$key]->getType()) { |
|
| 222 | - case \OCA\Files_External\Lib\DefinitionParameter::VALUE_BOOLEAN: |
|
| 223 | - $value = (bool)$value; |
|
| 224 | - break; |
|
| 225 | - } |
|
| 226 | - $backendOptions[$key] = $value; |
|
| 227 | - } |
|
| 228 | - } |
|
| 229 | - } |
|
| 230 | - |
|
| 231 | - $this->backendOptions = $backendOptions; |
|
| 232 | - } |
|
| 233 | - |
|
| 234 | - /** |
|
| 235 | - * @param string $key |
|
| 236 | - * @return mixed |
|
| 237 | - */ |
|
| 238 | - public function getBackendOption($key) { |
|
| 239 | - if (isset($this->backendOptions[$key])) { |
|
| 240 | - return $this->backendOptions[$key]; |
|
| 241 | - } |
|
| 242 | - return null; |
|
| 243 | - } |
|
| 244 | - |
|
| 245 | - /** |
|
| 246 | - * @param string $key |
|
| 247 | - * @param mixed $value |
|
| 248 | - */ |
|
| 249 | - public function setBackendOption($key, $value) { |
|
| 250 | - $this->backendOptions[$key] = $value; |
|
| 251 | - } |
|
| 252 | - |
|
| 253 | - /** |
|
| 254 | - * Returns the mount priority |
|
| 255 | - * |
|
| 256 | - * @return int priority |
|
| 257 | - */ |
|
| 258 | - public function getPriority() { |
|
| 259 | - return $this->priority; |
|
| 260 | - } |
|
| 261 | - |
|
| 262 | - /** |
|
| 263 | - * Sets the mount priotity |
|
| 264 | - * |
|
| 265 | - * @param int $priority priority |
|
| 266 | - */ |
|
| 267 | - public function setPriority($priority) { |
|
| 268 | - $this->priority = $priority; |
|
| 269 | - } |
|
| 270 | - |
|
| 271 | - /** |
|
| 272 | - * Returns the users for which to mount this storage |
|
| 273 | - * |
|
| 274 | - * @return array applicable users |
|
| 275 | - */ |
|
| 276 | - public function getApplicableUsers() { |
|
| 277 | - return $this->applicableUsers; |
|
| 278 | - } |
|
| 279 | - |
|
| 280 | - /** |
|
| 281 | - * Sets the users for which to mount this storage |
|
| 282 | - * |
|
| 283 | - * @param array|null $applicableUsers applicable users |
|
| 284 | - */ |
|
| 285 | - public function setApplicableUsers($applicableUsers) { |
|
| 286 | - if (is_null($applicableUsers)) { |
|
| 287 | - $applicableUsers = []; |
|
| 288 | - } |
|
| 289 | - $this->applicableUsers = $applicableUsers; |
|
| 290 | - } |
|
| 291 | - |
|
| 292 | - /** |
|
| 293 | - * Returns the groups for which to mount this storage |
|
| 294 | - * |
|
| 295 | - * @return array applicable groups |
|
| 296 | - */ |
|
| 297 | - public function getApplicableGroups() { |
|
| 298 | - return $this->applicableGroups; |
|
| 299 | - } |
|
| 300 | - |
|
| 301 | - /** |
|
| 302 | - * Sets the groups for which to mount this storage |
|
| 303 | - * |
|
| 304 | - * @param array|null $applicableGroups applicable groups |
|
| 305 | - */ |
|
| 306 | - public function setApplicableGroups($applicableGroups) { |
|
| 307 | - if (is_null($applicableGroups)) { |
|
| 308 | - $applicableGroups = []; |
|
| 309 | - } |
|
| 310 | - $this->applicableGroups = $applicableGroups; |
|
| 311 | - } |
|
| 312 | - |
|
| 313 | - /** |
|
| 314 | - * Returns the mount-specific options |
|
| 315 | - * |
|
| 316 | - * @return array mount specific options |
|
| 317 | - */ |
|
| 318 | - public function getMountOptions() { |
|
| 319 | - return $this->mountOptions; |
|
| 320 | - } |
|
| 321 | - |
|
| 322 | - /** |
|
| 323 | - * Sets the mount-specific options |
|
| 324 | - * |
|
| 325 | - * @param array $mountOptions applicable groups |
|
| 326 | - */ |
|
| 327 | - public function setMountOptions($mountOptions) { |
|
| 328 | - if (is_null($mountOptions)) { |
|
| 329 | - $mountOptions = []; |
|
| 330 | - } |
|
| 331 | - $this->mountOptions = $mountOptions; |
|
| 332 | - } |
|
| 333 | - |
|
| 334 | - /** |
|
| 335 | - * @param string $key |
|
| 336 | - * @return mixed |
|
| 337 | - */ |
|
| 338 | - public function getMountOption($key) { |
|
| 339 | - if (isset($this->mountOptions[$key])) { |
|
| 340 | - return $this->mountOptions[$key]; |
|
| 341 | - } |
|
| 342 | - return null; |
|
| 343 | - } |
|
| 344 | - |
|
| 345 | - /** |
|
| 346 | - * @param string $key |
|
| 347 | - * @param mixed $value |
|
| 348 | - */ |
|
| 349 | - public function setMountOption($key, $value) { |
|
| 350 | - $this->mountOptions[$key] = $value; |
|
| 351 | - } |
|
| 352 | - |
|
| 353 | - /** |
|
| 354 | - * Gets the storage status, whether the config worked last time |
|
| 355 | - * |
|
| 356 | - * @return int $status status |
|
| 357 | - */ |
|
| 358 | - public function getStatus() { |
|
| 359 | - return $this->status; |
|
| 360 | - } |
|
| 361 | - |
|
| 362 | - /** |
|
| 363 | - * Gets the message describing the storage status |
|
| 364 | - * |
|
| 365 | - * @return string|null |
|
| 366 | - */ |
|
| 367 | - public function getStatusMessage() { |
|
| 368 | - return $this->statusMessage; |
|
| 369 | - } |
|
| 370 | - |
|
| 371 | - /** |
|
| 372 | - * Sets the storage status, whether the config worked last time |
|
| 373 | - * |
|
| 374 | - * @param int $status status |
|
| 375 | - * @param string|null $message optional message |
|
| 376 | - */ |
|
| 377 | - public function setStatus($status, $message = null) { |
|
| 378 | - $this->status = $status; |
|
| 379 | - $this->statusMessage = $message; |
|
| 380 | - } |
|
| 381 | - |
|
| 382 | - /** |
|
| 383 | - * @return int self::MOUNT_TYPE_ADMIN or self::MOUNT_TYPE_PERSONAl |
|
| 384 | - */ |
|
| 385 | - public function getType() { |
|
| 386 | - return $this->type; |
|
| 387 | - } |
|
| 388 | - |
|
| 389 | - /** |
|
| 390 | - * @param int $type self::MOUNT_TYPE_ADMIN or self::MOUNT_TYPE_PERSONAl |
|
| 391 | - */ |
|
| 392 | - public function setType($type) { |
|
| 393 | - $this->type = $type; |
|
| 394 | - } |
|
| 395 | - |
|
| 396 | - /** |
|
| 397 | - * Serialize config to JSON |
|
| 398 | - * |
|
| 399 | - * @return array |
|
| 400 | - */ |
|
| 401 | - public function jsonSerialize() { |
|
| 402 | - $result = []; |
|
| 403 | - if (!is_null($this->id)) { |
|
| 404 | - $result['id'] = $this->id; |
|
| 405 | - } |
|
| 406 | - $result['mountPoint'] = $this->mountPoint; |
|
| 407 | - $result['backend'] = $this->backend->getIdentifier(); |
|
| 408 | - $result['authMechanism'] = $this->authMechanism->getIdentifier(); |
|
| 409 | - $result['backendOptions'] = $this->backendOptions; |
|
| 410 | - if (!is_null($this->priority)) { |
|
| 411 | - $result['priority'] = $this->priority; |
|
| 412 | - } |
|
| 413 | - if (!empty($this->applicableUsers)) { |
|
| 414 | - $result['applicableUsers'] = $this->applicableUsers; |
|
| 415 | - } |
|
| 416 | - if (!empty($this->applicableGroups)) { |
|
| 417 | - $result['applicableGroups'] = $this->applicableGroups; |
|
| 418 | - } |
|
| 419 | - if (!empty($this->mountOptions)) { |
|
| 420 | - $result['mountOptions'] = $this->mountOptions; |
|
| 421 | - } |
|
| 422 | - if (!is_null($this->status)) { |
|
| 423 | - $result['status'] = $this->status; |
|
| 424 | - } |
|
| 425 | - if (!is_null($this->statusMessage)) { |
|
| 426 | - $result['statusMessage'] = $this->statusMessage; |
|
| 427 | - } |
|
| 428 | - $result['userProvided'] = $this->authMechanism instanceof IUserProvided; |
|
| 429 | - $result['type'] = ($this->getType() === self::MOUNT_TYPE_PERSONAl) ? 'personal': 'system'; |
|
| 430 | - return $result; |
|
| 431 | - } |
|
| 38 | + const MOUNT_TYPE_ADMIN = 1; |
|
| 39 | + const MOUNT_TYPE_PERSONAl = 2; |
|
| 40 | + |
|
| 41 | + /** |
|
| 42 | + * Storage config id |
|
| 43 | + * |
|
| 44 | + * @var int |
|
| 45 | + */ |
|
| 46 | + private $id; |
|
| 47 | + |
|
| 48 | + /** |
|
| 49 | + * Backend |
|
| 50 | + * |
|
| 51 | + * @var Backend |
|
| 52 | + */ |
|
| 53 | + private $backend; |
|
| 54 | + |
|
| 55 | + /** |
|
| 56 | + * Authentication mechanism |
|
| 57 | + * |
|
| 58 | + * @var AuthMechanism |
|
| 59 | + */ |
|
| 60 | + private $authMechanism; |
|
| 61 | + |
|
| 62 | + /** |
|
| 63 | + * Backend options |
|
| 64 | + * |
|
| 65 | + * @var array |
|
| 66 | + */ |
|
| 67 | + private $backendOptions = []; |
|
| 68 | + |
|
| 69 | + /** |
|
| 70 | + * Mount point path, relative to the user's "files" folder |
|
| 71 | + * |
|
| 72 | + * @var string |
|
| 73 | + */ |
|
| 74 | + private $mountPoint; |
|
| 75 | + |
|
| 76 | + /** |
|
| 77 | + * Storage status |
|
| 78 | + * |
|
| 79 | + * @var int |
|
| 80 | + */ |
|
| 81 | + private $status; |
|
| 82 | + |
|
| 83 | + /** |
|
| 84 | + * Status message |
|
| 85 | + * |
|
| 86 | + * @var string |
|
| 87 | + */ |
|
| 88 | + private $statusMessage; |
|
| 89 | + |
|
| 90 | + /** |
|
| 91 | + * Priority |
|
| 92 | + * |
|
| 93 | + * @var int |
|
| 94 | + */ |
|
| 95 | + private $priority; |
|
| 96 | + |
|
| 97 | + /** |
|
| 98 | + * List of users who have access to this storage |
|
| 99 | + * |
|
| 100 | + * @var array |
|
| 101 | + */ |
|
| 102 | + private $applicableUsers = []; |
|
| 103 | + |
|
| 104 | + /** |
|
| 105 | + * List of groups that have access to this storage |
|
| 106 | + * |
|
| 107 | + * @var array |
|
| 108 | + */ |
|
| 109 | + private $applicableGroups = []; |
|
| 110 | + |
|
| 111 | + /** |
|
| 112 | + * Mount-specific options |
|
| 113 | + * |
|
| 114 | + * @var array |
|
| 115 | + */ |
|
| 116 | + private $mountOptions = []; |
|
| 117 | + |
|
| 118 | + /** |
|
| 119 | + * Whether it's a personal or admin mount |
|
| 120 | + * |
|
| 121 | + * @var int |
|
| 122 | + */ |
|
| 123 | + private $type; |
|
| 124 | + |
|
| 125 | + /** |
|
| 126 | + * Creates a storage config |
|
| 127 | + * |
|
| 128 | + * @param int|null $id config id or null for a new config |
|
| 129 | + */ |
|
| 130 | + public function __construct($id = null) { |
|
| 131 | + $this->id = $id; |
|
| 132 | + $this->mountOptions['enable_sharing'] = false; |
|
| 133 | + } |
|
| 134 | + |
|
| 135 | + /** |
|
| 136 | + * Returns the configuration id |
|
| 137 | + * |
|
| 138 | + * @return int |
|
| 139 | + */ |
|
| 140 | + public function getId() { |
|
| 141 | + return $this->id; |
|
| 142 | + } |
|
| 143 | + |
|
| 144 | + /** |
|
| 145 | + * Sets the configuration id |
|
| 146 | + * |
|
| 147 | + * @param int $id configuration id |
|
| 148 | + */ |
|
| 149 | + public function setId($id) { |
|
| 150 | + $this->id = $id; |
|
| 151 | + } |
|
| 152 | + |
|
| 153 | + /** |
|
| 154 | + * Returns mount point path relative to the user's |
|
| 155 | + * "files" folder. |
|
| 156 | + * |
|
| 157 | + * @return string path |
|
| 158 | + */ |
|
| 159 | + public function getMountPoint() { |
|
| 160 | + return $this->mountPoint; |
|
| 161 | + } |
|
| 162 | + |
|
| 163 | + /** |
|
| 164 | + * Sets mount point path relative to the user's |
|
| 165 | + * "files" folder. |
|
| 166 | + * The path will be normalized. |
|
| 167 | + * |
|
| 168 | + * @param string $mountPoint path |
|
| 169 | + */ |
|
| 170 | + public function setMountPoint($mountPoint) { |
|
| 171 | + $this->mountPoint = \OC\Files\Filesystem::normalizePath($mountPoint); |
|
| 172 | + } |
|
| 173 | + |
|
| 174 | + /** |
|
| 175 | + * @return Backend |
|
| 176 | + */ |
|
| 177 | + public function getBackend() { |
|
| 178 | + return $this->backend; |
|
| 179 | + } |
|
| 180 | + |
|
| 181 | + /** |
|
| 182 | + * @param Backend $backend |
|
| 183 | + */ |
|
| 184 | + public function setBackend(Backend $backend) { |
|
| 185 | + $this->backend= $backend; |
|
| 186 | + } |
|
| 187 | + |
|
| 188 | + /** |
|
| 189 | + * @return AuthMechanism |
|
| 190 | + */ |
|
| 191 | + public function getAuthMechanism() { |
|
| 192 | + return $this->authMechanism; |
|
| 193 | + } |
|
| 194 | + |
|
| 195 | + /** |
|
| 196 | + * @param AuthMechanism $authMechanism |
|
| 197 | + */ |
|
| 198 | + public function setAuthMechanism(AuthMechanism $authMechanism) { |
|
| 199 | + $this->authMechanism = $authMechanism; |
|
| 200 | + } |
|
| 201 | + |
|
| 202 | + /** |
|
| 203 | + * Returns the external storage backend-specific options |
|
| 204 | + * |
|
| 205 | + * @return array backend options |
|
| 206 | + */ |
|
| 207 | + public function getBackendOptions() { |
|
| 208 | + return $this->backendOptions; |
|
| 209 | + } |
|
| 210 | + |
|
| 211 | + /** |
|
| 212 | + * Sets the external storage backend-specific options |
|
| 213 | + * |
|
| 214 | + * @param array $backendOptions backend options |
|
| 215 | + */ |
|
| 216 | + public function setBackendOptions($backendOptions) { |
|
| 217 | + if($this->getBackend() instanceof Backend) { |
|
| 218 | + $parameters = $this->getBackend()->getParameters(); |
|
| 219 | + foreach($backendOptions as $key => $value) { |
|
| 220 | + if(isset($parameters[$key])) { |
|
| 221 | + switch ($parameters[$key]->getType()) { |
|
| 222 | + case \OCA\Files_External\Lib\DefinitionParameter::VALUE_BOOLEAN: |
|
| 223 | + $value = (bool)$value; |
|
| 224 | + break; |
|
| 225 | + } |
|
| 226 | + $backendOptions[$key] = $value; |
|
| 227 | + } |
|
| 228 | + } |
|
| 229 | + } |
|
| 230 | + |
|
| 231 | + $this->backendOptions = $backendOptions; |
|
| 232 | + } |
|
| 233 | + |
|
| 234 | + /** |
|
| 235 | + * @param string $key |
|
| 236 | + * @return mixed |
|
| 237 | + */ |
|
| 238 | + public function getBackendOption($key) { |
|
| 239 | + if (isset($this->backendOptions[$key])) { |
|
| 240 | + return $this->backendOptions[$key]; |
|
| 241 | + } |
|
| 242 | + return null; |
|
| 243 | + } |
|
| 244 | + |
|
| 245 | + /** |
|
| 246 | + * @param string $key |
|
| 247 | + * @param mixed $value |
|
| 248 | + */ |
|
| 249 | + public function setBackendOption($key, $value) { |
|
| 250 | + $this->backendOptions[$key] = $value; |
|
| 251 | + } |
|
| 252 | + |
|
| 253 | + /** |
|
| 254 | + * Returns the mount priority |
|
| 255 | + * |
|
| 256 | + * @return int priority |
|
| 257 | + */ |
|
| 258 | + public function getPriority() { |
|
| 259 | + return $this->priority; |
|
| 260 | + } |
|
| 261 | + |
|
| 262 | + /** |
|
| 263 | + * Sets the mount priotity |
|
| 264 | + * |
|
| 265 | + * @param int $priority priority |
|
| 266 | + */ |
|
| 267 | + public function setPriority($priority) { |
|
| 268 | + $this->priority = $priority; |
|
| 269 | + } |
|
| 270 | + |
|
| 271 | + /** |
|
| 272 | + * Returns the users for which to mount this storage |
|
| 273 | + * |
|
| 274 | + * @return array applicable users |
|
| 275 | + */ |
|
| 276 | + public function getApplicableUsers() { |
|
| 277 | + return $this->applicableUsers; |
|
| 278 | + } |
|
| 279 | + |
|
| 280 | + /** |
|
| 281 | + * Sets the users for which to mount this storage |
|
| 282 | + * |
|
| 283 | + * @param array|null $applicableUsers applicable users |
|
| 284 | + */ |
|
| 285 | + public function setApplicableUsers($applicableUsers) { |
|
| 286 | + if (is_null($applicableUsers)) { |
|
| 287 | + $applicableUsers = []; |
|
| 288 | + } |
|
| 289 | + $this->applicableUsers = $applicableUsers; |
|
| 290 | + } |
|
| 291 | + |
|
| 292 | + /** |
|
| 293 | + * Returns the groups for which to mount this storage |
|
| 294 | + * |
|
| 295 | + * @return array applicable groups |
|
| 296 | + */ |
|
| 297 | + public function getApplicableGroups() { |
|
| 298 | + return $this->applicableGroups; |
|
| 299 | + } |
|
| 300 | + |
|
| 301 | + /** |
|
| 302 | + * Sets the groups for which to mount this storage |
|
| 303 | + * |
|
| 304 | + * @param array|null $applicableGroups applicable groups |
|
| 305 | + */ |
|
| 306 | + public function setApplicableGroups($applicableGroups) { |
|
| 307 | + if (is_null($applicableGroups)) { |
|
| 308 | + $applicableGroups = []; |
|
| 309 | + } |
|
| 310 | + $this->applicableGroups = $applicableGroups; |
|
| 311 | + } |
|
| 312 | + |
|
| 313 | + /** |
|
| 314 | + * Returns the mount-specific options |
|
| 315 | + * |
|
| 316 | + * @return array mount specific options |
|
| 317 | + */ |
|
| 318 | + public function getMountOptions() { |
|
| 319 | + return $this->mountOptions; |
|
| 320 | + } |
|
| 321 | + |
|
| 322 | + /** |
|
| 323 | + * Sets the mount-specific options |
|
| 324 | + * |
|
| 325 | + * @param array $mountOptions applicable groups |
|
| 326 | + */ |
|
| 327 | + public function setMountOptions($mountOptions) { |
|
| 328 | + if (is_null($mountOptions)) { |
|
| 329 | + $mountOptions = []; |
|
| 330 | + } |
|
| 331 | + $this->mountOptions = $mountOptions; |
|
| 332 | + } |
|
| 333 | + |
|
| 334 | + /** |
|
| 335 | + * @param string $key |
|
| 336 | + * @return mixed |
|
| 337 | + */ |
|
| 338 | + public function getMountOption($key) { |
|
| 339 | + if (isset($this->mountOptions[$key])) { |
|
| 340 | + return $this->mountOptions[$key]; |
|
| 341 | + } |
|
| 342 | + return null; |
|
| 343 | + } |
|
| 344 | + |
|
| 345 | + /** |
|
| 346 | + * @param string $key |
|
| 347 | + * @param mixed $value |
|
| 348 | + */ |
|
| 349 | + public function setMountOption($key, $value) { |
|
| 350 | + $this->mountOptions[$key] = $value; |
|
| 351 | + } |
|
| 352 | + |
|
| 353 | + /** |
|
| 354 | + * Gets the storage status, whether the config worked last time |
|
| 355 | + * |
|
| 356 | + * @return int $status status |
|
| 357 | + */ |
|
| 358 | + public function getStatus() { |
|
| 359 | + return $this->status; |
|
| 360 | + } |
|
| 361 | + |
|
| 362 | + /** |
|
| 363 | + * Gets the message describing the storage status |
|
| 364 | + * |
|
| 365 | + * @return string|null |
|
| 366 | + */ |
|
| 367 | + public function getStatusMessage() { |
|
| 368 | + return $this->statusMessage; |
|
| 369 | + } |
|
| 370 | + |
|
| 371 | + /** |
|
| 372 | + * Sets the storage status, whether the config worked last time |
|
| 373 | + * |
|
| 374 | + * @param int $status status |
|
| 375 | + * @param string|null $message optional message |
|
| 376 | + */ |
|
| 377 | + public function setStatus($status, $message = null) { |
|
| 378 | + $this->status = $status; |
|
| 379 | + $this->statusMessage = $message; |
|
| 380 | + } |
|
| 381 | + |
|
| 382 | + /** |
|
| 383 | + * @return int self::MOUNT_TYPE_ADMIN or self::MOUNT_TYPE_PERSONAl |
|
| 384 | + */ |
|
| 385 | + public function getType() { |
|
| 386 | + return $this->type; |
|
| 387 | + } |
|
| 388 | + |
|
| 389 | + /** |
|
| 390 | + * @param int $type self::MOUNT_TYPE_ADMIN or self::MOUNT_TYPE_PERSONAl |
|
| 391 | + */ |
|
| 392 | + public function setType($type) { |
|
| 393 | + $this->type = $type; |
|
| 394 | + } |
|
| 395 | + |
|
| 396 | + /** |
|
| 397 | + * Serialize config to JSON |
|
| 398 | + * |
|
| 399 | + * @return array |
|
| 400 | + */ |
|
| 401 | + public function jsonSerialize() { |
|
| 402 | + $result = []; |
|
| 403 | + if (!is_null($this->id)) { |
|
| 404 | + $result['id'] = $this->id; |
|
| 405 | + } |
|
| 406 | + $result['mountPoint'] = $this->mountPoint; |
|
| 407 | + $result['backend'] = $this->backend->getIdentifier(); |
|
| 408 | + $result['authMechanism'] = $this->authMechanism->getIdentifier(); |
|
| 409 | + $result['backendOptions'] = $this->backendOptions; |
|
| 410 | + if (!is_null($this->priority)) { |
|
| 411 | + $result['priority'] = $this->priority; |
|
| 412 | + } |
|
| 413 | + if (!empty($this->applicableUsers)) { |
|
| 414 | + $result['applicableUsers'] = $this->applicableUsers; |
|
| 415 | + } |
|
| 416 | + if (!empty($this->applicableGroups)) { |
|
| 417 | + $result['applicableGroups'] = $this->applicableGroups; |
|
| 418 | + } |
|
| 419 | + if (!empty($this->mountOptions)) { |
|
| 420 | + $result['mountOptions'] = $this->mountOptions; |
|
| 421 | + } |
|
| 422 | + if (!is_null($this->status)) { |
|
| 423 | + $result['status'] = $this->status; |
|
| 424 | + } |
|
| 425 | + if (!is_null($this->statusMessage)) { |
|
| 426 | + $result['statusMessage'] = $this->statusMessage; |
|
| 427 | + } |
|
| 428 | + $result['userProvided'] = $this->authMechanism instanceof IUserProvided; |
|
| 429 | + $result['type'] = ($this->getType() === self::MOUNT_TYPE_PERSONAl) ? 'personal': 'system'; |
|
| 430 | + return $result; |
|
| 431 | + } |
|
| 432 | 432 | } |
@@ -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 | } |
@@ -33,24 +33,24 @@ |
||
| 33 | 33 | |
| 34 | 34 | class DAV extends Backend { |
| 35 | 35 | |
| 36 | - use LegacyDependencyCheckPolyfill; |
|
| 36 | + use LegacyDependencyCheckPolyfill; |
|
| 37 | 37 | |
| 38 | - public function __construct(IL10N $l, Password $legacyAuth) { |
|
| 39 | - $this |
|
| 40 | - ->setIdentifier('dav') |
|
| 41 | - ->addIdentifierAlias('\OC\Files\Storage\DAV') // legacy compat |
|
| 42 | - ->setStorageClass('\OC\Files\Storage\DAV') |
|
| 43 | - ->setText($l->t('WebDAV')) |
|
| 44 | - ->addParameters([ |
|
| 45 | - (new DefinitionParameter('host', $l->t('URL'))), |
|
| 46 | - (new DefinitionParameter('root', $l->t('Remote subfolder'))) |
|
| 47 | - ->setFlag(DefinitionParameter::FLAG_OPTIONAL), |
|
| 48 | - (new DefinitionParameter('secure', $l->t('Secure https://'))) |
|
| 49 | - ->setType(DefinitionParameter::VALUE_BOOLEAN), |
|
| 50 | - ]) |
|
| 51 | - ->addAuthScheme(AuthMechanism::SCHEME_PASSWORD) |
|
| 52 | - ->setLegacyAuthMechanism($legacyAuth) |
|
| 53 | - ; |
|
| 54 | - } |
|
| 38 | + public function __construct(IL10N $l, Password $legacyAuth) { |
|
| 39 | + $this |
|
| 40 | + ->setIdentifier('dav') |
|
| 41 | + ->addIdentifierAlias('\OC\Files\Storage\DAV') // legacy compat |
|
| 42 | + ->setStorageClass('\OC\Files\Storage\DAV') |
|
| 43 | + ->setText($l->t('WebDAV')) |
|
| 44 | + ->addParameters([ |
|
| 45 | + (new DefinitionParameter('host', $l->t('URL'))), |
|
| 46 | + (new DefinitionParameter('root', $l->t('Remote subfolder'))) |
|
| 47 | + ->setFlag(DefinitionParameter::FLAG_OPTIONAL), |
|
| 48 | + (new DefinitionParameter('secure', $l->t('Secure https://'))) |
|
| 49 | + ->setType(DefinitionParameter::VALUE_BOOLEAN), |
|
| 50 | + ]) |
|
| 51 | + ->addAuthScheme(AuthMechanism::SCHEME_PASSWORD) |
|
| 52 | + ->setLegacyAuthMechanism($legacyAuth) |
|
| 53 | + ; |
|
| 54 | + } |
|
| 55 | 55 | |
| 56 | 56 | } |
@@ -33,21 +33,21 @@ |
||
| 33 | 33 | |
| 34 | 34 | class Google extends Backend { |
| 35 | 35 | |
| 36 | - use LegacyDependencyCheckPolyfill; |
|
| 36 | + use LegacyDependencyCheckPolyfill; |
|
| 37 | 37 | |
| 38 | - public function __construct(IL10N $l, OAuth2 $legacyAuth) { |
|
| 39 | - $this |
|
| 40 | - ->setIdentifier('googledrive') |
|
| 41 | - ->addIdentifierAlias('\OC\Files\Storage\Google') // legacy compat |
|
| 42 | - ->setStorageClass('\OCA\Files_External\Lib\Storage\Google') |
|
| 43 | - ->setText($l->t('Google Drive')) |
|
| 44 | - ->addParameters([ |
|
| 45 | - // all parameters handled in OAuth2 mechanism |
|
| 46 | - ]) |
|
| 47 | - ->addAuthScheme(AuthMechanism::SCHEME_OAUTH2) |
|
| 48 | - ->addCustomJs('gdrive') |
|
| 49 | - ->setLegacyAuthMechanism($legacyAuth) |
|
| 50 | - ; |
|
| 51 | - } |
|
| 38 | + public function __construct(IL10N $l, OAuth2 $legacyAuth) { |
|
| 39 | + $this |
|
| 40 | + ->setIdentifier('googledrive') |
|
| 41 | + ->addIdentifierAlias('\OC\Files\Storage\Google') // legacy compat |
|
| 42 | + ->setStorageClass('\OCA\Files_External\Lib\Storage\Google') |
|
| 43 | + ->setText($l->t('Google Drive')) |
|
| 44 | + ->addParameters([ |
|
| 45 | + // all parameters handled in OAuth2 mechanism |
|
| 46 | + ]) |
|
| 47 | + ->addAuthScheme(AuthMechanism::SCHEME_OAUTH2) |
|
| 48 | + ->addCustomJs('gdrive') |
|
| 49 | + ->setLegacyAuthMechanism($legacyAuth) |
|
| 50 | + ; |
|
| 51 | + } |
|
| 52 | 52 | |
| 53 | 53 | } |
@@ -31,20 +31,20 @@ |
||
| 31 | 31 | |
| 32 | 32 | class Local extends Backend { |
| 33 | 33 | |
| 34 | - public function __construct(IL10N $l, NullMechanism $legacyAuth) { |
|
| 35 | - $this |
|
| 36 | - ->setIdentifier('local') |
|
| 37 | - ->addIdentifierAlias('\OC\Files\Storage\Local') // legacy compat |
|
| 38 | - ->setStorageClass('\OC\Files\Storage\Local') |
|
| 39 | - ->setText($l->t('Local')) |
|
| 40 | - ->addParameters([ |
|
| 41 | - (new DefinitionParameter('datadir', $l->t('Location'))), |
|
| 42 | - ]) |
|
| 43 | - ->setAllowedVisibility(BackendService::VISIBILITY_ADMIN) |
|
| 44 | - ->setPriority(BackendService::PRIORITY_DEFAULT + 50) |
|
| 45 | - ->addAuthScheme(AuthMechanism::SCHEME_NULL) |
|
| 46 | - ->setLegacyAuthMechanism($legacyAuth) |
|
| 47 | - ; |
|
| 48 | - } |
|
| 34 | + public function __construct(IL10N $l, NullMechanism $legacyAuth) { |
|
| 35 | + $this |
|
| 36 | + ->setIdentifier('local') |
|
| 37 | + ->addIdentifierAlias('\OC\Files\Storage\Local') // legacy compat |
|
| 38 | + ->setStorageClass('\OC\Files\Storage\Local') |
|
| 39 | + ->setText($l->t('Local')) |
|
| 40 | + ->addParameters([ |
|
| 41 | + (new DefinitionParameter('datadir', $l->t('Location'))), |
|
| 42 | + ]) |
|
| 43 | + ->setAllowedVisibility(BackendService::VISIBILITY_ADMIN) |
|
| 44 | + ->setPriority(BackendService::PRIORITY_DEFAULT + 50) |
|
| 45 | + ->addAuthScheme(AuthMechanism::SCHEME_NULL) |
|
| 46 | + ->setLegacyAuthMechanism($legacyAuth) |
|
| 47 | + ; |
|
| 48 | + } |
|
| 49 | 49 | |
| 50 | 50 | } |
@@ -32,21 +32,21 @@ |
||
| 32 | 32 | |
| 33 | 33 | class SFTP extends Backend { |
| 34 | 34 | |
| 35 | - public function __construct(IL10N $l, Password $legacyAuth) { |
|
| 36 | - $this |
|
| 37 | - ->setIdentifier('sftp') |
|
| 38 | - ->addIdentifierAlias('\OC\Files\Storage\SFTP') // legacy compat |
|
| 39 | - ->setStorageClass('\OCA\Files_External\Lib\Storage\SFTP') |
|
| 40 | - ->setText($l->t('SFTP')) |
|
| 41 | - ->addParameters([ |
|
| 42 | - (new DefinitionParameter('host', $l->t('Host'))), |
|
| 43 | - (new DefinitionParameter('root', $l->t('Root'))) |
|
| 44 | - ->setFlag(DefinitionParameter::FLAG_OPTIONAL), |
|
| 45 | - ]) |
|
| 46 | - ->addAuthScheme(AuthMechanism::SCHEME_PASSWORD) |
|
| 47 | - ->addAuthScheme(AuthMechanism::SCHEME_PUBLICKEY) |
|
| 48 | - ->setLegacyAuthMechanism($legacyAuth) |
|
| 49 | - ; |
|
| 50 | - } |
|
| 35 | + public function __construct(IL10N $l, Password $legacyAuth) { |
|
| 36 | + $this |
|
| 37 | + ->setIdentifier('sftp') |
|
| 38 | + ->addIdentifierAlias('\OC\Files\Storage\SFTP') // legacy compat |
|
| 39 | + ->setStorageClass('\OCA\Files_External\Lib\Storage\SFTP') |
|
| 40 | + ->setText($l->t('SFTP')) |
|
| 41 | + ->addParameters([ |
|
| 42 | + (new DefinitionParameter('host', $l->t('Host'))), |
|
| 43 | + (new DefinitionParameter('root', $l->t('Root'))) |
|
| 44 | + ->setFlag(DefinitionParameter::FLAG_OPTIONAL), |
|
| 45 | + ]) |
|
| 46 | + ->addAuthScheme(AuthMechanism::SCHEME_PASSWORD) |
|
| 47 | + ->addAuthScheme(AuthMechanism::SCHEME_PUBLICKEY) |
|
| 48 | + ->setLegacyAuthMechanism($legacyAuth) |
|
| 49 | + ; |
|
| 50 | + } |
|
| 51 | 51 | |
| 52 | 52 | } |
@@ -33,24 +33,24 @@ |
||
| 33 | 33 | |
| 34 | 34 | class FTP extends Backend { |
| 35 | 35 | |
| 36 | - use LegacyDependencyCheckPolyfill; |
|
| 36 | + use LegacyDependencyCheckPolyfill; |
|
| 37 | 37 | |
| 38 | - public function __construct(IL10N $l, Password $legacyAuth) { |
|
| 39 | - $this |
|
| 40 | - ->setIdentifier('ftp') |
|
| 41 | - ->addIdentifierAlias('\OC\Files\Storage\FTP') // legacy compat |
|
| 42 | - ->setStorageClass('\OCA\Files_External\Lib\Storage\FTP') |
|
| 43 | - ->setText($l->t('FTP')) |
|
| 44 | - ->addParameters([ |
|
| 45 | - (new DefinitionParameter('host', $l->t('Host'))), |
|
| 46 | - (new DefinitionParameter('root', $l->t('Remote subfolder'))) |
|
| 47 | - ->setFlag(DefinitionParameter::FLAG_OPTIONAL), |
|
| 48 | - (new DefinitionParameter('secure', $l->t('Secure ftps://'))) |
|
| 49 | - ->setType(DefinitionParameter::VALUE_BOOLEAN), |
|
| 50 | - ]) |
|
| 51 | - ->addAuthScheme(AuthMechanism::SCHEME_PASSWORD) |
|
| 52 | - ->setLegacyAuthMechanism($legacyAuth) |
|
| 53 | - ; |
|
| 54 | - } |
|
| 38 | + public function __construct(IL10N $l, Password $legacyAuth) { |
|
| 39 | + $this |
|
| 40 | + ->setIdentifier('ftp') |
|
| 41 | + ->addIdentifierAlias('\OC\Files\Storage\FTP') // legacy compat |
|
| 42 | + ->setStorageClass('\OCA\Files_External\Lib\Storage\FTP') |
|
| 43 | + ->setText($l->t('FTP')) |
|
| 44 | + ->addParameters([ |
|
| 45 | + (new DefinitionParameter('host', $l->t('Host'))), |
|
| 46 | + (new DefinitionParameter('root', $l->t('Remote subfolder'))) |
|
| 47 | + ->setFlag(DefinitionParameter::FLAG_OPTIONAL), |
|
| 48 | + (new DefinitionParameter('secure', $l->t('Secure ftps://'))) |
|
| 49 | + ->setType(DefinitionParameter::VALUE_BOOLEAN), |
|
| 50 | + ]) |
|
| 51 | + ->addAuthScheme(AuthMechanism::SCHEME_PASSWORD) |
|
| 52 | + ->setLegacyAuthMechanism($legacyAuth) |
|
| 53 | + ; |
|
| 54 | + } |
|
| 55 | 55 | |
| 56 | 56 | } |
@@ -33,73 +33,73 @@ |
||
| 33 | 33 | */ |
| 34 | 34 | class LegacyBackend extends Backend { |
| 35 | 35 | |
| 36 | - use LegacyDependencyCheckPolyfill { |
|
| 37 | - LegacyDependencyCheckPolyfill::checkDependencies as doCheckDependencies; |
|
| 38 | - } |
|
| 36 | + use LegacyDependencyCheckPolyfill { |
|
| 37 | + LegacyDependencyCheckPolyfill::checkDependencies as doCheckDependencies; |
|
| 38 | + } |
|
| 39 | 39 | |
| 40 | - /** @var bool */ |
|
| 41 | - protected $hasDependencies = false; |
|
| 40 | + /** @var bool */ |
|
| 41 | + protected $hasDependencies = false; |
|
| 42 | 42 | |
| 43 | - /** |
|
| 44 | - * @param string $class |
|
| 45 | - * @param array $definition |
|
| 46 | - * @param Builtin $authMechanism |
|
| 47 | - */ |
|
| 48 | - public function __construct($class, array $definition, Builtin $authMechanism) { |
|
| 49 | - $this |
|
| 50 | - ->setIdentifier($class) |
|
| 51 | - ->setStorageClass($class) |
|
| 52 | - ->setText($definition['backend']) |
|
| 53 | - ->addAuthScheme(Builtin::SCHEME_BUILTIN) |
|
| 54 | - ->setLegacyAuthMechanism($authMechanism) |
|
| 55 | - ; |
|
| 43 | + /** |
|
| 44 | + * @param string $class |
|
| 45 | + * @param array $definition |
|
| 46 | + * @param Builtin $authMechanism |
|
| 47 | + */ |
|
| 48 | + public function __construct($class, array $definition, Builtin $authMechanism) { |
|
| 49 | + $this |
|
| 50 | + ->setIdentifier($class) |
|
| 51 | + ->setStorageClass($class) |
|
| 52 | + ->setText($definition['backend']) |
|
| 53 | + ->addAuthScheme(Builtin::SCHEME_BUILTIN) |
|
| 54 | + ->setLegacyAuthMechanism($authMechanism) |
|
| 55 | + ; |
|
| 56 | 56 | |
| 57 | - foreach ($definition['configuration'] as $name => $placeholder) { |
|
| 58 | - $flags = DefinitionParameter::FLAG_NONE; |
|
| 59 | - $type = DefinitionParameter::VALUE_TEXT; |
|
| 60 | - if ($placeholder[0] === '&') { |
|
| 61 | - $flags = DefinitionParameter::FLAG_OPTIONAL; |
|
| 62 | - $placeholder = substr($placeholder, 1); |
|
| 63 | - } |
|
| 64 | - switch ($placeholder[0]) { |
|
| 65 | - case '!': |
|
| 66 | - $type = DefinitionParameter::VALUE_BOOLEAN; |
|
| 67 | - $placeholder = substr($placeholder, 1); |
|
| 68 | - break; |
|
| 69 | - case '*': |
|
| 70 | - $type = DefinitionParameter::VALUE_PASSWORD; |
|
| 71 | - $placeholder = substr($placeholder, 1); |
|
| 72 | - break; |
|
| 73 | - case '#': |
|
| 74 | - $type = DefinitionParameter::VALUE_HIDDEN; |
|
| 75 | - $placeholder = substr($placeholder, 1); |
|
| 76 | - break; |
|
| 77 | - } |
|
| 78 | - $this->addParameter((new DefinitionParameter($name, $placeholder)) |
|
| 79 | - ->setType($type) |
|
| 80 | - ->setFlags($flags) |
|
| 81 | - ); |
|
| 82 | - } |
|
| 57 | + foreach ($definition['configuration'] as $name => $placeholder) { |
|
| 58 | + $flags = DefinitionParameter::FLAG_NONE; |
|
| 59 | + $type = DefinitionParameter::VALUE_TEXT; |
|
| 60 | + if ($placeholder[0] === '&') { |
|
| 61 | + $flags = DefinitionParameter::FLAG_OPTIONAL; |
|
| 62 | + $placeholder = substr($placeholder, 1); |
|
| 63 | + } |
|
| 64 | + switch ($placeholder[0]) { |
|
| 65 | + case '!': |
|
| 66 | + $type = DefinitionParameter::VALUE_BOOLEAN; |
|
| 67 | + $placeholder = substr($placeholder, 1); |
|
| 68 | + break; |
|
| 69 | + case '*': |
|
| 70 | + $type = DefinitionParameter::VALUE_PASSWORD; |
|
| 71 | + $placeholder = substr($placeholder, 1); |
|
| 72 | + break; |
|
| 73 | + case '#': |
|
| 74 | + $type = DefinitionParameter::VALUE_HIDDEN; |
|
| 75 | + $placeholder = substr($placeholder, 1); |
|
| 76 | + break; |
|
| 77 | + } |
|
| 78 | + $this->addParameter((new DefinitionParameter($name, $placeholder)) |
|
| 79 | + ->setType($type) |
|
| 80 | + ->setFlags($flags) |
|
| 81 | + ); |
|
| 82 | + } |
|
| 83 | 83 | |
| 84 | - if (isset($definition['priority'])) { |
|
| 85 | - $this->setPriority($definition['priority']); |
|
| 86 | - } |
|
| 87 | - if (isset($definition['custom'])) { |
|
| 88 | - $this->addCustomJs($definition['custom']); |
|
| 89 | - } |
|
| 90 | - if (isset($definition['has_dependencies']) && $definition['has_dependencies']) { |
|
| 91 | - $this->hasDependencies = true; |
|
| 92 | - } |
|
| 93 | - } |
|
| 84 | + if (isset($definition['priority'])) { |
|
| 85 | + $this->setPriority($definition['priority']); |
|
| 86 | + } |
|
| 87 | + if (isset($definition['custom'])) { |
|
| 88 | + $this->addCustomJs($definition['custom']); |
|
| 89 | + } |
|
| 90 | + if (isset($definition['has_dependencies']) && $definition['has_dependencies']) { |
|
| 91 | + $this->hasDependencies = true; |
|
| 92 | + } |
|
| 93 | + } |
|
| 94 | 94 | |
| 95 | - /** |
|
| 96 | - * @return MissingDependency[] |
|
| 97 | - */ |
|
| 98 | - public function checkDependencies() { |
|
| 99 | - if ($this->hasDependencies) { |
|
| 100 | - return $this->doCheckDependencies(); |
|
| 101 | - } |
|
| 102 | - return []; |
|
| 103 | - } |
|
| 95 | + /** |
|
| 96 | + * @return MissingDependency[] |
|
| 97 | + */ |
|
| 98 | + public function checkDependencies() { |
|
| 99 | + if ($this->hasDependencies) { |
|
| 100 | + return $this->doCheckDependencies(); |
|
| 101 | + } |
|
| 102 | + return []; |
|
| 103 | + } |
|
| 104 | 104 | |
| 105 | 105 | } |
@@ -62,18 +62,18 @@ |
||
| 62 | 62 | $placeholder = substr($placeholder, 1); |
| 63 | 63 | } |
| 64 | 64 | switch ($placeholder[0]) { |
| 65 | - case '!': |
|
| 66 | - $type = DefinitionParameter::VALUE_BOOLEAN; |
|
| 67 | - $placeholder = substr($placeholder, 1); |
|
| 68 | - break; |
|
| 69 | - case '*': |
|
| 70 | - $type = DefinitionParameter::VALUE_PASSWORD; |
|
| 71 | - $placeholder = substr($placeholder, 1); |
|
| 72 | - break; |
|
| 73 | - case '#': |
|
| 74 | - $type = DefinitionParameter::VALUE_HIDDEN; |
|
| 75 | - $placeholder = substr($placeholder, 1); |
|
| 76 | - break; |
|
| 65 | + case '!': |
|
| 66 | + $type = DefinitionParameter::VALUE_BOOLEAN; |
|
| 67 | + $placeholder = substr($placeholder, 1); |
|
| 68 | + break; |
|
| 69 | + case '*': |
|
| 70 | + $type = DefinitionParameter::VALUE_PASSWORD; |
|
| 71 | + $placeholder = substr($placeholder, 1); |
|
| 72 | + break; |
|
| 73 | + case '#': |
|
| 74 | + $type = DefinitionParameter::VALUE_HIDDEN; |
|
| 75 | + $placeholder = substr($placeholder, 1); |
|
| 76 | + break; |
|
| 77 | 77 | } |
| 78 | 78 | $this->addParameter((new DefinitionParameter($name, $placeholder)) |
| 79 | 79 | ->setType($type) |
@@ -33,31 +33,31 @@ |
||
| 33 | 33 | |
| 34 | 34 | class Swift extends Backend { |
| 35 | 35 | |
| 36 | - use LegacyDependencyCheckPolyfill; |
|
| 36 | + use LegacyDependencyCheckPolyfill; |
|
| 37 | 37 | |
| 38 | - public function __construct(IL10N $l, OpenStack $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 | - ->setFlag(DefinitionParameter::FLAG_OPTIONAL), |
|
| 49 | - (new DefinitionParameter('bucket', $l->t('Bucket'))), |
|
| 50 | - (new DefinitionParameter('timeout', $l->t('Request timeout (seconds)'))) |
|
| 51 | - ->setFlag(DefinitionParameter::FLAG_OPTIONAL), |
|
| 52 | - ]) |
|
| 53 | - ->addAuthScheme(AuthMechanism::SCHEME_OPENSTACK) |
|
| 54 | - ->setLegacyAuthMechanismCallback(function(array $params) use ($openstackAuth, $rackspaceAuth) { |
|
| 55 | - if (isset($params['options']['key']) && $params['options']['key']) { |
|
| 56 | - return $rackspaceAuth; |
|
| 57 | - } |
|
| 58 | - return $openstackAuth; |
|
| 59 | - }) |
|
| 60 | - ; |
|
| 61 | - } |
|
| 38 | + public function __construct(IL10N $l, OpenStack $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 | + ->setFlag(DefinitionParameter::FLAG_OPTIONAL), |
|
| 49 | + (new DefinitionParameter('bucket', $l->t('Bucket'))), |
|
| 50 | + (new DefinitionParameter('timeout', $l->t('Request timeout (seconds)'))) |
|
| 51 | + ->setFlag(DefinitionParameter::FLAG_OPTIONAL), |
|
| 52 | + ]) |
|
| 53 | + ->addAuthScheme(AuthMechanism::SCHEME_OPENSTACK) |
|
| 54 | + ->setLegacyAuthMechanismCallback(function(array $params) use ($openstackAuth, $rackspaceAuth) { |
|
| 55 | + if (isset($params['options']['key']) && $params['options']['key']) { |
|
| 56 | + return $rackspaceAuth; |
|
| 57 | + } |
|
| 58 | + return $openstackAuth; |
|
| 59 | + }) |
|
| 60 | + ; |
|
| 61 | + } |
|
| 62 | 62 | |
| 63 | 63 | } |