From 49280a6f62f487b5099a8e7a21271de83f6772ca Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <bruederli@kolabsys.com>
Date: Mon, 9 Feb 2015 15:25:10 +0100
Subject: [PATCH] Set RSVP=FALSE when answering to an event RSVP in calendar
 view

---
 plugins/calendar/calendar.php   | 3 ++-
 plugins/calendar/calendar_ui.js | 3 +--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/calendar/calendar.php b/plugins/calendar/calendar.php
index 25af040a..a4d3f48d 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 8e903c5e..a8c01acb 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')