Sync master from upstream

README.md

@@ -4,7 +4,7 @@
 **Requires at least:** 6.4  
 **Tested up to:** 7.1  
 **Requires PHP:** 7.4  
-**Stable tag:** 2.12.5  
+**Stable tag:** 2.12.6  
 **License:** GPLv2 or later  
 **License URI:** http://www.gnu.org/licenses/gpl-2.0.html  
 
@@ -426,22 +426,17 @@ 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.6 - 2nd September 2026 ###
+* New: Added an Enable Logs option that records form submission failures to a downloadable file, making it easier to diagnose issues on a live site.
+* New: Added Views and Conversion Rate columns to the Forms list, so you can see how each form is performing at a glance.
+* 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.
 ### 2.12.4 - 19th August 2026 ###
 * Improvement: Email notification images are now saved to the Media Library instead of being embedded as base64, improving email deliverability and reducing message size.
 * Fix: Compatibility with WordPress 7.1.
-### 2.12.3 - 6th August 2026 ###
-* New: Added an "Entries" shortcut in the Instant Form admin bar to open a form's entries in one click.
-* Improvement: Enhanced WPML compatibility. [https://wpml.org/plugin/sureforms/](https://wpml.org/plugin/sureforms/)
-* Fix: This update addressed a security bug. Props to daroo and Wordfence for reporting it responsibly to our team.
-* Fix: Cloudflare Turnstile no longer shows a warning on WordPress 7.0.
-* Fix: Enhanced entries search - includes submitted data too.
-* Fix: Fixed a failed database update that could stop forms from accepting submissions.
-* Fix: Forms with default styles disabled no longer break the page — previously this aborted setup of every later form on the same page.
-* Fix: Payment History styles load only on required pages.
-* Fix: Removed the entries "Language" column. Sorting or filtering entries by language is no longer available, including via the entries API.
-* Fix: The number field no longer looks misaligned when "Use label as placeholder" is on.
 The full changelog is available [here](https://sureforms.com/whats-new/?utm_source=wordpress.org&utm_medium=whats_new).
 
 ## Upgrade Notice ##

admin/analytics.php

@@ -7,7 +7,9 @@
 
 namespace SRFM\Admin;
 
+use SRFM\Inc\Database\Register;
 use SRFM\Inc\Database\Tables\Entries;
+use SRFM\Inc\Form_Views;
 use SRFM\Inc\Helper;
 use SRFM\Inc\Learn;
 use SRFM\Inc\Traits\Get_Instance;
@@ -129,27 +131,38 @@ public static function events() {
 	 * @return array
 	 */
 	public function add_srfm_analytics_data( $stats_data ) {
-		$stats_data['plugin_data']['sureforms']                   = [
+		$stats_data['plugin_data']['sureforms'] = [
 			'free_version'          => SRFM_VER,
 			'site_language'         => get_locale(),
 			'most_used_anti_spam'   => $this->most_used_anti_spam(),
 			'user_status'           => $this->user_status(),
 			'pointer_popup_clicked' => $this->pointer_popup_clicked(),
 		];
+		// Every query against the entries table errors when the table is missing, so
+		// resolve that once here rather than letting each caller below trip over it.
+		$entries_table_missing = Register::is_entries_table_missing();
+
 		$stats_data['plugin_data']['sureforms']['numeric_values'] = [
 			'total_forms'                => wp_count_posts( SRFM_FORMS_POST_TYPE )->publish ?? 0,
 			'instant_forms_enabled'      => $this->instant_forms_enabled(),
 			'forms_using_custom_css'     => $this->forms_using_custom_css(),
 			'ai_generated_forms'         => $this->ai_generated_forms(),
 			'ai_generated_payment_forms' => $this->ai_generated_forms( 'payments' ),
 			'payment_forms'              => $this->get_payment_forms_count(),
-			'total_entries'              => Entries::get_total_entries_by_status(),
+			'total_entries'              => $entries_table_missing ? 0 : Entries::get_total_entries_by_status(),
 			'restricted_forms'           => $this->get_restricted_forms(),
 			'embed_styling_gb_default'   => self::embed_styling_gutenberg_count( 'default' ),
 			'embed_styling_el_default'   => self::embed_styling_elementor_count( 'default' ),
 			'embed_styling_br_default'   => self::embed_styling_bricks_count( 'default' ),
+			'total_form_views'           => $this->total_form_views(),
+			'forms_with_views'           => $this->forms_with_views(),
 		];
 
+		// Whether the entries table is currently missing. An event fires once when a
+		// site first sees the notice; this is what shows the state persisting, and
+		// catches a recurrence that the event's one-time dedup would swallow.
+		$stats_data['plugin_data']['sureforms']['boolean_values']['db_entries_table_missing'] = $entries_table_missing;
+
 		$stats_data['plugin_data']['sureforms'] = array_merge_recursive( $stats_data['plugin_data']['sureforms'], $this->global_settings_data() );
 		// Add KPI tracking data.
 		$kpi_data = $this->get_kpi_tracking_data();
@@ -488,9 +501,78 @@ public function global_settings_data() {
 		// Payment analytics - check if any payment method is enabled.
 		$global_data['boolean_values']['stripe_enabled'] = $this->is_stripe_enabled();
 
+		// Delegated rather than read from $general_settings directly, so the telemetry
+		// can never disagree with what the Forms list actually shows. That matters
+		// because the default has already changed once: reimplementing the check here
+		// means a future change has two places to be made and one to be forgotten.
+		$global_data['boolean_values']['form_views_columns_enabled'] = Form_Views::get_instance()->is_tracking_enabled();
+
 		return $global_data;
 	}
 
+	/**
+	 * Total page views counted across all published forms.
+	 *
+	 * Paired with `forms_with_views` and the existing `total_entries`, this is what
+	 * makes the conversion figure interpretable in the warehouse: a site with views
+	 * but no entries reads very differently from one with neither.
+	 *
+	 * Counts only published forms, so views left behind by a trashed or draft form
+	 * do not inflate the total against a denominator that no longer includes them.
+	 *
+	 * @since 2.12.6
+	 * @return int
+	 */
+	public function total_form_views() {
+		global $wpdb;
+
+		// Deliberately uncached: the only caller is the analytics payload builder,
+		// which runs once per cron pass. A cache would never see a second read inside
+		// a request, and any TTL would always have expired between passes — while
+		// still going stale if a second caller ever appeared.
+		// PHPCS: Ignore direct database query warning, as there is no built-in alternative.
+		// phpcs:ignore WordPress.DB.DirectDatabaseQuery.DirectQuery, WordPress.DB.DirectDatabaseQuery.NoCaching
+		$total = $wpdb->get_var(
+			$wpdb->prepare(
+				"
+			SELECT SUM( pm.meta_value )
+			FROM {$wpdb->postmeta} pm
+			INNER JOIN {$wpdb->posts} p ON p.ID = pm.post_id
+			WHERE pm.meta_key = %s
+			AND p.post_type = %s
+			AND p.post_status = 'publish'
+		",
+				Form_Views::META_KEY,
+				SRFM_FORMS_POST_TYPE
+			)
+		);
+
+		return Helper::get_integer_value( $total );
+	}
+
+	/**
+	 * Number of published forms that have been viewed at least once.
+	 *
+	 * Distinguishes "the feature is on but nothing is embedded anywhere" from "the
+	 * beacon is firing" — a total alone cannot, because one busy form looks the
+	 * same as many quiet ones.
+	 *
+	 * @since 2.12.6
+	 * @return int
+	 */
+	public function forms_with_views() {
+		return $this->custom_wp_query_total_posts(
+			[
+				[
+					'key'     => Form_Views::META_KEY,
+					'value'   => 0,
+					'compare' => '>',
+					'type'    => 'NUMERIC',
+				],
+			]
+		);
+	}
+
 	/**
 	 * Returns user status.
 	 *
@@ -719,6 +801,22 @@ public function track_embed_styling_configured( $post_id, $post ) {
 		);
 	}
 
+	/**
+	 * Track the plugin_activated event with the correct install referer.
+	 *
+	 * Dedup in self::events()->track() ensures this fires only once. Runs on
+	 * 'shutdown' (see detect_state_events()) so it reads bsf_product_referers
+	 * after any late-writing referer call has had a chance to run.
+	 *
+	 * @since 2.12.6
+	 * @return void
+	 */
+	public function track_plugin_activated_event() {
+		$bsf_referrers = get_option( 'bsf_product_referers', [] );
+		$source        = ! empty( $bsf_referrers['sureforms'] ) ? $bsf_referrers['sureforms'] : 'self';
+		self::events()->track( 'plugin_activated', SRFM_VER, [ 'source' => $source ] );
+	}
+
 	/**
 	 * Extract non-inherit formTheme values from Bricks element data.
 	 *
@@ -824,6 +922,14 @@ private function get_kpi_tracking_data() {
 	 * @return int Daily submissions count.
 	 */
 	private function get_daily_submissions_count( $date ) {
+		// Guarded here rather than at the call site: this is the function that runs
+		// the query, so a future caller is covered too. Every read against a missing
+		// entries table raises a DB error, and the daily send would raise one per
+		// day counted on exactly the sites whose breakage we most need reported.
+		if ( Register::is_entries_table_missing() ) {
+			return 0;
+		}
+
 		$start_date = $date . ' 00:00:00';
 		$end_date   = $date . ' 23:59:59';
 
@@ -853,10 +959,17 @@ private function get_daily_submissions_count( $date ) {
 	 * @return void
 	 */
 	private function detect_state_events() {
-		// plugin_activated: dedup in self::events()->track() ensures this fires only once.
-		$bsf_referrers = get_option( 'bsf_product_referers', [] );
-		$source        = ! empty( $bsf_referrers['sureforms'] ) ? $bsf_referrers['sureforms'] : 'self';
-		self::events()->track( 'plugin_activated', SRFM_VER, [ 'source' => $source ] );
+		// plugin_activated: deferred to 'shutdown' so that a referring plugin/theme's
+		// own BSF_UTM_Analytics::update_referer() call — which some products (incorrectly)
+		// make only after their activate_plugin() call returns, in the same request — has
+		// already run by the time we read bsf_product_referers. Reading this synchronously
+		// here would race that write, since this constructor can execute mid-request while
+		// SureForms itself is being activated by that other plugin.
+		if ( did_action( 'shutdown' ) ) {
+			$this->track_plugin_activated_event();
+		} else {
+			add_action( 'shutdown', [ $this, 'track_plugin_activated_event' ], PHP_INT_MAX );
+		}
 
 		// One-time: re-send onboarding_completed with full properties (v2).
 		if ( ! Helper::get_srfm_option( 'onboarding_event_v2_flushed', false )

admin/assets/js/notice-response.js

@@ -47,6 +47,23 @@
 		);
 	}
 
+	// Action-item notices declare what to record on the element itself, so a new
+	// one needs no entry in the map above. Delegated from the document because
+	// these render on every admin screen, not inside one known container.
+	document.addEventListener( 'click', function ( e ) {
+		const link = e.target.closest( '[data-srfm-notice-id][data-srfm-button]' );
+		if ( ! link ) {
+			return;
+		}
+
+		const noticeId = link.getAttribute( 'data-srfm-notice-id' );
+		const button = link.getAttribute( 'data-srfm-button' );
+
+		if ( noticeId && button ) {
+			sendResponse( noticeId, button );
+		}
+	} );
+
 	Object.keys( notices ).forEach( function ( noticeId ) {
 		const container = document.getElementById( noticeId );
 		if ( ! container ) {

admin/notice-manager.php

@@ -58,7 +58,10 @@ public function __construct() {
 	 *
 	 *     @type string   $id          Required. Unique notice identifier.
 	 *     @type string   $variant     Notice type: 'error', 'warning', 'info', 'success'. Default 'info'.
-	 *     @type string   $message     Required. Notice message (can contain HTML).
+	 *     @type string   $message     Required. Notice message. Plain text only —
+	 *                                 AdminNotice.js renders it as a React child, so any
+	 *                                 markup shows up as literal characters. Links belong
+	 *                                 in `actions`.
 	 *     @type string   $title       Optional. Notice title.
 	 *     @type array    $actions     Optional. Array of action button configurations.
 	 *     @type bool     $dismissible Optional. Whether notice can be dismissed. Default true.
@@ -73,6 +76,12 @@ public function __construct() {
 	 *     @type string $variant  Optional. Button variant: 'primary', 'secondary', 'link'. Default 'primary'.
 	 *     @type string $size     Optional. Button size: 'sm', 'md', 'lg'. Default 'sm'.
 	 *     @type string $className Optional. Additional CSS classes.
+	 *     @type string $action   Optional. Opaque identifier that AdminNotice.js resolves
+	 *                            to a local handler, for an action that must call the
+	 *                            server. Deliberately NOT a URL, endpoint or HTTP method:
+	 *                            the server never tells the browser which address to call.
+	 *                            Pair it with `url` so the action still does something if
+	 *                            no handler is registered for the identifier.
 	 * }
 	 *
 	 * @return void
@@ -187,7 +196,7 @@ public function add_notices_to_localized_data( $localization_data ) {
 	 *
 	 * @param string $id      Unique notice identifier.
 	 * @param string $variant Notice type: 'error', 'warning', 'info', 'success'.
-	 * @param string $message Notice message (HTML allowed).
+	 * @param string $message Notice message. Plain text only; see register_notice().
 	 * @param array  $actions Optional. Array of action button configurations.
 	 * @param array  $pages   Optional. Page slugs where notice should appear. Default ['all'].
 	 * @return void