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.4",
+    "version": "1.2.8",
     "title": "Ogre CAPTCHA",
     "description": "Protect your site with CAPTCHA",
     "author": "CleverOgre",

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "d662e21940aa15a41d819c504c3139c9",
+    "content-hash": "f65bf8d077abc18766530e9d520877ba",
     "packages": [
         {
             "name": "cleverogre/plugin-framework",

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.4
+ * @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;
 
@@ -278,7 +279,9 @@ final class Settings {
             args: [
                 'name' => 'site_key',
                 'description' => Plugin::__('Provide your Cap site key.'),
-                'type' => 'password',
+                'attributes' => [
+                    'autocomplete' => 'off',
+                ],
             ]
         );
 
@@ -291,6 +294,9 @@ final class Settings {
                 'name' => 'secret_key',
                 'description' => Plugin::__('Provide your Cap secret key.'),
                 'type' => 'password',
+                'attributes' => [
+                    'autocomplete' => 'off',
+                ],
             ]
         );
 
@@ -373,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;

inc/location/class-lost-password-form.php

@@ -4,7 +4,7 @@
  * @author cleverogre
  * @copyright 2026 CleverOgre
  * @license GLP-3.0-or-later
- * @version 1.2.4
+ * @version 1.2.6
  * @since 1.0.0
  */
 
@@ -14,7 +14,6 @@ use Override;
 use Ogre\Captcha\LoginLocation;
 use Ogre\Captcha\Settings;
 use WP_Error;
-use WP_User;
 
 defined('ABSPATH') || exit;
 
@@ -35,10 +34,10 @@ final class LostPasswordForm extends LoginLocation {
     {
         parent::activate();
         add_action('lostpassword_form', [$this, 'render']);
-        add_action('lostpassword_post', [$this, 'process_form'], 10, 2);
+        add_action('lostpassword_post', [$this, 'process_form'], 10, 1);
     }
 
-    public function process_form(WP_Error $errors, WP_User|bool $user_data):void {
+    public function process_form(WP_Error $errors):void {
         $this->process($errors);
     }
 

ogre-captcha.php

@@ -6,14 +6,14 @@
  * @author cleverogre
  * @copyright 2026 CleverOgre
  * @license GLP-3.0-or-later
- * @version 1.2.4
+ * @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.4
+ * Version:           1.2.8
  * Requires at least: 6.0
  * Requires PHP:      8.2
  * Author:            CleverOgre
@@ -27,7 +27,7 @@
  * Icon2x:            https://plugins.cleverogre.com/wp-content/uploads/ogre-captcha-icon-256x256.png
  * BannerLow:         https://plugins.cleverogre.com/wp-content/uploads/ogre-captcha-banner-772x250.png
  * BannerHigh:        https://plugins.cleverogre.com/wp-content/uploads/ogre-captcha-banner-1544x500.png
- * Requires License:  yes
+ * Require License:   yes
  */
 
 namespace Ogre;

package-lock.json

@@ -1,12 +1,12 @@
 {
 	"name": "cleverogre/ogre-captcha",
-	"version": "1.2.3",
+	"version": "1.2.7",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "cleverogre/ogre-captcha",
-			"version": "1.2.3",
+			"version": "1.2.7",
 			"license": "GPL-3.0+",
 			"devDependencies": {
 				"gulp": "^5.0.0",
@@ -58,13 +58,13 @@
 			"license": "MIT"
 		},
 		"node_modules/@types/node": {
-			"version": "25.9.1",
+			"version": "26.1.1",
-			"resolved": "https://registry.npmjs.org/@types/node/-/node-25.9.1.tgz",
+			"resolved": "https://registry.npmjs.org/@types/node/-/node-26.1.1.tgz",
-			"integrity": "sha512-xfrlY7UD5rMJk3ZVJP8BNzS28J36YJg+xp+LPXV1TdWxr8uMH5A860QNxYDGQe/ylDSgjxE52Q9VnO7p75tJxg==",
+			"integrity": "sha512-nxAkRSVkN1Y0JC1W8ky/fTfkGsMmcrRsbx+3XoZE+rMOX71kLYTV7fLXpqud1GpbpP5TuffXFqfX7fH2GgZREw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"undici-types": ">=7.24.0 <7.24.7"
+				"undici-types": "~8.3.0"
 			}
 		},
 		"node_modules/@types/vinyl": {
@@ -370,11 +370,14 @@
 			}
 		},
 		"node_modules/balanced-match": {
-			"version": "1.0.2",
+			"version": "4.0.4",
-			"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+			"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz",
-			"integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+			"integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==",
 			"dev": true,
-			"license": "MIT"
+			"license": "MIT",
+			"engines": {
+				"node": "18 || 20 || >=22"
+			}
 		},
 		"node_modules/bare-events": {
 			"version": "2.9.1",
@@ -485,14 +488,16 @@
 			}
 		},
 		"node_modules/brace-expansion": {
-			"version": "1.1.15",
+			"version": "5.0.7",
-			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.15.tgz",
+			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.7.tgz",
-			"integrity": "sha512-EwOCDEex4quD37XhqM3omwtMoJjr//isUZz1JopUNWms+4Z2ViyM/k1YIRePpoVNnQhENnxtFjLaxNHrT7xIUg==",
+			"integrity": "sha512-7oFy703dxfY3/NLxC1fh2SUCQ0H9rmAY+5EpDVfXjUTTs+HEwR2nYaqLv+GWcTsumwxPfiz6CzCNkwXwBUwqCA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"balanced-match": "^1.0.0",
+				"balanced-match": "^4.0.2"
-				"concat-map": "0.0.1"
+			},
+			"engines": {
+				"node": "18 || 20 || >=22"
 			}
 		},
 		"node_modules/braces": {
@@ -1756,6 +1761,37 @@
 				"node": ">= 10.13.0"
 			}
 		},
+		"node_modules/glob/node_modules/balanced-match": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+			"integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/glob/node_modules/brace-expansion": {
+			"version": "1.1.16",
+			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.16.tgz",
+			"integrity": "sha512-IDw48K2/2kRkg9LdJxurvq3lV3aBgq0REY89duEqFRthjlPdXHKMj7EnQOXVckxzgisinf3nHfrcE2FufFLXMw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"balanced-match": "^1.0.0",
+				"concat-map": "0.0.1"
+			}
+		},
+		"node_modules/glob/node_modules/minimatch": {
+			"version": "3.1.5",
+			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz",
+			"integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==",
+			"dev": true,
+			"license": "ISC",
+			"dependencies": {
+				"brace-expansion": "^1.1.7"
+			},
+			"engines": {
+				"node": "*"
+			}
+		},
 		"node_modules/global-modules": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz",
@@ -2351,9 +2387,9 @@
 			}
 		},
 		"node_modules/gulp/node_modules/yargs": {
-			"version": "16.2.0",
+			"version": "16.2.2",
-			"resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
+			"resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.2.tgz",
-			"integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
+			"integrity": "sha512-Nt9ZJjXTv5R8MHbqby/wXQ6Gi0Bb3TcYZkR1bzuL4yB2OxWPkXknz513gEF0GoA6tn00UpbPvERW8rzCuWCA6w==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -3196,16 +3232,19 @@
 			}
 		},
 		"node_modules/minimatch": {
-			"version": "3.1.5",
+			"version": "10.2.5",
-			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz",
+			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.5.tgz",
-			"integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==",
+			"integrity": "sha512-MULkVLfKGYDFYejP07QOurDLLQpcjk7Fw+7jXS2R2czRQzR56yHRveU5NDJEOviH+hETZKSkIk5c+T23GjFUMg==",
 			"dev": true,
-			"license": "ISC",
+			"license": "BlueOak-1.0.0",
 			"dependencies": {
-				"brace-expansion": "^1.1.7"
+				"brace-expansion": "^5.0.5"
 			},
 			"engines": {
-				"node": "*"
+				"node": "18 || 20 || >=22"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/isaacs"
 			}
 		},
 		"node_modules/mixin-deep": {
@@ -3247,45 +3286,6 @@
 				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"node_modules/multimatch/node_modules/balanced-match": {
-			"version": "4.0.4",
-			"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz",
-			"integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": "18 || 20 || >=22"
-			}
-		},
-		"node_modules/multimatch/node_modules/brace-expansion": {
-			"version": "5.0.6",
-			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.6.tgz",
-			"integrity": "sha512-kLpxurY4Z4r9sgMsyG0Z9uzsBlgiU/EFKhj/h91/8yHu0edo7XuixOIH3VcJ8kkxs6/jPzoI6U9Vj3WqbMQ94g==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"balanced-match": "^4.0.2"
-			},
-			"engines": {
-				"node": "18 || 20 || >=22"
-			}
-		},
-		"node_modules/multimatch/node_modules/minimatch": {
-			"version": "10.2.5",
-			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.5.tgz",
-			"integrity": "sha512-MULkVLfKGYDFYejP07QOurDLLQpcjk7Fw+7jXS2R2czRQzR56yHRveU5NDJEOviH+hETZKSkIk5c+T23GjFUMg==",
-			"dev": true,
-			"license": "BlueOak-1.0.0",
-			"dependencies": {
-				"brace-expansion": "^5.0.5"
-			},
-			"engines": {
-				"node": "18 || 20 || >=22"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/isaacs"
-			}
-		},
 		"node_modules/mute-stdout": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/mute-stdout/-/mute-stdout-1.0.1.tgz",
@@ -4477,9 +4477,9 @@
 			"license": "MIT"
 		},
 		"node_modules/streamx": {
-			"version": "2.26.0",
+			"version": "2.28.0",
-			"resolved": "https://registry.npmjs.org/streamx/-/streamx-2.26.0.tgz",
+			"resolved": "https://registry.npmjs.org/streamx/-/streamx-2.28.0.tgz",
-			"integrity": "sha512-VvNG1K72Po/xwJzxZFnZ++Tbrv4lwSptsbkFuzXCJAYZvCK5nnxsvXU6ajqkv7chyiI1Y0YXq2Jh8Iy8Y7NF/A==",
+			"integrity": "sha512-1Yowhzjf0ivGMrTIkY9hav5TxobO9qIVqUE41fiCGMGgc3CLlf4MY+9AHmZqBWgDTue0fY9zWjYFVyf6Diuobw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -4781,9 +4781,9 @@
 			}
 		},
 		"node_modules/undici-types": {
-			"version": "7.24.6",
+			"version": "8.3.0",
-			"resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.24.6.tgz",
+			"resolved": "https://registry.npmjs.org/undici-types/-/undici-types-8.3.0.tgz",
-			"integrity": "sha512-WRNW+sJgj5OBN4/0JpHFqtqzhpbnV0GuB+OozA9gCL7a993SmU+1JBZCzLNxYsbMfIeDL+lTsphD5jN5N+n0zg==",
+			"integrity": "sha512-j375ScV60dom+YkPFIfTLcOiPxkN/buHz5GobjLhixFuANaNs3C9l4GmrWqejgXWJ7BbJcFYpTEUkS1Ge8bpZQ==",
 			"dev": true,
 			"license": "MIT"
 		},

package.json

@@ -1,7 +1,7 @@
 {
 	"$schema": "https://www.schemastore.org/package.json",
 	"name": "cleverogre/ogre-captcha",
-	"version": "1.2.4",
+	"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.4
+Version: 1.2.8
 License: GPLv3 or later
 License URI: https://www.gnu.org/licenses/gpl-3.0.html
 Copyright: CleverOgre
@@ -28,6 +28,19 @@ 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
+
+= 1.2.5 - 2026-07-01 =
+* Improve API key input attributes
+
 = 1.2.4 - 2026-06-18 =
 * Minor bug fixes