diff --git a/app/Http/Controllers/ContactUsController.php b/app/Http/Controllers/ContactUsController.php index 06c982562..92181a489 100644 --- a/app/Http/Controllers/ContactUsController.php +++ b/app/Http/Controllers/ContactUsController.php @@ -12,9 +12,6 @@ class ContactUsController extends BasePageController */ public function contact(ContactContactURequest $request) { - if (\App\Support\CaptchaHelper::isEnabled()) { - $this->validate($request, \App\Support\CaptchaHelper::getValidationRules()); - } $msg = ''; diff --git a/app/Http/Requests/ContactContactURequest.php b/app/Http/Requests/ContactContactURequest.php index 678d13004..2162b53af 100644 --- a/app/Http/Requests/ContactContactURequest.php +++ b/app/Http/Requests/ContactContactURequest.php @@ -12,6 +12,31 @@ class ContactContactURequest extends FormRequest */ public function rules(): array { - return CaptchaHelper::getValidationRules(); + $rules = [ + 'username' => 'required|string|max:255', + 'useremail' => 'required|email|max:255', + 'comment' => 'required|string|min:10', + ]; + + // Merge CAPTCHA validation rules if enabled + if (CaptchaHelper::isEnabled()) { + $rules = array_merge($rules, CaptchaHelper::getValidationRules()); + } + + return $rules; + } + + /** + * Get custom validation messages + */ + public function messages(): array + { + return [ + 'username.required' => 'Please enter your name.', + 'useremail.required' => 'Please enter your email address.', + 'useremail.email' => 'Please enter a valid email address.', + 'comment.required' => 'Please enter your message.', + 'comment.min' => 'Your message must be at least 10 characters long.', + ]; } } diff --git a/resources/views/contact/index.blade.php b/resources/views/contact/index.blade.php index f89e099d3..dd7d68c03 100644 --- a/resources/views/contact/index.blade.php +++ b/resources/views/contact/index.blade.php @@ -126,3 +126,9 @@ @endsection +@push('scripts') + @if(\App\Support\CaptchaHelper::isEnabled()) + {!! \App\Support\CaptchaHelper::renderJs() !!} + @endif +@endpush +