Merge dev

Author: AntonV1211

.github/workflows/releaseNotice.yml

@@ -17,6 +17,6 @@ jobs:
           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 }}
+            <br>${{github.event.release.html_url}}
+            <br>
+            <br><pre>${{ github.event.release.body }}</pre>

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.99-dev
+  Version: 6.56.99-dev
   Author: CleanTalk - Anti-Spam Protection <welcome@cleantalk.org>
   Author URI: https://cleantalk.org
   Text Domain: cleantalk-spam-protect
@@ -166,6 +166,24 @@
 $apbct->setConnectionReports();
 // SFW update sentinel
 $apbct->setSFWUpdateSentinel();
+// User IP Keeper - used for checkers
+$apbct->setLoginIPKeeper();
+
+add_action('wp_login', 'apbct_wp_login_actions', 10, 2);
+
+/**
+ * Actions for hook 'wp-login'.
+ * @param $user_login
+ * @param $wp_user
+ *
+ * @return void
+ */
+function apbct_wp_login_actions($_user_login, $wp_user)
+{
+    global $apbct;
+    $apbct->login_ip_keeper->addUserIP($wp_user);
+    apbct_add_admin_ip_to_swf_whitelist($wp_user);
+}
 
 // Disabling comments
 if ( $apbct->settings['comments__disable_comments__all'] || $apbct->settings['comments__disable_comments__posts'] || $apbct->settings['comments__disable_comments__pages'] || $apbct->settings['comments__disable_comments__media'] ) {
@@ -269,7 +287,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
@@ -577,14 +595,6 @@ function apbct_write_js_errors($data)
 add_filter('happyforms_validate_submission', 'apbct_form_happyforms_test_spam', 1, 3);
 add_filter('happyforms_use_hash_protection', '__return_false');
 
-// WPForms
-// Adding fields
-add_action('wpforms_frontend_output', 'apbct_form__WPForms__addField', 1000, 5);
-// Gathering data to validate
-add_filter('wpforms_process_before_filter', 'apbct_from__WPForms__gatherData', 100, 2);
-// Do spam check
-add_filter('wpforms_process_initial_errors', 'apbct_form__WPForms__showResponse', 100, 2);
-
 // Formidable
 add_filter('frm_entries_before_create', 'apbct_form__formidable__testSpam', 999999, 2);
 add_action('frm_entries_footer_scripts', 'apbct_form__formidable__footerScripts', 20, 2);
@@ -2742,6 +2752,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);

css/cleantalk-public.min.css

@@ -106,18 +106,32 @@ input[class*='apbct'].apbct_special_field{
     height: 48px;
     border-radius: 50%;
     position: relative;
+    left: calc(50% - 27px);
+    top: calc(50% - 27px);
     animation: apbctIframePreloaderRotate 1s linear infinite
 }
 
-.apbct-iframe-preloader::before {
+.apbct-iframe-preloader-spin {
     content: "";
     box-sizing: border-box;
     position: absolute;
     inset: 0px;
     border-radius: 50%;
-    border: 5px solid #FFF;
+    border: 6px solid #FFF;
     animation: apbctIframePreloaderPrixClipFix 2s linear infinite ;
 }
+
+.apbct-iframe-preloader-text {
+    color: white;
+    background: black;
+    display: block;
+    width: 100%;
+    text-align: center;
+    position: absolute;
+    top: 60%;
+}
+
+
 /*Fix The Real Person popup for theme Spacious By ThemeGrill */
 .comments-area .comment-list article .comment-author {
     overflow: visible !important;

css/src/cleantalk-public.css

@@ -76,9 +76,6 @@ function apbct_array($array)
 // It uses for BuddyPress registrations to avoid double checks
 $ct_negative_comment = null;
 
-
-add_action('wp_login', 'apbct_add_admin_ip_to_swf_whitelist', 10, 2);
-
 /**
  * Public action 'plugins_loaded' - Loads locale, see http://codex.wordpress.org/Function_Reference/load_plugin_textdomain
  */

inc/cleantalk-common.php

@@ -14,6 +14,10 @@
         'plugin_class' => '',
         'wp_includes' => true,
     ),
+    'WPForms' => array(
+        'plugin_path' => ['wpforms-lite/wpforms.php', 'wpforms/wpforms.php'],
+        'plugin_class' => 'WPForms',
+    ),
 );
 
 add_action('plugins_loaded', function () use ($apbct_integrations_by_class) {

inc/cleantalk-integrations-by-class.php

@@ -399,6 +399,11 @@
         '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',
@@ -409,6 +414,11 @@
         'setting' => 'forms__contact_forms_test',
         'ajax'    => true
     ),
+    'LoginSignupPopup'         => array(
+        'hook'    => 'xoo_el_form_action',
+        'setting' => 'forms__registrations_test',
+        'ajax'    => true
+    ),
 );
 
 add_action('plugins_loaded', function () use ($apbct_active_integrations) {

inc/cleantalk-integrations-by-hook.php

@@ -1325,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';
@@ -1538,6 +1539,14 @@ class_exists('Cleantalk\Antispam\Integrations\CleantalkInternalForms')
         ) {
             return 'ChatyContactForm';
         }
+
+        // skip Login/Signup Popup - has direct integration
+        if (
+            apbct_is_plugin_active('easy-login-woocommerce/xoo-el-main.php') &&
+            Request::getString('action') === 'xoo_el_form_action'
+        ) {
+            return 'Login/Signup Popup';
+        }
     } else {
         /*****************************************/
         /*  Here is non-ajax requests skipping   */