← All changes | classes/controllers/FrmFormsController.php +256 -647 6.29 → 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 ) {
		@@ -271,9 +252,8 @@
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,23 +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		- $menu_name = FrmAppHelper::get_menu_name();
1077		- $icon = apply_filters( 'frm_media_icon', FrmAppHelper::svg_logo() );
1078		- self::$formidable_tinymce_button = '<a href="#TB_inline?width=50&height=50&inlineId=frm_insert_form" class="thickbox button add_media frm_insert_form" title="' . esc_attr__( 'Add forms and content', 'formidable' ) . '">' . FrmAppHelper::kses( $icon, 'all' ) . ' ' . esc_html( $menu_name ) . '</a>'; // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong
1079		- }
1080		- echo self::$formidable_tinymce_button; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
1081	950	}
1082	951
1083	952	/**
1084	953	* @return void
		@@ -1099,21 +968,17 @@
1099	968	$shortcodes = apply_filters( 'frm_popup_shortcodes', $shortcodes );
1100	969
1101	970	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/insert_form_popup.php';
1102	971
1103		- if ( ! FrmAppHelper::is_form_builder_page() || class_exists( '_WP_Editors', false ) ) {
1104		- 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
1105	980	}
1106		-
1107		- // Initialize a wysiwyg so we have usable settings defined in tinyMCEPreInit.mceInit
1108		- require ABSPATH . WPINC . '/class-wp-editor.php';
1109		- // phpcs:disable Generic.WhiteSpace.ScopeIndent
1110		- ?>
1111		- <div class="frm_hidden">
1112		- <?php wp_editor( '', 'frm_description_placeholder', array() ); ?>
1113		- </div>
1114		- <?php
1115		- // phpcs:enable Generic.WhiteSpace.ScopeIndent
1116	981	}
1117	982
1118	983	/**
1119	984	* Check the page being loaded, determine if this is a page that should include the form popup.
		@@ -1125,9 +990,8 @@
1125	990	private static function should_insert_form_popup() {
1126	991	if ( FrmAppHelper::is_form_builder_page() ) {
1127	992	return true;
1128	993	}
1129		-
1130	994	$page = basename( FrmAppHelper::get_server_value( 'PHP_SELF' ) );
1131	995	return in_array( $page, array( 'post.php', 'page.php', 'page-new.php', 'post-new.php' ), true );
1132	996	}
1133	997
		@@ -1135,10 +999,9 @@
1135	999	FrmAppHelper::permission_check( 'frm_view_forms' );
1136	1000	check_ajax_referer( 'frm_ajax', 'nonce' );
1137	1001
1138	1002	$shortcode = FrmAppHelper::get_post_param( 'shortcode', '', 'sanitize_text_field' );
1139		-
1140		- if ( ! $shortcode ) {
	1003	+ if ( empty( $shortcode ) ) {
1141	1004	wp_die();
1142	1005	}
1143	1006
1144	1007	echo '<div id="sc-opts-' . esc_attr( $shortcode ) . '" class="frm_shortcode_option">';
		@@ -1163,13 +1026,12 @@
1163	1026	'label' => __( 'Minimize form HTML', 'formidable' ),
1164	1027	),
1165	1028	);
1166	1029	}
1167		-
1168	1030	$opts = apply_filters( 'frm_sc_popup_opts', $opts, $shortcode );
1169	1031
1170	1032	if ( isset( $opts['form_id'] ) && is_string( $opts['form_id'] ) ) {
1171		- // Allow other shortcodes to use the required form id option
	1033	+ // allow other shortcodes to use the required form id option
1172	1034	$form_id = $opts['form_id'];
1173	1035	unset( $opts['form_id'] );
1174	1036	}
1175	1037
		@@ -1185,9 +1047,8 @@
1185	1047	*
1186	1048	* @param array $params
1187	1049	* @param string $message
1188	1050	* @param array $errors
1189		- *
1190	1051	* @return void
1191	1052	*/
1192	1053	public static function display_forms_list( $params = array(), $message = '', $errors = array() ) {
1193	1054	FrmAppHelper::permission_check( 'frm_view_forms' );
		@@ -1204,21 +1065,21 @@
1204	1065	* @param string $table_class Class name for List Helper.
1205	1066	*/
1206	1067	$table_class = apply_filters( 'frm_forms_list_class', 'FrmFormsListHelper' );
1207	1068	$wp_list_table = new $table_class( compact( 'params' ) );
1208		- $pagenum = $wp_list_table->get_pagenum();
1209	1069
	1070	+ $pagenum = $wp_list_table->get_pagenum();
	1071	+
1210	1072	$wp_list_table->prepare_items();
1211	1073
1212	1074	$total_pages = $wp_list_table->get_pagination_arg( 'total_pages' );
1213		-
1214	1075	if ( $pagenum > $total_pages && $total_pages > 0 ) {
1215		- wp_safe_redirect( esc_url_raw( add_query_arg( 'paged', $total_pages ) ) );
	1076	+ wp_redirect( esc_url_raw( add_query_arg( 'paged', $total_pages ) ) );
1216	1077	die();
1217	1078	}
1218	1079
1219		- $error = FrmInbox::check_for_error();
1220		-
	1080	+ $inbox = new FrmInbox();
	1081	+ $error = $inbox->check_for_error();
1221	1082	if ( $error ) {
1222	1083	$show_messages = array( $error['subject'] . '. ' . $error['message'] );
1223	1084	}
1224	1085
		@@ -1226,22 +1087,17 @@
1226	1087	}
1227	1088
1228	1089	/**
1229	1090	* @param array<string,string> $columns
1230		- *
1231	1091	* @return array<string,string>
1232	1092	*/
1233	1093	public static function get_columns( $columns ) {
1234		- $columns['cb'] = '<input type="checkbox" />';
1235		- $columns['name'] = esc_html__( 'Form Title', 'formidable' );
1236		- $columns['entries'] = esc_html__( 'Entries', 'formidable' );
1237		- $columns['id'] = 'ID';
1238		- $columns['form_key'] = esc_html__( 'Key', 'formidable' );
1239		-
1240		- if ( 'trash' !== FrmAppHelper::simple_get( 'form_type' ) ) {
1241		- $columns['shortcode'] = esc_html__( 'Actions', 'formidable' );
1242		- }
1243		-
	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' );
1244	1100	$columns['created_at'] = esc_html__( 'Date', 'formidable' );
1245	1101
1246	1102	add_screen_option(
1247	1103	'per_page',
		@@ -1269,9 +1125,8 @@
1269	1125	}
1270	1126
1271	1127	/**
1272	1128	* @param mixed $hidden_columns
1273		- *
1274	1129	* @return array
1275	1130	*/
1276	1131	public static function hidden_columns( $hidden_columns ) {
1277	1132	if ( ! is_array( $hidden_columns ) ) {
		@@ -1292,18 +1147,11 @@
1292	1147
1293	1148	return $hidden_columns;
1294	1149	}
1295	1150
1296		- /**
1297		- * @param mixed $save
1298		- * @param string $option
1299		- * @param int|string $value
1300		- *
1301		- * @return mixed
1302		- */
1303	1151	public static function save_per_page( $save, $option, $value ) {
1304	1152	if ( $option === 'formidable_page_formidable_per_page' ) {
1305		- return (int) $value;
	1153	+ $save = (int) $value;
1306	1154	}
1307	1155
1308	1156	return $save;
1309	1157	}
		@@ -1312,9 +1160,8 @@
1312	1160	* @param int|string $id
1313	1161	* @param array $errors
1314	1162	* @param string $message
1315	1163	* @param bool $create_link
1316		- *
1317	1164	* @return void
1318	1165	*/
1319	1166	private static function get_edit_vars( $id, $errors = array(), $message = '', $create_link = false ) {
1320	1167	global $frm_vars;
		@@ -1329,9 +1176,8 @@
1329	1176	'page' => 'formidable',
1330	1177	)
1331	1178	),
1332	1179	);
1333		-
1334	1180	if ( ! $form ) {
1335	1181	FrmAppController::show_error_modal( $error_args );
1336	1182	return;
1337	1183	}
		@@ -1353,14 +1199,15 @@
1353	1199	}
1354	1200
1355	1201	if ( $form->parent_form_id ) {
1356	1202	/* translators: %1$s: Start link HTML, %2$s: End link HTML */
1357		- wp_die( sprintf( esc_html__( 'You are trying to edit a child form. Please edit from %1$shere%2$s', 'formidable' ), '<a href="' . esc_url( FrmForm::get_edit_link( $form->parent_form_id ) ) . '">', '</a>' ) ); // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong
	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>' ) );
1358	1204	}
1359	1205
1360	1206	$frm_field_selection = FrmField::field_selection();
1361		- $fields = FrmField::get_all_for_form( $form->id );
1362	1207
	1208	+ $fields = FrmField::get_all_for_form( $form->id );
	1209	+
1363	1210	// Automatically add end section fields if they don't exist (2.0 migration).
1364	1211	$reset_fields = false;
1365	1212	FrmFormsHelper::auto_add_end_section_fields( $form, $fields, $reset_fields );
1366	1213	FrmSubmitHelper::maybe_create_submit_field( $form, $fields, $reset_fields );
		@@ -1384,10 +1231,9 @@
1384	1231	*/
1385	1232	$values['fields'] = apply_filters( 'frm_fields_in_form_builder', $fields, compact( 'form' ) );
1386	1233
1387	1234	$edit_message = __( 'Form was successfully updated.', 'formidable' );
1388		-
1389		- if ( $form->is_template && $message === $edit_message ) {
	1235	+ if ( $form->is_template && $message == $edit_message ) {
1390	1236	$message = __( 'Template was successfully updated.', 'formidable' );
1391	1237	}
1392	1238
1393	1239	self::maybe_update_form_builder_message( $message );
		@@ -1402,12 +1248,11 @@
1402	1248	}
1403	1249
1404	1250	/**
1405	1251	* @param array $fields
1406		- *
1407	1252	* @return array
1408	1253	*/
1409		- public static function update_form_builder_fields( $fields ) {
	1254	+ public static function update_form_builder_fields( $fields, $form ) {
1410	1255	foreach ( $fields as $field ) {
1411	1256	$field->do_not_include_icons = true;
1412	1257	}
1413	1258	return $fields;
		@@ -1412,13 +1257,8 @@
1412	1257	}
1413	1258	return $fields;
1414	1259	}
1415	1260
1416		- /**
1417		- * @param string $message
1418		- *
1419		- * @return void
1420		- */
1421	1261	public static function maybe_update_form_builder_message( &$message ) {
1422	1262	if ( 'form_duplicated' === FrmAppHelper::simple_get( 'message' ) ) {
1423	1263	$message = __( 'Form was Successfully Copied', 'formidable' );
1424	1264	}
		@@ -1427,9 +1267,8 @@
1427	1267	/**
1428	1268	* @param int|string $id
1429	1269	* @param array $errors
1430	1270	* @param array|string $args
1431		- *
1432	1271	* @return void
1433	1272	*/
1434	1273	public static function get_settings_vars( $id, $errors = array(), $args = array() ) {
1435	1274	FrmAppHelper::permission_check( 'frm_edit_forms' );
		@@ -1451,12 +1290,13 @@
1451	1290	);
1452	1291	$args = array_merge( $defaults, $args );
1453	1292	$message = $args['message'];
1454	1293	$warnings = $args['warnings'];
1455		- $form = FrmForm::getOne( $id );
1456		- $fields = FrmField::get_all_for_form( $id );
1457		- $values = FrmAppHelper::setup_edit_vars( $form, 'forms', $fields, true );
1458	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	+
1459	1299	/**
1460	1300	* Allows changing fields in the form settings.
1461	1301	*
1462	1302	* @since 5.0.04
		@@ -1496,12 +1336,8 @@
1496	1336	}
1497	1337
1498	1338	/**
1499	1339	* @since 4.0
1500		- *
1501		- * @param array $atts
1502		- *
1503		- * @return void
1504	1340	*/
1505	1341	public static function form_publish_button( $atts ) {
1506	1342	$values = $atts['values'];
1507	1343	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/_publish_box.php';
		@@ -1512,9 +1348,8 @@
1512	1348	*
1513	1349	* @since 4.0
1514	1350	*
1515	1351	* @param array $values
1516		- *
1517	1352	* @return array
1518	1353	*/
1519	1354	private static function get_settings_tabs( $values ) {
1520	1355	$sections = array(
		@@ -1520,20 +1355,20 @@
1520	1355	$sections = array(
1521	1356	'advanced' => array(
1522	1357	'name' => __( 'General', 'formidable' ),
1523	1358	'title' => __( 'General Form Settings', 'formidable' ),
1524		- 'function' => array( self::class, 'advanced_settings' ),
1525		- 'icon' => 'frmfont frm_settings_icon',
	1359	+ 'function' => array( __CLASS__, 'advanced_settings' ),
	1360	+ 'icon' => 'frm_icon_font frm_settings_icon',
1526	1361	),
1527	1362	'email' => array(
1528	1363	'name' => __( 'Actions & Notifications', 'formidable' ),
1529	1364	'function' => array( 'FrmFormActionsController', 'email_settings' ),
1530	1365	'id' => 'frm_notification_settings',
1531		- 'icon' => 'frmfont frm_mail_bulk_icon',
	1366	+ 'icon' => 'frm_icon_font frm_mail_bulk_icon',
1532	1367	),
1533	1368	'permissions' => array(
1534	1369	'name' => __( 'Form Permissions', 'formidable' ),
1535		- 'icon' => 'frmfont frm_lock_closed_icon',
	1370	+ 'icon' => 'frm_icon_font frm_lock_closed_icon',
1536	1371	'html_class' => 'frm_show_upgrade_tab frm_noallow',
1537	1372	'data' => array(
1538	1373	'medium' => 'permissions',
1539	1374	'upgrade' => __( 'Form Permissions', 'formidable' ),
		@@ -1538,37 +1373,35 @@
1538	1373	'medium' => 'permissions',
1539	1374	'upgrade' => __( 'Form Permissions', 'formidable' ),
1540	1375	'message' => __( 'Allow editing, protect forms and files, limit entries, and save drafts. Upgrade to get form and entry permissions.', 'formidable' ),
1541	1376	'screenshot' => 'permissions.png',
1542		- 'learn-more' => FrmAppHelper::get_doc_url( 'general-form-settings/#kb-form-permissions', 'form-permissions-settings' ),
1543	1377	),
1544	1378	),
1545	1379	'scheduling' => array(
1546	1380	'name' => __( 'Form Scheduling', 'formidable' ),
1547		- 'icon' => 'frmfont frm_calendar_icon',
	1381	+ 'icon' => 'frm_icon_font frm_calendar_icon',
1548	1382	'html_class' => 'frm_show_upgrade_tab frm_noallow',
1549	1383	'data' => array(
1550	1384	'medium' => 'scheduling',
1551	1385	'upgrade' => __( 'Form scheduling settings', 'formidable' ),
1552	1386	'screenshot' => 'scheduling.png',
1553		- 'learn-more' => FrmAppHelper::get_doc_url( 'general-form-settings/#kb-form-scheduling', 'form-scheduling-settings' ),
1554	1387	),
1555	1388	),
1556	1389	'buttons' => array(
1557	1390	'name' => __( 'Buttons', 'formidable' ),
1558		- 'class' => self::class,
	1391	+ 'class' => __CLASS__,
1559	1392	'function' => 'buttons_settings',
1560		- 'icon' => 'frmfont frm_button_icon',
	1393	+ 'icon' => 'frm_icon_font frm_button_icon',
1561	1394	),
1562	1395	'landing' => array(
1563	1396	'name' => __( 'Form Landing Page', 'formidable' ),
1564		- 'icon' => 'frmfont frm_file_text_icon',
	1397	+ 'icon' => 'frm_icon_font frm_file_text_icon',
1565	1398	'html_class' => 'frm_show_upgrade_tab frm_noallow',
1566	1399	'data' => FrmAppHelper::get_landing_page_upgrade_data_params(),
1567	1400	),
1568	1401	'chat' => array(
1569	1402	'name' => __( 'Conversational Forms', 'formidable' ),
1570		- 'icon' => 'frmfont frm_chat_forms_icon',
	1403	+ 'icon' => 'frm_icon_font frm_chat_forms_icon',
1571	1404	'html_class' => 'frm_show_upgrade_tab frm_noallow',
1572	1405	'data' => FrmAppHelper::get_upgrade_data_params(
1573	1406	'chat',
1574	1407	array(
		@@ -1574,15 +1407,14 @@
1574	1407	array(
1575	1408	'upgrade' => __( 'Conversational Forms', 'formidable' ),
1576	1409	'message' => __( 'Ask one question at a time for automated conversations.', 'formidable' ),
1577	1410	'screenshot' => 'chat.png',
1578		- 'learn-more' => FrmAppHelper::get_doc_url( 'conversational-forms', 'conversational-forms-settings', false ),
1579	1411	)
1580	1412	),
1581	1413	),
1582	1414	'abandonment' => array(
1583	1415	'name' => __( 'Form Abandonment', 'formidable' ),
1584		- 'icon' => 'frmfont frm_abandoned_icon',
	1416	+ 'icon' => 'frm_icon_font frm_abandoned_icon',
1585	1417	'html_class' => 'frm_show_upgrade_tab frm_noallow',
1586	1418	'data' => FrmAppHelper::get_upgrade_data_params(
1587	1419	'abandonment',
1588	1420	array(
		@@ -1588,17 +1420,16 @@
1588	1420	array(
1589	1421	'upgrade' => __( 'Form abandonment settings', 'formidable' ),
1590	1422	'message' => __( 'Unlock the power of data capture to boost lead generation and master the art of form optimization.', 'formidable' ),
1591	1423	'screenshot' => 'abandonment.png',
1592		- 'learn-more' => FrmAppHelper::get_doc_url( 'features/form-abandonment-wordpress-plugin', 'form-abandonment-settings', false ),
1593	1424	)
1594	1425	),
1595	1426	),
1596	1427	'html' => array(
1597	1428	'name' => __( 'Customize HTML', 'formidable' ),
1598		- 'class' => self::class,
	1429	+ 'class' => __CLASS__,
1599	1430	'function' => 'html_settings',
1600		- 'icon' => 'frmfont frm_code_icon',
	1431	+ 'icon' => 'frm_icon_font frm_code_icon',
1601	1432	),
1602	1433	);
1603	1434
1604	1435	if ( ! has_action( 'frm_add_form_style_tab_options' ) && ! has_action( 'frm_add_form_button_options' ) ) {
		@@ -1604,8 +1435,14 @@
1604	1435	if ( ! has_action( 'frm_add_form_style_tab_options' ) && ! has_action( 'frm_add_form_button_options' ) ) {
1605	1436	unset( $sections['buttons'] );
1606	1437	}
1607	1438
	1439	+ foreach ( array( 'landing', 'chat', 'abandonment' ) as $feature ) {
	1440	+ if ( ! FrmAppHelper::show_new_feature( $feature ) ) {
	1441	+ unset( $sections[ $feature ] );
	1442	+ }
	1443	+ }
	1444	+
1608	1445	$sections = apply_filters( 'frm_add_form_settings_section', $sections, $values );
1609	1446
1610	1447	foreach ( $sections as $key => $section ) {
1611	1448	$defaults = array(
		@@ -1610,9 +1447,9 @@
1610	1447	foreach ( $sections as $key => $section ) {
1611	1448	$defaults = array(
1612	1449	'html_class' => '',
1613	1450	'name' => ucfirst( $key ),
1614		- 'icon' => 'frmfont frm_settings_icon',
	1451	+ 'icon' => 'frm_icon_font frm_settings_icon',
1615	1452	);
1616	1453
1617	1454	$section = array_merge( $defaults, $section );
1618	1455
		@@ -1618,9 +1455,8 @@
1618	1455
1619	1456	if ( ! isset( $section['anchor'] ) ) {
1620	1457	$section['anchor'] = $key;
1621	1458	}
1622		-
1623	1459	$section['anchor'] .= '_settings';
1624	1460
1625	1461	if ( ! isset( $section['title'] ) ) {
1626	1462	$section['title'] = $section['name'];
		@@ -1639,19 +1475,18 @@
1639	1475	/**
1640	1476	* @since 4.0
1641	1477	*
1642	1478	* @param array $values
1643		- *
1644	1479	* @return void
1645	1480	*/
1646	1481	public static function advanced_settings( $values ) {
1647	1482	$first_h3 = 'frm_first_h3';
	1483	+
1648	1484	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings-advanced.php';
1649	1485	}
1650	1486
1651	1487	/**
1652	1488	* @param array $values
1653		- *
1654	1489	* @return void
1655	1490	*/
1656	1491	public static function render_spam_settings( $values ) {
1657	1492	if ( function_exists( 'akismet_http_post' ) ) {
		@@ -1656,9 +1491,9 @@
1656	1491	public static function render_spam_settings( $values ) {
1657	1492	if ( function_exists( 'akismet_http_post' ) ) {
1658	1493	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/spam-settings/akismet.php';
1659	1494	}
1660		- 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';
1661	1496	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/spam-settings/antispam.php';
1662	1497	}
1663	1498
1664	1499	/**
		@@ -1664,9 +1499,8 @@
1664	1499	/**
1665	1500	* @since 4.0
1666	1501	*
1667	1502	* @param array $values
1668		- *
1669	1503	* @return void
1670	1504	*/
1671	1505	public static function buttons_settings( $values ) {
1672	1506	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings-buttons.php';
		@@ -1675,9 +1509,8 @@
1675	1509	/**
1676	1510	* @since 4.0
1677	1511	*
1678	1512	* @param array $values
1679		- *
1680	1513	* @return void
1681	1514	*/
1682	1515	public static function html_settings( $values ) {
1683	1516	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings-html.php';
		@@ -1688,9 +1521,8 @@
1688	1521	*
1689	1522	* @since 2.03.08
1690	1523	*
1691	1524	* @param array|bool $values
1692		- *
1693	1525	* @return void
1694	1526	*/
1695	1527	private static function clean_submit_html( &$values ) {
1696	1528	if ( is_array( $values ) && isset( $values['submit_html'] ) ) {
		@@ -1713,17 +1545,13 @@
1713	1545	return $classes;
1714	1546	}
1715	1547
1716	1548	/**
1717		- * @since 6.27 Added $template_path parameter.
1718		- *
1719	1549	* @param int|string $form_id
1720	1550	* @param string $class
1721		- * @param string $template_path The path to a template file to use instead of the default.
1722		- *
1723	1551	* @return void
1724	1552	*/
1725		- public static function mb_tags_box( $form_id, $class = '', $template_path = 'default' ) {
	1553	+ public static function mb_tags_box( $form_id, $class = '' ) {
1726	1554	$fields = FrmField::get_all_for_form( $form_id, '', 'include' );
1727	1555
1728	1556	/**
1729	1557	* Allows modifying the list of fields in the tags box.
		@@ -1732,30 +1560,23 @@
1732	1560	*
1733	1561	* @param array $fields The list of fields.
1734	1562	* @param array $args The arguments. Contains `form_id`.
1735	1563	*/
1736		- $fields = apply_filters( 'frm_fields_in_tags_box', $fields, compact( 'form_id' ) );
1737		- $linked_forms = array();
1738		- $col = 'one';
1739		- $settings_tab = FrmAppHelper::is_admin_page( 'formidable' );
	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	+
1740	1569	$cond_shortcodes = apply_filters( 'frm_conditional_shortcodes', array() );
1741	1570	$entry_shortcodes = self::get_shortcode_helpers( $settings_tab );
	1571	+
1742	1572	$advanced_helpers = self::advanced_helpers( compact( 'fields', 'form_id' ) );
1743	1573
1744		- if ( 'default' === $template_path || ! file_exists( $template_path ) ) {
1745		- include FrmAppHelper::plugin_path() . '/classes/views/shared/mb_adv_info.php';
1746		- return;
1747		- }
1748		-
1749		- include $template_path;
	1574	+ include FrmAppHelper::plugin_path() . '/classes/views/shared/mb_adv_info.php';
1750	1575	}
1751	1576
1752	1577	/**
1753	1578	* @since 3.04.01
1754		- *
1755		- * @param array $atts
1756		- *
1757		- * @return array
1758	1579	*/
1759	1580	private static function advanced_helpers( $atts ) {
1760	1581	$advanced_helpers = array(
1761	1582	'default' => array(
		@@ -1764,12 +1585,10 @@
1764	1585	),
1765	1586	);
1766	1587
1767	1588	$user_fields = self::user_shortcodes();
1768		-
1769	1589	if ( $user_fields ) {
1770	1590	$user_helpers = array();
1771		-
1772	1591	foreach ( $user_fields as $uk => $uf ) {
1773	1592	$user_helpers[ '|user_id| show="' . $uk . '"' ] = $uf;
1774	1593	unset( $uk, $uf );
1775	1594	}
		@@ -1794,10 +1613,8 @@
1794	1613	* Get an array of the options to display in the advanced tab
1795	1614	* of the customization panel
1796	1615	*
1797	1616	* @since 2.0.6
1798		- *
1799		- * @return array
1800	1617	*/
1801	1618	private static function get_advanced_shortcodes() {
1802	1619	$adv_shortcodes = array(
1803	1620	'x sep=", "' => array(
		@@ -1814,18 +1631,17 @@
1814	1631	'label' => __( 'No Auto P', 'formidable' ),
1815	1632	'title' => __( 'Do not automatically add any paragraphs or line breaks', 'formidable' ),
1816	1633	),
1817	1634	);
	1635	+ $adv_shortcodes = apply_filters( 'frm_advanced_shortcodes', $adv_shortcodes );
1818	1636
1819	1637	// __( 'Leave blank instead of defaulting to User Login', 'formidable' ) : blank=1
1820	1638
1821		- return apply_filters( 'frm_advanced_shortcodes', $adv_shortcodes );
	1639	+ return $adv_shortcodes;
1822	1640	}
1823	1641
1824	1642	/**
1825	1643	* @since 3.04.01
1826		- *
1827		- * @return array
1828	1644	*/
1829	1645	private static function user_shortcodes() {
1830	1646	$options = array(
1831	1647	'ID' => __( 'User ID', 'formidable' ),
		@@ -1844,12 +1660,8 @@
1844	1660	/**
1845	1661	* Get an array of the helper shortcodes to display in the customization panel
1846	1662	*
1847	1663	* @since 2.0.6
1848		- *
1849		- * @param bool $settings_tab
1850		- *
1851		- * @return array
1852	1664	*/
1853	1665	private static function get_shortcode_helpers( $settings_tab ) {
1854	1666	$entry_shortcodes = array(
1855	1667	'id' => __( 'Entry ID', 'formidable' ),
		@@ -1864,9 +1676,8 @@
1864	1676	'form_name' => __( 'Form Name', 'formidable' ),
1865	1677	);
1866	1678
1867	1679	$entry_shortcodes = array_merge( FrmShortcodeHelper::get_contextual_shortcode_values(), $entry_shortcodes );
1868		-
1869	1680	if ( ! FrmAppHelper::pro_is_installed() ) {
1870	1681	unset( $entry_shortcodes['post_id'] );
1871	1682	}
1872	1683
		@@ -1874,13 +1685,12 @@
1874	1685	* Use this hook to add or remove buttons in the helpers section
1875	1686	* in the customization panel
1876	1687	*
1877	1688	* @since 2.0.6
1878		- *
1879		- * @param array $entry_shortcodes
1880		- * @param bool $settings_tab
1881	1689	*/
1882		- 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;
1883	1693	}
1884	1694
1885	1695	/**
1886	1696	* Insert the form class setting into the form.
		@@ -1885,9 +1695,8 @@
1885	1695	/**
1886	1696	* Insert the form class setting into the form.
1887	1697	*
1888	1698	* @param stdClass $form
1889		- *
1890	1699	* @return void
1891	1700	*/
1892	1701	public static function form_classes( $form ) {
1893	1702	if ( isset( $form->options['form_class'] ) ) {
		@@ -1898,9 +1707,9 @@
1898	1707	echo ' frm_js_validate ';
1899	1708	self::add_js_validate_form_to_global_vars( $form );
1900	1709	}
1901	1710
1902		- if ( FrmForm::is_ajax_on( $form ) ) {
	1711	+ if ( ! FrmFormsHelper::should_use_pro_for_ajax_submit() && FrmForm::is_ajax_on( $form ) ) {
1903	1712	echo ' frm_ajax_submit ';
1904	1713	}
1905	1714	}
1906	1715
		@@ -1910,9 +1719,8 @@
1910	1719	* @param stdClass $form
1911	1720	*/
1912	1721	public static function add_js_validate_form_to_global_vars( $form ) {
1913	1722	global $frm_vars;
1914		-
1915	1723	if ( ! isset( $frm_vars['js_validate_forms'] ) ) {
1916	1724	$frm_vars['js_validate_forms'] = array();
1917	1725	}
1918	1726	$frm_vars['js_validate_forms'][ $form->id ] = $form;
		@@ -1935,9 +1743,8 @@
1935	1743	/**
1936	1744	* @param string $content
1937	1745	* @param int|stdClass|string $form
1938	1746	* @param false|int|stdClass|string $entry
1939		- *
1940	1747	* @return string
1941	1748	*/
1942	1749	public static function filter_content( $content, $form, $entry = false ) {
1943	1750	$content = self::replace_form_name_shortcodes( $content, $form );
		@@ -1942,9 +1749,8 @@
1942	1749	public static function filter_content( $content, $form, $entry = false ) {
1943	1750	$content = self::replace_form_name_shortcodes( $content, $form );
1944	1751
1945	1752	self::get_entry_by_param( $entry );
1946		-
1947	1753	if ( ! $entry ) {
1948	1754	return $content;
1949	1755	}
1950	1756
		@@ -1960,10 +1766,11 @@
1960	1766	$form = $entry->parent_entry->form_id;
1961	1767	}
1962	1768
1963	1769	$shortcodes = FrmFieldsHelper::get_shortcodes( $content, $form );
	1770	+ $content = apply_filters( 'frm_replace_content_shortcodes', $content, $entry, $shortcodes );
1964	1771
1965		- return apply_filters( 'frm_replace_content_shortcodes', $content, $entry, $shortcodes );
	1772	+ return $content;
1966	1773	}
1967	1774
1968	1775	/**
1969	1776	* Replace any [form_name] shortcodes in a string.
		@@ -1971,9 +1778,8 @@
1971	1778	* @since 5.5
1972	1779	*
1973	1780	* @param array|string $string
1974	1781	* @param int|stdClass|string $form
1975		- *
1976	1782	* @return array|string
1977	1783	*/
1978	1784	public static function replace_form_name_shortcodes( $string, $form ) {
1979	1785	if ( ! is_string( $string ) ) {
		@@ -1979,9 +1785,9 @@
1979	1785	if ( ! is_string( $string ) ) {
1980	1786	return $string;
1981	1787	}
1982	1788
1983		- if ( ! str_contains( $string, '[form_name]' ) ) {
	1789	+ if ( false === strpos( $string, '[form_name]' ) ) {
1984	1790	return $string;
1985	1791	}
1986	1792
1987	1793	if ( ! is_object( $form ) ) {
		@@ -1993,30 +1799,20 @@
1993	1799	}
1994	1800
1995	1801	/**
1996	1802	* @param false|int|stdClass|string $entry
1997		- *
1998	1803	* @return void
1999	1804	*/
2000	1805	private static function get_entry_by_param( &$entry ) {
2001		- if ( $entry && is_object( $entry ) ) {
2002		- return;
2003		- }
	1806	+ if ( ! $entry || ! is_object( $entry ) ) {
	1807	+ if ( ! $entry || ! is_numeric( $entry ) ) {
	1808	+ $entry = FrmAppHelper::get_post_param( 'id', false, 'sanitize_title' );
	1809	+ }
2004	1810
2005		- if ( ! $entry || ! is_numeric( $entry ) ) {
2006		- $entry = FrmAppHelper::get_post_param( 'id', false, 'sanitize_title' );
	1811	+ FrmEntry::maybe_get_entry( $entry );
2007	1812	}
2008		-
2009		- FrmEntry::maybe_get_entry( $entry );
2010	1813	}
2011	1814
2012		- /**
2013		- * @param string $content
2014		- * @param false|object $entry
2015		- * @param array $shortcodes
2016		- *
2017		- * @return string
2018		- */
2019	1815	public static function replace_content_shortcodes( $content, $entry, $shortcodes ) {
2020	1816	return FrmFieldsHelper::replace_content_shortcodes( $content, $entry, $shortcodes );
2021	1817	}
2022	1818
		@@ -2021,9 +1817,8 @@
2021	1817	}
2022	1818
2023	1819	/**
2024	1820	* @param array $errors
2025		- *
2026	1821	* @return array
2027	1822	*/
2028	1823	public static function process_bulk_form_actions( $errors ) {
2029	1824	if ( ! $_REQUEST ) {
		@@ -2030,30 +1825,29 @@
2030	1825	return $errors;
2031	1826	}
2032	1827
2033	1828	$bulkaction = FrmAppHelper::get_param( 'action', '', 'get', 'sanitize_text_field' );
2034		-
2035		- // phpcs:ignore Universal.Operators.StrictComparisons
2036	1829	if ( $bulkaction == - 1 ) {
2037	1830	$bulkaction = FrmAppHelper::get_param( 'action2', '', 'get', 'sanitize_title' );
2038	1831	}
2039	1832
2040		- if ( $bulkaction && str_starts_with( $bulkaction, 'bulk_' ) ) {
	1833	+ if ( ! empty( $bulkaction ) && strpos( $bulkaction, 'bulk_' ) === 0 ) {
2041	1834	FrmAppHelper::remove_get_action();
	1835	+
2042	1836	$bulkaction = str_replace( 'bulk_', '', $bulkaction );
2043	1837	}
2044	1838
2045	1839	$ids = FrmAppHelper::get_param( 'item-action', '', 'get', 'sanitize_text_field' );
	1840	+ if ( empty( $ids ) ) {
	1841	+ $errors[] = __( 'No forms were specified', 'formidable' );
2046	1842
2047		- if ( ! $ids ) {
2048		- $errors[] = __( 'No forms were specified', 'formidable' );
2049	1843	return $errors;
2050	1844	}
2051	1845
2052	1846	$permission_error = FrmAppHelper::permission_nonce_error( '', '_wpnonce', 'bulk-toplevel_page_formidable' );
2053		-
2054	1847	if ( $permission_error !== false ) {
2055	1848	$errors[] = $permission_error;
	1849	+
2056	1850	return $errors;
2057	1851	}
2058	1852
2059	1853	if ( ! is_array( $ids ) ) {
		@@ -2077,24 +1871,9 @@
2077	1871
2078	1872	return $errors;
2079	1873	}
2080	1874
2081		- /**
2082		- * Includes html that shows a message when the device is too small to use Formidable Forms admin pages.
2083		- *
2084		- * @since 6.20
2085		- *
2086		- * @return void
2087		- */
2088		- public static function include_device_too_small_message() {
2089		- if ( ! FrmAppHelper::is_formidable_admin() ) {
2090		- return;
2091		- }
2092		-
2093		- include FrmAppHelper::plugin_path() . '/classes/views/shared/small-device-message.php';
2094		- }
2095		-
2096		- public static function route() { // phpcs:ignore Generic.Metrics.CyclomaticComplexity.MaxExceeded
	1875	+ public static function route() {
2097	1876	$action = isset( $_REQUEST['frm_action'] ) ? 'frm_action' : 'action';
2098	1877	$vars = array();
2099	1878	FrmAppHelper::include_svg();
2100	1879
		@@ -2104,28 +1883,25 @@
2104	1883	// Javascript needs to be allowed in some field settings.
2105	1884	// phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized, WordPress.Security.NonceVerification.Missing
2106	1885	$json_vars = htmlspecialchars_decode( nl2br( str_replace( '&quot;', '"', wp_unslash( $_POST['frm_compact_fields'] ) ) ) );
2107	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	+ }
2108	1893
2109		- if ( $json_vars ) {
	1894	+ add_filter( 'frm_validate_form', 'FrmFormsController::json_error' );
	1895	+ } else {
2110	1896	$vars = FrmAppHelper::json_to_array( $json_vars );
2111	1897	$action = $vars[ $action ];
2112	1898	unset( $_REQUEST['frm_compact_fields'], $_POST['frm_compact_fields'] ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
2113	1899	$_REQUEST = array_merge( $_REQUEST, $vars ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
2114	1900	$_POST = array_merge( $_POST, $_REQUEST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
2115		- } else {
2116		- // Json decoding failed so we should return an error message.
2117		- $action = FrmAppHelper::get_param( $action, '', 'get', 'sanitize_title' );
2118		-
2119		- if ( 'edit' === $action ) {
2120		- $action = 'update';
2121		- }
2122		-
2123		- add_filter( 'frm_validate_form', 'FrmFormsController::json_error' );
2124	1901	}
2125	1902	} else {
2126	1903	$action = FrmAppHelper::get_param( $action, '', 'get', 'sanitize_title' );
2127		-
2128	1904	if ( isset( $_REQUEST['delete_all'] ) ) {
2129	1905	// Override the action for this page.
2130	1906	$action = 'delete_all';
2131	1907	}
		@@ -2145,38 +1921,34 @@
2145	1921	case 'update_settings':
2146	1922	return self::$action( $vars );
2147	1923	case 'lite-reports':
2148	1924	self::no_reports( $vars );
2149		- return null;
	1925	+ return;
2150	1926	case 'views':
2151	1927	self::no_views( $vars );
2152		- return null;
	1928	+ return;
2153	1929	default:
2154	1930	do_action( 'frm_form_action_' . $action );
2155		-
2156	1931	if ( apply_filters( 'frm_form_stop_action_' . $action, false ) ) {
2157		- return null;
	1932	+ return;
2158	1933	}
2159	1934
2160	1935	$action = FrmAppHelper::get_param( 'action', '', 'get', 'sanitize_text_field' );
2161		-
2162		- // phpcs:ignore Universal.Operators.StrictComparisons
2163	1936	if ( $action == - 1 ) {
2164	1937	$action = FrmAppHelper::get_param( 'action2', '', 'get', 'sanitize_title' );
2165	1938	}
2166	1939
2167		- if ( str_starts_with( $action, 'bulk_' ) ) {
	1940	+ if ( strpos( $action, 'bulk_' ) === 0 ) {
2168	1941	FrmAppHelper::remove_get_action();
2169	1942
2170	1943	self::list_form();
2171		- return null;
	1944	+ return;
2172	1945	}
2173	1946
2174	1947	$message = FrmAppHelper::get_param( 'message' );
2175		-
2176	1948	if ( 'form_duplicate_error' === $message ) {
2177	1949	self::display_forms_list( array(), '', array( __( 'There was a problem duplicating the form', 'formidable' ) ) );
2178		- return null;
	1950	+ return;
2179	1951	}
2180	1952
2181	1953	if ( 'forms_permanently_deleted' === $message ) {
2182	1954	$count = FrmAppHelper::get_param( 'forms_deleted', 0, 'get', 'absint' );
		@@ -2182,14 +1954,14 @@
2182	1954	$count = FrmAppHelper::get_param( 'forms_deleted', 0, 'get', 'absint' );
2183	1955	/* translators: %1$s: Number of forms */
2184	1956	$message = sprintf( _n( '%1$s form permanently deleted.', '%1$s forms permanently deleted.', $count, 'formidable' ), $count );
2185	1957	self::display_forms_list( array(), $message, '' );
2186		- return null;
	1958	+ return;
2187	1959	}
2188	1960
2189	1961	self::display_forms_list();
2190	1962
2191		- return null;
	1963	+ return;
2192	1964	}//end switch
2193	1965	}
2194	1966
2195	1967	/**
		@@ -2208,43 +1980,19 @@
2208	1980
2209	1981	// Get posted data
2210	1982	$form_id = FrmAppHelper::get_post_param( 'form_id', '', 'absint' );
2211	1983	$name = FrmAppHelper::get_post_param( 'form_name', '', 'sanitize_text_field' );
2212		- $form = FrmForm::getOne( $form_id );
2213	1984
2214		- if ( ! $form ) {
2215		- wp_send_json_error( __( 'Form not found', 'formidable' ) );
2216		- }
	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' ) );
2217	1988
2218		- if ( $name === $form->name ) {
2219		- // Nothing to change so exit early.
2220		- wp_send_json_success();
2221		- }
2222		-
2223		- $to_update = array(
2224		- 'name' => $name,
2225		- );
2226		-
2227		- if ( '' === $name ) {
2228		- $form_key = $form->form_key;
2229		- } else {
2230		- // Only update form_key if name is not empty.
2231		- $form_key = FrmAppHelper::get_unique_key( sanitize_title( $name ), 'frm_forms', 'form_key' );
2232		- $to_update['form_key'] = $form_key;
2233		- }
2234		-
2235		- FrmForm::update( $form_id, $to_update );
2236		-
2237	1989	wp_send_json_success( compact( 'form_key' ) );
2238	1990	}
2239	1991
2240		- /**
2241		- * @param array $errors
2242		- *
2243		- * @return array
2244		- */
2245	1992	public static function json_error( $errors ) {
2246	1993	$errors['json'] = __( 'Abnormal HTML characters prevented your form from saving correctly', 'formidable' );
	1994	+
2247	1995	return $errors;
2248	1996	}
2249	1997
2250	1998	/**
		@@ -2251,10 +1999,8 @@
2251	1999	* Add education about views.
2252	2000	*
2253	2001	* @since 4.07
2254	2002	*
2255		- * @param array $values
2256		- *
2257	2003	* @return void
2258	2004	*/
2259	2005	public static function no_views( $values = array() ) {
2260	2006	FrmAppHelper::include_svg();
		@@ -2268,10 +2014,8 @@
2268	2014	* Add education about reports.
2269	2015	*
2270	2016	* @since 4.07
2271	2017	*
2272		- * @param array $values
2273		- *
2274	2018	* @return void
2275	2019	*/
2276	2020	public static function no_reports( $values = array() ) {
2277	2021	$id = FrmAppHelper::get_param( 'form', '', 'get', 'absint' );
		@@ -2298,9 +2042,8 @@
2298	2042	* @since 4.05.02
2299	2043	*/
2300	2044	private static function move_menu_to_footer() {
2301	2045	$settings = FrmAppHelper::get_settings();
2302		-
2303	2046	if ( empty( $settings->admin_bar ) ) {
2304	2047	remove_action( 'wp_body_open', 'wp_admin_bar_render', 0 );
2305	2048	}
2306	2049	}
		@@ -2306,15 +2049,13 @@
2306	2049	}
2307	2050
2308	2051	public static function admin_bar_configure() {
2309	2052	global $frm_vars;
2310		-
2311	2053	if ( empty( $frm_vars['forms_loaded'] ) ) {
2312	2054	return;
2313	2055	}
2314	2056
2315	2057	$actions = array();
2316		-
2317	2058	foreach ( $frm_vars['forms_loaded'] as $form ) {
2318	2059	if ( is_object( $form ) ) {
2319	2060	$actions[ $form->id ] = $form->name;
2320	2061	}
		@@ -2320,9 +2061,9 @@
2320	2061	}
2321	2062	unset( $form );
2322	2063	}
2323	2064
2324		- if ( ! $actions ) {
	2065	+ if ( empty( $actions ) ) {
2325	2066	return;
2326	2067	}
2327	2068
2328	2069	self::add_menu_to_admin_bar();
		@@ -2348,12 +2089,8 @@
2348	2089	}
2349	2090
2350	2091	/**
2351	2092	* @since 2.05.07
2352		- *
2353		- * @param array $actions
2354		- *
2355		- * @return void
2356	2093	*/
2357	2094	private static function add_forms_to_admin_bar( $actions ) {
2358	2095	global $wp_admin_bar;
2359	2096
		@@ -2359,13 +2096,14 @@
2359	2096
2360	2097	asort( $actions );
2361	2098
2362	2099	foreach ( $actions as $form_id => $name ) {
	2100	+
2363	2101	$wp_admin_bar->add_node(
2364	2102	array(
2365	2103	'parent' => 'frm-forms',
2366	2104	'id' => 'edit_form_' . $form_id,
2367		- 'title' => $name ? $name : FrmFormsHelper::get_no_title_text(),
	2105	+ 'title' => empty( $name ) ? FrmFormsHelper::get_no_title_text() : $name,
2368	2106	'href' => FrmForm::get_edit_link( $form_id ),
2369	2107	)
2370	2108	);
2371	2109	}
		@@ -2374,14 +2112,12 @@
2374	2112	/**
2375	2113	* The formidable shortcode
2376	2114	*
2377	2115	* @param array $atts The params from the shortcode.
2378		- *
2379	2116	* @return string
2380	2117	*/
2381	2118	public static function get_form_shortcode( $atts ) {
2382	2119	global $frm_vars;
2383		-
2384	2120	if ( ! empty( $frm_vars['skip_shortcode'] ) ) {
2385	2121	$sc = '[formidable';
2386	2122	$sc .= FrmAppHelper::array_to_html_params( $atts );
2387	2123	return $sc . ']';
		@@ -2410,9 +2146,8 @@
2410	2146	* @since 5.2.01
2411	2147	*
2412	2148	* @param false|int|string $id
2413	2149	* @param false|string $key
2414		- *
2415	2150	* @return false|stdClass
2416	2151	*/
2417	2152	private static function maybe_get_form_by_id_or_key( $id, $key ) {
2418	2153	if ( ! $id ) {
		@@ -2426,9 +2161,8 @@
2426	2161	* @param false|string $key
2427	2162	* @param bool|int|string $title may be 'auto', true, false, 'true', 'false', 'yes', '1', 1, '0', 0.
2428	2163	* @param bool|int|string $description may be 'auto', true, false, 'true', 'false', 'yes', '1', 1, '0', 0.
2429	2164	* @param array $atts
2430		- *
2431	2165	* @return string
2432	2166	*/
2433	2167	public static function show_form( $id = '', $key = '', $title = false, $description = false, $atts = array() ) {
2434	2168	$form = self::maybe_get_form_by_id_or_key( $id, $key );
		@@ -2449,13 +2183,14 @@
2449	2183
2450	2184	add_action( 'frm_load_form_hooks', 'FrmHooksController::trigger_load_form_hooks' );
2451	2185	FrmAppHelper::trigger_hook_load( 'form', $form );
2452	2186
2453		- $form = apply_filters( 'frm_pre_display_form', $form );
	2187	+ $form = apply_filters( 'frm_pre_display_form', $form );
	2188	+
2454	2189	$frm_settings = FrmAppHelper::get_settings( array( 'current_form' => $form->id ) );
2455	2190
2456	2191	if ( self::is_viewable_draft_form( $form ) ) {
2457		- // Don't show a draft form on a page
	2192	+ // don't show a draft form on a page
2458	2193	$form = __( 'Please select a valid form', 'formidable' );
2459	2194	} elseif ( ! FrmForm::is_visible_to_user( $form ) ) {
2460	2195	$form = do_shortcode( $frm_settings->login_msg );
2461	2196	} else {
		@@ -2475,18 +2210,16 @@
2475	2210	}
2476	2211
2477	2212	/**
2478	2213	* @param false|int|string $id
2479		- *
2480	2214	* @return false|stdClass
2481	2215	*/
2482	2216	private static function maybe_get_form_to_show( $id ) {
2483	2217	$form = false;
2484	2218
2485		- if ( $id ) {
	2219	+ if ( ! empty( $id ) ) {
2486	2220	// Form id or key is set.
2487	2221	$form = FrmForm::getOne( $id );
2488		-
2489	2222	if ( ! $form || $form->parent_form_id || $form->status === 'trash' ) {
2490	2223	$form = false;
2491	2224	}
2492	2225	}
		@@ -2493,25 +2226,12 @@
2493	2226
2494	2227	return $form;
2495	2228	}
2496	2229
2497		- /**
2498		- * @param object $form
2499		- *
2500		- * @return bool
2501		- */
2502	2230	private static function is_viewable_draft_form( $form ) {
2503	2231	return $form->status === 'draft' && current_user_can( 'frm_edit_forms' ) && ! FrmAppHelper::is_preview_page();
2504	2232	}
2505	2233
2506		- /**
2507		- * @param object $form
2508		- * @param bool $title
2509		- * @param bool $description
2510		- * @param array $atts
2511		- *
2512		- * @return string
2513		- */
2514	2234	public static function get_form( $form, $title, $description, $atts = array() ) {
2515	2235	ob_start();
2516	2236
2517	2237	do_action( 'frm_before_get_form', $atts );
		@@ -2518,9 +2238,10 @@
2518	2238
2519	2239	self::get_form_contents( $form, $title, $description, $atts );
2520	2240	self::enqueue_scripts( FrmForm::get_params( $form ) );
2521	2241
2522		- $contents = ob_get_clean();
	2242	+ $contents = ob_get_contents();
	2243	+ ob_end_clean();
2523	2244
2524	2245	self::maybe_minimize_form( $atts, $contents );
2525	2246
2526	2247	return $contents;
		@@ -2525,25 +2246,12 @@
2525	2246
2526	2247	return $contents;
2527	2248	}
2528	2249
2529		- /**
2530		- * @param array $params
2531		- *
2532		- * @return void
2533		- */
2534	2250	public static function enqueue_scripts( $params ) {
2535	2251	do_action( 'frm_enqueue_form_scripts', $params );
2536	2252	}
2537	2253
2538		- /**
2539		- * @param object $form
2540		- * @param bool $title
2541		- * @param bool $description
2542		- * @param array $atts
2543		- *
2544		- * @return void
2545		- */
2546	2254	public static function get_form_contents( $form, $title, $description, $atts ) {
2547	2255	$params = FrmForm::get_params( $form );
2548	2256	$errors = self::get_saved_errors( $form, $params );
2549	2257	$fields = FrmFieldsHelper::get_form_fields( $form->id, $errors );
		@@ -2550,10 +2258,9 @@
2550	2258	$reset = false;
2551	2259	$pass_args = compact( 'form', 'fields', 'errors', 'title', 'description', 'reset' );
2552	2260
2553	2261	$pass_args['action'] = $params['action'];
2554		- // phpcs:ignore WordPress.Security.NonceVerification.Missing, Universal.Operators.StrictComparisons
2555		- $handle_process_here = $params['action'] === 'create' && $params['posted_form_id'] == $form->id && $_POST;
	2262	+ $handle_process_here = $params['action'] === 'create' && $params['posted_form_id'] == $form->id && $_POST; // phpcs:ignore WordPress.Security.NonceVerification.Missing
2556	2263
2557	2264	if ( ! $handle_process_here ) {
2558	2265	FrmFormState::set_initial_value( 'title', $title );
2559	2266	FrmFormState::set_initial_value( 'description', $description );
		@@ -2558,15 +2265,16 @@
2558	2265	FrmFormState::set_initial_value( 'title', $title );
2559	2266	FrmFormState::set_initial_value( 'description', $description );
2560	2267
2561	2268	do_action( 'frm_display_form_action', $params, $fields, $form, $title, $description );
2562		-
2563	2269	if ( apply_filters( 'frm_continue_to_new', true, $form->id, $params['action'] ) ) {
2564	2270	self::show_form_after_submit( $pass_args );
2565	2271	}
2566		- } elseif ( $errors ) {
	2272	+ } elseif ( ! empty( $errors ) ) {
2567	2273	self::show_form_after_submit( $pass_args );
	2274	+
2568	2275	} else {
	2276	+
2569	2277	do_action( 'frm_validate_form_creation', $params, $fields, $form, $title, $description );
2570	2278
2571	2279	if ( apply_filters( 'frm_continue_to_create', true, $form->id ) ) {
2572	2280	$entry_id = self::just_created_entry( $form->id );
		@@ -2589,19 +2297,13 @@
2589	2297	/**
2590	2298	* If the form was processed earlier (init), get the generated errors
2591	2299	*
2592	2300	* @since 2.05
2593		- *
2594		- * @param object $form
2595		- * @param array $params
2596		- *
2597		- * @return array
2598	2301	*/
2599	2302	private static function get_saved_errors( $form, $params ) {
2600	2303	global $frm_vars;
2601	2304
2602		- // phpcs:ignore WordPress.Security.NonceVerification.Missing, Universal.Operators.StrictComparisons
2603		- if ( $params['posted_form_id'] == $form->id && $_POST && isset( $frm_vars['created_entries'][ $form->id ] ) ) {
	2305	+ if ( $params['posted_form_id'] == $form->id && $_POST && isset( $frm_vars['created_entries'][ $form->id ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
2604	2306	$errors = $frm_vars['created_entries'][ $form->id ]['errors'];
2605	2307	} else {
2606	2308	$errors = array();
2607	2309	}
		@@ -2618,16 +2320,13 @@
2618	2320	}
2619	2321
2620	2322	/**
2621	2323	* @since 2.2.7
2622		- *
2623		- * @param int|string $form_id
2624		- *
2625		- * @return int
2626	2324	*/
2627	2325	public static function just_created_entry( $form_id ) {
2628	2326	global $frm_vars;
2629		- return isset( $frm_vars['created_entries'] ) && isset( $frm_vars['created_entries'][ $form_id ] ) && isset( $frm_vars['created_entries'][ $form_id ]['entry_id'] ) ? $frm_vars['created_entries'][ $form_id ]['entry_id'] : 0; // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong
	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;
2630	2329	}
2631	2330
2632	2331	/**
2633	2332	* Gets confirmation method.
		@@ -2640,9 +2339,8 @@
2640	2339	*
2641	2340	* @type object $form Form object.
2642	2341	* @type int $entry_id Entry ID.
2643	2342	* }
2644		- *
2645	2343	* @return array|string
2646	2344	*/
2647	2345	private static function get_confirmation_method( $atts ) {
2648	2346	$action = FrmOnSubmitHelper::current_event( $atts );
		@@ -2650,9 +2348,8 @@
2650	2348	$method = ! empty( $atts['form']->options[ $opt ] ) ? $atts['form']->options[ $opt ] : 'message';
2651	2349
2652	2350	if ( ! empty( $atts['entry_id'] ) ) {
2653	2351	$met_actions = self::get_met_on_submit_actions( $atts, $action );
2654		-
2655	2352	if ( $met_actions ) {
2656	2353	$method = $met_actions;
2657	2354	}
2658	2355	}
		@@ -2659,21 +2356,14 @@
2659	2356
2660	2357	$method = apply_filters( 'frm_success_filter', $method, $atts['form'], $action );
2661	2358
2662	2359	if ( $method !== 'message' && ( ! $atts['entry_id'] || ! is_numeric( $atts['entry_id'] ) ) ) {
2663		- return 'message';
	2360	+ $method = 'message';
2664	2361	}
2665	2362
2666	2363	return $method;
2667	2364	}
2668	2365
2669		- /**
2670		- * @param object $form
2671		- * @param array $params
2672		- * @param array $args
2673		- *
2674		- * @return void
2675		- */
2676	2366	public static function maybe_trigger_redirect( $form, $params, $args ) {
2677	2367	if ( ! isset( $params['id'] ) ) {
2678	2368	global $frm_vars;
2679	2369	$params['id'] = $frm_vars['created_entries'][ $form->id ]['entry_id'];
		@@ -2700,12 +2390,14 @@
2700	2390	* @param array $params See {@see FrmFormsController::maybe_trigger_redirect()}.
2701	2391	* @param array $args See {@see FrmFormsController::maybe_trigger_redirect()}.
2702	2392	*/
2703	2393	public static function maybe_trigger_redirect_with_action( $conf_method, $form, $params, $args ) {
2704		- if ( is_array( $conf_method ) && 1 === count( $conf_method ) && 'redirect' === FrmOnSubmitHelper::get_action_type( $conf_method[0] ) && empty( $conf_method[0]->post_content['redirect_delay'] ) ) { // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong
2705		- $event = FrmOnSubmitHelper::current_event( $params );
2706		- FrmOnSubmitHelper::populate_on_submit_data( $form->options, $conf_method[0], $event );
2707		- $conf_method = 'redirect';
	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	+ }
2708	2400	}
2709	2401
2710	2402	if ( 'redirect' === $conf_method ) {
2711	2403	self::trigger_redirect( $form, $params, $args );
		@@ -2711,15 +2403,8 @@
2711	2403	self::trigger_redirect( $form, $params, $args );
2712	2404	}
2713	2405	}
2714	2406
2715		- /**
2716		- * @param object $form
2717		- * @param array $params
2718		- * @param array $args
2719		- *
2720		- * @return void
2721		- */
2722	2407	public static function trigger_redirect( $form, $params, $args ) {
2723	2408	$success_args = array(
2724	2409	'action' => $params['action'],
2725	2410	'conf_method' => 'redirect',
		@@ -2778,9 +2463,8 @@
2778	2463	* @since 6.0
2779	2464	*
2780	2465	* @param array $args See {@see FrmFormsController::run_success_action()}.
2781	2466	* @param string $event Form event. Default is `create`.
2782		- *
2783	2467	* @return array Array of actions that meet the conditional logics.
2784	2468	*/
2785	2469	public static function get_met_on_submit_actions( $args, $event = 'create' ) {
2786	2470	if ( ! FrmOnSubmitHelper::form_has_migrated( $args['form'] ) ) {
		@@ -2807,11 +2491,13 @@
2807	2491	}
2808	2492
2809	2493	$action_type = FrmOnSubmitHelper::get_action_type( $action );
2810	2494
2811		- if ( 'redirect' === $action_type && $has_redirect ) {
2812		- // Do not process because we run the first redirect action only.
2813		- 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	+ }
2814	2500	}
2815	2501
2816	2502	if ( ! self::is_valid_on_submit_action( $action, $args, $event ) ) {
2817	2503	continue;
		@@ -2836,10 +2522,10 @@
2836	2522	* @param array $args See {@see FrmFormsController::run_success_action()}. `$args['event']` is also added.
2837	2523	*/
2838	2524	$met_actions = apply_filters( 'frm_get_met_on_submit_actions', $met_actions, $args );
2839	2525
2840		- if ( ! $met_actions ) {
2841		- return array( FrmOnSubmitHelper::get_fallback_action( $event ) );
	2526	+ if ( empty( $met_actions ) ) {
	2527	+ $met_actions = array( FrmOnSubmitHelper::get_fallback_action( $event ) );
2842	2528	}
2843	2529
2844	2530	return $met_actions;
2845	2531	}
		@@ -2851,9 +2537,8 @@
2851	2537	*
2852	2538	* @param object $action Form action object.
2853	2539	* @param array $args See {@see FrmFormsController::run_success_action()}.
2854	2540	* @param string $event Form event. Default is `create`.
2855		- *
2856	2541	* @return bool
2857	2542	*/
2858	2543	private static function is_valid_on_submit_action( $action, $args, $event = 'create' ) {
2859	2544	$action_type = FrmOnSubmitHelper::get_action_type( $action );
		@@ -2875,9 +2560,8 @@
2875	2560	return false;
2876	2561	}
2877	2562
2878	2563	$page = get_post( $action->post_content['success_page_id'] );
2879		-
2880	2564	if ( ! $page || 'trash' === $page->post_status ) {
2881	2565	return false;
2882	2566	}
2883	2567	}
		@@ -2899,9 +2583,8 @@
2899	2583	'entry_id' => $args['entry_id'],
2900	2584	'action' => FrmOnSubmitHelper::current_event( $args ),
2901	2585	)
2902	2586	);
2903		-
2904	2587	if ( ! is_array( $args['conf_method'] ) ) {
2905	2588	self::run_success_action( $args );
2906	2589	return;
2907	2590	}
		@@ -2928,9 +2611,8 @@
2928	2611	* @param array $args See {@see FrmFormsController::run_success_action()}.
2929	2612	*/
2930	2613	public static function run_multi_on_submit_actions( $args ) {
2931	2614	$redirect_action = null;
2932		-
2933	2615	foreach ( $args['conf_method'] as $action ) {
2934	2616	if ( 'redirect' === FrmOnSubmitHelper::get_action_type( $action ) ) {
2935	2617	// We catch the redirect action to run it last.
2936	2618	$redirect_action = $action;
		@@ -2941,15 +2623,13 @@
2941	2623
2942	2624	unset( $action );
2943	2625	}
2944	2626
2945		- if ( ! $redirect_action ) {
2946		- 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 );
2947	2631	}
2948		-
2949		- // Show script to delay the redirection.
2950		- $args['force_delay_redirect'] = true;
2951		- self::run_single_on_submit_action( $args, $redirect_action );
2952	2632	}
2953	2633
2954	2634	/**
2955	2635	* Runs single On Submit action.
		@@ -2970,9 +2650,8 @@
2970	2650	* @since 6.0
2971	2651	*
2972	2652	* @param array $args See {@see FrmFormsController::run_success_action()}.
2973	2653	* @param object $action On Submit action object.
2974		- *
2975	2654	* @return array
2976	2655	*/
2977	2656	private static function get_run_success_action_args( $args, $action ) {
2978	2657	$new_args = $args;
		@@ -2978,9 +2657,10 @@
2978	2657	$new_args = $args;
2979	2658
2980	2659	FrmOnSubmitHelper::populate_on_submit_data( $new_args['form']->options, $action, $args['action'] );
2981	2660
2982		- $opt = 'update' === $args['action'] ? 'edit_' : 'success_';
	2661	+ $opt = 'update' === $args['action'] ? 'edit_' : 'success_';
	2662	+
2983	2663	$new_args['conf_method'] = $new_args['form']->options[ $opt . 'action' ];
2984	2664
2985	2665	/**
2986	2666	* Filters the run success action args.
		@@ -2995,18 +2675,12 @@
2995	2675	}
2996	2676
2997	2677	/**
2998	2678	* @since 3.0
2999		- *
3000		- * @param array $args
3001		- *
3002		- * @return void
3003	2679	*/
3004	2680	private static function load_page_after_submit( $args ) {
3005	2681	global $post;
3006	2682	$opt = $args['success_opt'];
3007		-
3008		- // phpcs:ignore Universal.Operators.StrictComparisons
3009	2683	if ( ! $post || $args['form']->options[ $opt . '_page_id' ] != $post->ID ) {
3010	2684	$page = get_post( $args['form']->options[ $opt . '_page_id' ] );
3011	2685	$old_post = $post;
3012	2686	$post = $page;
		@@ -3030,9 +2704,8 @@
3030	2704	}
3031	2705
3032	2706	/**
3033	2707	* @since 3.0
3034		- *
3035	2708	* @param array $args See {@see FrmFormsController::run_success_action()}.
3036	2709	*/
3037	2710	private static function redirect_after_submit( $args ) {
3038	2711	add_filter( 'frm_use_wpautop', '__return_false' );
		@@ -3046,10 +2719,11 @@
3046	2719	FrmEntriesController::delete_entry_before_redirect( $success_url, $args['form'], $args );
3047	2720
3048	2721	add_filter( 'frm_redirect_url', 'FrmEntriesController::prepare_redirect_url' );
3049	2722	$success_url = apply_filters( 'frm_redirect_url', $success_url, $args['form'], $args );
3050		- $doing_ajax = FrmAppHelper::doing_ajax();
3051	2723
	2724	+ $doing_ajax = FrmAppHelper::doing_ajax();
	2725	+
3052	2726	if ( ! empty( $args['ajax'] ) && $doing_ajax && empty( $args['force_delay_redirect'] ) ) {
3053	2727	// Is AJAX submit and there is just one Redirect action runs.
3054	2728	echo json_encode( self::get_ajax_redirect_response_data( $args + compact( 'success_url' ) ) );
3055	2729	wp_die();
		@@ -3098,9 +2772,8 @@
3098	2772	*
3099	2773	* @since 6.3.1
3100	2774	*
3101	2775	* @param array $args See {@see FrmFormsController::run_success_action()}.
3102		- *
3103	2776	* @return array
3104	2777	*/
3105	2778	private static function get_ajax_redirect_response_data( $args ) {
3106	2779	$response_data = array(
		@@ -3123,9 +2796,8 @@
3123	2796	$args['message'] = FrmOnSubmitHelper::get_default_new_tab_msg();
3124	2797
3125	2798	$args['form']->options['success_msg'] = $args['message'];
3126	2799	$args['form']->options['edit_msg'] = $args['message'];
3127		-
3128	2800	if ( ! isset( $args['fields'] ) ) {
3129	2801	$args['fields'] = FrmField::get_all_for_form( $args['form']->id );
3130	2802	}
3131	2803
		@@ -3177,15 +2849,13 @@
3177	2849	add_filter( 'frm_use_wpautop', '__return_true' );
3178	2850
3179	2851	echo FrmAppHelper::maybe_kses( $redirect_msg ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
3180	2852	echo '<script>';
3181		-
3182	2853	if ( empty( $args['doing_ajax'] ) ) {
3183	2854	// Not AJAX submit, delay JS until window.load.
3184	2855	echo 'window.onload=function(){';
3185	2856	}
3186	2857	echo 'setTimeout(function(){' . $redirect_js . '}, ' . intval( $delay_time ) . ');'; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
3187		-
3188	2858	if ( empty( $args['doing_ajax'] ) ) {
3189	2859	echo '};';
3190	2860	}
3191	2861	echo '</script>';
		@@ -3198,16 +2868,13 @@
3198	2868	* @param string $success_msg
3199	2869	* @param array $args
3200	2870	*/
3201	2871	private static function get_redirect_message( $success_url, $success_msg, $args ) {
3202		- $success_msg = apply_filters( 'frm_content', $success_msg, $args['form'], $args['entry_id'] );
3203		- $success_msg = do_shortcode( FrmAppHelper::use_wpautop( $success_msg ) );
3204		-
3205		- // phpcs:disable Generic.WhiteSpace.ScopeIndent
3206		- $redirect_msg = '<div class="' . esc_attr( FrmFormsHelper::get_form_style_class( $args['form'] ) ) . '"><div class="frm-redirect-msg" role="status">' . $success_msg . '<br/>' . // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong
	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/>' .
3207	2875	self::get_redirect_fallback_message( $success_url, $args ) .
3208	2876	'</div></div>';
3209		- // phpcs:enable Generic.WhiteSpace.ScopeIndent
3210	2877
3211	2878	$redirect_args = array(
3212	2879	'entry_id' => $args['entry_id'],
3213	2880	'form_id' => $args['form']->id,
		@@ -3223,14 +2890,12 @@
3223	2890	* @since 6.3.1
3224	2891	*
3225	2892	* @param string $success_url Redirect URL.
3226	2893	* @param array $args Contains `form` object.
3227		- *
3228	2894	* @return string
3229	2895	*/
3230	2896	private static function get_redirect_fallback_message( $success_url, $args ) {
3231	2897	$target = '';
3232		-
3233	2898	if ( ! empty( $args['form']->options['open_in_new_tab'] ) ) {
3234	2899	$target = ' target="_blank"';
3235	2900	}
3236	2901
		@@ -3245,12 +2910,8 @@
3245	2910	/**
3246	2911	* Prepare to show the success message and empty form after submit
3247	2912	*
3248	2913	* @since 2.05
3249		- *
3250		- * @param array $atts
3251		- *
3252		- * @return void
3253	2914	*/
3254	2915	public static function show_message_after_save( $atts ) {
3255	2916	$atts['message'] = self::prepare_submit_message( $atts['form'], $atts['entry_id'], $atts );
3256	2917
		@@ -3256,9 +2917,8 @@
3256	2917
3257	2918	if ( ! isset( $atts['form']->options['show_form'] ) || $atts['form']->options['show_form'] ) {
3258	2919	if ( isset( $atts['action'] ) && 'update' === $atts['action'] && is_callable( array( 'FrmProEntriesController', 'show_front_end_form_with_entry' ) ) ) {
3259	2920	$entry = FrmEntry::getOne( $atts['entry_id'] );
3260		-
3261	2921	if ( $entry ) {
3262	2922	// This is copied from the Pro plugin.
3263	2923	$atts['conf_message'] = FrmProEntriesController::confirmation( 'message', $atts['form'], $atts['form']->options, $entry->id, $atts );
3264	2924	$atts['show_form'] = FrmProEntriesController::is_form_displayed_after_edit( $atts['form'] );
		@@ -3275,12 +2935,8 @@
3275	2935	/**
3276	2936	* Show an empty form
3277	2937	*
3278	2938	* @since 2.05
3279		- *
3280		- * @param array $args
3281		- *
3282		- * @return void
3283	2939	*/
3284	2940	private static function show_form_after_submit( $args ) {
3285	2941	self::fill_atts_for_form_display( $args );
3286	2942
		@@ -3299,11 +2955,12 @@
3299	2955	}
3300	2956	unset( $args );
3301	2957
3302	2958	$include_form_tag = apply_filters( 'frm_include_form_tag', true, $form );
3303		- $frm_settings = FrmAppHelper::get_settings();
3304		- $submit = $form->options['submit_value'] ?? $frm_settings->submit_value;
3305	2959
	2960	+ $frm_settings = FrmAppHelper::get_settings();
	2961	+ $submit = isset( $form->options['submit_value'] ) ? $form->options['submit_value'] : $frm_settings->submit_value;
	2962	+
3306	2963	global $frm_vars;
3307	2964	self::maybe_load_css( $form, $values['custom_style'], $frm_vars['load_css'] );
3308	2965
3309	2966	$message_placement = self::message_placement( $form, $message );
		@@ -3311,36 +2968,25 @@
3311	2968	include FrmAppHelper::plugin_path() . '/classes/views/frm-entries/new.php';
3312	2969	}
3313	2970
3314	2971	/**
3315		- * Gets message placement.
3316		- *
3317	2972	* @since 4.05.02
3318		- * @since 6.26 This method changed from `private` to `public`.
3319		- *
3320		- * @param object $form Form object.
3321		- * @param string $message The message.
3322		- *
3323		- * @return string Accepts 'before', 'after', or 'submit'.
	2973	+ * @return string - 'before', 'after', or 'submit'
3324	2974	*/
3325		- public static function message_placement( $form, $message ) {
	2975	+ private static function message_placement( $form, $message ) {
3326	2976	$place = 'before';
3327	2977
3328	2978	if ( $message && isset( $form->options['form_class'] ) ) {
3329		- if ( str_contains( $form->options['form_class'], 'frm_below_success' ) ) {
	2979	+ if ( strpos( $form->options['form_class'], 'frm_below_success' ) !== false ) {
3330	2980	$place = 'after';
3331		- } elseif ( str_contains( $form->options['form_class'], 'frm_inline_success' ) ) {
	2981	+ } elseif ( strpos( $form->options['form_class'], 'frm_inline_success' ) !== false ) {
3332	2982	$place = 'submit';
3333	2983	}
3334	2984	}
3335	2985
3336	2986	/**
3337		- * Filter the message placement.
3338		- *
3339	2987	* @since 4.05.02
3340		- *
3341		- * @param string $place Accepts 'before', 'after', or 'submit'.
3342		- * @param array $args Args.
	2988	+ * @return string - 'before' or 'after'
3343	2989	*/
3344	2990	return apply_filters( 'frm_message_placement', $place, compact( 'form', 'message' ) );
3345	2991	}
3346	2992
		@@ -3347,12 +2993,8 @@
3347	2993	/**
3348	2994	* Get all the values needed on the new.php entry page
3349	2995	*
3350	2996	* @since 2.05
3351		- *
3352		- * @param array $args
3353		- *
3354		- * @return void
3355	2997	*/
3356	2998	private static function fill_atts_for_form_display( &$args ) {
3357	2999	if ( ! isset( $args['title'] ) && isset( $args['show_title'] ) ) {
3358	3000	$args['title'] = $args['show_title'];
		@@ -3377,12 +3019,8 @@
3377	3019	/**
3378	3020	* Show the success message without the form
3379	3021	*
3380	3022	* @since 2.05
3381		- *
3382		- * @param array $atts
3383		- *
3384		- * @return void
3385	3023	*/
3386	3024	private static function show_lone_success_message( $atts ) {
3387	3025	global $frm_vars;
3388	3026	$values = FrmEntriesHelper::setup_new_vars( $atts['fields'], $atts['form'], true );
		@@ -3388,12 +3026,13 @@
3388	3026	$values = FrmEntriesHelper::setup_new_vars( $atts['fields'], $atts['form'], true );
3389	3027	self::maybe_load_css( $atts['form'], $values['custom_style'], $frm_vars['load_css'] );
3390	3028
3391	3029	$include_extra_container = 'frm_forms' . FrmFormsHelper::get_form_style_class( $values );
3392		- $errors = array();
3393		- $form = $atts['form'];
3394		- $message = $atts['message'];
3395	3030
	3031	+ $errors = array();
	3032	+ $form = $atts['form'];
	3033	+ $message = $atts['message'];
	3034	+
3396	3035	include FrmAppHelper::plugin_path() . '/classes/views/frm-entries/errors.php';
3397	3036	}
3398	3037
3399	3038	/**
		@@ -3401,20 +3040,19 @@
3401	3040	*
3402	3041	* @since 2.05
3403	3042	* @since 6.0.x Added the third parameter.
3404	3043	*
3405		- * @param object $form Form object.
3406		- * @param int|string $entry_id Entry ID.
3407		- * @param array $args See {@see FrmFormsController::run_success_action()}.
3408		- *
	3044	+ * @param object $form Form object.
	3045	+ * @param int $entry_id Entry ID.
	3046	+ * @param array $args See {@see FrmFormsController::run_success_action()}.
3409	3047	* @return string
3410	3048	*/
3411	3049	private static function prepare_submit_message( $form, $entry_id, $args = array() ) {
3412	3050	$frm_settings = FrmAppHelper::get_settings( array( 'current_form' => $form->id ) );
3413		- $opt = $args['success_opt'] ?? 'success';
	3051	+ $opt = isset( $args['success_opt'] ) ? $args['success_opt'] : 'success';
3414	3052
3415	3053	if ( $entry_id && is_numeric( $entry_id ) ) {
3416		- $message = $form->options[ $opt . '_msg' ] ?? $frm_settings->success_msg;
	3054	+ $message = isset( $form->options[ $opt . '_msg' ] ) ? $form->options[ $opt . '_msg' ] : $frm_settings->success_msg;
3417	3055	$class = 'frm_message';
3418	3056	} else {
3419	3057	$message = $frm_settings->failed_msg;
3420	3058	$class = FrmFormsHelper::form_error_class();
		@@ -3431,9 +3069,9 @@
3431	3069	public static function front_head() {
3432	3070	$version = FrmAppHelper::plugin_version();
3433	3071	$suffix = FrmAppHelper::js_suffix();
3434	3072
3435		- if ( $suffix && self::has_combo_js_file() ) {
	3073	+ if ( ! empty( $suffix ) && self::has_combo_js_file() ) {
3436	3074	wp_register_script( 'formidable', FrmAppHelper::plugin_url() . '/js/frm.min.js', array( 'jquery' ), $version, true );
3437	3075	} else {
3438	3076	wp_register_script( 'formidable', FrmAppHelper::plugin_url() . "/js/formidable{$suffix}.js", array( 'jquery' ), $version, true );
3439	3077	}
		@@ -3440,9 +3078,9 @@
3440	3078
3441	3079	add_filter( 'script_loader_tag', 'FrmFormsController::defer_script_loading', 10, 2 );
3442	3080
3443	3081	if ( FrmAppHelper::is_admin() ) {
3444		- // Don't load this in back-end
	3082	+ // don't load this in back-end
3445	3083	return;
3446	3084	}
3447	3085
3448	3086	FrmAppHelper::localize_script( 'front' );
		@@ -3455,15 +3093,8 @@
3455	3093	public static function has_combo_js_file() {
3456	3094	return is_readable( FrmAppHelper::plugin_path() . '/js/frm.min.js' );
3457	3095	}
3458	3096
3459		- /**
3460		- * @param object $form
3461		- * @param int|string $this_load
3462		- * @param bool $global_load
3463		- *
3464		- * @return void
3465		- */
3466	3097	public static function maybe_load_css( $form, $this_load, $global_load ) {
3467	3098	$load_css = FrmForm::is_form_loaded( $form, $this_load, $global_load );
3468	3099
3469	3100	if ( ! $load_css ) {
		@@ -3493,9 +3124,8 @@
3493	3124	return;
3494	3125	}
3495	3126
3496	3127	global $wp_styles;
3497		-
3498	3128	if ( is_array( $wp_styles->queue ) && in_array( 'formidable', $wp_styles->queue, true ) ) {
3499	3129	wp_print_styles( 'formidable' );
3500	3130	}
3501	3131	}
		@@ -3510,52 +3140,32 @@
3510	3140	private static function should_load_late() {
3511	3141	return ! function_exists( 'aioseo' );
3512	3142	}
3513	3143
3514		- /**
3515		- * @param string $tag
3516		- * @param string $handle
3517		- *
3518		- * @return string
3519		- */
3520	3144	public static function defer_script_loading( $tag, $handle ) {
3521		- if ( 'captcha-api' === $handle && ! str_contains( $tag, 'defer' ) ) {
3522		- return str_replace( ' src', ' defer="defer" async="async" src', $tag );
	3145	+ if ( 'captcha-api' == $handle && ! strpos( $tag, 'defer' ) ) {
	3146	+ $tag = str_replace( ' src', ' defer="defer" async="async" src', $tag );
3523	3147	}
3524	3148
3525	3149	return $tag;
3526	3150	}
3527	3151
3528		- /**
3529		- * @param string $location
3530		- *
3531		- * @return void
3532		- */
3533	3152	public static function footer_js( $location = 'footer' ) {
3534	3153	global $frm_vars;
3535	3154
3536	3155	FrmStylesController::enqueue_css();
3537	3156
3538		- if ( FrmAppHelper::is_admin() || $location === 'header' || empty( $frm_vars['forms_loaded'] ) ) {
3539		- return;
	3157	+ if ( ! FrmAppHelper::is_admin() && $location !== 'header' && ! empty( $frm_vars['forms_loaded'] ) ) {
	3158	+ // load formidable js
	3159	+ wp_enqueue_script( 'formidable' );
3540	3160	}
3541		-
3542		- // Load formidable js
3543		- wp_enqueue_script( 'formidable' );
3544		-
3545		- FrmHoneypot::maybe_print_honeypot_js();
3546	3161	}
3547	3162
3548	3163	/**
3549	3164	* @since 2.0.8
3550		- *
3551		- * @param array $atts
3552		- * @param string $content
3553		- *
3554		- * @return void
3555	3165	*/
3556	3166	private static function maybe_minimize_form( $atts, &$content ) {
3557		- // Check if minimizing is turned on
	3167	+ // check if minimizing is turned on
3558	3168	if ( self::is_minification_on( $atts ) ) {
3559	3169	$content = str_replace( array( "\r\n", "\r", "\n", "\t", ' ' ), '', $content );
3560	3170	}
3561	3171	}
		@@ -3561,11 +3171,8 @@
3561	3171	}
3562	3172
3563	3173	/**
3564	3174	* @since 2.0.8
3565		- *
3566		- * @param array $atts
3567		- *
3568	3175	* @return bool
3569	3176	*/
3570	3177	private static function is_minification_on( $atts ) {
3571	3178	return ! empty( $atts['minimize'] );
		@@ -3577,13 +3184,11 @@
3577	3184	* @return void
3578	3185	*/
3579	3186	public static function landing_page_preview_option() {
3580	3187	$dir = apply_filters( 'frm_landing_page_preview_option', false );
3581		-
3582	3188	if ( false === $dir || ! file_exists( $dir . 'landing-page-preview-option.php' ) ) {
3583	3189	$dir = self::get_form_views_path();
3584	3190	}
3585		-
3586	3191	include $dir . 'landing-page-preview-option.php';
3587	3192	}
3588	3193
3589	3194	/**
		@@ -3609,15 +3214,13 @@
3609	3214
3610	3215	check_ajax_referer( 'frm_ajax', 'nonce' );
3611	3216
3612	3217	$type = FrmAppHelper::get_post_param( 'type', '', 'sanitize_text_field' );
3613		-
3614	3218	if ( ! $type || ! in_array( $type, array( 'form', 'view' ), true ) ) {
3615	3219	die( 0 );
3616	3220	}
3617	3221
3618	3222	$object_id = FrmAppHelper::get_post_param( 'object_id', '', 'absint' );
3619		-
3620	3223	if ( ! $object_id ) {
3621	3224	die( 0 );
3622	3225	}
3623	3226
		@@ -3629,15 +3232,13 @@
3629	3232	$postarr['post_content'] = apply_filters( 'frm_create_page_with_' . $type . '_shortcode_content', '', $object_id );
3630	3233	}
3631	3234
3632	3235	$name = FrmAppHelper::get_post_param( 'name', '', 'sanitize_text_field' );
3633		-
3634	3236	if ( $name ) {
3635	3237	$postarr['post_title'] = $name;
3636	3238	}
3637	3239
3638	3240	$success = wp_insert_post( $postarr );
3639		-
3640	3241	if ( ! is_numeric( $success ) || ! $success ) {
3641	3242	die( 0 );
3642	3243	}
3643	3244
		@@ -3651,9 +3252,8 @@
3651	3252	/**
3652	3253	* @since 5.3
3653	3254	*
3654	3255	* @param int $form_id
3655		- *
3656	3256	* @return string
3657	3257	*/
3658	3258	private static function get_page_shortcode_content_for_form( $form_id ) {
3659	3259	$shortcode = '[formidable id="' . $form_id . '"]';
		@@ -3695,14 +3295,23 @@
3695	3295	}
3696	3296
3697	3297	/**
3698	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.
3699	3307	*
3700		- * @param array $values
	3308	+ * @since 4.05
	3309	+ * @deprecated 6.16.3
3701	3310	*
3702	3311	* @return void
3703	3312	*/
3704		- public static function create( $values = array() ) {
3705		- _deprecated_function( __METHOD__, '4.0', 'FrmFormsController::update' );
3706		- 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';
3707	3316	}
3708	3317	}