diff options
author | Arthur Schiwon <blizzz@arthur-schiwon.de> | 2020-07-30 22:10:54 +0300 |
---|---|---|
committer | Arthur Schiwon <blizzz@arthur-schiwon.de> | 2020-08-06 13:43:47 +0300 |
commit | 69a38299403db073f4613e38724c16ac1009dbdf (patch) | |
tree | c370c70f6e006f21f7f024828b55222556dd6dba /apps/federatedfilesharing | |
parent | dd60e3282d8159a7ee249ce685fb184c85f14eb5 (diff) |
fix check for Cloud ID, missing return statements, wrong param use
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
Diffstat (limited to 'apps/federatedfilesharing')
-rw-r--r-- | apps/federatedfilesharing/lib/Notifier.php | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/apps/federatedfilesharing/lib/Notifier.php b/apps/federatedfilesharing/lib/Notifier.php index 46081240d6a..cae3fc2aa99 100644 --- a/apps/federatedfilesharing/lib/Notifier.php +++ b/apps/federatedfilesharing/lib/Notifier.php @@ -107,9 +107,7 @@ class Notifier implements INotifier { ); $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 @@ class Notifier implements INotifier { '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 @@ class Notifier implements INotifier { ); $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 @@ class Notifier implements INotifier { 'id' => $notification->getObjectId(), 'name' => $params[2], ], - 'user' => $this->createRemoteUser($owner, $ownerDisplay), + 'user' => $this->createRemoteUser($owner), ] ); } @@ -203,7 +200,7 @@ class Notifier implements INotifier { * @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 @@ class Notifier implements INotifier { } 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) { } |