@@ -23,8 +23,8 @@

 %global tmpdir %{_var}/lib/roundcubemail

 Name:           roundcubemail-plugins-kolab

-Version:        3.2.5

-Release:        2%{?dist}

+Version:        3.2.6

+Release:        1%{?dist}

 Summary:        Kolab Groupware plugins for Roundcube Webmail

 Group:          Applications/Internet

@@ -177,6 +177,16 @@

 %description -n roundcubemail-plugin-kolab_notes

 Plugin kolab_notes

+%package -n roundcubemail-plugin-kolab_shortcuts

+Summary:        Plugin kolab_shortcuts

+Group:          Applications/Internet

+Requires:       roundcubemail(core) >= %{roundcube_version}

+Requires:       roundcubemail(plugin-kolab_shortcuts-assets) = %{?epoch:%{epoch}:}%{version}-%{release}

+Provides:       roundcubemail(plugin-kolab_shortcuts) = %{?epoch:%{epoch}:}%{version}-%{release}

+

+%description -n roundcubemail-plugin-kolab_shortcuts

+Plugin kolab_shortcuts

+

 %package -n roundcubemail-plugin-kolab_tags

 Summary:        Plugin kolab_tags

 Group:          Applications/Internet

@@ -381,6 +391,14 @@

 %description -n roundcubemail-plugin-kolab_notes-assets

 Plugin kolab_notes Assets

+%package -n roundcubemail-plugin-kolab_shortcuts-assets

+Summary:        Plugin kolab_shortcuts Assets

+Group:          Applications/Internet

+Provides:       roundcubemail(plugin-kolab_shortcuts-assets) = %{?epoch:%{epoch}:}%{version}-%{release}

+

+%description -n roundcubemail-plugin-kolab_shortcuts-assets

+Plugin kolab_shortcuts Assets

+

 %package -n roundcubemail-plugin-kolab_tags-assets

 Summary:        Plugin kolab_tags Assets

 Group:          Applications/Internet

@@ -1258,6 +1276,11 @@

     %{__rm} -f "%{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted"

 fi

+%pre -n roundcubemail-plugin-kolab_shortcuts

+if [ -f "%{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted" ]; then

+    %{__rm} -f "%{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted"

+fi

+

 %pre -n roundcubemail-plugin-kolab_tags

 if [ -f "%{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted" ]; then

     %{__rm} -f "%{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted"

@@ -1453,6 +1476,21 @@

     touch %{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted

 fi

+%posttrans -n roundcubemail-plugin-kolab_shortcuts

+if [ ! -f "%{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted" ]; then

+    if [ -f "%{php_inidir}/apc.ini" ]; then

+        if [ ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc.ini)" ]; then

+%if 0%{?with_systemd}

+            /bin/systemctl condrestart %{httpd_name}.service

+%else

+            /sbin/service %{httpd_name} condrestart

+%endif

+        fi

+    fi

+    %{__mkdir_p} %{_localstatedir}/lib/rpm-state/roundcubemail/

+    touch %{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted

+fi

+

 %posttrans -n roundcubemail-plugin-kolab_tags

 if [ ! -f "%{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted" ]; then

     if [ -f "%{php_inidir}/apc.ini" ]; then

@@ -1674,6 +1712,9 @@

 %files -n roundcubemail-plugin-kolab_notes -f plugin-kolab_notes.files

 %defattr(-,root,root,-)

+%files -n roundcubemail-plugin-kolab_shortcuts -f plugin-kolab_shortcuts.files

+%defattr(-,root,root,-)

+

 %files -n roundcubemail-plugin-kolab_tags -f plugin-kolab_tags.files

 %defattr(-,root,root,-)

@@ -1742,6 +1783,9 @@

 %files -n roundcubemail-plugin-kolab_notes-assets -f plugin-kolab_notes-assets.files

 %defattr(-,root,root,-)

+%files -n roundcubemail-plugin-kolab_shortcuts-assets -f plugin-kolab_shortcuts-assets.files

+%defattr(-,root,root,-)

+

 %files -n roundcubemail-plugin-kolab_tags-assets -f plugin-kolab_tags-assets.files

 %defattr(-,root,root,-)

​

@@ -1,3 +1,9 @@

+roundcubemail-plugins-kolab (1:3.2.6-0~kolab1) unstable; urgency=low

+

+  * Release of version 3.2.6

+

+ -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Sun, 22 Feb 2015 18:41:13 +0200

+

 roundcubemail-plugins-kolab (1:3.2.5-0~kolab2) unstable; urgency=low

   * Removed tmpdir+symlink for odfviewer

​

@@ -841,17 +841,21 @@

     $event  = rcube_utils::get_input_value('e', rcube_utils::INPUT_POST, true);

     $success = $reload = $got_msg = false;

-    // don't notify if modifying a recurring instance (really?)

-    if ($event['_savemode'] && in_array($event['_savemode'], array('current','future')) && $event['_notify'] && $action != 'remove')

-      unset($event['_notify']);

     // force notify if hidden + active

-    else if ((int)$this->rc->config->get('calendar_itip_send_option', $this->defaults['calendar_itip_send_option']) === 1)

+    if ((int)$this->rc->config->get('calendar_itip_send_option', $this->defaults['calendar_itip_send_option']) === 1)

       $event['_notify'] = 1;

     // read old event data in order to find changes

-    if (($event['_notify'] || $event['decline']) && $action != 'new')

+    if (($event['_notify'] || $event['_decline']) && $action != 'new') {

       $old = $this->driver->get_event($event);

+      // load main event when savemode is 'all'

+      if ($event['_savemode'] == 'all' && $old['recurrence_id']) {

+        $old['id'] = $old['recurrence_id'];

+        $old = $this->driver->get_event($old);

+      }

+    }

+

     switch ($action) {

       case "new":

         // create UID for new event

@@ -859,7 +863,9 @@

         $this->write_preprocess($event, $action);

         if ($success = $this->driver->new_event($event)) {

           $event['id'] = $event['uid'];

+          $event['_savemode'] = 'all';

           $this->cleanup_event($event);

+          $this->event_save_success($event, null, $action, true);

         }

         $reload = $success && $event['recurrence'] ? 2 : 1;

         break;

@@ -868,21 +874,15 @@

         $this->write_preprocess($event, $action);

         if ($success = $this->driver->edit_event($event)) {

           $this->cleanup_event($event);

-          if ($success !== true) {

-            $event['id'] = $success;

-            $old = null;

-          }

+          $this->event_save_success($event, $old, $action, $success);

         }

-        $reload =  $success && ($event['recurrence'] || $event['_savemode'] || $event['_fromcalendar']) ? 2 : 1;

+        $reload = $success && ($event['recurrence'] || $event['_savemode'] || $event['_fromcalendar']) ? 2 : 1;

         break;

       case "resize":

         $this->write_preprocess($event, $action);

         if ($success = $this->driver->resize_event($event)) {

-          if ($success !== true) {

-            $event['id'] = $success;

-            $old = null;

-          }

+          $this->event_save_success($event, $old, $action, $success);

         }

         $reload = $event['_savemode'] ? 2 : 1;

         break;

@@ -890,10 +890,7 @@

       case "move":

         $this->write_preprocess($event, $action);

         if ($success = $this->driver->move_event($event)) {

-          if ($success !== true) {

-            $event['id'] = $success;

-            $old = null;

-          }

+          $this->event_save_success($event, $old, $action, $success);

         }

         $reload  = $success && $event['_savemode'] ? 2 : 1;

         break;

@@ -928,8 +925,14 @@

           $got_msg = true;

         }

+        // send cancellation for the main event

+        if ($event['_savemode'] == 'all')

+          unset($old['_instance'], $old['recurrence_date'], $old['recurrence_id']);

+        else if ($event['_savemode'] == 'future')

+          $old['thisandfuture'] = true;

+

         // send iTIP reply that participant has declined the event

-        if ($success && $event['decline']) {

+        if ($success && $event['_decline']) {

           $emails = $this->get_user_emails();

           foreach ($old['attendees'] as $i => $attendee) {

             if ($attendee['role'] == 'ORGANIZER')

@@ -939,7 +942,7 @@

               $reply_sender = $attendee['email'];

             }

           }

-          

+

           $itip = $this->load_itip();

           $itip->set_sender_email($reply_sender);

           if ($organizer && $itip->send_itip_message($old, 'REPLY', $organizer, 'itipsubjectdeclined', 'itipmailbodydeclined'))

@@ -947,6 +950,9 @@

           else

             $this->rc->output->command('display_message', $this->gettext('itipresponseerror'), 'error');

         }

+        else if ($success) {

+          $this->event_save_success($event, $old, $action, $success);

+        }

         break;

       case "undo":

@@ -967,18 +973,20 @@

       case "rsvp":

         $itip_sending  = $this->rc->config->get('calendar_itip_send_option', $this->defaults['calendar_itip_send_option']);

-        $status        = rcube_utils::get_input_value('status', rcube_utils::INPUT_GPC);

+        $status        = rcube_utils::get_input_value('status', rcube_utils::INPUT_POST);

+        $attendees     = rcube_utils::get_input_value('attendees', rcube_utils::INPUT_POST);

         $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'];

+        $ev['_savemode'] = $event['_savemode'];

         // send invitation to delegatee + add it as attendee

         if ($status == 'delegated' && $event['to']) {

           $itip = $this->load_itip();

-          if ($itip->delegate_to($ev, $event['to'], (bool)$event['rsvp'])) {

+          if ($itip->delegate_to($ev, $event['to'], (bool)$event['rsvp'], $attendees)) {

             $this->rc->output->show_message('calendar.itipsendsuccess', 'confirmation');

             $noreply = false;

           }

@@ -986,10 +994,15 @@

         $event = $ev;

-        if ($success = $this->driver->edit_rsvp($event, $status)) {

+        // compose a list of attendees affected by this change

+        $updated_attendees = array_filter(array_map(function($j) use ($event) {

+          return $event['attendees'][$j];

+        }, $attendees));

+

+        if ($success = $this->driver->edit_rsvp($event, $status, $updated_attendees)) {

           $noreply = rcube_utils::get_input_value('noreply', rcube_utils::INPUT_GPC);

           $noreply = intval($noreply) || $status == 'needs-action' || $itip_sending === 0;

-          $reload  = $event['calendar'] != $ev['calendar'] ? 2 : 1;

+          $reload  = $event['calendar'] != $ev['calendar'] || $event['recurrence'] ? 2 : 1;

           $organizer = null;

           $emails = $this->get_user_emails();

@@ -1006,11 +1019,18 @@

             $itip = $this->load_itip();

             $itip->set_sender_email($reply_sender);

             $event['comment'] = $reply_comment;

+            $event['thisandfuture'] = $event['_savemode'] == 'future';

             if ($organizer && $itip->send_itip_message($event, 'REPLY', $organizer, 'itipsubject' . $status, 'itipmailbody' . $status))

               $this->rc->output->command('display_message', $this->gettext(array('name' => 'sentresponseto', 'vars' => array('mailto' => $organizer['name'] ? $organizer['name'] : $organizer['email']))), 'confirmation');

             else

               $this->rc->output->command('display_message', $this->gettext('itipresponseerror'), 'error');

           }

+

+          // refresh all calendars

+          if ($event['calendar'] != $ev['calendar']) {

+            $this->rc->output->command('plugin.refresh_calendar', array('source' => null, 'refetch' => true));

+            $reload = 0;

+          }

         }

         break;

@@ -1122,27 +1142,6 @@

         $this->rc->output->show_message('calendar.errorsaving', 'error');

     }

-    // send out notifications

-    if ($success && $event['_notify'] && ($event['attendees'] || $old['attendees'])) {

-      // make sure we have the complete record

-      $event = $action == 'remove' ? $old : $this->driver->get_event($event);

-

-      // sending notification on a recurrence instance -> re-send the main event

-      if ($event['recurrence_id']) {

-        $event = $this->driver->get_event(array('id' => $event['recurrence_id'], 'cal' => $event['calendar']));

-        $action = 'edit';

-      }

-

-      // only notify if data really changed (TODO: do diff check on client already)

-      if (!$old || $action == 'remove' || self::event_diff($event, $old)) {

-        $sent = $this->notify_attendees($event, $old, $action, $event['_comment']);

-        if ($sent > 0)

-          $this->rc->output->show_message('calendar.itipsendsuccess', 'confirmation');

-        else if ($sent < 0)

-          $this->rc->output->show_message('calendar.errornotifying', 'error');

-      }

-    }

-

     // unlock client

     $this->rc->output->command('plugin.unlock_saving');

@@ -1158,6 +1157,62 @@

   }

   /**

+   * Helper method sending iTip notifications after successful event updates

+   */

+  private function event_save_success(&$event, $old, $action, $success)

+  {

+    // $success is a new event ID

+    if ($success !== true) {

+      // send update notification on the main event

+      if ($event['_savemode'] == 'future' && $event['_notify'] && $old['attendees'] && $old['recurrence_id']) {

+        $master = $this->driver->get_event(array('id' => $old['recurrence_id'], 'calendar' => $old['calendar']));

+        unset($master['_instance'], $master['recurrence_date']);

+

+        $sent = $this->notify_attendees($master, null, $action, $event['_comment']);

+        if ($sent < 0)

+          $this->rc->output->show_message('calendar.errornotifying', 'error');

+

+        $event['attendees'] = $master['attendees'];  // this tricks us into the next if clause

+      }

+

+      $event['id'] = $success;

+      $event['_savemode'] = 'all';

+      $old = null;

+    }

+

+    // send out notifications

+    if ($event['_notify'] && ($event['attendees'] || $old['attendees'])) {

+      $_savemode = $event['_savemode'];

+

+      // send notification for the main event when savemode is 'all'

+      if ($action != 'remove' && $_savemode == 'all' && ($event['recurrence_id'] || $old['recurrence_id'] || ($old && $old['id'] != $event['id']))) {

+        $event['id'] = $event['recurrence_id'] ?: ($old['recurrence_id'] ?: $old['id']);

+        $event = $this->driver->get_event($event);

+        unset($event['_instance'], $event['recurrence_date']);

+      }

+      else {

+        // make sure we have the complete record

+        $event = $action == 'remove' ? $old : $this->driver->get_event($event);

+      }

+

+      $event['_savemode'] = $_savemode;

+

+      if ($old) {

+        $old['thisandfuture'] = $_savemode == 'future';

+      }

+

+      // only notify if data really changed (TODO: do diff check on client already)

+      if (!$old || $action == 'remove' || self::event_diff($event, $old)) {

+        $sent = $this->notify_attendees($event, $old, $action, $event['_comment']);

+        if ($sent > 0)

+          $this->rc->output->show_message('calendar.itipsendsuccess', 'confirmation');

+        else if ($sent < 0)

+          $this->rc->output->show_message('calendar.errornotifying', 'error');

+      }

+    }

+  }

+

+  /**

    * Handler for load-requests from fullcalendar

    * This will return pure JSON formatted output

    */

@@ -1663,6 +1718,7 @@

     if ($event['recurrence']) {

       $event['recurrence_text'] = $this->lib->recurrence_text($event['recurrence']);

       $event['recurrence'] = $this->lib->to_client_recurrence($event['recurrence'], $event['allday']);

+      unset($event['recurrence_date']);

     }

     foreach ((array)$event['attachments'] as $k => $attachment) {

@@ -1687,6 +1743,9 @@

       if ($attendee['status'] == 'DELEGATED' && $attendee['rsvp'] == false) {

         $event['attendees'][$i]['noreply'] = true;

       }

+      else {

+        unset($event['attendees'][$i]['noreply']);

+      }

     }

     if ($organizer === null && !empty($event['organizer'])) {

@@ -1945,6 +2004,9 @@

     // add comment to the iTip attachment

     $event['comment'] = $comment;

+    // set a valid recurrence-id if this is a recurrence instance

+    libcalendaring::identify_recurrence_instance($event);

+

     // compose multipart message using PEAR:Mail_Mime

     $method = $action == 'remove' ? 'CANCEL' : 'REQUEST';

     $message = $itip->compose_itip_message($event, $method, $event['sequence'] > $old['sequence']);

@@ -1987,6 +2049,8 @@

         $sent = -100;

     }

+    // TODO: on change of a recurring (main) event, also send updates to differing attendess of recurrence exceptions

+

     // send CANCEL message to removed attendees

     foreach ((array)$old['attendees'] as $attendee) {

       if ($attendee['ROLE'] == 'ORGANIZER' || !$attendee['email'] || in_array(strtolower($attendee['email']), $current))

@@ -2212,7 +2276,7 @@

   public static function event_diff($a, $b)

   {

     $diff = array();

-    $ignore = array('changed' => 1, 'attachments' => 1, 'recurrence' => 1, '_notify' => 1, '_owner' => 1);

+    $ignore = array('changed' => 1, 'attachments' => 1, '_notify' => 1, '_owner' => 1, '_savemode' => 1);

     foreach (array_unique(array_merge(array_keys($a), array_keys($b))) as $key) {

       if (!$ignore[$key] && $a[$key] != $b[$key])

         $diff[] = $key;

@@ -2403,11 +2467,14 @@

    */

   function event_itip_remove()

   {

-    $success = false;

-    $uid     = rcube_utils::get_input_value('uid', rcube_utils::INPUT_POST);

+    $success  = false;

+    $uid      = rcube_utils::get_input_value('uid', rcube_utils::INPUT_POST);

+    $instance = rcube_utils::get_input_value('_instance', rcube_utils::INPUT_POST);

+    $savemode = rcube_utils::get_input_value('_savemode', rcube_utils::INPUT_POST);

     // search for event if only UID is given

-    if ($event = $this->driver->get_event(array('uid' => $uid), true)) {

+    if ($event = $this->driver->get_event(array('uid' => $uid, '_instance' => $instance), true)) {

+      $event['_savemode'] = $savemode;

       $success = $this->driver->remove_event($event, true);

     }

@@ -2635,6 +2702,8 @@

     $delete  = intval(rcube_utils::get_input_value('_del', rcube_utils::INPUT_POST));

     $noreply = intval(rcube_utils::get_input_value('_noreply', rcube_utils::INPUT_POST));

     $noreply = $noreply || $status == 'needs-action' || $itip_sending === 0;

+    $instance = rcube_utils::get_input_value('_instance', rcube_utils::INPUT_POST);

+    $savemode = rcube_utils::get_input_value('_savemode', rcube_utils::INPUT_POST);

     $error_msg = $this->gettext('errorimportingevent');

     $success = false;

@@ -2722,12 +2791,13 @@

       // save to calendar

       if ($calendar && !$calendar['readonly']) {

-        $event['calendar'] = $calendar['id'];

-        

-        // check for existing event with the same UID

-        $existing = $this->driver->get_event($event['uid'], true, false, true);

-        

+          // check for existing event with the same UID

+        $existing = $this->driver->get_event($event, true, false, true);

+

         if ($existing) {

+          // forward savemode for correct updates of recurring events

+          $existing['_savemode'] = $savemode ?: $event['_savemode'];

+

           // only update attendee status

           if ($event['_method'] == 'REPLY') {

             // try to identify the attendee using the email sender address

@@ -2740,9 +2810,11 @@

               }

             }

             $event_attendee = null;

+            $update_attendees = array();

             foreach ($event['attendees'] as $attendee) {

               if ($event['_sender'] && ($attendee['email'] == $event['_sender'] || $attendee['email'] == $event['_sender_utf'])) {

                 $event_attendee = $attendee;

+                $update_attendees[] = $attendee;

                 $metadata['fallback'] = $attendee['status'];

                 $metadata['attendee'] = $attendee['email'];

                 $metadata['rsvp'] = $attendee['rsvp'] || $attendee['role'] != 'NON-PARTICIPANT';

@@ -2752,9 +2824,12 @@

               }

               // also copy delegate attendee

               else if (!empty($attendee['delegated-from']) &&

-                       (stripos($attendee['delegated-from'], $event['_sender']) !== false || stripos($attendee['delegated-from'], $event['_sender_utf']) !== false) &&

-                       (!in_array($attendee['email'], $existing_attendee_emails))) {

-                $existing['attendees'][] = $attendee;

+                       (stripos($attendee['delegated-from'], $event['_sender']) !== false ||

+                        stripos($attendee['delegated-from'], $event['_sender_utf']) !== false)) {

+                $update_attendees[] = $attendee;

+                if (!in_array($attendee['email'], $existing_attendee_emails)) {

+                  $existing['attendees'][] = $attendee;

+                }

               }

             }

@@ -2771,12 +2846,12 @@

             // found matching attendee entry in both existing and new events

             if ($existing_attendee >= 0 && $event_attendee) {

               $existing['attendees'][$existing_attendee] = $event_attendee;

-              $success = $this->driver->edit_event($existing);

+              $success = $this->driver->update_attendees($existing, $update_attendees);

             }

             // update the entire attendees block

             else if (($event['sequence'] >= $existing['sequence'] || $event['changed'] >= $existing['changed']) && $event_attendee) {

               $existing['attendees'][] = $event_attendee;

-              $success = $this->driver->edit_event($existing);

+              $success = $this->driver->update_attendees($existing, $update_attendees);

             }

             else {

               $error_msg = $this->gettext('newerversionexists');

@@ -2829,7 +2904,43 @@

           if ($status == 'declined' || $event['status'] == 'CANCELLED' || $event_attendee['role'] == 'NON-PARTICIPANT') {

             $event['free_busy'] = 'free';

           }

-          $success = $this->driver->new_event($event);

+

+          // if the RSVP reply only refers to a single instance:

+          // store unmodified master event with current instance as exception

+          if (!empty($instance) && !empty($savemode) && $savemode != 'all') {

+            $master = $this->lib->mail_get_itip_object($mbox, $uid, $mime_id, 'event');

+            if ($master['recurrence'] && !$master['_instance']) {

+              // compute recurring events until this instance's date

+              if ($recurrence_date = rcube_utils::anytodatetime($instance, $master['start']->getTimezone())) {

+                $recurrence_date->setTime(23,59,59);

+

+                foreach ($this->driver->get_recurring_events($master, $master['start'], $recurrence_date) as $recurring) {

+                  if ($recurring['_instance'] == $instance) {

+                    // copy attendees block with my partstat to exception

+                    $recurring['attendees'] = $event['attendees'];

+                    $master['recurrence']['EXCEPTIONS'][] = $recurring;

+                    $event = $recurring;  // set reference for iTip reply

+                    break;

+                  }

+                }

+

+                $master['calendar'] = $event['calendar'] = $calendar['id'];

+                $success = $this->driver->new_event($master);

+              }

+              else {

+                $master = null;

+              }

+            }

+            else {

+              $master = null;

+            }

+          }

+

+          // save to the selected/default calendar

+          if (!$master) {

+            $event['calendar'] = $calendar['id'];

+            $success = $this->driver->new_event($event);

+          }

         }

         else if ($status == 'declined')

           $error_msg = null;

​

@@ -554,6 +554,14 @@

         $('#event-rsvp a.reply-comment-toggle').show();

         $('#event-rsvp .itip-reply-comment textarea').hide().val('');

+

+        if (event.recurrence && event.id) {

+          var sel = event._savemode || (event.thisandfuture ? 'future' : (event.isexception ? 'current' : 'all'));

+          $('#event-rsvp .rsvp-buttons').addClass('recurring');

+        }

+        else {

+          $('#event-rsvp .rsvp-buttons').removeClass('recurring');

+        }

       }

       var buttons = [];

@@ -596,13 +604,16 @@

         },

         close: function() {

           $dialog.dialog('destroy').attr('aria-hidden', 'true').hide();

-          rcmail.command('menu-close','eventoptionsmenu')

+          rcmail.command('menu-close','eventoptionsmenu');

+          $('.libcal-rsvp-replymode').hide();

         },

         dragStart: function() {

-          rcmail.command('menu-close','eventoptionsmenu')

+          rcmail.command('menu-close','eventoptionsmenu');

+          $('.libcal-rsvp-replymode').hide();

         },

         resizeStart: function() {

-          rcmail.command('menu-close','eventoptionsmenu')

+          rcmail.command('menu-close','eventoptionsmenu');

+          $('.libcal-rsvp-replymode').hide();

         },

         buttons: buttons,

         minWidth: 320,

@@ -683,6 +694,8 @@

       // reset dialog first

       $('#eventtabs').get(0).reset();

+      $('#event-panel-recurrence input, #event-panel-recurrence select, #event-panel-attachments input').prop('disabled', false);

+      $('#event-panel-recurrence, #event-panel-attachments').removeClass('disabled');

       // allow other plugins to do actions when event form is opened

       rcmail.triggerEvent('calendar-event-init', {o: event});

@@ -742,11 +755,9 @@

       // show warning if editing a recurring event

       if (event.id && event.recurrence) {

-        var allow_exceptions = !has_attendees(event) || !is_organizer(event),

-          sel = event._savemode || (allow_exceptions && event.thisandfuture ? 'future' : (allow_exceptions && event.isexception ? 'current' : 'all'));

+        var sel = event._savemode || (event.thisandfuture ? 'future' : (event.isexception ? 'current' : 'all'));

         $('#edit-recurring-warning').show();

-        $('input.edit-recurring-savemode[value="'+sel+'"]').prop('checked', true);

-        $('input.edit-recurring-savemode[value="current"], input.edit-recurring-savemode[value="future"]').prop('disabled', !allow_exceptions);

+        $('input.edit-recurring-savemode[value="'+sel+'"]').prop('checked', true).change();

       }

       else

         $('#edit-recurring-warning').hide();

@@ -797,7 +808,7 @@

       // attachments

       var load_attachments_tab = function()

       {

-        rcmail.enable_command('remove-attachment', !calendar.readonly);

+        rcmail.enable_command('remove-attachment', !calendar.readonly && !event.recurrence_id);

         rcmail.env.deleted_attachments = [];

         // we're sharing some code for uploads handling with app.js

         rcmail.env.attachments = [];

@@ -2370,19 +2381,37 @@

     }

     // when the user accepts or declines an event invitation

-    var event_rsvp = function(response, delegate)

+    var event_rsvp = function(response, delegate, replymode)

     {

+      var btn;

+      if (typeof response == 'object') {

+        btn = $(response);

+        response = btn.attr('rel')

+      }

+      else {

+        btn = $('#event-rsvp input.button[rel='+response+']');

+      }

+

+      // show menu to select rsvp reply mode (current or all)

+      if (me.selected_event && me.selected_event.recurrence && !replymode) {

+        rcube_libcalendaring.itip_rsvp_recurring(btn, function(resp, mode) {

+          event_rsvp(resp, null, mode);

+        });

+        return;

+      }

+

       if (me.selected_event && me.selected_event.attendees && response) {

         // bring up delegation dialog

         if (response == 'delegated' && !delegate) {

           rcube_libcalendaring.itip_delegate_dialog(function(data) {

             data.rsvp = data.rsvp ? 1 : '';

-            event_rsvp('delegated', data);

+            event_rsvp('delegated', data, replymode);

           });

           return;

         }

         // update attendee status

+        attendees = [];

         for (var data, i=0; i < me.selected_event.attendees.length; i++) {

           data = me.selected_event.attendees[i];

           if (settings.identity.emails.indexOf(';'+String(data.email).toLowerCase()) >= 0) {

@@ -2391,6 +2420,7 @@

             if (data.status == 'DELEGATED') {

               data['delegated-to'] = delegate.to;

+              data.rsvp = delegate.rsvp

             }

             else {

               if (data['delegated-to']) {

@@ -2399,6 +2429,12 @@

                   data.role = 'REQ-PARTICIPANT';

               }

             }

+

+            attendees.push(i)

+          }

+          else if (response != 'DELEGATED' && data['delegated-from'] &&

+              settings.identity.emails.indexOf(';'+String(data['delegated-from']).toLowerCase()) >= 0) {

+            delete data['delegated-from'];

           }

           // set free_busy status to transparent if declined (#4425)

@@ -2411,7 +2447,7 @@

         }

         // submit status change to server

-        var submit_data = $.extend({}, me.selected_event, { source:null, comment:$('#reply-comment-event-rsvp').val() }, (delegate || {})),

+        var submit_data = $.extend({}, me.selected_event, { source:null, comment:$('#reply-comment-event-rsvp').val(), _savemode: replymode || 'all' }, (delegate || {})),

           noreply = $('#noreply-event-rsvp:checked').length ? 1 : 0;

         // import event from mail (temporary iTip event)

@@ -2425,15 +2461,17 @@

             _to: (delegate ? delegate.to : null),

             _rsvp: (delegate && delegate.rsvp) ? 1 : 0,

             _noreply: noreply,

-            _comment: submit_data.comment

+            _comment: submit_data.comment,

+            _instance: submit_data._instance,

+            _savemode: submit_data._savemode

           });

         }

         else if (settings.invitation_calendars) {

-          update_event('rsvp', submit_data, { status:response, noreply:noreply });

+          update_event('rsvp', submit_data, { status:response, noreply:noreply, attendees:attendees });

         }

         else {

           me.saving_lock = rcmail.set_busy(true, 'calendar.savingdata');

-          rcmail.http_post('event', { action:'rsvp', e:submit_data, status:response, noreply:noreply });

+          rcmail.http_post('event', { action:'rsvp', e:submit_data, status:response, attendees:attendees, noreply:noreply });

         }

         event_show_dialog(me.selected_event);

@@ -2501,7 +2539,7 @@

         // mark all recurring instances as temp

         if (event.recurrence || event.recurrence_id) {

-          var base_id = event.recurrence_id ? event.recurrence_id.replace(/-\d+$/, '') : event.id;

+          var base_id = event.recurrence_id ? event.recurrence_id.replace(/-\d+(T\d{6})?$/, '') : event.id;

           $.each(fc.fullCalendar('clientEvents', function(e){ return e.id == base_id || e.recurrence_id == base_id; }), function(i,ev) {

             ev.temp = true;

             ev.editable = false;

@@ -2565,25 +2603,19 @@

       // recurring event: user needs to select the savemode

       if (event.recurrence) {

-        var disabled_state = '', message_label = (action == 'remove' ? 'removerecurringeventwarning' : 'changerecurringeventwarning');

+        var future_disabled = '', message_label = (action == 'remove' ? 'removerecurringeventwarning' : 'changerecurringeventwarning');

-        if (_has_attendees) {

-          if (action == 'remove') {

-            if (!_is_organizer) {

-              message_label = 'removerecurringallonly';

-              disabled_state = ' disabled';

-            }

-          }

-          else if (is_organizer(event)) {

-            disabled_state = ' disabled';

-          }

+        // disable the 'future' savemode if attendees are involved

+        // reason: no calendaring system supports the thisandfuture range parameter

+        if (action == 'remove' && _has_attendees && is_organizer(event)) {

+          future_disabled = ' disabled';

         }

         html += '<div class="message"><span class="ui-icon ui-icon-alert"></span>' +

           rcmail.gettext(message_label, 'calendar') + '</div>' +

           '<div class="savemode">' +

-            '<a href="#current" class="button' + disabled_state + '">' + rcmail.gettext('currentevent', 'calendar') + '</a>' +

-            '<a href="#future" class="button' + disabled_state + '">' + rcmail.gettext('futurevents', 'calendar') + '</a>' +

+            '<a href="#current" class="button">' + rcmail.gettext('currentevent', 'calendar') + '</a>' +

+            '<a href="#future" class="button' + future_disabled + '">' + rcmail.gettext('futurevents', 'calendar') + '</a>' +

             '<a href="#all" class="button">' + rcmail.gettext('allevents', 'calendar') + '</a>' +

             (action != 'remove' ? '<a href="#new" class="button">' + rcmail.gettext('saveasnew', 'calendar') + '</a>' : '') +

           '</div>';

@@ -2606,8 +2638,10 @@

           else {

             if ($dialog.find('input.confirm-attendees-donotify').length)

               data._notify = $dialog.find('input.confirm-attendees-donotify').get(0).checked ? 1 : 0;

-            if (decline && $dialog.find('input.confirm-attendees-decline:checked').length)

-              data.decline = 1;

+            if (decline) {

+              data._decline = $dialog.find('input.confirm-attendees-decline:checked').length;

+              data._notify = 0;

+            }

             update_event(action, data);

           }

@@ -2622,7 +2656,7 @@

             text: rcmail.gettext((action == 'remove' ? 'delete' : 'save'), 'calendar'),

             click: function() {

               data._notify = notify && $dialog.find('input.confirm-attendees-donotify:checked').length ? 1 : 0;

-              data.decline = decline && $dialog.find('input.confirm-attendees-decline:checked').length ? 1 : 0;

+              data._decline = decline && $dialog.find('input.confirm-attendees-decline:checked').length ? 1 : 0;

               update_event(action, data);

               $(this).dialog("close");

             }

@@ -4151,9 +4185,16 @@

       });

       $('#event-rsvp input.button').click(function(e) {

-        event_rsvp($(this).attr('rel'))

+        event_rsvp(this)

       });

+      $('#eventedit input.edit-recurring-savemode').change(function(e) {

+        var sel = $('input.edit-recurring-savemode:checked').val(),

+          disabled = sel == 'current' || sel == 'future';

+        $('#event-panel-recurrence input, #event-panel-recurrence select, #event-panel-attachments input').prop('disabled', disabled);

+        $('#event-panel-recurrence, #event-panel-attachments')[(disabled?'addClass':'removeClass')]('disabled');

+      })

+

       $('#eventshow .changersvp').click(function(e) {

         var d = $('#eventshow'),

           h = -$(this).closest('.event-line').toggle().height();

​

@@ -4,7 +4,7 @@

     "description": "Calendar plugin",

     "homepage": "http://git.kolab.org/roundcubemail-plugins-kolab/",

     "license": "AGPLv3",

-    "version": "3.2.5",

+    "version": "3.2.6",

     "authors": [

         {

             "name": "Thomas Bruederli",

@@ -26,6 +26,6 @@

     "require": {

         "php": ">=5.3.0",

         "roundcube/plugin-installer": ">=0.1.3",

-        "kolab/libcalendaring": ">=3.2.5"

+        "kolab/libcalendaring": ">=3.2.6"

     }

 }

​

@@ -50,6 +50,7 @@

  *      'EXCEPTIONS' => array(<event>),  list of event objects which denote exceptions in the recurrence chain

  *    ),

  * 'recurrence_id' => 'ID of the recurrence group',   // usually the ID of the starting event

+ *     '_instance' => 'ID of the recurring instance',   // identifies an instance within a recurrence chain

  *    'categories' => 'Event category',

  *     'free_busy' => 'free|busy|outofoffice|tentative',  // Show time as

  *        'status' => 'TENTATIVE|CONFIRMED|CANCELLED',    // event status according to RFC 2445

@@ -196,9 +197,22 @@

    *

    * @param array  Hash array with event properties

    * @param string New participant status

+   * @param array  List of hash arrays with updated attendees

    * @return boolean True on success, False on error

    */

-  public function edit_rsvp(&$event, $status)

+  public function edit_rsvp(&$event, $status, $attendees)

+  {

+    return $this->edit_event($event);

+  }

+

+  /**

+   * Update the participant status for the given attendee

+   *

+   * @param array  Hash array with event properties

+   * @param array  List of hash arrays each represeting an updated attendee

+   * @return boolean True on success, False on error

+   */

+  public function update_attendees(&$event, $attendees)

   {

     return $this->edit_event($event);

   }

@@ -449,6 +463,7 @@

       $rcmail = rcmail::get_instance();

       $recurrence = new calendar_recurrence($rcmail->plugins->get_plugin('calendar'), $event);

+      $recurrence_id_format = $event['allday'] ? 'Ymd' : 'Ymd\THis';

       // determine a reasonable end date if none given

       if (!$end) {

@@ -464,12 +479,11 @@

       $i = 0;

       while ($next_event = $recurrence->next_instance()) {

-        $next_event['uid'] = $event['uid'] . '-' . ++$i;

         // add to output if in range

         if (($next_event['start'] <= $end && $next_event['end'] >= $start)) {

-          $next_event['id'] = $next_event['uid'];

+          $next_event['_instance'] = $next_event['start']->format($recurrence_id_format);

+          $next_event['id'] = $next_event['uid'] . '-' . $exception['_instance'];

           $next_event['recurrence_id'] = $event['uid'];

-          $next_event['_instance'] = $i;

           $events[] = $next_event;

         }

         else if ($next_event['start'] > $end) {  // stop loop if out of range

@@ -477,7 +491,7 @@

         }

         // avoid endless recursion loops

-        if ($i > 1000) {

+        if (++$i > 1000) {

           break;

         }

       }

​

@@ -195,7 +195,11 @@

       if ($master_id != $id && ($record = $this->storage->get_object($master_id)))

         $this->events[$master_id] = $this->_to_rcube_event($record);

-      if (($master = $this->events[$master_id]) && $master['recurrence']) {

+      // check for match on the first instance already

+      if (($_instance = $this->events[$master_id]['_instance']) && $id == $master_id . '-' . $_instance) {

+        $this->events[$id] = $this->events[$master_id];

+      }

+      else if (($master = $this->events[$master_id]) && $master['recurrence']) {

         $this->get_recurring_events($record, $master['start'], null, $id);

       }

     }

@@ -236,35 +240,31 @@

     $query[] = array('dtstart', '<=', $end);

     $query[] = array('dtend',   '>=', $start);

-    // add query to exclude pending/declined invitations

-    if (empty($filter_query) && $this->get_namespace() != 'other') {

-      foreach ($user_emails as $email) {

-        $query[] = array('tags', '!=', 'x-partstat:' . $email . ':needs-action');

-        $query[] = array('tags', '!=', 'x-partstat:' . $email . ':declined');

-      }

-    }

-    else if (is_array($filter_query)) {

+    if (is_array($filter_query)) {

       $query = array_merge($query, $filter_query);

     }

     if (!empty($search)) {

         $search = mb_strtolower($search);

+        $words = rcube_utils::tokenize_string($search, 1);

         foreach (rcube_utils::normalize_string($search, true) as $word) {

             $query[] = array('words', 'LIKE', $word);

         }

     }

+    else {

+      $words = array();

+    }

+

+    // set partstat filter to skip pending and declined invitations

+    if (empty($filter_query) && $this->get_namespace() != 'other') {

+      $partstat_exclude = array('NEEDS-ACTION','DECLINED');

+    }

+    else {

+      $partstat_exclude = array();

+    }

     $events = array();

     foreach ($this->storage->select($query) as $record) {

-      // post-filter events to skip pending and declined invitations

-      if (empty($filter_query) && is_array($record['attendees']) && $this->get_namespace() != 'other') {

-        foreach ($record['attendees'] as $attendee) {

-          if (in_array($attendee['email'], $user_emails) && in_array($attendee['status'], array('NEEDS-ACTION','DECLINED'))) {

-            continue 2;

-          }

-        }

-      }

-

       $event = $this->_to_rcube_event($record);

       $this->events[$event['id']] = $event;

@@ -272,35 +272,16 @@

       if ($event['categories'])

         $this->categories[$event['categories']]++;

-      // filter events by search query

-      if (!empty($search)) {

-        $hits = 0;

-        $words = rcube_utils::tokenize_string($search, 1);

-        foreach ($words as $word) {

-          $hits += $this->_fulltext_match($event, $word);

-        }

-

-        if ($hits < count($words))  // skip this event if not match with search term

-          continue;

-      }

-

       // list events in requested time window

       if ($event['start'] <= $end && $event['end'] >= $start) {

         unset($event['_attendees']);

         $add = true;

         // skip the first instance of a recurring event if listed in exdate

-        if ($virtual && (!empty($event['recurrence']['EXDATE']) || !empty($event['recurrence']['EXCEPTIONS']))) {

+        if ($virtual && !empty($event['recurrence']['EXDATE'])) {

           $event_date = $event['start']->format('Ymd');

           $exdates = (array)$event['recurrence']['EXDATE'];

-          // add dates from exceptions to list

-          if (is_array($event['recurrence']['EXCEPTIONS'])) {

-              foreach ($event['recurrence']['EXCEPTIONS'] as $exception) {

-                  $exdates[] = clone $exception['start'];

-              }

-          }

-

           foreach ($exdates as $exdate) {

             if ($exdate->format('Ymd') == $event_date) {

               $add = false;

@@ -309,27 +290,53 @@

           }

         }

+        // find and merge exception for the first instance

+        if ($virtual && !empty($event['recurrence']) && is_array($event['recurrence']['EXCEPTIONS'])) {

+          $event_date = $event['start']->format('Ymd');

+          foreach ($event['recurrence']['EXCEPTIONS'] as $exception) {

+            $exdate = $exception['recurrence_date'] ? $exception['recurrence_date']->format('Ymd') : substr($exception['_instance'], 0, 8);

+            if ($exdate == $event_date) {

+              $event['_instance'] = $exception['_instance'];

+              kolab_driver::merge_exception_data($event, $exception);

+            }

+          }

+        }

+

         if ($add)

           $events[] = $event;

       }

-      

+

       // resolve recurring events

       if ($record['recurrence'] && $virtual == 1) {

         $events = array_merge($events, $this->get_recurring_events($record, $start, $end));

+      }

+    }

-        // when searching, only recurrence exceptions may match the query so post-filter the results again

-        if (!empty($search) && $record['recurrence']['EXCEPTIONS']) {

-          $me = $this;

-          $events = array_filter($events, function($event) use ($words, $me) {

-            $hits = 0;

-            foreach ($words as $word) {

-              $hits += $me->_fulltext_match($event, $word, false);

-            }

-            return $hits >= count($words);

-          });

+    // post-filter all events by fulltext search and partstat values

+    $me = $this;

+    $events = array_filter($events, function($event) use ($words, $partstat_exclude, $user_emails, $me) {

+      // fulltext search

+      if (count($words)) {

+        $hits = 0;

+        foreach ($words as $word) {

+          $hits += $me->_fulltext_match($event, $word, false);

+        }

+        if ($hits < count($words)) {

+          return false;

+        }

+      }

+

+      // partstat filter

+      if (count($partstat_exclude) && is_array($event['attendees'])) {

+        foreach ($event['attendees'] as $attendee) {

+          if (in_array($attendee['email'], $user_emails) && in_array($attendee['status'], $partstat_exclude)) {

+            return false;

+          }

         }

       }

-    }

+

+      return true;

+    });

     // avoid session race conditions that will loose temporary subscriptions

     $this->cal->rc->session->nowrite = true;

@@ -585,24 +592,29 @@

         $rec_event['id'] = $event['uid'] . '-' . $exception['_instance'];

         $rec_event['isexception'] = 1;

-        // found the specifically requested instance, exiting...

-        if ($rec_event['id'] == $event_id) {

+        // found the specifically requested instance: register exception (single occurrence wins)

+        if ($rec_event['id'] == $event_id && (!$this->events[$event_id] || $this->events[$event_id]['thisandfuture'])) {

           $rec_event['recurrence'] = $recurrence_rule;

           $rec_event['recurrence_id'] = $event['uid'];

-          $events[] = $rec_event;

           $this->events[$rec_event['id']] = $rec_event;

-          return $events;

         }

         // remember this exception's date

         $exdate = substr($exception['_instance'], 0, 8);

-        $exdata[$exdate] = $rec_event;

+        if (!$exdata[$exdate] || $exdata[$exdate]['thisandfuture']) {

+          $exdata[$exdate] = $rec_event;

+        }

         if ($rec_event['thisandfuture']) {

           $futuredata[$exdate] = $rec_event;

         }

       }

     }

+    // found the specifically requested instance, exiting...

+    if ($event_id && !empty($this->events[$event_id])) {

+      return array($this->events[$event_id]);

+    }

+

     // use libkolab to compute recurring events

     if (class_exists('kolabcalendaring')) {

         $recurrence = new kolab_date_recurrence($object);

@@ -627,9 +639,10 @@

       if (($next_event['start'] <= $end && $next_event['end'] >= $start) || ($event_id && $rec_id == $event_id)) {

         $rec_event = $this->_to_rcube_event($next_event);

         $rec_event['_instance'] = $instance_id;

+        $rec_event['_count'] = $i + 1;

         if ($overlay_data || $exdata[$datestr])  // copy data from exception

-          $this->_merge_event_data($rec_event, $exdata[$datestr] ?: $overlay_data);

+          kolab_driver::merge_exception_data($rec_event, $exdata[$datestr] ?: $overlay_data);

         $rec_event['id'] = $rec_id;

         $rec_event['recurrence_id'] = $event['uid'];

@@ -654,37 +667,10 @@

   }

   /**

-   * Merge certain properties from the overlay event to the base event object

-   *

-   * @param array The event object to be altered

-   * @param array The overlay event object to be merged over $event

-   */

-  private function _merge_event_data(&$event, $overlay)

-  {

-    static $forbidden = array('id','uid','created','changed','recurrence','organizer','attendees','sequence');

-

-    foreach ($overlay as $prop => $value) {

-      // adjust time of the recurring event instance

-      if ($prop == 'start' || $prop == 'end') {

-        if (is_object($event[$prop]) && is_a($event[$prop], 'DateTime')) {

-          $event[$prop]->setTime($value->format('G'), intval($value->format('i')), intval($value->format('s')));

-          // set date value if overlay is an exception of the current instance

-          if (substr($overlay['_instance'], 0, 8) == substr($event['_instance'], 0, 8)) {

-            $event[$prop]->setDate(intval($value->format('Y')), intval($value->format('n')), intval($value->format('j')));

-          }

-        }

-      }

-      else if ($prop[0] != '_' && !in_array($prop, $forbidden))

-        $event[$prop] = $value;

-    }

-  }

-

-  /**

    * Convert from Kolab_Format to internal representation

    */

   private function _to_rcube_event($record)

   {

-    $record['id'] = $record['uid'];

     $record['calendar'] = $this->id;

     $record['links'] = $this->get_links($record['uid']);

@@ -702,38 +688,7 @@

    */

   private function _from_rcube_event($event, $old = array())

   {

-    // in kolab_storage attachments are indexed by content-id

-    $event['_attachments'] = array();

-    if (is_array($event['attachments'])) {

-      foreach ($event['attachments'] as $attachment) {

-        $key = null;

-        // Roundcube ID has nothing to do with the storage ID, remove it

-        if ($attachment['content'] || $attachment['path']) {

-          unset($attachment['id']);

-        }

-        else {

-          foreach ((array)$old['_attachments'] as $cid => $oldatt) {

-            if ($attachment['id'] == $oldatt['id'])

-              $key = $cid;

-          }

-        }

-

-        // flagged for deletion => set to false

-        if ($attachment['_deleted']) {

-          $event['_attachments'][$key] = false;

-        }

-        // replace existing entry

-        else if ($key) {

-          $event['_attachments'][$key] = $attachment;

-        }

-        // append as new attachment

-        else {

-          $event['_attachments'][] = $attachment;

-        }

-      }

-

-      unset($event['attachments']);

-    }

+    $event = kolab_driver::from_rcube_event($event, $old);

     // set current user as ORGANIZER

     $identity = $this->cal->rc->user->list_emails(true);

​

@@ -534,8 +534,13 @@

   public function get_event($event, $writeable = false, $active = false, $personal = false)

   {

     if (is_array($event)) {

-      $id = $event['id'] ? $event['id'] : $event['uid'];

+      $id = $event['id'] ?: $event['uid'];

       $cal = $event['calendar'];

+

+      // we're looking for a recurring instance: expand the ID to our internal convention for recurring instances

+      if (!$event['id'] && $event['_instance']) {

+        $id .= '-' . $event['_instance'];

+      }

     }

     else {

       $id = $event;

@@ -543,7 +548,10 @@

     if ($cal) {

       if ($storage = $this->get_calendar($cal)) {

-        return $storage->get_event($id);

+        $result = $storage->get_event($id);

+        if (is_array($result))

+          self::clean_rcube_event_out($result);

+        return $result;

       }

       // get event from the address books birthday calendar

       else if ($cal == self::BIRTHDAY_CALENDAR_ID) {

@@ -554,6 +562,7 @@

     else {

       foreach ($this->filter_calendars($writeable, $active, $personal) as $calendar) {

         if ($result = $calendar->get_event($id)) {

+          self::clean_rcube_event_out($result);

           return $result;

         }

       }

@@ -614,9 +623,21 @@

    * @param string New participant status

    * @return boolean True on success, False on error

    */

-  public function edit_rsvp(&$event, $status)

+  public function edit_rsvp(&$event, $status, $attendees)

   {

-    if (($ret = $this->update_event($event)) && $this->rc->config->get('kolab_invitation_calendars')) {

+    $update_event = $event;

+

+    // apply changes to master (and all exceptions)

+    if ($event['_savemode'] == 'all' && $event['recurrence_id']) {

+      if ($storage = $this->get_calendar($event['calendar'])) {

+        $update_event = $storage->get_event($event['recurrence_id']);

+        $update_event['_savemode'] = $event['_savemode'];

+        unset($update_event['recurrence_id']);

+        self::merge_attendee_data($update_event, $attendees);

+      }

+    }

+

+    if (($ret = $this->update_attendees($update_event, $attendees)) && $this->rc->config->get('kolab_invitation_calendars')) {

       // re-assign to the according (virtual) calendar

       if (strtoupper($status) == 'DECLINED')

         $event['calendar'] = self::INVITATIONS_CALENDAR_DECLINED;

@@ -629,6 +650,48 @@

     return $ret;

   }

+  /**

+   * Update the participant status for the given attendees

+   *

+   * @see calendar_driver::update_attendees()

+   */

+  public function update_attendees(&$event, $attendees)

+  {

+    // for this-and-future updates, merge the updated attendees onto all exceptions in range

+    if (($event['_savemode'] == 'future' && $event['recurrence_id']) || (!empty($event['recurrence']) && !$event['recurrence_id'])) {

+      if (!($storage = $this->get_calendar($event['calendar'])))

+        return false;

+

+      // load master event

+      $master = $event['recurrence_id'] ? $storage->get_event($event['recurrence_id']) : $event;

+

+      // apply attendee update to each existing exception

+      if ($master['recurrence'] && !empty($master['recurrence']['EXCEPTIONS'])) {

+        $saved = false;

+        foreach ($master['recurrence']['EXCEPTIONS'] as $i => $exception) {

+          // merge the new event properties onto future exceptions

+          if ($exception['_instance'] >= $event['_instance']) {

+            self::merge_attendee_data($master['recurrence']['EXCEPTIONS'][$i], $attendees);

+          }

+          // update a specific instance

+          if ($exception['_instance'] == $event['_instance'] && $exception['thisandfuture']) {

+            $saved = true;

+          }

+        }

+

+        // add the given event as new exception

+        if (!$saved && $event['id'] != $master['id']) {

+          $event['thisandfuture'] = true;

+          $master['recurrence']['EXCEPTIONS'][] = $event;

+        }

+

+        return $this->update_event($master);

+      }

+    }

+

+    // just update the given event (instance)

+    return $this->update_event($event);

+  }

   /**

    * Move a single event

@@ -640,6 +703,7 @@

   {

     if (($storage = $this->get_calendar($event['calendar'])) && ($ev = $storage->get_event($event['id']))) {

       unset($ev['sequence']);

+      self::clear_attandee_noreply($ev);

       return $this->update_event($event + $ev);

     }

@@ -656,6 +720,7 @@

   {

     if (($storage = $this->get_calendar($event['calendar'])) && ($ev = $storage->get_event($event['id']))) {

       unset($ev['sequence']);

+      self::clear_attandee_noreply($ev);

       return $this->update_event($event + $ev);

     }

@@ -687,11 +752,11 @@

       // read master if deleting a recurring event

       if ($event['recurrence'] || $event['recurrence_id']) {

         $master = $event['recurrence_id'] ? $storage->get_event($event['recurrence_id']) : $event;

-        $savemode = $event['_savemode'];

+        $savemode = $event['_savemode'] ?: ($event['_instance'] ? 'current' : 'all');

       }

       // removing an exception instance

-      if ($event['recurrence_id']) {

+      if ($event['recurrence_id'] && $master['recurrence'] && is_array($master['recurrence']['EXCEPTIONS'])) {

         foreach ($master['recurrence']['EXCEPTIONS'] as $i => $exception) {

           if ($exception['_instance'] == $event['_instance']) {

             unset($master['recurrence']['EXCEPTIONS'][$i]);

@@ -880,7 +945,11 @@

     // modify a recurring event, check submitted savemode to do the right things

     if ($old['recurrence'] || $old['recurrence_id']) {

       $master = $old['recurrence_id'] ? $fromcalendar->get_event($old['recurrence_id']) : $old;

-      $savemode = $event['_savemode'];

+      $savemode = $event['_savemode'] ?: ($old['recurrence_id'] ? 'current' : 'all');

+

+      // this-and-future on the first instance equals to 'all'

+      if (!$old['recurrence_id'] && $savemode == 'future')

+        $savemode = 'all';

     }

     // check if update affects scheduling and update attendee status accordingly

@@ -894,47 +963,114 @@

     else if ($old['recurrence']['EXCEPTIONS'])

       $event['recurrence']['EXCEPTIONS'] = $old['recurrence']['EXCEPTIONS'];

+    // remove some internal properties which should not be saved

+    unset($event['_savemode'], $event['_fromcalendar'], $event['_identity'], $event['_owner'],

+        $event['_notify'], $event['_method'], $event['_sender'], $event['_sender_utf'], $event['_size']);

+

     switch ($savemode) {

       case 'new':

         // save submitted data as new (non-recurring) event

         $event['recurrence'] = array();

+        $event['_copyfrom'] = $master['_msguid'];

+        $event['_mailbox'] = $master['_mailbox'];

         $event['uid'] = $this->cal->generate_uid();

-        unset($event['recurrence_id'], $event['id'], $event['_savemode'], $event['_fromcalendar'], $event['_identity'], $event['_notify']);

+        unset($event['recurrence_id'], $event['recurrence_date'], $event['_instance'], $event['id']);

-        // copy attachment data to new event

-        foreach ((array)$event['attachments'] as $idx => $attachment) {

-          if (!$attachment['content'])

-            $event['attachments'][$idx]['content'] = $this->get_attachment_body($attachment['id'], $master);

-        }

+        // copy attachment metadata to new event

+        $event = self::from_rcube_event($event, $master);

+        self::clear_attandee_noreply($event);

         if ($success = $storage->insert_event($event))