Changeset 4657 in subversion

Timestamp:

Apr 15, 2011 11:26:16 AM (2 years ago)

Author:

thomasb

Message:

Fix vcard folding at 75 chars; don't fold vcards for internal storage

Location:

trunk/roundcubemail/program

Files:

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

trunk/roundcubemail/program/include/rcube_contacts.php

@@ -552 +552 @@
             }
         }
-        $out['vcard'] = $vcard->export();
+        $out['vcard'] = $vcard->export(false);
 
         foreach ($this->table_cols as $col) {

trunk/roundcubemail/program/include/rcube_vcard.php

@@ -207 +207 @@
    * Convert the data structure into a vcard 3.0 string
    */
-  public function export()
-  {
-    return self::rfc2425_fold(self::vcard_encode($this->raw));
+  public function export($folded = true)
+  {
+    $vcard = self::vcard_encode($this->raw);
+    return $folded ? self::rfc2425_fold($vcard) : $vcard;
   }
   
@@ -466 +467 @@
   private static function rfc2425_fold_callback($matches)
   {
-    // use mb string function if available
-    if (function_exists('mb_ereg_replace')) {
-      return ":\n " . mb_ereg_replace('(.{70})', "\\1\n ", $matches[1]);
-    }
-    
     // chunk_split string and avoid lines breaking multibyte characters
-    $c = 66;
-    $out = ":\n " . substr($matches[1], 0, $c);
+    $c = 71;
+    $out .= substr($matches[1], 0, $c);
     for ($n = $c; $c < strlen($matches[1]); $c++) {
-      // break if length > 70 or mutlibyte character starts after position 66
-      if ($n > 70 || ($n > 66 && ord($matches[1][$c]) >> 6 == 3)) {
-        $out .= "\n ";
+      // break if length > 75 or mutlibyte character starts after position 71
+      if ($n > 75 || ($n > 71 && ord($matches[1][$c]) >> 6 == 3)) {
+        $out .= "\n  ";
         $n = 0;
       }
@@ -487 +483 @@
   }
 
-  private static function rfc2425_fold($val)
-  {
-    return preg_replace_callback('/:([^\n]{72,})/', array('self', 'rfc2425_fold_callback'), $val) . "\n";
+  public static function rfc2425_fold($val)
+  {
+    return preg_replace_callback('/([^\n]{72,})/', array('self', 'rfc2425_fold_callback'), $val);
   }
 

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

@@ -33 +33 @@
   // we already have a vcard record
   if ($row['vcard']) {
-    echo $row['vcard'] . "\n";
+    echo rcube_vcard::rfc2425_fold($row['vcard']) . "\n";
   }
   // copy values into vcard object
@@ -47 +47 @@
     }
 
-    echo $vcard->export() . "\n";
+    echo $vcard->export(true) . "\n";
   }
 }