Changeset 5012 in subversion

Timestamp:

Aug 3, 2011 6:40:29 AM (22 months ago)

Author:

alec

Message:

• Fix EOL character in vCard exports (#1487873)

Location:

trunk/roundcubemail

Files:

• CHANGELOG (modified) (1 diff)
• program/include/rcube_vcard.php (modified) (3 diffs)
• program/steps/addressbook/export.inc (modified) (2 diffs)

trunk/roundcubemail/CHANGELOG

@@ -2 +2 @@
 ===========================
 
+- Fix EOL character in vCard exports (#1487873)
 - Added optional "multithreading" autocomplete feature
 - Plugin API: Added 'config_get' hook

trunk/roundcubemail/program/include/rcube_vcard.php

@@ -34 +34 @@
     'N' => array(array('','','','','')),
   );
-  static private $fieldmap = array(
+  private static $fieldmap = array(
     'phone'    => 'TEL',
     'birthday' => 'BDAY',
@@ -66 +66 @@
   public $email = array();
 
+  public static $eol = "\r\n";
 
   /**
@@ -641 +642 @@
           continue;
 
-        $vcard .= self::vcard_quote($type) . $attr . ':' . self::vcard_quote($value) . "\n";
-      }
-    }
-
-    return "BEGIN:VCARD\nVERSION:3.0\n{$vcard}END:VCARD";
+        $vcard .= self::vcard_quote($type) . $attr . ':' . self::vcard_quote($value) . self::$eol;
+      }
+    }
+
+    return 'BEGIN:VCARD' . self::$eol . 'VERSION:3.0' . self::$eol . $vcard . 'END:VCARD';
   }
 

trunk/roundcubemail/program/steps/addressbook/export.inc

@@ -74 +74 @@
     // we already have a vcard record
     if ($row['vcard'] && $row['name']) {
-        echo rcube_vcard::rfc2425_fold($row['vcard']) . "\n";
+        $row['vcard'] = preg_replace('/\r?\n/', rcube_vcard::$eol, $row['vcard']);
+        echo rcube_vcard::rfc2425_fold($row['vcard']) . rcube_vcard::$eol;
     }
     // copy values into vcard object
@@ -91 +92 @@
         }
 
-        echo $vcard->export(true) . "\n";
+        echo $vcard->export(true) . rcube_vcard::$eol;
     }
 }