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

Fix event comparison; use charset headers from mime part for ical import

Browse source
This commit is contained in:
Thomas 2011-08-04 23:56:48 +02:00
parent 8c36e7d88f
commit 8264a7c60b
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
plugins/calendar/calendar.php
View file

@ -1513,7 +1513,7 @@ class calendar extends rcube_plugin
public static function event_diff($a, $b) public static function event_diff($a, $b)
{ {
$diff = array(); $diff = array();
$ignore = array('attachments' => 1); $ignore = array('changed' => 1, 'attachments' => 1);
foreach (array_unique(array_merge(array_keys($a), array_keys($b))) as $key) { foreach (array_unique(array_merge(array_keys($a), array_keys($b))) as $key) {
if (!$ignore[$key] && $a[$key] != $b[$key]) if (!$ignore[$key] && $a[$key] != $b[$key])
$diff[] = $key; $diff[] = $key;
@ -1556,9 +1556,11 @@ class calendar extends rcube_plugin
} }
$html = ''; $html = '';
foreach ($this->ics_parts as $part) { foreach ($this->ics_parts as $mime_id) {
$this->load_ical(); $this->load_ical();
$events = $this->ical->import($this->message->get_part_content($part)); $part = $this->message->mime_parts[$mime_id];
$charset = $part->ctype_parameters['charset'] ? $part->ctype_parameters['charset'] : RCMAIL_CHARSET;
$events = $this->ical->import($this->message->get_part_content($mime_id), $charset);
// successfully parsed events? // successfully parsed events?
if (empty($events)) if (empty($events))
@ -1573,7 +1575,7 @@ class calendar extends rcube_plugin
html::tag('input', array( html::tag('input', array(
'type' => 'button', 'type' => 'button',
'class' => 'button', 'class' => 'button',
'onclick' => "rcube_calendar.add_event_from_mail('" . JQ($part.':'.$idx) . "', '" . JQ($event['title']) . "')", 'onclick' => "rcube_calendar.add_event_from_mail('" . JQ($mime_id.':'.$idx) . "', '" . JQ($event['title']) . "')",
'value' => $this->gettext('importtocalendar'), 'value' => $this->gettext('importtocalendar'),
)) ))
); );
@ -1597,6 +1599,7 @@ class calendar extends rcube_plugin
$uid = get_input_value('_uid', RCUBE_INPUT_POST); $uid = get_input_value('_uid', RCUBE_INPUT_POST);
$mbox = get_input_value('_mbox', RCUBE_INPUT_POST); $mbox = get_input_value('_mbox', RCUBE_INPUT_POST);
$mime_id = get_input_value('_part', RCUBE_INPUT_POST); $mime_id = get_input_value('_part', RCUBE_INPUT_POST);
$charset = RCMAIL_CHARSET;
// establish imap connection // establish imap connection
$this->rc->imap_connect(); $this->rc->imap_connect();
@ -1605,10 +1608,12 @@ class calendar extends rcube_plugin
if ($uid && $mime_id) { if ($uid && $mime_id) {
list($mime_id, $index) = explode(':', $mime_id); list($mime_id, $index) = explode(':', $mime_id);
$part = $this->rc->imap->get_message_part($uid, $mime_id); $part = $this->rc->imap->get_message_part($uid, $mime_id);
if ($part->ctype_parameters['charset'])
$charset = $part->ctype_parameters['charset'];
} }
$this->load_ical(); $this->load_ical();
$events = $this->ical->import($part); $events = $this->ical->import($part, $charset);
$error_msg = $this->gettext('errorimportingevent'); $error_msg = $this->gettext('errorimportingevent');
$success = false; $success = false;