mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

some cleanup in filestorage

This commit is contained in:
Robin Appelman 2012-02-27 12:20:37 +01:00
parent cef230c141
commit d8d4420f22
2 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/filestorage/local.php
View File

@ -96,9 +96,7 @@ class OC_Filestorage_Local extends OC_Filestorage{
$source=substr($path1,strrpos($path1,'/')+1);
$path2.=$source;
}
if($return=copy($this->datadir.$path1,$this->datadir.$path2)){
}
return $return;
return copy($this->datadir.$path1,$this->datadir.$path2);
}
public function fopen($path,$mode){
if($return=fopen($this->datadir.$path,$mode)){

16
lib/filesystemview.php
View File

@ -173,13 +173,11 @@ class OC_FilesystemView {
if(is_resource($data)){//not having to deal with streams in file_put_contents makes life easier
$target=$this->fopen($path,'w');
if($target){
while(!feof($data)){
fwrite($target,fread($data,8192));
}
$count=OC_Helper::streamCopy($data,$target);
fclose($target);
fclose($data);
OC_Hook::emit( OC_Filesystem::CLASSNAME, OC_Filesystem::signal_post_write, array( OC_Filesystem::signal_param_path => $path));
return true;
return $count>0;
}else{
return false;
}
@ -204,9 +202,7 @@ class OC_FilesystemView {
}else{
$source=$this->fopen($path1,'r');
$target=$this->fopen($path2,'w');
while (!feof($source)){
fwrite($target,fread($source,8192));
}
$count=OC_Helper::streamCopy($data,$target);
$storage1=$this->getStorage($path1);
$storage1->unlink($this->getInternalPath($path1));
}
@ -236,11 +232,7 @@ class OC_FilesystemView {
}else{
$source=$this->fopen($path1,'r');
$target=$this->fopen($path2,'w');
if($target and $source){
while (!feof($source)){
fwrite($target,fread($source,8192));
}
}
$count=OC_Helper::streamCopy($data,$target);
}
OC_Hook::emit( OC_Filesystem::CLASSNAME, OC_Filesystem::signal_post_copy, array( OC_Filesystem::signal_param_oldpath => $path1 , OC_Filesystem::signal_param_newpath=>$path2));
if(!$exists){