extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-26 16:48:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

* Calendar/eSync/eMail: fix not working accept/reject on calendar items (mails was working before)

Browse Source
This commit is contained in:
Ralf Becker 2012-09-25 15:07:54 +00:00
parent 3b7a0171c8
commit 4ae5bfb875
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
calendar/inc/class.calendar_activesync.inc.php
View File

@ -388,12 +388,12 @@ return array(); // temporary disabling meeting requests from calendar
* Process response to meeting request * Process response to meeting request
* *
* @see BackendDiff::MeetingResponse() * @see BackendDiff::MeetingResponse()
* @param int|string $requestid uid of mail with meeting request, or < 0 for cal_id, or string with iCal from fmail plugin
* @param string $folderid folder of meeting request mail * @param string $folderid folder of meeting request mail
* @param int|string $requestid cal_id, or string with iCal from fmail plugin
* @param int $response 1=accepted, 2=tentative, 3=decline * @param int $response 1=accepted, 2=tentative, 3=decline
* @return int|boolean id of calendar item, false on error * @return int|boolean id of calendar item, false on error
*/ */
function MeetingResponse($requestid, $folderid, $response) function MeetingResponse($folderid, $requestid, $response)
{ {
if (!isset($this->calendar)) $this->calendar = new calendar_boupdate(); if (!isset($this->calendar)) $this->calendar = new calendar_boupdate();
@ -432,11 +432,6 @@ return array(); // temporary disabling meeting requests from calendar
return false; return false;
} }
} }
elseif($requestid > 0) // uid from mail --> let fmail plugin call us
{
debugLog(__METHOD__."('$requestid', '$folderid', $response) returning NULL (fmail uid)");
return null;
}
elseif (!($event = $this->calendar->read(abs($requestid), 0, false, 'server'))) elseif (!($event = $this->calendar->read(abs($requestid), 0, false, 'server')))
{ {
debugLog(__METHOD__."('$requestid', '$folderid', $response) returning FALSE"); debugLog(__METHOD__."('$requestid', '$folderid', $response) returning FALSE");