CHANGELOG.md

@@ -1,12 +1,23 @@
-# Change Log for OE Captcha Module
+# Change Log for OE Tags Module
 
 All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
-## 2.0.10 - 15 Januar 2025
+
-- change PHP 7 incompatible code
+## [Unreleased]
-- exclude registration in checkout step 2 from captcha check
+
+### Added
+
+### Changed
+
+### Deprecated
+
+### Removed
+
+### Fixed
+
+### Security
 
 ## 2.0.9 - 25 Juni 2024
 - add check $oCaptcha in templates

README.md

@@ -19,7 +19,7 @@ request (e.g. send contact mail to shop administrator) or refuse and show an err
 
 Please proceed with one of the following ways to install the module:
 
-### Module installation
+### Module installation via composer
 
 In order to install the module via composer, run the following commands in commandline of your shop base directory 
 (where the shop's composer.json file resides).
@@ -28,24 +28,17 @@ In order to install the module via composer, run the following commands in comma
 composer require oxid-projects/captcha-module
 ```
 
-### Adjustments of shop theme
+### Module installation via repository cloning
-
-Depending of the installed theme, required tpl blocks may be missing. Please add the missing blocks (as described in metadata.php) to the shop theme templates.
-
-Exceptions:
-`tpl/form/fieldset/user_billing.tpl` - wrap block with this condition:
 
+Clone the module to your OXID eShop **modules/oe/** directory:
 ```
-[{if $blIsRegister == true}]
+git clone https://github.com/OXIDprojects/captcha-module.git captcha
-    [{block name="captcha_form"}][{/block}]
-[{/if}]
 ```
 
-`tpl/form/register.tpl` - insert the variable to the include command:
+### Module installation from zip package
 
-```
+* Make a new folder "captcha" in the **modules/oe/ directory** of your shop installation. 
-[{include file="form/fieldset/user_billing.tpl" blIsRegister=true}]
+* Download the https://github.com/OXIDprojects/captcha-module/archive/master.zip file and unpack it into the created folder.
-```
 
 ## Activate Module
 

application/component/oeusercomponent.php

@@ -36,20 +36,20 @@ class oeUserComponent extends oeUserComponent_parent
         $trace = ob_get_contents();
         ob_end_clean();
 
-        if(strpos($trace, 'initAmazonPayExpress') !== false)
+        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::getRequest()->getRequestEscapedParameter('fnc') == 'approveOrder')
+        if(\OxidEsales\Eshop\Core\Registry::getConfig()->getRequestParameter('fnc') == 'approveOrder')
         {
             return parent::createUser();
         }
         /* START check for PayPal Checkout - no Captcha */
 
-        if (\OxidEsales\Eshop\Core\Registry::getRequest()->getRequestEscapedParameter('cl') !== 'user' && !$this->getCaptcha()->passCaptcha()) {
+        if (!$this->getCaptcha()->passCaptcha()) {
             return false;
         }
 

metadata.php

@@ -37,7 +37,7 @@ $aModule = array(
         'en' => 'OXID eSales Simple Captcha Module',
     ),
     'thumbnail'   => 'out/pictures/picture.png',
-    'version'     => '2.0.10',
+    'version'     => '2.0.9',
     'author'      => 'OXID eSales AG',
     'url'         => 'https://www.oxid-esales.com/',
     'email'       => '',