summaryrefslogtreecommitdiff
path: root/plugins/tasklist
diff options
context:
space:
mode:
authorThomas Bruederli <bruederli@kolabsys.com>2015-02-20 16:35:09 (GMT)
committerThomas Bruederli <bruederli@kolabsys.com>2015-02-20 16:35:09 (GMT)
commit75cf17866c806075b8fe8f45fabf6d9a85b5bb1f (patch)
tree4b5ab7a9761d1e0922a7fc30d4a3122748832079 /plugins/tasklist
parentb41f2a05cb0d4fd67f5b65d00132c271d19a68b0 (diff)
downloadroundcubemail-plugins-kolab-75cf17866c806075b8fe8f45fabf6d9a85b5bb1f.tar.gz
Small fix for task assignment exchange via iTip
Diffstat (limited to 'plugins/tasklist')
-rw-r--r--plugins/tasklist/drivers/kolab/tasklist_kolab_driver.php4
-rw-r--r--plugins/tasklist/tasklist.php6
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 0cb51ae..3dd977b 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 06fad64..780602c 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) {