From 117637dc219b6b46069b46c904544fe2da3fa491 Mon Sep 17 00:00:00 2001 From: AVINASH GUSAIN Date: Wed, 26 Oct 2022 08:07:32 +0000 Subject: [PATCH] Revert "Merge branch 'dev/video-icon-mail-template' into 'main'" This reverts merge request !133 --- Dockerfile | 2 +- patches/015-email-mail-template.patch | 76 ++++++++++++--------------- 2 files changed, 34 insertions(+), 44 deletions(-) diff --git a/Dockerfile b/Dockerfile index d67395b7..9f614454 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,7 +18,7 @@ ARG GOOGLE_INTEGRATION_VERSION="1.0.8" ARG LDAP_WRITE_SUPPORT_VERSION="1.4.0" ARG OIDC_LOGIN_VERSION="2.3.3" -RUN sed -i 's/23,0,9,1/23,0,9,16/' ${BASE_DIR}/version.php +RUN sed -i 's/23,0,9,1/23,0,9,15/' ${BASE_DIR}/version.php COPY custom_entrypoint.sh / RUN chmod +x /custom_entrypoint.sh RUN mkdir -p /var/www/skeleton/Documents && mkdir -p /var/www/skeleton/Images diff --git a/patches/015-email-mail-template.patch b/patches/015-email-mail-template.patch index 6e7dbccd..12109ab9 100644 --- a/patches/015-email-mail-template.patch +++ b/patches/015-email-mail-template.patch @@ -1,9 +1,9 @@ ---- ./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 +--- apps/dav/lib/CalDAV/Schedule/IMipPlugin.php 2022-09-06 17:56:20.875827300 +0530 ++++ apps/dav/lib/CalDAV/Schedule/IMipPlugin-new23.php 2022-09-06 17:13:51.925827300 +0530 @@ -151,15 +151,6 @@ */ public function schedule(Message $iTipMessage) { - + - // Not sending any emails if the system considers the update - // insignificant. - if (!$iTipMessage->significantChange) { @@ -14,15 +14,16 @@ - } - $summary = $iTipMessage->message->VEVENT->SUMMARY; - + if (parse_url($iTipMessage->sender, PHP_URL_SCHEME) !== 'mailto') { -@@ -252,7 +243,21 @@ - +@@ -252,7 +243,22 @@ + $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); + } @@ -37,17 +38,9 @@ + $template->addHeadingBanner('#EFFFDB','#293618',$l10n->t('This event has been updated, please review the information below:')); + } $this->addBulletList($template, $l10n, $vevent); - + // Only add response buttons to invitation requests: Fix Issue #11230 -@@ -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 @@ +@@ -542,24 +548,84 @@ /** * @param IEMailTemplate $template * @param IL10N $l10n @@ -90,7 +83,10 @@ + $selectedEvent = $currentevent; + } + } ++ ++ + 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); @@ -104,14 +100,11 @@ 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); @@ -119,25 +112,22 @@ + $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) { -+ $template->addBodyListItem($selectedEvent->LOCATION, $l10n->t('Location:'), ++ $template->addBodyListItem($selectedEvent->LOCATION, $l10n->t('Location:'), + $this->getAbsoluteImagePath('caldav/location.png'),'','',self::IMIP_INDENT); -+ }else{ -+ $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:'), ++ $template->addBodyListItemModified($selectedEvent->LOCATION, $l10n->t('Updated Location:'), + $this->getAbsoluteImagePath('caldav/location.png'),'','',self::IMIP_INDENT); -+ }else{ -+ $template->addBodyListItemModified($selectedEvent->LOCATION, $l10n->t('Updated Location:'), -+ $this->getAbsoluteImagePath('caldav/videocall.png'),'','',self::IMIP_INDENT); -+ } + } ++ ++ } - if ($vevent->URL) { - $url = $vevent->URL->getValue(); @@ -146,14 +136,13 @@ $template->addBodyListItem(sprintf('%s', htmlspecialchars($url), htmlspecialchars($url)), -@@ -567,13 +635,16 @@ - $this->getAbsoluteImagePath('caldav/link.png'), +@@ -568,12 +634,18 @@ $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:'), @@ -166,19 +155,20 @@ + $template->addBodyListItemModified($selectedEvent->DESCRIPTION, $l10n->t('Updated Description:'), + $this->getAbsoluteImagePath('caldav/description.png'),'','',self::IMIP_INDENT); + } ++ } } - -@@ -662,7 +733,7 @@ + +@@ -662,7 +734,7 @@ Message $iTipMessage, $lastOccurrence) { $token = $this->createInvitationToken($iTipMessage, $lastOccurrence); - + - $template->addBodyButtonGroup( + $template->addBodyButtonGroupTentative( $l10n->t('Accept'), $this->urlGenerator->linkToRouteAbsolute('dav.invitation_response.accept', [ 'token' => $token, -@@ -670,18 +741,10 @@ +@@ -670,18 +742,10 @@ $l10n->t('Decline'), $this->urlGenerator->linkToRouteAbsolute('dav.invitation_response.decline', [ 'token' => $token, @@ -198,5 +188,5 @@ - - $template->addBodyText($html, $text); } - + /** -- GitLab