extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-22 16:03:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

* CalDAC fix for aCal Android client sending DTSTART+DURATION instead of DTSTART+DTEND

Browse Source 
- for new events, allways add owner as participant. Users expect to participate too, if they invite further participants
This commit is contained in:
Ralf Becker 2011-10-03 09:43:06 +00:00
parent b706d7d13d
commit 58f4cc1405
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
calendar/inc/class.calendar_ical.inc.php
View File

@ -1382,11 +1382,15 @@ class calendar_ical extends calendar_boupdate
if (!$event['participants']
|| !is_array($event['participants'])
|| !count($event['participants']))
|| !count($event['participants'])
// for new events, allways add owner as participant. Users expect to participate too, if they invite further participants.
// They can now only remove themselfs, if that is desired, after storing the event first.
|| !isset($event['participants'][$event['owner']]))
{
$status = $event['owner'] == $this->user ? 'A' : 'U';
$status = calendar_so::combine_status($status, 1, 'CHAIR');
$event['participants'] = array($event['owner'] => $status);
if (!is_array($event['participants'])) $event['participants'] = array();
$event['participants'][$event['owner']] = $status;
}
else
{
@ -2343,6 +2347,16 @@ class calendar_ical extends calendar_boupdate
{
switch ($attributes['name'])
{
case 'DURATION': // clients can use DTSTART+DURATION, instead of DTSTART+DTEND
if (!isset($vcardData['end']))
{
$vcardData['end'] = $vcardData['start'] + $attributes['value'];
}
else
{
error_log(__METHOD__."() find DTEND AND DURATION --> ignoring DURATION");
}
break;
case 'AALARM':
case 'DALARM':
$alarmTime = $attributes['value'];