sed fixes for NC 31

RUN patch -u ${BASE_DIR}/lib/private/Template/JSResourceLocator.php -i ${TMP_PATCH_DIR}/031-theme-custom-app-translations.patch

RUN patch -u ${BASE_DIR}/lib/private/L10N/Factory.php -i ${TMP_PATCH_DIR}/032-select-lang-from-session.patch

# UserConfigChangedEvent Ref: https://github.com/nextcloud/server/pull/42039

#RUN cd ${BASE_DIR} && patch -p1 < ${TMP_PATCH_DIR}/036-user-config-change-event.patch

RUN cd ${BASE_DIR} && patch -p1 < ${TMP_PATCH_DIR}/036-user-config-change-event.patch

RUN rm -rf ${TMP_PATCH_DIR}

# Fix total quota value for users in settings and files

RUN sed -i "s/'total'/'quota'/" ${BASE_DIR}/apps/settings/lib/Settings/Personal/PersonalInfo.php

#RUN sed -i "s/\['total'\]/\['quota'\]/" ${BASE_DIR}/apps/provisioning_api/lib/Controller/AUserData.php

RUN sed -i "s/\['total'\]/\['quota'\]/" ${BASE_DIR}/apps/provisioning_api/lib/Controller/AUserDataOCSController.php

# Fix API call in files script

# Fix API call in files script -Not needed in NC 31

#RUN sed -i "s/ajax\/getstoragestats/api\/v1\/stats/g" ${BASE_DIR}/apps/files/js/files.js

From selfhost as ecloud

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 cd ${BASE_DIR} && patch -u ${BASE_DIR}/apps/user_ldap/lib/User_LDAP.php -i ${TMP_PATCH_DIR}/023-ldap-check-pwd-optimization.patch

#RUN cd ${BASE_DIR} && patch -u ${BASE_DIR}/apps/user_ldap/lib/User_LDAP.php -i ${TMP_PATCH_DIR}/023-ldap-check-pwd-optimization.patch - already added in nc31

RUN patch -u ${BASE_DIR}/lib/private/User/Manager.php -i ${TMP_PATCH_DIR}/025-optimize-get-by-email.patch

RUN patch -u ${BASE_DIR}/apps/dav/lib/Connector/Sabre/Principal.php -i ${TMP_PATCH_DIR}/027-displayname-user-leak-dav.patch

RUN patch -u ${BASE_DIR}/apps/dav/lib/HookManager.php -i ${TMP_PATCH_DIR}/028-default-task-calendar.patch

# RUN cd ${BASE_DIR}/dist && sed -i 's/resetPassword:!1/resetPassword:!1||Z.showResetPassword==="1"/' core-login.js

# add attr about how many notifications to notif icon

#RUN sed -i 's/attrs:{id:"notifications",/attrs:{id:"notifications","data-has-notifications":0!==u.notifications.length,/' ${BASE_DIR}/apps/notifications/js/NotificationsApp-DS2Cdf60.chunk.mjs

RUN sed -i 's/attrs:{id:"notifications",/attrs:{id:"notifications","data-has-notifications":0!==u.notifications.length,/' ${BASE_DIR}/apps/notifications/js/NotificationsApp-BLfRaKfb.chunk.mjs 

# Rename Memories to Gallery

RUN sed -i 's/<name>Memories<\/name>/<name>Gallery<\/name>/g' ${BASE_DIR}/custom_apps/memories/appinfo/info.xml

From: Akhil <akhil@e.email>

Date: Wed, 04 Jan 2023 16:24 +0530

Subject: [PATCH] This patch optimize the ldap checkPassword function to reduce number of LDAP binds and SQL UPDATE operations per password check

--- ./apps/user_ldap/lib/User_LDAP.php	2023-01-04 16:20:02.747181606 +0530

+++ ./apps/user_ldap/lib/User_LDAP-new.php	2023-01-17 19:22:51.776857415 +0530

@@ -76,11 +76,12 @@

 	 * @return string|false

 	 * @throws \Exception

 	 */

-	public function loginName2UserName($loginName) {

+	public function loginName2UserName($loginName, bool $forceLdapRefetch = false) {

 		$cacheKey = 'loginName2UserName-' . $loginName;

 		$username = $this->access->connection->getFromCache($cacheKey);

-		if ($username !== null) {

+		$ignoreCache = ($username === false && $forceLdapRefetch);

+		if ($username !== null && !$ignoreCache) {

 			return $username;

 		}

@@ -96,6 +97,9 @@

 			}

 			$username = $user->getUsername();

 			$this->access->connection->writeToCache($cacheKey, $username);

+			if($forceLdapRefetch) {

+				$user->processAttributes($ldapRecord);

+			}

 			return $username;

 		} catch (NotOnLDAP $e) {

 			$this->access->connection->writeToCache($cacheKey, false);

@@ -142,16 +146,11 @@

 	 * @return false|string

 	 */

 	public function checkPassword($uid, $password) {

-		try {

-			$ldapRecord = $this->getLDAPUserByLoginName($uid);

-		} catch (NotOnLDAP $e) {

-			$this->logger->debug(

-				$e->getMessage(),

-				['app' => 'user_ldap', 'exception' => $e]

-			);

+		$username = $this->loginName2UserName($uid, true);

+		if(!$username) {

 			return false;

 		}

-		$dn = $ldapRecord['dn'][0];

+		$dn = $this->access->username2dn($username);

 		$user = $this->access->userManager->get($dn);

 		if (!$user instanceof User) {

@@ -164,7 +163,6 @@

 			}

 			$this->access->cacheUserExists($user->getUsername());

-			$user->processAttributes($ldapRecord);

 			$user->markLogin();

 			return $user->getUsername();