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

Commit e35e20b7 authored by Akhil's avatar Akhil 🙂
Browse files

(fix) remove contacts menu again

parent d5fe8880

Dockerfile

+2 −0
Original line number Diff line number Diff line
@@ -163,6 +163,8 @@ RUN curl -fsSL -o ldap_write_support.tar.gz \ 


# Patches

COPY patches/ ${TMP_PATCH_DIR}/

RUN patch -u ${BASE_DIR}/core/templates/layout.user.php -i ${TMP_PATCH_DIR}/003-contact-search-removal.patch

RUN patch -u ${BASE_DIR}/core/Controller/ContactsMenuController.php -i ${TMP_PATCH_DIR}/004-contact-search-controller-removal.patch

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

patches/003-contacts-search-removal.patch

0 → 100644
+17 −0
Original line number Diff line number Diff line 
From: diroots <diroots@e.email>

Date: Tue, 02 Feb 2021 16:47:33 +0100

Subject: [PATCH] remove user search icon in header tab



This patch removes the top right icon enabling the global user search function available to all in nextcloud.



diff --git layout.user.php layout.user.php-new

--- ./core/templates/layout.user.php	2023-03-28 14:54:05.873566570 +0530

+++ ./core/templates/layout.user-new.php	2023-03-28 14:54:35.044218831 +0530

@@ -76,7 +76,6 @@

 			<div class="header-right">

 				<div id="unified-search"></div>

 				<div id="notifications"></div>

-				<div id="contactsmenu"></div>

 				<div id="user-menu"></div>

 			</div>

 		</header>

patches/004-contacts-search-controller-removal.patch

0 → 100644
+18 −0
Original line number Diff line number Diff line 
From: diroots <diroots@e.email>

Date: Thu, 04 Feb 2021 10:30:13 +0100

Subject: [PATCH] do not return  these results in user search



This patch removes some results from the contact menu controller, not to leak user informations



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

@@ -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);

+		return ['contactsEnabled' => \OC::$server->getAppManager()->isEnabledForUser('contacts', $this->userSession->getUser()), 'contacts' => []];

 	}

 

 	/**