From c76b39f8d4ec3b70cc682d42a9e21e43963993d7 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Thu, 26 May 2011 16:50:31 +0000
Subject: [PATCH] fixed typo preventing meeting responses

---
 calendar/inc/class.calendar_activesync.inc.php | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/calendar/inc/class.calendar_activesync.inc.php b/calendar/inc/class.calendar_activesync.inc.php
index 7af8b7307b..a6ee65b47f 100644
--- a/calendar/inc/class.calendar_activesync.inc.php
+++ b/calendar/inc/class.calendar_activesync.inc.php
@@ -396,10 +396,10 @@ return array();	// temporary disabling meeting requests from calendar
 		$status = isset($as2status[$response]) ? $as2status[$response] : 'U';
 		$uid = $GLOBALS['egw_info']['user']['account_id'];
 
-		if (!is_numeric($event))	// iCal from fmail
+		if (!is_numeric($requestid))	// iCal from fmail
 		{
 			$ical = new calendar_ical();
-			if (!($events = $ical->icaltoegw($data['attachment'], '', 'utf-8')) || count($events) != 1)
+			if (!($events = $ical->icaltoegw($requestid, '', 'utf-8')) || count($events) != 1)
 			{
 				debugLog(__METHOD__."('$event') error parsing iCal!");
 				return null;
@@ -414,9 +414,14 @@ return array();	// temporary disabling meeting requests from calendar
 			}
 			elseif(!isset($event['participants'][$uid]))
 			{
-				debugLog(__METHOD__.'('.array2string($requestid).", $folderid, $response) current user is NO participant!");
+				debugLog(__METHOD__.'('.array2string($requestid).", $folderid, $response) current user ($uid) is NO participant of event ".array2string($event));
 				// maybe we should silently add him, as he might not have the rights to add him himself with calendar->update ...
 			}
+			elseif($event['deleted'])
+			{
+				debugLog(__METHOD__.'('.array2string($requestid).", $folderid, $response) event ($uid) deleted on server --> return false");
+				return false;
+			}
 		}
 		elseif($requestid > 0)	// uid from mail --> let fmail plugin call us
 		{