diff --git a/lib/BackgroundJob/SendInviteResponseMailJob.php b/lib/BackgroundJob/SendInviteResponseMailJob.php index 81df9c980e810d6edf565db7f338cebc7ba445ad..c2e025bfb8c1587510b122072379ae8fbba9d81d 100644 --- a/lib/BackgroundJob/SendInviteResponseMailJob.php +++ b/lib/BackgroundJob/SendInviteResponseMailJob.php @@ -37,6 +37,7 @@ use OCP\IL10N; use OCP\IUserManager; use OCP\Calendar\IManager; use Sabre\VObject\Reader; +use Sabre\VObject\Parameter; use OCP\Util; class SendInviteResponseMailJob extends QueuedJob { @@ -199,10 +200,21 @@ class SendInviteResponseMailJob extends QueuedJob { $SUMMARY = $vObject->VEVENT->SUMMARY; $datestart = (string) $vObject->VEVENT->DTSTART; if (str_contains($datestart, "T")) { - $eventdate = date("F d, Y h:i", strtotime($datestart)); + $eventdate = date("F d, Y h:i A", strtotime($datestart)); } else { $eventdate = date("F d, Y", strtotime($datestart)); } + $isAllDay = $vObject->VEVENT->DTSTART instanceof Property\ICalendar\Date; + if(!$isAllDay){ + $isFloating = $vObject->VEVENT->DTSTART->isFloating(); + if (!$isFloating) { + $prop = $vObject->VEVENT->DTSTART->offsetGet('TZID'); + if ($prop instanceof Parameter) { + $timezone = $vObject->VEVENT->DTSTART->offsetGet('TZID')->getValue(); + $eventdate=$eventdate.' ('.$timezone.')'; + } + } + } $translationData = [ "summary" => $SUMMARY, "attendee_name" => $attendeeName,