Changeset 93af155 in github

Timestamp:

Jul 20, 2009 7:09:02 AM (4 years ago)

Author:

alecpl <alec@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

6955c70

Parents:

3b7e00f

Message:

• Fix import of vCard entries with params (#1485453)

Files:

• CHANGELOG (modified) (1 diff)
• program/include/rcube_vcard.php (modified) (5 diffs)

CHANGELOG

@@ -2 +2 @@
 ===========================
 
+- Fix import of vCard entries with params (#1485453)
 - Fix HTML messages output with empty block elements (#1485974)
 - Added hook when killing a session

program/include/rcube_vcard.php

@@ -265 +265 @@
 
       if (!preg_match('/^(BEGIN|END)$/i', $line[1]) && preg_match_all('/([^\\;]+);?/', $line[1], $regs2)) {
-        $entry = array('');
+        $entry = array();
         $field = strtoupper($regs2[1][0]);
 
@@ -271 +271 @@
           if ((list($key, $value) = explode('=', $attr)) && $value) {
             if ($key == 'ENCODING') {
-              # add next line(s) to value string if QP line end detected
+              // add next line(s) to value string if QP line end detected
               while ($value == 'QUOTED-PRINTABLE' && preg_match('/=$/', $lines[$i]))
                   $line[2] .= "\n" . $lines[++$i];
@@ -281 +281 @@
           }
           else if ($attrid > 0) {
-            $entry[$key] = true;  # true means attr without =value
+            $entry[$key] = true;  // true means attr without =value
           }
         }
 
-        $entry[0] = self::vcard_unquote($line[2]);
+        $entry = array_merge($entry, (array)self::vcard_unquote($line[2]));
         $data[$field][] = count($entry) > 1 ? $entry : $entry[0];
       }
@@ -291 +291 @@
 
     unset($data['VERSION']);
-
     return $data;
   }
@@ -361 +360 @@
               $value[] = $attrvalues;
             elseif ($attrvalues === true)
-              $attr .= ";$attrname";    # true means just tag, not tag=value, as in PHOTO;BASE64:...
+              $attr .= ";$attrname";    // true means just tag, not tag=value, as in PHOTO;BASE64:...
             else {
               foreach((array)$attrvalues as $attrvalue)