Manual merge of PR getgrav#34 - form config options for Captcha keys

Author: rhukster

CHANGELOG.md

@@ -3,6 +3,7 @@
 
 1. [](#new)
     * Added support for advanced blueprint functionality in forms
+    * Added site-wide form options to set Google Captcha site + secret keys [#34](https://github.com/getgrav/grav-plugin-form/pull/34)
     * Session-based 'flash' storage of form for redirects [#48](https://github.com/getgrav/grav-plugin-form/issues/48)
     * Added ability to **append** to file if you include a `process: save: body:` template attribute [#65](https://github.com/getgrav/grav-plugin-form/issues/65)
 1. [](#improved)

blueprints.yaml

@@ -59,3 +59,19 @@ form:
             - image/*
           validate:
               type: commalist
+
+    recaptcha:
+      type: section
+      title: PLUGIN_FORM.RECAPTCHA
+
+      fields:
+        recaptcha.site_key:
+          type: text
+          label: PLUGIN_FORM.RECAPTCHA_SITE_KEY
+          help: PLUGIN_FORM.RECAPTCHA_SITE_KEY_HELP
+          default: ''
+        recaptcha.secret_key:
+          type: text
+          label: PLUGIN_FORM.RECAPTCHA_SECRET_KEY
+          help: PLUGIN_FORM.RECAPTCHA_SECRET_KEY_HELP
+          default: ''

form.php

@@ -117,7 +117,7 @@ public function onFormProcessed(Event $event)
             case 'captcha':
                 // Validate the captcha
                 $query = http_build_query([
-                    'secret'   => isset($params['recaptcha_secret']) ? $params['recaptcha_secret'] : $params['recatpcha_secret'], //Allow value with typo for BC
+                    'secret'   => isset($params['recaptcha_secret']) ? $params['recaptcha_secret'] : isset($params['recatpcha_secret']) ? $params['recatpcha_secret'] : $this->config->get('plugins.form.recaptcha.secret_key'),
                     'response' => $this->form->value('g-recaptcha-response', true)
                 ]);
                 $url = 'https://www.google.com/recaptcha/api/siteverify?' . $query;

languages.yaml

@@ -12,6 +12,11 @@ en:
     ERROR_VALIDATING_CAPTCHA: "Error validating the Captcha"
     DATA_SUMAMRY: "Here is the summary of what you wrote to us:"
     NO_FORM_DATA: "No form data available"
+    RECAPTCHA: "ReCaptcha"
+    RECAPTCHA_SITE_KEY: "Site key"
+    RECAPTCHA_SITE_KEY_HELP: "For more info visit https://developers.google.com/recaptcha"
+    RECAPTCHA_SECRET_KEY: "Secret key"
+    RECAPTCHA_SECRET_KEY_HELP: "For more info visit https://developers.google.com/recaptcha"
 
 de:
   PLUGIN_FORM:
@@ -28,8 +33,21 @@ de:
 
 es:
   PLUGIN_FORM:
-    NOT_VALIDATED: "Falló la validación del formulario. Uno o más campos obligatorios no fueron capturados."
-    NONCE_NOT_VALIDATED: "Oops, hay un problema, por favor revice la información capturada e intente enviar el formulario otra vez."
+    NOT_VALIDATED: "Falló la validación del formulario. Uno o más campos obligatorios no fueron cubiertos."
+    NONCE_NOT_VALIDATED: "Oops, hay un problema, por favor revise la información e intente enviar el formulario otra vez."
+    FILES: "Subida de Ficheros"
+    ALLOW_MULTIPLE: "Permitir más de un fichero"
+    ALLOW_MULTIPLE_HELP: "Permitir seleccionar más de un fichero para subir."
+    DESTINATION: "Destino"
+    DESTINATION_HELP: "El lugar de destino al que subir los ficheros"
+    ACCEPT: "MIME Types permitidos"
+    ACCEPT_HELP: "Una lista de  MIME Types que se permiten subir."
+    ERROR_VALIDATING_CAPTCHA: "Error al comrobar el Captcha"
+    RECAPTCHA: "ReCaptcha"
+    RECAPTCHA_SITE_KEY: "Site key"
+    RECAPTCHA_SITE_KEY_HELP: "Para más información visita https://developers.google.com/recaptcha"
+    RECAPTCHA_SECRET_KEY: "Secret key"
+    RECAPTCHA_SECRET_KEY_HELP: "Para más información visita https://developers.google.com/recaptcha"
 
 fr:
   PLUGIN_FORM:

templates/forms/fields/captcha/captcha.html.twig

@@ -4,7 +4,7 @@
     <script>
         var captchaOnloadCallback = function captchaOnloadCallback() {
             grecaptcha.render('g-recaptcha', {
-                'sitekey': "{{field.recaptcha_site_key ?: field.recatpcha_site_key}}",
+                'sitekey': "{{field.recaptcha_site_key ?: field.recatpcha_site_key ?: config.plugins.form.recaptcha.site_key }}",
                 'callback': captchaValidatedCallback,
                 'expired-callback': captchaExpiredCallback
             });