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

Commit ab0f87fb authored by AVINASH GUSAIN's avatar AVINASH GUSAIN
Browse files

fix: apply patches with offset adjustments

parent 9e9f7c13
Loading
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -7,8 +7,8 @@ This patch removes some results from the contact menu controller, not to leak us
diff --git ContactsMenuController.php ContactsMenuController-new.php
--- ./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
@@ -50,7 +50,7 @@
 	 */
@@ -32,7 +32,7 @@
 	#[NoAdminRequired]
 	#[FrontpageRoute(verb: 'POST', url: '/contactsmenu/contacts')]
 	public function index(?string $filter = null): array {
-		return $this->manager->getEntries($this->userSession->getUser(), $filter);
+7 −7
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
@@ -721,7 +721,7 @@
@@ -783,7 +783,7 @@
 			$permittedFields[] = IAccountManager::PROPERTY_EMAIL;
 		}
 
@@ -9,7 +9,7 @@
 		$permittedFields[] = IAccountManager::PROPERTY_PHONE;
 		$permittedFields[] = IAccountManager::PROPERTY_ADDRESS;
 		$permittedFields[] = IAccountManager::PROPERTY_WEBSITE;
@@ -776,8 +776,8 @@
@@ -840,8 +840,8 @@
 		$permittedFields = [];
 		if ($targetUser->getUID() === $currentLoggedInUser->getUID()) {
 			// Editing self (display, email)
@@ -19,8 +19,8 @@
+			// $permittedFields[] = IAccountManager::COLLECTION_EMAIL . self::SCOPE_SUFFIX;
 		} else {
 			// Check if admin / subadmin
 			if ($isAdminOrSubadmin) {
@@ -879,9 +879,9 @@
 			if ($isAdminOrSubadmin || $isDelegatedAdmin && !$this->groupManager->isInGroup($targetUser->getUID(), 'admin')) {
@@ -947,9 +947,9 @@
 			}
 
 			$permittedFields[] = IAccountManager::PROPERTY_DISPLAYNAME . self::SCOPE_SUFFIX;