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

Update an event on itip-attend page for logged-in users (Bifrost#T27847)

Browse source 
A participant can accept an invitation via link. This works fine
for initial invitation. However, if there is any update for the event
in another invitation request, the event in participant's calendar
was not updated.

Example scenario:
- an organizer invites a participant for specified date/time
- a participant declines the invitation (he's busy on that time),
  the event in participant's calendar will be created
- an organizer updates the event with another date/time
- a participant now accepts the modified event, the event should
  be updated with the new date/time.
This commit is contained in:
Aleksander Machniak 2017-03-28 10:59:58 +02:00
parent 51c1c62bc2
commit 5048c739d5
1 changed files with 33 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
plugins/calendar/calendar.php
View file

@ -2695,15 +2695,47 @@ class calendar extends rcube_plugin
$this->rc->output->command('display_message', $this->gettext('errorsaving'), 'error', -1);
// if user is logged in...
// FIXME: we should really consider removing this functionality
// it's confusing that it creates/updates an event only for logged-in user
// what if the logged-in user is not the same as the attendee?
if ($this->rc->user->ID) {
$this->load_driver();
$invitation = $itip->get_invitation($token);
$existing = $this->driver->get_event($this->event);
// save the event to his/her default calendar if not yet present
if (!$this->driver->get_event($this->event) && ($calendar = $this->get_default_calendar($invitation['event']['sensitivity']))) {
if (!$existing && ($calendar = $this->get_default_calendar($invitation['event']['sensitivity']))) {
$invitation['event']['calendar'] = $calendar['id'];
if ($this->driver->new_event($invitation['event']))
$this->rc->output->command('display_message', $this->gettext(array('name' => 'importedsuccessfully', 'vars' => array('calendar' => $calendar['name']))), 'confirmation');
else
$this->rc->output->command('display_message', $this->gettext('errorimportingevent'), 'error');
}
else if ($existing
&& ($this->event['sequence'] >= $existing['sequence'] || $this->event['changed'] >= $existing['changed'])
&& ($calendar = $this->driver->get_calendar($existing['calendar']))
) {
$this->event = $invitation['event'];
$this->event['id'] = $existing['id'];
unset($this->event['comment']);
// merge attendees status
// e.g. preserve my participant status for regular updates
$this->lib->merge_attendees($this->event, $existing, $status);
// update attachments list
$event['deleted_attachments'] = true;
// show me as free when declined (#1670)
if ($status == 'declined')
$this->event['free_busy'] = 'free';
if ($this->driver->edit_event($this->event))
$this->rc->output->command('display_message', $this->gettext(array('name' => 'updatedsuccessfully', 'vars' => array('calendar' => $calendar->get_name()))), 'confirmation');
else
$this->rc->output->command('display_message', $this->gettext('errorimportingevent'), 'error');
}
}
}