Merge pull request #293 from doenietzomoeilijk/fix-recaptcha-theme

FIX, Recaptcha: Apply the theme from the config, or any theme at all
bolt · Nov 6, 2019 · a88267b · a88267b
2 parents 9228782 + 32fea9a
commit a88267b
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 1 deletion.
diff --git a/src/Asset/ReCaptcha.php b/src/Asset/ReCaptcha.php
@@ -35,13 +35,16 @@ class ReCaptcha extends JavaScript
     /** @var string */
     protected $renderType;
 
+    /** @var string */
+    protected $theme;
+
     /**
      * {@inheritdoc}
      */
     public function __toString()
     {
         $onLoad = ($this->getRenderType() == 'invisible') ? '&render=explicit&onload=invisibleRecaptchaOnLoad' : '';
-        $theme =  sprintf('<script>var RecaptchaOptions = { theme : "" };</script>', 'clean');
+        $theme =  sprintf('<script>var RecaptchaOptions = { theme : "%s" };</script>', $this->getTheme());
         $api =  sprintf('<script src="https://www.google.com/recaptcha/api.js?hl=%s%s" async defer></script>', $this->getHtmlLang(), $onLoad);
 
         return $theme . $api;
@@ -86,4 +89,23 @@ public function setRenderType($type)
 
         return $this;
     }
+
+    /**
+     * @return string
+     */
+    public function getTheme()
+    {
+        return $this->theme;
+    }
+
+    /**
+     * @param string $theme
+     * @return ReCaptcha
+     */
+    public function setTheme($theme)
+    {
+        $this->theme = $theme;
+
+        return $this;
+    }
 }
diff --git a/src/BoltForms.php b/src/BoltForms.php
@@ -276,6 +276,7 @@ private function queueReCaptcha()
         $reCaptcha
             ->setHtmlLang($this->app['locale'])
             ->setRenderType($this->config->getReCaptcha()->get('type'))
+            ->setTheme($this->config->getReCaptcha()->get('theme'))
             ->setLocation(Target::END_OF_BODY)
             ->setZone(Zone::FRONTEND)
         ;