Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions apps/files_external/lib/Lib/Backend/AmazonS3.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public function __construct(IL10N $l, AccessKey $legacyAuth) {
->setIdentifier('amazons3')
->addIdentifierAlias('\OC\Files\Storage\AmazonS3') // legacy compat
->setStorageClass('\OCA\Files_External\Lib\Storage\AmazonS3')
->setText($l->t('S3 Storage'))
->setText($l->t('S3-Compatible Object Storage'))
->addParameters([
new DefinitionParameter('bucket', $l->t('Bucket')),
(new DefinitionParameter('hostname', $l->t('Hostname')))
Expand All @@ -36,17 +36,17 @@ public function __construct(IL10N $l, AccessKey $legacyAuth) {
->setFlag(DefinitionParameter::FLAG_OPTIONAL),
(new DefinitionParameter('storageClass', $l->t('Storage Class')))
->setFlag(DefinitionParameter::FLAG_OPTIONAL),
(new DefinitionParameter('use_ssl', $l->t('Enable SSL')))
(new DefinitionParameter('use_ssl', $l->t('Use HTTPS')))
->setType(DefinitionParameter::VALUE_BOOLEAN)
->setDefaultValue(true),
(new DefinitionParameter('use_path_style', $l->t('Enable Path Style')))
(new DefinitionParameter('use_path_style', $l->t('Use Path Style (https://domain.com/bucket)')))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
(new DefinitionParameter('use_path_style', $l->t('Use Path Style (https://domain.com/bucket)')))
(new DefinitionParameter('use_path_style', $l->t('Use Path Style (https://example.com/bucket)')))

We have reserved domains for a reason 😅

->setType(DefinitionParameter::VALUE_BOOLEAN),
(new DefinitionParameter('legacy_auth', $l->t('Legacy (v2) authentication')))
->setType(DefinitionParameter::VALUE_BOOLEAN),
(new DefinitionParameter('useMultipartCopy', $l->t('Enable multipart copy')))
->setType(DefinitionParameter::VALUE_BOOLEAN)
->setDefaultValue(true),
(new DefinitionParameter('use_presigned_url', $l->t('Use presigned S3 url')))
(new DefinitionParameter('use_presigned_url', $l->t('Enable Direct Downloads (presigned URLs)')))
->setType(DefinitionParameter::VALUE_BOOLEAN)
->setDefaultValue(false),
(new DefinitionParameter('sse_c_key', $l->t('SSE-C encryption key')))
Expand Down
2 changes: 1 addition & 1 deletion apps/files_external/lib/Lib/Backend/FTP.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public function __construct(IL10N $l, Password $legacyAuth) {
->setIdentifier('ftp')
->addIdentifierAlias('\OC\Files\Storage\FTP') // legacy compat
->setStorageClass('\OCA\Files_External\Lib\Storage\FTP')
->setText($l->t('FTP'))
->setText($l->t('FTP / FTPS'))
->addParameters([
new DefinitionParameter('host', $l->t('Host')),
(new DefinitionParameter('port', $l->t('Port')))
Expand Down
2 changes: 1 addition & 1 deletion apps/files_external/lib/Lib/Backend/Local.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public function __construct(IL10N $l, NullMechanism $legacyAuth) {
->setIdentifier('local')
->addIdentifierAlias('\OC\Files\Storage\Local') // legacy compat
->setStorageClass('\OC\Files\Storage\Local')
->setText($l->t('Local'))
->setText($l->t('Local (server storage)'))
->addParameters([
new DefinitionParameter('datadir', $l->t('Location')),
])
Expand Down
2 changes: 1 addition & 1 deletion apps/files_external/lib/Lib/Backend/OwnCloud.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public function __construct(IL10N $l, Password $legacyAuth) {
->setIdentifier('owncloud')
->addIdentifierAlias('\OC\Files\Storage\OwnCloud') // legacy compat
->setStorageClass('\OCA\Files_External\Lib\Storage\OwnCloud')
->setText($l->t('Nextcloud'))
->setText($l->t('Nextcloud (WebDAV)'))
->addParameters([
new DefinitionParameter('host', $l->t('URL')),
(new DefinitionParameter('root', $l->t('Remote subfolder')))
Expand Down
2 changes: 1 addition & 1 deletion apps/files_external/lib/Lib/Backend/SFTP.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public function __construct(IL10N $l, Password $legacyAuth) {
->setIdentifier('sftp')
->addIdentifierAlias('\OC\Files\Storage\SFTP') // legacy compat
->setStorageClass('\OCA\Files_External\Lib\Storage\SFTP')
->setText($l->t('SFTP'))
->setText($l->t('SFTP (SSH file transfer)'))
->addParameters([
new DefinitionParameter('host', $l->t('Host')),
(new DefinitionParameter('port', $l->t('Port')))
Expand Down
2 changes: 1 addition & 1 deletion apps/files_external/lib/Lib/Backend/SFTP_Key.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public function __construct(IL10N $l, RSA $legacyAuth, SFTP $sftpBackend) {
$this
->setIdentifier('\OC\Files\Storage\SFTP_Key')
->setStorageClass('\OCA\Files_External\Lib\Storage\SFTP')
->setText($l->t('SFTP with secret key login'))
->setText($l->t('SFTP with public key authentication'))
->addParameters([
new DefinitionParameter('host', $l->t('Host')),
(new DefinitionParameter('root', $l->t('Remote subfolder')))
Expand Down
2 changes: 1 addition & 1 deletion apps/files_external/lib/Lib/Backend/SMB.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public function __construct(IL10N $l, Password $legacyAuth) {
->setIdentifier('smb')
->addIdentifierAlias('\OC\Files\Storage\SMB')// legacy compat
->setStorageClass('\OCA\Files_External\Lib\Storage\SMB')
->setText($l->t('SMB/CIFS'))
->setText($l->t('SMB / CIFS (Windows network share)'))
->addParameters([
new DefinitionParameter('host', $l->t('Host')),
new DefinitionParameter('share', $l->t('Share')),
Expand Down
2 changes: 1 addition & 1 deletion apps/files_external/lib/Lib/Backend/SMB_OC.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public function __construct(IL10N $l, SessionCredentials $legacyAuth, SMB $smbBa
$this
->setIdentifier('\OC\Files\Storage\SMB_OC')
->setStorageClass('\OCA\Files_External\Lib\Storage\SMB')
->setText($l->t('SMB/CIFS using OC login'))
->setText($l->t('SMB / CIFS using Nextcloud login'))
->addParameters([
new DefinitionParameter('host', $l->t('Host')),
(new DefinitionParameter('username_as_share', $l->t('Login as share')))
Expand Down
2 changes: 1 addition & 1 deletion apps/files_external/lib/Lib/Backend/Swift.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public function __construct(IL10N $l, OpenStackV2 $openstackAuth, Rackspace $rac
->setIdentifier('swift')
->addIdentifierAlias('\OC\Files\Storage\Swift') // legacy compat
->setStorageClass('\OCA\Files_External\Lib\Storage\Swift')
->setText($l->t('OpenStack Object Storage'))
->setText($l->t('OpenStack Swift Object Storage'))
->addParameters([
(new DefinitionParameter('service_name', $l->t('Service name')))
->setFlag(DefinitionParameter::FLAG_OPTIONAL),
Expand Down
4 changes: 3 additions & 1 deletion apps/files_external/lib/Service/BackendService.php
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,9 @@ public function getBackends() {
* @return Backend[]
*/
public function getAvailableBackends() {
return array_filter($this->getBackends(), fn (Backend $backend) => $backend->checkRequiredDependencies() === []);
$backends = array_filter($this->getBackends(), fn (Backend $backend) => $backend->checkRequiredDependencies() === []);
uasort($backends, [Backend::class, 'lexicalCompare']);
return $backends;
}

/**
Expand Down
Loading