1 files changed, 2 insertions, 64 deletions

diff --git a/apps/files_sharing/sharedstorage.php b/apps/files_sharing/sharedstorage.php
index 4138fc2b399..32fd2124429 100644
--- a/apps/files_sharing/sharedstorage.php
+++ b/apps/files_sharing/sharedstorage.php
@@ -67,7 +67,6 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 	public function rmdir($path) {
 		// The folder will be removed from the database, but won't be deleted from the owner's filesystem
 		OC_Share::unshareFromMySelf($this->datadir.$path);
-		$this->clearFolderSizeCache($path);
 	}
 	
 	public function opendir($path) {
@@ -190,7 +189,7 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 	
 	public function filesize($path) {
 		if ($path == "" || $path == "/" || $this->is_dir($path)) {
-			return $this->getFolderSize($path);
+			return 0;
 		} else {
 			$source = $this->getSource($path);
 			if ($source) {
@@ -200,55 +199,6 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 		}
 	}
 
-	public function getFolderSize($path) {
-		return 0; //depricated
-	}
-	
-	private function calculateFolderSize($path) {
-		if ($this->is_file($path)) {
-			$path = dirname($path);
-		}
-		$size = 0;
-		if ($dh = $this->opendir($path)) {
-			while (($filename = readdir($dh)) !== false) {
-				if ($filename != "." && $filename != "..") {
-					$subFile = $path."/".$filename;
-					if ($this->is_file($subFile)) {
-						$size += $this->filesize($subFile);
-					} else {
-						$size += $this->getFolderSize($subFile);
-					}
-				}
-			}
-			if ($size > 0) {
-				$dbpath = rtrim($this->datadir.$path, "/");
-// 				$query = OCP\DB::prepare("INSERT INTO *PREFIX*foldersize VALUES(?,?)");
-// 				$result = $query->execute(array($dbpath, $size));
-			}
-		}
-		return $size;
-	}
-
-	private function clearFolderSizeCache($path) {
-		$path = rtrim($path, "/");
-		$path = preg_replace('{(/)\1+}', "/", $path);
-		if ($this->is_file($path)) {
-			$path = dirname($path);
-		}
-		$dbpath = rtrim($this->datadir.$path, "/");
-// 		$query = OCP\DB::prepare("DELETE FROM *PREFIX*/*foldersize*/ WHERE path = ?");
-// 		$result = $query->execute(array($dbpath));
-		if ($path != "/" && $path != "") {
-			$parts = explode("/", $path);
-			$part = array_pop($parts);
-			if (empty($part)) {
-				array_pop($parts);
-			}
-			$parent = implode("/", $parts);
-			$this->clearFolderSizeCache($parent);
-		}
-	}
-
 	public function is_readable($path) {
 		return true;
 	}
@@ -341,9 +291,6 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 				OCP\Util::emitHook('OC_Filestorage_Shared', 'file_put_contents', $info);
 				$storage = OC_Filesystem::getStorage($source);
 				$result = $storage->file_put_contents($this->getInternalPath($source), $data);
-				if ($result) {
-					$this->clearFolderSizeCache($path);
-				}
 				return $result;
 			}
 		}
@@ -365,7 +312,6 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 		} else {
 			OC_Share::unshareFromMySelf($target);
 		}
-		$this->clearFolderSizeCache($this->getInternalPath($target));
 		return true;
 	}
 	
@@ -401,8 +347,6 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 		} else {
 			OC_Share::setTarget($oldTarget, $newTarget);
 		}
-		$this->clearFolderSizeCache($this->getInternalPath($oldTarget));
-		$this->clearFolderSizeCache($this->getInternalPath($newTarget));
 		return true;
 	}
 	
@@ -413,9 +357,6 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 			if ($this->is_writable($path2)) {
 				$tmpFile = $this->toTmpFile($path1);
 				$result = $this->fromTmpFile($tmpFile, $path2);
-				if ($result) {
-					$this->clearFolderSizeCache($path2);
-				}
 				return $result;
 			} else {
 				return false;
@@ -451,9 +392,6 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 			if ($source) {
 				$storage = OC_Filesystem::getStorage($source);
 				$result = $storage->fromTmpFile($tmpFile, $this->getInternalPath($source));
-				if ($result) {
-					$this->clearFolderSizeCache($path);
-				}
 				return $result;
 			}
 		} else {
@@ -520,7 +458,7 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 		$source = $this->getSource($path);
 		if ($source) {
 			$storage = OC_Filesystem::getStorage($source);
-			return $storage->touch($this->getInternalPath($source),$time);
+			return $storage->touch($this->getInternalPath($source),$mtime);
 		}
 	}