Merge pull request 'Disable captcha on nested forms' (#11) from nested-forms into main

Reviewed-on: #11

composer.json

@@ -1,7 +1,7 @@
 {
     "$schema": "https://getcomposer.org/schema.json",
     "name": "cleverogre/ogre-captcha",
-    "version": "1.2.6",
+    "version": "1.2.8",
     "title": "Ogre CAPTCHA",
     "description": "Protect your site with CAPTCHA",
     "author": "CleverOgre",

inc/abstract-location.php

@@ -47,8 +47,17 @@ abstract class Location {
 
     abstract public function activate():void;
 
+    protected function get_widget_id(): string {
+        return sprintf(
+            'cap-%s',
+            $this->name
+        );
+    }
+
     public function render():void {
-        Widget::render();
+        Widget::render([
+            'id' => $this->get_widget_id(),
+        ]);
     }
 
     public function process(WP_Error|null $errors = null):void {
@@ -78,7 +87,12 @@ abstract class Location {
     public function footer():void {
         if (!Settings::is_widget_floating()) return;
         $html = ob_get_clean();
-        $html = Widget::set_button_floating($html);
+        $html = Widget::set_button_floating(
+            $html,
+            [
+                'id' => $this->get_widget_id(),
+            ]
+        );
         echo $html;
     }
 

inc/class-settings.php

@@ -4,7 +4,7 @@
  * @author cleverogre
  * @copyright 2026 CleverOgre
  * @license GLP-3.0-or-later
- * @version 1.2.5
+ * @version 1.2.7
  * @since 1.0.0
  */
 
@@ -12,6 +12,7 @@ namespace Ogre\Captcha;
 
 use Ogre\Singleton;
 use Ogre\Captcha as Plugin;
+use Ogre\Captcha\GravityForms\Addon;
 
 defined('ABSPATH') || exit;
 
@@ -378,6 +379,21 @@ final class Settings {
             ]
         );
 
+        if (Plugin::is_gravityforms_active() && class_exists('Ogre\Captcha\GravityForms\Addon')) {
+            add_settings_section(
+                'gravityforms',
+                Plugin::__('Gravity Forms'),
+                [$this, 'section'],
+                Plugin::get_id(),
+                [
+                    'description' => sprintf(
+                        Plugin::__('The configuration of Ogre CAPTCHA\'s Gravityforms integration can be found on <a href="%s">this page</a> and within the settings of each form.'),
+                        esc_url(Addon::get_instance()->get_url())
+                    ),
+                ]
+            );
+        }
+
 
     }
 

inc/class-widget.php

@@ -97,7 +97,7 @@ final class Widget {
         );
 
         $attributes = [
-            'data-cap-floating' => "#{$args['id']}",
+            'data-cap-floating' => '#' . $args['id'],
             'data-cap-floating-position' => $args['position'],
         ];
 

inc/gravityforms/class-addon.php

@@ -4,7 +4,7 @@
  * @author cleverogre
  * @copyright 2026 CleverOgre
  * @license GLP-3.0-or-later
- * @version 1.2.1
+ * @version 1.2.8
  * @since 1.1.0
  */
 
@@ -116,9 +116,19 @@ final class Addon extends GFAddOn {
     }
 
     public function is_enabled(array|null $form = null): bool {
+        // Check to make sure that we're enabled on the plugin level first
         $plugin_enabled = $this->get_plugin_setting('enabled') === '1';
         if (is_null($form) || !$plugin_enabled) return $plugin_enabled;
 
+        $form_id = !is_null($form) ? absint(rgar($form, 'id')) : 0;
+
+        // If Gravity Perks Nested Forms is active and the current form is nested, disable entirely (it's not compatible at the moment)
+        if (class_exists('GP_Nested_Forms')) {
+            $gp_nested_forms = GP_Nested_Forms::get_instance();
+            if ($gp_nested_forms->is_nested_form_submission() && $gp_nested_forms->get_parent_form_id() !== $form_id) return false;
+        }
+        
+        // Now check to see if the opt-out is enabled within the form settings
         $form_settings = $this->get_form_settings($form);
         $form_disabled = (bool) rgar($form_settings, 'disabled');
         return !$form_disabled;
@@ -135,10 +145,24 @@ final class Addon extends GFAddOn {
         if (!Settings::is_connected() || !$this->is_enabled($form)) return $button_input;
         if ((is_admin() && !defined('DOING_AJAX')) || GFCommon::is_form_editor()) return $button_input;
 
+        $id = sprintf(
+            'gform_cap_%d',
+            absint(rgar($form, 'id'))
+        );
+        
         ob_start();
-        Widget::render();
+        Widget::render([
+            'id' => $id,
+        ]);
         $button_input = ob_get_clean() . $button_input;
-        if (Settings::is_widget_floating()) $button_input = Widget::set_button_floating($button_input);
+        if (Settings::is_widget_floating()) {
+            $button_input = Widget::set_button_floating(
+                $button_input,
+                [
+                    'id' => $id,
+                ]
+            );
+        }
         return $button_input;
     }
 
@@ -146,7 +170,11 @@ final class Addon extends GFAddOn {
         if ($context != 'form-submit') return $validation_result;
 
         $form = $validation_result['form'];
+
+        // Make sure that we are actually processing the end of the form
 		if (!GFFormDisplay::is_last_page($form) || rgpost('action') == 'heartbeat') return $validation_result;
+
+        // Make sure that we are connected and enabled
         if (!Settings::is_connected() || !$this->is_enabled($form)) return $validation_result;
 
         $errors = API::process(Widget::get_token());
@@ -158,4 +186,19 @@ final class Addon extends GFAddOn {
         return $validation_result;
     }
 
+	public function plugin_settings_link( $links, $file ) {
+        // Remove plugin action link
+		return $links;
+	}
+
+    public function get_url(): string {
+        return add_query_arg(
+            [
+                'page' => 'gf_settings',
+                'subview' => $this->get_slug()
+            ],
+            admin_url('admin.php')
+        );
+    }
+
 }

inc/location/class-login-form.php

@@ -42,7 +42,9 @@ final class LoginForm extends Location {
         $content .= ob_get_clean();
 
         if (Settings::is_widget_floating()) {
-            Widget::add_dynamic_floating_attributes();
+            Widget::add_dynamic_floating_attributes([
+                'id' => $this->get_widget_id(),
+            ]);
         }
 
         return $content;

ogre-captcha.php

@@ -6,14 +6,14 @@
  * @author cleverogre
  * @copyright 2026 CleverOgre
  * @license GLP-3.0-or-later
- * @version 1.2.6
+ * @version 1.2.7
  * @since 1.0.0
  *
  * @wordpress-plugin
  * Plugin Name:       Ogre CAPTCHA
  * Plugin URI:        https://git.cleverogre.com/cleverogre/ogre-captcha/
  * Description:       Protect your site with CAPTCHA
- * Version:           1.2.6
+ * Version:           1.2.8
  * Requires at least: 6.0
  * Requires PHP:      8.2
  * Author:            CleverOgre

package-lock.json

@@ -1,12 +1,12 @@
 {
 	"name": "cleverogre/ogre-captcha",
-	"version": "1.2.6",
+	"version": "1.2.7",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "cleverogre/ogre-captcha",
-			"version": "1.2.6",
+			"version": "1.2.7",
 			"license": "GPL-3.0+",
 			"devDependencies": {
 				"gulp": "^5.0.0",

package.json

@@ -1,7 +1,7 @@
 {
 	"$schema": "https://www.schemastore.org/package.json",
 	"name": "cleverogre/ogre-captcha",
-	"version": "1.2.6",
+	"version": "1.2.8",
 	"title": "Ogre CAPTCHA",
 	"description": "Protect your site with CAPTCHA",
 	"author": "CleverOgre",

readme.txt

@@ -3,7 +3,7 @@ Contributors: ogrecooper, cleverogre
 Tested up to: 7.0
 Requires at least: 6.0
 Requires PHP: 8.2
-Version: 1.2.6
+Version: 1.2.8
 License: GPLv3 or later
 License URI: https://www.gnu.org/licenses/gpl-3.0.html
 Copyright: CleverOgre
@@ -28,6 +28,13 @@ If you don't know what plugin you have downloaded, please contact [CleverOgre](t
 
 == Changelog ==
 
+= 1.2.8 - 2026-08-19 =
+* Fix compatibility issue with Gravity Perks Nested Forms
+
+= 1.2.7 - 2026-08-14 =
+* Remove duplicate settings link
+* Add Gravity Forms section to settings page
+
 = 1.2.6 - 2026-07-15 =
 * Fix bug with lost password reset when using AIOWPS