From 47b8071ca7968ea489bd00c0746a2be39d6a6f2d Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Wed, 15 Jan 2014 03:12:47 -0800
Subject: dav: throw exception if channel for requested DAV directory is
 deleted

---
 include/reddav.php | 30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

(limited to 'include/reddav.php')

diff --git a/include/reddav.php b/include/reddav.php
index d00980011..c2dd07c5f 100644
--- a/include/reddav.php
+++ b/include/reddav.php
@@ -100,11 +100,11 @@ class RedDirectory extends DAV\Node implements DAV\ICollection {
 		$mimetype = z_mime_content_type($name);
 
 
-		$c = q("select * from channel where channel_id = %d limit 1",
+		$c = q("select * from channel where channel_id = %d and not (channel_pageflags & %d) limit 1",
+			intval(PAGE_REMOVED),
 			intval($this->auth->owner_id)
 		);
 
-
 		if(! $c) {
 			logger('createFile: no channel');
 			throw new DAV\Exception\Forbidden('Permission denied.');
@@ -180,8 +180,9 @@ class RedDirectory extends DAV\Node implements DAV\ICollection {
 			return;
 		}
 
-		$r = q("select * from channel where channel_id = %d limit 1",
-			dbesc($this->auth->owner_id)
+		$r = q("select * from channel where channel_id = %d and not (channel_pageflags & %d) limit 1",
+			intval(PAGE_REMOVED),
+			intval($this->auth->owner_id)
 		);
 
 		if($r) {
@@ -233,13 +234,17 @@ class RedDirectory extends DAV\Node implements DAV\ICollection {
 
 		$channel_name = $path_arr[0];
 
-		$r = q("select channel_id from channel where channel_address = '%s' limit 1",
-			dbesc($channel_name)
+
+		$r = q("select channel_id from channel where channel_address = '%s' and not ( channel_pageflags & %d ) limit 1",
+			dbesc($channel_name),
+			intval(PAGE_REMOVED)
 		);
 
-		if(! $r)
-			return;
+		if(! $r) {
+			throw new DAV\Exception\NotFound('The file with name: ' . $channel_name . ' could not be found');
 
+			return;
+		}
 		$channel_id = $r[0]['channel_id'];
 		$this->auth->owner_id = $channel_id;
 		$this->auth->owner_nick = $channel_name;
@@ -322,8 +327,8 @@ class RedFile extends DAV\Node implements DAV\IFile {
 	function put($data) {
 		logger('RedFile::put: ' . basename($this->name), LOGGER_DEBUG);
 
-
-		$c = q("select * from channel where channel_id = %d limit 1",
+		$c = q("select * from channel where channel_id = %d and not (channel_pageflags & %d) limit 1",
+			intval(PAGE_REMOVED),
 			intval($this->auth->owner_id)
 		);
 
@@ -440,8 +445,9 @@ function RedChannelList(&$auth) {
 
 	$ret = array();
 
-	$r = q("select channel_id, channel_address from channel where not (channel_pageflags & %d)",
-		intval(PAGE_REMOVED)
+	$r = q("select channel_id, channel_address from channel where not (channel_pageflags & %d) and not (channel_pageflags & %d) ",
+		intval(PAGE_REMOVED),
+		intval(PAGE_HIDDEN)
 	);
 
 	if($r) {
-- 
cgit v1.2.3