diff options
| author | Arthur Schiwon <blizzz@arthur-schiwon.de> | 2020-08-03 12:05:45 +0300 |
|---|---|---|
| committer | Arthur Schiwon <blizzz@arthur-schiwon.de> | 2020-08-06 13:43:47 +0300 |
| commit | c6becac993d04f6e8e3ebe2009967b8c4528ade3 (patch) | |
| tree | edec8c144f511c110270555f5d90bc9bb5577fb5 /apps/federatedfilesharing | |
| parent | f13d5a3ec0e3bacec53ea64ee360aae000413b16 (diff) | |
effectively revert 17fae47bdba84ed520fee2cbf1a9485cc14fbbcb fixing i10n
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
Diffstat (limited to 'apps/federatedfilesharing')
| -rw-r--r-- | apps/federatedfilesharing/lib/ocm/CloudFederationProviderFiles.php | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/apps/federatedfilesharing/lib/ocm/CloudFederationProviderFiles.php b/apps/federatedfilesharing/lib/ocm/CloudFederationProviderFiles.php index 0e9b9dbed62..4ee33c6e05b 100644 --- a/apps/federatedfilesharing/lib/ocm/CloudFederationProviderFiles.php +++ b/apps/federatedfilesharing/lib/ocm/CloudFederationProviderFiles.php @@ -255,7 +255,7 @@ class CloudFederationProviderFiles implements ICloudFederationProvider { ->setAffectedUser($shareWith) ->setObject('remote_share', (int)$shareId, $name); \OC::$server->getActivityManager()->publish($event); - $this->notifyAboutNewShare($shareWith, $shareId, $ownerFederatedId, $sharedByFederatedId, $name, $sharedBy, $owner); + $this->notifyAboutNewShare($shareWith, $shareId, $ownerFederatedId, $sharedByFederatedId, $name); } else { $groupMembers = $this->groupManager->get($shareWith)->getUsers(); foreach ($groupMembers as $user) { @@ -266,7 +266,7 @@ class CloudFederationProviderFiles implements ICloudFederationProvider { ->setAffectedUser($user->getUID()) ->setObject('remote_share', (int)$shareId, $name); \OC::$server->getActivityManager()->publish($event); - $this->notifyAboutNewShare($user->getUID(), $shareId, $ownerFederatedId, $sharedByFederatedId, $name, $sharedBy, $owner); + $this->notifyAboutNewShare($user->getUID(), $shareId, $ownerFederatedId, $sharedByFederatedId, $name); } } return $shareId; @@ -332,22 +332,13 @@ class CloudFederationProviderFiles implements ICloudFederationProvider { return $result; } - /** - * notify user about new federated share - * - * @param $shareWith - * @param $shareId - * @param $ownerFederatedId - * @param $sharedByFederatedId - * @param $name - */ - private function notifyAboutNewShare($shareWith, $shareId, $ownerFederatedId, $sharedByFederatedId, $name, $sharedBy, $owner) { + private function notifyAboutNewShare($shareWith, $shareId, $ownerFederatedId, $sharedByFederatedId, $name): void { $notification = $this->notificationManager->createNotification(); $notification->setApp('files_sharing') ->setUser($shareWith) ->setDateTime(new \DateTime()) ->setObject('remote_share', $shareId) - ->setSubject('remote_share', [$ownerFederatedId, $sharedByFederatedId, trim($name, '/'), $sharedBy, $owner]); + ->setSubject('remote_share', [$ownerFederatedId, $sharedByFederatedId, trim($name, '/')]); $declineAction = $notification->createAction(); $declineAction->setLabel('decline') |