diff --git a/web/modules/eicaptcha/README.md b/web/modules/eicaptcha/README.md deleted file mode 100644 index 2aace5ae..00000000 --- a/web/modules/eicaptcha/README.md +++ /dev/null @@ -1,27 +0,0 @@ -# eicaptcha -Module EiCaptcha for prestashop 1.7 - -This module display Google recaptcha on the following forms : - - contact form - - account creation form - - This module relies upon the override of the folowing files : - - AuthController - - ContactForm Module - - The last version used composer to get recaptcha lib. - Don't forget to use `composer update` in order to download the necessary recaptcha composer package. - Otherwise you can go on the github release page https://github.com/nenes25/eicaptcha/releases and download the last 2.0.x version release to get the full package - - Screenshots ---- - -
- Captcha on contact form
-
-
- Captcha on account creation form
-
-
If you do not have keys already then visit - - https://www.google.com/recaptcha/admin to generate them. - Edit this file and set the respective keys in $siteKey and - $secret. Reload the page after this.
- -That's it. Everything is working. Go integrate this into your real project.
- - -The following error was returned: getErrorCodes() as $code) { - echo '' , $code , ' '; - } - ?>
-Check the error code reference at https://developers.google.com/recaptcha/docs/verify#error-code-reference. -
Note: Error code missing-input-response may mean the user just didn't complete the reCAPTCHA.
- - -Complete the reCAPTCHA then submit the form.
- - - - diff --git a/web/modules/eicaptcha/vendor/google/recaptcha/phpunit.xml.dist b/web/modules/eicaptcha/vendor/google/recaptcha/phpunit.xml.dist deleted file mode 100644 index 43766788..00000000 --- a/web/modules/eicaptcha/vendor/google/recaptcha/phpunit.xml.dist +++ /dev/null @@ -1,17 +0,0 @@ - -+ {l s='How to get Site key and Secret key?' mod='ets_advancedcaptcha'} +
+ {elseif $input.name == 'PA_GOOGLE_V3_CAPTCHA_SECRET_KEY'} + {$smarty.block.parent} ++ {l s='How to get Site key and Secret key?' mod='ets_advancedcaptcha'} +
+ {else} + {$smarty.block.parent} + {/if} +{/block} +{block name="input_row"} + {if $old_version && isset($ik) && $ik == 0}{l s='Your message has been successfully sent to our team.' mod='ets_advancedcaptcha'}
+ +{elseif isset($alreadySent)} +{l s='Your message has already been sent.' mod='ets_advancedcaptcha'}
+ +{else} +{l s='For questions about an order or for more information about our products' mod='ets_advancedcaptcha'}.
+ {include file="$tpl_dir./errors.tpl"} + +{/if} diff --git a/web/modules/ets_advancedcaptcha/views/templates/front/contact-form.tpl b/web/modules/ets_advancedcaptcha/views/templates/front/contact-form.tpl new file mode 100644 index 00000000..7f471f71 --- /dev/null +++ b/web/modules/ets_advancedcaptcha/views/templates/front/contact-form.tpl @@ -0,0 +1,154 @@ +{* +* 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{l s='Your message has been successfully sent to our team.' mod='ets_advancedcaptcha'}
+ +{elseif isset($alreadySent)} +{l s='Your message has already been sent.' mod='ets_advancedcaptcha'}
+ +{else} + {include file="$tpl_dir./errors.tpl"} + +{/if} +{addJsDefL name='contact_fileDefaultHtml'}{l s='No file selected' mod='ets_advancedcaptcha' js=1}{/addJsDefL} +{addJsDefL name='contact_fileButtonHtml'}{l s='Choose File' mod='ets_advancedcaptcha' js=1}{/addJsDefL} diff --git a/web/modules/ets_advancedcaptcha/views/templates/front/index.php b/web/modules/ets_advancedcaptcha/views/templates/front/index.php new file mode 100644 index 00000000..fd19c194 --- /dev/null +++ b/web/modules/ets_advancedcaptcha/views/templates/front/index.php @@ -0,0 +1,31 @@ + + * @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; \ No newline at end of file diff --git a/web/modules/ets_advancedcaptcha/views/templates/front/password-15.tpl b/web/modules/ets_advancedcaptcha/views/templates/front/password-15.tpl new file mode 100644 index 00000000..fde2324a --- /dev/null +++ b/web/modules/ets_advancedcaptcha/views/templates/front/password-15.tpl @@ -0,0 +1,49 @@ +{* +* 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{l s='Your password has been successfully reset and a confirmation has been sent to your email address:' mod='ets_advancedcaptcha'} {if isset($email)}{$email|escape:'htmlall':'UTF-8'|stripslashes}{/if}
+{elseif isset($confirmation) && $confirmation == 2} +{l s='A confirmation email has been sent to your address:' mod='ets_advancedcaptcha'} {if isset($email)}{$email|escape:'htmlall':'UTF-8'|stripslashes}{/if}
+{else} +{l s='Please enter the email address you used to register. We will then send you a new password. ' mod='ets_advancedcaptcha'}
+ +{/if} +
+
{l s='Back to Login' mod='ets_advancedcaptcha'}
+
{l s='Your password has been successfully reset and a confirmation has been sent to your email address:' mod='ets_advancedcaptcha'} {if isset($customer_email)}{$customer_email|escape:'html':'UTF-8'|stripslashes}{/if}
+{elseif isset($confirmation) && $confirmation == 2} +{l s='A confirmation email has been sent to your address:' mod='ets_advancedcaptcha'} {if isset($customer_email)}{$customer_email|escape:'html':'UTF-8'|stripslashes}{/if}
+{else} +{l s='Please enter the email address you used to register. We will then send you a new password. ' mod='ets_advancedcaptcha'}
+ +{/if} +
+
+
+ {elseif $PA_CAPTCHA_TYPE == 'google_v3'}
+
+ {elseif $PA_CAPTCHA_TYPE == 'google'}
+
+ {/if}
+ {if $is16}div{else}span{/if}>
+ {if $is16}{/if}
+{if $is16}div{else}p{/if}>
\ No newline at end of file
diff --git a/web/modules/ets_advancedcaptcha/views/templates/hook/contact-form.tpl b/web/modules/ets_advancedcaptcha/views/templates/hook/contact-form.tpl
new file mode 100644
index 00000000..32f9a7c8
--- /dev/null
+++ b/web/modules/ets_advancedcaptcha/views/templates/hook/contact-form.tpl
@@ -0,0 +1,120 @@
+{*
+* 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 If you see an error that says method validate and getFormat are overriden
+ already by another module,
+ it means some other modules have overridden the method that causes blocking the CAPTCHA module to implement its
+ overriding code
+ To solve the problem, You need to manually edit the methods (in overriding files) with overriding code of the
+ CAPTCHA module
+
+
+
+
+
+
+
+
+
+ {l s='However, there are a few files/functions could not be overridden during the installation process (they might have been already overridden by another module).' mod='ets_advancedcaptcha'}
+{l s='Please check the installation log below and manually copy the files/functions from directory "root/modules/ets_advancedcaptcha/override/" to "root/override"' mod='ets_advancedcaptcha'}
+{l s='to make sure all features of the CAPTCHA works properly' mod='ets_advancedcaptcha'}
+{l s='Module was successfully installed with warnings.' mod='ets_advancedcaptcha'}
+ {l s='View installation log' mod='ets_advancedcaptcha'} + {l s='Clear installation log' mod='ets_advancedcaptcha'} +