Merge pull request #719 from CleanTalk/beta

Beta

Author: AntonV1211

.github/workflows/dev-fix-zip.yml

@@ -17,8 +17,8 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Install p7zip
-        run: sudo apt-get update && sudo apt-get install -y p7zip-full
+      - name: Install dependencies
+        run: sudo apt-get update && sudo apt-get install -y p7zip-full rsync
 
       - name: Set plugin name
         run: echo "PLUGIN_NAME=cleantalk-spam-protect" >> $GITHUB_ENV
@@ -55,8 +55,15 @@ jobs:
           .*
           EOF
 
-      - name: Create ZIP archive with 7z
-        run: 7z a -tzip "${PLUGIN_NAME}.zip" . -xr@.7zignore
+      - name: Prepare plugin directory
+        run: |
+          mkdir "${PLUGIN_NAME}"
+          rsync -a ./ "${PLUGIN_NAME}/" \
+            --exclude-from=.7zignore \
+            --exclude="${PLUGIN_NAME}"
+
+      - name: Create ZIP archive
+        run: 7z a -tzip "${PLUGIN_NAME}.zip" "${PLUGIN_NAME}"
 
       - name: Create / update GitHub Release and upload asset
         uses: softprops/action-gh-release@v2
@@ -74,7 +81,8 @@ jobs:
 
       - name: Clean up
         run: |
+          rm -rf "${PLUGIN_NAME}"
           rm -f "${PLUGIN_NAME}.zip"
           if [ "${{ steps.check_ignore.outputs.ignore_exists }}" = "false" ]; then
             rm -f .7zignore
-          fi
+          fi

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.70.1
+  Version: 6.71
   Author: CleanTalk - Anti-Spam Protection <welcome@cleantalk.org>
   Author URI: https://cleantalk.org
   Text Domain: cleantalk-spam-protect
@@ -29,6 +29,7 @@
 use Cleantalk\ApbctWP\Firewall\SFW;
 use Cleantalk\ApbctWP\Firewall\SFWUpdateHelper;
 use Cleantalk\ApbctWP\Helper;
+use Cleantalk\ApbctWP\Promotions\GF2DBPromotion;
 use Cleantalk\ApbctWP\RemoteCalls;
 use Cleantalk\ApbctWP\RequestParameters\RequestParameters;
 use Cleantalk\ApbctWP\RequestParameters\SubmitTimeHandler;
@@ -272,6 +273,10 @@ function apbct_register_my_rest_routes()
 add_action('init', function () {
     global $apbct;
 
+    //promotions
+    $promotion_gf2db = new GF2DBPromotion();
+    $promotion_gf2db->init();
+
     // Self cron
     $ct_cron = Cron::getInstance();
     $tasks_to_run = $ct_cron->checkTasks(); // Check for current tasks. Drop tasks inner counters.
@@ -1122,13 +1127,10 @@ function apbct_sfw_update__init($delay = 0)
         return false;
     }
 
-    // The Access key is empty
-    if ( ! $apbct->api_key && ! $apbct->ip_license ) {
-        return array('error' => 'SFW UPDATE INIT: KEY_IS_EMPTY');
-    }
+    $requirements_check = apply_filters('apbct_sfw_update__check_requirements', apbct_sfw_update__check_requirements());
 
-    if ( ! $apbct->data['key_is_ok'] ) {
-        return array('error' => 'SFW UPDATE INIT: KEY_IS_NOT_VALID');
+    if (true !== $requirements_check) {
+        return array('error' => $requirements_check);
     }
 
     // Get update period for server
@@ -1213,6 +1215,38 @@ function apbct_sfw_update__init($delay = 0)
     );
 }
 
+/**
+ * Precheck server requirements before SFW update started.
+ * @return string|true True if check passed, first error string otherwise.
+ */
+function apbct_sfw_update__check_requirements()
+{
+    global $apbct;
+    $result = true;
+    try {
+        // The Access key is empty
+        if ( ! $apbct->api_key && ! $apbct->ip_license ) {
+            throw new \Exception('KEY_IS_EMPTY');
+        }
+
+        if ( ! $apbct->data['key_is_ok'] ) {
+            throw new \Exception('KEY_IS_NOT_VALID');
+        }
+
+        $requirements_checker = new Cleantalk\ApbctWP\ServerRequirementsChecker\ServerRequirementsChecker();
+
+        $curl_multi_ok = $requirements_checker->getRequiredParameterValue('curl_multi_funcs_array');
+
+        if (!$curl_multi_ok) {
+            throw new \Exception('CURL MULTI FUNCTIONS NOT AVAILABLE');
+        }
+    } catch (\Exception $e) {
+        $result = 'SFW UPDATE INIT: ' . $e->getMessage();
+    }
+
+    return $result;
+}
+
 /**
  * Decide need to force direct update
  *

inc/cleantalk-admin.php

@@ -353,8 +353,6 @@ function apbct_admin__init()
 
         add_filter('cleantalk_admin_bar__parent_node__before', 'apbct_admin__admin_bar__prepare_counters');
         add_filter('cleantalk_admin_bar__add_icon_to_parent_node', 'apbct_admin__admin_bar__prepare_counters');
-        // Temporary disable the icon
-        //add_filter( 'cleantalk_admin_bar__parent_node__before', 'apbct_admin__admin_bar__add_parent_icon', 10, 1 );
         add_filter('cleantalk_admin_bar__parent_node__after', 'apbct_admin__admin_bar__add_counter', 10, 1);
 
         add_action('admin_bar_menu', 'apbct_admin__admin_bar__add_child_nodes', 1000);
@@ -677,6 +675,9 @@ function apbct_admin__badge__get_premium($placement = null)
             'top_info' => array(
                 'prefix' => __('Make it right!', 'cleantalk-spam-protect') . ' ',
                 'utm_set' => 'renew_top_info'),
+            'cleantalk-bbpress-spam-scanner' => array(
+                'prefix' => __('Make it right!', 'cleantalk-spam-protect') . ' ',
+                'utm_set' => 'cleantalk-bbpress-spam-scanner'),
             'plugins_listing' => array(
                 'prefix' => '',
                 'utm_set' => 'renew_plugins_listing'),
@@ -746,6 +747,23 @@ function apbct_admin__admin_bar__add_structure($wp_admin_bar)
         $wp_admin_bar->add_node($spbc_title_node);
     }
 
+    /**
+     * Link to project manager
+     */
+    $project_manager_title_node = apbct__admin_bar__get_title_for_project_manager();
+    if ( $project_manager_title_node ) {
+        $wp_admin_bar->add_node($project_manager_title_node);
+        $gf2db_title_node = apbct__admin_bar__add_gf2db_title();
+        if ($gf2db_title_node) {
+            $wp_admin_bar->add_node($gf2db_title_node);
+        } else {
+            $gf2db_invite_to_install_title = apbct__admin_bar__get_title_for_gf2db_invite_to_install();
+            if ($gf2db_invite_to_install_title) {
+                $wp_admin_bar->add_node($gf2db_invite_to_install_title);
+            }
+        }
+    }
+
     /**
      * Adding FAQ node
      */
@@ -756,6 +774,86 @@ function apbct_admin__admin_bar__add_structure($wp_admin_bar)
     }
 }
 
+/**
+ * Gets the title for the project manager admin bar node.
+ *
+ * This function constructs the title for the project manager admin bar node based on various conditions.
+ * The title includes a link to the project manager.
+ *
+ * @return array|false The node data for the project manager admin bar node, or false if the project manager admin bar is not enabled.
+ */
+function apbct__admin_bar__get_title_for_project_manager()
+{
+    if (!is_plugin_active('gravityforms/gravityforms.php')) {
+        return false;
+    }
+
+    $title = '<span><a>' . __('Project management', 'cleantalk-spam-protect') . '</a></span>';
+
+    return array(
+        'parent' => 'cleantalk_admin_bar__parent_node',
+        'id' => 'project_manager__parent_node',
+        'title' => $title,
+    );
+}
+
+/**
+ * Adds the title for the Gravity Forms to doBoard / Settings admin bar node.
+ *
+ * This function constructs the title for the Gravity Forms to doBoard / Settings admin bar node based on various conditions.
+ * The title includes a link to the Gravity Forms to doBoard / Settings.
+ *
+ */
+function apbct__admin_bar__add_gf2db_title()
+{
+    if (!is_plugin_active('cleantalk-doboard-add-on-for-gravity-forms/cleantalk-doboard-add-on-for-gravity-forms.php')) {
+        return false;
+    }
+
+    $title = sprintf(
+        '<a href="%s" target="_blank">%s</a>',
+        admin_url('admin.php?page=gf_settings&subview=cleantalk-doboard-add-on-for-gravity-forms'),
+        esc_html__('Gravity Forms to doBoard / Settings', 'cleantalk-spam-protect')
+    );
+
+    return array(
+        'parent' => 'project_manager__parent_node',
+        'id' => 'gf2db_title',
+        'title' => $title,
+    );
+}
+
+/**
+ * Gets the title for the "Gravity Forms to doBoard" Add-On invite to install admin bar node.
+ *
+ * This function constructs the title for the "Gravity Forms to doBoard" Add-On invite to install admin bar node based on various conditions.
+ * The title includes a link to the "Gravity Forms to doBoard" Add-On invite to install.
+ *
+ * @return array|false The node data for the "Gravity Forms to doBoard" Add-On invite to install admin bar node, or false if the "Gravity Forms to doBoard" Add-On invite to install admin bar node is not enabled.
+ */
+function apbct__admin_bar__get_title_for_gf2db_invite_to_install()
+{
+    if (is_plugin_active('cleantalk-doboard-add-on-for-gravity-forms/cleantalk-doboard-add-on-for-gravity-forms.php')) {
+        return false;
+    }
+
+    $title = sprintf(
+        '<a href="%s" target="_blank" title="%s">%s</a>',
+        admin_url('plugin-install.php?s=GF2DB&tab=search&type=term'),
+        esc_html__(
+            'Organize and track all messages from your site. Gravity Forms, upgraded with project management.',
+            'cleantalk-spam-protect'
+        ),
+        esc_html__('Install "Gravity Forms to doBoard" Add-On', 'cleantalk-spam-protect')
+    );
+
+    return array(
+        'parent' => 'project_manager__parent_node',
+        'id' => 'gf2db_invite_to_install_title',
+        'title' => $title,
+    );
+}
+
 /**
  * Gets the title for the APBCT admin bar node.
  *

inc/cleantalk-common.php

@@ -427,39 +427,54 @@ function apbct_exclusions_check__url()
             $exclusions = explode(',', $apbct->settings['exclusions__urls']);
         }
 
+        //default haystack is request_uri
+        $url_haystack = Server::getString('REQUEST_URI');
+
+        /**
+         * Fix for AJAX and WP REST API forms
+         */
+        // case for admin-ajax routes, may contain get params(!)
+        $is_admin_ajax_like = stripos(Server::getString('REQUEST_URI'), '/wp-admin/admin-ajax.php') === 0;
+        // case for wp-json paths
+        $is_wp_json_like = stripos(Server::getString('REQUEST_URI'), '/wp-json/') === 0;
+        // case for rest paths
         $rest_url_only_path = apbct_get_rest_url_only_path();
-        // Fix for AJAX and WP REST API forms
-        $haystack =
+        $is_rest_only_path =  $rest_url_only_path !== 'index.php' && stripos(Server::getString('REQUEST_URI'), $rest_url_only_path) === 0;
+
+        // if need to use http referrer as haystack
+        $do_use_http_referrer = (
+            Server::getString('HTTP_REFERER')  &&
             (
-                Server::get('REQUEST_URI') === '/wp-admin/admin-ajax.php' ||
-                stripos(TT::toString(Server::getString('REQUEST_URI')), '/wp-json/') === 0 ||
-                (
-                    $rest_url_only_path !== 'index.php' &&
-                    stripos(TT::toString(Server::getString('REQUEST_URI')), $rest_url_only_path) === 0
-                )
-            ) &&
-            TT::toString(Server::get('HTTP_REFERER'))
-            ? str_ireplace(
+                $is_admin_ajax_like ||
+                $is_wp_json_like ||
+                $is_rest_only_path
+            )
+        );
+
+        // do combine actions from referrer if so
+        if ($do_use_http_referrer) {
+            $url_haystack = str_ireplace(
                 array('http://', 'https://', strval(TT::toString(Server::get('HTTP_HOST')))),
                 '',
-                TT::toString(Server::get('HTTP_REFERER'))
-            )
-            : TT::toString(Server::get('REQUEST_URI'));
+                Server::getString('HTTP_REFERER')
+            );
+        }
 
+        // if exclusions is full-url like, modify haystack to being full-url also
         if ( $apbct->data['check_exclusion_as_url'] ) {
             $protocol = ! in_array(Server::get('HTTPS'), ['off', '']) || Server::get('SERVER_PORT') == 443 ? 'https://' : 'http://';
-            $haystack = $protocol . TT::toString(Server::get('SERVER_NAME')) . TT::toString($haystack);
+            $url_haystack = $protocol . TT::toString(Server::get('SERVER_NAME')) . TT::toString($url_haystack);
         }
 
-        $haystack = TT::toString($haystack);
+        $url_haystack = TT::toString($url_haystack);
 
         foreach ( $exclusions as $exclusion ) {
             if (
                 (
                     $apbct->settings['exclusions__urls__use_regexp'] &&
-                    preg_match('@' . $exclusion . '@', $haystack) === 1
+                    preg_match('@' . $exclusion . '@', $url_haystack) === 1
                 ) ||
-                stripos($haystack, $exclusion) !== false
+                stripos($url_haystack, $exclusion) !== false
             ) {
                 return true;
             }

inc/cleantalk-integrations-by-hook.php

@@ -478,6 +478,11 @@
         'setting' => 'forms__contact_forms_test',
         'ajax'    => true
     ),
+    'BitForm' => array(
+        'hook'    => 'bitform_filter_form_validation',
+        'setting' => 'forms__contact_forms_test',
+        'ajax'    => false
+    ),
 );
 
 add_action('plugins_loaded', function () use ($apbct_active_integrations) {

inc/cleantalk-public-validate-skip-functions.php

@@ -112,11 +112,11 @@ function skip_for_ct_contact_form_validate()
         '12' => apbct_is_in_referer('/wp-admin/'),
         // task 9405 - prevent Forminator forms direct attacks
         '13' => apbct_is_in_uri('/login/') && Post::get('action') !== 'forminator_submit_form_custom-forms',
-        '14' => apbct_is_in_uri('/my-account/edit-account/'),
+        '14' => (apbct_is_in_uri('/my-account/edit-account/') && (int)$apbct->settings['data__protect_logged_in'] === 1),
         // WooCommerce edit account page
-        '15' => apbct_is_in_uri('/my-account/edit-address/'),
+        '15' => (apbct_is_in_uri('/my-account/edit-address/') && (int)$apbct->settings['data__protect_logged_in'] === 1),
         // WooCommerce edit account page
-        '16' => (isset($_POST['action']) && $_POST['action'] === 'save_account_details'),
+        '16' => (isset($_POST['action']) && $_POST['action'] === 'save_account_details' && (int)$apbct->settings['data__protect_logged_in'] === 1),
         // WooCommerce edit account action
         '17' => apbct_is_in_uri('/peepsoajax/profilefieldsajax.validate_register'),
         '18' => (isset($_GET['ptype']) && $_GET['ptype'] === 'login'),