Changeset 3199524

Timestamp:

11/29/2024 03:13:54 PM (15 months ago)

Author:

adcaptcha

Message:

Update to version 1.5.4 from GitHub

Location:

adcaptcha

Files:

• tags/1.5.4 (copied) (copied from adcaptcha/trunk)
• tags/1.5.4/adcaptcha.php (modified) (2 diffs)
• tags/1.5.4/readme.txt (modified) (2 diffs)
• tags/1.5.4/src/Plugin/Comments.php (modified) (1 diff)
• tags/1.5.4/src/Settings/Settings.php (modified) (2 diffs)
• trunk/adcaptcha.php (modified) (2 diffs)
• trunk/readme.txt (modified) (2 diffs)
• trunk/src/Plugin/Comments.php (modified) (1 diff)
• trunk/src/Settings/Settings.php (modified) (2 diffs)

adcaptcha/tags/1.5.4/adcaptcha.php

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

adcaptcha/tags/1.5.4/readme.txt

@@ -5 +5 @@
 Requires at least: 6.0
 Tested up to: 6.5.2
-Stable tag: 1.5.3
+Stable tag: 1.5.4
 Requires PHP: 7.4
 License: GPLv2 or later
@@ -141 +141 @@
 = 1.5.3 =
 - Added advanced settings which includes a Woocommerce checkout feature, to trigger adCAPTCHA from the place order button.
+
+= 1.5.4 =
+- Minor bug fix for wordpress comments form

adcaptcha/tags/1.5.4/src/Plugin/Comments.php

@@ -9 +9 @@
 
 class Comments extends AdCaptchaPlugin {
+    private $verified = false;
 
     public function setup() {
+        global $adCAPTCHAWordpressComments;
+        $adCAPTCHAWordpressComments = $this;
         add_action( 'comment_form', [ AdCaptcha::class, 'enqueue_scripts' ] );
         add_action( 'comment_form', [ Verify::class, 'get_success_token' ] );
         add_filter( 'comment_form_submit_field', [ $this, 'captcha_trigger_filter' ] );
-        add_action( 'pre_comment_approved', [ $this, 'verify' ], 20, 2 );
+        add_filter( 'pre_comment_approved', [ $adCAPTCHAWordpressComments, 'verify' ], 20, 2 );
     }
 
     public function verify( $approved, array $commentdata ) {
+        if ( $this->verified ) {
+            return $approved;
+        }
+
         $successToken = sanitize_text_field(wp_unslash($_POST['adcaptcha_successToken']));
         $verify = new Verify();
         $response = $verify->verify_token($successToken);
 
-
         if ( $response === false ) {
             $approved = new WP_Error( 'adcaptcha_error', __( 'Incomplete captcha, Please try again', 'adcaptcha' ), 400 );
+            return $approved;
         }
 
+        $this->verified = true;
         return $approved;
     }

adcaptcha/tags/1.5.4/src/Settings/Settings.php

@@ -64 +64 @@
                         $pluginsSettings = new \AdCaptcha\Settings\Plugins\Plugins();
                         $pluginsSettings->render_plugins_settings();
+                        break;
                     case 'advance':
                         $advanceSettings = new \AdCaptcha\Settings\Advance\Advance();
@@ -80 +81 @@
 
     public function change_admin_footer_version() {
-        return 'Version 1.5.3';
+        return 'Version 1.5.4';
     }
 }

adcaptcha/trunk/adcaptcha.php

@@ -3 +3 @@
  * Plugin Name: adCAPTCHA for WordPress
  * Description: Secure your site. Elevate your brand. Boost Ad Revenue.
- * Version: 1.5.3
+ * Version: 1.5.4
  * Requires at least: 6.4.2
  * Requires PHP: 7.4
@@ -44 +44 @@
 use AdCaptcha\Instantiate;
 
-const PLUGIN_VERSION_ADCAPTCHA = '1.5.3';
+const PLUGIN_VERSION_ADCAPTCHA = '1.5.4';
 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.3
+Stable tag: 1.5.4
 Requires PHP: 7.4
 License: GPLv2 or later
@@ -141 +141 @@
 = 1.5.3 =
 - Added advanced settings which includes a Woocommerce checkout feature, to trigger adCAPTCHA from the place order button.
+
+= 1.5.4 =
+- Minor bug fix for wordpress comments form

adcaptcha/trunk/src/Plugin/Comments.php

@@ -9 +9 @@
 
 class Comments extends AdCaptchaPlugin {
+    private $verified = false;
 
     public function setup() {
+        global $adCAPTCHAWordpressComments;
+        $adCAPTCHAWordpressComments = $this;
         add_action( 'comment_form', [ AdCaptcha::class, 'enqueue_scripts' ] );
         add_action( 'comment_form', [ Verify::class, 'get_success_token' ] );
         add_filter( 'comment_form_submit_field', [ $this, 'captcha_trigger_filter' ] );
-        add_action( 'pre_comment_approved', [ $this, 'verify' ], 20, 2 );
+        add_filter( 'pre_comment_approved', [ $adCAPTCHAWordpressComments, 'verify' ], 20, 2 );
     }
 
     public function verify( $approved, array $commentdata ) {
+        if ( $this->verified ) {
+            return $approved;
+        }
+
         $successToken = sanitize_text_field(wp_unslash($_POST['adcaptcha_successToken']));
         $verify = new Verify();
         $response = $verify->verify_token($successToken);
 
-
         if ( $response === false ) {
             $approved = new WP_Error( 'adcaptcha_error', __( 'Incomplete captcha, Please try again', 'adcaptcha' ), 400 );
+            return $approved;
         }
 
+        $this->verified = true;
         return $approved;
     }

adcaptcha/trunk/src/Settings/Settings.php

@@ -64 +64 @@
                         $pluginsSettings = new \AdCaptcha\Settings\Plugins\Plugins();
                         $pluginsSettings->render_plugins_settings();
+                        break;
                     case 'advance':
                         $advanceSettings = new \AdCaptcha\Settings\Advance\Advance();
@@ -80 +81 @@
 
     public function change_admin_footer_version() {
-        return 'Version 1.5.3';
+        return 'Version 1.5.4';
     }
 }