X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Fvcard.inc.php;h=5dd3b68df69d7fdee600c6c97d1e6b0255234c05;hb=ea8a6bf558de0c540d65da3ea64d72232384bfc1;hp=f357f74d638a3f516b9772bc879f5beef573120d;hpb=787bb3d745141f2f85bd947ad7dd775d2c63f908;p=platal.git

diff --git a/include/vcard.inc.php b/include/vcard.inc.php
index f357f74..5dd3b68 100644
--- a/include/vcard.inc.php
+++ b/include/vcard.inc.php
@@ -108,11 +108,13 @@ class VCardIterator implements PlIterator
 
 class VCard
 {
+    static private $windows = false;
     private $iterator = null;
 
     public function __construct($users, $photos = true, $freetext = null)
     {
         $this->iterator = new VCardIterator($photos, $freetext);
+        VCard::$windows  = (strpos($_SERVER['HTTP_USER_AGENT'], 'Windows') !== false);
         if (is_array($users)) {
             foreach ($users as $user) {
                 $this->iterator->add_user($user);
@@ -124,7 +126,11 @@ class VCard
 
     public static function escape($text)
     {
-        return preg_replace('/[,;]/', '\\\\$0', $text);
+        if (VCard::$windows) {
+            return str_replace(';', '\\\\;', $text);
+        } else {
+            return str_replace(array(';', ','), array('\\\\;', '\\\\,'), $text);
+        }
     }
 
     public static function format_adr($params, &$smarty)
@@ -150,7 +156,10 @@ class VCard
         if ($escape) {
             $text = VCard::escape($text);
         }
-        return preg_replace("/(\r\n|\n|\r)/", '\n', $text);
+        if (VCard::$windows) {
+            $text = utf8_decode($text);
+        }
+        return str_replace(array("\r\n", "\n", "\r"), '\n', $text);
     }
 
     public function do_page(&$page)