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

Only one VTIMEZONE per VCALENDAR; Export Alarms again

Browse Source
This commit is contained in:
Jörg Lehrke 2009-10-30 21:39:19 +00:00
parent 6989d59ba6
commit 85a9a06a96
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -257,6 +257,11 @@ class calendar_ical extends calendar_boupdate
$servertime = true; $servertime = true;
$serverTZ = true; $serverTZ = true;
} }
if ($serverTZ)
{
// Add only one instance
$serverTZ = $this->generate_vtimezone($event, $vcal);
}
} }
if ($this->productManufacturer != 'file' && $this->uidExtension) if ($this->productManufacturer != 'file' && $this->uidExtension)
@ -270,11 +275,6 @@ class calendar_ical extends calendar_boupdate
$vevent = Horde_iCalendar::newComponent('VEVENT', $vcal); $vevent = Horde_iCalendar::newComponent('VEVENT', $vcal);
$parameters = $attributes = $values = array(); $parameters = $attributes = $values = array();
if ($serverTZ)
{
$serverTZ = $this->generate_vtimezone($event, $vcal);
}
if ($this->productManufacturer == 'sonyericsson') if ($this->productManufacturer == 'sonyericsson')
{ {
$eventDST = date('I', $event['start']); $eventDST = date('I', $event['start']);
@ -685,8 +685,8 @@ class calendar_ical extends calendar_boupdate
$attributes['DTSTAMP'] = time(); $attributes['DTSTAMP'] = time();
foreach ($event['alarm'] as $alarmID => $alarmData) foreach ($event['alarm'] as $alarmID => $alarmData)
{ {
// skip alarms being set for all users or alarms owned by other users // skip alarms not being set for all users and alarms owned by other users
if ($alarmData['all'] == true || $alarmData['owner'] != $this->user) if ($alarmData['all'] != true && $alarmData['owner'] != $this->user)
{ {
continue; continue;
} }