feat (contacts): format/clean emails of carddav

Signed-off-by: TimedIn <[email protected]>

Author: timedin-de

apps/dav/lib/CardDAV/CardDavBackend.php

@@ -30,6 +30,7 @@
 use Sabre\CardDAV\Backend\SyncSupport;
 use Sabre\CardDAV\Plugin;
 use Sabre\DAV\Exception\BadRequest;
+use Sabre\VObject;
 use Sabre\VObject\Component\VCard;
 use Sabre\VObject\Reader;
 
@@ -606,6 +607,7 @@ public function getMultipleCards($addressBookId, array $uris) {
 	 * @return string
 	 */
 	public function createCard($addressBookId, $cardUri, $cardData, bool $checkAlreadyExists = true) {
+		$cardData = $this->formatCard($cardData);
 		$etag = md5($cardData);
 		$uid = $this->getUID($cardData);
 		return $this->atomic(function () use ($addressBookId, $cardUri, $cardData, $checkAlreadyExists, $etag, $uid) {
@@ -678,6 +680,7 @@ public function createCard($addressBookId, $cardUri, $cardData, bool $checkAlrea
 	 * @return string
 	 */
 	public function updateCard($addressBookId, $cardUri, $cardData) {
+		$cardData = $this->formatCard($cardData);
 		$uid = $this->getUID($cardData);
 		$etag = md5($cardData);
 
@@ -1460,4 +1463,23 @@ private function getUID(string $cardData): string {
 		// should already be handled, but just in case
 		throw new BadRequest('vCard can not be empty');
 	}
+
+	/**
+	 * Format vcard data (cleans spaces of emails)
+	 * @param string $cardData the vcard raw data
+	 * @return string the cleaned vcard data
+	 */
+	private function formatCard(string $cardData): string {
+		// Parse VCard
+		$vCard = VObject\Reader::read($cardData);
+	
+		// Loop through all emails, remove the entry, remove all spaces from email, add it back
+		foreach ($vCard->EMAIL as $email) {
+			$cleanedEmail = str_replace(' ', '', (string)$email);
+			$vCard->remove($email);
+			$vCard->add('EMAIL', $cleanedEmail, ['type' => $email['TYPE']]);
+		}
+		// return as string
+		return $vCard->serialize();
+	}
 }