Move un-quote code to vCard parser

andig · Jan 12, 2019 · 980e461 · 980e461
1 parent 67ddf0e
commit 980e461
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/FritzBox/Converter.php b/src/FritzBox/Converter.php
@@ -36,8 +36,6 @@ public function convert($card)
             // add Person
             $person = $this->contact->addChild('person');
             $realName = htmlspecialchars($this->getProperty('realName'));
-            $realName = preg_replace("/\\\\([,\\\\])/", "$1", $realName); // remove quote backslashes
-            $realName = preg_replace("/\\ +/", " ", $realName);           // clean up multiple spaces
             $person->addChild('realName', $realName);
             // add photo
             if (isset($this->card->rawPhoto) && isset($this->card->imageURL)) {

diff --git a/src/Vcard/Parser.php b/src/Vcard/Parser.php
@@ -165,6 +165,13 @@ protected function parse()
                     $i++;
                 }
 
+                // Unquote COMMA and BACKSPACE as per RFC 6350 chap. 3.4
+                // https://tools.ietf.org/html/rfc6350#section-3.4
+                // But don't do this on potential binary data!
+                if (!$rawValue) {
+                    $value = preg_replace("/\\\\([,\\\\])/", "$1", $value); // remove quote backslashes
+                }
+
                 switch (strtoupper($element)) {
                     case 'FN':
                         $cardData->fullname = $value;