upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-03 16:16:36 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Merge pull request #53349 from nextcloud/backport/51131/stable31

Browse source 
[stable31] fix(imip): dont compare events for the reply message
This commit is contained in:
Andy Scherzinger 2025-06-12 21:59:41 +02:00 committed by GitHub
commit 9fdc7fb566
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 30 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/dav/lib/CalDAV/Schedule/IMipPlugin.php
View file

@ -186,7 +186,7 @@ class IMipPlugin extends SabreIMipPlugin {
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:

30
apps/dav/lib/CalDAV/Schedule/IMipService.php
View file

@ -159,7 +159,35 @@ class IMipService {
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;
}