Loading patches/015-email-mail-template.patch +9 −19 Original line number Diff line number Diff line Loading @@ -32,8 +32,8 @@ /** --- ./apps/dav/lib/CalDAV/Schedule/IMipPlugin.php 2022-07-27 13:21:50.294113800 +0530 +++ ./apps/dav/lib/CalDAV/Schedule/IMipPlugin-newModified.php 2022-07-28 11:43:03.254435200 +0530 --- ./apps/dav/lib/CalDAV/Schedule/IMipPlugin.php 2022-08-08 17:59:57.632858800 +0530 +++ ./apps/dav/lib/CalDAV/Schedule/IMipPlugin-new.php 2022-08-08 17:21:58.792858800 +0530 @@ -151,15 +151,6 @@ */ public function schedule(Message $iTipMessage) { Loading Loading @@ -128,8 +128,7 @@ + $lastmodified=$dtstampTime; + $selectedEvent = $currentevent; + } } - $meetingWhen = $this->generateWhenString($l10n, $vevent); + } + + + if ($selectedEvent->SUMMARY) { Loading @@ -141,7 +140,8 @@ + $template->addBodyListItemModified($selectedEvent->SUMMARY, $l10n->t('Updated Title:'), + $this->getAbsoluteImagePath('caldav/title.png'),'','',self::IMIP_INDENT); + } + } } - $meetingWhen = $this->generateWhenString($l10n, $vevent); + $meetingWhen = $this->generateWhenString($l10n, $selectedEvent); if ($meetingWhen) { - $template->addBodyListItem($meetingWhen, $l10n->t('Time:'), Loading Loading @@ -184,7 +184,7 @@ $template->addBodyListItem(sprintf('<a href="%s">%s</a>', htmlspecialchars($url), htmlspecialchars($url)), @@ -565,12 +629,28 @@ @@ -565,12 +629,18 @@ $url,'',self::IMIP_INDENT); } Loading @@ -204,20 +204,10 @@ + $this->getAbsoluteImagePath('caldav/description.png'),'','',self::IMIP_INDENT); + } + + } + if (isset($selectedEvent->ATTENDEE)) { + $finalguests=''; + foreach ($selectedEvent->ATTENDEE as $attendee) { + $emailid= substr(($attendee->getValue()),7); + $finalguests.=$emailid.' -'.$attendee['PARTSTAT'].', '; + + } + $template->addBodyListItem($finalguests, $l10n->t('Guests:'), + $this->getAbsoluteImagePath('caldav/description.png'),'','',self::IMIP_INDENT); } } @@ -671,7 +751,6 @@ @@ -671,7 +741,6 @@ $l10n->t('Maybe'), $this->urlGenerator->getAbsoluteUrl('apps/calendar/invitation/tentative/'.$token) ); Loading @@ -225,7 +215,7 @@ } /** @@ -716,4 +795,4 @@ @@ -716,4 +785,4 @@ return $token; } Loading Loading
patches/015-email-mail-template.patch +9 −19 Original line number Diff line number Diff line Loading @@ -32,8 +32,8 @@ /** --- ./apps/dav/lib/CalDAV/Schedule/IMipPlugin.php 2022-07-27 13:21:50.294113800 +0530 +++ ./apps/dav/lib/CalDAV/Schedule/IMipPlugin-newModified.php 2022-07-28 11:43:03.254435200 +0530 --- ./apps/dav/lib/CalDAV/Schedule/IMipPlugin.php 2022-08-08 17:59:57.632858800 +0530 +++ ./apps/dav/lib/CalDAV/Schedule/IMipPlugin-new.php 2022-08-08 17:21:58.792858800 +0530 @@ -151,15 +151,6 @@ */ public function schedule(Message $iTipMessage) { Loading Loading @@ -128,8 +128,7 @@ + $lastmodified=$dtstampTime; + $selectedEvent = $currentevent; + } } - $meetingWhen = $this->generateWhenString($l10n, $vevent); + } + + + if ($selectedEvent->SUMMARY) { Loading @@ -141,7 +140,8 @@ + $template->addBodyListItemModified($selectedEvent->SUMMARY, $l10n->t('Updated Title:'), + $this->getAbsoluteImagePath('caldav/title.png'),'','',self::IMIP_INDENT); + } + } } - $meetingWhen = $this->generateWhenString($l10n, $vevent); + $meetingWhen = $this->generateWhenString($l10n, $selectedEvent); if ($meetingWhen) { - $template->addBodyListItem($meetingWhen, $l10n->t('Time:'), Loading Loading @@ -184,7 +184,7 @@ $template->addBodyListItem(sprintf('<a href="%s">%s</a>', htmlspecialchars($url), htmlspecialchars($url)), @@ -565,12 +629,28 @@ @@ -565,12 +629,18 @@ $url,'',self::IMIP_INDENT); } Loading @@ -204,20 +204,10 @@ + $this->getAbsoluteImagePath('caldav/description.png'),'','',self::IMIP_INDENT); + } + + } + if (isset($selectedEvent->ATTENDEE)) { + $finalguests=''; + foreach ($selectedEvent->ATTENDEE as $attendee) { + $emailid= substr(($attendee->getValue()),7); + $finalguests.=$emailid.' -'.$attendee['PARTSTAT'].', '; + + } + $template->addBodyListItem($finalguests, $l10n->t('Guests:'), + $this->getAbsoluteImagePath('caldav/description.png'),'','',self::IMIP_INDENT); } } @@ -671,7 +751,6 @@ @@ -671,7 +741,6 @@ $l10n->t('Maybe'), $this->urlGenerator->getAbsoluteUrl('apps/calendar/invitation/tentative/'.$token) ); Loading @@ -225,7 +215,7 @@ } /** @@ -716,4 +795,4 @@ @@ -716,4 +785,4 @@ return $token; } Loading