Loading patches/015-email-mail-template.patch +28 −29 Original line number Diff line number Diff line --- ./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 13:53:03.959156800 +0530 +++ ./apps/dav/lib/CalDAV/Schedule/iMipPluginNew.php 2022-10-26 15:28:50.269156800 +0530 @@ -151,15 +151,6 @@ */ public function schedule(Message $iTipMessage) { Loading Loading @@ -104,10 +104,6 @@ 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); Loading @@ -119,7 +115,10 @@ + $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)) { Loading Loading
patches/015-email-mail-template.patch +28 −29 Original line number Diff line number Diff line --- ./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 13:53:03.959156800 +0530 +++ ./apps/dav/lib/CalDAV/Schedule/iMipPluginNew.php 2022-10-26 15:28:50.269156800 +0530 @@ -151,15 +151,6 @@ */ public function schedule(Message $iTipMessage) { Loading Loading @@ -104,10 +104,6 @@ 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); Loading @@ -119,7 +115,10 @@ + $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)) { Loading