aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Willingham <founder@kakste.com>2014-01-20 06:28:38 +0000
committerThomas Willingham <founder@kakste.com>2014-01-20 06:28:38 +0000
commit26dfcecf054e19616f198872b66c7645270f4430 (patch)
treecdaacae21be74226c8cd8194553debb2993c85b0
parent9fb36df8d981716a6557068b18ee364e62522180 (diff)
downloadvolse-hubzilla-26dfcecf054e19616f198872b66c7645270f4430.tar.gz
volse-hubzilla-26dfcecf054e19616f198872b66c7645270f4430.tar.bz2
volse-hubzilla-26dfcecf054e19616f198872b66c7645270f4430.zip
Prevent zids messing up dav
-rw-r--r--include/reddav.php8
1 files changed, 5 insertions, 3 deletions
diff --git a/include/reddav.php b/include/reddav.php
index 1658e43c4..0d2aac19e 100644
--- a/include/reddav.php
+++ b/include/reddav.php
@@ -50,6 +50,9 @@ class RedDirectory extends DAV\Node implements DAV\ICollection {
function getChild($name) {
logger('RedDirectory::getChild : ' . $name, LOGGER_DATA);
+ $name = str_replace(array('?f=','&f='),array('',''),$name);
+ $name = preg_replace('/[\?&]zid=(.*?)([\?&]|$)/ism','',$name);
+ logger('RedDirectory::getChild post strip zid: ' . $name, LOGGER_DATA);
if(get_config('system','block_public') && (! $this->auth->channel_id) && (! $this->auth->observer)) {
@@ -190,9 +193,8 @@ class RedDirectory extends DAV\Node implements DAV\ICollection {
}
$r = q("select * from channel where channel_id = %d and not (channel_pageflags & %d) limit 1",
- intval($this->auth->owner_id),
- intval(PAGE_REMOVED)
-
+ intval(PAGE_REMOVED),
+ intval($this->auth->owner_id)
);
if($r) {