harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

other reddav issues, but probably won't fix the empty file

Browse Source
This commit is contained in:
friendica 2014-01-10 13:47:56 -08:00
parent daec9b8767
commit 0ce3e7235a
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/reddav.php
View File

@ -322,7 +322,7 @@ class RedFile extends DAV\Node implements DAV\IFile {
logger('RedFile::put: ' . basename($this->name), LOGGER_DEBUG); logger('RedFile::put: ' . basename($this->name), LOGGER_DEBUG);
$r = q("select flags, data from attach where hash = '%s' and uid = %d limit 1", $r = q("select flags, data from attach where hash = '%s' and uid = %d limit 1",
dbesc($hash), dbesc($this->data['hash']),
intval($c[0]['channel_id']) intval($c[0]['channel_id'])
); );
if($r) { if($r) {
@ -330,6 +330,7 @@ class RedFile extends DAV\Node implements DAV\IFile {
$f = 'store/' . $this->auth->owner_nick . '/' . (($r[0]['data']) ? $r[0]['data'] . '/' : ''); $f = 'store/' . $this->auth->owner_nick . '/' . (($r[0]['data']) ? $r[0]['data'] . '/' : '');
@file_put_contents($f, $data); @file_put_contents($f, $data);
$size = @filesize($f); $size = @filesize($f);
logger('reddav: put() filename: ' . $f . ' size: ' . $size, LOGGER_DEBUG);
} }
else { else {
$r = q("update attach set data = '%s' where hash = '%s' and uid = %d limit 1", $r = q("update attach set data = '%s' where hash = '%s' and uid = %d limit 1",
@ -348,7 +349,7 @@ class RedFile extends DAV\Node implements DAV\IFile {
$r = q("update attach set filesize = '%s' where hash = '%s' and uid = %d limit 1", $r = q("update attach set filesize = '%s' where hash = '%s' and uid = %d limit 1",
dbesc($size), dbesc($size),
dbesc($hash), dbesc($this->data['hash']),
intval($c[0]['channel_id']) intval($c[0]['channel_id'])
); );
@ -356,7 +357,7 @@ class RedFile extends DAV\Node implements DAV\IFile {
$maxfilesize = get_config('system','maxfilesize'); $maxfilesize = get_config('system','maxfilesize');
if(($maxfilesize) && ($size > $maxfilesize)) { if(($maxfilesize) && ($size > $maxfilesize)) {
attach_delete($c[0]['channel_id'],$hash); attach_delete($c[0]['channel_id'],$this->data['hash']);
return; return;
} }
@ -366,7 +367,7 @@ class RedFile extends DAV\Node implements DAV\IFile {
intval($c[0]['channel_account_id']) intval($c[0]['channel_account_id'])
); );
if(($x) && ($x[0]['total'] + $size > $limit)) { if(($x) && ($x[0]['total'] + $size > $limit)) {
attach_delete($c[0]['channel_id'],$hash); attach_delete($c[0]['channel_id'],$this->data['hash']);
return; return;
} }
} }