mod CHANGELOG.md, add some comments

Ausnahmebedingung für Amazon Pay
add Version 2.0.7
2023-11-16 09:29:03 +01:00 · 2023-11-15 14:38:08 +01:00 · 2023-09-05 14:43:06 +02:00 · 2023-09-05 14:38:17 +02:00 · 2023-07-18 12:16:37 +02:00 · 2023-07-18 12:13:25 +02:00
12 changed files with 304 additions and 9 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -19,7 +19,14 @@ and this project adheres to [Semantic Versioning](http://semver.org/).

 ### Security

+## 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

--- a/application/component/oeusercomponent.php
+++ b/application/component/oeusercomponent.php
@ -0,0 +1,58 @@
+<?php
+/**
+ * #PHPHEADER_OECAPTCHA_LICENSE_INFORMATION#
+ */
+
+/**
+ * Article detailed information widget.
+ */
+class oeUserComponent extends oeUserComponent_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;
+    }
+
+    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()) {
+            return false;
+        }
+
+        return parent::createUser();
+    }
+}
--- a/application/views/blocks/captcha_form_contact_wave.tpl
+++ b/application/views/blocks/captcha_form_contact_wave.tpl
@ -0,0 +1,3 @@
+[{$smarty.block.parent}]
+
+[{include file="oecaptcha_wave.tpl" labelCssClass="control-label col-lg-2" inputCssClass="col-lg-5"}]
--- a/application/views/blocks/captcha_form_forgotpwd_wave.tpl
+++ b/application/views/blocks/captcha_form_forgotpwd_wave.tpl
@ -0,0 +1,3 @@
+[{$smarty.block.parent}]
+
+[{include file="oecaptcha_wave.tpl" labelCssClass="col-lg-2" inputCssClass="col-lg-5"}]
--- a/application/views/blocks/captcha_form_newsletter_wave.tpl
+++ b/application/views/blocks/captcha_form_newsletter_wave.tpl
@ -0,0 +1,3 @@
+[{$smarty.block.parent}]
+
+[{include file="oecaptcha_wave.tpl" labelCssClass="control-label col-lg-2" inputCssClass="col-lg-5"}]
--- a/application/views/blocks/captcha_form_user_billing_wave.tpl
+++ b/application/views/blocks/captcha_form_user_billing_wave.tpl
@ -0,0 +1,5 @@
+[{$smarty.block.parent}]
+
+[{if !$oxcmp_user}]
+    [{include file="oecaptcha_wave.tpl" labelCssClass="col-lg-3" inputCssClass="col-lg-5"}]
+[{/if}]    
--- a/application/views/blocks/captcha_form_wave.tpl
+++ b/application/views/blocks/captcha_form_wave.tpl
@ -0,0 +1,3 @@
+[{$smarty.block.parent}]
+
+[{include file="oecaptcha_wave.tpl" labelCssClass="col-lg-3" inputCssClass="col-lg-8"}]
--- a/application/views/tpl/oecaptcha_wave.tpl
+++ b/application/views/tpl/oecaptcha_wave.tpl
@ -0,0 +1,19 @@
+[{assign var="oCaptcha" value=$oView->getCaptcha()}]
+<input type="hidden" name="c_mach" value="[{$oCaptcha->getHash()}]"/>
+
+<div class="form-group row verify">
+    <label class="req [{$labelCssClass}]" for="c_mac">[{oxmultilang ident="VERIFICATION_CODE"}]</label>
+
+    <div class="[{$inputCssClass}]">
+        <div class="input-group">
+            <span class="input-group-addon" style="padding-right:15px">
+                [{if $oCaptcha->isImageVisible()}]
+                    <img src="[{$oCaptcha->getImageUrl()}]" alt="">
+                [{else}]
+                    <span class="verificationCode" id="verifyTextCode">[{$oCaptcha->getText()}]</span>
+                [{/if}]
+            </span>
+            <input type="text" data-fieldsize="verify" name="c_mac" value="" class="form-control js-oxValidate js-oxValidate_notEmpty" required>
+        </div>
+    </div>
+</div>
--- a/controllers/oecaptchaaccountuser.php
+++ b/controllers/oecaptchaaccountuser.php
@ -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;
+    }
+}
--- a/controllers/oecaptcharegister.php
+++ b/controllers/oecaptcharegister.php
@ -0,0 +1,52 @@
+<?php
+/**
+ * #PHPHEADER_OECAPTCHA_LICENSE_INFORMATION#
+ */
+
+/**
+ * Article suggestion page.
+ * Collects some article base information, sets default recomendation text,
+ * sends suggestion mail to user.
+ */
+class oeCaptchaRegister extends oeCaptchaRegister_parent
+{
+    /**
+     * Class handling CAPTCHA image.
+     *
+     * @var object
+     */
+    protected $captcha = null;
+
+    /**
+     * Sends product suggestion mail and returns a URL according to
+     * URL formatting rules.
+     *
+     * Template variables:
+     * <b>editval</b>, <b>error</b>
+     *
+     * @return  null
+     */
+    public function send()
+    {
+        // spam spider prevension
+        if (!$this->getCaptcha()->passCaptcha()) {
+            return false;
+        }
+
+        return parent::send();
+    }
+
+    /**
+     * 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;
+    }
+}
--- a/controllers/oecaptchauser.php
+++ b/controllers/oecaptchauser.php
@ -0,0 +1,52 @@
+<?php
+/**
+ * #PHPHEADER_OECAPTCHA_LICENSE_INFORMATION#
+ */
+
+/**
+ * Article suggestion page.
+ * Collects some article base information, sets default recomendation text,
+ * sends suggestion mail to user.
+ */
+class oeCaptchaUser extends oeCaptchaUser_parent
+{
+    /**
+     * Class handling CAPTCHA image.
+     *
+     * @var object
+     */
+    protected $captcha = null;
+
+    /**
+     * Sends product suggestion mail and returns a URL according to
+     * URL formatting rules.
+     *
+     * Template variables:
+     * <b>editval</b>, <b>error</b>
+     *
+     * @return  null
+     */
+    public function send()
+    {
+        // spam spider prevension
+        if (!$this->getCaptcha()->passCaptcha()) {
+            return false;
+        }
+
+        return parent::send();
+    }
+
+    /**
+     * 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;
+    }
+}
--- a/metadata.php
+++ b/metadata.php
@ -17,6 +17,10 @@
 /**
 * Metadata version
 */
+
+use OxidEsales\Eshop\Application\Component\UserComponent;
+use OxidEsales\Eshop\Application\Controller\AccountUserController;
+
 $sMetadataVersion = '1.1';

 /**
@ -33,9 +37,9 @@ $aModule = array(
        'en' => 'OXID eSales Simple Captcha Module',
    ),
    'thumbnail'   => 'out/pictures/picture.png',
-    'version'     => '2.0.4',
+    'version'     => '2.0.8',
    'author'      => 'OXID eSales AG',
-    'url'         => 'http://www.oxid-esales.com/',
+    'url'         => 'https://www.oxid-esales.com/',
    'email'       => '',
    'extend'      => array('details'           => 'oe/captcha/controllers/oecaptchadetails',
                           'contact'           => 'oe/captcha/controllers/oecaptchacontact',
@ -44,21 +48,78 @@ $aModule = array(
                           'newsletter'        => 'oe/captcha/controllers/oecaptchanewsletter',
                           'pricealarm'        => 'oe/captcha/controllers/oecaptchapricealarm',
                           'suggest'           => 'oe/captcha/controllers/oecaptchasuggest',
-                           'oxwarticledetails' => 'oe/captcha/application/component/widget/oecaptchawarticledetails'),
+                           'oxwarticledetails' => 'oe/captcha/application/component/widget/oecaptchawarticledetails',
+                           UserComponent::class   => 'oe/captcha/application/component/oeusercomponent',
+                           'register' => 'oe/captcha/controllers/oecaptcharegister',
+                           'user' => 'oe/captcha/controllers/oecaptchauser',
+                           AccountUserController::class => 'oe/captcha/controllers/oecaptchaaccountuser'
+    ),
    'files'       => array(
        'oecaptcha'       => 'oe/captcha/core/oecaptcha.php',
        'oecaptchaEvents' => 'oe/captcha/core/oecaptchaevents.php',
    ),
    'templates'   => array(
        'oecaptcha.tpl' => 'oe/captcha/application/views/tpl/oecaptcha.tpl',
+        'oecaptcha_wave.tpl' => 'oe/captcha/application/views/tpl/oecaptcha_wave.tpl',
    ),
    'blocks'      => array(
-        array('template' => 'form/contact.tpl', 'block'=>'captcha_form', 'file'=>'/application/views/blocks/captcha_form.tpl'),
-        array('template' => 'form/newsletter.tpl', 'block'=>'captcha_form', 'file'=>'/application/views/blocks/captcha_form.tpl'),
-        array('template' => 'form/privatesales/invite.tpl', 'block'=>'captcha_form', 'file'=>'/application/views/blocks/captcha_form.tpl'),
-        array('template' => 'form/pricealarm.tpl', 'block'=>'captcha_form', 'file'=>'/application/views/blocks/captcha_form.tpl'),
-        array('template' => 'form/suggest.tpl', 'block'=>'captcha_form', 'file'=>'/application/views/blocks/captcha_form.tpl'),
-        array('template' => 'form/forgotpwd_email.tpl', 'block'=>'captcha_form', 'file'=>'/application/views/blocks/captcha_form_forgotpwd.tpl'),
+        array('template' => 'form/contact.tpl',
+              'block'=>'captcha_form',
+              'theme' => 'flow',
+              'file'=>'/application/views/blocks/captcha_form.tpl'),
+        array('template' => 'form/newsletter.tpl',
+              'block'=>'captcha_form',
+              '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/newsletter.tpl',
+              'block'=>'captcha_form',
+              '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(
        array('group' => 'main', 'name' => 'oecaptchakey', 'type' => 'str', 'value' => ''),
Author	SHA1	Message	Date
Markus Gärtner	2ac4507ace	mod CHANGELOG.md, add some comments	2023-11-16 09:29:03 +01:00
Markus Gärtner	69618b8db5	Ausnahmebedingung für Amazon Pay	2023-11-15 14:38:08 +01:00
Markus Gärtner	e1be2b618a	add Version 2.0.7	2023-09-05 14:43:06 +02:00
Markus Gärtner	e7b5947a3d	Remove complication with PayPal Checkout	2023-09-05 14:38:17 +02: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
Markus Gärtner	477aef9b4a	update Version to 2.0.5	2022-05-16 15:15:35 +02:00
Markus Gärtner	e9ebf89c6a	add templates for wave theme	2022-05-16 15:14:57 +02:00
Markus Gärtner	9e5c91bed7	add check for user	2022-03-14 11:14:24 +01:00
Markus Gärtner	81b9602b10	add check for register	2022-02-23 09:20:32 +01:00