Merge pull request #26865 from nextcloud/backport/26845/stable21

[stable21] fix creating vcards with multiple string values
nextcloud · May 3, 2021 · 1cdb80b · 1cdb80b
2 parents 4714876 + c41a916
commit 1cdb80b
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 9 deletions.
diff --git a/apps/dav/lib/CardDAV/AddressBookImpl.php b/apps/dav/lib/CardDAV/AddressBookImpl.php
@@ -150,13 +150,17 @@ public function createOrUpdate($properties) {
 			if (is_array($value)) {
 				$vCard->remove($key);
 				foreach ($value as $entry) {
-					if (($key === "ADR" || $key === "PHOTO") && is_string($entry["value"])) {
-						$entry["value"] = stripslashes($entry["value"]);
-						$entry["value"] = explode(';', $entry["value"]);
-					}
-					$property = $vCard->createProperty($key, $entry["value"]);
-					if (isset($entry["type"])) {
-						$property->add('TYPE', $entry["type"]);
+					if (is_string($entry)) {
+						$property = $vCard->createProperty($key, $entry);
+					} else {
+						if (($key === "ADR" || $key === "PHOTO") && is_string($entry["value"])) {
+							$entry["value"] = stripslashes($entry["value"]);
+							$entry["value"] = explode(';', $entry["value"]);
+						}
+						$property = $vCard->createProperty($key, $entry["value"]);
+						if (isset($entry["type"])) {
+							$property->add('TYPE', $entry["type"]);
+						}
 					}
 					$vCard->add($property);
 				}

diff --git a/apps/dav/tests/unit/CardDAV/AddressBookImplTest.php b/apps/dav/tests/unit/CardDAV/AddressBookImplTest.php
@@ -154,11 +154,20 @@ public function testCreate($properties) {
 			->setMethods(['vCard2Array', 'createUid', 'createEmptyVCard'])
 			->getMock();
 
+		$expectedProperties = 0;
+		foreach ($properties as $data) {
+			if (is_string($data)) {
+				$expectedProperties++;
+			} else {
+				$expectedProperties += count($data);
+			}
+		}
+
 		$addressBookImpl->expects($this->once())->method('createUid')
 			->willReturn($uid);
 		$addressBookImpl->expects($this->once())->method('createEmptyVCard')
 			->with($uid)->willReturn($this->vCard);
-		$this->vCard->expects($this->exactly(count($properties)))
+		$this->vCard->expects($this->exactly($expectedProperties))
 			->method('createProperty');
 		$this->backend->expects($this->once())->method('createCard');
 		$this->backend->expects($this->never())->method('updateCard');
@@ -172,7 +181,8 @@ public function testCreate($properties) {
 	public function dataTestCreate() {
 		return [
 			[[]],
-			[['FN' => 'John Doe']]
+			[['FN' => 'John Doe']],
+			[['FN' => 'John Doe', 'EMAIL' => ['[email protected]', '[email protected]']]],
 		];
 	}