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

[Thomas Brüderli]

 plugins/calendar/drivers/kolab/kolab_calendar.php      |    1 -
 plugins/libkolab/lib/kolab_format_configuration.php    |    2 ++
 plugins/libkolab/lib/kolab_format_contact.php          |    2 +-
 plugins/libkolab/lib/kolab_format_distributionlist.php |    3 ++-
 plugins/libkolab/lib/kolab_format_event.php            |    2 +-
 plugins/libkolab/lib/kolab_format_journal.php          |    1 +
 plugins/libkolab/lib/kolab_format_note.php             |    1 +
 plugins/libkolab/lib/kolab_format_task.php             |    2 +-
 8 files changed, 9 insertions(+), 5 deletions(-)

New commits:
commit 5257fc62ff63b5781c76de070bf882673b8b4f0d
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Wed May 1 11:48:20 2013 +0200

    Update 'changed' date when saving an object. 'last-modification-date' is updated automatically by the Horde5 Kolab Format library

diff --git a/plugins/calendar/drivers/kolab/kolab_calendar.php b/plugins/calendar/drivers/kolab/kolab_calendar.php
index 8f95117..499e2a9 100644
--- a/plugins/calendar/drivers/kolab/kolab_calendar.php
+++ b/plugins/calendar/drivers/kolab/kolab_calendar.php
@@ -335,7 +335,6 @@ class kolab_calendar
     }
     else {
       $updated = true;
-      $object['last-modification-date'] = time();  // set last-modification timestamp
       $this->events[$event['id']] = $this->_to_rcube_event($object);
     }
 
diff --git a/plugins/libkolab/lib/kolab_format_configuration.php b/plugins/libkolab/lib/kolab_format_configuration.php
index 10c9eb9..050b8f8 100644
--- a/plugins/libkolab/lib/kolab_format_configuration.php
+++ b/plugins/libkolab/lib/kolab_format_configuration.php
@@ -40,6 +40,8 @@ class kolab_format_configuration extends kolab_format
         if ($object['type'])
             $this->subtype = $object['type'];
 
+        $object['changed'] = new DateTime();
+
         // adjust content-type string
         $this->CTYPE = 'application/x-vnd.kolab.configuration.' . $this->subtype;
 
diff --git a/plugins/libkolab/lib/kolab_format_contact.php b/plugins/libkolab/lib/kolab_format_contact.php
index 5e125b2..d9f68e3 100644
--- a/plugins/libkolab/lib/kolab_format_contact.php
+++ b/plugins/libkolab/lib/kolab_format_contact.php
@@ -125,7 +125,7 @@ class kolab_format_contact extends kolab_format
         if ($object['uid'])
             $this->kolab_object['uid'] = $object['uid'];
 
-        $this->kolab_object['last-modification-date'] = time();
+        $object['changed'] = new DateTime();
 
         // map name fields rcube => $kolab
         foreach ($this->kolab2_fieldmap_name as $kolab => $rcube) {
diff --git a/plugins/libkolab/lib/kolab_format_distributionlist.php b/plugins/libkolab/lib/kolab_format_distributionlist.php
index e138d8b..54de53f 100644
--- a/plugins/libkolab/lib/kolab_format_distributionlist.php
+++ b/plugins/libkolab/lib/kolab_format_distributionlist.php
@@ -41,7 +41,8 @@ class kolab_format_distributionlist extends kolab_format
         if ($object['uid'])
             $this->kolab_object['uid'] = $object['uid'];
 
-        $this->kolab_object['changed'] = new DateTime();
+        $object['changed'] = new DateTime();
+
         $this->kolab_object['display-name'] = $object['name'];
         $this->kolab_object['member'] = array();
 
diff --git a/plugins/libkolab/lib/kolab_format_event.php b/plugins/libkolab/lib/kolab_format_event.php
index c55654c..4b817a7 100644
--- a/plugins/libkolab/lib/kolab_format_event.php
+++ b/plugins/libkolab/lib/kolab_format_event.php
@@ -79,7 +79,7 @@ class kolab_format_event extends kolab_format
         if ($object['uid'])
             $this->kolab_object['uid'] = $object['uid'];
 
-        $this->kolab_object['last-modification-date'] = new DateTime();
+        $object['changed'] = new DateTime();
 
         // map basic fields rcube => $kolab
         foreach ($this->kolab2_fieldmap as $kolab => $rcube) {
diff --git a/plugins/libkolab/lib/kolab_format_journal.php b/plugins/libkolab/lib/kolab_format_journal.php
index 3e1d8ed..9d38ed3 100644
--- a/plugins/libkolab/lib/kolab_format_journal.php
+++ b/plugins/libkolab/lib/kolab_format_journal.php
@@ -39,6 +39,7 @@ class kolab_format_journal extends kolab_format
         $this->init();
 
         // TODO: set object propeties
+        $object['changed'] = new DateTime();
 
         // cache this data
         $this->data = $object;
diff --git a/plugins/libkolab/lib/kolab_format_note.php b/plugins/libkolab/lib/kolab_format_note.php
index da17f72..da78c02 100644
--- a/plugins/libkolab/lib/kolab_format_note.php
+++ b/plugins/libkolab/lib/kolab_format_note.php
@@ -39,6 +39,7 @@ class kolab_format_note extends kolab_format
         $this->init();
 
         // TODO: set object propeties
+        $object['changed'] = new DateTime();
 
         // cache this data
         $this->data = $object;
diff --git a/plugins/libkolab/lib/kolab_format_task.php b/plugins/libkolab/lib/kolab_format_task.php
index 02b32b3..915b227 100644
--- a/plugins/libkolab/lib/kolab_format_task.php
+++ b/plugins/libkolab/lib/kolab_format_task.php
@@ -61,7 +61,7 @@ class kolab_format_task extends kolab_format
         if ($object['uid'])
             $this->kolab_object['uid'] = $object['uid'];
 
-        $this->kolab_object['last-modification-date'] = new DateTime();
+        $object['changed'] = new DateTime();
 
         // map basic fields rcube => $kolab
         foreach ($this->kolab2_fieldmap as $kolab => $rcube) {