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

Minor fixes for attendee display and updates

Browse source
This commit is contained in:
Thomas Bruederli 2014-08-06 15:21:32 +02:00
parent fa3377cf20
commit 435b4483ec
3 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
plugins/calendar/calendar.php
View file

@ -978,7 +978,7 @@ class calendar extends rcube_plugin
$data = $this->driver->get_event_changelog($event);
if (is_array($data) && !empty($data)) {
$lib = $this->lib;
array_walk($data, function($change) use ($lib) {
array_walk($data, function(&$change) use ($lib) {
if ($change['date']) {
$dt = $lib->adjust_timezone($change['date']);
if ($dt instanceof DateTime)
@ -1720,6 +1720,8 @@ class calendar extends rcube_plugin
$owner = $i;
else if (!isset($attendee['rsvp']))
$event['attendees'][$i]['rsvp'] = true;
else if (is_string($attendee['rsvp']))
$event['attendees'][$i]['rsvp'] = $attendee['rsvp'] == 'true' || $attendee['rsvp'] == '1';
}
// set new organizer identity

2
plugins/calendar/calendar_ui.js
View file

@ -619,7 +619,7 @@ function rcube_calendar_ui(settings)
var dispname = Q(data.name || data.email), tooltip = '';
if (data.email) {
tooltip = data.email;
tooltip = data.email + '; ' + data.status;
dispname = '<a href="mailto:' + data.email + '" class="mailtolink" data-cutype="' + data.cutype + '">' + dispname + '</a>';
}

16
plugins/calendar/drivers/kolab/kolab_driver.php
View file

@ -1326,6 +1326,17 @@ class kolab_driver extends calendar_driver
$record['attachments'] = $attachments;
}
if (!empty($record['attendees'])) {
foreach ((array)$record['attendees'] as $i => $attendee) {
if (is_array($attendee['delegated-from'])) {
$record['attendees'][$i]['delegated-from'] = join(', ', $attendee['delegated-from']);
}
if (is_array($attendee['delegated-to'])) {
$record['attendees'][$i]['delegated-to'] = join(', ', $attendee['delegated-to']);
}
}
}
// Roundcube only supports one category assignment
if (is_array($record['categories']))
$record['categories'] = $record['categories'][0];
@ -1543,11 +1554,6 @@ class kolab_driver extends calendar_driver
$uid = $event;
}
// FIXME: hard-code UID for static Bonnie API demo
$demo_uids = $this->rc->config->get('kolab_static_bonnie_uids', array('0015c5fe-9baf-0561-11e3-d584fa2894b7'));
if (!in_array($uid, $demo_uids))
$uid = reset($demo_uids);
return array($uid, $mailbox);
}