plugins/libkolab

[Thomas Brüderli]

 plugins/libkolab/lib/kolab_format_event.php |    3 +--
 plugins/libkolab/lib/kolab_format_task.php  |    4 ----
 plugins/libkolab/lib/kolab_format_xcal.php  |    1 +
 3 files changed, 2 insertions(+), 6 deletions(-)

New commits:
commit 01584404008a48865707d924fdb802208720244f
Author: Thomas Bruederli <thomas at roundcube.net>
Date:   Tue Jul 3 09:56:03 2012 +0200

    Fix object recurrence rule processing

diff --git a/plugins/libkolab/lib/kolab_format_event.php b/plugins/libkolab/lib/kolab_format_event.php
index 4742b51..3a70700 100644
--- a/plugins/libkolab/lib/kolab_format_event.php
+++ b/plugins/libkolab/lib/kolab_format_event.php
@@ -118,9 +118,8 @@ class kolab_format_event extends kolab_format_xcal
 
         // read object properties
         $object += array(
-            'allday'      => $this->obj->start()->isDateOnly(),
-            'start'       => self::php_datetime($this->obj->start()),
             'end'         => self::php_datetime($this->obj->end()),
+            'allday'      => $this->obj->start()->isDateOnly(),
             'free_busy'   => $this->obj->transparency() ? 'free' : 'busy',  // TODO: transparency is only boolean
             'attendees'   => array(),
         );
diff --git a/plugins/libkolab/lib/kolab_format_task.php b/plugins/libkolab/lib/kolab_format_task.php
index 477f1b2..629f9ac 100644
--- a/plugins/libkolab/lib/kolab_format_task.php
+++ b/plugins/libkolab/lib/kolab_format_task.php
@@ -89,10 +89,6 @@ class kolab_format_task extends kolab_format_xcal
 
         $object['complete'] = intval($this->obj->percentComplete());
 
-        // if start/end date is set
-        if ($dtstart = $this->obj->start())
-            $object['start'] = self::php_datetime($dtstart);
-
         // if due date is set
         if ($due = $this->obj->due())
             $object['due'] = self::php_datetime($due);
diff --git a/plugins/libkolab/lib/kolab_format_xcal.php b/plugins/libkolab/lib/kolab_format_xcal.php
index 18cf6e5..1cd803e 100644
--- a/plugins/libkolab/lib/kolab_format_xcal.php
+++ b/plugins/libkolab/lib/kolab_format_xcal.php
@@ -105,6 +105,7 @@ abstract class kolab_format_xcal extends kolab_format
             'sensitivity' => $sensitivity_map[$this->obj->classification()],
             'priority'    => $this->obj->priority(),
             'categories'  => self::vector2array($this->obj->categories()),
+            'start'       => self::php_datetime($this->obj->start()),
         );
 
         // read organizer and attendees