From 950c7f24fa7846c27fccda8855e99fbf3a13bd8a Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Sun, 19 Jun 2011 08:56:42 +0000 Subject: [PATCH] * CalDAV: handle deleted events, as not existing (404 Not Found) --- calendar/inc/class.calendar_groupdav.inc.php | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/calendar/inc/class.calendar_groupdav.inc.php b/calendar/inc/class.calendar_groupdav.inc.php index e3b52040ac..a71532709a 100644 --- a/calendar/inc/class.calendar_groupdav.inc.php +++ b/calendar/inc/class.calendar_groupdav.inc.php @@ -787,11 +787,22 @@ error_log(__METHOD__."($path,,".array2string($start).") filter=".array2string($f { if ($this->debug > 1) error_log("bo-ical read :$id:"); $event = $this->bo->read($id, null, true, 'server'); - if (!($retval = $this->bo->check_perms(EGW_ACL_FREEBUSY, $event, 0, 'server'))) return $retval; + + if (!($retval = $this->bo->check_perms(EGW_ACL_FREEBUSY,$event, 0, 'server'))) + { + if ($this->debug > 0) error_log(__METHOD__."($id) no READ or FREEBUSY rights returning ".array2string($retval)); + return $retval; + } + if (!$this->bo->check_perms(EGW_ACL_READ, $event, 0, 'server')) { $this->bo->clear_private_infos($event, array($this->bo->user, $event['owner'])); } + // handle deleted events, as not existing + if ($event['deleted']) $event = null; + + if ($this->debug > 1) error_log(__METHOD__."($id) returning ".array2string($event)); + return $event; }