Branch 'roundcubemail-plugins-kolab-format2-horde5' - plugins/libkolab plugins/tasklist

[Thomas Brüderli]

 plugins/libkolab/lib/kolab_format_contact.php            |    2 +-
 plugins/libkolab/lib/kolab_format_distributionlist.php   |    2 +-
 plugins/libkolab/lib/kolab_format_journal.php            |    2 +-
 plugins/libkolab/lib/kolab_format_note.php               |    2 +-
 plugins/libkolab/lib/kolab_format_task.php               |    2 +-
 plugins/tasklist/drivers/kolab/tasklist_kolab_driver.php |    4 ++--
 6 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 5b696a324f256cee7f88e88ba88a84acb6b9ca56
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Wed May 1 12:13:19 2013 +0200

    Read and validate 'last-modification-date' properties from Kolab XML Format objects

diff --git a/plugins/libkolab/lib/kolab_format_contact.php b/plugins/libkolab/lib/kolab_format_contact.php
index d9f68e3..c8002b8 100644
--- a/plugins/libkolab/lib/kolab_format_contact.php
+++ b/plugins/libkolab/lib/kolab_format_contact.php
@@ -245,7 +245,7 @@ class kolab_format_contact extends kolab_format
     {
         $object = array(
           'uid' => $record['uid'],
-          'changed' => $record['last-modification-date'],
+          'changed' => self::php_datetime($rec['last-modification-date']),
           'email' => array(),
           'phone' => array(),
         );
diff --git a/plugins/libkolab/lib/kolab_format_distributionlist.php b/plugins/libkolab/lib/kolab_format_distributionlist.php
index 54de53f..279cf2a 100644
--- a/plugins/libkolab/lib/kolab_format_distributionlist.php
+++ b/plugins/libkolab/lib/kolab_format_distributionlist.php
@@ -74,7 +74,7 @@ class kolab_format_distributionlist extends kolab_format
     {
         $object = array(
             'uid'     => $record['uid'],
-            'changed' => $record['changed'],
+            'changed' => self::php_datetime($record['last-modification-date']),
             'name'    => $record['display-name'],
             'member'  => array(),
         );
diff --git a/plugins/libkolab/lib/kolab_format_journal.php b/plugins/libkolab/lib/kolab_format_journal.php
index 9d38ed3..c70f4bd 100644
--- a/plugins/libkolab/lib/kolab_format_journal.php
+++ b/plugins/libkolab/lib/kolab_format_journal.php
@@ -61,7 +61,7 @@ class kolab_format_journal extends kolab_format
     {
         $object = array(
             'uid'     => $record['uid'],
-            'changed' => $record['last-modification-date'],
+            'changed' => self::php_datetime($record['last-modification-date']),
         );
 
         // TODO: implement this
diff --git a/plugins/libkolab/lib/kolab_format_note.php b/plugins/libkolab/lib/kolab_format_note.php
index da78c02..d4cab27 100644
--- a/plugins/libkolab/lib/kolab_format_note.php
+++ b/plugins/libkolab/lib/kolab_format_note.php
@@ -61,7 +61,7 @@ class kolab_format_note extends kolab_format
     {
         $object = array(
             'uid'     => $record['uid'],
-            'changed' => $record['last-modification-date'],
+            'changed' => self::php_datetime($record['last-modification-date']),
         );
 
         // TODO: implement this
diff --git a/plugins/libkolab/lib/kolab_format_task.php b/plugins/libkolab/lib/kolab_format_task.php
index 3aa97df..ad85ebf 100644
--- a/plugins/libkolab/lib/kolab_format_task.php
+++ b/plugins/libkolab/lib/kolab_format_task.php
@@ -107,7 +107,7 @@ class kolab_format_task extends kolab_format
     {
         $object = array(
             'uid'     => $record['uid'],
-            'dtstamp' => $record['last-modification-date'],
+            'changed' => self::php_datetime($record['last-modification-date']),
             'complete' => intval($record['completed']),
         );
 
diff --git a/plugins/tasklist/drivers/kolab/tasklist_kolab_driver.php b/plugins/tasklist/drivers/kolab/tasklist_kolab_driver.php
index 34e9fa0..b4d45e7 100644
--- a/plugins/tasklist/drivers/kolab/tasklist_kolab_driver.php
+++ b/plugins/tasklist/drivers/kolab/tasklist_kolab_driver.php
@@ -557,8 +557,8 @@ class tasklist_kolab_driver extends tasklist_driver
             if (!$record['start']->_dateonly)
                 $task['starttime'] = $record['start']->format('h:i');
         }
-        if (is_a($record['dtstamp'], 'DateTime')) {
-            $task['changed'] = $record['dtstamp'];
+        if (is_a($record['changed'], 'DateTime')) {
+            $task['changed'] = $record['changed'];
         }
 
         if ($record['alarms']) {