From 2250dbec215ba6336160ae1b71102ae072863f1a Mon Sep 17 00:00:00 2001 From: Bjoern Schiessle Date: Thu, 12 Jul 2018 19:32:35 +0200 Subject: [PATCH] add a nice looking button as direct link to the sharre Signed-off-by: Bjoern Schiessle --- lib/private/Share20/DefaultShareProvider.php | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/lib/private/Share20/DefaultShareProvider.php b/lib/private/Share20/DefaultShareProvider.php index 90fa5044ae..f5e32de424 100644 --- a/lib/private/Share20/DefaultShareProvider.php +++ b/lib/private/Share20/DefaultShareProvider.php @@ -1318,14 +1318,6 @@ class DefaultShareProvider implements IShareProvider { $initiatorEmailAddress = ($initiatorUser instanceof IUser) ? $initiatorUser->getEMailAddress() : null; $plainHeading = $this->l->t('%1$s shared »%2$s« with you and want to add:', [$initiatorDisplayName, $filename]); $htmlHeading = $this->l->t('%1$s shared »%2$s« with you and want to add:', [$initiatorDisplayName, $filename]); - $link = $this->urlGenerator->linkToRouteAbsolute('files.viewcontroller.showFile', ['fileid' => $share->getNode()->getId()]); - if($share->getNode()->getType() === \OCP\Files\FileInfo::TYPE_FILE) { - $plainLink = $this->l->t('Direct link to the file: %s', [$link]); - $htmlLink = $this->l->t('Direct link to the file.', [$link]); - } else { - $plainLink = $this->l->t('Direct link to the folder: %s', [$link]); - $htmlLink = $this->l->t('Direct link to the folder.', [$link]); - } $message = $this->mailer->createMessage(); $emailTemplate = $this->mailer->createEMailTemplate('defaultShareProvider.sendNote'); @@ -1334,7 +1326,13 @@ class DefaultShareProvider implements IShareProvider { $emailTemplate->addHeader(); $emailTemplate->addHeading($htmlHeading, $plainHeading); $emailTemplate->addBodyText(htmlspecialchars($note), $note); - $emailTemplate->addBodyText($htmlLink, $plainLink); + + $link = $this->urlGenerator->linkToRouteAbsolute('files.viewcontroller.showFile', ['fileid' => $share->getNode()->getId()]); + $emailTemplate->addBodyButton( + $this->l->t('Open »%s«', [$filename]), + $link + ); + // The "From" contains the sharers name $instanceName = $this->defaults->getName();