From 2c225f4df0a25fb79a06de7f538e22a31868807a Mon Sep 17 00:00:00 2001
From: Mike Letellier <mike@crabcyb.org>
Date: Thu, 17 Oct 2024 15:46:23 -0300
Subject: [PATCH 1/5] Try to optimize how styles are saved

---
 classes/controllers/FrmStylesController.php |  6 +++---
 classes/views/styles/_manage-styles-row.php |  4 ++--
 js/formidable_admin.js                      | 15 +++++++++++++++
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/classes/controllers/FrmStylesController.php b/classes/controllers/FrmStylesController.php
index 39d6741e35..a2f33687e2 100644
--- a/classes/controllers/FrmStylesController.php
+++ b/classes/controllers/FrmStylesController.php
@@ -765,12 +765,12 @@ private static function manage_styles() {
 
 		$forms = FrmForm::get_published_forms();
 		foreach ( $forms as $form ) {
-			$new_style      = isset( $_POST['style'] ) && isset( $_POST['style'][ $form->id ] ) ? sanitize_text_field( wp_unslash( $_POST['style'][ $form->id ] ) ) : ''; // phpcs:ignore WordPress.Security.NonceVerification.Missing
-			$previous_style = isset( $_POST['prev_style'] ) && isset( $_POST['prev_style'][ $form->id ] ) ? sanitize_text_field( wp_unslash( $_POST['prev_style'][ $form->id ] ) ) : ''; // phpcs:ignore WordPress.Security.NonceVerification.Missing
-			if ( $new_style == $previous_style ) {
+			if ( ! isset( $_POST['style'] ) || ! isset( $_POST['style'][ $form->id ] ) ) {
 				continue;
 			}
 
+			$new_style = sanitize_text_field( wp_unslash( $_POST['style'][ $form->id ] ) ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
+
 			$form->options['custom_style'] = $new_style;
 			$wpdb->update( $wpdb->prefix . 'frm_forms', array( 'options' => maybe_serialize( $form->options ) ), array( 'id' => $form->id ) );
 			unset( $form );
diff --git a/classes/views/styles/_manage-styles-row.php b/classes/views/styles/_manage-styles-row.php
index ead1949088..b9c67d1c26 100644
--- a/classes/views/styles/_manage-styles-row.php
+++ b/classes/views/styles/_manage-styles-row.php
@@ -11,9 +11,9 @@
 		<label for="<?php echo esc_attr( $dropdown_id ); ?>"><?php echo esc_html( $form_name ); ?></label>
 	</td>
 	<td>
-		<input type="hidden" name="prev_style[<?php echo absint( $form->id ); ?>]" value="<?php echo esc_attr( $active_style_id ); ?>" />
+		<input id="frm_prev_style_<?php echo absint( $form->id ); ?>" type="hidden" value="<?php echo esc_attr( $active_style_id ); ?>" />
 
-		<select id="<?php echo esc_attr( $dropdown_id ); ?>" name="style[<?php echo absint( $form->id ); ?>]">
+		<select id="<?php echo esc_attr( $dropdown_id ); ?>" data-name="style[<?php echo absint( $form->id ); ?>]">
 			<?php foreach ( $styles as $style ) { ?>
 				<option value="<?php echo esc_attr( $style->ID ); ?>" <?php selected( $style->ID, $active_style_id ); ?>>
 					<?php echo esc_html( $style->post_title . ( empty( $style->menu_order ) ? '' : ' (' . __( 'default', 'formidable' ) . ')' ) ); ?>
diff --git a/js/formidable_admin.js b/js/formidable_admin.js
index d6ae438955..cdae13a51a 100644
--- a/js/formidable_admin.js
+++ b/js/formidable_admin.js
@@ -10926,6 +10926,21 @@ function frmAdminBuildJS() {
 
 			// Set fieldsUpdated to 0 to avoid the unsaved changes pop up.
 			frmDom.util.documentOn( 'submit', '.frm_settings_form', () => fieldsUpdated = 0 );
+
+			const manageStyleSettings = document.getElementById( 'manage_styles_settings' );
+			if ( manageStyleSettings ) {
+				document.addEventListener(
+					'change',
+					event => {
+						const target = event.originalTarget;
+						if ( 'SELECT' !== target.nodeName || ! target.dataset.name || target.getAttribute( 'name' ) ) {
+							return;
+						}
+
+						target.setAttribute( 'name', target.dataset.name );
+					}
+				);
+			}
 		},
 
 		exportInit: function() {

From 723006eb98b901d1e18a10b8c206fc71edf3fdb1 Mon Sep 17 00:00:00 2001
From: Mike Letellier <mike@crabcyb.org>
Date: Thu, 17 Oct 2024 15:47:35 -0300
Subject: [PATCH 2/5] Drop the prev style input as well

---
 classes/views/styles/_manage-styles-row.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/classes/views/styles/_manage-styles-row.php b/classes/views/styles/_manage-styles-row.php
index b9c67d1c26..4e1a43f3a6 100644
--- a/classes/views/styles/_manage-styles-row.php
+++ b/classes/views/styles/_manage-styles-row.php
@@ -11,8 +11,6 @@
 		<label for="<?php echo esc_attr( $dropdown_id ); ?>"><?php echo esc_html( $form_name ); ?></label>
 	</td>
 	<td>
-		<input id="frm_prev_style_<?php echo absint( $form->id ); ?>" type="hidden" value="<?php echo esc_attr( $active_style_id ); ?>" />
-
 		<select id="<?php echo esc_attr( $dropdown_id ); ?>" data-name="style[<?php echo absint( $form->id ); ?>]">
 			<?php foreach ( $styles as $style ) { ?>
 				<option value="<?php echo esc_attr( $style->ID ); ?>" <?php selected( $style->ID, $active_style_id ); ?>>

From 0f62b6c11ab3bf30363f913c98a416297f348c82 Mon Sep 17 00:00:00 2001
From: Mike Letellier <mike@crabcyb.org>
Date: Thu, 17 Oct 2024 15:50:44 -0300
Subject: [PATCH 3/5] Change scope of listener

---
 js/formidable_admin.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/formidable_admin.js b/js/formidable_admin.js
index cdae13a51a..35143146ef 100644
--- a/js/formidable_admin.js
+++ b/js/formidable_admin.js
@@ -10929,7 +10929,7 @@ function frmAdminBuildJS() {
 
 			const manageStyleSettings = document.getElementById( 'manage_styles_settings' );
 			if ( manageStyleSettings ) {
-				document.addEventListener(
+				manageStyleSettings.addEventListener(
 					'change',
 					event => {
 						const target = event.originalTarget;

From dc7a055cdc1323addbe437820237e1107e9cff8e Mon Sep 17 00:00:00 2001
From: Mike Letellier <mike@crabcyb.org>
Date: Thu, 17 Oct 2024 15:53:29 -0300
Subject: [PATCH 4/5] Add phpcs exception

---
 classes/controllers/FrmStylesController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/controllers/FrmStylesController.php b/classes/controllers/FrmStylesController.php
index a2f33687e2..1f4ee2a1e4 100644
--- a/classes/controllers/FrmStylesController.php
+++ b/classes/controllers/FrmStylesController.php
@@ -765,7 +765,7 @@ private static function manage_styles() {
 
 		$forms = FrmForm::get_published_forms();
 		foreach ( $forms as $form ) {
-			if ( ! isset( $_POST['style'] ) || ! isset( $_POST['style'][ $form->id ] ) ) {
+			if ( ! isset( $_POST['style'] ) || ! isset( $_POST['style'][ $form->id ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
 				continue;
 			}
 

From 7ccb50acd092376b86c9fa671f83d5dbc4137a60 Mon Sep 17 00:00:00 2001
From: Mike Letellier <mike@crabcyb.org>
Date: Thu, 17 Oct 2024 16:28:29 -0300
Subject: [PATCH 5/5] Use target

---
 js/formidable_admin.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/formidable_admin.js b/js/formidable_admin.js
index 35143146ef..019d816635 100644
--- a/js/formidable_admin.js
+++ b/js/formidable_admin.js
@@ -10932,7 +10932,7 @@ function frmAdminBuildJS() {
 				manageStyleSettings.addEventListener(
 					'change',
 					event => {
-						const target = event.originalTarget;
+						const target = event.target;
 						if ( 'SELECT' !== target.nodeName || ! target.dataset.name || target.getAttribute( 'name' ) ) {
 							return;
 						}