Skip to content

Feature/noid/invitation buttons request only this is only for ci #16625

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
georgehrke wants to merge 7 commits into from
Closed

Feature/noid/invitation buttons request only this is only for ci #16625

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
87bf430
Customize presentation of accept/decline buttons in iMip mail
Nov 10, 2018
e334aab
corrected sample config
Nov 10, 2018
2d756ac
Respect RSVP parameter for attendees when adding accept/decline buttons.
Nov 12, 2018
3510fdc
Revert 3ff3ed0c56 case-insensitive compares.
Nov 12, 2018
e451905
IMipPlugin: Added unit test for dav.invitation_link_recipients support
Feb 28, 2019
f033689
IMipPlugin: DRY up - move common test set-up into setUp function
Feb 28, 2019
a16c919
Move dav.invitation_link_recipients from getSystemValue to getAppValue
brad2014 Jul 17, 2019
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
Prev Previous commit
Next Next commit
Respect RSVP parameter for attendees when adding accept/decline buttons. 
If RSVP=TRUE parameter is FALSE or absent for an ATTENDEE, then do no
present accept/decline buttons. The organizer isn't asking for an RSVP.

Signed-off-by: Brad Rubenstein <[email protected]>
  • Loading branch information
@georgehrke
Brad Rubenstein authored and georgehrke committed Aug 1, 2019
commit 2d756ace607b1a06e978a28b9b93a7258deceabd
19 changes: 17 additions & 2 deletions apps/dav/lib/CalDAV/Schedule/IMipPlugin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ public function schedule(Message $iTipMessage) {


// Only add response buttons to invitation requests: Fix Issue #11230
if ($method == self::METHOD_REQUEST) {
if (($method == self::METHOD_REQUEST) && $this->getAttendeeRSVP($attendee)) {

/*
** Only offer invitation accept/reject buttons, which link back to the
Expand Down Expand Up @@ -380,6 +380,21 @@ private function getAttendeeLangOrDefault($default, Property $attendee = null) {
return $default;
}

/**
* @param Property|null $attendee
* @return bool
*/
private function getAttendeeRSVP(Property $attendee = null) {
if ($attendee !== null) {
$rsvp = $attendee->offsetGet('RSVP');
if (($rsvp instanceof Parameter) && (strcasecmp($rsvp->getValue(), 'TRUE') === 0)) {
return true;
}
}
// RFC 5545 3.2.17: default RSVP is false
return false;
}

/**
* @param IL10N $l10n
* @param Property $dtstart
Expand Down Expand Up @@ -538,7 +553,7 @@ private function addResponseButtons(IEMailTemplate $template, IL10N $l10n,
$moreOptionsURL, $l10n->t('More options …')
]);
$text = $l10n->t('More options at %s', [$moreOptionsURL]);

$template->addBodyText($html, $text);
}

Expand Down