From 846329aad19d004692d21833261918537d5517af Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Tue, 7 Oct 2025 15:15:42 +0530 Subject: [PATCH 01/15] NC 31 image added --- Dockerfile | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/Dockerfile b/Dockerfile index a8fea96..9315890 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM nextcloud:30.0.14-fpm AS nextcloud +FROM nextcloud:31.0.9-fpm AS nextcloud ARG BASE_DIR="/usr/src/nextcloud" ARG TMP_PATCH_DIR="/tmp/build_patches" ARG THEME_HELPER_JOB_ID="1330034" @@ -16,7 +16,7 @@ ARG USER_MIGRATION_JOB_ID="1313296" ARG MEMORIES_VERSION="7.5.2" ARG DROP_ACCOUNT_VERSION="2.7.1" -RUN sed -i 's/30,0,14,1/30,0,14,11/' ${BASE_DIR}/version.php +RUN sed -i 's/31,0,9,1/31,0,9,1/' ${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 @@ -146,16 +146,16 @@ 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 -RUN cd ${BASE_DIR} && patch -p0 < ${TMP_PATCH_DIR}/014-add-mail-usage.patch +#RUN cd ${BASE_DIR} && patch -p0 < ${TMP_PATCH_DIR}/014-add-mail-usage.patch RUN cd ${BASE_DIR} && patch -p0 < ${TMP_PATCH_DIR}/015-email-mail-template.patch 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/files/js/files.js -i ${TMP_PATCH_DIR}/021-repeated-storage-dialog-fix.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 cd ${BASE_DIR} && patch -p0 < ${TMP_PATCH_DIR}/026-primary-color-fix.patch -RUN patch -u ${BASE_DIR}/lib/private/Template/JSResourceLocator.php -i ${TMP_PATCH_DIR}/031-theme-custom-app-translations.patch +#RUN patch -u ${BASE_DIR}/lib/private/Template/JSResourceLocator.php -i ${TMP_PATCH_DIR}/031-theme-custom-app-translations.patch RUN patch -u ${BASE_DIR}/lib/private/L10N/Factory.php -i ${TMP_PATCH_DIR}/032-select-lang-from-session.patch # UserConfigChangedEvent Ref: https://github.com/nextcloud/server/pull/42039 -RUN cd ${BASE_DIR} && patch -p1 < ${TMP_PATCH_DIR}/036-user-config-change-event.patch +#RUN cd ${BASE_DIR} && patch -p1 < ${TMP_PATCH_DIR}/036-user-config-change-event.patch RUN rm -rf ${TMP_PATCH_DIR} @@ -198,10 +198,10 @@ RUN sed -i 's/this.appLimit=e/this.appLimit=this.appList.length/' ${BASE_DIR}/di # Fix total quota value for users in settings and files RUN sed -i "s/'total'/'quota'/" ${BASE_DIR}/apps/settings/lib/Settings/Personal/PersonalInfo.php -RUN sed -i "s/\['total'\]/\['quota'\]/" ${BASE_DIR}/apps/provisioning_api/lib/Controller/AUserData.php +#RUN sed -i "s/\['total'\]/\['quota'\]/" ${BASE_DIR}/apps/provisioning_api/lib/Controller/AUserData.php # Fix API call in files script -RUN sed -i "s/ajax\/getstoragestats/api\/v1\/stats/g" ${BASE_DIR}/apps/files/js/files.js +#RUN sed -i "s/ajax\/getstoragestats/api\/v1\/stats/g" ${BASE_DIR}/apps/files/js/files.js From selfhost as ecloud ARG BASE_DIR="/usr/src/nextcloud" @@ -220,9 +220,9 @@ COPY patches/ ${TMP_PATCH_DIR}/ RUN patch -u ${BASE_DIR}/core/templates/layout.user.php -i ${TMP_PATCH_DIR}/003-contact-search-removal.patch RUN patch -u ${BASE_DIR}/core/Controller/ContactsMenuController.php -i ${TMP_PATCH_DIR}/004-contact-search-controller-removal.patch RUN cd ${BASE_DIR} && patch -p0 < ${TMP_PATCH_DIR}/005-autocomplete-user-leak-core.patch -RUN patch -u ${BASE_DIR}/core/templates/layout.guest.php -i ${TMP_PATCH_DIR}/016-login-screen.patch +#RUN patch -u ${BASE_DIR}/core/templates/layout.guest.php -i ${TMP_PATCH_DIR}/016-login-screen.patch RUN patch -u ${BASE_DIR}/lib/private/Notification/Manager.php -i ${TMP_PATCH_DIR}/020-fairuse-notification-fix.patch -RUN cd ${BASE_DIR} && patch -u ${BASE_DIR}/apps/user_ldap/lib/User_LDAP.php -i ${TMP_PATCH_DIR}/023-ldap-check-pwd-optimization.patch +#RUN cd ${BASE_DIR} && patch -u ${BASE_DIR}/apps/user_ldap/lib/User_LDAP.php -i ${TMP_PATCH_DIR}/023-ldap-check-pwd-optimization.patch RUN patch -u ${BASE_DIR}/lib/private/User/Manager.php -i ${TMP_PATCH_DIR}/025-optimize-get-by-email.patch RUN patch -u ${BASE_DIR}/apps/dav/lib/Connector/Sabre/Principal.php -i ${TMP_PATCH_DIR}/027-displayname-user-leak-dav.patch RUN patch -u ${BASE_DIR}/apps/dav/lib/HookManager.php -i ${TMP_PATCH_DIR}/028-default-task-calendar.patch @@ -243,7 +243,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!==u.notifications.length,/' ${BASE_DIR}/apps/notifications/js/NotificationsApp-DS2Cdf60.chunk.mjs +#RUN sed -i 's/attrs:{id:"notifications",/attrs:{id:"notifications","data-has-notifications":0!==u.notifications.length,/' ${BASE_DIR}/apps/notifications/js/NotificationsApp-DS2Cdf60.chunk.mjs # Rename Memories to Gallery RUN sed -i 's/Memories<\/name>/Gallery<\/name>/g' ${BASE_DIR}/custom_apps/memories/appinfo/info.xml -- GitLab From 19de1ce31d29e9afcd040d58e7b27fa38c83d768 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Thu, 9 Oct 2025 00:54:34 +0530 Subject: [PATCH 02/15] add murena dashboad job id and version bump --- Dockerfile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9315890..a493fc6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,20 +3,20 @@ ARG BASE_DIR="/usr/src/nextcloud" ARG TMP_PATCH_DIR="/tmp/build_patches" ARG THEME_HELPER_JOB_ID="1330034" ARG NOTES_VERSION="4.11.0" -ARG CONTACTS_JOB_ID="1313223" -ARG CALENDAR_JOB_ID="1330379" +ARG CONTACTS_JOB_ID="1343484" +ARG CALENDAR_JOB_ID="1351761" ARG EMAIL_RECOVERY_JOB_ID="1313239" ARG EA_JOB_ID="1317005" ARG LAUNCHER_JOB_ID="1330025" ARG GOOGLE_INTEGRATION_VERSION="3.2.0" -ARG DASHBOARD_JOB_ID="1313279" +ARG DASHBOARD_JOB_ID="1353063" ARG SNAPPY_VERSION="2.37.2" ARG SNAPPY_THEME_VERSION="4.0.5" ARG USER_MIGRATION_JOB_ID="1313296" ARG MEMORIES_VERSION="7.5.2" ARG DROP_ACCOUNT_VERSION="2.7.1" -RUN sed -i 's/31,0,9,1/31,0,9,1/' ${BASE_DIR}/version.php +RUN sed -i 's/31,0,9,1/31,0,9,2/' ${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 @@ -207,7 +207,7 @@ From selfhost as ecloud ARG BASE_DIR="/usr/src/nextcloud" ARG TMP_PATCH_DIR="/tmp/build_patches" ARG THEME_VERSION="v30.0.1" -ARG LDAP_WRITE_SUPPORT_VERSION="1.12.1" +ARG LDAP_WRITE_SUPPORT_VERSION="1.13.0" ARG IS_SELFHOST=false RUN curl -fsSL -o ldap_write_support.tar.gz \ -- GitLab From 02645454c0c6fc2058e22babcbd1c0cbfb344449 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Fri, 10 Oct 2025 00:16:46 +0530 Subject: [PATCH 03/15] Added snappymail patch and other patch fixes --- Dockerfile | 16 ++++++------- custom_entrypoint.sh | 2 +- patches/014-add-mail-usage.patch | 22 ++++++++++-------- .../031-theme-custom-app-translations.patch | 5 ++-- patches/037-snappymail-contact.patch | 23 +++++++++++++++++++ 5 files changed, 47 insertions(+), 21 deletions(-) create mode 100644 patches/037-snappymail-contact.patch diff --git a/Dockerfile b/Dockerfile index a493fc6..3897d95 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,7 +10,7 @@ ARG EA_JOB_ID="1317005" ARG LAUNCHER_JOB_ID="1330025" ARG GOOGLE_INTEGRATION_VERSION="3.2.0" ARG DASHBOARD_JOB_ID="1353063" -ARG SNAPPY_VERSION="2.37.2" +ARG SNAPPY_VERSION="2.38.2" ARG SNAPPY_THEME_VERSION="4.0.5" ARG USER_MIGRATION_JOB_ID="1313296" ARG MEMORIES_VERSION="7.5.2" @@ -78,10 +78,10 @@ RUN curl -fsSL -o ecloud-dashboard.zip \ mv dist/murena-dashboard ${BASE_DIR}/custom_apps/ && \ rm ecloud-dashboard.zip; -#RUN curl -fsSL -o snappymail.tar.gz \ -# "https://snappymail.eu/repository/nextcloud/snappymail-${SNAPPY_VERSION}-nextcloud.tar.gz" && \ -# tar -xf snappymail.tar.gz -C ${BASE_DIR}/custom_apps/ && \ -# rm snappymail.tar.gz; +RUN curl -fsSL -o snappymail.tar.gz \ + "https://snappymail.eu/repository/nextcloud/snappymail-${SNAPPY_VERSION}-nextcloud.tar.gz" && \ + tar -xf snappymail.tar.gz -C ${BASE_DIR}/custom_apps/ && \ + rm snappymail.tar.gz; RUN curl -fsSL -o user_migration.zip \ "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/user_migration/-/jobs/${USER_MIGRATION_JOB_ID}/artifacts/download" && \ @@ -146,13 +146,13 @@ 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 -#RUN cd ${BASE_DIR} && patch -p0 < ${TMP_PATCH_DIR}/014-add-mail-usage.patch +RUN cd ${BASE_DIR} && patch -p0 < ${TMP_PATCH_DIR}/014-add-mail-usage.patch RUN cd ${BASE_DIR} && patch -p0 < ${TMP_PATCH_DIR}/015-email-mail-template.patch 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/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 cd ${BASE_DIR} && patch -p0 < ${TMP_PATCH_DIR}/026-primary-color-fix.patch -#RUN patch -u ${BASE_DIR}/lib/private/Template/JSResourceLocator.php -i ${TMP_PATCH_DIR}/031-theme-custom-app-translations.patch +RUN patch -u ${BASE_DIR}/lib/private/Template/JSResourceLocator.php -i ${TMP_PATCH_DIR}/031-theme-custom-app-translations.patch RUN patch -u ${BASE_DIR}/lib/private/L10N/Factory.php -i ${TMP_PATCH_DIR}/032-select-lang-from-session.patch # UserConfigChangedEvent Ref: https://github.com/nextcloud/server/pull/42039 #RUN cd ${BASE_DIR} && patch -p1 < ${TMP_PATCH_DIR}/036-user-config-change-event.patch @@ -229,7 +229,7 @@ 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 - +RUN patch -u ${BASE_DIR}/custom_apps/snappymail/app/snappymail/v/2.38.2/app/libraries/RainLoop/Actions/Contacts.php -i ${TMP_PATCH_DIR}/037-snappymail-contact.patch RUN rm -rf ${TMP_PATCH_DIR} diff --git a/custom_entrypoint.sh b/custom_entrypoint.sh index 7cbfde6..08fc883 100644 --- a/custom_entrypoint.sh +++ b/custom_entrypoint.sh @@ -29,7 +29,7 @@ if version_greater "$image_version" "$installed_version"; then rsync $rsync_options --include "/integration_google/" --exclude '/*' $SRC_DIR/custom_apps/ $DST_DIR/custom_apps/ rsync $rsync_options --include "/ldap_write_support/" --exclude '/*' $SRC_DIR/custom_apps/ $DST_DIR/custom_apps/ rsync $rsync_options --include "/murena-dashboard/" --exclude '/*' $SRC_DIR/custom_apps/ /$DST_DIR/custom_apps/ - #rsync $rsync_options --include "/snappymail/" --exclude '/*' $SRC_DIR/custom_apps/ /$DST_DIR/custom_apps/ + rsync $rsync_options --include "/snappymail/" --exclude '/*' $SRC_DIR/custom_apps/ /$DST_DIR/custom_apps/ rsync $rsync_options --include "/eCloud/" --exclude '/*' $SRC_DIR/themes/ $DST_DIR/themes/ rsync $rsync_options --include "/Murena/" --exclude '/*' $SRC_DIR/themes/ $DST_DIR/themes/ rsync $rsync_options --include "/memories/" --exclude '/*' $SRC_DIR/custom_apps/ $DST_DIR/custom_apps/ diff --git a/patches/014-add-mail-usage.patch b/patches/014-add-mail-usage.patch index 4418b3e..a8bf3a1 100644 --- a/patches/014-add-mail-usage.patch +++ b/patches/014-add-mail-usage.patch @@ -1,22 +1,24 @@ --- lib/private/legacy/OC_Helper.php 2025-05-25 16:00:00.880495300 +0530 +++ lib/private/legacy/OC_Helper-new.php 2025-05-25 16:02:00.970495300 +0530 -@@ -512,6 +512,12 @@ +@@ -512,6 +512,13 @@ } try { $free = $sourceStorage->free_space($rootInfo->getInternalPath()); -+ $ownerId = $storage->getOwner($path); -+ $mailQuotaUsage = (int) \OC::$server->getConfig()->getUserValue($ownerId, 'ecloud-accounts', 'mailQuotaUsage', 0); -+ $free = max(0, $free - $mailQuotaUsage); -+ if($path === '/') { -+ $used = $used + $mailQuotaUsage; -+ } ++ $ownerId = $storage->getOwner($path); ++ $mailQuotaUsage = (int) \OC::$server->getConfig()->getUserValue($ownerId, 'ecloud-accounts', 'mailQuotaUsage', 0); ++ $free = max(0, $free - $mailQuotaUsage); ++ if ($path === '/') { ++ $used = $used + $mailQuotaUsage; ++ } ++ if (is_bool($free)) { $free = 0.0; } -@@ -547,7 +553,6 @@ +@@ -547,7 +554,6 @@ */ $isRemoteShare = $storage->instanceOfStorage(\OCA\Files_Sharing\External\Storage::class); - $ownerId = $storage->getOwner($path); - $hasOwnerId = $ownerId !== false && $ownerId !== null; - $ownerDisplayName = ''; \ No newline at end of file + $ownerDisplayName = ''; + + if ($isRemoteShare === false && $ownerId !== false) { \ No newline at end of file diff --git a/patches/031-theme-custom-app-translations.patch b/patches/031-theme-custom-app-translations.patch index dd9bb27..f8d3f36 100644 --- a/patches/031-theme-custom-app-translations.patch +++ b/patches/031-theme-custom-app-translations.patch @@ -10,11 +10,12 @@ // For language files we try to load them all, so themes can overwrite @@ -57,7 +58,7 @@ $found += $this->appendScriptIfExist($this->serverroot, $script); - $found += $this->appendScriptIfExist($this->serverroot, $theme_dir.$script); + $found += $this->appendScriptIfExist($this->serverroot, $theme_dir . $script); $found += $this->appendScriptIfExist($appRoot, $script, $appWebRoot); -- $found += $this->appendScriptIfExist($this->serverroot, $theme_dir.'apps/'.$script); +- $found += $this->appendScriptIfExist($this->serverroot, $theme_dir . 'apps/' . $script); + $found += $this->appendScriptIfExist($this->serverroot, $theme_dir.$appDirName.'/'.$script); if ($found) { return; + diff --git a/patches/037-snappymail-contact.patch b/patches/037-snappymail-contact.patch new file mode 100644 index 0000000..b9f8f26 --- /dev/null +++ b/patches/037-snappymail-contact.patch @@ -0,0 +1,23 @@ +--- ./custom_apps/snappymail/app/snappymail/v/2.38.2/app/libraries/RainLoop/Actions/Contacts.php 2024-03-28 01:02:39 ++++ ./custom_apps/snappymail/app/snappymail/v/2.38.2/app/libraries/RainLoop/Actions/Contacts-new.php 2024-04-15 16:36:23 +@@ -227,7 +227,11 @@ + if (!empty($sData)) { + $aData = \json_decode($sData, true); + if ($aData) { +- if ($aData['Password']) { ++ // as remote-sync is didsabled for us (murena workspace), we ignore all remote sync password setup ++ $aData['Password'] = ''; ++ $aData['PasswordHMAC'] = null; ++ $aData['Mode'] = 0; ++ /* if ($aData['Password']) { + $oMainAccount = $this->getMainAccountFromToken(); + // Verify oAccount password hasn't changed so that Password can be decrypted + if ($aData['PasswordHMAC'] !== \hash_hmac('sha1', $aData['Password'], $oMainAccount->CryptKey())) { +@@ -243,7 +247,7 @@ + } + if (!isset($aData['Mode'])) { + $aData['Mode'] = empty($aData['Enable']) ? 0 : 1; +- } ++ } */ + return $aData; + } \ No newline at end of file -- GitLab From 17653ada90f3087c907ae7a9dde487fdc15d5d77 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Fri, 10 Oct 2025 10:59:38 +0530 Subject: [PATCH 04/15] fix patch for userConfig change --- patches/036-user-config-change-event.patch | 37 +++++++++++----------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/patches/036-user-config-change-event.patch b/patches/036-user-config-change-event.patch index c49c0e2..0169edc 100644 --- a/patches/036-user-config-change-event.patch +++ b/patches/036-user-config-change-event.patch @@ -1,41 +1,40 @@ --- ./lib/private/AllConfig.php 2024-03-28 01:02:39 +++ ./lib/private/AllConfig-new.php 2024-04-15 16:36:23 -@@ -12,6 +12,8 @@ +@@ -14,7 +14,10 @@ use OCP\IConfig; use OCP\IDBConnection; use OCP\PreConditionNotMetException; +use OCP\EventDispatcher\IEventDispatcher; +use OCP\User\Events\UserConfigChangedEvent; ++ /** * Class to combine all the configuration options ownCloud offers -@@ -257,6 +259,8 @@ - $qb->executeStatement(); - - $this->userCache[$userId][$appName][$key] = (string) $value; -+ $this->triggerUserValueChange($userId, $appName, $key, $value, $prevValue); -+ - return; + */ +@@ -252,9 +255,18 @@ + } catch (TypeConflictException) { } } -@@ -282,6 +286,14 @@ - $this->userCache[$userId][$appName] = []; - } - $this->userCache[$userId][$appName][$key] = (string) $value; -+ } +- ++ $prevValue = $this->getUserValue($userId, $appName, $key, null); + $userPreferences->setValueMixed($userId, $appName, $key, (string)$value); + $this->triggerUserValueChange($userId, $appName, $key, $value, $prevValue); -+ } -+ + } ++ + private function triggerUserValueChange($userId, $appId, $key, $value, $oldValue = null) { + if (\OC::$server instanceof \OCP\IServerContainer) { + $dispatcher = \OC::$server->get(IEventDispatcher::class); + $dispatcher->dispatchTyped(new UserConfigChangedEvent($userId, $appId, $key, $value, $oldValue)); - } - } ++ } ++ } ++ + + /** + * Getting a user defined value --- ./lib/composer/composer/autoload_static.php 2024-03-28 01:02:39 +++ ./lib/composer/composer/autoload_static-new.php 2024-04-15 16:34:18 -@@ -903,6 +903,7 @@ +@@ -982,6 +982,7 @@ 'OCP\\User\\Events\\PasswordUpdatedEvent' => __DIR__ . '/../../..' . '/lib/public/User/Events/PasswordUpdatedEvent.php', 'OCP\\User\\Events\\PostLoginEvent' => __DIR__ . '/../../..' . '/lib/public/User/Events/PostLoginEvent.php', 'OCP\\User\\Events\\UserChangedEvent' => __DIR__ . '/../../..' . '/lib/public/User/Events/UserChangedEvent.php', @@ -46,7 +45,7 @@ --- ./lib/composer/composer/autoload_classmap.php 2024-03-28 01:02:39 +++ ./lib/composer/composer/autoload_classmap-new.php 2024-04-15 16:33:19 -@@ -877,6 +877,7 @@ +@@ -942,6 +942,7 @@ 'OCP\\User\\Events\\UserLoggedInEvent' => $baseDir . '/lib/public/User/Events/UserLoggedInEvent.php', 'OCP\\User\\Events\\UserLoggedInWithCookieEvent' => $baseDir . '/lib/public/User/Events/UserLoggedInWithCookieEvent.php', 'OCP\\User\\Events\\UserLoggedOutEvent' => $baseDir . '/lib/public/User/Events/UserLoggedOutEvent.php', -- GitLab From 58dc684d25579bc56adbde1f7ab0baa3d5faf9e1 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Fri, 10 Oct 2025 12:56:10 +0530 Subject: [PATCH 05/15] login template fix --- Dockerfile | 2 +- patches/016-login-screen.patch | 65 ++++++++++++++++++---------------- 2 files changed, 36 insertions(+), 31 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3897d95..ee6adc0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -220,7 +220,7 @@ COPY patches/ ${TMP_PATCH_DIR}/ RUN patch -u ${BASE_DIR}/core/templates/layout.user.php -i ${TMP_PATCH_DIR}/003-contact-search-removal.patch RUN patch -u ${BASE_DIR}/core/Controller/ContactsMenuController.php -i ${TMP_PATCH_DIR}/004-contact-search-controller-removal.patch RUN cd ${BASE_DIR} && patch -p0 < ${TMP_PATCH_DIR}/005-autocomplete-user-leak-core.patch -#RUN patch -u ${BASE_DIR}/core/templates/layout.guest.php -i ${TMP_PATCH_DIR}/016-login-screen.patch +RUN patch -u ${BASE_DIR}/core/templates/layout.guest.php -i ${TMP_PATCH_DIR}/016-login-screen.patch RUN patch -u ${BASE_DIR}/lib/private/Notification/Manager.php -i ${TMP_PATCH_DIR}/020-fairuse-notification-fix.patch #RUN cd ${BASE_DIR} && patch -u ${BASE_DIR}/apps/user_ldap/lib/User_LDAP.php -i ${TMP_PATCH_DIR}/023-ldap-check-pwd-optimization.patch RUN patch -u ${BASE_DIR}/lib/private/User/Manager.php -i ${TMP_PATCH_DIR}/025-optimize-get-by-email.patch diff --git a/patches/016-login-screen.patch b/patches/016-login-screen.patch index d7d7b98..79414a4 100644 --- a/patches/016-login-screen.patch +++ b/patches/016-login-screen.patch @@ -1,5 +1,5 @@ ---- layout.guest.php 2025-07-24 10:37:50 -+++ layout.guest-new.php 2025-07-24 10:58:20 +--- layout.guest.php 2025-10-10 12:39:23 ++++ layout.guest-new.php 2025-10-10 12:53:43 @@ -32,6 +32,7 @@ @@ -8,63 +8,68 @@ -@@ -42,10 +43,38 @@ +@@ -42,10 +43,37 @@
+
" > -+ -+