Merge branch 'fix' into fix_save_trp_hash.ag

alexandergull · alexandergull · commit da27a89a7cf2 · 2026-01-05T16:06:48.000+05:00
diff --git a/cleantalk.php b/cleantalk.php
@@ -4,7 +4,7 @@
   Plugin Name: Anti-Spam by CleanTalk
   Plugin URI: https://cleantalk.org
   Description: Max power, all-in-one, no Captcha, premium anti-spam plugin. No comment spam, no registration spam, no contact spam, protects any WordPress forms.
-  Version: 6.70.1
+  Version: 6.70.99-fix
   Author: CleanTalk - Anti-Spam Protection <welcome@cleantalk.org>
   Author URI: https://cleantalk.org
   Text Domain: cleantalk-spam-protect
diff --git a/js/apbct-public-bundle.min.js b/js/apbct-public-bundle.min.js
diff --git a/js/apbct-public-bundle_ext-protection.min.js b/js/apbct-public-bundle_ext-protection.min.js
diff --git a/js/apbct-public-bundle_ext-protection_gathering.min.js b/js/apbct-public-bundle_ext-protection_gathering.min.js
diff --git a/js/apbct-public-bundle_full-protection.min.js b/js/apbct-public-bundle_full-protection.min.js
diff --git a/js/apbct-public-bundle_full-protection_gathering.min.js b/js/apbct-public-bundle_full-protection_gathering.min.js
diff --git a/js/apbct-public-bundle_gathering.min.js b/js/apbct-public-bundle_gathering.min.js
diff --git a/js/apbct-public-bundle_int-protection.min.js b/js/apbct-public-bundle_int-protection.min.js
diff --git a/js/apbct-public-bundle_int-protection_gathering.min.js b/js/apbct-public-bundle_int-protection_gathering.min.js
diff --git a/js/prebuild/apbct-public-bundle.js b/js/prebuild/apbct-public-bundle.js
@@ -3210,8 +3210,13 @@ class ApbctHandler {
      */
     catchWCRestRequestAsMiddleware() {
         const ctPinDataToRequest = (options, next) => {
-            if (typeof options !== 'object' || options === null ||
-                !options.hasOwnProperty('data') || !options.hasOwnProperty('path')
+            if (
+                typeof options !== 'object' ||
+                options === null ||
+                !options.hasOwnProperty('data') ||
+                typeof options.data === 'undefined' ||
+                !options.hasOwnProperty('path') ||
+                typeof options.path === 'undefined'
             ) {
                 return next(options);
             }
diff --git a/js/prebuild/apbct-public-bundle_ext-protection.js b/js/prebuild/apbct-public-bundle_ext-protection.js
@@ -3210,8 +3210,13 @@ class ApbctHandler {
      */
     catchWCRestRequestAsMiddleware() {
         const ctPinDataToRequest = (options, next) => {
-            if (typeof options !== 'object' || options === null ||
-                !options.hasOwnProperty('data') || !options.hasOwnProperty('path')
+            if (
+                typeof options !== 'object' ||
+                options === null ||
+                !options.hasOwnProperty('data') ||
+                typeof options.data === 'undefined' ||
+                !options.hasOwnProperty('path') ||
+                typeof options.path === 'undefined'
             ) {
                 return next(options);
             }
diff --git a/js/prebuild/apbct-public-bundle_ext-protection_gathering.js b/js/prebuild/apbct-public-bundle_ext-protection_gathering.js
@@ -3210,8 +3210,13 @@ class ApbctHandler {
      */
     catchWCRestRequestAsMiddleware() {
         const ctPinDataToRequest = (options, next) => {
-            if (typeof options !== 'object' || options === null ||
-                !options.hasOwnProperty('data') || !options.hasOwnProperty('path')
+            if (
+                typeof options !== 'object' ||
+                options === null ||
+                !options.hasOwnProperty('data') ||
+                typeof options.data === 'undefined' ||
+                !options.hasOwnProperty('path') ||
+                typeof options.path === 'undefined'
             ) {
                 return next(options);
             }
diff --git a/js/prebuild/apbct-public-bundle_full-protection.js b/js/prebuild/apbct-public-bundle_full-protection.js
@@ -3210,8 +3210,13 @@ class ApbctHandler {
      */
     catchWCRestRequestAsMiddleware() {
         const ctPinDataToRequest = (options, next) => {
-            if (typeof options !== 'object' || options === null ||
-                !options.hasOwnProperty('data') || !options.hasOwnProperty('path')
+            if (
+                typeof options !== 'object' ||
+                options === null ||
+                !options.hasOwnProperty('data') ||
+                typeof options.data === 'undefined' ||
+                !options.hasOwnProperty('path') ||
+                typeof options.path === 'undefined'
             ) {
                 return next(options);
             }
diff --git a/js/prebuild/apbct-public-bundle_full-protection_gathering.js b/js/prebuild/apbct-public-bundle_full-protection_gathering.js
@@ -3210,8 +3210,13 @@ class ApbctHandler {
      */
     catchWCRestRequestAsMiddleware() {
         const ctPinDataToRequest = (options, next) => {
-            if (typeof options !== 'object' || options === null ||
-                !options.hasOwnProperty('data') || !options.hasOwnProperty('path')
+            if (
+                typeof options !== 'object' ||
+                options === null ||
+                !options.hasOwnProperty('data') ||
+                typeof options.data === 'undefined' ||
+                !options.hasOwnProperty('path') ||
+                typeof options.path === 'undefined'
             ) {
                 return next(options);
             }
diff --git a/js/prebuild/apbct-public-bundle_gathering.js b/js/prebuild/apbct-public-bundle_gathering.js
@@ -3210,8 +3210,13 @@ class ApbctHandler {
      */
     catchWCRestRequestAsMiddleware() {
         const ctPinDataToRequest = (options, next) => {
-            if (typeof options !== 'object' || options === null ||
-                !options.hasOwnProperty('data') || !options.hasOwnProperty('path')
+            if (
+                typeof options !== 'object' ||
+                options === null ||
+                !options.hasOwnProperty('data') ||
+                typeof options.data === 'undefined' ||
+                !options.hasOwnProperty('path') ||
+                typeof options.path === 'undefined'
             ) {
                 return next(options);
             }
diff --git a/js/prebuild/apbct-public-bundle_int-protection.js b/js/prebuild/apbct-public-bundle_int-protection.js
@@ -3210,8 +3210,13 @@ class ApbctHandler {
      */
     catchWCRestRequestAsMiddleware() {
         const ctPinDataToRequest = (options, next) => {
-            if (typeof options !== 'object' || options === null ||
-                !options.hasOwnProperty('data') || !options.hasOwnProperty('path')
+            if (
+                typeof options !== 'object' ||
+                options === null ||
+                !options.hasOwnProperty('data') ||
+                typeof options.data === 'undefined' ||
+                !options.hasOwnProperty('path') ||
+                typeof options.path === 'undefined'
             ) {
                 return next(options);
             }
diff --git a/js/prebuild/apbct-public-bundle_int-protection_gathering.js b/js/prebuild/apbct-public-bundle_int-protection_gathering.js
@@ -3210,8 +3210,13 @@ class ApbctHandler {
      */
     catchWCRestRequestAsMiddleware() {
         const ctPinDataToRequest = (options, next) => {
-            if (typeof options !== 'object' || options === null ||
-                !options.hasOwnProperty('data') || !options.hasOwnProperty('path')
+            if (
+                typeof options !== 'object' ||
+                options === null ||
+                !options.hasOwnProperty('data') ||
+                typeof options.data === 'undefined' ||
+                !options.hasOwnProperty('path') ||
+                typeof options.path === 'undefined'
             ) {
                 return next(options);
             }
diff --git a/js/src/public-1-main.js b/js/src/public-1-main.js
@@ -868,8 +868,13 @@ class ApbctHandler {
      */
     catchWCRestRequestAsMiddleware() {
         const ctPinDataToRequest = (options, next) => {
-            if (typeof options !== 'object' || options === null ||
-                !options.hasOwnProperty('data') || !options.hasOwnProperty('path')
+            if (
+                typeof options !== 'object' ||
+                options === null ||
+                !options.hasOwnProperty('data') ||
+                typeof options.data === 'undefined' ||
+                !options.hasOwnProperty('path') ||
+                typeof options.path === 'undefined'
             ) {
                 return next(options);
             }
diff --git a/lib/Cleantalk/ApbctWP/ApbctJsBundleResolver.php b/lib/Cleantalk/ApbctWP/ApbctJsBundleResolver.php
@@ -35,4 +35,15 @@ public static function getBundleName($settings)
 
         return $script;
     }
+
+    /**
+     * Return full URI for JS script
+     * @param array|\ArrayObject $settings
+     *
+     * @return string
+     */
+    public static function getFullScriptURI($settings)
+    {
+        return APBCT_URL_PATH . '/js/' . self::getBundleName($settings) . '?' . APBCT_VERSION;
+    }
 }
diff --git a/lib/Cleantalk/ApbctWP/CleantalkRealPerson.php b/lib/Cleantalk/ApbctWP/CleantalkRealPerson.php
@@ -43,7 +43,6 @@ public function publicCommentAddTrpClass($classes, $_css_class, $comment_id, $co
         }
 
         // Logic for show TRP badge
-        $show_trp = false;
         $the_real_person = !empty($apbct->settings['comments__the_real_person']) && $apbct->settings['comments__the_real_person'] == '1';
         $show_trp = $the_real_person && self::isTRPHashExist($comment_id) && $comment->comment_author;
 
diff --git a/lib/Cleantalk/ApbctWP/ContactsEncoder/Exclusions/ExclusionsService.php b/lib/Cleantalk/ApbctWP/ContactsEncoder/Exclusions/ExclusionsService.php
@@ -12,6 +12,12 @@ class ExclusionsService extends \Cleantalk\Common\ContactsEncoder\Exclusions\Exc
 {
     /**
      * Keep arrays of exclusion signs in the array
+     *
+     * Each exclusion's array must contain two or more elements.
+     * The content checking by all inner array elements existence.
+     *
+     * It the exclusion set will contain only one element, this will trigger false-positive exclusion verdict.
+     *
      * @var array
      */
     private $content_exclusions_signs = array(
@@ -26,7 +32,7 @@ class ExclusionsService extends \Cleantalk\Common\ContactsEncoder\Exclusions\Exc
         // Stylish Cost Calculator
         array('scc-form-field-item'),
         // Exclusion of maps from leaflet
-        array('leaflet'),
+        array('leaflet', 'leaflet-map', 'map-wrap'),
         // prevent broking elementor swiper gallery
         array('class', 'elementor-swiper', 'elementor-testimonial', 'swiper-pagination'),
         // ics-calendar
diff --git a/lib/Cleantalk/ApbctWP/Firewall/AntiCrawler.php b/lib/Cleantalk/ApbctWP/Firewall/AntiCrawler.php
@@ -10,6 +10,7 @@
 use Cleantalk\ApbctWP\Variables\Get;
 use Cleantalk\ApbctWP\Variables\Server;
 use Cleantalk\Common\TT;
+use Cleantalk\ApbctWP\ApbctJsBundleResolver;
 
 /**
  * Class AntiCrawler
@@ -413,7 +414,7 @@ public function diePage($result)
                 CLEANTALK_PLUGIN_DIR . "lib/Cleantalk/ApbctWP/Firewall/die_page_anticrawler.html"
             );
 
-            $js_url = APBCT_URL_PATH . '/js/apbct-public-bundle.min.js?' . APBCT_VERSION;
+            $js_url = ApbctJsBundleResolver::getFullScriptURI($apbct->settings);
 
             $net_count = $apbct->stats['sfw']['entries'];
 
diff --git a/lib/Cleantalk/ApbctWP/Firewall/AntiFlood.php b/lib/Cleantalk/ApbctWP/Firewall/AntiFlood.php
@@ -6,6 +6,7 @@
 use Cleantalk\ApbctWP\Variables\Cookie;
 use Cleantalk\ApbctWP\Variables\Server;
 use Cleantalk\Common\TT;
+use Cleantalk\ApbctWP\ApbctJsBundleResolver;
 
 /**
  * Class AntiFlood
@@ -224,7 +225,7 @@ public function diePage($result)
                 CLEANTALK_PLUGIN_DIR . 'lib/Cleantalk/ApbctWP/Firewall/die_page_antiflood.html'
             );
 
-            $js_url = APBCT_URL_PATH . '/js/apbct-public-bundle.min.js?' . APBCT_VERSION;
+            $js_url = ApbctJsBundleResolver::getFullScriptURI($apbct->settings);
 
             $net_count = $apbct->stats['sfw']['entries'];
 
diff --git a/lib/Cleantalk/ApbctWP/Firewall/SFW.php b/lib/Cleantalk/ApbctWP/Firewall/SFW.php
@@ -10,6 +10,7 @@
 use Cleantalk\ApbctWP\Variables\Server;
 use Cleantalk\Common\TT;
 use AllowDynamicProperties;
+use Cleantalk\ApbctWP\ApbctJsBundleResolver;
 
 #[AllowDynamicProperties]
 class SFW extends \Cleantalk\Common\Firewall\FirewallModule
@@ -376,7 +377,7 @@ public function diePage($result)
                 CLEANTALK_PLUGIN_DIR . "lib/Cleantalk/ApbctWP/Firewall/die_page_sfw.html"
             );
 
-            $js_url = APBCT_URL_PATH . '/js/apbct-public-bundle.min.js?' . APBCT_VERSION;
+            $js_url = ApbctJsBundleResolver::getFullScriptURI($apbct->settings);
 
             $net_count = $apbct->stats['sfw']['entries'];
 
diff --git a/lib/Cleantalk/Common/ContactsEncoder/ContactsEncoder.php b/lib/Cleantalk/Common/ContactsEncoder/ContactsEncoder.php
@@ -39,7 +39,8 @@ abstract class ContactsEncoder
      * Regular expressions parts.
      */
     const ARIA_LABEL_PATTERN = '/aria-label.?=.?[\'"].+?[\'"]/';
-    const EMAIL_PATTERN = '[_A-Za-z0-9-\.]+@[_A-Za-z0-9-\.]+\.[A-Za-z]{2,}';
+    const EMAIL_PATTERN = '[_A-Za-z0-9-\.]+@[_A-Za-z0-9-\.]+\.[A-Za-z]{2,}\b';
+    const EMAIL_PATTERN_DOMAIN_CATCHING = '[_A-Za-z0-9-\.]+@[_A-Za-z0-9-\.]+(\.[A-Za-z]{2,}\b)';
     const PHONE_NUMBER = '\+\d{8,12}';
     const PHONE_NUMBERS_PATTERNS = [
         '(tel:' . self::PHONE_NUMBER . ')',                        // tel:+XXXXXXXXXX
@@ -194,7 +195,7 @@ private function prepareRegularExpressions()
     {
         $this->aria_regex = self::ARIA_LABEL_PATTERN;
 
-        $this->global_email_pattern = '/(mailto\:\b' . self::EMAIL_PATTERN . '\b)|(\b' . self::EMAIL_PATTERN . '\b)/';
+        $this->global_email_pattern = '/(mailto\:\b' . self::EMAIL_PATTERN . ')|(\b' . self::EMAIL_PATTERN_DOMAIN_CATCHING . ')/';
         $this->global_phones_pattern = '/' . implode('|', self::PHONE_NUMBERS_PATTERNS) . '/';
         $this->global_mailto_pattern = '/mailto\:(' . self::EMAIL_PATTERN . ')/';
         $this->plain_email_pattern = '/(\b' . self::EMAIL_PATTERN . '\b)/';
