Clean up quote backslashes before some special chars (#91)

andig · Jan 12, 2019 · 3c3730d · 3c3730d
1 parent ab291da
commit 3c3730d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/src/FritzBox/Converter.php b/src/FritzBox/Converter.php
@@ -35,8 +35,8 @@ public function convert($card)
             $this->addVip();
             // add Person
             $person = $this->contact->addChild('person');
-            $name = htmlspecialchars($this->getProperty('realName'));
-            $person->addChild('realName', $name);
+            $realName = htmlspecialchars($this->getProperty('realName'));
+            $person->addChild('realName', $realName);
             // add photo
             if (isset($this->card->rawPhoto) && isset($this->card->imageURL)) {
                 if (isset($this->configImagePath)) {

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