Retour de l'ano 0000023 sur le Captcha : on remplace par un module qui fonctionne

web/modules/ets_advancedcaptcha/override/classes/form/CustomerForm.php

@@ -0,0 +1,39 @@
+<?php
+/**
+ * 2007-2019 ETS-Soft
+ *
+ * NOTICE OF LICENSE
+ *
+ * This file is not open source! Each license that you purchased is only available for 1 wesite only.
+ * If you want to use this file on more websites (or projects), you need to purchase additional licenses.
+ * You are not allowed to redistribute, resell, lease, license, sub-license or offer our resources to any third party.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please contact us for extra customization service at an affordable price
+ *
+ *  @author ETS-Soft <etssoft.jsc@gmail.com>
+ *  @copyright  2007-2019 ETS-Soft
+ *  @license    Valid for 1 website (or project) for each purchase of license
+ *  International Registered Trademark & Property of ETS-Soft
+ */
+
+class CustomerForm extends CustomerFormCore
+{
+    public function validate()
+    {
+        if (Tools::isSubmit('submitCreate') && Module::isEnabled('ets_advancedcaptcha') && ($captcha = Module::getInstanceByName('ets_advancedcaptcha')) && $captcha->checkFile('hook','captcha') && $captcha->hookVal(Tools::getValue('controller', false), 'register'))
+        {
+            $captchaField = $this->getField('captcha');
+            $errors = array();
+            $captcha->captchaVal($errors);
+            if ($errors)
+            {
+                $captchaField->addError(implode(',', $errors));
+            }
+        }
+        return parent::validate();
+    }
+}

web/modules/ets_advancedcaptcha/override/classes/form/CustomerFormatter.php

@@ -0,0 +1,39 @@
+<?php
+/**
+ * 2007-2019 ETS-Soft
+ *
+ * NOTICE OF LICENSE
+ *
+ * This file is not open source! Each license that you purchased is only available for 1 wesite only.
+ * If you want to use this file on more websites (or projects), you need to purchase additional licenses.
+ * You are not allowed to redistribute, resell, lease, license, sub-license or offer our resources to any third party.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please contact us for extra customization service at an affordable price
+ *
+ *  @author ETS-Soft <etssoft.jsc@gmail.com>
+ *  @copyright  2007-2019 ETS-Soft
+ *  @license    Valid for 1 website (or project) for each purchase of license
+ *  International Registered Trademark & Property of ETS-Soft
+ */
+
+class CustomerFormatter extends CustomerFormatterCore
+{
+    public function getFormat()
+    {
+        if (Module::isEnabled('ets_advancedcaptcha') && ($captcha = Module::getInstanceByName('ets_advancedcaptcha')) && $captcha->checkFile('hook','captcha') && $captcha->hookVal(Tools::getValue('controller', false), 'register'))
+        {
+            $formats = parent::getFormat();
+            $formats['captcha'] = (new FormField)
+                ->setName('captcha')
+                ->setType('text')
+                ->setRequired(true)
+                ->setValue(1);
+            return $formats;
+        }
+        return parent::getFormat();
+    }
+}

web/modules/ets_advancedcaptcha/override/classes/form/CustomerLoginForm.php

@@ -0,0 +1,33 @@
+<?php
+/**
+ * 2007-2019 ETS-Soft
+ *
+ * NOTICE OF LICENSE
+ *
+ * This file is not open source! Each license that you purchased is only available for 1 wesite only.
+ * If you want to use this file on more websites (or projects), you need to purchase additional licenses.
+ * You are not allowed to redistribute, resell, lease, license, sub-license or offer our resources to any third party.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please contact us for extra customization service at an affordable price
+ *
+ *  @author ETS-Soft <etssoft.jsc@gmail.com>
+ *  @copyright  2007-2019 ETS-Soft
+ *  @license    Valid for 1 website (or project) for each purchase of license
+ *  International Registered Trademark & Property of ETS-Soft
+ */
+
+class CustomerLoginForm extends CustomerLoginFormCore
+{
+    public function submit()
+    {
+        if (Tools::isSubmit('submitLogin') && Module::isEnabled('ets_advancedcaptcha') && ($captcha = Module::getInstanceByName('ets_advancedcaptcha')) && $captcha->checkFile('hook','login-form') && $captcha->hookVal(Tools::getValue('controller', false), 'login'))
+        {
+            $captcha->captchaVal($this->errors['']);
+        }
+        return !$this->errors['']? parent::submit() : !$this->hasErrors();
+    }
+}

web/modules/ets_advancedcaptcha/override/classes/form/index.php

@@ -0,0 +1,31 @@
+<?php
+/**
+ * 2007-2019 ETS-Soft
+ *
+ * NOTICE OF LICENSE
+ *
+ * This file is not open source! Each license that you purchased is only available for 1 wesite only.
+ * If you want to use this file on more websites (or projects), you need to purchase additional licenses.
+ * You are not allowed to redistribute, resell, lease, license, sub-license or offer our resources to any third party.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please contact us for extra customization service at an affordable price
+ *
+ *  @author ETS-Soft <etssoft.jsc@gmail.com>
+ *  @copyright  2007-2019 ETS-Soft
+ *  @license    Valid for 1 website (or project) for each purchase of license
+ *  International Registered Trademark & Property of ETS-Soft
+ */
+
+header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+
+header("Cache-Control: no-store, no-cache, must-revalidate");
+header("Cache-Control: post-check=0, pre-check=0", false);
+header("Pragma: no-cache");
+
+header("Location: ../");
+exit;

web/modules/ets_advancedcaptcha/override/classes/index.php

@@ -0,0 +1,31 @@
+<?php
+/**
+ * 2007-2019 ETS-Soft
+ *
+ * NOTICE OF LICENSE
+ *
+ * This file is not open source! Each license that you purchased is only available for 1 wesite only.
+ * If you want to use this file on more websites (or projects), you need to purchase additional licenses.
+ * You are not allowed to redistribute, resell, lease, license, sub-license or offer our resources to any third party.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please contact us for extra customization service at an affordable price
+ *
+ *  @author ETS-Soft <etssoft.jsc@gmail.com>
+ *  @copyright  2007-2019 ETS-Soft
+ *  @license    Valid for 1 website (or project) for each purchase of license
+ *  International Registered Trademark & Property of ETS-Soft
+ */
+
+header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+
+header("Cache-Control: no-store, no-cache, must-revalidate");
+header("Cache-Control: post-check=0, pre-check=0", false);
+header("Pragma: no-cache");
+
+header("Location: ../");
+exit;

web/modules/ets_advancedcaptcha/override/controllers/front/AuthController.php

@@ -0,0 +1,52 @@
+<?php
+/**
+ * 2007-2019 ETS-Soft
+ *
+ * NOTICE OF LICENSE
+ *
+ * This file is not open source! Each license that you purchased is only available for 1 wesite only.
+ * If you want to use this file on more websites (or projects), you need to purchase additional licenses.
+ * You are not allowed to redistribute, resell, lease, license, sub-license or offer our resources to any third party.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please contact us for extra customization service at an affordable price
+ *
+ *  @author ETS-Soft <etssoft.jsc@gmail.com>
+ *  @copyright  2007-2019 ETS-Soft
+ *  @license    Valid for 1 website (or project) for each purchase of license
+ *  International Registered Trademark & Property of ETS-Soft
+ */
+
+class AuthController extends AuthControllerCore
+{
+    public function initContent()
+    {
+        parent::initContent();
+        if (version_compare(_PS_VERSION_, '1.7', '<') && Module::isEnabled('ets_advancedcaptcha')&& !Configuration::get('PA_CAPTCHA_TMP_LOGIN') && ($captcha = Module::getInstanceByName('ets_advancedcaptcha')) && ($checkFile = $captcha->checkFile('front','authentication', true)) && $captcha->hookVal(Tools::getValue('controller', false),'login'))
+        {
+            $this->setTemplate($checkFile);
+        }
+    }
+
+    public function processSubmitAccount()
+    {
+        if (version_compare(_PS_VERSION_, '1.7', '<') && Module::isEnabled('ets_advancedcaptcha') && ($captcha = Module::getInstanceByName('ets_advancedcaptcha')) && $captcha->checkFile('hook','captcha') && $captcha->hookVal(Tools::getValue('controller', false),'register'))
+        {
+            $captcha->captchaVal($this->errors);
+        }
+        parent::processSubmitAccount();
+    }
+
+    protected function processSubmitLogin()
+    {
+        if (version_compare(_PS_VERSION_, '1.7', '<') && Module::isEnabled('ets_advancedcaptcha') && ($captcha = Module::getInstanceByName('ets_advancedcaptcha')) && (Configuration::get('PA_CAPTCHA_TMP_LOGIN') || $captcha->checkFile('front','authentication', true)) && $captcha->hookVal(Tools::getValue('controller', false),'login'))
+        {
+            $captcha->captchaVal($this->errors);
+        }
+        if (!$this->errors)
+            return parent::processSubmitLogin();
+    }
+}

web/modules/ets_advancedcaptcha/override/controllers/front/ContactController.php

@@ -0,0 +1,46 @@
+<?php
+/**
+ * 2007-2019 ETS-Soft
+ *
+ * NOTICE OF LICENSE
+ *
+ * This file is not open source! Each license that you purchased is only available for 1 wesite only.
+ * If you want to use this file on more websites (or projects), you need to purchase additional licenses.
+ * You are not allowed to redistribute, resell, lease, license, sub-license or offer our resources to any third party.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please contact us for extra customization service at an affordable price
+ *
+ *  @author ETS-Soft <etssoft.jsc@gmail.com>
+ *  @copyright  2007-2019 ETS-Soft
+ *  @license    Valid for 1 website (or project) for each purchase of license
+ *  International Registered Trademark & Property of ETS-Soft
+ */
+
+class ContactController extends ContactControllerCore
+{
+    public function postProcess()
+    {
+        if (Tools::isSubmit('submitMessage'))
+        {
+            if (version_compare(_PS_VERSION_, '1.7.0', '<') && Module::isEnabled('ets_advancedcaptcha') && ($captcha = Module::getInstanceByName('ets_advancedcaptcha')) && (Configuration::get('PA_CAPTCHA_TMP_CONTACT') || $captcha->checkFile('front','contact-form', true)) && $captcha->hookVal(Tools::getValue('controller', false),'contact'))
+            {
+                $captcha->captchaVal($this->errors);
+            }
+            if (!count($this->errors))
+                parent::postProcess();
+        }
+    }
+
+    public function initContent()
+    {
+        parent::initContent();
+        if (version_compare(_PS_VERSION_, '1.7.0', '<') && Module::isEnabled('ets_advancedcaptcha') && ($captcha = Module::getInstanceByName('ets_advancedcaptcha')) && !(int)Configuration::get('PA_CAPTCHA_TMP_CONTACT') && ($checkFile = $captcha->checkFile('front','contact-form', true)) && $captcha->hookVal(Tools::getValue('controller', false),'contact'))
+        {
+            $this->setTemplate($checkFile);
+        }
+    }
+}

web/modules/ets_advancedcaptcha/override/controllers/front/PasswordController.php

@@ -0,0 +1,51 @@
+<?php
+/**
+ * 2007-2019 ETS-Soft
+ *
+ * NOTICE OF LICENSE
+ *
+ * This file is not open source! Each license that you purchased is only available for 1 wesite only.
+ * If you want to use this file on more websites (or projects), you need to purchase additional licenses.
+ * You are not allowed to redistribute, resell, lease, license, sub-license or offer our resources to any third party.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please contact us for extra customization service at an affordable price
+ *
+ *  @author ETS-Soft <etssoft.jsc@gmail.com>
+ *  @copyright  2007-2019 ETS-Soft
+ *  @license    Valid for 1 website (or project) for each purchase of license
+ *  International Registered Trademark & Property of ETS-Soft
+ */
+
+class PasswordController extends PasswordControllerCore
+{
+    public function postProcess()
+    {
+        if (Tools::isSubmit('email') && version_compare(_PS_VERSION_, '1.7', '<') && Module::isEnabled('ets_advancedcaptcha') && ($captcha = Module::getInstanceByName('ets_advancedcaptcha')) && (Configuration::get('PA_CAPTCHA_TMP_RE_PASSWORD') || $captcha->checkFile('front','password', true)) && $captcha->hookVal(Tools::getValue('controller', false), 'pwd_recovery'))
+        {
+            $captcha->captchaVal($this->errors);
+        }
+        if (!$this->errors)
+            return parent::postProcess();
+    }
+    public function initContent()
+    {
+        parent::initContent();
+        if (version_compare(_PS_VERSION_, '1.7', '<') && Module::isEnabled('ets_advancedcaptcha') && ($captcha = Module::getInstanceByName('ets_advancedcaptcha')) && !(int)Configuration::get('PA_CAPTCHA_TMP_RE_PASSWORD') && ($checkFile = $captcha->checkFile('front','password', true)) && $captcha->hookVal(Tools::getValue('controller', false), 'pwd_recovery'))
+        {
+            $this->setTemplate($checkFile);
+        }
+    }
+    protected function sendRenewPasswordLink()
+    {
+        if (version_compare(_PS_VERSION_, '1.7', '>=') && Module::isEnabled('ets_advancedcaptcha') && ($captcha = Module::getInstanceByName('ets_advancedcaptcha')) && $captcha->checkFile('hook','password-email')  && $captcha->hookVal(Tools::getValue('controller', false), 'pwd_recovery'))
+        {
+            $captcha->captchaVal($this->errors);
+        }
+        if (!$this->errors)
+            return parent::sendRenewPasswordLink();
+    }
+}

web/modules/ets_advancedcaptcha/override/controllers/front/index.php

@@ -0,0 +1,31 @@
+<?php
+/**
+ * 2007-2019 ETS-Soft
+ *
+ * NOTICE OF LICENSE
+ *
+ * This file is not open source! Each license that you purchased is only available for 1 wesite only.
+ * If you want to use this file on more websites (or projects), you need to purchase additional licenses.
+ * You are not allowed to redistribute, resell, lease, license, sub-license or offer our resources to any third party.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please contact us for extra customization service at an affordable price
+ *
+ *  @author ETS-Soft <etssoft.jsc@gmail.com>
+ *  @copyright  2007-2019 ETS-Soft
+ *  @license    Valid for 1 website (or project) for each purchase of license
+ *  International Registered Trademark & Property of ETS-Soft
+ */
+
+header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+
+header("Cache-Control: no-store, no-cache, must-revalidate");
+header("Cache-Control: post-check=0, pre-check=0", false);
+header("Pragma: no-cache");
+
+header("Location: ../");
+exit;

web/modules/ets_advancedcaptcha/override/controllers/index.php

@@ -0,0 +1,31 @@
+<?php
+/**
+ * 2007-2019 ETS-Soft
+ *
+ * NOTICE OF LICENSE
+ *
+ * This file is not open source! Each license that you purchased is only available for 1 wesite only.
+ * If you want to use this file on more websites (or projects), you need to purchase additional licenses.
+ * You are not allowed to redistribute, resell, lease, license, sub-license or offer our resources to any third party.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please contact us for extra customization service at an affordable price
+ *
+ *  @author ETS-Soft <etssoft.jsc@gmail.com>
+ *  @copyright  2007-2019 ETS-Soft
+ *  @license    Valid for 1 website (or project) for each purchase of license
+ *  International Registered Trademark & Property of ETS-Soft
+ */
+
+header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+
+header("Cache-Control: no-store, no-cache, must-revalidate");
+header("Cache-Control: post-check=0, pre-check=0", false);
+header("Pragma: no-cache");
+
+header("Location: ../");
+exit;

web/modules/ets_advancedcaptcha/override/index.php

@@ -0,0 +1,31 @@
+<?php
+/**
+ * 2007-2019 ETS-Soft
+ *
+ * NOTICE OF LICENSE
+ *
+ * This file is not open source! Each license that you purchased is only available for 1 wesite only.
+ * If you want to use this file on more websites (or projects), you need to purchase additional licenses.
+ * You are not allowed to redistribute, resell, lease, license, sub-license or offer our resources to any third party.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please contact us for extra customization service at an affordable price
+ *
+ *  @author ETS-Soft <etssoft.jsc@gmail.com>
+ *  @copyright  2007-2019 ETS-Soft
+ *  @license    Valid for 1 website (or project) for each purchase of license
+ *  International Registered Trademark & Property of ETS-Soft
+ */
+
+header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+
+header("Cache-Control: no-store, no-cache, must-revalidate");
+header("Cache-Control: post-check=0, pre-check=0", false);
+header("Pragma: no-cache");
+
+header("Location: ../");
+exit;

web/modules/ets_advancedcaptcha/override/modules/blocknewsletter/blocknewsletter.php

@@ -0,0 +1,48 @@
+<?php
+/**
+ * 2007-2019 ETS-Soft
+ *
+ * NOTICE OF LICENSE
+ *
+ * This file is not open source! Each license that you purchased is only available for 1 wesite only.
+ * If you want to use this file on more websites (or projects), you need to purchase additional licenses.
+ * You are not allowed to redistribute, resell, lease, license, sub-license or offer our resources to any third party.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please contact us for extra customization service at an affordable price
+ *
+ *  @author ETS-Soft <etssoft.jsc@gmail.com>
+ *  @copyright  2007-2019 ETS-Soft
+ *  @license    Valid for 1 website (or project) for each purchase of license
+ *  International Registered Trademark & Property of ETS-Soft
+ */
+
+if (!defined('_PS_VERSION_') || !class_exists('Blocknewsletter') || version_compare(_PS_VERSION_, '1.7', '>='))
+    exit;
+class BlocknewsletterOverride extends Blocknewsletter
+{
+    public function hookDisplayLeftColumn($params)
+    {
+        $result = parent::hookDisplayLeftColumn($params);
+        if ($result && Module::isEnabled('ets_advancedcaptcha') && ($captcha = Module::getInstanceByName('ets_advancedcaptcha')) && ($checkFile = $captcha->checkFile('hook','blocknewsletter')) && $captcha->hookVal(Tools::getValue('controller', false), 'newsletter'))
+        {
+            $result = $this->context->smarty->fetch($checkFile);
+        }
+        return $result;
+    }
+
+    protected function newsletterRegistration()
+    {
+        if (Module::isEnabled('ets_advancedcaptcha') && ($captcha = Module::getInstanceByName('ets_advancedcaptcha')) && $captcha->checkFile('hook','blocknewsletter') && $captcha->hookVal(Tools::getValue('controller', false), 'newsletter'))
+        {
+            $captcha->captchaVal($this->error);
+            if (is_array($this->error))
+                $this->error = implode(',', $this->error);
+        }
+        if (!$this->error)
+            parent::newsletterRegistration();
+    }
+}

web/modules/ets_advancedcaptcha/override/modules/blocknewsletter/index.php

@@ -0,0 +1,31 @@
+<?php
+/**
+ * 2007-2019 ETS-Soft
+ *
+ * NOTICE OF LICENSE
+ *
+ * This file is not open source! Each license that you purchased is only available for 1 wesite only.
+ * If you want to use this file on more websites (or projects), you need to purchase additional licenses.
+ * You are not allowed to redistribute, resell, lease, license, sub-license or offer our resources to any third party.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please contact us for extra customization service at an affordable price
+ *
+ *  @author ETS-Soft <etssoft.jsc@gmail.com>
+ *  @copyright  2007-2019 ETS-Soft
+ *  @license    Valid for 1 website (or project) for each purchase of license
+ *  International Registered Trademark & Property of ETS-Soft
+ */
+
+header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+
+header("Cache-Control: no-store, no-cache, must-revalidate");
+header("Cache-Control: post-check=0, pre-check=0", false);
+header("Pragma: no-cache");
+
+header("Location: ../");
+exit;

web/modules/ets_advancedcaptcha/override/modules/index.php

@@ -0,0 +1,35 @@
+<?php
+/**
+ * 2007-2017 PrestaShop
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to http://www.prestashop.com for more information.
+ *
+ * @author    PrestaShop SA <contact@prestashop.com>
+ * @copyright 2007-2017 PrestaShop SA
+ * @license   http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ * International Registered Trademark & Property of PrestaShop SA
+ */
+
+header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+
+header("Cache-Control: no-store, no-cache, must-revalidate");
+header("Cache-Control: post-check=0, pre-check=0", false);
+header("Pragma: no-cache");
+
+header("Location: ../");
+exit;

web/modules/ets_advancedcaptcha/override/modules/mailalerts/index.php

@@ -0,0 +1,31 @@
+<?php
+/**
+ * 2007-2019 ETS-Soft
+ *
+ * NOTICE OF LICENSE
+ *
+ * This file is not open source! Each license that you purchased is only available for 1 wesite only.
+ * If you want to use this file on more websites (or projects), you need to purchase additional licenses.
+ * You are not allowed to redistribute, resell, lease, license, sub-license or offer our resources to any third party.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please contact us for extra customization service at an affordable price
+ *
+ *  @author ETS-Soft <etssoft.jsc@gmail.com>
+ *  @copyright  2007-2019 ETS-Soft
+ *  @license    Valid for 1 website (or project) for each purchase of license
+ *  International Registered Trademark & Property of ETS-Soft
+ */
+
+header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+
+header("Cache-Control: no-store, no-cache, must-revalidate");
+header("Cache-Control: post-check=0, pre-check=0", false);
+header("Pragma: no-cache");
+
+header("Location: ../");
+exit;

web/modules/ets_advancedcaptcha/override/modules/mailalerts/mailalerts.php

@@ -0,0 +1,49 @@
+<?php
+/**
+ * 2007-2019 ETS-Soft
+ *
+ * NOTICE OF LICENSE
+ *
+ * This file is not open source! Each license that you purchased is only available for 1 wesite only.
+ * If you want to use this file on more websites (or projects), you need to purchase additional licenses.
+ * You are not allowed to redistribute, resell, lease, license, sub-license or offer our resources to any third party.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please contact us for extra customization service at an affordable price
+ *
+ *  @author ETS-Soft <etssoft.jsc@gmail.com>
+ *  @copyright  2007-2019 ETS-Soft
+ *  @license    Valid for 1 website (or project) for each purchase of license
+ *  International Registered Trademark & Property of ETS-Soft
+ */
+
+if (!defined('_PS_VERSION_') || !class_exists('MailAlerts') || version_compare(_PS_VERSION_, '1.7', '>='))
+    exit;
+class MailAlertsOverride extends MailAlerts
+{
+    public function __construct()
+    {
+        parent::__construct();
+        if (Tools::getValue('process', false) == 'add' && Tools::getValue('module', false) == $this->name && Tools::getValue('controller', false) == 'actions')
+        {
+            if (Module::isEnabled('ets_advancedcaptcha') && ($captcha = Module::getInstanceByName('ets_advancedcaptcha')) && $captcha->checkFile('hook','mailalerts') && $captcha->hookVal('product', 'out_of_stock'))
+            {
+                $captcha->captchaVal($this->_errors);
+            }
+            if ($this->_errors)
+                die('-1');
+        }
+    }
+    public function hookActionProductOutOfStock($params)
+    {
+        $result = parent::hookActionProductOutOfStock($params);
+        if ($result && Module::isEnabled('ets_advancedcaptcha') && ($captcha = Module::getInstanceByName('ets_advancedcaptcha')) && ($checkFile = $captcha->checkFile('hook','mailalerts')) && $captcha->hookVal('product', 'out_of_stock'))
+        {
+            $result = $this->context->smarty->fetch($checkFile);
+        }
+        return $result;
+    }
+}

web/modules/ets_advancedcaptcha/override/modules/ps_emailalerts/index.php

@@ -0,0 +1,31 @@
+<?php
+/**
+ * 2007-2019 ETS-Soft
+ *
+ * NOTICE OF LICENSE
+ *
+ * This file is not open source! Each license that you purchased is only available for 1 wesite only.
+ * If you want to use this file on more websites (or projects), you need to purchase additional licenses.
+ * You are not allowed to redistribute, resell, lease, license, sub-license or offer our resources to any third party.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please contact us for extra customization service at an affordable price
+ *
+ *  @author ETS-Soft <etssoft.jsc@gmail.com>
+ *  @copyright  2007-2019 ETS-Soft
+ *  @license    Valid for 1 website (or project) for each purchase of license
+ *  International Registered Trademark & Property of ETS-Soft
+ */
+
+header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+
+header("Cache-Control: no-store, no-cache, must-revalidate");
+header("Cache-Control: post-check=0, pre-check=0", false);
+header("Pragma: no-cache");
+
+header("Location: ../");
+exit;

web/modules/ets_advancedcaptcha/override/modules/ps_emailalerts/ps_emailalerts.php

@@ -0,0 +1,54 @@
+<?php
+/**
+ * 2007-2019 ETS-Soft
+ *
+ * NOTICE OF LICENSE
+ *
+ * This file is not open source! Each license that you purchased is only available for 1 wesite only.
+ * If you want to use this file on more websites (or projects), you need to purchase additional licenses.
+ * You are not allowed to redistribute, resell, lease, license, sub-license or offer our resources to any third party.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please contact us for extra customization service at an affordable price
+ *
+ *  @author ETS-Soft <etssoft.jsc@gmail.com>
+ *  @copyright  2007-2019 ETS-Soft
+ *  @license    Valid for 1 website (or project) for each purchase of license
+ *  International Registered Trademark & Property of ETS-Soft
+ */
+
+if (!defined('_PS_VERSION_') || !class_exists('Ps_EmailAlerts') || version_compare(_PS_VERSION_, '1.7', '<'))
+    exit;
+class Ps_EmailAlertsOverride extends Ps_EmailAlerts
+{
+    public function __construct()
+    {
+        parent::__construct();
+        if (Tools::getValue('process', false) == 'add' && Tools::getValue('module', false) == $this->name && Tools::getValue('controller', false) == 'actions')
+        {
+            if (Module::isEnabled('ets_advancedcaptcha') && ($captcha = Module::getInstanceByName('ets_advancedcaptcha')) && $captcha->checkFile('hook','ps_emailalerts', true) && $captcha->hookVal('product', 'out_of_stock'))
+            {
+                $captcha->captchaVal($this->_errors);
+            }
+            if ($this->_errors)
+            {
+                die(Tools::jsonEncode(array(
+                    'error' => true,
+                    'message' => implode(',', $this->_errors),
+                )));
+            }
+        }
+    }
+    public function hookDisplayProductAdditionalInfo($params)
+    {
+        $result = parent::hookDisplayProductAdditionalInfo($params);
+        if ($result && Module::isEnabled('ets_advancedcaptcha') && ($captcha = Module::getInstanceByName('ets_advancedcaptcha')) && ($checkFile = $captcha->checkFile('hook','ps_emailalerts', true)) && $captcha->hookVal('product', 'out_of_stock'))
+        {
+            $result = $this->fetch($checkFile);
+        }
+        return $result;
+    }
+}

web/modules/ets_advancedcaptcha/override/modules/ps_emailsubscription/index.php

@@ -0,0 +1,31 @@
+<?php
+/**
+ * 2007-2019 ETS-Soft
+ *
+ * NOTICE OF LICENSE
+ *
+ * This file is not open source! Each license that you purchased is only available for 1 wesite only.
+ * If you want to use this file on more websites (or projects), you need to purchase additional licenses.
+ * You are not allowed to redistribute, resell, lease, license, sub-license or offer our resources to any third party.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please contact us for extra customization service at an affordable price
+ *
+ *  @author ETS-Soft <etssoft.jsc@gmail.com>
+ *  @copyright  2007-2019 ETS-Soft
+ *  @license    Valid for 1 website (or project) for each purchase of license
+ *  International Registered Trademark & Property of ETS-Soft
+ */
+
+header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+
+header("Cache-Control: no-store, no-cache, must-revalidate");
+header("Cache-Control: post-check=0, pre-check=0", false);
+header("Pragma: no-cache");
+
+header("Location: ../");
+exit;

web/modules/ets_advancedcaptcha/override/modules/ps_emailsubscription/ps_emailsubscription.php

@@ -0,0 +1,51 @@
+<?php
+/**
+ * 2007-2019 ETS-Soft
+ *
+ * NOTICE OF LICENSE
+ *
+ * This file is not open source! Each license that you purchased is only available for 1 wesite only.
+ * If you want to use this file on more websites (or projects), you need to purchase additional licenses.
+ * You are not allowed to redistribute, resell, lease, license, sub-license or offer our resources to any third party.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please contact us for extra customization service at an affordable price
+ *
+ *  @author ETS-Soft <etssoft.jsc@gmail.com>
+ *  @copyright  2007-2019 ETS-Soft
+ *  @license    Valid for 1 website (or project) for each purchase of license
+ *  International Registered Trademark & Property of ETS-Soft
+ */
+
+if (!defined('_PS_VERSION_') || !class_exists('Ps_Emailsubscription') || version_compare(_PS_VERSION_, '1.7', '<'))
+    exit;
+class Ps_EmailsubscriptionOverride extends Ps_Emailsubscription
+{
+    public $error = false;
+
+    public function renderWidget($hookName = null, array $configuration = array())
+    {
+        $this->smarty->assign($this->getWidgetVariables($hookName, $configuration));
+        $this->context->smarty->assign(array('id_module' => $this->id));
+        if (Module::isEnabled('ets_advancedcaptcha') && ($captcha = Module::getInstanceByName('ets_advancedcaptcha')) && ($checkFile = $captcha->checkFile('hook','ps_emailsubscription', true)) && $captcha->hookVal(Tools::getValue('controller', false), 'newsletter'))
+        {
+            return $this->fetch($checkFile);
+        }
+        return $this->fetch('module:ps_emailsubscription/views/templates/hook/ps_emailsubscription.tpl');
+    }
+
+    public function newsletterRegistration()
+    {
+        if (Module::isEnabled('ets_advancedcaptcha') && ($captcha = Module::getInstanceByName('ets_advancedcaptcha')) && $captcha->checkFile('hook','ps_emailalerts') && $captcha->hookVal(Tools::getValue('controller', false), 'newsletter'))
+        {
+            $captcha->captchaVal($this->error);
+            if (is_array($this->error))
+                $this->error = implode(',', $this->error);
+        }
+        if (!$this->error)
+            parent::newsletterRegistration();
+    }
+}