Merge pull request #762 from CleanTalk/beta

Beta

Author: AntonV1211

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.74
+  Version: 6.75
   Author: CleanTalk - Anti-Spam Protection <welcome@cleantalk.org>
   Author URI: https://cleantalk.org
   Text Domain: cleantalk-spam-protect
@@ -476,10 +476,11 @@ function apbct_write_js_errors($data)
 }
 
 // Memberpress integration
+// MemberPress sends mepr_process_signup_form='Y' or '1' — both must trigger the check
 if (
     !empty($_POST) &&
     apbct_is_plugin_active('memberpress/memberpress.php') &&
-    Post::hasString('mepr_process_signup_form', '1') &&
+    Post::getString('mepr_process_signup_form') &&
     (int)$apbct->settings['forms__registrations_test'] === 1
 ) {
     apbct_memberpress_signup_request_test();
@@ -614,10 +615,12 @@ function apbct_write_js_errors($data)
                 . '/js/apbct-public-bundle.min.js'
                 . '?ver=' . APBCT_VERSION . '" id="ct_public_functions-js"></script>';
             echo '<script src="' . APBCT_BOT_DETECTOR_SCRIPT_URL . '?ver='
-                . APBCT_VERSION . '" id="ct_bot_detector-js"></script>';
+                . APBCT_VERSION . '" async id="ct_bot_detector-js" data-wp-strategy="async"></script>';
         }, 100);
     }
 
+    SFWUpdateHelper::processSFWOutdatedError($apbct);
+
     // SpamFireWall check
     if ( $apbct->plugin_version == APBCT_VERSION && // Do not call with first start
          $apbct->settings['sfw__enabled'] == 1 &&
@@ -910,25 +913,12 @@ function apbct_sfw__check()
     }
 
     // update mode - skip checking
-    if ( isset($apbct->fw_stats['update_mode']) && $apbct->fw_stats['update_mode'] === 1 ) {
+    if ( SFWUpdateHelper::SFWUpdateModeEnabled($apbct)) {
         return;
     }
 
-    // Checking if database was outdated
-    $is_sfw_outdated = $apbct->stats['sfw']['last_update_time'] + $apbct->stats['sfw']['update_period'] * 3 < time();
-
-    add_action('init', function () use ($apbct, $is_sfw_outdated) {
-        $apbct->errorToggle(
-            $is_sfw_outdated,
-            'sfw_outdated',
-            esc_html__(
-                'SpamFireWall database is outdated. Please, try to synchronize with the cloud.',
-                'cleantalk-spam-protect'
-            )
-        );
-    });
-
-    if ( $is_sfw_outdated ) {
+    // sfw is outdated - skip checking
+    if ( SFWUpdateHelper::SFWDataOutdated($apbct) ) {
         return;
     }
 

composer.json

@@ -35,7 +35,7 @@
             "vendor/bin/psalm --no-cache --config=psalm.xml --taint-analysis"
         ],
         "just_phpunit": [
-            "vendor/bin/phpunit --configuration tests/phpunit.xml --debug"
+            "vendor/bin/phpunit --configuration tests/phpunit.xml --coverage-clover=coverage.xml"
         ]
     },
     "config": {

css/cleantalk-trp.min.css

@@ -56,6 +56,15 @@
     gap: 1px;
 }
 
+.apbct-real-user-popup-content_row * {
+    color: grey;
+    font-style: italic;
+}
+.apbct-real-user-popup-content_row strong {
+    color: initial;
+    font-style: initial;
+}
+
 .apbct-real-user-popup-img {
     align-self: start;
     margin: 0!important;

css/src/cleantalk-trp.css

@@ -348,6 +348,11 @@
         'setting' => 'forms__contact_forms_test',
         'ajax'    => true
     ),
+    'ElfsightForm'            => array(
+        'hook'    => 'cleantalk_force_elfsight_check',
+        'setting' => 'forms__check_external',
+        'ajax'    => true
+    ),
     'BloomForms' => array(
         'hook'    => 'bloom_subscribe',
         'setting' => 'forms__contact_forms_test',

inc/cleantalk-integrations-by-hook.php

@@ -11,6 +11,16 @@
         'setting' => 'forms__contact_forms_test',
         'rest'       => true,
     ),
+    'HivePress'         => array(
+        'rest_route'    => '/hivepress/v1/listings/',
+        'setting' => 'forms__contact_forms_test',
+        'rest'       => true,
+    ),
+    'HivePressRegistration'         => array(
+        'rest_route'    => '/hivepress/v1/users',
+        'setting' => 'forms__registrations_test',
+        'rest'       => true,
+    ),
 );
 
 add_filter('rest_pre_dispatch', function ($result, $_, $request) use ($apbct_active_rest_integrations) {

inc/cleantalk-integrations-by-route.php

@@ -1982,6 +1982,14 @@ class_exists('Cleantalk\Antispam\Integrations\CleantalkInternalForms')
         ) {
             return 'AsgarosForum';
         }
+
+        // Plugin Name: HivePress
+        if (
+            apbct_is_plugin_active('hivepress/hivepress.php') &&
+            (apbct_is_in_uri('/hivepress/v1/listings/') || apbct_is_in_uri('/hivepress/v1/users'))
+        ) {
+            return 'Plugin Name: HivePress skip REST route checking';
+        }
     }
 
     // WP Fusion Abandoned Cart Addon

inc/cleantalk-pluggable.php

@@ -44,7 +44,7 @@ function apbct_print_public_scripts()
     echo CtPublicLocalize::getCode();
 
     echo '<script src="' . $js_url . '" type="application/javascript"></script>';
-    echo '<script src="' . $js_url_wrapper . '" type="application/javascript"></script>';
+    echo '<script src="' . $js_url_wrapper . '" async data-wp-strategy="async" type="application/javascript"></script>';
 }
 
 /**
@@ -2115,7 +2115,7 @@ function apbct_form__gravityForms__testSpam($is_spam, $form, $entry)
 {
     global $apbct, $ct_gform_is_spam, $ct_gform_response;
 
-    if (apbct_form__gravityForms__isSkippedRequest($is_spam)) {
+    if (apbct_form__gravityForms__isSkippedRequest()) {
         return $is_spam;
     }
 
@@ -2253,7 +2253,7 @@ function apbct_form__gravityForms__testSpam($is_spam, $form, $entry)
  *
  * @return bool
  */
-function apbct_form__gravityForms__isSkippedRequest($is_spam)
+function apbct_form__gravityForms__isSkippedRequest()
 {
     global $cleantalk_executed, $apbct;
 
@@ -2262,15 +2262,9 @@ function apbct_form__gravityForms__isSkippedRequest($is_spam)
         '_GET' => $_GET,
         'SERVER_URI' => Server::getString('REQUEST_URI'),
         'HTTP_REFERER' => Server::getString('HTTP_REFERER'),
-        '$is_spam' => $is_spam,
         '$cleantalk_executed' => $cleantalk_executed,
     ];
 
-    if ( $is_spam ) {
-        do_action('apbct_skipped_request', __FILE__ . ' -> ' . __FUNCTION__ . '():' . 'ALREADY SET BY GRAVITY AS SPAM', $data);
-        return true;
-    }
-
     if ( $apbct->settings['forms__contact_forms_test'] == 0 ) {
         do_action('apbct_skipped_request', __FILE__ . ' -> ' . __FUNCTION__ . '():' . 'CONTACT FORM TEST DISABLED', $data);
         return true;

inc/cleantalk-public-integrations.php

@@ -211,24 +211,6 @@ function ct_contact_form_validate()
         return false;
     }
 
-    //hivepress theme listing integration
-    if ( empty($sender_email) &&
-         function_exists('hivepress') &&
-         is_callable('hivepress') &&
-         apbct_is_user_logged_in() &&
-         $apbct->settings['data__protect_logged_in']
-    ) {
-        if (! isset($_POST['_model'])) {
-            $current_user = wp_get_current_user();
-            if ( ! empty($current_user->data->user_email) ) {
-                $sender_email = $current_user->data->user_email;
-            }
-        } else {
-            do_action('apbct_skipped_request', __FILE__ . ' -> ' . __FUNCTION__ . '(hivepress theme listing integration):' . __LINE__, $_POST);
-            return false;
-        }
-    }
-
     //tellallfriend integration #1
     if ( isset($_POST['TellAFriend_Link']) ) {
         $tmp = Sanitize::cleanTextField(Post::get('TellAFriend_Link'));

inc/cleantalk-public-validate.php

@@ -1254,7 +1254,7 @@ function apbct_enqueue_and_localize_public_scripts()
             APBCT_VERSION,
             array(
                 'in_footer' => $in_footer,
-                'strategy' => 'defer'
+                'strategy' => 'async'
             )
         );
     }