plugins/calendar
Thomas Brüderli
bruederli at kolabsys.com
Mon Feb 9 15:25:18 CET 2015
plugins/calendar/calendar.php | 3 ++-
plugins/calendar/calendar_ui.js | 3 +--
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 49280a6f62f487b5099a8e7a21271de83f6772ca
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date: Mon Feb 9 15:25:10 2015 +0100
Set RSVP=FALSE when answering to an event RSVP in calendar view
diff --git a/plugins/calendar/calendar.php b/plugins/calendar/calendar.php
index 25af040..a4d3f48 100644
--- a/plugins/calendar/calendar.php
+++ b/plugins/calendar/calendar.php
@@ -970,6 +970,7 @@ class calendar extends rcube_plugin
$status = rcube_utils::get_input_value('status', rcube_utils::INPUT_GPC);
$reply_comment = $event['comment'];
+ $this->write_preprocess($event, 'edit');
$ev = $this->driver->get_event($event);
$ev['attendees'] = $event['attendees'];
$ev['free_busy'] = $event['free_busy'];
@@ -1885,7 +1886,7 @@ class calendar extends rcube_plugin
$organizer = $i;
if ($attendee['email'] == in_array(strtolower($attendee['email']), $emails))
$owner = $i;
- else if (!isset($attendee['rsvp']))
+ 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';
diff --git a/plugins/calendar/calendar_ui.js b/plugins/calendar/calendar_ui.js
index 8e903c5..a8c01ac 100644
--- a/plugins/calendar/calendar_ui.js
+++ b/plugins/calendar/calendar_ui.js
@@ -2387,13 +2387,12 @@ function rcube_calendar_ui(settings)
data = me.selected_event.attendees[i];
if (settings.identity.emails.indexOf(';'+String(data.email).toLowerCase()) >= 0) {
data.status = response.toUpperCase();
+ data.rsvp = 0; // unset RSVP flag
if (data.status == 'DELEGATED') {
data['delegated-to'] = delegate.to;
}
else {
- delete data.rsvp; // unset RSVP flag
-
if (data['delegated-to']) {
delete data['delegated-to'];
if (data.role == 'NON-PARTICIPANT' && data.status != 'DECLINED')
More information about the commits
mailing list