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

Do not force RSVP on updates to the master event that was truncated by from 'future' save mode (#4950)

Browse source
This commit is contained in:
Thomas Bruederli 2015-03-31 19:13:03 +02:00
parent c43040e4e1
commit 0d2f804e66
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
plugins/calendar/calendar.php
View file

@ -1178,7 +1178,7 @@ class calendar extends rcube_plugin
$master = $this->driver->get_event(array('id' => $old['recurrence_id'], 'calendar' => $old['calendar']), 0, true); $master = $this->driver->get_event(array('id' => $old['recurrence_id'], 'calendar' => $old['calendar']), 0, true);
unset($master['_instance'], $master['recurrence_date']); unset($master['_instance'], $master['recurrence_date']);
$sent = $this->notify_attendees($master, null, $action, $event['_comment']); $sent = $this->notify_attendees($master, null, $action, $event['_comment'], false);
if ($sent < 0) if ($sent < 0)
$this->rc->output->show_message('calendar.errornotifying', 'error'); $this->rc->output->show_message('calendar.errornotifying', 'error');
@ -2005,13 +2005,16 @@ class calendar extends rcube_plugin
/** /**
* Send out an invitation/notification to all event attendees * Send out an invitation/notification to all event attendees
*/ */
private function notify_attendees($event, $old, $action = 'edit', $comment = null) private function notify_attendees($event, $old, $action = 'edit', $comment = null, $rsvp = null)
{ {
if ($action == 'remove' || ($event['status'] == 'CANCELLED' && $old['status'] != $event['status'])) { if ($action == 'remove' || ($event['status'] == 'CANCELLED' && $old['status'] != $event['status'])) {
$event['cancelled'] = true; $event['cancelled'] = true;
$is_cancelled = true; $is_cancelled = true;
} }
if ($rsvp === null)
$rsvp = !$old || $event['sequence'] > $old['sequence'];
$itip = $this->load_itip(); $itip = $this->load_itip();
$emails = $this->get_user_emails(); $emails = $this->get_user_emails();
$itip_notify = (int)$this->rc->config->get('calendar_itip_send_option', $this->defaults['calendar_itip_send_option']); $itip_notify = (int)$this->rc->config->get('calendar_itip_send_option', $this->defaults['calendar_itip_send_option']);
@ -2024,7 +2027,7 @@ class calendar extends rcube_plugin
// compose multipart message using PEAR:Mail_Mime // compose multipart message using PEAR:Mail_Mime
$method = $action == 'remove' ? 'CANCEL' : 'REQUEST'; $method = $action == 'remove' ? 'CANCEL' : 'REQUEST';
$message = $itip->compose_itip_message($event, $method, !$old || $event['sequence'] > $old['sequence']); $message = $itip->compose_itip_message($event, $method, $rsvp);
// list existing attendees from $old event // list existing attendees from $old event
$old_attendees = array(); $old_attendees = array();