Changeset 3197490

Timestamp:

11/26/2024 02:18:12 PM (15 months ago)

Author:

adcaptcha

Message:

Update to version 1.5.1 from GitHub

Location:

adcaptcha

Files:

• tags/1.5.1 (copied) (copied from adcaptcha/trunk)
• tags/1.5.1/adcaptcha.php (modified) (2 diffs)
• tags/1.5.1/readme.txt (modified) (2 diffs)
• tags/1.5.1/src/Plugin/Elementor/Forms.php (modified) (1 diff)
• tags/1.5.1/src/Plugin/Woocommerce/Checkout.php (modified) (2 diffs)
• tags/1.5.1/src/Plugin/Woocommerce/Registration.php (modified) (1 diff)
• tags/1.5.1/src/Settings/Settings.php (modified) (1 diff)
• trunk/adcaptcha.php (modified) (2 diffs)
• trunk/readme.txt (modified) (2 diffs)
• trunk/src/Plugin/Elementor/Forms.php (modified) (1 diff)
• trunk/src/Plugin/Woocommerce/Checkout.php (modified) (2 diffs)
• trunk/src/Plugin/Woocommerce/Registration.php (modified) (1 diff)
• trunk/src/Settings/Settings.php (modified) (1 diff)

adcaptcha/tags/1.5.1/adcaptcha.php

@@ -3 +3 @@
  * Plugin Name: adCAPTCHA for WordPress
  * Description: Secure your site. Elevate your brand. Boost Ad Revenue.
- * Version: 1.5.0
+ * Version: 1.5.1
  * Requires at least: 6.4.2
  * Requires PHP: 7.4
@@ -43 +43 @@
 use AdCaptcha\Instantiate;
 
-const PLUGIN_VERSION_ADCAPTCHA = '1.5.0';
+const PLUGIN_VERSION_ADCAPTCHA = '1.5.1';
 define('ADCAPTCHA_ERROR_MESSAGE', __( 'Please complete the I am human box.', 'adcaptcha' ));
 

adcaptcha/tags/1.5.1/readme.txt

@@ -5 +5 @@
 Requires at least: 6.0
 Tested up to: 6.5.2
-Stable tag: 1.5.0
+Stable tag: 1.5.1
 Requires PHP: 7.4
 License: GPLv2 or later
@@ -132 +132 @@
 = 1.5.0 =
 - Feature: Support Woocommerce checkout (Shortcodes)
+
+= 1.5.1 =
+- Minor bug fix

adcaptcha/tags/1.5.1/src/Plugin/Elementor/Forms.php

@@ -130 +130 @@
 
         $successToken = sanitize_text_field(wp_unslash($_POST['adcaptcha_successToken']));
-        error_log('Success Token: ' . $successToken);
 
         if ( empty( $successToken ) ) {

adcaptcha/tags/1.5.1/src/Plugin/Woocommerce/Checkout.php

@@ -9 +9 @@
 class Checkout extends AdCaptchaPlugin {
 
-    public function setup() {   
+    private $hasVerified = null;
+
+    public function setup() { 
+
+        $this->hasVerified = get_option('wc_adcaptcha_is_verified');
+
         add_action( 'wp_enqueue_scripts', [ AdCaptcha::class, 'enqueue_scripts' ] );
         add_action( 'wp_enqueue_scripts', [ Verify::class, 'get_success_token' ] );
         add_action( 'wp_enqueue_scripts', [ $this, 'init_trigger' ] );
         add_action( 'woocommerce_review_order_before_submit', [ AdCaptcha::class, 'captcha_trigger' ] );
+        add_action('woocommerce_payment_complete', [ $this, 'reset_hasVerified' ]);
         add_action( 'woocommerce_checkout_process', [ $this, 'verify' ] );
     }
 
-    public function verify( $error ) {
+    public function verify() {
+        if ( $this->hasVerified && strtotime($this->hasVerified) < time() ) {
+            $this->reset_hasVerified();
+        }
+
+        if ( $this->hasVerified && strtotime($this->hasVerified) > time() ) {
+            return;
+        }
+
         $successToken = sanitize_text_field(wp_unslash($_POST['adcaptcha_successToken']));
         $response = Verify::verify_token($successToken);
 
         if ( !$response ) {
-            wc_add_notice( __( 'Incomplete captcha, Please try again', 'adcaptcha' ), 'error' );
+            wc_add_notice( __( 'Incomplete captcha, Please try again.', 'adcaptcha' ), 'error' );    
         }
+
+        update_option('wc_adcaptcha_is_verified', date('Y-m-d H:i:s', strtotime('+10 minutes')));
+    }
+
+    public function reset_hasVerified() {
+        update_option('wc_adcaptcha_is_verified', '');
     }
 
@@ -33 +53 @@
                     if (window.adcap) {
                         window.adcap.init();
+
+                        ' . ($this->hasVerified ? ' window.adcap.setVerificationState(true);' : '' ) . '
                     }
                 });

adcaptcha/tags/1.5.1/src/Plugin/Woocommerce/Registration.php

@@ -23 +23 @@
         $response = Verify::verify_token($successToken);
 
-        if ( !$response ) {
+        if ( !$response && !is_checkout() ) {
             $validation_errors = new WP_Error('adcaptcha_error', __( 'Incomplete captcha, Please try again.', 'adcaptcha' ) );
         }

adcaptcha/tags/1.5.1/src/Settings/Settings.php

@@ -71 +71 @@
 
     public function change_admin_footer_version() {
-        return 'Version 1.5.0';
+        return 'Version 1.5.1';
     }
 }

adcaptcha/trunk/adcaptcha.php

@@ -3 +3 @@
  * Plugin Name: adCAPTCHA for WordPress
  * Description: Secure your site. Elevate your brand. Boost Ad Revenue.
- * Version: 1.5.0
+ * Version: 1.5.1
  * Requires at least: 6.4.2
  * Requires PHP: 7.4
@@ -43 +43 @@
 use AdCaptcha\Instantiate;
 
-const PLUGIN_VERSION_ADCAPTCHA = '1.5.0';
+const PLUGIN_VERSION_ADCAPTCHA = '1.5.1';
 define('ADCAPTCHA_ERROR_MESSAGE', __( 'Please complete the I am human box.', 'adcaptcha' ));
 

adcaptcha/trunk/readme.txt

@@ -5 +5 @@
 Requires at least: 6.0
 Tested up to: 6.5.2
-Stable tag: 1.5.0
+Stable tag: 1.5.1
 Requires PHP: 7.4
 License: GPLv2 or later
@@ -132 +132 @@
 = 1.5.0 =
 - Feature: Support Woocommerce checkout (Shortcodes)
+
+= 1.5.1 =
+- Minor bug fix

adcaptcha/trunk/src/Plugin/Elementor/Forms.php

@@ -130 +130 @@
 
         $successToken = sanitize_text_field(wp_unslash($_POST['adcaptcha_successToken']));
-        error_log('Success Token: ' . $successToken);
 
         if ( empty( $successToken ) ) {

adcaptcha/trunk/src/Plugin/Woocommerce/Checkout.php

@@ -9 +9 @@
 class Checkout extends AdCaptchaPlugin {
 
-    public function setup() {   
+    private $hasVerified = null;
+
+    public function setup() { 
+
+        $this->hasVerified = get_option('wc_adcaptcha_is_verified');
+
         add_action( 'wp_enqueue_scripts', [ AdCaptcha::class, 'enqueue_scripts' ] );
         add_action( 'wp_enqueue_scripts', [ Verify::class, 'get_success_token' ] );
         add_action( 'wp_enqueue_scripts', [ $this, 'init_trigger' ] );
         add_action( 'woocommerce_review_order_before_submit', [ AdCaptcha::class, 'captcha_trigger' ] );
+        add_action('woocommerce_payment_complete', [ $this, 'reset_hasVerified' ]);
         add_action( 'woocommerce_checkout_process', [ $this, 'verify' ] );
     }
 
-    public function verify( $error ) {
+    public function verify() {
+        if ( $this->hasVerified && strtotime($this->hasVerified) < time() ) {
+            $this->reset_hasVerified();
+        }
+
+        if ( $this->hasVerified && strtotime($this->hasVerified) > time() ) {
+            return;
+        }
+
         $successToken = sanitize_text_field(wp_unslash($_POST['adcaptcha_successToken']));
         $response = Verify::verify_token($successToken);
 
         if ( !$response ) {
-            wc_add_notice( __( 'Incomplete captcha, Please try again', 'adcaptcha' ), 'error' );
+            wc_add_notice( __( 'Incomplete captcha, Please try again.', 'adcaptcha' ), 'error' );    
         }
+
+        update_option('wc_adcaptcha_is_verified', date('Y-m-d H:i:s', strtotime('+10 minutes')));
+    }
+
+    public function reset_hasVerified() {
+        update_option('wc_adcaptcha_is_verified', '');
     }
 
@@ -33 +53 @@
                     if (window.adcap) {
                         window.adcap.init();
+
+                        ' . ($this->hasVerified ? ' window.adcap.setVerificationState(true);' : '' ) . '
                     }
                 });

adcaptcha/trunk/src/Plugin/Woocommerce/Registration.php

@@ -23 +23 @@
         $response = Verify::verify_token($successToken);
 
-        if ( !$response ) {
+        if ( !$response && !is_checkout() ) {
             $validation_errors = new WP_Error('adcaptcha_error', __( 'Incomplete captcha, Please try again.', 'adcaptcha' ) );
         }

adcaptcha/trunk/src/Settings/Settings.php

@@ -71 +71 @@
 
     public function change_admin_footer_version() {
-        return 'Version 1.5.0';
+        return 'Version 1.5.1';
     }
 }