D3Public/captcha-module
8
0
Fork 0
mirror of https://git.d3data.de/3rdParty/captcha-module.git synced 2024-10-31 20:34:38 +01:00
Code Packages Projects Releases Activity

Compare commits

base: D3Public:v2.0.5
Branches Tags
D3Public:master
D3Public:old-master
D3Public:original-simple-captcha/b-7.0.x
D3Public:2.0.9
D3Public:2.0.8
D3Public:2.0.7
D3Public:2.0.6
D3Public:v2.0.5
D3Public:v2.0.4
D3Public:v2.0.3
D3Public:v2.0.2
D3Public:v2.0.1
D3Public:v2.0.0
..
compare: D3Public:master
Branches Tags
D3Public:master
D3Public:old-master
D3Public:original-simple-captcha/b-7.0.x
D3Public:2.0.9
D3Public:2.0.8
D3Public:2.0.7
D3Public:2.0.6
D3Public:v2.0.5
D3Public:v2.0.4
D3Public:v2.0.3
D3Public:v2.0.2
D3Public:v2.0.1
D3Public:v2.0.0

27 Commits
v2.0.5 ... master

Author SHA1 Message Date
MarkusGaertner
0607bbaa7c add check for oCaptcha 2024-06-25 10:06:15 +02:00
MarkusGaertner
61133da014 add check for oCaptcha 2024-06-25 10:04:06 +02:00
MarkusGaertner
ffcfed8ba0 Merge branch 'master' of https://git.d3data.de/3rdParty/captcha-module into master 2024-06-25 09:59:34 +02:00
MarkusGaertner
45657767e4 mod CHANGELOG.md, add some comments 2024-05-21 14:06:23 +02:00
MarkusGaertner
a2fdc17247 Ausnahmebedingung für Amazon Pay 2024-05-21 14:06:23 +02:00
MarkusGaertner
5620d6b460 add Version 2.0.7 2024-05-21 14:06:22 +02:00
MarkusGaertner
0305d484a3 Remove complication with PayPal Checkout 2024-05-21 14:06:22 +02:00
Daniel Seifert
ba5d8d04af adjust version informations 2024-05-21 14:06:22 +02:00
Daniel Seifert
3d0025cbc9 don't show and request captcha if user is logged in 2024-05-21 14:06:22 +02:00
Daniel Seifert
4e038ef885 initial preparation for ticket https://support.shopmodule.com/scp/tickets.php?id=11765 2024-05-21 14:06:21 +02:00
MarkusGaertner
c44887803e update Version to 2.0.5 2024-05-21 14:06:21 +02:00
MarkusGaertner
33fe2d8ade add templates for wave theme 2024-05-21 14:06:21 +02:00
MarkusGaertner
ae340f8569 add check for user 2024-05-21 14:06:20 +02:00
MarkusGaertner
0c74177b15 add check for register 2024-05-21 14:06:20 +02:00
MarkusGaertner
2ac4507ace mod CHANGELOG.md, add some comments 2023-11-16 09:29:03 +01:00
MarkusGaertner
69618b8db5 Ausnahmebedingung für Amazon Pay 2023-11-15 14:38:08 +01:00
MarkusGaertner
e1be2b618a add Version 2.0.7 2023-09-05 14:43:06 +02:00
MarkusGaertner
e7b5947a3d Remove complication with PayPal Checkout 2023-09-05 14:38:17 +02:00
LarsStegelitz@Oxid
b8f1c7e8aa
Merge pull request #11 from OXIDprojects/revert-10-master 
Revert "Upgrade to OXID 7 with Twig & Smarty"
 2023-08-15 14:14:10 +02:00
LarsStegelitz@Oxid
64abb3b36f
Revert "Upgrade to OXID 7 with Twig & Smarty" 2023-08-15 14:11:11 +02:00
Fabian Vogel
3acc30a3a5
Merge pull request #10 from gp-itholics/master 
Upgrade to OXID 7 with Twig & Smarty
 2023-08-15 14:00:33 +02:00
Gabriel Peleskei
8926e6618d Finalized module for smarty, added more blocks in templates 2023-07-19 10:56:36 +00:00
Gabriel Peleskei
e802847f06 twig support tested manually 2023-07-19 09:05:40 +00:00
Gabriel Peleskei
bd415ccb3e Basic changes made for smarty and base code 2023-07-18 14:59:11 +00:00
Daniel Seifert
ce5fcbd664
adjust version informations 2023-07-18 12:16:37 +02:00
Daniel Seifert
91d21f7f07
don't show and request captcha if user is logged in 2023-07-18 12:13:25 +02:00
Daniel Seifert
0dbb8fb6e3
initial preparation for ticket https://support.shopmodule.com/scp/tickets.php?id=11765 2023-06-30 10:29:30 +02:00
7 changed files with 157 additions and 46 deletions
Show Stats Expand all files Collapse all files

10
CHANGELOG.md
View File

@ -19,7 +19,17 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
### Security ### Security
## 2.0.9 - 25 Juni 2024
- add check $oCaptcha in templates
## 2.0.8 - 08 September 2023
- add check for Amazon Pay - no Captcha
## 2.0.7 - 08 September 2023
- add check for PayPal Checkout - no Captcha
## 2.0.6 - 18 Juli 2023
- don't request captcha if user is logged in
## [2.0.4] - 22 Oct 2021 ## [2.0.4] - 22 Oct 2021

19
application/component/oeusercomponent.php
View File

@ -30,6 +30,25 @@ class oeUserComponent extends oeUserComponent_parent
public function createUser() public function createUser()
{ {
/* START check for Amazon Pay - no Captcha */
ob_start();
debug_print_backtrace();
$trace = ob_get_contents();
ob_end_clean();
if(str_contains($trace, 'initAmazonPayExpress'))
{
return parent::createUser();
}
/* END check for Amazon Pay - no Captcha /
/* START check for PayPal Checkout - no Captcha */
if(\OxidEsales\Eshop\Core\Registry::getConfig()->getRequestParameter('fnc') == 'approveOrder')
{
return parent::createUser();
}
/* START check for PayPal Checkout - no Captcha */
if (!$this->getCaptcha()->passCaptcha()) { if (!$this->getCaptcha()->passCaptcha()) {
return false; return false;
} }

4
application/views/blocks/captcha_form_user_billing_wave.tpl
View File

@ -1,3 +1,5 @@
[{$smarty.block.parent}] [{$smarty.block.parent}]
[{include file="oecaptcha_wave.tpl" labelCssClass="col-lg-3" inputCssClass="col-lg-5"}] [{if !$oxcmp_user}]
[{include file="oecaptcha_wave.tpl" labelCssClass="col-lg-3" inputCssClass="col-lg-5"}]
[{/if}]

30
application/views/tpl/oecaptcha.tpl
View File

@ -1,19 +1,21 @@
[{assign var="oCaptcha" value=$oView->getCaptcha()}] [{assign var="oCaptcha" value=$oView->getCaptcha()}]
<input type="hidden" name="c_mach" value="[{$oCaptcha->getHash()}]"/> [{if $oCaptcha}]
<input type="hidden" name="c_mach" value="[{$oCaptcha->getHash()}]"/>
<div class="form-group verify"> <div class="form-group verify">
<label class="req control-label [{$labelCssClass}]" for="c_mac">[{oxmultilang ident="VERIFICATION_CODE"}]</label> <label class="req control-label [{$labelCssClass}]" for="c_mac">[{oxmultilang ident="VERIFICATION_CODE"}]</label>
<div class="[{$inputCssClass}] controls"> <div class="[{$inputCssClass}] controls">
<div class="input-group"> <div class="input-group">
<span class="input-group-addon"> <span class="input-group-addon">
[{if $oCaptcha->isImageVisible()}] [{if $oCaptcha->isImageVisible()}]
<img src="[{$oCaptcha->getImageUrl()}]" alt=""> <img src="[{$oCaptcha->getImageUrl()}]" alt="">
[{else}] [{else}]
<span class="verificationCode" id="verifyTextCode">[{$oCaptcha->getText()}]</span> <span class="verificationCode" id="verifyTextCode">[{$oCaptcha->getText()}]</span>
[{/if}] [{/if}]
</span> </span>
<input type="text" data-fieldsize="verify" name="c_mac" value="" class="form-control js-oxValidate js-oxValidate_notEmpty" required> <input type="text" data-fieldsize="verify" name="c_mac" value="" class="form-control js-oxValidate js-oxValidate_notEmpty" required>
</div>
</div> </div>
</div> </div>
</div> [{/if}]

30
application/views/tpl/oecaptcha_wave.tpl
View File

@ -1,19 +1,21 @@
[{assign var="oCaptcha" value=$oView->getCaptcha()}] [{assign var="oCaptcha" value=$oView->getCaptcha()}]
<input type="hidden" name="c_mach" value="[{$oCaptcha->getHash()}]"/> [{if $oCaptcha}]
<input type="hidden" name="c_mach" value="[{$oCaptcha->getHash()}]"/>
<div class="form-group row verify"> <div class="form-group row verify">
<label class="req [{$labelCssClass}]" for="c_mac">[{oxmultilang ident="VERIFICATION_CODE"}]</label> <label class="req [{$labelCssClass}]" for="c_mac">[{oxmultilang ident="VERIFICATION_CODE"}]</label>
<div class="[{$inputCssClass}]"> <div class="[{$inputCssClass}]">
<div class="input-group"> <div class="input-group">
<span class="input-group-addon" style="padding-right:15px"> <span class="input-group-addon" style="padding-right:15px">
[{if $oCaptcha->isImageVisible()}] [{if $oCaptcha->isImageVisible()}]
<img src="[{$oCaptcha->getImageUrl()}]" alt=""> <img src="[{$oCaptcha->getImageUrl()}]" alt="">
[{else}] [{else}]
<span class="verificationCode" id="verifyTextCode">[{$oCaptcha->getText()}]</span> <span class="verificationCode" id="verifyTextCode">[{$oCaptcha->getText()}]</span>
[{/if}] [{/if}]
</span> </span>
<input type="text" data-fieldsize="verify" name="c_mac" value="" class="form-control js-oxValidate js-oxValidate_notEmpty" required> <input type="text" data-fieldsize="verify" name="c_mac" value="" class="form-control js-oxValidate js-oxValidate_notEmpty" required>
</div>
</div> </div>
</div> </div>
</div> [{/if}]

29
controllers/oecaptchaaccountuser.php Normal file
View File

@ -0,0 +1,29 @@
<?php
/**
* #PHPHEADER_OECAPTCHA_LICENSE_INFORMATION#
*/
class oecaptchaaccountuser extends oecaptchaaccountuser_parent
{
/**
* Class handling CAPTCHA image.
*
* @var object
*/
protected $captcha = null;
/**
* Template variable getter. Returns object of handling CAPTCHA image
*
* @return object
*/
public function getCaptcha()
{
if ( $this->captcha === null ) {
$this->captcha = oxNew( 'oeCaptcha' );
}
return $this->captcha;
}
}

81
metadata.php
View File

@ -17,6 +17,10 @@
/** /**
* Metadata version * Metadata version
*/ */
use OxidEsales\Eshop\Application\Component\UserComponent;
use OxidEsales\Eshop\Application\Controller\AccountUserController;
$sMetadataVersion = '1.1'; $sMetadataVersion = '1.1';
/** /**
@ -33,7 +37,7 @@ $aModule = array(
'en' => 'OXID eSales Simple Captcha Module', 'en' => 'OXID eSales Simple Captcha Module',
), ),
'thumbnail' => 'out/pictures/picture.png', 'thumbnail' => 'out/pictures/picture.png',
'version' => '2.0.5', 'version' => '2.0.9',
'author' => 'OXID eSales AG', 'author' => 'OXID eSales AG',
'url' => 'https://www.oxid-esales.com/', 'url' => 'https://www.oxid-esales.com/',
'email' => '', 'email' => '',
@ -45,9 +49,10 @@ $aModule = array(
'pricealarm' => 'oe/captcha/controllers/oecaptchapricealarm', 'pricealarm' => 'oe/captcha/controllers/oecaptchapricealarm',
'suggest' => 'oe/captcha/controllers/oecaptchasuggest', 'suggest' => 'oe/captcha/controllers/oecaptchasuggest',
'oxwarticledetails' => 'oe/captcha/application/component/widget/oecaptchawarticledetails', 'oxwarticledetails' => 'oe/captcha/application/component/widget/oecaptchawarticledetails',
\OxidEsales\Eshop\Application\Component\UserComponent::class => 'oe/captcha/application/component/oeusercomponent', UserComponent::class => 'oe/captcha/application/component/oeusercomponent',
'register' => 'oe/captcha/controllers/oecaptcharegister', 'register' => 'oe/captcha/controllers/oecaptcharegister',
'user' => 'oe/captcha/controllers/oecaptchauser' 'user' => 'oe/captcha/controllers/oecaptchauser',
AccountUserController::class => 'oe/captcha/controllers/oecaptchaaccountuser'
), ),
'files' => array( 'files' => array(
'oecaptcha' => 'oe/captcha/core/oecaptcha.php', 'oecaptcha' => 'oe/captcha/core/oecaptcha.php',
@ -58,21 +63,63 @@ $aModule = array(
'oecaptcha_wave.tpl' => 'oe/captcha/application/views/tpl/oecaptcha_wave.tpl', 'oecaptcha_wave.tpl' => 'oe/captcha/application/views/tpl/oecaptcha_wave.tpl',
), ),
'blocks' => array( 'blocks' => array(
array('template' => 'form/contact.tpl', 'block'=>'captcha_form', 'theme' => 'flow', 'file'=>'/application/views/blocks/captcha_form.tpl'), array('template' => 'form/contact.tpl',
array('template' => 'form/newsletter.tpl', 'block'=>'captcha_form', 'theme' => 'flow', 'file'=>'/application/views/blocks/captcha_form.tpl'), 'block'=>'captcha_form',
array('template' => 'form/privatesales/invite.tpl', 'theme' => 'flow', 'block'=>'captcha_form', 'file'=>'/application/views/blocks/captcha_form.tpl'), 'theme' => 'flow',
array('template' => 'form/pricealarm.tpl', 'block'=>'captcha_form', 'theme' => 'flow', 'file'=>'/application/views/blocks/captcha_form.tpl'), 'file'=>'/application/views/blocks/captcha_form.tpl'),
array('template' => 'form/suggest.tpl', 'block'=>'captcha_form', 'theme' => 'flow', 'file'=>'/application/views/blocks/captcha_form.tpl'), array('template' => 'form/newsletter.tpl',
array('template' => 'form/forgotpwd_email.tpl', 'block'=>'captcha_form', 'theme' => 'flow', 'file'=>'/application/views/blocks/captcha_form_forgotpwd.tpl'), 'block'=>'captcha_form',
array('template' => 'form/fieldset/user_billing.tpl', 'block'=>'captcha_form', 'theme' => 'flow', 'file'=>'/application/views/blocks/captcha_form.tpl'), 'theme' => 'flow',
'file'=>'/application/views/blocks/captcha_form.tpl'),
array('template' => 'form/privatesales/invite.tpl',
'theme' => 'flow',
'block'=>'captcha_form',
'file'=>'/application/views/blocks/captcha_form.tpl'),
array('template' => 'form/pricealarm.tpl',
'block'=>'captcha_form',
'theme' => 'flow',
'file'=>'/application/views/blocks/captcha_form.tpl'),
array('template' => 'form/suggest.tpl',
'block'=>'captcha_form',
'theme' => 'flow',
'file'=>'/application/views/blocks/captcha_form.tpl'),
array('template' => 'form/forgotpwd_email.tpl',
'block'=>'captcha_form',
'theme' => 'flow',
'file'=>'/application/views/blocks/captcha_form_forgotpwd.tpl'),
array('template' => 'form/fieldset/user_billing.tpl',
'block'=>'captcha_form',
'theme' => 'flow',
'file'=>'/application/views/blocks/captcha_form.tpl'),
array('template' => 'form/contact.tpl', 'block'=>'captcha_form', 'theme' => 'wave', 'file'=>'/application/views/blocks/captcha_form_contact_wave.tpl'), array('template' => 'form/contact.tpl',
array('template' => 'form/newsletter.tpl', 'block'=>'captcha_form', 'theme' => 'wave', 'file'=>'/application/views/blocks/captcha_form_newsletter_wave.tpl'), 'block'=>'captcha_form',
array('template' => 'form/privatesales/invite.tpl', 'theme' => 'wave', 'block'=>'captcha_form', 'file'=>'/application/views/blocks/captcha_form_wave.tpl'), 'theme' => 'wave',
array('template' => 'form/pricealarm.tpl', 'block'=>'captcha_form', 'theme' => 'wave', 'file'=>'/application/views/blocks/captcha_form_wave.tpl'), 'file'=>'/application/views/blocks/captcha_form_contact_wave.tpl'),
array('template' => 'form/suggest.tpl', 'block'=>'captcha_form', 'theme' => 'wave', 'file'=>'/application/views/blocks/captcha_form_wave.tpl'), array('template' => 'form/newsletter.tpl',
array('template' => 'form/forgotpwd_email.tpl', 'block'=>'captcha_form', 'theme' => 'wave', 'file'=>'/application/views/blocks/captcha_form_forgotpwd_wave.tpl'), 'block'=>'captcha_form',
array('template' => 'form/fieldset/user_billing.tpl', 'block'=>'captcha_form', 'theme' => 'wave', 'file'=>'/application/views/blocks/captcha_form_user_billing_wave.tpl'), 'theme' => 'wave',
'file'=>'/application/views/blocks/captcha_form_newsletter_wave.tpl'),
array('template' => 'form/privatesales/invite.tpl',
'theme' => 'wave',
'block'=>'captcha_form',
'file'=>'/application/views/blocks/captcha_form_wave.tpl'),
array('template' => 'form/pricealarm.tpl',
'block'=>'captcha_form',
'theme' => 'wave',
'file'=>'/application/views/blocks/captcha_form_wave.tpl'),
array('template' => 'form/suggest.tpl',
'block'=>'captcha_form',
'theme' => 'wave',
'file'=>'/application/views/blocks/captcha_form_wave.tpl'),
array('template' => 'form/forgotpwd_email.tpl',
'block'=>'captcha_form',
'theme' => 'wave',
'file'=>'/application/views/blocks/captcha_form_forgotpwd_wave.tpl'),
array('template' => 'form/fieldset/user_billing.tpl',
'block'=>'captcha_form',
'theme' => 'wave',
'file'=>'/application/views/blocks/captcha_form_user_billing_wave.tpl'),
), ),
'settings' => array( 'settings' => array(
array('group' => 'main', 'name' => 'oecaptchakey', 'type' => 'str', 'value' => ''), array('group' => 'main', 'name' => 'oecaptchakey', 'type' => 'str', 'value' => ''),