2 commits - plugins/calendar plugins/libkolab plugins/tasklist

[Thomas Brüderli]

 plugins/calendar/drivers/kolab/kolab_driver.php          |    2 +-
 plugins/libkolab/README                                  |    3 +++
 plugins/libkolab/config.inc.php.dist                     |    2 +-
 plugins/libkolab/lib/kolab_storage.php                   |    2 +-
 plugins/libkolab/lib/kolab_storage_folder.php            |    4 ++--
 plugins/tasklist/drivers/kolab/tasklist_kolab_driver.php |    2 +-
 6 files changed, 9 insertions(+), 6 deletions(-)

New commits:
commit d59d4856d90edbcd1fde7548759845faf9025e36
Merge: 4245fb0 05f796f
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Thu Nov 22 15:19:38 2012 +0100

    Merge branch 'master' of ssh://git.kolabsys.com/git/roundcube



commit 4245fb0839686e5a20a0657052573e98399919fd
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Thu Nov 22 15:19:17 2012 +0100

    Treat Kolab format version as string

diff --git a/plugins/calendar/drivers/kolab/kolab_driver.php b/plugins/calendar/drivers/kolab/kolab_driver.php
index 0251107..9392ddc 100644
--- a/plugins/calendar/drivers/kolab/kolab_driver.php
+++ b/plugins/calendar/drivers/kolab/kolab_driver.php
@@ -56,7 +56,7 @@ class kolab_driver extends calendar_driver
     
     $this->freebusy_trigger = $this->rc->config->get('calendar_freebusy_trigger', false);
 
-    if (kolab_storage::$version == 2.0) {
+    if (kolab_storage::$version == '2.0') {
         $this->alarm_types = array('DISPLAY');
         $this->alarm_absolute = false;
     }
diff --git a/plugins/libkolab/README b/plugins/libkolab/README
index 0a3c0ce..54bf4ae 100644
--- a/plugins/libkolab/README
+++ b/plugins/libkolab/README
@@ -34,6 +34,9 @@ or a local config file (config.inc.php) located in the plugin folder.
 // Enable caching of Kolab objects in local database
 $rcmail_config['kolab_cache'] = true;
 
+// Specify format version to write Kolab objects (must be a string value!)
+$rcmail_config['kolab_format_version']  = '3.0';
+
 // Optional override of the URL to read and trigger Free/Busy information of Kolab users
 // Defaults to https://<imap-server->/freebusy
 $rcmail_config['kolab_freebusy_server'] = 'https://<some-host>/<freebusy-path>';
diff --git a/plugins/libkolab/config.inc.php.dist b/plugins/libkolab/config.inc.php.dist
index cb44652..6c7d05a 100644
--- a/plugins/libkolab/config.inc.php.dist
+++ b/plugins/libkolab/config.inc.php.dist
@@ -2,7 +2,7 @@
     /* Configuration for libkolab */
 
     $rcmail_config['kolab_cache'] = true;
-	$rcmail_config['kolab_format_version']  = 3.0;
+    $rcmail_config['kolab_format_version']  = '3.0';
 
     $rcmail_config['kolab_freebusy_server'] = 'https://' . $_SESSION['imap_host'] . '/freebusy';
     $rcmail_config['kolab_ssl_verify_peer'] = true;
diff --git a/plugins/libkolab/lib/kolab_storage.php b/plugins/libkolab/lib/kolab_storage.php
index 4c9e75d..05cb08d 100644
--- a/plugins/libkolab/lib/kolab_storage.php
+++ b/plugins/libkolab/lib/kolab_storage.php
@@ -31,7 +31,7 @@ class kolab_storage
     const SERVERSIDE_SUBSCRIPTION = 0;
     const CLIENTSIDE_SUBSCRIPTION = 1;
 
-    public static $version = 3.0;
+    public static $version = '3.0';
     public static $last_error;
 
     private static $ready = false;
diff --git a/plugins/libkolab/lib/kolab_storage_folder.php b/plugins/libkolab/lib/kolab_storage_folder.php
index f6730eb..c762822 100644
--- a/plugins/libkolab/lib/kolab_storage_folder.php
+++ b/plugins/libkolab/lib/kolab_storage_folder.php
@@ -582,7 +582,7 @@ class kolab_storage_folder
         }
 
         // save contact photo to attachment for Kolab2 format
-        if (kolab_storage::$version == 2.0 && $object['photo'] && !$existing_photo) {
+        if (kolab_storage::$version == '2.0' && $object['photo'] && !$existing_photo) {
             $attkey = 'kolab-picture.png';  // this file name is hard-coded in libkolab/kolabformatV2/contact.cpp
             $object['_attachments'][$attkey] = array(
                 'mimetype'=> rc_image_content_type($object['photo']),
@@ -800,7 +800,7 @@ class kolab_storage_folder
             . "To view this object you will need an email client that understands the Kolab Groupware format. "
             . "For a list of such email clients please visit http://www.kolab.org/\n\n");
 
-        $ctype = kolab_storage::$version == 2.0 ? $format->CTYPEv2 : $format->CTYPE;
+        $ctype = kolab_storage::$version == '2.0' ? $format->CTYPEv2 : $format->CTYPE;
         // Convert new lines to \r\n, to wrokaround "NO Message contains bare newlines"
         // when APPENDing from temp file
         $xml = preg_replace('/\r?\n/', "\r\n", $xml);
diff --git a/plugins/tasklist/drivers/kolab/tasklist_kolab_driver.php b/plugins/tasklist/drivers/kolab/tasklist_kolab_driver.php
index f1f0aea..3409e9c 100644
--- a/plugins/tasklist/drivers/kolab/tasklist_kolab_driver.php
+++ b/plugins/tasklist/drivers/kolab/tasklist_kolab_driver.php
@@ -47,7 +47,7 @@ class tasklist_kolab_driver extends tasklist_driver
 
         $this->_read_lists();
 
-        if (kolab_storage::$version == 2.0) {
+        if (kolab_storage::$version == '2.0') {
             $this->alarm_absolute = false;
         }
     }