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

Set RSVP=FALSE when answering to an event RSVP in calendar view

Browse source
This commit is contained in:
Thomas Bruederli 2015-02-09 15:25:10 +01:00
parent ad67a1c7b9
commit 49280a6f62
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
plugins/calendar/calendar.php
View file

@ -970,6 +970,7 @@ class calendar extends rcube_plugin
$status = rcube_utils::get_input_value('status', rcube_utils::INPUT_GPC); $status = rcube_utils::get_input_value('status', rcube_utils::INPUT_GPC);
$reply_comment = $event['comment']; $reply_comment = $event['comment'];
$this->write_preprocess($event, 'edit');
$ev = $this->driver->get_event($event); $ev = $this->driver->get_event($event);
$ev['attendees'] = $event['attendees']; $ev['attendees'] = $event['attendees'];
$ev['free_busy'] = $event['free_busy']; $ev['free_busy'] = $event['free_busy'];
@ -1885,7 +1886,7 @@ class calendar extends rcube_plugin
$organizer = $i; $organizer = $i;
if ($attendee['email'] == in_array(strtolower($attendee['email']), $emails)) if ($attendee['email'] == in_array(strtolower($attendee['email']), $emails))
$owner = $i; $owner = $i;
else if (!isset($attendee['rsvp'])) if (!isset($attendee['rsvp']))
$event['attendees'][$i]['rsvp'] = true; $event['attendees'][$i]['rsvp'] = true;
else if (is_string($attendee['rsvp'])) else if (is_string($attendee['rsvp']))
$event['attendees'][$i]['rsvp'] = $attendee['rsvp'] == 'true' || $attendee['rsvp'] == '1'; $event['attendees'][$i]['rsvp'] = $attendee['rsvp'] == 'true' || $attendee['rsvp'] == '1';

3
plugins/calendar/calendar_ui.js
View file

@ -2387,13 +2387,12 @@ function rcube_calendar_ui(settings)
data = me.selected_event.attendees[i]; data = me.selected_event.attendees[i];
if (settings.identity.emails.indexOf(';'+String(data.email).toLowerCase()) >= 0) { if (settings.identity.emails.indexOf(';'+String(data.email).toLowerCase()) >= 0) {
data.status = response.toUpperCase(); data.status = response.toUpperCase();
data.rsvp = 0; // unset RSVP flag
if (data.status == 'DELEGATED') { if (data.status == 'DELEGATED') {
data['delegated-to'] = delegate.to; data['delegated-to'] = delegate.to;
} }
else { else {
delete data.rsvp; // unset RSVP flag
if (data['delegated-to']) { if (data['delegated-to']) {
delete data['delegated-to']; delete data['delegated-to'];
if (data.role == 'NON-PARTICIPANT' && data.status != 'DECLINED') if (data.role == 'NON-PARTICIPANT' && data.status != 'DECLINED')