From fea9ae3f9c03cde45850545594c7921297453cb4 Mon Sep 17 00:00:00 2001
From: Akhil <akhil.potukuchi@gmail.com>
Date: Wed, 1 Feb 2023 23:13:00 +0530
Subject: [PATCH 01/49] NC 25 + patch fixes

---
 Dockerfile                                    |  19 ++-
 patches/003-contact-search-removal.patch      |  12 +-
 ...04-contact-search-controller-removal.patch |  16 +--
 patches/005-autocomplete-user-leak-core.patch | 122 +++++++++---------
 ...05-autocomplete-user-leak-custom-app.patch |  25 ----
 patches/006-recovery-email-changes.patch      |  10 +-
 patches/009-help-links.patch                  |  34 +++--
 7 files changed, 105 insertions(+), 133 deletions(-)
 delete mode 100644 patches/005-autocomplete-user-leak-custom-app.patch

diff --git a/Dockerfile b/Dockerfile
index 64a024e4..50c8a727 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,10 +1,10 @@
-FROM nextcloud:24.0.8-fpm AS nextcloud
+FROM nextcloud:25.0.3-fpm AS nextcloud
 ARG BASE_DIR="/usr/src/nextcloud"
 ARG TMP_PATCH_DIR="/tmp/build_patches"
 ARG THEME_HELPER_JOB_ID="446245"
-ARG NEWS_VERSION="20.0.0"
+ARG NEWS_VERSION="20.0.1"
 ARG QUOTA_WARN_VERSION="1.15.0"
-ARG NOTES_VERSION="4.5.1"
+ARG NOTES_VERSION="4.6.0"
 ARG CONTACTS_JOB_ID="471108"
 ARG CALENDAR_JOB_ID="471116"
 ARG USER_BACKEND_RAW_SQL_VERSION="1.3.0"
@@ -13,10 +13,10 @@ ARG RAINLOOP_VERSION="7.2.5"
 ARG RAINLOOP_COMMIT_SHA="523518ba"
 ARG EA_JOB_ID="445966"
 ARG ECLOUD_LAUNCHER_JOB_ID="458901"
-ARG GOOGLE_INTEGRATION_VERSION="1.0.8"
+ARG GOOGLE_INTEGRATION_VERSION="1.0.9"
 ARG ECLOUD_DASHBOARD_JOB_ID="485170"
 
-RUN sed -i 's/24,0,8,2/24,0,8,7/' ${BASE_DIR}/version.php
+RUN sed -i 's/25,0,3,2/25,0,3,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
@@ -119,8 +119,8 @@ 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 patch -u ${BASE_DIR}/lib/private/Template/IconsCacher.php -i ${TMP_PATCH_DIR}/008-icons-cacher-theme-svgs.patch
-RUN patch -u ${BASE_DIR}/core/Controller/SvgController.php -i ${TMP_PATCH_DIR}/008-svg-controller-theme-svgs.patch
+# RUN patch -u ${BASE_DIR}/lib/private/Template/IconsCacher.php -i ${TMP_PATCH_DIR}/008-icons-cacher-theme-svgs.patch
+# RUN patch -u ${BASE_DIR}/core/Controller/SvgController.php -i ${TMP_PATCH_DIR}/008-svg-controller-theme-svgs.patch
 RUN cd ${BASE_DIR} && patch -p0 < ${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
@@ -164,10 +164,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 cd ${BASE_DIR}/custom_apps && patch -p0 < ${TMP_PATCH_DIR}/005-autocomplete-user-leak-custom-app.patch
 RUN cd ${BASE_DIR} && patch -u ${BASE_DIR}/apps/dashboard/lib/Controller/DashboardController.php -i ${TMP_PATCH_DIR}/012-remove-user-status-widget.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 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 rm -rf ${TMP_PATCH_DIR}
 
 RUN curl -fsSL -o ldap_write_support.tar.gz \
diff --git a/patches/003-contact-search-removal.patch b/patches/003-contact-search-removal.patch
index 6449e213..4cd68d4a 100644
--- a/patches/003-contact-search-removal.patch
+++ b/patches/003-contact-search-removal.patch
@@ -5,14 +5,14 @@ Subject: [PATCH] remove user search icon in header tab
 This patch removes the top right icon enabling the global user search function available to all in nextcloud.
 
 diff --git layout.user.php layout.user.php-new
---- layout.user.php	2021-06-22 14:06:34.786843164 +0530
-+++ layout.user.php-new	2021-06-22 14:07:45.938569109 +0530
-@@ -103,14 +103,6 @@
-
+--- layout.user.php	2023-02-01 21:04:06.457790526 +0530
++++ layout.user.php-new	2023-02-01 21:04:35.125102888 +0530
+@@ -69,14 +69,6 @@
  			<div class="header-right">
  				<div id="unified-search"></div>
+ 				<div id="notifications"></div>
 -				<div id="contactsmenu">
--					<div class="icon-contacts menutoggle" tabindex="0" role="button"
+-					<div class="menutoggle" tabindex="0" role="button"
 -					aria-haspopup="true" aria-controls="contactsmenu-menu" aria-expanded="false">
 -						<span class="hidden-visually"><?php p($l->t('Contacts'));?></span>
 -					</div>
@@ -21,4 +21,4 @@ diff --git layout.user.php layout.user.php-new
 -				</div>
  				<div id="settings">
  					<div id="expand" tabindex="0" role="button" class="menutoggle"
- 						aria-label="<?php p($l->t('Settings'));?>"
+ 						aria-label="<?php p($l->t('Open settings menu'));?>"
diff --git a/patches/004-contact-search-controller-removal.patch b/patches/004-contact-search-controller-removal.patch
index d4dc24da..5c6d7d2e 100644
--- a/patches/004-contact-search-controller-removal.patch
+++ b/patches/004-contact-search-controller-removal.patch
@@ -5,21 +5,21 @@ Subject: [PATCH] do not return  these results in user search
 This patch removes some results from the contact menu controller, not to leak user informations
 
 diff --git ContactsMenuController.php ContactsMenuController-new.php
---- ContactsMenuController.php	2021-02-04 10:20:18.000000000 +0100
-+++ ContactsMenuController-new.php	2021-02-04 10:30:13.000000000 +0100
-@@ -58,7 +58,7 @@
- 	 * @return \JsonSerializable[]
+--- ./core/Controller/ContactsMenuController.php	2023-02-01 21:40:07.515628276 +0530
++++ ./core/Controller/ContactsMenuController-new.php	2023-02-01 21:39:07.398140201 +0530
+@@ -49,7 +49,7 @@
+ 	 * @throws Exception
  	 */
- 	public function index($filter = null) {
+ 	public function index(?string $filter = null): array {
 -		return $this->manager->getEntries($this->userSession->getUser(), $filter);
 +		return [];
  	}
  
  	/**
-@@ -69,11 +69,6 @@
- 	 * @return JSONResponse|\JsonSerializable
+@@ -59,11 +59,6 @@
+ 	 * @throws Exception
  	 */
- 	public function findOne($shareType, $shareWith) {
+ 	public function findOne(int $shareType, string $shareWith) {
 -		$contact = $this->manager->findOne($this->userSession->getUser(), $shareType, $shareWith);
 -
 -		if ($contact) {
diff --git a/patches/005-autocomplete-user-leak-core.patch b/patches/005-autocomplete-user-leak-core.patch
index a50b4f79..a1a781a3 100644
--- a/patches/005-autocomplete-user-leak-core.patch
+++ b/patches/005-autocomplete-user-leak-core.patch
@@ -29,17 +29,17 @@ diff --git lib/private/Collaboration/Collaborators/UserPlugin.php lib/private/Co
  					$foundUserById = true;
 
 diff --git lib/private/Collaboration/Collaborators/MailPlugin.php lib/private/Collaboration/Collaborators/MailPlugin-new.php
---- lib/private/Collaboration/Collaborators/MailPlugin.php	2022-11-23 15:20:44.460495300 +0530
-+++ lib/private/Collaboration/Collaborators/MailPlugin-new.php	2022-11-23 16:55:17.540495300 +0530
-@@ -36,6 +36,7 @@
- use OCP\IConfig;
- use OCP\IGroupManager;
- use OCP\IUser;
-+use OCP\IUserManager;
+--- 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
+@@ -39,6 +39,7 @@
  use OCP\IUserSession;
  use OCP\Share\IShare;
  use OCP\Mail\IMailer;
-@@ -76,13 +77,15 @@
++use OCP\IUserManager;
+ 
+ class MailPlugin implements ISearchPlugin {
+ 	/* @var bool */
+@@ -76,7 +77,8 @@
  								IGroupManager $groupManager,
  								KnownUserService $knownUserService,
  								IUserSession $userSession,
@@ -49,61 +49,60 @@ diff --git lib/private/Collaboration/Collaborators/MailPlugin.php lib/private/Co
  		$this->contactsManager = $contactsManager;
  		$this->cloudIdManager = $cloudIdManager;
  		$this->config = $config;
- 		$this->groupManager = $groupManager;
+@@ -84,6 +86,7 @@
  		$this->knownUserService = $knownUserService;
  		$this->userSession = $userSession;
-+		$this->userManager = $userManager;
  		$this->mailer = $mailer;
-
++		$this->userManager = $userManager;
+ 
  		$this->shareeEnumeration = $this->config->getAppValue('core', 'shareapi_allow_share_dialog_user_enumeration', 'yes') === 'yes';
-@@ -224,27 +227,63 @@
+ 		$this->shareWithGroupOnly = $this->config->getAppValue('core', 'shareapi_only_share_with_group_members', 'no') === 'yes';
+@@ -230,27 +233,61 @@
  						if ($exactEmailMatch) {
  							$searchResult->markExactIdMatch($emailType);
  						}
 -						$result['exact'][] = [
 -							'label' => $displayName,
--							'uuid' => $contact['UID'],
--							'name' => $contact['FN'],
+-							'uuid' => $contact['UID'] ?? $emailAddress,
+-							'name' => $contact['FN'] ?? $displayName,
 -							'type' => $emailAddressType ?? '',
 -							'value' => [
 -								'shareType' => IShare::TYPE_EMAIL,
 -								'shareWith' => $emailAddress,
 -							],
 -						];
-+
 +						$isUserinInstance = $this->userManager->get($emailAddress);
 +						if ($isUserinInstance === null) {
-+    					// /e/ user is not in ecloud
-+
++						// /e/ user is not in ecloud
 +							$result['exact'][] = [
-+        						'label' => $displayName,
-+        						'uuid' => $contact['UID'],
-+        						'name' => $contact['FN'],
-+        						'type' => $emailAddressType ?? '',
-+        						'value' => [
-+        				    		'shareType' => IShare::TYPE_EMAIL,
-+        				   			'shareWith' => $emailAddress,
-+        							],
-+   								];
++								'label' => $displayName,
++								'uuid' => $contact['UID'],
++						        'name' => $contact['FN'],
++						        'type' => $emailAddressType ?? '',
++						        'value' => [
++						        	'shareType' => IShare::TYPE_EMAIL,
++						        	'shareWith' => $emailAddress,
++						        ],
++						   	];
 +						} else {
-+    					// /e/ user IS an ecloud user, convert to user share type
-+    						if (!$isUserinInstance->isEnabled()) {
-+        						// Ignore disabled users
-+        						continue;
-+    						}
-+    						$result['exact'][] = [
-+        						'label' => $displayName,
-+        						'value' => [
-+            						'shareType' => IShare::TYPE_USER,
-+            						'shareWith' => $emailAddress,
-+        						],
-+    						];
++						    // /e/ user IS an ecloud user, convert to user share type
++							if (!$isUserinInstance->isEnabled()) {
++						        // Ignore disabled users
++						        continue;
++						    }
++						    $result['exact'][] = [
++						        'label' => $displayName,
++						        'value' => [
++						        	'shareType' => IShare::TYPE_USER,
++						        	'shareWith' => $emailAddress,
++						    	],
++						    ];
 +						}
  					} else {
 -						$result['wide'][] = [
 -							'label' => $displayName,
--							'uuid' => $contact['UID'],
--							'name' => $contact['FN'],
+-							'uuid' => $contact['UID'] ?? $emailAddress,
+-							'name' => $contact['FN'] ?? $displayName,
 -							'type' => $emailAddressType ?? '',
 -							'value' => [
 -								'shareType' => IShare::TYPE_EMAIL,
@@ -113,30 +112,31 @@ diff --git lib/private/Collaboration/Collaborators/MailPlugin.php lib/private/Co
 +						$isUserinInstance = $this->userManager->get($emailAddress);
 +						if ($isUserinInstance === null) {
 +							// /e/ user is not in ecloud
-+								$result['wide'][] = [
-+									'label' => $displayName,
-+									'uuid' => $contact['UID'],
-+									'name' => $contact['FN'],
-+									'type' => $emailAddressType ?? '',
-+									'value' => [
++							$result['wide'][] = [
++								'label' => $displayName,
++								'uuid' => $contact['UID'],
++								'name' => $contact['FN'],
++								'type' => $emailAddressType ?? '',
++								'value' => [
 +									'shareType' => IShare::TYPE_EMAIL,
 +									'shareWith' => $emailAddress,
-+									],
-+								];
-+							} else {
-+								// /e/ user IS an ecloud user, convert to user share type
-+								if (!$isUserinInstance->isEnabled()) {
-+									// Ignore disabled users
-+									continue;
-+								}
-+								$result['wide'][] = [
-+									'label' => $displayName,
-+									'value' => [
-+										'shareType' => IShare::TYPE_USER,
-+										'shareWith' => $emailAddress,
-+									],
-+								];
++								],
++							];
++						} else {
++							// /e/ user IS an ecloud user, convert to user share type
++							if (!$isUserinInstance->isEnabled()) {
++								// Ignore disabled users
++								continue;
 +							}
++							$result['wide'][] = [
++								'label' => $displayName,
++								'value' => [
++									'shareType' => IShare::TYPE_USER,
++									'shareWith' => $emailAddress,
++								],
++							];
++						}
  					}
  				}
  			}
+
diff --git a/patches/005-autocomplete-user-leak-custom-app.patch b/patches/005-autocomplete-user-leak-custom-app.patch
deleted file mode 100644
index d686b2a2..00000000
--- a/patches/005-autocomplete-user-leak-custom-app.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: diroots <diroots@e.email>
-Date: Tue, 02 Mar 2021 15:43:12 +0100
-Subject: [PATCH] filter user search results during file sharing  - user_backend_sql_raw app changes
-
-This patch filter results from user search not to return users by their displayname, but only return users with full username, 
-ie. username@ecloud_domain so no user leaks with their display name which could be username
-
-this filtering works in conjunction with the autocomplete feature disabled in nextcloud settings
-
-this patch is applied to the user_backend_sql_raw app as this application superseeds the nextcloud's core UserBackend class
-
-
-diff --git user_backend_sql_raw/lib/UserBackend.php user_backend_sql_raw/lib/UserBackend-new.php
---- user_backend_sql_raw/lib/UserBackend.php	2020-10-06 01:56:49.000000000 +0200
-+++ user_backend_sql_raw/lib/UserBackend-new.php	2021-03-02 15:43:12.615868478 +0100
-@@ -108,7 +108,8 @@
- 		// Because MariaDB can not handle string parameters for LIMIT/OFFSET we have to bind the
- 		// values "manually" instead of passing an array to execute(). This is another instance of
- 		// MariaDB making the code "uglier".
--		$statement->bindValue(':search', '%' . $searchString . '%', \PDO::PARAM_STR);
-+		$statement->bindValue(':search', $searchString , \PDO::PARAM_STR);
-+
- 		if (isset($limit)) {
- 			$statement->bindValue(':limit', intval($limit), \PDO::PARAM_INT);
- 		}
\ No newline at end of file
diff --git a/patches/006-recovery-email-changes.patch b/patches/006-recovery-email-changes.patch
index bffaf5b3..7b705c9d 100644
--- a/patches/006-recovery-email-changes.patch
+++ b/patches/006-recovery-email-changes.patch
@@ -1,6 +1,6 @@
---- ./core/Controller/LostController.php	2022-05-25 15:07:44.582984541 +0530
-+++ ./core/Controller/LostController-new.php	2022-05-28 15:29:43.418394746 +0530
-@@ -174,8 +174,23 @@
+--- ./core/Controller/LostController.php	2023-02-01 18:49:00.652101897 +0530
++++ ./core/Controller/LostController-new.php	2023-02-01 18:53:01.231516084 +0530
+@@ -168,8 +168,23 @@
  	 */
  	protected function checkPasswordResetToken(string $token, string $userId): void {
  		try {
@@ -25,10 +25,10 @@
  		} catch (InvalidTokenException $e) {
  			$error = $e->getCode() === InvalidTokenException::TOKEN_EXPIRED
  				? $this->l10n->t('Could not reset password because the token is expired')
-@@ -287,8 +302,21 @@
+@@ -269,8 +284,21 @@
  	 * @throws \OCP\PreConditionNotMetException
  	 */
- 	protected function sendEmail($input) {
+ 	protected function sendEmail(string $input): void {
 +		$domain = $this->config->getSystemValue('mail_domain', '');
 +		$domainSuffix = !empty($domain) ? '@' . $domain : '';
 +		$altDomain = $this->config->getSystemValue('alt_mail_domain', '');
diff --git a/patches/009-help-links.patch b/patches/009-help-links.patch
index 43bd732b..e29fffe2 100644
--- a/patches/009-help-links.patch
+++ b/patches/009-help-links.patch
@@ -5,29 +5,27 @@ 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
 help links are shown
 
---- ./apps/settings/lib/Controller/HelpController.php  2021-08-10 16:54:15.844898527 +0530
-+++ ./apps/settings/lib/Controller/HelpController-new.php      2021-08-10 16:54:42.541807384 +0530
-@@ -89,7 +89,8 @@
- 			'url' => $documentationUrl,
- 			'urlUserDocs' => $urlUserDocs,
+--- ./apps/settings/lib/Controller/HelpController.php  2023-02-01 18:59:44.491700506 +0530
++++ ./apps/settings/lib/Controller/HelpController-new.php  2023-02-01 21:01:10.933837383 +0530
+@@ -98,6 +98,7 @@
  			'urlAdminDocs' => $urlAdminDocs,
--			'mode' => $mode,
-+            'mode' => $mode,
-+            'ncVersion' => \OCP\Util::getVersion()[0]
+ 			'mode' => $mode,
+ 			'pageTitle' => $pageTitle,
++			'ncVersion' => \OCP\Util::getVersion()[0],
  		]);
  		$policy = new ContentSecurityPolicy();
  		$policy->addAllowedFrameDomain('\'self\'');
---- ./apps/settings/templates/help.php	2021-07-01 15:13:08.000000000 +0530
-+++ ./apps/settings/templates/help-new.php	2021-08-10 17:22:42.771569854 +0530
-@@ -4,45 +4,25 @@
- <div id="app-navigation">
+--- ./apps/settings/templates/help.php	2023-02-01 20:49:47.625123858 +0530
++++ ./apps/settings/templates/help-new.php	2023-02-01 20:55:46.533199855 +0530
+@@ -4,45 +4,26 @@
+ <div id="app-navigation" role="navigation" tabindex="0">
  	<ul>
  		<li>
 -			<a class="icon-user <?php if ($_['mode'] === 'user') {
 -	p('active');
--} ?>"
+-} ?>" <?php if ($_['mode'] === 'user') { print_unescaped('aria-current="page"'); } ?>
 -				href="<?php print_unescaped($_['urlUserDocs']); ?>">
-+			<a class="icon-user" 
++			<a class="icon-user"
 +				href="https://docs.nextcloud.com/server/<?php print_unescaped($_['ncVersion']); ?>/user_manual/en" target="_blank" rel="noreferrer noopener">
  				<span class="help-list__text">
 -					<?php p($l->t('User documentation')); ?>
@@ -39,17 +37,17 @@ help links are shown
  		<li>
 -			<a class="icon-user-admin <?php if ($_['mode'] === 'admin') {
 -	p('active');
--} ?>"
+-} ?>" <?php if ($_['mode'] === 'admin') { print_unescaped('aria-current="page"'); } ?>
 -				href="<?php print_unescaped($_['urlAdminDocs']); ?>">
 +			<a href="https://support.e.foundation/how-tos#ecloud-eemail--account" class="icon-category-office" target="_blank" rel="noreferrer noopener">
  				<span class="help-list__text">
 -					<?php p($l->t('Administrator documentation')); ?>
-+					<?php p('/e/' . ' ' . $l->t('Documentation'));  ?> ↗
++					<?php p('/e/' . ' ' . $l->t('Documentation'));  ?>
  				</span>
  			</a>
  		</li>
 -	<?php } ?>
--
+ 
  		<li>
 -			<a href="https://docs.nextcloud.com" class="icon-category-office" target="_blank" rel="noreferrer noopener">
 -				<span class="help-list__text">
@@ -68,7 +66,7 @@ help links are shown
  </div>
 -
 -<div id="app-content" class="help-includes">
--	<iframe src="<?php print_unescaped($_['url']); ?>" class="help-iframe">
+-	<iframe src="<?php print_unescaped($_['url']); ?>" class="help-iframe" tabindex="0">
 -	</iframe>
 -</div>
 
-- 
GitLab


From 6b4a95e75169c5eed6f3f55682256687d509b01b Mon Sep 17 00:00:00 2001
From: Akhil <akhil.potukuchi@gmail.com>
Date: Thu, 2 Feb 2023 15:22:13 +0530
Subject: [PATCH 02/49] comment out sed

---
 Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 50c8a727..da21b23a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,7 +16,7 @@ ARG ECLOUD_LAUNCHER_JOB_ID="458901"
 ARG GOOGLE_INTEGRATION_VERSION="1.0.9"
 ARG ECLOUD_DASHBOARD_JOB_ID="485170"
 
-RUN sed -i 's/25,0,3,2/25,0,3,2/' ${BASE_DIR}/version.php
+RUN sed -i 's/25,0,3,2/25,0,3,3/' ${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
@@ -183,7 +183,7 @@ RUN curl -fsSL -o oidc_login.tar.gz \
 RUN sed -i 's/https:\/\/nextcloud.com\/signup\//https:\/\/e\.foundation\/<?php p(\$_\[\x27language\x27\]); ?>\/e-email-invite\//' ${BASE_DIR}/core/templates/layout.public.php
 
 # show reset pwd page with a query param
-RUN cd ${BASE_DIR}/dist && sed -i 's/resetPassword:!1/resetPassword:!1||Z.showResetPassword==="1"/' core-login.js
+# RUN cd ${BASE_DIR}/dist && sed -i 's/resetPassword:!1/resetPassword:!1||Z.showResetPassword==="1"/' core-login.js
 
 # 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
-- 
GitLab


From 354a9f4237c6073c670e4b9350ea7ba45f93fb1e Mon Sep 17 00:00:00 2001
From: Akhil <akhil@e.email>
Date: Thu, 16 Mar 2023 15:12:49 +0530
Subject: [PATCH 03/49] Comment out patches

---
 Dockerfile                                  | 12 +++---
 patches/008-icons-cacher-theme-svgs.patch   | 46 ---------------------
 patches/008-svg-controller-theme-svgs.patch | 38 -----------------
 3 files changed, 5 insertions(+), 91 deletions(-)
 delete mode 100644 patches/008-icons-cacher-theme-svgs.patch
 delete mode 100644 patches/008-svg-controller-theme-svgs.patch

diff --git a/Dockerfile b/Dockerfile
index 1aad7528..231b3f2e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,9 +1,7 @@
-FROM nextcloud:25.0.3-fpm AS nextcloud
+FROM nextcloud:25.0.4-fpm AS nextcloud
 ARG BASE_DIR="/usr/src/nextcloud"
 ARG TMP_PATCH_DIR="/tmp/build_patches"
 ARG THEME_HELPER_JOB_ID="446245"
-ARG NEWS_VERSION="20.0.1"
-ARG QUOTA_WARN_VERSION="1.15.0"
 ARG NOTES_VERSION="4.6.0"
 ARG CONTACTS_JOB_ID="471108"
 ARG CALENDAR_JOB_ID="471116"
@@ -16,7 +14,7 @@ ARG ECLOUD_LAUNCHER_JOB_ID="458901"
 ARG GOOGLE_INTEGRATION_VERSION="1.0.9"
 ARG ECLOUD_DASHBOARD_JOB_ID="485170"
 
-RUN sed -i 's/25,0,3,2/25,0,3,3/' ${BASE_DIR}/version.php
+RUN sed -i 's/25,0,4,1/25,0,4,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
@@ -161,12 +159,12 @@ ARG OIDC_LOGIN_VERSION="2.4.0"
 
 # Patches
 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/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 cd ${BASE_DIR}/custom_apps && patch -p0 < ${TMP_PATCH_DIR}/005-autocomplete-user-leak-custom-app.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 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
 RUN rm -rf ${TMP_PATCH_DIR}
diff --git a/patches/008-icons-cacher-theme-svgs.patch b/patches/008-icons-cacher-theme-svgs.patch
deleted file mode 100644
index 76ce2756..00000000
--- a/patches/008-icons-cacher-theme-svgs.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From: ArnauVP <arnauvp@e.email>
-Date: Thu, 23 Mar 2022 11:30:00 +0000
-Subject: [PATCH] Caches SVGs added via theme
-
-This patch modifies Icons Cacher to check theme for icons and if they exist,
-cache them instead of the icons in core or apps directories
-
-diff --git ./lib/private/Template/IconsCacher.php ./lib/private/Template/IconsCacher-new.php
---- ./lib/private/Template/IconsCacher.php	2022-03-23 12:30:24.000000000 +0100
-+++ ./lib/private/Template/IconsCacher-new.php	2022-03-23 12:32:37.000000000 +0100
-@@ -161,21 +161,28 @@
- 		$color = '';
- 		$base = $this->getRoutePrefix() . '/svg/';
- 		$cleanUrl = \substr($url, \strlen($base));
-+		$theme = \OC::$server->getConfig()->getSystemValue("theme");
- 		if (\strpos($url, $base . 'core') === 0) {
- 			$cleanUrl = \substr($cleanUrl, \strlen('core'));
- 			if (\preg_match('/\/([a-zA-Z0-9-_\~\/\.\=\:\;\+\,]+)\?color=([0-9a-fA-F]{3,6})/', $cleanUrl, $matches)) {
- 				[,$cleanUrl,$color] = $matches;
--				$location = \OC::$SERVERROOT . '/core/img/' . $cleanUrl . '.svg';
-+				$location = \OC::$SERVERROOT . '/themes/'. $theme . '/core/img/' . $cleanUrl . '.svg';
-+                if (!file_exists($location)) {
-+                	$location = \OC::$SERVERROOT . '/core/img/' . $cleanUrl . '.svg';
-+                }
- 			}
- 		} elseif (\strpos($url, $base) === 0) {
- 			if (\preg_match('/([A-z0-9\_\-]+)\/([a-zA-Z0-9-_\~\/\.\=\:\;\+\,]+)\?color=([0-9a-fA-F]{3,6})/', $cleanUrl, $matches)) {
- 				[,$app,$cleanUrl, $color] = $matches;
--				$appPath = \OC_App::getAppPath($app);
--				if ($appPath !== false) {
--					$location = $appPath . '/img/' . $cleanUrl . '.svg';
--				}
--				if ($app === 'settings') {
--					$location = \OC::$SERVERROOT . '/settings/img/' . $cleanUrl . '.svg';
-+				$location = \OC::$SERVERROOT . '/themes/' . $theme . '/apps/' . $app . '/img/' . $cleanUrl . '.svg';
-+				if (!file_exists($location)) {
-+					$appPath = \OC_App::getAppPath($app);
-+					if ($appPath !== false) {
-+						$location = $appPath . '/img/' . $cleanUrl . '.svg';
-+					}
-+					if ($app === 'settings') {
-+						$location = \OC::$SERVERROOT . '/settings/img/' . $cleanUrl . '.svg';
-+					}
- 				}
- 			}
- 		}
diff --git a/patches/008-svg-controller-theme-svgs.patch b/patches/008-svg-controller-theme-svgs.patch
deleted file mode 100644
index 4e86543e..00000000
--- a/patches/008-svg-controller-theme-svgs.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From: Akhil <akhil@e.email>
-Date: Tue, 22 Jul 2021 18:15:00 +0530
-Subject: [PATCH] Serves SVGs added via theme through SVG Controller
-
-This patch modifies SVG Controllers to check theme for icons and if they exist, return them before checking
-app or core directories in their respective methods
-
-diff --git ./lib/private/Template/IconsCacher.php ./lib/private/Template/IconsCacher-new.php
---- ./core/Controller/SvgController.php	2021-07-22 18:00:30.575284496 +0530
-+++ ./core/Controller/SvgController-new.php	2021-07-22 18:07:55.927091362 +0530
-@@ -81,7 +81,13 @@
- 	 * @return DataDisplayResponse|NotFoundResponse
- 	 */
- 	public function getSvgFromCore(string $folder, string $fileName, string $color = 'ffffff') {
--		$path = $this->serverRoot . "/core/img/$folder/$fileName.svg";
-+        $theme = \OC::$server->getConfig()->getSystemValue("theme");
-+        $path = $this->serverRoot . '/themes/' . $theme .'/core/img/' . $folder . '/' . $fileName . '.svg';
-+        if(file_exists($path)) {
-+            return $this->getSvg($path, $color, $fileName);
-+        }
-+
-+        $path = $this->serverRoot . "/core/img/$folder/$fileName.svg";
- 		return $this->getSvg($path, $color, $fileName);
- 	}
- 
-@@ -103,7 +109,11 @@
- 		} catch (AppPathNotFoundException $e) {
- 			return new NotFoundResponse();
- 		}
--
-+        $theme = \OC::$server->getConfig()->getSystemValue("theme");
-+        $path = $this->serverRoot . '/themes/' . $theme .'/apps/' . $app .  '/img/'. $fileName . '.svg';
-+        if(file_exists($path)) {
-+                return $this->getSvg($path, $color, $fileName);
-+        }
- 		$path = $appPath . "/img/$fileName.svg";
- 		return $this->getSvg($path, $color, $fileName);
- 	}
-- 
GitLab


From 15b94e6ee7722923fbf2e53de4d7dcdae5566c68 Mon Sep 17 00:00:00 2001
From: Akhil <akhil@e.email>
Date: Thu, 16 Mar 2023 15:47:37 +0530
Subject: [PATCH 04/49] Remove rainloop(again)

---
 Dockerfile           | 2 --
 custom_entrypoint.sh | 1 -
 2 files changed, 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 231b3f2e..d0bcc342 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,8 +7,6 @@ ARG CONTACTS_JOB_ID="471108"
 ARG CALENDAR_JOB_ID="471116"
 ARG USER_BACKEND_RAW_SQL_VERSION="1.3.0"
 ARG EMAIL_RECOVERY_JOB_ID="445958"
-ARG RAINLOOP_VERSION="7.2.5"
-ARG RAINLOOP_COMMIT_SHA="523518ba"
 ARG EA_JOB_ID="445966"
 ARG ECLOUD_LAUNCHER_JOB_ID="458901"
 ARG GOOGLE_INTEGRATION_VERSION="1.0.9"
diff --git a/custom_entrypoint.sh b/custom_entrypoint.sh
index f7fe2658..dcc88bd4 100644
--- a/custom_entrypoint.sh
+++ b/custom_entrypoint.sh
@@ -22,7 +22,6 @@ if version_greater "$image_version" "$installed_version"; then
     rsync $rsync_options --include "/calendar/" --exclude '/*' $SRC_DIR/custom_apps/ $DST_DIR/custom_apps/
     rsync $rsync_options --include "/contacts/" --exclude '/*' $SRC_DIR/custom_apps/ $DST_DIR/custom_apps/
     rsync $rsync_options --include "/user_backend_sql_raw/" --exclude '/*' $SRC_DIR/custom_apps/ $DST_DIR/custom_apps/
-    rsync $rsync_options --include "/rainloop/" --exclude '/*' $SRC_DIR/custom_apps/ $DST_DIR/custom_apps/
     rsync $rsync_options --include "/email-recovery/" --exclude '/*' $SRC_DIR/custom_apps/ $DST_DIR/custom_apps/
     rsync $rsync_options --include "/ecloud-accounts/" --exclude '/*' $SRC_DIR/custom_apps/ $DST_DIR/custom_apps/
     rsync $rsync_options --include "/ecloud-theme-helper/" --exclude '/*' $SRC_DIR/custom_apps/ $DST_DIR/custom_apps/
-- 
GitLab


From 8da1b905b8bd0356f65f99fdb439018d018615f6 Mon Sep 17 00:00:00 2001
From: Akhil <akhil@e.email>
Date: Thu, 16 Mar 2023 15:58:20 +0530
Subject: [PATCH 05/49] Update app versions

---
 Dockerfile | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index d0bcc342..c047a786 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,16 +1,16 @@
 FROM nextcloud:25.0.4-fpm AS nextcloud
 ARG BASE_DIR="/usr/src/nextcloud"
 ARG TMP_PATCH_DIR="/tmp/build_patches"
-ARG THEME_HELPER_JOB_ID="446245"
+ARG THEME_HELPER_JOB_ID="535835"
 ARG NOTES_VERSION="4.6.0"
 ARG CONTACTS_JOB_ID="471108"
 ARG CALENDAR_JOB_ID="471116"
 ARG USER_BACKEND_RAW_SQL_VERSION="1.3.0"
-ARG EMAIL_RECOVERY_JOB_ID="445958"
-ARG EA_JOB_ID="445966"
-ARG ECLOUD_LAUNCHER_JOB_ID="458901"
+ARG EMAIL_RECOVERY_JOB_ID="535883"
+ARG EA_JOB_ID="535903"
+ARG ECLOUD_LAUNCHER_JOB_ID="535912"
 ARG GOOGLE_INTEGRATION_VERSION="1.0.9"
-ARG ECLOUD_DASHBOARD_JOB_ID="485170"
+ARG ECLOUD_DASHBOARD_JOB_ID="535923"
 
 RUN sed -i 's/25,0,4,1/25,0,4,1/' ${BASE_DIR}/version.php
 COPY custom_entrypoint.sh /
-- 
GitLab


From 401f3150b491e0134d966a8249ce043be1c9aecc Mon Sep 17 00:00:00 2001
From: Akhil <akhil@e.email>
Date: Thu, 16 Mar 2023 16:05:26 +0530
Subject: [PATCH 06/49] Add snappy version args

---
 Dockerfile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index c047a786..95b0ae8d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,6 +11,8 @@ ARG EA_JOB_ID="535903"
 ARG ECLOUD_LAUNCHER_JOB_ID="535912"
 ARG GOOGLE_INTEGRATION_VERSION="1.0.9"
 ARG ECLOUD_DASHBOARD_JOB_ID="535923"
+ARG SNAPPY_VERSION="2.26.3"
+ARG SNAPPY_THEME_VERSION="1.2.3"
 
 RUN sed -i 's/25,0,4,1/25,0,4,1/' ${BASE_DIR}/version.php
 COPY custom_entrypoint.sh /
-- 
GitLab


From 5d3b51f7b2e68b0312f9494425a142241d9bd963 Mon Sep 17 00:00:00 2001
From: Akhil <akhil@e.email>
Date: Thu, 16 Mar 2023 16:10:35 +0530
Subject: [PATCH 07/49] Remove iconscacher and svgcontroller patch steps

---
 Dockerfile | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 95b0ae8d..ce58f34c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -109,8 +109,6 @@ 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 patch -u ${BASE_DIR}/lib/private/Template/IconsCacher.php -i ${TMP_PATCH_DIR}/008-icons-cacher-theme-svgs.patch
-# RUN patch -u ${BASE_DIR}/core/Controller/SvgController.php -i ${TMP_PATCH_DIR}/008-svg-controller-theme-svgs.patch
 RUN cd ${BASE_DIR} && patch -p0 < ${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
-- 
GitLab


From f817a8b36e84591f61560a6f2000164db2fb4130 Mon Sep 17 00:00:00 2001
From: Akhil <akhil@e.email>
Date: Thu, 16 Mar 2023 16:18:46 +0530
Subject: [PATCH 08/49] remove custom app autocomplete patch

---
 Dockerfile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index ce58f34c..30ad2564 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -160,7 +160,6 @@ 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 cd ${BASE_DIR}/custom_apps && patch -p0 < ${TMP_PATCH_DIR}/005-autocomplete-user-leak-custom-app.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
-- 
GitLab


From 694ed04b40f522af6889e9941510555c62b7e3c8 Mon Sep 17 00:00:00 2001
From: Akhil <akhil@e.email>
Date: Thu, 16 Mar 2023 23:08:35 +0530
Subject: [PATCH 09/49] Update cal to nc 25 compatible version

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 30ad2564..a1b9239f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,7 +4,7 @@ ARG TMP_PATCH_DIR="/tmp/build_patches"
 ARG THEME_HELPER_JOB_ID="535835"
 ARG NOTES_VERSION="4.6.0"
 ARG CONTACTS_JOB_ID="471108"
-ARG CALENDAR_JOB_ID="471116"
+ARG CALENDAR_JOB_ID="536077"
 ARG USER_BACKEND_RAW_SQL_VERSION="1.3.0"
 ARG EMAIL_RECOVERY_JOB_ID="535883"
 ARG EA_JOB_ID="535903"
-- 
GitLab


From 42aaa9b74ebc34bc4b4489f7d3301c5f4ab09758 Mon Sep 17 00:00:00 2001
From: Akhil <akhil@e.email>
Date: Thu, 16 Mar 2023 23:14:08 +0530
Subject: [PATCH 10/49] Update oidc login and ldap write support

---
 Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index a1b9239f..c15d9f8d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -152,8 +152,8 @@ From selfhost as ecloud
 ARG BASE_DIR="/usr/src/nextcloud"
 ARG TMP_PATCH_DIR="/tmp/build_patches"
 ARG THEME_VERSION="24.0.4"
-ARG LDAP_WRITE_SUPPORT_VERSION="1.6.0"
-ARG OIDC_LOGIN_VERSION="2.4.0"
+ARG LDAP_WRITE_SUPPORT_VERSION="1.7.0"
+ARG OIDC_LOGIN_VERSION="2.4.1"
 
 # Patches
 COPY patches/ ${TMP_PATCH_DIR}/
-- 
GitLab


From 3458e7294cb1bc6b3024b3af35fe91d51b3fe507 Mon Sep 17 00:00:00 2001
From: Akhil <akhil@e.email>
Date: Tue, 28 Mar 2023 15:12:05 +0530
Subject: [PATCH 11/49] Fix broken patches

Signed-off-by: Akhil <akhil@e.email>
---
 Dockerfile                                 | 10 ++++----
 patches/003-contact-search-removal.patch   | 21 ++++++----------
 patches/016-login-screen.patch             | 28 ++++++++++++----------
 patches/020-fairuse-notification-fix.patch | 11 ++++-----
 4 files changed, 32 insertions(+), 38 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index c15d9f8d..c8975e01 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM nextcloud:25.0.4-fpm AS nextcloud
+FROM nextcloud:25.0.5-fpm AS nextcloud
 ARG BASE_DIR="/usr/src/nextcloud"
 ARG TMP_PATCH_DIR="/tmp/build_patches"
 ARG THEME_HELPER_JOB_ID="535835"
@@ -14,7 +14,7 @@ ARG ECLOUD_DASHBOARD_JOB_ID="535923"
 ARG SNAPPY_VERSION="2.26.3"
 ARG SNAPPY_THEME_VERSION="1.2.3"
 
-RUN sed -i 's/25,0,4,1/25,0,4,1/' ${BASE_DIR}/version.php
+RUN sed -i 's/25,0,5,1/25,0,5,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
@@ -157,11 +157,11 @@ ARG OIDC_LOGIN_VERSION="2.4.1"
 
 # Patches
 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/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}/lib/private/Notification/Manager.php -i ${TMP_PATCH_DIR}/020-fairuse-notification-fix.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
 RUN rm -rf ${TMP_PATCH_DIR}
diff --git a/patches/003-contact-search-removal.patch b/patches/003-contact-search-removal.patch
index 4cd68d4a..aef513aa 100644
--- a/patches/003-contact-search-removal.patch
+++ b/patches/003-contact-search-removal.patch
@@ -5,20 +5,13 @@ Subject: [PATCH] remove user search icon in header tab
 This patch removes the top right icon enabling the global user search function available to all in nextcloud.
 
 diff --git layout.user.php layout.user.php-new
---- layout.user.php	2023-02-01 21:04:06.457790526 +0530
-+++ layout.user.php-new	2023-02-01 21:04:35.125102888 +0530
-@@ -69,14 +69,6 @@
+--- ./core/templates/layout.user.php	2023-03-28 14:54:05.873566570 +0530
++++ ./core/templates/layout.user-new.php	2023-03-28 14:54:35.044218831 +0530
+@@ -76,7 +76,6 @@
  			<div class="header-right">
  				<div id="unified-search"></div>
  				<div id="notifications"></div>
--				<div id="contactsmenu">
--					<div class="menutoggle" tabindex="0" role="button"
--					aria-haspopup="true" aria-controls="contactsmenu-menu" aria-expanded="false">
--						<span class="hidden-visually"><?php p($l->t('Contacts'));?></span>
--					</div>
--					<div id="contactsmenu-menu" class="menu"
--						aria-label="<?php p($l->t('Contacts menu'));?>"></div>
--				</div>
- 				<div id="settings">
- 					<div id="expand" tabindex="0" role="button" class="menutoggle"
- 						aria-label="<?php p($l->t('Open settings menu'));?>"
+-				<div id="contactsmenu"></div>
+ 				<div id="user-menu"></div>
+ 			</div>
+ 		</header>
diff --git a/patches/016-login-screen.patch b/patches/016-login-screen.patch
index 67cef3ce..4bf803b7 100644
--- a/patches/016-login-screen.patch
+++ b/patches/016-login-screen.patch
@@ -1,14 +1,20 @@
---- ./core/templates/layout.guest.php	2022-09-12 14:16:28.724884600 +0530
-+++ ./core/templates/layout.guest-new.php	2022-09-12 14:03:12.924884600 +0530
-@@ -20,6 +20,7 @@
- 		<link rel="mask-icon" sizes="any" href="<?php print_unescaped(image_path('', 'favicon-mask.svg')); ?>" color="<?php p($theme->getColorPrimary()); ?>">
- 		<link rel="manifest" href="<?php print_unescaped(image_path('', 'manifest.json')); ?>">
+From: Akhil <akhil@e.email>
+Date: Thu, 28 Mar 2023 15:05:00 +0530
+Subject: [PATCH] Login page patch to apply Murena login page
+
+This patch applies the Murena login page changes to the login page
+
+--- ./core/templates/layout.guest.php	2023-03-28 14:56:52.130616847 +0530
++++ ./core/templates/layout.guest-new.php	2023-03-28 15:01:34.973604329 +0530
+@@ -22,6 +22,7 @@
+ 		<link rel="mask-icon" sizes="any" href="<?php print_unescaped(image_path('core', 'favicon-mask.svg')); ?>" color="<?php p($theme->getColorPrimary()); ?>">
+ 		<link rel="manifest" href="<?php print_unescaped(image_path('core', 'manifest.json')); ?>">
  		<?php emit_css_loading_tags($_); ?>
 +		<?php array_push($_['jsfiles'] , '/themes/eCloud/core/js/custom-login.js') ?>
  		<?php emit_script_loading_tags($_); ?>
  		<?php print_unescaped($_['headers']); ?>
  	</head>
-@@ -28,8 +29,29 @@
+@@ -30,12 +31,37 @@
  		<?php foreach ($_['initialStates'] as $app => $initialState) { ?>
  			<input type="hidden" id="initial-state-<?php p($app); ?>" value="<?php p(base64_encode($initialState)); ?>">
  		<?php }?>
@@ -40,10 +46,7 @@
  				<?php if ($_['bodyid'] === 'body-login'): ?>
  					<header role="banner">
  						<div id="header">
-@@ -42,18 +64,34 @@
- 									<img src="<?php p($theme->getLogo()); ?>"/>
- 								<?php endif; ?>
- 							</div>
+ 							<div class="logo"></div>
 +							<?php if (array_key_exists("alt_login",$_)) { ?>
 +								<div class="sign-in-label sign-label"><?php p($l->t('Sign in to your account')); ?></div>
 +								<div class="sign-in-label fp-label" style="display: none"><?php p($l->t('Forgot Password')); ?></div>
@@ -51,7 +54,9 @@
  						</div>
  					</header>
  				<?php endif; ?>
- 				<main>
+@@ -44,13 +70,24 @@
+ 						<?php p($theme->getName()); ?>
+ 					</h1>
  					<?php print_unescaped($_['content']); ?>
 +					<?php if (array_key_exists("alt_login",$_)) { ?>
 +					<div class="have-an-account">
@@ -77,6 +82,5 @@
 -				<?php print_unescaped($theme->getLongFooter()); ?>
 -			</p>
 -		</footer>
-+
  	</body>
  </html>
diff --git a/patches/020-fairuse-notification-fix.patch b/patches/020-fairuse-notification-fix.patch
index 84dab625..47760192 100644
--- a/patches/020-fairuse-notification-fix.patch
+++ b/patches/020-fairuse-notification-fix.patch
@@ -1,6 +1,6 @@
---- lib/private/Notification/Manager.php	2022-09-06 21:39:49.735827300 +0530
-+++ lib/private/Notification/Manager-new.php	2022-10-06 15:44:38.874640100 +0530
-@@ -303,21 +303,7 @@
+--- lib/private/Notification/Manager.php	2023-03-28 15:06:21.073329171 +0530
++++ lib/private/Notification/Manager-new.php	2023-03-28 15:07:06.854351797 +0530
+@@ -298,18 +298,7 @@
  	 * {@inheritDoc}
  	 */
  	public function isFairUseOfFreePushService(): bool {
@@ -11,10 +11,7 @@
 -			 * users overload our infrastructure. For this reason we have to rate-limit the
 -			 * use of push notifications. If you need this feature, consider using Nextcloud Enterprise.
 -			 */
--			// TODO Remove time check after 1st March 2022
--			$isFairUse = $this->timeFactory->getTime() < 1646089200
--				|| $this->subscription->delegateHasValidSubscription()
--				|| $this->userManager->countSeenUsers() < 5000;
+-			$isFairUse = $this->subscription->delegateHasValidSubscription() || $this->userManager->countSeenUsers() < 1000;
 -			$pushAllowed = $isFairUse ? 'yes' : 'no';
 -			$this->cache->set('push_fair_use', $pushAllowed, 3600);
 -		}
-- 
GitLab


From f46c283b770d08bf58ca0545aacf5c09e522b866 Mon Sep 17 00:00:00 2001
From: Akhil <akhil@e.email>
Date: Sat, 8 Apr 2023 01:11:23 +0530
Subject: [PATCH 12/49] Bump version

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index c8975e01..e4b95b0b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,7 +14,7 @@ ARG ECLOUD_DASHBOARD_JOB_ID="535923"
 ARG SNAPPY_VERSION="2.26.3"
 ARG SNAPPY_THEME_VERSION="1.2.3"
 
-RUN sed -i 's/25,0,5,1/25,0,5,1/' ${BASE_DIR}/version.php
+RUN sed -i 's/25,0,5,1/25,0,5,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
-- 
GitLab


From 584e7cae94a0de4e9564959aea4b1d3ff1579bd1 Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Mon, 10 Apr 2023 11:16:51 +0530
Subject: [PATCH 13/49] job id updated

---
 Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index e4b95b0b..8a46ce38 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
 FROM nextcloud:25.0.5-fpm AS nextcloud
 ARG BASE_DIR="/usr/src/nextcloud"
 ARG TMP_PATCH_DIR="/tmp/build_patches"
-ARG THEME_HELPER_JOB_ID="535835"
+ARG THEME_HELPER_JOB_ID="555956"
 ARG NOTES_VERSION="4.6.0"
 ARG CONTACTS_JOB_ID="471108"
 ARG CALENDAR_JOB_ID="536077"
 ARG USER_BACKEND_RAW_SQL_VERSION="1.3.0"
 ARG EMAIL_RECOVERY_JOB_ID="535883"
 ARG EA_JOB_ID="535903"
-ARG ECLOUD_LAUNCHER_JOB_ID="535912"
+ARG ECLOUD_LAUNCHER_JOB_ID="546927"
 ARG GOOGLE_INTEGRATION_VERSION="1.0.9"
 ARG ECLOUD_DASHBOARD_JOB_ID="535923"
 ARG SNAPPY_VERSION="2.26.3"
-- 
GitLab


From 2126cbe670ea546e73059d5afe241d3dec758a5e Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Mon, 10 Apr 2023 11:48:33 +0530
Subject: [PATCH 14/49] login patch fix

---
 patches/002-login-without-domain.patch | 63 ++++++++++++--------------
 1 file changed, 30 insertions(+), 33 deletions(-)

diff --git a/patches/002-login-without-domain.patch b/patches/002-login-without-domain.patch
index b8575978..a0ba71ea 100644
--- a/patches/002-login-without-domain.patch
+++ b/patches/002-login-without-domain.patch
@@ -7,36 +7,35 @@ This patch auto append the domain handled by nc, configured in env var.
 only the admin user (also configured in env var) will not have his login appended with a @domain suffix
 
 diff --git ./core/Controller/LoginController.php ./core/Controller/LoginController-new.php
---- ./core/Controller/LoginController.php	2022-05-11 11:09:58.346364031 +0530
-+++ ./core/Controller/LoginController-new.php	2022-05-30 19:32:45.195279817 +0530
-@@ -303,6 +303,27 @@
- 			return $this->generateRedirect($redirect_url);
- 		}
-
-+		$user = trim($user);
-+		$user = mb_strtolower($user, 'UTF-8');
-+		$domain = $this->config->getSystemValue('mail_domain', '');
-+		$domain_suffix = !empty($domain) ? '@' . $domain : '';
-+		$alt_domain = $this->config->getSystemValue('alt_mail_domain', '');
-+		$alt_domain_suffix = !empty($alt_domain) ? '@'  . $alt_domain : '';
-+		$admin_username = $_ENV["NEXTCLOUD_ADMIN_USER"];
-+		$is_admin = strcmp($user, $admin_username) === 0;
-+
-+		if(!$is_admin && stristr($user, $domain_suffix) !== FALSE) {
-+			$user = str_replace($domain_suffix, '', $user);
-+		}
+--- ./core/Controller/LoginController.php	2023-04-10 11:26:27.974097676 +0530
++++ ./core/Controller/LoginController-new.php	2023-04-10 11:33:01.374096460 +0530
+@@ -307,6 +307,26 @@
+ 				// case when a user has already logged-in, in another tab.
+ 				return $this->generateRedirect($redirect_url);
+ 			}
++            $user = trim($user);
++            $user = mb_strtolower($user, 'UTF-8');
++            $domain = $this->config->getSystemValue('mail_domain', '');
++            $domain_suffix = !empty($domain) ? '@' . $domain : '';
++            $alt_domain = $this->config->getSystemValue('alt_mail_domain', '');
++            $alt_domain_suffix = !empty($alt_domain) ? '@'  . $alt_domain : '';
++            $admin_username = $_ENV["NEXTCLOUD_ADMIN_USER"];
++            $is_admin = strcmp($user, $admin_username) === 0;
 +
-+		if (!$is_admin && stristr($user, $alt_domain_suffix) !== FALSE) {
-+			$user = str_replace($alt_domain_suffix, '', $user);
-+		}
++            if(!$is_admin && stristr($user, $domain_suffix) !== FALSE) {
++                $user = str_replace($domain_suffix, '', $user);
++            }
 +
-+		if(!$this->userManager->userExists($user)) {
-+			$user = $user . $domain_suffix;
-+		}
++            if (!$is_admin && stristr($user, $alt_domain_suffix) !== FALSE) {
++                $user = str_replace($alt_domain_suffix, '', $user);
++            }
 +
- 		$data = new LoginData(
- 			$this->request,
- 			trim($user),
++            if(!$this->userManager->userExists($user)) {
++                $user = $user . $domain_suffix;
++            }
+
+ 			// Clear any auth remnants like cookies to ensure a clean login
+ 			// For the next attempt
 --- ./core/Controller/WebAuthnController.php	2022-08-18 10:33:16.150199100 +0530
 +++ ./core/Controller/WebAuthnController-new.php	2022-08-18 10:34:31.880199100 +0530
 @@ -37,6 +37,7 @@
@@ -75,14 +74,12 @@ diff --git ./core/Controller/LoginController.php ./core/Controller/LoginControll
  			'preLoginNameUsedAsUserName',
 
 
---- ./lib/private/User/Session.php	2022-08-10 15:39:33.131890282 +0530
-+++ ./lib/private/User/Session-new.php	2022-08-10 15:48:23.236165783 +0530
-@@ -438,7 +438,11 @@
- 								IRequest $request,
+--- ./lib/private/User/Session.php	2023-04-10 11:42:40.124084595 +0530
++++ ./lib/private/User/Session-new.php	2023-04-10 11:44:34.384098645 +0530
+@@ -428,6 +428,10 @@
  								OC\Security\Bruteforce\Throttler $throttler) {
  		$currentDelay = $throttler->sleepDelay($request->getRemoteAddress(), 'login');
--
-+
+
 +		$altDomain = $this->config->getSystemValue('alt_mail_domain', '');
 +		$altDomainSuffix = !empty($altDomain) ? '@' . $altDomain : '';
 +		$user = str_replace($altDomainSuffix, '', $user);
-- 
GitLab


From 383a49580945b9c3debff6e03839940f5b0d397d Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Mon, 10 Apr 2023 12:52:46 +0530
Subject: [PATCH 15/49] login patch fix

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 8a46ce38..6e7f5255 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,7 +14,7 @@ ARG ECLOUD_DASHBOARD_JOB_ID="535923"
 ARG SNAPPY_VERSION="2.26.3"
 ARG SNAPPY_THEME_VERSION="1.2.3"
 
-RUN sed -i 's/25,0,5,1/25,0,5,2/' ${BASE_DIR}/version.php
+RUN sed -i 's/25,0,5,1/25,0,5,3/' ${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


From 13a6def90678e26018b8006c8fc87b8c1401beb6 Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Wed, 12 Apr 2023 17:24:44 +0530
Subject: [PATCH 16/49] primary color patch

---
 Dockerfile                          |  1 +
 patches/026-primary-color-fix.patch | 16 ++++++++++++++++
 2 files changed, 17 insertions(+)
 create mode 100644 patches/026-primary-color-fix.patch

diff --git a/Dockerfile b/Dockerfile
index 6e7f5255..19850d2b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -164,6 +164,7 @@ RUN patch -u ${BASE_DIR}/core/templates/layout.guest.php -i ${TMP_PATCH_DIR}/016
 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
+RUN patch -u ${BASE_DIR}/apps/theming/lib/Themes/CommonThemeTrait.php -i ${TMP_PATCH_DIR}/026-primary-color-fix.patch
 RUN rm -rf ${TMP_PATCH_DIR}
 
 RUN curl -fsSL -o ldap_write_support.tar.gz \
diff --git a/patches/026-primary-color-fix.patch b/patches/026-primary-color-fix.patch
new file mode 100644
index 00000000..33ee6da6
--- /dev/null
+++ b/patches/026-primary-color-fix.patch
@@ -0,0 +1,16 @@
+From: Avinash <avinashg@e.email>
+Date: Web, 12 Mar 2023 17:00 +0530
+Subject: [PATCH] To fix the primary color in nextcloud 25 onwards
+
+--- apps/theming/lib/Themes/CommonThemeTrait.php	2023-04-12 17:16:23.456078658 +0530
++++ apps/theming/lib/Themes/CommonThemeTrait-new.php	2023-04-12 17:17:30.456079957 +0530
+@@ -38,6 +38,9 @@
+ 	 * will change in between.
+ 	 */
+ 	protected function generatePrimaryVariables(string $colorMainBackground, string $colorMainText): array {
++		$defaults = new \OC_Defaults();
++		$this->primaryColor = $defaults->getColorPrimary();
++		$this->defaultPrimaryColor=$defaults->getColorPrimary();
+ 		$colorPrimaryLight = $this->util->mix($this->primaryColor, $colorMainBackground, -80);
+ 		$colorPrimaryElement = $this->util->elementColor($this->primaryColor);
+ 		$colorPrimaryElementDefault = $this->util->elementColor($this->defaultPrimaryColor);
-- 
GitLab


From 9dce4c260d5910de409ddf7760d173959c9a4914 Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Wed, 12 Apr 2023 17:27:27 +0530
Subject: [PATCH 17/49] version bump

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 19850d2b..fdeed65a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,7 +14,7 @@ ARG ECLOUD_DASHBOARD_JOB_ID="535923"
 ARG SNAPPY_VERSION="2.26.3"
 ARG SNAPPY_THEME_VERSION="1.2.3"
 
-RUN sed -i 's/25,0,5,1/25,0,5,3/' ${BASE_DIR}/version.php
+RUN sed -i 's/25,0,5,1/25,0,5,4/' ${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


From d3ffc1c4babb10abd2fb04ebae54301ed242d0d4 Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Thu, 13 Apr 2023 17:22:47 +0530
Subject: [PATCH 18/49] contact and calendar job id updated

---
 Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index fdeed65a..01f4c25f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,8 +3,8 @@ ARG BASE_DIR="/usr/src/nextcloud"
 ARG TMP_PATCH_DIR="/tmp/build_patches"
 ARG THEME_HELPER_JOB_ID="555956"
 ARG NOTES_VERSION="4.6.0"
-ARG CONTACTS_JOB_ID="471108"
-ARG CALENDAR_JOB_ID="536077"
+ARG CONTACTS_JOB_ID="559941"
+ARG CALENDAR_JOB_ID="559880"
 ARG USER_BACKEND_RAW_SQL_VERSION="1.3.0"
 ARG EMAIL_RECOVERY_JOB_ID="535883"
 ARG EA_JOB_ID="535903"
-- 
GitLab


From 3c58313b693f3c6e4dd5bdedf63f152d208864b1 Mon Sep 17 00:00:00 2001
From: Avinash Gusain <avinashg@e.email>
Date: Thu, 13 Apr 2023 17:28:26 +0530
Subject: [PATCH 19/49] murena launcher job id update

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 01f4c25f..6c9f92d0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,7 +8,7 @@ ARG CALENDAR_JOB_ID="559880"
 ARG USER_BACKEND_RAW_SQL_VERSION="1.3.0"
 ARG EMAIL_RECOVERY_JOB_ID="535883"
 ARG EA_JOB_ID="535903"
-ARG ECLOUD_LAUNCHER_JOB_ID="546927"
+ARG ECLOUD_LAUNCHER_JOB_ID="559988"
 ARG GOOGLE_INTEGRATION_VERSION="1.0.9"
 ARG ECLOUD_DASHBOARD_JOB_ID="535923"
 ARG SNAPPY_VERSION="2.26.3"
-- 
GitLab


From a0b4a989f1c0e8a1903ff93fbf855d570444e6bc Mon Sep 17 00:00:00 2001
From: Akhil <akhil@e.email>
Date: Thu, 13 Apr 2023 23:53:03 +0530
Subject: [PATCH 20/49] Fix sed for launcher

---
 Dockerfile | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index 6c9f92d0..1172d3fb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -148,6 +148,10 @@ RUN sed -i 's/Nextcloud administrator/administrator/' ${BASE_DIR}/custom_apps/in
 #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
 
+# Fix the navbar entries
+RUN sed -i 's/this.appLimit=e/this.appLimit=e<7?e:7/' ${BASE_DIR}/dist/core-main.js
+RUN sed -i 's/this.appLimit=e/this.appLimit=this.appList.length/' ${BASE_DIR}/dist/core-main.js
+
 From selfhost as ecloud
 ARG BASE_DIR="/usr/src/nextcloud"
 ARG TMP_PATCH_DIR="/tmp/build_patches"
-- 
GitLab


From 548a9b75b2a262244339c583156b62681176d058 Mon Sep 17 00:00:00 2001
From: Akhil <akhil@e.email>
Date: Mon, 17 Apr 2023 13:54:39 +0530
Subject: [PATCH 21/49] Fix snappymail icon

---
 Dockerfile | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index 1172d3fb..8864988d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -152,6 +152,9 @@ RUN sed -i 's/update/error/g' ${BASE_DIR}/apps/dav/templates/schedule-response-e
 RUN sed -i 's/this.appLimit=e/this.appLimit=e<7?e:7/' ${BASE_DIR}/dist/core-main.js
 RUN sed -i 's/this.appLimit=e/this.appLimit=this.appList.length/' ${BASE_DIR}/dist/core-main.js
 
+# Fix snappymail icon
+RUN sed -i 's/logo-white-64x64.png/app.svg/' ${BASE_DIR}/custom_apps/snappymail/appinfo/info.xml
+
 From selfhost as ecloud
 ARG BASE_DIR="/usr/src/nextcloud"
 ARG TMP_PATCH_DIR="/tmp/build_patches"
-- 
GitLab


From 7ec91f19c81be78e32b616ca15512734ad643204 Mon Sep 17 00:00:00 2001
From: Akhil <akhil@e.email>
Date: Tue, 18 Apr 2023 00:25:11 +0530
Subject: [PATCH 22/49] Add notif sed

---
 Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 8864988d..5443ef9a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -193,8 +193,8 @@ RUN sed -i 's/https:\/\/nextcloud.com\/signup\//https:\/\/e\.foundation\/<?php p
 # 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,zd.imagePath)("notifications",e)/"\/themes\/"+OC.theme.folder+"\/apps\/notifications\/img\/"+e+".svg"/' ${BASE_DIR}/apps/notifications/js/notifications-main.js
+# add attr about how many notifications to notif icon
+sed -i 's/attrs:{id:"notifications",/attrs:{id:"notifications","data-has-notifications":0!==e.notifications.length,/' ${BASE_DIR}/apps/notifications/js/notifications-main.js
 
 # autocomplete leak tweak apps frontend with sed, disable group suggestion
 
-- 
GitLab


From 44802480e4025a51e3f2e50ed2af4896fce2e84d Mon Sep 17 00:00:00 2001
From: Akhil <akhil@e.email>
Date: Tue, 18 Apr 2023 11:54:17 +0530
Subject: [PATCH 23/49] Latest job ids

---
 Dockerfile | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 5443ef9a..8b222e2d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,20 +1,20 @@
 FROM nextcloud:25.0.5-fpm AS nextcloud
 ARG BASE_DIR="/usr/src/nextcloud"
 ARG TMP_PATCH_DIR="/tmp/build_patches"
-ARG THEME_HELPER_JOB_ID="555956"
+ARG THEME_HELPER_JOB_ID="564351"
 ARG NOTES_VERSION="4.6.0"
 ARG CONTACTS_JOB_ID="559941"
 ARG CALENDAR_JOB_ID="559880"
 ARG USER_BACKEND_RAW_SQL_VERSION="1.3.0"
 ARG EMAIL_RECOVERY_JOB_ID="535883"
-ARG EA_JOB_ID="535903"
-ARG ECLOUD_LAUNCHER_JOB_ID="559988"
+ARG EA_JOB_ID="562506"
+ARG LAUNCHER_JOB_ID="564592"
 ARG GOOGLE_INTEGRATION_VERSION="1.0.9"
-ARG ECLOUD_DASHBOARD_JOB_ID="535923"
+ARG ECLOUD_DASHBOARD_JOB_ID="564386"
 ARG SNAPPY_VERSION="2.26.3"
 ARG SNAPPY_THEME_VERSION="1.2.3"
 
-RUN sed -i 's/25,0,5,1/25,0,5,4/' ${BASE_DIR}/version.php
+RUN sed -i 's/25,0,5,1/25,0,5,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
@@ -53,7 +53,7 @@ RUN curl -fsSL -o ecloud-theme-helper.zip \
     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" && \
+    "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/launcher/-/jobs/${LAUNCHER_JOB_ID}/artifacts/download" && \
     unzip murena_launcher.zip && \
     mv dist/murena_launcher ${BASE_DIR}/custom_apps/ && \
     rm murena_launcher.zip;
@@ -149,7 +149,6 @@ RUN sed -i 's/Nextcloud administrator/administrator/' ${BASE_DIR}/custom_apps/in
 RUN sed -i 's/update/error/g' ${BASE_DIR}/apps/dav/templates/schedule-response-error.php
 
 # Fix the navbar entries
-RUN sed -i 's/this.appLimit=e/this.appLimit=e<7?e:7/' ${BASE_DIR}/dist/core-main.js
 RUN sed -i 's/this.appLimit=e/this.appLimit=this.appList.length/' ${BASE_DIR}/dist/core-main.js
 
 # Fix snappymail icon
-- 
GitLab


From 26d944a472e57353adad28755030699b5da94cc8 Mon Sep 17 00:00:00 2001
From: Akhil <akhil@e.email>
Date: Tue, 18 Apr 2023 11:57:05 +0530
Subject: [PATCH 24/49] Fix syntax error

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 8b222e2d..3b521a7d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -193,7 +193,7 @@ RUN sed -i 's/https:\/\/nextcloud.com\/signup\//https:\/\/e\.foundation\/<?php p
 RUN sed -i 's/$context->registerAlternativeLogin(OIDCLoginOption::class);/\/\/$context->registerAlternativeLogin(OIDCLoginOption::class);/' ${BASE_DIR}/custom_apps/oidc_login/lib/AppInfo/Application.php
 
 # add attr about how many notifications to notif icon
-sed -i 's/attrs:{id:"notifications",/attrs:{id:"notifications","data-has-notifications":0!==e.notifications.length,/' ${BASE_DIR}/apps/notifications/js/notifications-main.js
+RUN sed -i 's/attrs:{id:"notifications",/attrs:{id:"notifications","data-has-notifications":0!==e.notifications.length,/' ${BASE_DIR}/apps/notifications/js/notifications-main.js
 
 # autocomplete leak tweak apps frontend with sed, disable group suggestion
 
-- 
GitLab


From 5bfc2f66e9dc981806c9432cada2f4bff648b564 Mon Sep 17 00:00:00 2001
From: Akhil <akhil@e.email>
Date: Tue, 18 Apr 2023 12:00:01 +0530
Subject: [PATCH 25/49] Update launcher job id

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 3b521a7d..c5a46b52 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,7 +8,7 @@ ARG CALENDAR_JOB_ID="559880"
 ARG USER_BACKEND_RAW_SQL_VERSION="1.3.0"
 ARG EMAIL_RECOVERY_JOB_ID="535883"
 ARG EA_JOB_ID="562506"
-ARG LAUNCHER_JOB_ID="564592"
+ARG LAUNCHER_JOB_ID="564590"
 ARG GOOGLE_INTEGRATION_VERSION="1.0.9"
 ARG ECLOUD_DASHBOARD_JOB_ID="564386"
 ARG SNAPPY_VERSION="2.26.3"
-- 
GitLab


From ad7a01b60894d38b56707babcd41758dbef4daed Mon Sep 17 00:00:00 2001
From: Akhil <akhil@e.email>
Date: Tue, 18 Apr 2023 12:11:03 +0530
Subject: [PATCH 26/49] Fix dash unpack command

---
 Dockerfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index c5a46b52..1aafcce2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,7 +10,7 @@ ARG EMAIL_RECOVERY_JOB_ID="535883"
 ARG EA_JOB_ID="562506"
 ARG LAUNCHER_JOB_ID="564590"
 ARG GOOGLE_INTEGRATION_VERSION="1.0.9"
-ARG ECLOUD_DASHBOARD_JOB_ID="564386"
+ARG DASHBOARD_JOB_ID="564384"
 ARG SNAPPY_VERSION="2.26.3"
 ARG SNAPPY_THEME_VERSION="1.2.3"
 
@@ -71,9 +71,9 @@ RUN curl -fsSL -o ecloud-accounts.zip \
     rm ecloud-accounts.zip;
 
 RUN curl -fsSL -o ecloud-dashboard.zip \
-    "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/ecloud-dashboard/-/jobs/${ECLOUD_DASHBOARD_JOB_ID}/artifacts/download" && \
+    "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/murena-dashboard/-/jobs/${DASHBOARD_JOB_ID}/artifacts/download" && \
     unzip ecloud-dashboard.zip && \
-    mv dist/ecloud-dashboard ${BASE_DIR}/custom_apps/ && \
+    mv dist/murena-dashboard ${BASE_DIR}/custom_apps/ && \
     rm ecloud-dashboard.zip;
 
 RUN curl -fsSL -o snappymail.tar.gz \
-- 
GitLab


From f9b3ed756567e3a15296353e373fdaca4f389c1e Mon Sep 17 00:00:00 2001
From: Akhil <akhil@e.email>
Date: Tue, 18 Apr 2023 12:18:44 +0530
Subject: [PATCH 27/49] Fix theme version

---
 Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 1aafcce2..83ac3cfb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -157,7 +157,7 @@ RUN sed -i 's/logo-white-64x64.png/app.svg/' ${BASE_DIR}/custom_apps/snappymail/
 From selfhost as ecloud
 ARG BASE_DIR="/usr/src/nextcloud"
 ARG TMP_PATCH_DIR="/tmp/build_patches"
-ARG THEME_VERSION="24.0.4"
+ARG THEME_VERSION="dev/nc-25"
 ARG LDAP_WRITE_SUPPORT_VERSION="1.7.0"
 ARG OIDC_LOGIN_VERSION="2.4.1"
 
@@ -213,7 +213,7 @@ RUN sed -i '/<step>OCA\\DAV\\Migration\\CalDAVRemoveEmptyValue<\/step>/d' ${BASE
 # Custom theme
 RUN rm -rf ${BASE_DIR}/themes/eCloud && \
     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" && \
+    "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/nextcloud-theme/-/archive/dev/nc-25/nextcloud-theme-dev-nc-25.tar.gz" && \
     tar -xf eCloud-theme.tar.gz -C /tmp/ && \
     mv /tmp/nextcloud-theme-${THEME_VERSION}/ ${BASE_DIR}/themes/eCloud && \
     chown -R www-data:www-data ${BASE_DIR}/themes/eCloud/ && \
-- 
GitLab


From 00cd55e87cba6622b46d05932e6ff445b582e904 Mon Sep 17 00:00:00 2001
From: Akhil <akhil@e.email>
Date: Tue, 18 Apr 2023 12:22:31 +0530
Subject: [PATCH 28/49] Temporarily hardcode theme unpack

---
 Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 83ac3cfb..e89910be 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,7 +14,7 @@ ARG DASHBOARD_JOB_ID="564384"
 ARG SNAPPY_VERSION="2.26.3"
 ARG SNAPPY_THEME_VERSION="1.2.3"
 
-RUN sed -i 's/25,0,5,1/25,0,5,5/' ${BASE_DIR}/version.php
+RUN sed -i 's/25,0,5,1/25,0,5,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
@@ -215,7 +215,7 @@ RUN rm -rf ${BASE_DIR}/themes/eCloud && \
     curl -fsSL -o eCloud-theme.tar.gz \
     "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/nextcloud-theme/-/archive/dev/nc-25/nextcloud-theme-dev-nc-25.tar.gz" && \
     tar -xf eCloud-theme.tar.gz -C /tmp/ && \
-    mv /tmp/nextcloud-theme-${THEME_VERSION}/ ${BASE_DIR}/themes/eCloud && \
+    mv /tmp/nextcloud-theme-dev-nc-25/ ${BASE_DIR}/themes/eCloud && \
     chown -R www-data:www-data ${BASE_DIR}/themes/eCloud/ && \
     rm -rf eCloud-theme.tar.gz ${BASE_DIR}/themes/example/
 
-- 
GitLab


From bda246562b1bc1b5c62cb75288909cc306913b4f Mon Sep 17 00:00:00 2001
From: Akhil <akhil@e.email>
Date: Thu, 20 Apr 2023 15:35:38 +0530
Subject: [PATCH 29/49] Update job IDs

---
 Dockerfile | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index e89910be..cd75300b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
 FROM nextcloud:25.0.5-fpm AS nextcloud
 ARG BASE_DIR="/usr/src/nextcloud"
 ARG TMP_PATCH_DIR="/tmp/build_patches"
-ARG THEME_HELPER_JOB_ID="564351"
+ARG THEME_HELPER_JOB_ID="566446"
 ARG NOTES_VERSION="4.6.0"
 ARG CONTACTS_JOB_ID="559941"
 ARG CALENDAR_JOB_ID="559880"
 ARG USER_BACKEND_RAW_SQL_VERSION="1.3.0"
 ARG EMAIL_RECOVERY_JOB_ID="535883"
 ARG EA_JOB_ID="562506"
-ARG LAUNCHER_JOB_ID="564590"
+ARG LAUNCHER_JOB_ID="566025"
 ARG GOOGLE_INTEGRATION_VERSION="1.0.9"
 ARG DASHBOARD_JOB_ID="564384"
 ARG SNAPPY_VERSION="2.26.3"
@@ -81,6 +81,9 @@ RUN curl -fsSL -o snappymail.tar.gz \
     tar -xf snappymail.tar.gz -C ${BASE_DIR}/custom_apps/ && \
     rm snappymail.tar.gz;
 
+# Fix snappymail icon
+RUN sed -i 's/logo-white-64x64.png/app.svg/' ${BASE_DIR}/custom_apps/snappymail/appinfo/info.xml
+
 # Snappy theme
 RUN curl -fsSL -o Murena-snappymail-theme.tar.gz \
     "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/snappymail-theme/-/archive/${SNAPPY_THEME_VERSION}/snappymail-theme-${SNAPPY_THEME_VERSION}.tar.gz" && \
@@ -151,9 +154,6 @@ RUN sed -i 's/update/error/g' ${BASE_DIR}/apps/dav/templates/schedule-response-e
 # Fix the navbar entries
 RUN sed -i 's/this.appLimit=e/this.appLimit=this.appList.length/' ${BASE_DIR}/dist/core-main.js
 
-# Fix snappymail icon
-RUN sed -i 's/logo-white-64x64.png/app.svg/' ${BASE_DIR}/custom_apps/snappymail/appinfo/info.xml
-
 From selfhost as ecloud
 ARG BASE_DIR="/usr/src/nextcloud"
 ARG TMP_PATCH_DIR="/tmp/build_patches"
-- 
GitLab


From f88488a4107e64f1325333903ae45634b8d400b3 Mon Sep 17 00:00:00 2001
From: Akhil <akhil@e.email>
Date: Fri, 21 Apr 2023 15:47:03 +0530
Subject: [PATCH 30/49] Update to 25.0.6; switch mail_domain variable names

---
 Dockerfile                             |   4 +-
 patches/002-login-without-domain.patch | 125 ++++++++++++-------------
 2 files changed, 61 insertions(+), 68 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index cd75300b..d998b678 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM nextcloud:25.0.5-fpm AS nextcloud
+FROM nextcloud:25.0.6-fpm AS nextcloud
 ARG BASE_DIR="/usr/src/nextcloud"
 ARG TMP_PATCH_DIR="/tmp/build_patches"
 ARG THEME_HELPER_JOB_ID="566446"
@@ -14,7 +14,7 @@ ARG DASHBOARD_JOB_ID="564384"
 ARG SNAPPY_VERSION="2.26.3"
 ARG SNAPPY_THEME_VERSION="1.2.3"
 
-RUN sed -i 's/25,0,5,1/25,0,5,6/' ${BASE_DIR}/version.php
+RUN sed -i 's/25,0,6,1/25,0,6,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
diff --git a/patches/002-login-without-domain.patch b/patches/002-login-without-domain.patch
index a0ba71ea..a65f50c5 100644
--- a/patches/002-login-without-domain.patch
+++ b/patches/002-login-without-domain.patch
@@ -7,82 +7,75 @@ This patch auto append the domain handled by nc, configured in env var.
 only the admin user (also configured in env var) will not have his login appended with a @domain suffix
 
 diff --git ./core/Controller/LoginController.php ./core/Controller/LoginController-new.php
---- ./core/Controller/LoginController.php	2023-04-10 11:26:27.974097676 +0530
-+++ ./core/Controller/LoginController-new.php	2023-04-10 11:33:01.374096460 +0530
-@@ -307,6 +307,26 @@
- 				// case when a user has already logged-in, in another tab.
- 				return $this->generateRedirect($redirect_url);
- 			}
-+            $user = trim($user);
-+            $user = mb_strtolower($user, 'UTF-8');
-+            $domain = $this->config->getSystemValue('mail_domain', '');
-+            $domain_suffix = !empty($domain) ? '@' . $domain : '';
-+            $alt_domain = $this->config->getSystemValue('alt_mail_domain', '');
-+            $alt_domain_suffix = !empty($alt_domain) ? '@'  . $alt_domain : '';
-+            $admin_username = $_ENV["NEXTCLOUD_ADMIN_USER"];
-+            $is_admin = strcmp($user, $admin_username) === 0;
-+
-+            if(!$is_admin && stristr($user, $domain_suffix) !== FALSE) {
-+                $user = str_replace($domain_suffix, '', $user);
-+            }
+--- ./core/Controller/LoginController.php	2023-04-21 15:08:54.979407062 +0530
++++ ./core/Controller/LoginController-new.php	2023-04-21 15:16:48.582366408 +0530
+@@ -318,6 +318,26 @@
+ 				$this->l10n->t('Please try again')
+ 			);
+ 		}
++		$user = trim($user);
++        $user = mb_strtolower($user, 'UTF-8');
++        $legacyDomain = $this->config->getSystemValue('legacy_domain', '');
++        $legacyDomainSuffix = !empty($legacyDomain) ? '@' . $legacyDomain : '';
++        $mainDomain = $this->config->getSystemValue('main_domain', '');
++        $mainDomainSuffix = !empty($mainDomain) ? '@'  . $mainDomain : '';
++        $admin_username = $_ENV["NEXTCLOUD_ADMIN_USER"];
++        $is_admin = strcmp($user, $admin_username) === 0;
++        
++		if (!$is_admin && str_ends_with($user, $legacyDomainSuffix)) {
++            $user = str_replace($legacyDomainSuffix, '', $user);
++        }
 +
-+            if (!$is_admin && stristr($user, $alt_domain_suffix) !== FALSE) {
-+                $user = str_replace($alt_domain_suffix, '', $user);
-+            }
++        if (!$is_admin && str_ends_with($user, $mainDomainSuffix)) {
++            $user = str_replace($mainDomainSuffix, '', $user);
++        }
 +
-+            if(!$this->userManager->userExists($user)) {
-+                $user = $user . $domain_suffix;
-+            }
-
- 			// Clear any auth remnants like cookies to ensure a clean login
- 			// For the next attempt
---- ./core/Controller/WebAuthnController.php	2022-08-18 10:33:16.150199100 +0530
-+++ ./core/Controller/WebAuthnController-new.php	2022-08-18 10:34:31.880199100 +0530
-@@ -37,6 +37,7 @@
- use OCP\ISession;
- use OCP\Util;
- use Webauthn\PublicKeyCredentialRequestOptions;
-+use OCP\IUserManager;
-
- class WebAuthnController extends Controller {
- 	private const WEBAUTHN_LOGIN = 'webauthn_login';
-@@ -73,6 +74,25 @@
-
++        if (!$this->userManager->userExists($user)) {
++                $user = $user . $legacyDomainSuffix;
++        }
+ 
+ 		$data = new LoginData(
+ 			$this->request,
+--- ./core/Controller/WebAuthnController.php	2023-04-21 15:18:58.813220092 +0530
++++ ./core/Controller/WebAuthnController-new.php	2023-04-21 15:24:40.036538414 +0530
+@@ -66,6 +66,27 @@
+ 
  		$this->logger->debug('Converting login name to UID');
  		$uid = $loginName;
-+        $uid = trim($uid);
-+		$uid = mb_strtolower($uid, 'UTF-8');
-+		$domain = \OC::$server->getConfig()->getSystemValue('mail_domain', '');
-+		$domain_suffix = !empty($domain) ? '@' . $domain : '';
-+		$alt_domain = \OC::$server->getConfig()->getSystemValue('alt_mail_domain', '');
-+		$alt_domain_suffix = !empty($alt_domain) ? '@'  . $alt_domain : '';
-+		$admin_username = $_ENV["NEXTCLOUD_ADMIN_USER"];
-+		$is_admin = strcmp($uid, $admin_username) === 0;
 +
-+		if(!$is_admin && stristr($uid, $domain_suffix) !== FALSE) {
-+			$uid = str_replace($domain_suffix, '', $uid);
-+		}
-+		if (!$is_admin && stristr($uid, $alt_domain_suffix) !== FALSE) {
-+			$uid = str_replace($alt_domain_suffix, '', $uid);
-+		}
++		$uid = trim($uid);
++        $uid = mb_strtolower($uid, 'UTF-8');
++        $legacyDomain = \OC::$server->getConfig()->getSystemValue('legacy_domain', '');
++        $legacyDomainSuffix = !empty($legacyDomain) ? '@' . $legacyDomain : '';
++        $mainDomain = \OC::$server->getConfig()->getSystemValue('main_domain', '');
++        $mainDomainSuffix = !empty($mainDomain) ? '@'  . $mainDomain : '';
++        $admin_username = $_ENV["NEXTCLOUD_ADMIN_USER"];
++        $is_admin = strcmp($uid, $admin_username) === 0;
++        
++		if (!$is_admin && str_ends_with($uid, $legacyDomainSuffix)) {
++            $uid = str_replace($legacyDomainSuffix, '', $uid);
++        }
++
++        if (!$is_admin && str_ends_with($uid, $mainDomainSuffix)) {
++            $uid = str_replace($mainDomainSuffix, '', $uid);
++        }
 +
-+		if(!\OC::$server->get(IUserManager::class)->userExists($uid)) {
-+			$uid = $uid . $domain_suffix;
-+		}
++        if (!\OC::$server->get(IUserManager::class)->userExists($uid)) {
++                $uid = $uid . $legacyDomainSuffix;
++        }
  		Util::emitHook(
  			'\OCA\Files_Sharing\API\Server2Server',
  			'preLoginNameUsedAsUserName',
 
-
---- ./lib/private/User/Session.php	2023-04-10 11:42:40.124084595 +0530
-+++ ./lib/private/User/Session-new.php	2023-04-10 11:44:34.384098645 +0530
-@@ -428,6 +428,10 @@
- 								OC\Security\Bruteforce\Throttler $throttler) {
- 		$currentDelay = $throttler->sleepDelay($request->getRemoteAddress(), 'login');
-
-+		$altDomain = $this->config->getSystemValue('alt_mail_domain', '');
-+		$altDomainSuffix = !empty($altDomain) ? '@' . $altDomain : '';
-+		$user = str_replace($altDomainSuffix, '', $user);
+--- ./lib/private/User/Session.php	2023-04-21 15:27:00.417034490 +0530
++++ ./lib/private/User/Session-new.php	2023-04-21 15:28:18.309111435 +0530
+@@ -430,6 +430,10 @@
+ 		$remoteAddress = $request->getRemoteAddress();
+ 		$currentDelay = $throttler->sleepDelay($remoteAddress, 'login');
+ 
++		$mainDomain = $this->config->getSystemValue('main_domain', '');
++		$mainDomainSuffix = !empty($mainDomain) ? '@' . $mainDomain : '';
++		$user = str_replace($mainDomainSuffix, '', $user);
 +
  		if ($this->manager instanceof PublicEmitter) {
  			$this->manager->emit('\OC\User', 'preLogin', [$user, $password]);
-- 
GitLab


From 4a855bb91fbfb592723ceab713fc5c6f73a7b39a Mon Sep 17 00:00:00 2001
From: Akhil <akhil@e.email>
Date: Tue, 25 Apr 2023 02:19:55 +0530
Subject: [PATCH 31/49] update jobs ids and versions

---
 Dockerfile | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index d998b678..c010f8db 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,15 +2,14 @@ FROM nextcloud:25.0.6-fpm AS nextcloud
 ARG BASE_DIR="/usr/src/nextcloud"
 ARG TMP_PATCH_DIR="/tmp/build_patches"
 ARG THEME_HELPER_JOB_ID="566446"
-ARG NOTES_VERSION="4.6.0"
+ARG NOTES_VERSION="4.7.2"
 ARG CONTACTS_JOB_ID="559941"
 ARG CALENDAR_JOB_ID="559880"
-ARG USER_BACKEND_RAW_SQL_VERSION="1.3.0"
-ARG EMAIL_RECOVERY_JOB_ID="535883"
+ARG EMAIL_RECOVERY_JOB_ID="570722"
 ARG EA_JOB_ID="562506"
-ARG LAUNCHER_JOB_ID="566025"
+ARG LAUNCHER_JOB_ID="570737"
 ARG GOOGLE_INTEGRATION_VERSION="1.0.9"
-ARG DASHBOARD_JOB_ID="564384"
+ARG DASHBOARD_JOB_ID="570430"
 ARG SNAPPY_VERSION="2.26.3"
 ARG SNAPPY_THEME_VERSION="1.2.3"
 
@@ -159,7 +158,7 @@ ARG BASE_DIR="/usr/src/nextcloud"
 ARG TMP_PATCH_DIR="/tmp/build_patches"
 ARG THEME_VERSION="dev/nc-25"
 ARG LDAP_WRITE_SUPPORT_VERSION="1.7.0"
-ARG OIDC_LOGIN_VERSION="2.4.1"
+ARG OIDC_LOGIN_VERSION="2.5.0"
 
 # Patches
 COPY patches/ ${TMP_PATCH_DIR}/
-- 
GitLab


From 4fc4c101c288391029e2d2531c4a7cc05491739d Mon Sep 17 00:00:00 2001
From: Akhil <akhil@e.email>
Date: Tue, 25 Apr 2023 02:36:14 +0530
Subject: [PATCH 32/49] Add sed for notification data-object-type

---
 Dockerfile | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index c010f8db..3ddea9ce 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -206,6 +206,9 @@ RUN sed -i 's/$this->header, \[$this->themingDefaults->getColorPrimary()/$this->
 # Remove changeAvatar in changeUserHook of ldap_write_support as it throws errors
 RUN sed -i 's/$this->changeAvatar/\/\/ $this->changeAvatar/' ${BASE_DIR}/custom_apps/ldap_write_support/lib/LDAPUserManager.php
 
+# Add data-object-type to notification
+RUN sed -i 's/"object-type":/"data-object-type":/' ${BASE_DIR}/apps/notifications/js/notifications-main.js
+
 # Remove 'fix broken values of calendar objects' repair step
 RUN sed -i '/<step>OCA\\DAV\\Migration\\CalDAVRemoveEmptyValue<\/step>/d' ${BASE_DIR}/apps/dav/appinfo/info.xml
 
-- 
GitLab


From 3269c4d137bc79aa1e05ca70828374bbeccc568a Mon Sep 17 00:00:00 2001
From: Akhil <akhil@e.email>
Date: Tue, 25 Apr 2023 19:09:58 +0530
Subject: [PATCH 33/49] Update EA job id

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 3ddea9ce..1ddb9d77 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,7 +6,7 @@ ARG NOTES_VERSION="4.7.2"
 ARG CONTACTS_JOB_ID="559941"
 ARG CALENDAR_JOB_ID="559880"
 ARG EMAIL_RECOVERY_JOB_ID="570722"
-ARG EA_JOB_ID="562506"
+ARG EA_JOB_ID="571462"
 ARG LAUNCHER_JOB_ID="570737"
 ARG GOOGLE_INTEGRATION_VERSION="1.0.9"
 ARG DASHBOARD_JOB_ID="570430"
-- 
GitLab


From 8d0df18731625ae64231cc47b314b85f00266c81 Mon Sep 17 00:00:00 2001
From: Akhil <akhil@e.email>
Date: Fri, 28 Apr 2023 17:08:26 +0530
Subject: [PATCH 34/49] Update snappymail

---
 Dockerfile | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 1ddb9d77..da5ff94f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,8 +10,8 @@ ARG EA_JOB_ID="571462"
 ARG LAUNCHER_JOB_ID="570737"
 ARG GOOGLE_INTEGRATION_VERSION="1.0.9"
 ARG DASHBOARD_JOB_ID="570430"
-ARG SNAPPY_VERSION="2.26.3"
-ARG SNAPPY_THEME_VERSION="1.2.3"
+ARG SNAPPY_VERSION="2.27.2"
+ARG SNAPPY_THEME_VERSION="1.2.7"
 
 RUN sed -i 's/25,0,6,1/25,0,6,1/' ${BASE_DIR}/version.php
 COPY custom_entrypoint.sh /
@@ -141,8 +141,6 @@ RUN curl -fsSL -o user_backend_sql_raw.tar.gz \
 
 # Set default class of hidden to settings-hint
 RUN sed -i 's/settings-hint/settings-hint hidden/' ${BASE_DIR}/apps/settings/templates/settings/personal/security/twofactor.php
-# change notifications icon src
-RUN sed -i 's/(0,Ud.imagePath)("notifications",e)/"\/themes\/"+OC.theme.folder+"\/apps\/notifications\/img\/"+e+".svg"/' ${BASE_DIR}/apps/notifications/js/notifications-main.js
 
 RUN sed -i 's/ in Nextcloud/ /' ${BASE_DIR}/custom_apps/integration_google/js/integration_google-personalSettings.js
 RUN sed -i 's/Nextcloud administrator/administrator/' ${BASE_DIR}/custom_apps/integration_google/js/integration_google-personalSettings.js
@@ -193,6 +191,8 @@ RUN sed -i 's/$context->registerAlternativeLogin(OIDCLoginOption::class);/\/\/$c
 
 # add attr about how many notifications to notif icon
 RUN sed -i 's/attrs:{id:"notifications",/attrs:{id:"notifications","data-has-notifications":0!==e.notifications.length,/' ${BASE_DIR}/apps/notifications/js/notifications-main.js
+# Add data-object-type to notification
+RUN sed -i 's/"data-id":e.notificationId,/"data-id":e.notificationId,"data-object-type":e.objectType,/' ${BASE_DIR}/apps/notifications/js/notifications-main.js
 
 # autocomplete leak tweak apps frontend with sed, disable group suggestion
 
@@ -206,8 +206,6 @@ RUN sed -i 's/$this->header, \[$this->themingDefaults->getColorPrimary()/$this->
 # Remove changeAvatar in changeUserHook of ldap_write_support as it throws errors
 RUN sed -i 's/$this->changeAvatar/\/\/ $this->changeAvatar/' ${BASE_DIR}/custom_apps/ldap_write_support/lib/LDAPUserManager.php
 
-# Add data-object-type to notification
-RUN sed -i 's/"object-type":/"data-object-type":/' ${BASE_DIR}/apps/notifications/js/notifications-main.js
 
 # Remove 'fix broken values of calendar objects' repair step
 RUN sed -i '/<step>OCA\\DAV\\Migration\\CalDAVRemoveEmptyValue<\/step>/d' ${BASE_DIR}/apps/dav/appinfo/info.xml
-- 
GitLab


From e484c4a6cbfcbf6162181d208a82b128fbf3e4e9 Mon Sep 17 00:00:00 2001
From: Akhil <akhil@e.email>
Date: Fri, 28 Apr 2023 17:37:56 +0530
Subject: [PATCH 35/49] Fix usermanager class query

---
 patches/002-login-without-domain.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/patches/002-login-without-domain.patch b/patches/002-login-without-domain.patch
index a65f50c5..0d61eb88 100644
--- a/patches/002-login-without-domain.patch
+++ b/patches/002-login-without-domain.patch
@@ -60,7 +60,7 @@ diff --git ./core/Controller/LoginController.php ./core/Controller/LoginControll
 +            $uid = str_replace($mainDomainSuffix, '', $uid);
 +        }
 +
-+        if (!\OC::$server->get(IUserManager::class)->userExists($uid)) {
++        if (!\OC::$server->get(\OCP\IUserManager::class)->userExists($uid)) {
 +                $uid = $uid . $legacyDomainSuffix;
 +        }
  		Util::emitHook(
-- 
GitLab


From 326d163db7b01ef3e30e5082c21c86a792d8c597 Mon Sep 17 00:00:00 2001
From: Akhil <akhil@e.email>
Date: Tue, 2 May 2023 18:55:22 +0530
Subject: [PATCH 36/49] Add sed to disable edit feature

---
 Dockerfile | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index da5ff94f..383fc01c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,7 +13,7 @@ ARG DASHBOARD_JOB_ID="570430"
 ARG SNAPPY_VERSION="2.27.2"
 ARG SNAPPY_THEME_VERSION="1.2.7"
 
-RUN sed -i 's/25,0,6,1/25,0,6,1/' ${BASE_DIR}/version.php
+RUN sed -i 's/25,0,6,1/25,0,6,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
@@ -97,6 +97,9 @@ RUN apt-get -y remove unzip
 # force eCloud theme not to be disabled even when there is an upgrade process launched
 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/!this.isMobile/!this.isMobile\&\&false/' ${BASE_DIR}/apps/viewer/js/viewer-main.js
+
 ENTRYPOINT ["/custom_entrypoint.sh"]
 CMD ["php-fpm"]
 
-- 
GitLab


From c117e681924bd786a1a58fd24d038181e1348322 Mon Sep 17 00:00:00 2001
From: Akhil <akhil@e.email>
Date: Thu, 4 May 2023 18:53:16 +0530
Subject: [PATCH 37/49] Update job ids

---
 Dockerfile | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 383fc01c..9e82d89e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,15 +1,15 @@
 FROM nextcloud:25.0.6-fpm AS nextcloud
 ARG BASE_DIR="/usr/src/nextcloud"
 ARG TMP_PATCH_DIR="/tmp/build_patches"
-ARG THEME_HELPER_JOB_ID="566446"
+ARG THEME_HELPER_JOB_ID="578040"
 ARG NOTES_VERSION="4.7.2"
-ARG CONTACTS_JOB_ID="559941"
-ARG CALENDAR_JOB_ID="559880"
-ARG EMAIL_RECOVERY_JOB_ID="570722"
-ARG EA_JOB_ID="571462"
-ARG LAUNCHER_JOB_ID="570737"
+ARG CONTACTS_JOB_ID="577585"
+ARG CALENDAR_JOB_ID="577595"
+ARG EMAIL_RECOVERY_JOB_ID="576577"
+ARG EA_JOB_ID="575530"
+ARG LAUNCHER_JOB_ID="575632"
 ARG GOOGLE_INTEGRATION_VERSION="1.0.9"
-ARG DASHBOARD_JOB_ID="570430"
+ARG DASHBOARD_JOB_ID="576050"
 ARG SNAPPY_VERSION="2.27.2"
 ARG SNAPPY_THEME_VERSION="1.2.7"
 
-- 
GitLab


From 4b708d1fa089a2f12e9ca4e5053ef9d57a91e3bf Mon Sep 17 00:00:00 2001
From: Akhil <akhil@e.email>
Date: Thu, 4 May 2023 18:58:02 +0530
Subject: [PATCH 38/49] Fix email-recovery job id

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 9e82d89e..882b1f26 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,7 +5,7 @@ ARG THEME_HELPER_JOB_ID="578040"
 ARG NOTES_VERSION="4.7.2"
 ARG CONTACTS_JOB_ID="577585"
 ARG CALENDAR_JOB_ID="577595"
-ARG EMAIL_RECOVERY_JOB_ID="576577"
+ARG EMAIL_RECOVERY_JOB_ID="576777"
 ARG EA_JOB_ID="575530"
 ARG LAUNCHER_JOB_ID="575632"
 ARG GOOGLE_INTEGRATION_VERSION="1.0.9"
-- 
GitLab


From 23a2fc8fd8712fd059feedc78f66b6b7c82b2538 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arnau=20V=C3=A0zquez?= <arnauvp@e.email>
Date: Thu, 4 May 2023 13:39:47 +0000
Subject: [PATCH 39/49] Apply 1 suggestion(s) to 1 file(s)

---
 patches/009-help-links.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/patches/009-help-links.patch b/patches/009-help-links.patch
index e29fffe2..b9251db7 100644
--- a/patches/009-help-links.patch
+++ b/patches/009-help-links.patch
@@ -39,7 +39,7 @@ help links are shown
 -	p('active');
 -} ?>" <?php if ($_['mode'] === 'admin') { print_unescaped('aria-current="page"'); } ?>
 -				href="<?php print_unescaped($_['urlAdminDocs']); ?>">
-+			<a href="https://support.e.foundation/how-tos#ecloud-eemail--account" class="icon-category-office" target="_blank" rel="noreferrer noopener">
++			<a href="https://support.e.foundation/support-topics/e-cloud-e-email-account" class="icon-category-office" target="_blank" rel="noreferrer noopener">
  				<span class="help-list__text">
 -					<?php p($l->t('Administrator documentation')); ?>
 +					<?php p('/e/' . ' ' . $l->t('Documentation'));  ?>
-- 
GitLab


From 5f0edf7acefdd5865c19a6420159bb0b79109689 Mon Sep 17 00:00:00 2001
From: Akhil <akhil@e.email>
Date: Thu, 4 May 2023 19:23:06 +0530
Subject: [PATCH 40/49] Use theme version again

---
 Dockerfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 882b1f26..4963e62c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -157,7 +157,7 @@ RUN sed -i 's/this.appLimit=e/this.appLimit=this.appList.length/' ${BASE_DIR}/di
 From selfhost as ecloud
 ARG BASE_DIR="/usr/src/nextcloud"
 ARG TMP_PATCH_DIR="/tmp/build_patches"
-ARG THEME_VERSION="dev/nc-25"
+ARG THEME_VERSION="main"
 ARG LDAP_WRITE_SUPPORT_VERSION="1.7.0"
 ARG OIDC_LOGIN_VERSION="2.5.0"
 
@@ -216,9 +216,9 @@ RUN sed -i '/<step>OCA\\DAV\\Migration\\CalDAVRemoveEmptyValue<\/step>/d' ${BASE
 # Custom theme
 RUN rm -rf ${BASE_DIR}/themes/eCloud && \
     curl -fsSL -o eCloud-theme.tar.gz \
-    "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/nextcloud-theme/-/archive/dev/nc-25/nextcloud-theme-dev-nc-25.tar.gz" && \
+    "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/nextcloud-theme/-/archive/${THEME_VERSION}/nextcloud-theme-%{THEME_VERSION}.tar.gz" && \
     tar -xf eCloud-theme.tar.gz -C /tmp/ && \
-    mv /tmp/nextcloud-theme-dev-nc-25/ ${BASE_DIR}/themes/eCloud && \
+    mv /tmp/nextcloud-theme-${THEME_VERSION}/ ${BASE_DIR}/themes/eCloud && \
     chown -R www-data:www-data ${BASE_DIR}/themes/eCloud/ && \
     rm -rf eCloud-theme.tar.gz ${BASE_DIR}/themes/example/
 
-- 
GitLab


From 416988940d38212917d5d60f70c09a54322e482b Mon Sep 17 00:00:00 2001
From: Akhil <akhil@e.email>
Date: Thu, 4 May 2023 19:30:31 +0530
Subject: [PATCH 41/49] % -> $

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 4963e62c..f1fdc198 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -216,7 +216,7 @@ RUN sed -i '/<step>OCA\\DAV\\Migration\\CalDAVRemoveEmptyValue<\/step>/d' ${BASE
 # Custom theme
 RUN rm -rf ${BASE_DIR}/themes/eCloud && \
     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" && \
+    "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/nextcloud-theme/-/archive/${THEME_VERSION}/nextcloud-theme-${THEME_VERSION}.tar.gz" && \
     tar -xf eCloud-theme.tar.gz -C /tmp/ && \
     mv /tmp/nextcloud-theme-${THEME_VERSION}/ ${BASE_DIR}/themes/eCloud && \
     chown -R www-data:www-data ${BASE_DIR}/themes/eCloud/ && \
-- 
GitLab


From 82c8f1344b660fbe30b14e0b6fa44b602302cfd6 Mon Sep 17 00:00:00 2001
From: Akhil <akhil@e.email>
Date: Fri, 5 May 2023 18:51:27 +0530
Subject: [PATCH 42/49] Fix patches to use correct variables

---
 patches/006-recovery-email-changes.patch | 57 ++++++++++++------------
 patches/025-optimize-get-by-email.patch  | 32 ++++++-------
 2 files changed, 45 insertions(+), 44 deletions(-)

diff --git a/patches/006-recovery-email-changes.patch b/patches/006-recovery-email-changes.patch
index 7b705c9d..a424dd06 100644
--- a/patches/006-recovery-email-changes.patch
+++ b/patches/006-recovery-email-changes.patch
@@ -1,50 +1,51 @@
---- ./core/Controller/LostController.php	2023-02-01 18:49:00.652101897 +0530
-+++ ./core/Controller/LostController-new.php	2023-02-01 18:53:01.231516084 +0530
-@@ -168,8 +168,23 @@
+--- ./core/Controller/LostController.php	2023-05-05 18:38:07.080445742 +0530
++++ ./core/Controller/LostController-new.php	2023-05-05 18:48:27.385043088 +0530
+@@ -172,8 +172,23 @@
  	 */
  	protected function checkPasswordResetToken(string $token, string $userId): void {
  		try {
-+			$domain = $this->config->getSystemValue('mail_domain', '');
-+			$domainSuffix = !empty($domain) ? '@' . $domain : '';
-+			$altDomain = $this->config->getSystemValue('alt_mail_domain', '');
-+			$altDomainSuffix = !empty($altDomain) ? '@' . $altDomain : '';
-+			if(stristr($userId, $domainSuffix) !== FALSE) {
-+				$userId = str_replace($domainSuffix, '', $userId);
++			$legacyDomain = $this->config->getSystemValue('legacy_domain', '');
++			$legacyDomainSuffix = !empty($legacyDomain) ? '@' . $legacyDomain : '';
++			$mainDomain = $this->config->getSystemValue('main_domain', '');
++			$mainDomainSuffix = !empty($mainDomain) ? '@' . $mainDomain : '';
++			if(str_ends_with($userId, $legacyDomainSuffix)) {
++				$userId = str_replace($legacyDomainSuffix, '', $userId);
 +			}
-+			if(stristr($userId, $altDomainSuffix) !== FALSE) {
-+				$userId = str_replace($altDomainSuffix, '', $userId);
++			if(str_ends_with($userId, $mainDomainSuffix)) {
++				$userId = str_replace($mainDomainSuffix, '', $userId);
 +			}
++
 +			if(!$this->userManager->userExists($userId)) {
-+				$userId = $userId . $domainSuffix;
++				$userId = $userId . $legacyDomainSuffix;
 +			}
  			$user = $this->userManager->get($userId);
 -			$this->verificationToken->check($token, $user, 'lostpassword', $user ? $user->getEMailAddress() : '', true);
-+			$recoveryEmail = $this->config->getUserValue($userId, 'email-recovery', 'recovery-email');
-+			$mailAddress = is_null($recoveryEmail) ? '' : $recoveryEmail;
-+			$this->verificationToken->check($token, $user, 'lostpassword', $mailAddress, true);
++			$recoveryEmail = $this->config->getUserValue($userId, 'email-recovery', 'recovery-email', '');
++			$this->verificationToken->check($token, $user, 'lostpassword', $user ? $recoveryEmail : '', true);
  		} catch (InvalidTokenException $e) {
  			$error = $e->getCode() === InvalidTokenException::TOKEN_EXPIRED
  				? $this->l10n->t('Could not reset password because the token is expired')
-@@ -269,8 +284,21 @@
+@@ -273,9 +288,22 @@
  	 * @throws \OCP\PreConditionNotMetException
  	 */
  	protected function sendEmail(string $input): void {
-+		$domain = $this->config->getSystemValue('mail_domain', '');
-+		$domainSuffix = !empty($domain) ? '@' . $domain : '';
-+		$altDomain = $this->config->getSystemValue('alt_mail_domain', '');
-+		$altDomainSuffix = !empty($altDomain) ? '@' . $altDomain : '';
-+		if (stristr($input, $domainSuffix) !== FALSE) {
-+			$input = str_replace($domainSuffix, '', $input);
++		$legacyDomain = $this->config->getSystemValue('legacy_domain', '');
++		$legacyDomainSuffix = !empty($legacyDomain) ? '@' . $legacyDomain : '';
++		$mainDomain = $this->config->getSystemValue('main_domain', '');
++		$mainDomainSuffix = !empty($mainDomain) ? '@' . $mainDomain : '';
++		if (str_ends_with($input, $legacyDomainSuffix)) {
++			$input = str_replace($legacyDomainSuffix, '', $input);
 +		}
-+		if(stristr($input, $altDomainSuffix) !== FALSE) {
-+			$input = str_replace($altDomainSuffix, '', $input);
++		if(str_ends_with($input, $mainDomainSuffix)) {
++			$input = str_replace($mainDomainSuffix, '', $input);
 +		}
 +		if(!$this->userManager->userExists($input) ) {
-+			$input = $input . $domainSuffix;
++			$input = $input . $legacyDomainSuffix;
 +		}
  		$user = $this->findUserByIdOrMail($input);
--		$email = $user->getEMailAddress();
-+		$email = $this->config->getUserValue($user->getUID(), 'email-recovery', 'recovery-email');
- 
+ 		$email = $user->getEMailAddress();
+-
++		$email = $this->config->getUserValue($user->getUID(), 'email-recovery', 'recovery-email', '');
  		if (empty($email)) {
  			throw new ResetPasswordException('Could not send reset e-mail since there is no email for username ' . $input);
+ 		}
diff --git a/patches/025-optimize-get-by-email.patch b/patches/025-optimize-get-by-email.patch
index 7673feb2..172f23e2 100644
--- a/patches/025-optimize-get-by-email.patch
+++ b/patches/025-optimize-get-by-email.patch
@@ -2,43 +2,43 @@ From: Akhil <akhil@e.email>
 Date: Tue, 10 Mar 2023 10:00 +0530
 Subject: [PATCH] To optimize getByEmail as we have boundary conditions that email is unique per-user and can only match one of the two domains
 
---- ./lib/private/User/Manager.php	2023-03-10 10:01:44.729561986 +0530
-+++ ./lib/private/User/Manager-new.php	2023-03-10 10:05:18.767230727 +0530
-@@ -706,11 +706,33 @@
+--- ./lib/private/User/Manager.php	2023-05-05 18:29:34.818568291 +0530
++++ ./lib/private/User/Manager-new.php	2023-05-05 18:33:49.872682118 +0530
+@@ -693,12 +693,33 @@
  	 */
  	public function getByEmail($email) {
  		// looking for 'email' only (and not primary_mail) is intentional
 -		$userIds = $this->config->getUsersForUserValueCaseInsensitive('settings', 'email', $email);
-+		$mailDomain = $this->config->getSystemValue('mail_domain', '');
-+		$altMailDomain = $this->config->getSystemValue('alt_mail_domain', '');
++		$legacyDomain = $this->config->getSystemValue('legacy_domain', '');
++		$mainDomain = $this->config->getSystemValue('main_domain', '');
 +		$users = [];
-+		
-+		if(empty($mailDomain) && empty($altMailDomain)) {
-+			$userIds = $this->config->getUsersForUserValueCaseInsensitive('settings', 'email', $email);
  
 -		$users = array_map(function ($uid) {
 -			return $this->get($uid);
 -		}, $userIds);
++		if(empty($mailDomain) && empty($altMailDomain)) {
++			$userIds = $this->config->getUsersForUserValueCaseInsensitive('settings', 'email', $email);
+ 
 +			$users = array_map(function ($uid) {
 +				return $this->get($uid);
 +			}, $userIds);
 +		} else {
 +			$uid = '';
-+			$mailDomainSuffix = empty($mailDomain) ?  '' : '@' . $mailDomain;
-+			$altMailDomainSuffix = empty($altMailDomain) ? '' : '@' . $altMailDomain;
++			$legacyDomainSuffix = empty($legacyDomain) ?  '' : '@' . $legacyDomain;
++			$mainDomainSuffix = empty($mainDomain) ? '' : '@' . $mainDomain;
 +
-+			if (!empty($mailDomainSuffix) && stristr($email, $mailDomainSuffix) !== FALSE) {
-+				// In case of mail_domain, username is email
++			if (!empty($legacyDomainSuffix) && str_ends_with($email, $legacyDomainSuffix)) {
++				// In case of legacy_domain, username is email
 +				$uid = $email;
-+			} else if (!empty($altMailDomainSuffix) && stristr($email, $altMailDomainSuffix) !== FALSE) {
-+				// In case of alt_mail_domain, username is email without domain suffix
-+				$uid =  str_replace($altMailDomainSuffix, '', $email);
++			} else if (!empty($mainDomainSuffix) && str_ends_with($email, $mainDomainSuffix)) {
++				// In case of main_domain, username is email without domain suffix
++				$uid =  str_replace($mainDomainSuffix, '', $email);
 +			}
 +			// If no match of domain, no user
 +			if(!empty($uid)) {
 +				$users = [$this->get($uid)];
 +			}
 +		}
- 
  		return array_values(array_filter($users, function ($u) {
  			return ($u instanceof IUser);
+ 		}));
-- 
GitLab


From 81344fe040c3917d915008206112150356209b78 Mon Sep 17 00:00:00 2001
From: Akhil <akhil@e.email>
Date: Tue, 9 May 2023 12:56:13 +0530
Subject: [PATCH 43/49] Update app versions

---
 Dockerfile | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index f1fdc198..1c4e53e0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,17 +3,17 @@ ARG BASE_DIR="/usr/src/nextcloud"
 ARG TMP_PATCH_DIR="/tmp/build_patches"
 ARG THEME_HELPER_JOB_ID="578040"
 ARG NOTES_VERSION="4.7.2"
-ARG CONTACTS_JOB_ID="577585"
-ARG CALENDAR_JOB_ID="577595"
-ARG EMAIL_RECOVERY_JOB_ID="576777"
-ARG EA_JOB_ID="575530"
-ARG LAUNCHER_JOB_ID="575632"
+ARG CONTACTS_JOB_ID="582012"
+ARG CALENDAR_JOB_ID="582001"
+ARG EMAIL_RECOVERY_JOB_ID="582038"
+ARG EA_JOB_ID="582028"
+ARG LAUNCHER_JOB_ID="582054"
 ARG GOOGLE_INTEGRATION_VERSION="1.0.9"
-ARG DASHBOARD_JOB_ID="576050"
+ARG DASHBOARD_JOB_ID="582062"
 ARG SNAPPY_VERSION="2.27.2"
 ARG SNAPPY_THEME_VERSION="1.2.7"
 
-RUN sed -i 's/25,0,6,1/25,0,6,2/' ${BASE_DIR}/version.php
+RUN sed -i 's/25,0,6,1/25,0,6,3/' ${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
@@ -159,7 +159,7 @@ ARG BASE_DIR="/usr/src/nextcloud"
 ARG TMP_PATCH_DIR="/tmp/build_patches"
 ARG THEME_VERSION="main"
 ARG LDAP_WRITE_SUPPORT_VERSION="1.7.0"
-ARG OIDC_LOGIN_VERSION="2.5.0"
+ARG OIDC_LOGIN_VERSION="2.5.1"
 
 # Patches
 COPY patches/ ${TMP_PATCH_DIR}/
-- 
GitLab


From 37a38c6f8cdf6ad9e7771e91973bc9fd487da7f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arnau=20V=C3=A0zquez?= <arnauvp@e.email>
Date: Tue, 9 May 2023 07:59:14 +0000
Subject: [PATCH 44/49] Add slash to end of NC docs URL

---
 patches/009-help-links.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/patches/009-help-links.patch b/patches/009-help-links.patch
index b9251db7..d414f91c 100644
--- a/patches/009-help-links.patch
+++ b/patches/009-help-links.patch
@@ -26,7 +26,7 @@ help links are shown
 -} ?>" <?php if ($_['mode'] === 'user') { print_unescaped('aria-current="page"'); } ?>
 -				href="<?php print_unescaped($_['urlUserDocs']); ?>">
 +			<a class="icon-user"
-+				href="https://docs.nextcloud.com/server/<?php print_unescaped($_['ncVersion']); ?>/user_manual/en" target="_blank" rel="noreferrer noopener">
++				href="https://docs.nextcloud.com/server/<?php print_unescaped($_['ncVersion']); ?>/user_manual/en/" target="_blank" rel="noreferrer noopener">
  				<span class="help-list__text">
 -					<?php p($l->t('User documentation')); ?>
 +					<?php p('Nextcloud ' . $_['ncVersion'] . ' ' . $l->t('User documentation')); ?> ↗
-- 
GitLab


From f91d32c3a57665789b63d249e53af2eab6ccb4fc Mon Sep 17 00:00:00 2001
From: Akhil <akhil@e.email>
Date: Tue, 9 May 2023 15:57:19 +0530
Subject: [PATCH 45/49] Add patch for displayname leak during search

---
 Dockerfile                                  |  3 ++-
 patches/027-displayname-user-leak-dav.patch | 18 ++++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 patches/027-displayname-user-leak-dav.patch

diff --git a/Dockerfile b/Dockerfile
index 1c4e53e0..b1ba8f3c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -125,6 +125,7 @@ RUN patch -u ${BASE_DIR}/apps/settings/lib/Sections/Personal/Groupware.php -i ${
 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 patch -u ${BASE_DIR}/apps/dav/lib/CalDAV/Reminder/ReminderService.php -i ${TMP_PATCH_DIR}/024-reminder-service-handle-exception.patch
+RUN patch -u ${BASE_DIR}/apps/theming/lib/Themes/CommonThemeTrait.php -i ${TMP_PATCH_DIR}/026-primary-color-fix.patch
 
 RUN rm -rf ${TMP_PATCH_DIR}
 
@@ -170,7 +171,7 @@ RUN patch -u ${BASE_DIR}/core/templates/layout.guest.php -i ${TMP_PATCH_DIR}/016
 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
-RUN patch -u ${BASE_DIR}/apps/theming/lib/Themes/CommonThemeTrait.php -i ${TMP_PATCH_DIR}/026-primary-color-fix.patch
+RUN patch -u ${BASE_DIR}/apps/dav/lib/Connector/Sabre/Principal.php -i ${TMP_PATCH_DIR}/027-displayname-user-leak-dav.patch
 RUN rm -rf ${TMP_PATCH_DIR}
 
 RUN curl -fsSL -o ldap_write_support.tar.gz \
diff --git a/patches/027-displayname-user-leak-dav.patch b/patches/027-displayname-user-leak-dav.patch
new file mode 100644
index 00000000..329de5ea
--- /dev/null
+++ b/patches/027-displayname-user-leak-dav.patch
@@ -0,0 +1,18 @@
+From: akhil <akhil.potukuchi.ext@murena.com>
+Date: Tue, 09 May 2023 15:50:00 +0530
+Subject: [PATCH] Don't return results when searching by display name
+
+This patch(along with the right settings in the admin section "sharing") ensures that DAV searches are done only on the full email address 
+of the user and not on the display name property
+
+--- ./apps/dav/lib/Connector/Sabre/Principal.php	2023-05-09 15:49:02.397783639 +0530
++++ ./apps/dav/lib/Connector/Sabre/Principal-new.php	2023-05-09 15:49:56.555305986 +0530
+@@ -358,7 +358,7 @@
+ 					if (!$allowEnumeration) {
+ 						if ($allowEnumerationFullMatch) {
+ 							$lowerSearch = strtolower($value);
+-							$users = $this->userManager->searchDisplayName($value, $searchLimit);
++							$users = [];
+ 							$users = \array_filter($users, static function (IUser $user) use ($lowerSearch, $ignoreSecondDisplayName) {
+ 								$lowerDisplayName = strtolower($user->getDisplayName());
+ 								return $lowerDisplayName === $lowerSearch || ($ignoreSecondDisplayName && trim(preg_replace('/ \(.*\)$/', '', $lowerDisplayName)) === $lowerSearch);
-- 
GitLab


From ec445f9f7acb456583ebc33aaa5f229e7ad43d4c Mon Sep 17 00:00:00 2001
From: Akhil <akhil@e.email>
Date: Tue, 9 May 2023 18:21:53 +0530
Subject: [PATCH 46/49] Update theme version

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index b1ba8f3c..b6c75991 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -158,7 +158,7 @@ RUN sed -i 's/this.appLimit=e/this.appLimit=this.appList.length/' ${BASE_DIR}/di
 From selfhost as ecloud
 ARG BASE_DIR="/usr/src/nextcloud"
 ARG TMP_PATCH_DIR="/tmp/build_patches"
-ARG THEME_VERSION="main"
+ARG THEME_VERSION="25.0.6"
 ARG LDAP_WRITE_SUPPORT_VERSION="1.7.0"
 ARG OIDC_LOGIN_VERSION="2.5.1"
 
-- 
GitLab


From 099b2fe73a6a0911df67dfb70330ceef91fd1895 Mon Sep 17 00:00:00 2001
From: Akhil <akhil@e.email>
Date: Tue, 9 May 2023 18:22:44 +0530
Subject: [PATCH 47/49] Update theme helper job ID

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index b6c75991..a2ba11c7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 FROM nextcloud:25.0.6-fpm AS nextcloud
 ARG BASE_DIR="/usr/src/nextcloud"
 ARG TMP_PATCH_DIR="/tmp/build_patches"
-ARG THEME_HELPER_JOB_ID="578040"
+ARG THEME_HELPER_JOB_ID="582464"
 ARG NOTES_VERSION="4.7.2"
 ARG CONTACTS_JOB_ID="582012"
 ARG CALENDAR_JOB_ID="582001"
-- 
GitLab


From b13e648cfc4a17385e22e65cd58dcb0be3ef519b Mon Sep 17 00:00:00 2001
From: Nivesh Krishna <nivesh@e.email>
Date: Tue, 9 May 2023 21:25:57 +0530
Subject: [PATCH 48/49] create snappymail dir

---
 Dockerfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index a2ba11c7..9fc5089f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -87,7 +87,8 @@ RUN sed -i 's/logo-white-64x64.png/app.svg/' ${BASE_DIR}/custom_apps/snappymail/
 RUN curl -fsSL -o Murena-snappymail-theme.tar.gz \
     "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/snappymail-theme/-/archive/${SNAPPY_THEME_VERSION}/snappymail-theme-${SNAPPY_THEME_VERSION}.tar.gz" && \
     tar -xf Murena-snappymail-theme.tar.gz -C /tmp/ && \
-    mv /tmp/snappymail-theme-${SNAPPY_THEME_VERSION}/ ${BASE_DIR}/themes/Murena && \
+    mkdir -p ${BASE_DIR}/themes/Murena/snappymail && \
+    mv /tmp/snappymail-theme-${SNAPPY_THEME_VERSION}/ ${BASE_DIR}/themes/Murena/snappymail && \
     chown -R www-data:www-data ${BASE_DIR}/themes/Murena/ && \
     rm -rf Murena-snappymail-theme.tar.gz
 
-- 
GitLab


From fec09b38721d5cdff1e784120564612ddbc48e96 Mon Sep 17 00:00:00 2001
From: Akhil <akhil@e.email>
Date: Wed, 10 May 2023 12:31:36 +0530
Subject: [PATCH 49/49] Update launcher job id

---
 Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 9fc5089f..5f963a67 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,13 +7,13 @@ ARG CONTACTS_JOB_ID="582012"
 ARG CALENDAR_JOB_ID="582001"
 ARG EMAIL_RECOVERY_JOB_ID="582038"
 ARG EA_JOB_ID="582028"
-ARG LAUNCHER_JOB_ID="582054"
+ARG LAUNCHER_JOB_ID="582666"
 ARG GOOGLE_INTEGRATION_VERSION="1.0.9"
 ARG DASHBOARD_JOB_ID="582062"
 ARG SNAPPY_VERSION="2.27.2"
 ARG SNAPPY_THEME_VERSION="1.2.7"
 
-RUN sed -i 's/25,0,6,1/25,0,6,3/' ${BASE_DIR}/version.php
+RUN sed -i 's/25,0,6,1/25,0,6,4/' ${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