Prepare for 6.33

changelog.txt

@@ -1,4 +1,12 @@
 == Changelog ==
+= 6.33 =
+* New: A new Gated Content form action type has been added. Now you can easily give access to restricted pages, views, pdfs, and files!
+* New: A new Spam settings section has been added to Form settings. Several spam settings have been moved here. In addition this section includes a summary of Global Spam settings, and a new Include Captcha in this form setting to easily add and remove Captcha fields.
+* New: PayPal Commerce front end error messages have been improved.
+* New: A Payment Settings button has been added to the Payments list page.
+* Fix: Google Pay would use the test environment incorrectly when using PayPal Commerce.
+* Fix: A Using null as an array offset is deprecated, use an empty string instead PHP deprecated message has been fixed.
+
 = 6.32.1 =
 * Security: An issue has been fixed where requests could be manipulated to attempt form submissions using test payments instead of live payments, for Stripe, Square, and PayPal Commerce.
 * Security: An incorrect status check would allow forms to submit without errors when using PayPal Commerce to handle subscriptions in a pending approval status. Credit to Yaswanth Reddy Sunkara and WPScan for reporting the issue.

classes/controllers/FrmFormsController.php

@@ -306,7 +306,7 @@ private static function antispam_was_on( $form_id ) {
 	/**
 	 * Handle captcha field inclusion in form
 	 *
-	 * @since x.x
+	 * @since 6.33
 	 *
 	 * @param int  $form_id         Form ID.
 	 * @param bool $include_captcha Whether to include captcha field.
@@ -1712,7 +1712,7 @@ public static function advanced_settings( $values ) {
 	}
 
 	/**
-	 * @since x.x
+	 * @since 6.33
 	 *
 	 * @param array $values
 	 *
@@ -3804,13 +3804,13 @@ public static function create( $values = array() ) {
 	}
 
 	/**
-	 * @deprecated x.x
+	 * @deprecated 6.33
 	 *
 	 * @param array $values
 	 *
 	 * @return void
 	 */
 	public static function render_spam_settings( $values ) {
-		_deprecated_function( __METHOD__, 'x.x' );
+		_deprecated_function( __METHOD__, '6.33' );
 	}
 }

classes/controllers/FrmGatedContentController.php

@@ -4,7 +4,7 @@
  *
  * @package Formidable
  *
- * @since x.x
+ * @since 6.33
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
@@ -306,7 +306,7 @@ public static function trigger( $action, $entry, $form, $event ) {
 	 *
 	 * Hooked to `frm_helper_shortcodes` with 3 accepted args.
 	 *
-	 * @since x.x
+	 * @since 6.33
 	 *
 	 * @param array  $shortcodes   Existing shortcode helpers array (shortcode => label).
 	 * @param string $settings_tab Active settings tab slug.

classes/controllers/FrmGatedContentShortcodeController.php

@@ -6,7 +6,7 @@
  *
  * @package Formidable
  *
- * @since x.x
+ * @since 6.33
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
@@ -56,7 +56,7 @@ public static function shortcode( $atts ) {
 		 * Return a non-null string to short-circuit the default rendering. Return null
 		 * to let the shortcode fall through to its built-in show= handlers.
 		 *
-		 * @since x.x
+		 * @since 6.33
 		 *
 		 * @param string|null $output Output string, or null to continue default handling.
 		 * @param array       $atts   Full shortcode attributes array (id, show, item, …).

classes/helpers/FrmAppHelper.php

@@ -29,7 +29,7 @@ class FrmAppHelper {
 	 *
 	 * @var string
 	 */
-	public static $plug_version = '6.32.1';
+	public static $plug_version = '6.33';
 
 	/**
 	 * @var bool

classes/helpers/FrmGatedTokenHelper.php

@@ -4,7 +4,7 @@
  *
  * @package Formidable
  *
- * @since x.x
+ * @since 6.33
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
@@ -83,7 +83,7 @@ public static function generate( $action, $entry, $event ) {
 		 * token — for example, Formidable Registration hooks here to set the correct
 		 * user_id when the registrant is not yet logged in at trigger time.
 		 *
-		 * @since x.x
+		 * @since 6.33
 		 *
 		 * @param array  $data Row data to insert into wp_frm_gated_tokens.
 		 * @param array  $args {
@@ -483,7 +483,7 @@ public static function get_valid_token( FrmGatedItem $item ) {
 		 * a valid token. Add-ons can return a validated FrmGatedToken to grant access from
 		 * alternative sources, or null to indicate no token is available.
 		 *
-		 * @since x.x
+		 * @since 6.33
 		 *
 		 * @param FrmGatedToken|null        $token Null — no valid token found by core.
 		 * @param array{item: FrmGatedItem} $args  Array containing the content item being accessed.

classes/helpers/FrmHtmlHelper.php

@@ -38,7 +38,7 @@ function () use ( $id, $name, $args ) {
 	/**
 	 * Show readonly setting icon
 	 *
-	 * @since x.x
+	 * @since 6.33
 	 *
 	 * @param bool $is_enabled Whether the setting is enabled.
 	 *

classes/models/FrmGatedContentAction.php

@@ -4,7 +4,7 @@
  *
  * @package Formidable
  *
- * @since x.x
+ * @since 6.33
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
@@ -134,7 +134,7 @@ public function get_defaults() {
 	 * The `frm_gated_content_shortcodes` filter allows Pro and add-ons to append
 	 * additional rows (e.g. show="expired_time" when expiry is configured).
 	 *
-	 * @since x.x
+	 * @since 6.33
 	 *
 	 * @param int $action_id Gated content action post ID.
 	 *
@@ -167,7 +167,7 @@ public static function get_shortcodes( $action_id ) {
 		 * - code   (string) The shortcode string to display and copy.
 		 * - output (string) Human-readable description of what it outputs.
 		 *
-		 * @since x.x
+		 * @since 6.33
 		 *
 		 * @param array<int, array{code: string, output: string}> $shortcodes Shortcode rows.
 		 * @param int                                             $action_id  Gated content action post ID.
@@ -214,7 +214,7 @@ public static function get_posts() {
 		 *
 		 * The filtered list is then narrowed to private and password-protected posts only.
 		 *
-		 * @since x.x
+		 * @since 6.33
 		 *
 		 * @param array $query_args get_posts() argument array.
 		 */

classes/models/FrmGatedItem.php

@@ -8,7 +8,7 @@
  *
  * @package Formidable
  *
- * @since x.x
+ * @since 6.33
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
@@ -57,7 +57,7 @@ public static function make( array $item ) {
 		 * Return a FrmGatedItem subclass instance to handle the given type.
 		 * Return null to fall back to the base FrmGatedItem.
 		 *
-		 * @since x.x
+		 * @since 6.33
 		 *
 		 * @param FrmGatedItem|null                   $instance Instance, or null to use base class.
 		 * @param array{type: string, id: int|string} $item     Item data array with 'type' and 'id' keys.
@@ -138,7 +138,7 @@ public function get_title() {
 	 * Subclasses may override to produce a more specific name — e.g. when the
 	 * same post type can have multiple distinct access scopes (view + entry).
 	 *
-	 * @since x.x
+	 * @since 6.33
 	 *
 	 * @return string
 	 */
@@ -154,7 +154,7 @@ public function get_cookie_name() {
 	 * include extra scope — e.g. entry ID for view items — so that cache
 	 * entries for different access scopes never collide.
 	 *
-	 * @since x.x
+	 * @since 6.33
 	 *
 	 * @return string
 	 */

classes/models/FrmGatedToken.php

@@ -7,7 +7,7 @@
  *
  * @package Formidable
  *
- * @since x.x
+ * @since 6.33
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
@@ -153,7 +153,7 @@ public function validate( FrmGatedItem $item ) {
 		/**
 		 * Filters whether a resolved token grants access to a content item.
 		 *
-		 * @since x.x
+		 * @since 6.33
 		 *
 		 * @param bool          $is_valid  Whether the token passes structural validation.
 		 * @param array         $args {

classes/views/frm-form-actions/_gated_content_item_row.php

@@ -14,7 +14,7 @@
  *
  * @package Formidable
  *
- * @since x.x
+ * @since 6.33
  *
  * @var bool         $is_template         True when rendering the JS clone template.
  * @var string       $frm_gc_item_type    Active type key ('post', 'frm_file', …). Always 'post' for template.
@@ -201,7 +201,7 @@
 			 * wrapper as the primary post selector. Fires for both existing rows and the
 			 * JS <template> row.
 			 *
-			 * @since x.x
+			 * @since 6.33
 			 *
 			 * @param string $type     Post-type key for this settings div (e.g. 'frm_display').
 			 * @param array  $row_args Same keys as the outer `frm_gated_content_item_type_settings` hook.
@@ -225,7 +225,7 @@
 		 * - In existing-row mode: add `hidden` when `$args['active_type'] !== '{TYPE}'`; use real for/id/name.
 		 * - Add `data-frm-gc-field="{KEY}"` to each input so JS manages its name on type change.
 		 *
-		 * @since x.x
+		 * @since 6.33
 		 *
 		 * @param array $args {
 		 *

classes/views/frm-form-actions/_gated_content_settings.php

@@ -4,7 +4,7 @@
  *
  * @package Formidable
  *
- * @since x.x
+ * @since 6.33
  *
  * @var object                $instance Form action post object. Settings in $instance->post_content.
  * @var array                 $args     Contains `form`, `action_key`, `values`.

classes/views/frm-form-actions/_gated_content_shortcodes.php

@@ -4,7 +4,7 @@
  *
  * @package Formidable
  *
- * @since x.x
+ * @since 6.33
  *
  * @var int $frm_gc_action_id Gated content action post ID.
  */

classes/views/frm-forms/spam-settings.php

@@ -2,7 +2,7 @@
 /**
  * Spam settings for form
  *
- * @since x.x
+ * @since 6.33
  *
  * @package Formidable
  *