From d13833f19a73ea2ebab8104b4f9dec2d6ab22a89 Mon Sep 17 00:00:00 2001 From: Krzysztof Strzelecki Date: Sat, 1 Feb 2020 02:46:17 +0100 Subject: [PATCH 1/2] fix walidacji --- app/Http/Controllers/RegistrationController.php | 4 ++-- app/Http/Controllers/fireFightersController.php | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/Http/Controllers/RegistrationController.php b/app/Http/Controllers/RegistrationController.php index 0402efc..930df77 100644 --- a/app/Http/Controllers/RegistrationController.php +++ b/app/Http/Controllers/RegistrationController.php @@ -19,8 +19,8 @@ class RegistrationController extends Controller { $this->validate(request(), [ - 'name' => 'required|min:2|max:45|regex:/^[\p{L}\040\x27-]+$/', - 'surname' => 'required|min:2|max:45|regex:/^[\p{L}\040\x27-]+$/', + 'name' => 'required|min:2|max:45|regex:/^[A-Za-zżźćńółęąśŻŹĆĄŚĘŁÓŃ\040\x27-]+$/', + 'surname' => 'required|min:2|max:45|regex:/^[A-Za-zżźćńółęąśŻŹĆĄŚĘŁÓŃ\040\x27-]+$/', 'PESEL' => new Pesel, 'phoneNumber' => 'required|digits:9', 'email' => 'required|email|unique:users', diff --git a/app/Http/Controllers/fireFightersController.php b/app/Http/Controllers/fireFightersController.php index 2b9eeb9..cdb2ea8 100644 --- a/app/Http/Controllers/fireFightersController.php +++ b/app/Http/Controllers/fireFightersController.php @@ -62,8 +62,8 @@ class fireFightersController extends Controller public function store(){ $this->validate(request(), [ - 'name' =>'required|min:2|max:45|regex:/^[\p{L}\040\x27-]+$/', - 'surname' =>'required|min:2|max:45|regex:/^[\p{L}\040\x27-]+$/', + 'name' =>'required|min:2|max:45|regex:/^[A-Za-zżźćńółęąśŻŹĆĄŚĘŁÓŃ\040\x27-]+$/', + 'surname' =>'required|min:2|max:45|regex:/^[A-Za-zżźćńółęąśŻŹĆĄŚĘŁÓŃ\040\x27-]+$/', 'PESEL' => new Pesel, 'phoneNumber' => 'required|digits:9', 'email' => 'required|email|unique:users', @@ -111,8 +111,8 @@ class fireFightersController extends Controller public function update(){ $this->validate(request(), [ - 'name' =>'required|min:2|max:45|regex:/^[\p{L}\040\x27-]+$/', - 'surname' =>'required|min:2|max:45|regex:/^[\p{L}\040\x27-]+$/', + 'name' =>'required|min:2|max:45|regex:/^[A-Za-zżźćńółęąśŻŹĆĄŚĘŁÓŃ\040\x27-]+$/', + 'surname' =>'required|min:2|max:45|regex:/^[A-Za-zżźćńółęąśŻŹĆĄŚĘŁÓŃ\040\x27-]+$/', 'PESEL' => new Pesel, 'phoneNumber' => 'required|digits:9', ], From fa5812dc2f26f017f696d5b32a7532b1c7bd28df Mon Sep 17 00:00:00 2001 From: Krzysztof Strzelecki Date: Sat, 1 Feb 2020 03:53:59 +0100 Subject: [PATCH 2/2] walidacja fix --- app/Http/Controllers/userProfileController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/userProfileController.php b/app/Http/Controllers/userProfileController.php index 567beee..0c6772c 100644 --- a/app/Http/Controllers/userProfileController.php +++ b/app/Http/Controllers/userProfileController.php @@ -39,8 +39,8 @@ class userProfileController extends Controller public function update(){ $this->validate(request(), [ - 'name' =>'required|min:2|max:45|regex:/^[\p{L}\040\x27-]+$/', - 'surname' =>'required|min:2|max:45|regex:/^[\p{L}\040\x27-]+$/', + 'name' =>'required|min:2|max:45|regex:/^[A-Za-zżźćńółęąśŻŹĆĄŚĘŁÓŃ\040\x27-]+$/', + 'surname' =>'required|min:2|max:45|regex:/^[A-Za-zżźćńółęąśŻŹĆĄŚĘŁÓŃ\040\x27-]+$/', 'PESEL' => new Pesel, 'phoneNumber' => 'required|digits:9', 'email' => 'required|email|unique:users,email,'.auth()->user()->id, //wymagaj unikalnego adresu email ale pozwól na zachowanie starego adresu