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

Refactor user ID assignment in DomainController

Browse Source 
Moved the assignment of the current user ID ($userId) to the beginning of relevant methods instead of inside conditional blocks. This improves code clarity and avoids redundant calls to Auth::id().
This commit is contained in:
Hosteroid
2025-10-20 19:05:33 +03:00
parent a1211ae815
commit 1b84f06c86
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/Controllers/DomainController.php
View File

@@ -121,6 +121,7 @@ class DomainController extends Controller
$domainName = trim($_POST['domain_name'] ?? ''); $domainName = trim($_POST['domain_name'] ?? '');
$groupId = !empty($_POST['notification_group_id']) ? (int)$_POST['notification_group_id'] : null; $groupId = !empty($_POST['notification_group_id']) ? (int)$_POST['notification_group_id'] : null;
$tagsInput = trim($_POST['tags'] ?? ''); $tagsInput = trim($_POST['tags'] ?? '');
$userId = \Core\Auth::id();
// Validate // Validate
if (empty($domainName)) { if (empty($domainName)) {
@@ -147,7 +148,6 @@ class DomainController extends Controller
// Validate notification group in isolation mode // Validate notification group in isolation mode
if ($groupId) { if ($groupId) {
$userId = \Core\Auth::id();
$settingModel = new \App\Models\Setting(); $settingModel = new \App\Models\Setting();
$isolationMode = $settingModel->getValue('user_isolation_mode', 'shared'); $isolationMode = $settingModel->getValue('user_isolation_mode', 'shared');
@@ -269,6 +269,7 @@ class DomainController extends Controller
$groupId = !empty($_POST['notification_group_id']) ? (int)$_POST['notification_group_id'] : null; $groupId = !empty($_POST['notification_group_id']) ? (int)$_POST['notification_group_id'] : null;
$isActive = isset($_POST['is_active']) ? 1 : 0; $isActive = isset($_POST['is_active']) ? 1 : 0;
$tagsInput = trim($_POST['tags'] ?? ''); $tagsInput = trim($_POST['tags'] ?? '');
$userId = \Core\Auth::id();
// Validate tags // Validate tags
$tagValidation = \App\Helpers\InputValidator::validateTags($tagsInput); $tagValidation = \App\Helpers\InputValidator::validateTags($tagsInput);
@@ -281,7 +282,6 @@ class DomainController extends Controller
// Validate notification group in isolation mode // Validate notification group in isolation mode
if ($groupId) { if ($groupId) {
$userId = \Core\Auth::id();
$settingModel = new \App\Models\Setting(); $settingModel = new \App\Models\Setting();
$isolationMode = $settingModel->getValue('user_isolation_mode', 'shared'); $isolationMode = $settingModel->getValue('user_isolation_mode', 'shared');
@@ -480,6 +480,7 @@ class DomainController extends Controller
$domainsText = trim($_POST['domains'] ?? ''); $domainsText = trim($_POST['domains'] ?? '');
$groupId = !empty($_POST['notification_group_id']) ? (int)$_POST['notification_group_id'] : null; $groupId = !empty($_POST['notification_group_id']) ? (int)$_POST['notification_group_id'] : null;
$tagsInput = trim($_POST['tags'] ?? ''); $tagsInput = trim($_POST['tags'] ?? '');
$userId = \Core\Auth::id();
if (empty($domainsText)) { if (empty($domainsText)) {
$_SESSION['error'] = 'Please enter at least one domain'; $_SESSION['error'] = 'Please enter at least one domain';
@@ -498,7 +499,6 @@ class DomainController extends Controller
// Validate notification group in isolation mode // Validate notification group in isolation mode
if ($groupId) { if ($groupId) {
$userId = \Core\Auth::id();
$settingModel = new \App\Models\Setting(); $settingModel = new \App\Models\Setting();
$isolationMode = $settingModel->getValue('user_isolation_mode', 'shared'); $isolationMode = $settingModel->getValue('user_isolation_mode', 'shared');
@@ -701,6 +701,7 @@ class DomainController extends Controller
$domainIds = $_POST['domain_ids'] ?? []; $domainIds = $_POST['domain_ids'] ?? [];
$groupId = !empty($_POST['group_id']) ? (int)$_POST['group_id'] : null; $groupId = !empty($_POST['group_id']) ? (int)$_POST['group_id'] : null;
$userId = \Core\Auth::id();
if (empty($domainIds)) { if (empty($domainIds)) {
$_SESSION['error'] = 'No domains selected'; $_SESSION['error'] = 'No domains selected';
@@ -718,7 +719,6 @@ class DomainController extends Controller
// Validate notification group in isolation mode // Validate notification group in isolation mode
if ($groupId) { if ($groupId) {
$userId = \Core\Auth::id();
$settingModel = new \App\Models\Setting(); $settingModel = new \App\Models\Setting();
$isolationMode = $settingModel->getValue('user_isolation_mode', 'shared'); $isolationMode = $settingModel->getValue('user_isolation_mode', 'shared');