One class per File

3 files changed, 620 insertions, 412 deletions

diff --git a/lib/filestorage.php b/lib/filestorage.php
index 95e8c31eff2..46612687a92 100644
--- a/lib/filestorage.php
+++ b/lib/filestorage.php
@@ -61,416 +61,4 @@ class OC_FILESTORAGE{
 
 
 OC_FILESYSTEM::registerStorageType('local','OC_FILESTORAGE_LOCAL',array('datadir'=>'string'));
-/**
- * for local filestore, we only have to map the paths
- */
-class OC_FILESTORAGE_LOCAL extends OC_FILESTORAGE{
-	private $datadir;
-	private static $mimetypes=null;
-	public function __construct($arguments){
-		$this->datadir=$arguments['datadir'];
-		if(substr($this->datadir,-1)!=='/'){
-			$this->datadir.='/';
-		}
-	}
-	public function mkdir($path){
-		if($return=mkdir($this->datadir.$path)){
-			$this->clearFolderSizeCache($path);
-		}
-		return $return;
-	}
-	public function rmdir($path){
-		if($return=rmdir($this->datadir.$path)){
-			$this->clearFolderSizeCache($path);
-		}
-		return $return;
-	}
-	public function opendir($path){
-		return opendir($this->datadir.$path);
-	}
-	public function is_dir($path){
-		return (is_dir($this->datadir.$path) or substr($path,-1)=='/');
-	}
-	public function is_file($path){
-		return is_file($this->datadir.$path);
-	}
-	public function stat($path){
-		return stat($this->datadir.$path);
-	}
-	public function filetype($path){
-		$filetype=filetype($this->datadir.$path);
-		if($filetype=='link'){
-			$filetype=filetype(readlink($this->datadir.$path));
-		}
-		return $filetype;
-	}
-	public function filesize($path){
-		if($this->is_dir($path)){
-			return $this->getFolderSize($path);
-		}else{
-			return filesize($this->datadir.$path);
-		}
-	}
-	public function is_readable($path){
-		return is_readable($this->datadir.$path);
-	}
-	public function is_writeable($path){
-		return is_writeable($this->datadir.$path);
-	}
-	public function file_exists($path){
-		return file_exists($this->datadir.$path);
-	}
-	public function readfile($path){
-		return readfile($this->datadir.$path);
-	}
-	public function filectime($path){
-		return filectime($this->datadir.$path);
-	}
-	public function filemtime($path){
-		return filemtime($this->datadir.$path);
-	}
-	public function fileatime($path){
-		return fileatime($this->datadir.$path);
-	}
-	public function file_get_contents($path){
-		return file_get_contents($this->datadir.$path);
-	}
-	public function file_put_contents($path,$data){
-		if($return=file_put_contents($this->datadir.$path,$data)){
-			$this->clearFolderSizeCache($path);
-		}
-	}
-	public function unlink($path){
-		if($return=unlink($this->datadir.$path)){
-			$this->clearFolderSizeCache($path);
-		}
-		return $return;
-	}
-	public function rename($path1,$path2){
-		if($return=rename($this->datadir.$path1,$this->datadir.$path2)){
-			$this->clearFolderSizeCache($path1);
-			$this->clearFolderSizeCache($path2);
-		}
-		return $return;
-	}
-	public function copy($path1,$path2){
-		if($this->is_dir($path2)){
-			if(!$this->file_exists($path2)){
-				$this->mkdir($path2);
-			}
-			$source=substr($path1,strrpos($path1,'/')+1);
-			$path2.=$source;
-		}
-		if($return=copy($this->datadir.$path1,$this->datadir.$path2)){
-			$this->clearFolderSizeCache($path2);
-		}
-		return $return;
-	}
-	public function fopen($path,$mode){
-		if($return=fopen($this->datadir.$path,$mode)){
-			switch($mode){
-				case 'r':
-					break;
-				case 'r+':
-				case 'w+':
-				case 'x+':
-				case 'a+':
-					$this->clearFolderSizeCache($path);
-					break;
-				case 'w':
-				case 'x':
-				case 'a':
-					$this->clearFolderSizeCache($path);
-					break;
-			}
-		}
-		return $return;
-	}
-
-	public function getMimeType($fspath){
-		if($this->is_readable($fspath)){
-			if (@is_dir($this->datadir.$fspath)) {
-				// directories are easy
-				return "httpd/unix-directory";
-			}elseif (function_exists('finfo_open') and function_exists('finfo_file') and $finfo=finfo_open(FILEINFO_MIME)){
-				$mimeType =strtolower(finfo_file($finfo,$this->datadir.$fspath));
-				$mimeType=substr($mimeType,0,strpos($mimeType,';'));
-				finfo_close($finfo);
-				return $mimeType;
-			} else if (function_exists("mime_content_type")) {
-				// use mime magic extension if available
-				$mime_type = mime_content_type($this->datadir.$fspath);
-			} else if (self::canExecute("file")) {
-				// it looks like we have a 'file' command,
-				// lets see it it does have mime support
-				$fp = popen("file -i -b '{$this->datadir}$fspath' 2>/dev/null", "r");
-				$reply = fgets($fp);
-				pclose($fp);
-
-				//trim the character set from the end of the response
-				$mime_type=substr($reply,0,strrpos($reply,' '));
-			}
-			if (empty($mime_type)) {
-				// Fallback solution: (try to guess the type by the file extension
-				if(!self::$mimetypes){
-					self::$mimetypes=include('mimetypes.list.php');
-				}
-				$extention=strtolower(strrchr(basename($fspath), "."));
-				$extention=substr($extention,1);//remove leading .
-				$mime_type=(isset(self::$mimetypes[$extention]))?self::$mimetypes[$extention]:'application/octet-stream';
-			}
-			return $mime_type;
-		}
-	}
-
-	/**
-	* detect if a given program is found in the search PATH
-	*
-	* helper function used by _mimetype() to detect if the
-	* external 'file' utility is available
-	*
-	* @param  string  program name
-	* @param  string  optional search path, defaults to $PATH
-	* @return bool    true if executable program found in path
-	*/
-	private function canExecute($name, $path = false)
-	{
-		// path defaults to PATH from environment if not set
-		if ($path === false) {
-			$path = getenv("PATH");
-		}
-
-		// check method depends on operating system
-		if (!strncmp(PHP_OS, "WIN", 3)) {
-			// on Windows an appropriate COM or EXE file needs to exist
-			$exts = array(".exe", ".com");
-			$check_fn = "file_exists";
-		} else {
-			// anywhere else we look for an executable file of that name
-			$exts = array("");
-			$check_fn = "is_executable";
-		}
-
-        // Default check will be done with $path directories :
-        $dirs = explode(PATH_SEPARATOR, $path);
-
-		// WARNING : We have to check if open_basedir is enabled :
-		$obd = ini_get('open_basedir');
-
-		if($obd != "none")
-            $obd_values = explode(PATH_SEPARATOR, $obd);
-
-		if(count($obd_values) > 0)
-		{
-            // open_basedir is in effect !
-            // We need to check if the program is in one of these dirs :
-            $dirs = $obd_values;
-        }
-
-        foreach($dirs as $dir)
-        {
-            foreach($exts as $ext)
-            {
-                if($check_fn("$dir/$name".$ext))
-                    return true;
-            }
-        }
-
-		return false;
-	}
-
-	public function toTmpFile($path){
-		$tmpFolder=sys_get_temp_dir();
-		$filename=tempnam($tmpFolder,'OC_TEMP_FILE_'.substr($path,strrpos($path,'.')));
-		$fileStats = stat($this->datadir.$path);
-		if(copy($this->datadir.$path,$filename)){
-			touch($filename, $fileStats['mtime'], $fileStats['atime']);
-			return $filename;
-		}else{
-			return false;
-		}
-	}
-
-	public function fromTmpFile($tmpFile,$path){
-		$fileStats = stat($tmpFile);
-		if(rename($tmpFile,$this->datadir.$path)){
-			touch($this->datadir.$path, $fileStats['mtime'], $fileStats['atime']);
-			$this->clearFolderSizeCache($path);
-			return true;
-		}else{
-			return false;
-		}
-	}
-	
-	public function fromUploadedFile($tmpFile,$path){
-		$fileStats = stat($tmpFile);
-		if(move_uploaded_file($tmpFile,$this->datadir.$path)){
-			touch($this->datadir.$path, $fileStats['mtime'], $fileStats['atime']);
-			$this->clearFolderSizeCache($path);
-			return true;
-		}else{
-			return false;
-		}
-	}
-
-	public function delTree($dir) {
-		$dirRelative=$dir;
-		$dir=$this->datadir.$dir;
-		if (!file_exists($dir)) return true;
-		if (!is_dir($dir) || is_link($dir)) return unlink($dir);
-		foreach (scandir($dir) as $item) {
-			if ($item == '.' || $item == '..') continue;
-			if(is_file($dir.'/'.$item)){
-				if(unlink($dir.'/'.$item)){
-					$this->clearFolderSizeCache($dir);
-				}
-			}elseif(is_dir($dir.'/'.$item)){
-				if (!$this->delTree($dirRelative. "/" . $item)){
-					return false;
-				};
-			}
-		}
-		if($return=rmdir($dir)){
-			$this->clearFolderSizeCache($dir);
-		}
-		return $return;
-	}
-
-	public function find($path){
-		$return=System::find($this->datadir.$path);
-		foreach($return as &$file){
-			$file=str_replace($file,$this->datadir,'');
-		}
-		return $return;
-	}
-
-	public function getTree($dir) {
-		if(substr($dir,-1,1)=='/'){
-			$dir=substr($dir,0,-1);
-		}
-		$tree=array();
-		$tree[]=$dir;
-		$dirRelative=$dir;
-		$dir=$this->datadir.$dir;
-		if (!file_exists($dir)) return true;
-		foreach (scandir($dir) as $item) {
-			if ($item == '.' || $item == '..') continue;
-			if(is_file($dir.'/'.$item)){
-				$tree[]=$dirRelative.'/'.$item;
-			}elseif(is_dir($dir.'/'.$item)){
-				if ($subTree=$this->getTree($dirRelative. "/" . $item)){
-					$tree=array_merge($tree,$subTree);
-				}
-			}
-		}
-		return $tree;
-	}
-
-	public function hash($type,$path,$raw){
-		return hash_file($type,$this->datadir.$path,$raw);
-	}
-	
-	public function free_space($path){
-		return disk_free_space($this->datadir.$path);
-	}
-	
-	public function search($query){
-		return $this->searchInDir($query);
-	}
-	public function getLocalFile($path){
-			return $this->datadir.$path;
-	}
-	
-	private function searchInDir($query,$dir=''){
-		$files=array();
-		foreach (scandir($this->datadir.$dir) as $item) {
-			if ($item == '.' || $item == '..') continue;
-			if(strstr(strtolower($item),strtolower($query))!==false){
-				$files[]=$dir.'/'.$item;
-			}
-			if(is_dir($this->datadir.$dir.'/'.$item)){
-				$files=array_merge($files,$this->searchInDir($query,$dir.'/'.$item));
-			}
-		}
-		return $files;
-	}
-	
-	/**
-	 * @brief get the size of folder and it's content
-	 * @param string $path file path
-	 * @return int size of folder and it's content
-	 */
-	public function getFolderSize($path){
-		$path=str_replace('//','/',$path);
-		if($this->is_dir($path) and substr($path,-1)!='/'){
-			$path.='/';
-		}
-		$query=OC_DB::prepare("SELECT size FROM *PREFIX*foldersize WHERE path=?");
-		$size=$query->execute(array($path))->fetchAll();
-		if(count($size)>0){// we already the size, just return it
-			return $size[0]['size'];
-		}else{//the size of the folder isn't know, calulate it
-			return $this->calculateFolderSize($path);
-		}
-	}
-
-	/**
-	 * @brief calulate the size of folder and it's content and cache it
-	 * @param string $path file path
-	 * @return int size of folder and it's content
-	 */
-	public function calculateFolderSize($path){
-		if($this->is_file($path)){
-			$path=dirname($path);
-		}
-		$path=str_replace('//','/',$path);
-		if($this->is_dir($path) and substr($path,-1)!='/'){
-			$path.='/';
-		}
-		$size=0;
-		if ($dh = $this->opendir($path)) {
-			while (($filename = readdir($dh)) !== false) {
-				if($filename!='.' and $filename!='..'){
-					$subFile=$path.'/'.$filename;
-					if($this->is_file($subFile)){
-						$size+=$this->filesize($subFile);
-					}else{
-						$size+=$this->getFolderSize($subFile);
-					}
-				}
-			}
-			if($size>0){
-				$query=OC_DB::prepare("INSERT INTO *PREFIX*foldersize VALUES(?,?)");
-				$result=$query->execute(array($path,$size));
-			}
-		}
-		return $size;
-	}
-
-	/**
-	 * @brief clear the folder size cache of folders containing a file
-	 * @param string $path
-	 */
-	public function clearFolderSizeCache($path){
-		if($this->is_file($path)){
-			$path=dirname($path);
-		}
-		$path=str_replace('//','/',$path);
-		if($this->is_dir($path) and substr($path,-1)!='/'){
-			$path.='/';
-		}
-		$query=OC_DB::prepare("DELETE FROM *PREFIX*foldersize WHERE path = ?");
-		$result=$query->execute(array($path));
-		if($path!='/' and $path!=''){
-			$parts=explode('/',$path);
-			//pop empty part
-			$part=array_pop($parts);
-			if(empty($part)){
-				array_pop($parts);
-			}
-			$parent=implode('/',$parts);
-			$this->clearFolderSizeCache($parent);
-		}
-	}
-}
 ?>
\ No newline at end of file
diff --git a/lib/filestorage/local.php b/lib/filestorage/local.php
new file mode 100644
index 00000000000..81a00dd8f4d
--- /dev/null
+++ b/lib/filestorage/local.php
@@ -0,0 +1,414 @@
+<?php
+/**
+ * for local filestore, we only have to map the paths
+ */
+class OC_FILESTORAGE_LOCAL extends OC_FILESTORAGE{
+	private $datadir;
+	private static $mimetypes=null;
+	public function __construct($arguments){
+		$this->datadir=$arguments['datadir'];
+		if(substr($this->datadir,-1)!=='/'){
+			$this->datadir.='/';
+		}
+	}
+	public function mkdir($path){
+		if($return=mkdir($this->datadir.$path)){
+			$this->clearFolderSizeCache($path);
+		}
+		return $return;
+	}
+	public function rmdir($path){
+		if($return=rmdir($this->datadir.$path)){
+			$this->clearFolderSizeCache($path);
+		}
+		return $return;
+	}
+	public function opendir($path){
+		return opendir($this->datadir.$path);
+	}
+	public function is_dir($path){
+		return (is_dir($this->datadir.$path) or substr($path,-1)=='/');
+	}
+	public function is_file($path){
+		return is_file($this->datadir.$path);
+	}
+	public function stat($path){
+		return stat($this->datadir.$path);
+	}
+	public function filetype($path){
+		$filetype=filetype($this->datadir.$path);
+		if($filetype=='link'){
+			$filetype=filetype(readlink($this->datadir.$path));
+		}
+		return $filetype;
+	}
+	public function filesize($path){
+		if($this->is_dir($path)){
+			return $this->getFolderSize($path);
+		}else{
+			return filesize($this->datadir.$path);
+		}
+	}
+	public function is_readable($path){
+		return is_readable($this->datadir.$path);
+	}
+	public function is_writeable($path){
+		return is_writeable($this->datadir.$path);
+	}
+	public function file_exists($path){
+		return file_exists($this->datadir.$path);
+	}
+	public function readfile($path){
+		return readfile($this->datadir.$path);
+	}
+	public function filectime($path){
+		return filectime($this->datadir.$path);
+	}
+	public function filemtime($path){
+		return filemtime($this->datadir.$path);
+	}
+	public function fileatime($path){
+		return fileatime($this->datadir.$path);
+	}
+	public function file_get_contents($path){
+		return file_get_contents($this->datadir.$path);
+	}
+	public function file_put_contents($path,$data){
+		if($return=file_put_contents($this->datadir.$path,$data)){
+			$this->clearFolderSizeCache($path);
+		}
+	}
+	public function unlink($path){
+		if($return=unlink($this->datadir.$path)){
+			$this->clearFolderSizeCache($path);
+		}
+		return $return;
+	}
+	public function rename($path1,$path2){
+		if($return=rename($this->datadir.$path1,$this->datadir.$path2)){
+			$this->clearFolderSizeCache($path1);
+			$this->clearFolderSizeCache($path2);
+		}
+		return $return;
+	}
+	public function copy($path1,$path2){
+		if($this->is_dir($path2)){
+			if(!$this->file_exists($path2)){
+				$this->mkdir($path2);
+			}
+			$source=substr($path1,strrpos($path1,'/')+1);
+			$path2.=$source;
+		}
+		if($return=copy($this->datadir.$path1,$this->datadir.$path2)){
+			$this->clearFolderSizeCache($path2);
+		}
+		return $return;
+	}
+	public function fopen($path,$mode){
+		if($return=fopen($this->datadir.$path,$mode)){
+			switch($mode){
+				case 'r':
+					break;
+				case 'r+':
+				case 'w+':
+				case 'x+':
+				case 'a+':
+					$this->clearFolderSizeCache($path);
+					break;
+				case 'w':
+				case 'x':
+				case 'a':
+					$this->clearFolderSizeCache($path);
+					break;
+			}
+		}
+		return $return;
+	}
+
+	public function getMimeType($fspath){
+		if($this->is_readable($fspath)){
+			if (@is_dir($this->datadir.$fspath)) {
+				// directories are easy
+				return "httpd/unix-directory";
+			}elseif (function_exists('finfo_open') and function_exists('finfo_file') and $finfo=finfo_open(FILEINFO_MIME)){
+				$mimeType =strtolower(finfo_file($finfo,$this->datadir.$fspath));
+				$mimeType=substr($mimeType,0,strpos($mimeType,';'));
+				finfo_close($finfo);
+				return $mimeType;
+			} else if (function_exists("mime_content_type")) {
+				// use mime magic extension if available
+				$mime_type = mime_content_type($this->datadir.$fspath);
+			} else if (self::canExecute("file")) {
+				// it looks like we have a 'file' command,
+				// lets see it it does have mime support
+				$fp = popen("file -i -b '{$this->datadir}$fspath' 2>/dev/null", "r");
+				$reply = fgets($fp);
+				pclose($fp);
+
+				//trim the character set from the end of the response
+				$mime_type=substr($reply,0,strrpos($reply,' '));
+			}
+			if (empty($mime_type)) {
+				// Fallback solution: (try to guess the type by the file extension
+				if(!self::$mimetypes){
+					self::$mimetypes=include('mimetypes.list.php');
+				}
+				$extention=strtolower(strrchr(basename($fspath), "."));
+				$extention=substr($extention,1);//remove leading .
+				$mime_type=(isset(self::$mimetypes[$extention]))?self::$mimetypes[$extention]:'application/octet-stream';
+			}
+			return $mime_type;
+		}
+	}
+
+	/**
+	* detect if a given program is found in the search PATH
+	*
+	* helper function used by _mimetype() to detect if the
+	* external 'file' utility is available
+	*
+	* @param  string  program name
+	* @param  string  optional search path, defaults to $PATH
+	* @return bool    true if executable program found in path
+	*/
+	private function canExecute($name, $path = false)
+	{
+		// path defaults to PATH from environment if not set
+		if ($path === false) {
+			$path = getenv("PATH");
+		}
+
+		// check method depends on operating system
+		if (!strncmp(PHP_OS, "WIN", 3)) {
+			// on Windows an appropriate COM or EXE file needs to exist
+			$exts = array(".exe", ".com");
+			$check_fn = "file_exists";
+		} else {
+			// anywhere else we look for an executable file of that name
+			$exts = array("");
+			$check_fn = "is_executable";
+		}
+
+        // Default check will be done with $path directories :
+        $dirs = explode(PATH_SEPARATOR, $path);
+
+		// WARNING : We have to check if open_basedir is enabled :
+		$obd = ini_get('open_basedir');
+
+		if($obd != "none")
+            $obd_values = explode(PATH_SEPARATOR, $obd);
+
+		if(count($obd_values) > 0)
+		{
+            // open_basedir is in effect !
+            // We need to check if the program is in one of these dirs :
+            $dirs = $obd_values;
+        }
+
+        foreach($dirs as $dir)
+        {
+            foreach($exts as $ext)
+            {
+                if($check_fn("$dir/$name".$ext))
+                    return true;
+            }
+        }
+
+		return false;
+	}
+
+	public function toTmpFile($path){
+		$tmpFolder=sys_get_temp_dir();
+		$filename=tempnam($tmpFolder,'OC_TEMP_FILE_'.substr($path,strrpos($path,'.')));
+		$fileStats = stat($this->datadir.$path);
+		if(copy($this->datadir.$path,$filename)){
+			touch($filename, $fileStats['mtime'], $fileStats['atime']);
+			return $filename;
+		}else{
+			return false;
+		}
+	}
+
+	public function fromTmpFile($tmpFile,$path){
+		$fileStats = stat($tmpFile);
+		if(rename($tmpFile,$this->datadir.$path)){
+			touch($this->datadir.$path, $fileStats['mtime'], $fileStats['atime']);
+			$this->clearFolderSizeCache($path);
+			return true;
+		}else{
+			return false;
+		}
+	}
+
+	public function fromUploadedFile($tmpFile,$path){
+		$fileStats = stat($tmpFile);
+		if(move_uploaded_file($tmpFile,$this->datadir.$path)){
+			touch($this->datadir.$path, $fileStats['mtime'], $fileStats['atime']);
+			$this->clearFolderSizeCache($path);
+			return true;
+		}else{
+			return false;
+		}
+	}
+
+	public function delTree($dir) {
+		$dirRelative=$dir;
+		$dir=$this->datadir.$dir;
+		if (!file_exists($dir)) return true;
+		if (!is_dir($dir) || is_link($dir)) return unlink($dir);
+		foreach (scandir($dir) as $item) {
+			if ($item == '.' || $item == '..') continue;
+			if(is_file($dir.'/'.$item)){
+				if(unlink($dir.'/'.$item)){
+					$this->clearFolderSizeCache($dir);
+				}
+			}elseif(is_dir($dir.'/'.$item)){
+				if (!$this->delTree($dirRelative. "/" . $item)){
+					return false;
+				};
+			}
+		}
+		if($return=rmdir($dir)){
+			$this->clearFolderSizeCache($dir);
+		}
+		return $return;
+	}
+
+	public function find($path){
+		$return=System::find($this->datadir.$path);
+		foreach($return as &$file){
+			$file=str_replace($file,$this->datadir,'');
+		}
+		return $return;
+	}
+
+	public function getTree($dir) {
+		if(substr($dir,-1,1)=='/'){
+			$dir=substr($dir,0,-1);
+		}
+		$tree=array();
+		$tree[]=$dir;
+		$dirRelative=$dir;
+		$dir=$this->datadir.$dir;
+		if (!file_exists($dir)) return true;
+		foreach (scandir($dir) as $item) {
+			if ($item == '.' || $item == '..') continue;
+			if(is_file($dir.'/'.$item)){
+				$tree[]=$dirRelative.'/'.$item;
+			}elseif(is_dir($dir.'/'.$item)){
+				if ($subTree=$this->getTree($dirRelative. "/" . $item)){
+					$tree=array_merge($tree,$subTree);
+				}
+			}
+		}
+		return $tree;
+	}
+
+	public function hash($type,$path,$raw){
+		return hash_file($type,$this->datadir.$path,$raw);
+	}
+
+	public function free_space($path){
+		return disk_free_space($this->datadir.$path);
+	}
+
+	public function search($query){
+		return $this->searchInDir($query);
+	}
+	public function getLocalFile($path){
+			return $this->datadir.$path;
+	}
+
+	private function searchInDir($query,$dir=''){
+		$files=array();
+		foreach (scandir($this->datadir.$dir) as $item) {
+			if ($item == '.' || $item == '..') continue;
+			if(strstr(strtolower($item),strtolower($query))!==false){
+				$files[]=$dir.'/'.$item;
+			}
+			if(is_dir($this->datadir.$dir.'/'.$item)){
+				$files=array_merge($files,$this->searchInDir($query,$dir.'/'.$item));
+			}
+		}
+		return $files;
+	}
+
+	/**
+	 * @brief get the size of folder and it's content
+	 * @param string $path file path
+	 * @return int size of folder and it's content
+	 */
+	public function getFolderSize($path){
+		$path=str_replace('//','/',$path);
+		if($this->is_dir($path) and substr($path,-1)!='/'){
+			$path.='/';
+		}
+		$query=OC_DB::prepare("SELECT size FROM *PREFIX*foldersize WHERE path=?");
+		$size=$query->execute(array($path))->fetchAll();
+		if(count($size)>0){// we already the size, just return it
+			return $size[0]['size'];
+		}else{//the size of the folder isn't know, calulate it
+			return $this->calculateFolderSize($path);
+		}
+	}
+
+	/**
+	 * @brief calulate the size of folder and it's content and cache it
+	 * @param string $path file path
+	 * @return int size of folder and it's content
+	 */
+	public function calculateFolderSize($path){
+		if($this->is_file($path)){
+			$path=dirname($path);
+		}
+		$path=str_replace('//','/',$path);
+		if($this->is_dir($path) and substr($path,-1)!='/'){
+			$path.='/';
+		}
+		$size=0;
+		if ($dh = $this->opendir($path)) {
+			while (($filename = readdir($dh)) !== false) {
+				if($filename!='.' and $filename!='..'){
+					$subFile=$path.'/'.$filename;
+					if($this->is_file($subFile)){
+						$size+=$this->filesize($subFile);
+					}else{
+						$size+=$this->getFolderSize($subFile);
+					}
+				}
+			}
+			if($size>0){
+				$query=OC_DB::prepare("INSERT INTO *PREFIX*foldersize VALUES(?,?)");
+				$result=$query->execute(array($path,$size));
+			}
+		}
+		return $size;
+	}
+
+	/**
+	 * @brief clear the folder size cache of folders containing a file
+	 * @param string $path
+	 */
+	public function clearFolderSizeCache($path){
+		if($this->is_file($path)){
+			$path=dirname($path);
+		}
+		$path=str_replace('//','/',$path);
+		if($this->is_dir($path) and substr($path,-1)!='/'){
+			$path.='/';
+		}
+		$query=OC_DB::prepare("DELETE FROM *PREFIX*foldersize WHERE path = ?");
+		$result=$query->execute(array($path));
+		if($path!='/' and $path!=''){
+			$parts=explode('/',$path);
+			//pop empty part
+			$part=array_pop($parts);
+			if(empty($part)){
+				array_pop($parts);
+			}
+			$parent=implode('/',$parts);
+			$this->clearFolderSizeCache($parent);
+		}
+	}
+}
+ 
diff --git a/lib/remote/cloud.php b/lib/remote/cloud.php
new file mode 100644
index 00000000000..6358bea46fc
--- /dev/null
+++ b/lib/remote/cloud.php
@@ -0,0 +1,206 @@
+<?php
+/**
+ * Class for connection to a remote owncloud installation
+ *
+ */
+class OC_REMOTE_CLOUD{
+	private $path;
+	private $connected=false;
+	private $cookiefile=false;
+
+	/**
+	* make an api call to the remote cloud
+	* @param string $action
+	* @param array parameters
+	* @param bool assoc   when set to true, the result will be parsed as associative array
+	*
+	*/
+	private function apiCall($action,$parameters=false,$assoc=false){
+		if(!$this->cookiefile){
+			$this->cookiefile=sys_get_temp_dir().'/remoteCloudCookie'.uniqid();
+		}
+		$url=$this->path.='/files/api.php';
+		$fields_string="action=$action&";
+		if(is_array($parameters)){
+			foreach($parameters as $key=>$value){
+				$fields_string.=$key.'='.$value.'&';
+			}
+			rtrim($fields_string,'&');
+		}
+		$ch=curl_init();
+		curl_setopt($ch,CURLOPT_URL,$url);
+		curl_setopt($ch,CURLOPT_POST,count($parameters));
+		curl_setopt($ch,CURLOPT_POSTFIELDS,$fields_string);
+		curl_setopt($ch, CURLOPT_COOKIEFILE,$this->cookiefile);
+		curl_setopt($ch, CURLOPT_COOKIEJAR,$this->cookiefile);
+		curl_setopt($ch,CURLOPT_RETURNTRANSFER,true);
+		$result=curl_exec($ch);
+		$result=trim($result);
+		$info=curl_getinfo($ch);
+		$httpCode=$info['http_code'];
+		curl_close($ch);
+		if($httpCode==200 or $httpCode==0){
+			return json_decode($result,$assoc);
+		}else{
+			return false;
+		}
+	}
+
+	public function __construct($path,$user,$password){
+		$this->path=$path;
+		$this->connected=$this->apiCall('login',array('username'=>$user,'password'=>$password));
+	}
+
+	/**
+	* check if we are stull logged in on the remote cloud
+	*
+	*/
+	public function isLoggedIn(){
+		if(!$this->connected){
+			return false;
+		}
+		return $this->apiCall('checklogin');
+	}
+
+	public function __get($name){
+		switch($name){
+			case 'connected':
+				return $this->connected;
+		}
+	}
+
+	/**
+	* disconnect from the remote cloud
+	*
+	*/
+	public function disconnect(){
+		$this->connected=false;
+		if(is_file($this->cookiefile)){
+			unlink($this->cookiefile);
+		}
+		$this->cookiefile=false;
+	}
+
+	/**
+	* create a new file or directory
+	* @param string $dir
+	* @param string $name
+	* @param string $type
+	*/
+	public function newFile($dir,$name,$type){
+		if(!$this->connected){
+			return false;
+		}
+		return $this->apiCall('new',array('dir'=>$dir,'name'=>$name,'type'=>$type),true);
+	}
+
+	/**
+	* deletes a file or directory
+	* @param string $dir
+	* @param string $file
+	*/
+	public function delete($dir,$name){
+		if(!$this->connected){
+			return false;
+		}
+		return $this->apiCall('delete',array('dir'=>$dir,'file'=>$name),true);
+	}
+
+	/**
+	* moves a file or directory
+	* @param string $sorceDir
+	* @param string $sorceFile
+	* @param string $targetDir
+	* @param string $targetFile
+	*/
+	public function move($sourceDir,$sourceFile,$targetDir,$targetFile){
+		if(!$this->connected){
+			return false;
+		}
+		return $this->apiCall('move',array('sourcedir'=>$sourceDir,'source'=>$sourceFile,'targetdir'=>$targetDir,'target'=>$targetFile),true);
+	}
+
+	/**
+	* copies a file or directory
+	* @param string $sorceDir
+	* @param string $sorceFile
+	* @param string $targetDir
+	* @param string $targetFile
+	*/
+	public function copy($sourceDir,$sourceFile,$targetDir,$targetFile){
+		if(!$this->connected){
+			return false;
+		}
+		return $this->apiCall('copy',array('sourcedir'=>$sourceDir,'source'=>$sourceFile,'targetdir'=>$targetDir,'target'=>$targetFile),true);
+	}
+
+	/**
+	* get a file tree
+	* @param string $dir
+	*/
+	public function getTree($dir){
+		if(!$this->connected){
+			return false;
+		}
+		return $this->apiCall('gettree',array('dir'=>$dir),true);
+	}
+
+	/**
+	* get the files inside a directory of the remote cloud
+	* @param string $dir
+	*/
+	public function getFiles($dir){
+		if(!$this->connected){
+			return false;
+		}
+		return $this->apiCall('getfiles',array('dir'=>$dir),true);
+	}
+
+	/**
+	* get a remove file and save it in a temporary file and return the path of the temporary file
+	* @param string $dir
+	* @param string $file
+	* @return string
+	*/
+	public function getFile($dir, $file){
+		if(!$this->connected){
+			return false;
+		}
+		$ch=curl_init();
+		if(!$this->cookiefile){
+			$this->cookiefile=sys_get_temp_dir().'/remoteCloudCookie'.uniqid();
+		}
+		$tmpfile=tempnam(sys_get_temp_dir(),'remoteCloudFile');
+		$fp=fopen($tmpfile,'w+');
+		$url=$this->path.="/files/api.php?action=get&dir=$dir&file=$file";
+		curl_setopt($ch,CURLOPT_URL,$url);
+		curl_setopt($ch, CURLOPT_COOKIEFILE,$this->cookiefile);
+		curl_setopt($ch, CURLOPT_COOKIEJAR,$this->cookiefile);
+		curl_setopt($ch, CURLOPT_FILE, $fp);
+		curl_exec($ch);
+		fclose($fp);
+		curl_close($ch);
+		return $tmpfile;
+	}
+
+	public function sendFile($sourceDir,$sourceFile,$targetDir,$targetFile){
+		global $WEBROOT;
+		$source=$sourceDir.'/'.$sourceFile;
+		$tmp=OC_FILESYSTEM::toTmpFile($source);
+		return $this->sendTmpFile($tmp,$targetDir,$targetFile);
+	}
+
+	public function sendTmpFile($tmp,$targetDir,$targetFile){
+		$token=sha1(uniqid().$tmp);
+		global $WEBROOT;
+		$file=sys_get_temp_dir().'/'.'remoteCloudFile'.$token;
+		rename($tmp,$file);
+		if( OC_CONFIG::getValue( "forcessl", false ) or isset($_SERVER['HTTPS']) and $_SERVER['HTTPS'] == 'on') {
+			$url = "https://". $_SERVER['SERVER_NAME'] . $WEBROOT;
+		}else{
+			$url = "http://". $_SERVER['SERVER_NAME'] . $WEBROOT;
+		}
+		return $this->apiCall('pull',array('dir'=>$targetDir,'file'=>$targetFile,'token'=>$token,'source'=>$url),true);
+	}
+}
+