@@ -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 | } |
@@ -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 | } |
@@ -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 |
@@ -30,40 +30,40 @@ |
||
30 | 30 | * @var $this \OCP\Route\IRouter |
31 | 31 | **/ |
32 | 32 | \OC_Mount_Config::$app->registerRoutes( |
33 | - $this, |
|
34 | - array( |
|
35 | - 'resources' => array( |
|
36 | - 'global_storages' => array('url' => '/globalstorages'), |
|
37 | - 'user_storages' => array('url' => '/userstorages'), |
|
38 | - 'user_global_storages' => array('url' => '/userglobalstorages'), |
|
39 | - ), |
|
40 | - 'routes' => array( |
|
41 | - array( |
|
42 | - 'name' => 'Ajax#getSshKeys', |
|
43 | - 'url' => '/ajax/public_key.php', |
|
44 | - 'verb' => 'POST', |
|
45 | - 'requirements' => array() |
|
46 | - ), |
|
47 | - [ |
|
48 | - 'name' => 'Ajax#saveGlobalCredentials', |
|
49 | - 'url' => '/globalcredentials', |
|
50 | - 'verb' => 'POST', |
|
51 | - ], |
|
52 | - ) |
|
53 | - ) |
|
33 | + $this, |
|
34 | + array( |
|
35 | + 'resources' => array( |
|
36 | + 'global_storages' => array('url' => '/globalstorages'), |
|
37 | + 'user_storages' => array('url' => '/userstorages'), |
|
38 | + 'user_global_storages' => array('url' => '/userglobalstorages'), |
|
39 | + ), |
|
40 | + 'routes' => array( |
|
41 | + array( |
|
42 | + 'name' => 'Ajax#getSshKeys', |
|
43 | + 'url' => '/ajax/public_key.php', |
|
44 | + 'verb' => 'POST', |
|
45 | + 'requirements' => array() |
|
46 | + ), |
|
47 | + [ |
|
48 | + 'name' => 'Ajax#saveGlobalCredentials', |
|
49 | + 'url' => '/globalcredentials', |
|
50 | + 'verb' => 'POST', |
|
51 | + ], |
|
52 | + ) |
|
53 | + ) |
|
54 | 54 | ); |
55 | 55 | |
56 | 56 | $this->create('files_external_oauth1', 'ajax/oauth1.php') |
57 | - ->actionInclude('files_external/ajax/oauth1.php'); |
|
57 | + ->actionInclude('files_external/ajax/oauth1.php'); |
|
58 | 58 | $this->create('files_external_oauth2', 'ajax/oauth2.php') |
59 | - ->actionInclude('files_external/ajax/oauth2.php'); |
|
59 | + ->actionInclude('files_external/ajax/oauth2.php'); |
|
60 | 60 | |
61 | 61 | |
62 | 62 | $this->create('files_external_list_applicable', '/applicable') |
63 | - ->actionInclude('files_external/ajax/applicable.php'); |
|
63 | + ->actionInclude('files_external/ajax/applicable.php'); |
|
64 | 64 | |
65 | 65 | \OCP\API::register('get', |
66 | - '/apps/files_external/api/v1/mounts', |
|
67 | - array('\OCA\Files_External\Lib\Api', 'getUserMounts'), |
|
68 | - 'files_external'); |
|
66 | + '/apps/files_external/api/v1/mounts', |
|
67 | + array('\OCA\Files_External\Lib\Api', 'getUserMounts'), |
|
68 | + 'files_external'); |
|
69 | 69 |
@@ -20,10 +20,10 @@ |
||
20 | 20 | */ |
21 | 21 | |
22 | 22 | script('core', [ |
23 | - 'oc-backbone-webdav', |
|
24 | - 'systemtags/systemtags', |
|
25 | - 'systemtags/systemtagmodel', |
|
26 | - 'systemtags/systemtagscollection', |
|
23 | + 'oc-backbone-webdav', |
|
24 | + 'systemtags/systemtags', |
|
25 | + 'systemtags/systemtagmodel', |
|
26 | + 'systemtags/systemtagscollection', |
|
27 | 27 | ]); |
28 | 28 | |
29 | 29 | script('systemtags', 'admin'); |
@@ -27,72 +27,72 @@ |
||
27 | 27 | |
28 | 28 | class Setting implements ISetting { |
29 | 29 | |
30 | - /** @var IL10N */ |
|
31 | - protected $l; |
|
30 | + /** @var IL10N */ |
|
31 | + protected $l; |
|
32 | 32 | |
33 | - /** |
|
34 | - * @param IL10N $l |
|
35 | - */ |
|
36 | - public function __construct(IL10N $l) { |
|
37 | - $this->l = $l; |
|
38 | - } |
|
33 | + /** |
|
34 | + * @param IL10N $l |
|
35 | + */ |
|
36 | + public function __construct(IL10N $l) { |
|
37 | + $this->l = $l; |
|
38 | + } |
|
39 | 39 | |
40 | - /** |
|
41 | - * @return string Lowercase a-z and underscore only identifier |
|
42 | - * @since 11.0.0 |
|
43 | - */ |
|
44 | - public function getIdentifier() { |
|
45 | - return 'systemtags'; |
|
46 | - } |
|
40 | + /** |
|
41 | + * @return string Lowercase a-z and underscore only identifier |
|
42 | + * @since 11.0.0 |
|
43 | + */ |
|
44 | + public function getIdentifier() { |
|
45 | + return 'systemtags'; |
|
46 | + } |
|
47 | 47 | |
48 | - /** |
|
49 | - * @return string A translated string |
|
50 | - * @since 11.0.0 |
|
51 | - */ |
|
52 | - public function getName() { |
|
53 | - return $this->l->t('<strong>System tags</strong> for a file have been modified'); |
|
54 | - } |
|
48 | + /** |
|
49 | + * @return string A translated string |
|
50 | + * @since 11.0.0 |
|
51 | + */ |
|
52 | + public function getName() { |
|
53 | + return $this->l->t('<strong>System tags</strong> for a file have been modified'); |
|
54 | + } |
|
55 | 55 | |
56 | - /** |
|
57 | - * @return int whether the filter should be rather on the top or bottom of |
|
58 | - * the admin section. The filters are arranged in ascending order of the |
|
59 | - * priority values. It is required to return a value between 0 and 100. |
|
60 | - * @since 11.0.0 |
|
61 | - */ |
|
62 | - public function getPriority() { |
|
63 | - return 50; |
|
64 | - } |
|
56 | + /** |
|
57 | + * @return int whether the filter should be rather on the top or bottom of |
|
58 | + * the admin section. The filters are arranged in ascending order of the |
|
59 | + * priority values. It is required to return a value between 0 and 100. |
|
60 | + * @since 11.0.0 |
|
61 | + */ |
|
62 | + public function getPriority() { |
|
63 | + return 50; |
|
64 | + } |
|
65 | 65 | |
66 | - /** |
|
67 | - * @return bool True when the option can be changed for the stream |
|
68 | - * @since 11.0.0 |
|
69 | - */ |
|
70 | - public function canChangeStream() { |
|
71 | - return true; |
|
72 | - } |
|
66 | + /** |
|
67 | + * @return bool True when the option can be changed for the stream |
|
68 | + * @since 11.0.0 |
|
69 | + */ |
|
70 | + public function canChangeStream() { |
|
71 | + return true; |
|
72 | + } |
|
73 | 73 | |
74 | - /** |
|
75 | - * @return bool True when the option can be changed for the stream |
|
76 | - * @since 11.0.0 |
|
77 | - */ |
|
78 | - public function isDefaultEnabledStream() { |
|
79 | - return true; |
|
80 | - } |
|
74 | + /** |
|
75 | + * @return bool True when the option can be changed for the stream |
|
76 | + * @since 11.0.0 |
|
77 | + */ |
|
78 | + public function isDefaultEnabledStream() { |
|
79 | + return true; |
|
80 | + } |
|
81 | 81 | |
82 | - /** |
|
83 | - * @return bool True when the option can be changed for the mail |
|
84 | - * @since 11.0.0 |
|
85 | - */ |
|
86 | - public function canChangeMail() { |
|
87 | - return true; |
|
88 | - } |
|
82 | + /** |
|
83 | + * @return bool True when the option can be changed for the mail |
|
84 | + * @since 11.0.0 |
|
85 | + */ |
|
86 | + public function canChangeMail() { |
|
87 | + return true; |
|
88 | + } |
|
89 | 89 | |
90 | - /** |
|
91 | - * @return bool True when the option can be changed for the stream |
|
92 | - * @since 11.0.0 |
|
93 | - */ |
|
94 | - public function isDefaultEnabledMail() { |
|
95 | - return false; |
|
96 | - } |
|
90 | + /** |
|
91 | + * @return bool True when the option can be changed for the stream |
|
92 | + * @since 11.0.0 |
|
93 | + */ |
|
94 | + public function isDefaultEnabledMail() { |
|
95 | + return false; |
|
96 | + } |
|
97 | 97 | } |
98 | 98 |
@@ -30,30 +30,30 @@ |
||
30 | 30 | |
31 | 31 | class LastUsedController extends Controller { |
32 | 32 | |
33 | - /** @var IConfig */ |
|
34 | - protected $config; |
|
35 | - |
|
36 | - /** @var IUserSession */ |
|
37 | - protected $userSession; |
|
38 | - |
|
39 | - /** |
|
40 | - * @param string $appName |
|
41 | - * @param IRequest $request |
|
42 | - * @param IConfig $config |
|
43 | - * @param IUserSession $userSession |
|
44 | - */ |
|
45 | - public function __construct($appName, IRequest $request, IConfig $config, IUserSession $userSession) { |
|
46 | - parent::__construct($appName, $request); |
|
47 | - $this->config = $config; |
|
48 | - $this->userSession = $userSession; |
|
49 | - } |
|
50 | - |
|
51 | - /** |
|
52 | - * @NoAdminRequired |
|
53 | - */ |
|
54 | - public function getLastUsedTagIds() { |
|
55 | - $lastUsed = $this->config->getUserValue($this->userSession->getUser()->getUID(), 'systemtags', 'last_used', '[]'); |
|
56 | - $tagIds = json_decode($lastUsed, true); |
|
57 | - return new DataResponse(array_map(function($id) { return (string) $id; }, $tagIds)); |
|
58 | - } |
|
33 | + /** @var IConfig */ |
|
34 | + protected $config; |
|
35 | + |
|
36 | + /** @var IUserSession */ |
|
37 | + protected $userSession; |
|
38 | + |
|
39 | + /** |
|
40 | + * @param string $appName |
|
41 | + * @param IRequest $request |
|
42 | + * @param IConfig $config |
|
43 | + * @param IUserSession $userSession |
|
44 | + */ |
|
45 | + public function __construct($appName, IRequest $request, IConfig $config, IUserSession $userSession) { |
|
46 | + parent::__construct($appName, $request); |
|
47 | + $this->config = $config; |
|
48 | + $this->userSession = $userSession; |
|
49 | + } |
|
50 | + |
|
51 | + /** |
|
52 | + * @NoAdminRequired |
|
53 | + */ |
|
54 | + public function getLastUsedTagIds() { |
|
55 | + $lastUsed = $this->config->getUserValue($this->userSession->getUser()->getUID(), 'systemtags', 'last_used', '[]'); |
|
56 | + $tagIds = json_decode($lastUsed, true); |
|
57 | + return new DataResponse(array_map(function($id) { return (string) $id; }, $tagIds)); |
|
58 | + } |
|
59 | 59 | } |