Fix filesystem hash, no longer using basicOperation()

apps/files_sharing/sharedstorage.php

@@ -410,7 +410,7 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 		}
 	}
 	
-	public function hash($type, $path, $raw) {
+	public function hash($type, $path, $raw = false) {
 		$source = $this->getSource($path);
 		if ($source) {
 			$storage = OC_Filesystem::getStorage($source);

lib/filestorage.php

@@ -45,7 +45,7 @@ abstract class OC_Filestorage{
 	abstract public function copy($path1,$path2);
 	abstract public function fopen($path,$mode);
 	abstract public function getMimeType($path);
-	abstract public function hash($type,$path,$raw);
+	abstract public function hash($type,$path,$raw = false);
 	abstract public function free_space($path);
 	abstract public function search($query);
 	abstract public function touch($path, $mtime=null);

lib/filestorage/common.php

@@ -195,7 +195,7 @@ abstract class OC_Filestorage_Common extends OC_Filestorage {
 		unlink($tmpFile);
 		return $mime;
 	}
-	public function hash($type,$path,$raw){
+	public function hash($type,$path,$raw = false){
 		$tmpFile=$this->getLocalFile();
 		$hash=hash($type,$tmpFile,$raw);
 		unlink($tmpFile);

lib/filesystem.php

@@ -452,8 +452,8 @@ class OC_Filesystem{
 	static public function getMimeType($path){
 		return self::$defaultInstance->getMimeType($path);
 	}
-	static public function hash($type,$path){
-		return self::$defaultInstance->hash($type,$path);
+	static public function hash($type,$path, $raw = false){
+		return self::$defaultInstance->hash($type,$path, $raw);
 	}
 	
 	static public function free_space($path='/'){

lib/filesystemview.php

@@ -465,8 +465,27 @@ class OC_FilesystemView {
 	public function getMimeType($path) {
 		return $this->basicOperation('getMimeType', $path);
 	}
-	public function hash($type, $path) {
-		return $this->basicOperation('hash', $path, array('read'), $type);
+	public function hash($type, $path, $raw = false) {
+		$absolutePath = $this->getAbsolutePath($path);
+		if (OC_FileProxy::runPreProxies('hash', $absolutePath) && OC_Filesystem::isValidPath($path)) {
+			$path = $this->getRelativePath($absolutePath);
+			if ($path == null) {
+				return false;
+			}
+			if (OC_Filesystem::$loaded && $this->fakeRoot == OC_Filesystem::getRoot()) {
+				OC_Hook::emit(
+					OC_Filesystem::CLASSNAME,
+					OC_Filesystem::signal_read,
+					array( OC_Filesystem::signal_param_path => $path)
+				);
+			}
+			if ($storage = $this->getStorage($path)) {
+				$result = $storage->hash($type, $this->getInternalPath($path), $raw);
+				$result = OC_FileProxy::runPostProxies('hash', $absolutePath, $result);
+				return $result;
+			}
+		}
+		return null;
 	}
 
 	public function free_space($path='/') {