From e315da1ea0776dc6551fb77049892135725f4924 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Wed, 26 Oct 2022 11:21:42 +0530 Subject: [PATCH 1/4] video icon in mail template --- patches/015-email-mail-template.patch | 61 +++++++++++++++++---------- 1 file changed, 39 insertions(+), 22 deletions(-) diff --git a/patches/015-email-mail-template.patch b/patches/015-email-mail-template.patch index 12109ab9..65c28037 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-09-06 17:56:20.875827300 +0530 -+++ apps/dav/lib/CalDAV/Schedule/IMipPlugin-new23.php 2022-09-06 17:13:51.925827300 +0530 +--- ./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 @@ -151,15 +151,6 @@ */ public function schedule(Message $iTipMessage) { - + - // Not sending any emails if the system considers the update - // insignificant. - if (!$iTipMessage->significantChange) { @@ -14,12 +14,12 @@ - } - $summary = $iTipMessage->message->VEVENT->SUMMARY; - + if (parse_url($iTipMessage->sender, PHP_URL_SCHEME) !== 'mailto') { @@ -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); @@ -38,9 +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 -@@ -542,24 +548,84 @@ +@@ -542,24 +548,94 @@ /** * @param IEMailTemplate $template * @param IL10N $l10n @@ -82,7 +82,8 @@ + $lastmodified=$dtstampTime; + $selectedEvent = $currentevent; + } -+ } + } +- $meetingWhen = $this->generateWhenString($l10n, $vevent); + + + if ($selectedEvent->SUMMARY) { @@ -94,8 +95,7 @@ + $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:'), @@ -120,13 +120,23 @@ - $this->getAbsoluteImagePath('caldav/location.png'),'','',self::IMIP_INDENT); + if ($selectedEvent->LOCATION) { + if(trim($selectedEvent->LOCATION)==trim($parentevent->LOCATION)){ -+ $template->addBodyListItem($selectedEvent->LOCATION, $l10n->t('Location:'), ++ if (filter_var(trim($selectedEvent->LOCATION), FILTER_VALIDATE_URL) === FALSE) { ++ $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{ -+ $template->addBodyListItemModified($selectedEvent->LOCATION, $l10n->t('Updated Location:'), ++ if (filter_var(trim($selectedEvent->LOCATION), FILTER_VALIDATE_URL) === FALSE) { ++ $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) { @@ -136,13 +146,13 @@ $template->addBodyListItem(sprintf('%s', htmlspecialchars($url), htmlspecialchars($url)), -@@ -568,12 +634,18 @@ +@@ -568,12 +644,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:'), @@ -158,17 +168,17 @@ + } } - -@@ -662,7 +734,7 @@ + +@@ -662,7 +744,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 +742,10 @@ +@@ -670,18 +752,10 @@ $l10n->t('Decline'), $this->urlGenerator->linkToRouteAbsolute('dav.invitation_response.decline', [ 'token' => $token, @@ -188,5 +198,12 @@ - - $template->addBodyText($html, $text); } - + /** +@@ -726,4 +800,4 @@ + + return $token; + } +-} +\ No newline at end of file ++} -- GitLab From d656fc6e124d231556d343608f3b0c1cc491661f Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Wed, 26 Oct 2022 11:33:54 +0530 Subject: [PATCH 2/4] video icon in mail template --- patches/015-email-mail-template.patch | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/patches/015-email-mail-template.patch b/patches/015-email-mail-template.patch index 65c28037..2386d9b4 100644 --- a/patches/015-email-mail-template.patch +++ b/patches/015-email-mail-template.patch @@ -3,7 +3,7 @@ @@ -151,15 +151,6 @@ */ public function schedule(Message $iTipMessage) { - + - // Not sending any emails if the system considers the update - // insignificant. - if (!$iTipMessage->significantChange) { @@ -14,12 +14,12 @@ - } - $summary = $iTipMessage->message->VEVENT->SUMMARY; - + if (parse_url($iTipMessage->sender, PHP_URL_SCHEME) !== 'mailto') { @@ -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); @@ -38,7 +38,7 @@ + $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 @@ -542,24 +548,94 @@ /** @@ -149,10 +149,10 @@ @@ -568,12 +644,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:'), @@ -168,11 +168,11 @@ + } } - + @@ -662,7 +744,7 @@ Message $iTipMessage, $lastOccurrence) { $token = $this->createInvitationToken($iTipMessage, $lastOccurrence); - + - $template->addBodyButtonGroup( + $template->addBodyButtonGroupTentative( $l10n->t('Accept'), @@ -198,10 +198,10 @@ - - $template->addBodyText($html, $text); } - + /** @@ -726,4 +800,4 @@ - + return $token; } -} -- GitLab From c9031ee8a591cc76c254b3b96eb8fc2747898825 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Wed, 26 Oct 2022 11:58:39 +0530 Subject: [PATCH 3/4] video icon in mail template --- patches/015-email-mail-template.patch | 75 ++++++++++++--------------- 1 file changed, 34 insertions(+), 41 deletions(-) diff --git a/patches/015-email-mail-template.patch b/patches/015-email-mail-template.patch index 2386d9b4..6e7dbccd 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: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) { - + - // Not sending any emails if the system considers the update - // insignificant. - if (!$iTipMessage->significantChange) { @@ -14,16 +14,15 @@ - } - $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); + } @@ -38,9 +37,17 @@ + $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 -@@ -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 @@ -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); @@ -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); @@ -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) { @@ -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:'), @@ -137,7 +138,6 @@ + $this->getAbsoluteImagePath('caldav/videocall.png'),'','',self::IMIP_INDENT); + } + } -+ } - if ($vevent->URL) { - $url = $vevent->URL->getValue(); @@ -146,13 +146,14 @@ $template->addBodyListItem(sprintf('%s', 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:'), @@ -165,20 +166,19 @@ + $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); - + - $template->addBodyButtonGroup( + $template->addBodyButtonGroupTentative( $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, @@ -198,12 +198,5 @@ - - $template->addBodyText($html, $text); } - + /** -@@ -726,4 +800,4 @@ - - return $token; - } --} -\ No newline at end of file -+} -- GitLab From 5d838d42a5801365b104dbbf1ff48911841c9ed1 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Wed, 26 Oct 2022 12:01:44 +0530 Subject: [PATCH 4/4] version bump --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 9f614454..d67395b7 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,15/' ${BASE_DIR}/version.php +RUN sed -i 's/23,0,9,1/23,0,9,16/' ${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 -- GitLab