From bc5a47b11742d8abe14417f840e08e2884a919c0 Mon Sep 17 00:00:00 2001
From: Mike Letellier <mike@crabcyb.org>
Date: Tue, 28 May 2024 11:08:46 -0300
Subject: [PATCH 1/3] Pro issue 5058 / Update form button settings

---
 classes/controllers/FrmFormsController.php    | 21 ++++++-------------
 .../frm-forms/add_form_style_options.php      | 19 +++++------------
 classes/views/frm-forms/settings-buttons.php  |  4 ----
 3 files changed, 11 insertions(+), 33 deletions(-)

diff --git a/classes/controllers/FrmFormsController.php b/classes/controllers/FrmFormsController.php
index f2ea29b285..da523f74ba 100644
--- a/classes/controllers/FrmFormsController.php
+++ b/classes/controllers/FrmFormsController.php
@@ -1429,6 +1429,7 @@ private static function get_settings_tabs( $values ) {
 	 * @since 4.0
 	 *
 	 * @param array $values
+	 * @return void
 	 */
 	public static function advanced_settings( $values ) {
 		$first_h3 = 'frm_first_h3';
@@ -1438,6 +1439,7 @@ public static function advanced_settings( $values ) {
 
 	/**
 	 * @param array $values
+	 * @return void
 	 */
 	public static function render_spam_settings( $values ) {
 		if ( function_exists( 'akismet_http_post' ) ) {
@@ -1451,13 +1453,9 @@ public static function render_spam_settings( $values ) {
 	 * @since 4.0
 	 *
 	 * @param array $values
+	 * @return void
 	 */
 	public static function buttons_settings( $values ) {
-		$styles = apply_filters( 'frm_get_style_opts', array() );
-
-		$frm_settings    = FrmAppHelper::get_settings();
-		$no_global_style = $frm_settings->load_style === 'none';
-
 		include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings-buttons.php';
 	}
 
@@ -1465,6 +1463,7 @@ public static function buttons_settings( $values ) {
 	 * @since 4.0
 	 *
 	 * @param array $values
+	 * @return void
 	 */
 	public static function html_settings( $values ) {
 		include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings-html.php';
@@ -1476,6 +1475,7 @@ public static function html_settings( $values ) {
 	 * @since 2.03.08
 	 *
 	 * @param array|bool $values
+	 * @return void
 	 */
 	private static function clean_submit_html( &$values ) {
 		if ( is_array( $values ) && isset( $values['submit_html'] ) ) {
@@ -1944,9 +1944,8 @@ public static function json_error( $errors ) {
 	}
 
 	/**
-	 * Education for premium features.
-	 *
 	 * @since 4.05
+	 * @return void
 	 */
 	public static function add_form_style_tab_options() {
 		include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/add_form_style_options.php';
@@ -3235,14 +3234,6 @@ public static function create( $values = array() ) {
 		self::update( $values );
 	}
 
-	/**
-	 * @deprecated 4.08
-	 * @since 3.06
-	 */
-	public static function add_new() {
-		_deprecated_function( __FUNCTION__, '4.08' );
-	}
-
 	/**
 	 * @deprecated 6.7
 	 *
diff --git a/classes/views/frm-forms/add_form_style_options.php b/classes/views/frm-forms/add_form_style_options.php
index 4a57595acb..4997b9dace 100644
--- a/classes/views/frm-forms/add_form_style_options.php
+++ b/classes/views/frm-forms/add_form_style_options.php
@@ -4,19 +4,10 @@
 }
 ?>
 <tr>
-	<td>
-		<label for="frm_option_transition" class="frm_show_upgrade frm_noallow" data-medium="transitions" data-upgrade="Form transitions">
-			<?php esc_html_e( 'Page Turn Transitions', 'formidable' ); ?>
-		</label>
-	</td>
-	<td>
-		<select id="frm_option_transition" >
-			<option disabled>
-				<?php esc_html_e( 'Slide horizontally', 'formidable' ); ?>
-			</option>
-			<option disabled>
-				<?php esc_html_e( 'Slide vertically', 'formidable' ); ?>
-			</option>
-		</select>
+	<td colspan="2">
+		<div class="frm_note_style" style="margin-top: 0;">
+			<?php esc_html_e( 'Page Turn Transitions setting was moved to the page break field settings in the form builder.', 'formidable' ); ?>
+			<input type="hidden" name="options[transition]" value="<?php echo esc_attr( $values['transition'] ); ?>" />
+		</div>
 	</td>
 </tr>
diff --git a/classes/views/frm-forms/settings-buttons.php b/classes/views/frm-forms/settings-buttons.php
index e4b8804a12..ae14ef0119 100644
--- a/classes/views/frm-forms/settings-buttons.php
+++ b/classes/views/frm-forms/settings-buttons.php
@@ -3,10 +3,6 @@
 	die( 'You are not allowed to call this page directly.' );
 }
 ?>
-<p class="howto">
-	<?php esc_html_e( 'Set your button text.', 'formidable' ); ?>
-</p>
-
 <input type="hidden" name="options[custom_style]" value="<?php echo esc_attr( $values['custom_style'] ); ?>" />
 
 <table class="form-table">

From b6a848ae5074118d3ae014e3f214085067ebcf52 Mon Sep 17 00:00:00 2001
From: Mike Letellier <mike@crabcyb.org>
Date: Tue, 28 May 2024 11:10:29 -0300
Subject: [PATCH 2/3] Remove the hidden input from the view

---
 classes/views/frm-forms/add_form_style_options.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/classes/views/frm-forms/add_form_style_options.php b/classes/views/frm-forms/add_form_style_options.php
index 4997b9dace..547ad73828 100644
--- a/classes/views/frm-forms/add_form_style_options.php
+++ b/classes/views/frm-forms/add_form_style_options.php
@@ -7,7 +7,6 @@
 	<td colspan="2">
 		<div class="frm_note_style" style="margin-top: 0;">
 			<?php esc_html_e( 'Page Turn Transitions setting was moved to the page break field settings in the form builder.', 'formidable' ); ?>
-			<input type="hidden" name="options[transition]" value="<?php echo esc_attr( $values['transition'] ); ?>" />
 		</div>
 	</td>
 </tr>

From bcf83f071ba3e5484c8a84220431a7f23a83f309 Mon Sep 17 00:00:00 2001
From: Mike Letellier <mike@crabcyb.org>
Date: Tue, 28 May 2024 11:18:20 -0300
Subject: [PATCH 3/3] Put back function descripion

---
 classes/controllers/FrmFormsController.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/classes/controllers/FrmFormsController.php b/classes/controllers/FrmFormsController.php
index da523f74ba..d45f08d8ca 100644
--- a/classes/controllers/FrmFormsController.php
+++ b/classes/controllers/FrmFormsController.php
@@ -1944,6 +1944,8 @@ public static function json_error( $errors ) {
 	}
 
 	/**
+	 * Education for premium features.
+	 *
 	 * @since 4.05
 	 * @return void
 	 */