Skip to content

[stable17] Update list of multiple properties #20532

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Parent: fix #21285 - Return correct loginname in credentials,
merged 1 commit into from
Apr 18, 2020
Merged

[stable17] Update list of multiple properties #20532

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 10 additions & 19 deletions apps/dav/lib/CardDAV/AddressBookImpl.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,14 @@
/**
* @copyright Copyright (c) 2016, ownCloud, Inc.
*
* @author Arne Hamann <kontakt+github@arne.email>
* @author Björn Schießle <bjoern@schiessle.org>
* @author Daniel Kesselberg <mail@danielkesselberg.de>
* @author Georg Ehrke <oc.list@georgehrke.com>
* @author Joas Schilling <coding@schilljs.com>
* @author John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* @author Julius Härtl <jus@bitgrid.net>
* @author labor4 <schreibtisch@labor4.ch>
* @author Thomas Müller <thomas.mueller@tmit.eu>
*
* @license AGPL-3.0
Expand All @@ -19,7 +24,7 @@
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License, version 3,
* along with this program. If not, see <http://www.gnu.org/licenses/>
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
*/

Expand Down Expand Up @@ -162,7 +167,7 @@ public function getPermissions() {
$permissions = $this->addressBook->getACL();
$result = 0;
foreach ($permissions as $permission) {
switch($permission['privilege']) {
switch ($permission['privilege']) {
case '{DAV:}read':
$result |= Constants::PERMISSION_READ;
break;
Expand Down Expand Up @@ -237,6 +242,7 @@ protected function createEmptyVCard($uid) {
*
* @param string $uri
* @param VCard $vCard
* @param boolean $withTypes (optional) return the values as arrays of value/type pairs
* @return array
*/
protected function vCard2Array($uri, VCard $vCard, $withTypes = false) {
Expand All @@ -256,20 +262,7 @@ protected function vCard2Array($uri, VCard $vCard, $withTypes = false) {
]) . '?photo';

$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', 'X-ADDRESSBOOKSERVER-MEMBER'])) {
} elseif (in_array($property->name, ['URL', 'GEO', 'CLOUD', 'ADR', 'EMAIL', 'IMPP', 'TEL', 'X-SOCIALPROFILE', 'RELATED', 'LANG', 'X-ADDRESSBOOKSERVER-MEMBER'])) {
if (!isset($result[$property->name])) {
$result[$property->name] = [];
}
Expand All @@ -279,12 +272,10 @@ protected function vCard2Array($uri, VCard $vCard, $withTypes = false) {
$result[$property->name][] = [
'type' => $type,
'value' => $property->getValue()
];
];
} else {
$result[$property->name][] = $property->getValue();
}


} else {
$result[$property->name] = $property->getValue();
}
Expand Down
87 changes: 85 additions & 2 deletions apps/dav/tests/unit/CardDAV/AddressBookImplTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,6 +326,9 @@ public function testVCard2Array() {
$property = $vCard->createProperty('X-SOCIALPROFILE', 'tw-example');
$property->add('TYPE', 'twitter');
$vCard->add($property);
$property = $vCard->createProperty('X-SOCIALPROFILE', 'tw-example-2');
$property->add('TYPE', 'twitter');
$vCard->add($property);
$property = $vCard->createProperty('X-SOCIALPROFILE', 'fb-example');
$property->add('TYPE', 'facebook');
$vCard->add($property);
Expand Down Expand Up @@ -360,8 +363,88 @@ public function testVCard2Array() {
],

'X-SOCIALPROFILE' => [
'twitter'=> 'tw-example',
'facebook'=> 'fb-example',
'tw-example',
'tw-example-2',
'fb-example',
],

'isLocalSystemBook' => true,
], $array);
}

public function testVCard2ArrayWithTypes() {
$vCard = new VCard();

$vCard->add($vCard->createProperty('FN', 'Full Name'));

// Multi-value properties
$vCard->add($vCard->createProperty('CLOUD', 'cloud-user1@localhost'));
$vCard->add($vCard->createProperty('CLOUD', 'cloud-user2@example.tld'));

$property = $vCard->createProperty('EMAIL', 'email-user1@localhost');
$property->add('TYPE', 'HOME');
$vCard->add($property);
$property = $vCard->createProperty('EMAIL', 'email-user2@example.tld');
$property->add('TYPE', 'WORK');
$vCard->add($property);

$vCard->add($vCard->createProperty('IMPP', 'impp-user1@localhost'));
$vCard->add($vCard->createProperty('IMPP', 'impp-user2@example.tld'));

$property = $vCard->createProperty('TEL', '+49 123456789');
$property->add('TYPE', 'HOME,VOICE');
$vCard->add($property);
$property = $vCard->createProperty('TEL', '+1 555 123456789');
$property->add('TYPE', 'WORK');
$vCard->add($property);

$vCard->add($vCard->createProperty('URL', 'https://localhost'));
$vCard->add($vCard->createProperty('URL', 'https://example.tld'));

// Type depending properties
$property = $vCard->createProperty('X-SOCIALPROFILE', 'tw-example');
$property->add('TYPE', 'twitter');
$vCard->add($property);
$property = $vCard->createProperty('X-SOCIALPROFILE', 'tw-example-2');
$property->add('TYPE', 'twitter');
$vCard->add($property);
$property = $vCard->createProperty('X-SOCIALPROFILE', 'fb-example');
$property->add('TYPE', 'facebook');
$vCard->add($property);

$array = $this->invokePrivate($this->addressBookImpl, 'vCard2Array', ['uri', $vCard, true]);
unset($array['PRODID']);
unset($array['UID']);

$this->assertEquals([
'URI' => 'uri',
'VERSION' => '4.0',
'FN' => 'Full Name',
'CLOUD' => [
['type' => '', 'value' => 'cloud-user1@localhost'],
['type' => '', 'value' => 'cloud-user2@example.tld'],
],
'EMAIL' => [
['type' => 'HOME', 'value' => 'email-user1@localhost'],
['type' => 'WORK', 'value' => 'email-user2@example.tld'],
],
'IMPP' => [
['type' => '', 'value' => 'impp-user1@localhost'],
['type' => '', 'value' => 'impp-user2@example.tld'],
],
'TEL' => [
['type' => 'HOME,VOICE', 'value' => '+49 123456789'],
['type' => 'WORK', 'value' => '+1 555 123456789'],
],
'URL' => [
['type' => '', 'value' => 'https://localhost'],
['type' => '', 'value' => 'https://example.tld'],
],

'X-SOCIALPROFILE' => [
['type' => 'twitter', 'value' => 'tw-example'],
['type' => 'twitter', 'value' => 'tw-example-2'],
['type' => 'facebook', 'value' => 'fb-example'],
],

'isLocalSystemBook' => true,
Expand Down