#221 recaptcha v3 doesn't validate in form added with elementor form …

…builder of warehouse theme

eicaptcha.php

@@ -194,8 +194,17 @@ public function hookHeader(array $params)
  */
  protected function renderHeaderV2()
  {
- if (($this->context->controller instanceof AuthController && Configuration::get('CAPTCHA_ENABLE_ACCOUNT') == 1) ||
- ($this->context->controller instanceof ContactController && Configuration::get('CAPTCHA_ENABLE_CONTACT') == 1)
+ if ((
+ $this->context->controller instanceof AuthController
+ && Configuration::get('CAPTCHA_ENABLE_ACCOUNT') == 1
+ )
+ ||
+ (
+ ($this->context->controller instanceof ContactController
+ || Configuration::get('CAPTCHA_LOAD_EVERYWHERE') == 1
+ )
+ && Configuration::get('CAPTCHA_ENABLE_CONTACT') == 1
+ )
  ) {
  $this->context->controller->registerStylesheet(
  'module-eicaptcha',
@@ -237,7 +246,9 @@ protected function renderHeaderV2()
  public function renderHeaderV3()
  {
  if (
- $this->context->controller instanceof ContactController
+ ($this->context->controller instanceof ContactController
+ || Configuration::get('CAPTCHA_LOAD_EVERYWHERE') == 1
+ )
  && Configuration::get('CAPTCHA_ENABLE_CONTACT') == 1
  ) {
  $publicKey = Configuration::get('CAPTCHA_PUBLIC_KEY');

src/ConfigForm.php

@@ -247,6 +247,29 @@ public function renderForm()
  ],
  'tab' => 'advanced',
  ],
+ [
+ 'type' => 'switch',
+ 'name' => 'CAPTCHA_LOAD_EVERYWHERE',
+ 'label' => $this->l('Load Recaptcha library everywhere'),
+ 'hint' => $this->l('Let this option disabled by default if you don\'t use a specific contact form'),
+ 'desc' => $this->l('Only If you use a theme with elementor or warehouse and your contact form is not on the default page, enable this option.'),
+ 'required' => false,
+ 'class' => 't',
+ 'is_bool' => true,
+ 'values' => [
+ [
+ 'id' => 'active_on',
+ 'value' => 1,
+ 'label' => $this->l('Enabled'),
+ ],
+ [
+ 'id' => 'active_off',
+ 'value' => 0,
+ 'label' => $this->l('Disabled'),
+ ],
+ ],
+ 'tab' => 'advanced',
+ ],
  [
  'type' => 'html',
  'label' => $this->l('Check module installation'),
@@ -339,6 +362,7 @@ public function postProcess()
  Configuration::updateValue('CAPTCHA_THEME', (int) Tools::getValue('CAPTCHA_THEME'));
  Configuration::updateValue('CAPTCHA_DEBUG', (int) Tools::getValue('CAPTCHA_DEBUG'));
  Configuration::updateValue('CAPTCHA_USE_AUTHCONTROLLER_OVERRIDE', (int) Tools::getValue('CAPTCHA_USE_AUTHCONTROLLER_OVERRIDE'));
+ Configuration::updateValue('CAPTCHA_LOAD_EVERYWHERE', (int) Tools::getValue('CAPTCHA_LOAD_EVERYWHERE'));
 
  return $this->module->displayConfirmation($this->l('Settings updated'));
  }
@@ -363,6 +387,7 @@ public function getConfigFieldsValues()
  'CAPTCHA_THEME' => Tools::getValue('CAPTCHA_THEME', Configuration::get('CAPTCHA_THEME')),
  'CAPTCHA_DEBUG' => Tools::getValue('CAPTCHA_DEBUG', Configuration::get('CAPTCHA_DEBUG')),
  'CAPTCHA_USE_AUTHCONTROLLER_OVERRIDE' => Tools::getValue('CAPTCHA_USE_AUTHCONTROLLER_OVERRIDE', Configuration::get('CAPTCHA_USE_AUTHCONTROLLER_OVERRIDE')),
+ 'CAPTCHA_LOAD_EVERYWHERE' => Tools::getValue('CAPTCHA_LOAD_EVERYWHERE', Configuration::get('CAPTCHA_LOAD_EVERYWHERE')),
  ];
  }
 

upgrade/upgrade-2.5.0.php

@@ -27,10 +27,15 @@
  */
 function upgrade_module_2_5_0($module)
 {
+ //Add a new configuration for websites with elementor to allow to load the recaptcha library on all pages
+ //But as it is unnecessary for most of the website it will be disabled by default
+ Configuration::updateValue('CAPTCHA_LOAD_EVERYWHERE', '0');
+
  //For the version 8.0+ we need to use to hook as the controller has changed.
  //For the version under it we let the choice to the customer, but by default we keep the legacy behavior
  $enableOverride = version_compare(_PS_VERSION_, '8.0') < 0 ? '1' : '0';
  Configuration::updateValue('CAPTCHA_USE_AUTHCONTROLLER_OVERRIDE', $enableOverride);
+
  $module->uninstallOverrides();
  $module->installOverrides();