From 1b84f06c8675ffcdad7a1246f3d17ae1c63d473f Mon Sep 17 00:00:00 2001
From: Hosteroid <office@hosteroid.uk>
Date: Mon, 20 Oct 2025 19:05:33 +0300
Subject: [PATCH] Refactor user ID assignment in DomainController

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().
---
 app/Controllers/DomainController.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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