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