diff --git a/Dockerfile b/Dockerfile index 9c0115e4c42b623d55785a62516c7e4f6b6e7efc..a51764971e292f635cb36079dc3a2b3fffa0d95b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,7 +15,7 @@ ARG EA_TAG="2.1.1" ARG ECLOUD_LAUNCHER_JOB_ID="389373" ARG GOOGLE_INTEGRATION_VERSION="1.0.8" -RUN sed -i 's/23,0,9,1/23,0,9,19/' ${BASE_DIR}/version.php +RUN sed -i 's/23,0,9,1/23,0,9,29/' ${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 @@ -125,6 +125,7 @@ RUN cd ${BASE_DIR} && patch -u ${BASE_DIR}/apps/dav/lib/CalDAV/Schedule/IMipPlug RUN patch -u ${BASE_DIR}/core/Command/User/Setting.php -i ${TMP_PATCH_DIR}/018-occ-user-setting.patch RUN patch -u ${BASE_DIR}/apps/settings/lib/Sections/Personal/Groupware.php -i ${TMP_PATCH_DIR}/019-groupware.patch RUN patch -u ${BASE_DIR}/apps/files/js/files.js -i ${TMP_PATCH_DIR}/021-repeated-storage-dialog-fix.patch +RUN cd ${BASE_DIR} && patch -u ${BASE_DIR}/3rdparty/sabre/vobject/lib/ITip/Broker.php -i ${TMP_PATCH_DIR}/022-significantchange.patch RUN rm -rf ${TMP_PATCH_DIR} # Custom theme diff --git a/patches/015-email-mail-template.patch b/patches/015-email-mail-template.patch index f654c784472967d88e542bf9bf7b35ed9cc807a3..f709cf027cf58c09bcb8a482aefad405028109e8 100644 --- a/patches/015-email-mail-template.patch +++ b/patches/015-email-mail-template.patch @@ -1,25 +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 15:28:50.269156800 +0530 -@@ -151,15 +151,6 @@ - */ - public function schedule(Message $iTipMessage) { - -- // Not sending any emails if the system considers the update -- // insignificant. -- if (!$iTipMessage->significantChange) { -- if (!$iTipMessage->scheduleStatus) { -- $iTipMessage->scheduleStatus = '1.0;We got the message, but it\'s not significant enough to warrant an email'; -- } -- return; -- } -- - $summary = $iTipMessage->message->VEVENT->SUMMARY; - - if (parse_url($iTipMessage->sender, PHP_URL_SCHEME) !== 'mailto') { -@@ -252,7 +243,21 @@ - +--- ./apps/dav/lib/CalDAV/Schedule/IMipPlugin.php 2022-11-10 10:39:19.134653000 +0530 ++++ ./apps/dav/lib/CalDAV/Schedule/iMipPluginNew.php 2022-11-11 12:28:15.829119700 +0530 +@@ -252,7 +252,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); @@ -37,17 +21,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 -@@ -516,6 +521,7 @@ +@@ -516,6 +530,7 @@ return $dtStart->format('Y-m-d') === $dtEnd->format('Y-m-d'); } - + + /** * @param IEMailTemplate $template * @param IL10N $l10n -@@ -542,24 +548,86 @@ +@@ -542,24 +557,86 @@ /** * @param IEMailTemplate $template * @param IL10N $l10n @@ -89,7 +73,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:'), @@ -98,8 +83,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:'), @@ -145,7 +129,7 @@ $template->addBodyListItem(sprintf('%s', htmlspecialchars($url), htmlspecialchars($url)), -@@ -567,13 +635,16 @@ +@@ -567,13 +644,16 @@ $this->getAbsoluteImagePath('caldav/link.png'), $url,'',self::IMIP_INDENT); } @@ -167,17 +151,17 @@ + } } } - -@@ -662,7 +733,7 @@ + +@@ -662,7 +742,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 +750,10 @@ $l10n->t('Decline'), $this->urlGenerator->linkToRouteAbsolute('dav.invitation_response.decline', [ 'token' => $token, @@ -197,5 +181,5 @@ - - $template->addBodyText($html, $text); } - + /** diff --git a/patches/022-significantchange.patch b/patches/022-significantchange.patch new file mode 100644 index 0000000000000000000000000000000000000000..e7549ce8f3ff27e5ffe6a616268b11e57e23787a --- /dev/null +++ b/patches/022-significantchange.patch @@ -0,0 +1,11 @@ +--- ./3rdparty/sabre/vobject/lib/ITip/Broker.php 2022-09-06 21:39:42.985827300 +0530 ++++ ./3rdparty/sabre/vobject/lib/ITip/Broker-New.php 2022-11-11 12:45:53.449119700 +0530 +@@ -75,6 +75,8 @@ + 'RDATE', + 'EXDATE', + 'STATUS', ++ 'SUMMARY', ++ 'DESCRIPTION', + ]; + + /**