123

Administrator
1 parent 5a391de7
Showing 2 changed files with 18 additions and 16 deletions Show diff stats
common/models/Feedback.php
frontend/controllers/SiteController.php
@@ -24,19 +24,6 @@ class Feedback extends CoreFeedback
 				'required',
 				'on' => self::SCENARIO_DEFAULT,
 			],
-			[[
-				'reCaptcha'
-			],
-				\himiklab\yii2\recaptcha\ReCaptchaValidator::className(),
-//				'secret' => '6LcmYmcUAAAAACVi_73RmSAIjJlw4BCgQpfUsrPs',
-				'secret' => '6LfWrmkUAAAAAAFJfjMieZs-EHblaqdt4sPZZqVZ',
-				'uncheckedMessage' => 'Please confirm that you are not a bot.',
-
-			],
-			[
-				['reCaptcha'],
-				'required'
-			],
 			[
 				[
 					'name',
@@ -53,6 +40,20 @@ class Feedback extends CoreFeedback
 				'required',
 				'on' => self::SCENARIO_CALLBACK,
 			],
+			[[
+				'reCaptcha'
+			],
+				\himiklab\yii2\recaptcha\ReCaptchaValidator::className(),
+//				'secret' => '6LcmYmcUAAAAACVi_73RmSAIjJlw4BCgQpfUsrPs',
+				'secret' => '6LfWrmkUAAAAAAFJfjMieZs-EHblaqdt4sPZZqVZ',
+				'uncheckedMessage' => 'Please confirm that you are not a bot.',
+
+			],
+			[
+				['reCaptcha'],
+				'required'
+			],
+
 			[
 				['email'],
 				'email',
@@ -206,14 +206,15 @@
             } else {
                 $model = new Feedback(
                     [
-                        'scenario' => Feedback::SCENARIO_CONTACT,
+                        'scenario' => Feedback::SCENARIO_DEFAULT,
                     ]
                 );
 	            if ($model->load(Yii::$app->request->post())) {
-
-		            if (empty($model->reCaptcha) || $model->reCaptcha == null || $model->reCaptcha == '')
+	            	
+		            if ( $model->reCaptcha == null )
 			            return [
 				            'success' => 'false',
+				            'cap'       => $model->reCaptcha,
 				            'error' => 'You don`t confirm Recaptcha. Unblock JS to this'
 			            ];
 		            $model->save();