From d5fe88803e6d80e83db3a2f925eb518aa8a89520 Mon Sep 17 00:00:00 2001 From: Akhil Date: Wed, 11 Feb 2026 18:03:51 +0530 Subject: [PATCH 1/3] (fix) remove contacts related patches --- Dockerfile | 2 -- patches/003-contact-search-removal.patch | 17 ----------------- ...004-contact-search-controller-removal.patch | 18 ------------------ 3 files changed, 37 deletions(-) delete mode 100644 patches/003-contact-search-removal.patch delete mode 100644 patches/004-contact-search-controller-removal.patch diff --git a/Dockerfile b/Dockerfile index e302454..f5e1aa5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -163,8 +163,6 @@ 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 diff --git a/patches/003-contact-search-removal.patch b/patches/003-contact-search-removal.patch deleted file mode 100644 index aef513a..0000000 --- a/patches/003-contact-search-removal.patch +++ /dev/null @@ -1,17 +0,0 @@ -From: diroots -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 @@ -
- -
--
-
-
- diff --git a/patches/004-contact-search-controller-removal.patch b/patches/004-contact-search-controller-removal.patch deleted file mode 100644 index f8e49e4..0000000 --- a/patches/004-contact-search-controller-removal.patch +++ /dev/null @@ -1,18 +0,0 @@ -From: diroots -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 []; - } - - /** -- GitLab From e35e20b762e7eaad6bf6fbb10bd62c05e28fc519 Mon Sep 17 00:00:00 2001 From: Akhil Date: Wed, 11 Feb 2026 18:40:52 +0530 Subject: [PATCH 2/3] (fix) remove contacts menu again --- Dockerfile | 2 ++ patches/003-contacts-search-removal.patch | 17 +++++++++++++++++ ...04-contacts-search-controller-removal.patch | 18 ++++++++++++++++++ 3 files changed, 37 insertions(+) create mode 100644 patches/003-contacts-search-removal.patch create mode 100644 patches/004-contacts-search-controller-removal.patch diff --git a/Dockerfile b/Dockerfile index f5e1aa5..e302454 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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 diff --git a/patches/003-contacts-search-removal.patch b/patches/003-contacts-search-removal.patch new file mode 100644 index 0000000..aef513a --- /dev/null +++ b/patches/003-contacts-search-removal.patch @@ -0,0 +1,17 @@ +From: diroots +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 @@ +
+ +
+-
+
+
+ diff --git a/patches/004-contacts-search-controller-removal.patch b/patches/004-contacts-search-controller-removal.patch new file mode 100644 index 0000000..3a0c613 --- /dev/null +++ b/patches/004-contacts-search-controller-removal.patch @@ -0,0 +1,18 @@ +From: diroots +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' => []]; + } + + /** -- GitLab From db51650aa6a0836926855b629926a182dbc4deea Mon Sep 17 00:00:00 2001 From: Akhil Date: Wed, 11 Feb 2026 18:41:53 +0530 Subject: [PATCH 3/3] (fix) rename patch names correctly --- ...acts-search-removal.patch => 003-contact-search-removal.patch} | 0 ...-removal.patch => 004-contact-search-controller-removal.patch} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename patches/{003-contacts-search-removal.patch => 003-contact-search-removal.patch} (100%) rename patches/{004-contacts-search-controller-removal.patch => 004-contact-search-controller-removal.patch} (100%) diff --git a/patches/003-contacts-search-removal.patch b/patches/003-contact-search-removal.patch similarity index 100% rename from patches/003-contacts-search-removal.patch rename to patches/003-contact-search-removal.patch diff --git a/patches/004-contacts-search-controller-removal.patch b/patches/004-contact-search-controller-removal.patch similarity index 100% rename from patches/004-contacts-search-controller-removal.patch rename to patches/004-contact-search-controller-removal.patch -- GitLab