Merge pull request #802 from CleanTalk/beta

Beta

Author: AntonV1211

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.79.1
+  Version: 6.80
   Author: CleanTalk - Anti-Spam Protection <welcome@cleantalk.org>
   Author URI: https://cleantalk.org
   Text Domain: cleantalk-spam-protect
@@ -135,7 +135,9 @@
     define('APBCT_MODERATE_URL', 'https://moderate.cleantalk.org'); // Api URL
 }
 
-define('APBCT_BOT_DETECTOR_SCRIPT_URL', 'https://fd.cleantalk.org/ct-bot-detector-wrapper.js');
+if ( ! defined('APBCT_BOT_DETECTOR_SCRIPT_URL') ) {
+    define('APBCT_BOT_DETECTOR_SCRIPT_URL', 'https://fd.cleantalk.org/ct-bot-detector-wrapper.js');
+}
 
 /**
  * Require base classes.
@@ -2132,18 +2134,11 @@ function apbct_rc__install_plugin($_wp = null, $plugin = null)
                     } else {
                         die('FAIL ' . json_encode(array('error' => $installer->apbct_result)));
                     }
-                } elseif ( $result instanceof \WP_Error ) {
-                    die(
-                        'FAIL ' . json_encode(array(
-                            'error'   => 'FAIL_TO_GET_LATEST_VERSION',
-                            'details' => $result->get_error_message(),
-                        ))
-                    );
                 } else {
                     die(
                         'FAIL ' . json_encode(array(
                             'error'   => 'FAIL_TO_GET_LATEST_VERSION',
-                            'details' => 'Unknown error',
+                            'details' => $result->get_error_message(),
                         ))
                     );
                 }
@@ -2177,16 +2172,18 @@ function apbct_rc__activate_plugin($plugin)
             $result = activate_plugins($plugin);
 
             $result_array = array('success' => true);
-            $error_msg = '';
 
-            if ( ! $result || is_wp_error($result) ) {
-                if ( $result instanceof \WP_Error ) {
-                    $error_msg = ' ' . $result->get_error_message();
-                }
+            if ( is_wp_error($result) ) {
+                $error_msg = ' ' . $result->get_error_message();
                 $result_array = array(
                     'error'   => 'FAIL_TO_ACTIVATE',
                     'details' => $error_msg
                 );
+            } elseif ( ! $result ) {
+                $result_array = array(
+                    'error'   => 'FAIL_TO_ACTIVATE',
+                    'details' => ''
+                );
             }
             return $result_array;
         } else {

inc/cleantalk-ajax.php

@@ -906,23 +906,6 @@ function ct_ajax_hook($message_obj = null)
             die();
         }
 
-        // Plugin Name: User Registration; ajax register action user_registration_user_form_submit
-        if (
-            (
-                apbct_is_plugin_active('user-registration/user-registration.php')
-                ||
-                apbct_is_plugin_active('user-registration-pro/user-registration.php')
-            ) &&
-            Post::get('action') === 'user_registration_user_form_submit'
-        ) {
-            wp_send_json_error(
-                array(
-                    'message' => $ct_result->comment
-                )
-            );
-            die();
-        }
-
         // Plugin Name: eForm - WordPress Form Builder; ajax action ipt_fsqm_save_form
         if (
             apbct_is_plugin_active('wp-fsqm-pro/ipt_fsqm.php') &&

inc/cleantalk-public.php

@@ -851,11 +851,15 @@ function ct_die($_comment_id, $_comment_status)
             $ct_die_page = str_replace($place_holder, (is_null($replace) ? '' : $replace), $ct_die_page);
         }
 
-        http_response_code(200);
+        if ( ! headers_sent() ) {
+            http_response_code(200);
+        }
         die($ct_die_page);
     }
 
-    http_response_code(200);
+    if ( ! headers_sent() ) {
+        http_response_code(200);
+    }
     die("Forbidden. Sender blacklisted. Blocked by CleanTalk");
 }
 
@@ -901,7 +905,9 @@ function ct_die_extended($comment_body)
             $ct_die_page = str_replace($place_holder, $replace, $ct_die_page);
         }
 
-        http_response_code(200);
+        if ( ! headers_sent() ) {
+            http_response_code(200);
+        }
         $allowed_html = array(
             'html' => array(
                 'lang' => array(),
@@ -938,7 +944,9 @@ function ct_die_extended($comment_body)
         die($content);
     }
 
-    http_response_code(200);
+    if ( ! headers_sent() ) {
+        http_response_code(200);
+    }
     die("Forbidden. Sender blacklisted. Blocked by CleanTalk");
 }
 
@@ -1039,20 +1047,6 @@ function ct_set_approved($approved, $_comment)
     return 1;
 }
 
-/**
- * Public action 'comment_post' - Store cleantalk hash in comment meta
- *
- * @psalm-suppress UnusedParam
- * @return void
- */
-function ct_set_real_user_badge_automod_hash($comment_id)
-{
-    $hash1 = ct_hash();
-    if ( ! empty($hash1) ) {
-        update_comment_meta($comment_id, 'ct_real_user_badge_automod_hash', ct_hash());
-    }
-}
-
 /**
  * Public filter 'pre_comment_approved' - Mark comment unapproved always
  * @return    string

inc/cleantalk-settings.php

@@ -63,6 +63,7 @@ function apbct_settings_add_page()
         global $apbct;
 
         $filtered = ($value === '1' || $value === 1) ? '1' : '0';
+        //sync discussion and plugin settings
         if ($old_value !== $filtered) {
             $apbct->settings['cleantalk_allowed_moderation'] = $filtered;
             $apbct->saveSettings();
@@ -169,16 +170,6 @@ function apbct_settings__set_fields()
             'html_before'    => '<hr>',
             'html_after'     => '',
             'fields'         => array(
-                'comments__hide_website_field'             => array(
-                    'type'        => 'checkbox',
-                    'title'       => __('Hide the "Website" field', 'cleantalk-spam-protect'),
-                    'description' => __(
-                        'This option hides the "Website" field on the comment form.',
-                        'cleantalk-spam-protect'
-                    ),
-                    'long_description' => true,
-                    'display'     => ! $apbct->white_label,
-                ),
                 'comments__the_real_person' => array(
                     'type'        => 'checkbox',
                     'title' => __('The Real Person Badge!', 'cleantalk-spam-protect')
@@ -927,6 +918,12 @@ function apbct_settings__set_fields()
             'section'    => 'hidden_section',
             'html_after' => '</div><div id="apbct_hidden_section_nav">{HIDDEN_SECTION_NAV}<div class="apbct_hidden_section_nav_mob_btn"></div></div></div>',
             'fields'     => array(
+                'comments__hide_website_field'             => array(
+                    'type'        => 'checkbox',
+                    'title'       => __('Hide the "Website" field', 'cleantalk-spam-protect'),
+                    'long_description' => true,
+                    'display'     => ! $apbct->white_label,
+                ),
                 'misc__send_connection_reports' => array(
                     'type'        => 'checkbox',
                     'title'       => __('Send connection reports', 'cleantalk-spam-protect'),
@@ -2108,7 +2105,7 @@ function apbct_discussion_settings__field__moderation()
                 name="cleantalk_allowed_moderation" 
                 id="cleantalk_allowed_moderation" 
                 value="1" ' .
-                checked('1', $apbct->settings['cleantalk_allowed_moderation'], false) .
+                checked('1', TT::toString($apbct->settings['cleantalk_allowed_moderation'], '0'), false) .
                 '/> ';
     $output .= esc_html__('Skip manual approving for the very first comment if a comment has been allowed by CleanTalk Anti-Spam protection.', 'cleantalk-spam-protect');
     $output .= '</label>';
@@ -2582,6 +2579,11 @@ function apbct_settings__validate($incoming_settings)
         $incoming_settings['data__email_decoder_obfuscation_custom_text'] = ContactsEncoder::getDefaultReplacingText();
     }
 
+    //sync discussion and plugin settings
+    if (isset($incoming_settings['cleantalk_allowed_moderation'])) {
+        update_option('cleantalk_allowed_moderation', TT::toString($incoming_settings['cleantalk_allowed_moderation'], '0'));
+    }
+
     /**
      * Triggered before returning the settings
      */
@@ -3064,8 +3066,12 @@ function apbct_settings__get__long_description()
             'title' => 'Anti-Crawler', // Do not to localize this phrase
             //HANDLE LINK
             'desc'  => sprintf(
-                __(esc_html__($apbct->data['wl_brandname']) . ' Anti-Crawler — this option is meant to block all types of bots visiting website pages that can search vulnerabilities on a website, attempt to hack a site, collect personal data, price parsing or content and images, generate 404 error pages, or aggressive website scanning bots. %s', 'cleantalk-spam-protect'),
-                '<a href="https://cleantalk.org/help/anti-flood-and-anti-crawler{utm_mark}#anticrawl" target="_blank">' . __('Learn more.', 'cleantalk-spam-protect') . '</a>'
+                '<p>' . sprintf(
+                    __('%1$s Anti-Crawler — this option is meant to block all types of bots visiting website pages that can search vulnerabilities on a website, attempt to hack a site, collect personal data, price parsing or content and images, generate 404 error pages, or aggressive website scanning bots. %2$s', 'cleantalk-spam-protect'),
+                    esc_html($apbct->data['wl_brandname']),
+                    '<a href="https://cleantalk.org/help/anti-flood-and-anti-crawler{utm_mark}#anticrawl" target="_blank">' . __('Learn more.', 'cleantalk-spam-protect') . '</a>'
+                ) . '</p>' .
+                '<p>' . __('By default, well-known good bots are allowed, including AI crawlers like GPTBot (ChatGPT), ClaudeBot (Claude), Google-Extended (Gemini), and Copilot. You can selectively block any of these bots in your private lists.', 'cleantalk-spam-protect') . '</p>'
             )
         ),
         'sfw__anti_flood' => array(