Merge branch 'dev' into quform_codecov.ag

Author: alexandergull

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.75.99-dev
+  Version: 6.77.99-dev
   Author: CleanTalk - Anti-Spam Protection <welcome@cleantalk.org>
   Author URI: https://cleantalk.org
   Text Domain: cleantalk-spam-protect
@@ -694,6 +694,9 @@ function apbct_wpms__delete_blog(WP_Site $old_site)
 // After plugin loaded - to load locale as described in manual
 add_action('init', 'apbct_plugin_loaded');
 
+// SiteGround Speed Optimizer: skip cache for URLs with apbct_no_cache.
+add_action('plugins_loaded', 'apbct_sgo_optimizer__register_bypass_query_params', 1);
+
 if ( ! empty($apbct->settings['data__use_ajax']) &&
      ! apbct_is_in_uri('.xml') &&
      ! apbct_is_in_uri('.xsl')

inc/cleantalk-admin.php

@@ -751,17 +751,10 @@ function apbct_admin__admin_bar__add_structure($wp_admin_bar)
      * Link to project manager
      */
     $project_manager_title_node = apbct__admin_bar__get_title_for_project_manager();
-    if ( $project_manager_title_node ) {
+    $gf2db_title_node = apbct__admin_bar__add_gf2db_title();
+    if ( $project_manager_title_node && $gf2db_title_node) {
         $wp_admin_bar->add_node($project_manager_title_node);
-        $gf2db_title_node = apbct__admin_bar__add_gf2db_title();
-        if ($gf2db_title_node) {
-            $wp_admin_bar->add_node($gf2db_title_node);
-        } else {
-            $gf2db_invite_to_install_title = apbct__admin_bar__get_title_for_gf2db_invite_to_install();
-            if ($gf2db_invite_to_install_title) {
-                $wp_admin_bar->add_node($gf2db_invite_to_install_title);
-            }
-        }
+        $wp_admin_bar->add_node($gf2db_title_node);
     }
 
     /**
@@ -823,36 +816,6 @@ function apbct__admin_bar__add_gf2db_title()
     );
 }
 
-/**
- * Gets the title for the "Gravity Forms to doBoard" Add-On invite to install admin bar node.
- *
- * This function constructs the title for the "Gravity Forms to doBoard" Add-On invite to install admin bar node based on various conditions.
- * The title includes a link to the "Gravity Forms to doBoard" Add-On invite to install.
- *
- * @return array|false The node data for the "Gravity Forms to doBoard" Add-On invite to install admin bar node, or false if the "Gravity Forms to doBoard" Add-On invite to install admin bar node is not enabled.
- */
-function apbct__admin_bar__get_title_for_gf2db_invite_to_install()
-{
-    if (is_plugin_active('cleantalk-doboard-add-on-for-gravity-forms/cleantalk-doboard-add-on-for-gravity-forms.php')) {
-        return false;
-    }
-
-    $title = sprintf(
-        '<a href="%s" target="_blank" title="%s">%s</a>',
-        admin_url('plugin-install.php?s=GF2DB&tab=search&type=term'),
-        esc_html__(
-            'Organize and track all messages from your site. Gravity Forms, upgraded with project management.',
-            'cleantalk-spam-protect'
-        ),
-        esc_html__('Install "Gravity Forms to doBoard" Add-On', 'cleantalk-spam-protect')
-    );
-
-    return array(
-        'parent' => 'project_manager__parent_node',
-        'id' => 'gf2db_invite_to_install_title',
-        'title' => $title,
-    );
-}
 
 /**
  * Gets the title for the APBCT admin bar node.

inc/cleantalk-common.php

@@ -591,6 +591,14 @@ function apbct_get_sender_info()
     $page_hits = RequestParameters::get('apbct_page_hits', Cookie::$force_alt_cookies_global);
     $page_hits = !empty($page_hits) ? TT::toString($page_hits) : null;
 
+    $ct_options = json_encode(
+        array_merge(
+            (array) $apbct->settings,
+            ['data__bot_detector_enabled' => apbct__is_bot_detector_enabled() ? 1 : 0]
+        ),
+        JSON_UNESCAPED_SLASHES
+    );
+
     //Let's keep $data_array for debugging
     $data_array = array(
         'plugin_request_id'         => $apbct->plugin_request_id,
@@ -599,7 +607,7 @@ function apbct_get_sender_info()
         'USER_AGENT'                => Server::get('HTTP_USER_AGENT'),
         'page_url'                  => apbct_sender_info___get_page_url(),
         'cms_lang'                  => substr(get_locale(), 0, 2),
-        'ct_options'                => json_encode($apbct->settings, JSON_UNESCAPED_SLASHES),
+        'ct_options'                => $ct_options,
         'fields_number'             => sizeof($_POST),
         'direct_post'               => $cookie_is_ok === null && apbct_is_post() ? 1 : 0,
         // Raw data to validated JavaScript test in the cloud
@@ -1843,7 +1851,6 @@ function apbct__bot_detector_get_fired_exclusions()
  */
 function apbct__bot_detector_get_fd_log()
 {
-    global $apbct;
     $result = array(
         'plugin_status' => 'OK',
         'error_msg' => '',
@@ -1858,7 +1865,7 @@ function apbct__bot_detector_get_fd_log()
     }
 
     try {
-        if ( TT::toString($apbct->settings['data__bot_detector_enabled']) === '0') {
+        if ( ! apbct__is_bot_detector_enabled() ) {
             throw new \Exception('bot detector library usage is disabled');
         }
         // Retrieve bot detector frontend data log from Alt Sessions
@@ -1915,3 +1922,24 @@ function apbct__bot_detector_get_custom_exclusion_from_settings()
     }
     return $exclusions;
 }
+
+/**
+ * Check if Bot-Detector is enabled/disabled
+ *
+ * @return bool
+ */
+function apbct__is_bot_detector_enabled()
+{
+    global $apbct;
+
+    // Constant is preferred
+    if ( isset($apbct->service_constants->bot_detector_enabled) && $apbct->service_constants->bot_detector_enabled->isDefined() ) {
+        return (bool) $apbct->service_constants->bot_detector_enabled->getValue();
+    }
+    // Check by $apbct->data
+    if ( isset($apbct->data['bot_detector_enabled']) ) {
+        return (bool) $apbct->data['bot_detector_enabled'];
+    }
+    // By default - enabled
+    return true;
+}

inc/cleantalk-integrations-by-hook.php

@@ -135,7 +135,7 @@
         'ajax'    => false
     ),
     'EasyDigitalDownloads' => array(
-        'hook'    => array('edd_pre_process_register_form', 'edd_insert_user_args'),
+        'hook'    => array('edd_pre_process_register_form', 'edd_insert_user_args', 'edd_customer_pre_create'),
         'setting' => 'forms__registrations_test',
         'ajax'    => false
     ),
@@ -291,6 +291,13 @@
         'setting' => 'forms__contact_forms_test',
         'ajax'    => true
     ),
+    'BookingCalendar' => array(
+        'hook'    => [
+            'WPBC_AJX_BOOKING__CREATE',
+        ],
+        'setting' => 'forms__contact_forms_test',
+        'ajax'    => true
+    ),
     'JobstackThemeRegistration' => array(
         'hook'    => 'wp_loaded',
         'setting' => 'forms__registrations_test',

inc/cleantalk-pluggable.php

@@ -1406,6 +1406,13 @@ function apbct_is_skip_request($ajax = false, $ajax_message_obj = array())
             return 'BookingPress service action';
         }
 
+        if (
+            apbct_is_plugin_active('booking/wpdev-booking.php') &&
+            (Post::getString('action') === 'WPBC_AJX_BOOKING__CREATE')
+        ) {
+            return 'WP BookingCalendar service action';
+        }
+
         if (
             (
                 apbct_is_plugin_active('pixelyoursite/pixelyoursite.php') ||
@@ -1812,6 +1819,11 @@ class_exists('Cleantalk\Antispam\Integrations\CleantalkInternalForms')
              apbct_is_in_uri('wc-ajax=iwd_opc_update_order_review') ) {
             return 'cartflows_save_cart';
         }
+        // WC addon - Metorik Helper plugin service requests
+        if ( apbct_is_plugin_active('metorik-helper/metorik-helper.php') &&
+             apbct_is_in_uri('wc-ajax=metorik_capture_customer_data') ) {
+            return 'metorik-helper skip';
+        }
         // Vault Press (JetPack) plugin service requests
         if (
             Post::get('do_backups') !== '' &&

inc/cleantalk-public-integrations.php

@@ -938,6 +938,11 @@ function ct_registration_errors($errors, $sanitized_user_login = null, $user_ema
         $checkjs        = $checkjs_cookie ?: $checkjs_post;
     }
 
+    // BuddyBoss Platform use rest api for registration from phone app
+    if ( apbct_is_plugin_active('buddyboss-app/buddyboss-app.php') && apbct_is_in_uri('/wp-json/buddyboss-app/v1/signup') ) {
+        $checkjs = Post::getString('checkjs') === 'true' ? 1 : 0;
+    }
+
     $sender_info = array(
         'post_checkjs_passed'   => $checkjs_post,
         'cookie_checkjs_passed' => $checkjs_cookie,
@@ -1049,6 +1054,10 @@ function ct_registration_errors($errors, $sanitized_user_login = null, $user_ema
             $bp->signup->errors['signup_username'] = $ct_result->comment;
         }
 
+        if (apbct_is_plugin_active('buddyboss-app/buddyboss-app.php') && apbct_is_in_uri('/wp-json/buddyboss-app/v1/signup')) {
+            wp_send_json_error(['success' => false, 'message' => $ct_result->comment]);
+        }
+
         if ( $facebook ) {
             /** @psalm-suppress InvalidArrayOffset */
             $_POST['FB_userdata']['email'] = '';
@@ -1451,6 +1460,11 @@ function apbct_form__contactForm7__testSpam($spam, $_submission = null)
      */
     $input_array = apply_filters('apbct__filter_post', $_POST);
 
+    $honeypot_params = array();
+    if ( isset($input_array['apbct__email_id__wp_contact_form_7']) ) {
+        $honeypot_params['honeypot_field'] = ($input_array['apbct__email_id__wp_contact_form_7'] === '') ? 1 : 0;
+    }
+
     $ct_temp_msg_data = ct_get_fields_any($input_array);
 
     $sender_email    = isset($ct_temp_msg_data['email']) ? $ct_temp_msg_data['email'] : '';
@@ -1463,21 +1477,24 @@ function apbct_form__contactForm7__testSpam($spam, $_submission = null)
     }
 
     $base_call_result = apbct_base_call(
-        array(
-            'message'         => $message,
-            'sender_email'    => $sender_email,
-            'sender_nickname' => $sender_nickname,
-            'js_on'           => $checkjs,
-            'post_info'       => array('comment_type' => 'contact_form_wordpress_cf7'),
-            'sender_info'     => array(
-                'form_validation' => ! isset($apbct->validation_error)
-                    ? null
-                    : json_encode(array(
-                        'validation_notice' => $apbct->validation_error,
-                        'page_url'          => TT::toString(Server::get('HTTP_HOST')) . TT::toString(Server::get('REQUEST_URI')),
-                    )),
-                'sender_emails_array' => $sender_emails_array,
+        array_merge(
+            array(
+                'message'         => $message,
+                'sender_email'    => $sender_email,
+                'sender_nickname' => $sender_nickname,
+                'js_on'           => $checkjs,
+                'post_info'       => array('comment_type' => 'contact_form_wordpress_cf7'),
+                'sender_info'     => array(
+                    'form_validation' => ! isset($apbct->validation_error)
+                        ? null
+                        : json_encode(array(
+                            'validation_notice' => $apbct->validation_error,
+                            'page_url'          => TT::toString(Server::get('HTTP_HOST')) . TT::toString(Server::get('REQUEST_URI')),
+                        )),
+                    'sender_emails_array' => $sender_emails_array,
+                ),
             ),
+            $honeypot_params
         )
     );
 

inc/cleantalk-public-validate-skip-functions.php

@@ -287,6 +287,11 @@ function skip_for_ct_contact_form_validate()
             Get::equal('wc-ajax', 'wc_stripe_frontend_request') &&
             ! empty(Post::getString('stripe_applepay_token_key'))
         ),
+        // BuddyBoss REST API has a direct integration
+        '101' => (
+            apbct_is_plugin_active('buddyboss-platform/buddyboss-platform.php') &&
+            apbct_is_in_uri('/wp-json/buddyboss/v1/signup')
+        ),
     );
 
     foreach ( $exclusions as $exclusion_key => $state ) {

inc/cleantalk-public.php

@@ -32,7 +32,7 @@ function apbct_init()
         $apbct->settings['data__pixel'] &&
         empty($apbct->pixel_url) &&
         !(
-            $apbct->settings['data__bot_detector_enabled'] === '1' &&
+            apbct__is_bot_detector_enabled() &&
             $apbct->settings['data__pixel'] === '3'
         )
     ) {
@@ -378,6 +378,36 @@ class_exists('Jetpack', false) &&
     }
 }
 
+/**
+ * SiteGround Speed Optimizer: register sgo_bypass_query_params filter.
+ */
+function apbct_sgo_optimizer__register_bypass_query_params()
+{
+    if ( ! defined('SG_OPTIMIZER_VERSION') ) {
+        return;
+    }
+    add_filter('sgo_bypass_query_params', 'apbct_sgo_bypass_query_params', 10, 1);
+}
+
+/**
+ * Adds apbct_no_cache to SG Optimizer bypass list.
+ *
+ * @param string[] $bypass_query_params
+ *
+ * @return string[]
+ */
+function apbct_sgo_bypass_query_params($bypass_query_params)
+{
+    if ( ! is_array($bypass_query_params) ) {
+        $bypass_query_params = array();
+    }
+    if ( ! in_array('apbct_no_cache', $bypass_query_params, true) ) {
+        $bypass_query_params[] = 'apbct_no_cache';
+    }
+
+    return $bypass_query_params;
+}
+
 function apbct_buffer__start()
 {
     ob_start();
@@ -540,7 +570,7 @@ function apbct_hook__wp_footer()
         (
             $apbct->settings['data__pixel'] === '3' &&
             ! apbct_is_cache_plugins_exists() &&
-            $apbct->settings['data__bot_detector_enabled'] !== '1'
+            ! apbct__is_bot_detector_enabled()
         )
     ) {
         echo '<img alt="Cleantalk Pixel" title="Cleantalk Pixel" id="apbct_pixel" style="display: none;" src="' . Escape::escUrl($apbct->pixel_url) . '">';
@@ -1245,7 +1275,7 @@ function apbct_enqueue_and_localize_public_scripts()
     ApbctEnqueue::getInstance()->js($bundle_name, array(), $in_footer);
 
     // Bot detector
-    if ( $apbct->settings['data__bot_detector_enabled'] && ! apbct_bot_detector_scripts_exclusion()) {
+    if ( apbct__is_bot_detector_enabled() && ! apbct_bot_detector_scripts_exclusion()) {
         // Attention! Skip old enqueue way for external script.
         wp_enqueue_script(
             'ct_bot_detector',