Updates to 2.9.7.2

Author: Gravity Forms

assets/js/dist/assets.php

@@ -1 +1 @@
-<?php return array('hash_map' => array('admin-components.min.js' => array('version' => '066871d1b555f41a6e9697608dee9ad4', 'file' => 'admin-components.min.js'), 'libraries.min.js' => array('version' => '4dea2c1ac02022febd3ab26058a82fa4', 'file' => 'libraries.min.js'), 'react-utils.min.js' => array('version' => '317e7f73d059f4c17a97f822575d199c', 'file' => 'react-utils.min.js'), 'scripts-admin.min.js' => array('version' => 'f31619cf3dd8cf8fcd68a027dc02dc48', 'file' => 'scripts-admin.min.js'), 'scripts-theme.min.js' => array('version' => 'df7d94fe9fc1f64aa683997d87531853', 'file' => 'scripts-theme.min.js'), 'utils.min.js' => array('version' => 'a8f8e72876ba5bc3f797026fe4225946', 'file' => 'utils.min.js'), 'vendor-admin.min.js' => array('version' => '5c817f596821cbb9a6254ebae1506a95', 'file' => 'vendor-admin.min.js'), 'vendor-theme.min.js' => array('version' => '639b4ac21c17c9dc304b05db4a3d3293', 'file' => 'vendor-theme.min.js')));
+<?php return array('hash_map' => array('admin-components.min.js' => array('version' => '066871d1b555f41a6e9697608dee9ad4', 'file' => 'admin-components.min.js'), 'libraries.min.js' => array('version' => '4dea2c1ac02022febd3ab26058a82fa4', 'file' => 'libraries.min.js'), 'react-utils.min.js' => array('version' => '317e7f73d059f4c17a97f822575d199c', 'file' => 'react-utils.min.js'), 'scripts-admin.min.js' => array('version' => 'f31619cf3dd8cf8fcd68a027dc02dc48', 'file' => 'scripts-admin.min.js'), 'scripts-theme.min.js' => array('version' => '96c75ff0cdaac8ba09d57979885a0fc0', 'file' => 'scripts-theme.min.js'), 'utils.min.js' => array('version' => 'a8f8e72876ba5bc3f797026fe4225946', 'file' => 'utils.min.js'), 'vendor-admin.min.js' => array('version' => '5c817f596821cbb9a6254ebae1506a95', 'file' => 'vendor-admin.min.js'), 'vendor-theme.min.js' => array('version' => '639b4ac21c17c9dc304b05db4a3d3293', 'file' => 'vendor-theme.min.js')));

assets/js/dist/scripts-theme.min.asset.php

@@ -1 +1 @@
-<?php return array('dependencies' => array('gform_gravityforms_utils', 'jquery', 'wp-polyfill'), 'version' => '3221725d61bf5a30ff41');
+<?php return array('dependencies' => array('gform_gravityforms_utils', 'jquery', 'wp-polyfill'), 'version' => '432ac1965f9ee22a65a7');

assets/js/dist/scripts-theme.min.js

@@ -1,3 +1,13 @@
+### 2.9.7.2
+- API: Fixed an issue with the gform/post_render event being fired too early during an AJAX submission, which causes conflicts with certain add-ons.
+- Updated the default honeypot action from "Do not create an entry" to "Create an entry and mark it as spam".
+- Fixed an issue where the honeypot doesn't work with new Ajax.
+- API: Updated GFAPI::submit_form() to support an optional 6th param, $initiated_by, the process that initiated the submission. Supported integers are 1 (aka GFFormDisplay::SUBMISSION_INITIATED_BY_WEBFORM) or 2 (aka GFFormDisplay::SUBMISSION_INITIATED_BY_API). Defaults to GFFormDisplay::SUBMISSION_INITIATED_BY_API.
+- API: Updated the result returned by GFAPI::submit_form() to include the is_spam, confirmation_message, and confirmation_type properties when the form fails honeypot validation and it is configured to use the "Do not create an entry" action.
+- Fixed a PHP fatal error that occurs during background processing if another plugin includes an older version of WP_Async_Request that doesn't include maybe_wp_die().
+- Fixed a PHP fatal error that occurs in wp_date() for some PHP versions and timestamps during background processing if a batch has previously been attempted.
+- Fixed a 403 error that occurs when a background processor dispatch method is called during an admin-ajax.php request, such as the one used to process new Ajax enabled form submissions.
+
 ### 2.9.7.1
 - Fixed an accessibility issue where the consent field description does not get keyboard focus.
 - Added a setting to disable the dashboard widget.

change_log.txt

@@ -169,6 +169,7 @@ public static function process_form( $form_id, $initiated_by = self::SUBMISSION_
 				// Display confirmation but doesn't process the form. Useful for spam filters.
 				$confirmation = self::handle_confirmation( $form, $lead, $ajax );
 				$is_valid     = false;
+				self::set_submission_if_null( $form_id, 'abort_with_confirmation', true );
 			} elseif ( ! $saving_for_later ) {
 
 				GFCommon::log_debug( 'GFFormDisplay::process_form(): Submission is valid. Moving forward.' );

form_display.php

@@ -97,6 +97,7 @@ public static function form_settings_ui() {
 	 * Prepare form settings fields.
 	 *
 	 * @since 2.5
+	 * @since 2.9.8 Updated honeypotAction default to spam.
 	 *
 	 * @param array $form Form being edited.
 	 *
@@ -518,7 +519,7 @@ public static function form_settings_fields( $form ) {
 					array(
 						'name'          => 'honeypotAction',
 						'type'          => 'radio',
-						'default_value' => 'abort',
+						'default_value' => 'spam',
 						'horizontal'    => true,
 						'label'         => esc_html__( 'If the honeypot flags a submission as spam:', 'gravityforms' ),
 						'dependency'    => array(
@@ -696,6 +697,7 @@ class="gform-alert__cta gform-button gform-button--white gform-button--size-xs"
 	 * Initialize Plugin Settings fields renderer.
 	 *
 	 * @since 2.5
+	 * @since 2.9.8 Updated honeypotAction default to spam.
 	 */
 	public static function initialize_settings_renderer() {
 
@@ -761,7 +763,7 @@ public static function initialize_settings_renderer() {
 
 					// Form Options
 					$form['enableHoneypot']  = (bool) rgar( $values, 'enableHoneypot' );
-					$form['honeypotAction']  = GFCommon::whitelist( rgar( $values, 'honeypotAction' ), array( 'abort', 'spam' ) );
+					$form['honeypotAction']  = GFCommon::whitelist( rgar( $values, 'honeypotAction' ), array( 'spam', 'abort' ) );
 					$form['enableAnimation'] = (bool) rgar( $values, 'enableAnimation' );
 					$form['markupVersion']   = rgar( $values, 'markupVersion' ) ? 1 : 2;
 

form_settings.php

@@ -3,7 +3,7 @@
 Plugin Name: Gravity Forms
 Plugin URI: https://gravityforms.com
 Description: Easily create web forms and manage form entries within the WordPress admin.
-Version: 2.9.7.1
+Version: 2.9.7.2
 Requires at least: 6.5
 Requires PHP: 7.4
 Author: Gravity Forms
@@ -257,7 +257,7 @@ class GFForms {
 	 *
 	 * @var string $version The version number.
 	 */
-	public static $version = '2.9.7.1';
+	public static $version = '2.9.7.2';
 
 	/**
 	 * Handles background upgrade tasks.

gravityforms.php

@@ -1,11 +1,13 @@
 <?php
 
+use Gravity_Forms\Gravity_Forms\Async\GF_Background_Process;
+
 if ( ! class_exists( 'GFForms' ) ) {
 	die();
 }
 
-if ( ! class_exists( 'GF_Background_Process' ) ) {
-	require_once GF_PLUGIN_DIR_PATH . 'includes/libraries/gf-background-process.php';
+if ( ! class_exists( 'Gravity_Forms\Gravity_Forms\Async\GF_Background_Process' ) ) {
+	require_once GF_PLUGIN_DIR_PATH . 'includes/async/class-gf-background-process.php';
 }
 
 /**

includes/addon/class-gf-feed-processor.php

@@ -103,30 +103,31 @@ public function submit_form() {
 		$style             = rgpost( 'gform_style_settings' );
 		$submission_method = rgpost( 'gform_submission_method' );
 
-		$result = \GFAPI::submit_form( $form_id, array(), $field_values, $target_page, $source_page );
+		require_once \GFCommon::get_base_path() . '/form_display.php';
+
+		$result = \GFAPI::submit_form( $form_id, array(), $field_values, $target_page, $source_page, \GFFormDisplay::SUBMISSION_INITIATED_BY_WEBFORM );
 
 		if ( is_wp_error( $result ) ) {
 			wp_send_json_error( $result->get_error_message() );
 		}
 
 		$form = $result['form'];
 
-		// Adding validation markup if form failed validation
-		if ( ! $result['is_valid'] ) {
-			$result = $this->add_validation_summary( $form, $result );
-		}
-
 		// Adding confirmation markup if there is a confirmation message to be displayed.
 		if ( rgar( $result, 'confirmation_type' ) == 'message' && ! empty( rgar( $result, 'confirmation_message' ) ) ) {
 			// Get confirmation markup from get_form(). This is necessary to ensure that confirmation markup is properly formatted.
 			$result['confirmation_markup'] = \GFFormDisplay::get_form( $form_id, false, false, false, $field_values, false, 0, $theme, $style );
 		} elseif ( ! $result['is_valid'] ) {
+			$result = $this->add_validation_summary( $form, $result );
+
 			// Refresh the form markup if single page or multipage forms have validation errors.
 			$result['form_markup'] = \GFFormDisplay::get_form( $form_id, false, false, false, $field_values, false, 0, $theme, $style );
 		} elseif ( $target_page > 0 ) {
 			// Getting the target page number taking page conditional logic into account.
 			$page_number = \GFFormDisplay::get_target_page( $form, $source_page, $field_values );
 
+			$result = $this->add_validation_summary( $form, $result );
+
 			// Getting the field markup for the target page if the form is a multipage form.
 			$result['page_markup'] = \GFFormDisplay::get_page( $form_id, $page_number, $field_values, $theme, $style, $submission_method );
 		}

includes/ajax/class-gf-ajax-handler.php

@@ -1664,22 +1664,18 @@ public static function update_note( $note, $note_id = '' ) {
 	 * 'resume_token' => string '045f941cc4c04d479556bab1db6d3495'
 	 *
 	 * @since  Unknown
-	 * @access public
-	 *
-	 * @uses GFAPI::get_form()
-	 * @uses GFCommon::get_base_path()
-	 * @uses GFFormDisplay::process_form()
-	 * @uses GFFormDisplay::replace_save_variables()
+	 * @since  2.9.9 Added the optional $initiated_by param.
 	 *
-	 * @param int $form_id The Form ID
-	 * @param array $input_values An array of values. Not $_POST, that will be automatically merged with the $input_values.
-	 * @param array $field_values Optional.
-	 * @param int $target_page Optional.
-	 * @param int $source_page Optional.
+	 * @param int      $form_id      The Form ID
+	 * @param array    $input_values An array of values. Not $_POST, that will be automatically merged with the $input_values.
+	 * @param array    $field_values Optional. An array of dynamic population parameter keys with their corresponding values used to populate the fields.
+	 * @param int      $target_page  Optional. For multi-page forms to indicate which page is to be loaded if the current page passes validation. Default is 0, indicating the last or only page is being submitted.
+	 * @param int      $source_page  Optional. For multi-page forms to indicate which page of the form was just submitted. Default is 1.
+	 * @param null|int $initiated_by Optional. The process that initiated the submission. Supported integers are 1 (aka GFFormDisplay::SUBMISSION_INITIATED_BY_WEBFORM) or 2 (aka GFFormDisplay::SUBMISSION_INITIATED_BY_API). Defaults to GFFormDisplay::SUBMISSION_INITIATED_BY_API.
 	 *
 	 * @return array|WP_Error An array containing the result of the submission.
 	 */
-	public static function submit_form( $form_id, $input_values, $field_values = array(), $target_page = 0, $source_page = 1 ) {
+	public static function submit_form( $form_id, $input_values, $field_values = array(), $target_page = 0, $source_page = 1, $initiated_by = null ) {
 
 		if ( gf_upgrade()->get_submissions_block() ) {
 			return new WP_Error( 'submissions_blocked', __( 'Submissions are currently blocked due to an upgrade in progress', 'gravityforms' ) );
@@ -1699,7 +1695,8 @@ public static function submit_form( $form_id, $input_values, $field_values = arr
 
 		try {
 			require_once GFCommon::get_base_path() . '/form_display.php';
-			GFFormDisplay::process_form( $form_id, GFFormDisplay::SUBMISSION_INITIATED_BY_API );
+			$initiated_by = GFCommon::whitelist( $initiated_by, array( GFFormDisplay::SUBMISSION_INITIATED_BY_API, GFFormDisplay::SUBMISSION_INITIATED_BY_WEBFORM ) );
+			GFFormDisplay::process_form( $form_id, $initiated_by );
 		} catch ( Exception $ex ) {
 			remove_filter( 'gform_suppress_confirmation_redirect', '__return_true' );
 			remove_filter( 'gform_pre_validation', array( 'GFAPI', 'submit_form_filter_gform_pre_validation' ), 50 );
@@ -1721,17 +1718,12 @@ public static function submit_form( $form_id, $input_values, $field_values = arr
 
 		$result = array();
 
-		$result['is_valid'] = $submission_details['is_valid'];
-
-		if ( $result['is_valid'] == false ) {
-			$result['validation_messages'] = self::get_field_validation_errors( $submission_details['form'] );
-		}
-
+		$result['is_valid']           = $submission_details['is_valid'];
 		$result['form']               = $submission_details['form'];
 		$result['page_number']        = $submission_details['page_number'];
 		$result['source_page_number'] = $submission_details['source_page_number'];
 
-		if ( $submission_details['is_valid'] ) {
+		if ( $result['is_valid'] || rgar( $submission_details, 'abort_with_confirmation' ) ) {
 			$confirmation_message = $submission_details['confirmation_message'];
 
 			if ( is_array( $confirmation_message ) ) {
@@ -1748,7 +1740,9 @@ public static function submit_form( $form_id, $input_values, $field_values = arr
 			}
 
 			$result['entry_id'] = rgars( $submission_details, 'lead/id' );
-			$result['is_spam']  = rgars( $submission_details, 'is_spam' );
+			$result['is_spam']  = rgar( $submission_details, 'is_spam' );
+		} else {
+			$result['validation_messages'] = self::get_field_validation_errors( $submission_details['form'] );
 		}
 
 		if ( isset( $submission_details['resume_token'] ) ) {

includes/api.php

@@ -11,7 +11,6 @@
 use Gravity_Forms\Gravity_Forms\GF_Service_Provider;
 use Gravity_Forms\Gravity_Forms\Telemetry\GF_Telemetry_Processor;
 use GFForms;
-use GF_Background_Process;
 use GF_Background_Upgrader;
 use GF_Feed_Processor;