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:23:30 +01:00
parent 2b3c8790de
commit e0f7021693
2 changed files with 44 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Updated_Cms/app/Http/Middleware/LocalizationMiddleware.php
+19 -7
View File
@@ -16,7 +16,13 @@ class LocalizationMiddleware
{
// Controleer of de instellingen bestaan en of de taal al in de sessie staat
if (Schema::hasTable('website_settings') && Session::has('locale')) {
App::setLocale((string) Session::get('locale'));
$locale = Session::get('locale');
if (! is_string($locale)) {
$response = $next($request);
assert($response instanceof Response);
return $response;
}
App::setLocale($locale);
$response = $next($request);
assert($response instanceof Response);
@@ -26,16 +32,20 @@ class LocalizationMiddleware
$countryCode = config('habbo.site.default_language');
// GEWIJZIGD: isset() werkt niet op Request::server() in PHP 8. Gebruik null !== in plaats daarvan.
if (null !== \Illuminate\Support\Facades\Request::server('HTTP_CF_IPCOUNTRY')) {
$countryCode = strtolower((string) \Illuminate\Support\Facades\Request::server('HTTP_CF_IPCOUNTRY'));
}
elseif (null !== \Illuminate\Support\Facades\Request::server('HTTP_ACCEPT_LANGUAGE')) {
$countryCode = strtolower(substr((string) \Illuminate\Support\Facades\Request::server('HTTP_ACCEPT_LANGUAGE'), 0, 2));
$cfCountry = \Illuminate\Support\Facades\Request::server('HTTP_CF_IPCOUNTRY');
if (is_string($cfCountry)) {
$countryCode = strtolower($cfCountry);
} elseif (is_string(\Illuminate\Support\Facades\Request::server('HTTP_ACCEPT_LANGUAGE'))) {
$acceptLanguage = \Illuminate\Support\Facades\Request::server('HTTP_ACCEPT_LANGUAGE');
$countryCode = strtolower(substr($acceptLanguage, 0, 2));
}
// Als de taal niet in de database staat, gebruik de standaardtaal
if (Schema::hasTable('website_languages') && WebsiteLanguage::where('country_code', '=', $countryCode)->doesntExist()) {
$defaultCountry = config('habbo.site.default_language');
if (! is_string($defaultCountry)) {
$defaultCountry = 'en';
}
App::setLocale($defaultCountry);
Session::put('locale', $defaultCountry);
@@ -46,7 +56,9 @@ class LocalizationMiddleware
}
// Zet de gedetecteerde taal
App::setLocale($countryCode);
if (is_string($countryCode)) {
App::setLocale($countryCode);
}
Session::put('locale', $countryCode);
$response = $next($request);