Merge pull request #17290 from owncloud/remove-readonly-wrapper

Replace readonly wrapper with permissions mask

3 files changed, 2 insertions, 76 deletions

diff --git a/apps/files_sharing/ajax/shareinfo.php b/apps/files_sharing/ajax/shareinfo.php
index 3ea0fae8522..db6194d3f05 100644
--- a/apps/files_sharing/ajax/shareinfo.php
+++ b/apps/files_sharing/ajax/shareinfo.php
@@ -55,7 +55,7 @@ $path = $data['realPath'];
 $isWritable = $linkItem['permissions'] & (\OCP\Constants::PERMISSION_UPDATE | \OCP\Constants::PERMISSION_CREATE);
 if (!$isWritable) {
 	\OC\Files\Filesystem::addStorageWrapper('readonly', function ($mountPoint, $storage) {
-		return new \OCA\Files_Sharing\ReadOnlyWrapper(array('storage' => $storage));
+		return new \OC\Files\Storage\Wrapper\PermissionsMask(array('storage' => $storage, 'mask' => \OCP\Constants::PERMISSION_READ + \OCP\Constants::PERMISSION_SHARE));
 	});
 }
 
diff --git a/apps/files_sharing/lib/readonlywrapper.php b/apps/files_sharing/lib/readonlywrapper.php
deleted file mode 100644
index a5d84f7f5a2..00000000000
--- a/apps/files_sharing/lib/readonlywrapper.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-/**
- * @author Joas Schilling <nickvergessen@owncloud.com>
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Robin Appelman <icewind@owncloud.com>
- *
- * @copyright Copyright (c) 2015, ownCloud, Inc.
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program.  If not, see <http://www.gnu.org/licenses/>
- *
- */
-
-namespace OCA\Files_Sharing;
-
-use OC\Files\Cache\Wrapper\CachePermissionsMask;
-use OC\Files\Storage\Wrapper\Wrapper;
-use OCP\Constants;
-
-class ReadOnlyWrapper extends Wrapper {
-	public function isUpdatable($path) {
-		return false;
-	}
-
-	public function isCreatable($path) {
-		return false;
-	}
-
-	public function isDeletable($path) {
-		return false;
-	}
-
-	public function getPermissions($path) {
-		return $this->storage->getPermissions($path) & (\OCP\Constants::PERMISSION_READ | \OCP\Constants::PERMISSION_SHARE);
-	}
-
-	public function rename($path1, $path2) {
-		return false;
-	}
-
-	public function touch($path, $mtime = null) {
-		return false;
-	}
-
-	public function mkdir($path) {
-		return false;
-	}
-
-	public function rmdir($path) {
-		return false;
-	}
-
-	public function unlink($path) {
-		return false;
-	}
-
-	public function getCache($path = '', $storage = null) {
-		if (!$storage) {
-			$storage = $this;
-		}
-		$sourceCache = $this->storage->getCache($path, $storage);
-		return new CachePermissionsMask($sourceCache, Constants::PERMISSION_READ | Constants::PERMISSION_SHARE);
-	}
-}
diff --git a/apps/files_sharing/publicwebdav.php b/apps/files_sharing/publicwebdav.php
index be7530897f6..c0a9dc328d1 100644
--- a/apps/files_sharing/publicwebdav.php
+++ b/apps/files_sharing/publicwebdav.php
@@ -64,7 +64,7 @@ $server->on('beforeMethod', function () use ($server, $objectTree, $authBackend)
 
 	if (!$isWritable) {
 		\OC\Files\Filesystem::addStorageWrapper('readonly', function ($mountPoint, $storage) {
-			return new \OCA\Files_Sharing\ReadOnlyWrapper(array('storage' => $storage));
+			return new \OC\Files\Storage\Wrapper\PermissionsMask(array('storage' => $storage, 'mask' => \OCP\Constants::PERMISSION_READ + \OCP\Constants::PERMISSION_SHARE));
 		});
 	}