mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #18996 from owncloud/ext-swift-dependencycheck 

Fix dependency check for Swift and SMB_OC
This commit is contained in:
Robin McCorkell 2015-09-13 22:41:07 +01:00
parent 0dc7181335 522619f90e
commit c15ba0d658
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/files_external/lib/backend/smb_oc.php
View File

@ -28,12 +28,15 @@ use \OCA\Files_External\Lib\Auth\AuthMechanism;
use \OCA\Files_External\Service\BackendService; use \OCA\Files_External\Service\BackendService;
use \OCA\Files_External\Lib\Auth\Password\SessionCredentials; use \OCA\Files_External\Lib\Auth\Password\SessionCredentials;
use \OCA\Files_External\Lib\StorageConfig; use \OCA\Files_External\Lib\StorageConfig;
use \OCA\Files_External\Lib\LegacyDependencyCheckPolyfill;
/** /**
* Deprecated SMB_OC class - use SMB with the password::sessioncredentials auth mechanism * Deprecated SMB_OC class - use SMB with the password::sessioncredentials auth mechanism
*/ */
class SMB_OC extends Backend { class SMB_OC extends Backend {
use LegacyDependencyCheckPolyfill;
public function __construct(IL10N $l, SessionCredentials $legacyAuth) { public function __construct(IL10N $l, SessionCredentials $legacyAuth) {
$this $this
->setIdentifier('\OC\Files\Storage\SMB_OC') ->setIdentifier('\OC\Files\Storage\SMB_OC')
@ -48,7 +51,6 @@ class SMB_OC extends Backend {
(new DefinitionParameter('root', $l->t('Remote subfolder'))) (new DefinitionParameter('root', $l->t('Remote subfolder')))
->setFlag(DefinitionParameter::FLAG_OPTIONAL), ->setFlag(DefinitionParameter::FLAG_OPTIONAL),
]) ])
->setDependencyCheck('\OC\Files\Storage\SMB::checkDependencies')
->removeAllowedPermission(BackendService::USER_PERSONAL, BackendService::PERMISSION_CREATE) ->removeAllowedPermission(BackendService::USER_PERSONAL, BackendService::PERMISSION_CREATE)
->removeAllowedPermission(BackendService::USER_ADMIN, BackendService::PERMISSION_CREATE) ->removeAllowedPermission(BackendService::USER_ADMIN, BackendService::PERMISSION_CREATE)
->setPriority(BackendService::PRIORITY_DEFAULT - 10) ->setPriority(BackendService::PRIORITY_DEFAULT - 10)

4
apps/files_external/lib/backend/swift.php
View File

@ -28,9 +28,12 @@ use \OCA\Files_External\Lib\Auth\AuthMechanism;
use \OCA\Files_External\Service\BackendService; use \OCA\Files_External\Service\BackendService;
use \OCA\Files_External\Lib\Auth\OpenStack\OpenStack; use \OCA\Files_External\Lib\Auth\OpenStack\OpenStack;
use \OCA\Files_External\Lib\Auth\OpenStack\Rackspace; use \OCA\Files_External\Lib\Auth\OpenStack\Rackspace;
use \OCA\Files_External\Lib\LegacyDependencyCheckPolyfill;
class Swift extends Backend { class Swift extends Backend {
use LegacyDependencyCheckPolyfill;
public function __construct(IL10N $l, OpenStack $openstackAuth, Rackspace $rackspaceAuth) { public function __construct(IL10N $l, OpenStack $openstackAuth, Rackspace $rackspaceAuth) {
$this $this
->setIdentifier('swift') ->setIdentifier('swift')
@ -46,7 +49,6 @@ class Swift extends Backend {
(new DefinitionParameter('timeout', $l->t('Request timeout (seconds)'))) (new DefinitionParameter('timeout', $l->t('Request timeout (seconds)')))
->setFlag(DefinitionParameter::FLAG_OPTIONAL), ->setFlag(DefinitionParameter::FLAG_OPTIONAL),
]) ])
->setDependencyCheck('\OC\Files\Storage\Swift::checkDependencies')
->addAuthScheme(AuthMechanism::SCHEME_OPENSTACK) ->addAuthScheme(AuthMechanism::SCHEME_OPENSTACK)
->setLegacyAuthMechanismCallback(function(array $params) use ($openstackAuth, $rackspaceAuth) { ->setLegacyAuthMechanismCallback(function(array $params) use ($openstackAuth, $rackspaceAuth) {
if (isset($params['options']['key']) && $params['options']['key']) { if (isset($params['options']['key']) && $params['options']['key']) {