← All changes | classes/controllers/FrmFormsController.php +245 -675 6.28 → 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,31 +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		- $error = __( 'You do not have permission to view this form', 'formidable' );
770		- wp_die(
771		- '<h1>' . esc_html( $error ) . '</h1>',
772		- '<p>' . esc_html( $error ) . '</p>',
773		- 403
774		- );
775		- }
776		- }
777		-
778		- /**
779	641	* Some themes have a null $src value.
780	642	* This function adds a filter to ensure that $src is not null.
781	643	* WP will call str_starts_with with the null value triggering a deprecated message otherwise.
782	644	*
		@@ -788,13 +650,15 @@
788	650	add_filter(
789	651	'script_loader_src',
790	652	/**
791	653	* @param string|null $src
792		- *
793	654	* @return string
794	655	*/
795	656	function ( $src ) {
796		- return is_null( $src ) ? '' : $src;
	657	+ if ( is_null( $src ) ) {
	658	+ $src = '';
	659	+ }
	660	+ return $src;
797	661	}
798	662	);
799	663	}
800	664
		@@ -803,9 +667,8 @@
803	667	}
804	668
805	669	/**
806	670	* @param array $ids
807		- *
808	671	* @return string
809	672	*/
810	673	public static function bulk_untrash( $ids ) {
811	674	FrmAppHelper::permission_check( 'frm_edit_forms' );
		@@ -817,9 +680,11 @@
817	680	return '';
818	681	}
819	682
820	683	/* translators: %1$s: Number of forms */
821		- 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;
822	687	}
823	688
824	689	/**
825	690	* @since 3.06
		@@ -864,9 +729,8 @@
864	729	// Check nonce url.
865	730	check_admin_referer( $status . '_form_' . $params['id'] );
866	731
867	732	$count = 0;
868		-
869	733	if ( FrmForm::set_status( $params['id'], $available_status[ $status ]['new_status'] ) ) {
870	734	++$count;
871	735	}
872	736
		@@ -880,9 +744,9 @@
880	744	/* translators: %1$s: Number of forms */
881	745	$available_status['untrash']['message'] = sprintf( _n( '%1$s form restored from the Trash.', '%1$s forms restored from the Trash.', $count, 'formidable' ), $count );
882	746
883	747	/* translators: %1$s: Number of forms, %2$s: Start link HTML, %3$s: End link HTML */
884		- $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>' );
885	749
886	750	$message = $available_status[ $status ]['message'];
887	751
888	752	self::display_forms_list( $params, $message );
		@@ -889,9 +753,8 @@
889	753	}
890	754
891	755	/**
892	756	* @param array $ids
893		- *
894	757	* @return string
895	758	*/
896	759	public static function bulk_trash( $ids ) {
897	760	FrmAppHelper::permission_check( 'frm_delete_forms' );
		@@ -896,9 +759,8 @@
896	759	public static function bulk_trash( $ids ) {
897	760	FrmAppHelper::permission_check( 'frm_delete_forms' );
898	761
899	762	$count = 0;
900		-
901	763	foreach ( $ids as $id ) {
902	764	if ( FrmForm::trash( $id ) ) {
903	765	++$count;
904	766	}
		@@ -913,16 +775,17 @@
913	775	'param' => 'form_type',
914	776	'type' => 'request',
915	777	)
916	778	);
917		-
918		- return sprintf(
	779	+ $message = sprintf(
919	780	/* translators: %1$s: Number of forms, %2$s: Start link HTML, %3$s: End link HTML */
920	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' ),
921	782	$count,
922		- '<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' ) ) . '">',
923	784	'</a>'
924	785	);
	786	+
	787	+ return $message;
925	788	}
926	789
927	790	public static function destroy() {
928	791	FrmAppHelper::permission_check( 'frm_delete_forms' );
		@@ -932,9 +795,8 @@
932	795	// Check nonce url.
933	796	check_admin_referer( 'destroy_form_' . $params['id'] );
934	797
935	798	$count = 0;
936		-
937	799	if ( FrmForm::destroy( $params['id'] ) ) {
938	800	++$count;
939	801	}
940	802
		@@ -945,9 +807,8 @@
945	807	}
946	808
947	809	/**
948	810	* @param array $ids
949		- *
950	811	* @return string
951	812	*/
952	813	public static function bulk_destroy( $ids ) {
953	814	FrmAppHelper::permission_check( 'frm_delete_forms' );
		@@ -952,12 +813,10 @@
952	813	public static function bulk_destroy( $ids ) {
953	814	FrmAppHelper::permission_check( 'frm_delete_forms' );
954	815
955	816	$count = 0;
956		-
957	817	foreach ( $ids as $id ) {
958	818	$d = FrmForm::destroy( $id );
959		-
960	819	if ( $d ) {
961	820	++$count;
962	821	}
963	822	}
		@@ -975,18 +834,19 @@
975	834	*/
976	835	public static function delete_all() {
977	836	// Check nonce url.
978	837	$permission_error = FrmAppHelper::permission_nonce_error( 'frm_delete_forms', '_wpnonce', 'bulk-toplevel_page_formidable' );
979		-
980	838	if ( $permission_error !== false ) {
981	839	self::display_forms_list( array(), '', array( $permission_error ) );
	840	+
982	841	return;
983	842	}
984	843
985	844	$count = FrmForm::scheduled_delete( time() );
986	845	$url = remove_query_arg( array( 'delete_all' ) );
987		- $url .= '&message=forms_permanently_deleted&forms_deleted=' . $count;
988	846
	847	+ $url .= '&message=forms_permanently_deleted&forms_deleted=' . $count;
	848	+
989	849	wp_safe_redirect( $url );
990	850	die();
991	851	}
992	852
		@@ -1060,23 +920,21 @@
1060	920	*
1061	921	* @return void
1062	922	*/
1063	923	public static function insert_form_button() {
1064		- if ( ! current_user_can( 'frm_view_forms' ) ) {
1065		- 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
1066	936	}
1067		-
1068		- // Store the result in memory and re-use it when this function is called multiple times.
1069		- // This helps speed up the form builder when there are a lot of HTML fields, where this
1070		- // Button is inserted once per HTML field.
1071		- // In a form with 66 HTML fields, this saves 0.5 seconds on page load time, tested locally.
1072		- if ( ! isset( self::$formidable_tinymce_button ) ) {
1073		- FrmAppHelper::load_admin_wide_js();
1074		- $menu_name = FrmAppHelper::get_menu_name();
1075		- $icon = apply_filters( 'frm_media_icon', FrmAppHelper::svg_logo() );
1076		- 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
1077		- }
1078		- echo self::$formidable_tinymce_button; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
1079	937	}
1080	938
1081	939	/**
1082	940	* @return void
		@@ -1097,21 +955,17 @@
1097	955	$shortcodes = apply_filters( 'frm_popup_shortcodes', $shortcodes );
1098	956
1099	957	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/insert_form_popup.php';
1100	958
1101		- if ( ! FrmAppHelper::is_form_builder_page() || class_exists( '_WP_Editors', false ) ) {
1102		- 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
1103	967	}
1104		-
1105		- // Initialize a wysiwyg so we have usable settings defined in tinyMCEPreInit.mceInit
1106		- require ABSPATH . WPINC . '/class-wp-editor.php';
1107		- // phpcs:disable Generic.WhiteSpace.ScopeIndent
1108		- ?>
1109		- <div class="frm_hidden">
1110		- <?php wp_editor( '', 'frm_description_placeholder', array() ); ?>
1111		- </div>
1112		- <?php
1113		- // phpcs:enable Generic.WhiteSpace.ScopeIndent
1114	968	}
1115	969
1116	970	/**
1117	971	* Check the page being loaded, determine if this is a page that should include the form popup.
		@@ -1123,9 +977,8 @@
1123	977	private static function should_insert_form_popup() {
1124	978	if ( FrmAppHelper::is_form_builder_page() ) {
1125	979	return true;
1126	980	}
1127		-
1128	981	$page = basename( FrmAppHelper::get_server_value( 'PHP_SELF' ) );
1129	982	return in_array( $page, array( 'post.php', 'page.php', 'page-new.php', 'post-new.php' ), true );
1130	983	}
1131	984
		@@ -1133,10 +986,9 @@
1133	986	FrmAppHelper::permission_check( 'frm_view_forms' );
1134	987	check_ajax_referer( 'frm_ajax', 'nonce' );
1135	988
1136	989	$shortcode = FrmAppHelper::get_post_param( 'shortcode', '', 'sanitize_text_field' );
1137		-
1138		- if ( ! $shortcode ) {
	990	+ if ( empty( $shortcode ) ) {
1139	991	wp_die();
1140	992	}
1141	993
1142	994	echo '<div id="sc-opts-' . esc_attr( $shortcode ) . '" class="frm_shortcode_option">';
		@@ -1161,13 +1013,12 @@
1161	1013	'label' => __( 'Minimize form HTML', 'formidable' ),
1162	1014	),
1163	1015	);
1164	1016	}
1165		-
1166	1017	$opts = apply_filters( 'frm_sc_popup_opts', $opts, $shortcode );
1167	1018
1168	1019	if ( isset( $opts['form_id'] ) && is_string( $opts['form_id'] ) ) {
1169		- // Allow other shortcodes to use the required form id option
	1020	+ // allow other shortcodes to use the required form id option
1170	1021	$form_id = $opts['form_id'];
1171	1022	unset( $opts['form_id'] );
1172	1023	}
1173	1024
		@@ -1183,9 +1034,8 @@
1183	1034	*
1184	1035	* @param array $params
1185	1036	* @param string $message
1186	1037	* @param array $errors
1187		- *
1188	1038	* @return void
1189	1039	*/
1190	1040	public static function display_forms_list( $params = array(), $message = '', $errors = array() ) {
1191	1041	FrmAppHelper::permission_check( 'frm_view_forms' );
		@@ -1202,44 +1052,33 @@
1202	1052	* @param string $table_class Class name for List Helper.
1203	1053	*/
1204	1054	$table_class = apply_filters( 'frm_forms_list_class', 'FrmFormsListHelper' );
1205	1055	$wp_list_table = new $table_class( compact( 'params' ) );
1206		- $pagenum = $wp_list_table->get_pagenum();
1207	1056
	1057	+ $pagenum = $wp_list_table->get_pagenum();
	1058	+
1208	1059	$wp_list_table->prepare_items();
1209	1060
1210	1061	$total_pages = $wp_list_table->get_pagination_arg( 'total_pages' );
1211		-
1212	1062	if ( $pagenum > $total_pages && $total_pages > 0 ) {
1213		- wp_safe_redirect( esc_url_raw( add_query_arg( 'paged', $total_pages ) ) );
	1063	+ wp_redirect( esc_url_raw( add_query_arg( 'paged', $total_pages ) ) );
1214	1064	die();
1215	1065	}
1216	1066
1217		- $error = FrmInbox::check_for_error();
1218		-
1219		- if ( $error ) {
1220		- $show_messages = array( $error['subject'] . '. ' . $error['message'] );
1221		- }
1222		-
1223	1067	require FrmAppHelper::plugin_path() . '/classes/views/frm-forms/list.php';
1224	1068	}
1225	1069
1226	1070	/**
1227	1071	* @param array<string,string> $columns
1228		- *
1229	1072	* @return array<string,string>
1230	1073	*/
1231	1074	public static function get_columns( $columns ) {
1232		- $columns['cb'] = '<input type="checkbox" />';
1233		- $columns['name'] = esc_html__( 'Form Title', 'formidable' );
1234		- $columns['entries'] = esc_html__( 'Entries', 'formidable' );
1235		- $columns['id'] = 'ID';
1236		- $columns['form_key'] = esc_html__( 'Key', 'formidable' );
1237		-
1238		- if ( 'trash' !== FrmAppHelper::simple_get( 'form_type' ) ) {
1239		- $columns['shortcode'] = esc_html__( 'Actions', 'formidable' );
1240		- }
1241		-
	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' );
1242	1081	$columns['created_at'] = esc_html__( 'Date', 'formidable' );
1243	1082
1244	1083	add_screen_option(
1245	1084	'per_page',
		@@ -1267,9 +1106,8 @@
1267	1106	}
1268	1107
1269	1108	/**
1270	1109	* @param mixed $hidden_columns
1271		- *
1272	1110	* @return array
1273	1111	*/
1274	1112	public static function hidden_columns( $hidden_columns ) {
1275	1113	if ( ! is_array( $hidden_columns ) ) {
		@@ -1290,18 +1128,11 @@
1290	1128
1291	1129	return $hidden_columns;
1292	1130	}
1293	1131
1294		- /**
1295		- * @param mixed $save
1296		- * @param string $option
1297		- * @param int|string $value
1298		- *
1299		- * @return mixed
1300		- */
1301	1132	public static function save_per_page( $save, $option, $value ) {
1302	1133	if ( $option === 'formidable_page_formidable_per_page' ) {
1303		- return (int) $value;
	1134	+ $save = (int) $value;
1304	1135	}
1305	1136
1306	1137	return $save;
1307	1138	}
		@@ -1310,9 +1141,8 @@
1310	1141	* @param int|string $id
1311	1142	* @param array $errors
1312	1143	* @param string $message
1313	1144	* @param bool $create_link
1314		- *
1315	1145	* @return void
1316	1146	*/
1317	1147	private static function get_edit_vars( $id, $errors = array(), $message = '', $create_link = false ) {
1318	1148	global $frm_vars;
		@@ -1327,9 +1157,8 @@
1327	1157	'page' => 'formidable',
1328	1158	)
1329	1159	),
1330	1160	);
1331		-
1332	1161	if ( ! $form ) {
1333	1162	FrmAppController::show_error_modal( $error_args );
1334	1163	return;
1335	1164	}
		@@ -1351,14 +1180,15 @@
1351	1180	}
1352	1181
1353	1182	if ( $form->parent_form_id ) {
1354	1183	/* translators: %1$s: Start link HTML, %2$s: End link HTML */
1355		- 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>' ) );
1356	1185	}
1357	1186
1358	1187	$frm_field_selection = FrmField::field_selection();
1359		- $fields = FrmField::get_all_for_form( $form->id );
1360	1188
	1189	+ $fields = FrmField::get_all_for_form( $form->id );
	1190	+
1361	1191	// Automatically add end section fields if they don't exist (2.0 migration).
1362	1192	$reset_fields = false;
1363	1193	FrmFormsHelper::auto_add_end_section_fields( $form, $fields, $reset_fields );
1364	1194	FrmSubmitHelper::maybe_create_submit_field( $form, $fields, $reset_fields );
		@@ -1382,10 +1212,9 @@
1382	1212	*/
1383	1213	$values['fields'] = apply_filters( 'frm_fields_in_form_builder', $fields, compact( 'form' ) );
1384	1214
1385	1215	$edit_message = __( 'Form was successfully updated.', 'formidable' );
1386		-
1387		- if ( $form->is_template && $message === $edit_message ) {
	1216	+ if ( $form->is_template && $message == $edit_message ) {
1388	1217	$message = __( 'Template was successfully updated.', 'formidable' );
1389	1218	}
1390	1219
1391	1220	self::maybe_update_form_builder_message( $message );
		@@ -1400,12 +1229,11 @@
1400	1229	}
1401	1230
1402	1231	/**
1403	1232	* @param array $fields
1404		- *
1405	1233	* @return array
1406	1234	*/
1407		- public static function update_form_builder_fields( $fields ) {
	1235	+ public static function update_form_builder_fields( $fields, $form ) {
1408	1236	foreach ( $fields as $field ) {
1409	1237	$field->do_not_include_icons = true;
1410	1238	}
1411	1239	return $fields;
		@@ -1410,13 +1238,8 @@
1410	1238	}
1411	1239	return $fields;
1412	1240	}
1413	1241
1414		- /**
1415		- * @param string $message
1416		- *
1417		- * @return void
1418		- */
1419	1242	public static function maybe_update_form_builder_message( &$message ) {
1420	1243	if ( 'form_duplicated' === FrmAppHelper::simple_get( 'message' ) ) {
1421	1244	$message = __( 'Form was Successfully Copied', 'formidable' );
1422	1245	}
		@@ -1425,9 +1248,8 @@
1425	1248	/**
1426	1249	* @param int|string $id
1427	1250	* @param array $errors
1428	1251	* @param array|string $args
1429		- *
1430	1252	* @return void
1431	1253	*/
1432	1254	public static function get_settings_vars( $id, $errors = array(), $args = array() ) {
1433	1255	FrmAppHelper::permission_check( 'frm_edit_forms' );
		@@ -1449,12 +1271,13 @@
1449	1271	);
1450	1272	$args = array_merge( $defaults, $args );
1451	1273	$message = $args['message'];
1452	1274	$warnings = $args['warnings'];
1453		- $form = FrmForm::getOne( $id );
1454		- $fields = FrmField::get_all_for_form( $id );
1455		- $values = FrmAppHelper::setup_edit_vars( $form, 'forms', $fields, true );
1456	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	+
1457	1280	/**
1458	1281	* Allows changing fields in the form settings.
1459	1282	*
1460	1283	* @since 5.0.04
		@@ -1494,12 +1317,8 @@
1494	1317	}
1495	1318
1496	1319	/**
1497	1320	* @since 4.0
1498		- *
1499		- * @param array $atts
1500		- *
1501		- * @return void
1502	1321	*/
1503	1322	public static function form_publish_button( $atts ) {
1504	1323	$values = $atts['values'];
1505	1324	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/_publish_box.php';
		@@ -1510,9 +1329,8 @@
1510	1329	*
1511	1330	* @since 4.0
1512	1331	*
1513	1332	* @param array $values
1514		- *
1515	1333	* @return array
1516	1334	*/
1517	1335	private static function get_settings_tabs( $values ) {
1518	1336	$sections = array(
		@@ -1518,20 +1336,20 @@
1518	1336	$sections = array(
1519	1337	'advanced' => array(
1520	1338	'name' => __( 'General', 'formidable' ),
1521	1339	'title' => __( 'General Form Settings', 'formidable' ),
1522		- 'function' => array( self::class, 'advanced_settings' ),
1523		- 'icon' => 'frmfont frm_settings_icon',
	1340	+ 'function' => array( __CLASS__, 'advanced_settings' ),
	1341	+ 'icon' => 'frm_icon_font frm_settings_icon',
1524	1342	),
1525	1343	'email' => array(
1526	1344	'name' => __( 'Actions & Notifications', 'formidable' ),
1527	1345	'function' => array( 'FrmFormActionsController', 'email_settings' ),
1528	1346	'id' => 'frm_notification_settings',
1529		- 'icon' => 'frmfont frm_mail_bulk_icon',
	1347	+ 'icon' => 'frm_icon_font frm_mail_bulk_icon',
1530	1348	),
1531	1349	'permissions' => array(
1532	1350	'name' => __( 'Form Permissions', 'formidable' ),
1533		- 'icon' => 'frmfont frm_lock_closed_icon',
	1351	+ 'icon' => 'frm_icon_font frm_lock_closed_icon',
1534	1352	'html_class' => 'frm_show_upgrade_tab frm_noallow',
1535	1353	'data' => array(
1536	1354	'medium' => 'permissions',
1537	1355	'upgrade' => __( 'Form Permissions', 'formidable' ),
		@@ -1536,37 +1354,35 @@
1536	1354	'medium' => 'permissions',
1537	1355	'upgrade' => __( 'Form Permissions', 'formidable' ),
1538	1356	'message' => __( 'Allow editing, protect forms and files, limit entries, and save drafts. Upgrade to get form and entry permissions.', 'formidable' ),
1539	1357	'screenshot' => 'permissions.png',
1540		- 'learn-more' => FrmAppHelper::get_doc_url( 'general-form-settings/#kb-form-permissions', 'form-permissions-settings' ),
1541	1358	),
1542	1359	),
1543	1360	'scheduling' => array(
1544	1361	'name' => __( 'Form Scheduling', 'formidable' ),
1545		- 'icon' => 'frmfont frm_calendar_icon',
	1362	+ 'icon' => 'frm_icon_font frm_calendar_icon',
1546	1363	'html_class' => 'frm_show_upgrade_tab frm_noallow',
1547	1364	'data' => array(
1548	1365	'medium' => 'scheduling',
1549	1366	'upgrade' => __( 'Form scheduling settings', 'formidable' ),
1550	1367	'screenshot' => 'scheduling.png',
1551		- 'learn-more' => FrmAppHelper::get_doc_url( 'general-form-settings/#kb-form-scheduling', 'form-scheduling-settings' ),
1552	1368	),
1553	1369	),
1554	1370	'buttons' => array(
1555	1371	'name' => __( 'Buttons', 'formidable' ),
1556		- 'class' => self::class,
	1372	+ 'class' => __CLASS__,
1557	1373	'function' => 'buttons_settings',
1558		- 'icon' => 'frmfont frm_button_icon',
	1374	+ 'icon' => 'frm_icon_font frm_button_icon',
1559	1375	),
1560	1376	'landing' => array(
1561	1377	'name' => __( 'Form Landing Page', 'formidable' ),
1562		- 'icon' => 'frmfont frm_file_text_icon',
	1378	+ 'icon' => 'frm_icon_font frm_file_text_icon',
1563	1379	'html_class' => 'frm_show_upgrade_tab frm_noallow',
1564	1380	'data' => FrmAppHelper::get_landing_page_upgrade_data_params(),
1565	1381	),
1566	1382	'chat' => array(
1567	1383	'name' => __( 'Conversational Forms', 'formidable' ),
1568		- 'icon' => 'frmfont frm_chat_forms_icon',
	1384	+ 'icon' => 'frm_icon_font frm_chat_forms_icon',
1569	1385	'html_class' => 'frm_show_upgrade_tab frm_noallow',
1570	1386	'data' => FrmAppHelper::get_upgrade_data_params(
1571	1387	'chat',
1572	1388	array(
		@@ -1572,15 +1388,14 @@
1572	1388	array(
1573	1389	'upgrade' => __( 'Conversational Forms', 'formidable' ),
1574	1390	'message' => __( 'Ask one question at a time for automated conversations.', 'formidable' ),
1575	1391	'screenshot' => 'chat.png',
1576		- 'learn-more' => FrmAppHelper::get_doc_url( 'conversational-forms', 'conversational-forms-settings', false ),
1577	1392	)
1578	1393	),
1579	1394	),
1580	1395	'abandonment' => array(
1581	1396	'name' => __( 'Form Abandonment', 'formidable' ),
1582		- 'icon' => 'frmfont frm_abandoned_icon',
	1397	+ 'icon' => 'frm_icon_font frm_abandoned_icon',
1583	1398	'html_class' => 'frm_show_upgrade_tab frm_noallow',
1584	1399	'data' => FrmAppHelper::get_upgrade_data_params(
1585	1400	'abandonment',
1586	1401	array(
		@@ -1586,17 +1401,16 @@
1586	1401	array(
1587	1402	'upgrade' => __( 'Form abandonment settings', 'formidable' ),
1588	1403	'message' => __( 'Unlock the power of data capture to boost lead generation and master the art of form optimization.', 'formidable' ),
1589	1404	'screenshot' => 'abandonment.png',
1590		- 'learn-more' => FrmAppHelper::get_doc_url( 'features/form-abandonment-wordpress-plugin', 'form-abandonment-settings', false ),
1591	1405	)
1592	1406	),
1593	1407	),
1594	1408	'html' => array(
1595	1409	'name' => __( 'Customize HTML', 'formidable' ),
1596		- 'class' => self::class,
	1410	+ 'class' => __CLASS__,
1597	1411	'function' => 'html_settings',
1598		- 'icon' => 'frmfont frm_code_icon',
	1412	+ 'icon' => 'frm_icon_font frm_code_icon',
1599	1413	),
1600	1414	);
1601	1415
1602	1416	if ( ! has_action( 'frm_add_form_style_tab_options' ) && ! has_action( 'frm_add_form_button_options' ) ) {
		@@ -1602,8 +1416,14 @@
1602	1416	if ( ! has_action( 'frm_add_form_style_tab_options' ) && ! has_action( 'frm_add_form_button_options' ) ) {
1603	1417	unset( $sections['buttons'] );
1604	1418	}
1605	1419
	1420	+ foreach ( array( 'landing', 'chat', 'abandonment' ) as $feature ) {
	1421	+ if ( ! FrmAppHelper::show_new_feature( $feature ) ) {
	1422	+ unset( $sections[ $feature ] );
	1423	+ }
	1424	+ }
	1425	+
1606	1426	$sections = apply_filters( 'frm_add_form_settings_section', $sections, $values );
1607	1427
1608	1428	foreach ( $sections as $key => $section ) {
1609	1429	$defaults = array(
		@@ -1608,9 +1428,9 @@
1608	1428	foreach ( $sections as $key => $section ) {
1609	1429	$defaults = array(
1610	1430	'html_class' => '',
1611	1431	'name' => ucfirst( $key ),
1612		- 'icon' => 'frmfont frm_settings_icon',
	1432	+ 'icon' => 'frm_icon_font frm_settings_icon',
1613	1433	);
1614	1434
1615	1435	$section = array_merge( $defaults, $section );
1616	1436
		@@ -1616,9 +1436,8 @@
1616	1436
1617	1437	if ( ! isset( $section['anchor'] ) ) {
1618	1438	$section['anchor'] = $key;
1619	1439	}
1620		-
1621	1440	$section['anchor'] .= '_settings';
1622	1441
1623	1442	if ( ! isset( $section['title'] ) ) {
1624	1443	$section['title'] = $section['name'];
		@@ -1637,19 +1456,18 @@
1637	1456	/**
1638	1457	* @since 4.0
1639	1458	*
1640	1459	* @param array $values
1641		- *
1642	1460	* @return void
1643	1461	*/
1644	1462	public static function advanced_settings( $values ) {
1645	1463	$first_h3 = 'frm_first_h3';
	1464	+
1646	1465	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings-advanced.php';
1647	1466	}
1648	1467
1649	1468	/**
1650	1469	* @param array $values
1651		- *
1652	1470	* @return void
1653	1471	*/
1654	1472	public static function render_spam_settings( $values ) {
1655	1473	if ( function_exists( 'akismet_http_post' ) ) {
		@@ -1654,9 +1472,9 @@
1654	1472	public static function render_spam_settings( $values ) {
1655	1473	if ( function_exists( 'akismet_http_post' ) ) {
1656	1474	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/spam-settings/akismet.php';
1657	1475	}
1658		- 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';
1659	1477	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/spam-settings/antispam.php';
1660	1478	}
1661	1479
1662	1480	/**
		@@ -1662,9 +1480,8 @@
1662	1480	/**
1663	1481	* @since 4.0
1664	1482	*
1665	1483	* @param array $values
1666		- *
1667	1484	* @return void
1668	1485	*/
1669	1486	public static function buttons_settings( $values ) {
1670	1487	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings-buttons.php';
		@@ -1673,9 +1490,8 @@
1673	1490	/**
1674	1491	* @since 4.0
1675	1492	*
1676	1493	* @param array $values
1677		- *
1678	1494	* @return void
1679	1495	*/
1680	1496	public static function html_settings( $values ) {
1681	1497	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings-html.php';
		@@ -1686,9 +1502,8 @@
1686	1502	*
1687	1503	* @since 2.03.08
1688	1504	*
1689	1505	* @param array|bool $values
1690		- *
1691	1506	* @return void
1692	1507	*/
1693	1508	private static function clean_submit_html( &$values ) {
1694	1509	if ( is_array( $values ) && isset( $values['submit_html'] ) ) {
		@@ -1711,17 +1526,13 @@
1711	1526	return $classes;
1712	1527	}
1713	1528
1714	1529	/**
1715		- * @since 6.27 Added $template_path parameter.
1716		- *
1717	1530	* @param int|string $form_id
1718	1531	* @param string $class
1719		- * @param string $template_path The path to a template file to use instead of the default.
1720		- *
1721	1532	* @return void
1722	1533	*/
1723		- public static function mb_tags_box( $form_id, $class = '', $template_path = 'default' ) {
	1534	+ public static function mb_tags_box( $form_id, $class = '' ) {
1724	1535	$fields = FrmField::get_all_for_form( $form_id, '', 'include' );
1725	1536
1726	1537	/**
1727	1538	* Allows modifying the list of fields in the tags box.
		@@ -1730,30 +1541,23 @@
1730	1541	*
1731	1542	* @param array $fields The list of fields.
1732	1543	* @param array $args The arguments. Contains `form_id`.
1733	1544	*/
1734		- $fields = apply_filters( 'frm_fields_in_tags_box', $fields, compact( 'form_id' ) );
1735		- $linked_forms = array();
1736		- $col = 'one';
1737		- $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	+
1738	1550	$cond_shortcodes = apply_filters( 'frm_conditional_shortcodes', array() );
1739	1551	$entry_shortcodes = self::get_shortcode_helpers( $settings_tab );
	1552	+
1740	1553	$advanced_helpers = self::advanced_helpers( compact( 'fields', 'form_id' ) );
1741	1554
1742		- if ( 'default' === $template_path || ! file_exists( $template_path ) ) {
1743		- include FrmAppHelper::plugin_path() . '/classes/views/shared/mb_adv_info.php';
1744		- return;
1745		- }
1746		-
1747		- include $template_path;
	1555	+ include FrmAppHelper::plugin_path() . '/classes/views/shared/mb_adv_info.php';
1748	1556	}
1749	1557
1750	1558	/**
1751	1559	* @since 3.04.01
1752		- *
1753		- * @param array $atts
1754		- *
1755		- * @return array
1756	1560	*/
1757	1561	private static function advanced_helpers( $atts ) {
1758	1562	$advanced_helpers = array(
1759	1563	'default' => array(
		@@ -1762,12 +1566,10 @@
1762	1566	),
1763	1567	);
1764	1568
1765	1569	$user_fields = self::user_shortcodes();
1766		-
1767	1570	if ( $user_fields ) {
1768	1571	$user_helpers = array();
1769		-
1770	1572	foreach ( $user_fields as $uk => $uf ) {
1771	1573	$user_helpers[ '|user_id| show="' . $uk . '"' ] = $uf;
1772	1574	unset( $uk, $uf );
1773	1575	}
		@@ -1792,10 +1594,8 @@
1792	1594	* Get an array of the options to display in the advanced tab
1793	1595	* of the customization panel
1794	1596	*
1795	1597	* @since 2.0.6
1796		- *
1797		- * @return array
1798	1598	*/
1799	1599	private static function get_advanced_shortcodes() {
1800	1600	$adv_shortcodes = array(
1801	1601	'x sep=", "' => array(
		@@ -1812,18 +1612,17 @@
1812	1612	'label' => __( 'No Auto P', 'formidable' ),
1813	1613	'title' => __( 'Do not automatically add any paragraphs or line breaks', 'formidable' ),
1814	1614	),
1815	1615	);
	1616	+ $adv_shortcodes = apply_filters( 'frm_advanced_shortcodes', $adv_shortcodes );
1816	1617
1817	1618	// __( 'Leave blank instead of defaulting to User Login', 'formidable' ) : blank=1
1818	1619
1819		- return apply_filters( 'frm_advanced_shortcodes', $adv_shortcodes );
	1620	+ return $adv_shortcodes;
1820	1621	}
1821	1622
1822	1623	/**
1823	1624	* @since 3.04.01
1824		- *
1825		- * @return array
1826	1625	*/
1827	1626	private static function user_shortcodes() {
1828	1627	$options = array(
1829	1628	'ID' => __( 'User ID', 'formidable' ),
		@@ -1842,12 +1641,8 @@
1842	1641	/**
1843	1642	* Get an array of the helper shortcodes to display in the customization panel
1844	1643	*
1845	1644	* @since 2.0.6
1846		- *
1847		- * @param bool $settings_tab
1848		- *
1849		- * @return array
1850	1645	*/
1851	1646	private static function get_shortcode_helpers( $settings_tab ) {
1852	1647	$entry_shortcodes = array(
1853	1648	'id' => __( 'Entry ID', 'formidable' ),
		@@ -1862,9 +1657,8 @@
1862	1657	'form_name' => __( 'Form Name', 'formidable' ),
1863	1658	);
1864	1659
1865	1660	$entry_shortcodes = array_merge( FrmShortcodeHelper::get_contextual_shortcode_values(), $entry_shortcodes );
1866		-
1867	1661	if ( ! FrmAppHelper::pro_is_installed() ) {
1868	1662	unset( $entry_shortcodes['post_id'] );
1869	1663	}
1870	1664
		@@ -1872,13 +1666,12 @@
1872	1666	* Use this hook to add or remove buttons in the helpers section
1873	1667	* in the customization panel
1874	1668	*
1875	1669	* @since 2.0.6
1876		- *
1877		- * @param array $entry_shortcodes
1878		- * @param bool $settings_tab
1879	1670	*/
1880		- 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;
1881	1674	}
1882	1675
1883	1676	/**
1884	1677	* Insert the form class setting into the form.
		@@ -1883,9 +1676,8 @@
1883	1676	/**
1884	1677	* Insert the form class setting into the form.
1885	1678	*
1886	1679	* @param stdClass $form
1887		- *
1888	1680	* @return void
1889	1681	*/
1890	1682	public static function form_classes( $form ) {
1891	1683	if ( isset( $form->options['form_class'] ) ) {
		@@ -1896,9 +1688,9 @@
1896	1688	echo ' frm_js_validate ';
1897	1689	self::add_js_validate_form_to_global_vars( $form );
1898	1690	}
1899	1691
1900		- if ( FrmForm::is_ajax_on( $form ) ) {
	1692	+ if ( ! FrmFormsHelper::should_use_pro_for_ajax_submit() && FrmForm::is_ajax_on( $form ) ) {
1901	1693	echo ' frm_ajax_submit ';
1902	1694	}
1903	1695	}
1904	1696
		@@ -1908,9 +1700,8 @@
1908	1700	* @param stdClass $form
1909	1701	*/
1910	1702	public static function add_js_validate_form_to_global_vars( $form ) {
1911	1703	global $frm_vars;
1912		-
1913	1704	if ( ! isset( $frm_vars['js_validate_forms'] ) ) {
1914	1705	$frm_vars['js_validate_forms'] = array();
1915	1706	}
1916	1707	$frm_vars['js_validate_forms'][ $form->id ] = $form;
		@@ -1933,9 +1724,8 @@
1933	1724	/**
1934	1725	* @param string $content
1935	1726	* @param int|stdClass|string $form
1936	1727	* @param false|int|stdClass|string $entry
1937		- *
1938	1728	* @return string
1939	1729	*/
1940	1730	public static function filter_content( $content, $form, $entry = false ) {
1941	1731	$content = self::replace_form_name_shortcodes( $content, $form );
		@@ -1940,9 +1730,8 @@
1940	1730	public static function filter_content( $content, $form, $entry = false ) {
1941	1731	$content = self::replace_form_name_shortcodes( $content, $form );
1942	1732
1943	1733	self::get_entry_by_param( $entry );
1944		-
1945	1734	if ( ! $entry ) {
1946	1735	return $content;
1947	1736	}
1948	1737
		@@ -1958,10 +1747,11 @@
1958	1747	$form = $entry->parent_entry->form_id;
1959	1748	}
1960	1749
1961	1750	$shortcodes = FrmFieldsHelper::get_shortcodes( $content, $form );
	1751	+ $content = apply_filters( 'frm_replace_content_shortcodes', $content, $entry, $shortcodes );
1962	1752
1963		- return apply_filters( 'frm_replace_content_shortcodes', $content, $entry, $shortcodes );
	1753	+ return $content;
1964	1754	}
1965	1755
1966	1756	/**
1967	1757	* Replace any [form_name] shortcodes in a string.
		@@ -1969,9 +1759,8 @@
1969	1759	* @since 5.5
1970	1760	*
1971	1761	* @param array|string $string
1972	1762	* @param int|stdClass|string $form
1973		- *
1974	1763	* @return array|string
1975	1764	*/
1976	1765	public static function replace_form_name_shortcodes( $string, $form ) {
1977	1766	if ( ! is_string( $string ) ) {
		@@ -1977,9 +1766,9 @@
1977	1766	if ( ! is_string( $string ) ) {
1978	1767	return $string;
1979	1768	}
1980	1769
1981		- if ( ! str_contains( $string, '[form_name]' ) ) {
	1770	+ if ( false === strpos( $string, '[form_name]' ) ) {
1982	1771	return $string;
1983	1772	}
1984	1773
1985	1774	if ( ! is_object( $form ) ) {
		@@ -1991,9 +1780,8 @@
1991	1780	}
1992	1781
1993	1782	/**
1994	1783	* @param false|int|stdClass|string $entry
1995		- *
1996	1784	* @return void
1997	1785	*/
1998	1786	private static function get_entry_by_param( &$entry ) {
1999	1787	if ( ! $entry || ! is_object( $entry ) ) {
		@@ -2004,15 +1792,8 @@
2004	1792	FrmEntry::maybe_get_entry( $entry );
2005	1793	}
2006	1794	}
2007	1795
2008		- /**
2009		- * @param string $content
2010		- * @param false|object $entry
2011		- * @param array $shortcodes
2012		- *
2013		- * @return string
2014		- */
2015	1796	public static function replace_content_shortcodes( $content, $entry, $shortcodes ) {
2016	1797	return FrmFieldsHelper::replace_content_shortcodes( $content, $entry, $shortcodes );
2017	1798	}
2018	1799
		@@ -2017,9 +1798,8 @@
2017	1798	}
2018	1799
2019	1800	/**
2020	1801	* @param array $errors
2021		- *
2022	1802	* @return array
2023	1803	*/
2024	1804	public static function process_bulk_form_actions( $errors ) {
2025	1805	if ( ! $_REQUEST ) {
		@@ -2026,30 +1806,29 @@
2026	1806	return $errors;
2027	1807	}
2028	1808
2029	1809	$bulkaction = FrmAppHelper::get_param( 'action', '', 'get', 'sanitize_text_field' );
2030		-
2031		- // phpcs:ignore Universal.Operators.StrictComparisons
2032	1810	if ( $bulkaction == - 1 ) {
2033	1811	$bulkaction = FrmAppHelper::get_param( 'action2', '', 'get', 'sanitize_title' );
2034	1812	}
2035	1813
2036		- if ( $bulkaction && str_starts_with( $bulkaction, 'bulk_' ) ) {
	1814	+ if ( ! empty( $bulkaction ) && strpos( $bulkaction, 'bulk_' ) === 0 ) {
2037	1815	FrmAppHelper::remove_get_action();
	1816	+
2038	1817	$bulkaction = str_replace( 'bulk_', '', $bulkaction );
2039	1818	}
2040	1819
2041	1820	$ids = FrmAppHelper::get_param( 'item-action', '', 'get', 'sanitize_text_field' );
	1821	+ if ( empty( $ids ) ) {
	1822	+ $errors[] = __( 'No forms were specified', 'formidable' );
2042	1823
2043		- if ( ! $ids ) {
2044		- $errors[] = __( 'No forms were specified', 'formidable' );
2045	1824	return $errors;
2046	1825	}
2047	1826
2048	1827	$permission_error = FrmAppHelper::permission_nonce_error( '', '_wpnonce', 'bulk-toplevel_page_formidable' );
2049		-
2050	1828	if ( $permission_error !== false ) {
2051	1829	$errors[] = $permission_error;
	1830	+
2052	1831	return $errors;
2053	1832	}
2054	1833
2055	1834	if ( ! is_array( $ids ) ) {
		@@ -2073,24 +1852,9 @@
2073	1852
2074	1853	return $errors;
2075	1854	}
2076	1855
2077		- /**
2078		- * Includes html that shows a message when the device is too small to use Formidable Forms admin pages.
2079		- *
2080		- * @since 6.20
2081		- *
2082		- * @return void
2083		- */
2084		- public static function include_device_too_small_message() {
2085		- if ( ! FrmAppHelper::is_formidable_admin() ) {
2086		- return;
2087		- }
2088		-
2089		- include FrmAppHelper::plugin_path() . '/classes/views/shared/small-device-message.php';
2090		- }
2091		-
2092		- public static function route() { // phpcs:ignore Generic.Metrics.CyclomaticComplexity.MaxExceeded
	1856	+ public static function route() {
2093	1857	$action = isset( $_REQUEST['frm_action'] ) ? 'frm_action' : 'action';
2094	1858	$vars = array();
2095	1859	FrmAppHelper::include_svg();
2096	1860
		@@ -2100,13 +1864,11 @@
2100	1864	// Javascript needs to be allowed in some field settings.
2101	1865	// phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized, WordPress.Security.NonceVerification.Missing
2102	1866	$json_vars = htmlspecialchars_decode( nl2br( str_replace( '&quot;', '"', wp_unslash( $_POST['frm_compact_fields'] ) ) ) );
2103	1867	$json_vars = json_decode( $json_vars, true );
2104		-
2105		- if ( ! $json_vars ) {
2106		- // Json decoding failed so we should return an error message.
	1868	+ if ( empty( $json_vars ) ) {
	1869	+ // json decoding failed so we should return an error message.
2107	1870	$action = FrmAppHelper::get_param( $action, '', 'get', 'sanitize_title' );
2108		-
2109	1871	if ( 'edit' === $action ) {
2110	1872	$action = 'update';
2111	1873	}
2112	1874
		@@ -2119,9 +1881,8 @@
2119	1881	$_POST = array_merge( $_POST, $_REQUEST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
2120	1882	}
2121	1883	} else {
2122	1884	$action = FrmAppHelper::get_param( $action, '', 'get', 'sanitize_title' );
2123		-
2124	1885	if ( isset( $_REQUEST['delete_all'] ) ) {
2125	1886	// Override the action for this page.
2126	1887	$action = 'delete_all';
2127	1888	}
		@@ -2141,38 +1902,34 @@
2141	1902	case 'update_settings':
2142	1903	return self::$action( $vars );
2143	1904	case 'lite-reports':
2144	1905	self::no_reports( $vars );
2145		- return null;
	1906	+ return;
2146	1907	case 'views':
2147	1908	self::no_views( $vars );
2148		- return null;
	1909	+ return;
2149	1910	default:
2150	1911	do_action( 'frm_form_action_' . $action );
2151		-
2152	1912	if ( apply_filters( 'frm_form_stop_action_' . $action, false ) ) {
2153		- return null;
	1913	+ return;
2154	1914	}
2155	1915
2156	1916	$action = FrmAppHelper::get_param( 'action', '', 'get', 'sanitize_text_field' );
2157		-
2158		- // phpcs:ignore Universal.Operators.StrictComparisons
2159	1917	if ( $action == - 1 ) {
2160	1918	$action = FrmAppHelper::get_param( 'action2', '', 'get', 'sanitize_title' );
2161	1919	}
2162	1920
2163		- if ( str_starts_with( $action, 'bulk_' ) ) {
	1921	+ if ( strpos( $action, 'bulk_' ) === 0 ) {
2164	1922	FrmAppHelper::remove_get_action();
2165	1923
2166	1924	self::list_form();
2167		- return null;
	1925	+ return;
2168	1926	}
2169	1927
2170	1928	$message = FrmAppHelper::get_param( 'message' );
2171		-
2172	1929	if ( 'form_duplicate_error' === $message ) {
2173	1930	self::display_forms_list( array(), '', array( __( 'There was a problem duplicating the form', 'formidable' ) ) );
2174		- return null;
	1931	+ return;
2175	1932	}
2176	1933
2177	1934	if ( 'forms_permanently_deleted' === $message ) {
2178	1935	$count = FrmAppHelper::get_param( 'forms_deleted', 0, 'get', 'absint' );
		@@ -2178,14 +1935,14 @@
2178	1935	$count = FrmAppHelper::get_param( 'forms_deleted', 0, 'get', 'absint' );
2179	1936	/* translators: %1$s: Number of forms */
2180	1937	$message = sprintf( _n( '%1$s form permanently deleted.', '%1$s forms permanently deleted.', $count, 'formidable' ), $count );
2181	1938	self::display_forms_list( array(), $message, '' );
2182		- return null;
	1939	+ return;
2183	1940	}
2184	1941
2185	1942	self::display_forms_list();
2186	1943
2187		- return null;
	1944	+ return;
2188	1945	}//end switch
2189	1946	}
2190	1947
2191	1948	/**
		@@ -2204,43 +1961,19 @@
2204	1961
2205	1962	// Get posted data
2206	1963	$form_id = FrmAppHelper::get_post_param( 'form_id', '', 'absint' );
2207	1964	$name = FrmAppHelper::get_post_param( 'form_name', '', 'sanitize_text_field' );
2208		- $form = FrmForm::getOne( $form_id );
2209	1965
2210		- if ( ! $form ) {
2211		- wp_send_json_error( __( 'Form not found', 'formidable' ) );
2212		- }
	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' ) );
2213	1969
2214		- if ( $name === $form->name ) {
2215		- // Nothing to change so exit early.
2216		- wp_send_json_success();
2217		- }
2218		-
2219		- $to_update = array(
2220		- 'name' => $name,
2221		- );
2222		-
2223		- if ( '' !== $name ) {
2224		- // Only update form_key if name is not empty.
2225		- $form_key = FrmAppHelper::get_unique_key( sanitize_title( $name ), 'frm_forms', 'form_key' );
2226		- $to_update['form_key'] = $form_key;
2227		- } else {
2228		- $form_key = $form->form_key;
2229		- }
2230		-
2231		- FrmForm::update( $form_id, $to_update );
2232		-
2233	1970	wp_send_json_success( compact( 'form_key' ) );
2234	1971	}
2235	1972
2236		- /**
2237		- * @param array $errors
2238		- *
2239		- * @return array
2240		- */
2241	1973	public static function json_error( $errors ) {
2242	1974	$errors['json'] = __( 'Abnormal HTML characters prevented your form from saving correctly', 'formidable' );
	1975	+
2243	1976	return $errors;
2244	1977	}
2245	1978
2246	1979	/**
		@@ -2247,10 +1980,8 @@
2247	1980	* Add education about views.
2248	1981	*
2249	1982	* @since 4.07
2250	1983	*
2251		- * @param array $values
2252		- *
2253	1984	* @return void
2254	1985	*/
2255	1986	public static function no_views( $values = array() ) {
2256	1987	FrmAppHelper::include_svg();
		@@ -2264,10 +1995,8 @@
2264	1995	* Add education about reports.
2265	1996	*
2266	1997	* @since 4.07
2267	1998	*
2268		- * @param array $values
2269		- *
2270	1999	* @return void
2271	2000	*/
2272	2001	public static function no_reports( $values = array() ) {
2273	2002	$id = FrmAppHelper::get_param( 'form', '', 'get', 'absint' );
		@@ -2294,9 +2023,8 @@
2294	2023	* @since 4.05.02
2295	2024	*/
2296	2025	private static function move_menu_to_footer() {
2297	2026	$settings = FrmAppHelper::get_settings();
2298		-
2299	2027	if ( empty( $settings->admin_bar ) ) {
2300	2028	remove_action( 'wp_body_open', 'wp_admin_bar_render', 0 );
2301	2029	}
2302	2030	}
		@@ -2302,15 +2030,13 @@
2302	2030	}
2303	2031
2304	2032	public static function admin_bar_configure() {
2305	2033	global $frm_vars;
2306		-
2307	2034	if ( empty( $frm_vars['forms_loaded'] ) ) {
2308	2035	return;
2309	2036	}
2310	2037
2311	2038	$actions = array();
2312		-
2313	2039	foreach ( $frm_vars['forms_loaded'] as $form ) {
2314	2040	if ( is_object( $form ) ) {
2315	2041	$actions[ $form->id ] = $form->name;
2316	2042	}
		@@ -2316,9 +2042,9 @@
2316	2042	}
2317	2043	unset( $form );
2318	2044	}
2319	2045
2320		- if ( ! $actions ) {
	2046	+ if ( empty( $actions ) ) {
2321	2047	return;
2322	2048	}
2323	2049
2324	2050	self::add_menu_to_admin_bar();
		@@ -2344,12 +2070,8 @@
2344	2070	}
2345	2071
2346	2072	/**
2347	2073	* @since 2.05.07
2348		- *
2349		- * @param array $actions
2350		- *
2351		- * @return void
2352	2074	*/
2353	2075	private static function add_forms_to_admin_bar( $actions ) {
2354	2076	global $wp_admin_bar;
2355	2077
		@@ -2355,13 +2077,14 @@
2355	2077
2356	2078	asort( $actions );
2357	2079
2358	2080	foreach ( $actions as $form_id => $name ) {
	2081	+
2359	2082	$wp_admin_bar->add_node(
2360	2083	array(
2361	2084	'parent' => 'frm-forms',
2362	2085	'id' => 'edit_form_' . $form_id,
2363		- 'title' => $name ? $name : FrmFormsHelper::get_no_title_text(),
	2086	+ 'title' => empty( $name ) ? FrmFormsHelper::get_no_title_text() : $name,
2364	2087	'href' => FrmForm::get_edit_link( $form_id ),
2365	2088	)
2366	2089	);
2367	2090	}
		@@ -2370,14 +2093,12 @@
2370	2093	/**
2371	2094	* The formidable shortcode
2372	2095	*
2373	2096	* @param array $atts The params from the shortcode.
2374		- *
2375	2097	* @return string
2376	2098	*/
2377	2099	public static function get_form_shortcode( $atts ) {
2378	2100	global $frm_vars;
2379		-
2380	2101	if ( ! empty( $frm_vars['skip_shortcode'] ) ) {
2381	2102	$sc = '[formidable';
2382	2103	$sc .= FrmAppHelper::array_to_html_params( $atts );
2383	2104	return $sc . ']';
		@@ -2406,9 +2127,8 @@
2406	2127	* @since 5.2.01
2407	2128	*
2408	2129	* @param false|int|string $id
2409	2130	* @param false|string $key
2410		- *
2411	2131	* @return false|stdClass
2412	2132	*/
2413	2133	private static function maybe_get_form_by_id_or_key( $id, $key ) {
2414	2134	if ( ! $id ) {
		@@ -2422,9 +2142,8 @@
2422	2142	* @param false|string $key
2423	2143	* @param bool|int|string $title may be 'auto', true, false, 'true', 'false', 'yes', '1', 1, '0', 0.
2424	2144	* @param bool|int|string $description may be 'auto', true, false, 'true', 'false', 'yes', '1', 1, '0', 0.
2425	2145	* @param array $atts
2426		- *
2427	2146	* @return string
2428	2147	*/
2429	2148	public static function show_form( $id = '', $key = '', $title = false, $description = false, $atts = array() ) {
2430	2149	$form = self::maybe_get_form_by_id_or_key( $id, $key );
		@@ -2445,13 +2164,14 @@
2445	2164
2446	2165	add_action( 'frm_load_form_hooks', 'FrmHooksController::trigger_load_form_hooks' );
2447	2166	FrmAppHelper::trigger_hook_load( 'form', $form );
2448	2167
2449		- $form = apply_filters( 'frm_pre_display_form', $form );
	2168	+ $form = apply_filters( 'frm_pre_display_form', $form );
	2169	+
2450	2170	$frm_settings = FrmAppHelper::get_settings( array( 'current_form' => $form->id ) );
2451	2171
2452	2172	if ( self::is_viewable_draft_form( $form ) ) {
2453		- // Don't show a draft form on a page
	2173	+ // don't show a draft form on a page
2454	2174	$form = __( 'Please select a valid form', 'formidable' );
2455	2175	} elseif ( ! FrmForm::is_visible_to_user( $form ) ) {
2456	2176	$form = do_shortcode( $frm_settings->login_msg );
2457	2177	} else {
		@@ -2471,18 +2191,16 @@
2471	2191	}
2472	2192
2473	2193	/**
2474	2194	* @param false|int|string $id
2475		- *
2476	2195	* @return false|stdClass
2477	2196	*/
2478	2197	private static function maybe_get_form_to_show( $id ) {
2479	2198	$form = false;
2480	2199
2481		- if ( $id ) {
	2200	+ if ( ! empty( $id ) ) {
2482	2201	// Form id or key is set.
2483	2202	$form = FrmForm::getOne( $id );
2484		-
2485	2203	if ( ! $form || $form->parent_form_id || $form->status === 'trash' ) {
2486	2204	$form = false;
2487	2205	}
2488	2206	}
		@@ -2489,25 +2207,12 @@
2489	2207
2490	2208	return $form;
2491	2209	}
2492	2210
2493		- /**
2494		- * @param object $form
2495		- *
2496		- * @return bool
2497		- */
2498	2211	private static function is_viewable_draft_form( $form ) {
2499	2212	return $form->status === 'draft' && current_user_can( 'frm_edit_forms' ) && ! FrmAppHelper::is_preview_page();
2500	2213	}
2501	2214
2502		- /**
2503		- * @param object $form
2504		- * @param bool $title
2505		- * @param bool $description
2506		- * @param array $atts
2507		- *
2508		- * @return string
2509		- */
2510	2215	public static function get_form( $form, $title, $description, $atts = array() ) {
2511	2216	ob_start();
2512	2217
2513	2218	do_action( 'frm_before_get_form', $atts );
		@@ -2514,9 +2219,10 @@
2514	2219
2515	2220	self::get_form_contents( $form, $title, $description, $atts );
2516	2221	self::enqueue_scripts( FrmForm::get_params( $form ) );
2517	2222
2518		- $contents = ob_get_clean();
	2223	+ $contents = ob_get_contents();
	2224	+ ob_end_clean();
2519	2225
2520	2226	self::maybe_minimize_form( $atts, $contents );
2521	2227
2522	2228	return $contents;
		@@ -2521,25 +2227,12 @@
2521	2227
2522	2228	return $contents;
2523	2229	}
2524	2230
2525		- /**
2526		- * @param array $params
2527		- *
2528		- * @return void
2529		- */
2530	2231	public static function enqueue_scripts( $params ) {
2531	2232	do_action( 'frm_enqueue_form_scripts', $params );
2532	2233	}
2533	2234
2534		- /**
2535		- * @param object $form
2536		- * @param bool $title
2537		- * @param bool $description
2538		- * @param array $atts
2539		- *
2540		- * @return void
2541		- */
2542	2235	public static function get_form_contents( $form, $title, $description, $atts ) {
2543	2236	$params = FrmForm::get_params( $form );
2544	2237	$errors = self::get_saved_errors( $form, $params );
2545	2238	$fields = FrmFieldsHelper::get_form_fields( $form->id, $errors );
		@@ -2546,10 +2239,9 @@
2546	2239	$reset = false;
2547	2240	$pass_args = compact( 'form', 'fields', 'errors', 'title', 'description', 'reset' );
2548	2241
2549	2242	$pass_args['action'] = $params['action'];
2550		- // phpcs:ignore WordPress.Security.NonceVerification.Missing, Universal.Operators.StrictComparisons
2551		- $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
2552	2244
2553	2245	if ( ! $handle_process_here ) {
2554	2246	FrmFormState::set_initial_value( 'title', $title );
2555	2247	FrmFormState::set_initial_value( 'description', $description );
		@@ -2554,15 +2246,16 @@
2554	2246	FrmFormState::set_initial_value( 'title', $title );
2555	2247	FrmFormState::set_initial_value( 'description', $description );
2556	2248
2557	2249	do_action( 'frm_display_form_action', $params, $fields, $form, $title, $description );
2558		-
2559	2250	if ( apply_filters( 'frm_continue_to_new', true, $form->id, $params['action'] ) ) {
2560	2251	self::show_form_after_submit( $pass_args );
2561	2252	}
2562		- } elseif ( $errors ) {
	2253	+ } elseif ( ! empty( $errors ) ) {
2563	2254	self::show_form_after_submit( $pass_args );
	2255	+
2564	2256	} else {
	2257	+
2565	2258	do_action( 'frm_validate_form_creation', $params, $fields, $form, $title, $description );
2566	2259
2567	2260	if ( apply_filters( 'frm_continue_to_create', true, $form->id ) ) {
2568	2261	$entry_id = self::just_created_entry( $form->id );
		@@ -2585,19 +2278,13 @@
2585	2278	/**
2586	2279	* If the form was processed earlier (init), get the generated errors
2587	2280	*
2588	2281	* @since 2.05
2589		- *
2590		- * @param object $form
2591		- * @param array $params
2592		- *
2593		- * @return array
2594	2282	*/
2595	2283	private static function get_saved_errors( $form, $params ) {
2596	2284	global $frm_vars;
2597	2285
2598		- // phpcs:ignore WordPress.Security.NonceVerification.Missing, Universal.Operators.StrictComparisons
2599		- 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
2600	2287	$errors = $frm_vars['created_entries'][ $form->id ]['errors'];
2601	2288	} else {
2602	2289	$errors = array();
2603	2290	}
		@@ -2614,16 +2301,13 @@
2614	2301	}
2615	2302
2616	2303	/**
2617	2304	* @since 2.2.7
2618		- *
2619		- * @param int|string $form_id
2620		- *
2621		- * @return int
2622	2305	*/
2623	2306	public static function just_created_entry( $form_id ) {
2624	2307	global $frm_vars;
2625		- 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;
2626	2310	}
2627	2311
2628	2312	/**
2629	2313	* Gets confirmation method.
		@@ -2636,9 +2320,8 @@
2636	2320	*
2637	2321	* @type object $form Form object.
2638	2322	* @type int $entry_id Entry ID.
2639	2323	* }
2640		- *
2641	2324	* @return array|string
2642	2325	*/
2643	2326	private static function get_confirmation_method( $atts ) {
2644	2327	$action = FrmOnSubmitHelper::current_event( $atts );
		@@ -2646,9 +2329,8 @@
2646	2329	$method = ! empty( $atts['form']->options[ $opt ] ) ? $atts['form']->options[ $opt ] : 'message';
2647	2330
2648	2331	if ( ! empty( $atts['entry_id'] ) ) {
2649	2332	$met_actions = self::get_met_on_submit_actions( $atts, $action );
2650		-
2651	2333	if ( $met_actions ) {
2652	2334	$method = $met_actions;
2653	2335	}
2654	2336	}
		@@ -2655,21 +2337,14 @@
2655	2337
2656	2338	$method = apply_filters( 'frm_success_filter', $method, $atts['form'], $action );
2657	2339
2658	2340	if ( $method !== 'message' && ( ! $atts['entry_id'] || ! is_numeric( $atts['entry_id'] ) ) ) {
2659		- return 'message';
	2341	+ $method = 'message';
2660	2342	}
2661	2343
2662	2344	return $method;
2663	2345	}
2664	2346
2665		- /**
2666		- * @param object $form
2667		- * @param array $params
2668		- * @param array $args
2669		- *
2670		- * @return void
2671		- */
2672	2347	public static function maybe_trigger_redirect( $form, $params, $args ) {
2673	2348	if ( ! isset( $params['id'] ) ) {
2674	2349	global $frm_vars;
2675	2350	$params['id'] = $frm_vars['created_entries'][ $form->id ]['entry_id'];
		@@ -2697,9 +2372,9 @@
2697	2372	* @param array $args See {@see FrmFormsController::maybe_trigger_redirect()}.
2698	2373	*/
2699	2374	public static function maybe_trigger_redirect_with_action( $conf_method, $form, $params, $args ) {
2700	2375	if ( is_array( $conf_method ) && 1 === count( $conf_method ) ) {
2701		- if ( 'redirect' === FrmOnSubmitHelper::get_action_type( $conf_method[0] ) && empty( $conf_method[0]->post_content['redirect_delay'] ) ) {
	2376	+ if ( 'redirect' === FrmOnSubmitHelper::get_action_type( $conf_method[0] ) ) {
2702	2377	$event = FrmOnSubmitHelper::current_event( $params );
2703	2378	FrmOnSubmitHelper::populate_on_submit_data( $form->options, $conf_method[0], $event );
2704	2379	$conf_method = 'redirect';
2705	2380	}
		@@ -2709,15 +2384,8 @@
2709	2384	self::trigger_redirect( $form, $params, $args );
2710	2385	}
2711	2386	}
2712	2387
2713		- /**
2714		- * @param object $form
2715		- * @param array $params
2716		- * @param array $args
2717		- *
2718		- * @return void
2719		- */
2720	2388	public static function trigger_redirect( $form, $params, $args ) {
2721	2389	$success_args = array(
2722	2390	'action' => $params['action'],
2723	2391	'conf_method' => 'redirect',
		@@ -2776,9 +2444,8 @@
2776	2444	* @since 6.0
2777	2445	*
2778	2446	* @param array $args See {@see FrmFormsController::run_success_action()}.
2779	2447	* @param string $event Form event. Default is `create`.
2780		- *
2781	2448	* @return array Array of actions that meet the conditional logics.
2782	2449	*/
2783	2450	public static function get_met_on_submit_actions( $args, $event = 'create' ) {
2784	2451	if ( ! FrmOnSubmitHelper::form_has_migrated( $args['form'] ) ) {
		@@ -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	}