Merge pull request #704 from CleanTalk/beta

6.70. Final merge.

Author: alexandergull

.7zignore

@@ -0,0 +1,15 @@
+node_modules/
+vendor/
+js/prebuild/
+js/src/
+css/src/
+tests/
+package.json
+package-lock.json
+gulpfile.js
+README.md
+LICENSE
+psalm.xml
+composer.json
+composer.lock
+.*

.github/workflows/checkLibrariesChanges.yml

@@ -0,0 +1,70 @@
+name: Check for library changes on PR Merge
+
+on:
+  pull_request:
+    types: [closed]
+    branches:
+      - dev
+      - master
+
+env: # environment variables (available in any part of the action)
+  PHP_VERSION: 7.4
+
+jobs:
+  notify:
+    if: github.event.pull_request.merged == true
+    runs-on: ubuntu-22.04
+
+    steps:
+      - name: Set up PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ env.PHP_VERSION }}
+
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Install Dependencies
+        run: composer i
+
+      - name: Check for library changes
+        id: check-libraries
+        run: |
+          CHANGED_FILES=$(git status --porcelain | grep -v '^??' | awk '{print $2}' | grep -v '^composer\.lock$' || true)
+          
+          if [ -z "$CHANGED_FILES" ]; then
+            echo "No library changes detected in vendor/"
+            echo "has_changes=false" >> $GITHUB_OUTPUT
+          else
+            echo "Library changes detected in vendor/ after merge!"
+          
+            HTML_LIST=$(echo "$CHANGED_FILES" | sed 's/^/<li>/;s/$/<\/li>/')
+            echo "html_list<<EOF" >> $GITHUB_OUTPUT
+            echo "<ul>$HTML_LIST</ul>" >> $GITHUB_OUTPUT
+            echo "EOF" >> $GITHUB_OUTPUT
+          
+            echo "has_changes=true" >> $GITHUB_OUTPUT
+          fi
+
+      - name: Send notification to Matrix
+        if: steps.check-libraries.outputs.has_changes == 'true'
+        uses: Glomberg/matrix-messenger-action@master
+        with:
+          server: ${{ secrets.MATRIX_SERVER }}
+          to: ${{ secrets.MATRIX_EXTERNSION_ROOM }}
+          token: ${{ secrets.MATRIX_USER_TOKEN }}
+          message: |
+            📦 <strong>Library Changes Detected After PR Merge!</strong>
+            
+            Repository: <strong>${{ github.repository }}</strong>
+            PR #${{ github.event.pull_request.number }} merged by: <strong>${{ github.event.pull_request.merged_by.login }}</strong>
+            <br>Title: ${{ github.event.pull_request.title }}
+            
+            <br>⚠️ Libraries may not be up-to-date.
+            
+            <br><strong>Changed files in vendor/:</strong>
+            ${{ steps.check-libraries.outputs.html_list }}
+            
+            <a href="${{ github.event.pull_request.html_url }}">View Pull Request</a>

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

@@ -23,23 +23,37 @@ jobs:
       - name: Set plugin name
         run: echo "PLUGIN_NAME=cleantalk-spam-protect" >> $GITHUB_ENV
 
-      - name: Create .7zignore
+      - name: Check if .7zignore exists
+        id: check_ignore
         run: |
-          echo "node_modules" > .7zignore
-          echo "package.json" >> .7zignore
-          echo "package-lock.json" >> .7zignore
-          echo "gulpfile.js" >> .7zignore
-          echo "tests" >> .7zignore
-          echo "README.md" >> .7zignore
-          echo "LICENSE" >> .7zignore
-          echo "psalm.xml" >> .7zignore
-          echo "composer.json" >> .7zignore
-          echo "composer.lock" >> .7zignore
-          echo "vendor" >> .7zignore
-          echo "js/prebuild" >> .7zignore
-          echo "js/src" >> .7zignore
-          echo "css/src" >> .7zignore
-          echo ".*" >> .7zignore
+          if [ -f ".7zignore" ]; then
+            echo "Using existing .7zignore file"
+            echo "ignore_exists=true" >> $GITHUB_OUTPUT
+          else
+            echo "::warning::.7zignore file not found, creating default one"
+            echo "ignore_exists=false" >> $GITHUB_OUTPUT
+          fi
+
+      - name: Create default .7zignore if missing
+        if: steps.check_ignore.outputs.ignore_exists == 'false'
+        run: |
+          cat > .7zignore << EOF
+          node_modules/
+          vendor/
+          js/prebuild/
+          js/src/
+          css/src/
+          tests/
+          package.json
+          package-lock.json
+          gulpfile.js
+          README.md
+          LICENSE
+          psalm.xml
+          composer.json
+          composer.lock
+          .*
+          EOF
 
       - name: Create ZIP archive with 7z
         run: 7z a -tzip "${PLUGIN_NAME}.zip" . -xr@.7zignore
@@ -49,7 +63,7 @@ jobs:
         with:
           tag_name: ${{ github.ref_name }}-version
           name: ${{ github.ref_name }} version
-          body: "Prebuil version from ${{ github.ref_name }} branch"
+          body: "Prebuilt version from ${{ github.ref_name }} branch"
           draft: false
           prerelease: true
           files: |
@@ -59,4 +73,8 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Clean up
-        run: rm -f "${PLUGIN_NAME}.zip" .7zignore
+        run: |
+          rm -f "${PLUGIN_NAME}.zip"
+          if [ "${{ steps.check_ignore.outputs.ignore_exists }}" = "false" ]; then
+            rm -f .7zignore
+          fi

.github/workflows/tests.yml

@@ -58,7 +58,7 @@ jobs:
         env:
           CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
 
-      - name: Matrix notify
+      - name: Matrix notify on failure
         if: failure()
         uses: Glomberg/matrix-messenger-action@master
         with:

.gitignore

@@ -9,7 +9,6 @@ package-lock.json
 checkstyle.xml
 /fw_files*
 /cleantalk-spam-protect.bat
-.github/
 /lib/Cleantalk/Common/ContactsEncoder/.github/
 /lib/Cleantalk/Common/ContactsEncoder/tests/
 /coverage.xml

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.69.2
+  Version: 6.70
   Author: CleanTalk - Anti-Spam Protection <welcome@cleantalk.org>
   Author URI: https://cleantalk.org
   Text Domain: cleantalk-spam-protect
@@ -603,7 +603,21 @@ function apbct_write_js_errors($data)
 
 // Public actions
 if ( ! is_admin() && ! apbct_is_ajax() && ! apbct_is_customize_preview() ) {
-    if (apbct_is_plugin_active('fluentformpro/fluentformpro.php') && apbct_is_in_uri('ff_landing=')) {
+    if ( ! function_exists('is_user_logged_in') ) {
+        require_once ABSPATH . 'wp-includes/pluggable.php';
+    }
+    if (
+        apbct_is_plugin_active('fluentformpro/fluentformpro.php') &&
+        (
+            apbct_is_in_uri('ff_landing=') ||
+            (
+                // Load scripts for logged in users if constant is defined
+                is_user_logged_in() &&
+                (defined('APBCT_FF_JS_SCRIPTS_LOAD') &&
+                APBCT_FF_JS_SCRIPTS_LOAD == true)
+            )
+        )
+    ) {
         add_action('wp_head', function () {
             echo '<script data-pagespeed-no-defer="" src="'
                 . APBCT_URL_PATH
@@ -1504,6 +1518,20 @@ function apbct_sfw_update__download_files($urls, $direct_update = false)
 
     $results = array();
     $batch_size = 10;
+
+    /**
+     * Reduce batch size of curl multi instanced
+     */
+    if (defined('APBCT_SERVICE__SFW_UPDATE_CURL_MULTI_BATCH_SIZE')) {
+        if (
+            is_int(APBCT_SERVICE__SFW_UPDATE_CURL_MULTI_BATCH_SIZE) &&
+            APBCT_SERVICE__SFW_UPDATE_CURL_MULTI_BATCH_SIZE > 0 &&
+            APBCT_SERVICE__SFW_UPDATE_CURL_MULTI_BATCH_SIZE < 10
+        ) {
+            $batch_size = APBCT_SERVICE__SFW_UPDATE_CURL_MULTI_BATCH_SIZE;
+        };
+    }
+
     $total_urls = count($urls);
     $batches = ceil($total_urls / $batch_size);
 

composer.json

@@ -11,12 +11,13 @@
     "require-dev": {
         "vimeo/psalm": "^4.8",
         "phpunit/phpunit": "^7.5",
-        "squizlabs/php_codesniffer": "3.*",
+        "squizlabs/php_codesniffer": "*",
         "phpcompatibility/php-compatibility": "@dev",
         "yoast/phpunit-polyfills": "^1.0",
         "ext-dom": "*",
         "wp-cli/wp-cli-bundle": "*",
         "mockery/mockery": "*",
+        "cleantalk/apbct-installer": "*",
         "cleantalk/contacts-encoder": "*"
     },
     "scripts": {