Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c5084ce1 authored by Fahim Salam Chowdhury's avatar Fahim Salam Chowdhury 👽
Browse files

fix: patch-029 for nc32 upgrade

parent 458a157d
Loading
Loading
Loading
Loading
Loading
+6 −11
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
@@ -757,7 +757,7 @@
--- ./apps/provisioning_api/lib/Controller/UsersController.php	2026-03-23 17:46:38.042005199 +0600
+++ ./apps/provisioning_api/lib/Controller/UsersController-new.php	2026-03-24 11:20:14.469922604 +0600
@@ -783,7 +783,6 @@
 			$permittedFields[] = IAccountManager::PROPERTY_EMAIL;
 		}
 
-		$permittedFields[] = IAccountManager::COLLECTION_EMAIL;
+		// $permittedFields[] = IAccountManager::COLLECTION_EMAIL;
 		$permittedFields[] = IAccountManager::PROPERTY_PHONE;
 		$permittedFields[] = IAccountManager::PROPERTY_ADDRESS;
 		$permittedFields[] = IAccountManager::PROPERTY_WEBSITE;
@@ -813,8 +813,8 @@
@@ -841,8 +840,6 @@
 		$permittedFields = [];
 		if ($targetUser->getUID() === $currentLoggedInUser->getUID()) {
 			// Editing self (display, email)
-			$permittedFields[] = IAccountManager::COLLECTION_EMAIL;
-			$permittedFields[] = IAccountManager::COLLECTION_EMAIL . self::SCOPE_SUFFIX;
+			// $permittedFields[] = IAccountManager::COLLECTION_EMAIL;
+			// $permittedFields[] = IAccountManager::COLLECTION_EMAIL . self::SCOPE_SUFFIX;
 		} else {
 			// Check if admin / subadmin
 			if ($isAdminOrSubadmin || $isDelegatedAdmin && !$this->groupManager->isInGroup($targetUser->getUID(), 'admin')) {
@@ -919,9 +919,9 @@
@@ -948,9 +945,6 @@
 			}
 
 			$permittedFields[] = IAccountManager::PROPERTY_DISPLAYNAME . self::SCOPE_SUFFIX;
-			$permittedFields[] = IAccountManager::PROPERTY_EMAIL . self::SCOPE_SUFFIX;
+			//$permittedFields[] = IAccountManager::PROPERTY_EMAIL . self::SCOPE_SUFFIX;
 
-
-			$permittedFields[] = IAccountManager::COLLECTION_EMAIL;
+			//$permittedFields[] = IAccountManager::COLLECTION_EMAIL;
 
 			$permittedFields[] = self::USER_FIELD_PASSWORD;
 			$permittedFields[] = self::USER_FIELD_NOTIFICATION_EMAIL;