From 067862cee7ff9e6279190c4e7499e7c200ba0b4e Mon Sep 17 00:00:00 2001 From: Faenir Date: Mon, 11 Dec 2017 13:14:36 +0300 Subject: [PATCH] Fix validation (#125). --- src/User/Controller/AdminController.php | 2 +- src/User/Controller/RecoveryController.php | 2 +- src/User/Controller/RegistrationController.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/User/Controller/AdminController.php b/src/User/Controller/AdminController.php index 63ded04..7875629 100644 --- a/src/User/Controller/AdminController.php +++ b/src/User/Controller/AdminController.php @@ -130,7 +130,7 @@ class AdminController extends Controller $this->make(AjaxRequestModelValidator::class, [$user])->validate(); - if ($user->load(Yii::$app->request->post())) { + if ($user->load(Yii::$app->request->post()) && $user->validate()) { $this->trigger(UserEvent::EVENT_BEFORE_CREATE, $event); $mailService = MailFactory::makeWelcomeMailerService($user); diff --git a/src/User/Controller/RecoveryController.php b/src/User/Controller/RecoveryController.php index dee824b..cd2f621 100644 --- a/src/User/Controller/RecoveryController.php +++ b/src/User/Controller/RecoveryController.php @@ -94,7 +94,7 @@ class RecoveryController extends Controller $this->make(AjaxRequestModelValidator::class, [$form])->validate(); - if ($form->load(Yii::$app->request->post())) { + if ($form->load(Yii::$app->request->post()) && $form->validate()) { $this->trigger(FormEvent::EVENT_BEFORE_REQUEST, $event); $mailService = MailFactory::makeRecoveryMailerService($form->email); diff --git a/src/User/Controller/RegistrationController.php b/src/User/Controller/RegistrationController.php index f668387..2834f9d 100644 --- a/src/User/Controller/RegistrationController.php +++ b/src/User/Controller/RegistrationController.php @@ -145,7 +145,7 @@ class RegistrationController extends Controller $this->make(AjaxRequestModelValidator::class, [$user])->validate(); - if ($user->load(Yii::$app->request->post())) { + if ($user->load(Yii::$app->request->post()) && $user->validate()) { $this->trigger(SocialNetworkConnectEvent::EVENT_BEFORE_CONNECT, $event); $mailService = MailFactory::makeWelcomeMailerService($user);