Merge develop into main

README.md

@@ -40,6 +40,10 @@
 
 ### Fluent Forms
 
+### Gravity Forms
+
+### Forminator
+
 ## Advance Features
 
 * Able to trigger adCAPTCHA on the "Place order" button.

adcaptcha.php

@@ -2,7 +2,7 @@
 /**
  * Plugin Name: adCAPTCHA for WordPress
  * Description: Secure your site. Elevate your brand. Boost Ad Revenue.
- * Version: 1.6.0
+ * Version: 1.7.0
  * Requires at least: 6.4.2
  * Requires PHP: 7.4
  * Author: adCAPTCHA
@@ -21,7 +21,7 @@
 
 use AdCaptcha\Instantiate;
 
-const PLUGIN_VERSION_ADCAPTCHA = '1.6.0';
+const PLUGIN_VERSION_ADCAPTCHA = '1.7.0';
 define('ADCAPTCHA_ERROR_MESSAGE', __( 'Please complete the I am human box.', 'adcaptcha' ));
 
 if ( ! function_exists( 'adcaptcha_uninstall' ) ) {

readme.txt

@@ -4,7 +4,7 @@ Contributors: adCAPTCHA
 Tags: spam, anti-spam, block bots, security, adCAPTCHA
 Requires at least: 6.0
 Tested up to: 6.5.2
-Stable tag: 1.6.0
+Stable tag: 1.7.0
 Requires PHP: 7.4
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -46,6 +46,10 @@ adCAPTCHA offers a unique proposition in the digital space by combining Security
 
 **Fluent Forms**
 
+**Gravity Forms**
+
+**Forminator**
+
 == Advance Features ==
 
 **Woocommerce**
@@ -157,3 +161,6 @@ During verification, the adCAPTCHA service may briefly receive the user's IP add
 
 = 1.6.0 =
 - Added feature to disable the WooCommerce checkout endpoint.
+
+= 1.7.0 =
+- Feature: Added support for Gravity Forms and Forminator.

src/Instantiate.php

@@ -17,6 +17,8 @@
 use AdCaptcha\Plugin\WPForms\Forms as WPForms;
 use AdCaptcha\Plugin\Elementor\Forms as Elementor;
 use AdCaptcha\Plugin\FluentForms\Forms as FluentForms;
+use AdCaptcha\Plugin\Forminator\Forms as Forminator;
+use AdCaptcha\Plugin\GravityForms\Forms as GravityForms;
 
 class Instantiate {
 
@@ -83,6 +85,15 @@ public function setup() {
                 'instance' => FluentForms::class,
                 'plugin' => [ 'fluentform/fluentform.php' ],
             ],
+
+            'Forminator_Forms' => [
+                'instance' => Forminator::class,
+                'plugin' => [ 'forminator/forminator.php' ],
+            ],
+            'GravityForms_Forms' => [
+                'instance' => GravityForms::class,
+                'plugin' => [ 'gravityforms/gravityforms.php' ]
+            ]
         ];
 
         $selected_plugins = get_option('adcaptcha_selected_plugins') ? get_option('adcaptcha_selected_plugins') : array();

src/Plugin/Forminator/Forms.php

@@ -0,0 +1,85 @@
+<?php
+
+namespace AdCaptcha\Plugin\Forminator;
+
+use AdCaptcha\Widget\AdCaptcha;
+use AdCaptcha\Widget\Verify;
+use AdCaptcha\Plugin\AdCaptchaPlugin;
+
+class Forms extends AdCaptchaPlugin {
+    private $verify;
+    private $has_captcha = false;
+
+    public function __construct() {
+        parent::__construct();
+        $this->verify = new Verify();
+    }
+
+    public function setup() {
+        add_action('forminator_before_form_render', [$this, 'before_form_render'], 10, 5);
+        add_action('forminator_before_form_render', [AdCaptcha::class, 'enqueue_scripts'], 9);
+        add_action('forminator_before_form_render', [Verify::class, 'get_success_token'], 9);
+        add_filter('forminator_render_button_markup', [$this, 'captcha_trigger_filter'], 10, 2);
+        add_action( 'wp_enqueue_scripts', [ $this, 'reset_captcha_script' ], 9 );
+        add_filter('forminator_cform_form_is_submittable', [$this, 'verify'], 10, 3);
+    }
+
+    public function before_form_render($id, $form_type, $post_id, $form_fields, $form_settings) {
+        $this->has_captcha = $this->has_adcaptcha_field($form_fields);
+    }
+
+    private function has_adcaptcha_field($form_fields) {
+        foreach ($form_fields as $field) {
+            if (!empty($field['type']) && $field['type'] === 'captcha' && !empty($field['captcha_provider']) && $field['captcha_provider'] === 'adcaptcha') {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public function captcha_trigger_filter($html, string $button) {
+        if ($this->has_captcha) {
+            return $html;
+        }
+        return AdCaptcha::ob_captcha_trigger() . $html;
+    }
+
+
+    public function reset_captcha_script() {
+        add_action('wp_footer', function() {
+            echo "<script>
+                (function checkJQuery() {
+                    if (typeof jQuery === 'undefined') {
+                        setTimeout(checkJQuery, 100);
+                        return;
+                    }
+                    jQuery(document).on('after:forminator:form:submit', function() {
+                        if (window.adcap && typeof window.adcap.reset === 'function') {
+                            window.adcap.reset();
+                            window.adcap.successToken = '';
+                            jQuery('[name=\"adcaptcha_successToken\"]').val('');
+                        }   
+                    });
+                })();
+            </script>";
+        });
+    }
+
+    public function verify($can_show, $form_id, $field_data_array) {
+        $successToken = sanitize_text_field(wp_unslash($_POST['adcaptcha_successToken'] ?? ''));
+        if (empty($successToken)) {
+            return [
+                'can_submit' => false,
+                'error'      => __('Please complete the AdCaptcha verification.', 'adcaptcha'),
+            ];
+        }
+        $response = $this->verify->verify_token($successToken);
+        if (!$response) {
+            return [
+                'can_submit' => false,
+                'error'      => __('AdCaptcha verification failed. Please try again.', 'adcaptcha'),
+            ];
+        }
+        return $can_show;
+    }
+}