Update list of multiple properties

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>

diff --git a/apps/dav/lib/CardDAV/AddressBookImpl.php b/apps/dav/lib/CardDAV/AddressBookImpl.php
index c63955202f474a804286e09d9c702475ac9748cc..5e355611c11d34d25e20a8b50fefc25450fad3ba 100644 (file)
--- a/apps/dav/lib/CardDAV/AddressBookImpl.php
+++ b/apps/dav/lib/CardDAV/AddressBookImpl.php
@@ -240,6 +240,7 @@ class AddressBookImpl implements IAddressBook {
         *
         * @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) {
@@ -259,19 +260,7 @@ class AddressBookImpl implements IAddressBook {
                                ]) . '?photo';
 
                                $result['PHOTO'] = 'VALUE=uri:' . $url;
-                       } elseif ($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
-                       } elseif (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] = [];
                                }

diff --git a/apps/dav/tests/unit/CardDAV/AddressBookImplTest.php b/apps/dav/tests/unit/CardDAV/AddressBookImplTest.php
index e4e2d4aef8e814c21da8d11f881992a090e4b5ef..6bf77c1f49e29a8b14451a7a5bd75c4e86a84bfd 100644 (file)
--- a/apps/dav/tests/unit/CardDAV/AddressBookImplTest.php
+++ b/apps/dav/tests/unit/CardDAV/AddressBookImplTest.php
@@ -321,6 +321,9 @@ class AddressBookImplTest extends TestCase {
                $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);
@@ -355,8 +358,88 @@ class AddressBookImplTest extends TestCase {
                        ],
 
                        '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,