mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Correctly handle multi-values when converting VCards to array

This commit is contained in:
Joas Schilling 2016-08-30 12:08:39 +02:00
parent dd2482e2c2
commit 0c4d471c18
No known key found for this signature in database
GPG Key ID: E166FD8976B3BAC8
1 changed files with 41 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
apps/dav/lib/CardDAV/AddressBookImpl.php
View File

@ -28,6 +28,7 @@ use OCP\Constants;
use OCP\IAddressBook; use OCP\IAddressBook;
use OCP\IURLGenerator; use OCP\IURLGenerator;
use Sabre\VObject\Component\VCard; use Sabre\VObject\Component\VCard;
use Sabre\VObject\Property;
use Sabre\VObject\Property\Text; use Sabre\VObject\Property\Text;
use Sabre\VObject\Reader; use Sabre\VObject\Reader;
use Sabre\VObject\UUIDUtil; use Sabre\VObject\UUIDUtil;
@ -225,7 +226,7 @@ class AddressBookImpl implements IAddressBook {
]; ];
foreach ($vCard->children as $property) { foreach ($vCard->children as $property) {
$result[$property->name] = $property->getValue(); /** @var \Sabre\VObject\Property\Unknown $property */
if ($property->name === 'PHOTO' && $property->getValueType() === 'BINARY') { if ($property->name === 'PHOTO' && $property->getValueType() === 'BINARY') {
$url = $this->urlGenerator->getAbsoluteURL( $url = $this->urlGenerator->getAbsoluteURL(
$this->urlGenerator->linkTo('', 'remote.php') . '/dav/'); $this->urlGenerator->linkTo('', 'remote.php') . '/dav/');
@ -237,14 +238,53 @@ class AddressBookImpl implements IAddressBook {
]) . '?photo'; ]) . '?photo';
$result['PHOTO'] = 'VALUE=uri:' . $url; $result['PHOTO'] = 'VALUE=uri:' . $url;
} else if ($property->name === 'X-SOCIALPROFILE') {
$type = $this->getTypeFromProperty($property);
// Type is the social network, when it's empty we don't need this.
if ($type !== null) {
if (!isset($result[$property->name])) {
$result[$property->name] = [];
}
$result[$property->name][$type] = $property->getValue();
}
// The following properties can be set multiple times
} else if (in_array($property->name, ['CLOUD', 'EMAIL', 'IMPP', 'TEL', 'URL'])) {
if (!isset($result[$property->name])) {
$result[$property->name] = [];
}
$result[$property->name][] = $property->getValue();
} else { } else {
$result[$property->name] = $property->getValue(); $result[$property->name] = $property->getValue();
} }
} }
if ($this->addressBookInfo['principaluri'] === 'principals/system/system' && if ($this->addressBookInfo['principaluri'] === 'principals/system/system' &&
$this->addressBookInfo['uri'] === 'system') { $this->addressBookInfo['uri'] === 'system') {
$result['isLocalSystemBook'] = true; $result['isLocalSystemBook'] = true;
} }
return $result; return $result;
} }
/**
* Get the type of the current property
*
* @param Property $property
* @return null|string
*/
protected function getTypeFromProperty(Property $property) {
$parameters = $property->parameters();
// Type is the social network, when it's empty we don't need this.
if (isset($parameters['TYPE'])) {
/** @var \Sabre\VObject\Parameter $type */
$type = $parameters['TYPE'];
return $type->getValue();
}
return null;
}
} }