Automatically converting incoming vcard or icalendardata to UTF-8.

Author: evert

ChangeLog

@@ -4,6 +4,8 @@
 	  uppercase.
 	* Fixed: Issue 153: Support for files with mixed newline styles in
 	  Sabre_VObject.
+	* Fixed: Issue 159: Automatically converting any vcard and icalendardata
+	  to UTF-8.
 	* Added: Sabre_DAV_SimpleFile class for easy static file creation.
 	* Added: Issue 158: Support for the CARDDAV:supported-address-data
 	  property.

lib/Sabre/CalDAV/Calendar.php

@@ -178,6 +178,8 @@ public function createDirectory($name) {
     public function createFile($name,$calendarData = null) {
 
         $calendarData = stream_get_contents($calendarData);
+        // Converting to UTF-8, if needed
+        $calendarData = Sabre_DAV_StringUtil::ensureUTF8($calendarData);
 
         $supportedComponents = $this->calendarInfo['{' . Sabre_CalDAV_Plugin::NS_CALDAV . '}supported-calendar-component-set'];
         if ($supportedComponents) {

lib/Sabre/CalDAV/CalendarObject.php

@@ -93,6 +93,9 @@ public function put($calendarData) {
         if (is_resource($calendarData))
             $calendarData = stream_get_contents($calendarData);
 
+        // Converting to UTF-8, if needed
+        $calendarData = Sabre_DAV_StringUtil::ensureUTF8($calendarData);
+
         $supportedComponents = $this->calendarInfo['{' . Sabre_CalDAV_Plugin::NS_CALDAV . '}supported-calendar-component-set'];
         if ($supportedComponents) {
             $supportedComponents = $supportedComponents->getValue();

lib/Sabre/CalDAV/Version.php

@@ -14,7 +14,7 @@ class Sabre_CalDAV_Version {
     /**
      * Full version number
      */
-    const VERSION = '1.5.2';
+    const VERSION = '1.5.3';
 
     /**
      * Stability : alpha, beta, stable

lib/Sabre/CardDAV/AddressBook.php

@@ -112,6 +112,8 @@ public function createDirectory($name) {
     public function createFile($name,$vcardData = null) {
 
         $vcardData = stream_get_contents($vcardData);
+        // Converting to UTF-8, if needed
+        $vcardData = Sabre_DAV_StringUtil::ensureUTF8($vcardData);
 
         $this->carddavBackend->createCard($this->addressBookInfo['id'],$name,$vcardData);
 

lib/Sabre/CardDAV/Card.php

@@ -88,6 +88,9 @@ public function put($cardData) {
         if (is_resource($cardData))
             $cardData = stream_get_contents($cardData);
 
+        // Converting to UTF-8, if needed
+        $cardData = Sabre_DAV_StringUtil::ensureUTF8($cardData);
+
         $this->carddavBackend->updateCard($this->addressBookInfo['id'],$this->cardData['uri'],$cardData);
         $this->cardData['carddata'] = $cardData;