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