Merge pull request #613 from CleanTalk/release_6.56

Release 6.56

Author: AntonV1211

.github/workflows/eslint.yml

@@ -35,15 +35,14 @@ jobs: # list of things to do
       - name: Code Linting
         run: npm run eslint
 
-      - name: Telegram notify
+      - name: Matrix notify
         if: failure()
-        uses: appleboy/telegram-action@master
+        uses: Glomberg/matrix-messenger-action@master
         with:
-          to: ${{ secrets.TELEGRAM_PLUGINS_TO }}
-          token: ${{ secrets.TELEGRAM_REVIEWER_TOKEN }}
+          server: ${{ secrets.MATRIX_SERVER }}
+          to: ${{ secrets.MATRIX_EXTERNSION_ROOM }}
+          token: ${{ secrets.MATRIX_USER_TOKEN }}
           message: |
             Hi, <strong>${{ github.actor }}</strong>! Your commit for <strong>${{ github.repository }}</strong> 
             contains 💯 the best solution but it have to be fixed!
             <a href="${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}">Auto-Tests <strong>ESLint</strong></a> build failed ⛔!
-          format: html
-          disable_web_page_preview: true

.github/workflows/releaseNotice.yml

@@ -1,4 +1,4 @@
-name: Notice about releases via Telegram
+name: Notice about releases via Matrix
 
 on:
   release:
@@ -9,15 +9,14 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - name: send telegram message on release
-        uses: appleboy/telegram-action@master
+      - name: Send Matrix message on release
+        uses: Glomberg/matrix-messenger-action@master
         with:
-          to: ${{ secrets.TELEGRAM_TO }}
-          token: ${{ secrets.TELEGRAM_TOKEN }}
+          server: ${{ secrets.MATRIX_SERVER }}
+          to: ${{ secrets.MATRIX_NEWS_ROOM }}
+          token: ${{ secrets.MATRIX_USER_TOKEN }}
           message: |
             ${{ github.event.repository.description }} <strong>v${{github.event.release.name}}</strong> released
-            ${{github.event.release.html_url}}
-            
-            ${{ github.event.release.body }}
-          format: html
-          disable_web_page_preview: true
+            <br>${{github.event.release.html_url}}
+            <br>
+            <br><pre>${{ github.event.release.body }}</pre>

.github/workflows/reviewNotice.yml

@@ -1,4 +1,4 @@
-name: Notice about review approved via Telegram
+name: Notice about review approved via Matrix
 
 on:
   pull_request_review:
@@ -13,15 +13,14 @@ jobs:
       - name: Convert date format
         id: date
         run: echo "::set-output name=date::$(date -d "${{ github.event.pull_request.created_at }}" +"%Y-%m-%d")"
-      - name: Send telegram message on review approved
-        uses: appleboy/telegram-action@master
+      - name: Send Matrix message on review approved
+        uses: Glomberg/matrix-messenger-action@master
         with:
-          to: ${{ secrets.TELEGRAM_PLUGINS_TO }}
-          token: ${{ secrets.TELEGRAM_REVIEWER_TOKEN }}
+          server: ${{ secrets.MATRIX_SERVER }}
+          to: ${{ secrets.MATRIX_EXTERNSION_ROOM }}
+          token: ${{ secrets.MATRIX_USER_TOKEN }}
           message: |
             💥🎉🎉🎉💥 Pull-request <a href="${{ github.event.pull_request.html_url }}"><strong>${{ github.event.pull_request.title }}</strong></a> 
             submitted by <strong>${{ github.event.pull_request.user.login }}</strong> at <strong>${{ steps.date.outputs.date }}</strong>
 
             was <strong>approved</strong> and is ready to merge <a href="${{ github.event.pull_request.html_url }}">➡️</a> !!!
-          format: html
-          disable_web_page_preview: true

.github/workflows/tests.yml

@@ -52,15 +52,14 @@ jobs:
           CLEANTALK_TEST_API_KEY: ${{ secrets.CLEANTALK_TEST_API_KEY }}
         run: composer test
 
-      - name: Telegram notify
+      - name: Matrix notify
         if: failure()
-        uses: appleboy/telegram-action@master
+        uses: Glomberg/matrix-messenger-action@master
         with:
-          to: ${{ secrets.TELEGRAM_PLUGINS_TO }}
-          token: ${{ secrets.TELEGRAM_REVIEWER_TOKEN }}
+          server: ${{ secrets.MATRIX_SERVER }}
+          to: ${{ secrets.MATRIX_EXTERNSION_ROOM }}
+          token: ${{ secrets.MATRIX_USER_TOKEN }}
           message: |
             Hi, <strong>${{ github.actor }}</strong>! Your commit for <strong>${{ github.repository }}</strong> 
             contains 💯 the best solution but it have to be fixed!
             <a href="${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}">Auto-Tests (PHPUnit, PHPCS, Psalm)</a> build failed ⛔!
-          format: html
-          disable_web_page_preview: true

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.55
+  Version: 6.56
   Author: CleanTalk - Anti-Spam Protection <welcome@cleantalk.org>
   Author URI: https://cleantalk.org
   Text Domain: cleantalk-spam-protect
@@ -269,7 +269,7 @@ function apbct_register_my_rest_routes()
     global $apbct;
 
     // Self cron
-    $ct_cron = new Cron();
+    $ct_cron = Cron::getInstance();
     $tasks_to_run = $ct_cron->checkTasks(); // Check for current tasks. Drop tasks inner counters.
     if (
         $tasks_to_run && // There are tasks to run
@@ -600,10 +600,6 @@ function apbct_write_js_errors($data)
 
 // Public actions
 if ( ! is_admin() && ! apbct_is_ajax() && ! apbct_is_customize_preview() ) {
-    // Default search
-    add_filter('get_search_query', 'apbct_forms__search__testSpam');
-    add_action('wp_head', 'apbct_search_add_noindex', 1);
-
     if (apbct_is_plugin_active('fluentformpro/fluentformpro.php') && apbct_is_in_uri('ff_landing=')) {
         add_action('wp_head', function () {
             echo '<script data-pagespeed-no-defer="" src="'
@@ -2746,6 +2742,22 @@ function ct_account_status_check($api_key = null, $process_errors = true)
         $apbct->data['notice_trial']        = TT::getArrayValueAsInt($result, 'trial', 0);
         $apbct->data['notice_review']       = TT::getArrayValueAsInt($result, 'show_review', 0);
 
+        if ($apbct->data['notice_show']) {
+            $notice_banners = API::getNoticeBanners($api_key);
+
+            if (isset($notice_banners['operation_status'], $notice_banners['banners']) && $notice_banners['operation_status'] === 'SUCCESS') {
+                if (isset($notice_banners['banners']['TRIAL']['level'])) {
+                    $apbct->data['notice_trial_level'] = strtolower($notice_banners['banners']['TRIAL']['level']);
+                }
+                if (isset($notice_banners['banners']['RENEW']['level'])) {
+                    $apbct->data['notice_renew_level'] = strtolower($notice_banners['banners']['RENEW']['level']);
+                }
+                if (isset($notice_banners['banners']['REVIEW']['level'])) {
+                    $apbct->data['notice_review_level'] = strtolower($notice_banners['banners']['REVIEW']['level']);
+                }
+            }
+        }
+
         // Other
         $apbct->data['service_id']          = TT::getArrayValueAsInt($result, 'service_id', 0);
         $apbct->data['user_id']             = TT::getArrayValueAsInt($result, 'user_id', 0);

inc/cleantalk-integrations-by-class.php

@@ -9,6 +9,11 @@
         'plugin_path' => 'woocommerce/woocommerce.php',
         'plugin_class' => 'WooCommerce',
     ),
+    'WPSearchForm' => array(
+        'plugin_path' => '',
+        'plugin_class' => '',
+        'wp_includes' => true,
+    ),
 );
 
 add_action('plugins_loaded', function () use ($apbct_integrations_by_class) {

inc/cleantalk-integrations-by-hook.php

@@ -399,6 +399,21 @@
         'setting' => 'forms__contact_forms_test',
         'ajax'    => true
     ),
+    'WPZOOMForms' => array(
+        'hook'    => 'admin_post_nopriv_wpzf_submit',
+        'setting' => 'forms__contact_forms_test',
+        'ajax'    => false
+    ),
+    'Newsletter' => array(
+        'hook'    => 'newsletter_action',
+        'setting' => 'forms__contact_forms_test',
+        'ajax'    => false
+    ),
+    'ChatyContactForm'         => array(
+        'hook'    => 'chaty_front_form_save_data',
+        'setting' => 'forms__contact_forms_test',
+        'ajax'    => true
+    ),
 );
 
 add_action('plugins_loaded', function () use ($apbct_active_integrations) {

inc/cleantalk-pluggable.php

@@ -695,6 +695,7 @@ function apbct_is_skip_request($ajax = false, $ajax_message_obj = array())
             'wcf_woocommerce_login', //WooCommerce CartFlows login
             'nasa_process_login', //Nasa login
             'leaky_paywall_validate_registration', //Leaky Paywall validation request
+            'cleantalk_force_ajax_check', //Force ajax check has direct integration
         );
 
         // Skip test if
@@ -1324,6 +1325,7 @@ function apbct_is_skip_request($ajax = false, $ajax_message_obj = array())
             ) &&
             Post::get('action') === 'edd_add_to_cart' ||
             Post::get('action') === 'edd_get_shipping_rate' ||
+            Post::get('action') === 'edd_check_email' ||
             Post::get('action') === 'edd_recalculate_discounts_pro'
         ) {
             return 'Easy Digital Downloads service action';
@@ -1521,6 +1523,22 @@ class_exists('Cleantalk\Antispam\Integrations\CleantalkInternalForms')
         ) {
             return 'fusion_form/avada_theme skip';
         }
+
+        // skip Newsletter - has direct integration
+        if (
+            apbct_is_plugin_active('newsletter/plugin.php') &&
+            Request::getString('action') === 'tnp'
+        ) {
+            return 'Newsletter';
+        }
+
+        // skip ChatyContactForm - has direct integration
+        if (
+            apbct_is_plugin_active('chaty/cht-icons.php') &&
+            Request::getString('action') === 'chaty_front_form_save_data'
+        ) {
+            return 'ChatyContactForm';
+        }
     } else {
         /*****************************************/
         /*  Here is non-ajax requests skipping   */

inc/cleantalk-public-integrations.php

@@ -206,70 +206,6 @@ function ct_woocommerce_wishlist_check($args)
     return $args;
 }
 
-
-/**
- * Test default search string for spam
- *
- * @param $search string
- *
- * @return string
- */
-function apbct_forms__search__testSpam($search)
-{
-    global $apbct, $cleantalk_executed;
-
-    if (
-        empty($search) ||
-        $cleantalk_executed ||
-        $apbct->settings['forms__search_test'] == 0 ||
-        ($apbct->settings['data__protect_logged_in'] != 1 && is_user_logged_in()) // Skip processing for logged in users.
-    ) {
-        do_action('apbct_skipped_request', __FILE__ . ' -> ' . __FUNCTION__ . '():' . __LINE__, $_POST);
-
-        return $search;
-    }
-
-    $user = apbct_is_user_logged_in() ? wp_get_current_user() : null;
-
-    $base_call_result = apbct_base_call(
-        array(
-            'message'         => $search,
-            'sender_email'    => $user !== null ? $user->user_email : null,
-            'sender_nickname' => $user !== null ? $user->user_login : null,
-            'post_info'       => array('comment_type' => 'site_search_wordpress'),
-            'exception_action' => 0,
-        )
-    );
-
-    if ( isset($base_call_result['ct_result']) ) {
-        $ct_result = $base_call_result['ct_result'];
-
-        $cleantalk_executed = true;
-
-        if ( $ct_result->allow == 0 ) {
-            die($ct_result->comment);
-        }
-    }
-
-    return $search;
-}
-
-function apbct_search_add_noindex()
-{
-    global $apbct;
-
-    if (
-        ! is_search() || // If it is search results
-        $apbct->settings['forms__search_test'] == 0 ||
-        ($apbct->settings['data__protect_logged_in'] != 1 && is_user_logged_in()) // Skip processing for logged in users.
-    ) {
-        return;
-    }
-
-    echo '<!-- meta by CleanTalk Anti-Spam Protection plugin -->' . "\n";
-    echo '<meta name="robots" content="noindex,nofollow" />' . "\n";
-}
-
 /**
  * Public function - Tests for Pirate contact forms
  * return NULL
@@ -2729,6 +2665,7 @@ function apbct_form__gravityForms__addField($form_string, $form)
  * Gravity forms anti-spam test.
  * @return boolean
  * @psalm-suppress UnusedVariable
+ * @psalm-suppress ArgumentTypeCoercion
  */
 function apbct_form__gravityForms__testSpam($is_spam, $form, $entry)
 {
@@ -2861,7 +2798,12 @@ function apbct_form__gravityForms__testSpam($is_spam, $form, $entry)
             $is_spam           = true;
             $ct_gform_is_spam  = true;
             $ct_gform_response = $ct_result->comment;
-            add_action('gform_entry_created', 'apbct_form__gravityForms__add_entry_note');
+            if ( isset($apbct->settings['forms__gravityforms_save_spam']) && $apbct->settings['forms__gravityforms_save_spam'] == 1 ) {
+                add_action('gform_entry_created', 'apbct_form__gravityForms__add_entry_note');
+            } elseif ( class_exists('GFFormsModel') && method_exists('GFFormsModel', 'delete_lead') ) {
+                /** @psalm-suppress UndefinedClass */
+                GFFormsModel::delete_lead($entry['id']);
+            }
         }
     }
 
@@ -3440,53 +3382,6 @@ function apbct_form_happyforms_test_spam($is_valid, $request, $_form)
     return $is_valid;
 }
 
-/**
- * Prepare data to add honeypot to the WordPress default search form.
- * Fires ct_add_honeypot_field() on hook get_search_form when:
- * - method of the form is post
- * - spam test of search form is enabled
- *
- * @param string $form_html
- * @return string
- */
-function apbct_form_search__add_fields($form_html)
-{
-    global $apbct;
-
-    if ( !empty($form_html) && is_string($form_html) && $apbct->settings['forms__search_test'] == 1 ) {
-        // extract method of the form with DOMDocument
-        if ( class_exists('DOMDocument') ) {
-            libxml_use_internal_errors(true);
-            $dom = new DOMDocument();
-            if ( @$dom->loadHTML($form_html) ) {
-                $search_form_dom = $dom->getElementById('searchform');
-                if ( !empty($search_form_dom) ) {
-                    $method = empty($search_form_dom->getAttribute('method'))
-                        //default method is get for any form if no method specified
-                        ? 'get'
-                        : $search_form_dom->getAttribute('method');
-                }
-            }
-            libxml_clear_errors();
-            unset($dom);
-        }
-
-        // retry extract method of the form with regex
-        if ( empty($method) ) {
-            preg_match('/form.*method="(.*?)"/', $form_html, $matches);
-            $method = empty($matches[1])
-                ? 'get'
-                : trim($matches[1]);
-        }
-
-        $form_method = strtolower($method);
-
-        return str_replace('</form>', Honeypot::generateHoneypotField('search_form', $form_method) . '</form>', $form_html);
-    }
-
-    return $form_html;
-}
-
 /**
  * Advanced Classifieds & Directory Pro
  *

inc/cleantalk-public-validate.php

@@ -398,6 +398,21 @@ function_exists('hivepress') &&
                             ),
                         )
                     );
+                } else if (
+                    // BuddyBoss App - request from mobile app usually
+                    apbct_is_plugin_active('buddyboss-app/buddyboss-app.php') &&
+                    Server::getString('REQUEST_URI') === '/wp-json/buddyboss-app/v1/signup'
+                ) {
+                    $data = [
+                        'code' => 'bp_rest_register_errors',
+                        'message' => [
+                            'signup_email' => $ct_result->comment
+                        ],
+                        'data' => [
+                            'status' => 403,
+                        ],
+                    ];
+                    wp_send_json($data);
                 } else {
                     ct_die(null, null);
                 }