Correctly handle iTIP cancellations (#381)

plugins/calendar/calendar.php

@@ -566,6 +566,14 @@ class calendar extends rcube_plugin
         // remove previous deletes
         $undo_time = $this->driver->undelete ? $this->rc->config->get('undo_timeout', 0) : 0;
         $this->rc->session->remove('calendar_event_undo');
+        
+        // search for event if only UID is given
+        if (!isset($event['calendar']) && $event['uid']) {
+          if (!($event = $this->driver->get_event($event))) {
+            break;
+          }
+          $undo_time = 0;
+        }
 
         $success = $this->driver->remove_event($event, $undo_time < 1);
         $reload  = true;
@@ -621,7 +629,7 @@ class calendar extends rcube_plugin
       case "rsvp-status":
         $action = 'rsvp';
         $status = $event['fallback'];
-        $html = html::div('rsvp-status', $this->gettext('acceptinvitation'));
+        $html = html::div('rsvp-status', $status != 'CANCELLED' ? $this->gettext('acceptinvitation') : '');
         $this->load_driver();
         if ($existing = $this->driver->get_event($event)) {
           $emails = $this->get_user_emails();
@@ -1621,7 +1629,7 @@ class calendar extends rcube_plugin
           $buttons = html::tag('input', array(
             'type' => 'button',
             'class' => 'button',
-            'onclick' => "rcube_calendar.add_event_from_mail('" . JQ($mime_id.':'.$idx) . "', '" . JQ($event['title']) . "')",
+            'onclick' => "rcube_calendar.add_event_from_mail('" . JQ($mime_id.':'.$idx) . "')",
             'value' => $this->gettext('updateattendeestatus'),
           ));
         }
@@ -1663,12 +1671,27 @@ class calendar extends rcube_plugin
         }
         else if ($this->ical->method == 'CANCEL') {
           $title = $this->gettext('itipcancellation');
-          $buttons = html::tag('input', array(
+          
+          // create buttons to be activated from async request checking existence of this event in local calendars
+          $button_import = html::tag('input', array(
+            'type' => 'button',
+            'class' => 'button',
+            'onclick' => "rcube_calendar.add_event_from_mail('" . JQ($mime_id.':'.$idx) . "')",
+            'value' => $this->gettext('importtocalendar'),
+          ));
+          $button_remove = html::tag('input', array(
             'type' => 'button',
             'class' => 'button',
             'onclick' => "rcube_calendar.remove_event_from_mail('" . JQ($event['uid']) . "', '" . JQ($event['title']) . "')",
-            'value' => $this->gettext('importtocalendar'),
+            'value' => $this->gettext('removefromcalendar'),
           ));
+          
+          $dom_id = asciiwords($event['uid'], true);
+          $buttons = html::div(array('id' => 'rsvp-'.$dom_id, 'style' => 'display:none'), $button_remove);
+          $buttons .= html::div(array('id' => 'import-'.$dom_id, 'style' => 'display:none'), $button_import);
+          $buttons_pre = html::div(array('id' => 'loading-'.$dom_id, 'class' => 'rsvp-status loading'), $this->gettext('loading'));
+          
+          $this->rc->output->add_script('rcube_calendar.fetch_event_rsvp_status(' . json_serialize(array('uid' => $event['uid'], 'changed' => $event['changed'], 'fallback' => 'CANCELLED')) . ')', 'docready');
         }
         else {
           $buttons = html::tag('input', array(
@@ -1703,6 +1726,7 @@ class calendar extends rcube_plugin
     if ($html) {
       $this->ui->init();
       $p['content'] = $html . $p['content'];
+      $this->rc->output->add_label('calendar.savingdata','calendar.deleteventconfirm');
     }
 
     return $p;

plugins/calendar/calendar_base.js

@@ -161,7 +161,7 @@ function rcube_calendar(settings)
 // static methods
 rcube_calendar.add_event_from_mail = function(mime_id, status)
 {
-  var lock = rcmail.set_busy(true, 'loading');
+  var lock = rcmail.set_busy(true, 'calendar.savingdata');
   rcmail.http_post('calendar/mailimportevent', {
       '_uid': rcmail.env.uid,
       '_mbox': rcmail.env.mailbox,
@@ -171,6 +171,17 @@ rcube_calendar.add_event_from_mail = function(mime_id, status)
   return false;
 };
 
+rcube_calendar.remove_event_from_mail = function(uid, title)
+{
+  if (confirm(rcmail.gettext('calendar.deleteventconfirm'))) {
+    var lock = rcmail.set_busy(true, 'calendar.savingdata');
+    rcmail.http_post('calendar/event', {
+        e:{ uid:uid },
+        action: 'remove'
+      }, lock);
+  }
+};
+
 rcube_calendar.fetch_event_rsvp_status = function(event)
 {
 /*

plugins/calendar/localization/de_CH.inc

@@ -137,6 +137,7 @@ $labels['itipmailbodytentative'] = "\$sender hat die Einladung mit Vorbehalt zum
 $labels['itipmailbodydeclined'] = "\$sender hat die Einladung zum folgenden Termin abgelehnt:\n\n*\$title*\n\nWann: \$date\n\nTeilnehmer: \$attendees";
 $labels['itipdeclineevent'] = 'Möchten Sie die Einladung zu diesem Termin ablehnen?';
 $labels['importtocalendar'] = 'In Kalender übernehmen';
+$labels['removefromcalendar'] = 'Aus meinem Kalender löschen';
 $labels['updateattendeestatus'] = 'Teilnehmerstatus aktualisieren';
 $labels['acceptinvitation'] = 'Möchten Sie die Einladung zu diesem Termin annehmen?';
 $labels['youhaveaccepted'] = 'Sie haben die Einladung angenommen';

plugins/calendar/localization/de_DE.inc

@@ -136,6 +136,7 @@ $labels['itipmailbodytentative'] = "\$sender hat die Einladung mit Vorbehalt zum
 $labels['itipmailbodydeclined'] = "\$sender hat die Einladung zum folgenden Termin abgelehnt:\n\n*\$title*\n\nWann: \$date\n\nTeilnehmer: \$attendees";
 $labels['itipdeclineevent'] = 'Möchten Sie die Einladung zu diesem Termin ablehnen?';
 $labels['importtocalendar'] = 'In Kalender übernehmen';
+$labels['removefromcalendar'] = 'Aus meinem Kalender löschen';
 $labels['updateattendeestatus'] = 'Teilnehmerstatus aktualisieren';
 $labels['acceptinvitation'] = 'Möchten Sie die Einladung zu diesem Termin annehmen?';
 $labels['youhaveaccepted'] = 'Sie haben die Einladung angenommen';

plugins/calendar/localization/en_US.inc

@@ -137,6 +137,7 @@ $labels['itipmailbodytentative'] = "\$sender has tentatively accepted the invita
 $labels['itipmailbodydeclined'] = "\$sender has declined the invitation to the following event:\n\n*\$title*\n\nWhen: \$date\n\nInvitees: \$attendees";
 $labels['itipdeclineevent'] = 'Do you want to decline your invitation to this event?';
 $labels['importtocalendar'] = 'Save to my calendar';
+$labels['removefromcalendar'] = 'Remove from my calendar';
 $labels['updateattendeestatus'] = 'Update the participant\'s status';
 $labels['acceptinvitation'] = 'Do you accept this invitation?';
 $labels['youhaveaccepted'] = 'You have accepted this invitation';