Micke/roundcubemail-plugins-kolab
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't convert timezone; avoid exporting empty properties

Browse source
This commit is contained in:
Thomas Bruederli 2013-07-24 18:05:04 +02:00
parent 3780f04f71
commit cbc2d067ea
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
plugins/libcalendaring/libvcalendar.php
View file

@ -53,7 +53,7 @@ class libvcalendar
require_once(__DIR__ . '/lib/Sabre/VObject/includes.php');
}
$this->timezone = $tz ? $tz : new DateTimezone('UTC');
$this->timezone = $tz;
$this->prodid = '-//Roundcube//Roundcube libcalendaring ' . RCUBE_VERSION . '//Sabre//Sabre VObject ' . VObject\Version::VERSION . '//EN';
}
@ -325,7 +325,7 @@ class libvcalendar
else if (strlen($prop->value) && strtoupper($params['VALUE']) == 'BINARY') {
$attachment = self::map_keys($params, array('FMTTYPE' => 'mimetype', 'X-LABEL' => 'name'));
$attachment['data'] = base64_decode($prop->value);
$attachment['size'] = strlen($attachment['content']);
$attachment['size'] = strlen($attachment['data']);
$event['attachments'][] = $attachment;
}
break;
@ -404,14 +404,16 @@ class libvcalendar
// assign current timezone to event start/end
if ($event['start'] instanceof DateTime) {
$event['start']->setTimezone($this->timezone);
if ($this->timezone)
$event['start']->setTimezone($this->timezone);
}
else {
unset($event['start']);
}
if ($event['end'] instanceof DateTime) {
$event['end']->setTimezone($this->timezone);
if ($this->timezone)
$event['end']->setTimezone($this->timezone);
}
else {
unset($event['end']);
@ -643,10 +645,11 @@ class libvcalendar
if ($attendee['role'] == 'ORGANIZER') {
if (empty($event['organizer']))
$event['organizer'] = $attendee;
continue;
}
$attendee['rsvp'] = $attendee['rsvp'] ? 'TRUE' : null;
$ve->add('ATTENDEE', 'mailto:' . $attendee['email'], self::map_keys($attendee, $this->attendee_keymap));
else if (!empty($attendee['email'])) {
$attendee['rsvp'] = $attendee['rsvp'] ? 'TRUE' : null;
$ve->add('ATTENDEE', 'mailto:' . $attendee['email'], self::map_keys($attendee, $this->attendee_keymap));
}
}
if ($event['organizer']) {
@ -654,7 +657,9 @@ class libvcalendar
}
foreach ((array)$event['url'] as $url) {
$ve->add('URL', $url);
if (!empty($url)) {
$ve->add('URL', $url);
}
}
if (!empty($event['parent_id'])) {