TheCoreDev/taome
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

On change de module de Captcha

Browse Source
This commit is contained in:
TheCoreDev
2020-10-29 11:09:29 +01:00
parent 46b1cae84e
commit d5c6342c37
124 changed files with 1001 additions and 10260 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
override/classes/form/CustomerForm.php
View File

@@ -1,41 +0,0 @@
<?php
/**
* 2007-2020 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-2020 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
{
/*
* module: ets_advancedcaptcha
* date: 2020-10-20 11:45:48
* version: 1.1.6
*/
public function validate()
{
if (Tools::isSubmit('submitCreate') && Module::isEnabled('ets_advancedcaptcha') && ($captcha = Module::getInstanceByName('ets_advancedcaptcha')) && $captcha->hookVal(trim(Tools::getValue('controller')), 'register')) {
$captchaField = $this->getField('captcha');
$errors = array();
$captcha->captchaVal($errors);
if ($errors) {
$captchaField->addError(implode(',', $errors));
}
}
return parent::validate();
}
}

42
override/classes/form/CustomerFormatter.php
View File

@@ -1,42 +0,0 @@
<?php
/**
* 2007-2020 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-2020 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
{
/*
* module: ets_advancedcaptcha
* date: 2020-10-20 11:45:48
* version: 1.1.6
*/
public function getFormat()
{
if (Module::isEnabled('ets_advancedcaptcha') && ($captcha = Module::getInstanceByName('ets_advancedcaptcha')) && $captcha->hookVal(trim(Tools::getValue('controller')), 'register')) {
$formats = parent::getFormat();
$formats['captcha'] = (new FormField)
->setName('captcha')
->setType('text')
->setRequired(true)
->setValue(1);
return $formats;
}
return parent::getFormat();
}
}

36
override/classes/form/CustomerLoginForm.php
View File

@@ -1,36 +0,0 @@
<?php
/**
* 2007-2020 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-2020 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
{
/*
* module: ets_advancedcaptcha
* date: 2020-10-20 11:45:49
* version: 1.1.6
*/
public function submit()
{
if (Tools::isSubmit('submitLogin') && Module::isEnabled('ets_advancedcaptcha') && ($captcha = Module::getInstanceByName('ets_advancedcaptcha')) && $captcha->hookVal(trim(Tools::getValue('controller')), 'login')) {
$captcha->captchaVal($this->errors['']);
}
return !$this->errors[''] ? parent::submit() : !$this->hasErrors();
}
}

64
override/controllers/front/AuthController.php
View File

@@ -1,49 +1,31 @@
<?php
/**
* 2007-2020 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-2020 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
{
/*
* module: ets_advancedcaptcha
* date: 2020-10-20 11:45:50
* version: 1.1.6
* module: eicaptcha
* date: 2020-10-29 10:48:47
* version: 2.0.1
*/
public function processSubmitAccount()
public function initContent()
{
if (version_compare(_PS_VERSION_, '1.7', '<') && Module::isEnabled('ets_advancedcaptcha') && ($captcha = Module::getInstanceByName('ets_advancedcaptcha')) && $captcha->hookVal(trim(Tools::getValue('controller')), 'register')) {
$captcha->captchaVal($this->errors);
if ( Tools::isSubmit('submitCreate') ) {
Hook::exec('actionContactFormSubmitCaptcha');
if ( ! sizeof( $this->context->controller->errors ) ) {
parent::initContent();
} else {
$register_form = $this
->makeCustomerForm()
->setGuestAllowed(false)
->fillWith(Tools::getAllValues());
FrontController::initContent();
$this->context->smarty->assign([
'register_form' => $register_form->getProxy(),
'hook_create_account_top' => Hook::exec('displayCustomerAccountFormTop')
]);
$this->setTemplate('customer/registration');
}
} else {
parent::initContent();
}
parent::processSubmitAccount();
}
/*
* module: ets_advancedcaptcha
* date: 2020-10-20 11:45:50
* version: 1.1.6
*/
protected function processSubmitLogin()
{
if (version_compare(_PS_VERSION_, '1.7', '<') && Module::isEnabled('ets_advancedcaptcha') && ($captcha = Module::getInstanceByName('ets_advancedcaptcha')) && $captcha->hookVal(trim(Tools::getValue('controller')), 'login')) {
$captcha->captchaVal($this->errors);
}
if (!$this->errors)
return parent::processSubmitLogin();
}
}
}

39
override/controllers/front/ContactController.php
View File

@@ -1,39 +0,0 @@
<?php
/**
* 2007-2020 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-2020 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
{
/*
* module: ets_advancedcaptcha
* date: 2020-10-20 11:45:50
* version: 1.1.6
*/
public function postProcess()
{
if (Tools::isSubmit('submitMessage')) {
if (version_compare(_PS_VERSION_, '1.7.0', '<') && Module::isEnabled('ets_advancedcaptcha') && ($captcha = Module::getInstanceByName('ets_advancedcaptcha')) && $captcha->hookVal(trim(Tools::getValue('controller')), 'contact')) {
$captcha->captchaVal($this->errors);
}
if (!count($this->errors))
parent::postProcess();
}
}
}

50
override/controllers/front/PasswordController.php
View File

@@ -1,50 +0,0 @@
<?php
/**
* 2007-2020 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-2020 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
{
/*
* module: ets_advancedcaptcha
* date: 2020-10-20 11:45:51
* version: 1.1.6
*/
public function postProcess()
{
if (Tools::isSubmit('email') && version_compare(_PS_VERSION_, '1.7', '<') && Module::isEnabled('ets_advancedcaptcha') && ($captcha = Module::getInstanceByName('ets_advancedcaptcha')) && $captcha->hookVal(trim(Tools::getValue('controller')), 'pwd_recovery')) {
$captcha->captchaVal($this->errors);
}
if (!$this->errors)
return parent::postProcess();
}
/*
* module: ets_advancedcaptcha
* date: 2020-10-20 11:45:51
* version: 1.1.6
*/
protected function sendRenewPasswordLink()
{
if (version_compare(_PS_VERSION_, '1.7', '>=') && Module::isEnabled('ets_advancedcaptcha') && ($captcha = Module::getInstanceByName('ets_advancedcaptcha')) && $captcha->hookVal(trim(Tools::getValue('controller')), 'pwd_recovery')) {
$captcha->captchaVal($this->errors);
}
if (!$this->errors)
return parent::sendRenewPasswordLink();
}
}

10
override/modules/contactform/contactform.php Normal file
View File

@@ -0,0 +1,10 @@
<?php
class ContactformOverride extends Contactform
{
public function sendMessage() {
Hook::exec('actionContactFormSubmitBefore');
if ( !sizeof($this->context->controller->errors)) {
parent::sendMessage();
}
}
}

34
override/modules/ps_emailsubscription/ps_emailsubscription.php
View File

@@ -1,34 +0,0 @@
<?php
/**
* 2007-2020 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-2020 ETS-Soft
* @license Valid for 1 website (or project) for each purchase of license
* International Registered Trademark & Property of ETS-Soft
*/
class Ps_EmailsubscriptionOverride extends Ps_Emailsubscription
{
public function newsletterRegistration()
{
if (Module::isEnabled('ets_advancedcaptcha') && ($captcha = Module::getInstanceByName('ets_advancedcaptcha')) && $captcha->hookVal(trim(Tools::getValue('controller')), 'newsletter')) {
$captcha->captchaVal($this->_errors);
if (is_array($this->_errors))
$this->_errors = implode(',', $this->_errors);
}
if (!$this->_errors)
parent::newsletterRegistration();
}
}