Merge remote-tracking branch 'origin/master' into fix

# Conflicts:
#	js/apbct-public-bundle.min.js
#	js/apbct-public-bundle_ext-protection.min.js
#	js/apbct-public-bundle_ext-protection_gathering.min.js
#	js/apbct-public-bundle_full-protection.min.js
#	js/apbct-public-bundle_full-protection_gathering.min.js
#	js/apbct-public-bundle_gathering.min.js
#	js/apbct-public-bundle_int-protection.min.js
#	js/apbct-public-bundle_int-protection_gathering.min.js

Author: Glomberg

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-fix
+  Version: 6.76
   Author: CleanTalk - Anti-Spam Protection <welcome@cleantalk.org>
   Author URI: https://cleantalk.org
   Text Domain: cleantalk-spam-protect

inc/cleantalk-common.php

@@ -193,7 +193,9 @@ function apbct_base_call($params = array(), $reg_flag = false)
 
         // Misc
         'auth_key'        => $apbct->api_key,
-        'js_on'           => apbct_js_test(Sanitize::cleanTextField(Cookie::get('ct_checkjs')), true) ? 1 : apbct_js_test(TT::toString(Post::get('ct_checkjs'))),
+        'js_on'           => apbct_js_test(Sanitize::cleanTextField(Cookie::getString('ct_checkjs')), true)
+            ? 1
+            : apbct_js_test(Post::getString('ct_checkjs')),
 
         'agent'       => APBCT_AGENT,
         'sender_info' => $sender_info,
@@ -1857,7 +1859,6 @@ function apbct__bot_detector_get_fired_exclusions()
  */
 function apbct__bot_detector_get_fd_log()
 {
-    global $apbct;
     $result = array(
         'plugin_status' => 'OK',
         'error_msg' => '',
@@ -1872,7 +1873,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
@@ -1929,3 +1930,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

@@ -226,7 +226,7 @@
         'ajax'    => true
     ),
     'PiotnetAddonsForElementorPro' => array(
-        'hook'    => array('pafe_ajax_form_builder'),
+        'hook'    => 'pafe_ajax_form_builder',
         'setting' => 'forms__contact_forms_test',
         'ajax'    => true
     ),

inc/cleantalk-pluggable.php

@@ -723,6 +723,7 @@ function apbct_is_skip_request($ajax = false, $ajax_message_obj = array())
             'fl_builder_subscribe_form_submit', // FLBuilderForms has direct integration
             'tutor_pro_social_authentication', // Tutor Pro social authentication, we trust a third-party service
             'drplus_login', // Doctor Plus theme login
+            'fluent_cal_schedule_meeting', // Fluent Booking has direct integration
         );
 
         // Skip test if
@@ -1429,7 +1430,11 @@ function apbct_is_skip_request($ajax = false, $ajax_message_obj = array())
                 apbct_is_plugin_active('piotnet-addons-for-elementor-pro/piotnet-addons-for-elementor-pro.php') ||
                 apbct_is_plugin_active('piotnet-addons-for-elementor/piotnet-addons-for-elementor.php')
             ) &&
-            Post::get('action') === 'pafe_ajax_form_builder_preview_submission' ) {
+            (
+                Post::get('action') === 'pafe_ajax_form_builder_preview_submission' ||
+                Post::get('action') === 'pafe_ajax_form_builder'
+            )
+        ) {
             return 'PAFE';
         }
 

inc/cleantalk-public-integrations.php

@@ -1879,19 +1879,16 @@ function ct_quform_post_validate($result, $form)
      * Filter for POST
      */
     $input_array = apply_filters('apbct__filter_post', $form->getValues());
-
     $ct_temp_msg_data = ct_get_fields_any($input_array);
     $sender_email = isset($ct_temp_msg_data['email']) ? $ct_temp_msg_data['email'] : '';
     $sender_emails_array = isset($ct_temp_msg_data['emails_array']) ? $ct_temp_msg_data['emails_array'] : '';
 
-    $checkjs          = apbct_js_test(Sanitize::cleanTextField(Cookie::get('ct_checkjs')), true);
     $base_call_result = apbct_base_call(
         array(
             'message'      => $form->getValues(),
             'sender_email' => $sender_email,
             'post_info'    => array('comment_type' => $comment_type),
             'sender_info'     => array('sender_emails_array' => $sender_emails_array),
-            'js_on'        => $checkjs,
         )
     );
 

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'
         )
     ) {
@@ -570,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) . '">';
@@ -1275,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',

inc/cleantalk-settings.php

@@ -564,14 +564,17 @@ function apbct_settings__set_fields()
                     'callback' => 'apbct_settings__check_alt_cookies_types'
                 ),
                 //bot detector
-                'data__bot_detector_enabled' => array(
-                    'title' => __('Use ', 'cleantalk-spam-protect')
-                               . $apbct->data['wl_brandname']
-                               . __(' JavaScript library', 'cleantalk-spam-protect'),
-                    'description' => __('This option includes external ', 'cleantalk-spam-protect')
-                               . $apbct->data['wl_brandname']
-                               . __(' JavaScript library to getting visitors info data', 'cleantalk-spam-protect'),
-                    'childrens' => array('exclusions__bot_detector')
+                'bot_detector_state' => array(
+                    'callback' => function () {
+                        printf(
+                            esc_html__('JavaScript library (Bot Detector) is %s', 'cleantalk-spam-protect'),
+                            apbct__is_bot_detector_enabled()
+                                ? esc_html__('enabled', 'cleantalk-spam-protect')
+                                : esc_html__('disabled', 'cleantalk-spam-protect')
+                        );
+                    },
+                    'long_description' => true,
+                    'display'    => apbct__is_bot_detector_enabled(),
                 ),
                 'exclusions__bot_detector' => array(
                     'title' => __('JavaScript Library Exclusions', 'cleantalk-spam-protect'),
@@ -584,28 +587,31 @@ function apbct_settings__set_fields()
                         'Regular expression. Use to skip a HTML form from special service field attach.',
                         'cleantalk-spam-protect'
                     ),
-                    'parent' => 'data__bot_detector_enabled',
+                    'display'    => apbct__is_bot_detector_enabled(),
                 ),
                 'exclusions__bot_detector__form_attributes'             => array(
                     'type'        => 'text',
                     'title'       => __('Exclude any forms that has attribute matches.', 'cleantalk-spam-protect'),
                     'parent' => 'exclusions__bot_detector',
                     'class' => 'apbct_settings-field_wrapper--sub',
                     'long_description' => true,
+                    'display'    => apbct__is_bot_detector_enabled(),
                 ),
                 'exclusions__bot_detector__form_children_attributes'             => array(
                     'type'        => 'text',
                     'title'       => __('Exclude any forms that includes a child element with attribute matches.', 'cleantalk-spam-protect'),
                     'parent' => 'exclusions__bot_detector',
                     'class' => 'apbct_settings-field_wrapper--sub',
                     'long_description' => true,
+                    'display'    => apbct__is_bot_detector_enabled(),
                 ),
                 'exclusions__bot_detector__form_parent_attributes'             => array(
                     'type'        => 'text',
                     'title'       => __('Exclude any forms that includes a parent element with attribute matches.', 'cleantalk-spam-protect'),
                     'parent' => 'exclusions__bot_detector',
                     'class' => 'apbct_settings-field_wrapper--sub',
                     'long_description' => true,
+                    'display'    => apbct__is_bot_detector_enabled(),
                 ),
                 'wp__use_builtin_http_api'             => array(
                     'title'       => __("Use WordPress HTTP API", 'cleantalk-spam-protect'),
@@ -3150,6 +3156,14 @@ function apbct_settings__get__long_description()
             'title' => __('Contact data encoding', 'cleantalk-spam-protect'),
             'desc'  => ContactsEncoder::getEmailEncoderCommonLongDescription(),
         ),
+        'bot_detector_state' => array(
+            'title' => esc_html__('JavaScript library (Bot Detector)', 'cleantalk-spam-protect'),
+            'desc' => esc_html__("The Bot Detector is a JavaScript library that runs in the visitor's browser and collects behavioral signals to distinguish real users from bots.", 'cleantalk-spam-protect')
+                . '<br><br>' . esc_html__("This data is sent to the CleanTalk cloud along with each spam check request, significantly improving detection accuracy for spam on any website forms.", 'cleantalk-spam-protect')
+                . '<br><br>' . esc_html__("Disabling the Bot Detector will reduce anti-spam effectiveness.", 'cleantalk-spam-protect')
+                . '<br>' . esc_html__("It can only be disabled by adding the following constant to your wp-config.php: define('APBCT_SERVICE__BOT_DETECTOR_ENABLED', false);", 'cleantalk-spam-protect')
+                . '<br>' . esc_html__("We do not recommend disabling this functionality.", 'cleantalk-spam-protect')
+        ),
     );
 
     if (!empty($setting_id) && isset($descriptions[$setting_id])) {

inc/cleantalk-updater.php

@@ -1377,3 +1377,14 @@ function apbct_update_to_6_60_0()
         }
     }
 }
+
+function apbct_update_to_6_76_0()
+{
+    global $apbct;
+
+    if ( isset($apbct->settings['data__bot_detector_enabled']) ) {
+        $bot_detector_state = $apbct->settings['data__bot_detector_enabled'];
+        $apbct->data['bot_detector_enabled'] = $bot_detector_state;
+        $apbct->saveData();
+    }
+}