diff --git a/Updated_Cms/app/Http/Middleware/MaintenanceMiddleware.php b/Updated_Cms/app/Http/Middleware/MaintenanceMiddleware.php index 7dfcc7fe8d..1283819cbe 100644 --- a/Updated_Cms/app/Http/Middleware/MaintenanceMiddleware.php +++ b/Updated_Cms/app/Http/Middleware/MaintenanceMiddleware.php @@ -13,7 +13,7 @@ class MaintenanceMiddleware { $isPostRequest = $request->method() === 'POST'; $isMaintenanceRequest = $request->is('maintenance'); - $maintenanceEnabled = setting('maintenance_enabled'); + $maintenanceEnabled = setting('maintenance_enabled') === '1'; $fortify2faRoutes = [ 'two-factor.login', @@ -29,7 +29,9 @@ class MaintenanceMiddleware return $next($request); } - if (Auth::check() && Auth::user()->rank >= setting('min_maintenance_login_rank')) { + $minRank = (int) setting('min_maintenance_login_rank'); + $user = Auth::user(); + if ($user !== null && $user->rank >= $minRank) { if ($isMaintenanceRequest) { return to_route('me.show'); } @@ -37,7 +39,7 @@ class MaintenanceMiddleware return $next($request); } - if (Auth::check() && Auth::user()->rank >= setting('min_maintenance_login_rank') && $isMaintenanceRequest) { + if ($user !== null && $user->rank >= $minRank && $isMaintenanceRequest) { return to_route('me.show'); } @@ -49,7 +51,7 @@ class MaintenanceMiddleware return to_route('welcome'); } - if ($maintenanceEnabled && ! $isMaintenanceRequest && Auth::check() && Auth::user()->rank < setting('min_maintenance_login_rank')) { + if ($maintenanceEnabled && ! $isMaintenanceRequest && $user !== null && $user->rank < $minRank) { return to_route('maintenance.show'); } diff --git a/Updated_Cms/app/Http/Middleware/RealClientIpMiddleware.php b/Updated_Cms/app/Http/Middleware/RealClientIpMiddleware.php index 0b89f6eb80..c2ca4df94f 100644 --- a/Updated_Cms/app/Http/Middleware/RealClientIpMiddleware.php +++ b/Updated_Cms/app/Http/Middleware/RealClientIpMiddleware.php @@ -7,7 +7,7 @@ use Illuminate\Http\Request; class RealClientIpMiddleware { - public function handle(Request $request, Closure $next) + public function handle(Request $request, Closure $next): \Symfony\Component\HttpFoundation\Response { $proxyHeaders = [ 'HTTP_CF_CONNECTING_IP', @@ -33,9 +33,9 @@ class RealClientIpMiddleware } // Special handling for REMOTE_ADDR with multiple IPs - $remoteAddr = \Illuminate\Support\Facades\Request::server('REMOTE_ADDR') ?? ''; - if (! empty($remoteAddr) && str_contains((string) $remoteAddr, ',')) { - [$ip] = explode(',', (string) $remoteAddr); + $remoteAddr = \Illuminate\Support\Facades\Request::server('REMOTE_ADDR'); + if (is_string($remoteAddr) && str_contains($remoteAddr, ',')) { + [$ip] = explode(',', $remoteAddr); $ip = trim($ip); if (filter_var($ip, FILTER_VALIDATE_IP)) { $request->server->set('REMOTE_ADDR', $ip); diff --git a/Updated_Cms/app/Http/Middleware/SetThemeMiddleware.php b/Updated_Cms/app/Http/Middleware/SetThemeMiddleware.php index e28a6f78f3..feaa02b475 100644 --- a/Updated_Cms/app/Http/Middleware/SetThemeMiddleware.php +++ b/Updated_Cms/app/Http/Middleware/SetThemeMiddleware.php @@ -11,10 +11,11 @@ class SetThemeMiddleware { public function handle(Request $request, Closure $next): Response { - if (setting('theme') === '' || setting('theme' === '1')) { + $theme = setting('theme'); + if ($theme === '' || $theme === '1') { Theme::set('atom'); } else { - Theme::set(setting('theme')); + Theme::set($theme); } return $next($request); diff --git a/Updated_Cms/app/Http/Middleware/VPNCheckerMiddleware.php b/Updated_Cms/app/Http/Middleware/VPNCheckerMiddleware.php index 116d048cf3..6f180bb47c 100644 --- a/Updated_Cms/app/Http/Middleware/VPNCheckerMiddleware.php +++ b/Updated_Cms/app/Http/Middleware/VPNCheckerMiddleware.php @@ -19,7 +19,7 @@ class VPNCheckerMiddleware } // Skip check if the rank is allowed to bypass the checker - if (hasPermission('bypass_vpn') !== '' && hasPermission('bypass_vpn') !== '0') { + if (hasPermission('bypass_vpn')) { return $next($request); } diff --git a/Updated_Cms/storage/logs/laravel.log b/Updated_Cms/storage/logs/laravel.log index c4f5faec99..827d663841 100644 --- a/Updated_Cms/storage/logs/laravel.log +++ b/Updated_Cms/storage/logs/laravel.log @@ -57,3 +57,5 @@ [2026-01-19 20:59:57] production.ERROR: RCON connection failed: Kan geen verbinding maken omdat de doelcomputer de verbinding actief heeft geweigerd [2026-01-19 20:59:57] production.ERROR: RCON connection failed: Kan geen verbinding maken omdat de doelcomputer de verbinding actief heeft geweigerd [2026-01-19 21:09:39] production.ERROR: RCON connection failed: Kan geen verbinding maken omdat de doelcomputer de verbinding actief heeft geweigerd +[2026-01-19 21:12:03] production.ERROR: RCON connection failed: Kan geen verbinding maken omdat de doelcomputer de verbinding actief heeft geweigerd +[2026-01-19 21:12:03] production.ERROR: RCON connection failed: Kan geen verbinding maken omdat de doelcomputer de verbinding actief heeft geweigerd