Render preview agenda for iTip requests below RSVP buttons (#3161)

2 files changed, 17 insertions, 0 deletions

diff --git a/plugins/libcalendaring/lib/libcalendaring_itip.php b/plugins/libcalendaring/lib/libcalendaring_itip.php
index a5b056f..6740bfa 100644
--- a/plugins/libcalendaring/lib/libcalendaring_itip.php
+++ b/plugins/libcalendaring/lib/libcalendaring_itip.php
@@ -434,6 +434,9 @@ class libcalendaring_itip
             $emails = $this->lib->get_user_emails();
             $title = $event['sequence'] > 0 ? $this->gettext('itipupdate') : $this->gettext('itipinvitation');
             $metadata['rsvp'] = true;
+            if (is_object($event['start'])) {
+                $metadata['date'] = $event['start']->format('U');
+            }
 
             // check for X-KOLAB-INVITATIONTYPE property and only show accept/decline buttons
             if (self::get_custom_property($event, 'X-KOLAB-INVITATIONTYPE') == 'CONFIRMATION') {
diff --git a/plugins/libcalendaring/libcalendaring.js b/plugins/libcalendaring/libcalendaring.js
index b23a3fe..5b8ad5c 100644
--- a/plugins/libcalendaring/libcalendaring.js
+++ b/plugins/libcalendaring/libcalendaring.js
@@ -912,6 +912,20 @@ rcube_libcalendaring.update_itip_object_status = function(p)
  
   // show rsvp/import buttons (with calendar selector)
   $('#'+p.action+'-'+p.id).show().find('input.button').last().after(p.select);
+
+  // show itip box appendix after replacing the given placeholders
+  if (p.append && p.append.selector) {
+    var elem = $(p.append.selector);
+    if (p.append.replacements) {
+      $.each(p.append.replacements, function(k, html) {
+        elem.html(elem.html().replace(k, html));
+      });
+    }
+    else if (p.append.html) {
+      elem.html(p.append.html)
+    }
+    elem.show();
+  }
 };
 
 /**