From 26dfcecf054e19616f198872b66c7645270f4430 Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Mon, 20 Jan 2014 06:28:38 +0000 Subject: Prevent zids messing up dav --- include/reddav.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'include/reddav.php') 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) { -- cgit v1.2.3