Fix remaining issues: CDN config, min_staff_rank defaults, blade views

- Centralize all CDN URLs in config('habbo.cdn.*') with env overrides
- Replace hardcoded CDN URLs in 12+ blade views (fancybox, sweetalert2,
  alpinejs, fontsource, fontawesome, html2canvas)
- Fix font-awesome 7.0.0 (non-existent) -> config with 6.7.0 default
- Centralize all hardcoded min_staff_rank defaults (3 and 7) to config
- Add MIN_STAFF_RANK and MIN_STAFF_RANK_LOGIN env variables
This commit is contained in:
root
2026-06-08 19:11:28 +02:00
parent b6fb43cba1
commit 0b6f14d5bf
20 changed files with 38 additions and 27 deletions
+1 -1
View File
@@ -113,7 +113,7 @@ class CreateNewUser implements CreatesNewUsers
if (! empty($discordRanks)) {
$shouldNotify = in_array($user->rank, $discordRanks);
} else {
$minStaffRank = (int) setting('min_staff_rank', 3);
$minStaffRank = (int) setting('min_staff_rank', config('habbo.defaults.min_staff_rank_login'));
$shouldNotify = $user->rank >= $minStaffRank;
}
@@ -17,7 +17,7 @@ class FurniEditorController extends Controller
{
private function checkAdmin(): void
{
if (! Auth::check() || Auth::user()->rank < (int) setting('min_staff_rank', 7)) {
if (! Auth::check() || Auth::user()->rank < (int) setting('min_staff_rank', config('habbo.defaults.min_staff_rank'))) {
abort(403, 'Forbidden');
}
}
@@ -20,7 +20,7 @@ class AdminSecurityMiddleware
}
// Check 2: Must have admin rank
$minRank = (int) setting('min_staff_rank', 7);
$minRank = (int) setting('min_staff_rank', config('habbo.defaults.min_staff_rank'));
if ($user->rank < $minRank) {
Log::warning('[Security] Unauthorized API access attempt', [
'user_id' => $user->id,
@@ -21,7 +21,7 @@ class ForceStaffTwoFactorMiddleware
'two-factor.verify',
];
if (($user->rank >= setting('min_staff_rank') && ! $user->two_factor_confirmed) && ! in_array(request()->route()?->getName(), $allowedRoutes)) {
if (($user->rank >= setting('min_staff_rank', config('habbo.defaults.min_staff_rank')) && ! $user->two_factor_confirmed) && ! in_array(request()->route()?->getName(), $allowedRoutes)) {
return to_route('settings.two-factor');
}
+1 -1
View File
@@ -16,7 +16,7 @@ class LogStaffActivity
public function terminate(Request $request, Response $response): void
{
if (auth()->check() && auth()->user()->rank >= (int) setting('min_staff_rank', 3)) {
if (auth()->check() && auth()->user()->rank >= (int) setting('min_staff_rank', config('habbo.defaults.min_staff_rank_login'))) {
$this->logRequest($request);
}
}
+1 -1
View File
@@ -10,7 +10,7 @@ class LogStaffLogin
public function handle(Login $event): void
{
$user = $event->user;
$minStaffRank = (int) setting('min_staff_rank', 3);
$minStaffRank = (int) setting('min_staff_rank', config('habbo.defaults.min_staff_rank_login'));
if ($user && $user->rank >= $minStaffRank) {
StaffActivity::logLogin($user->id);
+2 -2
View File
@@ -18,7 +18,7 @@ readonly class StaffService
return Cache::get('staff_positions');
}
$minStaffRank = (int) setting('min_staff_rank', 3);
$minStaffRank = (int) setting('min_staff_rank', config('habbo.defaults.min_staff_rank_login'));
$minRankToSeeHidden = (int) setting('min_rank_to_see_hidden_staff', 7);
$userRank = Auth::check() ? Auth::user()->rank : 0;
@@ -49,7 +49,7 @@ readonly class StaffService
return Cache::get('staff_ids');
}
$minRank = (int) setting('min_staff_rank', 3);
$minRank = (int) setting('min_staff_rank', config('habbo.defaults.min_staff_rank_login'));
$staffIds = User::query()->select('id')
->where('rank', '>=', $minRank)