🆙 More fixes🆙

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
@@ -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');
}