diff --git a/app/Actions/Fortify/CreateNewUser.php b/app/Actions/Fortify/CreateNewUser.php index ba5ec92..7bf9c60 100755 --- a/app/Actions/Fortify/CreateNewUser.php +++ b/app/Actions/Fortify/CreateNewUser.php @@ -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; } diff --git a/app/Http/Controllers/Api/FurniEditorController.php b/app/Http/Controllers/Api/FurniEditorController.php index 0b73f15..26fa01c 100755 --- a/app/Http/Controllers/Api/FurniEditorController.php +++ b/app/Http/Controllers/Api/FurniEditorController.php @@ -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'); } } diff --git a/app/Http/Middleware/AdminSecurityMiddleware.php b/app/Http/Middleware/AdminSecurityMiddleware.php index cb08dc7..e0a4d1d 100755 --- a/app/Http/Middleware/AdminSecurityMiddleware.php +++ b/app/Http/Middleware/AdminSecurityMiddleware.php @@ -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, diff --git a/app/Http/Middleware/ForceStaffTwoFactorMiddleware.php b/app/Http/Middleware/ForceStaffTwoFactorMiddleware.php index 97ae9b4..2cc44ca 100755 --- a/app/Http/Middleware/ForceStaffTwoFactorMiddleware.php +++ b/app/Http/Middleware/ForceStaffTwoFactorMiddleware.php @@ -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'); } diff --git a/app/Http/Middleware/LogStaffActivity.php b/app/Http/Middleware/LogStaffActivity.php index 4177f36..093ee89 100755 --- a/app/Http/Middleware/LogStaffActivity.php +++ b/app/Http/Middleware/LogStaffActivity.php @@ -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); } } diff --git a/app/Listeners/LogStaffLogin.php b/app/Listeners/LogStaffLogin.php index 3af8274..88f2c98 100755 --- a/app/Listeners/LogStaffLogin.php +++ b/app/Listeners/LogStaffLogin.php @@ -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); diff --git a/app/Services/Community/StaffService.php b/app/Services/Community/StaffService.php index 26d6723..d658e33 100755 --- a/app/Services/Community/StaffService.php +++ b/app/Services/Community/StaffService.php @@ -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) diff --git a/config/habbo.php b/config/habbo.php index f8954a9..d5054bc 100755 --- a/config/habbo.php +++ b/config/habbo.php @@ -56,6 +56,18 @@ return [ 'defaults' => [ 'avatar_look' => env('DEFAULT_AVATAR_LOOK', 'hr-100-61.hd-180-1.ch-210-66'), + 'min_staff_rank' => env('MIN_STAFF_RANK', 7), + 'min_staff_rank_login' => env('MIN_STAFF_RANK_LOGIN', 3), + ], + + 'cdn' => [ + 'fancybox_js' => env('FANCYBOX_JS_URL', 'https://cdn.jsdelivr.net/npm/@fancyapps/ui@4.0/dist/fancybox.umd.js'), + 'fancybox_css' => env('FANCYBOX_CSS_URL', 'https://cdn.jsdelivr.net/npm/@fancyapps/ui/dist/fancybox.css'), + 'sweetalert2_js' => env('SWEETALERT2_JS_URL', '//cdn.jsdelivr.net/npm/sweetalert2@11'), + 'alpine_js' => env('ALPINE_JS_URL', 'https://cdn.jsdelivr.net/npm/alpinejs@3.x.x/dist/cdn.min.js'), + 'fontsource_inter_css' => env('FONTSOURCE_INTER_CSS_URL', 'https://cdn.jsdelivr.net/npm/@fontsource/inter@4.x/400-700.css'), + 'fontawesome_css' => env('FONTAWESOME_CSS_URL', 'https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.7.0/css/all.min.css'), + 'html2canvas_js' => env('HTML2CANVAS_JS_URL', 'https://cdnjs.cloudflare.com/ajax/libs/html2canvas/1.3.3/html2canvas.min.js'), ], 'findretros' => [ diff --git a/resources/themes/atom/views/community/photos.blade.php b/resources/themes/atom/views/community/photos.blade.php index d7037f4..8200518 100755 --- a/resources/themes/atom/views/community/photos.blade.php +++ b/resources/themes/atom/views/community/photos.blade.php @@ -35,8 +35,7 @@ @push('javascript') - - @endpush + - + diff --git a/resources/themes/atom/views/components/messages/flash-messages.blade.php b/resources/themes/atom/views/components/messages/flash-messages.blade.php index 7973a1e..12d5c3e 100755 --- a/resources/themes/atom/views/components/messages/flash-messages.blade.php +++ b/resources/themes/atom/views/components/messages/flash-messages.blade.php @@ -1,4 +1,4 @@ - +