← All changes | classes/controllers/FrmFormsController.php +167 -584 6.27 → 6.16.3 View file →

		@@ -26,13 +26,11 @@
26	26	private static $formidable_tinymce_button;
27	27
28	28	public static function menu() {
29	29	$menu_label = __( 'Forms', 'formidable' );
30		-
31	30	if ( ! FrmAppHelper::pro_is_installed() ) {
32	31	$menu_label .= ' (Lite)';
33	32	}
34		-
35	33	add_submenu_page( 'formidable', 'Formidable | ' . $menu_label, $menu_label, 'frm_view_forms', 'formidable', 'FrmFormsController::route' );
36	34
37	35	self::maybe_load_listing_hooks();
38	36	}
		@@ -66,12 +64,12 @@
66	64	*/
67	65	public static function logic_tip() {
68	66	$images_url = FrmAppHelper::plugin_url() . '/images/';
69	67	$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
	68	+ $data_message .= ' <img src="' . esc_url( $images_url ) . '/survey-logic.png" srcset="' . esc_url( $images_url ) . 'survey-logic@2x.png 2x" alt="' . esc_attr__( 'Conditional Logic options', 'formidable' ) . '"/>';
	69	+ echo '<a href="javascript:void(0)" class="frm_noallow frm_show_upgrade frm_add_logic_link frm-collapsed frm-flex-justify" data-upgrade="' . esc_attr__( 'Conditional Logic options', 'formidable' ) . '" data-message="' . esc_attr( $data_message ) . '" data-medium="builder" data-content="logic">';
72	70	esc_html_e( 'Conditional Logic', 'formidable' );
73		- FrmAppHelper::icon_by_class( 'frmfont frm_arrowdown8_icon', array( 'aria-hidden' => 'true' ) );
	71	+ FrmAppHelper::icon_by_class( 'frmfont frm_arrowdown6_icon', array( 'aria-hidden' => 'true' ) );
74	72	echo '</a>';
75	73	}
76	74
77	75	/**
		@@ -78,15 +76,12 @@
78	76	* By default, Divi processes form shortcodes on the edit post page.
79	77	* Now that won't do.
80	78	*
81	79	* @since 3.01
82		- *
83		- * @param array $shortcodes List of shortcodes to process.
84		- *
85		- * @return array
86	80	*/
87	81	public static function prevent_divi_conflict( $shortcodes ) {
88	82	$shortcodes[] = 'formidable';
	83	+
89	84	return $shortcodes;
90	85	}
91	86
92	87	/**
		@@ -97,14 +92,12 @@
97	92
98	93	$message = '';
99	94	$params = FrmForm::list_page_params();
100	95	$errors = self::process_bulk_form_actions( array() );
101		-
102	96	if ( isset( $errors['message'] ) ) {
103	97	$message = $errors['message'];
104	98	unset( $errors['message'] );
105	99	}
106		-
107	100	$errors = apply_filters( 'frm_admin_list_form_action', $errors );
108	101
109	102	self::display_forms_list( $params, $message, $errors );
110	103	}
		@@ -114,18 +107,11 @@
114	107	*
115	108	* @since 2.02.11
116	109	*
117	110	* @param int|object $form
118		- *
119		- * @return void
120	111	*/
121	112	private static function create_default_email_action( $form ) {
122	113	FrmForm::maybe_get_form( $form );
123		-
124		- if ( ! is_object( $form ) ) {
125		- return;
126		- }
127		-
128	114	$create_email = apply_filters( 'frm_create_default_email_action', true, $form );
129	115
130	116	if ( $create_email ) {
131	117	/**
		@@ -141,18 +127,12 @@
141	127	*
142	128	* @since 6.0.0
143	129	*
144	130	* @param int|object $form Form object or ID.
145		- *
146		- * @return void
147	131	*/
148	132	private static function create_default_on_submit_action( $form ) {
149	133	FrmForm::maybe_get_form( $form );
150	134
151		- if ( ! is_object( $form ) ) {
152		- return;
153		- }
154		-
155	135	/**
156	136	* Enable or disable the default On Submit action.
157	137	*
158	138	* @since 6.0.0
		@@ -176,18 +156,12 @@
176	156	*
177	157	* @since 6.9
178	158	*
179	159	* @param int|object $form Form ID or object.
180		- *
181		- * @return void
182	160	*/
183	161	private static function create_submit_button_field( $form ) {
184	162	FrmForm::maybe_get_form( $form );
185	163
186		- if ( ! is_object( $form ) ) {
187		- return;
188		- }
189		-
190	164	if ( FrmSubmitHelper::get_submit_field( $form->id ) ) {
191	165	// Do not create submit button field if it exists.
192	166	return;
193	167	}
		@@ -206,10 +180,8 @@
206	180	);
207	181	}
208	182
209	183	/**
210		- * @param array|false $values
211		- *
212	184	* @return void
213	185	*/
214	186	public static function edit( $values = false ) {
215	187	FrmAppHelper::permission_check( 'frm_edit_forms' );
		@@ -221,9 +193,8 @@
221	193
222	194	/**
223	195	* @param mixed $id
224	196	* @param string $message
225		- *
226	197	* @return void
227	198	*/
228	199	public static function settings( $id = false, $message = '' ) {
229	200	FrmAppHelper::permission_check( 'frm_edit_forms' );
		@@ -251,9 +222,10 @@
251	222	FrmAppController::show_error_modal( $error_args );
252	223	return;
253	224	}
254	225
255		- $id = FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
	226	+ $id = FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
	227	+
256	228	$errors = FrmForm::validate( $_POST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
257	229	$warnings = FrmFormsHelper::check_for_warnings( $_POST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
258	230
259	231	if ( count( $errors ) > 0 ) {
		@@ -267,9 +239,8 @@
267	239
268	240	FrmForm::update( $id, $_POST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
269	241
270	242	$antispam_is_on = ! empty( $_POST['options']['antispam'] ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
271		-
272	243	if ( $antispam_is_on !== $antispam_was_on ) {
273	244	FrmAntiSpam::clear_caches();
274	245	}
275	246
		@@ -279,9 +250,8 @@
279	250	}
280	251
281	252	/**
282	253	* @param int $form_id
283		- *
284	254	* @return bool
285	255	*/
286	256	private static function antispam_was_on( $form_id ) {
287	257	$form = FrmForm::getOne( $form_id );
		@@ -288,14 +258,12 @@
288	258	return ! empty( $form->options['antispam'] );
289	259	}
290	260
291	261	/**
292		- * @param array $values
293		- *
294	262	* @return void
295	263	*/
296	264	public static function update( $values = array() ) {
297		- if ( ! $values ) {
	265	+ if ( empty( $values ) ) {
298	266	$values = $_POST; // phpcs:ignore WordPress.Security.NonceVerification.Missing
299	267	}
300	268
301	269	// Set radio button and checkbox meta equal to "other" value.
		@@ -304,9 +272,8 @@
304	272	}
305	273
306	274	$errors = FrmForm::validate( $values );
307	275	$permission_error = FrmAppHelper::permission_nonce_error( 'frm_edit_forms', 'frm_save_form', 'frm_save_form_nonce' );
308		-
309	276	if ( $permission_error !== false ) {
310	277	$errors['form'] = $permission_error;
311	278	}
312	279
		@@ -325,9 +292,9 @@
325	292	if ( self::is_too_long( $values ) ) {
326	293	$message .= '<br/> ' . sprintf(
327	294	/* translators: %1$s: Start link HTML, %2$s: end link HTML */
328	295	__( 'However, your form is very long and may be %1$sreaching server limits%2$s.', 'formidable' ),
329		- '<a href="' . esc_url( self::get_form_too_long_docs_url() ) . '" target="_blank" rel="noopener">',
	296	+ '<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">',
330	297	'</a>'
331	298	);
332	299	}
333	300
		@@ -338,32 +305,17 @@
338	305	self::get_edit_vars( $id, array(), $message );
339	306	}
340	307
341	308	/**
342		- * @since 6.25.1
343		- *
344		- * @return string
345		- */
346		- private static function get_form_too_long_docs_url() {
347		- $utm = array(
348		- 'campaign' => 'builder',
349		- 'content' => 'form-too-long',
350		- );
351		- return FrmAppHelper::admin_upgrade_link( $utm, 'knowledgebase/i-have-a-long-form-why-did-the-options-at-the-end-of-the-form-stop-saving/' );
352		- }
353		-
354		- /**
355	309	* Remove the draft flag from any new fields from this current session.
356	310	*
357	311	* @since 6.8
358	312	*
359	313	* @param int $form_id
360		- *
361	314	* @return void
362	315	*/
363	316	private static function maybe_remove_draft_option_from_fields( $form_id ) {
364	317	$draft_field_ids_csv = FrmAppHelper::get_post_param( 'draft_fields', '', 'sanitize_text_field' );
365		-
366	318	if ( ! $draft_field_ids_csv ) {
367	319	// If the draft_fields input is empty there are no new fields in the session.
368	320	return;
369	321	}
		@@ -368,9 +320,8 @@
368	320	return;
369	321	}
370	322
371	323	$draft_field_ids = array_filter( explode( ',', $draft_field_ids_csv ), 'is_numeric' );
372		-
373	324	if ( ! $draft_field_ids ) {
374	325	// Exit early if the draft fields input is invalid. It should be a CSV of integer values.
375	326	return;
376	327	}
		@@ -375,9 +326,8 @@
375	326	return;
376	327	}
377	328
378	329	$draft_field_rows = FrmFieldsHelper::get_draft_field_results( $form_id, $draft_field_ids );
379		-
380	330	foreach ( $draft_field_rows as $row ) {
381	331	$row->field_options['draft'] = 0;
382	332	FrmField::update( $row->id, array( 'field_options' => $row->field_options ) );
383	333	}
		@@ -389,10 +339,8 @@
389	339	* were likely not saved either.
390	340	*
391	341	* @since 3.06.01
392	342	*
393		- * @param array $values
394		- *
395	343	* @return bool
396	344	*/
397	345	private static function is_too_long( $values ) {
398	346	return empty( $values['frm_end'] );
		@@ -428,17 +376,13 @@
428	376	* @return string|null
429	377	*/
430	378	public static function page_preview() {
431	379	$params = FrmForm::list_page_params();
432		-
433		- if ( ! $params['form'] || is_numeric( $params['form'] ) ) {
	380	+ if ( ! $params['form'] ) {
434	381	return null;
435	382	}
436	383
437		- self::maybe_block_preview( $params['form'] );
438		-
439	384	$form = FrmForm::getOne( $params['form'] );
440		-
441	385	if ( ! $form ) {
442	386	return null;
443	387	}
444	388
		@@ -450,19 +394,9 @@
450	394	*
451	395	* @return void
452	396	*/
453	397	public static function show_page_preview() {
454		- $preview = self::page_preview();
455		-
456		- if ( is_null( $preview ) ) {
457		- wp_die(
458		- '<h1>' . esc_html__( 'Form key is invalid', 'formidable' ) . '</h1>',
459		- '<p>' . esc_html__( 'Form key is invalid', 'formidable' ) . '</p>',
460		- 404
461		- );
462		- }
463		-
464		- echo $preview; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
	398	+ echo self::page_preview(); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
465	399	}
466	400
467	401	/**
468	402	* @return void
		@@ -473,19 +407,9 @@
473	407
474	408	global $frm_vars;
475	409	$frm_vars['preview'] = true;
476	410
477		- // print_emoji_styles is deprecated.
478		- remove_action( 'wp_print_styles', 'print_emoji_styles' );
479		-
480		- if ( FrmTestModeController::should_add_test_mode_container() ) {
481		- do_action( 'frm_test_mode_init' );
482		- add_action( 'wp_enqueue_scripts', 'FrmTestModeController::register_and_enqueue_required_scripts' );
483		- add_filter( 'frm_filter_final_form', 'FrmTestModeController::maybe_add_test_mode_container', 99 );
484		- }
485		-
486	411	$include_theme = FrmAppHelper::get_param( 'theme', '', 'get', 'absint' );
487		-
488	412	if ( $include_theme ) {
489	413	self::set_preview_query();
490	414	self::load_theme_preview();
491	415	} else {
		@@ -508,9 +432,8 @@
508	432	'post_type' => 'page',
509	433	);
510	434
511	435	$page_for_posts = get_option( 'page_for_posts' );
512		-
513	436	if ( is_numeric( $page_for_posts ) ) {
514	437	// Avoid querying for the "Posts Page" or "Blog Page" so we don't display 10 forms.
515	438	$page_query['post__not_in'] = array( $page_for_posts );
516	439	}
		@@ -515,15 +438,13 @@
515	438	$page_query['post__not_in'] = array( $page_for_posts );
516	439	}
517	440
518	441	$random_page = get_posts( $page_query );
519		-
520	442	if ( ! $random_page ) {
521	443	return;
522	444	}
523	445
524	446	$random_page = reset( $random_page );
525		-
526	447	if ( ! is_a( $random_page, 'WP_Post' ) ) {
527	448	// The return type can also be int.
528	449	return;
529	450	}
		@@ -545,9 +466,8 @@
545	466	*
546	467	* @since 5.5.2
547	468	*
548	469	* @param WP_Post $page The page object.
549		- *
550	470	* @return void
551	471	*/
552	472	private static function set_post_global( $page ) {
553	473	global $post;
		@@ -580,9 +500,8 @@
580	500	*
581	501	* @since 6.5.2
582	502	*
583	503	* @param array $classes The body classes list.
584		- *
585	504	* @return array
586	505	*/
587	506	public static function preview_block_theme_body_classnames( $classes ) {
588	507	$classes[] = 'has-global-padding';
		@@ -606,12 +525,8 @@
606	525	echo '<div class="container entry-content">';
607	526	the_content();
608	527	echo '</div>';
609	528
610		- // Prevent extra unexpected forms in the footer.
611		- // For some reason this happens in the Twenty Twenty Five theme.
612		- add_filter( 'frm_filter_final_form', '__return_empty_string' );
613		-
614	529	self::get_template( 'footer' );
615	530	}
616	531	}
617	532
		@@ -619,11 +534,9 @@
619	534	* Calls core function to get a template part if it doesn't cause deprecation warnings. Otherwise skips the deprecation function call
620	535	* and renders required html fragments calling required functions.
621	536	*
622	537	* @since 6.7.1
623		- *
624	538	* @param string $template
625		- *
626	539	* @return void
627	540	*/
628	541	private static function get_template( $template ) {
629	542	if ( self::should_try_getting_template( $template ) ) {
		@@ -644,11 +557,9 @@
644	557	/**
645	558	* Returns true if calling a template function doesn't trigger deprecation warnings.
646	559	*
647	560	* @since 6.7.1
648		- *
649	561	* @param string $template
650		- *
651	562	* @return bool
652	563	*/
653	564	private static function should_try_getting_template( $template ) {
654	565	$stylesheet_path = get_stylesheet_directory();
		@@ -662,12 +573,8 @@
662	573	/**
663	574	* Set the page title for the theme preview page
664	575	*
665	576	* @since 3.0
666		- *
667		- * @param string $title
668		- *
669		- * @return string
670	577	*/
671	578	public static function preview_page_title( $title ) {
672	579	if ( in_the_loop() ) {
673	580	$title = self::preview_title( $title );
		@@ -681,9 +588,8 @@
681	588	*
682	589	* @since 3.0
683	590	*
684	591	* @param string $title
685		- *
686	592	* @return string
687	593	*/
688	594	public static function preview_title( $title ) {
689	595	return __( 'Form Preview', 'formidable' );
		@@ -694,9 +600,8 @@
694	600	*
695	601	* @since 3.0
696	602	*
697	603	* @param string $content
698		- *
699	604	* @return string
700	605	*/
701	606	public static function preview_content( $content ) {
702	607	if ( in_the_loop() ) {
		@@ -711,39 +616,23 @@
711	616	/**
712	617	* @since 3.0
713	618	*/
714	619	private static function load_direct_preview() {
	620	+ header( 'Content-Type: text/html; charset=' . get_option( 'blog_charset' ) );
	621	+
	622	+ // print_emoji_styles is deprecated.
	623	+ remove_action( 'wp_print_styles', 'print_emoji_styles' );
	624	+
715	625	$key = FrmAppHelper::simple_get( 'form', 'sanitize_title' );
716		-
717		- // phpcs:ignore Universal.Operators.StrictComparisons
718	626	if ( $key == '' ) {
719	627	$key = FrmAppHelper::get_post_param( 'form', '', 'sanitize_title' );
720	628	}
721	629
722		- if ( ! $key ) {
723		- $error = __( 'Form key is missing', 'formidable' );
724		- wp_die(
725		- '<h1>' . esc_html( $error ) . '</h1>',
726		- '<p>' . esc_html( $error ) . '</p>',
727		- 404
728		- );
729		- }
730		-
731		- self::maybe_block_preview( $key );
732		-
733	630	$form = FrmForm::getAll( array( 'form_key' => $key ), '', 1 );
734		-
735		- if ( ! $form ) {
736		- $error = __( 'Form does not exist', 'formidable' );
737		- wp_die(
738		- '<h1>' . esc_html( $error ) . '</h1>',
739		- '<p>' . esc_html( $error ) . '</p>',
740		- 404
741		- );
	631	+ if ( empty( $form ) ) {
	632	+ $form = FrmForm::getAll( array(), '', 1 );
742	633	}
743	634
744		- header( 'Content-Type: text/html; charset=' . get_option( 'blog_charset' ) );
745		-
746	635	self::fix_deprecated_null_param_warning();
747	636
748	637	require FrmAppHelper::plugin_path() . '/classes/views/frm-entries/direct.php';
749	638	}
		@@ -748,31 +637,8 @@
748	637	require FrmAppHelper::plugin_path() . '/classes/views/frm-entries/direct.php';
749	638	}
750	639
751	640	/**
752		- * Block the form preview for the contact form by default if the user cannot view forms.
753		- * This is to prevent the contact form being exploited.
754		- * Since this form is added by default and every site uses the same key, it is too easy
755		- * to guess this form.
756		- *
757		- * @since 6.20
758		- *
759		- * @param string $form_key Form key.
760		- *
761		- * @return void
762		- */
763		- public static function maybe_block_preview( $form_key ) {
764		- if ( FrmFormsHelper::should_block_preview( $form_key ) ) {
765		- $error = __( 'You do not have permission to view this form', 'formidable' );
766		- wp_die(
767		- '<h1>' . esc_html( $error ) . '</h1>',
768		- '<p>' . esc_html( $error ) . '</p>',
769		- 403
770		- );
771		- }
772		- }
773		-
774		- /**
775	641	* Some themes have a null $src value.
776	642	* This function adds a filter to ensure that $src is not null.
777	643	* WP will call str_starts_with with the null value triggering a deprecated message otherwise.
778	644	*
		@@ -784,9 +650,8 @@
784	650	add_filter(
785	651	'script_loader_src',
786	652	/**
787	653	* @param string|null $src
788		- *
789	654	* @return string
790	655	*/
791	656	function ( $src ) {
792	657	if ( is_null( $src ) ) {
		@@ -802,9 +667,8 @@
802	667	}
803	668
804	669	/**
805	670	* @param array $ids
806		- *
807	671	* @return string
808	672	*/
809	673	public static function bulk_untrash( $ids ) {
810	674	FrmAppHelper::permission_check( 'frm_edit_forms' );
		@@ -816,9 +680,11 @@
816	680	return '';
817	681	}
818	682
819	683	/* translators: %1$s: Number of forms */
820		- return sprintf( _n( '%1$s form restored from the Trash.', '%1$s forms restored from the Trash.', $count, 'formidable' ), $count );
	684	+ $message = sprintf( _n( '%1$s form restored from the Trash.', '%1$s forms restored from the Trash.', $count, 'formidable' ), $count );
	685	+
	686	+ return $message;
821	687	}
822	688
823	689	/**
824	690	* @since 3.06
		@@ -863,9 +729,8 @@
863	729	// Check nonce url.
864	730	check_admin_referer( $status . '_form_' . $params['id'] );
865	731
866	732	$count = 0;
867		-
868	733	if ( FrmForm::set_status( $params['id'], $available_status[ $status ]['new_status'] ) ) {
869	734	++$count;
870	735	}
871	736
		@@ -879,9 +744,9 @@
879	744	/* translators: %1$s: Number of forms */
880	745	$available_status['untrash']['message'] = sprintf( _n( '%1$s form restored from the Trash.', '%1$s forms restored from the Trash.', $count, 'formidable' ), $count );
881	746
882	747	/* translators: %1$s: Number of forms, %2$s: Start link HTML, %3$s: End link HTML */
883		- $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
	748	+ $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>' );
884	749
885	750	$message = $available_status[ $status ]['message'];
886	751
887	752	self::display_forms_list( $params, $message );
		@@ -888,9 +753,8 @@
888	753	}
889	754
890	755	/**
891	756	* @param array $ids
892		- *
893	757	* @return string
894	758	*/
895	759	public static function bulk_trash( $ids ) {
896	760	FrmAppHelper::permission_check( 'frm_delete_forms' );
		@@ -895,9 +759,8 @@
895	759	public static function bulk_trash( $ids ) {
896	760	FrmAppHelper::permission_check( 'frm_delete_forms' );
897	761
898	762	$count = 0;
899		-
900	763	foreach ( $ids as $id ) {
901	764	if ( FrmForm::trash( $id ) ) {
902	765	++$count;
903	766	}
		@@ -912,16 +775,17 @@
912	775	'param' => 'form_type',
913	776	'type' => 'request',
914	777	)
915	778	);
916		-
917		- return sprintf(
	779	+ $message = sprintf(
918	780	/* translators: %1$s: Number of forms, %2$s: Start link HTML, %3$s: End link HTML */
919	781	_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' ),
920	782	$count,
921		- '<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
	783	+ '<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' ) ) . '">',
922	784	'</a>'
923	785	);
	786	+
	787	+ return $message;
924	788	}
925	789
926	790	public static function destroy() {
927	791	FrmAppHelper::permission_check( 'frm_delete_forms' );
		@@ -931,9 +795,8 @@
931	795	// Check nonce url.
932	796	check_admin_referer( 'destroy_form_' . $params['id'] );
933	797
934	798	$count = 0;
935		-
936	799	if ( FrmForm::destroy( $params['id'] ) ) {
937	800	++$count;
938	801	}
939	802
		@@ -944,9 +807,8 @@
944	807	}
945	808
946	809	/**
947	810	* @param array $ids
948		- *
949	811	* @return string
950	812	*/
951	813	public static function bulk_destroy( $ids ) {
952	814	FrmAppHelper::permission_check( 'frm_delete_forms' );
		@@ -951,12 +813,10 @@
951	813	public static function bulk_destroy( $ids ) {
952	814	FrmAppHelper::permission_check( 'frm_delete_forms' );
953	815
954	816	$count = 0;
955		-
956	817	foreach ( $ids as $id ) {
957	818	$d = FrmForm::destroy( $id );
958		-
959	819	if ( $d ) {
960	820	++$count;
961	821	}
962	822	}
		@@ -974,18 +834,19 @@
974	834	*/
975	835	public static function delete_all() {
976	836	// Check nonce url.
977	837	$permission_error = FrmAppHelper::permission_nonce_error( 'frm_delete_forms', '_wpnonce', 'bulk-toplevel_page_formidable' );
978		-
979	838	if ( $permission_error !== false ) {
980	839	self::display_forms_list( array(), '', array( $permission_error ) );
	840	+
981	841	return;
982	842	}
983	843
984	844	$count = FrmForm::scheduled_delete( time() );
985	845	$url = remove_query_arg( array( 'delete_all' ) );
986		- $url .= '&message=forms_permanently_deleted&forms_deleted=' . $count;
987	846
	847	+ $url .= '&message=forms_permanently_deleted&forms_deleted=' . $count;
	848	+
988	849	wp_safe_redirect( $url );
989	850	die();
990	851	}
991	852
		@@ -1068,9 +929,9 @@
1068	929	if ( ! isset( self::$formidable_tinymce_button ) ) {
1069	930	FrmAppHelper::load_admin_wide_js();
1070	931	$menu_name = FrmAppHelper::get_menu_name();
1071	932	$icon = apply_filters( 'frm_media_icon', FrmAppHelper::svg_logo() );
1072		- self::$formidable_tinymce_button = '<a href="#TB_inline?width=50&height=50&inlineId=frm_insert_form" class="thickbox button add_media frm_insert_form" title="' . esc_attr__( 'Add forms and content', 'formidable' ) . '">' . FrmAppHelper::kses( $icon, 'all' ) . ' ' . esc_html( $menu_name ) . '</a>'; // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong
	933	+ self::$formidable_tinymce_button = '<a href="#TB_inline?width=50&height=50&inlineId=frm_insert_form" class="thickbox button add_media frm_insert_form" title="' . esc_attr__( 'Add forms and content', 'formidable' ) . '">' . FrmAppHelper::kses( $icon, 'all' ) . ' ' . esc_html( $menu_name ) . '</a>';
1073	934	}
1074	935	echo self::$formidable_tinymce_button; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
1075	936	}
1076	937	}
		@@ -1116,9 +977,8 @@
1116	977	private static function should_insert_form_popup() {
1117	978	if ( FrmAppHelper::is_form_builder_page() ) {
1118	979	return true;
1119	980	}
1120		-
1121	981	$page = basename( FrmAppHelper::get_server_value( 'PHP_SELF' ) );
1122	982	return in_array( $page, array( 'post.php', 'page.php', 'page-new.php', 'post-new.php' ), true );
1123	983	}
1124	984
		@@ -1126,10 +986,9 @@
1126	986	FrmAppHelper::permission_check( 'frm_view_forms' );
1127	987	check_ajax_referer( 'frm_ajax', 'nonce' );
1128	988
1129	989	$shortcode = FrmAppHelper::get_post_param( 'shortcode', '', 'sanitize_text_field' );
1130		-
1131		- if ( ! $shortcode ) {
	990	+ if ( empty( $shortcode ) ) {
1132	991	wp_die();
1133	992	}
1134	993
1135	994	echo '<div id="sc-opts-' . esc_attr( $shortcode ) . '" class="frm_shortcode_option">';
		@@ -1154,9 +1013,8 @@
1154	1013	'label' => __( 'Minimize form HTML', 'formidable' ),
1155	1014	),
1156	1015	);
1157	1016	}
1158		-
1159	1017	$opts = apply_filters( 'frm_sc_popup_opts', $opts, $shortcode );
1160	1018
1161	1019	if ( isset( $opts['form_id'] ) && is_string( $opts['form_id'] ) ) {
1162	1020	// allow other shortcodes to use the required form id option
		@@ -1176,9 +1034,8 @@
1176	1034	*
1177	1035	* @param array $params
1178	1036	* @param string $message
1179	1037	* @param array $errors
1180		- *
1181	1038	* @return void
1182	1039	*/
1183	1040	public static function display_forms_list( $params = array(), $message = '', $errors = array() ) {
1184	1041	FrmAppHelper::permission_check( 'frm_view_forms' );
		@@ -1195,44 +1052,33 @@
1195	1052	* @param string $table_class Class name for List Helper.
1196	1053	*/
1197	1054	$table_class = apply_filters( 'frm_forms_list_class', 'FrmFormsListHelper' );
1198	1055	$wp_list_table = new $table_class( compact( 'params' ) );
1199		- $pagenum = $wp_list_table->get_pagenum();
1200	1056
	1057	+ $pagenum = $wp_list_table->get_pagenum();
	1058	+
1201	1059	$wp_list_table->prepare_items();
1202	1060
1203	1061	$total_pages = $wp_list_table->get_pagination_arg( 'total_pages' );
1204		-
1205	1062	if ( $pagenum > $total_pages && $total_pages > 0 ) {
1206	1063	wp_redirect( esc_url_raw( add_query_arg( 'paged', $total_pages ) ) );
1207	1064	die();
1208	1065	}
1209	1066
1210		- $error = FrmInbox::check_for_error();
1211		-
1212		- if ( $error ) {
1213		- $show_messages = array( $error['subject'] . '. ' . $error['message'] );
1214		- }
1215		-
1216	1067	require FrmAppHelper::plugin_path() . '/classes/views/frm-forms/list.php';
1217	1068	}
1218	1069
1219	1070	/**
1220	1071	* @param array<string,string> $columns
1221		- *
1222	1072	* @return array<string,string>
1223	1073	*/
1224	1074	public static function get_columns( $columns ) {
1225		- $columns['cb'] = '<input type="checkbox" />';
1226		- $columns['name'] = esc_html__( 'Form Title', 'formidable' );
1227		- $columns['entries'] = esc_html__( 'Entries', 'formidable' );
1228		- $columns['id'] = 'ID';
1229		- $columns['form_key'] = esc_html__( 'Key', 'formidable' );
1230		-
1231		- if ( 'trash' !== FrmAppHelper::simple_get( 'form_type' ) ) {
1232		- $columns['shortcode'] = esc_html__( 'Actions', 'formidable' );
1233		- }
1234		-
	1075	+ $columns['cb'] = '<input type="checkbox" />';
	1076	+ $columns['name'] = esc_html__( 'Form Title', 'formidable' );
	1077	+ $columns['entries'] = esc_html__( 'Entries', 'formidable' );
	1078	+ $columns['id'] = 'ID';
	1079	+ $columns['form_key'] = esc_html__( 'Key', 'formidable' );
	1080	+ $columns['shortcode'] = esc_html__( 'Actions', 'formidable' );
1235	1081	$columns['created_at'] = esc_html__( 'Date', 'formidable' );
1236	1082
1237	1083	add_screen_option(
1238	1084	'per_page',
		@@ -1260,9 +1106,8 @@
1260	1106	}
1261	1107
1262	1108	/**
1263	1109	* @param mixed $hidden_columns
1264		- *
1265	1110	* @return array
1266	1111	*/
1267	1112	public static function hidden_columns( $hidden_columns ) {
1268	1113	if ( ! is_array( $hidden_columns ) ) {
		@@ -1283,15 +1128,8 @@
1283	1128
1284	1129	return $hidden_columns;
1285	1130	}
1286	1131
1287		- /**
1288		- * @param mixed $save
1289		- * @param string $option
1290		- * @param int|string $value
1291		- *
1292		- * @return mixed
1293		- */
1294	1132	public static function save_per_page( $save, $option, $value ) {
1295	1133	if ( $option === 'formidable_page_formidable_per_page' ) {
1296	1134	$save = (int) $value;
1297	1135	}
		@@ -1303,9 +1141,8 @@
1303	1141	* @param int|string $id
1304	1142	* @param array $errors
1305	1143	* @param string $message
1306	1144	* @param bool $create_link
1307		- *
1308	1145	* @return void
1309	1146	*/
1310	1147	private static function get_edit_vars( $id, $errors = array(), $message = '', $create_link = false ) {
1311	1148	global $frm_vars;
		@@ -1320,9 +1157,8 @@
1320	1157	'page' => 'formidable',
1321	1158	)
1322	1159	),
1323	1160	);
1324		-
1325	1161	if ( ! $form ) {
1326	1162	FrmAppController::show_error_modal( $error_args );
1327	1163	return;
1328	1164	}
		@@ -1344,14 +1180,15 @@
1344	1180	}
1345	1181
1346	1182	if ( $form->parent_form_id ) {
1347	1183	/* translators: %1$s: Start link HTML, %2$s: End link HTML */
1348		- 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
	1184	+ 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>' ) );
1349	1185	}
1350	1186
1351	1187	$frm_field_selection = FrmField::field_selection();
1352		- $fields = FrmField::get_all_for_form( $form->id );
1353	1188
	1189	+ $fields = FrmField::get_all_for_form( $form->id );
	1190	+
1354	1191	// Automatically add end section fields if they don't exist (2.0 migration).
1355	1192	$reset_fields = false;
1356	1193	FrmFormsHelper::auto_add_end_section_fields( $form, $fields, $reset_fields );
1357	1194	FrmSubmitHelper::maybe_create_submit_field( $form, $fields, $reset_fields );
		@@ -1375,10 +1212,9 @@
1375	1212	*/
1376	1213	$values['fields'] = apply_filters( 'frm_fields_in_form_builder', $fields, compact( 'form' ) );
1377	1214
1378	1215	$edit_message = __( 'Form was successfully updated.', 'formidable' );
1379		-
1380		- if ( $form->is_template && $message === $edit_message ) {
	1216	+ if ( $form->is_template && $message == $edit_message ) {
1381	1217	$message = __( 'Template was successfully updated.', 'formidable' );
1382	1218	}
1383	1219
1384	1220	self::maybe_update_form_builder_message( $message );
		@@ -1393,12 +1229,11 @@
1393	1229	}
1394	1230
1395	1231	/**
1396	1232	* @param array $fields
1397		- *
1398	1233	* @return array
1399	1234	*/
1400		- public static function update_form_builder_fields( $fields ) {
	1235	+ public static function update_form_builder_fields( $fields, $form ) {
1401	1236	foreach ( $fields as $field ) {
1402	1237	$field->do_not_include_icons = true;
1403	1238	}
1404	1239	return $fields;
		@@ -1403,13 +1238,8 @@
1403	1238	}
1404	1239	return $fields;
1405	1240	}
1406	1241
1407		- /**
1408		- * @param string $message
1409		- *
1410		- * @return void
1411		- */
1412	1242	public static function maybe_update_form_builder_message( &$message ) {
1413	1243	if ( 'form_duplicated' === FrmAppHelper::simple_get( 'message' ) ) {
1414	1244	$message = __( 'Form was Successfully Copied', 'formidable' );
1415	1245	}
		@@ -1418,9 +1248,8 @@
1418	1248	/**
1419	1249	* @param int|string $id
1420	1250	* @param array $errors
1421	1251	* @param array|string $args
1422		- *
1423	1252	* @return void
1424	1253	*/
1425	1254	public static function get_settings_vars( $id, $errors = array(), $args = array() ) {
1426	1255	FrmAppHelper::permission_check( 'frm_edit_forms' );
		@@ -1442,12 +1271,13 @@
1442	1271	);
1443	1272	$args = array_merge( $defaults, $args );
1444	1273	$message = $args['message'];
1445	1274	$warnings = $args['warnings'];
1446		- $form = FrmForm::getOne( $id );
1447		- $fields = FrmField::get_all_for_form( $id );
1448		- $values = FrmAppHelper::setup_edit_vars( $form, 'forms', $fields, true );
1449	1275
	1276	+ $form = FrmForm::getOne( $id );
	1277	+ $fields = FrmField::get_all_for_form( $id );
	1278	+ $values = FrmAppHelper::setup_edit_vars( $form, 'forms', $fields, true );
	1279	+
1450	1280	/**
1451	1281	* Allows changing fields in the form settings.
1452	1282	*
1453	1283	* @since 5.0.04
		@@ -1487,12 +1317,8 @@
1487	1317	}
1488	1318
1489	1319	/**
1490	1320	* @since 4.0
1491		- *
1492		- * @param array $atts
1493		- *
1494		- * @return void
1495	1321	*/
1496	1322	public static function form_publish_button( $atts ) {
1497	1323	$values = $atts['values'];
1498	1324	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/_publish_box.php';
		@@ -1503,9 +1329,8 @@
1503	1329	*
1504	1330	* @since 4.0
1505	1331	*
1506	1332	* @param array $values
1507		- *
1508	1333	* @return array
1509	1334	*/
1510	1335	private static function get_settings_tabs( $values ) {
1511	1336	$sections = array(
		@@ -1511,20 +1336,20 @@
1511	1336	$sections = array(
1512	1337	'advanced' => array(
1513	1338	'name' => __( 'General', 'formidable' ),
1514	1339	'title' => __( 'General Form Settings', 'formidable' ),
1515		- 'function' => array( self::class, 'advanced_settings' ),
1516		- 'icon' => 'frmfont frm_settings_icon',
	1340	+ 'function' => array( __CLASS__, 'advanced_settings' ),
	1341	+ 'icon' => 'frm_icon_font frm_settings_icon',
1517	1342	),
1518	1343	'email' => array(
1519	1344	'name' => __( 'Actions & Notifications', 'formidable' ),
1520	1345	'function' => array( 'FrmFormActionsController', 'email_settings' ),
1521	1346	'id' => 'frm_notification_settings',
1522		- 'icon' => 'frmfont frm_mail_bulk_icon',
	1347	+ 'icon' => 'frm_icon_font frm_mail_bulk_icon',
1523	1348	),
1524	1349	'permissions' => array(
1525	1350	'name' => __( 'Form Permissions', 'formidable' ),
1526		- 'icon' => 'frmfont frm_lock_closed_icon',
	1351	+ 'icon' => 'frm_icon_font frm_lock_closed_icon',
1527	1352	'html_class' => 'frm_show_upgrade_tab frm_noallow',
1528	1353	'data' => array(
1529	1354	'medium' => 'permissions',
1530	1355	'upgrade' => __( 'Form Permissions', 'formidable' ),
		@@ -1529,37 +1354,35 @@
1529	1354	'medium' => 'permissions',
1530	1355	'upgrade' => __( 'Form Permissions', 'formidable' ),
1531	1356	'message' => __( 'Allow editing, protect forms and files, limit entries, and save drafts. Upgrade to get form and entry permissions.', 'formidable' ),
1532	1357	'screenshot' => 'permissions.png',
1533		- 'learn-more' => FrmAppHelper::get_doc_url( 'general-form-settings/#kb-form-permissions', 'form-permissions-settings' ),
1534	1358	),
1535	1359	),
1536	1360	'scheduling' => array(
1537	1361	'name' => __( 'Form Scheduling', 'formidable' ),
1538		- 'icon' => 'frmfont frm_calendar_icon',
	1362	+ 'icon' => 'frm_icon_font frm_calendar_icon',
1539	1363	'html_class' => 'frm_show_upgrade_tab frm_noallow',
1540	1364	'data' => array(
1541	1365	'medium' => 'scheduling',
1542	1366	'upgrade' => __( 'Form scheduling settings', 'formidable' ),
1543	1367	'screenshot' => 'scheduling.png',
1544		- 'learn-more' => FrmAppHelper::get_doc_url( 'general-form-settings/#kb-form-scheduling', 'form-scheduling-settings' ),
1545	1368	),
1546	1369	),
1547	1370	'buttons' => array(
1548	1371	'name' => __( 'Buttons', 'formidable' ),
1549		- 'class' => self::class,
	1372	+ 'class' => __CLASS__,
1550	1373	'function' => 'buttons_settings',
1551		- 'icon' => 'frmfont frm_button_icon',
	1374	+ 'icon' => 'frm_icon_font frm_button_icon',
1552	1375	),
1553	1376	'landing' => array(
1554	1377	'name' => __( 'Form Landing Page', 'formidable' ),
1555		- 'icon' => 'frmfont frm_file_text_icon',
	1378	+ 'icon' => 'frm_icon_font frm_file_text_icon',
1556	1379	'html_class' => 'frm_show_upgrade_tab frm_noallow',
1557	1380	'data' => FrmAppHelper::get_landing_page_upgrade_data_params(),
1558	1381	),
1559	1382	'chat' => array(
1560	1383	'name' => __( 'Conversational Forms', 'formidable' ),
1561		- 'icon' => 'frmfont frm_chat_forms_icon',
	1384	+ 'icon' => 'frm_icon_font frm_chat_forms_icon',
1562	1385	'html_class' => 'frm_show_upgrade_tab frm_noallow',
1563	1386	'data' => FrmAppHelper::get_upgrade_data_params(
1564	1387	'chat',
1565	1388	array(
		@@ -1565,15 +1388,14 @@
1565	1388	array(
1566	1389	'upgrade' => __( 'Conversational Forms', 'formidable' ),
1567	1390	'message' => __( 'Ask one question at a time for automated conversations.', 'formidable' ),
1568	1391	'screenshot' => 'chat.png',
1569		- 'learn-more' => FrmAppHelper::get_doc_url( 'conversational-forms', 'conversational-forms-settings', false ),
1570	1392	)
1571	1393	),
1572	1394	),
1573	1395	'abandonment' => array(
1574	1396	'name' => __( 'Form Abandonment', 'formidable' ),
1575		- 'icon' => 'frmfont frm_abandoned_icon',
	1397	+ 'icon' => 'frm_icon_font frm_abandoned_icon',
1576	1398	'html_class' => 'frm_show_upgrade_tab frm_noallow',
1577	1399	'data' => FrmAppHelper::get_upgrade_data_params(
1578	1400	'abandonment',
1579	1401	array(
		@@ -1579,17 +1401,16 @@
1579	1401	array(
1580	1402	'upgrade' => __( 'Form abandonment settings', 'formidable' ),
1581	1403	'message' => __( 'Unlock the power of data capture to boost lead generation and master the art of form optimization.', 'formidable' ),
1582	1404	'screenshot' => 'abandonment.png',
1583		- 'learn-more' => FrmAppHelper::get_doc_url( 'features/form-abandonment-wordpress-plugin', 'form-abandonment-settings', false ),
1584	1405	)
1585	1406	),
1586	1407	),
1587	1408	'html' => array(
1588	1409	'name' => __( 'Customize HTML', 'formidable' ),
1589		- 'class' => self::class,
	1410	+ 'class' => __CLASS__,
1590	1411	'function' => 'html_settings',
1591		- 'icon' => 'frmfont frm_code_icon',
	1412	+ 'icon' => 'frm_icon_font frm_code_icon',
1592	1413	),
1593	1414	);
1594	1415
1595	1416	if ( ! has_action( 'frm_add_form_style_tab_options' ) && ! has_action( 'frm_add_form_button_options' ) ) {
		@@ -1595,8 +1416,14 @@
1595	1416	if ( ! has_action( 'frm_add_form_style_tab_options' ) && ! has_action( 'frm_add_form_button_options' ) ) {
1596	1417	unset( $sections['buttons'] );
1597	1418	}
1598	1419
	1420	+ foreach ( array( 'landing', 'chat', 'abandonment' ) as $feature ) {
	1421	+ if ( ! FrmAppHelper::show_new_feature( $feature ) ) {
	1422	+ unset( $sections[ $feature ] );
	1423	+ }
	1424	+ }
	1425	+
1599	1426	$sections = apply_filters( 'frm_add_form_settings_section', $sections, $values );
1600	1427
1601	1428	foreach ( $sections as $key => $section ) {
1602	1429	$defaults = array(
		@@ -1601,9 +1428,9 @@
1601	1428	foreach ( $sections as $key => $section ) {
1602	1429	$defaults = array(
1603	1430	'html_class' => '',
1604	1431	'name' => ucfirst( $key ),
1605		- 'icon' => 'frmfont frm_settings_icon',
	1432	+ 'icon' => 'frm_icon_font frm_settings_icon',
1606	1433	);
1607	1434
1608	1435	$section = array_merge( $defaults, $section );
1609	1436
		@@ -1609,9 +1436,8 @@
1609	1436
1610	1437	if ( ! isset( $section['anchor'] ) ) {
1611	1438	$section['anchor'] = $key;
1612	1439	}
1613		-
1614	1440	$section['anchor'] .= '_settings';
1615	1441
1616	1442	if ( ! isset( $section['title'] ) ) {
1617	1443	$section['title'] = $section['name'];
		@@ -1630,19 +1456,18 @@
1630	1456	/**
1631	1457	* @since 4.0
1632	1458	*
1633	1459	* @param array $values
1634		- *
1635	1460	* @return void
1636	1461	*/
1637	1462	public static function advanced_settings( $values ) {
1638	1463	$first_h3 = 'frm_first_h3';
	1464	+
1639	1465	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings-advanced.php';
1640	1466	}
1641	1467
1642	1468	/**
1643	1469	* @param array $values
1644		- *
1645	1470	* @return void
1646	1471	*/
1647	1472	public static function render_spam_settings( $values ) {
1648	1473	if ( function_exists( 'akismet_http_post' ) ) {
		@@ -1647,9 +1472,9 @@
1647	1472	public static function render_spam_settings( $values ) {
1648	1473	if ( function_exists( 'akismet_http_post' ) ) {
1649	1474	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/spam-settings/akismet.php';
1650	1475	}
1651		- include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/spam-settings/stopforumspam.php';
	1476	+ include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/spam-settings/honeypot.php';
1652	1477	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/spam-settings/antispam.php';
1653	1478	}
1654	1479
1655	1480	/**
		@@ -1655,9 +1480,8 @@
1655	1480	/**
1656	1481	* @since 4.0
1657	1482	*
1658	1483	* @param array $values
1659		- *
1660	1484	* @return void
1661	1485	*/
1662	1486	public static function buttons_settings( $values ) {
1663	1487	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings-buttons.php';
		@@ -1666,9 +1490,8 @@
1666	1490	/**
1667	1491	* @since 4.0
1668	1492	*
1669	1493	* @param array $values
1670		- *
1671	1494	* @return void
1672	1495	*/
1673	1496	public static function html_settings( $values ) {
1674	1497	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings-html.php';
		@@ -1679,9 +1502,8 @@
1679	1502	*
1680	1503	* @since 2.03.08
1681	1504	*
1682	1505	* @param array|bool $values
1683		- *
1684	1506	* @return void
1685	1507	*/
1686	1508	private static function clean_submit_html( &$values ) {
1687	1509	if ( is_array( $values ) && isset( $values['submit_html'] ) ) {
		@@ -1704,17 +1526,13 @@
1704	1526	return $classes;
1705	1527	}
1706	1528
1707	1529	/**
1708		- * @since 6.27 Added $template_path parameter.
1709		- *
1710	1530	* @param int|string $form_id
1711	1531	* @param string $class
1712		- * @param string $template_path The path to a template file to use instead of the default.
1713		- *
1714	1532	* @return void
1715	1533	*/
1716		- public static function mb_tags_box( $form_id, $class = '', $template_path = 'default' ) {
	1534	+ public static function mb_tags_box( $form_id, $class = '' ) {
1717	1535	$fields = FrmField::get_all_for_form( $form_id, '', 'include' );
1718	1536
1719	1537	/**
1720	1538	* Allows modifying the list of fields in the tags box.
		@@ -1723,30 +1541,23 @@
1723	1541	*
1724	1542	* @param array $fields The list of fields.
1725	1543	* @param array $args The arguments. Contains `form_id`.
1726	1544	*/
1727		- $fields = apply_filters( 'frm_fields_in_tags_box', $fields, compact( 'form_id' ) );
1728		- $linked_forms = array();
1729		- $col = 'one';
1730		- $settings_tab = FrmAppHelper::is_admin_page( 'formidable' );
	1545	+ $fields = apply_filters( 'frm_fields_in_tags_box', $fields, compact( 'form_id' ) );
	1546	+ $linked_forms = array();
	1547	+ $col = 'one';
	1548	+ $settings_tab = FrmAppHelper::is_admin_page( 'formidable' );
	1549	+
1731	1550	$cond_shortcodes = apply_filters( 'frm_conditional_shortcodes', array() );
1732	1551	$entry_shortcodes = self::get_shortcode_helpers( $settings_tab );
	1552	+
1733	1553	$advanced_helpers = self::advanced_helpers( compact( 'fields', 'form_id' ) );
1734	1554
1735		- if ( 'default' === $template_path || ! file_exists( $template_path ) ) {
1736		- include FrmAppHelper::plugin_path() . '/classes/views/shared/mb_adv_info.php';
1737		- return;
1738		- }
1739		-
1740		- include $template_path;
	1555	+ include FrmAppHelper::plugin_path() . '/classes/views/shared/mb_adv_info.php';
1741	1556	}
1742	1557
1743	1558	/**
1744	1559	* @since 3.04.01
1745		- *
1746		- * @param array $atts
1747		- *
1748		- * @return array
1749	1560	*/
1750	1561	private static function advanced_helpers( $atts ) {
1751	1562	$advanced_helpers = array(
1752	1563	'default' => array(
		@@ -1755,12 +1566,10 @@
1755	1566	),
1756	1567	);
1757	1568
1758	1569	$user_fields = self::user_shortcodes();
1759		-
1760	1570	if ( $user_fields ) {
1761	1571	$user_helpers = array();
1762		-
1763	1572	foreach ( $user_fields as $uk => $uf ) {
1764	1573	$user_helpers[ '|user_id| show="' . $uk . '"' ] = $uf;
1765	1574	unset( $uk, $uf );
1766	1575	}
		@@ -1785,10 +1594,8 @@
1785	1594	* Get an array of the options to display in the advanced tab
1786	1595	* of the customization panel
1787	1596	*
1788	1597	* @since 2.0.6
1789		- *
1790		- * @return array
1791	1598	*/
1792	1599	private static function get_advanced_shortcodes() {
1793	1600	$adv_shortcodes = array(
1794	1601	'x sep=", "' => array(
		@@ -1805,18 +1612,17 @@
1805	1612	'label' => __( 'No Auto P', 'formidable' ),
1806	1613	'title' => __( 'Do not automatically add any paragraphs or line breaks', 'formidable' ),
1807	1614	),
1808	1615	);
	1616	+ $adv_shortcodes = apply_filters( 'frm_advanced_shortcodes', $adv_shortcodes );
1809	1617
1810	1618	// __( 'Leave blank instead of defaulting to User Login', 'formidable' ) : blank=1
1811	1619
1812		- return apply_filters( 'frm_advanced_shortcodes', $adv_shortcodes );
	1620	+ return $adv_shortcodes;
1813	1621	}
1814	1622
1815	1623	/**
1816	1624	* @since 3.04.01
1817		- *
1818		- * @return array
1819	1625	*/
1820	1626	private static function user_shortcodes() {
1821	1627	$options = array(
1822	1628	'ID' => __( 'User ID', 'formidable' ),
		@@ -1835,12 +1641,8 @@
1835	1641	/**
1836	1642	* Get an array of the helper shortcodes to display in the customization panel
1837	1643	*
1838	1644	* @since 2.0.6
1839		- *
1840		- * @param bool $settings_tab
1841		- *
1842		- * @return array
1843	1645	*/
1844	1646	private static function get_shortcode_helpers( $settings_tab ) {
1845	1647	$entry_shortcodes = array(
1846	1648	'id' => __( 'Entry ID', 'formidable' ),
		@@ -1855,9 +1657,8 @@
1855	1657	'form_name' => __( 'Form Name', 'formidable' ),
1856	1658	);
1857	1659
1858	1660	$entry_shortcodes = array_merge( FrmShortcodeHelper::get_contextual_shortcode_values(), $entry_shortcodes );
1859		-
1860	1661	if ( ! FrmAppHelper::pro_is_installed() ) {
1861	1662	unset( $entry_shortcodes['post_id'] );
1862	1663	}
1863	1664
		@@ -1865,13 +1666,12 @@
1865	1666	* Use this hook to add or remove buttons in the helpers section
1866	1667	* in the customization panel
1867	1668	*
1868	1669	* @since 2.0.6
1869		- *
1870		- * @param array $entry_shortcodes
1871		- * @param bool $settings_tab
1872	1670	*/
1873		- return apply_filters( 'frm_helper_shortcodes', $entry_shortcodes, $settings_tab );
	1671	+ $entry_shortcodes = apply_filters( 'frm_helper_shortcodes', $entry_shortcodes, $settings_tab );
	1672	+
	1673	+ return $entry_shortcodes;
1874	1674	}
1875	1675
1876	1676	/**
1877	1677	* Insert the form class setting into the form.
		@@ -1876,9 +1676,8 @@
1876	1676	/**
1877	1677	* Insert the form class setting into the form.
1878	1678	*
1879	1679	* @param stdClass $form
1880		- *
1881	1680	* @return void
1882	1681	*/
1883	1682	public static function form_classes( $form ) {
1884	1683	if ( isset( $form->options['form_class'] ) ) {
		@@ -1889,9 +1688,9 @@
1889	1688	echo ' frm_js_validate ';
1890	1689	self::add_js_validate_form_to_global_vars( $form );
1891	1690	}
1892	1691
1893		- if ( FrmForm::is_ajax_on( $form ) ) {
	1692	+ if ( ! FrmFormsHelper::should_use_pro_for_ajax_submit() && FrmForm::is_ajax_on( $form ) ) {
1894	1693	echo ' frm_ajax_submit ';
1895	1694	}
1896	1695	}
1897	1696
		@@ -1901,9 +1700,8 @@
1901	1700	* @param stdClass $form
1902	1701	*/
1903	1702	public static function add_js_validate_form_to_global_vars( $form ) {
1904	1703	global $frm_vars;
1905		-
1906	1704	if ( ! isset( $frm_vars['js_validate_forms'] ) ) {
1907	1705	$frm_vars['js_validate_forms'] = array();
1908	1706	}
1909	1707	$frm_vars['js_validate_forms'][ $form->id ] = $form;
		@@ -1926,9 +1724,8 @@
1926	1724	/**
1927	1725	* @param string $content
1928	1726	* @param int|stdClass|string $form
1929	1727	* @param false|int|stdClass|string $entry
1930		- *
1931	1728	* @return string
1932	1729	*/
1933	1730	public static function filter_content( $content, $form, $entry = false ) {
1934	1731	$content = self::replace_form_name_shortcodes( $content, $form );
		@@ -1933,9 +1730,8 @@
1933	1730	public static function filter_content( $content, $form, $entry = false ) {
1934	1731	$content = self::replace_form_name_shortcodes( $content, $form );
1935	1732
1936	1733	self::get_entry_by_param( $entry );
1937		-
1938	1734	if ( ! $entry ) {
1939	1735	return $content;
1940	1736	}
1941	1737
		@@ -1951,10 +1747,11 @@
1951	1747	$form = $entry->parent_entry->form_id;
1952	1748	}
1953	1749
1954	1750	$shortcodes = FrmFieldsHelper::get_shortcodes( $content, $form );
	1751	+ $content = apply_filters( 'frm_replace_content_shortcodes', $content, $entry, $shortcodes );
1955	1752
1956		- return apply_filters( 'frm_replace_content_shortcodes', $content, $entry, $shortcodes );
	1753	+ return $content;
1957	1754	}
1958	1755
1959	1756	/**
1960	1757	* Replace any [form_name] shortcodes in a string.
		@@ -1962,9 +1759,8 @@
1962	1759	* @since 5.5
1963	1760	*
1964	1761	* @param array|string $string
1965	1762	* @param int|stdClass|string $form
1966		- *
1967	1763	* @return array|string
1968	1764	*/
1969	1765	public static function replace_form_name_shortcodes( $string, $form ) {
1970	1766	if ( ! is_string( $string ) ) {
		@@ -1970,9 +1766,9 @@
1970	1766	if ( ! is_string( $string ) ) {
1971	1767	return $string;
1972	1768	}
1973	1769
1974		- if ( ! str_contains( $string, '[form_name]' ) ) {
	1770	+ if ( false === strpos( $string, '[form_name]' ) ) {
1975	1771	return $string;
1976	1772	}
1977	1773
1978	1774	if ( ! is_object( $form ) ) {
		@@ -1984,9 +1780,8 @@
1984	1780	}
1985	1781
1986	1782	/**
1987	1783	* @param false|int|stdClass|string $entry
1988		- *
1989	1784	* @return void
1990	1785	*/
1991	1786	private static function get_entry_by_param( &$entry ) {
1992	1787	if ( ! $entry || ! is_object( $entry ) ) {
		@@ -1997,15 +1792,8 @@
1997	1792	FrmEntry::maybe_get_entry( $entry );
1998	1793	}
1999	1794	}
2000	1795
2001		- /**
2002		- * @param string $content
2003		- * @param false|object $entry
2004		- * @param array $shortcodes
2005		- *
2006		- * @return string
2007		- */
2008	1796	public static function replace_content_shortcodes( $content, $entry, $shortcodes ) {
2009	1797	return FrmFieldsHelper::replace_content_shortcodes( $content, $entry, $shortcodes );
2010	1798	}
2011	1799
		@@ -2010,9 +1798,8 @@
2010	1798	}
2011	1799
2012	1800	/**
2013	1801	* @param array $errors
2014		- *
2015	1802	* @return array
2016	1803	*/
2017	1804	public static function process_bulk_form_actions( $errors ) {
2018	1805	if ( ! $_REQUEST ) {
		@@ -2019,30 +1806,29 @@
2019	1806	return $errors;
2020	1807	}
2021	1808
2022	1809	$bulkaction = FrmAppHelper::get_param( 'action', '', 'get', 'sanitize_text_field' );
2023		-
2024		- // phpcs:ignore Universal.Operators.StrictComparisons
2025	1810	if ( $bulkaction == - 1 ) {
2026	1811	$bulkaction = FrmAppHelper::get_param( 'action2', '', 'get', 'sanitize_title' );
2027	1812	}
2028	1813
2029		- if ( $bulkaction && str_starts_with( $bulkaction, 'bulk_' ) ) {
	1814	+ if ( ! empty( $bulkaction ) && strpos( $bulkaction, 'bulk_' ) === 0 ) {
2030	1815	FrmAppHelper::remove_get_action();
	1816	+
2031	1817	$bulkaction = str_replace( 'bulk_', '', $bulkaction );
2032	1818	}
2033	1819
2034	1820	$ids = FrmAppHelper::get_param( 'item-action', '', 'get', 'sanitize_text_field' );
	1821	+ if ( empty( $ids ) ) {
	1822	+ $errors[] = __( 'No forms were specified', 'formidable' );
2035	1823
2036		- if ( ! $ids ) {
2037		- $errors[] = __( 'No forms were specified', 'formidable' );
2038	1824	return $errors;
2039	1825	}
2040	1826
2041	1827	$permission_error = FrmAppHelper::permission_nonce_error( '', '_wpnonce', 'bulk-toplevel_page_formidable' );
2042		-
2043	1828	if ( $permission_error !== false ) {
2044	1829	$errors[] = $permission_error;
	1830	+
2045	1831	return $errors;
2046	1832	}
2047	1833
2048	1834	if ( ! is_array( $ids ) ) {
		@@ -2066,24 +1852,9 @@
2066	1852
2067	1853	return $errors;
2068	1854	}
2069	1855
2070		- /**
2071		- * Includes html that shows a message when the device is too small to use Formidable Forms admin pages.
2072		- *
2073		- * @since 6.20
2074		- *
2075		- * @return void
2076		- */
2077		- public static function include_device_too_small_message() {
2078		- if ( ! FrmAppHelper::is_formidable_admin() ) {
2079		- return;
2080		- }
2081		-
2082		- include FrmAppHelper::plugin_path() . '/classes/views/shared/small-device-message.php';
2083		- }
2084		-
2085		- public static function route() { // phpcs:ignore Generic.Metrics.CyclomaticComplexity.MaxExceeded
	1856	+ public static function route() {
2086	1857	$action = isset( $_REQUEST['frm_action'] ) ? 'frm_action' : 'action';
2087	1858	$vars = array();
2088	1859	FrmAppHelper::include_svg();
2089	1860
		@@ -2093,13 +1864,11 @@
2093	1864	// Javascript needs to be allowed in some field settings.
2094	1865	// phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized, WordPress.Security.NonceVerification.Missing
2095	1866	$json_vars = htmlspecialchars_decode( nl2br( str_replace( '&quot;', '"', wp_unslash( $_POST['frm_compact_fields'] ) ) ) );
2096	1867	$json_vars = json_decode( $json_vars, true );
2097		-
2098		- if ( ! $json_vars ) {
	1868	+ if ( empty( $json_vars ) ) {
2099	1869	// json decoding failed so we should return an error message.
2100	1870	$action = FrmAppHelper::get_param( $action, '', 'get', 'sanitize_title' );
2101		-
2102	1871	if ( 'edit' === $action ) {
2103	1872	$action = 'update';
2104	1873	}
2105	1874
		@@ -2112,9 +1881,8 @@
2112	1881	$_POST = array_merge( $_POST, $_REQUEST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
2113	1882	}
2114	1883	} else {
2115	1884	$action = FrmAppHelper::get_param( $action, '', 'get', 'sanitize_title' );
2116		-
2117	1885	if ( isset( $_REQUEST['delete_all'] ) ) {
2118	1886	// Override the action for this page.
2119	1887	$action = 'delete_all';
2120	1888	}
		@@ -2134,38 +1902,34 @@
2134	1902	case 'update_settings':
2135	1903	return self::$action( $vars );
2136	1904	case 'lite-reports':
2137	1905	self::no_reports( $vars );
2138		- return null;
	1906	+ return;
2139	1907	case 'views':
2140	1908	self::no_views( $vars );
2141		- return null;
	1909	+ return;
2142	1910	default:
2143	1911	do_action( 'frm_form_action_' . $action );
2144		-
2145	1912	if ( apply_filters( 'frm_form_stop_action_' . $action, false ) ) {
2146		- return null;
	1913	+ return;
2147	1914	}
2148	1915
2149	1916	$action = FrmAppHelper::get_param( 'action', '', 'get', 'sanitize_text_field' );
2150		-
2151		- // phpcs:ignore Universal.Operators.StrictComparisons
2152	1917	if ( $action == - 1 ) {
2153	1918	$action = FrmAppHelper::get_param( 'action2', '', 'get', 'sanitize_title' );
2154	1919	}
2155	1920
2156		- if ( str_starts_with( $action, 'bulk_' ) ) {
	1921	+ if ( strpos( $action, 'bulk_' ) === 0 ) {
2157	1922	FrmAppHelper::remove_get_action();
2158	1923
2159	1924	self::list_form();
2160		- return null;
	1925	+ return;
2161	1926	}
2162	1927
2163	1928	$message = FrmAppHelper::get_param( 'message' );
2164		-
2165	1929	if ( 'form_duplicate_error' === $message ) {
2166	1930	self::display_forms_list( array(), '', array( __( 'There was a problem duplicating the form', 'formidable' ) ) );
2167		- return null;
	1931	+ return;
2168	1932	}
2169	1933
2170	1934	if ( 'forms_permanently_deleted' === $message ) {
2171	1935	$count = FrmAppHelper::get_param( 'forms_deleted', 0, 'get', 'absint' );
		@@ -2171,14 +1935,14 @@
2171	1935	$count = FrmAppHelper::get_param( 'forms_deleted', 0, 'get', 'absint' );
2172	1936	/* translators: %1$s: Number of forms */
2173	1937	$message = sprintf( _n( '%1$s form permanently deleted.', '%1$s forms permanently deleted.', $count, 'formidable' ), $count );
2174	1938	self::display_forms_list( array(), $message, '' );
2175		- return null;
	1939	+ return;
2176	1940	}
2177	1941
2178	1942	self::display_forms_list();
2179	1943
2180		- return null;
	1944	+ return;
2181	1945	}//end switch
2182	1946	}
2183	1947
2184	1948	/**
		@@ -2197,43 +1961,19 @@
2197	1961
2198	1962	// Get posted data
2199	1963	$form_id = FrmAppHelper::get_post_param( 'form_id', '', 'absint' );
2200	1964	$name = FrmAppHelper::get_post_param( 'form_name', '', 'sanitize_text_field' );
2201		- $form = FrmForm::getOne( $form_id );
2202	1965
2203		- if ( ! $form ) {
2204		- wp_send_json_error( __( 'Form not found', 'formidable' ) );
2205		- }
	1966	+ // Update the form name and form key.
	1967	+ $form_key = FrmAppHelper::get_unique_key( sanitize_title( $name ), 'frm_forms', 'form_key' );
	1968	+ FrmForm::update( $form_id, compact( 'name', 'form_key' ) );
2206	1969
2207		- if ( $name === $form->name ) {
2208		- // Nothing to change so exit early.
2209		- wp_send_json_success();
2210		- }
2211		-
2212		- $to_update = array(
2213		- 'name' => $name,
2214		- );
2215		-
2216		- if ( '' !== $name ) {
2217		- // Only update form_key if name is not empty.
2218		- $form_key = FrmAppHelper::get_unique_key( sanitize_title( $name ), 'frm_forms', 'form_key' );
2219		- $to_update['form_key'] = $form_key;
2220		- } else {
2221		- $form_key = $form->form_key;
2222		- }
2223		-
2224		- FrmForm::update( $form_id, $to_update );
2225		-
2226	1970	wp_send_json_success( compact( 'form_key' ) );
2227	1971	}
2228	1972
2229		- /**
2230		- * @param array $errors
2231		- *
2232		- * @return array
2233		- */
2234	1973	public static function json_error( $errors ) {
2235	1974	$errors['json'] = __( 'Abnormal HTML characters prevented your form from saving correctly', 'formidable' );
	1975	+
2236	1976	return $errors;
2237	1977	}
2238	1978
2239	1979	/**
		@@ -2240,10 +1980,8 @@
2240	1980	* Add education about views.
2241	1981	*
2242	1982	* @since 4.07
2243	1983	*
2244		- * @param array $values
2245		- *
2246	1984	* @return void
2247	1985	*/
2248	1986	public static function no_views( $values = array() ) {
2249	1987	FrmAppHelper::include_svg();
		@@ -2257,10 +1995,8 @@
2257	1995	* Add education about reports.
2258	1996	*
2259	1997	* @since 4.07
2260	1998	*
2261		- * @param array $values
2262		- *
2263	1999	* @return void
2264	2000	*/
2265	2001	public static function no_reports( $values = array() ) {
2266	2002	$id = FrmAppHelper::get_param( 'form', '', 'get', 'absint' );
		@@ -2287,9 +2023,8 @@
2287	2023	* @since 4.05.02
2288	2024	*/
2289	2025	private static function move_menu_to_footer() {
2290	2026	$settings = FrmAppHelper::get_settings();
2291		-
2292	2027	if ( empty( $settings->admin_bar ) ) {
2293	2028	remove_action( 'wp_body_open', 'wp_admin_bar_render', 0 );
2294	2029	}
2295	2030	}
		@@ -2295,15 +2030,13 @@
2295	2030	}
2296	2031
2297	2032	public static function admin_bar_configure() {
2298	2033	global $frm_vars;
2299		-
2300	2034	if ( empty( $frm_vars['forms_loaded'] ) ) {
2301	2035	return;
2302	2036	}
2303	2037
2304	2038	$actions = array();
2305		-
2306	2039	foreach ( $frm_vars['forms_loaded'] as $form ) {
2307	2040	if ( is_object( $form ) ) {
2308	2041	$actions[ $form->id ] = $form->name;
2309	2042	}
		@@ -2309,9 +2042,9 @@
2309	2042	}
2310	2043	unset( $form );
2311	2044	}
2312	2045
2313		- if ( ! $actions ) {
	2046	+ if ( empty( $actions ) ) {
2314	2047	return;
2315	2048	}
2316	2049
2317	2050	self::add_menu_to_admin_bar();
		@@ -2337,12 +2070,8 @@
2337	2070	}
2338	2071
2339	2072	/**
2340	2073	* @since 2.05.07
2341		- *
2342		- * @param array $actions
2343		- *
2344		- * @return void
2345	2074	*/
2346	2075	private static function add_forms_to_admin_bar( $actions ) {
2347	2076	global $wp_admin_bar;
2348	2077
		@@ -2348,8 +2077,9 @@
2348	2077
2349	2078	asort( $actions );
2350	2079
2351	2080	foreach ( $actions as $form_id => $name ) {
	2081	+
2352	2082	$wp_admin_bar->add_node(
2353	2083	array(
2354	2084	'parent' => 'frm-forms',
2355	2085	'id' => 'edit_form_' . $form_id,
		@@ -2363,14 +2093,12 @@
2363	2093	/**
2364	2094	* The formidable shortcode
2365	2095	*
2366	2096	* @param array $atts The params from the shortcode.
2367		- *
2368	2097	* @return string
2369	2098	*/
2370	2099	public static function get_form_shortcode( $atts ) {
2371	2100	global $frm_vars;
2372		-
2373	2101	if ( ! empty( $frm_vars['skip_shortcode'] ) ) {
2374	2102	$sc = '[formidable';
2375	2103	$sc .= FrmAppHelper::array_to_html_params( $atts );
2376	2104	return $sc . ']';
		@@ -2399,9 +2127,8 @@
2399	2127	* @since 5.2.01
2400	2128	*
2401	2129	* @param false|int|string $id
2402	2130	* @param false|string $key
2403		- *
2404	2131	* @return false|stdClass
2405	2132	*/
2406	2133	private static function maybe_get_form_by_id_or_key( $id, $key ) {
2407	2134	if ( ! $id ) {
		@@ -2415,9 +2142,8 @@
2415	2142	* @param false|string $key
2416	2143	* @param bool|int|string $title may be 'auto', true, false, 'true', 'false', 'yes', '1', 1, '0', 0.
2417	2144	* @param bool|int|string $description may be 'auto', true, false, 'true', 'false', 'yes', '1', 1, '0', 0.
2418	2145	* @param array $atts
2419		- *
2420	2146	* @return string
2421	2147	*/
2422	2148	public static function show_form( $id = '', $key = '', $title = false, $description = false, $atts = array() ) {
2423	2149	$form = self::maybe_get_form_by_id_or_key( $id, $key );
		@@ -2438,9 +2164,10 @@
2438	2164
2439	2165	add_action( 'frm_load_form_hooks', 'FrmHooksController::trigger_load_form_hooks' );
2440	2166	FrmAppHelper::trigger_hook_load( 'form', $form );
2441	2167
2442		- $form = apply_filters( 'frm_pre_display_form', $form );
	2168	+ $form = apply_filters( 'frm_pre_display_form', $form );
	2169	+
2443	2170	$frm_settings = FrmAppHelper::get_settings( array( 'current_form' => $form->id ) );
2444	2171
2445	2172	if ( self::is_viewable_draft_form( $form ) ) {
2446	2173	// don't show a draft form on a page
		@@ -2464,18 +2191,16 @@
2464	2191	}
2465	2192
2466	2193	/**
2467	2194	* @param false|int|string $id
2468		- *
2469	2195	* @return false|stdClass
2470	2196	*/
2471	2197	private static function maybe_get_form_to_show( $id ) {
2472	2198	$form = false;
2473	2199
2474		- if ( $id ) {
	2200	+ if ( ! empty( $id ) ) {
2475	2201	// Form id or key is set.
2476	2202	$form = FrmForm::getOne( $id );
2477		-
2478	2203	if ( ! $form || $form->parent_form_id || $form->status === 'trash' ) {
2479	2204	$form = false;
2480	2205	}
2481	2206	}
		@@ -2482,25 +2207,12 @@
2482	2207
2483	2208	return $form;
2484	2209	}
2485	2210
2486		- /**
2487		- * @param object $form
2488		- *
2489		- * @return bool
2490		- */
2491	2211	private static function is_viewable_draft_form( $form ) {
2492	2212	return $form->status === 'draft' && current_user_can( 'frm_edit_forms' ) && ! FrmAppHelper::is_preview_page();
2493	2213	}
2494	2214
2495		- /**
2496		- * @param object $form
2497		- * @param bool $title
2498		- * @param bool $description
2499		- * @param array $atts
2500		- *
2501		- * @return string
2502		- */
2503	2215	public static function get_form( $form, $title, $description, $atts = array() ) {
2504	2216	ob_start();
2505	2217
2506	2218	do_action( 'frm_before_get_form', $atts );
		@@ -2507,9 +2219,10 @@
2507	2219
2508	2220	self::get_form_contents( $form, $title, $description, $atts );
2509	2221	self::enqueue_scripts( FrmForm::get_params( $form ) );
2510	2222
2511		- $contents = ob_get_clean();
	2223	+ $contents = ob_get_contents();
	2224	+ ob_end_clean();
2512	2225
2513	2226	self::maybe_minimize_form( $atts, $contents );
2514	2227
2515	2228	return $contents;
		@@ -2514,25 +2227,12 @@
2514	2227
2515	2228	return $contents;
2516	2229	}
2517	2230
2518		- /**
2519		- * @param array $params
2520		- *
2521		- * @return void
2522		- */
2523	2231	public static function enqueue_scripts( $params ) {
2524	2232	do_action( 'frm_enqueue_form_scripts', $params );
2525	2233	}
2526	2234
2527		- /**
2528		- * @param object $form
2529		- * @param bool $title
2530		- * @param bool $description
2531		- * @param array $atts
2532		- *
2533		- * @return void
2534		- */
2535	2235	public static function get_form_contents( $form, $title, $description, $atts ) {
2536	2236	$params = FrmForm::get_params( $form );
2537	2237	$errors = self::get_saved_errors( $form, $params );
2538	2238	$fields = FrmFieldsHelper::get_form_fields( $form->id, $errors );
		@@ -2539,10 +2239,9 @@
2539	2239	$reset = false;
2540	2240	$pass_args = compact( 'form', 'fields', 'errors', 'title', 'description', 'reset' );
2541	2241
2542	2242	$pass_args['action'] = $params['action'];
2543		- // phpcs:ignore WordPress.Security.NonceVerification.Missing, Universal.Operators.StrictComparisons
2544		- $handle_process_here = $params['action'] === 'create' && $params['posted_form_id'] == $form->id && $_POST;
	2243	+ $handle_process_here = $params['action'] === 'create' && $params['posted_form_id'] == $form->id && $_POST; // phpcs:ignore WordPress.Security.NonceVerification.Missing
2545	2244
2546	2245	if ( ! $handle_process_here ) {
2547	2246	FrmFormState::set_initial_value( 'title', $title );
2548	2247	FrmFormState::set_initial_value( 'description', $description );
		@@ -2547,16 +2246,16 @@
2547	2246	FrmFormState::set_initial_value( 'title', $title );
2548	2247	FrmFormState::set_initial_value( 'description', $description );
2549	2248
2550	2249	do_action( 'frm_display_form_action', $params, $fields, $form, $title, $description );
2551		-
2552	2250	if ( apply_filters( 'frm_continue_to_new', true, $form->id, $params['action'] ) ) {
2553	2251	self::show_form_after_submit( $pass_args );
2554	2252	}
2555		- } elseif ( $errors ) {
	2253	+ } elseif ( ! empty( $errors ) ) {
2556	2254	self::show_form_after_submit( $pass_args );
2557	2255
2558	2256	} else {
	2257	+
2559	2258	do_action( 'frm_validate_form_creation', $params, $fields, $form, $title, $description );
2560	2259
2561	2260	if ( apply_filters( 'frm_continue_to_create', true, $form->id ) ) {
2562	2261	$entry_id = self::just_created_entry( $form->id );
		@@ -2579,19 +2278,13 @@
2579	2278	/**
2580	2279	* If the form was processed earlier (init), get the generated errors
2581	2280	*
2582	2281	* @since 2.05
2583		- *
2584		- * @param object $form
2585		- * @param array $params
2586		- *
2587		- * @return array
2588	2282	*/
2589	2283	private static function get_saved_errors( $form, $params ) {
2590	2284	global $frm_vars;
2591	2285
2592		- // phpcs:ignore WordPress.Security.NonceVerification.Missing, Universal.Operators.StrictComparisons
2593		- if ( $params['posted_form_id'] == $form->id && $_POST && isset( $frm_vars['created_entries'][ $form->id ] ) ) {
	2286	+ if ( $params['posted_form_id'] == $form->id && $_POST && isset( $frm_vars['created_entries'][ $form->id ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
2594	2287	$errors = $frm_vars['created_entries'][ $form->id ]['errors'];
2595	2288	} else {
2596	2289	$errors = array();
2597	2290	}
		@@ -2608,16 +2301,13 @@
2608	2301	}
2609	2302
2610	2303	/**
2611	2304	* @since 2.2.7
2612		- *
2613		- * @param int|string $form_id
2614		- *
2615		- * @return int
2616	2305	*/
2617	2306	public static function just_created_entry( $form_id ) {
2618	2307	global $frm_vars;
2619		- 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
	2308	+
	2309	+ 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;
2620	2310	}
2621	2311
2622	2312	/**
2623	2313	* Gets confirmation method.
		@@ -2630,9 +2320,8 @@
2630	2320	*
2631	2321	* @type object $form Form object.
2632	2322	* @type int $entry_id Entry ID.
2633	2323	* }
2634		- *
2635	2324	* @return array|string
2636	2325	*/
2637	2326	private static function get_confirmation_method( $atts ) {
2638	2327	$action = FrmOnSubmitHelper::current_event( $atts );
		@@ -2640,9 +2329,8 @@
2640	2329	$method = ! empty( $atts['form']->options[ $opt ] ) ? $atts['form']->options[ $opt ] : 'message';
2641	2330
2642	2331	if ( ! empty( $atts['entry_id'] ) ) {
2643	2332	$met_actions = self::get_met_on_submit_actions( $atts, $action );
2644		-
2645	2333	if ( $met_actions ) {
2646	2334	$method = $met_actions;
2647	2335	}
2648	2336	}
		@@ -2655,15 +2343,8 @@
2655	2343
2656	2344	return $method;
2657	2345	}
2658	2346
2659		- /**
2660		- * @param object $form
2661		- * @param array $params
2662		- * @param array $args
2663		- *
2664		- * @return void
2665		- */
2666	2347	public static function maybe_trigger_redirect( $form, $params, $args ) {
2667	2348	if ( ! isset( $params['id'] ) ) {
2668	2349	global $frm_vars;
2669	2350	$params['id'] = $frm_vars['created_entries'][ $form->id ]['entry_id'];
		@@ -2691,9 +2372,9 @@
2691	2372	* @param array $args See {@see FrmFormsController::maybe_trigger_redirect()}.
2692	2373	*/
2693	2374	public static function maybe_trigger_redirect_with_action( $conf_method, $form, $params, $args ) {
2694	2375	if ( is_array( $conf_method ) && 1 === count( $conf_method ) ) {
2695		- if ( 'redirect' === FrmOnSubmitHelper::get_action_type( $conf_method[0] ) && empty( $conf_method[0]->post_content['redirect_delay'] ) ) {
	2376	+ if ( 'redirect' === FrmOnSubmitHelper::get_action_type( $conf_method[0] ) ) {
2696	2377	$event = FrmOnSubmitHelper::current_event( $params );
2697	2378	FrmOnSubmitHelper::populate_on_submit_data( $form->options, $conf_method[0], $event );
2698	2379	$conf_method = 'redirect';
2699	2380	}
		@@ -2703,15 +2384,8 @@
2703	2384	self::trigger_redirect( $form, $params, $args );
2704	2385	}
2705	2386	}
2706	2387
2707		- /**
2708		- * @param object $form
2709		- * @param array $params
2710		- * @param array $args
2711		- *
2712		- * @return void
2713		- */
2714	2388	public static function trigger_redirect( $form, $params, $args ) {
2715	2389	$success_args = array(
2716	2390	'action' => $params['action'],
2717	2391	'conf_method' => 'redirect',
		@@ -2770,9 +2444,8 @@
2770	2444	* @since 6.0
2771	2445	*
2772	2446	* @param array $args See {@see FrmFormsController::run_success_action()}.
2773	2447	* @param string $event Form event. Default is `create`.
2774		- *
2775	2448	* @return array Array of actions that meet the conditional logics.
2776	2449	*/
2777	2450	public static function get_met_on_submit_actions( $args, $event = 'create' ) {
2778	2451	if ( ! FrmOnSubmitHelper::form_has_migrated( $args['form'] ) ) {
		@@ -2830,9 +2503,9 @@
2830	2503	* @param array $args See {@see FrmFormsController::run_success_action()}. `$args['event']` is also added.
2831	2504	*/
2832	2505	$met_actions = apply_filters( 'frm_get_met_on_submit_actions', $met_actions, $args );
2833	2506
2834		- if ( ! $met_actions ) {
	2507	+ if ( empty( $met_actions ) ) {
2835	2508	$met_actions = array( FrmOnSubmitHelper::get_fallback_action( $event ) );
2836	2509	}
2837	2510
2838	2511	return $met_actions;
		@@ -2845,9 +2518,8 @@
2845	2518	*
2846	2519	* @param object $action Form action object.
2847	2520	* @param array $args See {@see FrmFormsController::run_success_action()}.
2848	2521	* @param string $event Form event. Default is `create`.
2849		- *
2850	2522	* @return bool
2851	2523	*/
2852	2524	private static function is_valid_on_submit_action( $action, $args, $event = 'create' ) {
2853	2525	$action_type = FrmOnSubmitHelper::get_action_type( $action );
		@@ -2869,9 +2541,8 @@
2869	2541	return false;
2870	2542	}
2871	2543
2872	2544	$page = get_post( $action->post_content['success_page_id'] );
2873		-
2874	2545	if ( ! $page || 'trash' === $page->post_status ) {
2875	2546	return false;
2876	2547	}
2877	2548	}
		@@ -2893,9 +2564,8 @@
2893	2564	'entry_id' => $args['entry_id'],
2894	2565	'action' => FrmOnSubmitHelper::current_event( $args ),
2895	2566	)
2896	2567	);
2897		-
2898	2568	if ( ! is_array( $args['conf_method'] ) ) {
2899	2569	self::run_success_action( $args );
2900	2570	return;
2901	2571	}
		@@ -2922,9 +2592,8 @@
2922	2592	* @param array $args See {@see FrmFormsController::run_success_action()}.
2923	2593	*/
2924	2594	public static function run_multi_on_submit_actions( $args ) {
2925	2595	$redirect_action = null;
2926		-
2927	2596	foreach ( $args['conf_method'] as $action ) {
2928	2597	if ( 'redirect' === FrmOnSubmitHelper::get_action_type( $action ) ) {
2929	2598	// We catch the redirect action to run it last.
2930	2599	$redirect_action = $action;
		@@ -2962,9 +2631,8 @@
2962	2631	* @since 6.0
2963	2632	*
2964	2633	* @param array $args See {@see FrmFormsController::run_success_action()}.
2965	2634	* @param object $action On Submit action object.
2966		- *
2967	2635	* @return array
2968	2636	*/
2969	2637	private static function get_run_success_action_args( $args, $action ) {
2970	2638	$new_args = $args;
		@@ -2970,9 +2638,10 @@
2970	2638	$new_args = $args;
2971	2639
2972	2640	FrmOnSubmitHelper::populate_on_submit_data( $new_args['form']->options, $action, $args['action'] );
2973	2641
2974		- $opt = 'update' === $args['action'] ? 'edit_' : 'success_';
	2642	+ $opt = 'update' === $args['action'] ? 'edit_' : 'success_';
	2643	+
2975	2644	$new_args['conf_method'] = $new_args['form']->options[ $opt . 'action' ];
2976	2645
2977	2646	/**
2978	2647	* Filters the run success action args.
		@@ -2987,18 +2656,12 @@
2987	2656	}
2988	2657
2989	2658	/**
2990	2659	* @since 3.0
2991		- *
2992		- * @param array $args
2993		- *
2994		- * @return void
2995	2660	*/
2996	2661	private static function load_page_after_submit( $args ) {
2997	2662	global $post;
2998	2663	$opt = $args['success_opt'];
2999		-
3000		- // phpcs:ignore Universal.Operators.StrictComparisons
3001	2664	if ( ! $post || $args['form']->options[ $opt . '_page_id' ] != $post->ID ) {
3002	2665	$page = get_post( $args['form']->options[ $opt . '_page_id' ] );
3003	2666	$old_post = $post;
3004	2667	$post = $page;
		@@ -3022,9 +2685,8 @@
3022	2685	}
3023	2686
3024	2687	/**
3025	2688	* @since 3.0
3026		- *
3027	2689	* @param array $args See {@see FrmFormsController::run_success_action()}.
3028	2690	*/
3029	2691	private static function redirect_after_submit( $args ) {
3030	2692	add_filter( 'frm_use_wpautop', '__return_false' );
		@@ -3038,10 +2700,11 @@
3038	2700	FrmEntriesController::delete_entry_before_redirect( $success_url, $args['form'], $args );
3039	2701
3040	2702	add_filter( 'frm_redirect_url', 'FrmEntriesController::prepare_redirect_url' );
3041	2703	$success_url = apply_filters( 'frm_redirect_url', $success_url, $args['form'], $args );
3042		- $doing_ajax = FrmAppHelper::doing_ajax();
3043	2704
	2705	+ $doing_ajax = FrmAppHelper::doing_ajax();
	2706	+
3044	2707	if ( ! empty( $args['ajax'] ) && $doing_ajax && empty( $args['force_delay_redirect'] ) ) {
3045	2708	// Is AJAX submit and there is just one Redirect action runs.
3046	2709	echo json_encode( self::get_ajax_redirect_response_data( $args + compact( 'success_url' ) ) );
3047	2710	wp_die();
		@@ -3046,9 +2709,9 @@
3046	2709	echo json_encode( self::get_ajax_redirect_response_data( $args + compact( 'success_url' ) ) );
3047	2710	wp_die();
3048	2711	}
3049	2712
3050		- if ( ! headers_sent() && empty( $args['force_delay_redirect'] ) && empty( $args['form']->options['redirect_delay'] ) ) {
	2713	+ if ( ! headers_sent() && empty( $args['force_delay_redirect'] ) ) {
3051	2714	// Not AJAX submit, no headers sent, and there is just one Redirect action runs.
3052	2715	if ( ! empty( $args['form']->options['open_in_new_tab'] ) ) {
3053	2716	self::print_open_in_new_tab_js_with_fallback_handler( $success_url, $args );
3054	2717	self::$redirected_in_new_tab[ $args['form']->id ] = 1;
		@@ -3090,51 +2753,31 @@
3090	2753	*
3091	2754	* @since 6.3.1
3092	2755	*
3093	2756	* @param array $args See {@see FrmFormsController::run_success_action()}.
3094		- *
3095	2757	* @return array
3096	2758	*/
3097	2759	private static function get_ajax_redirect_response_data( $args ) {
3098		- $response_data = array(
3099		- 'redirect' => $args['success_url'],
3100		- 'content' => '',
3101		- );
3102		- $unset_content = true;
	2760	+ $response_data = array( 'redirect' => $args['success_url'] );
3103	2761
3104		- if ( ! empty( $args['form']->options['redirect_delay'] ) ) {
3105		- $response_data['delay'] = $args['form']->options['redirect_delay_time'];
3106		- $response_data['content'] .= self::get_redirect_message( $args['success_url'], $args['form']->options['redirect_delay_msg'], $args );
3107		- $unset_content = false;
3108		- }
3109		-
3110	2762	if ( ! empty( $args['form']->options['open_in_new_tab'] ) ) {
3111	2763	$response_data['openInNewTab'] = 1;
3112	2764
3113		- // Only show open in new tab text if there is no delay.
3114		- if ( empty( $response_data['content'] ) ) {
3115		- $args['message'] = FrmOnSubmitHelper::get_default_new_tab_msg();
	2765	+ $args['message'] = FrmOnSubmitHelper::get_default_new_tab_msg();
3116	2766
3117		- $args['form']->options['success_msg'] = $args['message'];
3118		- $args['form']->options['edit_msg'] = $args['message'];
	2767	+ $args['form']->options['success_msg'] = $args['message'];
	2768	+ $args['form']->options['edit_msg'] = $args['message'];
	2769	+ if ( ! isset( $args['fields'] ) ) {
	2770	+ $args['fields'] = FrmField::get_all_for_form( $args['form']->id );
	2771	+ }
3119	2772
3120		- if ( ! isset( $args['fields'] ) ) {
3121		- $args['fields'] = FrmField::get_all_for_form( $args['form']->id );
3122		- }
	2773	+ $args['message'] = self::prepare_submit_message( $args['form'], $args['entry_id'], $args );
3123	2774
3124		- $args['message'] = self::prepare_submit_message( $args['form'], $args['entry_id'], $args );
	2775	+ ob_start();
	2776	+ self::show_lone_success_message( $args );
	2777	+ $response_data['content'] = ob_get_clean();
3125	2778
3126		- ob_start();
3127		- self::show_lone_success_message( $args );
3128		- $response_data['content'] .= ob_get_clean();
3129		- $unset_content = false;
3130		- }//end if
3131		-
3132	2779	$response_data['fallbackMsg'] = self::get_redirect_fallback_message( $args['success_url'], $args );
3133		- }//end if
3134		-
3135		- if ( $unset_content && '' === $response_data['content'] ) {
3136		- unset( $response_data['content'] );
3137	2780	}
3138	2781
3139	2782	return $response_data;
3140	2783	}
		@@ -3146,9 +2789,9 @@
3146	2789	*
3147	2790	* @param array $args See {@see FrmFormsController::run_success_action()}.
3148	2791	*/
3149	2792	private static function redirect_after_submit_using_js( $args ) {
3150		- $success_msg = $args['form']->options['redirect_delay_msg'];
	2793	+ $success_msg = FrmOnSubmitHelper::get_default_redirect_msg();
3151	2794	$redirect_msg = self::get_redirect_message( $args['success_url'], $success_msg, $args );
3152	2795	$success_url = esc_url_raw( $args['success_url'] );
3153	2796
3154	2797	/**
		@@ -3157,9 +2800,9 @@
3157	2800	* @since 6.0
3158	2801	*
3159	2802	* @param int $delay_time Delay time in milliseconds.
3160	2803	*/
3161		- $delay_time = apply_filters( 'frm_redirect_delay_time', 1000 * $args['form']->options['redirect_delay_time'] );
	2804	+ $delay_time = apply_filters( 'frm_redirect_delay_time', 8000 );
3162	2805
3163	2806	if ( ! empty( $args['form']->options['open_in_new_tab'] ) ) {
3164	2807	$redirect_js = 'window.open("' . $success_url . '", "_blank")';
3165	2808	} else {
		@@ -3169,15 +2812,13 @@
3169	2812	add_filter( 'frm_use_wpautop', '__return_true' );
3170	2813
3171	2814	echo FrmAppHelper::maybe_kses( $redirect_msg ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
3172	2815	echo '<script>';
3173		-
3174	2816	if ( empty( $args['doing_ajax'] ) ) {
3175	2817	// Not AJAX submit, delay JS until window.load.
3176	2818	echo 'window.onload=function(){';
3177	2819	}
3178	2820	echo 'setTimeout(function(){' . $redirect_js . '}, ' . intval( $delay_time ) . ');'; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
3179		-
3180	2821	if ( empty( $args['doing_ajax'] ) ) {
3181	2822	echo '};';
3182	2823	}
3183	2824	echo '</script>';
		@@ -3190,11 +2831,9 @@
3190	2831	* @param string $success_msg
3191	2832	* @param array $args
3192	2833	*/
3193	2834	private static function get_redirect_message( $success_url, $success_msg, $args ) {
3194		- $success_msg = apply_filters( 'frm_content', $success_msg, $args['form'], $args['entry_id'] );
3195		- $success_msg = do_shortcode( FrmAppHelper::use_wpautop( $success_msg ) );
3196		- $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
	2835	+ $redirect_msg = '<div class="' . esc_attr( FrmFormsHelper::get_form_style_class( $args['form'] ) ) . '"><div class="frm-redirect-msg" role="status">' . $success_msg . '<br/>' .
3197	2836	self::get_redirect_fallback_message( $success_url, $args ) .
3198	2837	'</div></div>';
3199	2838
3200	2839	$redirect_args = array(
		@@ -3212,14 +2851,12 @@
3212	2851	* @since 6.3.1
3213	2852	*
3214	2853	* @param string $success_url Redirect URL.
3215	2854	* @param array $args Contains `form` object.
3216		- *
3217	2855	* @return string
3218	2856	*/
3219	2857	private static function get_redirect_fallback_message( $success_url, $args ) {
3220	2858	$target = '';
3221		-
3222	2859	if ( ! empty( $args['form']->options['open_in_new_tab'] ) ) {
3223	2860	$target = ' target="_blank"';
3224	2861	}
3225	2862
		@@ -3234,12 +2871,8 @@
3234	2871	/**
3235	2872	* Prepare to show the success message and empty form after submit
3236	2873	*
3237	2874	* @since 2.05
3238		- *
3239		- * @param array $atts
3240		- *
3241		- * @return void
3242	2875	*/
3243	2876	public static function show_message_after_save( $atts ) {
3244	2877	$atts['message'] = self::prepare_submit_message( $atts['form'], $atts['entry_id'], $atts );
3245	2878
		@@ -3245,9 +2878,8 @@
3245	2878
3246	2879	if ( ! isset( $atts['form']->options['show_form'] ) || $atts['form']->options['show_form'] ) {
3247	2880	if ( isset( $atts['action'] ) && 'update' === $atts['action'] && is_callable( array( 'FrmProEntriesController', 'show_front_end_form_with_entry' ) ) ) {
3248	2881	$entry = FrmEntry::getOne( $atts['entry_id'] );
3249		-
3250	2882	if ( $entry ) {
3251	2883	// This is copied from the Pro plugin.
3252	2884	$atts['conf_message'] = FrmProEntriesController::confirmation( 'message', $atts['form'], $atts['form']->options, $entry->id, $atts );
3253	2885	$atts['show_form'] = FrmProEntriesController::is_form_displayed_after_edit( $atts['form'] );
		@@ -3264,12 +2896,8 @@
3264	2896	/**
3265	2897	* Show an empty form
3266	2898	*
3267	2899	* @since 2.05
3268		- *
3269		- * @param array $args
3270		- *
3271		- * @return void
3272	2900	*/
3273	2901	private static function show_form_after_submit( $args ) {
3274	2902	self::fill_atts_for_form_display( $args );
3275	2903
		@@ -3288,11 +2916,12 @@
3288	2916	}
3289	2917	unset( $args );
3290	2918
3291	2919	$include_form_tag = apply_filters( 'frm_include_form_tag', true, $form );
3292		- $frm_settings = FrmAppHelper::get_settings();
3293		- $submit = $form->options['submit_value'] ?? $frm_settings->submit_value;
3294	2920
	2921	+ $frm_settings = FrmAppHelper::get_settings();
	2922	+ $submit = isset( $form->options['submit_value'] ) ? $form->options['submit_value'] : $frm_settings->submit_value;
	2923	+
3295	2924	global $frm_vars;
3296	2925	self::maybe_load_css( $form, $values['custom_style'], $frm_vars['load_css'] );
3297	2926
3298	2927	$message_placement = self::message_placement( $form, $message );
		@@ -3300,36 +2929,25 @@
3300	2929	include FrmAppHelper::plugin_path() . '/classes/views/frm-entries/new.php';
3301	2930	}
3302	2931
3303	2932	/**
3304		- * Gets message placement.
3305		- *
3306	2933	* @since 4.05.02
3307		- * @since 6.26 This method changed from `private` to `public`.
3308		- *
3309		- * @param object $form Form object.
3310		- * @param string $message The message.
3311		- *
3312		- * @return string Accepts 'before', 'after', or 'submit'.
	2934	+ * @return string - 'before', 'after', or 'submit'
3313	2935	*/
3314		- public static function message_placement( $form, $message ) {
	2936	+ private static function message_placement( $form, $message ) {
3315	2937	$place = 'before';
3316	2938
3317	2939	if ( $message && isset( $form->options['form_class'] ) ) {
3318		- if ( str_contains( $form->options['form_class'], 'frm_below_success' ) ) {
	2940	+ if ( strpos( $form->options['form_class'], 'frm_below_success' ) !== false ) {
3319	2941	$place = 'after';
3320		- } elseif ( str_contains( $form->options['form_class'], 'frm_inline_success' ) ) {
	2942	+ } elseif ( strpos( $form->options['form_class'], 'frm_inline_success' ) !== false ) {
3321	2943	$place = 'submit';
3322	2944	}
3323	2945	}
3324	2946
3325	2947	/**
3326		- * Filter the message placement.
3327		- *
3328	2948	* @since 4.05.02
3329		- *
3330		- * @param string $place Accepts 'before', 'after', or 'submit'.
3331		- * @param array $args Args.
	2949	+ * @return string - 'before' or 'after'
3332	2950	*/
3333	2951	return apply_filters( 'frm_message_placement', $place, compact( 'form', 'message' ) );
3334	2952	}
3335	2953
		@@ -3336,12 +2954,8 @@
3336	2954	/**
3337	2955	* Get all the values needed on the new.php entry page
3338	2956	*
3339	2957	* @since 2.05
3340		- *
3341		- * @param array $args
3342		- *
3343		- * @return void
3344	2958	*/
3345	2959	private static function fill_atts_for_form_display( &$args ) {
3346	2960	if ( ! isset( $args['title'] ) && isset( $args['show_title'] ) ) {
3347	2961	$args['title'] = $args['show_title'];
		@@ -3366,12 +2980,8 @@
3366	2980	/**
3367	2981	* Show the success message without the form
3368	2982	*
3369	2983	* @since 2.05
3370		- *
3371		- * @param array $atts
3372		- *
3373		- * @return void
3374	2984	*/
3375	2985	private static function show_lone_success_message( $atts ) {
3376	2986	global $frm_vars;
3377	2987	$values = FrmEntriesHelper::setup_new_vars( $atts['fields'], $atts['form'], true );
		@@ -3377,12 +2987,13 @@
3377	2987	$values = FrmEntriesHelper::setup_new_vars( $atts['fields'], $atts['form'], true );
3378	2988	self::maybe_load_css( $atts['form'], $values['custom_style'], $frm_vars['load_css'] );
3379	2989
3380	2990	$include_extra_container = 'frm_forms' . FrmFormsHelper::get_form_style_class( $values );
3381		- $errors = array();
3382		- $form = $atts['form'];
3383		- $message = $atts['message'];
3384	2991
	2992	+ $errors = array();
	2993	+ $form = $atts['form'];
	2994	+ $message = $atts['message'];
	2995	+
3385	2996	include FrmAppHelper::plugin_path() . '/classes/views/frm-entries/errors.php';
3386	2997	}
3387	2998
3388	2999	/**
		@@ -3393,17 +3004,16 @@
3393	3004	*
3394	3005	* @param object $form Form object.
3395	3006	* @param int $entry_id Entry ID.
3396	3007	* @param array $args See {@see FrmFormsController::run_success_action()}.
3397		- *
3398	3008	* @return string
3399	3009	*/
3400	3010	private static function prepare_submit_message( $form, $entry_id, $args = array() ) {
3401	3011	$frm_settings = FrmAppHelper::get_settings( array( 'current_form' => $form->id ) );
3402		- $opt = $args['success_opt'] ?? 'success';
	3012	+ $opt = isset( $args['success_opt'] ) ? $args['success_opt'] : 'success';
3403	3013
3404	3014	if ( $entry_id && is_numeric( $entry_id ) ) {
3405		- $message = $form->options[ $opt . '_msg' ] ?? $frm_settings->success_msg;
	3015	+ $message = isset( $form->options[ $opt . '_msg' ] ) ? $form->options[ $opt . '_msg' ] : $frm_settings->success_msg;
3406	3016	$class = 'frm_message';
3407	3017	} else {
3408	3018	$message = $frm_settings->failed_msg;
3409	3019	$class = FrmFormsHelper::form_error_class();
		@@ -3420,9 +3030,9 @@
3420	3030	public static function front_head() {
3421	3031	$version = FrmAppHelper::plugin_version();
3422	3032	$suffix = FrmAppHelper::js_suffix();
3423	3033
3424		- if ( $suffix && self::has_combo_js_file() ) {
	3034	+ if ( ! empty( $suffix ) && self::has_combo_js_file() ) {
3425	3035	wp_register_script( 'formidable', FrmAppHelper::plugin_url() . '/js/frm.min.js', array( 'jquery' ), $version, true );
3426	3036	} else {
3427	3037	wp_register_script( 'formidable', FrmAppHelper::plugin_url() . "/js/formidable{$suffix}.js", array( 'jquery' ), $version, true );
3428	3038	}
		@@ -3444,15 +3054,8 @@
3444	3054	public static function has_combo_js_file() {
3445	3055	return is_readable( FrmAppHelper::plugin_path() . '/js/frm.min.js' );
3446	3056	}
3447	3057
3448		- /**
3449		- * @param object $form
3450		- * @param int|string $this_load
3451		- * @param bool $global_load
3452		- *
3453		- * @return void
3454		- */
3455	3058	public static function maybe_load_css( $form, $this_load, $global_load ) {
3456	3059	$load_css = FrmForm::is_form_loaded( $form, $this_load, $global_load );
3457	3060
3458	3061	if ( ! $load_css ) {
		@@ -3482,9 +3085,8 @@
3482	3085	return;
3483	3086	}
3484	3087
3485	3088	global $wp_styles;
3486		-
3487	3089	if ( is_array( $wp_styles->queue ) && in_array( 'formidable', $wp_styles->queue, true ) ) {
3488	3090	wp_print_styles( 'formidable' );
3489	3091	}
3490	3092	}
		@@ -3499,16 +3101,10 @@
3499	3101	private static function should_load_late() {
3500	3102	return ! function_exists( 'aioseo' );
3501	3103	}
3502	3104
3503		- /**
3504		- * @param string $tag
3505		- * @param string $handle
3506		- *
3507		- * @return string
3508		- */
3509	3105	public static function defer_script_loading( $tag, $handle ) {
3510		- if ( 'captcha-api' === $handle && ! str_contains( $tag, 'defer' ) ) {
	3106	+ if ( 'captcha-api' == $handle && ! strpos( $tag, 'defer' ) ) {
3511	3107	$tag = str_replace( ' src', ' defer="defer" async="async" src', $tag );
3512	3108	}
3513	3109
3514	3110	return $tag;
		@@ -3513,13 +3109,8 @@
3513	3109
3514	3110	return $tag;
3515	3111	}
3516	3112
3517		- /**
3518		- * @param string $location
3519		- *
3520		- * @return void
3521		- */
3522	3113	public static function footer_js( $location = 'footer' ) {
3523	3114	global $frm_vars;
3524	3115
3525	3116	FrmStylesController::enqueue_css();
		@@ -3526,20 +3117,13 @@
3526	3117
3527	3118	if ( ! FrmAppHelper::is_admin() && $location !== 'header' && ! empty( $frm_vars['forms_loaded'] ) ) {
3528	3119	// load formidable js
3529	3120	wp_enqueue_script( 'formidable' );
3530		-
3531		- FrmHoneypot::maybe_print_honeypot_js();
3532	3121	}
3533	3122	}
3534	3123
3535	3124	/**
3536	3125	* @since 2.0.8
3537		- *
3538		- * @param array $atts
3539		- * @param string $content
3540		- *
3541		- * @return void
3542	3126	*/
3543	3127	private static function maybe_minimize_form( $atts, &$content ) {
3544	3128	// check if minimizing is turned on
3545	3129	if ( self::is_minification_on( $atts ) ) {
		@@ -3548,11 +3132,8 @@
3548	3132	}
3549	3133
3550	3134	/**
3551	3135	* @since 2.0.8
3552		- *
3553		- * @param array $atts
3554		- *
3555	3136	* @return bool
3556	3137	*/
3557	3138	private static function is_minification_on( $atts ) {
3558	3139	return ! empty( $atts['minimize'] );
		@@ -3564,13 +3145,11 @@
3564	3145	* @return void
3565	3146	*/
3566	3147	public static function landing_page_preview_option() {
3567	3148	$dir = apply_filters( 'frm_landing_page_preview_option', false );
3568		-
3569	3149	if ( false === $dir || ! file_exists( $dir . 'landing-page-preview-option.php' ) ) {
3570	3150	$dir = self::get_form_views_path();
3571	3151	}
3572		-
3573	3152	include $dir . 'landing-page-preview-option.php';
3574	3153	}
3575	3154
3576	3155	/**
		@@ -3596,15 +3175,13 @@
3596	3175
3597	3176	check_ajax_referer( 'frm_ajax', 'nonce' );
3598	3177
3599	3178	$type = FrmAppHelper::get_post_param( 'type', '', 'sanitize_text_field' );
3600		-
3601	3179	if ( ! $type || ! in_array( $type, array( 'form', 'view' ), true ) ) {
3602	3180	die( 0 );
3603	3181	}
3604	3182
3605	3183	$object_id = FrmAppHelper::get_post_param( 'object_id', '', 'absint' );
3606		-
3607	3184	if ( ! $object_id ) {
3608	3185	die( 0 );
3609	3186	}
3610	3187
		@@ -3616,15 +3193,13 @@
3616	3193	$postarr['post_content'] = apply_filters( 'frm_create_page_with_' . $type . '_shortcode_content', '', $object_id );
3617	3194	}
3618	3195
3619	3196	$name = FrmAppHelper::get_post_param( 'name', '', 'sanitize_text_field' );
3620		-
3621	3197	if ( $name ) {
3622	3198	$postarr['post_title'] = $name;
3623	3199	}
3624	3200
3625	3201	$success = wp_insert_post( $postarr );
3626		-
3627	3202	if ( ! is_numeric( $success ) || ! $success ) {
3628	3203	die( 0 );
3629	3204	}
3630	3205
		@@ -3638,9 +3213,8 @@
3638	3213	/**
3639	3214	* @since 5.3
3640	3215	*
3641	3216	* @param int $form_id
3642		- *
3643	3217	* @return string
3644	3218	*/
3645	3219	private static function get_page_shortcode_content_for_form( $form_id ) {
3646	3220	$shortcode = '[formidable id="' . $form_id . '"]';
		@@ -3682,14 +3256,23 @@
3682	3256	}
3683	3257
3684	3258	/**
3685	3259	* @deprecated 4.0
	3260	+ */
	3261	+ public static function create( $values = array() ) {
	3262	+ _deprecated_function( __METHOD__, '4.0', 'FrmFormsController::update' );
	3263	+ self::update( $values );
	3264	+ }
	3265	+
	3266	+ /**
	3267	+ * Education for premium features.
3686	3268	*
3687		- * @param array $values
	3269	+ * @since 4.05
	3270	+ * @deprecated 6.16.3
3688	3271	*
3689	3272	* @return void
3690	3273	*/
3691		- public static function create( $values = array() ) {
3692		- _deprecated_function( __METHOD__, '4.0', 'FrmFormsController::update' );
3693		- self::update( $values );
	3274	+ public static function add_form_style_tab_options() {
	3275	+ _deprecated_function( __METHOD__, '6.16.3' );
	3276	+ include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/add_form_style_options.php';
3694	3277	}
3695	3278	}