diff --git a/app/Http/Controllers/ContactController.php b/app/Http/Controllers/ContactController.php index 71b7f2004..15a8958de 100644 --- a/app/Http/Controllers/ContactController.php +++ b/app/Http/Controllers/ContactController.php @@ -6,6 +6,7 @@ use Illuminate\Http\Request; use Auth; use App\Contact; use App\Jobs\ContactPipeline\ContactPipeline; +use App\Rules\MaxMultiLine; class ContactController extends Controller { @@ -21,7 +22,7 @@ class ContactController extends Controller abort_if(!Auth::check(), 403); $this->validate($request, [ - 'message' => 'required|string|min:5|max:500', + 'message' => ['required', 'string', 'min:5', new MaxMultiLine('500')], 'request_response' => 'string|max:3' ]); diff --git a/app/Rules/MaxMultiLine.php b/app/Rules/MaxMultiLine.php new file mode 100644 index 000000000..8d3d7654c --- /dev/null +++ b/app/Rules/MaxMultiLine.php @@ -0,0 +1,34 @@ +maxCharacters = $maxCharacters; + } + + /** + * Run the validation rule. + * + * @param string $attribute + * @param mixed $value + * @param \Closure(string): \Illuminate\Translation\PotentiallyTranslatedString $fail + * @return void + */ + public function __invoke($attribute, $value, $fail) + { + $realCount = Str::length($value) - Str::substrCount($value, "\r\n"); + + if($realCount > $this->maxCharacters) + { + $fail('validation.max.string')->translate(['max' => $this->maxCharacters]); + } + } +}