Version V6

Author: Roman Gsponer

LICENSE.md

@@ -1,34 +1,21 @@
-Plain Solutions Software License  
-Version 1.1, February 2025  
-
-Copyright (c) 2025 Plain Solutions GmbH  
-All rights reserved.  
-
-## 1. Grant of License  
-This software is provided under GPL-3.0-only license. You are granted a non-exclusive, non-transferable, and revocable right to download, install, and use the software **for non-commercial purposes** only.  
-
-## 2. Permitted Use  
-- You may download and use the software for personal, educational, or research purposes.  
-- You may modify the software **for personal use only** but may not distribute modified versions.  
-
-## 3. Restrictions  
-- Commercial use, resale, or redistribution of the software in any form is **strictly prohibited**.  
-- You may not sublicense, rent, lease, or sell copies of this software.  
-- Decompiling, reverse engineering, or modifying the software for redistribution is not allowed.  
-
-## 4. No Warranty & Limitation of Liability  
-This software is provided "as is" without any warranties. Plain Solutions GmbH is not responsible for any damages, data loss, or other issues arising from the use of this software.  
-
-## 5. Support & Updates  
-Support and updates may be provided at the sole discretion of Plain Solutions GmbH. There is no guarantee of future updates or bug fixes.  
-
-## 6. Termination  
-Plain Solutions GmbH reserves the right to revoke this license if the terms are violated. Upon termination, you must stop using the software and delete all copies.  
-
-## 7. Governing Law  
-This license is governed by Swiss law. Any disputes shall be settled in the jurisdiction of Plain Solutions GmbH’s registered office in Raron, Switzerland.  
-
-For inquiries, please contact:  
-Plain Solutions GmbH  
-Theaterstrasse 2, 3942 Raron, Switzerland  
-Email: support@plain-solutions.net  
+MIT License
+
+Copyright (c) Plain Solutions GmbH
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -28,11 +28,11 @@ With the integrated mailview field you can display requests allover the panel.
 
 ⭐️   Create a new form field type with ease by added just 2 files (Blueprint & Template).
 
-⭐️   Spam protection with an integrated honeypot.
+⭐️   Spam protection with captcha field: math puzzle, reCaptcha (since v6) or hCaptcha (since v6).
 
 ⭐️   Pre-styled form
 
-⭐️   Full language support for English, German, Italian, French, Lithuanian, Hungarian & Netherlands
+⭐️   Full language support for English, German, Italian, French, Lithuanian, Hungarian, Netherlands, Spanish (Since v6) & Serbian (Since v6)
 
 # Table of content
 
@@ -60,6 +60,7 @@ With the integrated mailview field you can display requests allover the panel.
   - [Placeholders](#placeholders)
   - [Disable Functions](#disable-functions)
   - [Email templating](#email-templating)
+  - [Captcha](#captcha)
   - [Translations](#translations)
   - [Dynamic validation](#dynamic-validation)
   - [Email field](#email-field)
@@ -79,24 +80,8 @@ With the integrated mailview field you can display requests allover the panel.
 
 `composer require plain/kirby-form-block-suite`
 
-**Get a license**
-
-[Klick here to obtain a license](https://plain-solutions.net/?product=801346)
-
 [See also the other plugins](https://plain-solutions.net/)
 
-**Validate your license**
-
-*Important notes: If you’re working in a development environment, please activate the license on the public domain. Licenses are tied to the domain they are first activated on.*
-
-To validate your license key click on this button:
-
-<img src="./.github/license.png" width="200" />
-
-...or go to *System* in the Panel and click on `plain/formblock` in the Plugins section. (Kirby > 5.0.0). You’ll be guided through the validation process from there.
-
-> If you have trouble with your license, check [Troubleshooting](#troubleshooting) at the end of this documentation.
-
 # How to use?
 
 Just create a block field in your blueprint and add `form` to the fieldsets props:
@@ -529,6 +514,40 @@ You can set the templates for outgoing emails like this:
 ],
 ```
 
+## Captcha
+
+```php
+'plain.formblock' => [
+   'captcha' => [
+        // choose one of these types: math | hcaptcha | recaptcha_v2 | recaptcha_v3
+        'mode' => 'math', //default
+
+        // If mode is 'math': Existing "calc" captcha settings
+        'math' => [
+            'min' => 1,
+            'max' => 90,
+        ],
+
+        // If mode is 'hcaptcha':
+        'hcaptcha' => [
+            'sitekey' => HCAPTCHA_SITEKEY,
+            'secret'  => HCAPTCHA_SECRET,
+        ],
+
+        // If mode is 'recaptcha_v2' or 'recaptcha_v2':
+        'recaptcha' => [
+            'sitekey' => RECAPTCHA_SITEKEY,
+            'secret'  => RECAPTCHA_SECRET,
+            // v3 only
+            'v3' => [
+                'threshold' => 0.5,
+                'action'    => 'form_submit',
+            ],
+        ]
+    ]
+],
+```
+
 ## Translations
 
 Change custom texts like this:
@@ -657,18 +676,6 @@ If it is impossible to activate symbolic links, copy the content of `site/plugin
 ```
 > This will be ignored for multilingual sites.
 
----
-
-**Problem:** Error to validate license key
-
-**Solutions:**
-- If you haven't got a license yet? Get a [license](https://plain-solutions.net/?product=801346).
-- Your server needs a connection to the license server: [https://plain-solutions.net](https://plain-solutions.net).
-- Your license key was already validated by another host [release the assigment here](https://plain-solutions.net/unlink).
-- Delete the license file `/site/config/.formblock_license` (if present) and try again. 
-
----
-
 **Problem:** Problem with the validation
 
 **Solutions:**
@@ -683,6 +690,6 @@ If you still have any questions or something is not working properly, [make an i
 
 # License
 
-By using this project, you agree to the terms and conditions outlined in our [Terms of Service](https://plain-solutions.net/terms). 
+Starting with version 6, this plugin is available under the MIT license.
 
-To acquire a license for this project, please visit our [Licensing Page](https://plain-solutions.net/801346).
+All customers who purchased this plugin receive support for one year from the date of purchase.

autoload/blockModels.php

@@ -2,21 +2,18 @@ name: form.block.fromfields.captcha
 icon: bug
 
 fields:
+  info:
+    text: form.block.fromfields.captcha.info
+  required_fail:
+    type: hidden
   slug:
     type: hidden
     default: captcha-input
+    width: 1/1
   placeholder:
     type: hidden
   required:
     default: true
     type: hidden
-  ask:
-    label: form.block.fromfields.captcha.ask
-    type: text
-    help: form.block.default.help
-  fail:
-    label: form.block.fromfields.captcha.fail
-    type: text
-    help: form.block.default.help
   autofill:
     type: hidden

autoload/blueprints.php

@@ -7,7 +7,7 @@
  * @author    Roman Gsponer <support@plain-solutions.net>
  * @link      https://plain-solutions.net/
  * @copyright Roman Gsponer
- * @license   https://plain-solutions.net/terms/ 
+ * @license   MIT / 
  */
 
 use Kirby\Filesystem\Dir;
@@ -124,8 +124,6 @@ private static function getFormfields(): array
 
         $fieldsets = [];
 
-        $out = [];
-
         $customfields = static::getBlueprint('blocks/customfields', true);
 
         $fieldsets = static::mergeFormfields(__DIR__ . '/../blueprints/blocks/formfields', $fieldsets, $customfields);