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

some dav cleanup

Browse Source
This commit is contained in:
friendica 2014-01-05 16:37:07 -08:00
parent 061894d37f
commit 0297241a64
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
include/reddav.php
View File

@ -104,13 +104,13 @@ class RedDirectory extends DAV\Node implements DAV\ICollection {
return; return;
} }
if(! perm_is_allowed($this->auth->channel_id,$this->auth->observer,'view_storage')) { if(($this->auth->owner_id) && (! perm_is_allowed($this->auth->owner_id,$this->auth->observer,'view_storage'))) {
throw new DAV\Exception\Forbidden('Permission denied.'); throw new DAV\Exception\Forbidden('Permission denied.');
return; return;
} }
return RedCollectionData($this->red_path,$this->auth); $contents = RedCollectionData($this->red_path,$this->auth);
return $contents;
} }
@ -469,9 +469,9 @@ logger('dbg1: ' . print_r($r,true));
$folder = ''; $folder = '';
for($x = 1; $x < count($path_arr); $x ++) { for($x = 1; $x < count($path_arr); $x ++) {
$r = q("select id, hash, filename, flags from attach where folder = '%s' and (flags & %d)", $r = q("select id, hash, filename, flags from attach where folder = '%s' and filename = '%s' and (flags & %d)",
dbesc($folder), dbesc($folder),
intval($channel_id), dbesc($path_arr[$x]),
intval(ATTACH_FLAG_DIR) intval(ATTACH_FLAG_DIR)
); );
if($r && ( $r[0]['flags'] & ATTACH_FLAG_DIR)) { if($r && ( $r[0]['flags'] & ATTACH_FLAG_DIR)) {
@ -567,8 +567,9 @@ logger('file=' . $file);
for($x = 1; $x < count($path_arr); $x ++) { for($x = 1; $x < count($path_arr); $x ++) {
dbg(1); dbg(1);
$r = q("select id, hash, filename, flags from attach where folder = '%s' and uid = %d and (flags & %d) $perms", $r = q("select id, hash, filename, flags from attach where folder = '%s' and filename = '%s' and uid = %d and (flags & %d) $perms",
dbesc($folder), dbesc($folder),
dbesc($path_arr[$x]),
intval($channel_id), intval($channel_id),
intval(ATTACH_FLAG_DIR) intval(ATTACH_FLAG_DIR)
); );