lib/kolab_sync_body_converter.php

Aleksander Machniak machniak at kolabsys.com
Fri Aug 31 13:52:49 CEST 2012


 lib/kolab_sync_body_converter.php |   10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

New commits:
commit 1cb0206a72b3a76d32e838b38e2b5213b5e02162
Author: Aleksander Machniak <alec at alec.pl>
Date:   Fri Aug 31 13:52:02 2012 +0200

    Handle properly conversion to/from unsupported type, return empty instead of unconverted string

diff --git a/lib/kolab_sync_body_converter.php b/lib/kolab_sync_body_converter.php
index c3f9856..c4ce8dc 100644
--- a/lib/kolab_sync_body_converter.php
+++ b/lib/kolab_sync_body_converter.php
@@ -86,6 +86,9 @@ class kolab_sync_body_converter
         switch ($type) {
         case Syncroton_Model_EmailBody::TYPE_HTML:
             return '<pre>' . htmlspecialchars($data, ENT_COMPAT, kolab_sync::CHARSET) . '</pre>';
+        case Syncroton_Model_EmailBody::TYPE_RTF:
+            // @TODO
+            return '';
         }
 
         return $data;
@@ -107,6 +110,11 @@ class kolab_sync_body_converter
         case Syncroton_Model_EmailBody::TYPE_PLAINTEXT:
             $txt = new html2text($data, false, true);
             return $txt->get_text();
+        case Syncroton_Model_EmailBody::TYPE_RTF:
+            // @TODO
+            return '';
+        case Syncroton_Model_EmailBody::TYPE_MIME:
+            return '';
         }
 
         return $data;
@@ -123,6 +131,6 @@ class kolab_sync_body_converter
     protected function convert_rtf($type)
     {
         // @TODO: not implemented
-        return $this->text;
+        return '';
     }
 }





More information about the commits mailing list