fix check for Cloud ID, missing return statements, wrong param use

Signed-off-by: Arthur Schiwon <[email protected]>

Author: blizzz

apps/dav/lib/CardDAV/CardDavBackend.php

@@ -974,8 +974,9 @@ public function search($addressBookId, $pattern, $searchProperties, $options = [
 					continue;
 				}
 
-				if ($property === 'CLOUD' && preg_match('/[^a-zA-Z0-9 _.@\-\']/', $pattern) === 1) {
-					// There can be no chars in cloud ids which are not valid for user ids
+				if ($property === 'CLOUD' && preg_match('/[^a-zA-Z0-9 :_.@\/\-\']/', $pattern) === 1) {
+					// There can be no chars in cloud ids which are not valid for user ids plus :/
+					// worst case: CA61590A-BBBC-423E-84AF-E6DF01455A53@https://my.nxt/srv/
 					continue;
 				}
 			}

apps/federatedfilesharing/lib/Notifier.php

@@ -107,9 +107,7 @@ public function prepare(INotification $notification, string $languageCode): INot
 					);
 
 					$initiator = $params[0];
-					$initiatorDisplay = isset($params[3]) ? $params[3] : null;
 					$owner = $params[1];
-					$ownerDisplay = isset($params[4]) ? $params[4] : null;
 
 					$notification->setRichSubject(
 						$l->t('You received {share} as a remote share from {user} (on behalf of {behalf})'),
@@ -119,8 +117,8 @@ public function prepare(INotification $notification, string $languageCode): INot
 								'id' => $notification->getObjectId(),
 								'name' => $params[2],
 							],
-							'user' => $this->createRemoteUser($initiator, $initiatorDisplay),
-							'behalf' => $this->createRemoteUser($owner, $ownerDisplay),
+							'user' => $this->createRemoteUser($initiator),
+							'behalf' => $this->createRemoteUser($owner),
 						]
 					);
 				} else {
@@ -129,7 +127,6 @@ public function prepare(INotification $notification, string $languageCode): INot
 					);
 
 					$owner = $params[0];
-					$ownerDisplay = isset($params[3]) ? $params[3] : null;
 
 					$notification->setRichSubject(
 						$l->t('You received {share} as a remote share from {user}'),
@@ -139,7 +136,7 @@ public function prepare(INotification $notification, string $languageCode): INot
 								'id' => $notification->getObjectId(),
 								'name' => $params[2],
 							],
-							'user' => $this->createRemoteUser($owner, $ownerDisplay),
+							'user' => $this->createRemoteUser($owner),
 						]
 					);
 				}
@@ -203,7 +200,7 @@ protected function createRemoteUser($cloudId, $displayName = null) {
 	 * @param ICloudId $cloudId
 	 * @return string
 	 */
-	protected function getDisplayName(ICloudId $cloudId) {
+	protected function getDisplayName(ICloudId $cloudId): string {
 		$server = $cloudId->getRemote();
 		$user = $cloudId->getUser();
 		if (strpos($server, 'http://') === 0) {
@@ -213,17 +210,24 @@ protected function getDisplayName(ICloudId $cloudId) {
 		}
 
 		try {
+			// contains protocol in the  ID
 			return $this->getDisplayNameFromContact($cloudId->getId());
 		} catch (\OutOfBoundsException $e) {
 		}
 
 		try {
-			$this->getDisplayNameFromContact($user . '@http://' . $server);
+			// does not include protocol, as stored in addressbooks
+			return $this->getDisplayNameFromContact($cloudId->getDisplayId());
 		} catch (\OutOfBoundsException $e) {
 		}
 
 		try {
-			$this->getDisplayNameFromContact($user . '@https://' . $server);
+			return $this->getDisplayNameFromContact($user . '@http://' . $server);
+		} catch (\OutOfBoundsException $e) {
+		}
+
+		try {
+			return $this->getDisplayNameFromContact($user . '@https://' . $server);
 		} catch (\OutOfBoundsException $e) {
 		}