Skip to content

[stable31] fix(imip): dont compare events for the reply message #53349

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

Merged
merged 1 commit into from
Jun 12, 2025
Merged

[stable31] fix(imip): dont compare events for the reply message #53349

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
2 changes: 1 addition & 1 deletion apps/dav/lib/CalDAV/Schedule/IMipPlugin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ public function schedule(Message $iTipMessage) {
switch (strtolower($iTipMessage->method)) {
case self::METHOD_REPLY:
$method = self::METHOD_REPLY;
$data = $this->imipService->buildBodyData($vEvent, $oldVevent);
$data = $this->imipService->buildReplyBodyData($vEvent);
$replyingAttendee = $this->imipService->getReplyingAttendee($iTipMessage);
break;
case self::METHOD_CANCEL:
Expand Down
30 changes: 29 additions & 1 deletion apps/dav/lib/CalDAV/Schedule/IMipService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,35 @@ public function buildBodyData(VEvent $vEvent, ?VEvent $oldVEvent): array {
if ($eventReaderCurrent->recurs()) {
$data['meeting_occurring'] = $this->generateOccurringString($eventReaderCurrent);
}

return $data;
}

/**
* @param VEvent $vEvent
* @return array
*/
public function buildReplyBodyData(VEvent $vEvent): array {
// construct event reader
$eventReader = new EventReader($vEvent);
$defaultVal = '';
$data = [];
$data['meeting_when'] = $this->generateWhenString($eventReader);

foreach (self::STRING_DIFF as $key => $property) {
$data[$key] = self::readPropertyWithDefault($vEvent, $property, $defaultVal);
}

if (($locationHtml = $this->linkify($data['meeting_location'])) !== null) {
$data['meeting_location_html'] = $locationHtml;
}

$data['meeting_url_html'] = $data['meeting_url'] ? sprintf('<a href="%1$s">%1$s</a>', $data['meeting_url']) : '';

// generate occurring next string
if ($eventReader->recurs()) {
$data['meeting_occurring'] = $this->generateOccurringString($eventReader);
}

return $data;
}

Expand Down
Loading