remco/Epicnabbo-Catalogus-Updated-Daily
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🆙 More fixes🆙

Browse Source
This commit is contained in:
Remco
2026-01-19 22:14:07 +01:00
parent 5aefd89f1b
commit e561acb897
5 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Updated_Cms/app/Http/Middleware/MaintenanceMiddleware.php
+6 -4
View File
@@ -13,7 +13,7 @@ class MaintenanceMiddleware
{ {
$isPostRequest = $request->method() === 'POST'; $isPostRequest = $request->method() === 'POST';
$isMaintenanceRequest = $request->is('maintenance'); $isMaintenanceRequest = $request->is('maintenance');
$maintenanceEnabled = setting('maintenance_enabled'); $maintenanceEnabled = setting('maintenance_enabled') === '1';
$fortify2faRoutes = [ $fortify2faRoutes = [
'two-factor.login', 'two-factor.login',
@@ -29,7 +29,9 @@ class MaintenanceMiddleware
return $next($request); 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) { if ($isMaintenanceRequest) {
return to_route('me.show'); return to_route('me.show');
} }
@@ -37,7 +39,7 @@ class MaintenanceMiddleware
return $next($request); 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'); return to_route('me.show');
} }
@@ -49,7 +51,7 @@ class MaintenanceMiddleware
return to_route('welcome'); 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'); return to_route('maintenance.show');
} }
Updated_Cms/app/Http/Middleware/RealClientIpMiddleware.php
+4 -4
View File
@@ -7,7 +7,7 @@ use Illuminate\Http\Request;
class RealClientIpMiddleware class RealClientIpMiddleware
{ {
public function handle(Request $request, Closure $next) public function handle(Request $request, Closure $next): \Symfony\Component\HttpFoundation\Response
{ {
$proxyHeaders = [ $proxyHeaders = [
'HTTP_CF_CONNECTING_IP', 'HTTP_CF_CONNECTING_IP',
@@ -33,9 +33,9 @@ class RealClientIpMiddleware
} }
// Special handling for REMOTE_ADDR with multiple IPs // Special handling for REMOTE_ADDR with multiple IPs
$remoteAddr = \Illuminate\Support\Facades\Request::server('REMOTE_ADDR') ?? ''; $remoteAddr = \Illuminate\Support\Facades\Request::server('REMOTE_ADDR');
if (! empty($remoteAddr) && str_contains((string) $remoteAddr, ',')) { if (is_string($remoteAddr) && str_contains($remoteAddr, ',')) {
[$ip] = explode(',', (string) $remoteAddr); [$ip] = explode(',', $remoteAddr);
$ip = trim($ip); $ip = trim($ip);
if (filter_var($ip, FILTER_VALIDATE_IP)) { if (filter_var($ip, FILTER_VALIDATE_IP)) {
$request->server->set('REMOTE_ADDR', $ip); $request->server->set('REMOTE_ADDR', $ip);
Updated_Cms/app/Http/Middleware/SetThemeMiddleware.php
+3 -2
View File
@@ -11,10 +11,11 @@ class SetThemeMiddleware
{ {
public function handle(Request $request, Closure $next): Response public function handle(Request $request, Closure $next): Response
{ {
if (setting('theme') === '' || setting('theme' === '1')) { $theme = setting('theme');
if ($theme === '' || $theme === '1') {
Theme::set('atom'); Theme::set('atom');
} else { } else {
Theme::set(setting('theme')); Theme::set($theme);
} }
return $next($request); return $next($request);
Updated_Cms/app/Http/Middleware/VPNCheckerMiddleware.php
+1 -1
View File
@@ -19,7 +19,7 @@ class VPNCheckerMiddleware
} }
// Skip check if the rank is allowed to bypass the checker // 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); return $next($request);
} }
Updated_Cms/storage/logs/laravel.log
+2
View File
@@ -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 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: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