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

handle old files with partial paths

Browse Source
This commit is contained in:
redmatrix 2015-11-05 16:28:10 -08:00
parent 001e4276d3
commit a26d8609a9
3 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/RedDAV/RedDirectory.php
View File

@ -251,7 +251,7 @@ class RedDirectory extends DAV\Node implements DAV\ICollection, DAV\IQuota {
intval($filesize), intval($filesize),
intval(0), intval(0),
intval($is_photo), intval($is_photo),
dbesc($this->os_path . '/' . $hash), dbesc($f),
dbesc(datetime_convert()), dbesc(datetime_convert()),
dbesc(datetime_convert()), dbesc(datetime_convert()),
dbesc($allow_cid), dbesc($allow_cid),

12
include/RedDAV/RedFile.php
View File

@ -126,7 +126,11 @@ class RedFile extends DAV\Node implements DAV\IFile {
} }
} }
$fname = dbunescbin($d[0]['data']); $fname = dbunescbin($d[0]['data']);
$f = 'store/' . $this->auth->owner_nick . '/' . (($fname) ? $fname : ''); if(strpos($fname,'store') === false)
$f = 'store/' . $this->auth->owner_nick . '/' . (($fname) ? $fname : '');
else
$f = $fname;
// @todo check return value and set $size directly // @todo check return value and set $size directly
@file_put_contents($f, $data); @file_put_contents($f, $data);
$size = @filesize($f); $size = @filesize($f);
@ -226,7 +230,11 @@ class RedFile extends DAV\Node implements DAV\IFile {
} }
if (intval($r[0]['os_storage'])) { if (intval($r[0]['os_storage'])) {
$f = 'store/' . $this->auth->owner_nick . '/' . (($this->os_path) ? $this->os_path . '/' : '') . dbunescbin($r[0]['data']); $x = dbunsecbin($r[0]['data']);
if(strpos($x,'store') === false)
$f = 'store/' . $this->auth->owner_nick . '/' . (($this->os_path) ? $this->os_path . '/' : '') . $x;
else
$f = $x;
return fopen($f, 'rb'); return fopen($f, 'rb');
} }
return dbunescbin($r[0]['data']); return dbunescbin($r[0]['data']);

10
include/attach.php
View File

@ -1270,9 +1270,13 @@ function attach_delete($channel_id, $resource, $is_photo = 0) {
); );
if($y) { if($y) {
$f = 'store/' . $channel_address . '/' . $y[0]['data']; if(strpos($y[0]['data'],'store') === false)
if(is_dir($y[0]['data'])) $f = 'store/' . $channel_address . '/' . $y[0]['data'];
@rmdir($y[0]['data']); else
$f = $y[0]['data'];
if(is_dir($f))
@rmdir($f);
elseif(file_exists($f)) elseif(file_exists($f))
unlink($f); unlink($f);
} }