kopano_webapp/contactimporter
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

added unescaping for x- values as this is not handled in the vcard parser

Browse Source
This commit is contained in:
Christoph Haas 2017-02-27 23:20:22 +01:00
parent 17d686e1ce
commit b975c17812
1 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
php/module.contact.php
View File

@ -934,13 +934,13 @@ class ContactModule extends Module
$properties["notes"] = $vCard->note; $properties["notes"] = $vCard->note;
} }
if (isset($vCard->x["msassistant"])) { if (isset($vCard->x["msassistant"])) {
$properties["assistant"] = $vCard->x["msassistant"]; $properties["assistant"] = $this->unescapeVCFValue($vCard->x["msassistant"]);
} }
if (isset($vCard->x["msmanager"])) { if (isset($vCard->x["msmanager"])) {
$properties["manager_name"] = $vCard->x["msmanager"]; $properties["manager_name"] = $this->unescapeVCFValue($vCard->x["msmanager"]);
} }
if (isset($vCard->x["msspouse"])) { if (isset($vCard->x["msspouse"])) {
$properties["spouse_name"] = $vCard->x["msspouse"]; $properties["spouse_name"] = $this->unescapeVCFValue($vCard->x["msspouse"]);
} }
if (isset($vCard->categories) && count($vCard->categories) > 0) { if (isset($vCard->categories) && count($vCard->categories) > 0) {
$categories = array(); $categories = array();
@ -1182,4 +1182,23 @@ class ContactModule extends Module
$haystack = str_replace("type=", "", $haystack); // remove type from string $haystack = str_replace("type=", "", $haystack); // remove type from string
return substr($haystack, 0, strlen($needle)) === $needle; return substr($haystack, 0, strlen($needle)) === $needle;
} }
/**
* Unescape newline characters according to rfc6350 section 3.4.
* This function will replace:
* - escaped line breaks with PHP_EOL
* - escaped commas by ascii comma
* - escaped semicolon by ascii semicolon
*
* @link https://tools.ietf.org/html/rfc6350#section-3.4
* @param string $text
* @return string
*/
private function unescapeVCFValue($text)
{
$unescaped = str_replace("\\n", PHP_EOL, $text);
$unescaped = str_replace("\\;", ";", $unescaped);
$unescaped = str_replace("\\,", ",", $unescaped);
return $unescaped;
}
} }