Merge remote-tracking branch 'origin/dev' into GFA-Elementor-forms-visible-fields-#2

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

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

inc/cleantalk-admin.php

@@ -4,6 +4,7 @@
 use Cleantalk\Antispam\CleantalkRequest;
 use Cleantalk\ApbctWP\AdjustToEnvironmentModule\AdjustToEnvironmentHandler;
 use Cleantalk\ApbctWP\AJAXService;
+use Cleantalk\ApbctWP\Antispam\EmailEncoder;
 use Cleantalk\ApbctWP\CleantalkSettingsTemplates;
 use Cleantalk\ApbctWP\Escape;
 use Cleantalk\ApbctWP\Variables\Get;
@@ -538,7 +539,7 @@ function apbct_admin__enqueue_scripts($hook)
         APBCT_VERSION
     );
 
-    wp_localize_script('ct_admin_common', 'ctAdminCommon', array(
+    $data = array(
         '_ajax_nonce'        => $apbct->ajax_service->getAdminNonce(),
         '_ajax_url'          => admin_url('admin-ajax.php', 'relative'),
         'plugin_name'        => $apbct->plugin_name,
@@ -548,7 +549,9 @@ function apbct_admin__enqueue_scripts($hook)
         'notice_when_deleting_user_text' => esc_html__('Warning! Users are deleted without the possibility of restoring them, you can only restore them from a site backup.', 'cleantalk-spam-protect'),
         'apbctNoticeDismissSuccess'       => esc_html__('Thank you for the review! We strive to make our Anti-Spam plugin better every day.', 'cleantalk-spam-protect'),
         'apbctNoticeForceProtectionOn'       => esc_html__('This option affects the reflection of the page by checking the user and adds a cookie "apbct_force_protection_check", which serves as an indicator of successful or unsuccessful verification. If the check is successful, it will no longer run.', 'cleantalk-spam-protect'),
-    ));
+    );
+    $data = array_merge($data, EmailEncoder::getLocalizationText());
+    wp_localize_script('ct_admin_common', 'ctAdminCommon', $data);
 
     // DASHBOARD page JavaScript and CSS
     if ( $hook == 'index.php' && apbct_is_user_role_in(array('administrator')) ) {

inc/cleantalk-ajax.php

@@ -448,6 +448,25 @@ function ct_ajax_hook($message_obj = null)
         }
     }
 
+    // SiteReviews integration
+    if ( Post::getString('action', 'glsr_public_action') &&
+        apbct_is_plugin_active('site-reviews/site-reviews.php')
+    ) {
+        $post_info['comment_type'] = 'site_reviews_integration';
+        if (isset($_POST['site-reviews']['title'])) {
+            $ct_post_temp['title'] = $_POST['site-reviews']['title'];
+        }
+        if (isset($_POST['site-reviews']['name'])) {
+            $ct_post_temp['nickname'] = $_POST['site-reviews']['name'];
+        }
+        if (isset($_POST['site-reviews']['email'])) {
+            $ct_post_temp['email'] = $_POST['site-reviews']['email'];
+        }
+        if (isset($_POST['site-reviews']['content'])) {
+            $ct_post_temp['comment'] = $_POST['site-reviews']['content'];
+        }
+    }
+
     // Nasa registration
     if ( Post::get('action') === 'nasa_process_register' ) {
         $post_info['comment_type'] = 'nasa_process_register';
@@ -724,6 +743,19 @@ function ct_ajax_hook($message_obj = null)
             die();
         }
 
+        if ( Post::getString('action', 'glsr_public_action') ) {
+            $result = array(
+                'success' => false,
+                'data' => array(
+                    'errors' => array(),
+                    'message' => $ct_result->comment,
+                ),
+            );
+            @header('Content-Type: application/json; charset=' . get_option('blog_charset'));
+            print json_encode($result);
+            die();
+        }
+
         if ( Post::get('action') === 'mymail_form_submit' ) {
             $result = array('success' => false, 'html' => $ct_result->comment);
             @header('Content-Type: application/json; charset=' . get_option('blog_charset'));