Skip to content
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

Jump to bottom

[stable24] Remove comment and guests option from Invitations UI #35861

Merged
merged 1 commit into from
Dec 23, 2022
Merged

[stable24] Remove comment and guests option from Invitations UI #35861

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 2 additions & 17 deletions apps/dav/lib/Controller/InvitationResponseController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,15 +140,13 @@ public function options(string $token):TemplateResponse {
*/
public function processMoreOptionsResult(string $token):TemplateResponse {
$partstat = $this->request->getParam('partStat');
$guests = (int) $this->request->getParam('guests');
$comment = $this->request->getParam('comment');

$row = $this->getTokenInformation($token);
if (!$row || !\in_array($partstat, ['ACCEPTED', 'DECLINED', 'TENTATIVE'])) {
return new TemplateResponse($this->appName, 'schedule-response-error', [], 'guest');
}

$iTipMessage = $this->buildITipResponse($row, $partstat, $guests, $comment);
$iTipMessage = $this->buildITipResponse($row, $partstat);
$this->responseServer->handleITipMessage($iTipMessage);
if ($iTipMessage->getScheduleStatus() === '1.2') {
return new TemplateResponse($this->appName, 'schedule-response-success', [], 'guest');
Expand Down Expand Up @@ -190,8 +188,7 @@ private function getTokenInformation(string $token) {
* @param string|null $comment
* @return Message
*/
private function buildITipResponse(array $row, string $partStat, int $guests = null,
string $comment = null):Message {
private function buildITipResponse(array $row, string $partStat):Message {
$iTipMessage = new Message();
$iTipMessage->uid = $row['uid'];
$iTipMessage->component = 'VEVENT';
Expand Down Expand Up @@ -225,19 +222,7 @@ private function buildITipResponse(array $row, string $partStat, int $guests = n
$row['uid'], $row['sequence'] ?? 0, $row['recurrenceid'] ?? ''
]));
$vEvent = $vObject->{'VEVENT'};
/** @var \Sabre\VObject\Property\ICalendar\CalAddress $attendee */
$attendee = $vEvent->{'ATTENDEE'};

$vEvent->DTSTAMP = date('Ymd\\THis\\Z', $this->timeFactory->getTime());

if ($comment) {
$attendee->add('X-RESPONSE-COMMENT', $comment);
$vEvent->add('COMMENT', $comment);
}
if ($guests) {
$attendee->add('X-NUM-GUESTS', $guests);
}

$iTipMessage->message = $vObject;

return $iTipMessage;
Expand Down
4 changes: 0 additions & 4 deletions apps/dav/templates/schedule-response-options.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,6 @@
</label>
</div>
</fieldset>
<fieldset id="more_options">
<input type="number" min="0" name="guests" placeholder="<?php p($l->t('Number of guests')); ?>" />
<input type="text" name="comment" placeholder="<?php p($l->t('Comment')); ?>" />
</fieldset>
<fieldset>
<input type="submit" value="<?php p($l->t('Save'));?>">
</fieldset>
Expand Down
14 changes: 2 additions & 12 deletions apps/dav/tests/unit/Controller/InvitationResponseControllerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,18 +380,10 @@ public function testOptions() {
* @dataProvider attendeeProvider
*/
public function testProcessMoreOptionsResult(bool $isExternalAttendee): void {
$this->request->expects($this->at(0))
$this->request->expects($this->once())
->method('getParam')
->with('partStat')
->willReturn('TENTATIVE');
$this->request->expects($this->at(1))
->method('getParam')
->with('guests')
->willReturn('7');
$this->request->expects($this->at(2))
->method('getParam')
->with('comment')
->willReturn('Foo bar Bli blub');

$this->buildQueryExpects('TOKEN123', [
'id' => 0,
Expand All @@ -410,14 +402,12 @@ public function testProcessMoreOptionsResult(bool $isExternalAttendee): void {
PRODID:-//Nextcloud/Nextcloud CalDAV Server//EN
METHOD:REPLY
BEGIN:VEVENT
ATTENDEE;PARTSTAT=TENTATIVE;X-RESPONSE-COMMENT=Foo bar Bli blub;X-NUM-GUEST
S=7:mailto:attendee@foo.bar
ATTENDEE;PARTSTAT=TENTATIVE:mailto:attendee@foo.bar
ORGANIZER:mailto:organizer@foo.bar
UID:this-is-the-events-uid
SEQUENCE:0
REQUEST-STATUS:2.0;Success
DTSTAMP:19700101T002217Z
COMMENT:Foo bar Bli blub
END:VEVENT
END:VCALENDAR

Expand Down