diff --git a/Dockerfile b/Dockerfile index d0392f39d28b2c62462deeb221c4cfd0a6614d49..8f9fa30e952a23d15d6c574176e82f0ef63ba181 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,22 +1,22 @@ -FROM nextcloud:28.0.9-fpm AS nextcloud +FROM nextcloud:29.0.12-fpm AS nextcloud ARG BASE_DIR="/usr/src/nextcloud" ARG TMP_PATCH_DIR="/tmp/build_patches" -ARG THEME_HELPER_JOB_ID="1004002" -ARG NOTES_VERSION="4.10.1" +ARG THEME_HELPER_JOB_ID="1168069" +ARG NOTES_VERSION="4.11.0" ARG CONTACTS_JOB_ID="881946" ARG CALENDAR_JOB_ID="991372" -ARG EMAIL_RECOVERY_JOB_ID="1004020" -ARG EA_JOB_ID="1004029" -ARG LAUNCHER_JOB_ID="991418" -ARG GOOGLE_INTEGRATION_VERSION="2.2.0" -ARG DASHBOARD_JOB_ID="1004045" +ARG EMAIL_RECOVERY_JOB_ID="1168177" +ARG EA_JOB_ID="1168157" +ARG LAUNCHER_JOB_ID="1168135" +ARG GOOGLE_INTEGRATION_VERSION="3.2.0" +ARG DASHBOARD_JOB_ID="1168115" ARG SNAPPY_VERSION="2.37.2" ARG SNAPPY_THEME_VERSION="4.0.1" -ARG USER_MIGRATION_JOB_ID="991454" -ARG MEMORIES_VERSION="7.3.1" -ARG DROP_ACCOUNT_VERSION="2.5.0" +ARG USER_MIGRATION_JOB_ID="1168093" +ARG MEMORIES_VERSION="7.5.2" +ARG DROP_ACCOUNT_VERSION="2.7.1" -RUN sed -i 's/28,0,9,1/28,0,9,6/' ${BASE_DIR}/version.php +RUN sed -i 's/29,0,12,2/29,0,12,5/' ${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 @@ -120,7 +120,8 @@ RUN apt-get -y remove unzip RUN sed -i "s/\$systemConfig->setValue('theme', '');/\$systemConfig->setValue('theme', 'eCloud');/g" ${BASE_DIR}/lib/base.php # Disable editor feature of media viewer -RUN sed -i 's/canEdit(){var e,t;return!this.isMobile/canEdit(){var e,t;return!this.isMobile\&\&false/' ${BASE_DIR}/apps/viewer/js/viewer-main.js +RUN sed -i 's/canEdit(){return!this.isMobile&&L()/canEdit(){return!this.isMobile&&false&&L()/' ${BASE_DIR}/apps/viewer/js/viewer-main.mjs + ENTRYPOINT ["/custom_entrypoint.sh"] CMD ["php-fpm"] @@ -138,7 +139,7 @@ COPY patches/ ${TMP_PATCH_DIR}/ RUN cd ${BASE_DIR} && patch -p0 < ${TMP_PATCH_DIR}/002-login-without-domain.patch RUN cd ${BASE_DIR} && patch -p0 < ${TMP_PATCH_DIR}/006-recovery-email-changes.patch RUN patch -u ${BASE_DIR}/apps/settings/lib/Settings/Personal/ServerDevNotice.php -i ${TMP_PATCH_DIR}/007-remove-dev-notice.patch -RUN cd ${BASE_DIR} && patch -p0 < ${TMP_PATCH_DIR}/009-help-links.patch +RUN cd ${BASE_DIR} && patch -p1 < ${TMP_PATCH_DIR}/009-help-links.patch RUN patch -u ${BASE_DIR}/lib/private/Updater.php -i ${TMP_PATCH_DIR}/010-disable-app-store-upgrade.patch RUN cd ${BASE_DIR} && patch -p0 < ${TMP_PATCH_DIR}/011-privacy-settings.patch RUN patch -u ${BASE_DIR}/lib/private/Authentication/Token/PublicKeyTokenProvider.php -i ${TMP_PATCH_DIR}/013-revert-token-password-update.patch @@ -153,8 +154,6 @@ RUN patch -u ${BASE_DIR}/lib/private/L10N/Factory.php -i ${TMP_PATCH_DIR}/032-se # UserConfigChangedEvent Ref: https://github.com/nextcloud/server/pull/42039 RUN cd ${BASE_DIR} && patch -p1 < ${TMP_PATCH_DIR}/036-user-config-change-event.patch -# fixed Mailer.php error which is fixed in upstream,so we need to remove this in Nextcloud 29 upgrade -RUN patch -u ${BASE_DIR}/lib/private/Mail/Mailer.php -i ${TMP_PATCH_DIR}/037-mailer-template-fix.patch RUN rm -rf ${TMP_PATCH_DIR} # Custom theme @@ -211,7 +210,7 @@ From selfhost as ecloud ARG BASE_DIR="/usr/src/nextcloud" ARG TMP_PATCH_DIR="/tmp/build_patches" ARG THEME_VERSION="28.0.2" -ARG LDAP_WRITE_SUPPORT_VERSION="1.10.0" +ARG LDAP_WRITE_SUPPORT_VERSION="1.11.0" ARG IS_SELFHOST=false RUN curl -fsSL -o ldap_write_support.tar.gz \ @@ -233,8 +232,6 @@ RUN patch -u ${BASE_DIR}/apps/dav/lib/HookManager.php -i ${TMP_PATCH_DIR}/028-de RUN patch -u ${BASE_DIR}/apps/provisioning_api/lib/Controller/UsersController.php -i ${TMP_PATCH_DIR}/029-restrict-user-to-change-primary-email.patch RUN patch -u ${BASE_DIR}/lib/private/Security/VerificationToken/VerificationToken.php -i ${TMP_PATCH_DIR}/033-verification-token-private.patch RUN patch -u ${BASE_DIR}/lib/private/AppFramework/Middleware/Security/CORSMiddleware.php -i ${TMP_PATCH_DIR}/034-oidc-bearer-token-auth.patch -#fixed regression in generic event type for nextcloud 28.0.9 -RUN patch -u ${BASE_DIR}/apps/dav/lib/AppInfo/Application.php -i ${TMP_PATCH_DIR}/038-generic-event-fix.patch #commenting code to re-enable account creation RUN patch -u ${BASE_DIR}/lib/private/User/Session.php -i ${TMP_PATCH_DIR}/039-reenable-ac-comment-setupfs.patch @@ -251,9 +248,7 @@ RUN sed -i 's/$this->getAvatarImage($user)/null/' ${BASE_DIR}/apps/dav/lib/CardD # RUN cd ${BASE_DIR}/dist && sed -i 's/resetPassword:!1/resetPassword:!1||Z.showResetPassword==="1"/' core-login.js # add attr about how many notifications to notif icon -RUN sed -i 's/attrs:{id:"notifications",/attrs:{id:"notifications","data-has-notifications":0!==t.notifications.length,/' ${BASE_DIR}/apps/notifications/js/notifications-node_modules_moment_locale_sync_recursive_-src_NotificationsApp_vue-data_image_svg_xml_base64-ab95a3.js -# Add data-object-type to notification -RUN sed -i 's/"data-id":t.notificationId,/"data-id":t.notificationId,"data-object-type":t.objectType,/' ${BASE_DIR}/apps/notifications/js/notifications-node_modules_moment_locale_sync_recursive_-src_NotificationsApp_vue-data_image_svg_xml_base64-ab95a3.js +RUN sed -i 's/attrs:{id:"notifications",/attrs:{id:"notifications","data-has-notifications":0!==t.notifications.length,/' ${BASE_DIR}/apps/notifications/js/notifications-src_NotificationsApp_vue.js # Rename Memories to Gallery RUN sed -i 's/Memories<\/name>/Gallery<\/name>/g' ${BASE_DIR}/custom_apps/memories/appinfo/info.xml @@ -313,7 +308,7 @@ RUN sed -i "s/return in_array(\$user->getBackendClassName(), \['Database', 'Gues RUN sed -i ':a;N;$!ba;s/t("NcActionButton",{on:{click:e.onToggleSharing},scopedSlots:e._u(\[{key:"icon",fn:function(){return\[t("ShareVariantIcon",{attrs:{size:20}})\]},proxy:!0}\])},\[e._v("\\n\\t\\t\\t"+e._s(e.t("notes","Share"))+"\\n\\t\\t")\]),e._v(" "),/''/g' ${BASE_DIR}/custom_apps/notes/js/notes-main.js # Add id to delete account settings section and hide it by default -Run sed -i 's/"NcSettingsSection",{attrs:{/"NcSettingsSection",{attrs:{id:"delete-account-settings-section",style:"visibility:hidden;",/' ${BASE_DIR}/custom_apps/drop_account/js/drop_account-personal-settings.js +RUN sed -i 's/"NcSettingsSection",{attrs:{/"NcSettingsSection",{attrs:{id:"delete-account-settings-section",style:"visibility:hidden;",/' ${BASE_DIR}/custom_apps/drop_account/js/drop_account-personal-settings.mjs # Fix of https://github.com/nextcloud/server/commit/e727a3b00bd9b574279d25c006a0bc6b8fa4eec3 for availability setting RUN sed -i 's/n.data/await n.text()/' ${BASE_DIR}/dist/dav-settings-personal-availability.js \ No newline at end of file diff --git a/patches/005-autocomplete-user-leak-core.patch b/patches/005-autocomplete-user-leak-core.patch index 8fed793e1b19d59fe9e37939ba3e1ebee35cd6ff..bf69e89e0705548aebf3463367f4bcb42982e086 100644 --- a/patches/005-autocomplete-user-leak-core.patch +++ b/patches/005-autocomplete-user-leak-core.patch @@ -12,25 +12,23 @@ this filtering works in conjunction with the autocomplete feature disabled in ne diff --git lib/private/Collaboration/Collaborators/UserPlugin.php lib/private/Collaboration/Collaborators/UserPlugin-new.php ---- lib/private/Collaboration/Collaborators/UserPlugin.php 2022-11-23 17:19:20.220495300 +0530 -+++ lib/private/Collaboration/Collaborators/UserPlugin-new.php 2022-11-23 17:19:05.690495300 +0530 -@@ -186,9 +186,9 @@ +--- lib/private/Collaboration/Collaborators/UserPlugin.php 2025-02-13 19:30:40 ++++ lib/private/Collaboration/Collaborators/UserPlugin-new.php 2025-03-07 12:48:50 +@@ -175,8 +175,8 @@ if ( $this->shareeEnumerationFullMatch && $lowerSearch !== '' && (strtolower($uid) === $lowerSearch || - strtolower($userDisplayName) === $lowerSearch || - ($this->shareeEnumerationFullMatchIgnoreSecondDisplayName && trim(strtolower(preg_replace('/ \(.*\)$/', '', $userDisplayName))) === $lowerSearch) || -- ($this->shareeEnumerationFullMatchEmail && strtolower($userEmail ?? '') === $lowerSearch)) + // strtolower($userDisplayName) === $lowerSearch || + // ($this->shareeEnumerationFullMatchIgnoreSecondDisplayName && trim(strtolower(preg_replace('/ \(.*\)$/', '', $userDisplayName))) === $lowerSearch) || -+ ($this->shareeEnumerationFullMatchEmail && strtolower($userEmail) === $lowerSearch)) + ($this->shareeEnumerationFullMatchEmail && strtolower($userEmail ?? '') === $lowerSearch)) ) { if (strtolower($uid) === $lowerSearch) { - $foundUserById = true; diff --git lib/private/Collaboration/Collaborators/MailPlugin.php lib/private/Collaboration/Collaborators/MailPlugin-new.php ---- lib/private/Collaboration/Collaborators/MailPlugin.php 2023-02-01 21:43:07.661060529 +0530 -+++ lib/private/Collaboration/Collaborators/MailPlugin-new.php 2023-02-01 21:51:00.382603635 +0530 +--- lib/private/Collaboration/Collaborators/MailPlugin.php 2025-02-13 19:30:40 ++++ lib/private/Collaboration/Collaborators/MailPlugin-new.php 2025-03-07 12:55:25 @@ -39,6 +39,7 @@ use OCP\IUserSession; use OCP\Mail\IMailer; @@ -39,17 +37,18 @@ diff --git lib/private/Collaboration/Collaborators/MailPlugin.php lib/private/Co class MailPlugin implements ISearchPlugin { protected bool $shareWithGroupOnly; -@@ -61,7 +62,9 @@ +@@ -61,8 +62,10 @@ private KnownUserService $knownUserService, private IUserSession $userSession, private IMailer $mailer, + private IUserManager $userManager, + private mixed $shareWithGroupOnlyExcludeGroupsList = [], ) { + $this->userManager = $userManager; $this->shareeEnumeration = $this->config->getAppValue('core', 'shareapi_allow_share_dialog_user_enumeration', 'yes') === 'yes'; $this->shareWithGroupOnly = $this->config->getAppValue('core', 'shareapi_only_share_with_group_members', 'no') === 'yes'; $this->shareeEnumerationInGroupOnly = $this->shareeEnumeration && $this->config->getAppValue('core', 'shareapi_restrict_user_enumeration_to_group', 'no') === 'yes'; -@@ -207,27 +210,61 @@ +@@ -216,27 +219,61 @@ if ($exactEmailMatch) { $searchResult->markExactIdMatch($emailType); } @@ -69,12 +68,12 @@ diff --git lib/private/Collaboration/Collaborators/MailPlugin.php lib/private/Co + $result['exact'][] = [ + 'label' => $displayName, + 'uuid' => $contact['UID'], -+ 'name' => $contact['FN'], -+ 'type' => $emailAddressType ?? '', -+ 'value' => [ -+ 'shareType' => IShare::TYPE_EMAIL, -+ 'shareWith' => $emailAddress, -+ ], ++ 'name' => $contact['FN'], ++ 'type' => $emailAddressType ?? '', ++ 'value' => [ ++ 'shareType' => IShare::TYPE_EMAIL, ++ 'shareWith' => $emailAddress, ++ ], + ]; + } else { + // /e/ user IS an ecloud user, convert to user share type @@ -131,4 +130,3 @@ diff --git lib/private/Collaboration/Collaborators/MailPlugin.php lib/private/Co } } } - diff --git a/patches/009-help-links.patch b/patches/009-help-links.patch index 68a072a8e3ac5d6fa23fd5447db9446c750b572f..ce58874f4607da112b248deadaabc85981e34f2e 100644 --- a/patches/009-help-links.patch +++ b/patches/009-help-links.patch @@ -1,23 +1,24 @@ -From: Akhil -Date: Thu, 10 Aug 2021 17:30:00 +0530 +From: Ronak +Date: Fri, 07 March 2025 17:30:00 +0530 Subject: [PATCH] Changes help links to point to the correct links -This patch adds changes to the "Settings" app's help template, controller and stylesheet to make sure the correct +This patch updated/adds changes to the "Settings" app's help template, controller and stylesheet to make sure the correct help links are shown ---- ./apps/settings/lib/Controller/HelpController.php 2024-07-25 16:11:57 +0530 -+++ ./apps/settings/lib/Controller/HelpController-new.php 2024-07-25 16:12:51 +0530 -@@ -114,6 +114,7 @@ +--- ./apps/settings/lib/Controller/HelpController.php 2025-03-07 11:04:18 ++++ ./apps/settings/lib/Controller/HelpController-new.php 2025-03-07 11:04:21 +@@ -123,6 +123,7 @@ 'urlAdminDocs' => $urlAdminDocs, 'mode' => $mode, 'pageTitle' => $pageTitle, + 'ncVersion' => \OCP\Util::getVersion()[0], 'knowledgebaseEmbedded' => $knowledgebaseEmbedded, - ]); - $policy = new ContentSecurityPolicy() ---- ./apps/settings/templates/help.php 2024-07-25 16:17:46 +0530 -+++ ./apps/settings/templates/help-new.php 2024-07-25 17:13:16 +0530 -@@ -5,72 +5,49 @@ + 'legalNoticeUrl' => $legalNoticeUrl, + 'privacyUrl' => $privacyUrl, +\ No newline at end of file +--- ./apps/settings/templates/help.php 2025-03-13 21:19:20 ++++ ./apps/settings/templates/help-new.php 2025-03-26 13:04:36 +@@ -5,85 +5,48 @@ - +- -
- @@ -85,7 +79,7 @@ help links are shown

-- t('Nextcloud help resources')); ?> +- t('Nextcloud help & privacy resources')); ?> + t('Murena Workspace help resources')); ?>

@@ -108,14 +102,29 @@ help links are shown + t('Forum')); ?> ↗ +- +- +- t('Legal notice')); ?> ↗ +- +- +- +- +- t('Privacy policy')); ?> ↗ +- +-
+
+
+- ++ +\ No newline at end of file --- ./apps/settings/css/help.css 2021-08-20 14:16:57.951439620 +0530 +++ ./apps/settings/css/help-new.css 2021-08-20 17:02:43.549016337 +0530 -@@ -10,3 +10,12 @@ - border: 0; - overflow: auto; - } -+ +@@ -50,4 +50,12 @@ + + .help-content__body > .button { + margin: 20px; ++} +#content #app-navigation { + transform: none; + width: max-content; @@ -123,4 +132,5 @@ help links are shown + +#app-navigation:not(.vue) > ul > li > a { + padding: 0 12px 0 44px; -+} + } + diff --git a/patches/037-mailer-template-fix.patch b/patches/037-mailer-template-fix.patch deleted file mode 100644 index 5dca9ddc152c0fc0f2af420948edbf44d657628f..0000000000000000000000000000000000000000 --- a/patches/037-mailer-template-fix.patch +++ /dev/null @@ -1,46 +0,0 @@ -From: Avinash -Date: Thu, 29 Aug 2024 15:50:00 +0530 -Subject: [PATCH] This actually fixes error introduces in 28.0.9 Mailer.php .Already fixed on Stable 28,29 and 30. Not needed in next upgrade. - ---- lib/private/Mail/Mailer.php 2024-08-29 15:55:02 -+++ lib/private/Mail/Mailer-new.php 2024-08-29 15:56:18 -@@ -130,18 +130,6 @@ - * @since 12.0.0 - */ - public function createEMailTemplate(string $emailId, array $data = []): IEMailTemplate { -- $class = $this->config->getSystemValueString('mail_template_class', ''); -- -- if ($class !== '' && class_exists($class) && is_a($class, EMailTemplate::class, true)) { -- return new $class( -- $this->defaults, -- $this->urlGenerator, -- $this->l10nFactory, -- $emailId, -- $data -- ); -- } -- - $logoDimensions = $this->config->getAppValue('theming', 'logoDimensions', self::DEFAULT_DIMENSIONS); - if (str_contains($logoDimensions, 'x')) { - [$width, $height] = explode('x', $logoDimensions); -@@ -165,6 +153,19 @@ - } - } else { - $logoWidth = $logoHeight = null; -+ } -+ -+ $class = $this->config->getSystemValueString('mail_template_class', ''); -+ if ($class !== '' && class_exists($class) && is_a($class, EMailTemplate::class, true)) { -+ return new $class( -+ $this->defaults, -+ $this->urlGenerator, -+ $this->l10nFactory, -+ $logoWidth, -+ $logoHeight, -+ $emailId, -+ $data -+ ); - } - - return new EMailTemplate( - diff --git a/patches/038-generic-event-fix.patch b/patches/038-generic-event-fix.patch deleted file mode 100644 index d679cfa9443b710250c21668ae623ec199f440e2..0000000000000000000000000000000000000000 --- a/patches/038-generic-event-fix.patch +++ /dev/null @@ -1,16 +0,0 @@ -From: Avinash Gusain -Date: Wed, 04 Sept 2024 18:50:00 +0530 -Subject: [PATCH] Fixed Generic event - -This patch basically fix a regression caused in 28.0.9 by changing the correct event type - ---- apps/dav/lib/AppInfo/Application.php 2024-09-04 13:08:44 -+++ apps/dav/lib/AppInfo/Application-new.php 2024-09-04 13:09:40 -@@ -110,7 +110,7 @@ - use OCP\User\Events\OutOfOfficeScheduledEvent; - use Psr\Container\ContainerInterface; - use Psr\Log\LoggerInterface; --use Symfony\Component\EventDispatcher\GenericEvent; -+use OCP\EventDispatcher\GenericEvent; - use Throwable; - use function is_null; \ No newline at end of file