4 files changed, 47 insertions, 9 deletions

diff --git a/lib/private/files/storage/common.php b/lib/private/files/storage/common.php
index 9e826dd6192..2b697141515 100644
--- a/lib/private/files/storage/common.php
+++ b/lib/private/files/storage/common.php
@@ -27,6 +27,11 @@ abstract class Common implements \OC\Files\Storage\Storage {
 	protected $watcher;
 	protected $storageCache;
 
+	/**
+	 * @var string[]
+	 */
+	protected $cachedFiles = array();
+
 	public function __construct($parameters) {
 	}
 
@@ -122,11 +127,13 @@ abstract class Common implements \OC\Files\Storage\Storage {
 
 	public function file_put_contents($path, $data) {
 		$handle = $this->fopen($path, "w");
+		$this->removeCachedFile($path);
 		return fwrite($handle, $data);
 	}
 
 	public function rename($path1, $path2) {
 		if ($this->copy($path1, $path2)) {
+			$this->removeCachedFile($path1);
 			return $this->unlink($path1);
 		} else {
 			return false;
@@ -137,6 +144,7 @@ abstract class Common implements \OC\Files\Storage\Storage {
 		$source = $this->fopen($path1, 'r');
 		$target = $this->fopen($path2, 'w');
 		list($count, $result) = \OC_Helper::streamCopy($source, $target);
+		$this->removeCachedFile($path2);
 		return $result;
 	}
 
@@ -152,8 +160,7 @@ abstract class Common implements \OC\Files\Storage\Storage {
 
 	public function hash($type, $path, $raw = false) {
 		$tmpFile = $this->getLocalFile($path);
-		$hash = hash($type, $tmpFile, $raw);
-		unlink($tmpFile);
+		$hash = hash_file($type, $tmpFile, $raw);
 		return $hash;
 	}
 
@@ -162,13 +169,14 @@ abstract class Common implements \OC\Files\Storage\Storage {
 	}
 
 	public function getLocalFile($path) {
-		return $this->toTmpFile($path);
+		return $this->getCachedFile($path);
 	}
 
 	/**
 	 * @param string $path
+	 * @return string
 	 */
-	private function toTmpFile($path) { //no longer in the storage api, still useful here
+	protected function toTmpFile($path) { //no longer in the storage api, still useful here
 		$source = $this->fopen($path, 'r');
 		if (!$source) {
 			return false;
@@ -352,4 +360,15 @@ abstract class Common implements \OC\Files\Storage\Storage {
 		// default, which is not local
 		return false;
 	}
+
+	protected function getCachedFile($path) {
+		if (!isset($this->cachedFiles[$path])) {
+			$this->cachedFiles[$path] = $this->toTmpFile($path);
+		}
+		return $this->cachedFiles[$path];
+	}
+
+	protected function removeCachedFile($path) {
+		unset($this->cachedFiles[$path]);
+	}
 }
diff --git a/lib/private/files/storage/local.php b/lib/private/files/storage/local.php
index a62230bdba5..571bf7f97c1 100644
--- a/lib/private/files/storage/local.php
+++ b/lib/private/files/storage/local.php
@@ -35,7 +35,7 @@ if (\OC_Util::runningOnWindows()) {
 		}
 
 		public function mkdir($path) {
-			return @mkdir($this->datadir . $path);
+			return @mkdir($this->datadir . $path, 0777, true);
 		}
 
 		public function rmdir($path) {
@@ -256,7 +256,7 @@ if (\OC_Util::runningOnWindows()) {
 			return 0;
 		}
 
-		public function hash($path, $type, $raw = false) {
+		public function hash($type, $path, $raw = false) {
 			return hash_file($type, $this->datadir . $path, $raw);
 		}
 
diff --git a/lib/private/files/storage/mappedlocal.php b/lib/private/files/storage/mappedlocal.php
index 1bab3489a28..94ee28ca763 100644
--- a/lib/private/files/storage/mappedlocal.php
+++ b/lib/private/files/storage/mappedlocal.php
@@ -31,7 +31,7 @@ class MappedLocal extends \OC\Files\Storage\Common{
 		return 'local::'.$this->datadir;
 	}
 	public function mkdir($path) {
-		return @mkdir($this->buildPath($path));
+		return @mkdir($this->buildPath($path), 0777, true);
 	}
 	public function rmdir($path) {
 		try {
@@ -276,7 +276,7 @@ class MappedLocal extends \OC\Files\Storage\Common{
 		return 0;
 	}
 
-	public function hash($path, $type, $raw=false) {
+	public function hash($type, $path, $raw=false) {
 		return hash_file($type, $this->buildPath($path), $raw);
 	}
 
diff --git a/lib/private/files/storage/wrapper/quota.php b/lib/private/files/storage/wrapper/quota.php
index 26c952e694a..a878b2c5cf6 100644
--- a/lib/private/files/storage/wrapper/quota.php
+++ b/lib/private/files/storage/wrapper/quota.php
@@ -30,12 +30,24 @@ class Quota extends Wrapper {
 	}
 
 	/**
+	 * @return quota value
+	 */
+	public function getQuota() {
+		return $this->quota;
+	}
+
+	/**
 	 * @param string $path
 	 */
 	protected function getSize($path) {
 		$cache = $this->getCache();
 		$data = $cache->get($path);
 		if (is_array($data) and isset($data['size'])) {
+			if (isset($data['unencrypted_size'])
+				&& $data['unencrypted_size'] > 0
+			) {
+				return $data['unencrypted_size'];
+			}
 			return $data['size'];
 		} else {
 			return \OC\Files\SPACE_NOT_COMPUTED;
@@ -57,7 +69,14 @@ class Quota extends Wrapper {
 				return \OC\Files\SPACE_NOT_COMPUTED;
 			} else {
 				$free = $this->storage->free_space($path);
-				return min($free, (max($this->quota - $used, 0)));
+				$quotaFree = max($this->quota - $used, 0);
+				// if free space is known
+				if ($free >= 0) {
+					$free = min($free, $quotaFree);
+				} else {
+					$free = $quotaFree;
+				}
+				return $free;
 			}
 		}
 	}