fix(offset): applied offset corrections to more additional patches(3) (0fe27291) · Commits · e / infra / ecloud / nextcloud

patches/020-fairuse-notification-fix.patch

+1 −1

Original line number	Diff line number	Diff line
		--- 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
		@@ -285,18 +285,7 @@
		@@ -272,18 +272,7 @@
		* {@inheritDoc}
		*/
		public function isFairUseOfFreePushService(): bool {

+4 −4

Original line number	Diff line number	Diff line
		@@ -4,7 +4,7 @@ Subject: [PATCH] This patch optimize the ldap checkPassword function to reduce n

		--- ./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
		@@ -107,11 +107,12 @@
		@@ -76,11 +76,12 @@
		* @return string\|false
		* @throws \Exception
		*/
		@@ -19,7 +19,7 @@ Subject: [PATCH] This patch optimize the ldap checkPassword function to reduce n
		return $username;
		}

		@@ -126,6 +127,9 @@
		@@ -96,6 +97,9 @@
		}
		$username = $user->getUsername();
		$this->access->connection->writeToCache($cacheKey, $username);
		@@ -29,7 +29,7 @@ Subject: [PATCH] This patch optimize the ldap checkPassword function to reduce n
		return $username;
		} catch (NotOnLDAP $e) {
		$this->access->connection->writeToCache($cacheKey, false);
		@@ -169,16 +173,11 @@
		@@ -142,16 +146,11 @@
		* @return false\|string
		*/
		public function checkPassword($uid, $password) {
		@@ -49,7 +49,7 @@ Subject: [PATCH] This patch optimize the ldap checkPassword function to reduce n
		$user = $this->access->userManager->get($dn);

		if (!$user instanceof User) {
		@@ -196,7 +195,6 @@
		@@ -164,7 +163,6 @@
		}

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -4,7 +4,7 @@ Subject: [PATCH] To optimize getByEmail as we have boundary conditions that emai

		--- ./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
		@@ -679,12 +679,33 @@
		@@ -653,12 +653,33 @@
		*/
		public function getByEmail($email) {
		// looking for 'email' only (and not primary_mail) is intentional

+1 −1

Original line number	Diff line number	Diff line
		@@ -7,7 +7,7 @@ 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
		@@ -364,7 +364,7 @@
		@@ -334,7 +334,7 @@
		if (!$allowEnumeration) {
		if ($allowEnumerationFullMatch) {
		$lowerSearch = strtolower($value);

+3 −3

Original line number	Diff line number	Diff line
		--- ./apps/provisioning_api/lib/Controller/UsersController.php 2025-06-10 18:21:13.822570507 +0600
		+++ ./apps/provisioning_api/lib/Controller/UsersController-new.php 2025-06-16 18:43:19.135040688 +0600
		@@ -783,7 +783,7 @@
		@@ -757,7 +757,7 @@
		$permittedFields[] = IAccountManager::PROPERTY_EMAIL;
		}

		@@ -9,7 +9,7 @@
		$permittedFields[] = IAccountManager::PROPERTY_PHONE;
		$permittedFields[] = IAccountManager::PROPERTY_ADDRESS;
		$permittedFields[] = IAccountManager::PROPERTY_WEBSITE;
		@@ -840,8 +840,8 @@
		@@ -813,8 +813,8 @@
		$permittedFields = [];
		if ($targetUser->getUID() === $currentLoggedInUser->getUID()) {
		// Editing self (display, email)
		@@ -20,7 +20,7 @@
		} else {
		// Check if admin / subadmin
		if ($isAdminOrSubadmin \|\| $isDelegatedAdmin && !$this->groupManager->isInGroup($targetUser->getUID(), 'admin')) {
		@@ -947,9 +947,9 @@
		@@ -919,9 +919,9 @@
		}

		$permittedFields[] = IAccountManager::PROPERTY_DISPLAYNAME . self::SCOPE_SUFFIX;