holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix EXDATE issue for Apple devices

Browse Source
This commit is contained in:
Jörg Lehrke 2010-08-26 20:28:54 +00:00
parent 7be62b431f
commit f91095f2ec
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -663,16 +663,19 @@ class calendar_ical extends calendar_boupdate
{ {
if (empty($event['whole_day'])) if (empty($event['whole_day']))
{ {
$value_type = 'DATE-TIME';
foreach ($event['recur_exception'] as $key => $timestamp) foreach ($event['recur_exception'] as $key => $timestamp)
{ {
$event['recur_exception'][$key] = self::getDateTime($timestamp,$tzid,$parameters['EXDATE']); $event['recur_exception'][$key] = self::getDateTime($timestamp,$tzid,$parameters['EXDATE']);
} }
if ($version != '1.0')
{
$parameters['EXDATE']['VALUE'] = 'DATE-TIME';
if (!empty($tzid)) $parameters['EXDATE']['TZID'] = $tzid;
}
} }
else else
{ {
// use 'DATE' instead of 'DATE-TIME' on whole day events // use 'DATE' instead of 'DATE-TIME' on whole day events
$value_type = 'DATE';
foreach ($event['recur_exception'] as $id => $timestamp) foreach ($event['recur_exception'] as $id => $timestamp)
{ {
$time = new egw_time($timestamp,egw_time::$server_timezone); $time = new egw_time($timestamp,egw_time::$server_timezone);
@ -685,13 +688,20 @@ class calendar_ical extends calendar_boupdate
); );
} }
$event['recur_exception'] = $days; $event['recur_exception'] = $days;
if ($version != '1.0') $parameters['EXDATE']['VALUE'] = 'DATE';
} }
if ($this->productManufacturer == 'groupdav' &&
($this->productName == 'iphone' || $this->productName == 'davkit'))
{
foreach ($event['recur_exception'] as $exdate)
{
$vevent->setAttribute('EXDATE', $exdate, $parameters['EXDATE']);
}
}
else
{
$attributes['EXDATE'] = ''; $attributes['EXDATE'] = '';
$values['EXDATE'] = $event['recur_exception']; $values['EXDATE'] = $event['recur_exception'];
if ($version != '1.0')
{
$parameters['EXDATE']['VALUE'] = $value_type;
} }
} }
break; break;