Add Google Recaptcha to site/contact

**** Нужно композером на сервере установить новую либу

Add Google Recaptcha to site/contact
**** Нужно композером на сервере установить новую либу
alex
1 parent d73c3e95
Showing 10 changed files with 182 additions and 16 deletions Show diff stats
common/config/main.php
composer.json
composer.lock
frontend/config/main.php
frontend/controllers/SiteController.php
frontend/models/Feedback.php
frontend/views/forms/ContactModule.php
frontend/views/site/contact.php
frontend/web/css/site.css
frontend/web/js/script.js
@@ -26,6 +26,13 @@
             ]
         ],
         'components' => [
+
+	        'reCaptcha' => [
+		        'name' => 'reCaptcha',
+		        'class' => 'sashsvamir\yii2\recaptcha\ReCaptcha',
+		        'siteKey' => '6LcZcmQUAAAAANF1TashIYAvYtTBCscpTlPe1q6T',
+		        'secret' => '6LcZcmQUAAAAAFH4Ru4S6QnmB3An3PJWglmV',
+	        ],
             'cache'              => [
                 'class' => 'yii\caching\FileCache',
             ],
@@ -18,7 +18,8 @@
     "minimum-stability": "RC",
     "require": {
         "php": ">=7.0",
-        "artweb/artbox-core" : ">0.0.10"
+        "artweb/artbox-core": ">0.0.10",
+        "sashsvamir/yii2-recaptcha-widget": "dev-master"
     },
     "require-dev": {
         "yiisoft/yii2-debug": "~2.0.0",
@@ -4,8 +4,8 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "d1c4ebdcace0dbe46fef8e15f5de2d7f",
-    "content-hash": "20c2db805fdbbc718dc7c57c39800648",
+  "hash": "9a6e92d2cba1e4da99f27abd0a2ae4f3",
+  "content-hash": "f335aaff8ec5703aad48c3b2fd89b0c1",
     "packages": [
         {
             "name": "2amigos/yii2-tinymce-widget",
@@ -226,7 +226,7 @@
             "version": "1.4.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/puikinsh/gentelella.git",
+              "url": "git@github.com:puikinsh/gentelella.git",
                 "reference": "3448fdfdf16a41707d6e2a8154d592a88d85c41c"
             },
             "dist": {
@@ -245,12 +245,12 @@
             "version": "1.0.2",
             "source": {
                 "type": "git",
-                "url": "https://github.com/fronteed/icheck.git",
+              "url": "git@github.com:fronteed/iCheck.git",
                 "reference": "8a6eb37bd7dab1e843c1b630c91c6398ff409d05"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/fronteed/icheck/zipball/8a6eb37bd7dab1e843c1b630c91c6398ff409d05",
+              "url": "https://api.github.com/repos/fronteed/iCheck/zipball/8a6eb37bd7dab1e843c1b630c91c6398ff409d05",
                 "reference": "8a6eb37bd7dab1e843c1b630c91c6398ff409d05",
                 "shasum": null
             },
@@ -370,7 +370,7 @@
             "version": "v1.3.2",
             "source": {
                 "type": "git",
-                "url": "https://github.com/bestiejs/punycode.js.git",
+              "url": "git@github.com:bestiejs/punycode.js.git",
                 "reference": "38c8d3131a82567bfef18da09f7f4db68c84f8a3"
             },
             "dist": {
@@ -2485,6 +2485,50 @@
             "time": "2017-01-11 14:05:47"
         },
         {
+          "name": "sashsvamir/yii2-recaptcha-widget",
+          "version": "dev-master",
+          "source": {
+            "type": "git",
+            "url": "https://github.com/sashsvamir/yii2-recaptcha-widget.git",
+            "reference": "3daa1b48d99839807c0bf520bb2660d43ed83446"
+          },
+          "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/sashsvamir/yii2-recaptcha-widget/zipball/3daa1b48d99839807c0bf520bb2660d43ed83446",
+            "reference": "3daa1b48d99839807c0bf520bb2660d43ed83446",
+            "shasum": ""
+          },
+          "require": {
+            "himiklab/yii2-recaptcha-widget": "1.0.6",
+            "yiisoft/yii2": "*"
+          },
+          "type": "yii2-extension",
+          "autoload": {
+            "psr-4": {
+              "sashsvamir\\yii2\\recaptcha\\": ""
+            }
+          },
+          "notification-url": "https://packagist.org/downloads/",
+          "license": [
+            "MIT"
+          ],
+          "authors": [
+            {
+              "name": "sashsvamir",
+              "homepage": "https://github.com/sashsvamir/"
+            }
+          ],
+          "description": "Yii2 Google reCAPTCHA widget",
+          "keywords": [
+            "captcha",
+            "google",
+            "recaptcha",
+            "widget",
+            "yii2"
+          ],
+          "time": "2018-01-24 10:27:21"
+        },
+      {
             "name": "skeeks/yii2-assets-auto-compress",
             "version": "1.4.0",
             "source": {
@@ -5899,7 +5943,9 @@
     ],
     "aliases": [],
     "minimum-stability": "RC",
-    "stability-flags": [],
+  "stability-flags": {
+    "sashsvamir/yii2-recaptcha-widget": 20
+  },
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {
@@ -137,7 +137,7 @@
                     }',
             ],
             'contact' => [
-                'class'        => 'artbox\core\forms\Module',
+	            'class' => 'frontend\views\forms\ContactModule',
                 'activeRecord' => "frontend\models\Feedback",
                 'templateForm' => '<div class="row">{form}</div>',
                 'attributes'   => [
@@ -145,6 +145,7 @@
                     'email',
                     'phone',
                     'message',
+
                 ],
                 'rules'        => [
                     [
@@ -158,7 +159,8 @@
                             'phone',
                         ],
                         'required',
-                    ]
+                    ],
+
                 ],
                 'labels'     => [
                     'email'   => \Yii::t('app','Email'),
 <?php
     namespace frontend\controllers;
-    use frontend\models\Feedback;
+    use frontend\models\Feedback as F;
     use common\models\blog\Article;
     use common\models\Settings;
     use common\models\slider\Slide;
@@ -72,11 +72,11 @@
          */
         public function actionContact()
         {
-            $contact = new Feedback();
+	        $contact = new F(['scenario' => F::SCENARIO_DEFAULT]);
             return $this->render(
                 'contact',
                 [
-                    'contact' => $contact,
+	                'model' => $contact,
                 ]
             );
         }
@@ -7,13 +7,18 @@
 namespace frontend\models;
 use artbox\core\models\Feedback as ArtboxCoreFeedback;
-
+use sashsvamir\yii2\recaptcha\ReCaptchaValidator;
 class Feedback extends ArtboxCoreFeedback
 {
+	public $reCaptcha;
+
+
 	public function rules()
     {
-        return [
+
+
+	    return [
             [
                 [
                     'name',
@@ -24,6 +29,14 @@ class Feedback extends ArtboxCoreFeedback
                 'on'      => self::SCENARIO_DEFAULT,
                 'message' => \Yii::t('app', 'Empty field'),
             ],
+		    ['reCaptcha', ReCaptchaValidator::className(), 'uncheckedMessage' => 'Please confirm that you are not a bot.',
+			    // add follow lines to prevent checking recaptcha when from has errors
+			    'when' => function ($model) {
+				    return !$model->hasErrors();
+			    },
+			    'on' => self::SCENARIO_DEFAULT,
+
+		    ],
             [
                 [
                     'name',
+<?php
+
+namespace frontend\views\forms;
+
+
+use yii\helpers\Html;
+use yii\web\View;
+use yii\widgets\ActiveForm;
+use artbox\core\forms\Module as CoreModule;
+
+
+/**
+ * Class ContactModule
+ * @package frontend\forms
+ *
+ *
+ * Класс, который немного видоизменяет вывод формы контактов для того, чтобы в ней появилась гугловая рекапча
+ *
+ */
+class ContactModule extends CoreModule
+{
+
+
+	public function renderForm(View $view)
+	{
+		if ($this->ajax) {
+			$js = <<<JS
+$(document).on('submit', '#{$this->formId}', function(e) {
+        e.preventDefault();
+        e.stopImmediatePropagation();
+        $.post(
+            $(this).attr("action"), $(this).serialize(), {$this->successCallback}).fail({$this->errorCallback});
+});
+JS;
+
+			$view->registerJs($js, View::POS_READY);
+		}
+		/**
+		 * @var ActiveForm $form
+		 */
+
+		$form = ActiveForm::begin(
+			[
+				'id' => $this->formId,
+				'action' => ($this->ajax) ? '/' . $this->id . '/save/ajax' : '/' . $this->id . '/save/no-ajax',
+				'class' => $this->classForm,
+			]
+		);
+		$content = '';
+		foreach ($this->attributes as $field) {
+
+			# если мы присвоили этому полю тип, то он его отрисовывает
+			if (isset($this->inputOptions[$field]['type'])) {
+				$function = $this->inputOptions[$field]['type'];
+				$formStr = $form->field($this->model, $field)
+					->$function(
+						isset($this->inputOptions[$field]['options'])
+							? $this->inputOptions[$field]['options'] : []
+					);
+			} # а если нет, то просто добавляет поле
+			else {
+				$formStr = $form->field($this->model, $field);
+			}
+			if (isset($this->labels[$field])) {
+				$formStr->label(\Yii::t($this->locale, $this->labels[$field]));
+			}
+			if (isset($this->inputOptions[$field]['template'])) {
+
+				$formStr = str_replace('{input}', $formStr, $this->inputOptions[$field]['template']);
+			}
+			$content .= $formStr;
+
+		}
+
+		$content .= $form->field($this->model, 'reCaptcha')->widget(\sashsvamir\yii2\recaptcha\ReCaptcha::className())->label(false);
+
+
+		$content .= str_replace('{button}', Html::submitButton(\Yii::t($this->locale, $this->buttonContent), $this->buttonOptions), $this->buttonTemplate);
+		$content = str_replace('{form}', $content, $this->templateForm);
+		echo $content;
+		ActiveForm::end();
+	}
+}
 \ No newline at end of file
@@ -11,6 +11,7 @@
     use frontend\assets\MapAsset;
     use yii\helpers\Html;
     use yii\web\View;
+use yii\widgets\ActiveForm;
     MapAsset::register($this);
     $settings = Settings::getInstance();
@@ -119,7 +120,9 @@ JS;
                 </div>
                 <div class="col-md-8 col-md-offset-2">
-                  <?=$module->renderForm($this)?>
+
+
+	                <?= $module->renderForm($this) ?>
                 </div>
             </div>
@@ -133,3 +133,11 @@ a.desc:after {
 .background-white {
     background-color: white;
 }
+
+/*
+Класс для выравнивания по центру формы инпута google ReCaptcha
+*/
+.f_center {
+    margin-left: 80%;
+    transform: translateX(-50%);
+}
 \ No newline at end of file
@@ -67,6 +67,9 @@ $(
         //                }
         //            );
+
+        $('.field-feedback-recaptcha').addClass('col-sm-12').addClass('f_center')
+
         /**
          * Button UP code
          */