Beta to 6.88

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.87
+  Version: 6.88
   Author: CleanTalk - Anti-Spam Protection <welcome@cleantalk.org>
   Author URI: https://cleantalk.org
   Text Domain: cleantalk-spam-protect
@@ -15,6 +15,7 @@
 use Cleantalk\Antispam\ProtectByShortcode;
 use Cleantalk\ApbctWP\Activator;
 use Cleantalk\ApbctWP\AdminNotices;
+use Cleantalk\ApbctWP\BotDetectorService;
 use Cleantalk\ApbctWP\Constant;
 use Cleantalk\ApbctWP\ContactsEncoder\ContactsEncoder;
 use Cleantalk\ApbctWP\Antispam\ForceProtection;
@@ -152,7 +153,7 @@
 }
 
 if ( ! defined('APBCT_BOT_DETECTOR_SCRIPT_URL') ) {
-    define('APBCT_BOT_DETECTOR_SCRIPT_URL', 'https://fd.cleantalk.org/ct-bot-detector-wrapper.js');
+    define('APBCT_BOT_DETECTOR_SCRIPT_URL', BotDetectorService::getWrapperUrl());
 }
 
 /**
@@ -1879,6 +1880,8 @@ function apbct_sfw_update__end_of_update($is_first_updating = false)
 
     // Delete update errors
     $apbct->errorDelete('sfw_update', true);
+    // Delete outdated errors
+    $apbct->errorDelete('sfw_outdated', true);
 
     // Running sfw update once again in 12 min if entries is < 4000
     if ( $is_first_updating &&
@@ -2349,35 +2352,6 @@ function apbct_rc__uninstall_plugin__check_deactivate()
     $apbct->plugin_deactivated = true;
 }
 
-/**
- * @param $source
- *
- * @return bool
- */
-function apbct_rc__update_settings($source)
-{
-    global $apbct;
-
-    foreach ( $apbct->default_settings as $setting => $def_value ) {
-        if ( array_key_exists($setting, $source) ) {
-            if ($setting === 'apikey') {
-                continue;
-            }
-            $var  = $source[$setting];
-            $type = gettype($def_value);
-            settype($var, $type);
-            if ( $type === 'string' ) {
-                $var = preg_replace(array('/=/', '/`/'), '', $var);
-            }
-            $apbct->settings[$setting] = $var;
-        }
-    }
-
-    $apbct->save('settings');
-
-    return true;
-}
-
 /**
  * @param string $key
  * @param string $plugin
@@ -2390,7 +2364,7 @@ function apbct_rc__insert_auth_key($key, $plugin)
         require_once(ABSPATH . '/wp-admin/includes/plugin.php');
 
         if ( is_plugin_active($plugin) ) {
-            $key = trim($key);
+            $key = trim($key, " \n\r\t\v\x00");
 
             if ( $key && preg_match('/^[a-z\d]{3,30}$/', $key) ) {
                 $result = API::methodNoticePaidTill(
@@ -2656,7 +2630,7 @@ function apbct_cookie()
     // Cookie names to validate
     $cookie_test_value = array(
         'cookies_names' => array(),
-        'check_value'   => $apbct->api_key . $apbct->data['salt'],
+        'check_value'   => $apbct->api_key . $apbct->data['salt'] . '_apbct_cookies_test',
     );
 
     // We need to skip the domain attribute for prevent including the dot to the cookie's domain on the client.
@@ -2751,7 +2725,7 @@ function apbct_cookies_test()
             return 0;
         }
 
-        $check_string = $apbct->api_key . $apbct->data['salt'];
+        $check_string = $apbct->api_key . $apbct->data['salt'] . '_apbct_cookies_test';
         // generate value
         $cookie_names = TT::getArrayValueAsArray($cookie_test, 'cookies_names');
         foreach ( $cookie_names as $cookie_name ) {
@@ -3197,6 +3171,11 @@ function apbctGetContactsEncoder()
     $contacts_encoder_params->obfuscation_text = $apbct->settings['data__email_decoder_obfuscation_custom_text'];
     $contacts_encoder_params->do_encode_emails = (int)$apbct->settings['data__email_decoder_encode_email_addresses'];
     $contacts_encoder_params->do_encode_phones = (int)$apbct->settings['data__email_decoder_encode_phone_numbers'];
+    $contacts_encoder_params->excluded_strings = \Cleantalk\Common\ContactsEncoder\Exclusions\ExclusionsService::parseExcludedStrings(
+        isset($apbct->settings['data__email_decoder_excluded_strings'])
+            ? $apbct->settings['data__email_decoder_excluded_strings']
+            : ''
+    );
 
     return ContactsEncoder::getInstance($contacts_encoder_params);
 }

composer.json

@@ -16,11 +16,18 @@
         "yoast/phpunit-polyfills": "^1.0",
         "ext-dom": "*",
         "wp-cli/wp-cli-bundle": "*",
-        "mockery/mockery": "*",
         "cleantalk/apbct-installer": "*",
-        "cleantalk/contacts-encoder": "2.0.18.7",
+        "cleantalk/contacts-encoder": "^2.2.0",
         "cleantalk/rate-limiter": "*"
     },
+    "replace": {
+        "cleantalk/antispam": "*",
+        "cleantalk/helper": "*",
+        "cleantalk/http": "*",
+        "cleantalk/variables": "*",
+        "cleantalk/cleaner": "*",
+        "cleantalk/mloader": "*"
+    },
     "scripts": {
         "test": [
             "vendor/bin/phpunit --configuration tests/phpunit.xml --coverage-clover=coverage.xml",

css/src/cleantalk-admin-settings-page.css

@@ -59,6 +59,10 @@ i.animate-spin {
     font-size: 14px;
     vertical-align: top;
 }
+.apbct_settings-field_title--with-help{
+    width: auto;
+    white-space: nowrap;
+}
 .apbct_settings-field_title--radio{
     display: inline-block;
     margin: 0;

css/src/cleantalk-trp.css

@@ -55,11 +55,6 @@
     flex-direction: column;
     gap: 1px;
 }
-@media (min-width: 768px) {
-    .apbct-real-user-popup-content_row {
-        white-space: nowrap;
-    }
-}
 
 .apbct-real-user-popup-content_row * {
     color: grey;

inc/apbct-sync-react.php

@@ -42,7 +42,11 @@ function apbct_react_access_key_check()
         );
     }
 
-    $apbct->errorDeleteAll(true);
+    $clear_all_blogs = APBCT_WPMS
+        && is_main_site()
+        && isset($apbct->network_settings['multisite__work_mode'])
+        && (int) $apbct->network_settings['multisite__work_mode'] === 2;
+    apbct_settings__clear_errors($clear_all_blogs);
 
     $account_is_ok = (bool) ct_account_status_check($apbct->settings['apikey']);
     $connection_error = ! empty($apbct->errors['account_check'])

inc/cleantalk-admin.php

@@ -48,7 +48,7 @@ function apbct_admin_set_cookie_for_anti_bot()
         echo
             '<script ' . (class_exists('Cookiebot_WP') ? 'data-cookieconsent="ignore"' : '') . '>
                 var ctSecure = location.protocol === "https:" ? "; secure" : "";
-                document.cookie = "wordpress_apbct_antibot=' . apbct_get_anti_bot_cookie_hash() . '; path=/; expires=0; samesite=lax" + ctSecure;
+                document.cookie = "apbct_antibot=' . apbct_get_anti_bot_cookie_hash() . '; path=/; expires=0; samesite=lax" + ctSecure;
             </script>';
     }
 }

inc/cleantalk-common.php

@@ -5,6 +5,7 @@
 use Cleantalk\Antispam\CleantalkResponse;
 use Cleantalk\ApbctWP\API;
 use Cleantalk\ApbctWP\BaseCall\DefaultParams;
+use Cleantalk\ApbctWP\BotDetectorService;
 use Cleantalk\ApbctWP\CleantalkSettingsTemplates;
 use Cleantalk\ApbctWP\Constant;
 use Cleantalk\ApbctWP\Cron;
@@ -744,7 +745,7 @@ function apbct_get_pixel_url($direct_call = false)
  */
 function apbct_email_check_before_post()
 {
-    $email = trim(TT::toString(Post::get('email')));
+    $email = trim(TT::toString(Post::get('email')), " \n\r\t\v\x00");
 
     if ( $email ) {
         $result = \Cleantalk\ApbctWP\API::methodEmailCheck($email);
@@ -762,7 +763,7 @@ function apbct_email_check_before_post()
 function apbct_email_check_exist_post()
 {
     global $apbct;
-    $email = trim(TT::toString(Post::get('email')));
+    $email = trim(TT::toString(Post::get('email')), " \n\r\t\v\x00");
     $api_key = $apbct->api_key;
     $brandname = $apbct->data['wl_mode_enabled'] ? $apbct->data['wl_brandname'] : 'Anti-Spam by CleanTalk';
     if ( $email && $api_key ) {
@@ -1152,7 +1153,7 @@ function ct_get_fields_any($arr, $email = '', $nickname = '')
         foreach ( $nickname as $value ) {
             $nickname_str .= ($value ? $value . " " : "");
         }
-        $nickname = trim($nickname_str);
+        $nickname = trim($nickname_str, " \n\r\t\v\x00");
     }
 
     return ct_gfa($arr, TT::toString($email), TT::toString($nickname));
@@ -1813,156 +1814,41 @@ function apbct_get_event_token($params)
 }
 
 /**
- * Do prepare exclusions for skippping bot-detector event token field.
+ * Prepare exclusions for skippping bot-detector event token field.
+ * @deprecated since 6.88, use BotDetectorService::getPreparedExclusions() instead
  * @return string JSOn
  */
 function apbct__bot_detector_get_prepared_exclusion()
 {
-    global $apbct;
-    $bot_detector_exclusions = array();
-
-    //start exclusion there
-
-    //todo if do need to add a built-ib exclusion, use $exlusion_format
-    //set regexp to chek within attributes
-    //    $exlusion_format = array(
-    //        'exclusion_id' => '',
-    //        'signs_to_check' => array(
-    //            'form_attributes'               => '',
-    //            'form_children_attributes'      => '',
-    //            'form_parent_attributes'        => ''
-    //        )
-    //    );
-    if ($apbct->settings['exclusions__bot_detector']) {
-        $bot_detector_exclusions = array_merge(
-            $bot_detector_exclusions,
-            apbct__bot_detector_get_custom_exclusion_from_settings()
-        );
-    }
-
-    //start validate
-    $bot_detector_exclusions_valid = array();
-    foreach ($bot_detector_exclusions as $exclusion) {
-        if (
-            empty($exclusion['exclusion_id']) ||
-            (
-                empty($exclusion['signs_to_check']['form_attributes']) &&
-                empty($exclusion['signs_to_check']['form_children_attributes']) &&
-                empty($exclusion['signs_to_check']['form_parent_attributes'])
-            )
-        ) {
-            continue;
-        }
-        $bot_detector_exclusions_valid[] = $exclusion;
-    }
-
-    //prepare for early localize
-    $bot_detector_exclusions_valid = json_encode($bot_detector_exclusions_valid);
-    return $bot_detector_exclusions_valid !== false ? $bot_detector_exclusions_valid : '{}';
+    return BotDetectorService::getPreparedExclusions();
 }
 
+/**
+ * @deprecated since 6.88, use BotDetectorService::getFrontendDataLog() instead
+ * @return string
+ */
 function apbct__bot_detector_get_fired_exclusions()
 {
-    return Cookie::get('ct_bot_detector_form_exclusion');
+    return BotDetectorService::getFiredExclusions();
 }
 
 /**
  * Return bot detector frontend data log from Alt Sessions if data found.
  * Format: JSON.
- *
+ * @deprecated since 6.88, use BotDetectorService::getFrontendDataLog() instead
  * @return string JSON encoded bot detector frontend data log.
  */
 function apbct__bot_detector_get_fd_log()
 {
-    $result = array(
-        'plugin_status' => 'OK',
-        'error_msg' => '',
-        'frontend_data_log' => ''
-    );
-    // Initialize result array with default values
-
-    if (Constant::is(Constant::APBCT_SERVICE__DO_NOT_COLLECT_FRONTEND_DATA_LOGS)) {
-        $result['plugin_status'] = 'OK';
-        $result['error_msg'] = 'bot detector logs collection is disabled via constant definition';
-        return json_encode($result);
-    }
-
-    try {
-        if ( ! apbct__is_bot_detector_enabled() ) {
-            throw new \Exception('bot detector library usage is disabled');
-        }
-        // Retrieve bot detector frontend data log from Alt Sessions
-        $alt_sessions_fd_log = AltSessions::get('ct_bot_detector_frontend_data_log');
-        // Check if the retrieved data is a string
-        if ( !is_string($alt_sessions_fd_log) || '' === $alt_sessions_fd_log ) {
-            throw new \Exception('no log found in alt sessions');
-        }
-        // Encode the retrieved data to JSON format
-        $param_bot_detector_fd_log = json_decode($alt_sessions_fd_log, true);
-        // Check if the JSON encoding was successful
-        if ( empty($param_bot_detector_fd_log) ) {
-            throw new \Exception('can not decode data from alt sessions');
-        }
-    } catch (Exception $e) {
-        $result['plugin_status'] = 'ERROR';
-        $result['error_msg'] = $e->getMessage();
-        return json_encode($result);
-    }
-    $result['frontend_data_log'] = $param_bot_detector_fd_log;
-    // Return the result as a JSON encoded string
-    return json_encode($result);
-}
-
-function apbct__bot_detector_get_custom_exclusion_from_settings()
-{
-    global $apbct;
-
-    $exlusion_format = array(
-        'exclusion_id' => '',
-        'signs_to_check' => array(
-            'form_attributes'               => '',
-            'form_children_attributes'      => '',
-            'form_parent_attributes'        => ''
-        )
-    );
-
-    $exclusions = array();
-    if (!$apbct->settings['exclusions__bot_detector']) {
-        return $exclusions;
-    }
-
-    foreach ($exlusion_format['signs_to_check'] as $sign => $_val) {
-        $setting_name = 'exclusions__bot_detector__' . $sign;
-        if (!empty($apbct->settings[$setting_name])) {
-            $regexps = explode(',', $apbct->settings[$setting_name]);
-            for ( $i = 0; $i < count($regexps); $i++ ) {
-                $form_exclusion = $exlusion_format;
-                $form_exclusion['exclusion_id'] = 'exclusion_' . $i;
-                $form_exclusion['signs_to_check'][$sign] = $regexps[$i];
-                $exclusions[] = $form_exclusion;
-            }
-        }
-    }
-    return $exclusions;
+    return BotDetectorService::getFrontendDataLog();
 }
 
 /**
  * Check if Bot-Detector is enabled/disabled
- *
+ * @deprecated since 6.88, use BotDetectorService::isEnabled() instead
  * @return bool
  */
 function apbct__is_bot_detector_enabled()
 {
-    global $apbct;
-
-    // Constant is preferred
-    if ( Constant::is(Constant::APBCT_SERVICE__BOT_DETECTOR_ENABLED) ) {
-        return (bool) Constant::getValue(Constant::APBCT_SERVICE__BOT_DETECTOR_ENABLED);
-    }
-    // Check by $apbct->data
-    if ( isset($apbct->data['bot_detector_enabled']) ) {
-        return (bool) $apbct->data['bot_detector_enabled'];
-    }
-    // By default - enabled
-    return true;
+    return BotDetectorService::isEnabled();
 }

inc/cleantalk-public-integrations.php

@@ -178,7 +178,7 @@ function ct_woocommerce_wishlist_check($args)
     $subject = '';
     $email   = $args['wishlist_owner_email'];
     if ( $args['wishlist_first_name'] !== '' || $args['wishlist_last_name'] !== '' ) {
-        $nickname = trim($args['wishlist_first_name'] . " " . $args['wishlist_last_name']);
+        $nickname = trim($args['wishlist_first_name'] . " " . $args['wishlist_last_name'], " \n\r\t\v\x00");
     } else {
         $nickname = '';
     }