diff --git a/Dockerfile b/Dockerfile index d6abb4954d617c6155fd7ac980194ab28c51a30d..b7e6f8d9513aa8c5bdb5f08be2caa9304757e3bb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,24 +1,24 @@ -FROM nextcloud:23.0.9-fpm AS nextcloud +FROM nextcloud:23.0.11-fpm AS nextcloud ARG BASE_DIR="/usr/src/nextcloud" ARG TMP_PATCH_DIR="/tmp/build_patches" -ARG THEME_VERSION="22.1.5" -ARG THEME_HELPER_VERSION="1.4.4" -ARG NEWS_VERSION="18.1.1" -ARG QUOTA_WARN_VERSION="1.14.0" +ARG THEME_VERSION="23.0.3" +ARG THEME_HELPER_JOB_ID="433795" +ARG NEWS_VERSION="19.0.0" +ARG QUOTA_WARN_VERSION="1.15.0" ARG NOTES_VERSION="4.5.1" ARG CONTACTS_JOB_ID="400045" -ARG CALENDAR_JOB_ID="414851" +ARG CALENDAR_JOB_ID="435164" ARG USER_BACKEND_RAW_SQL_VERSION="1.3.0" -ARG EMAIL_RECOVERY_JOB_ID="389385" +ARG EMAIL_RECOVERY_JOB_ID="433031" ARG RAINLOOP_VERSION="7.2.5" ARG RAINLOOP_COMMIT_SHA="523518ba" -ARG EA_TAG="2.1.1" -ARG ECLOUD_LAUNCHER_JOB_ID="389373" +ARG EA_JOB_ID="433303" +ARG ECLOUD_LAUNCHER_JOB_ID="432959" 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,19/' ${BASE_DIR}/version.php +RUN sed -i 's/23,0,11,1/23,0,11,6/' ${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 @@ -72,12 +72,11 @@ RUN curl -fsSL -o rainloop.tar.gz \ mv "${BASE_DIR}/custom_apps/rainloop-nextcloud-${RAINLOOP_VERSION}-${RAINLOOP_COMMIT_SHA}" "${BASE_DIR}/custom_apps/rainloop" && \ rm rainloop.tar.gz; - -RUN curl -fsSL -o ecloud-theme-helper.tar.gz \ - "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/ecloud-theme-helper/-/archive/${THEME_HELPER_VERSION}/ecloud-theme-helper-${THEME_HELPER_VERSION}.tar.gz" && \ - tar -xf ecloud-theme-helper.tar.gz -C ${BASE_DIR}/custom_apps/ && \ - mv "${BASE_DIR}/custom_apps/ecloud-theme-helper-${THEME_HELPER_VERSION}" "${BASE_DIR}/custom_apps/ecloud-theme-helper" && \ - rm ecloud-theme-helper.tar.gz; +RUN curl -fsSL -o ecloud-theme-helper.zip \ + "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/ecloud-theme-helper/-/jobs/${THEME_HELPER_JOB_ID}/artifacts/download" && \ + unzip ecloud-theme-helper.zip && \ + mv dist/ecloud-theme-helper ${BASE_DIR}/custom_apps/ && \ + rm ecloud-theme-helper.zip; RUN curl -fsSL -o murena_launcher.zip \ "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/launcher/-/jobs/${ECLOUD_LAUNCHER_JOB_ID}/artifacts/download" && \ @@ -91,11 +90,11 @@ RUN curl -fsSL -o integration_google.tar.gz \ chown -R www-data:www-data ${BASE_DIR}/custom_apps/integration_google && \ rm integration_google.tar.gz; -RUN curl -fsSL -o ecloud-accounts.tar.gz \ - "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/ecloud-accounts/-/archive/${EA_TAG}/ecloud-accounts-${EA_TAG}.tar.gz" && \ - tar -xf ecloud-accounts.tar.gz -C ${BASE_DIR}/custom_apps/ && \ - mv "${BASE_DIR}/custom_apps/ecloud-accounts-${EA_TAG}" "${BASE_DIR}/custom_apps/ecloud-accounts" && \ - rm ecloud-accounts.tar.gz; +RUN curl -fsSL -o ecloud-accounts.zip \ + "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/ecloud-accounts/-/jobs/${EA_JOB_ID}/artifacts/download" && \ + unzip ecloud-accounts.zip && \ + mv dist/ecloud-accounts ${BASE_DIR}/custom_apps/ && \ + rm ecloud-accounts.zip; RUN curl -fsSL -o ldap_write_support.tar.gz \ "https://github.com/nextcloud-releases/ldap_write_support/releases/download/v${LDAP_WRITE_SUPPORT_VERSION}/ldap_write_support.tar.gz" && \ @@ -144,6 +143,9 @@ RUN cd ${BASE_DIR}/core/js/dist && sed -i 's/resetPassword:!1/resetPassword:!1|| # hide oidc login button RUN sed -i 's/$context->registerAlternativeLogin(OIDCLoginOption::class);/\/\/$context->registerAlternativeLogin(OIDCLoginOption::class);/' ${BASE_DIR}/custom_apps/oidc_login/lib/AppInfo/Application.php +# change notifications icon src +RUN sed -i 's/(0,Pd.imagePath)("notifications",e)/"\/themes\/"+OC.theme.folder+"\/apps\/notifications\/img\/"+e+".svg"/' ${BASE_DIR}/apps/notifications/js/notifications-main.js + # sed version of ldap_write_support RUN cd ${BASE_DIR}/custom_apps/ldap_write_support && sed -i 's/max-version="22"/max-version="23"/' appinfo/info.xml @@ -168,6 +170,9 @@ RUN sed -i 's/$this->changeAvatar/\/\/ $this->changeAvatar/' ${BASE_DIR}/custom_ #replace error class in schedule response error file to fix error color RUN sed -i 's/update/error/g' ${BASE_DIR}/apps/dav/templates/schedule-response-error.php +# Remove 'fix broken values of calendar objects' repair step +RUN sed -i '/OCA\\DAV\\Migration\\CalDAVRemoveEmptyValue<\/step>/d' ${BASE_DIR}/apps/dav/appinfo/info.xml + # Custom theme RUN curl -fsSL -o eCloud-theme.tar.gz \ "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/nextcloud-theme/-/archive/${THEME_VERSION}/nextcloud-theme-${THEME_VERSION}.tar.gz" && \ diff --git a/patches/015-email-mail-template.patch b/patches/015-email-mail-template.patch index f654c784472967d88e542bf9bf7b35ed9cc807a3..72af74d74f97df4bc286f015c87177b1eeb1094a 100644 --- a/patches/015-email-mail-template.patch +++ b/patches/015-email-mail-template.patch @@ -1,25 +1,15 @@ ---- ./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 @@ - +From: Avinash +Date: Tue, 15 Nov 2022 12:50 +0530 +Subject: [PATCH] To implement custom email template design for calendar invite + +This patch is allowing to customize the email template design for invitation + +--- ./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 +27,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 +79,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 +89,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 +135,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 +157,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 +187,5 @@ - - $template->addBodyText($html, $text); } - + /** diff --git a/patches/022-significantchange.patch b/patches/022-significantchange.patch new file mode 100644 index 0000000000000000000000000000000000000000..8040a53cadf9a1f02ec8bb8aa0f0a810cbf6f657 --- /dev/null +++ b/patches/022-significantchange.patch @@ -0,0 +1,17 @@ +From: Avinash +Date: Tue, 15 Nov 2022 12:50 +0530 +Subject: [PATCH] To allow significant change to send mail for summary and description change + +This patch is allowing to to send mail for summary and description change + +--- ./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', + ]; + + /**