diff options
| author | Robin McCorkell <rmccorkell@owncloud.com> | 2015-09-17 10:24:19 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-09-23 12:10:02 +0200 |
| commit | 38a260e963abd04b75aff8d67a8cf7b3b20a9c67 (patch) | |
| tree | eb118da0cdd9819657efa8fbf58c6c754c4cf19c /apps/files_external/service | |
| parent | ee649d58c5f82ee209ddc1812c1a896da53de707 (diff) | |
| download | nextcloud-server-38a260e963abd04b75aff8d67a8cf7b3b20a9c67.tar.gz nextcloud-server-38a260e963abd04b75aff8d67a8cf7b3b20a9c67.zip | |
Revert "Implement more fine-grained external storage permissions model"
This reverts commit 0b97a05e7bd631d66de1c2aee115113ada8a5f63.
This reverts commit d2e3c17c0000bc0020f1ff641190452f370434de.
This reverts commit cc88c5f4b84da57c425cbdb7dc8b391b1942b503.
Diffstat (limited to 'apps/files_external/service')
| -rw-r--r-- | apps/files_external/service/backendservice.php | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/apps/files_external/service/backendservice.php b/apps/files_external/service/backendservice.php index 70cb9291660..1e90247b3e4 100644 --- a/apps/files_external/service/backendservice.php +++ b/apps/files_external/service/backendservice.php @@ -31,17 +31,13 @@ use \OCA\Files_External\Lib\Auth\AuthMechanism; */ class BackendService { - /** Permission constants for PermissionsTrait */ - const PERMISSION_NONE = 0; - const PERMISSION_MOUNT = 1; - const PERMISSION_CREATE = 2; - const PERMISSION_MODIFY = 4; + /** Visibility constants for VisibilityTrait */ + const VISIBILITY_NONE = 0; + const VISIBILITY_PERSONAL = 1; + const VISIBILITY_ADMIN = 2; + //const VISIBILITY_ALIENS = 4; - const PERMISSION_DEFAULT = 7; // MOUNT | CREATE | MODIFY - - /** User contants */ - const USER_ADMIN = 'admin'; - const USER_PERSONAL = 'personal'; + const VISIBILITY_DEFAULT = 3; // PERSONAL | ADMIN /** Priority constants for PriorityTrait */ const PRIORITY_DEFAULT = 100; @@ -85,7 +81,7 @@ class BackendService { */ public function registerBackend(Backend $backend) { if (!$this->isAllowedUserBackend($backend)) { - $backend->removePermission(self::USER_PERSONAL, self::PERMISSION_CREATE | self::PERMISSION_MOUNT); + $backend->removeVisibility(BackendService::VISIBILITY_PERSONAL); } foreach ($backend->getIdentifierAliases() as $alias) { $this->backends[$alias] = $backend; @@ -107,7 +103,7 @@ class BackendService { */ public function registerAuthMechanism(AuthMechanism $authMech) { if (!$this->isAllowedAuthMechanism($authMech)) { - $authMech->removePermission(self::USER_PERSONAL, self::PERMISSION_CREATE | self::PERMISSION_MOUNT); + $authMech->removeVisibility(BackendService::VISIBILITY_PERSONAL); } foreach ($authMech->getIdentifierAliases() as $alias) { $this->authMechanisms[$alias] = $authMech; |