Branch 'dev/recurring-invitations' - 3 commits - plugins/libcalendaring plugins/libkolab

Thomas Brüderli bruederli at kolabsys.com
Thu Feb 19 15:59:14 CET 2015


 plugins/libcalendaring/lib/libcalendaring_itip.php |    4 ++--
 plugins/libcalendaring/libvcalendar.php            |    2 +-
 plugins/libkolab/lib/kolab_format_event.php        |    2 +-
 plugins/libkolab/lib/kolab_format_xcal.php         |    2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 026d62d2351c58b5e28777ccc8767415490b4985
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Thu Feb 19 15:58:32 2015 +0100

    Avoid comparison errors if recurrence is set to '' (used to unset recurrence rules)

diff --git a/plugins/libkolab/lib/kolab_format_xcal.php b/plugins/libkolab/lib/kolab_format_xcal.php
index e6507d6..4d3a758 100644
--- a/plugins/libkolab/lib/kolab_format_xcal.php
+++ b/plugins/libkolab/lib/kolab_format_xcal.php
@@ -661,7 +661,7 @@ abstract class kolab_format_xcal extends kolab_format
                 $a = $a->format('Y-m-d');
                 $b = $b->format('Y-m-d');
             }
-            if ($prop == 'recurrence') {
+            if ($prop == 'recurrence' && is_array($a) && is_array($b)) {
                 unset($a['EXCEPTIONS']);
                 unset($b['EXCEPTIONS']);
                 $a = array_filter($a);


commit db637619c3cfa5fc73e55c7f60adba9c2c635e0a
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Thu Feb 19 15:57:37 2015 +0100

    Omit RSVP flag in iCal export if not true

diff --git a/plugins/libcalendaring/libvcalendar.php b/plugins/libcalendaring/libvcalendar.php
index 07612d5..826e8d8 100644
--- a/plugins/libcalendaring/libvcalendar.php
+++ b/plugins/libcalendaring/libvcalendar.php
@@ -1088,7 +1088,7 @@ class libvcalendar implements Iterator
             }
             else if (!empty($attendee['email'])) {
                 if (isset($attendee['rsvp']))
-                    $attendee['rsvp'] = $attendee['rsvp'] ? 'TRUE' : 'FALSE';
+                    $attendee['rsvp'] = $attendee['rsvp'] ? 'TRUE' : null;
                 $ve->add('ATTENDEE', 'mailto:' . $attendee['email'], array_filter(self::map_keys($attendee, $this->attendee_keymap)));
             }
         }


commit 61037eb97c8580d385fc625db064f3855d8a823f
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Thu Feb 19 15:56:46 2015 +0100

    Fix RSVP flag in iTip REQUESTS

diff --git a/plugins/libcalendaring/lib/libcalendaring_itip.php b/plugins/libcalendaring/lib/libcalendaring_itip.php
index b4a7aee..e7de5c8 100644
--- a/plugins/libcalendaring/lib/libcalendaring_itip.php
+++ b/plugins/libcalendaring/lib/libcalendaring_itip.php
@@ -250,8 +250,8 @@ class libcalendaring_itip
         // set RSVP for every attendee
         else if ($method == 'REQUEST') {
             foreach ($event['attendees'] as $i => $attendee) {
-                if ($attendee['status'] != 'DELEGATED') {
-                    $event['attendees'][$i]['rsvp']= $rsvp ? true : null;
+                if ($attendee['status'] != 'DELEGATED' && !isset($attendee['rsvp'])) {
+                    $event['attendees'][$i]['rsvp']= (bool)$rsvp;
                 }
             }
         }
diff --git a/plugins/libkolab/lib/kolab_format_event.php b/plugins/libkolab/lib/kolab_format_event.php
index 0c90e85..91efb26 100644
--- a/plugins/libkolab/lib/kolab_format_event.php
+++ b/plugins/libkolab/lib/kolab_format_event.php
@@ -118,7 +118,7 @@ class kolab_format_event extends kolab_format_xcal
                 $vexceptions->push($exevent->obj);
 
                 // write cleaned-up exception data back to memory/cache
-                $object['recurrence']['EXCEPTIONS'][$i] = $this->expand_exception($compacted, $object);
+                $object['recurrence']['EXCEPTIONS'][$i] = $this->expand_exception($exevent->data, $object);
             }
             $this->obj->setExceptions($vexceptions);
         }




More information about the commits mailing list