Add CRUDS permissions calls to filesystem, deprecate is_readable() and is_writable()

1 files changed, 23 insertions, 24 deletions

diff --git a/apps/files_sharing/sharedstorage.php b/apps/files_sharing/sharedstorage.php
index e3519306e02..a4510f2e77c 100644
--- a/apps/files_sharing/sharedstorage.php
+++ b/apps/files_sharing/sharedstorage.php
@@ -107,7 +107,7 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 	}
 	
 	public function mkdir($path) {
-		if ($path == '' || $path == '/' || !$this->is_writable(dirname($path))) {
+		if ($path == '' || $path == '/' || !$this->isCreatable(dirname($path))) {
 			return false; 
 		} else if ($source = $this->getSourcePath($path)) {
 			$storage = OC_Filesystem::getStorage($source);
@@ -117,7 +117,7 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 	}
 	
 	public function rmdir($path) {
-		if (($source = $this->getSourcePath($path)) && ($this->getPermissions($path) & OCP\Share::PERMISSION_DELETE)) {
+		if (($source = $this->getSourcePath($path)) && $this->isDeletable($path)) {
 			$storage = OC_Filesystem::getStorage($source);
 			return $storage->rmdir($this->getInternalPath($source));
 		}
@@ -187,25 +187,26 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 		return false;
 	}
 
-	public function is_readable($path) {
+	public function isCreatable($path) {
+		return ($this->getPermissions($path) & OCP\Share::PERMISSION_CREATE);
+	}
+
+	public function isReadable($path) {
 		return $this->file_exists($path);
 	}
-	
-	public function is_writable($path) {
-		if ($path == '' || $path == '/') {
-			return false;
-		// Folders need CREATE permission to be writable
-		} else if ($this->is_dir($path)) {
-			if ($this->getPermissions($path) & OCP\Share::PERMISSION_CREATE) {
-				return true;
-			}
-		// Files need UPDATE permission to be writable
-		} else if ($this->getPermissions($path) & OCP\Share::PERMISSION_UPDATE) {
-			return true;
-		}
-		return false;
+
+	public function isUpdatable($path) {
+		return ($this->getPermissions($path) & OCP\Share::PERMISSION_UPDATE);
 	}
-	
+
+	public function isDeletable($path) {
+		return ($this->getPermissions($path) & OCP\Share::PERMISSION_DELETE);
+	}
+
+	public function isSharable($path) {
+		return ($this->getPermissions($path) & OCP\Share::PERMISSION_SHARE);
+	}
+
 	public function file_exists($path) {
 		if ($path == '' || $path == '/') {
 			return true;
@@ -292,7 +293,7 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 	
 	public function unlink($path) {
 		// Delete the file if DELETE permission is granted
-		if (($source = $this->getSourcePath($path)) && ($this->getPermissions($path) & OCP\Share::PERMISSION_DELETE)) {
+		if (($source = $this->getSourcePath($path)) && $this->isDeletable($path)) {
 			$storage = OC_Filesystem::getStorage($source);
 			return $storage->unlink($this->getInternalPath($source));
 		}
@@ -305,17 +306,15 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 			$root2 = substr($path2, 0, strpos($path2, '/'));
 			// Moving/renaming is only allowed within the same shared folder
 			if ($root1 == $root2) {
-				$permissions1 = $this->getPermissions($path1);
-				$permissions2 = $this->getPermissions(dirname($path2));
 				$storage = OC_Filesystem::getStorage($oldSource);
 				$newSource = substr($oldSource, 0, strpos($oldSource, $root1)).$path2;
 				if (dirname($path1) == dirname($path2)) {
 					// Rename the file if UPDATE permission is granted
-					if ($permissions1 & OCP\Share::PERMISSION_UPDATE) {
+					if ($this->isUpdatable($path1)) {
 						return $storage->rename($this->getInternalPath($oldSource), $this->getInternalPath($newSource));
 					}
 				// Move the file if DELETE and CREATE permissions are granted
-				} else if (($permissions1 & OCP\Share::PERMISSION_DELETE) && ($permissions2 & OCP\Share::PERMISSION_CREATE)) {
+				} else if ($this->isDeletable($path1) && $this->isCreatable(dirname($path2))) {
 					return $storage->rename($this->getInternalPath($oldSource), $this->getInternalPath($newSource));
 				}
 			}
@@ -325,7 +324,7 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 	
 	public function copy($path1, $path2) {
 		// Copy the file if CREATE permission is granted
-		if (($source = $this->getSourcePath($path1)) && ($this->getPermissions(dirname($path2)) & OCP\Share::PERMISSION_CREATE)) {
+		if (($source = $this->getSourcePath($path1)) && $this->isCreatable(dirname($path2))) {
 			$source = $this->fopen($path1, 'r');
 			$target = $this->fopen($path2, 'w');
 			return OC_Helper::streamCopy($source, $target);