Malin/domnitor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Respect user isolation mode when fetching groups

Browse Source 
Updated DomainController to fetch groups using getAllWithChannelCount, passing the user ID when user isolation mode is set to 'isolated'. This ensures group listings are filtered per user when isolation is enabled, improving data separation and security.
This commit is contained in:
Hosteroid
2025-10-20 18:50:32 +03:00
parent e448855687
commit 5727911656
1 changed files with 31 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
app/Controllers/DomainController.php
View File

@@ -91,7 +91,16 @@ class DomainController extends Controller
public function create()
{
$groups = $this->groupModel->all();
// Get groups based on isolation mode
$userId = \Core\Auth::id();
$settingModel = new \App\Models\Setting();
$isolationMode = $settingModel->getValue('user_isolation_mode', 'shared');
if ($isolationMode === 'isolated') {
$groups = $this->groupModel->getAllWithChannelCount($userId);
} else {
$groups = $this->groupModel->getAllWithChannelCount();
}
$this->view('domains/create', [
'groups' => $groups,
@@ -192,7 +201,16 @@ class DomainController extends Controller
return;
}
$groups = $this->groupModel->all();
// Get groups based on isolation mode
$userId = \Core\Auth::id();
$settingModel = new \App\Models\Setting();
$isolationMode = $settingModel->getValue('user_isolation_mode', 'shared');
if ($isolationMode === 'isolated') {
$groups = $this->groupModel->getAllWithChannelCount($userId);
} else {
$groups = $this->groupModel->getAllWithChannelCount();
}
$this->view('domains/edit', [
'domain' => $domain,
@@ -393,7 +411,17 @@ class DomainController extends Controller
public function bulkAdd()
{
if ($_SERVER['REQUEST_METHOD'] === 'GET') {
$groups = $this->groupModel->all();
// Get groups based on isolation mode
$userId = \Core\Auth::id();
$settingModel = new \App\Models\Setting();
$isolationMode = $settingModel->getValue('user_isolation_mode', 'shared');
if ($isolationMode === 'isolated') {
$groups = $this->groupModel->getAllWithChannelCount($userId);
} else {
$groups = $this->groupModel->getAllWithChannelCount();
}
$this->view('domains/bulk-add', [
'groups' => $groups,
'title' => 'Bulk Add Domains'