Skip to content

[stable19] fix display of remote users in incoming share notifications #22105

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
backportbot-nextcloud wants to merge 5 commits into from
Closed

[stable19] fix display of remote users in incoming share notifications #22105

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
815d7ce
fix check for Cloud ID, missing return statements, wrong param use
blizzz Jul 30, 2020
6a6955b
coding style fixes
blizzz Jul 30, 2020
b38ac81
effectively revert 17fae47bdba84ed520fee2cbf1a9485cc14fbbcb fixing i10n
blizzz Aug 3, 2020
8d56d0b
Fix missing placeholders in translations
nickvergessen Aug 3, 2020
57e3bf9
Short php syntax
nickvergessen Aug 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
fix check for Cloud ID, missing return statements, wrong param use 
Signed-off-by: Arthur Schiwon <[email protected]>
  • Loading branch information
@blizzz @backportbot
blizzz authored and backportbot[bot] committed Aug 4, 2020
commit 815d7ceeddacb701306ada5da39971b9d5e80a66
22 changes: 13 additions & 9 deletions apps/federatedfilesharing/lib/Notifier.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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})'),
Expand All @@ -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 {
Expand All @@ -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}'),
Expand All @@ -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),
]
);
}
Expand Down Expand Up @@ -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) {
Expand All @@ -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) {
}

Expand Down