Merge pull request #830 from CleanTalk/beta

Beta to 6.83

Author: svfcode

.eslintrc.js

@@ -11,7 +11,43 @@ module.exports = {
         'js/src/cleantalk-users-checkspam.js',
         'js/src/cleantalk-users-editscreen.js',
     ],
-    overrides: [],
+    overrides: [
+        {
+            files: ['js/src/react/**/*.js'],
+            extends: [
+                'plugin:react/recommended',
+                'plugin:react/jsx-runtime',
+            ],
+            parserOptions: {
+                ecmaVersion: 'latest',
+                sourceType: 'module',
+                ecmaFeatures: {
+                    jsx: true,
+                },
+            },
+            plugins: ['react'],
+            settings: {
+                react: {
+                    version: 'detect',
+                },
+            },
+            rules: {
+                'react/prop-types': 'off',
+                'react/react-in-jsx-scope': 'off',
+                'react/jsx-uses-react': 'off',
+                'require-jsdoc': 'off',
+                'valid-jsdoc': 'off',
+                'linebreak-style': 'off',
+                'no-invalid-this': 'off',
+                'max-len': 'off',
+                'no-unused-vars': ['error', {varsIgnorePattern: 'React', args: 'none'}],
+            },
+            globals: {
+                wp: 'readonly',
+                cleantalkModal: 'readonly',
+            },
+        },
+    ],
     parserOptions: {
         ecmaVersion: 'latest',
     },

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.82
+  Version: 6.83
   Author: CleanTalk - Anti-Spam Protection <welcome@cleantalk.org>
   Author URI: https://cleantalk.org
   Text Domain: cleantalk-spam-protect
@@ -720,6 +720,7 @@ function apbct_wpms__delete_blog(WP_Site $old_site)
     require_once(CLEANTALK_PLUGIN_DIR . 'inc/cleantalk-find-spam.php');
     require_once(CLEANTALK_PLUGIN_DIR . 'inc/cleantalk-admin.php');
     require_once(CLEANTALK_PLUGIN_DIR . 'inc/cleantalk-settings.php');
+    require_once(CLEANTALK_PLUGIN_DIR . 'inc/apbct-sync-react.php');
 
     add_action('admin_init', 'apbct_admin__init', 1);
 
@@ -887,12 +888,15 @@ function apbct_sfw__check()
     global $apbct, $spbc, $cleantalk_url_exclusions;
 
     // Turn off the SpamFireWall if current url in the exceptions list and WordPress core pages
+    $core_page_to_skip_check = array('/feed');
     if ( ! empty($cleantalk_url_exclusions) && is_array($cleantalk_url_exclusions) ) {
-        $core_page_to_skip_check = array('/feed');
-        foreach ( array_merge($cleantalk_url_exclusions, $core_page_to_skip_check) as $v ) {
-            if ( apbct_is_in_uri($v) ) {
-                return;
-            }
+        $cleantalk_url_exclusions = array_merge($cleantalk_url_exclusions, $core_page_to_skip_check);
+    } else {
+        $cleantalk_url_exclusions = $core_page_to_skip_check;
+    }
+    foreach ( $cleantalk_url_exclusions as $v ) {
+        if ( apbct_is_in_uri($v) ) {
+            return;
         }
     }
 
@@ -1011,14 +1015,30 @@ function apbct_plugin_redirect()
 {
     global $apbct;
     wp_suspend_cache_addition(true);
+    $redirect = get_option('ct_plugin_do_activation_redirect', false);
     if (
-        get_option('ct_plugin_do_activation_redirect', false) &&
+        $redirect &&
         delete_option('ct_plugin_do_activation_redirect') &&
         ! Get::get('activate-multi')
     ) {
         ct_account_status_check(null, false);
         apbct_sfw_update__init(3); // Updating SFW
-        wp_redirect($apbct->settings_link);
+
+        if ( is_string($redirect) && $redirect !== '1' ) {
+            $redirect_url = $redirect;
+        } else {
+            $redirect_url = $apbct->settings_link;
+            if (
+                function_exists('apbct_settings__needs_signup_wizard') &&
+                apbct_settings__needs_signup_wizard() &&
+                empty($apbct->api_key)
+            ) {
+                $redirect_url = apbct_settings__get_signup_wizard_url();
+            }
+        }
+
+        wp_safe_redirect($redirect_url);
+        exit;
     }
     wp_suspend_cache_addition(false);
 }

composer.json

@@ -18,7 +18,8 @@
         "wp-cli/wp-cli-bundle": "*",
         "mockery/mockery": "*",
         "cleantalk/apbct-installer": "*",
-        "cleantalk/contacts-encoder": "*"
+        "cleantalk/contacts-encoder": "2.0.18",
+        "cleantalk/rate-limiter": "*"
     },
     "scripts": {
         "test": [

css/cleantalk-admin.min.css

@@ -140,7 +140,7 @@
 }
 
 .apbct-table-actions-wrapper {
-	background: #FСFСFС;
+	background: #FCFCFC;
 	border-radius: 2px;
 	padding: 5px !important;
 	border: 1px solid lightgray;
@@ -156,3 +156,92 @@
 		max-width: 50%;
 	}
 }
+
+/* Review banner styles */
+.apbct-notice.apbct-banner-success {
+	padding: 16px 32px !important;
+	background-color: #ffffff !important;
+	box-shadow: 0px 4px 15px #84848440 !important;
+	border-left-color: #00BB5D !important;
+}
+
+.apbct-banner-content {
+	display: flex;
+	flex-wrap: wrap;
+	justify-content: space-between;
+	row-gap: 16px;
+}
+
+.apbct-banner-content-wrapper {
+	display: flex;
+	flex-wrap: wrap;
+	gap: 16px;
+	justify-content: space-between;
+}
+
+.apbct-banner-text-wrapper {
+	margin-top: 16px;
+	margin-left: 32px;
+}
+
+.apbct-banner-button {
+	display: block;
+	padding: 16px 50px;
+	color: #FFFFFF !important;
+	border-radius: 8px;
+	font-size: 16px;
+	font-weight: 500;
+	text-decoration: none !important;
+	text-align: center;
+	align-content: center;
+}
+
+.apbct-banner-button-green {
+	background-color: #00BB5D !important;
+}
+
+.apbct-banner-button-green:hover {
+	background-color: #00a34f !important;
+}
+
+.apbct-banner-button-wrapper {
+	display: grid;
+	gap: 12px;
+	align-content: center;
+	text-align: center;
+	margin-right: 24px;
+	margin-left: 32px;
+}
+
+.apbct-banner-title {
+	font-size: 24px;
+	line-height: 29px;
+	font-weight: 500;
+	color: #000000;
+}
+
+.apbct-banner-subtitle {
+	font-size: 14px;
+	line-height: 22px;
+	font-weight: 400;
+	color: #444444;
+	margin-top: 8px;
+}
+
+.apbct-banner-big-subtitle {
+	font-size: 16px;
+}
+
+.apbct-banner-link {
+	font-size: 16px;
+	line-height: 24px;
+	font-weight: 400;
+	color: #026E88 !important;
+}
+
+.apbct-banner-dismiss-link {
+	font-weight: 400;
+	font-size: 14px;
+	line-height: 22px;
+	color: #646464 !important;
+}

css/src/cleantalk-admin.css

@@ -2494,3 +2494,144 @@ msgstr ""
 #. Author of the plugin
 msgid "СleanTalk - Anti-Spam Protection <welcome@cleantalk.org>"
 msgstr ""
+
+#: inc/cleantalk-settings.php
+msgid "Get access key manually"
+msgstr ""
+
+#: js/src/react/hooks/useSync.js
+msgid "Checking access key..."
+msgstr ""
+
+#: js/src/react/hooks/useSync.js
+msgid "Updating SpamFireWall..."
+msgstr ""
+
+#: js/src/react/hooks/useSync.js
+msgid "Sending feedback..."
+msgstr ""
+
+#: js/src/react/hooks/useSync.js
+msgid "Updating dashboard data..."
+msgstr ""
+
+#: js/src/react/hooks/useSync.js
+msgid "Adjusting environment..."
+msgstr ""
+
+#: js/src/react/hooks/useSync.js
+msgid "Finishing setup..."
+msgstr ""
+
+#: js/src/react/components/SignupWizard/Screens/SignupInterface.js
+msgid "Connect to Account"
+msgstr ""
+
+#: js/src/react/components/SignupWizard/Screens/SignupInterface.js
+msgid "Please, wait..."
+msgstr ""
+
+#: js/src/react/components/SignupWizard/Screens/SignupInterface.js
+msgid "Request failed. Please try again."
+msgstr ""
+
+#: js/src/react/components/SignupWizard/Screens/SignupInterface.js
+msgid "Protect your website in under 60 seconds"
+msgstr ""
+
+#: js/src/react/components/SignupWizard/Screens/SignupInterface.js
+msgid "Top-rated spam and bot protection for WordPress"
+msgstr ""
+
+#: js/src/react/components/SignupWizard/Screens/SignupInterface.js
+msgid "Protects comments, registrations, and contact forms automatically"
+msgstr ""
+
+#: js/src/react/components/SignupWizard/Screens/SignupInterface.js
+msgid "No CAPTCHAs, no puzzles, and no visitor friction"
+msgstr ""
+
+#: js/src/react/components/SignupWizard/Screens/SignupInterface.js
+msgid "What happens next?"
+msgstr ""
+
+#: js/src/react/components/SignupWizard/Screens/SignupInterface.js
+msgid "Once connected, the plugin synchronizes with the CleanTalk cloud, updates the spam database, and enables protection for your forms."
+msgstr ""
+
+#: js/src/react/components/SignupWizard/Screens/SignupInterface.js
+msgid "Connect your website to CleanTalk cloud"
+msgstr ""
+
+#: js/src/react/components/SignupWizard/Screens/SignupInterface.js
+msgid "Email address"
+msgstr ""
+
+#: js/src/react/components/SignupWizard/Screens/SignupInterface.js
+msgid "I agree to the Privacy Policy and"
+msgstr ""
+
+#: js/src/react/components/SignupWizard/Screens/SignupInterface.js
+msgid "License Agreement"
+msgstr ""
+
+#: js/src/react/components/SignupWizard/Screens/SignupInterface.js
+msgid "I already have an Access Key"
+msgstr ""
+
+#: js/src/react/components/SignupWizard/Screens/SignupInterface.js
+msgid "Skip setup wizard"
+msgstr ""
+
+#: js/src/react/components/SignupWizard/Screens/AccessKeyInterface.js
+msgid "Connect to CleanTalk"
+msgstr ""
+
+#: js/src/react/components/SignupWizard/Screens/AccessKeyInterface.js
+msgid "Go to previous step"
+msgstr ""
+
+#: js/src/react/components/SignupWizard/Screens/AccessKeyInterface.js
+msgid "Connect your site to CleanTalk cloud"
+msgstr ""
+
+#: js/src/react/components/SignupWizard/Screens/AccessKeyInterface.js
+msgid "Copy the access key you have received via email or you can get it from "
+msgstr ""
+
+#: js/src/react/components/SignupWizard/Screens/AccessKeyInterface.js
+msgid "Cloud Dashboard"
+msgstr ""
+
+#: js/src/react/components/SignupWizard/Screens/AccessKeyInterface.js
+msgid "If your account has multiple domains select the one you want to use."
+msgstr ""
+
+#: js/src/react/components/SignupWizard/Screens/AccessKeyInterface.js
+msgid "Access key"
+msgstr ""
+
+#: js/src/react/components/SignupWizard/Screens/ConnectingInterface.js
+msgid "Connecting your site to CleanTalk cloud"
+msgstr ""
+
+#: js/src/react/components/SignupWizard/Screens/SuccessInterface.js
+msgid "Everything is good!"
+msgstr ""
+
+#: js/src/react/components/SignupWizard/Screens/SuccessInterface.js
+#, javascript-format
+msgid "The plugin is ready to protect %s. After closing this window, your site will be fully protected against spam."
+msgstr ""
+
+#: js/src/react/components/SignupWizard/Screens/SuccessInterface.js
+msgid "Go to settings"
+msgstr ""
+
+#: js/src/react/components/SignupWizard/Screens/ErrorInterface.js
+msgid "Contact support"
+msgstr ""
+
+#: js/src/react/components/SignupWizard/Screens/ErrorInterface.js
+msgid "Try again"
+msgstr ""