Branch 'kolab-syncroton-2.1' - 4 commits - .htaccess lib/kolab_sync_data_calendar.php lib/kolab_sync_data_email.php lib/kolab_sync_data.php

Jeroen van Meeuwen vanmeeuwen at kolabsys.com
Tue Mar 12 12:48:40 CET 2013


 .htaccess                        |   14 ++++++++++++++
 lib/kolab_sync_data.php          |    3 ++-
 lib/kolab_sync_data_calendar.php |    4 +++-
 lib/kolab_sync_data_email.php    |    6 ++++--
 4 files changed, 23 insertions(+), 4 deletions(-)

New commits:
commit ae4f5962077d991147500b16b4ff4be36baba87a
Author: Aleksander Machniak <alec at alec.pl>
Date:   Tue Mar 12 10:45:21 2013 +0100

    Don't send MIME if MimeSupport is not set (Bug #1688)

diff --git a/lib/kolab_sync_data_email.php b/lib/kolab_sync_data_email.php
index 45ac1b9..6959e71 100644
--- a/lib/kolab_sync_data_email.php
+++ b/lib/kolab_sync_data_email.php
@@ -237,13 +237,15 @@ class kolab_sync_data_email extends kolab_sync_data implements Syncroton_Data_ID
             }
         }
         else {
+            // The spec is not very clear, but it looks that if MimeSupport is not set
+            // we can't add Syncroton_Command_Sync::BODY_TYPE_MIME to the supported types
+            // list below (Bug #1688)
             $types = array(
-                Syncroton_Command_Sync::BODY_TYPE_MIME,
                 Syncroton_Command_Sync::BODY_TYPE_HTML,
                 Syncroton_Command_Sync::BODY_TYPE_PLAIN_TEXT,
             );
 
-            // @TODO: client can support both HTML and TEXT use one of
+            // @TODO: if client can support both HTML and TEXT use one of
             // them which is better according to the real message body type
 
             foreach ($types as $type) {


commit 58e6eb78753047bb338326ade19c0c14bfd26c52
Author: Aleksander Machniak <alec at alec.pl>
Date:   Tue Feb 26 17:55:33 2013 +0100

    Add .htaccess file with some PHP defaults required by Roundcube Framework (Bug #1660)

diff --git a/.htaccess b/.htaccess
new file mode 100644
index 0000000..3f76969
--- /dev/null
+++ b/.htaccess
@@ -0,0 +1,14 @@
+<IfModule mod_php5.c>
+php_flag	display_errors	Off
+php_flag	log_errors	On
+# php_value	error_log	logs/errors
+
+php_flag	magic_quotes_gpc			Off
+php_flag	magic_quotes_runtime		Off
+php_flag	zend.ze1_compatibility_mode	Off
+php_flag	suhosin.session.encrypt		Off
+php_flag	session.auto_start			Off
+
+php_value	mbstring.func_overload	0
+
+</IfModule>


commit 9a54257727a1f03c400399479b23a86349f69e41
Author: Aleksander Machniak <alec at alec.pl>
Date:   Sun Feb 24 12:10:56 2013 +0100

    Fix bug in recurrence exceptions handling (Bug #1656)

diff --git a/lib/kolab_sync_data_calendar.php b/lib/kolab_sync_data_calendar.php
index a0c828b..f93a91d 100644
--- a/lib/kolab_sync_data_calendar.php
+++ b/lib/kolab_sync_data_calendar.php
@@ -467,7 +467,9 @@ class kolab_sync_data_calendar extends kolab_sync_data implements Syncroton_Data
         $event['recurrence'] = $this->recurrence_to_kolab($data->recurrence, $timezone);
 
         // recurrence exceptions
-        $event['recurrence']['EXDATE'] = $this->exceptions_to_kolab($data->exceptions, $timezone);
+        if ($exdate = $this->exceptions_to_kolab($data->exceptions, $timezone)) {
+            $event['recurrence']['EXDATE'] = $exdate;
+        }
 
         return $event;
     }


commit 37f332055ceec2545e19e73529d0c3e2131c5f8f
Author: Aleksander Machniak <alec at alec.pl>
Date:   Wed Feb 20 09:46:32 2013 +0100

    Cast some data to string to workaround issue described in Bug #1635.
    PHP Warning: DOMDocument::createTextNode() expects parameter 1 to be string

diff --git a/lib/kolab_sync_data.php b/lib/kolab_sync_data.php
index 795d534..43371bc 100644
--- a/lib/kolab_sync_data.php
+++ b/lib/kolab_sync_data.php
@@ -971,7 +971,8 @@ abstract class kolab_sync_data implements Syncroton_Data_IData
         }
 
         if (!empty($value)) {
-            $params['data'] = $value;
+            // cast to string to workaround issue described in Bug #1635
+            $params['data'] = (string) $value;
         }
 
         if (!isset($params['type'])) {





More information about the commits mailing list