From 6ad1ca2ba9c906647c5940b3b741b41d0cdef530 Mon Sep 17 00:00:00 2001 From: Michael Kaufmann Date: Thu, 7 Sep 2023 15:34:06 +0200 Subject: [PATCH] fix API permission error in navigation when customer-hide-options include 'domains'; fixes #1183 Signed-off-by: Michael Kaufmann --- lib/Froxlor/CurrentUser.php | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/lib/Froxlor/CurrentUser.php b/lib/Froxlor/CurrentUser.php index a6796b3a..25456b8c 100644 --- a/lib/Froxlor/CurrentUser.php +++ b/lib/Froxlor/CurrentUser.php @@ -154,17 +154,21 @@ class CurrentUser ]); $addition = $result['emaildomains'] != 0; } elseif ($resource == 'subdomains') { - $parentDomainCollection = (new Collection( - SubDomains::class, - $_SESSION['userinfo'], - ['sql_search' => [ - 'd.parentdomainid' => 0, - 'd.deactivated' => 0, - 'd.id' => ['op' => '<>', 'value' => $_SESSION['userinfo']['standardsubdomain']] + if (Settings::IsInList('panel.customer_hide_options', 'domains')) { + $addition = false; + } else { + $parentDomainCollection = (new Collection( + SubDomains::class, + $_SESSION['userinfo'], + ['sql_search' => [ + 'd.parentdomainid' => 0, + 'd.deactivated' => 0, + 'd.id' => ['op' => '<>', 'value' => $_SESSION['userinfo']['standardsubdomain']] + ] ] - ] - )); - $addition = $parentDomainCollection->count() != 0; + )); + $addition = $parentDomainCollection->count() != 0; + } } elseif ($resource == 'domains') { $customerCollection = (new Collection(Customers::class, $_SESSION['userinfo'])); $addition = $customerCollection->count() != 0;