Added the option to disable automatic contact form validation.

matt-west · Oct 8, 2018 · eb097da · eb097da
1 parent cd7a4a7
commit eb097da
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 4 deletions.
diff --git a/.craftplugin b/.craftplugin
@@ -1,7 +1,7 @@
 {
   "pluginName": "Craft reCAPTCHA",
   "pluginDescription": "Integrate Google’s reCAPTCHA into your forms.",
-  "pluginVersion": "1.1.0",
+  "pluginVersion": "1.2.0",
   "pluginAuthorName": "Matt West",
   "pluginVendorName": "mattwest",
   "pluginAuthorUrl": "https://mattwest.io",

diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
     "name": "matt-west/craft-recaptcha",
     "description": "Integrate Google’s reCAPTCHA into your forms.",
     "type": "craft-plugin",
-    "version": "1.1.0",
+    "version": "1.2.0",
     "keywords": [
         "craft",
         "cms",

diff --git a/src/CraftRecaptcha.php b/src/CraftRecaptcha.php
@@ -109,7 +109,9 @@ function (PluginEvent $event) {
         );
 
         // Set up contact form hook.
-        if (class_exists(Submission::class)) {
+        $settings = CraftRecaptcha::$plugin->getSettings();
+
+        if (class_exists(Submission::class) && $settings->validateContactForm) {
             Event::on(Submission::class, Submission::EVENT_BEFORE_VALIDATE, function(ModelEvent $e) {
                 /** @var Submission $submission */
                 $submission = $e->sender;

diff --git a/src/config.php b/src/config.php
@@ -26,5 +26,6 @@
 
     "siteKey" => "",
     "secretKey" => "",
-
+    "validateContactForm" => true,
+
 ];
diff --git a/src/models/Settings.php b/src/models/Settings.php
@@ -48,6 +48,13 @@ class Settings extends Model
      */
     public $secretKey = '';
 
+    /**
+     * Validate ContactForm submissions
+     * 
+     * @var bool
+     */
+    public $validateContactForm = true;
+
     // Public Methods
     // =========================================================================
 

diff --git a/src/templates/settings.twig b/src/templates/settings.twig
@@ -32,3 +32,14 @@
     value: settings['secretKey'],
     required: true})
 }}
+
+
+<hr>
+
+{{ forms.lightswitchField({
+    label: 'Validate contact forms?',
+    instructions: 'Enable to automatically validate reCAPTCHAs when using the official [Craft CMS contact form plugin](https://github.com/craftcms/contact-form).',
+    id: 'validateContactForm',
+    name: 'validateContactForm',
+    on: settings['validateContactForm']})
+}}
diff --git a/src/translations/en/recaptcha.php b/src/translations/en/recaptcha.php
@@ -26,4 +26,5 @@
     'Secret Key' => 'Secret Key',
     'Enter your reCAPTCHA site key.' => 'Enter your reCAPTCHA site key.',
     'Enter your reCAPTCHA secret key.' => 'Enter your reCAPTCHA secret key.',
+    'Validate contact forms?' => 'Validate contact forms?',
 ];