Loading patches/015-email-mail-template.patch +34 −41 Original line number Diff line number Diff line --- ./apps/dav/lib/CalDAV/Schedule/IMipPlugin.php 2022-10-26 11:09:37.299156800 +0530 +++ ./apps/dav/lib/CalDAV/Schedule/iMipPluginNew.php 2022-10-26 11:14:48.519156800 +0530 --- ./apps/dav/lib/CalDAV/Schedule/IMipPlugin.php 2022-10-26 11:45:19.589156800 +0530 +++ ./apps/dav/lib/CalDAV/Schedule/iMipPluginNew.php 2022-10-26 11:54:19.259156800 +0530 @@ -151,15 +151,6 @@ */ public function schedule(Message $iTipMessage) { Loading @@ -16,14 +16,13 @@ $summary = $iTipMessage->message->VEVENT->SUMMARY; if (parse_url($iTipMessage->sender, PHP_URL_SCHEME) !== 'mailto') { @@ -252,7 +243,22 @@ @@ -252,7 +243,21 @@ $summary = ((string) $summary !== '') ? (string) $summary : $l10n->t('Untitled event'); - $this->addSubjectAndHeading($template, $l10n, $method, $summary); + if( count($vevent)>1){ + $this->addSubjectAndHeadingUpdated($template, $l10n, $method, $summary); + + }else{ + $this->addSubjectAndHeading($template, $l10n, $method, $summary); + } Loading @@ -40,7 +39,15 @@ $this->addBulletList($template, $l10n, $vevent); // Only add response buttons to invitation requests: Fix Issue #11230 @@ -542,24 +548,94 @@ @@ -516,6 +521,7 @@ return $dtStart->format('Y-m-d') === $dtEnd->format('Y-m-d'); } + /** * @param IEMailTemplate $template * @param IL10N $l10n @@ -542,24 +548,86 @@ /** * @param IEMailTemplate $template * @param IL10N $l10n Loading Loading @@ -82,12 +89,8 @@ + $lastmodified=$dtstampTime; + $selectedEvent = $currentevent; + } } - $meetingWhen = $this->generateWhenString($l10n, $vevent); + + + } + if ($selectedEvent->SUMMARY) { + + if(trim($selectedEvent->SUMMARY)==trim($parentevent->SUMMARY)){ + $template->addBodyListItem($selectedEvent->SUMMARY, $l10n->t('Title:'), + $this->getAbsoluteImagePath('caldav/title.png'),'','',self::IMIP_INDENT); Loading @@ -95,16 +98,20 @@ + $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:'), - $this->getAbsoluteImagePath('caldav/time.png'),'','',self::IMIP_INDENT); - } - if ($vevent->LOCATION) { - $template->addBodyListItem($vevent->LOCATION, $l10n->t('Location:'), - $this->getAbsoluteImagePath('caldav/location.png'),'','',self::IMIP_INDENT); + $selectedtimestart= substr(($selectedEvent->DTSTART), strpos(($selectedEvent->DTSTART), "T") + 1); + $parenttimestart= substr(($parentevent->DTSTART), strpos(($parentevent->DTSTART), "T") + 1); + $selectedtimeend= substr(($selectedEvent->DTEND), strpos(($selectedEvent->DTEND), "T") + 1); + $parenttimeend= substr(($parentevent->DTEND), strpos(($parentevent->DTEND), "T") + 1); + + if(trim($selectedtimestart)==trim($parenttimestart) && trim($selectedtimeend)==trim($parenttimeend)){ + $template->addBodyListItem($meetingWhen, $l10n->t('Time:'), + $this->getAbsoluteImagePath('caldav/time.png'),'','',self::IMIP_INDENT); Loading @@ -112,12 +119,7 @@ + $template->addBodyListItemModified($meetingWhen, $l10n->t('Updated Time:'), + $this->getAbsoluteImagePath('caldav/time.png'),'','',self::IMIP_INDENT); + } + + } - if ($vevent->LOCATION) { - $template->addBodyListItem($vevent->LOCATION, $l10n->t('Location:'), - $this->getAbsoluteImagePath('caldav/location.png'),'','',self::IMIP_INDENT); + } + if ($selectedEvent->LOCATION) { + if(trim($selectedEvent->LOCATION)==trim($parentevent->LOCATION)){ + if (filter_var(trim($selectedEvent->LOCATION), FILTER_VALIDATE_URL) === FALSE) { Loading @@ -127,7 +129,6 @@ + $template->addBodyListItem($selectedEvent->LOCATION, $l10n->t('Location:'), + $this->getAbsoluteImagePath('caldav/videocall.png'),'','',self::IMIP_INDENT); + } + + }else{ + if (filter_var(trim($selectedEvent->LOCATION), FILTER_VALIDATE_URL) === FALSE) { + $template->addBodyListItemModified($selectedEvent->LOCATION, $l10n->t('Updated Location:'), Loading @@ -137,7 +138,6 @@ + $this->getAbsoluteImagePath('caldav/videocall.png'),'','',self::IMIP_INDENT); + } + } + } - if ($vevent->URL) { - $url = $vevent->URL->getValue(); Loading @@ -146,13 +146,14 @@ $template->addBodyListItem(sprintf('<a href="%s">%s</a>', htmlspecialchars($url), htmlspecialchars($url)), @@ -568,12 +644,18 @@ @@ -567,13 +635,16 @@ $this->getAbsoluteImagePath('caldav/link.png'), $url,'',self::IMIP_INDENT); } - - $this->addAttendees($template, $l10n, $vevent); - + $this->addAttendees($template, $l10n, $selectedEvent); /* Put description last, like an email body, since it can be arbitrarily long */ - if ($vevent->DESCRIPTION) { - $template->addBodyListItem($vevent->DESCRIPTION->getValue(), $l10n->t('Description:'), Loading @@ -165,11 +166,10 @@ + $template->addBodyListItemModified($selectedEvent->DESCRIPTION, $l10n->t('Updated Description:'), + $this->getAbsoluteImagePath('caldav/description.png'),'','',self::IMIP_INDENT); + } + } } @@ -662,7 +744,7 @@ @@ -662,7 +733,7 @@ Message $iTipMessage, $lastOccurrence) { $token = $this->createInvitationToken($iTipMessage, $lastOccurrence); Loading @@ -178,7 +178,7 @@ $l10n->t('Accept'), $this->urlGenerator->linkToRouteAbsolute('dav.invitation_response.accept', [ 'token' => $token, @@ -670,18 +752,10 @@ @@ -670,18 +741,10 @@ $l10n->t('Decline'), $this->urlGenerator->linkToRouteAbsolute('dav.invitation_response.decline', [ 'token' => $token, Loading @@ -200,10 +200,3 @@ } /** @@ -726,4 +800,4 @@ return $token; } -} \ No newline at end of file +} Loading
patches/015-email-mail-template.patch +34 −41 Original line number Diff line number Diff line --- ./apps/dav/lib/CalDAV/Schedule/IMipPlugin.php 2022-10-26 11:09:37.299156800 +0530 +++ ./apps/dav/lib/CalDAV/Schedule/iMipPluginNew.php 2022-10-26 11:14:48.519156800 +0530 --- ./apps/dav/lib/CalDAV/Schedule/IMipPlugin.php 2022-10-26 11:45:19.589156800 +0530 +++ ./apps/dav/lib/CalDAV/Schedule/iMipPluginNew.php 2022-10-26 11:54:19.259156800 +0530 @@ -151,15 +151,6 @@ */ public function schedule(Message $iTipMessage) { Loading @@ -16,14 +16,13 @@ $summary = $iTipMessage->message->VEVENT->SUMMARY; if (parse_url($iTipMessage->sender, PHP_URL_SCHEME) !== 'mailto') { @@ -252,7 +243,22 @@ @@ -252,7 +243,21 @@ $summary = ((string) $summary !== '') ? (string) $summary : $l10n->t('Untitled event'); - $this->addSubjectAndHeading($template, $l10n, $method, $summary); + if( count($vevent)>1){ + $this->addSubjectAndHeadingUpdated($template, $l10n, $method, $summary); + + }else{ + $this->addSubjectAndHeading($template, $l10n, $method, $summary); + } Loading @@ -40,7 +39,15 @@ $this->addBulletList($template, $l10n, $vevent); // Only add response buttons to invitation requests: Fix Issue #11230 @@ -542,24 +548,94 @@ @@ -516,6 +521,7 @@ return $dtStart->format('Y-m-d') === $dtEnd->format('Y-m-d'); } + /** * @param IEMailTemplate $template * @param IL10N $l10n @@ -542,24 +548,86 @@ /** * @param IEMailTemplate $template * @param IL10N $l10n Loading Loading @@ -82,12 +89,8 @@ + $lastmodified=$dtstampTime; + $selectedEvent = $currentevent; + } } - $meetingWhen = $this->generateWhenString($l10n, $vevent); + + + } + if ($selectedEvent->SUMMARY) { + + if(trim($selectedEvent->SUMMARY)==trim($parentevent->SUMMARY)){ + $template->addBodyListItem($selectedEvent->SUMMARY, $l10n->t('Title:'), + $this->getAbsoluteImagePath('caldav/title.png'),'','',self::IMIP_INDENT); Loading @@ -95,16 +98,20 @@ + $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:'), - $this->getAbsoluteImagePath('caldav/time.png'),'','',self::IMIP_INDENT); - } - if ($vevent->LOCATION) { - $template->addBodyListItem($vevent->LOCATION, $l10n->t('Location:'), - $this->getAbsoluteImagePath('caldav/location.png'),'','',self::IMIP_INDENT); + $selectedtimestart= substr(($selectedEvent->DTSTART), strpos(($selectedEvent->DTSTART), "T") + 1); + $parenttimestart= substr(($parentevent->DTSTART), strpos(($parentevent->DTSTART), "T") + 1); + $selectedtimeend= substr(($selectedEvent->DTEND), strpos(($selectedEvent->DTEND), "T") + 1); + $parenttimeend= substr(($parentevent->DTEND), strpos(($parentevent->DTEND), "T") + 1); + + if(trim($selectedtimestart)==trim($parenttimestart) && trim($selectedtimeend)==trim($parenttimeend)){ + $template->addBodyListItem($meetingWhen, $l10n->t('Time:'), + $this->getAbsoluteImagePath('caldav/time.png'),'','',self::IMIP_INDENT); Loading @@ -112,12 +119,7 @@ + $template->addBodyListItemModified($meetingWhen, $l10n->t('Updated Time:'), + $this->getAbsoluteImagePath('caldav/time.png'),'','',self::IMIP_INDENT); + } + + } - if ($vevent->LOCATION) { - $template->addBodyListItem($vevent->LOCATION, $l10n->t('Location:'), - $this->getAbsoluteImagePath('caldav/location.png'),'','',self::IMIP_INDENT); + } + if ($selectedEvent->LOCATION) { + if(trim($selectedEvent->LOCATION)==trim($parentevent->LOCATION)){ + if (filter_var(trim($selectedEvent->LOCATION), FILTER_VALIDATE_URL) === FALSE) { Loading @@ -127,7 +129,6 @@ + $template->addBodyListItem($selectedEvent->LOCATION, $l10n->t('Location:'), + $this->getAbsoluteImagePath('caldav/videocall.png'),'','',self::IMIP_INDENT); + } + + }else{ + if (filter_var(trim($selectedEvent->LOCATION), FILTER_VALIDATE_URL) === FALSE) { + $template->addBodyListItemModified($selectedEvent->LOCATION, $l10n->t('Updated Location:'), Loading @@ -137,7 +138,6 @@ + $this->getAbsoluteImagePath('caldav/videocall.png'),'','',self::IMIP_INDENT); + } + } + } - if ($vevent->URL) { - $url = $vevent->URL->getValue(); Loading @@ -146,13 +146,14 @@ $template->addBodyListItem(sprintf('<a href="%s">%s</a>', htmlspecialchars($url), htmlspecialchars($url)), @@ -568,12 +644,18 @@ @@ -567,13 +635,16 @@ $this->getAbsoluteImagePath('caldav/link.png'), $url,'',self::IMIP_INDENT); } - - $this->addAttendees($template, $l10n, $vevent); - + $this->addAttendees($template, $l10n, $selectedEvent); /* Put description last, like an email body, since it can be arbitrarily long */ - if ($vevent->DESCRIPTION) { - $template->addBodyListItem($vevent->DESCRIPTION->getValue(), $l10n->t('Description:'), Loading @@ -165,11 +166,10 @@ + $template->addBodyListItemModified($selectedEvent->DESCRIPTION, $l10n->t('Updated Description:'), + $this->getAbsoluteImagePath('caldav/description.png'),'','',self::IMIP_INDENT); + } + } } @@ -662,7 +744,7 @@ @@ -662,7 +733,7 @@ Message $iTipMessage, $lastOccurrence) { $token = $this->createInvitationToken($iTipMessage, $lastOccurrence); Loading @@ -178,7 +178,7 @@ $l10n->t('Accept'), $this->urlGenerator->linkToRouteAbsolute('dav.invitation_response.accept', [ 'token' => $token, @@ -670,18 +752,10 @@ @@ -670,18 +741,10 @@ $l10n->t('Decline'), $this->urlGenerator->linkToRouteAbsolute('dav.invitation_response.decline', [ 'token' => $token, Loading @@ -200,10 +200,3 @@ } /** @@ -726,4 +800,4 @@ return $token; } -} \ No newline at end of file +}