nextcloud /
server
@@ -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 | } |
@@ -32,22 +32,22 @@ |
||
| 32 | 32 | |
| 33 | 33 | class OwnCloud extends Backend { |
| 34 | 34 | |
| 35 | - public function __construct(IL10N $l, Password $legacyAuth) { |
|
| 36 | - $this |
|
| 37 | - ->setIdentifier('owncloud') |
|
| 38 | - ->addIdentifierAlias('\OC\Files\Storage\OwnCloud') // legacy compat |
|
| 39 | - ->setStorageClass('\OCA\Files_External\Lib\Storage\OwnCloud') |
|
| 40 | - ->setText($l->t('Nextcloud')) |
|
| 41 | - ->addParameters([ |
|
| 42 | - (new DefinitionParameter('host', $l->t('URL'))), |
|
| 43 | - (new DefinitionParameter('root', $l->t('Remote subfolder'))) |
|
| 44 | - ->setFlag(DefinitionParameter::FLAG_OPTIONAL), |
|
| 45 | - (new DefinitionParameter('secure', $l->t('Secure https://'))) |
|
| 46 | - ->setType(DefinitionParameter::VALUE_BOOLEAN), |
|
| 47 | - ]) |
|
| 48 | - ->addAuthScheme(AuthMechanism::SCHEME_PASSWORD) |
|
| 49 | - ->setLegacyAuthMechanism($legacyAuth) |
|
| 50 | - ; |
|
| 51 | - } |
|
| 35 | + public function __construct(IL10N $l, Password $legacyAuth) { |
|
| 36 | + $this |
|
| 37 | + ->setIdentifier('owncloud') |
|
| 38 | + ->addIdentifierAlias('\OC\Files\Storage\OwnCloud') // legacy compat |
|
| 39 | + ->setStorageClass('\OCA\Files_External\Lib\Storage\OwnCloud') |
|
| 40 | + ->setText($l->t('Nextcloud')) |
|
| 41 | + ->addParameters([ |
|
| 42 | + (new DefinitionParameter('host', $l->t('URL'))), |
|
| 43 | + (new DefinitionParameter('root', $l->t('Remote subfolder'))) |
|
| 44 | + ->setFlag(DefinitionParameter::FLAG_OPTIONAL), |
|
| 45 | + (new DefinitionParameter('secure', $l->t('Secure https://'))) |
|
| 46 | + ->setType(DefinitionParameter::VALUE_BOOLEAN), |
|
| 47 | + ]) |
|
| 48 | + ->addAuthScheme(AuthMechanism::SCHEME_PASSWORD) |
|
| 49 | + ->setLegacyAuthMechanism($legacyAuth) |
|
| 50 | + ; |
|
| 51 | + } |
|
| 52 | 52 | |
| 53 | 53 | } |
@@ -33,30 +33,30 @@ |
||
| 33 | 33 | |
| 34 | 34 | class AmazonS3 extends Backend { |
| 35 | 35 | |
| 36 | - use LegacyDependencyCheckPolyfill; |
|
| 36 | + use LegacyDependencyCheckPolyfill; |
|
| 37 | 37 | |
| 38 | - public function __construct(IL10N $l, AccessKey $legacyAuth) { |
|
| 39 | - $this |
|
| 40 | - ->setIdentifier('amazons3') |
|
| 41 | - ->addIdentifierAlias('\OC\Files\Storage\AmazonS3') // legacy compat |
|
| 42 | - ->setStorageClass('\OCA\Files_External\Lib\Storage\AmazonS3') |
|
| 43 | - ->setText($l->t('Amazon S3')) |
|
| 44 | - ->addParameters([ |
|
| 45 | - (new DefinitionParameter('bucket', $l->t('Bucket'))), |
|
| 46 | - (new DefinitionParameter('hostname', $l->t('Hostname'))) |
|
| 47 | - ->setFlag(DefinitionParameter::FLAG_OPTIONAL), |
|
| 48 | - (new DefinitionParameter('port', $l->t('Port'))) |
|
| 49 | - ->setFlag(DefinitionParameter::FLAG_OPTIONAL), |
|
| 50 | - (new DefinitionParameter('region', $l->t('Region'))) |
|
| 51 | - ->setFlag(DefinitionParameter::FLAG_OPTIONAL), |
|
| 52 | - (new DefinitionParameter('use_ssl', $l->t('Enable SSL'))) |
|
| 53 | - ->setType(DefinitionParameter::VALUE_BOOLEAN), |
|
| 54 | - (new DefinitionParameter('use_path_style', $l->t('Enable Path Style'))) |
|
| 55 | - ->setType(DefinitionParameter::VALUE_BOOLEAN), |
|
| 56 | - ]) |
|
| 57 | - ->addAuthScheme(AccessKey::SCHEME_AMAZONS3_ACCESSKEY) |
|
| 58 | - ->setLegacyAuthMechanism($legacyAuth) |
|
| 59 | - ; |
|
| 60 | - } |
|
| 38 | + public function __construct(IL10N $l, AccessKey $legacyAuth) { |
|
| 39 | + $this |
|
| 40 | + ->setIdentifier('amazons3') |
|
| 41 | + ->addIdentifierAlias('\OC\Files\Storage\AmazonS3') // legacy compat |
|
| 42 | + ->setStorageClass('\OCA\Files_External\Lib\Storage\AmazonS3') |
|
| 43 | + ->setText($l->t('Amazon S3')) |
|
| 44 | + ->addParameters([ |
|
| 45 | + (new DefinitionParameter('bucket', $l->t('Bucket'))), |
|
| 46 | + (new DefinitionParameter('hostname', $l->t('Hostname'))) |
|
| 47 | + ->setFlag(DefinitionParameter::FLAG_OPTIONAL), |
|
| 48 | + (new DefinitionParameter('port', $l->t('Port'))) |
|
| 49 | + ->setFlag(DefinitionParameter::FLAG_OPTIONAL), |
|
| 50 | + (new DefinitionParameter('region', $l->t('Region'))) |
|
| 51 | + ->setFlag(DefinitionParameter::FLAG_OPTIONAL), |
|
| 52 | + (new DefinitionParameter('use_ssl', $l->t('Enable SSL'))) |
|
| 53 | + ->setType(DefinitionParameter::VALUE_BOOLEAN), |
|
| 54 | + (new DefinitionParameter('use_path_style', $l->t('Enable Path Style'))) |
|
| 55 | + ->setType(DefinitionParameter::VALUE_BOOLEAN), |
|
| 56 | + ]) |
|
| 57 | + ->addAuthScheme(AccessKey::SCHEME_AMAZONS3_ACCESSKEY) |
|
| 58 | + ->setLegacyAuthMechanism($legacyAuth) |
|
| 59 | + ; |
|
| 60 | + } |
|
| 61 | 61 | |
| 62 | 62 | } |
