← All changes | classes/controllers/FrmFormsController.php +572 -410 6.5.3 → 6.19 View file →

		@@ -6,9 +6,9 @@
6	6	class FrmFormsController {
7	7
8	8	/**
9	9	* Track the form that opened the redirect URL in a new tab. This is used to check if we should show the default
10		- * message in the currect tab.
	10	+ * message in the current tab.
11	11	*
12	12	* @since 6.2
13	13	*
14	14	* @var array Keys are form IDs and values are 1.
		@@ -14,8 +14,18 @@
14	14	* @var array Keys are form IDs and values are 1.
15	15	*/
16	16	private static $redirected_in_new_tab = array();
17	17
	18	+ /**
	19	+ * The HTML for the Formdiable TinyMCE button (That triggers a popup to insert shortcodes)
	20	+ * is stored here and re-used as an optimization.
	21	+ *
	22	+ * @since 6.11
	23	+ *
	24	+ * @var string|null
	25	+ */
	26	+ private static $formidable_tinymce_button;
	27	+
18	28	public static function menu() {
19	29	$menu_label = __( 'Forms', 'formidable' );
20	30	if ( ! FrmAppHelper::pro_is_installed() ) {
21	31	$menu_label .= ' (Lite)';
		@@ -54,9 +64,9 @@
54	64	*/
55	65	public static function logic_tip() {
56	66	$images_url = FrmAppHelper::plugin_url() . '/images/';
57	67	$data_message = __( 'Only show the fields you need and create branching forms. Upgrade to get conditional logic and question branching.', 'formidable' );
58		- $data_message .= ' <img src="' . esc_attr( $images_url ) . '/survey-logic.png" srcset="' . esc_attr( $images_url ) . 'survey-logic@2x.png 2x" alt="' . esc_attr__( 'Conditional Logic options', 'formidable' ) . '"/>';
	68	+ $data_message .= ' <img src="' . esc_url( $images_url ) . '/survey-logic.png" srcset="' . esc_url( $images_url ) . 'survey-logic@2x.png 2x" alt="' . esc_attr__( 'Conditional Logic options', 'formidable' ) . '"/>';
59	69	echo '<a href="javascript:void(0)" class="frm_noallow frm_show_upgrade frm_add_logic_link frm-collapsed frm-flex-justify" data-upgrade="' . esc_attr__( 'Conditional Logic options', 'formidable' ) . '" data-message="' . esc_attr( $data_message ) . '" data-medium="builder" data-content="logic">';
60	70	esc_html_e( 'Conditional Logic', 'formidable' );
61	71	FrmAppHelper::icon_by_class( 'frmfont frm_arrowdown6_icon', array( 'aria-hidden' => 'true' ) );
62	72	echo '</a>';
		@@ -96,15 +106,23 @@
96	106	* Create the default email action
97	107	*
98	108	* @since 2.02.11
99	109	*
100		- * @param object|int $form
	110	+ * @param int|object $form
	111	+ * @return void
101	112	*/
102	113	private static function create_default_email_action( $form ) {
103	114	FrmForm::maybe_get_form( $form );
	115	+ if ( ! is_object( $form ) ) {
	116	+ return;
	117	+ }
	118	+
104	119	$create_email = apply_filters( 'frm_create_default_email_action', true, $form );
105	120
106	121	if ( $create_email ) {
	122	+ /**
	123	+ * @var FrmFormAction
	124	+ */
107	125	$action_control = FrmFormActionsController::get_form_actions( 'email' );
108	126	$action_control->create( $form->id );
109	127	}
110	128	}
		@@ -113,12 +131,16 @@
113	131	* Create the default On submit action
114	132	*
115	133	* @since 6.0.0
116	134	*
117		- * @param object|int $form Form object or ID.
	135	+ * @param int|object $form Form object or ID.
	136	+ * @return void
118	137	*/
119	138	private static function create_default_on_submit_action( $form ) {
120	139	FrmForm::maybe_get_form( $form );
	140	+ if ( ! is_object( $form ) ) {
	141	+ return;
	142	+ }
121	143
122	144	/**
123	145	* Enable or disable the default On Submit action.
124	146	*
		@@ -129,21 +151,65 @@
129	151	*/
130	152	$create = apply_filters( 'frm_create_default_on_submit_action', true, $form );
131	153
132	154	if ( $create ) {
	155	+ /**
	156	+ * @var FrmFormAction
	157	+ */
133	158	$action_control = FrmFormActionsController::get_form_actions( FrmOnSubmitAction::$slug );
134	159	$action_control->create( $form->id );
135	160	}
136	161	}
137	162
	163	+ /**
	164	+ * Creates submit button field.
	165	+ *
	166	+ * @since 6.9
	167	+ *
	168	+ * @param int|object $form Form ID or object.
	169	+ * @return void
	170	+ */
	171	+ private static function create_submit_button_field( $form ) {
	172	+ FrmForm::maybe_get_form( $form );
	173	+ if ( ! is_object( $form ) ) {
	174	+ return;
	175	+ }
	176	+
	177	+ if ( FrmSubmitHelper::get_submit_field( $form->id ) ) {
	178	+ // Do not create submit button field if it exists.
	179	+ return;
	180	+ }
	181	+
	182	+ FrmField::create(
	183	+ array(
	184	+ 'type' => FrmSubmitHelper::FIELD_TYPE,
	185	+ 'name' => __( 'Submit', 'formidable' ),
	186	+ 'field_order' => FrmSubmitHelper::DEFAULT_ORDER,
	187	+ 'form_id' => $form->id,
	188	+ 'field_options' => FrmFieldsHelper::get_default_field_options( FrmSubmitHelper::FIELD_TYPE ),
	189	+ 'description' => '',
	190	+ 'default_value' => '',
	191	+ 'options' => array(),
	192	+ )
	193	+ );
	194	+ }
	195	+
	196	+ /**
	197	+ * @return void
	198	+ */
138	199	public static function edit( $values = false ) {
139	200	FrmAppHelper::permission_check( 'frm_edit_forms' );
140	201
141	202	$id = isset( $values['id'] ) ? absint( $values['id'] ) : FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
142	203
143		- return self::get_edit_vars( $id );
	204	+ self::get_edit_vars( $id );
144	205	}
145	206
	207	+ /**
	208	+ * @param mixed $id
	209	+ * @param string $message
	210	+ * @return void
	211	+ */
146	212	public static function settings( $id = false, $message = '' ) {
147	213	FrmAppHelper::permission_check( 'frm_edit_forms' );
148	214
149	215	if ( ! $id || ! is_numeric( $id ) ) {
		@@ -151,21 +217,34 @@
151	217	}
152	218
153	219	FrmOnSubmitHelper::maybe_migrate_submit_settings_to_action( $id );
154	220
155		- return self::get_settings_vars( $id, array(), $message );
	221	+ self::get_settings_vars( $id, array(), $message );
156	222	}
157	223
158	224	public static function update_settings() {
159	225	FrmAppHelper::permission_check( 'frm_edit_forms' );
	226	+ $process_form = FrmAppHelper::get_post_param( 'process_form', '', 'sanitize_text_field' );
160	227
	228	+ if ( ! wp_verify_nonce( $process_form, 'process_form_nonce' ) ) {
	229	+ $frm_settings = FrmAppHelper::get_settings();
	230	+ $error_args = array(
	231	+ 'title' => __( 'Verification failed', 'formidable' ),
	232	+ 'body' => $frm_settings->admin_permission,
	233	+ 'cancel_text' => __( 'Cancel', 'formidable' ),
	234	+ );
	235	+ FrmAppController::show_error_modal( $error_args );
	236	+ return;
	237	+ }
	238	+
161	239	$id = FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
162	240
163		- $errors = FrmForm::validate( $_POST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
	241	+ $errors = FrmForm::validate( $_POST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
164	242	$warnings = FrmFormsHelper::check_for_warnings( $_POST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
165	243
166	244	if ( count( $errors ) > 0 ) {
167		- return self::get_settings_vars( $id, $errors, compact( 'warnings' ) );
	245	+ self::get_settings_vars( $id, $errors, compact( 'warnings' ) );
	246	+ return;
168	247	}
169	248
170	249	do_action( 'frm_before_update_form_settings', $id );
171	250
		@@ -179,9 +258,9 @@
179	258	}
180	259
181	260	$message = __( 'Settings Successfully Updated', 'formidable' );
182	261
183		- return self::get_settings_vars( $id, array(), compact( 'message', 'warnings' ) );
	262	+ self::get_settings_vars( $id, array(), compact( 'message', 'warnings' ) );
184	263	}
185	264
186	265	/**
187	266	* @param int $form_id
		@@ -191,8 +270,11 @@
191	270	$form = FrmForm::getOne( $form_id );
192	271	return ! empty( $form->options['antispam'] );
193	272	}
194	273
	274	+ /**
	275	+ * @return void
	276	+ */
195	277	public static function update( $values = array() ) {
196	278	if ( empty( $values ) ) {
197	279	$values = $_POST; // phpcs:ignore WordPress.Security.NonceVerification.Missing
198	280	}
		@@ -210,65 +292,74 @@
210	292
211	293	$id = isset( $values['id'] ) ? absint( $values['id'] ) : FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
212	294
213	295	if ( count( $errors ) > 0 ) {
214		- return self::get_edit_vars( $id, $errors );
215		- } else {
216		- FrmForm::update( $id, $values );
217		- $message = __( 'Form was successfully updated.', 'formidable' );
	296	+ self::get_edit_vars( $id, $errors );
	297	+ return;
	298	+ }
218	299
219		- if ( self::is_too_long( $values ) ) {
220		- $message .= '<br/> ' . sprintf(
221		- /* translators: %1$s: Start link HTML, %2$s: end link HTML */
222		- __( 'However, your form is very long and may be %1$sreaching server limits%2$s.', 'formidable' ),
223		- '<a href="https://formidableforms.com/knowledgebase/i-have-a-long-form-why-did-the-options-at-the-end-of-the-form-stop-saving/?utm_source=WordPress&utm_medium=builder&utm_campaign=liteplugin" target="_blank" rel="noopener">',
224		- '</a>'
225		- );
226		- }
	300	+ self::maybe_remove_draft_option_from_fields( $id );
227	301
228		- if ( defined( 'DOING_AJAX' ) ) {
229		- wp_die( FrmAppHelper::kses( $message, array( 'a' ) ) ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
230		- }
	302	+ FrmForm::update( $id, $values );
	303	+ $message = __( 'Form was successfully updated.', 'formidable' );
231	304
232		- return self::get_edit_vars( $id, array(), $message );
	305	+ if ( self::is_too_long( $values ) ) {
	306	+ $message .= '<br/> ' . sprintf(
	307	+ /* translators: %1$s: Start link HTML, %2$s: end link HTML */
	308	+ __( 'However, your form is very long and may be %1$sreaching server limits%2$s.', 'formidable' ),
	309	+ '<a href="https://formidableforms.com/knowledgebase/i-have-a-long-form-why-did-the-options-at-the-end-of-the-form-stop-saving/?utm_source=WordPress&utm_medium=builder&utm_campaign=liteplugin" target="_blank" rel="noopener">',
	310	+ '</a>'
	311	+ );
233	312	}
	313	+
	314	+ if ( defined( 'DOING_AJAX' ) ) {
	315	+ wp_die( FrmAppHelper::kses( $message, array( 'a' ) ) ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
	316	+ }
	317	+
	318	+ self::get_edit_vars( $id, array(), $message );
234	319	}
235	320
236	321	/**
	322	+ * Remove the draft flag from any new fields from this current session.
	323	+ *
	324	+ * @since 6.8
	325	+ *
	326	+ * @param int $form_id
	327	+ * @return void
	328	+ */
	329	+ private static function maybe_remove_draft_option_from_fields( $form_id ) {
	330	+ $draft_field_ids_csv = FrmAppHelper::get_post_param( 'draft_fields', '', 'sanitize_text_field' );
	331	+ if ( ! $draft_field_ids_csv ) {
	332	+ // If the draft_fields input is empty there are no new fields in the session.
	333	+ return;
	334	+ }
	335	+
	336	+ $draft_field_ids = array_filter( explode( ',', $draft_field_ids_csv ), 'is_numeric' );
	337	+ if ( ! $draft_field_ids ) {
	338	+ // Exit early if the draft fields input is invalid. It should be a CSV of integer values.
	339	+ return;
	340	+ }
	341	+
	342	+ $draft_field_rows = FrmFieldsHelper::get_draft_field_results( $form_id, $draft_field_ids );
	343	+ foreach ( $draft_field_rows as $row ) {
	344	+ $row->field_options['draft'] = 0;
	345	+ FrmField::update( $row->id, array( 'field_options' => $row->field_options ) );
	346	+ }
	347	+ }
	348	+
	349	+ /**
237	350	* Check if the value at the end of the form was included.
238	351	* If it's missing, it means other values at the end of the form
239	352	* were likely not saved either.
240	353	*
241	354	* @since 3.06.01
	355	+ *
	356	+ * @return bool
242	357	*/
243	358	private static function is_too_long( $values ) {
244		- return ( ! isset( $values['frm_end'] ) ) || empty( $values['frm_end'] );
	359	+ return empty( $values['frm_end'] );
245	360	}
246	361
247		- /**
248		- * Redirect to the url for creating from a template
249		- * Also delete the current form
250		- *
251		- * @since 2.0
252		- * @deprecated 3.06
253		- */
254		- public static function _create_from_template() {
255		- _deprecated_function( __FUNCTION__, '3.06' );
256		-
257		- FrmAppHelper::permission_check( 'frm_edit_forms' );
258		- check_ajax_referer( 'frm_ajax', 'nonce' );
259		-
260		- $current_form = FrmAppHelper::get_param( 'this_form', '', 'get', 'absint' );
261		- $template_id = FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
262		-
263		- if ( $current_form ) {
264		- FrmForm::destroy( $current_form );
265		- }
266		-
267		- echo esc_url_raw( admin_url( 'admin.php?page=formidable&frm_action=duplicate&id=' . absint( $template_id ) ) );
268		- wp_die();
269		- }
270		-
271	362	public static function duplicate() {
272	363	FrmAppHelper::permission_check( 'frm_edit_forms' );
273	364	$nonce = FrmAppHelper::simple_get( '_wpnonce' );
274	365
		@@ -282,10 +373,11 @@
282	373	$url = admin_url( 'admin.php?page=formidable' );
283	374	$message = 'form_duplicate_error';
284	375
285	376	if ( $form ) {
286		- $url = admin_url( 'admin.php?page=formidable&frm_action=edit&id=' . absint( $form ) );
287		- $message = 'form_duplicated';
	377	+ $new_template = FrmAppHelper::simple_get( 'new_template' ) ? '&new_template=true' : '';
	378	+ $url = admin_url( 'admin.php?page=formidable&frm_action=edit&id=' . absint( $form ) . $new_template );
	379	+ $message = 'form_duplicated';
288	380	}
289	381
290	382	$url .= '&message=' . $message;
291	383
		@@ -293,24 +385,28 @@
293	385	exit();
294	386	}
295	387
296	388	/**
297		- * @return string
	389	+ * @return string|null
298	390	*/
299	391	public static function page_preview() {
300	392	$params = FrmForm::list_page_params();
301	393	if ( ! $params['form'] ) {
302		- return;
	394	+ return null;
303	395	}
304	396
305	397	$form = FrmForm::getOne( $params['form'] );
306		- if ( $form ) {
307		- return self::show_form( $form->id, '', 'auto', 'auto' );
	398	+ if ( ! $form ) {
	399	+ return null;
308	400	}
	401	+
	402	+ return self::show_form( $form->id, '', 'auto', 'auto' );
309	403	}
310	404
311	405	/**
312	406	* @since 3.0
	407	+ *
	408	+ * @return void
313	409	*/
314	410	public static function show_page_preview() {
315	411	echo self::page_preview(); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
316	412	}
		@@ -360,8 +456,13 @@
360	456	return;
361	457	}
362	458
363	459	$random_page = reset( $random_page );
	460	+ if ( ! is_a( $random_page, 'WP_Post' ) ) {
	461	+ // The return type can also be int.
	462	+ return;
	463	+ }
	464	+
364	465	query_posts(
365	466	array(
366	467	'post_type' => 'page',
367	468	'page_id' => $random_page->ID,
		@@ -377,9 +478,9 @@
377	478	* Set the WP $post global object. Used for in-theme preview when defining a page.
378	479	*
379	480	* @since 5.5.2
380	481	*
381		- * @param WP_Post $post
	482	+ * @param WP_Post $page The page object.
382	483	* @return void
383	484	*/
384	485	private static function set_post_global( $page ) {
385	486	global $post;
		@@ -387,8 +488,10 @@
387	488	}
388	489
389	490	/**
390	491	* @since 3.0
	492	+ *
	493	+ * @return void
391	494	*/
392	495	private static function load_theme_preview() {
393	496	add_filter( 'wp_title', 'FrmFormsController::preview_title', 9999 );
394	497	add_filter( 'the_title', 'FrmFormsController::preview_page_title', 9999 );
		@@ -420,13 +523,16 @@
420	523
421	524	/**
422	525	* Not every theme supports get_template_part( 'page' ).
423	526	* When this is not supported, false is returned, and we can handle a fallback.
	527	+ *
	528	+ * @return void
424	529	*/
425	530	private static function fallback_when_page_template_part_is_not_supported_by_theme() {
426	531	if ( have_posts() ) {
427	532	the_post();
428		- get_header( '' );
	533	+ self::get_template( 'header' );
	534	+
429	535	// add some generic class names to the container to add some natural padding to the content.
430	536	// .entry-content catches the WordPress TwentyTwenty theme.
431	537	// .container catches Customizr content.
432	538	echo '<div class="container entry-content">';
		@@ -431,13 +537,54 @@
431	537	// .container catches Customizr content.
432	538	echo '<div class="container entry-content">';
433	539	the_content();
434	540	echo '</div>';
435		- get_footer();
	541	+
	542	+ self::get_template( 'footer' );
436	543	}
437	544	}
438	545
439	546	/**
	547	+ * Calls core function to get a template part if it doesn't cause deprecation warnings. Otherwise skips the deprecation function call
	548	+ * and renders required html fragments calling required functions.
	549	+ *
	550	+ * @since 6.7.1
	551	+ * @param string $template
	552	+ * @return void
	553	+ */
	554	+ private static function get_template( $template ) {
	555	+ if ( self::should_try_getting_template( $template ) ) {
	556	+ call_user_func( 'get_' . $template );
	557	+ return;
	558	+ }
	559	+
	560	+ if ( 'header' === $template ) {
	561	+ include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/preview/header.php';
	562	+ return;
	563	+ }
	564	+
	565	+ if ( 'footer' === $template ) {
	566	+ include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/preview/footer.php';
	567	+ }
	568	+ }
	569	+
	570	+ /**
	571	+ * Returns true if calling a template function doesn't trigger deprecation warnings.
	572	+ *
	573	+ * @since 6.7.1
	574	+ * @param string $template
	575	+ * @return bool
	576	+ */
	577	+ private static function should_try_getting_template( $template ) {
	578	+ $stylesheet_path = get_stylesheet_directory();
	579	+ $template_path = get_template_directory();
	580	+ $is_child_theme = $stylesheet_path !== $template_path;
	581	+ $template_name = $template . '.php';
	582	+
	583	+ return file_exists( $stylesheet_path . '/' . $template_name ) || $is_child_theme && file_exists( $template_path . '/' . $template_name );
	584	+ }
	585	+
	586	+ /**
440	587	* Set the page title for the theme preview page
441	588	*
442	589	* @since 3.0
443	590	*/
		@@ -449,11 +596,14 @@
449	596	return $title;
450	597	}
451	598
452	599	/**
453		- * Set the page title for the theme preview page
	600	+ * Set the page title for the theme preview page.
454	601	*
455	602	* @since 3.0
	603	+ *
	604	+ * @param string $title
	605	+ * @return string
456	606	*/
457	607	public static function preview_title( $title ) {
458	608	return __( 'Form Preview', 'formidable' );
459	609	}
		@@ -458,15 +608,20 @@
458	608	return __( 'Form Preview', 'formidable' );
459	609	}
460	610
461	611	/**
462		- * Set the page content for the theme preview page
	612	+ * Set the page content for the theme preview page.
463	613	*
464	614	* @since 3.0
	615	+ *
	616	+ * @param string $content
	617	+ * @return string
465	618	*/
466	619	public static function preview_content( $content ) {
467	620	if ( in_the_loop() ) {
468		- $content = self::show_page_preview();
	621	+ self::show_page_preview();
	622	+ // Clear the content for the page we're using.
	623	+ $content = '';
469	624	}
470	625
471	626	return $content;
472	627	}
		@@ -476,8 +631,11 @@
476	631	*/
477	632	private static function load_direct_preview() {
478	633	header( 'Content-Type: text/html; charset=' . get_option( 'blog_charset' ) );
479	634
	635	+ // print_emoji_styles is deprecated.
	636	+ remove_action( 'wp_print_styles', 'print_emoji_styles' );
	637	+
480	638	$key = FrmAppHelper::simple_get( 'form', 'sanitize_title' );
481	639	if ( $key == '' ) {
482	640	$key = FrmAppHelper::get_post_param( 'form', '', 'sanitize_title' );
483	641	}
		@@ -486,11 +644,38 @@
486	644	if ( empty( $form ) ) {
487	645	$form = FrmForm::getAll( array(), '', 1 );
488	646	}
489	647
490		- require( FrmAppHelper::plugin_path() . '/classes/views/frm-entries/direct.php' );
	648	+ self::fix_deprecated_null_param_warning();
	649	+
	650	+ require FrmAppHelper::plugin_path() . '/classes/views/frm-entries/direct.php';
491	651	}
492	652
	653	+ /**
	654	+ * Some themes have a null $src value.
	655	+ * This function adds a filter to ensure that $src is not null.
	656	+ * WP will call str_starts_with with the null value triggering a deprecated message otherwise.
	657	+ *
	658	+ * @since 6.10
	659	+ *
	660	+ * @return void
	661	+ */
	662	+ private static function fix_deprecated_null_param_warning() {
	663	+ add_filter(
	664	+ 'script_loader_src',
	665	+ /**
	666	+ * @param string|null $src
	667	+ * @return string
	668	+ */
	669	+ function ( $src ) {
	670	+ if ( is_null( $src ) ) {
	671	+ $src = '';
	672	+ }
	673	+ return $src;
	674	+ }
	675	+ );
	676	+ }
	677	+
493	678	public static function untrash() {
494	679	self::change_form_status( 'untrash' );
495	680	}
496	681
		@@ -553,14 +738,14 @@
553	738	FrmAppHelper::permission_check( $available_status[ $status ]['permission'] );
554	739
555	740	$params = FrmForm::list_page_params();
556	741
557		- //check nonce url
	742	+ // Check nonce url.
558	743	check_admin_referer( $status . '_form_' . $params['id'] );
559	744
560	745	$count = 0;
561	746	if ( FrmForm::set_status( $params['id'], $available_status[ $status ]['new_status'] ) ) {
562		- $count ++;
	747	+ ++$count;
563	748	}
564	749
565	750	$form_type = FrmAppHelper::get_simple_request(
566	751	array(
		@@ -572,9 +757,9 @@
572	757	/* translators: %1$s: Number of forms */
573	758	$available_status['untrash']['message'] = sprintf( _n( '%1$s form restored from the Trash.', '%1$s forms restored from the Trash.', $count, 'formidable' ), $count );
574	759
575	760	/* translators: %1$s: Number of forms, %2$s: Start link HTML, %3$s: End link HTML */
576		- $available_status['trash']['message'] = sprintf( _n( '%1$s form moved to the Trash. %2$sUndo%3$s', '%1$s forms moved to the Trash. %2$sUndo%3$s', $count, 'formidable' ), $count, '<a href="' . esc_url( wp_nonce_url( '?page=formidable&frm_action=untrash&form_type=' . $form_type . '&id=' . $params['id'], 'untrash_form_' . $params['id'] ) ) . '">', '</a>' );
	761	+ $available_status['trash']['message'] = sprintf( _n( '%1$s form moved to the Trash. %2$sUndo%3$s', '%1$s forms moved to the Trash. %2$sUndo%3$s', $count, 'formidable' ), $count, '<a href="' . esc_url( wp_nonce_url( '?page=formidable&frm_action=untrash&form_type=' . $form_type . '&id=' . $params['id'], 'untrash_form_' . $params['id'] ) ) . '">', '</a>' );
577	762
578	763	$message = $available_status[ $status ]['message'];
579	764
580	765	self::display_forms_list( $params, $message );
		@@ -579,8 +764,12 @@
579	764
580	765	self::display_forms_list( $params, $message );
581	766	}
582	767
	768	+ /**
	769	+ * @param array $ids
	770	+ * @return string
	771	+ */
583	772	public static function bulk_trash( $ids ) {
584	773	FrmAppHelper::permission_check( 'frm_delete_forms' );
585	774
586	775	$count = 0;
		@@ -585,12 +774,16 @@
585	774
586	775	$count = 0;
587	776	foreach ( $ids as $id ) {
588	777	if ( FrmForm::trash( $id ) ) {
589		- $count ++;
	778	+ ++$count;
590	779	}
591	780	}
592	781
	782	+ if ( ! $count ) {
	783	+ return '';
	784	+ }
	785	+
593	786	$current_page = FrmAppHelper::get_simple_request(
594	787	array(
595	788	'param' => 'form_type',
596	789	'type' => 'request',
		@@ -616,9 +809,9 @@
616	809	check_admin_referer( 'destroy_form_' . $params['id'] );
617	810
618	811	$count = 0;
619	812	if ( FrmForm::destroy( $params['id'] ) ) {
620		- $count ++;
	813	+ ++$count;
621	814	}
622	815
623	816	/* translators: %1$s: Number of forms */
624	817	$message = sprintf( _n( '%1$s Form Permanently Deleted', '%1$s Forms Permanently Deleted', $count, 'formidable' ), $count );
		@@ -625,8 +818,12 @@
625	818
626	819	self::display_forms_list( $params, $message );
627	820	}
628	821
	822	+ /**
	823	+ * @param array $ids
	824	+ * @return string
	825	+ */
629	826	public static function bulk_destroy( $ids ) {
630	827	FrmAppHelper::permission_check( 'frm_delete_forms' );
631	828
632	829	$count = 0;
		@@ -632,19 +829,24 @@
632	829	$count = 0;
633	830	foreach ( $ids as $id ) {
634	831	$d = FrmForm::destroy( $id );
635	832	if ( $d ) {
636		- $count ++;
	833	+ ++$count;
637	834	}
638	835	}
639	836
640		- /* translators: %1$s: Number of forms */
641		- $message = sprintf( _n( '%1$s form permanently deleted.', '%1$s forms permanently deleted.', $count, 'formidable' ), $count );
	837	+ if ( $count ) {
	838	+ /* translators: %1$s: Number of forms */
	839	+ return sprintf( _n( '%1$s form permanently deleted.', '%1$s forms permanently deleted.', $count, 'formidable' ), $count );
	840	+ }
642	841
643		- return $message;
	842	+ return '';
644	843	}
645	844
646		- private static function delete_all() {
	845	+ /**
	846	+ * @since 6.7.1 Function went from private to public.
	847	+ */
	848	+ public static function delete_all() {
647	849	// Check nonce url.
648	850	$permission_error = FrmAppHelper::permission_nonce_error( 'frm_delete_forms', '_wpnonce', 'bulk-toplevel_page_formidable' );
649	851	if ( $permission_error !== false ) {
650	852	self::display_forms_list( array(), '', array( $permission_error ) );
		@@ -651,14 +853,15 @@
651	853
652	854	return;
653	855	}
654	856
655		- $count = FrmForm::scheduled_delete( time() );
	857	+ $count = FrmForm::scheduled_delete( time() );
	858	+ $url = remove_query_arg( array( 'delete_all' ) );
656	859
657		- /* translators: %1$s: Number of forms */
658		- $message = sprintf( _n( '%1$s form permanently deleted.', '%1$s forms permanently deleted.', $count, 'formidable' ), $count );
	860	+ $url .= '&message=forms_permanently_deleted&forms_deleted=' . $count;
659	861
660		- self::display_forms_list( array(), $message );
	862	+ wp_safe_redirect( $url );
	863	+ die();
661	864	}
662	865
663	866	/**
664	867	* Create a new form from the modal.
		@@ -671,9 +874,9 @@
671	874
672	875	$new_values = self::get_modal_values();
673	876	$new_values['form_key'] = $new_values['name'];
674	877	$new_values['options'] = array(
675		- 'antispam' => 1,
	878	+ 'antispam' => 1,
676	879	'on_submit_migrated' => 1,
677	880	);
678	881
679	882	/**
		@@ -692,13 +895,14 @@
692	895	* @param int $form_id
693	896	*/
694	897	do_action( 'frm_build_new_form', $form_id );
695	898
	899	+ self::create_submit_button_field( $form_id );
696	900	self::create_default_on_submit_action( $form_id );
697	901	self::create_default_email_action( $form_id );
698	902
699	903	$response = array(
700		- 'redirect' => FrmForm::get_edit_link( $form_id ),
	904	+ 'redirect' => FrmForm::get_edit_link( $form_id ) . '&new_template=true',
701	905	);
702	906
703	907	echo wp_json_encode( $response );
704	908	wp_die();
		@@ -704,46 +908,15 @@
704	908	wp_die();
705	909	}
706	910
707	911	/**
708		- * Create a custom template from a form
709		- *
710		- * @since 3.06
711		- */
712		- public static function build_template() {
713		- global $wpdb;
714		-
715		- FrmAppHelper::permission_check( 'frm_edit_forms' );
716		- check_ajax_referer( 'frm_ajax', 'nonce' );
717		-
718		- $form_id = FrmAppHelper::get_param( 'xml', '', 'post', 'absint' );
719		- $new_form_id = FrmForm::duplicate( $form_id, 1, true );
720		- if ( ! $new_form_id ) {
721		- $response = array(
722		- 'message' => __( 'There was an error creating a template.', 'formidable' ),
723		- );
724		- } else {
725		- $new_values = self::get_modal_values();
726		- $query_results = $wpdb->update( $wpdb->prefix . 'frm_forms', $new_values, array( 'id' => $new_form_id ) );
727		- if ( $query_results ) {
728		- FrmForm::clear_form_cache();
729		- }
730		-
731		- $response = array(
732		- 'redirect' => admin_url( 'admin.php?page=formidable&frm_action=duplicate&id=' . $new_form_id ) . '&_wpnonce=' . wp_create_nonce(),
733		- );
734		- }
735		-
736		- echo wp_json_encode( $response );
737		- wp_die();
738		- }
739		-
740		- /**
741	912	* Before creating a new form, get the name and description from the modal.
742	913	*
743	914	* @since 4.0
	915	+ *
	916	+ * @return array<string,string>
744	917	*/
745		- private static function get_modal_values() {
	918	+ public static function get_modal_values() {
746	919	$name = FrmAppHelper::get_param( 'name', '', 'post', 'sanitize_text_field' );
747	920	$desc = FrmAppHelper::get_param( 'desc', '', 'post', 'sanitize_textarea_field' );
748	921
749	922	return array(
		@@ -756,17 +929,24 @@
756	929	* Inserts Formidable button
757	930	* Hook exists since 2.5.0
758	931	*
759	932	* @since 2.0.15
	933	+ *
	934	+ * @return void
760	935	*/
761	936	public static function insert_form_button() {
762	937	if ( current_user_can( 'frm_view_forms' ) ) {
763		- FrmAppHelper::load_admin_wide_js();
764		- $menu_name = FrmAppHelper::get_menu_name();
765		- $icon = apply_filters( 'frm_media_icon', FrmAppHelper::svg_logo() );
766		- echo '<a href="#TB_inline?width=50&height=50&inlineId=frm_insert_form" class="thickbox button add_media frm_insert_form" title="' . esc_attr__( 'Add forms and content', 'formidable' ) . '">' .
767		- FrmAppHelper::kses( $icon, 'all' ) . // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
768		- ' ' . esc_html( $menu_name ) . '</a>';
	938	+ // Store the result in memory and re-use it when this function is called multiple times.
	939	+ // This helps speed up the form builder when there are a lot of HTML fields, where this
	940	+ // button is inserted once per HTML field.
	941	+ // In a form with 66 HTML fields, this saves 0.5 seconds on page load time, tested locally.
	942	+ if ( ! isset( self::$formidable_tinymce_button ) ) {
	943	+ FrmAppHelper::load_admin_wide_js();
	944	+ $menu_name = FrmAppHelper::get_menu_name();
	945	+ $icon = apply_filters( 'frm_media_icon', FrmAppHelper::svg_logo() );
	946	+ self::$formidable_tinymce_button = '<a href="#TB_inline?width=50&height=50&inlineId=frm_insert_form" class="thickbox button add_media frm_insert_form" title="' . esc_attr__( 'Add forms and content', 'formidable' ) . '">' . FrmAppHelper::kses( $icon, 'all' ) . ' ' . esc_html( $menu_name ) . '</a>';
	947	+ }
	948	+ echo self::$formidable_tinymce_button; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
769	949	}
770	950	}
771	951
772	952	/**
		@@ -854,9 +1034,9 @@
854	1034	$form_id = $opts['form_id'];
855	1035	unset( $opts['form_id'] );
856	1036	}
857	1037
858		- include( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/shortcode_opts.php' );
	1038	+ include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/shortcode_opts.php';
859	1039
860	1040	echo '</div>';
861	1041
862	1042	wp_die();
		@@ -896,8 +1076,14 @@
896	1076	wp_redirect( esc_url_raw( add_query_arg( 'paged', $total_pages ) ) );
897	1077	die();
898	1078	}
899	1079
	1080	+ $inbox = new FrmInbox();
	1081	+ $error = $inbox->check_for_error();
	1082	+ if ( $error ) {
	1083	+ $show_messages = array( $error['subject'] . '. ' . $error['message'] );
	1084	+ }
	1085	+
900	1086	require FrmAppHelper::plugin_path() . '/classes/views/frm-forms/list.php';
901	1087	}
902	1088
903	1089	/**
		@@ -924,8 +1110,11 @@
924	1110
925	1111	return $columns;
926	1112	}
927	1113
	1114	+ /**
	1115	+ * @return array<string,string>
	1116	+ */
928	1117	public static function get_sortable_columns() {
929	1118	return array(
930	1119	'id' => 'id',
931	1120	'name' => 'name',
		@@ -959,9 +1148,9 @@
959	1148	return $hidden_columns;
960	1149	}
961	1150
962	1151	public static function save_per_page( $save, $option, $value ) {
963		- if ( $option == 'formidable_page_formidable_per_page' ) {
	1152	+ if ( $option === 'formidable_page_formidable_per_page' ) {
964	1153	$save = (int) $value;
965	1154	}
966	1155
967	1156	return $save;
		@@ -967,146 +1156,49 @@
967	1156	return $save;
968	1157	}
969	1158
970	1159	/**
971		- * @return bool
972		- */
973		- public static function expired() {
974		- global $frm_expired;
975		- return $frm_expired;
976		- }
977		-
978		- /**
979		- * Get data from api before rendering it so that we can flag the modal as expired
980		- *
	1160	+ * @param int|string $id
	1161	+ * @param array $errors
	1162	+ * @param string $message
	1163	+ * @param bool $create_link
981	1164	* @return void
982	1165	*/
983		- public static function before_list_templates() {
984		- global $frm_templates;
985		- global $frm_expired;
986		- global $frm_license_type;
	1166	+ private static function get_edit_vars( $id, $errors = array(), $message = '', $create_link = false ) {
	1167	+ global $frm_vars;
987	1168
988		- $api = new FrmFormTemplateApi();
989		- $frm_templates = $api->get_api_info();
990		- $expired = false;
991		- $license_type = '';
992		- if ( isset( $frm_templates['error'] ) ) {
993		- $error = $frm_templates['error']['message'];
994		- $error = str_replace( 'utm_medium=addons', 'utm_medium=form-templates', $error );
995		- $expired = 'expired' === $frm_templates['error']['code'];
996		- $license_type = isset( $frm_templates['error']['type'] ) ? $frm_templates['error']['type'] : '';
997		- unset( $frm_templates['error'] );
998		- }
999		-
1000		- $frm_expired = $expired;
1001		- $frm_license_type = $license_type;
1002		- }
1003		-
1004		- /**
1005		- * @return void
1006		- */
1007		- public static function list_templates() {
1008		- global $frm_templates;
1009		- global $frm_license_type;
1010		-
1011		- $templates = $frm_templates;
1012		- $custom_templates = array();
1013		- $templates_by_category = array();
1014		-
1015		- self::add_user_templates( $custom_templates );
1016		-
1017		- foreach ( $templates as $template ) {
1018		- if ( ! isset( $template['categories'] ) ) {
1019		- continue;
1020		- }
1021		-
1022		- foreach ( $template['categories'] as $category ) {
1023		- if ( ! isset( $templates_by_category[ $category ] ) ) {
1024		- $templates_by_category[ $category ] = array();
1025		- }
1026		-
1027		- $templates_by_category[ $category ][] = $template;
1028		- }
1029		- }
1030		- unset( $template );
1031		-
1032		- // Subcategories that are included elsewhere.
1033		- $redundant_cats = array( 'PayPal', 'Stripe', 'Twilio' );
1034		-
1035		- $categories = array_keys( $templates_by_category );
1036		- $categories = array_diff( $categories, FrmFormsHelper::ignore_template_categories() );
1037		- $categories = array_diff( $categories, $redundant_cats );
1038		- sort( $categories );
1039		-
1040		- array_walk(
1041		- $custom_templates,
1042		- function( &$template ) {
1043		- $template['custom'] = true;
1044		- }
	1169	+ $form = FrmForm::getOne( $id );
	1170	+ $error_args = array(
	1171	+ 'title' => __( 'You can\'t edit the form', 'formidable' ),
	1172	+ 'body' => __( 'You are trying to edit a form that does not exist', 'formidable' ),
	1173	+ 'cancel_url' => admin_url( 'admin.php?page=formidable' ),
	1174	+ 'continue_url' => add_query_arg(
	1175	+ array(
	1176	+ 'page' => 'formidable',
	1177	+ )
	1178	+ ),
1045	1179	);
1046		-
1047		- $my_templates_translation = __( 'My Templates', 'formidable' );
1048		- $categories = array_merge( array( $my_templates_translation ), $categories );
1049		- $pricing = FrmAppHelper::admin_upgrade_link( 'form-templates' );
1050		- $license_type = $frm_license_type;
1051		- $args = compact( 'pricing', 'license_type' );
1052		- $where = apply_filters( 'frm_forms_dropdown', array(), '' );
1053		- $forms = FrmForm::get_published_forms( $where );
1054		- $view_path = FrmAppHelper::plugin_path() . '/classes/views/frm-forms/';
1055		-
1056		- $templates_by_category[ $my_templates_translation ] = $custom_templates;
1057		-
1058		- unset( $pricing, $license_type, $where );
1059		- wp_enqueue_script( 'accordion' ); // register accordion for template groups
1060		- require $view_path . 'list-templates.php';
1061		- }
1062		-
1063		- /**
1064		- * @since 4.03.01
1065		- */
1066		- private static function get_template_categories( $templates ) {
1067		- $categories = array();
1068		- foreach ( $templates as $template ) {
1069		- if ( isset( $template['categories'] ) ) {
1070		- $categories = array_merge( $categories, $template['categories'] );
1071		- }
	1180	+ if ( ! $form ) {
	1181	+ FrmAppController::show_error_modal( $error_args );
	1182	+ return;
1072	1183	}
1073		- $exclude_cats = FrmFormsHelper::ignore_template_categories();
1074		- $categories = array_unique( $categories );
1075		- $categories = array_diff( $categories, $exclude_cats );
1076		- sort( $categories );
1077		- return $categories;
1078		- }
1079	1184
1080		- private static function add_user_templates( &$templates ) {
1081		- $user_templates = array(
1082		- 'is_template' => 1,
1083		- 'default_template' => 0,
1084		- );
1085		- $user_templates = FrmForm::getAll( $user_templates, 'name' );
1086		- foreach ( $user_templates as $template ) {
1087		- $template = array(
1088		- 'id' => $template->id,
1089		- 'name' => $template->name,
1090		- 'key' => $template->form_key,
1091		- 'description' => $template->description,
1092		- 'url' => wp_nonce_url( admin_url( 'admin.php?page=formidable&frm_action=duplicate&id=' . absint( $template->id ) ) ),
1093		- 'released' => $template->created_at,
1094		- 'installed' => 1,
	1185	+ if ( 'trash' === $form->status ) {
	1186	+ $error_args['body'] = __( 'The form you\'re trying to edit is in trash. You must restore it first before you can make changes', 'formidable' );
	1187	+ $error_args['continue_url'] = add_query_arg(
	1188	+ array(
	1189	+ 'page' => 'formidable',
	1190	+ '_wpnonce' => wp_create_nonce( 'untrash_form_' . $id ),
	1191	+ 'form_type' => 'trash',
	1192	+ 'frm_action' => 'untrash',
	1193	+ 'id' => $id,
	1194	+ )
1095	1195	);
1096		- array_unshift( $templates, $template );
1097		- unset( $template );
	1196	+ $error_args['continue_text'] = __( 'Restore form', 'formidable' );
	1197	+ FrmAppController::show_error_modal( $error_args );
	1198	+ return;
1098	1199	}
1099		- }
1100	1200
1101		- private static function get_edit_vars( $id, $errors = array(), $message = '', $create_link = false ) {
1102		- global $frm_vars;
1103		-
1104		- $form = FrmForm::getOne( $id );
1105		- if ( ! $form ) {
1106		- wp_die( esc_html__( 'You are trying to edit a form that does not exist.', 'formidable' ) );
1107		- }
1108		-
1109	1201	if ( $form->parent_form_id ) {
1110	1202	/* translators: %1$s: Start link HTML, %2$s: End link HTML */
1111	1203	wp_die( sprintf( esc_html__( 'You are trying to edit a child form. Please edit from %1$shere%2$s', 'formidable' ), '<a href="' . esc_url( FrmForm::get_edit_link( $form->parent_form_id ) ) . '">', '</a>' ) );
1112	1204	}
		@@ -1117,8 +1209,9 @@
1117	1209
1118	1210	// Automatically add end section fields if they don't exist (2.0 migration).
1119	1211	$reset_fields = false;
1120	1212	FrmFormsHelper::auto_add_end_section_fields( $form, $fields, $reset_fields );
	1213	+ FrmSubmitHelper::maybe_create_submit_field( $form, $fields, $reset_fields );
1121	1214
1122	1215	if ( $reset_fields ) {
1123	1216	$fields = FrmField::get_all_for_form( $form->id, '', 'exclude' );
1124	1217	}
		@@ -1144,18 +1237,21 @@
1144	1237	}
1145	1238
1146	1239	self::maybe_update_form_builder_message( $message );
1147	1240
1148		- $all_templates = FrmForm::getAll( array( 'is_template' => 1 ), 'name' );
1149		- $has_fields = isset( $values['fields'] ) && ! empty( $values['fields'] );
	1241	+ $has_fields = ! empty( $values['fields'] ) && ! FrmSubmitHelper::only_contains_submit_field( $values['fields'] );
1150	1242
1151	1243	if ( defined( 'DOING_AJAX' ) ) {
1152	1244	wp_die();
1153		- } else {
1154		- require( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/edit.php' );
1155	1245	}
	1246	+
	1247	+ require FrmAppHelper::plugin_path() . '/classes/views/frm-forms/edit.php';
1156	1248	}
1157	1249
	1250	+ /**
	1251	+ * @param array $fields
	1252	+ * @return array
	1253	+ */
1158	1254	public static function update_form_builder_fields( $fields, $form ) {
1159	1255	foreach ( $fields as $field ) {
1160	1256	$field->do_not_include_icons = true;
1161	1257	}
		@@ -1167,13 +1263,21 @@
1167	1263	$message = __( 'Form was Successfully Copied', 'formidable' );
1168	1264	}
1169	1265	}
1170	1266
	1267	+ /**
	1268	+ * @param int|string $id
	1269	+ * @param array $errors
	1270	+ * @param array|string $args
	1271	+ * @return void
	1272	+ */
1171	1273	public static function get_settings_vars( $id, $errors = array(), $args = array() ) {
1172	1274	FrmAppHelper::permission_check( 'frm_edit_forms' );
1173	1275
1174	1276	global $frm_vars;
1175	1277
	1278	+ self::maybe_print_media_templates();
	1279	+
1176	1280	if ( ! is_array( $args ) ) {
1177	1281	// For reverse compatibility.
1178	1282	$args = array(
1179	1283	'message' => $args,
		@@ -1206,17 +1310,38 @@
1206	1310
1207	1311	$sections = self::get_settings_tabs( $values );
1208	1312	$current = FrmAppHelper::simple_get( 't', 'sanitize_title', 'advanced_settings' );
1209	1313
1210		- require( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings.php' );
	1314	+ require FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings.php';
1211	1315	}
1212	1316
1213	1317	/**
	1318	+ * Print WordPress media templates email actions does not trigger a "Uncaught Error: Template not found: #tmpl-media-selection" error when the media button is clicked.
	1319	+ *
	1320	+ * @since 6.10
	1321	+ *
	1322	+ * @return void
	1323	+ */
	1324	+ private static function maybe_print_media_templates() {
	1325	+ if ( FrmAppHelper::pro_is_included() ) {
	1326	+ // This issue does not exist when Pro is active so exit early.
	1327	+ return;
	1328	+ }
	1329	+
	1330	+ add_action(
	1331	+ 'wp_enqueue_editor',
	1332	+ function () {
	1333	+ wp_print_media_templates();
	1334	+ }
	1335	+ );
	1336	+ }
	1337	+
	1338	+ /**
1214	1339	* @since 4.0
1215	1340	*/
1216	1341	public static function form_publish_button( $atts ) {
1217	1342	$values = $atts['values'];
1218		- include( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/_publish_box.php' );
	1343	+ include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/_publish_box.php';
1219	1344	}
1220	1345
1221	1346	/**
1222	1347	* Get a list of all the settings tabs for the form settings page.
		@@ -1241,9 +1366,9 @@
1241	1366	'icon' => 'frm_icon_font frm_mail_bulk_icon',
1242	1367	),
1243	1368	'permissions' => array(
1244	1369	'name' => __( 'Form Permissions', 'formidable' ),
1245		- 'icon' => 'frm_icon_font frm_lock_icon',
	1370	+ 'icon' => 'frm_icon_font frm_lock_closed_icon',
1246	1371	'html_class' => 'frm_show_upgrade_tab frm_noallow',
1247	1372	'data' => array(
1248	1373	'medium' => 'permissions',
1249	1374	'upgrade' => __( 'Form Permissions', 'formidable' ),
		@@ -1250,9 +1375,9 @@
1250	1375	'message' => __( 'Allow editing, protect forms and files, limit entries, and save drafts. Upgrade to get form and entry permissions.', 'formidable' ),
1251	1376	'screenshot' => 'permissions.png',
1252	1377	),
1253	1378	),
1254		- 'scheduling' => array(
	1379	+ 'scheduling' => array(
1255	1380	'name' => __( 'Form Scheduling', 'formidable' ),
1256	1381	'icon' => 'frm_icon_font frm_calendar_icon',
1257	1382	'html_class' => 'frm_show_upgrade_tab frm_noallow',
1258	1383	'data' => array(
		@@ -1285,9 +1410,9 @@
1285	1410	'screenshot' => 'chat.png',
1286	1411	)
1287	1412	),
1288	1413	),
1289		- 'abandonment' => array(
	1414	+ 'abandonment' => array(
1290	1415	'name' => __( 'Form Abandonment', 'formidable' ),
1291	1416	'icon' => 'frm_icon_font frm_abandoned_icon',
1292	1417	'html_class' => 'frm_show_upgrade_tab frm_noallow',
1293	1418	'data' => FrmAppHelper::get_upgrade_data_params(
		@@ -1306,8 +1431,12 @@
1306	1431	'icon' => 'frm_icon_font frm_code_icon',
1307	1432	),
1308	1433	);
1309	1434
	1435	+ if ( ! has_action( 'frm_add_form_style_tab_options' ) && ! has_action( 'frm_add_form_button_options' ) ) {
	1436	+ unset( $sections['buttons'] );
	1437	+ }
	1438	+
1310	1439	foreach ( array( 'landing', 'chat', 'abandonment' ) as $feature ) {
1311	1440	if ( ! FrmAppHelper::show_new_feature( $feature ) ) {
1312	1441	unset( $sections[ $feature ] );
1313	1442	}
		@@ -1314,13 +1443,8 @@
1314	1443	}
1315	1444
1316	1445	$sections = apply_filters( 'frm_add_form_settings_section', $sections, $values );
1317	1446
1318		- if ( FrmAppHelper::pro_is_installed() && ! FrmAppHelper::meets_min_pro_version( '4.0' ) ) {
1319		- // Prevent settings from showing in 2 spots.
1320		- unset( $sections['permissions'], $sections['scheduling'] );
1321		- }
1322		-
1323	1447	foreach ( $sections as $key => $section ) {
1324	1448	$defaults = array(
1325	1449	'html_class' => '',
1326	1450	'name' => ucfirst( $key ),
		@@ -1342,9 +1466,9 @@
1342	1466	$section['id'] = $section['anchor'];
1343	1467	}
1344	1468
1345	1469	$sections[ $key ] = $section;
1346		- }
	1470	+ }//end foreach
1347	1471
1348	1472	return $sections;
1349	1473	}
1350	1474
		@@ -1351,8 +1475,9 @@
1351	1475	/**
1352	1476	* @since 4.0
1353	1477	*
1354	1478	* @param array $values
	1479	+ * @return void
1355	1480	*/
1356	1481	public static function advanced_settings( $values ) {
1357	1482	$first_h3 = 'frm_first_h3';
1358	1483
		@@ -1360,8 +1485,9 @@
1360	1485	}
1361	1486
1362	1487	/**
1363	1488	* @param array $values
	1489	+ * @return void
1364	1490	*/
1365	1491	public static function render_spam_settings( $values ) {
1366	1492	if ( function_exists( 'akismet_http_post' ) ) {
1367	1493	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/spam-settings/akismet.php';
		@@ -1373,16 +1499,12 @@
1373	1499	/**
1374	1500	* @since 4.0
1375	1501	*
1376	1502	* @param array $values
	1503	+ * @return void
1377	1504	*/
1378	1505	public static function buttons_settings( $values ) {
1379		- $styles = apply_filters( 'frm_get_style_opts', array() );
1380		-
1381		- $frm_settings = FrmAppHelper::get_settings();
1382		- $no_global_style = $frm_settings->load_style === 'none';
1383		-
1384		- include( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings-buttons.php' );
	1506	+ include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings-buttons.php';
1385	1507	}
1386	1508
1387	1509	/**
1388	1510	* @since 4.0
		@@ -1387,11 +1509,12 @@
1387	1509	/**
1388	1510	* @since 4.0
1389	1511	*
1390	1512	* @param array $values
	1513	+ * @return void
1391	1514	*/
1392	1515	public static function html_settings( $values ) {
1393		- include( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings-html.php' );
	1516	+ include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings-html.php';
1394	1517	}
1395	1518
1396	1519	/**
1397	1520	* Replace old Submit Button href with new href to avoid errors in Chrome
		@@ -1397,9 +1520,10 @@
1397	1520	* Replace old Submit Button href with new href to avoid errors in Chrome
1398	1521	*
1399	1522	* @since 2.03.08
1400	1523	*
1401		- * @param array|boolean $values
	1524	+ * @param array|bool $values
	1525	+ * @return void
1402	1526	*/
1403	1527	private static function clean_submit_html( &$values ) {
1404	1528	if ( is_array( $values ) && isset( $values['submit_html'] ) ) {
1405	1529	$values['submit_html'] = str_replace( 'javascript:void(0)', '#', $values['submit_html'] );
		@@ -1420,8 +1544,13 @@
1420	1544
1421	1545	return $classes;
1422	1546	}
1423	1547
	1548	+ /**
	1549	+ * @param int|string $form_id
	1550	+ * @param string $class
	1551	+ * @return void
	1552	+ */
1424	1553	public static function mb_tags_box( $form_id, $class = '' ) {
1425	1554	$fields = FrmField::get_all_for_form( $form_id, '', 'include' );
1426	1555
1427	1556	/**
		@@ -1434,9 +1563,9 @@
1434	1563	*/
1435	1564	$fields = apply_filters( 'frm_fields_in_tags_box', $fields, compact( 'form_id' ) );
1436	1565	$linked_forms = array();
1437	1566	$col = 'one';
1438		- $settings_tab = FrmAppHelper::is_admin_page( 'formidable' ) ? true : false;
	1567	+ $settings_tab = FrmAppHelper::is_admin_page( 'formidable' );
1439	1568
1440	1569	$cond_shortcodes = apply_filters( 'frm_conditional_shortcodes', array() );
1441	1570	$entry_shortcodes = self::get_shortcode_helpers( $settings_tab );
1442	1571
		@@ -1441,9 +1570,9 @@
1441	1570	$entry_shortcodes = self::get_shortcode_helpers( $settings_tab );
1442	1571
1443	1572	$advanced_helpers = self::advanced_helpers( compact( 'fields', 'form_id' ) );
1444	1573
1445		- include( FrmAppHelper::plugin_path() . '/classes/views/shared/mb_adv_info.php' );
	1574	+ include FrmAppHelper::plugin_path() . '/classes/views/shared/mb_adv_info.php';
1446	1575	}
1447	1576
1448	1577	/**
1449	1578	* @since 3.04.01
		@@ -1456,9 +1585,9 @@
1456	1585	),
1457	1586	);
1458	1587
1459	1588	$user_fields = self::user_shortcodes();
1460		- if ( ! empty( $user_fields ) ) {
	1589	+ if ( $user_fields ) {
1461	1590	$user_helpers = array();
1462	1591	foreach ( $user_fields as $uk => $uf ) {
1463	1592	$user_helpers[ '|user_id| show="' . $uk . '"' ] = $uf;
1464	1593	unset( $uk, $uf );
		@@ -1464,9 +1593,9 @@
1464	1593	unset( $uk, $uf );
1465	1594	}
1466	1595
1467	1596	$advanced_helpers['user_id'] = array(
1468		- 'codes' => $user_helpers,
	1597	+ 'codes' => $user_helpers,
1469	1598	);
1470	1599	}
1471	1600
1472	1601	/**
		@@ -1543,21 +1672,16 @@
1543	1672	'updated-at' => __( 'Entry updated', 'formidable' ),
1544	1673	'' => '',
1545	1674	'siteurl' => __( 'Site URL', 'formidable' ),
1546	1675	'sitename' => __( 'Site Name', 'formidable' ),
	1676	+ 'form_name' => __( 'Form Name', 'formidable' ),
1547	1677	);
1548	1678
	1679	+ $entry_shortcodes = array_merge( FrmShortcodeHelper::get_contextual_shortcode_values(), $entry_shortcodes );
1549	1680	if ( ! FrmAppHelper::pro_is_installed() ) {
1550	1681	unset( $entry_shortcodes['post_id'] );
1551	1682	}
1552	1683
1553		- if ( $settings_tab ) {
1554		- $entry_shortcodes['default-message'] = __( 'Default Msg', 'formidable' );
1555		- $entry_shortcodes['default-html'] = __( 'Default HTML', 'formidable' );
1556		- $entry_shortcodes['default-plain'] = __( 'Default Plain', 'formidable' );
1557		- $entry_shortcodes['form_name'] = __( 'Form Name', 'formidable' );
1558		- }
1559		-
1560	1684	/**
1561	1685	* Use this hook to add or remove buttons in the helpers section
1562	1686	* in the customization panel
1563	1687	*
		@@ -1607,11 +1731,11 @@
1607	1731	check_ajax_referer( 'frm_ajax', 'nonce' );
1608	1732
1609	1733	echo FrmEntriesController::show_entry_shortcode( // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
1610	1734	array(
1611		- 'form_id' => FrmAppHelper::get_post_param( 'form_id', '', 'absint' ),
	1735	+ 'form_id' => FrmAppHelper::get_post_param( 'form_id', '', 'absint' ), // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
1612	1736	'default_email' => true,
1613		- 'plain_text' => FrmAppHelper::get_post_param( 'plain_text', '', 'absint' ),
	1737	+ 'plain_text' => FrmAppHelper::get_post_param( 'plain_text', '', 'absint' ), // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
1614	1738	)
1615	1739	);
1616	1740	wp_die();
1617	1741	}
		@@ -1617,10 +1741,10 @@
1617	1741	}
1618	1742
1619	1743	/**
1620	1744	* @param string $content
1621		- * @param stdClass|string|int $form
1622		- * @param stdClass|string|int|false $entry
	1745	+ * @param int|stdClass|string $form
	1746	+ * @param false|int|stdClass|string $entry
1623	1747	* @return string
1624	1748	*/
1625	1749	public static function filter_content( $content, $form, $entry = false ) {
1626	1750	$content = self::replace_form_name_shortcodes( $content, $form );
		@@ -1633,8 +1757,16 @@
1633	1757	if ( is_object( $form ) ) {
1634	1758	$form = $form->id;
1635	1759	}
1636	1760
	1761	+ /*
	1762	+ * Repeater actions adds `parent_entry` to `$entry` store the parent entry data. If `parent_entry` is not empty,
	1763	+ * use the parent form ID instead of repeater form ID to fix the parent form field shortcodes doesn't work.
	1764	+ */
	1765	+ if ( ! empty( $entry->parent_entry ) ) {
	1766	+ $form = $entry->parent_entry->form_id;
	1767	+ }
	1768	+
1637	1769	$shortcodes = FrmFieldsHelper::get_shortcodes( $content, $form );
1638	1770	$content = apply_filters( 'frm_replace_content_shortcodes', $content, $entry, $shortcodes );
1639	1771
1640	1772	return $content;
		@@ -1644,11 +1776,11 @@
1644	1776	* Replace any [form_name] shortcodes in a string.
1645	1777	*
1646	1778	* @since 5.5
1647	1779	*
1648		- * @param string|array $string
1649		- * @param stdClass|string|int $form
1650		- * @return string|array
	1780	+ * @param array|string $string
	1781	+ * @param int|stdClass|string $form
	1782	+ * @return array|string
1651	1783	*/
1652	1784	public static function replace_form_name_shortcodes( $string, $form ) {
1653	1785	if ( ! is_string( $string ) ) {
1654	1786	return $string;
		@@ -1666,9 +1798,9 @@
1666	1798	return str_replace( '[form_name]', $form_name, $string );
1667	1799	}
1668	1800
1669	1801	/**
1670		- * @param stdClass|string|int|false $entry
	1802	+ * @param false|int|stdClass|string $entry
1671	1803	* @return void
1672	1804	*/
1673	1805	private static function get_entry_by_param( &$entry ) {
1674	1806	if ( ! $entry || ! is_object( $entry ) ) {
		@@ -1683,8 +1815,12 @@
1683	1815	public static function replace_content_shortcodes( $content, $entry, $shortcodes ) {
1684	1816	return FrmFieldsHelper::replace_content_shortcodes( $content, $entry, $shortcodes );
1685	1817	}
1686	1818
	1819	+ /**
	1820	+ * @param array $errors
	1821	+ * @return array
	1822	+ */
1687	1823	public static function process_bulk_form_actions( $errors ) {
1688	1824	if ( ! $_REQUEST ) {
1689	1825	return $errors;
1690	1826	}
		@@ -1728,9 +1864,9 @@
1728	1864	case 'untrash':
1729	1865	$message = self::bulk_untrash( $ids );
1730	1866	}
1731	1867
1732		- if ( isset( $message ) && ! empty( $message ) ) {
	1868	+ if ( ! empty( $message ) ) {
1733	1869	$errors['message'] = $message;
1734	1870	}
1735	1871
1736	1872	return $errors;
		@@ -1750,9 +1886,9 @@
1750	1886	$json_vars = json_decode( $json_vars, true );
1751	1887	if ( empty( $json_vars ) ) {
1752	1888	// json decoding failed so we should return an error message.
1753	1889	$action = FrmAppHelper::get_param( $action, '', 'get', 'sanitize_title' );
1754		- if ( 'edit' == $action ) {
	1890	+ if ( 'edit' === $action ) {
1755	1891	$action = 'update';
1756	1892	}
1757	1893
1758	1894	add_filter( 'frm_validate_form', 'FrmFormsController::json_error' );
		@@ -1768,16 +1904,14 @@
1768	1904	if ( isset( $_REQUEST['delete_all'] ) ) {
1769	1905	// Override the action for this page.
1770	1906	$action = 'delete_all';
1771	1907	}
1772		- }
	1908	+ }//end if
1773	1909
1774	1910	add_action( 'frm_load_form_hooks', 'FrmHooksController::trigger_load_form_hooks' );
1775	1911	FrmAppHelper::trigger_hook_load( 'form' );
1776	1912
1777	1913	switch ( $action ) {
1778		- case 'new':
1779		- return self::new_form( $vars );
1780	1914	case 'create':
1781	1915	case 'edit':
1782	1916	case 'update':
1783	1917	case 'trash':
		@@ -1782,16 +1916,17 @@
1782	1916	case 'update':
1783	1917	case 'trash':
1784	1918	case 'untrash':
1785	1919	case 'destroy':
1786		- case 'delete_all':
1787	1920	case 'settings':
1788	1921	case 'update_settings':
1789	1922	return self::$action( $vars );
1790	1923	case 'lite-reports':
1791		- return self::no_reports( $vars );
	1924	+ self::no_reports( $vars );
	1925	+ return;
1792	1926	case 'views':
1793		- return self::no_views( $vars );
	1927	+ self::no_views( $vars );
	1928	+ return;
1794	1929	default:
1795	1930	do_action( 'frm_form_action_' . $action );
1796	1931	if ( apply_filters( 'frm_form_stop_action_' . $action, false ) ) {
1797	1932	return;
		@@ -1814,14 +1949,47 @@
1814	1949	self::display_forms_list( array(), '', array( __( 'There was a problem duplicating the form', 'formidable' ) ) );
1815	1950	return;
1816	1951	}
1817	1952
	1953	+ if ( 'forms_permanently_deleted' === $message ) {
	1954	+ $count = FrmAppHelper::get_param( 'forms_deleted', 0, 'get', 'absint' );
	1955	+ /* translators: %1$s: Number of forms */
	1956	+ $message = sprintf( _n( '%1$s form permanently deleted.', '%1$s forms permanently deleted.', $count, 'formidable' ), $count );
	1957	+ self::display_forms_list( array(), $message, '' );
	1958	+ return;
	1959	+ }
	1960	+
1818	1961	self::display_forms_list();
1819	1962
1820	1963	return;
1821		- }
	1964	+ }//end switch
1822	1965	}
1823	1966
	1967	+ /**
	1968	+ * Rename a form.
	1969	+ *
	1970	+ * Handles the AJAX request for renaming a form.
	1971	+ *
	1972	+ * @since 6.7
	1973	+ *
	1974	+ * @return void
	1975	+ */
	1976	+ public static function rename_form() {
	1977	+ // Check permission and nonce
	1978	+ FrmAppHelper::permission_check( 'frm_edit_forms' );
	1979	+ check_ajax_referer( 'frm_ajax', 'nonce' );
	1980	+
	1981	+ // Get posted data
	1982	+ $form_id = FrmAppHelper::get_post_param( 'form_id', '', 'absint' );
	1983	+ $name = FrmAppHelper::get_post_param( 'form_name', '', 'sanitize_text_field' );
	1984	+
	1985	+ // Update the form name and form key.
	1986	+ $form_key = FrmAppHelper::get_unique_key( sanitize_title( $name ), 'frm_forms', 'form_key' );
	1987	+ FrmForm::update( $form_id, compact( 'name', 'form_key' ) );
	1988	+
	1989	+ wp_send_json_success( compact( 'form_key' ) );
	1990	+ }
	1991	+
1824	1992	public static function json_error( $errors ) {
1825	1993	$errors['json'] = __( 'Abnormal HTML characters prevented your form from saving correctly', 'formidable' );
1826	1994
1827	1995	return $errors;
		@@ -1827,20 +1995,13 @@
1827	1995	return $errors;
1828	1996	}
1829	1997
1830	1998	/**
1831		- * Education for premium features.
1832		- *
1833		- * @since 4.05
1834		- */
1835		- public static function add_form_style_tab_options() {
1836		- include( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/add_form_style_options.php' );
1837		- }
1838		-
1839		- /**
1840	1999	* Add education about views.
1841	2000	*
1842	2001	* @since 4.07
	2002	+ *
	2003	+ * @return void
1843	2004	*/
1844	2005	public static function no_views( $values = array() ) {
1845	2006	FrmAppHelper::include_svg();
1846	2007	$id = FrmAppHelper::get_param( 'form', '', 'get', 'absint' );
		@@ -1852,8 +2013,10 @@
1852	2013	/**
1853	2014	* Add education about reports.
1854	2015	*
1855	2016	* @since 4.07
	2017	+ *
	2018	+ * @return void
1856	2019	*/
1857	2020	public static function no_reports( $values = array() ) {
1858	2021	$id = FrmAppHelper::get_param( 'form', '', 'get', 'absint' );
1859	2022	$form = $id ? FrmForm::getOne( $id ) : false;
		@@ -1860,9 +2023,11 @@
1860	2023
1861	2024	include FrmAppHelper::plugin_path() . '/classes/views/shared/reports-info.php';
1862	2025	}
1863	2026
1864		- /* FRONT-END FORMS */
	2027	+ /**
	2028	+ * FRONT-END FORMS.
	2029	+ */
1865	2030	public static function admin_bar_css() {
1866	2031	if ( is_admin() || ! current_user_can( 'frm_edit_forms' ) ) {
1867	2032	return;
1868	2033	}
		@@ -1936,9 +2101,9 @@
1936	2101	$wp_admin_bar->add_node(
1937	2102	array(
1938	2103	'parent' => 'frm-forms',
1939	2104	'id' => 'edit_form_' . $form_id,
1940		- 'title' => empty( $name ) ? __( '(no title)', 'formidable' ) : $name,
	2105	+ 'title' => empty( $name ) ? FrmFormsHelper::get_no_title_text() : $name,
1941	2106	'href' => FrmForm::get_edit_link( $form_id ),
1942	2107	)
1943	2108	);
1944	2109	}
		@@ -1951,10 +2116,10 @@
1951	2116	* @return string
1952	2117	*/
1953	2118	public static function get_form_shortcode( $atts ) {
1954	2119	global $frm_vars;
1955		- if ( isset( $frm_vars['skip_shortcode'] ) && $frm_vars['skip_shortcode'] ) {
1956		- $sc = '[formidable';
	2120	+ if ( ! empty( $frm_vars['skip_shortcode'] ) ) {
	2121	+ $sc = '[formidable';
1957	2122	$sc .= FrmAppHelper::array_to_html_params( $atts );
1958	2123	return $sc . ']';
1959	2124	}
1960	2125
		@@ -1979,11 +2144,11 @@
1979	2144
1980	2145	/**
1981	2146	* @since 5.2.01
1982	2147	*
1983		- * @param string|int|false $id
1984		- * @param string|false $key
1985		- * @return stdClass|false
	2148	+ * @param false|int|string $id
	2149	+ * @param false|string $key
	2150	+ * @return false|stdClass
1986	2151	*/
1987	2152	private static function maybe_get_form_by_id_or_key( $id, $key ) {
1988	2153	if ( ! $id ) {
1989	2154	$id = $key;
		@@ -1991,12 +2156,12 @@
1991	2156	return self::maybe_get_form_to_show( $id );
1992	2157	}
1993	2158
1994	2159	/**
1995		- * @param string|int|false $id
1996		- * @param string|false $key
1997		- * @param string|int|bool $title may be 'auto', true, false, 'true', 'false', 'yes', '1', 1, '0', 0.
1998		- * @param string|int|bool $description may be 'auto', true, false, 'true', 'false', 'yes', '1', 1, '0', 0.
	2160	+ * @param false|int|string $id
	2161	+ * @param false|string $key
	2162	+ * @param bool|int|string $title may be 'auto', true, false, 'true', 'false', 'yes', '1', 1, '0', 0.
	2163	+ * @param bool|int|string $description may be 'auto', true, false, 'true', 'false', 'yes', '1', 1, '0', 0.
1999	2164	* @param array $atts
2000	2165	* @return string
2001	2166	*/
2002	2167	public static function show_form( $id = '', $key = '', $title = false, $description = false, $atts = array() ) {
		@@ -2044,15 +2209,16 @@
2044	2209	return $form;
2045	2210	}
2046	2211
2047	2212	/**
2048		- * @param string|int|false $id
2049		- * @return stdClass|false
	2213	+ * @param false|int|string $id
	2214	+ * @return false|stdClass
2050	2215	*/
2051	2216	private static function maybe_get_form_to_show( $id ) {
2052	2217	$form = false;
2053	2218
2054		- if ( ! empty( $id ) ) { // form id or key is set
	2219	+ if ( ! empty( $id ) ) {
	2220	+ // Form id or key is set.
2055	2221	$form = FrmForm::getOne( $id );
2056	2222	if ( ! $form || $form->parent_form_id || $form->status === 'trash' ) {
2057	2223	$form = false;
2058	2224	}
		@@ -2110,11 +2276,11 @@
2110	2276
2111	2277	do_action( 'frm_validate_form_creation', $params, $fields, $form, $title, $description );
2112	2278
2113	2279	if ( apply_filters( 'frm_continue_to_create', true, $form->id ) ) {
2114		- $entry_id = self::just_created_entry( $form->id );
2115		- $pass_args['entry_id'] = $entry_id;
2116		- $pass_args['reset'] = true;
	2280	+ $entry_id = self::just_created_entry( $form->id );
	2281	+ $pass_args['entry_id'] = $entry_id;
	2282	+ $pass_args['reset'] = true;
2117	2283
2118	2284	self::run_on_submit_actions( $pass_args );
2119	2285
2120	2286	do_action(
		@@ -2124,9 +2290,9 @@
2124	2290	'form' => $form,
2125	2291	)
2126	2292	);
2127	2293	}
2128		- }
	2294	+ }//end if
2129	2295	}
2130	2296
2131	2297	/**
2132	2298	* If the form was processed earlier (init), get the generated errors
		@@ -2158,9 +2324,9 @@
2158	2324	*/
2159	2325	public static function just_created_entry( $form_id ) {
2160	2326	global $frm_vars;
2161	2327
2162		- return ( isset( $frm_vars['created_entries'] ) && isset( $frm_vars['created_entries'][ $form_id ] ) && isset( $frm_vars['created_entries'][ $form_id ]['entry_id'] ) ) ? $frm_vars['created_entries'][ $form_id ]['entry_id'] : 0;
	2328	+ return isset( $frm_vars['created_entries'] ) && isset( $frm_vars['created_entries'][ $form_id ] ) && isset( $frm_vars['created_entries'][ $form_id ]['entry_id'] ) ? $frm_vars['created_entries'][ $form_id ]['entry_id'] : 0;
2163	2329	}
2164	2330
2165	2331	/**
2166	2332	* Gets confirmation method.
		@@ -2173,14 +2339,14 @@
2173	2339	*
2174	2340	* @type object $form Form object.
2175	2341	* @type int $entry_id Entry ID.
2176	2342	* }
2177		- * @return string|array
	2343	+ * @return array|string
2178	2344	*/
2179	2345	private static function get_confirmation_method( $atts ) {
2180	2346	$action = FrmOnSubmitHelper::current_event( $atts );
2181	2347	$opt = 'update' === $action ? 'edit_action' : 'success_action';
2182		- $method = ( isset( $atts['form']->options[ $opt ] ) && ! empty( $atts['form']->options[ $opt ] ) ) ? $atts['form']->options[ $opt ] : 'message';
	2348	+ $method = ! empty( $atts['form']->options[ $opt ] ) ? $atts['form']->options[ $opt ] : 'message';
2183	2349
2184	2350	if ( ! empty( $atts['entry_id'] ) ) {
2185	2351	$met_actions = self::get_met_on_submit_actions( $atts, $action );
2186	2352	if ( $met_actions ) {
		@@ -2189,9 +2355,9 @@
2189	2355	}
2190	2356
2191	2357	$method = apply_filters( 'frm_success_filter', $method, $atts['form'], $action );
2192	2358
2193		- if ( $method != 'message' && ( ! $atts['entry_id'] || ! is_numeric( $atts['entry_id'] ) ) ) {
	2359	+ if ( $method !== 'message' && ( ! $atts['entry_id'] || ! is_numeric( $atts['entry_id'] ) ) ) {
2194	2360	$method = 'message';
2195	2361	}
2196	2362
2197	2363	return $method;
		@@ -2225,9 +2391,9 @@
2225	2391	* @param array $args See {@see FrmFormsController::maybe_trigger_redirect()}.
2226	2392	*/
2227	2393	public static function maybe_trigger_redirect_with_action( $conf_method, $form, $params, $args ) {
2228	2394	if ( is_array( $conf_method ) && 1 === count( $conf_method ) ) {
2229		- if ( 'redirect' === FrmOnSubmitHelper::get_action_type( $conf_method[0] ) ) {
	2395	+ if ( 'redirect' === FrmOnSubmitHelper::get_action_type( $conf_method[0] ) && empty( $conf_method[0]->post_content['redirect_delay'] ) ) {
2230	2396	$event = FrmOnSubmitHelper::current_event( $params );
2231	2397	FrmOnSubmitHelper::populate_on_submit_data( $form->options, $conf_method[0], $event );
2232	2398	$conf_method = 'redirect';
2233	2399	}
		@@ -2276,9 +2442,9 @@
2276	2442	unset( $extra_args['form'] );
2277	2443
2278	2444	do_action( 'frm_success_action', $args['conf_method'], $args['form'], $args['form']->options, $args['entry_id'], $extra_args );
2279	2445
2280		- $opt = ( ! isset( $args['action'] ) || $args['action'] === 'create' ) ? 'success' : 'edit';
	2446	+ $opt = ! isset( $args['action'] ) || $args['action'] === 'create' ? 'success' : 'edit';
2281	2447
2282	2448	$args['success_opt'] = $opt;
2283	2449	$args['ajax'] = ! empty( $frm_vars['ajax'] );
2284	2450
		@@ -2304,16 +2470,16 @@
2304	2470	if ( ! FrmOnSubmitHelper::form_has_migrated( $args['form'] ) ) {
2305	2471	return array();
2306	2472	}
2307	2473
2308		- // If a redirect action has already opened the URL in a new tab, we show the default message in the currect tab.
	2474	+ // If a redirect action has already opened the URL in a new tab, we show the default message in the current tab.
2309	2475	if ( ! empty( self::$redirected_in_new_tab[ $args['form']->id ] ) ) {
2310	2476	return array( FrmOnSubmitHelper::get_fallback_action_after_open_in_new_tab( $event ) );
2311	2477	}
2312	2478
2313		- $entry = FrmEntry::getOne( $args['entry_id'], true );
2314		- $actions = FrmOnSubmitHelper::get_actions( $args['form']->id );
2315		- $met_actions = array();
	2479	+ $entry = FrmEntry::getOne( $args['entry_id'], true );
	2480	+ $actions = FrmOnSubmitHelper::get_actions( $args['form']->id );
	2481	+ $met_actions = array();
2316	2482	$has_redirect = false;
2317	2483
2318	2484	foreach ( $actions as $action ) {
2319	2485	if ( ! in_array( $event, $action->post_content['event'], true ) ) {
		@@ -2326,9 +2492,10 @@
2326	2492
2327	2493	$action_type = FrmOnSubmitHelper::get_action_type( $action );
2328	2494
2329	2495	if ( 'redirect' === $action_type ) {
2330		- if ( $has_redirect ) { // Do not process because we run the first redirect action only.
	2496	+ if ( $has_redirect ) {
	2497	+ // Do not process because we run the first redirect action only.
2331	2498	continue;
2332	2499	}
2333	2500	}
2334	2501
		@@ -2341,9 +2508,9 @@
2341	2508	}
2342	2509
2343	2510	$met_actions[] = $action;
2344	2511	unset( $action );
2345		- }
	2512	+ }//end foreach
2346	2513
2347	2514	$args['event'] = $event;
2348	2515
2349	2516	/**
		@@ -2532,9 +2699,9 @@
2532	2699	add_filter( 'the_content', 'FrmFormsController::preview_content', 9999 );
2533	2700	}
2534	2701
2535	2702	$post = $old_post;
2536		- }
	2703	+ }//end if
2537	2704	}
2538	2705
2539	2706	/**
2540	2707	* @since 3.0
		@@ -2555,14 +2722,16 @@
2555	2722	$success_url = apply_filters( 'frm_redirect_url', $success_url, $args['form'], $args );
2556	2723
2557	2724	$doing_ajax = FrmAppHelper::doing_ajax();
2558	2725
2559		- if ( ! empty( $args['ajax'] ) && $doing_ajax && empty( $args['force_delay_redirect'] ) ) { // Is AJAX submit and there is just one Redirect action runs.
	2726	+ if ( ! empty( $args['ajax'] ) && $doing_ajax && empty( $args['force_delay_redirect'] ) ) {
	2727	+ // Is AJAX submit and there is just one Redirect action runs.
2560	2728	echo json_encode( self::get_ajax_redirect_response_data( $args + compact( 'success_url' ) ) );
2561	2729	wp_die();
2562	2730	}
2563	2731
2564		- if ( ! headers_sent() && empty( $args['force_delay_redirect'] ) ) { // Not AJAX submit, no headers sent, and there is just one Redirect action runs.
	2732	+ if ( ! headers_sent() && empty( $args['force_delay_redirect'] ) && empty( $args['form']->options['redirect_delay'] ) ) {
	2733	+ // Not AJAX submit, no headers sent, and there is just one Redirect action runs.
2565	2734	if ( ! empty( $args['form']->options['open_in_new_tab'] ) ) {
2566	2735	self::print_open_in_new_tab_js_with_fallback_handler( $success_url, $args );
2567	2736	self::$redirected_in_new_tab[ $args['form']->id ] = 1;
2568	2737	return;
		@@ -2568,9 +2737,10 @@
2568	2737	return;
2569	2738	}
2570	2739
2571	2740	wp_redirect( esc_url_raw( $success_url ) );
2572		- die(); // do not use wp_die or redirect fails
	2741	+ // Do not use wp_die or redirect fails.
	2742	+ die();
2573	2743	}
2574	2744
2575	2745	// Redirect with a delay.
2576	2746	self::redirect_after_submit_using_js( $args + compact( 'success_url', 'doing_ajax' ) );
		@@ -2605,28 +2775,46 @@
2605	2775	* @param array $args See {@see FrmFormsController::run_success_action()}.
2606	2776	* @return array
2607	2777	*/
2608	2778	private static function get_ajax_redirect_response_data( $args ) {
2609		- $response_data = array( 'redirect' => $args['success_url'] );
	2779	+ $response_data = array(
	2780	+ 'redirect' => $args['success_url'],
	2781	+ 'content' => '',
	2782	+ );
	2783	+ $unset_content = true;
2610	2784
	2785	+ if ( ! empty( $args['form']->options['redirect_delay'] ) ) {
	2786	+ $response_data['delay'] = $args['form']->options['redirect_delay_time'];
	2787	+ $response_data['content'] .= self::get_redirect_message( $args['success_url'], $args['form']->options['redirect_delay_msg'], $args );
	2788	+ $unset_content = false;
	2789	+ }
	2790	+
2611	2791	if ( ! empty( $args['form']->options['open_in_new_tab'] ) ) {
2612	2792	$response_data['openInNewTab'] = 1;
2613	2793
2614		- $args['message'] = FrmOnSubmitHelper::get_default_new_tab_msg();
	2794	+ // Only show open in new tab text if there is no delay.
	2795	+ if ( empty( $response_data['content'] ) ) {
	2796	+ $args['message'] = FrmOnSubmitHelper::get_default_new_tab_msg();
2615	2797
2616		- $args['form']->options['success_msg'] = $args['message'];
2617		- $args['form']->options['edit_msg'] = $args['message'];
2618		- if ( ! isset( $args['fields'] ) ) {
2619		- $args['fields'] = FrmField::get_all_for_form( $args['form']->id );
2620		- }
	2798	+ $args['form']->options['success_msg'] = $args['message'];
	2799	+ $args['form']->options['edit_msg'] = $args['message'];
	2800	+ if ( ! isset( $args['fields'] ) ) {
	2801	+ $args['fields'] = FrmField::get_all_for_form( $args['form']->id );
	2802	+ }
2621	2803
2622		- $args['message'] = self::prepare_submit_message( $args['form'], $args['entry_id'], $args );
	2804	+ $args['message'] = self::prepare_submit_message( $args['form'], $args['entry_id'], $args );
2623	2805
2624		- ob_start();
2625		- self::show_lone_success_messsage( $args );
2626		- $response_data['content'] = ob_get_clean();
	2806	+ ob_start();
	2807	+ self::show_lone_success_message( $args );
	2808	+ $response_data['content'] .= ob_get_clean();
	2809	+ $unset_content = false;
	2810	+ }//end if
2627	2811
2628	2812	$response_data['fallbackMsg'] = self::get_redirect_fallback_message( $args['success_url'], $args );
	2813	+ }//end if
	2814	+
	2815	+ if ( $unset_content && '' === $response_data['content'] ) {
	2816	+ unset( $response_data['content'] );
2629	2817	}
2630	2818
2631	2819	return $response_data;
2632	2820	}
		@@ -2638,9 +2826,9 @@
2638	2826	*
2639	2827	* @param array $args See {@see FrmFormsController::run_success_action()}.
2640	2828	*/
2641	2829	private static function redirect_after_submit_using_js( $args ) {
2642		- $success_msg = FrmOnSubmitHelper::get_default_redirect_msg();
	2830	+ $success_msg = $args['form']->options['redirect_delay_msg'];
2643	2831	$redirect_msg = self::get_redirect_message( $args['success_url'], $success_msg, $args );
2644	2832	$success_url = esc_url_raw( $args['success_url'] );
2645	2833
2646	2834	/**
		@@ -2647,11 +2835,11 @@
2647	2835	* Filters the delay time before redirecting when On Submit Redirect action is delayed.
2648	2836	*
2649	2837	* @since 6.0
2650	2838	*
2651		- * @param int $delay_time Delay time in miliseconds.
	2839	+ * @param int $delay_time Delay time in milliseconds.
2652	2840	*/
2653		- $delay_time = apply_filters( 'frm_redirect_delay_time', 8000 );
	2841	+ $delay_time = apply_filters( 'frm_redirect_delay_time', 1000 * $args['form']->options['redirect_delay_time'] );
2654	2842
2655	2843	if ( ! empty( $args['form']->options['open_in_new_tab'] ) ) {
2656	2844	$redirect_js = 'window.open("' . $success_url . '", "_blank")';
2657	2845	} else {
		@@ -2661,9 +2849,10 @@
2661	2849	add_filter( 'frm_use_wpautop', '__return_true' );
2662	2850
2663	2851	echo FrmAppHelper::maybe_kses( $redirect_msg ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
2664	2852	echo '<script>';
2665		- if ( empty( $args['doing_ajax'] ) ) { // Not AJAX submit, delay JS until window.load.
	2853	+ if ( empty( $args['doing_ajax'] ) ) {
	2854	+ // Not AJAX submit, delay JS until window.load.
2666	2855	echo 'window.onload=function(){';
2667	2856	}
2668	2857	echo 'setTimeout(function(){' . $redirect_js . '}, ' . intval( $delay_time ) . ');'; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
2669	2858	if ( empty( $args['doing_ajax'] ) ) {
		@@ -2676,11 +2865,13 @@
2676	2865	* @since 3.0
2677	2866	*
2678	2867	* @param string $success_url
2679	2868	* @param string $success_msg
2680		- * @param array $args
	2869	+ * @param array $args
2681	2870	*/
2682	2871	private static function get_redirect_message( $success_url, $success_msg, $args ) {
	2872	+ $success_msg = apply_filters( 'frm_content', $success_msg, $args['form'], $args['entry_id'] );
	2873	+ $success_msg = do_shortcode( FrmAppHelper::use_wpautop( $success_msg ) );
2683	2874	$redirect_msg = '<div class="' . esc_attr( FrmFormsHelper::get_form_style_class( $args['form'] ) ) . '"><div class="frm-redirect-msg" role="status">' . $success_msg . '<br/>' .
2684	2875	self::get_redirect_fallback_message( $success_url, $args ) .
2685	2876	'</div></div>';
2686	2877
		@@ -2736,9 +2927,9 @@
2736	2927	} else {
2737	2928	self::show_form_after_submit( $atts );
2738	2929	}
2739	2930	} else {
2740		- self::show_lone_success_messsage( $atts );
	2931	+ self::show_lone_success_message( $atts );
2741	2932	}
2742	2933	}
2743	2934
2744	2935	/**
		@@ -2777,11 +2968,10 @@
2777	2968	include FrmAppHelper::plugin_path() . '/classes/views/frm-entries/new.php';
2778	2969	}
2779	2970
2780	2971	/**
	2972	+ * @since 4.05.02
2781	2973	* @return string - 'before', 'after', or 'submit'
2782		- *
2783		- * @since 4.05.02
2784	2974	*/
2785	2975	private static function message_placement( $form, $message ) {
2786	2976	$place = 'before';
2787	2977
		@@ -2793,11 +2983,10 @@
2793	2983	}
2794	2984	}
2795	2985
2796	2986	/**
	2987	+ * @since 4.05.02
2797	2988	* @return string - 'before' or 'after'
2798		- *
2799		- * @since 4.05.02
2800	2989	*/
2801	2990	return apply_filters( 'frm_message_placement', $place, compact( 'form', 'message' ) );
2802	2991	}
2803	2992
		@@ -2831,9 +3020,9 @@
2831	3020	* Show the success message without the form
2832	3021	*
2833	3022	* @since 2.05
2834	3023	*/
2835		- private static function show_lone_success_messsage( $atts ) {
	3024	+ private static function show_lone_success_message( $atts ) {
2836	3025	global $frm_vars;
2837	3026	$values = FrmEntriesHelper::setup_new_vars( $atts['fields'], $atts['form'], true );
2838	3027	self::maybe_load_css( $atts['form'], $values['custom_style'], $frm_vars['load_css'] );
2839	3028
		@@ -2842,9 +3031,9 @@
2842	3031	$errors = array();
2843	3032	$form = $atts['form'];
2844	3033	$message = $atts['message'];
2845	3034
2846		- include( FrmAppHelper::plugin_path() . '/classes/views/frm-entries/errors.php' );
	3035	+ include FrmAppHelper::plugin_path() . '/classes/views/frm-entries/errors.php';
2847	3036	}
2848	3037
2849	3038	/**
2850	3039	* Prepare the success message before it's shown
		@@ -2964,9 +3153,9 @@
2964	3153	global $frm_vars;
2965	3154
2966	3155	FrmStylesController::enqueue_css();
2967	3156
2968		- if ( ! FrmAppHelper::is_admin() && $location != 'header' && ! empty( $frm_vars['forms_loaded'] ) ) {
	3157	+ if ( ! FrmAppHelper::is_admin() && $location !== 'header' && ! empty( $frm_vars['forms_loaded'] ) ) {
2969	3158	// load formidable js
2970	3159	wp_enqueue_script( 'formidable' );
2971	3160	}
2972	3161	}
		@@ -2982,12 +3171,12 @@
2982	3171	}
2983	3172
2984	3173	/**
2985	3174	* @since 2.0.8
2986		- * @return boolean
	3175	+ * @return bool
2987	3176	*/
2988	3177	private static function is_minification_on( $atts ) {
2989		- return isset( $atts['minimize'] ) && ! empty( $atts['minimize'] );
	3178	+ return ! empty( $atts['minimize'] );
2990	3179	}
2991	3180
2992	3181	/**
2993	3182	* @since 5.0.16
		@@ -3015,9 +3204,9 @@
3015	3204	* Create a page with an embedded formidable Gutenberg block.
3016	3205	*
3017	3206	* @since 5.2
3018	3207	*
3019		- * @return never
	3208	+ * @return void
3020	3209	*/
3021	3210	public static function create_page_with_shortcode() {
3022	3211	if ( ! current_user_can( 'publish_posts' ) ) {
3023	3212	die( 0 );
		@@ -3062,10 +3251,9 @@
3062	3251
3063	3252	/**
3064	3253	* @since 5.3
3065	3254	*
3066		- * @param string $content
3067		- * @param int $form_id
	3255	+ * @param int $form_id
3068	3256	* @return string
3069	3257	*/
3070	3258	private static function get_page_shortcode_content_for_form( $form_id ) {
3071	3259	$shortcode = '[formidable id="' . $form_id . '"]';
		@@ -3076,9 +3264,9 @@
3076	3264
3077	3265	/**
3078	3266	* Get page dropdown for AJAX request for embedding form in an existing page.
3079	3267	*
3080		- * @return never
	3268	+ * @return void
3081	3269	*/
3082	3270	public static function get_page_dropdown() {
3083	3271	if ( ! current_user_can( 'publish_posts' ) ) {
3084	3272	die( 0 );
		@@ -3086,9 +3274,9 @@
3086	3274
3087	3275	check_ajax_referer( 'frm_ajax', 'nonce' );
3088	3276
3089	3277	$html = FrmAppHelper::clip(
3090		- function() {
	3278	+ function () {
3091	3279	FrmAppHelper::maybe_autocomplete_pages_options(
3092	3280	array(
3093	3281	'field_name' => 'frm_page_dropdown',
3094	3282	'page_id' => '',
		@@ -3108,15 +3296,8 @@
3108	3296
3109	3297	/**
3110	3298	* @deprecated 4.0
3111	3299	*/
3112		- public static function new_form( $values = array() ) {
3113		- FrmDeprecated::new_form( $values );
3114		- }
3115		-
3116		- /**
3117		- * @deprecated 4.0
3118		- */
3119	3300	public static function create( $values = array() ) {
3120	3301	_deprecated_function( __METHOD__, '4.0', 'FrmFormsController::update' );
3121	3302	self::update( $values );
3122	3303	}
		@@ -3121,35 +3302,16 @@
3121	3302	self::update( $values );
3122	3303	}
3123	3304
3124	3305	/**
3125		- * @deprecated 3.0
3126		- * @codeCoverageIgnore
	3306	+ * Education for premium features.
	3307	+ *
	3308	+ * @since 4.05
	3309	+ * @deprecated 6.16.3
	3310	+ *
	3311	+ * @return void
3127	3312	*/
3128		- public static function bulk_create_template( $ids ) {
3129		- return FrmDeprecated::bulk_create_template( $ids );
3130		- }
3131		-
3132		- /**
3133		- * @deprecated 3.0
3134		- * @codeCoverageIgnore
3135		- */
3136		- public static function edit_key() {
3137		- FrmDeprecated::edit_key();
3138		- }
3139		-
3140		- /**
3141		- * @deprecated 3.0
3142		- * @codeCoverageIgnore
3143		- */
3144		- public static function edit_description() {
3145		- FrmDeprecated::edit_description();
3146		- }
3147		-
3148		- /**
3149		- * @deprecated 4.08
3150		- * @since 3.06
3151		- */
3152		- public static function add_new() {
3153		- _deprecated_function( __FUNCTION__, '4.08' );
	3313	+ public static function add_form_style_tab_options() {
	3314	+ _deprecated_function( __METHOD__, '6.16.3' );
	3315	+ include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/add_form_style_options.php';
3154	3316	}
3155	3317	}