@@ -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 | } |
@@ -32,20 +32,20 @@ |
||
32 | 32 | |
33 | 33 | class SFTP_Key extends Backend { |
34 | 34 | |
35 | - public function __construct(IL10N $l, RSA $legacyAuth, SFTP $sftpBackend) { |
|
36 | - $this |
|
37 | - ->setIdentifier('\OC\Files\Storage\SFTP_Key') |
|
38 | - ->setStorageClass('\OCA\Files_External\Lib\Storage\SFTP') |
|
39 | - ->setText($l->t('SFTP with secret key login')) |
|
40 | - ->addParameters([ |
|
41 | - (new DefinitionParameter('host', $l->t('Host'))), |
|
42 | - (new DefinitionParameter('root', $l->t('Remote subfolder'))) |
|
43 | - ->setFlag(DefinitionParameter::FLAG_OPTIONAL), |
|
44 | - ]) |
|
45 | - ->addAuthScheme(AuthMechanism::SCHEME_PUBLICKEY) |
|
46 | - ->setLegacyAuthMechanism($legacyAuth) |
|
47 | - ->deprecateTo($sftpBackend) |
|
48 | - ; |
|
49 | - } |
|
35 | + public function __construct(IL10N $l, RSA $legacyAuth, SFTP $sftpBackend) { |
|
36 | + $this |
|
37 | + ->setIdentifier('\OC\Files\Storage\SFTP_Key') |
|
38 | + ->setStorageClass('\OCA\Files_External\Lib\Storage\SFTP') |
|
39 | + ->setText($l->t('SFTP with secret key login')) |
|
40 | + ->addParameters([ |
|
41 | + (new DefinitionParameter('host', $l->t('Host'))), |
|
42 | + (new DefinitionParameter('root', $l->t('Remote subfolder'))) |
|
43 | + ->setFlag(DefinitionParameter::FLAG_OPTIONAL), |
|
44 | + ]) |
|
45 | + ->addAuthScheme(AuthMechanism::SCHEME_PUBLICKEY) |
|
46 | + ->setLegacyAuthMechanism($legacyAuth) |
|
47 | + ->deprecateTo($sftpBackend) |
|
48 | + ; |
|
49 | + } |
|
50 | 50 | |
51 | 51 | } |
@@ -35,36 +35,36 @@ |
||
35 | 35 | |
36 | 36 | class SMB extends Backend { |
37 | 37 | |
38 | - use LegacyDependencyCheckPolyfill; |
|
38 | + use LegacyDependencyCheckPolyfill; |
|
39 | 39 | |
40 | - public function __construct(IL10N $l, Password $legacyAuth) { |
|
41 | - $this |
|
42 | - ->setIdentifier('smb') |
|
43 | - ->addIdentifierAlias('\OC\Files\Storage\SMB') // legacy compat |
|
44 | - ->setStorageClass('\OCA\Files_External\Lib\Storage\SMB') |
|
45 | - ->setText($l->t('SMB / CIFS')) |
|
46 | - ->addParameters([ |
|
47 | - (new DefinitionParameter('host', $l->t('Host'))), |
|
48 | - (new DefinitionParameter('share', $l->t('Share'))), |
|
49 | - (new DefinitionParameter('root', $l->t('Remote subfolder'))) |
|
50 | - ->setFlag(DefinitionParameter::FLAG_OPTIONAL), |
|
51 | - (new DefinitionParameter('domain', $l->t('Domain'))) |
|
52 | - ->setFlag(DefinitionParameter::FLAG_OPTIONAL), |
|
53 | - ]) |
|
54 | - ->addAuthScheme(AuthMechanism::SCHEME_PASSWORD) |
|
55 | - ->setLegacyAuthMechanism($legacyAuth) |
|
56 | - ; |
|
57 | - } |
|
40 | + public function __construct(IL10N $l, Password $legacyAuth) { |
|
41 | + $this |
|
42 | + ->setIdentifier('smb') |
|
43 | + ->addIdentifierAlias('\OC\Files\Storage\SMB') // legacy compat |
|
44 | + ->setStorageClass('\OCA\Files_External\Lib\Storage\SMB') |
|
45 | + ->setText($l->t('SMB / CIFS')) |
|
46 | + ->addParameters([ |
|
47 | + (new DefinitionParameter('host', $l->t('Host'))), |
|
48 | + (new DefinitionParameter('share', $l->t('Share'))), |
|
49 | + (new DefinitionParameter('root', $l->t('Remote subfolder'))) |
|
50 | + ->setFlag(DefinitionParameter::FLAG_OPTIONAL), |
|
51 | + (new DefinitionParameter('domain', $l->t('Domain'))) |
|
52 | + ->setFlag(DefinitionParameter::FLAG_OPTIONAL), |
|
53 | + ]) |
|
54 | + ->addAuthScheme(AuthMechanism::SCHEME_PASSWORD) |
|
55 | + ->setLegacyAuthMechanism($legacyAuth) |
|
56 | + ; |
|
57 | + } |
|
58 | 58 | |
59 | - /** |
|
60 | - * @param StorageConfig $storage |
|
61 | - * @param IUser $user |
|
62 | - */ |
|
63 | - public function manipulateStorageConfig(StorageConfig &$storage, IUser $user = null) { |
|
64 | - $user = $storage->getBackendOption('user'); |
|
65 | - if ($domain = $storage->getBackendOption('domain')) { |
|
66 | - $storage->setBackendOption('user', $domain.'\\'.$user); |
|
67 | - } |
|
68 | - } |
|
59 | + /** |
|
60 | + * @param StorageConfig $storage |
|
61 | + * @param IUser $user |
|
62 | + */ |
|
63 | + public function manipulateStorageConfig(StorageConfig &$storage, IUser $user = null) { |
|
64 | + $user = $storage->getBackendOption('user'); |
|
65 | + if ($domain = $storage->getBackendOption('domain')) { |
|
66 | + $storage->setBackendOption('user', $domain.'\\'.$user); |
|
67 | + } |
|
68 | + } |
|
69 | 69 | |
70 | 70 | } |
@@ -60,7 +60,7 @@ |
||
60 | 60 | * @param StorageConfig $storage |
61 | 61 | * @param IUser $user |
62 | 62 | */ |
63 | - public function manipulateStorageConfig(StorageConfig &$storage, IUser $user = null) { |
|
63 | + public function manipulateStorageConfig(StorageConfig & $storage, IUser $user = null) { |
|
64 | 64 | $user = $storage->getBackendOption('user'); |
65 | 65 | if ($domain = $storage->getBackendOption('domain')) { |
66 | 66 | $storage->setBackendOption('user', $domain.'\\'.$user); |
@@ -38,36 +38,36 @@ |
||
38 | 38 | */ |
39 | 39 | class SMB_OC extends Backend { |
40 | 40 | |
41 | - use LegacyDependencyCheckPolyfill; |
|
41 | + use LegacyDependencyCheckPolyfill; |
|
42 | 42 | |
43 | - public function __construct(IL10N $l, SessionCredentials $legacyAuth, SMB $smbBackend) { |
|
44 | - $this |
|
45 | - ->setIdentifier('\OC\Files\Storage\SMB_OC') |
|
46 | - ->setStorageClass('\OCA\Files_External\Lib\Storage\SMB') |
|
47 | - ->setText($l->t('SMB / CIFS using OC login')) |
|
48 | - ->addParameters([ |
|
49 | - (new DefinitionParameter('host', $l->t('Host'))), |
|
50 | - (new DefinitionParameter('username_as_share', $l->t('Username as share'))) |
|
51 | - ->setType(DefinitionParameter::VALUE_BOOLEAN), |
|
52 | - (new DefinitionParameter('share', $l->t('Share'))) |
|
53 | - ->setFlag(DefinitionParameter::FLAG_OPTIONAL), |
|
54 | - (new DefinitionParameter('root', $l->t('Remote subfolder'))) |
|
55 | - ->setFlag(DefinitionParameter::FLAG_OPTIONAL), |
|
56 | - ]) |
|
57 | - ->setPriority(BackendService::PRIORITY_DEFAULT - 10) |
|
58 | - ->addAuthScheme(AuthMechanism::SCHEME_PASSWORD) |
|
59 | - ->setLegacyAuthMechanism($legacyAuth) |
|
60 | - ->deprecateTo($smbBackend) |
|
61 | - ; |
|
62 | - } |
|
43 | + public function __construct(IL10N $l, SessionCredentials $legacyAuth, SMB $smbBackend) { |
|
44 | + $this |
|
45 | + ->setIdentifier('\OC\Files\Storage\SMB_OC') |
|
46 | + ->setStorageClass('\OCA\Files_External\Lib\Storage\SMB') |
|
47 | + ->setText($l->t('SMB / CIFS using OC login')) |
|
48 | + ->addParameters([ |
|
49 | + (new DefinitionParameter('host', $l->t('Host'))), |
|
50 | + (new DefinitionParameter('username_as_share', $l->t('Username as share'))) |
|
51 | + ->setType(DefinitionParameter::VALUE_BOOLEAN), |
|
52 | + (new DefinitionParameter('share', $l->t('Share'))) |
|
53 | + ->setFlag(DefinitionParameter::FLAG_OPTIONAL), |
|
54 | + (new DefinitionParameter('root', $l->t('Remote subfolder'))) |
|
55 | + ->setFlag(DefinitionParameter::FLAG_OPTIONAL), |
|
56 | + ]) |
|
57 | + ->setPriority(BackendService::PRIORITY_DEFAULT - 10) |
|
58 | + ->addAuthScheme(AuthMechanism::SCHEME_PASSWORD) |
|
59 | + ->setLegacyAuthMechanism($legacyAuth) |
|
60 | + ->deprecateTo($smbBackend) |
|
61 | + ; |
|
62 | + } |
|
63 | 63 | |
64 | - public function manipulateStorageConfig(StorageConfig &$storage, IUser $user = null) { |
|
65 | - $username_as_share = ($storage->getBackendOption('username_as_share') === true); |
|
64 | + public function manipulateStorageConfig(StorageConfig &$storage, IUser $user = null) { |
|
65 | + $username_as_share = ($storage->getBackendOption('username_as_share') === true); |
|
66 | 66 | |
67 | - if ($username_as_share) { |
|
68 | - $share = '/' . $storage->getBackendOption('user'); |
|
69 | - $storage->setBackendOption('share', $share); |
|
70 | - } |
|
71 | - } |
|
67 | + if ($username_as_share) { |
|
68 | + $share = '/' . $storage->getBackendOption('user'); |
|
69 | + $storage->setBackendOption('share', $share); |
|
70 | + } |
|
71 | + } |
|
72 | 72 | |
73 | 73 | } |
@@ -61,11 +61,11 @@ |
||
61 | 61 | ; |
62 | 62 | } |
63 | 63 | |
64 | - public function manipulateStorageConfig(StorageConfig &$storage, IUser $user = null) { |
|
64 | + public function manipulateStorageConfig(StorageConfig & $storage, IUser $user = null) { |
|
65 | 65 | $username_as_share = ($storage->getBackendOption('username_as_share') === true); |
66 | 66 | |
67 | 67 | if ($username_as_share) { |
68 | - $share = '/' . $storage->getBackendOption('user'); |
|
68 | + $share = '/'.$storage->getBackendOption('user'); |
|
69 | 69 | $storage->setBackendOption('share', $share); |
70 | 70 | } |
71 | 71 | } |
@@ -27,39 +27,39 @@ |
||
27 | 27 | */ |
28 | 28 | class MissingDependency { |
29 | 29 | |
30 | - /** @var string */ |
|
31 | - private $dependency; |
|
30 | + /** @var string */ |
|
31 | + private $dependency; |
|
32 | 32 | |
33 | - /** @var string|null Custom message */ |
|
34 | - private $message = null; |
|
33 | + /** @var string|null Custom message */ |
|
34 | + private $message = null; |
|
35 | 35 | |
36 | - /** |
|
37 | - * @param string $dependency |
|
38 | - */ |
|
39 | - public function __construct($dependency) { |
|
40 | - $this->dependency = $dependency; |
|
41 | - } |
|
36 | + /** |
|
37 | + * @param string $dependency |
|
38 | + */ |
|
39 | + public function __construct($dependency) { |
|
40 | + $this->dependency = $dependency; |
|
41 | + } |
|
42 | 42 | |
43 | - /** |
|
44 | - * @return string |
|
45 | - */ |
|
46 | - public function getDependency() { |
|
47 | - return $this->dependency; |
|
48 | - } |
|
43 | + /** |
|
44 | + * @return string |
|
45 | + */ |
|
46 | + public function getDependency() { |
|
47 | + return $this->dependency; |
|
48 | + } |
|
49 | 49 | |
50 | - /** |
|
51 | - * @return string|null |
|
52 | - */ |
|
53 | - public function getMessage() { |
|
54 | - return $this->message; |
|
55 | - } |
|
50 | + /** |
|
51 | + * @return string|null |
|
52 | + */ |
|
53 | + public function getMessage() { |
|
54 | + return $this->message; |
|
55 | + } |
|
56 | 56 | |
57 | - /** |
|
58 | - * @param string $message |
|
59 | - * @return self |
|
60 | - */ |
|
61 | - public function setMessage($message) { |
|
62 | - $this->message = $message; |
|
63 | - return $this; |
|
64 | - } |
|
57 | + /** |
|
58 | + * @param string $message |
|
59 | + * @return self |
|
60 | + */ |
|
61 | + public function setMessage($message) { |
|
62 | + $this->message = $message; |
|
63 | + return $this; |
|
64 | + } |
|
65 | 65 | } |
@@ -29,14 +29,14 @@ |
||
29 | 29 | */ |
30 | 30 | trait DependencyTrait { |
31 | 31 | |
32 | - /** |
|
33 | - * Check if object is valid for use |
|
34 | - * |
|
35 | - * @return MissingDependency[] Unsatisfied dependencies |
|
36 | - */ |
|
37 | - public function checkDependencies() { |
|
38 | - return []; // no dependencies by default |
|
39 | - } |
|
32 | + /** |
|
33 | + * Check if object is valid for use |
|
34 | + * |
|
35 | + * @return MissingDependency[] Unsatisfied dependencies |
|
36 | + */ |
|
37 | + public function checkDependencies() { |
|
38 | + return []; // no dependencies by default |
|
39 | + } |
|
40 | 40 | |
41 | 41 | } |
42 | 42 |
@@ -28,61 +28,61 @@ |
||
28 | 28 | |
29 | 29 | class Api { |
30 | 30 | |
31 | - /** |
|
32 | - * Formats the given mount config to a mount entry. |
|
33 | - * |
|
34 | - * @param string $mountPoint mount point name, relative to the data dir |
|
35 | - * @param array $mountConfig mount config to format |
|
36 | - * |
|
37 | - * @return array entry |
|
38 | - */ |
|
39 | - private static function formatMount($mountPoint, $mountConfig) { |
|
40 | - // strip "/$user/files" from mount point |
|
41 | - $mountPoint = explode('/', trim($mountPoint, '/'), 3); |
|
42 | - $mountPoint = $mountPoint[2]; |
|
31 | + /** |
|
32 | + * Formats the given mount config to a mount entry. |
|
33 | + * |
|
34 | + * @param string $mountPoint mount point name, relative to the data dir |
|
35 | + * @param array $mountConfig mount config to format |
|
36 | + * |
|
37 | + * @return array entry |
|
38 | + */ |
|
39 | + private static function formatMount($mountPoint, $mountConfig) { |
|
40 | + // strip "/$user/files" from mount point |
|
41 | + $mountPoint = explode('/', trim($mountPoint, '/'), 3); |
|
42 | + $mountPoint = $mountPoint[2]; |
|
43 | 43 | |
44 | - // split path from mount point |
|
45 | - $path = dirname($mountPoint); |
|
46 | - if ($path === '.') { |
|
47 | - $path = ''; |
|
48 | - } |
|
44 | + // split path from mount point |
|
45 | + $path = dirname($mountPoint); |
|
46 | + if ($path === '.') { |
|
47 | + $path = ''; |
|
48 | + } |
|
49 | 49 | |
50 | - $isSystemMount = !$mountConfig['personal']; |
|
50 | + $isSystemMount = !$mountConfig['personal']; |
|
51 | 51 | |
52 | - $permissions = \OCP\Constants::PERMISSION_READ; |
|
53 | - // personal mounts can be deleted |
|
54 | - if (!$isSystemMount) { |
|
55 | - $permissions |= \OCP\Constants::PERMISSION_DELETE; |
|
56 | - } |
|
52 | + $permissions = \OCP\Constants::PERMISSION_READ; |
|
53 | + // personal mounts can be deleted |
|
54 | + if (!$isSystemMount) { |
|
55 | + $permissions |= \OCP\Constants::PERMISSION_DELETE; |
|
56 | + } |
|
57 | 57 | |
58 | - $entry = array( |
|
59 | - 'name' => basename($mountPoint), |
|
60 | - 'path' => $path, |
|
61 | - 'type' => 'dir', |
|
62 | - 'backend' => $mountConfig['backend'], |
|
63 | - 'scope' => ( $isSystemMount ? 'system' : 'personal' ), |
|
64 | - 'permissions' => $permissions, |
|
65 | - 'id' => $mountConfig['id'], |
|
66 | - 'class' => $mountConfig['class'] |
|
67 | - ); |
|
68 | - return $entry; |
|
69 | - } |
|
58 | + $entry = array( |
|
59 | + 'name' => basename($mountPoint), |
|
60 | + 'path' => $path, |
|
61 | + 'type' => 'dir', |
|
62 | + 'backend' => $mountConfig['backend'], |
|
63 | + 'scope' => ( $isSystemMount ? 'system' : 'personal' ), |
|
64 | + 'permissions' => $permissions, |
|
65 | + 'id' => $mountConfig['id'], |
|
66 | + 'class' => $mountConfig['class'] |
|
67 | + ); |
|
68 | + return $entry; |
|
69 | + } |
|
70 | 70 | |
71 | - /** |
|
72 | - * Returns the mount points visible for this user. |
|
73 | - * |
|
74 | - * @param array $params |
|
75 | - * @return \OC_OCS_Result share information |
|
76 | - */ |
|
77 | - public static function getUserMounts($params) { |
|
78 | - $entries = array(); |
|
79 | - $user = \OC::$server->getUserSession()->getUser()->getUID(); |
|
71 | + /** |
|
72 | + * Returns the mount points visible for this user. |
|
73 | + * |
|
74 | + * @param array $params |
|
75 | + * @return \OC_OCS_Result share information |
|
76 | + */ |
|
77 | + public static function getUserMounts($params) { |
|
78 | + $entries = array(); |
|
79 | + $user = \OC::$server->getUserSession()->getUser()->getUID(); |
|
80 | 80 | |
81 | - $mounts = \OC_Mount_Config::getAbsoluteMountPoints($user); |
|
82 | - foreach($mounts as $mountPoint => $mount) { |
|
83 | - $entries[] = self::formatMount($mountPoint, $mount); |
|
84 | - } |
|
81 | + $mounts = \OC_Mount_Config::getAbsoluteMountPoints($user); |
|
82 | + foreach($mounts as $mountPoint => $mount) { |
|
83 | + $entries[] = self::formatMount($mountPoint, $mount); |
|
84 | + } |
|
85 | 85 | |
86 | - return new \OC_OCS_Result($entries); |
|
87 | - } |
|
86 | + return new \OC_OCS_Result($entries); |
|
87 | + } |
|
88 | 88 | } |
@@ -60,7 +60,7 @@ discard block |
||
60 | 60 | 'path' => $path, |
61 | 61 | 'type' => 'dir', |
62 | 62 | 'backend' => $mountConfig['backend'], |
63 | - 'scope' => ( $isSystemMount ? 'system' : 'personal' ), |
|
63 | + 'scope' => ($isSystemMount ? 'system' : 'personal'), |
|
64 | 64 | 'permissions' => $permissions, |
65 | 65 | 'id' => $mountConfig['id'], |
66 | 66 | 'class' => $mountConfig['class'] |
@@ -79,7 +79,7 @@ discard block |
||
79 | 79 | $user = \OC::$server->getUserSession()->getUser()->getUID(); |
80 | 80 | |
81 | 81 | $mounts = \OC_Mount_Config::getAbsoluteMountPoints($user); |
82 | - foreach($mounts as $mountPoint => $mount) { |
|
82 | + foreach ($mounts as $mountPoint => $mount) { |
|
83 | 83 | $entries[] = self::formatMount($mountPoint, $mount); |
84 | 84 | } |
85 | 85 |