Sync master from upstream

.distignore

@@ -67,6 +67,11 @@ auth.json
 credentials.json
 
 # Directories
+# Build-time artwork source. Webpack re-emits every @Image/onboarding import as a
+# hashed file under assets/build/images/, so shipping this directory as well put
+# the same 2.8 MB in the ZIP twice. The rest of images/ cannot be ignored --
+# inc/gutenberg-hooks.php serves images/field-previews/* directly.
+images/onboarding
 node_modules
 vendor
 tests

README.md

@@ -2,9 +2,9 @@
 **Contributors:** [brainstormforce](https://profiles.wordpress.org/brainstormforce/)  
 **Tags:** forms, ai forms, contact form, form builder, payment form  
 **Requires at least:** 6.4  
-**Tested up to:** 7.1  
+**Tested up to:** 7.1.2  
 **Requires PHP:** 7.4  
-**Stable tag:** 2.12.7  
+**Stable tag:** 2.12.8  
 **License:** GPLv2 or later  
 **License URI:** http://www.gnu.org/licenses/gpl-2.0.html  
 
@@ -426,6 +426,10 @@ Visit the [SureForms features page](https://sureforms.com/features/?utm_source=w
 You can report security issues through our [Bug Bounty Program](https://brainstormforce.com/bug-bounty-program/). We collaborate with Patchstack to validate, triage, and handle security reports.
 
 ## Changelog ##
+### 2.12.8 - 25th September 2026 ###
+* Improvement: The debug log no longer records routine validation stops, such as an empty required field, keeping it focused on real failures.
+* Fix: Entry Logs now record the email notification sent when a form is submitted.
+* Fix: Resolved an editor crash that prevented forms containing a Register block from opening.
 ### 2.12.7 - 12th September 2026 ###
 * Improvement: Submission failure notices now offer View details, so you can read and copy the full diagnostics before contacting support.
 * Improvement: The Form Checks panel now appears only when something genuinely needs attention, with clearer wording, keeping the sidebar focused.
@@ -441,8 +445,6 @@ You can report security issues through our [Bug Bounty Program](https://brainsto
 * New: SureForms now detects a missing entries database table and offers a one-click repair, so submissions start saving again without manual database work.
 * Fix: The Edit Form button no longer overlaps form fields on the front end.
 * Fix: This update addressed a security bug. Props to Patchstack for reporting it responsibly to our team.
-### 2.12.5 - 25th August 2026 ###
-* Fix: Form submissions now go through reliably, even on sites where a performance plugin combines or defers JavaScript.
 The full changelog is available [here](https://sureforms.com/whats-new/?utm_source=wordpress.org&utm_medium=whats_new).
 
 ## Upgrade Notice ##

admin/analytics.php

@@ -990,6 +990,14 @@ private function detect_state_events() {
 			$onboarding_props     = [];
 			$onboarding_analytics = Helper::get_srfm_option( 'onboarding_analytics', [] );
 
+			// Which wizard produced the blob. Outside the non-empty guard and not
+			// isset()-gated like the flags below, because absence IS the answer: a
+			// blob from the old wizard, or no blob at all, must still report 'no'.
+			// Without this the two wizards share one event name and can only be
+			// told apart by which properties happen to be present -- and a v2 run
+			// on Pro with no caching plugin emits none of the new ones.
+			$onboarding_props['onboarding_v2'] = ! empty( $onboarding_analytics['onboardingV2'] ) ? 'yes' : 'no';
+
 			if ( ! empty( $onboarding_analytics ) && is_array( $onboarding_analytics ) ) {
 				if ( ! empty( $onboarding_analytics['skippedSteps'] ) && is_array( $onboarding_analytics['skippedSteps'] ) ) {
 					$onboarding_props['skipped_steps'] = implode( ',', $onboarding_analytics['skippedSteps'] );
@@ -1011,15 +1019,38 @@ private function detect_state_events() {
 					$onboarding_props['exited_early'] = (bool) $onboarding_analytics['exitedEarly'] ? 'yes' : 'no';
 				}
 
-				if ( ! empty( $onboarding_analytics['premiumFeatures']['selectedFeatures'] ) && is_array( $onboarding_analytics['premiumFeatures']['selectedFeatures'] ) ) {
-					$premium                                       = array_filter(
-						$onboarding_analytics['premiumFeatures']['selectedFeatures'],
-						static function( $f ) {
-							return 'ai-form-generation' !== $f && 'entries' !== $f;
-						}
+				// Add-ons step: the wizard shows one feature tab at a time
+				// instead of a checkbox list, so we report which tabs were opened and
+				// whether Upgrade was clicked. Blobs written by older wizards carry
+				// neither key and emit neither property.
+				if ( ! empty( $onboarding_analytics['premiumFeatures']['viewedTabs'] ) && is_array( $onboarding_analytics['premiumFeatures']['viewedTabs'] ) ) {
+					// The blob is whatever the wizard POSTed. The tabs are a closed
+					// set of four, so intersect against it rather than filtering on
+					// type: that drops anything unrecognised and caps both the
+					// content and the length of the property in one step.
+					$viewed_tabs                             = array_values(
+						array_intersect(
+							array_map( 'strval', array_filter( (array) $onboarding_analytics['premiumFeatures']['viewedTabs'], 'is_scalar' ) ),
+							[ 'multistep', 'conditional', 'calculation', 'conversational' ]
+						)
 					);
-					$onboarding_props['selected_premium_features'] = implode( ',', $premium );
-					$onboarding_props['premium_features_count']    = (string) count( $premium );
+					$onboarding_props['viewed_premium_tabs'] = implode( ',', $viewed_tabs );
+				}
+
+				if ( isset( $onboarding_analytics['premiumFeatures']['upgradeClicked'] ) ) {
+					$onboarding_props['premium_upgrade_clicked'] = (bool) $onboarding_analytics['premiumFeatures']['upgradeClicked'] ? 'yes' : 'no';
+				}
+
+				// Cache-conflict step: shown only when a recognised caching plugin
+				// is active; "yes" means the user pressed "I've fixed this".
+				//
+				// Read this as an abandonment signal, not as intent. Acknowledging
+				// is the only way past the step, so everyone who completes the
+				// wizard reports "yes" and "no" only ever appears next to
+				// exited_early. It cannot answer "did people act on the warning" --
+				// only "did they stop here".
+				if ( isset( $onboarding_analytics['cacheConflictAcknowledged'] ) ) {
+					$onboarding_props['cache_conflict_acknowledged'] = (bool) $onboarding_analytics['cacheConflictAcknowledged'] ? 'yes' : 'no';
 				}
 			}