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

# Conflicts:
#	cleantalk.php

Author: Glomberg

inc/cleantalk-integrations-by-hook.php

@@ -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

@@ -1460,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'] : '';
@@ -1472,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
         )
     );