fix: patched with offset adjustments due to upstream changes

diff --git ./core/Controller/LoginController.php ./core/Controller/LoginController-new.php

--- ./core/Controller/LoginController.php	2024-04-26 15:08:54.979407062 +0530

+++ ./core/Controller/LoginController-new.php	2024-04-26 15:16:48.582366408 +0530

@@ -340,6 +340,26 @@

 				$this->l10n->t('Unsupported email length (>255)')

@@ -315,6 +315,27 @@

 			);

 		}

+		$user = mb_strtolower($user, 'UTF-8');

+		$actualUser = $user;

+		$legacyDomain = $this->config->getSystemValue('legacy_domain', '');

+		if (!$this->userManager->userExists($user)) {

+			$user = $user . $legacyDomainSuffix;

+		}

+

 		$data = new LoginData(

 			$this->request,

@@ -353,7 +373,7 @@

 			$user,

@@ -327,7 +348,7 @@

 		if (!$result->isSuccess()) {

 			return $this->createLoginFailedResponse(

 				$data->getUsername(),

 				$redirect_url,

 				$result->getErrorMessage()

 			);

--- ./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

@@ -69,6 +69,27 @@

@@ -48,6 +48,27 @@

 		$this->logger->debug('Converting login name to UID');

 		$uid = $loginName;

+

+        $uid = trim($uid);

+        $uid = mb_strtolower($uid, 'UTF-8');

+        $legacyDomain = \OC::$server->getConfig()->getSystemValue('legacy_domain', '');

+        if (!\OC::$server->get(\OCP\IUserManager::class)->userExists($uid)) {

+                $uid = $uid . $legacyDomainSuffix;

+        }

+

 		Util::emitHook(

 			'\OCA\Files_Sharing\API\Server2Server',

 			'preLoginNameUsedAsUserName',

--- ./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

@@ -413,6 +413,10 @@

@@ -383,6 +383,10 @@

 		$remoteAddress = $request->getRemoteAddress();

 		$currentDelay = $throttler->sleepDelayOrThrowOnMax($remoteAddress, 'login');

--- ./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

@@ -151,8 +151,23 @@

 	 */

@@ -126,7 +126,24 @@

 	protected function checkPasswordResetToken(string $token, string $userId): void {

 		try {

 			$user = $this->userManager->get($userId);

-			$this->verificationToken->check($token, $user, 'lostpassword', $user ? $user->getEMailAddress() : '', true);

+			$legacyDomain = $this->config->getSystemValue('legacy_domain', '');

+			$legacyDomainSuffix = !empty($legacyDomain) ? '@' . $legacyDomain : '';

+			$mainDomain = $this->config->getSystemValue('main_domain', '');

+			if(!$this->userManager->userExists($userId)) {

+				$userId = $userId . $legacyDomainSuffix;

+			}

 			$user = $this->userManager->get($userId);

-			$this->verificationToken->check($token, $user, 'lostpassword', $user ? $user->getEMailAddress() : '', true);

+			$user = $this->userManager->get($userId);

+			$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')

@@ -266,9 +281,22 @@

@@ -236,9 +253,22 @@

 	 * @throws \OCP\PreConditionNotMetException

 	 */

 	protected function sendEmail(string $input): void {

 		if (empty($email)) {

 			throw new ResetPasswordException('Could not send reset e-mail since there is no email for username ' . $input);

 		}

diff --git ./apps/settings/lib/Settings/Personal/ServerDevNotice.php ./apps/settings/lib/Settings/Personal/ServerDevNotice-new.php

--- ./apps/settings/lib/Settings/Personal/ServerDevNotice.php	2022-03-23 12:22:57.000000000 +0100

+++ ./apps/settings/lib/Settings/Personal/ServerDevNotice.php-new	2022-03-23 12:23:25.000000000 +0100

@@ -100,11 +100,7 @@

@@ -81,11 +81,7 @@

 	 * @return string|null the section ID, e.g. 'sharing'

 	 */

 	public function getSection(): ?string {

--- ./apps/settings/lib/Controller/HelpController.php	2025-03-07 11:04:18

+++ ./apps/settings/lib/Controller/HelpController-new.php	2025-03-07 11:04:21

@@ -123,6 +123,7 @@

@@ -103,6 +103,7 @@

 			'urlAdminDocs' => $urlAdminDocs,

 			'mode' => $mode,

 			'pageTitle' => $pageTitle,

--- ./apps/settings/templates/help.php	2025-03-13 21:19:20

+++ ./apps/settings/templates/help-new.php	2025-03-26 13:04:36

@@ -5,85 +5,48 @@

@@ -9,84 +9,47 @@

 	<div id="app-navigation" role="navigation" tabindex="0">

 		<ul>

 			<li>

 			</div>

 		</div>

 	</div>

-<?php endif; ?>

+<?php endif; ?>

\ No newline at end of file

--- ./apps/settings/css/help.css    2021-08-20 14:16:57.951439620 +0530

+++ ./apps/settings/css/help-new.css        2021-08-20 17:02:43.549016337 +0530

@@ -50,4 +50,12 @@

.help-content__body > .button {

 	margin: 20px;

+}

+#app-navigation:not(.vue) > ul > li > a {

+       padding: 0 12px 0 44px;

 }

 No newline at end of file

--- ./lib/private/Updater.php	2021-11-16 12:12:35.631823438 +0530

+++ ./lib/private/Updater-new.php	2021-11-16 12:14:28.445155684 +0530

@@ -272,11 +272,11 @@

@@ -240,11 +240,11 @@

 		$appManager = \OC::$server->getAppManager();

 		// upgrade appstore apps

 		// install new shipped apps on upgrade

 		$errors = Installer::installShippedApps(true);