FrmFormsController.php: 6.10 vs 6.30 · Formidable Forms – WordPress Form Builder for Contact Forms, Calculators, Quizzes & More

← All changes | classes/controllers/FrmFormsController.php +280 -741 6.30 → 6.10 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 current tab.
	10	+ * message in the currect tab.
11	11	*
12	12	* @since 6.2
13	13	*
14	14	* @var array Keys are form IDs and values are 1.
		@@ -14,25 +14,13 @@
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		-
28	18	public static function menu() {
29	19	$menu_label = __( 'Forms', 'formidable' );
30		-
31	20	if ( ! FrmAppHelper::pro_is_installed() ) {
32	21	$menu_label .= ' (Lite)';
33	22	}
34		-
35	23	add_submenu_page( 'formidable', 'Formidable \| ' . $menu_label, $menu_label, 'frm_view_forms', 'formidable', 'FrmFormsController::route' );
36	24
37	25	self::maybe_load_listing_hooks();
38	26	}
		@@ -66,12 +54,12 @@
66	54	*/
67	55	public static function logic_tip() {
68	56	$images_url = FrmAppHelper::plugin_url() . '/images/';
69	57	$data_message = __( 'Only show the fields you need and create branching forms. Upgrade to get conditional logic and question branching.', 'formidable' );
70		- $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' ) . '"/>'; // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong
71		- 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">'; // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong
	58	+ $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	+ 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">';
72	60	esc_html_e( 'Conditional Logic', 'formidable' );
73		- FrmAppHelper::icon_by_class( 'frmfont frm_arrowdown8_icon', array( 'aria-hidden' => 'true' ) );
	61	+ FrmAppHelper::icon_by_class( 'frmfont frm_arrowdown6_icon', array( 'aria-hidden' => 'true' ) );
74	62	echo '</a>';
75	63	}
76	64
77	65	/**
		@@ -78,15 +66,12 @@
78	66	* By default, Divi processes form shortcodes on the edit post page.
79	67	* Now that won't do.
80	68	*
81	69	* @since 3.01
82		- *
83		- * @param array $shortcodes List of shortcodes to process.
84		- *
85		- * @return array
86	70	*/
87	71	public static function prevent_divi_conflict( $shortcodes ) {
88	72	$shortcodes[] = 'formidable';
	73	+
89	74	return $shortcodes;
90	75	}
91	76
92	77	/**
		@@ -97,14 +82,12 @@
97	82
98	83	$message = '';
99	84	$params = FrmForm::list_page_params();
100	85	$errors = self::process_bulk_form_actions( array() );
101		-
102	86	if ( isset( $errors['message'] ) ) {
103	87	$message = $errors['message'];
104	88	unset( $errors['message'] );
105	89	}
106		-
107	90	$errors = apply_filters( 'frm_admin_list_form_action', $errors );
108	91
109	92	self::display_forms_list( $params, $message, $errors );
110	93	}
		@@ -114,29 +97,17 @@
114	97	*
115	98	* @since 2.02.11
116	99	*
117	100	* @param int\|object $form
118		- *
119		- * @return void
120	101	*/
121	102	private static function create_default_email_action( $form ) {
122	103	FrmForm::maybe_get_form( $form );
123		-
124		- if ( ! is_object( $form ) ) {
125		- return;
126		- }
127		-
128	104	$create_email = apply_filters( 'frm_create_default_email_action', true, $form );
129	105
130		- if ( ! $create_email ) {
131		- return;
	106	+ if ( $create_email ) {
	107	+ $action_control = FrmFormActionsController::get_form_actions( 'email' );
	108	+ $action_control->create( $form->id );
132	109	}
133		-
134		- /**
135		- * @var FrmFormAction
136		- */
137		- $action_control = FrmFormActionsController::get_form_actions( 'email' );
138		- $action_control->create( $form->id );
139	110	}
140	111
141	112	/**
142	113	* Create the default On submit action
		@@ -143,18 +114,12 @@
143	114	*
144	115	* @since 6.0.0
145	116	*
146	117	* @param int\|object $form Form object or ID.
147		- *
148		- * @return void
149	118	*/
150	119	private static function create_default_on_submit_action( $form ) {
151	120	FrmForm::maybe_get_form( $form );
152	121
153		- if ( ! is_object( $form ) ) {
154		- return;
155		- }
156		-
157	122	/**
158	123	* Enable or disable the default On Submit action.
159	124	*
160	125	* @since 6.0.0
		@@ -163,17 +128,12 @@
163	128	* @param object $form Form object.
164	129	*/
165	130	$create = apply_filters( 'frm_create_default_on_submit_action', true, $form );
166	131
167		- if ( ! $create ) {
168		- return;
	132	+ if ( $create ) {
	133	+ $action_control = FrmFormActionsController::get_form_actions( FrmOnSubmitAction::$slug );
	134	+ $action_control->create( $form->id );
169	135	}
170		-
171		- /**
172		- * @var FrmFormAction
173		- */
174		- $action_control = FrmFormActionsController::get_form_actions( FrmOnSubmitAction::$slug );
175		- $action_control->create( $form->id );
176	136	}
177	137
178	138	/**
179	139	* Creates submit button field.
		@@ -180,18 +140,12 @@
180	140	*
181	141	* @since 6.9
182	142	*
183	143	* @param int\|object $form Form ID or object.
184		- *
185		- * @return void
186	144	*/
187	145	private static function create_submit_button_field( $form ) {
188	146	FrmForm::maybe_get_form( $form );
189	147
190		- if ( ! is_object( $form ) ) {
191		- return;
192		- }
193		-
194	148	if ( FrmSubmitHelper::get_submit_field( $form->id ) ) {
195	149	// Do not create submit button field if it exists.
196	150	return;
197	151	}
		@@ -199,9 +153,9 @@
199	153	FrmField::create(
200	154	array(
201	155	'type' => FrmSubmitHelper::FIELD_TYPE,
202	156	'name' => __( 'Submit', 'formidable' ),
203		- 'field_order' => FrmSubmitHelper::DEFAULT_ORDER,
	157	+ 'field_order' => 9999,
204	158	'form_id' => $form->id,
205	159	'field_options' => FrmFieldsHelper::get_default_field_options( FrmSubmitHelper::FIELD_TYPE ),
206	160	'description' => '',
207	161	'default_value' => '',
		@@ -210,10 +164,8 @@
210	164	);
211	165	}
212	166
213	167	/**
214		- * @param array\|false $values
215		- *
216	168	* @return void
217	169	*/
218	170	public static function edit( $values = false ) {
219	171	FrmAppHelper::permission_check( 'frm_edit_forms' );
		@@ -225,9 +177,8 @@
225	177
226	178	/**
227	179	* @param mixed $id
228	180	* @param string $message
229		- *
230	181	* @return void
231	182	*/
232	183	public static function settings( $id = false, $message = '' ) {
233	184	FrmAppHelper::permission_check( 'frm_edit_forms' );
		@@ -255,9 +206,10 @@
255	206	FrmAppController::show_error_modal( $error_args );
256	207	return;
257	208	}
258	209
259		- $id = FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
	210	+ $id = FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
	211	+
260	212	$errors = FrmForm::validate( $_POST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
261	213	$warnings = FrmFormsHelper::check_for_warnings( $_POST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
262	214
263	215	if ( count( $errors ) > 0 ) {
		@@ -266,14 +218,13 @@
266	218	}
267	219
268	220	do_action( 'frm_before_update_form_settings', $id );
269	221
270		- $antispam_was_on = self::antispam_was_on( $id ); // phpcs:ignore Formidable.CodeAnalysis.InlineSingleUseVariable
	222	+ $antispam_was_on = self::antispam_was_on( $id );
271	223
272	224	FrmForm::update( $id, $_POST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
273	225
274	226	$antispam_is_on = ! empty( $_POST['options']['antispam'] ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
275		-
276	227	if ( $antispam_is_on !== $antispam_was_on ) {
277	228	FrmAntiSpam::clear_caches();
278	229	}
279	230
		@@ -283,9 +234,8 @@
283	234	}
284	235
285	236	/**
286	237	* @param int $form_id
287		- *
288	238	* @return bool
289	239	*/
290	240	private static function antispam_was_on( $form_id ) {
291	241	$form = FrmForm::getOne( $form_id );
		@@ -292,14 +242,12 @@
292	242	return ! empty( $form->options['antispam'] );
293	243	}
294	244
295	245	/**
296		- * @param array $values
297		- *
298	246	* @return void
299	247	*/
300	248	public static function update( $values = array() ) {
301		- if ( ! $values ) {
	249	+ if ( empty( $values ) ) {
302	250	$values = $_POST; // phpcs:ignore WordPress.Security.NonceVerification.Missing
303	251	}
304	252
305	253	// Set radio button and checkbox meta equal to "other" value.
		@@ -308,9 +256,8 @@
308	256	}
309	257
310	258	$errors = FrmForm::validate( $values );
311	259	$permission_error = FrmAppHelper::permission_nonce_error( 'frm_edit_forms', 'frm_save_form', 'frm_save_form_nonce' );
312		-
313	260	if ( $permission_error !== false ) {
314	261	$errors['form'] = $permission_error;
315	262	}
316	263
		@@ -329,9 +276,9 @@
329	276	if ( self::is_too_long( $values ) ) {
330	277	$message .= '<br/> ' . sprintf(
331	278	/* translators: %1$s: Start link HTML, %2$s: end link HTML */
332	279	__( 'However, your form is very long and may be %1$sreaching server limits%2$s.', 'formidable' ),
333		- '<a href="' . esc_url( self::get_form_too_long_docs_url() ) . '" target="_blank" rel="noopener">',
	280	+ '<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">',
334	281	'</a>'
335	282	);
336	283	}
337	284
		@@ -342,32 +289,17 @@
342	289	self::get_edit_vars( $id, array(), $message );
343	290	}
344	291
345	292	/**
346		- * @since 6.25.1
347		- *
348		- * @return string
349		- */
350		- private static function get_form_too_long_docs_url() {
351		- $utm = array(
352		- 'campaign' => 'builder',
353		- 'content' => 'form-too-long',
354		- );
355		- return FrmAppHelper::admin_upgrade_link( $utm, 'knowledgebase/i-have-a-long-form-why-did-the-options-at-the-end-of-the-form-stop-saving/' );
356		- }
357		-
358		- /**
359	293	* Remove the draft flag from any new fields from this current session.
360	294	*
361	295	* @since 6.8
362	296	*
363	297	* @param int $form_id
364		- *
365	298	* @return void
366	299	*/
367	300	private static function maybe_remove_draft_option_from_fields( $form_id ) {
368	301	$draft_field_ids_csv = FrmAppHelper::get_post_param( 'draft_fields', '', 'sanitize_text_field' );
369		-
370	302	if ( ! $draft_field_ids_csv ) {
371	303	// If the draft_fields input is empty there are no new fields in the session.
372	304	return;
373	305	}
		@@ -372,9 +304,8 @@
372	304	return;
373	305	}
374	306
375	307	$draft_field_ids = array_filter( explode( ',', $draft_field_ids_csv ), 'is_numeric' );
376		-
377	308	if ( ! $draft_field_ids ) {
378	309	// Exit early if the draft fields input is invalid. It should be a CSV of integer values.
379	310	return;
380	311	}
		@@ -379,9 +310,8 @@
379	310	return;
380	311	}
381	312
382	313	$draft_field_rows = FrmFieldsHelper::get_draft_field_results( $form_id, $draft_field_ids );
383		-
384	314	foreach ( $draft_field_rows as $row ) {
385	315	$row->field_options['draft'] = 0;
386	316	FrmField::update( $row->id, array( 'field_options' => $row->field_options ) );
387	317	}
		@@ -393,10 +323,8 @@
393	323	* were likely not saved either.
394	324	*
395	325	* @since 3.06.01
396	326	*
397		- * @param array $values
398		- *
399	327	* @return bool
400	328	*/
401	329	private static function is_too_long( $values ) {
402	330	return empty( $values['frm_end'] );
		@@ -432,17 +360,13 @@
432	360	* @return string\|null
433	361	*/
434	362	public static function page_preview() {
435	363	$params = FrmForm::list_page_params();
436		-
437		- if ( ! $params['form'] \|\| is_numeric( $params['form'] ) ) {
	364	+ if ( ! $params['form'] ) {
438	365	return null;
439	366	}
440	367
441		- self::maybe_block_preview( $params['form'] );
442		-
443	368	$form = FrmForm::getOne( $params['form'] );
444		-
445	369	if ( ! $form ) {
446	370	return null;
447	371	}
448	372
		@@ -454,19 +378,9 @@
454	378	*
455	379	* @return void
456	380	*/
457	381	public static function show_page_preview() {
458		- $preview = self::page_preview();
459		-
460		- if ( is_null( $preview ) ) {
461		- wp_die(
462		- '<h1>' . esc_html__( 'Form key is invalid', 'formidable' ) . '</h1>',
463		- '<p>' . esc_html__( 'Form key is invalid', 'formidable' ) . '</p>',
464		- 404
465		- );
466		- }
467		-
468		- echo $preview; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
	382	+ echo self::page_preview(); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
469	383	}
470	384
471	385	/**
472	386	* @return void
		@@ -477,19 +391,9 @@
477	391
478	392	global $frm_vars;
479	393	$frm_vars['preview'] = true;
480	394
481		- // print_emoji_styles is deprecated.
482		- remove_action( 'wp_print_styles', 'print_emoji_styles' );
483		-
484		- if ( FrmTestModeController::should_add_test_mode_container() ) {
485		- do_action( 'frm_test_mode_init' );
486		- add_action( 'wp_enqueue_scripts', 'FrmTestModeController::register_and_enqueue_required_scripts' );
487		- add_filter( 'frm_filter_final_form', 'FrmTestModeController::maybe_add_test_mode_container', 99 );
488		- }
489		-
490	395	$include_theme = FrmAppHelper::get_param( 'theme', '', 'get', 'absint' );
491		-
492	396	if ( $include_theme ) {
493	397	self::set_preview_query();
494	398	self::load_theme_preview();
495	399	} else {
		@@ -512,9 +416,8 @@
512	416	'post_type' => 'page',
513	417	);
514	418
515	419	$page_for_posts = get_option( 'page_for_posts' );
516		-
517	420	if ( is_numeric( $page_for_posts ) ) {
518	421	// Avoid querying for the "Posts Page" or "Blog Page" so we don't display 10 forms.
519	422	$page_query['post__not_in'] = array( $page_for_posts );
520	423	}
		@@ -519,15 +422,13 @@
519	422	$page_query['post__not_in'] = array( $page_for_posts );
520	423	}
521	424
522	425	$random_page = get_posts( $page_query );
523		-
524	426	if ( ! $random_page ) {
525	427	return;
526	428	}
527	429
528	430	$random_page = reset( $random_page );
529		-
530	431	if ( ! is_a( $random_page, 'WP_Post' ) ) {
531	432	// The return type can also be int.
532	433	return;
533	434	}
		@@ -549,9 +450,8 @@
549	450	*
550	451	* @since 5.5.2
551	452	*
552	453	* @param WP_Post $page The page object.
553		- *
554	454	* @return void
555	455	*/
556	456	private static function set_post_global( $page ) {
557	457	global $post;
		@@ -570,16 +470,14 @@
570	470	add_action( 'loop_no_results', 'FrmFormsController::show_page_preview' );
571	471	add_filter( 'is_active_sidebar', '__return_false' );
572	472	FrmStylesController::enqueue_css( 'enqueue', true );
573	473
574		- if ( false !== get_template_part( 'page' ) ) {
575		- return;
	474	+ if ( false === get_template_part( 'page' ) ) {
	475	+ if ( function_exists( 'wp_is_block_theme' ) && wp_is_block_theme() ) {
	476	+ add_filter( 'body_class', 'FrmFormsController::preview_block_theme_body_classnames' );
	477	+ }
	478	+ self::fallback_when_page_template_part_is_not_supported_by_theme();
576	479	}
577		-
578		- if ( function_exists( 'wp_is_block_theme' ) && wp_is_block_theme() ) {
579		- add_filter( 'body_class', 'FrmFormsController::preview_block_theme_body_classnames' );
580		- }
581		- self::fallback_when_page_template_part_is_not_supported_by_theme();
582	480	}
583	481
584	482	/**
585	483	* Add padding to the body for block themes.
		@@ -586,9 +484,8 @@
586	484	*
587	485	* @since 6.5.2
588	486	*
589	487	* @param array $classes The body classes list.
590		- *
591	488	* @return array
592	489	*/
593	490	public static function preview_block_theme_body_classnames( $classes ) {
594	491	$classes[] = 'has-global-padding';
		@@ -601,37 +498,29 @@
601	498	*
602	499	* @return void
603	500	*/
604	501	private static function fallback_when_page_template_part_is_not_supported_by_theme() {
605		- if ( ! have_posts() ) {
606		- return;
607		- }
	502	+ if ( have_posts() ) {
	503	+ the_post();
	504	+ self::get_template( 'header' );
608	505
609		- the_post();
610		- self::get_template( 'header' );
	506	+ // add some generic class names to the container to add some natural padding to the content.
	507	+ // .entry-content catches the WordPress TwentyTwenty theme.
	508	+ // .container catches Customizr content.
	509	+ echo '<div class="container entry-content">';
	510	+ the_content();
	511	+ echo '</div>';
611	512
612		- // Add some generic class names to the container to add some natural padding to the content.
613		- // .entry-content catches the WordPress TwentyTwenty theme.
614		- // .container catches Customizr content.
615		- echo '<div class="container entry-content">';
616		- the_content();
617		- echo '</div>';
618		-
619		- // Prevent extra unexpected forms in the footer.
620		- // For some reason this happens in the Twenty Twenty Five theme.
621		- add_filter( 'frm_filter_final_form', '__return_empty_string' );
622		-
623		- self::get_template( 'footer' );
	513	+ self::get_template( 'footer' );
	514	+ }
624	515	}
625	516
626	517	/**
627	518	* Calls core function to get a template part if it doesn't cause deprecation warnings. Otherwise skips the deprecation function call
628		- * and renders required html fragments calling required functions.
	519	+ * and renders required html fragements calling required functions.
629	520	*
630	521	* @since 6.7.1
631		- *
632	522	* @param string $template
633		- *
634	523	* @return void
635	524	*/
636	525	private static function get_template( $template ) {
637	526	if ( self::should_try_getting_template( $template ) ) {
		@@ -652,11 +541,9 @@
652	541	/**
653	542	* Returns true if calling a template function doesn't trigger deprecation warnings.
654	543	*
655	544	* @since 6.7.1
656		- *
657	545	* @param string $template
658		- *
659	546	* @return bool
660	547	*/
661	548	private static function should_try_getting_template( $template ) {
662	549	$stylesheet_path = get_stylesheet_directory();
		@@ -670,15 +557,15 @@
670	557	/**
671	558	* Set the page title for the theme preview page
672	559	*
673	560	* @since 3.0
674		- *
675		- * @param string $title
676		- *
677		- * @return string
678	561	*/
679	562	public static function preview_page_title( $title ) {
680		- return in_the_loop() ? self::preview_title( $title ) : $title;
	563	+ if ( in_the_loop() ) {
	564	+ $title = self::preview_title( $title );
	565	+ }
	566	+
	567	+ return $title;
681	568	}
682	569
683	570	/**
684	571	* Set the page title for the theme preview page.
		@@ -685,9 +572,8 @@
685	572	*
686	573	* @since 3.0
687	574	*
688	575	* @param string $title
689		- *
690	576	* @return string
691	577	*/
692	578	public static function preview_title( $title ) {
693	579	return __( 'Form Preview', 'formidable' );
		@@ -698,9 +584,8 @@
698	584	*
699	585	* @since 3.0
700	586	*
701	587	* @param string $content
702		- *
703	588	* @return string
704	589	*/
705	590	public static function preview_content( $content ) {
706	591	if ( in_the_loop() ) {
		@@ -715,39 +600,23 @@
715	600	/**
716	601	* @since 3.0
717	602	*/
718	603	private static function load_direct_preview() {
	604	+ header( 'Content-Type: text/html; charset=' . get_option( 'blog_charset' ) );
	605	+
	606	+ // print_emoji_styles is deprecated.
	607	+ remove_action( 'wp_print_styles', 'print_emoji_styles' );
	608	+
719	609	$key = FrmAppHelper::simple_get( 'form', 'sanitize_title' );
720		-
721		- // phpcs:ignore Universal.Operators.StrictComparisons
722	610	if ( $key == '' ) {
723	611	$key = FrmAppHelper::get_post_param( 'form', '', 'sanitize_title' );
724	612	}
725	613
726		- if ( ! $key ) {
727		- $error = __( 'Form key is missing', 'formidable' );
728		- wp_die(
729		- '<h1>' . esc_html( $error ) . '</h1>',
730		- '<p>' . esc_html( $error ) . '</p>',
731		- 404
732		- );
733		- }
734		-
735		- self::maybe_block_preview( $key );
736		-
737	614	$form = FrmForm::getAll( array( 'form_key' => $key ), '', 1 );
738		-
739		- if ( ! $form ) {
740		- $error = __( 'Form does not exist', 'formidable' );
741		- wp_die(
742		- '<h1>' . esc_html( $error ) . '</h1>',
743		- '<p>' . esc_html( $error ) . '</p>',
744		- 404
745		- );
	615	+ if ( empty( $form ) ) {
	616	+ $form = FrmForm::getAll( array(), '', 1 );
746	617	}
747	618
748		- header( 'Content-Type: text/html; charset=' . get_option( 'blog_charset' ) );
749		-
750	619	self::fix_deprecated_null_param_warning();
751	620
752	621	require FrmAppHelper::plugin_path() . '/classes/views/frm-entries/direct.php';
753	622	}
		@@ -752,33 +621,8 @@
752	621	require FrmAppHelper::plugin_path() . '/classes/views/frm-entries/direct.php';
753	622	}
754	623
755	624	/**
756		- * Block the form preview for the contact form by default if the user cannot view forms.
757		- * This is to prevent the contact form being exploited.
758		- * Since this form is added by default and every site uses the same key, it is too easy
759		- * to guess this form.
760		- *
761		- * @since 6.20
762		- *
763		- * @param string $form_key Form key.
764		- *
765		- * @return void
766		- */
767		- public static function maybe_block_preview( $form_key ) {
768		- if ( ! FrmFormsHelper::should_block_preview( $form_key ) ) {
769		- return;
770		- }
771		-
772		- $error = __( 'You do not have permission to view this form', 'formidable' );
773		- wp_die(
774		- '<h1>' . esc_html( $error ) . '</h1>',
775		- '<p>' . esc_html( $error ) . '</p>',
776		- 403
777		- );
778		- }
779		-
780		- /**
781	625	* Some themes have a null $src value.
782	626	* This function adds a filter to ensure that $src is not null.
783	627	* WP will call str_starts_with with the null value triggering a deprecated message otherwise.
784	628	*
		@@ -790,13 +634,15 @@
790	634	add_filter(
791	635	'script_loader_src',
792	636	/**
793	637	* @param string\|null $src
794		- *
795	638	* @return string
796	639	*/
797	640	function ( $src ) {
798		- return is_null( $src ) ? '' : $src;
	641	+ if ( is_null( $src ) ) {
	642	+ $src = '';
	643	+ }
	644	+ return $src;
799	645	}
800	646	);
801	647	}
802	648
		@@ -805,9 +651,8 @@
805	651	}
806	652
807	653	/**
808	654	* @param array $ids
809		- *
810	655	* @return string
811	656	*/
812	657	public static function bulk_untrash( $ids ) {
813	658	FrmAppHelper::permission_check( 'frm_edit_forms' );
		@@ -819,9 +664,11 @@
819	664	return '';
820	665	}
821	666
822	667	/* translators: %1$s: Number of forms */
823		- return sprintf( _n( '%1$s form restored from the Trash.', '%1$s forms restored from the Trash.', $count, 'formidable' ), $count );
	668	+ $message = sprintf( _n( '%1$s form restored from the Trash.', '%1$s forms restored from the Trash.', $count, 'formidable' ), $count );
	669	+
	670	+ return $message;
824	671	}
825	672
826	673	/**
827	674	* @since 3.06
		@@ -866,9 +713,8 @@
866	713	// Check nonce url.
867	714	check_admin_referer( $status . '_form_' . $params['id'] );
868	715
869	716	$count = 0;
870		-
871	717	if ( FrmForm::set_status( $params['id'], $available_status[ $status ]['new_status'] ) ) {
872	718	++$count;
873	719	}
874	720
		@@ -882,9 +728,9 @@
882	728	/* translators: %1$s: Number of forms */
883	729	$available_status['untrash']['message'] = sprintf( _n( '%1$s form restored from the Trash.', '%1$s forms restored from the Trash.', $count, 'formidable' ), $count );
884	730
885	731	/* translators: %1$s: Number of forms, %2$s: Start link HTML, %3$s: End link HTML */
886		- $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>' ); // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong
	732	+ $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>' );
887	733
888	734	$message = $available_status[ $status ]['message'];
889	735
890	736	self::display_forms_list( $params, $message );
		@@ -891,9 +737,8 @@
891	737	}
892	738
893	739	/**
894	740	* @param array $ids
895		- *
896	741	* @return string
897	742	*/
898	743	public static function bulk_trash( $ids ) {
899	744	FrmAppHelper::permission_check( 'frm_delete_forms' );
		@@ -898,9 +743,8 @@
898	743	public static function bulk_trash( $ids ) {
899	744	FrmAppHelper::permission_check( 'frm_delete_forms' );
900	745
901	746	$count = 0;
902		-
903	747	foreach ( $ids as $id ) {
904	748	if ( FrmForm::trash( $id ) ) {
905	749	++$count;
906	750	}
		@@ -905,12 +749,8 @@
905	749	++$count;
906	750	}
907	751	}
908	752
909		- if ( ! $count ) {
910		- return '';
911		- }
912		-
913	753	$current_page = FrmAppHelper::get_simple_request(
914	754	array(
915	755	'param' => 'form_type',
916	756	'type' => 'request',
		@@ -915,16 +755,17 @@
915	755	'param' => 'form_type',
916	756	'type' => 'request',
917	757	)
918	758	);
919		-
920		- return sprintf(
	759	+ $message = sprintf(
921	760	/* translators: %1$s: Number of forms, %2$s: Start link HTML, %3$s: End link HTML */
922	761	_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' ),
923	762	$count,
924		- '<a href="' . esc_url( wp_nonce_url( '?page=formidable&frm_action=list&action=bulk_untrash&form_type=' . $current_page . '&item-action=' . implode( ',', $ids ), 'bulk-toplevel_page_formidable' ) ) . '">', // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong
	763	+ '<a href="' . esc_url( wp_nonce_url( '?page=formidable&frm_action=list&action=bulk_untrash&form_type=' . $current_page . '&item-action=' . implode( ',', $ids ), 'bulk-toplevel_page_formidable' ) ) . '">',
925	764	'</a>'
926	765	);
	766	+
	767	+ return $message;
927	768	}
928	769
929	770	public static function destroy() {
930	771	FrmAppHelper::permission_check( 'frm_delete_forms' );
		@@ -934,9 +775,8 @@
934	775	// Check nonce url.
935	776	check_admin_referer( 'destroy_form_' . $params['id'] );
936	777
937	778	$count = 0;
938		-
939	779	if ( FrmForm::destroy( $params['id'] ) ) {
940	780	++$count;
941	781	}
942	782
		@@ -947,9 +787,8 @@
947	787	}
948	788
949	789	/**
950	790	* @param array $ids
951		- *
952	791	* @return string
953	792	*/
954	793	public static function bulk_destroy( $ids ) {
955	794	FrmAppHelper::permission_check( 'frm_delete_forms' );
		@@ -954,12 +793,10 @@
954	793	public static function bulk_destroy( $ids ) {
955	794	FrmAppHelper::permission_check( 'frm_delete_forms' );
956	795
957	796	$count = 0;
958		-
959	797	foreach ( $ids as $id ) {
960	798	$d = FrmForm::destroy( $id );
961		-
962	799	if ( $d ) {
963	800	++$count;
964	801	}
965	802	}
		@@ -977,18 +814,19 @@
977	814	*/
978	815	public static function delete_all() {
979	816	// Check nonce url.
980	817	$permission_error = FrmAppHelper::permission_nonce_error( 'frm_delete_forms', '_wpnonce', 'bulk-toplevel_page_formidable' );
981		-
982	818	if ( $permission_error !== false ) {
983	819	self::display_forms_list( array(), '', array( $permission_error ) );
	820	+
984	821	return;
985	822	}
986	823
987	824	$count = FrmForm::scheduled_delete( time() );
988	825	$url = remove_query_arg( array( 'delete_all' ) );
989		- $url .= '&message=forms_permanently_deleted&forms_deleted=' . $count;
990	826
	827	+ $url .= '&message=forms_permanently_deleted&forms_deleted=' . $count;
	828	+
991	829	wp_safe_redirect( $url );
992	830	die();
993	831	}
994	832
		@@ -1062,22 +900,16 @@
1062	900	*
1063	901	* @return void
1064	902	*/
1065	903	public static function insert_form_button() {
1066		- if ( ! current_user_can( 'frm_view_forms' ) ) {
1067		- return;
1068		- }
1069		-
1070		- // Store the result in memory and re-use it when this function is called multiple times.
1071		- // This helps speed up the form builder when there are a lot of HTML fields, where this
1072		- // Button is inserted once per HTML field.
1073		- // In a form with 66 HTML fields, this saves 0.5 seconds on page load time, tested locally.
1074		- if ( ! isset( self::$formidable_tinymce_button ) ) {
	904	+ if ( current_user_can( 'frm_view_forms' ) ) {
1075	905	FrmAppHelper::load_admin_wide_js();
1076		- $icon = apply_filters( 'frm_media_icon', FrmAppHelper::svg_logo() );
1077		- 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( FrmAppHelper::get_menu_name() ) . '</a>'; // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong
	906	+ $menu_name = FrmAppHelper::get_menu_name();
	907	+ $icon = apply_filters( 'frm_media_icon', FrmAppHelper::svg_logo() );
	908	+ 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' ) . '">' .
	909	+ FrmAppHelper::kses( $icon, 'all' ) . // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
	910	+ ' ' . esc_html( $menu_name ) . '</a>';
1078	911	}
1079		- echo self::$formidable_tinymce_button; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
1080	912	}
1081	913
1082	914	/**
1083	915	* @return void
		@@ -1098,21 +930,17 @@
1098	930	$shortcodes = apply_filters( 'frm_popup_shortcodes', $shortcodes );
1099	931
1100	932	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/insert_form_popup.php';
1101	933
1102		- if ( ! FrmAppHelper::is_form_builder_page() \|\| class_exists( '_WP_Editors', false ) ) {
1103		- return;
	934	+ if ( FrmAppHelper::is_form_builder_page() && ! class_exists( '_WP_Editors', false ) ) {
	935	+ // initialize a wysiwyg so we have usable settings defined in tinyMCEPreInit.mceInit
	936	+ require ABSPATH . WPINC . '/class-wp-editor.php';
	937	+ ?>
	938	+ <div class="frm_hidden">
	939	+ <?php wp_editor( '', 'frm_description_placeholder', array() ); ?>
	940	+ </div>
	941	+ <?php
1104	942	}
1105		-
1106		- // Initialize a wysiwyg so we have usable settings defined in tinyMCEPreInit.mceInit
1107		- require ABSPATH . WPINC . '/class-wp-editor.php';
1108		- // phpcs:disable Generic.WhiteSpace.ScopeIndent
1109		- ?>
1110		- <div class="frm_hidden">
1111		- <?php wp_editor( '', 'frm_description_placeholder', array() ); ?>
1112		- </div>
1113		- <?php
1114		- // phpcs:enable Generic.WhiteSpace.ScopeIndent
1115	943	}
1116	944
1117	945	/**
1118	946	* Check the page being loaded, determine if this is a page that should include the form popup.
		@@ -1124,9 +952,8 @@
1124	952	private static function should_insert_form_popup() {
1125	953	if ( FrmAppHelper::is_form_builder_page() ) {
1126	954	return true;
1127	955	}
1128		-
1129	956	$page = basename( FrmAppHelper::get_server_value( 'PHP_SELF' ) );
1130	957	return in_array( $page, array( 'post.php', 'page.php', 'page-new.php', 'post-new.php' ), true );
1131	958	}
1132	959
		@@ -1134,10 +961,9 @@
1134	961	FrmAppHelper::permission_check( 'frm_view_forms' );
1135	962	check_ajax_referer( 'frm_ajax', 'nonce' );
1136	963
1137	964	$shortcode = FrmAppHelper::get_post_param( 'shortcode', '', 'sanitize_text_field' );
1138		-
1139		- if ( ! $shortcode ) {
	965	+ if ( empty( $shortcode ) ) {
1140	966	wp_die();
1141	967	}
1142	968
1143	969	echo '<div id="sc-opts-' . esc_attr( $shortcode ) . '" class="frm_shortcode_option">';
		@@ -1162,13 +988,12 @@
1162	988	'label' => __( 'Minimize form HTML', 'formidable' ),
1163	989	),
1164	990	);
1165	991	}
1166		-
1167	992	$opts = apply_filters( 'frm_sc_popup_opts', $opts, $shortcode );
1168	993
1169	994	if ( isset( $opts['form_id'] ) && is_string( $opts['form_id'] ) ) {
1170		- // Allow other shortcodes to use the required form id option
	995	+ // allow other shortcodes to use the required form id option
1171	996	$form_id = $opts['form_id'];
1172	997	unset( $opts['form_id'] );
1173	998	}
1174	999
		@@ -1184,9 +1009,8 @@
1184	1009	*
1185	1010	* @param array $params
1186	1011	* @param string $message
1187	1012	* @param array $errors
1188		- *
1189	1013	* @return void
1190	1014	*/
1191	1015	public static function display_forms_list( $params = array(), $message = '', $errors = array() ) {
1192	1016	FrmAppHelper::permission_check( 'frm_view_forms' );
		@@ -1203,44 +1027,33 @@
1203	1027	* @param string $table_class Class name for List Helper.
1204	1028	*/
1205	1029	$table_class = apply_filters( 'frm_forms_list_class', 'FrmFormsListHelper' );
1206	1030	$wp_list_table = new $table_class( compact( 'params' ) );
1207		- $pagenum = $wp_list_table->get_pagenum();
1208	1031
	1032	+ $pagenum = $wp_list_table->get_pagenum();
	1033	+
1209	1034	$wp_list_table->prepare_items();
1210	1035
1211	1036	$total_pages = $wp_list_table->get_pagination_arg( 'total_pages' );
1212		-
1213	1037	if ( $pagenum > $total_pages && $total_pages > 0 ) {
1214		- wp_safe_redirect( esc_url_raw( add_query_arg( 'paged', $total_pages ) ) );
	1038	+ wp_redirect( esc_url_raw( add_query_arg( 'paged', $total_pages ) ) );
1215	1039	die();
1216	1040	}
1217	1041
1218		- $error = FrmInbox::check_for_error();
1219		-
1220		- if ( $error ) {
1221		- $show_messages = array( $error['subject'] . '. ' . $error['message'] );
1222		- }
1223		-
1224	1042	require FrmAppHelper::plugin_path() . '/classes/views/frm-forms/list.php';
1225	1043	}
1226	1044
1227	1045	/**
1228	1046	* @param array<string,string> $columns
1229		- *
1230	1047	* @return array<string,string>
1231	1048	*/
1232	1049	public static function get_columns( $columns ) {
1233		- $columns['cb'] = '<input type="checkbox" />';
1234		- $columns['name'] = esc_html__( 'Form Title', 'formidable' );
1235		- $columns['entries'] = esc_html__( 'Entries', 'formidable' );
1236		- $columns['id'] = 'ID';
1237		- $columns['form_key'] = esc_html__( 'Key', 'formidable' );
1238		-
1239		- if ( 'trash' !== FrmAppHelper::simple_get( 'form_type' ) ) {
1240		- $columns['shortcode'] = esc_html__( 'Actions', 'formidable' );
1241		- }
1242		-
	1050	+ $columns['cb'] = '<input type="checkbox" />';
	1051	+ $columns['name'] = esc_html__( 'Form Title', 'formidable' );
	1052	+ $columns['entries'] = esc_html__( 'Entries', 'formidable' );
	1053	+ $columns['id'] = 'ID';
	1054	+ $columns['form_key'] = esc_html__( 'Key', 'formidable' );
	1055	+ $columns['shortcode'] = esc_html__( 'Actions', 'formidable' );
1243	1056	$columns['created_at'] = esc_html__( 'Date', 'formidable' );
1244	1057
1245	1058	add_screen_option(
1246	1059	'per_page',
		@@ -1268,9 +1081,8 @@
1268	1081	}
1269	1082
1270	1083	/**
1271	1084	* @param mixed $hidden_columns
1272		- *
1273	1085	* @return array
1274	1086	*/
1275	1087	public static function hidden_columns( $hidden_columns ) {
1276	1088	if ( ! is_array( $hidden_columns ) ) {
		@@ -1291,18 +1103,11 @@
1291	1103
1292	1104	return $hidden_columns;
1293	1105	}
1294	1106
1295		- /**
1296		- * @param mixed $save
1297		- * @param string $option
1298		- * @param int\|string $value
1299		- *
1300		- * @return mixed
1301		- */
1302	1107	public static function save_per_page( $save, $option, $value ) {
1303	1108	if ( $option === 'formidable_page_formidable_per_page' ) {
1304		- return (int) $value;
	1109	+ $save = (int) $value;
1305	1110	}
1306	1111
1307	1112	return $save;
1308	1113	}
		@@ -1311,9 +1116,8 @@
1311	1116	* @param int\|string $id
1312	1117	* @param array $errors
1313	1118	* @param string $message
1314	1119	* @param bool $create_link
1315		- *
1316	1120	* @return void
1317	1121	*/
1318	1122	private static function get_edit_vars( $id, $errors = array(), $message = '', $create_link = false ) {
1319	1123	global $frm_vars;
		@@ -1328,9 +1132,8 @@
1328	1132	'page' => 'formidable',
1329	1133	)
1330	1134	),
1331	1135	);
1332		-
1333	1136	if ( ! $form ) {
1334	1137	FrmAppController::show_error_modal( $error_args );
1335	1138	return;
1336	1139	}
		@@ -1352,14 +1155,15 @@
1352	1155	}
1353	1156
1354	1157	if ( $form->parent_form_id ) {
1355	1158	/* translators: %1$s: Start link HTML, %2$s: End link HTML */
1356		- 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>' ) ); // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong
	1159	+ 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>' ) );
1357	1160	}
1358	1161
1359	1162	$frm_field_selection = FrmField::field_selection();
1360		- $fields = FrmField::get_all_for_form( $form->id );
1361	1163
	1164	+ $fields = FrmField::get_all_for_form( $form->id );
	1165	+
1362	1166	// Automatically add end section fields if they don't exist (2.0 migration).
1363	1167	$reset_fields = false;
1364	1168	FrmFormsHelper::auto_add_end_section_fields( $form, $fields, $reset_fields );
1365	1169	FrmSubmitHelper::maybe_create_submit_field( $form, $fields, $reset_fields );
		@@ -1383,16 +1187,16 @@
1383	1187	*/
1384	1188	$values['fields'] = apply_filters( 'frm_fields_in_form_builder', $fields, compact( 'form' ) );
1385	1189
1386	1190	$edit_message = __( 'Form was successfully updated.', 'formidable' );
1387		-
1388		- if ( $form->is_template && $message === $edit_message ) {
	1191	+ if ( $form->is_template && $message == $edit_message ) {
1389	1192	$message = __( 'Template was successfully updated.', 'formidable' );
1390	1193	}
1391	1194
1392	1195	self::maybe_update_form_builder_message( $message );
1393	1196
1394		- $has_fields = ! empty( $values['fields'] ) && ! FrmSubmitHelper::only_contains_submit_field( $values['fields'] );
	1197	+ $all_templates = FrmForm::getAll( array( 'is_template' => 1 ), 'name' );
	1198	+ $has_fields = ! empty( $values['fields'] ) && ! FrmSubmitHelper::only_contains_submit_field( $values['fields'] );
1395	1199
1396	1200	if ( defined( 'DOING_AJAX' ) ) {
1397	1201	wp_die();
1398	1202	}
		@@ -1401,12 +1205,11 @@
1401	1205	}
1402	1206
1403	1207	/**
1404	1208	* @param array $fields
1405		- *
1406	1209	* @return array
1407	1210	*/
1408		- public static function update_form_builder_fields( $fields ) {
	1211	+ public static function update_form_builder_fields( $fields, $form ) {
1409	1212	foreach ( $fields as $field ) {
1410	1213	$field->do_not_include_icons = true;
1411	1214	}
1412	1215	return $fields;
		@@ -1411,13 +1214,8 @@
1411	1214	}
1412	1215	return $fields;
1413	1216	}
1414	1217
1415		- /**
1416		- * @param string $message
1417		- *
1418		- * @return void
1419		- */
1420	1218	public static function maybe_update_form_builder_message( &$message ) {
1421	1219	if ( 'form_duplicated' === FrmAppHelper::simple_get( 'message' ) ) {
1422	1220	$message = __( 'Form was Successfully Copied', 'formidable' );
1423	1221	}
		@@ -1426,9 +1224,8 @@
1426	1224	/**
1427	1225	* @param int\|string $id
1428	1226	* @param array $errors
1429	1227	* @param array\|string $args
1430		- *
1431	1228	* @return void
1432	1229	*/
1433	1230	public static function get_settings_vars( $id, $errors = array(), $args = array() ) {
1434	1231	FrmAppHelper::permission_check( 'frm_edit_forms' );
		@@ -1450,12 +1247,13 @@
1450	1247	);
1451	1248	$args = array_merge( $defaults, $args );
1452	1249	$message = $args['message'];
1453	1250	$warnings = $args['warnings'];
1454		- $form = FrmForm::getOne( $id );
1455		- $fields = FrmField::get_all_for_form( $id );
1456		- $values = FrmAppHelper::setup_edit_vars( $form, 'forms', $fields, true );
1457	1251
	1252	+ $form = FrmForm::getOne( $id );
	1253	+ $fields = FrmField::get_all_for_form( $id );
	1254	+ $values = FrmAppHelper::setup_edit_vars( $form, 'forms', $fields, true );
	1255	+
1458	1256	/**
1459	1257	* Allows changing fields in the form settings.
1460	1258	*
1461	1259	* @since 5.0.04
		@@ -1495,12 +1293,8 @@
1495	1293	}
1496	1294
1497	1295	/**
1498	1296	* @since 4.0
1499		- *
1500		- * @param array $atts
1501		- *
1502		- * @return void
1503	1297	*/
1504	1298	public static function form_publish_button( $atts ) {
1505	1299	$values = $atts['values'];
1506	1300	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/_publish_box.php';
		@@ -1511,9 +1305,8 @@
1511	1305	*
1512	1306	* @since 4.0
1513	1307	*
1514	1308	* @param array $values
1515		- *
1516	1309	* @return array
1517	1310	*/
1518	1311	private static function get_settings_tabs( $values ) {
1519	1312	$sections = array(
		@@ -1519,20 +1312,20 @@
1519	1312	$sections = array(
1520	1313	'advanced' => array(
1521	1314	'name' => __( 'General', 'formidable' ),
1522	1315	'title' => __( 'General Form Settings', 'formidable' ),
1523		- 'function' => array( self::class, 'advanced_settings' ),
1524		- 'icon' => 'frmfont frm_settings_icon',
	1316	+ 'function' => array( __CLASS__, 'advanced_settings' ),
	1317	+ 'icon' => 'frm_icon_font frm_settings_icon',
1525	1318	),
1526	1319	'email' => array(
1527	1320	'name' => __( 'Actions & Notifications', 'formidable' ),
1528	1321	'function' => array( 'FrmFormActionsController', 'email_settings' ),
1529	1322	'id' => 'frm_notification_settings',
1530		- 'icon' => 'frmfont frm_mail_bulk_icon',
	1323	+ 'icon' => 'frm_icon_font frm_mail_bulk_icon',
1531	1324	),
1532	1325	'permissions' => array(
1533	1326	'name' => __( 'Form Permissions', 'formidable' ),
1534		- 'icon' => 'frmfont frm_lock_closed_icon',
	1327	+ 'icon' => 'frm_icon_font frm_lock_closed_icon',
1535	1328	'html_class' => 'frm_show_upgrade_tab frm_noallow',
1536	1329	'data' => array(
1537	1330	'medium' => 'permissions',
1538	1331	'upgrade' => __( 'Form Permissions', 'formidable' ),
		@@ -1537,37 +1330,35 @@
1537	1330	'medium' => 'permissions',
1538	1331	'upgrade' => __( 'Form Permissions', 'formidable' ),
1539	1332	'message' => __( 'Allow editing, protect forms and files, limit entries, and save drafts. Upgrade to get form and entry permissions.', 'formidable' ),
1540	1333	'screenshot' => 'permissions.png',
1541		- 'learn-more' => FrmAppHelper::get_doc_url( 'general-form-settings/#kb-form-permissions', 'form-permissions-settings' ),
1542	1334	),
1543	1335	),
1544	1336	'scheduling' => array(
1545	1337	'name' => __( 'Form Scheduling', 'formidable' ),
1546		- 'icon' => 'frmfont frm_calendar_icon',
	1338	+ 'icon' => 'frm_icon_font frm_calendar_icon',
1547	1339	'html_class' => 'frm_show_upgrade_tab frm_noallow',
1548	1340	'data' => array(
1549	1341	'medium' => 'scheduling',
1550	1342	'upgrade' => __( 'Form scheduling settings', 'formidable' ),
1551	1343	'screenshot' => 'scheduling.png',
1552		- 'learn-more' => FrmAppHelper::get_doc_url( 'general-form-settings/#kb-form-scheduling', 'form-scheduling-settings' ),
1553	1344	),
1554	1345	),
1555	1346	'buttons' => array(
1556	1347	'name' => __( 'Buttons', 'formidable' ),
1557		- 'class' => self::class,
	1348	+ 'class' => __CLASS__,
1558	1349	'function' => 'buttons_settings',
1559		- 'icon' => 'frmfont frm_button_icon',
	1350	+ 'icon' => 'frm_icon_font frm_button_icon',
1560	1351	),
1561	1352	'landing' => array(
1562	1353	'name' => __( 'Form Landing Page', 'formidable' ),
1563		- 'icon' => 'frmfont frm_file_text_icon',
	1354	+ 'icon' => 'frm_icon_font frm_file_text_icon',
1564	1355	'html_class' => 'frm_show_upgrade_tab frm_noallow',
1565	1356	'data' => FrmAppHelper::get_landing_page_upgrade_data_params(),
1566	1357	),
1567	1358	'chat' => array(
1568	1359	'name' => __( 'Conversational Forms', 'formidable' ),
1569		- 'icon' => 'frmfont frm_chat_forms_icon',
	1360	+ 'icon' => 'frm_icon_font frm_chat_forms_icon',
1570	1361	'html_class' => 'frm_show_upgrade_tab frm_noallow',
1571	1362	'data' => FrmAppHelper::get_upgrade_data_params(
1572	1363	'chat',
1573	1364	array(
		@@ -1573,15 +1364,14 @@
1573	1364	array(
1574	1365	'upgrade' => __( 'Conversational Forms', 'formidable' ),
1575	1366	'message' => __( 'Ask one question at a time for automated conversations.', 'formidable' ),
1576	1367	'screenshot' => 'chat.png',
1577		- 'learn-more' => FrmAppHelper::get_doc_url( 'conversational-forms', 'conversational-forms-settings', false ),
1578	1368	)
1579	1369	),
1580	1370	),
1581	1371	'abandonment' => array(
1582	1372	'name' => __( 'Form Abandonment', 'formidable' ),
1583		- 'icon' => 'frmfont frm_abandoned_icon',
	1373	+ 'icon' => 'frm_icon_font frm_abandoned_icon',
1584	1374	'html_class' => 'frm_show_upgrade_tab frm_noallow',
1585	1375	'data' => FrmAppHelper::get_upgrade_data_params(
1586	1376	'abandonment',
1587	1377	array(
		@@ -1587,22 +1377,23 @@
1587	1377	array(
1588	1378	'upgrade' => __( 'Form abandonment settings', 'formidable' ),
1589	1379	'message' => __( 'Unlock the power of data capture to boost lead generation and master the art of form optimization.', 'formidable' ),
1590	1380	'screenshot' => 'abandonment.png',
1591		- 'learn-more' => FrmAppHelper::get_doc_url( 'features/form-abandonment-wordpress-plugin', 'form-abandonment-settings', false ),
1592	1381	)
1593	1382	),
1594	1383	),
1595	1384	'html' => array(
1596	1385	'name' => __( 'Customize HTML', 'formidable' ),
1597		- 'class' => self::class,
	1386	+ 'class' => __CLASS__,
1598	1387	'function' => 'html_settings',
1599		- 'icon' => 'frmfont frm_code_icon',
	1388	+ 'icon' => 'frm_icon_font frm_code_icon',
1600	1389	),
1601	1390	);
1602	1391
1603		- if ( ! has_action( 'frm_add_form_style_tab_options' ) && ! has_action( 'frm_add_form_button_options' ) ) {
1604		- unset( $sections['buttons'] );
	1392	+ foreach ( array( 'landing', 'chat', 'abandonment' ) as $feature ) {
	1393	+ if ( ! FrmAppHelper::show_new_feature( $feature ) ) {
	1394	+ unset( $sections[ $feature ] );
	1395	+ }
1605	1396	}
1606	1397
1607	1398	$sections = apply_filters( 'frm_add_form_settings_section', $sections, $values );
1608	1399
		@@ -1609,9 +1400,9 @@
1609	1400	foreach ( $sections as $key => $section ) {
1610	1401	$defaults = array(
1611	1402	'html_class' => '',
1612	1403	'name' => ucfirst( $key ),
1613		- 'icon' => 'frmfont frm_settings_icon',
	1404	+ 'icon' => 'frm_icon_font frm_settings_icon',
1614	1405	);
1615	1406
1616	1407	$section = array_merge( $defaults, $section );
1617	1408
		@@ -1617,9 +1408,8 @@
1617	1408
1618	1409	if ( ! isset( $section['anchor'] ) ) {
1619	1410	$section['anchor'] = $key;
1620	1411	}
1621		-
1622	1412	$section['anchor'] .= '_settings';
1623	1413
1624	1414	if ( ! isset( $section['title'] ) ) {
1625	1415	$section['title'] = $section['name'];
		@@ -1638,19 +1428,18 @@
1638	1428	/**
1639	1429	* @since 4.0
1640	1430	*
1641	1431	* @param array $values
1642		- *
1643	1432	* @return void
1644	1433	*/
1645	1434	public static function advanced_settings( $values ) {
1646	1435	$first_h3 = 'frm_first_h3';
	1436	+
1647	1437	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings-advanced.php';
1648	1438	}
1649	1439
1650	1440	/**
1651	1441	* @param array $values
1652		- *
1653	1442	* @return void
1654	1443	*/
1655	1444	public static function render_spam_settings( $values ) {
1656	1445	if ( function_exists( 'akismet_http_post' ) ) {
		@@ -1655,9 +1444,9 @@
1655	1444	public static function render_spam_settings( $values ) {
1656	1445	if ( function_exists( 'akismet_http_post' ) ) {
1657	1446	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/spam-settings/akismet.php';
1658	1447	}
1659		- include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/spam-settings/stopforumspam.php';
	1448	+ include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/spam-settings/honeypot.php';
1660	1449	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/spam-settings/antispam.php';
1661	1450	}
1662	1451
1663	1452	/**
		@@ -1663,9 +1452,8 @@
1663	1452	/**
1664	1453	* @since 4.0
1665	1454	*
1666	1455	* @param array $values
1667		- *
1668	1456	* @return void
1669	1457	*/
1670	1458	public static function buttons_settings( $values ) {
1671	1459	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings-buttons.php';
		@@ -1674,9 +1462,8 @@
1674	1462	/**
1675	1463	* @since 4.0
1676	1464	*
1677	1465	* @param array $values
1678		- *
1679	1466	* @return void
1680	1467	*/
1681	1468	public static function html_settings( $values ) {
1682	1469	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings-html.php';
		@@ -1687,9 +1474,8 @@
1687	1474	*
1688	1475	* @since 2.03.08
1689	1476	*
1690	1477	* @param array\|bool $values
1691		- *
1692	1478	* @return void
1693	1479	*/
1694	1480	private static function clean_submit_html( &$values ) {
1695	1481	if ( is_array( $values ) && isset( $values['submit_html'] ) ) {
		@@ -1712,17 +1498,13 @@
1712	1498	return $classes;
1713	1499	}
1714	1500
1715	1501	/**
1716		- * @since 6.27 Added $template_path parameter.
1717		- *
1718	1502	* @param int\|string $form_id
1719	1503	* @param string $class
1720		- * @param string $template_path The path to a template file to use instead of the default.
1721		- *
1722	1504	* @return void
1723	1505	*/
1724		- public static function mb_tags_box( $form_id, $class = '', $template_path = 'default' ) {
	1506	+ public static function mb_tags_box( $form_id, $class = '' ) {
1725	1507	$fields = FrmField::get_all_for_form( $form_id, '', 'include' );
1726	1508
1727	1509	/**
1728	1510	* Allows modifying the list of fields in the tags box.
		@@ -1731,30 +1513,23 @@
1731	1513	*
1732	1514	* @param array $fields The list of fields.
1733	1515	* @param array $args The arguments. Contains `form_id`.
1734	1516	*/
1735		- $fields = apply_filters( 'frm_fields_in_tags_box', $fields, compact( 'form_id' ) );
1736		- $linked_forms = array();
1737		- $col = 'one';
1738		- $settings_tab = FrmAppHelper::is_admin_page( 'formidable' );
	1517	+ $fields = apply_filters( 'frm_fields_in_tags_box', $fields, compact( 'form_id' ) );
	1518	+ $linked_forms = array();
	1519	+ $col = 'one';
	1520	+ $settings_tab = FrmAppHelper::is_admin_page( 'formidable' );
	1521	+
1739	1522	$cond_shortcodes = apply_filters( 'frm_conditional_shortcodes', array() );
1740	1523	$entry_shortcodes = self::get_shortcode_helpers( $settings_tab );
	1524	+
1741	1525	$advanced_helpers = self::advanced_helpers( compact( 'fields', 'form_id' ) );
1742	1526
1743		- if ( 'default' === $template_path \|\| ! file_exists( $template_path ) ) {
1744		- include FrmAppHelper::plugin_path() . '/classes/views/shared/mb_adv_info.php';
1745		- return;
1746		- }
1747		-
1748		- include $template_path;
	1527	+ include FrmAppHelper::plugin_path() . '/classes/views/shared/mb_adv_info.php';
1749	1528	}
1750	1529
1751	1530	/**
1752	1531	* @since 3.04.01
1753		- *
1754		- * @param array $atts
1755		- *
1756		- * @return array
1757	1532	*/
1758	1533	private static function advanced_helpers( $atts ) {
1759	1534	$advanced_helpers = array(
1760	1535	'default' => array(
		@@ -1763,12 +1538,10 @@
1763	1538	),
1764	1539	);
1765	1540
1766	1541	$user_fields = self::user_shortcodes();
1767		-
1768	1542	if ( $user_fields ) {
1769	1543	$user_helpers = array();
1770		-
1771	1544	foreach ( $user_fields as $uk => $uf ) {
1772	1545	$user_helpers[ '\|user_id\| show="' . $uk . '"' ] = $uf;
1773	1546	unset( $uk, $uf );
1774	1547	}
		@@ -1793,10 +1566,8 @@
1793	1566	* Get an array of the options to display in the advanced tab
1794	1567	* of the customization panel
1795	1568	*
1796	1569	* @since 2.0.6
1797		- *
1798		- * @return array
1799	1570	*/
1800	1571	private static function get_advanced_shortcodes() {
1801	1572	$adv_shortcodes = array(
1802	1573	'x sep=", "' => array(
		@@ -1813,18 +1584,17 @@
1813	1584	'label' => __( 'No Auto P', 'formidable' ),
1814	1585	'title' => __( 'Do not automatically add any paragraphs or line breaks', 'formidable' ),
1815	1586	),
1816	1587	);
	1588	+ $adv_shortcodes = apply_filters( 'frm_advanced_shortcodes', $adv_shortcodes );
1817	1589
1818	1590	// __( 'Leave blank instead of defaulting to User Login', 'formidable' ) : blank=1
1819	1591
1820		- return apply_filters( 'frm_advanced_shortcodes', $adv_shortcodes );
	1592	+ return $adv_shortcodes;
1821	1593	}
1822	1594
1823	1595	/**
1824	1596	* @since 3.04.01
1825		- *
1826		- * @return array
1827	1597	*/
1828	1598	private static function user_shortcodes() {
1829	1599	$options = array(
1830	1600	'ID' => __( 'User ID', 'formidable' ),
		@@ -1843,12 +1613,8 @@
1843	1613	/**
1844	1614	* Get an array of the helper shortcodes to display in the customization panel
1845	1615	*
1846	1616	* @since 2.0.6
1847		- *
1848		- * @param bool $settings_tab
1849		- *
1850		- * @return array
1851	1617	*/
1852	1618	private static function get_shortcode_helpers( $settings_tab ) {
1853	1619	$entry_shortcodes = array(
1854	1620	'id' => __( 'Entry ID', 'formidable' ),
		@@ -1859,27 +1625,30 @@
1859	1625	'updated-at' => __( 'Entry updated', 'formidable' ),
1860	1626	'' => '',
1861	1627	'siteurl' => __( 'Site URL', 'formidable' ),
1862	1628	'sitename' => __( 'Site Name', 'formidable' ),
1863		- 'form_name' => __( 'Form Name', 'formidable' ),
1864	1629	);
1865	1630
1866		- $entry_shortcodes = array_merge( FrmShortcodeHelper::get_contextual_shortcode_values(), $entry_shortcodes );
1867		-
1868	1631	if ( ! FrmAppHelper::pro_is_installed() ) {
1869	1632	unset( $entry_shortcodes['post_id'] );
1870	1633	}
1871	1634
	1635	+ if ( $settings_tab ) {
	1636	+ $entry_shortcodes['default-message'] = __( 'Default Msg', 'formidable' );
	1637	+ $entry_shortcodes['default-html'] = __( 'Default HTML', 'formidable' );
	1638	+ $entry_shortcodes['default-plain'] = __( 'Default Plain', 'formidable' );
	1639	+ $entry_shortcodes['form_name'] = __( 'Form Name', 'formidable' );
	1640	+ }
	1641	+
1872	1642	/**
1873	1643	* Use this hook to add or remove buttons in the helpers section
1874	1644	* in the customization panel
1875	1645	*
1876	1646	* @since 2.0.6
1877		- *
1878		- * @param array $entry_shortcodes
1879		- * @param bool $settings_tab
1880	1647	*/
1881		- return apply_filters( 'frm_helper_shortcodes', $entry_shortcodes, $settings_tab );
	1648	+ $entry_shortcodes = apply_filters( 'frm_helper_shortcodes', $entry_shortcodes, $settings_tab );
	1649	+
	1650	+ return $entry_shortcodes;
1882	1651	}
1883	1652
1884	1653	/**
1885	1654	* Insert the form class setting into the form.
		@@ -1884,9 +1653,8 @@
1884	1653	/**
1885	1654	* Insert the form class setting into the form.
1886	1655	*
1887	1656	* @param stdClass $form
1888		- *
1889	1657	* @return void
1890	1658	*/
1891	1659	public static function form_classes( $form ) {
1892	1660	if ( isset( $form->options['form_class'] ) ) {
		@@ -1897,9 +1665,9 @@
1897	1665	echo ' frm_js_validate ';
1898	1666	self::add_js_validate_form_to_global_vars( $form );
1899	1667	}
1900	1668
1901		- if ( FrmForm::is_ajax_on( $form ) ) {
	1669	+ if ( ! FrmFormsHelper::should_use_pro_for_ajax_submit() && FrmForm::is_ajax_on( $form ) ) {
1902	1670	echo ' frm_ajax_submit ';
1903	1671	}
1904	1672	}
1905	1673
		@@ -1909,9 +1677,8 @@
1909	1677	* @param stdClass $form
1910	1678	*/
1911	1679	public static function add_js_validate_form_to_global_vars( $form ) {
1912	1680	global $frm_vars;
1913		-
1914	1681	if ( ! isset( $frm_vars['js_validate_forms'] ) ) {
1915	1682	$frm_vars['js_validate_forms'] = array();
1916	1683	}
1917	1684	$frm_vars['js_validate_forms'][ $form->id ] = $form;
		@@ -1934,9 +1701,8 @@
1934	1701	/**
1935	1702	* @param string $content
1936	1703	* @param int\|stdClass\|string $form
1937	1704	* @param false\|int\|stdClass\|string $entry
1938		- *
1939	1705	* @return string
1940	1706	*/
1941	1707	public static function filter_content( $content, $form, $entry = false ) {
1942	1708	$content = self::replace_form_name_shortcodes( $content, $form );
		@@ -1941,9 +1707,8 @@
1941	1707	public static function filter_content( $content, $form, $entry = false ) {
1942	1708	$content = self::replace_form_name_shortcodes( $content, $form );
1943	1709
1944	1710	self::get_entry_by_param( $entry );
1945		-
1946	1711	if ( ! $entry ) {
1947	1712	return $content;
1948	1713	}
1949	1714
		@@ -1950,19 +1715,12 @@
1950	1715	if ( is_object( $form ) ) {
1951	1716	$form = $form->id;
1952	1717	}
1953	1718
1954		- /*
1955		- * Repeater actions adds `parent_entry` to `$entry` store the parent entry data. If `parent_entry` is not empty,
1956		- * use the parent form ID instead of repeater form ID to fix the parent form field shortcodes doesn't work.
1957		- */
1958		- if ( ! empty( $entry->parent_entry ) ) {
1959		- $form = $entry->parent_entry->form_id;
1960		- }
1961		-
1962	1719	$shortcodes = FrmFieldsHelper::get_shortcodes( $content, $form );
	1720	+ $content = apply_filters( 'frm_replace_content_shortcodes', $content, $entry, $shortcodes );
1963	1721
1964		- return apply_filters( 'frm_replace_content_shortcodes', $content, $entry, $shortcodes );
	1722	+ return $content;
1965	1723	}
1966	1724
1967	1725	/**
1968	1726	* Replace any [form_name] shortcodes in a string.
		@@ -1970,9 +1728,8 @@
1970	1728	* @since 5.5
1971	1729	*
1972	1730	* @param array\|string $string
1973	1731	* @param int\|stdClass\|string $form
1974		- *
1975	1732	* @return array\|string
1976	1733	*/
1977	1734	public static function replace_form_name_shortcodes( $string, $form ) {
1978	1735	if ( ! is_string( $string ) ) {
		@@ -1978,9 +1735,9 @@
1978	1735	if ( ! is_string( $string ) ) {
1979	1736	return $string;
1980	1737	}
1981	1738
1982		- if ( ! str_contains( $string, '[form_name]' ) ) {
	1739	+ if ( false === strpos( $string, '[form_name]' ) ) {
1983	1740	return $string;
1984	1741	}
1985	1742
1986	1743	if ( ! is_object( $form ) ) {
		@@ -1992,30 +1749,20 @@
1992	1749	}
1993	1750
1994	1751	/**
1995	1752	* @param false\|int\|stdClass\|string $entry
1996		- *
1997	1753	* @return void
1998	1754	*/
1999	1755	private static function get_entry_by_param( &$entry ) {
2000		- if ( $entry && is_object( $entry ) ) {
2001		- return;
2002		- }
	1756	+ if ( ! $entry \|\| ! is_object( $entry ) ) {
	1757	+ if ( ! $entry \|\| ! is_numeric( $entry ) ) {
	1758	+ $entry = FrmAppHelper::get_post_param( 'id', false, 'sanitize_title' );
	1759	+ }
2003	1760
2004		- if ( ! $entry \|\| ! is_numeric( $entry ) ) {
2005		- $entry = FrmAppHelper::get_post_param( 'id', false, 'sanitize_title' );
	1761	+ FrmEntry::maybe_get_entry( $entry );
2006	1762	}
2007		-
2008		- FrmEntry::maybe_get_entry( $entry );
2009	1763	}
2010	1764
2011		- /**
2012		- * @param string $content
2013		- * @param false\|object $entry
2014		- * @param array $shortcodes
2015		- *
2016		- * @return string
2017		- */
2018	1765	public static function replace_content_shortcodes( $content, $entry, $shortcodes ) {
2019	1766	return FrmFieldsHelper::replace_content_shortcodes( $content, $entry, $shortcodes );
2020	1767	}
2021	1768
		@@ -2020,9 +1767,8 @@
2020	1767	}
2021	1768
2022	1769	/**
2023	1770	* @param array $errors
2024		- *
2025	1771	* @return array
2026	1772	*/
2027	1773	public static function process_bulk_form_actions( $errors ) {
2028	1774	if ( ! $_REQUEST ) {
		@@ -2029,30 +1775,29 @@
2029	1775	return $errors;
2030	1776	}
2031	1777
2032	1778	$bulkaction = FrmAppHelper::get_param( 'action', '', 'get', 'sanitize_text_field' );
2033		-
2034		- // phpcs:ignore Universal.Operators.StrictComparisons
2035	1779	if ( $bulkaction == - 1 ) {
2036	1780	$bulkaction = FrmAppHelper::get_param( 'action2', '', 'get', 'sanitize_title' );
2037	1781	}
2038	1782
2039		- if ( $bulkaction && str_starts_with( $bulkaction, 'bulk_' ) ) {
	1783	+ if ( ! empty( $bulkaction ) && strpos( $bulkaction, 'bulk_' ) === 0 ) {
2040	1784	FrmAppHelper::remove_get_action();
	1785	+
2041	1786	$bulkaction = str_replace( 'bulk_', '', $bulkaction );
2042	1787	}
2043	1788
2044	1789	$ids = FrmAppHelper::get_param( 'item-action', '', 'get', 'sanitize_text_field' );
	1790	+ if ( empty( $ids ) ) {
	1791	+ $errors[] = __( 'No forms were specified', 'formidable' );
2045	1792
2046		- if ( ! $ids ) {
2047		- $errors[] = __( 'No forms were specified', 'formidable' );
2048	1793	return $errors;
2049	1794	}
2050	1795
2051	1796	$permission_error = FrmAppHelper::permission_nonce_error( '', '_wpnonce', 'bulk-toplevel_page_formidable' );
2052		-
2053	1797	if ( $permission_error !== false ) {
2054	1798	$errors[] = $permission_error;
	1799	+
2055	1800	return $errors;
2056	1801	}
2057	1802
2058	1803	if ( ! is_array( $ids ) ) {
		@@ -2076,24 +1821,9 @@
2076	1821
2077	1822	return $errors;
2078	1823	}
2079	1824
2080		- /**
2081		- * Includes html that shows a message when the device is too small to use Formidable Forms admin pages.
2082		- *
2083		- * @since 6.20
2084		- *
2085		- * @return void
2086		- */
2087		- public static function include_device_too_small_message() {
2088		- if ( ! FrmAppHelper::is_formidable_admin() ) {
2089		- return;
2090		- }
2091		-
2092		- include FrmAppHelper::plugin_path() . '/classes/views/shared/small-device-message.php';
2093		- }
2094		-
2095		- public static function route() { // phpcs:ignore Generic.Metrics.CyclomaticComplexity.MaxExceeded
	1825	+ public static function route() {
2096	1826	$action = isset( $_REQUEST['frm_action'] ) ? 'frm_action' : 'action';
2097	1827	$vars = array();
2098	1828	FrmAppHelper::include_svg();
2099	1829
		@@ -2103,28 +1833,25 @@
2103	1833	// Javascript needs to be allowed in some field settings.
2104	1834	// phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized, WordPress.Security.NonceVerification.Missing
2105	1835	$json_vars = htmlspecialchars_decode( nl2br( str_replace( '"', '"', wp_unslash( $_POST['frm_compact_fields'] ) ) ) );
2106	1836	$json_vars = json_decode( $json_vars, true );
	1837	+ if ( empty( $json_vars ) ) {
	1838	+ // json decoding failed so we should return an error message.
	1839	+ $action = FrmAppHelper::get_param( $action, '', 'get', 'sanitize_title' );
	1840	+ if ( 'edit' === $action ) {
	1841	+ $action = 'update';
	1842	+ }
2107	1843
2108		- if ( $json_vars ) {
	1844	+ add_filter( 'frm_validate_form', 'FrmFormsController::json_error' );
	1845	+ } else {
2109	1846	$vars = FrmAppHelper::json_to_array( $json_vars );
2110	1847	$action = $vars[ $action ];
2111	1848	unset( $_REQUEST['frm_compact_fields'], $_POST['frm_compact_fields'] ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
2112	1849	$_REQUEST = array_merge( $_REQUEST, $vars ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
2113	1850	$_POST = array_merge( $_POST, $_REQUEST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
2114		- } else {
2115		- // Json decoding failed so we should return an error message.
2116		- $action = FrmAppHelper::get_param( $action, '', 'get', 'sanitize_title' );
2117		-
2118		- if ( 'edit' === $action ) {
2119		- $action = 'update';
2120		- }
2121		-
2122		- add_filter( 'frm_validate_form', 'FrmFormsController::json_error' );
2123	1851	}
2124	1852	} else {
2125	1853	$action = FrmAppHelper::get_param( $action, '', 'get', 'sanitize_title' );
2126		-
2127	1854	if ( isset( $_REQUEST['delete_all'] ) ) {
2128	1855	// Override the action for this page.
2129	1856	$action = 'delete_all';
2130	1857	}
		@@ -2143,39 +1870,33 @@
2143	1870	case 'settings':
2144	1871	case 'update_settings':
2145	1872	return self::$action( $vars );
2146	1873	case 'lite-reports':
2147		- self::no_reports( $vars );
2148		- return null;
	1874	+ return self::no_reports( $vars );
2149	1875	case 'views':
2150		- self::no_views( $vars );
2151		- return null;
	1876	+ return self::no_views( $vars );
2152	1877	default:
2153	1878	do_action( 'frm_form_action_' . $action );
2154		-
2155	1879	if ( apply_filters( 'frm_form_stop_action_' . $action, false ) ) {
2156		- return null;
	1880	+ return;
2157	1881	}
2158	1882
2159	1883	$action = FrmAppHelper::get_param( 'action', '', 'get', 'sanitize_text_field' );
2160		-
2161		- // phpcs:ignore Universal.Operators.StrictComparisons
2162	1884	if ( $action == - 1 ) {
2163	1885	$action = FrmAppHelper::get_param( 'action2', '', 'get', 'sanitize_title' );
2164	1886	}
2165	1887
2166		- if ( str_starts_with( $action, 'bulk_' ) ) {
	1888	+ if ( strpos( $action, 'bulk_' ) === 0 ) {
2167	1889	FrmAppHelper::remove_get_action();
2168	1890
2169	1891	self::list_form();
2170		- return null;
	1892	+ return;
2171	1893	}
2172	1894
2173	1895	$message = FrmAppHelper::get_param( 'message' );
2174		-
2175	1896	if ( 'form_duplicate_error' === $message ) {
2176	1897	self::display_forms_list( array(), '', array( __( 'There was a problem duplicating the form', 'formidable' ) ) );
2177		- return null;
	1898	+ return;
2178	1899	}
2179	1900
2180	1901	if ( 'forms_permanently_deleted' === $message ) {
2181	1902	$count = FrmAppHelper::get_param( 'forms_deleted', 0, 'get', 'absint' );
		@@ -2181,14 +1902,14 @@
2181	1902	$count = FrmAppHelper::get_param( 'forms_deleted', 0, 'get', 'absint' );
2182	1903	/* translators: %1$s: Number of forms */
2183	1904	$message = sprintf( _n( '%1$s form permanently deleted.', '%1$s forms permanently deleted.', $count, 'formidable' ), $count );
2184	1905	self::display_forms_list( array(), $message, '' );
2185		- return null;
	1906	+ return;
2186	1907	}
2187	1908
2188	1909	self::display_forms_list();
2189	1910
2190		- return null;
	1911	+ return;
2191	1912	}//end switch
2192	1913	}
2193	1914
2194	1915	/**
		@@ -2207,44 +1928,30 @@
2207	1928
2208	1929	// Get posted data
2209	1930	$form_id = FrmAppHelper::get_post_param( 'form_id', '', 'absint' );
2210	1931	$name = FrmAppHelper::get_post_param( 'form_name', '', 'sanitize_text_field' );
2211		- $form = FrmForm::getOne( $form_id );
2212	1932
2213		- if ( ! $form ) {
2214		- wp_send_json_error( __( 'Form not found', 'formidable' ) );
2215		- }
	1933	+ // Update the form name and form key.
	1934	+ $form_key = FrmAppHelper::get_unique_key( sanitize_title( $name ), 'frm_forms', 'form_key' );
	1935	+ FrmForm::update( $form_id, compact( 'name', 'form_key' ) );
2216	1936
2217		- if ( $name === $form->name ) {
2218		- // Nothing to change so exit early.
2219		- wp_send_json_success();
2220		- }
	1937	+ wp_send_json_success( compact( 'form_key' ) );
	1938	+ }
2221	1939
2222		- $to_update = array(
2223		- 'name' => $name,
2224		- );
	1940	+ public static function json_error( $errors ) {
	1941	+ $errors['json'] = __( 'Abnormal HTML characters prevented your form from saving correctly', 'formidable' );
2225	1942
2226		- if ( '' === $name ) {
2227		- $form_key = $form->form_key;
2228		- } else {
2229		- // Only update form_key if name is not empty.
2230		- $form_key = FrmAppHelper::get_unique_key( sanitize_title( $name ), 'frm_forms', 'form_key' );
2231		- $to_update['form_key'] = $form_key;
2232		- }
2233		-
2234		- FrmForm::update( $form_id, $to_update );
2235		-
2236		- wp_send_json_success( compact( 'form_key' ) );
	1943	+ return $errors;
2237	1944	}
2238	1945
2239	1946	/**
2240		- * @param array $errors
	1947	+ * Education for premium features.
2241	1948	*
2242		- * @return array
	1949	+ * @since 4.05
	1950	+ * @return void
2243	1951	*/
2244		- public static function json_error( $errors ) {
2245		- $errors['json'] = __( 'Abnormal HTML characters prevented your form from saving correctly', 'formidable' );
2246		- return $errors;
	1952	+ public static function add_form_style_tab_options() {
	1953	+ include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/add_form_style_options.php';
2247	1954	}
2248	1955
2249	1956	/**
2250	1957	* Add education about views.
		@@ -2249,12 +1956,8 @@
2249	1956	/**
2250	1957	* Add education about views.
2251	1958	*
2252	1959	* @since 4.07
2253		- *
2254		- * @param array $values
2255		- *
2256		- * @return void
2257	1960	*/
2258	1961	public static function no_views( $values = array() ) {
2259	1962	FrmAppHelper::include_svg();
2260	1963	$id = FrmAppHelper::get_param( 'form', '', 'get', 'absint' );
		@@ -2266,12 +1969,8 @@
2266	1969	/**
2267	1970	* Add education about reports.
2268	1971	*
2269	1972	* @since 4.07
2270		- *
2271		- * @param array $values
2272		- *
2273		- * @return void
2274	1973	*/
2275	1974	public static function no_reports( $values = array() ) {
2276	1975	$id = FrmAppHelper::get_param( 'form', '', 'get', 'absint' );
2277	1976	$form = $id ? FrmForm::getOne( $id ) : false;
		@@ -2296,9 +1995,10 @@
2296	1995	/**
2297	1996	* @since 4.05.02
2298	1997	*/
2299	1998	private static function move_menu_to_footer() {
2300		- if ( empty( FrmAppHelper::get_settings()->admin_bar ) ) {
	1999	+ $settings = FrmAppHelper::get_settings();
	2000	+ if ( empty( $settings->admin_bar ) ) {
2301	2001	remove_action( 'wp_body_open', 'wp_admin_bar_render', 0 );
2302	2002	}
2303	2003	}
2304	2004
		@@ -2303,15 +2003,13 @@
2303	2003	}
2304	2004
2305	2005	public static function admin_bar_configure() {
2306	2006	global $frm_vars;
2307		-
2308	2007	if ( empty( $frm_vars['forms_loaded'] ) ) {
2309	2008	return;
2310	2009	}
2311	2010
2312	2011	$actions = array();
2313		-
2314	2012	foreach ( $frm_vars['forms_loaded'] as $form ) {
2315	2013	if ( is_object( $form ) ) {
2316	2014	$actions[ $form->id ] = $form->name;
2317	2015	}
		@@ -2317,9 +2015,9 @@
2317	2015	}
2318	2016	unset( $form );
2319	2017	}
2320	2018
2321		- if ( ! $actions ) {
	2019	+ if ( empty( $actions ) ) {
2322	2020	return;
2323	2021	}
2324	2022
2325	2023	self::add_menu_to_admin_bar();
		@@ -2345,12 +2043,8 @@
2345	2043	}
2346	2044
2347	2045	/**
2348	2046	* @since 2.05.07
2349		- *
2350		- * @param array $actions
2351		- *
2352		- * @return void
2353	2047	*/
2354	2048	private static function add_forms_to_admin_bar( $actions ) {
2355	2049	global $wp_admin_bar;
2356	2050
		@@ -2356,13 +2050,14 @@
2356	2050
2357	2051	asort( $actions );
2358	2052
2359	2053	foreach ( $actions as $form_id => $name ) {
	2054	+
2360	2055	$wp_admin_bar->add_node(
2361	2056	array(
2362	2057	'parent' => 'frm-forms',
2363	2058	'id' => 'edit_form_' . $form_id,
2364		- 'title' => $name ? $name : FrmFormsHelper::get_no_title_text(),
	2059	+ 'title' => empty( $name ) ? __( '(no title)', 'formidable' ) : $name,
2365	2060	'href' => FrmForm::get_edit_link( $form_id ),
2366	2061	)
2367	2062	);
2368	2063	}
		@@ -2371,14 +2066,12 @@
2371	2066	/**
2372	2067	* The formidable shortcode
2373	2068	*
2374	2069	* @param array $atts The params from the shortcode.
2375		- *
2376	2070	* @return string
2377	2071	*/
2378	2072	public static function get_form_shortcode( $atts ) {
2379	2073	global $frm_vars;
2380		-
2381	2074	if ( ! empty( $frm_vars['skip_shortcode'] ) ) {
2382	2075	$sc = '[formidable';
2383	2076	$sc .= FrmAppHelper::array_to_html_params( $atts );
2384	2077	return $sc . ']';
		@@ -2407,9 +2100,8 @@
2407	2100	* @since 5.2.01
2408	2101	*
2409	2102	* @param false\|int\|string $id
2410	2103	* @param false\|string $key
2411		- *
2412	2104	* @return false\|stdClass
2413	2105	*/
2414	2106	private static function maybe_get_form_by_id_or_key( $id, $key ) {
2415	2107	if ( ! $id ) {
		@@ -2423,9 +2115,8 @@
2423	2115	* @param false\|string $key
2424	2116	* @param bool\|int\|string $title may be 'auto', true, false, 'true', 'false', 'yes', '1', 1, '0', 0.
2425	2117	* @param bool\|int\|string $description may be 'auto', true, false, 'true', 'false', 'yes', '1', 1, '0', 0.
2426	2118	* @param array $atts
2427		- *
2428	2119	* @return string
2429	2120	*/
2430	2121	public static function show_form( $id = '', $key = '', $title = false, $description = false, $atts = array() ) {
2431	2122	$form = self::maybe_get_form_by_id_or_key( $id, $key );
		@@ -2446,13 +2137,14 @@
2446	2137
2447	2138	add_action( 'frm_load_form_hooks', 'FrmHooksController::trigger_load_form_hooks' );
2448	2139	FrmAppHelper::trigger_hook_load( 'form', $form );
2449	2140
2450		- $form = apply_filters( 'frm_pre_display_form', $form );
	2141	+ $form = apply_filters( 'frm_pre_display_form', $form );
	2142	+
2451	2143	$frm_settings = FrmAppHelper::get_settings( array( 'current_form' => $form->id ) );
2452	2144
2453	2145	if ( self::is_viewable_draft_form( $form ) ) {
2454		- // Don't show a draft form on a page
	2146	+ // don't show a draft form on a page
2455	2147	$form = __( 'Please select a valid form', 'formidable' );
2456	2148	} elseif ( ! FrmForm::is_visible_to_user( $form ) ) {
2457	2149	$form = do_shortcode( $frm_settings->login_msg );
2458	2150	} else {
		@@ -2472,18 +2164,16 @@
2472	2164	}
2473	2165
2474	2166	/**
2475	2167	* @param false\|int\|string $id
2476		- *
2477	2168	* @return false\|stdClass
2478	2169	*/
2479	2170	private static function maybe_get_form_to_show( $id ) {
2480	2171	$form = false;
2481	2172
2482		- if ( $id ) {
	2173	+ if ( ! empty( $id ) ) {
2483	2174	// Form id or key is set.
2484	2175	$form = FrmForm::getOne( $id );
2485		-
2486	2176	if ( ! $form \|\| $form->parent_form_id \|\| $form->status === 'trash' ) {
2487	2177	$form = false;
2488	2178	}
2489	2179	}
		@@ -2490,25 +2180,12 @@
2490	2180
2491	2181	return $form;
2492	2182	}
2493	2183
2494		- /**
2495		- * @param object $form
2496		- *
2497		- * @return bool
2498		- */
2499	2184	private static function is_viewable_draft_form( $form ) {
2500	2185	return $form->status === 'draft' && current_user_can( 'frm_edit_forms' ) && ! FrmAppHelper::is_preview_page();
2501	2186	}
2502	2187
2503		- /**
2504		- * @param object $form
2505		- * @param bool $title
2506		- * @param bool $description
2507		- * @param array $atts
2508		- *
2509		- * @return string
2510		- */
2511	2188	public static function get_form( $form, $title, $description, $atts = array() ) {
2512	2189	ob_start();
2513	2190
2514	2191	do_action( 'frm_before_get_form', $atts );
		@@ -2515,9 +2192,10 @@
2515	2192
2516	2193	self::get_form_contents( $form, $title, $description, $atts );
2517	2194	self::enqueue_scripts( FrmForm::get_params( $form ) );
2518	2195
2519		- $contents = ob_get_clean();
	2196	+ $contents = ob_get_contents();
	2197	+ ob_end_clean();
2520	2198
2521	2199	self::maybe_minimize_form( $atts, $contents );
2522	2200
2523	2201	return $contents;
		@@ -2522,25 +2200,12 @@
2522	2200
2523	2201	return $contents;
2524	2202	}
2525	2203
2526		- /**
2527		- * @param array $params
2528		- *
2529		- * @return void
2530		- */
2531	2204	public static function enqueue_scripts( $params ) {
2532	2205	do_action( 'frm_enqueue_form_scripts', $params );
2533	2206	}
2534	2207
2535		- /**
2536		- * @param object $form
2537		- * @param bool $title
2538		- * @param bool $description
2539		- * @param array $atts
2540		- *
2541		- * @return void
2542		- */
2543	2208	public static function get_form_contents( $form, $title, $description, $atts ) {
2544	2209	$params = FrmForm::get_params( $form );
2545	2210	$errors = self::get_saved_errors( $form, $params );
2546	2211	$fields = FrmFieldsHelper::get_form_fields( $form->id, $errors );
		@@ -2547,10 +2212,9 @@
2547	2212	$reset = false;
2548	2213	$pass_args = compact( 'form', 'fields', 'errors', 'title', 'description', 'reset' );
2549	2214
2550	2215	$pass_args['action'] = $params['action'];
2551		- // phpcs:ignore WordPress.Security.NonceVerification.Missing, Universal.Operators.StrictComparisons
2552		- $handle_process_here = $params['action'] === 'create' && $params['posted_form_id'] == $form->id && $_POST;
	2216	+ $handle_process_here = $params['action'] === 'create' && $params['posted_form_id'] == $form->id && $_POST; // phpcs:ignore WordPress.Security.NonceVerification.Missing
2553	2217
2554	2218	if ( ! $handle_process_here ) {
2555	2219	FrmFormState::set_initial_value( 'title', $title );
2556	2220	FrmFormState::set_initial_value( 'description', $description );
		@@ -2555,15 +2219,16 @@
2555	2219	FrmFormState::set_initial_value( 'title', $title );
2556	2220	FrmFormState::set_initial_value( 'description', $description );
2557	2221
2558	2222	do_action( 'frm_display_form_action', $params, $fields, $form, $title, $description );
2559		-
2560	2223	if ( apply_filters( 'frm_continue_to_new', true, $form->id, $params['action'] ) ) {
2561	2224	self::show_form_after_submit( $pass_args );
2562	2225	}
2563		- } elseif ( $errors ) {
	2226	+ } elseif ( ! empty( $errors ) ) {
2564	2227	self::show_form_after_submit( $pass_args );
	2228	+
2565	2229	} else {
	2230	+
2566	2231	do_action( 'frm_validate_form_creation', $params, $fields, $form, $title, $description );
2567	2232
2568	2233	if ( apply_filters( 'frm_continue_to_create', true, $form->id ) ) {
2569	2234	$entry_id = self::just_created_entry( $form->id );
		@@ -2586,19 +2251,13 @@
2586	2251	/**
2587	2252	* If the form was processed earlier (init), get the generated errors
2588	2253	*
2589	2254	* @since 2.05
2590		- *
2591		- * @param object $form
2592		- * @param array $params
2593		- *
2594		- * @return array
2595	2255	*/
2596	2256	private static function get_saved_errors( $form, $params ) {
2597	2257	global $frm_vars;
2598	2258
2599		- // phpcs:ignore WordPress.Security.NonceVerification.Missing, Universal.Operators.StrictComparisons
2600		- if ( $params['posted_form_id'] == $form->id && $_POST && isset( $frm_vars['created_entries'][ $form->id ] ) ) {
	2259	+ if ( $params['posted_form_id'] == $form->id && $_POST && isset( $frm_vars['created_entries'][ $form->id ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
2601	2260	$errors = $frm_vars['created_entries'][ $form->id ]['errors'];
2602	2261	} else {
2603	2262	$errors = array();
2604	2263	}
		@@ -2615,16 +2274,13 @@
2615	2274	}
2616	2275
2617	2276	/**
2618	2277	* @since 2.2.7
2619		- *
2620		- * @param int\|string $form_id
2621		- *
2622		- * @return int
2623	2278	*/
2624	2279	public static function just_created_entry( $form_id ) {
2625	2280	global $frm_vars;
2626		- 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; // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong
	2281	+
	2282	+ 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;
2627	2283	}
2628	2284
2629	2285	/**
2630	2286	* Gets confirmation method.
		@@ -2637,9 +2293,8 @@
2637	2293	*
2638	2294	* @type object $form Form object.
2639	2295	* @type int $entry_id Entry ID.
2640	2296	* }
2641		- *
2642	2297	* @return array\|string
2643	2298	*/
2644	2299	private static function get_confirmation_method( $atts ) {
2645	2300	$action = FrmOnSubmitHelper::current_event( $atts );
		@@ -2647,9 +2302,8 @@
2647	2302	$method = ! empty( $atts['form']->options[ $opt ] ) ? $atts['form']->options[ $opt ] : 'message';
2648	2303
2649	2304	if ( ! empty( $atts['entry_id'] ) ) {
2650	2305	$met_actions = self::get_met_on_submit_actions( $atts, $action );
2651		-
2652	2306	if ( $met_actions ) {
2653	2307	$method = $met_actions;
2654	2308	}
2655	2309	}
		@@ -2656,21 +2310,14 @@
2656	2310
2657	2311	$method = apply_filters( 'frm_success_filter', $method, $atts['form'], $action );
2658	2312
2659	2313	if ( $method !== 'message' && ( ! $atts['entry_id'] \|\| ! is_numeric( $atts['entry_id'] ) ) ) {
2660		- return 'message';
	2314	+ $method = 'message';
2661	2315	}
2662	2316
2663	2317	return $method;
2664	2318	}
2665	2319
2666		- /**
2667		- * @param object $form
2668		- * @param array $params
2669		- * @param array $args
2670		- *
2671		- * @return void
2672		- */
2673	2320	public static function maybe_trigger_redirect( $form, $params, $args ) {
2674	2321	if ( ! isset( $params['id'] ) ) {
2675	2322	global $frm_vars;
2676	2323	$params['id'] = $frm_vars['created_entries'][ $form->id ]['entry_id'];
		@@ -2697,12 +2344,14 @@
2697	2344	* @param array $params See {@see FrmFormsController::maybe_trigger_redirect()}.
2698	2345	* @param array $args See {@see FrmFormsController::maybe_trigger_redirect()}.
2699	2346	*/
2700	2347	public static function maybe_trigger_redirect_with_action( $conf_method, $form, $params, $args ) {
2701		- if ( is_array( $conf_method ) && 1 === count( $conf_method ) && 'redirect' === FrmOnSubmitHelper::get_action_type( $conf_method[0] ) && empty( $conf_method[0]->post_content['redirect_delay'] ) ) { // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong
2702		- $event = FrmOnSubmitHelper::current_event( $params );
2703		- FrmOnSubmitHelper::populate_on_submit_data( $form->options, $conf_method[0], $event );
2704		- $conf_method = 'redirect';
	2348	+ if ( is_array( $conf_method ) && 1 === count( $conf_method ) ) {
	2349	+ if ( 'redirect' === FrmOnSubmitHelper::get_action_type( $conf_method[0] ) ) {
	2350	+ $event = FrmOnSubmitHelper::current_event( $params );
	2351	+ FrmOnSubmitHelper::populate_on_submit_data( $form->options, $conf_method[0], $event );
	2352	+ $conf_method = 'redirect';
	2353	+ }
2705	2354	}
2706	2355
2707	2356	if ( 'redirect' === $conf_method ) {
2708	2357	self::trigger_redirect( $form, $params, $args );
		@@ -2708,15 +2357,8 @@
2708	2357	self::trigger_redirect( $form, $params, $args );
2709	2358	}
2710	2359	}
2711	2360
2712		- /**
2713		- * @param object $form
2714		- * @param array $params
2715		- * @param array $args
2716		- *
2717		- * @return void
2718		- */
2719	2361	public static function trigger_redirect( $form, $params, $args ) {
2720	2362	$success_args = array(
2721	2363	'action' => $params['action'],
2722	2364	'conf_method' => 'redirect',
		@@ -2775,9 +2417,8 @@
2775	2417	* @since 6.0
2776	2418	*
2777	2419	* @param array $args See {@see FrmFormsController::run_success_action()}.
2778	2420	* @param string $event Form event. Default is `create`.
2779		- *
2780	2421	* @return array Array of actions that meet the conditional logics.
2781	2422	*/
2782	2423	public static function get_met_on_submit_actions( $args, $event = 'create' ) {
2783	2424	if ( ! FrmOnSubmitHelper::form_has_migrated( $args['form'] ) ) {
		@@ -2783,9 +2424,9 @@
2783	2424	if ( ! FrmOnSubmitHelper::form_has_migrated( $args['form'] ) ) {
2784	2425	return array();
2785	2426	}
2786	2427
2787		- // If a redirect action has already opened the URL in a new tab, we show the default message in the current tab.
	2428	+ // If a redirect action has already opened the URL in a new tab, we show the default message in the currect tab.
2788	2429	if ( ! empty( self::$redirected_in_new_tab[ $args['form']->id ] ) ) {
2789	2430	return array( FrmOnSubmitHelper::get_fallback_action_after_open_in_new_tab( $event ) );
2790	2431	}
2791	2432
		@@ -2804,11 +2445,13 @@
2804	2445	}
2805	2446
2806	2447	$action_type = FrmOnSubmitHelper::get_action_type( $action );
2807	2448
2808		- if ( 'redirect' === $action_type && $has_redirect ) {
2809		- // Do not process because we run the first redirect action only.
2810		- continue;
	2449	+ if ( 'redirect' === $action_type ) {
	2450	+ if ( $has_redirect ) {
	2451	+ // Do not process because we run the first redirect action only.
	2452	+ continue;
	2453	+ }
2811	2454	}
2812	2455
2813	2456	if ( ! self::is_valid_on_submit_action( $action, $args, $event ) ) {
2814	2457	continue;
		@@ -2833,10 +2476,10 @@
2833	2476	* @param array $args See {@see FrmFormsController::run_success_action()}. `$args['event']` is also added.
2834	2477	*/
2835	2478	$met_actions = apply_filters( 'frm_get_met_on_submit_actions', $met_actions, $args );
2836	2479
2837		- if ( ! $met_actions ) {
2838		- return array( FrmOnSubmitHelper::get_fallback_action( $event ) );
	2480	+ if ( empty( $met_actions ) ) {
	2481	+ $met_actions = array( FrmOnSubmitHelper::get_fallback_action( $event ) );
2839	2482	}
2840	2483
2841	2484	return $met_actions;
2842	2485	}
		@@ -2848,9 +2491,8 @@
2848	2491	*
2849	2492	* @param object $action Form action object.
2850	2493	* @param array $args See {@see FrmFormsController::run_success_action()}.
2851	2494	* @param string $event Form event. Default is `create`.
2852		- *
2853	2495	* @return bool
2854	2496	*/
2855	2497	private static function is_valid_on_submit_action( $action, $args, $event = 'create' ) {
2856	2498	$action_type = FrmOnSubmitHelper::get_action_type( $action );
		@@ -2872,9 +2514,8 @@
2872	2514	return false;
2873	2515	}
2874	2516
2875	2517	$page = get_post( $action->post_content['success_page_id'] );
2876		-
2877	2518	if ( ! $page \|\| 'trash' === $page->post_status ) {
2878	2519	return false;
2879	2520	}
2880	2521	}
		@@ -2896,9 +2537,8 @@
2896	2537	'entry_id' => $args['entry_id'],
2897	2538	'action' => FrmOnSubmitHelper::current_event( $args ),
2898	2539	)
2899	2540	);
2900		-
2901	2541	if ( ! is_array( $args['conf_method'] ) ) {
2902	2542	self::run_success_action( $args );
2903	2543	return;
2904	2544	}
		@@ -2925,9 +2565,8 @@
2925	2565	* @param array $args See {@see FrmFormsController::run_success_action()}.
2926	2566	*/
2927	2567	public static function run_multi_on_submit_actions( $args ) {
2928	2568	$redirect_action = null;
2929		-
2930	2569	foreach ( $args['conf_method'] as $action ) {
2931	2570	if ( 'redirect' === FrmOnSubmitHelper::get_action_type( $action ) ) {
2932	2571	// We catch the redirect action to run it last.
2933	2572	$redirect_action = $action;
		@@ -2938,15 +2577,13 @@
2938	2577
2939	2578	unset( $action );
2940	2579	}
2941	2580
2942		- if ( ! $redirect_action ) {
2943		- return;
	2581	+ if ( $redirect_action ) {
	2582	+ // Show script to delay the redirection.
	2583	+ $args['force_delay_redirect'] = true;
	2584	+ self::run_single_on_submit_action( $args, $redirect_action );
2944	2585	}
2945		-
2946		- // Show script to delay the redirection.
2947		- $args['force_delay_redirect'] = true;
2948		- self::run_single_on_submit_action( $args, $redirect_action );
2949	2586	}
2950	2587
2951	2588	/**
2952	2589	* Runs single On Submit action.
		@@ -2967,9 +2604,8 @@
2967	2604	* @since 6.0
2968	2605	*
2969	2606	* @param array $args See {@see FrmFormsController::run_success_action()}.
2970	2607	* @param object $action On Submit action object.
2971		- *
2972	2608	* @return array
2973	2609	*/
2974	2610	private static function get_run_success_action_args( $args, $action ) {
2975	2611	$new_args = $args;
		@@ -2975,9 +2611,10 @@
2975	2611	$new_args = $args;
2976	2612
2977	2613	FrmOnSubmitHelper::populate_on_submit_data( $new_args['form']->options, $action, $args['action'] );
2978	2614
2979		- $opt = 'update' === $args['action'] ? 'edit_' : 'success_';
	2615	+ $opt = 'update' === $args['action'] ? 'edit_' : 'success_';
	2616	+
2980	2617	$new_args['conf_method'] = $new_args['form']->options[ $opt . 'action' ];
2981	2618
2982	2619	/**
2983	2620	* Filters the run success action args.
		@@ -2992,18 +2629,12 @@
2992	2629	}
2993	2630
2994	2631	/**
2995	2632	* @since 3.0
2996		- *
2997		- * @param array $args
2998		- *
2999		- * @return void
3000	2633	*/
3001	2634	private static function load_page_after_submit( $args ) {
3002	2635	global $post;
3003	2636	$opt = $args['success_opt'];
3004		-
3005		- // phpcs:ignore Universal.Operators.StrictComparisons
3006	2637	if ( ! $post \|\| $args['form']->options[ $opt . '_page_id' ] != $post->ID ) {
3007	2638	$page = get_post( $args['form']->options[ $opt . '_page_id' ] );
3008	2639	$old_post = $post;
3009	2640	$post = $page;
		@@ -3027,9 +2658,8 @@
3027	2658	}
3028	2659
3029	2660	/**
3030	2661	* @since 3.0
3031		- *
3032	2662	* @param array $args See {@see FrmFormsController::run_success_action()}.
3033	2663	*/
3034	2664	private static function redirect_after_submit( $args ) {
3035	2665	add_filter( 'frm_use_wpautop', '__return_false' );
		@@ -3043,10 +2673,11 @@
3043	2673	FrmEntriesController::delete_entry_before_redirect( $success_url, $args['form'], $args );
3044	2674
3045	2675	add_filter( 'frm_redirect_url', 'FrmEntriesController::prepare_redirect_url' );
3046	2676	$success_url = apply_filters( 'frm_redirect_url', $success_url, $args['form'], $args );
3047		- $doing_ajax = FrmAppHelper::doing_ajax();
3048	2677
	2678	+ $doing_ajax = FrmAppHelper::doing_ajax();
	2679	+
3049	2680	if ( ! empty( $args['ajax'] ) && $doing_ajax && empty( $args['force_delay_redirect'] ) ) {
3050	2681	// Is AJAX submit and there is just one Redirect action runs.
3051	2682	echo json_encode( self::get_ajax_redirect_response_data( $args + compact( 'success_url' ) ) );
3052	2683	wp_die();
		@@ -3051,9 +2682,9 @@
3051	2682	echo json_encode( self::get_ajax_redirect_response_data( $args + compact( 'success_url' ) ) );
3052	2683	wp_die();
3053	2684	}
3054	2685
3055		- if ( ! headers_sent() && empty( $args['force_delay_redirect'] ) && empty( $args['form']->options['redirect_delay'] ) ) {
	2686	+ if ( ! headers_sent() && empty( $args['force_delay_redirect'] ) ) {
3056	2687	// Not AJAX submit, no headers sent, and there is just one Redirect action runs.
3057	2688	if ( ! empty( $args['form']->options['open_in_new_tab'] ) ) {
3058	2689	self::print_open_in_new_tab_js_with_fallback_handler( $success_url, $args );
3059	2690	self::$redirected_in_new_tab[ $args['form']->id ] = 1;
		@@ -3095,51 +2726,31 @@
3095	2726	*
3096	2727	* @since 6.3.1
3097	2728	*
3098	2729	* @param array $args See {@see FrmFormsController::run_success_action()}.
3099		- *
3100	2730	* @return array
3101	2731	*/
3102	2732	private static function get_ajax_redirect_response_data( $args ) {
3103		- $response_data = array(
3104		- 'redirect' => $args['success_url'],
3105		- 'content' => '',
3106		- );
3107		- $unset_content = true;
	2733	+ $response_data = array( 'redirect' => $args['success_url'] );
3108	2734
3109		- if ( ! empty( $args['form']->options['redirect_delay'] ) ) {
3110		- $response_data['delay'] = $args['form']->options['redirect_delay_time'];
3111		- $response_data['content'] .= self::get_redirect_message( $args['success_url'], $args['form']->options['redirect_delay_msg'], $args );
3112		- $unset_content = false;
3113		- }
3114		-
3115	2735	if ( ! empty( $args['form']->options['open_in_new_tab'] ) ) {
3116	2736	$response_data['openInNewTab'] = 1;
3117	2737
3118		- // Only show open in new tab text if there is no delay.
3119		- if ( empty( $response_data['content'] ) ) {
3120		- $args['message'] = FrmOnSubmitHelper::get_default_new_tab_msg();
	2738	+ $args['message'] = FrmOnSubmitHelper::get_default_new_tab_msg();
3121	2739
3122		- $args['form']->options['success_msg'] = $args['message'];
3123		- $args['form']->options['edit_msg'] = $args['message'];
	2740	+ $args['form']->options['success_msg'] = $args['message'];
	2741	+ $args['form']->options['edit_msg'] = $args['message'];
	2742	+ if ( ! isset( $args['fields'] ) ) {
	2743	+ $args['fields'] = FrmField::get_all_for_form( $args['form']->id );
	2744	+ }
3124	2745
3125		- if ( ! isset( $args['fields'] ) ) {
3126		- $args['fields'] = FrmField::get_all_for_form( $args['form']->id );
3127		- }
	2746	+ $args['message'] = self::prepare_submit_message( $args['form'], $args['entry_id'], $args );
3128	2747
3129		- $args['message'] = self::prepare_submit_message( $args['form'], $args['entry_id'], $args );
	2748	+ ob_start();
	2749	+ self::show_lone_success_messsage( $args );
	2750	+ $response_data['content'] = ob_get_clean();
3130	2751
3131		- ob_start();
3132		- self::show_lone_success_message( $args );
3133		- $response_data['content'] .= ob_get_clean();
3134		- $unset_content = false;
3135		- }//end if
3136		-
3137	2752	$response_data['fallbackMsg'] = self::get_redirect_fallback_message( $args['success_url'], $args );
3138		- }//end if
3139		-
3140		- if ( $unset_content && '' === $response_data['content'] ) {
3141		- unset( $response_data['content'] );
3142	2753	}
3143	2754
3144	2755	return $response_data;
3145	2756	}
		@@ -3151,9 +2762,9 @@
3151	2762	*
3152	2763	* @param array $args See {@see FrmFormsController::run_success_action()}.
3153	2764	*/
3154	2765	private static function redirect_after_submit_using_js( $args ) {
3155		- $success_msg = $args['form']->options['redirect_delay_msg'];
	2766	+ $success_msg = FrmOnSubmitHelper::get_default_redirect_msg();
3156	2767	$redirect_msg = self::get_redirect_message( $args['success_url'], $success_msg, $args );
3157	2768	$success_url = esc_url_raw( $args['success_url'] );
3158	2769
3159	2770	/**
		@@ -3160,11 +2771,11 @@
3160	2771	* Filters the delay time before redirecting when On Submit Redirect action is delayed.
3161	2772	*
3162	2773	* @since 6.0
3163	2774	*
3164		- * @param int $delay_time Delay time in milliseconds.
	2775	+ * @param int $delay_time Delay time in miliseconds.
3165	2776	*/
3166		- $delay_time = apply_filters( 'frm_redirect_delay_time', 1000 * $args['form']->options['redirect_delay_time'] );
	2777	+ $delay_time = apply_filters( 'frm_redirect_delay_time', 8000 );
3167	2778
3168	2779	if ( ! empty( $args['form']->options['open_in_new_tab'] ) ) {
3169	2780	$redirect_js = 'window.open("' . $success_url . '", "_blank")';
3170	2781	} else {
		@@ -3174,15 +2785,13 @@
3174	2785	add_filter( 'frm_use_wpautop', '__return_true' );
3175	2786
3176	2787	echo FrmAppHelper::maybe_kses( $redirect_msg ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
3177	2788	echo '<script>';
3178		-
3179	2789	if ( empty( $args['doing_ajax'] ) ) {
3180	2790	// Not AJAX submit, delay JS until window.load.
3181	2791	echo 'window.onload=function(){';
3182	2792	}
3183	2793	echo 'setTimeout(function(){' . $redirect_js . '}, ' . intval( $delay_time ) . ');'; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
3184		-
3185	2794	if ( empty( $args['doing_ajax'] ) ) {
3186	2795	echo '};';
3187	2796	}
3188	2797	echo '</script>';
		@@ -3195,16 +2804,11 @@
3195	2804	* @param string $success_msg
3196	2805	* @param array $args
3197	2806	*/
3198	2807	private static function get_redirect_message( $success_url, $success_msg, $args ) {
3199		- $success_msg = apply_filters( 'frm_content', $success_msg, $args['form'], $args['entry_id'] );
3200		- $success_msg = do_shortcode( FrmAppHelper::use_wpautop( $success_msg ) );
3201		-
3202		- // phpcs:disable Generic.WhiteSpace.ScopeIndent
3203		- $redirect_msg = '<div class="' . esc_attr( FrmFormsHelper::get_form_style_class( $args['form'] ) ) . '"><div class="frm-redirect-msg" role="status">' . $success_msg . '<br/>' . // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong
	2808	+ $redirect_msg = '<div class="' . esc_attr( FrmFormsHelper::get_form_style_class( $args['form'] ) ) . '"><div class="frm-redirect-msg" role="status">' . $success_msg . '<br/>' .
3204	2809	self::get_redirect_fallback_message( $success_url, $args ) .
3205	2810	'</div></div>';
3206		- // phpcs:enable Generic.WhiteSpace.ScopeIndent
3207	2811
3208	2812	$redirect_args = array(
3209	2813	'entry_id' => $args['entry_id'],
3210	2814	'form_id' => $args['form']->id,
		@@ -3220,14 +2824,12 @@
3220	2824	* @since 6.3.1
3221	2825	*
3222	2826	* @param string $success_url Redirect URL.
3223	2827	* @param array $args Contains `form` object.
3224		- *
3225	2828	* @return string
3226	2829	*/
3227	2830	private static function get_redirect_fallback_message( $success_url, $args ) {
3228	2831	$target = '';
3229		-
3230	2832	if ( ! empty( $args['form']->options['open_in_new_tab'] ) ) {
3231	2833	$target = ' target="_blank"';
3232	2834	}
3233	2835
		@@ -3242,12 +2844,8 @@
3242	2844	/**
3243	2845	* Prepare to show the success message and empty form after submit
3244	2846	*
3245	2847	* @since 2.05
3246		- *
3247		- * @param array $atts
3248		- *
3249		- * @return void
3250	2848	*/
3251	2849	public static function show_message_after_save( $atts ) {
3252	2850	$atts['message'] = self::prepare_submit_message( $atts['form'], $atts['entry_id'], $atts );
3253	2851
		@@ -3253,9 +2851,8 @@
3253	2851
3254	2852	if ( ! isset( $atts['form']->options['show_form'] ) \|\| $atts['form']->options['show_form'] ) {
3255	2853	if ( isset( $atts['action'] ) && 'update' === $atts['action'] && is_callable( array( 'FrmProEntriesController', 'show_front_end_form_with_entry' ) ) ) {
3256	2854	$entry = FrmEntry::getOne( $atts['entry_id'] );
3257		-
3258	2855	if ( $entry ) {
3259	2856	// This is copied from the Pro plugin.
3260	2857	$atts['conf_message'] = FrmProEntriesController::confirmation( 'message', $atts['form'], $atts['form']->options, $entry->id, $atts );
3261	2858	$atts['show_form'] = FrmProEntriesController::is_form_displayed_after_edit( $atts['form'] );
		@@ -3264,9 +2861,9 @@
3264	2861	} else {
3265	2862	self::show_form_after_submit( $atts );
3266	2863	}
3267	2864	} else {
3268		- self::show_lone_success_message( $atts );
	2865	+ self::show_lone_success_messsage( $atts );
3269	2866	}
3270	2867	}
3271	2868
3272	2869	/**
		@@ -3272,12 +2869,8 @@
3272	2869	/**
3273	2870	* Show an empty form
3274	2871	*
3275	2872	* @since 2.05
3276		- *
3277		- * @param array $args
3278		- *
3279		- * @return void
3280	2873	*/
3281	2874	private static function show_form_after_submit( $args ) {
3282	2875	self::fill_atts_for_form_display( $args );
3283	2876
		@@ -3296,11 +2889,12 @@
3296	2889	}
3297	2890	unset( $args );
3298	2891
3299	2892	$include_form_tag = apply_filters( 'frm_include_form_tag', true, $form );
3300		- $frm_settings = FrmAppHelper::get_settings();
3301		- $submit = $form->options['submit_value'] ?? $frm_settings->submit_value;
3302	2893
	2894	+ $frm_settings = FrmAppHelper::get_settings();
	2895	+ $submit = isset( $form->options['submit_value'] ) ? $form->options['submit_value'] : $frm_settings->submit_value;
	2896	+
3303	2897	global $frm_vars;
3304	2898	self::maybe_load_css( $form, $values['custom_style'], $frm_vars['load_css'] );
3305	2899
3306	2900	$message_placement = self::message_placement( $form, $message );
		@@ -3308,36 +2902,25 @@
3308	2902	include FrmAppHelper::plugin_path() . '/classes/views/frm-entries/new.php';
3309	2903	}
3310	2904
3311	2905	/**
3312		- * Gets message placement.
3313		- *
3314	2906	* @since 4.05.02
3315		- * @since 6.26 This method changed from `private` to `public`.
3316		- *
3317		- * @param object $form Form object.
3318		- * @param string $message The message.
3319		- *
3320		- * @return string Accepts 'before', 'after', or 'submit'.
	2907	+ * @return string - 'before', 'after', or 'submit'
3321	2908	*/
3322		- public static function message_placement( $form, $message ) {
	2909	+ private static function message_placement( $form, $message ) {
3323	2910	$place = 'before';
3324	2911
3325	2912	if ( $message && isset( $form->options['form_class'] ) ) {
3326		- if ( str_contains( $form->options['form_class'], 'frm_below_success' ) ) {
	2913	+ if ( strpos( $form->options['form_class'], 'frm_below_success' ) !== false ) {
3327	2914	$place = 'after';
3328		- } elseif ( str_contains( $form->options['form_class'], 'frm_inline_success' ) ) {
	2915	+ } elseif ( strpos( $form->options['form_class'], 'frm_inline_success' ) !== false ) {
3329	2916	$place = 'submit';
3330	2917	}
3331	2918	}
3332	2919
3333	2920	/**
3334		- * Filter the message placement.
3335		- *
3336	2921	* @since 4.05.02
3337		- *
3338		- * @param string $place Accepts 'before', 'after', or 'submit'.
3339		- * @param array $args Args.
	2922	+ * @return string - 'before' or 'after'
3340	2923	*/
3341	2924	return apply_filters( 'frm_message_placement', $place, compact( 'form', 'message' ) );
3342	2925	}
3343	2926
		@@ -3344,12 +2927,8 @@
3344	2927	/**
3345	2928	* Get all the values needed on the new.php entry page
3346	2929	*
3347	2930	* @since 2.05
3348		- *
3349		- * @param array $args
3350		- *
3351		- * @return void
3352	2931	*/
3353	2932	private static function fill_atts_for_form_display( &$args ) {
3354	2933	if ( ! isset( $args['title'] ) && isset( $args['show_title'] ) ) {
3355	2934	$args['title'] = $args['show_title'];
		@@ -3374,23 +2953,20 @@
3374	2953	/**
3375	2954	* Show the success message without the form
3376	2955	*
3377	2956	* @since 2.05
3378		- *
3379		- * @param array $atts
3380		- *
3381		- * @return void
3382	2957	*/
3383		- private static function show_lone_success_message( $atts ) {
	2958	+ private static function show_lone_success_messsage( $atts ) {
3384	2959	global $frm_vars;
3385	2960	$values = FrmEntriesHelper::setup_new_vars( $atts['fields'], $atts['form'], true );
3386	2961	self::maybe_load_css( $atts['form'], $values['custom_style'], $frm_vars['load_css'] );
3387	2962
3388	2963	$include_extra_container = 'frm_forms' . FrmFormsHelper::get_form_style_class( $values );
3389		- $errors = array();
3390		- $form = $atts['form'];
3391		- $message = $atts['message'];
3392	2964
	2965	+ $errors = array();
	2966	+ $form = $atts['form'];
	2967	+ $message = $atts['message'];
	2968	+
3393	2969	include FrmAppHelper::plugin_path() . '/classes/views/frm-entries/errors.php';
3394	2970	}
3395	2971
3396	2972	/**
		@@ -3398,20 +2974,19 @@
3398	2974	*
3399	2975	* @since 2.05
3400	2976	* @since 6.0.x Added the third parameter.
3401	2977	*
3402		- * @param object $form Form object.
3403		- * @param int\|string $entry_id Entry ID.
3404		- * @param array $args See {@see FrmFormsController::run_success_action()}.
3405		- *
	2978	+ * @param object $form Form object.
	2979	+ * @param int $entry_id Entry ID.
	2980	+ * @param array $args See {@see FrmFormsController::run_success_action()}.
3406	2981	* @return string
3407	2982	*/
3408	2983	private static function prepare_submit_message( $form, $entry_id, $args = array() ) {
3409	2984	$frm_settings = FrmAppHelper::get_settings( array( 'current_form' => $form->id ) );
3410		- $opt = $args['success_opt'] ?? 'success';
	2985	+ $opt = isset( $args['success_opt'] ) ? $args['success_opt'] : 'success';
3411	2986
3412	2987	if ( $entry_id && is_numeric( $entry_id ) ) {
3413		- $message = $form->options[ $opt . '_msg' ] ?? $frm_settings->success_msg;
	2988	+ $message = isset( $form->options[ $opt . '_msg' ] ) ? $form->options[ $opt . '_msg' ] : $frm_settings->success_msg;
3414	2989	$class = 'frm_message';
3415	2990	} else {
3416	2991	$message = $frm_settings->failed_msg;
3417	2992	$class = FrmFormsHelper::form_error_class();
		@@ -3428,9 +3003,9 @@
3428	3003	public static function front_head() {
3429	3004	$version = FrmAppHelper::plugin_version();
3430	3005	$suffix = FrmAppHelper::js_suffix();
3431	3006
3432		- if ( $suffix && self::has_combo_js_file() ) {
	3007	+ if ( ! empty( $suffix ) && self::has_combo_js_file() ) {
3433	3008	wp_register_script( 'formidable', FrmAppHelper::plugin_url() . '/js/frm.min.js', array( 'jquery' ), $version, true );
3434	3009	} else {
3435	3010	wp_register_script( 'formidable', FrmAppHelper::plugin_url() . "/js/formidable{$suffix}.js", array( 'jquery' ), $version, true );
3436	3011	}
		@@ -3437,9 +3012,9 @@
3437	3012
3438	3013	add_filter( 'script_loader_tag', 'FrmFormsController::defer_script_loading', 10, 2 );
3439	3014
3440	3015	if ( FrmAppHelper::is_admin() ) {
3441		- // Don't load this in back-end
	3016	+ // don't load this in back-end
3442	3017	return;
3443	3018	}
3444	3019
3445	3020	FrmAppHelper::localize_script( 'front' );
		@@ -3452,15 +3027,8 @@
3452	3027	public static function has_combo_js_file() {
3453	3028	return is_readable( FrmAppHelper::plugin_path() . '/js/frm.min.js' );
3454	3029	}
3455	3030
3456		- /**
3457		- * @param object $form
3458		- * @param int\|string $this_load
3459		- * @param bool $global_load
3460		- *
3461		- * @return void
3462		- */
3463	3031	public static function maybe_load_css( $form, $this_load, $global_load ) {
3464	3032	$load_css = FrmForm::is_form_loaded( $form, $this_load, $global_load );
3465	3033
3466	3034	if ( ! $load_css ) {
		@@ -3490,9 +3058,8 @@
3490	3058	return;
3491	3059	}
3492	3060
3493	3061	global $wp_styles;
3494		-
3495	3062	if ( is_array( $wp_styles->queue ) && in_array( 'formidable', $wp_styles->queue, true ) ) {
3496	3063	wp_print_styles( 'formidable' );
3497	3064	}
3498	3065	}
		@@ -3507,57 +3074,32 @@
3507	3074	private static function should_load_late() {
3508	3075	return ! function_exists( 'aioseo' );
3509	3076	}
3510	3077
3511		- /**
3512		- * @param string $tag
3513		- * @param string $handle
3514		- *
3515		- * @return string
3516		- */
3517	3078	public static function defer_script_loading( $tag, $handle ) {
3518		- if ( 'captcha-api' === $handle && ! str_contains( $tag, 'defer' ) ) {
3519		- return str_replace( ' src', ' defer="defer" async="async" src', $tag );
	3079	+ if ( 'captcha-api' == $handle && ! strpos( $tag, 'defer' ) ) {
	3080	+ $tag = str_replace( ' src', ' defer="defer" async="async" src', $tag );
3520	3081	}
3521	3082
3522	3083	return $tag;
3523	3084	}
3524	3085
3525		- /**
3526		- * @param string $location
3527		- *
3528		- * @return void
3529		- */
3530	3086	public static function footer_js( $location = 'footer' ) {
3531	3087	global $frm_vars;
3532	3088
3533	3089	FrmStylesController::enqueue_css();
3534	3090
3535		- if ( FrmAppHelper::is_admin() \|\| $location === 'header' \|\| empty( $frm_vars['forms_loaded'] ) ) {
3536		- return;
	3091	+ if ( ! FrmAppHelper::is_admin() && $location !== 'header' && ! empty( $frm_vars['forms_loaded'] ) ) {
	3092	+ // load formidable js
	3093	+ wp_enqueue_script( 'formidable' );
3537	3094	}
3538		-
3539		- // Load formidable js
3540		- wp_enqueue_script( 'formidable' );
3541		-
3542		- FrmHoneypot::maybe_print_honeypot_js();
3543		-
3544		- if ( ! method_exists( 'FrmProFormsHelper', 'load_currency_js' ) ) {
3545		- // Load currency JS if Pro is not installed.
3546		- FrmFormsHelper::load_currency_js();
3547		- }
3548	3095	}
3549	3096
3550	3097	/**
3551	3098	* @since 2.0.8
3552		- *
3553		- * @param array $atts
3554		- * @param string $content
3555		- *
3556		- * @return void
3557	3099	*/
3558	3100	private static function maybe_minimize_form( $atts, &$content ) {
3559		- // Check if minimizing is turned on
	3101	+ // check if minimizing is turned on
3560	3102	if ( self::is_minification_on( $atts ) ) {
3561	3103	$content = str_replace( array( "\r\n", "\r", "\n", "\t", ' ' ), '', $content );
3562	3104	}
3563	3105	}
		@@ -3563,11 +3105,8 @@
3563	3105	}
3564	3106
3565	3107	/**
3566	3108	* @since 2.0.8
3567		- *
3568		- * @param array $atts
3569		- *
3570	3109	* @return bool
3571	3110	*/
3572	3111	private static function is_minification_on( $atts ) {
3573	3112	return ! empty( $atts['minimize'] );
		@@ -3579,13 +3118,11 @@
3579	3118	* @return void
3580	3119	*/
3581	3120	public static function landing_page_preview_option() {
3582	3121	$dir = apply_filters( 'frm_landing_page_preview_option', false );
3583		-
3584	3122	if ( false === $dir \|\| ! file_exists( $dir . 'landing-page-preview-option.php' ) ) {
3585	3123	$dir = self::get_form_views_path();
3586	3124	}
3587		-
3588	3125	include $dir . 'landing-page-preview-option.php';
3589	3126	}
3590	3127
3591	3128	/**
		@@ -3611,15 +3148,13 @@
3611	3148
3612	3149	check_ajax_referer( 'frm_ajax', 'nonce' );
3613	3150
3614	3151	$type = FrmAppHelper::get_post_param( 'type', '', 'sanitize_text_field' );
3615		-
3616	3152	if ( ! $type \|\| ! in_array( $type, array( 'form', 'view' ), true ) ) {
3617	3153	die( 0 );
3618	3154	}
3619	3155
3620	3156	$object_id = FrmAppHelper::get_post_param( 'object_id', '', 'absint' );
3621		-
3622	3157	if ( ! $object_id ) {
3623	3158	die( 0 );
3624	3159	}
3625	3160
		@@ -3631,15 +3166,13 @@
3631	3166	$postarr['post_content'] = apply_filters( 'frm_create_page_with_' . $type . '_shortcode_content', '', $object_id );
3632	3167	}
3633	3168
3634	3169	$name = FrmAppHelper::get_post_param( 'name', '', 'sanitize_text_field' );
3635		-
3636	3170	if ( $name ) {
3637	3171	$postarr['post_title'] = $name;
3638	3172	}
3639	3173
3640	3174	$success = wp_insert_post( $postarr );
3641		-
3642	3175	if ( ! is_numeric( $success ) \|\| ! $success ) {
3643	3176	die( 0 );
3644	3177	}
3645	3178
		@@ -3653,9 +3186,8 @@
3653	3186	/**
3654	3187	* @since 5.3
3655	3188	*
3656	3189	* @param int $form_id
3657		- *
3658	3190	* @return string
3659	3191	*/
3660	3192	private static function get_page_shortcode_content_for_form( $form_id ) {
3661	3193	$shortcode = '[formidable id="' . $form_id . '"]';
		@@ -3675,9 +3207,9 @@
3675	3207	}
3676	3208
3677	3209	check_ajax_referer( 'frm_ajax', 'nonce' );
3678	3210
3679		- $html = FrmAppHelper::clip(
	3211	+ $html = FrmAppHelper::clip(
3680	3212	function () {
3681	3213	FrmAppHelper::maybe_autocomplete_pages_options(
3682	3214	array(
3683	3215	'field_name' => 'frm_page_dropdown',
		@@ -3686,12 +3218,13 @@
3686	3218	)
3687	3219	);
3688	3220	}
3689	3221	);
	3222	+ $post_type_object = get_post_type_object( 'page' );
3690	3223	wp_send_json(
3691	3224	array(
3692	3225	'html' => $html,
3693		- 'edit_page_url' => admin_url( sprintf( get_post_type_object( 'page' )->_edit_link . '&action=edit', 0 ) ),
	3226	+ 'edit_page_url' => admin_url( sprintf( $post_type_object->_edit_link . '&action=edit', 0 ) ),
3694	3227	)
3695	3228	);
3696	3229	}
3697	3230
		@@ -3696,14 +3229,20 @@
3696	3229	}
3697	3230
3698	3231	/**
3699	3232	* @deprecated 4.0
3700		- *
3701		- * @param array $values
3702		- *
3703		- * @return void
3704	3233	*/
3705	3234	public static function create( $values = array() ) {
3706	3235	_deprecated_function( __METHOD__, '4.0', 'FrmFormsController::update' );
3707	3236	self::update( $values );
	3237	+ }
	3238	+
	3239	+ /**
	3240	+ * @deprecated 6.7
	3241	+ *
	3242	+ * @return bool
	3243	+ */
	3244	+ public static function expired() {
	3245	+ _deprecated_function( __METHOD__, '6.7' );
	3246	+ return FrmAddonsController::is_license_expired();
3708	3247	}
3709	3248	}