From 8c32e31fa392a66f2f5be49bfb85ea293b60f178 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <machniak@kolabsys.com>
Date: Thu, 11 Feb 2016 14:49:39 +0100
Subject: [PATCH] Set COMMENT on delegation iTip (#4915)

---
 plugins/calendar/calendar.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/plugins/calendar/calendar.php b/plugins/calendar/calendar.php
index d18f737a..3e0c0adf 100644
--- a/plugins/calendar/calendar.php
+++ b/plugins/calendar/calendar.php
@@ -2793,10 +2793,13 @@ class calendar extends rcube_plugin
     if ($event = $this->lib->mail_get_itip_object($mbox, $uid, $mime_id, 'event')) {
       // forward iTip request to delegatee
       if ($delegate) {
-        $rsvpme = intval(rcube_utils::get_input_value('_rsvp', rcube_utils::INPUT_POST));
+        $rsvpme  = (bool) intval(rcube_utils::get_input_value('_rsvp', rcube_utils::INPUT_POST));
+        $comment = rcube_utils::get_input_value('_comment', rcube_utils::INPUT_POST);
 
-        $itip = $this->load_itip();
-        if ($itip->delegate_to($event, $delegate, $rsvpme ? true : false)) {
+        $d_event = $comment ? array_merge($event, array('comment' => $comment)) : $event;
+        $itip    = $this->load_itip();
+
+        if ($itip->delegate_to($d_event, $delegate, $rsvpme)) {
           $this->rc->output->show_message('calendar.itipsendsuccess', 'confirmation');
         }
         else {