🆙 Fixed and no bugs anymore 🆙

This commit is contained in:
Remco
2026-01-07 20:01:53 +01:00
parent 6bf99066a5
commit 65ea6c167f
34 changed files with 63 additions and 63 deletions
@@ -135,7 +135,7 @@ class ShopController extends Controller
public function handleFurniture(array $furniture)
{
$sendFurniture = resolve(SendFurniture::class);
$sendFurniture = app(SendFurniture::class);
$sendFurniture->execute(Auth::user(), $furniture);
}
@@ -5,6 +5,7 @@ namespace App\Http\Controllers\User;
use App\Http\Controllers\Controller;
use App\Models\PasswordResetToken;
use App\Models\User;
use Carbon\Carbon;
use Illuminate\Http\Request;
use Illuminate\Support\Str;
use Mail;
@@ -24,9 +24,10 @@ class LocalizationMiddleware
$countryCode = config('habbo.site.default_language');
// GEWIJZIGD: isset() werkt niet op Request::server() in PHP 8. Gebruik null !== in plaats daarvan.
if (\Illuminate\Support\Facades\Request::server('HTTP_CF_IPCOUNTRY') !== null) {
if (null !== \Illuminate\Support\Facades\Request::server('HTTP_CF_IPCOUNTRY')) {
$countryCode = strtolower((string) \Illuminate\Support\Facades\Request::server('HTTP_CF_IPCOUNTRY'));
} elseif (\Illuminate\Support\Facades\Request::server('HTTP_ACCEPT_LANGUAGE') !== null) {
}
elseif (null !== \Illuminate\Support\Facades\Request::server('HTTP_ACCEPT_LANGUAGE')) {
$countryCode = strtolower(substr((string) \Illuminate\Support\Facades\Request::server('HTTP_ACCEPT_LANGUAGE'), 0, 2));
}
@@ -46,4 +47,4 @@ class LocalizationMiddleware
return $next($request);
}
}
}
@@ -17,7 +17,7 @@ class AccountSettingsFormRequest extends FormRequest
'mail' => ['required', 'email', Rule::unique('users')->ignore($this->user()->id), new WebsiteWordfilterRule],
'motto' => ['nullable', 'string', 'max:127', new WebsiteWordfilterRule],
'g-recaptcha-response' => [new GoogleRecaptchaRule],
'cf-turnstile-response' => [resolve(Turnstile::class)],
'cf-turnstile-response' => [app(Turnstile::class)],
];
}
@@ -18,7 +18,7 @@ class PasswordSettingsFormRequest extends FormRequest
'current_password' => ['required', 'string', new CurrentPasswordRule],
'password' => $this->passwordRules(),
'g-recaptcha-response' => [new GoogleRecaptchaRule],
'cf-turnstile-response' => [resolve(Turnstile::class)],
'cf-turnstile-response' => [app(Turnstile::class)],
];
}
}
@@ -18,7 +18,7 @@ class RegisterFormRequest extends FormRequest
'password' => ['required', 'string', 'confirmed', 'min:8'],
'terms' => ['required', 'accepted'],
'g-recaptcha-response' => [new GoogleRecaptchaRule],
'cf-turnstile-response' => [resolve(Turnstile::class)],
'cf-turnstile-response' => [app(Turnstile::class)],
];
}
@@ -13,7 +13,7 @@ class ShopVoucherFormRequest extends FormRequest
return [
'code' => ['required', 'string'],
'g-recaptcha-response' => [new GoogleRecaptchaRule],
'cf-turnstile-response' => [resolve(Turnstile::class)],
'cf-turnstile-response' => [app(Turnstile::class)],
];
}
}
@@ -13,7 +13,7 @@ class StaffApplicationFormRequest extends FormRequest
return [
'content' => ['required', 'string'],
'g-recaptcha-response' => [new GoogleRecaptchaRule],
'cf-turnstile-response' => [resolve(Turnstile::class)],
'cf-turnstile-response' => [app(Turnstile::class)],
];
}
}