wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix saved file size for uploaded files

Browse source
This commit is contained in:
Robin Appelman 2012-06-21 18:07:56 +02:00
parent d0455c5819
commit 56de98ed8c
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
apps/files_encryption/lib/cryptstream.php
View file

@ -115,8 +115,9 @@ class OC_CryptStream{
$data=substr($block,0,$currentPos%8192).$data;
fseek($this->source,-($currentPos%8192),SEEK_CUR);
}
while(strlen($data)>0){
if(strlen($data)<8192){
$currentPos=ftell($this->source);
while($remainingLength=strlen($data)>0){
if($remainingLength<8192){
$this->writeCache=$data;
$data='';
}else{
@ -125,8 +126,7 @@ class OC_CryptStream{
$data=substr($data,8192);
}
}
$currentPos=ftell($this->source);
$this->size=max($this->size,$currentPos);
$this->size=max($this->size,$currentPos+$length);
return $length;
}

8
lib/filecache.php
View file

@ -72,14 +72,14 @@ class OC_FileCache{
$data=array_merge(OC_FileCache_Cached::$savedData[$path],$data);
unset(OC_FileCache_Cached::$savedData[$path]);
}
if(!isset($data['size']) or !isset($data['mtime'])){//save incomplete data for the next time we write it
OC_FileCache_Cached::$savedData[$path]=$data;
return;
}
if($id!=-1){
self::update($id,$data);
return;
}
if(!isset($data['size']) or !isset($data['mtime'])){//save incomplete data for the next time we write it
OC_FileCache_Cached::$savedData[$path]=$data;
return;
}
if(!isset($data['encrypted'])){
$data['encrypted']=false;
}