created google captcha validation while sending anonimus ticket (#32)

hiqdev · Oct 28, 2019 · 4efcf78 · 4efcf78
1 parent f043480
commit 4efcf78
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 6 deletions.
diff --git a/composer.json b/composer.json
@@ -62,6 +62,7 @@
         "hiqdev/hipanel-module-finance": "<2.0 || dev-master",
         "hiqdev/hipanel-module-server": "<2.0 || dev-master",
         "hiqdev/yii2-asset-icheck": "~1.0.2.5",
+        "vintage/yii2-invisible-recaptcha": "dev-master",
         "hiqdev/hipanel-faq": "<2.0 || dev-master"
     },
     "require-dev": {

diff --git a/src/controllers/SiteController.php b/src/controllers/SiteController.php
@@ -24,6 +24,8 @@
 use hiqdev\yii2\cart\actions\AddToCartAction;
 use hisite\actions\RedirectAction;
 use hisite\actions\RenderAction;
+use vintage\recaptcha\helpers\RecaptchaConfig;
+use vintage\recaptcha\validators\InvisibleRecaptchaValidator;
 use Yii;
 use yii\helpers\ArrayHelper;
 
@@ -130,15 +132,25 @@ public function actionContact()
         $thread = new Thread();
         $thread->scenario = Thread::SCENARIO_SUBMIT;
 
-        if (Yii::$app->request->isPost && $thread->load(Yii::$app->request->post(), '') && $thread->save()) {
+        if (!Yii::$app->request->isPost) {
+            return $this->render('contact', [
+                'thread' => $thread,
+                'includeCaptcha' => !empty(Yii::$app->params[RecaptchaConfig::SITE_KEY]),
+            ]);
+        }
+        if ($this->validateCaptha() && $thread->load(Yii::$app->request->post(), '') && $thread->save()) {
             Yii::$app->session->setFlash('contactFormSubmitted', 1);
-
-            return $this->redirect(['/site/contact', '#' => 'sendstatus']);
         }
+        return $this->redirect(['/site/contact', '#' => 'sendstatus']);
+    }
 
-        return $this->render('contact', [
-            'thread' => $thread,
-        ]);
+    private function validateCaptha(): bool
+    {
+        if (empty(Yii::$app->params[RecaptchaConfig::SITE_KEY])) {
+            return true;
+        }
+        $validator = new InvisibleRecaptchaValidator(Yii::$app->getRequest()->post());
+        return (bool)$validator->validate();
     }
 
     public function actionVds()

diff --git a/src/views/themes/dataserv/site/contact.php b/src/views/themes/dataserv/site/contact.php
@@ -3,9 +3,11 @@
 /** @var yii\web\View $this */
 /** @var \hipanel\site\models\Thread $thread */
 /** @var yii\bootstrap\ActiveForm $form */
+/** @var bool $includeCaptcha */
 
 use hipanel\helpers\Url;
 use hiqdev\thememanager\widgets\FancyPanel;
+use vintage\recaptcha\widgets\InvisibleRecaptcha;
 use yii\bootstrap\ActiveForm;
 use yii\helpers\Html;
 
@@ -119,6 +121,12 @@
                         'id' => 'message',
                         'placeholder' => $thread->getAttributeLabel('message'),
                     ]) ?>
+                    <?php if ($includeCaptcha) : ?>
+                        <?= InvisibleRecaptcha::widget([
+                            'formSelector' => '#submit-ticket',
+                        ]) ?>
+                        </br>
+                    <?php endif ?>
                     <?= Html::submitButton(Yii::t('hipanel:site:pages', 'Submit'), ['id' => 'submit', 'class' => 'mtr-btn button-fab ripple']) ?>
                     <?php ActiveForm::end() ?>
                 </div>