From 75cf17866c806075b8fe8f45fabf6d9a85b5bb1f Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <bruederli@kolabsys.com>
Date: Fri, 20 Feb 2015 17:35:09 +0100
Subject: [PATCH] Small fix for task assignment exchange via iTip

---
 plugins/tasklist/drivers/kolab/tasklist_kolab_driver.php | 4 ++--
 plugins/tasklist/tasklist.php                            | 6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/plugins/tasklist/drivers/kolab/tasklist_kolab_driver.php b/plugins/tasklist/drivers/kolab/tasklist_kolab_driver.php
index 0cb51ae7..3dd977b2 100644
--- a/plugins/tasklist/drivers/kolab/tasklist_kolab_driver.php
+++ b/plugins/tasklist/drivers/kolab/tasklist_kolab_driver.php
@@ -1064,10 +1064,10 @@ class tasklist_kolab_driver extends tasklist_driver
         }
 
         // allow sequence increments if I'm the organizer
-        if ($this->plugin->is_organizer($object)) {
+        if ($this->plugin->is_organizer($object) && empty($object['_method'])) {
             unset($object['sequence']);
         }
-        else if (isset($old['sequence'])) {
+        else if (isset($old['sequence']) && empty($object['_method'])) {
             $object['sequence'] = $old['sequence'];
         }
 
diff --git a/plugins/tasklist/tasklist.php b/plugins/tasklist/tasklist.php
index 06fad645..780602cf 100644
--- a/plugins/tasklist/tasklist.php
+++ b/plugins/tasklist/tasklist.php
@@ -615,6 +615,12 @@ class tasklist extends rcube_plugin
         if (isset($rec['attendees']) && !is_array($rec['attendees']))
             $rec['attendees'] = array();
 
+        foreach ((array)$rec['attendees'] as $i => $attendee) {
+            if (is_string($attendee['rsvp'])) {
+                $rec['attendees'][$i]['rsvp'] = $attendee['rsvp'] == 'true' || $attendee['rsvp'] == '1';
+            }
+        }
+
         // copy the task status to my attendee partstat
         if (!empty($rec['_reportpartstat'])) {
             if (($idx = $this->is_attendee($rec)) !== false) {