Loading patches/015-email-mail-template.patch +6 −29 Original line number Diff line number Diff line Loading @@ -33,7 +33,7 @@ /** --- ./apps/dav/lib/CalDAV/Schedule/IMipPlugin.php 2022-07-27 13:21:50.294113800 +0530 +++ ./apps/dav/lib/CalDAV/Schedule/IMipPlugin-newModified.php 2022-07-27 13:52:13.154113800 +0530 +++ ./apps/dav/lib/CalDAV/Schedule/IMipPlugin-newModified.php 2022-07-28 11:43:03.254435200 +0530 @@ -151,15 +151,6 @@ */ public function schedule(Message $iTipMessage) { Loading Loading @@ -217,38 +217,15 @@ } } @@ -659,7 +739,7 @@ Message $iTipMessage, $lastOccurrence) { $token = $this->createInvitationToken($iTipMessage, $lastOccurrence); - $template->addBodyButtonGroupTentative( + $template->addBodyButtonGroup( $l10n->t('Accept'), $this->urlGenerator->linkToRouteAbsolute('dav.invitation_response.accept', [ 'token' => $token, @@ -667,11 +747,18 @@ $l10n->t('Decline'), $this->urlGenerator->linkToRouteAbsolute('dav.invitation_response.decline', [ 'token' => $token, - ]), - $l10n->t('Maybe'), - $this->urlGenerator->getAbsoluteUrl('apps/calendar/invitation/tentative/'.$token) + ]) @@ -671,7 +751,6 @@ $l10n->t('Maybe'), $this->urlGenerator->getAbsoluteUrl('apps/calendar/invitation/tentative/'.$token) ); + $moreOptionsURL = $this->urlGenerator->linkToRouteAbsolute('dav.invitation_response.options', [ + 'token' => $token, + ]); + $html = vsprintf('<small><a href="%s">%s</a></small>', [ + $moreOptionsURL, $l10n->t('More options …') + ]); + $text = $l10n->t('More options at %s', [$moreOptionsURL]); + + $template->addBodyText($html, $text); - } /** @@ -716,4 +803,4 @@ @@ -716,4 +795,4 @@ return $token; } Loading Loading
patches/015-email-mail-template.patch +6 −29 Original line number Diff line number Diff line Loading @@ -33,7 +33,7 @@ /** --- ./apps/dav/lib/CalDAV/Schedule/IMipPlugin.php 2022-07-27 13:21:50.294113800 +0530 +++ ./apps/dav/lib/CalDAV/Schedule/IMipPlugin-newModified.php 2022-07-27 13:52:13.154113800 +0530 +++ ./apps/dav/lib/CalDAV/Schedule/IMipPlugin-newModified.php 2022-07-28 11:43:03.254435200 +0530 @@ -151,15 +151,6 @@ */ public function schedule(Message $iTipMessage) { Loading Loading @@ -217,38 +217,15 @@ } } @@ -659,7 +739,7 @@ Message $iTipMessage, $lastOccurrence) { $token = $this->createInvitationToken($iTipMessage, $lastOccurrence); - $template->addBodyButtonGroupTentative( + $template->addBodyButtonGroup( $l10n->t('Accept'), $this->urlGenerator->linkToRouteAbsolute('dav.invitation_response.accept', [ 'token' => $token, @@ -667,11 +747,18 @@ $l10n->t('Decline'), $this->urlGenerator->linkToRouteAbsolute('dav.invitation_response.decline', [ 'token' => $token, - ]), - $l10n->t('Maybe'), - $this->urlGenerator->getAbsoluteUrl('apps/calendar/invitation/tentative/'.$token) + ]) @@ -671,7 +751,6 @@ $l10n->t('Maybe'), $this->urlGenerator->getAbsoluteUrl('apps/calendar/invitation/tentative/'.$token) ); + $moreOptionsURL = $this->urlGenerator->linkToRouteAbsolute('dav.invitation_response.options', [ + 'token' => $token, + ]); + $html = vsprintf('<small><a href="%s">%s</a></small>', [ + $moreOptionsURL, $l10n->t('More options …') + ]); + $text = $l10n->t('More options at %s', [$moreOptionsURL]); + + $template->addBodyText($html, $text); - } /** @@ -716,4 +803,4 @@ @@ -716,4 +795,4 @@ return $token; } Loading