← All changes | classes/controllers/FrmFormsController.php +260 -883 6.35 → 6.18 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	}
		@@ -47,15 +45,8 @@
47	45	add_filter( 'manage_toplevel_page_formidable_columns', 'FrmFormsController::get_columns', 0 );
48	46	add_filter( 'manage_toplevel_page_formidable_sortable_columns', 'FrmFormsController::get_sortable_columns' );
49	47	}
50	48
51		- /**
52		- * Runs on admin head of the formidable forms page.
53		- *
54		- * @since 6.32 This adds screen options.
55		- *
56		- * @return void
57		- */
58	49	public static function head() {
59	50	if ( wp_is_mobile() ) {
60	51	wp_enqueue_script( 'jquery-touch-punch' );
61	52	}
		@@ -73,12 +64,12 @@
73	64	*/
74	65	public static function logic_tip() {
75	66	$images_url = FrmAppHelper::plugin_url() . '/images/';
76	67	$data_message = __( 'Only show the fields you need and create branching forms. Upgrade to get conditional logic and question branching.', 'formidable' );
77		- $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
78		- 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">';
79	70	esc_html_e( 'Conditional Logic', 'formidable' );
80		- 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' ) );
81	72	echo '</a>';
82	73	}
83	74
84	75	/**
		@@ -85,15 +76,12 @@
85	76	* By default, Divi processes form shortcodes on the edit post page.
86	77	* Now that won't do.
87	78	*
88	79	* @since 3.01
89		- *
90		- * @param array $shortcodes List of shortcodes to process.
91		- *
92		- * @return array
93	80	*/
94	81	public static function prevent_divi_conflict( $shortcodes ) {
95	82	$shortcodes[] = 'formidable';
	83	+
96	84	return $shortcodes;
97	85	}
98	86
99	87	/**
		@@ -104,14 +92,12 @@
104	92
105	93	$message = '';
106	94	$params = FrmForm::list_page_params();
107	95	$errors = self::process_bulk_form_actions( array() );
108		-
109	96	if ( isset( $errors['message'] ) ) {
110	97	$message = $errors['message'];
111	98	unset( $errors['message'] );
112	99	}
113		-
114	100	$errors = apply_filters( 'frm_admin_list_form_action', $errors );
115	101
116	102	self::display_forms_list( $params, $message, $errors );
117	103	}
		@@ -121,14 +107,12 @@
121	107	*
122	108	* @since 2.02.11
123	109	*
124	110	* @param int|object $form
125		- *
126	111	* @return void
127	112	*/
128	113	private static function create_default_email_action( $form ) {
129	114	FrmForm::maybe_get_form( $form );
130		-
131	115	if ( ! is_object( $form ) ) {
132	116	return;
133	117	}
134	118
		@@ -133,17 +117,15 @@
133	117	}
134	118
135	119	$create_email = apply_filters( 'frm_create_default_email_action', true, $form );
136	120
137		- if ( ! $create_email ) {
138		- return;
	121	+ if ( $create_email ) {
	122	+ /**
	123	+ * @var FrmFormAction
	124	+ */
	125	+ $action_control = FrmFormActionsController::get_form_actions( 'email' );
	126	+ $action_control->create( $form->id );
139	127	}
140		-
141		- /**
142		- * @var FrmFormAction
143		- */
144		- $action_control = FrmFormActionsController::get_form_actions( 'email' );
145		- $action_control->create( $form->id );
146	128	}
147	129
148	130	/**
149	131	* Create the default On submit action
		@@ -150,14 +132,12 @@
150	132	*
151	133	* @since 6.0.0
152	134	*
153	135	* @param int|object $form Form object or ID.
154		- *
155	136	* @return void
156	137	*/
157	138	private static function create_default_on_submit_action( $form ) {
158	139	FrmForm::maybe_get_form( $form );
159		-
160	140	if ( ! is_object( $form ) ) {
161	141	return;
162	142	}
163	143
		@@ -170,17 +150,15 @@
170	150	* @param object $form Form object.
171	151	*/
172	152	$create = apply_filters( 'frm_create_default_on_submit_action', true, $form );
173	153
174		- if ( ! $create ) {
175		- return;
	154	+ if ( $create ) {
	155	+ /**
	156	+ * @var FrmFormAction
	157	+ */
	158	+ $action_control = FrmFormActionsController::get_form_actions( FrmOnSubmitAction::$slug );
	159	+ $action_control->create( $form->id );
176	160	}
177		-
178		- /**
179		- * @var FrmFormAction
180		- */
181		- $action_control = FrmFormActionsController::get_form_actions( FrmOnSubmitAction::$slug );
182		- $action_control->create( $form->id );
183	161	}
184	162
185	163	/**
186	164	* Creates submit button field.
		@@ -187,14 +165,12 @@
187	165	*
188	166	* @since 6.9
189	167	*
190	168	* @param int|object $form Form ID or object.
191		- *
192	169	* @return void
193	170	*/
194	171	private static function create_submit_button_field( $form ) {
195	172	FrmForm::maybe_get_form( $form );
196		-
197	173	if ( ! is_object( $form ) ) {
198	174	return;
199	175	}
200	176
		@@ -217,10 +193,8 @@
217	193	);
218	194	}
219	195
220	196	/**
221		- * @param array|false $values
222		- *
223	197	* @return void
224	198	*/
225	199	public static function edit( $values = false ) {
226	200	FrmAppHelper::permission_check( 'frm_edit_forms' );
		@@ -232,9 +206,8 @@
232	206
233	207	/**
234	208	* @param mixed $id
235	209	* @param string $message
236		- *
237	210	* @return void
238	211	*/
239	212	public static function settings( $id = false, $message = '' ) {
240	213	FrmAppHelper::permission_check( 'frm_edit_forms' );
		@@ -262,9 +235,10 @@
262	235	FrmAppController::show_error_modal( $error_args );
263	236	return;
264	237	}
265	238
266		- $id = FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
	239	+ $id = FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
	240	+
267	241	$errors = FrmForm::validate( $_POST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
268	242	$warnings = FrmFormsHelper::check_for_warnings( $_POST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
269	243
270	244	if ( count( $errors ) > 0 ) {
		@@ -273,22 +247,17 @@
273	247	}
274	248
275	249	do_action( 'frm_before_update_form_settings', $id );
276	250
277		- $antispam_was_on = self::antispam_was_on( $id ); // phpcs:ignore Formidable.CodeAnalysis.InlineSingleUseVariable
	251	+ $antispam_was_on = self::antispam_was_on( $id );
278	252
279	253	FrmForm::update( $id, $_POST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
280	254
281	255	$antispam_is_on = ! empty( $_POST['options']['antispam'] ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
282		-
283	256	if ( $antispam_is_on !== $antispam_was_on ) {
284	257	FrmAntiSpam::clear_caches();
285	258	}
286	259
287		- // Handle captcha field inclusion
288		- $include_captcha = isset( $_POST['frm_include_captcha'] ) && '1' === $_POST['frm_include_captcha']; // phpcs:ignore WordPress.Security.NonceVerification.Missing
289		- self::handle_captcha_field( $id, $include_captcha );
290		-
291	260	$message = __( 'Settings Successfully Updated', 'formidable' );
292	261
293	262	self::get_settings_vars( $id, array(), compact( 'message', 'warnings' ) );
294	263	}
		@@ -294,9 +263,8 @@
294	263	}
295	264
296	265	/**
297	266	* @param int $form_id
298		- *
299	267	* @return bool
300	268	*/
301	269	private static function antispam_was_on( $form_id ) {
302	270	$form = FrmForm::getOne( $form_id );
		@@ -303,52 +271,12 @@
303	271	return ! empty( $form->options['antispam'] );
304	272	}
305	273
306	274	/**
307		- * Handle captcha field inclusion in form
308		- *
309		- * @since 6.33
310		- *
311		- * @param int $form_id Form ID.
312		- * @param bool $include_captcha Whether to include captcha field.
313		- *
314	275	* @return void
315	276	*/
316		- private static function handle_captcha_field( $form_id, $include_captcha ) {
317		- $form_fields = FrmField::get_all_for_form( $form_id, '', 'exclude' );
318		- $captcha_field_id = 0;
319		- $submit_field_order = 0;
320		-
321		- foreach ( $form_fields as $field ) {
322		- if ( 'captcha' === $field->type ) {
323		- $captcha_field_id = $field->id;
324		- break;
325		- }
326		-
327		- if ( 'submit' === $field->type ) {
328		- $submit_field_order = $field->field_order;
329		- }
330		- }
331		-
332		- if ( $include_captcha && ! $captcha_field_id ) {
333		- // Create captcha field just before submit button
334		- $field_values = FrmFieldsHelper::setup_new_vars( 'captcha', $form_id );
335		- $field_values['name'] = __( 'Captcha', 'formidable' );
336		- $field_values['field_order'] = $submit_field_order > 0 ? $submit_field_order - 1 : 0;
337		- FrmField::create( $field_values );
338		- } elseif ( ! $include_captcha && $captcha_field_id ) {
339		- // Delete captcha field
340		- FrmField::destroy( $captcha_field_id );
341		- }
342		- }
343		-
344		- /**
345		- * @param array $values
346		- *
347		- * @return void
348		- */
349	277	public static function update( $values = array() ) {
350		- if ( ! $values ) {
	278	+ if ( empty( $values ) ) {
351	279	$values = $_POST; // phpcs:ignore WordPress.Security.NonceVerification.Missing
352	280	}
353	281
354	282	// Set radio button and checkbox meta equal to "other" value.
		@@ -357,9 +285,8 @@
357	285	}
358	286
359	287	$errors = FrmForm::validate( $values );
360	288	$permission_error = FrmAppHelper::permission_nonce_error( 'frm_edit_forms', 'frm_save_form', 'frm_save_form_nonce' );
361		-
362	289	if ( $permission_error !== false ) {
363	290	$errors['form'] = $permission_error;
364	291	}
365	292
		@@ -378,9 +305,9 @@
378	305	if ( self::is_too_long( $values ) ) {
379	306	$message .= '<br/> ' . sprintf(
380	307	/* translators: %1$s: Start link HTML, %2$s: end link HTML */
381	308	__( 'However, your form is very long and may be %1$sreaching server limits%2$s.', 'formidable' ),
382		- '<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">',
383	310	'</a>'
384	311	);
385	312	}
386	313
		@@ -391,32 +318,17 @@
391	318	self::get_edit_vars( $id, array(), $message );
392	319	}
393	320
394	321	/**
395		- * @since 6.25.1
396		- *
397		- * @return string
398		- */
399		- private static function get_form_too_long_docs_url() {
400		- $utm = array(
401		- 'campaign' => 'builder',
402		- 'content' => 'form-too-long',
403		- );
404		- return FrmAppHelper::admin_upgrade_link( $utm, 'knowledgebase/i-have-a-long-form-why-did-the-options-at-the-end-of-the-form-stop-saving/' );
405		- }
406		-
407		- /**
408	322	* Remove the draft flag from any new fields from this current session.
409	323	*
410	324	* @since 6.8
411	325	*
412	326	* @param int $form_id
413		- *
414	327	* @return void
415	328	*/
416	329	private static function maybe_remove_draft_option_from_fields( $form_id ) {
417	330	$draft_field_ids_csv = FrmAppHelper::get_post_param( 'draft_fields', '', 'sanitize_text_field' );
418		-
419	331	if ( ! $draft_field_ids_csv ) {
420	332	// If the draft_fields input is empty there are no new fields in the session.
421	333	return;
422	334	}
		@@ -421,9 +333,8 @@
421	333	return;
422	334	}
423	335
424	336	$draft_field_ids = array_filter( explode( ',', $draft_field_ids_csv ), 'is_numeric' );
425		-
426	337	if ( ! $draft_field_ids ) {
427	338	// Exit early if the draft fields input is invalid. It should be a CSV of integer values.
428	339	return;
429	340	}
		@@ -428,9 +339,8 @@
428	339	return;
429	340	}
430	341
431	342	$draft_field_rows = FrmFieldsHelper::get_draft_field_results( $form_id, $draft_field_ids );
432		-
433	343	foreach ( $draft_field_rows as $row ) {
434	344	$row->field_options['draft'] = 0;
435	345	FrmField::update( $row->id, array( 'field_options' => $row->field_options ) );
436	346	}
		@@ -442,10 +352,8 @@
442	352	* were likely not saved either.
443	353	*
444	354	* @since 3.06.01
445	355	*
446		- * @param array $values
447		- *
448	356	* @return bool
449	357	*/
450	358	private static function is_too_long( $values ) {
451	359	return empty( $values['frm_end'] );
		@@ -481,17 +389,13 @@
481	389	* @return string|null
482	390	*/
483	391	public static function page_preview() {
484	392	$params = FrmForm::list_page_params();
485		-
486		- if ( ! $params['form'] || is_numeric( $params['form'] ) ) {
	393	+ if ( ! $params['form'] ) {
487	394	return null;
488	395	}
489	396
490		- self::maybe_block_preview( $params['form'] );
491		-
492	397	$form = FrmForm::getOne( $params['form'] );
493		-
494	398	if ( ! $form ) {
495	399	return null;
496	400	}
497	401
		@@ -503,19 +407,9 @@
503	407	*
504	408	* @return void
505	409	*/
506	410	public static function show_page_preview() {
507		- $preview = self::page_preview();
508		-
509		- if ( is_null( $preview ) ) {
510		- wp_die(
511		- '<h1>' . esc_html__( 'Form key is invalid', 'formidable' ) . '</h1>',
512		- '<p>' . esc_html__( 'Form key is invalid', 'formidable' ) . '</p>',
513		- 404
514		- );
515		- }
516		-
517		- echo $preview; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
	411	+ echo self::page_preview(); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
518	412	}
519	413
520	414	/**
521	415	* @return void
		@@ -526,19 +420,9 @@
526	420
527	421	global $frm_vars;
528	422	$frm_vars['preview'] = true;
529	423
530		- // print_emoji_styles is deprecated.
531		- remove_action( 'wp_print_styles', 'print_emoji_styles' );
532		-
533		- if ( FrmTestModeController::should_add_test_mode_container() ) {
534		- do_action( 'frm_test_mode_init' );
535		- add_action( 'wp_enqueue_scripts', 'FrmTestModeController::register_and_enqueue_required_scripts' );
536		- add_filter( 'frm_filter_final_form', 'FrmTestModeController::maybe_add_test_mode_container', 99 );
537		- }
538		-
539	424	$include_theme = FrmAppHelper::get_param( 'theme', '', 'get', 'absint' );
540		-
541	425	if ( $include_theme ) {
542	426	self::set_preview_query();
543	427	self::load_theme_preview();
544	428	} else {
		@@ -561,9 +445,8 @@
561	445	'post_type' => 'page',
562	446	);
563	447
564	448	$page_for_posts = get_option( 'page_for_posts' );
565		-
566	449	if ( is_numeric( $page_for_posts ) ) {
567	450	// Avoid querying for the "Posts Page" or "Blog Page" so we don't display 10 forms.
568	451	$page_query['post__not_in'] = array( $page_for_posts );
569	452	}
		@@ -568,15 +451,13 @@
568	451	$page_query['post__not_in'] = array( $page_for_posts );
569	452	}
570	453
571	454	$random_page = get_posts( $page_query );
572		-
573	455	if ( ! $random_page ) {
574	456	return;
575	457	}
576	458
577	459	$random_page = reset( $random_page );
578		-
579	460	if ( ! is_a( $random_page, 'WP_Post' ) ) {
580	461	// The return type can also be int.
581	462	return;
582	463	}
		@@ -598,9 +479,8 @@
598	479	*
599	480	* @since 5.5.2
600	481	*
601	482	* @param WP_Post $page The page object.
602		- *
603	483	* @return void
604	484	*/
605	485	private static function set_post_global( $page ) {
606	486	global $post;
		@@ -619,16 +499,14 @@
619	499	add_action( 'loop_no_results', 'FrmFormsController::show_page_preview' );
620	500	add_filter( 'is_active_sidebar', '__return_false' );
621	501	FrmStylesController::enqueue_css( 'enqueue', true );
622	502
623		- if ( false !== get_template_part( 'page' ) ) {
624		- 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();
625	508	}
626		-
627		- if ( function_exists( 'wp_is_block_theme' ) && wp_is_block_theme() ) {
628		- add_filter( 'body_class', 'FrmFormsController::preview_block_theme_body_classnames' );
629		- }
630		- self::fallback_when_page_template_part_is_not_supported_by_theme();
631	509	}
632	510
633	511	/**
634	512	* Add padding to the body for block themes.
		@@ -635,9 +513,8 @@
635	513	*
636	514	* @since 6.5.2
637	515	*
638	516	* @param array $classes The body classes list.
639		- *
640	517	* @return array
641	518	*/
642	519	public static function preview_block_theme_body_classnames( $classes ) {
643	520	$classes[] = 'has-global-padding';
		@@ -650,27 +527,21 @@
650	527	*
651	528	* @return void
652	529	*/
653	530	private static function fallback_when_page_template_part_is_not_supported_by_theme() {
654		- if ( ! have_posts() ) {
655		- return;
656		- }
	531	+ if ( have_posts() ) {
	532	+ the_post();
	533	+ self::get_template( 'header' );
657	534
658		- the_post();
659		- 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>';
660	541
661		- // Add some generic class names to the container to add some natural padding to the content.
662		- // .entry-content catches the WordPress TwentyTwenty theme.
663		- // .container catches Customizr content.
664		- echo '<div class="container entry-content">';
665		- the_content();
666		- echo '</div>';
667		-
668		- // Prevent extra unexpected forms in the footer.
669		- // For some reason this happens in the Twenty Twenty Five theme.
670		- add_filter( 'frm_filter_final_form', '__return_empty_string' );
671		-
672		- self::get_template( 'footer' );
	542	+ self::get_template( 'footer' );
	543	+ }
673	544	}
674	545
675	546	/**
676	547	* Calls core function to get a template part if it doesn't cause deprecation warnings. Otherwise skips the deprecation function call
		@@ -676,11 +547,9 @@
676	547	* Calls core function to get a template part if it doesn't cause deprecation warnings. Otherwise skips the deprecation function call
677	548	* and renders required html fragments calling required functions.
678	549	*
679	550	* @since 6.7.1
680		- *
681	551	* @param string $template
682		- *
683	552	* @return void
684	553	*/
685	554	private static function get_template( $template ) {
686	555	if ( self::should_try_getting_template( $template ) ) {
		@@ -701,11 +570,9 @@
701	570	/**
702	571	* Returns true if calling a template function doesn't trigger deprecation warnings.
703	572	*
704	573	* @since 6.7.1
705		- *
706	574	* @param string $template
707		- *
708	575	* @return bool
709	576	*/
710	577	private static function should_try_getting_template( $template ) {
711	578	$stylesheet_path = get_stylesheet_directory();
		@@ -719,15 +586,15 @@
719	586	/**
720	587	* Set the page title for the theme preview page
721	588	*
722	589	* @since 3.0
723		- *
724		- * @param string $title
725		- *
726		- * @return string
727	590	*/
728	591	public static function preview_page_title( $title ) {
729		- 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;
730	597	}
731	598
732	599	/**
733	600	* Set the page title for the theme preview page.
		@@ -734,9 +601,8 @@
734	601	*
735	602	* @since 3.0
736	603	*
737	604	* @param string $title
738		- *
739	605	* @return string
740	606	*/
741	607	public static function preview_title( $title ) {
742	608	return __( 'Form Preview', 'formidable' );
		@@ -747,9 +613,8 @@
747	613	*
748	614	* @since 3.0
749	615	*
750	616	* @param string $content
751		- *
752	617	* @return string
753	618	*/
754	619	public static function preview_content( $content ) {
755	620	if ( in_the_loop() ) {
		@@ -764,39 +629,23 @@
764	629	/**
765	630	* @since 3.0
766	631	*/
767	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	+
768	638	$key = FrmAppHelper::simple_get( 'form', 'sanitize_title' );
769		-
770		- // phpcs:ignore Universal.Operators.StrictComparisons
771	639	if ( $key == '' ) {
772	640	$key = FrmAppHelper::get_post_param( 'form', '', 'sanitize_title' );
773	641	}
774	642
775		- if ( ! $key ) {
776		- $error = __( 'Form key is missing', 'formidable' );
777		- wp_die(
778		- '<h1>' . esc_html( $error ) . '</h1>',
779		- '<p>' . esc_html( $error ) . '</p>',
780		- 404
781		- );
782		- }
783		-
784		- self::maybe_block_preview( $key );
785		-
786	643	$form = FrmForm::getAll( array( 'form_key' => $key ), '', 1 );
787		-
788		- if ( ! $form ) {
789		- $error = __( 'Form does not exist', 'formidable' );
790		- wp_die(
791		- '<h1>' . esc_html( $error ) . '</h1>',
792		- '<p>' . esc_html( $error ) . '</p>',
793		- 404
794		- );
	644	+ if ( empty( $form ) ) {
	645	+ $form = FrmForm::getAll( array(), '', 1 );
795	646	}
796	647
797		- header( 'Content-Type: text/html; charset=' . get_option( 'blog_charset' ) );
798		-
799	648	self::fix_deprecated_null_param_warning();
800	649
801	650	require FrmAppHelper::plugin_path() . '/classes/views/frm-entries/direct.php';
802	651	}
		@@ -801,33 +650,8 @@
801	650	require FrmAppHelper::plugin_path() . '/classes/views/frm-entries/direct.php';
802	651	}
803	652
804	653	/**
805		- * Block the form preview for the contact form by default if the user cannot view forms.
806		- * This is to prevent the contact form being exploited.
807		- * Since this form is added by default and every site uses the same key, it is too easy
808		- * to guess this form.
809		- *
810		- * @since 6.20
811		- *
812		- * @param string $form_key Form key.
813		- *
814		- * @return void
815		- */
816		- public static function maybe_block_preview( $form_key ) {
817		- if ( ! FrmFormsHelper::should_block_preview( $form_key ) ) {
818		- return;
819		- }
820		-
821		- $error = __( 'You do not have permission to view this form', 'formidable' );
822		- wp_die(
823		- '<h1>' . esc_html( $error ) . '</h1>',
824		- '<p>' . esc_html( $error ) . '</p>',
825		- 403
826		- );
827		- }
828		-
829		- /**
830	654	* Some themes have a null $src value.
831	655	* This function adds a filter to ensure that $src is not null.
832	656	* WP will call str_starts_with with the null value triggering a deprecated message otherwise.
833	657	*
		@@ -839,13 +663,15 @@
839	663	add_filter(
840	664	'script_loader_src',
841	665	/**
842	666	* @param string|null $src
843		- *
844	667	* @return string
845	668	*/
846	669	function ( $src ) {
847		- return is_null( $src ) ? '' : $src;
	670	+ if ( is_null( $src ) ) {
	671	+ $src = '';
	672	+ }
	673	+ return $src;
848	674	}
849	675	);
850	676	}
851	677
		@@ -854,9 +680,8 @@
854	680	}
855	681
856	682	/**
857	683	* @param array $ids
858		- *
859	684	* @return string
860	685	*/
861	686	public static function bulk_untrash( $ids ) {
862	687	FrmAppHelper::permission_check( 'frm_edit_forms' );
		@@ -868,9 +693,11 @@
868	693	return '';
869	694	}
870	695
871	696	/* translators: %1$s: Number of forms */
872		- 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;
873	700	}
874	701
875	702	/**
876	703	* @since 3.06
		@@ -915,9 +742,8 @@
915	742	// Check nonce url.
916	743	check_admin_referer( $status . '_form_' . $params['id'] );
917	744
918	745	$count = 0;
919		-
920	746	if ( FrmForm::set_status( $params['id'], $available_status[ $status ]['new_status'] ) ) {
921	747	++$count;
922	748	}
923	749
		@@ -931,9 +757,9 @@
931	757	/* translators: %1$s: Number of forms */
932	758	$available_status['untrash']['message'] = sprintf( _n( '%1$s form restored from the Trash.', '%1$s forms restored from the Trash.', $count, 'formidable' ), $count );
933	759
934	760	/* translators: %1$s: Number of forms, %2$s: Start link HTML, %3$s: End link HTML */
935		- $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>' );
936	762
937	763	$message = $available_status[ $status ]['message'];
938	764
939	765	self::display_forms_list( $params, $message );
		@@ -940,9 +766,8 @@
940	766	}
941	767
942	768	/**
943	769	* @param array $ids
944		- *
945	770	* @return string
946	771	*/
947	772	public static function bulk_trash( $ids ) {
948	773	FrmAppHelper::permission_check( 'frm_delete_forms' );
		@@ -947,9 +772,8 @@
947	772	public static function bulk_trash( $ids ) {
948	773	FrmAppHelper::permission_check( 'frm_delete_forms' );
949	774
950	775	$count = 0;
951		-
952	776	foreach ( $ids as $id ) {
953	777	if ( FrmForm::trash( $id ) ) {
954	778	++$count;
955	779	}
		@@ -964,16 +788,17 @@
964	788	'param' => 'form_type',
965	789	'type' => 'request',
966	790	)
967	791	);
968		-
969		- return sprintf(
	792	+ $message = sprintf(
970	793	/* translators: %1$s: Number of forms, %2$s: Start link HTML, %3$s: End link HTML */
971	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' ),
972	795	$count,
973		- '<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' ) ) . '">',
974	797	'</a>'
975	798	);
	799	+
	800	+ return $message;
976	801	}
977	802
978	803	public static function destroy() {
979	804	FrmAppHelper::permission_check( 'frm_delete_forms' );
		@@ -983,9 +808,8 @@
983	808	// Check nonce url.
984	809	check_admin_referer( 'destroy_form_' . $params['id'] );
985	810
986	811	$count = 0;
987		-
988	812	if ( FrmForm::destroy( $params['id'] ) ) {
989	813	++$count;
990	814	}
991	815
		@@ -996,9 +820,8 @@
996	820	}
997	821
998	822	/**
999	823	* @param array $ids
1000		- *
1001	824	* @return string
1002	825	*/
1003	826	public static function bulk_destroy( $ids ) {
1004	827	FrmAppHelper::permission_check( 'frm_delete_forms' );
		@@ -1003,12 +826,10 @@
1003	826	public static function bulk_destroy( $ids ) {
1004	827	FrmAppHelper::permission_check( 'frm_delete_forms' );
1005	828
1006	829	$count = 0;
1007		-
1008	830	foreach ( $ids as $id ) {
1009	831	$d = FrmForm::destroy( $id );
1010		-
1011	832	if ( $d ) {
1012	833	++$count;
1013	834	}
1014	835	}
		@@ -1026,18 +847,19 @@
1026	847	*/
1027	848	public static function delete_all() {
1028	849	// Check nonce url.
1029	850	$permission_error = FrmAppHelper::permission_nonce_error( 'frm_delete_forms', '_wpnonce', 'bulk-toplevel_page_formidable' );
1030		-
1031	851	if ( $permission_error !== false ) {
1032	852	self::display_forms_list( array(), '', array( $permission_error ) );
	853	+
1033	854	return;
1034	855	}
1035	856
1036	857	$count = FrmForm::scheduled_delete( time() );
1037	858	$url = remove_query_arg( array( 'delete_all' ) );
1038		- $url .= '&message=forms_permanently_deleted&forms_deleted=' . $count;
1039	859
	860	+ $url .= '&message=forms_permanently_deleted&forms_deleted=' . $count;
	861	+
1040	862	wp_safe_redirect( $url );
1041	863	die();
1042	864	}
1043	865
		@@ -1111,22 +933,21 @@
1111	933	*
1112	934	* @return void
1113	935	*/
1114	936	public static function insert_form_button() {
1115		- if ( ! current_user_can( 'frm_view_forms' ) ) {
1116		- 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
1117	949	}
1118		-
1119		- // Store the result in memory and re-use it when this function is called multiple times.
1120		- // This helps speed up the form builder when there are a lot of HTML fields, where this
1121		- // Button is inserted once per HTML field.
1122		- // In a form with 66 HTML fields, this saves 0.5 seconds on page load time, tested locally.
1123		- if ( ! isset( self::$formidable_tinymce_button ) ) {
1124		- FrmAppHelper::load_admin_wide_js();
1125		- $icon = apply_filters( 'frm_media_icon', FrmAppHelper::svg_logo() );
1126		- self::$formidable_tinymce_button = '<a href="#TB_inline?width=50&height=50&inlineId=frm_insert_form" class="thickbox button add_media frm_insert_form" title="' . esc_attr__( 'Add forms and content', 'formidable' ) . '">' . FrmAppHelper::kses( $icon, 'all' ) . ' ' . esc_html( FrmAppHelper::get_menu_name() ) . '</a>'; // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong
1127		- }
1128		- echo self::$formidable_tinymce_button; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
1129	950	}
1130	951
1131	952	/**
1132	953	* @return void
		@@ -1147,21 +968,17 @@
1147	968	$shortcodes = apply_filters( 'frm_popup_shortcodes', $shortcodes );
1148	969
1149	970	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/insert_form_popup.php';
1150	971
1151		- if ( ! FrmAppHelper::is_form_builder_page() || class_exists( '_WP_Editors', false ) ) {
1152		- 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
1153	980	}
1154		-
1155		- // Initialize a wysiwyg so we have usable settings defined in tinyMCEPreInit.mceInit
1156		- require ABSPATH . WPINC . '/class-wp-editor.php';
1157		- // phpcs:disable Generic.WhiteSpace.ScopeIndent
1158		- ?>
1159		- <div class="frm_hidden">
1160		- <?php wp_editor( '', 'frm_description_placeholder', array() ); ?>
1161		- </div>
1162		- <?php
1163		- // phpcs:enable Generic.WhiteSpace.ScopeIndent
1164	981	}
1165	982
1166	983	/**
1167	984	* Check the page being loaded, determine if this is a page that should include the form popup.
		@@ -1173,9 +990,8 @@
1173	990	private static function should_insert_form_popup() {
1174	991	if ( FrmAppHelper::is_form_builder_page() ) {
1175	992	return true;
1176	993	}
1177		-
1178	994	$page = basename( FrmAppHelper::get_server_value( 'PHP_SELF' ) );
1179	995	return in_array( $page, array( 'post.php', 'page.php', 'page-new.php', 'post-new.php' ), true );
1180	996	}
1181	997
		@@ -1183,10 +999,9 @@
1183	999	FrmAppHelper::permission_check( 'frm_view_forms' );
1184	1000	check_ajax_referer( 'frm_ajax', 'nonce' );
1185	1001
1186	1002	$shortcode = FrmAppHelper::get_post_param( 'shortcode', '', 'sanitize_text_field' );
1187		-
1188		- if ( ! $shortcode ) {
	1003	+ if ( empty( $shortcode ) ) {
1189	1004	wp_die();
1190	1005	}
1191	1006
1192	1007	echo '<div id="sc-opts-' . esc_attr( $shortcode ) . '" class="frm_shortcode_option">';
		@@ -1211,13 +1026,12 @@
1211	1026	'label' => __( 'Minimize form HTML', 'formidable' ),
1212	1027	),
1213	1028	);
1214	1029	}
1215		-
1216	1030	$opts = apply_filters( 'frm_sc_popup_opts', $opts, $shortcode );
1217	1031
1218	1032	if ( isset( $opts['form_id'] ) && is_string( $opts['form_id'] ) ) {
1219		- // Allow other shortcodes to use the required form id option
	1033	+ // allow other shortcodes to use the required form id option
1220	1034	$form_id = $opts['form_id'];
1221	1035	unset( $opts['form_id'] );
1222	1036	}
1223	1037
		@@ -1233,9 +1047,8 @@
1233	1047	*
1234	1048	* @param array $params
1235	1049	* @param string $message
1236	1050	* @param array $errors
1237		- *
1238	1051	* @return void
1239	1052	*/
1240	1053	public static function display_forms_list( $params = array(), $message = '', $errors = array() ) {
1241	1054	FrmAppHelper::permission_check( 'frm_view_forms' );
		@@ -1252,56 +1065,35 @@
1252	1065	* @param string $table_class Class name for List Helper.
1253	1066	*/
1254	1067	$table_class = apply_filters( 'frm_forms_list_class', 'FrmFormsListHelper' );
1255	1068	$wp_list_table = new $table_class( compact( 'params' ) );
1256		- $pagenum = $wp_list_table->get_pagenum();
1257	1069
	1070	+ $pagenum = $wp_list_table->get_pagenum();
	1071	+
1258	1072	$wp_list_table->prepare_items();
1259	1073
1260	1074	$total_pages = $wp_list_table->get_pagination_arg( 'total_pages' );
1261		-
1262	1075	if ( $pagenum > $total_pages && $total_pages > 0 ) {
1263		- wp_safe_redirect( esc_url_raw( add_query_arg( 'paged', $total_pages ) ) );
	1076	+ wp_redirect( esc_url_raw( add_query_arg( 'paged', $total_pages ) ) );
1264	1077	die();
1265	1078	}
1266	1079
1267		- $error = FrmInbox::check_for_error();
1268		-
1269		- if ( $error ) {
1270		- $show_messages = array( $error['subject'] . '. ' . $error['message'] );
1271		- }
1272		-
1273	1080	require FrmAppHelper::plugin_path() . '/classes/views/frm-forms/list.php';
1274	1081	}
1275	1082
1276	1083	/**
1277	1084	* @param array<string,string> $columns
1278		- *
1279	1085	* @return array<string,string>
1280	1086	*/
1281	1087	public static function get_columns( $columns ) {
1282		- $columns['cb'] = '<input type="checkbox" />';
1283		- $columns['name'] = esc_html__( 'Form Title', 'formidable' );
1284		- $columns['entries'] = esc_html__( 'Entries', 'formidable' );
1285		- $columns['views'] = esc_html__( 'Views', 'formidable' );
1286		- $columns['id'] = 'ID';
1287		- $columns['form_key'] = esc_html__( 'Key', 'formidable' );
1288		-
1289		- if ( 'trash' !== FrmAppHelper::simple_get( 'form_type' ) && has_filter( 'frm_form_list_actions' ) ) {
1290		- // If there is any filters added, keep this column.
1291		- $columns['shortcode'] = esc_html__( 'Actions', 'formidable' );
1292		- }
1293		-
	1088	+ $columns['cb'] = '<input type="checkbox" />';
	1089	+ $columns['name'] = esc_html__( 'Form Title', 'formidable' );
	1090	+ $columns['entries'] = esc_html__( 'Entries', 'formidable' );
	1091	+ $columns['id'] = 'ID';
	1092	+ $columns['form_key'] = esc_html__( 'Key', 'formidable' );
	1093	+ $columns['shortcode'] = esc_html__( 'Actions', 'formidable' );
1294	1094	$columns['created_at'] = esc_html__( 'Date', 'formidable' );
1295	1095
1296		- if ( 'trash' !== FrmAppHelper::simple_get( 'form_type' ) ) {
1297		- $columns['embeds'] = esc_html__( 'Embeds', 'formidable' );
1298		- $columns['settings'] = '<div class="frm-forms-list-settings-btn-wrapper"><a href="#" class="frm-forms-list-settings-btn">';
1299		- $columns['settings'] .= FrmAppHelper::icon_by_class( 'frmfont frm_settings_icon', array( 'echo' => false ) );
1300		- $columns['settings'] .= '<span class="screen-reader-text">' . esc_html__( 'List settings', 'formidable' ) . '</span>';
1301		- $columns['settings'] .= '</a></div>';
1302		- }
1303		-
1304	1096	add_screen_option(
1305	1097	'per_page',
1306	1098	array(
1307	1099	'label' => __( 'Forms', 'formidable' ),
		@@ -1327,9 +1119,8 @@
1327	1119	}
1328	1120
1329	1121	/**
1330	1122	* @param mixed $hidden_columns
1331		- *
1332	1123	* @return array
1333	1124	*/
1334	1125	public static function hidden_columns( $hidden_columns ) {
1335	1126	if ( ! is_array( $hidden_columns ) ) {
		@@ -1350,18 +1141,11 @@
1350	1141
1351	1142	return $hidden_columns;
1352	1143	}
1353	1144
1354		- /**
1355		- * @param mixed $save
1356		- * @param string $option
1357		- * @param int|string $value
1358		- *
1359		- * @return mixed
1360		- */
1361	1145	public static function save_per_page( $save, $option, $value ) {
1362	1146	if ( $option === 'formidable_page_formidable_per_page' ) {
1363		- return (int) $value;
	1147	+ $save = (int) $value;
1364	1148	}
1365	1149
1366	1150	return $save;
1367	1151	}
		@@ -1370,9 +1154,8 @@
1370	1154	* @param int|string $id
1371	1155	* @param array $errors
1372	1156	* @param string $message
1373	1157	* @param bool $create_link
1374		- *
1375	1158	* @return void
1376	1159	*/
1377	1160	private static function get_edit_vars( $id, $errors = array(), $message = '', $create_link = false ) {
1378	1161	global $frm_vars;
		@@ -1387,9 +1170,8 @@
1387	1170	'page' => 'formidable',
1388	1171	)
1389	1172	),
1390	1173	);
1391		-
1392	1174	if ( ! $form ) {
1393	1175	FrmAppController::show_error_modal( $error_args );
1394	1176	return;
1395	1177	}
		@@ -1411,14 +1193,15 @@
1411	1193	}
1412	1194
1413	1195	if ( $form->parent_form_id ) {
1414	1196	/* translators: %1$s: Start link HTML, %2$s: End link HTML */
1415		- 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
	1197	+ 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>' ) );
1416	1198	}
1417	1199
1418	1200	$frm_field_selection = FrmField::field_selection();
1419		- $fields = FrmField::get_all_for_form( $form->id );
1420	1201
	1202	+ $fields = FrmField::get_all_for_form( $form->id );
	1203	+
1421	1204	// Automatically add end section fields if they don't exist (2.0 migration).
1422	1205	$reset_fields = false;
1423	1206	FrmFormsHelper::auto_add_end_section_fields( $form, $fields, $reset_fields );
1424	1207	FrmSubmitHelper::maybe_create_submit_field( $form, $fields, $reset_fields );
		@@ -1442,10 +1225,9 @@
1442	1225	*/
1443	1226	$values['fields'] = apply_filters( 'frm_fields_in_form_builder', $fields, compact( 'form' ) );
1444	1227
1445	1228	$edit_message = __( 'Form was successfully updated.', 'formidable' );
1446		-
1447		- if ( $form->is_template && $message === $edit_message ) {
	1229	+ if ( $form->is_template && $message == $edit_message ) {
1448	1230	$message = __( 'Template was successfully updated.', 'formidable' );
1449	1231	}
1450	1232
1451	1233	self::maybe_update_form_builder_message( $message );
		@@ -1460,12 +1242,11 @@
1460	1242	}
1461	1243
1462	1244	/**
1463	1245	* @param array $fields
1464		- *
1465	1246	* @return array
1466	1247	*/
1467		- public static function update_form_builder_fields( $fields ) {
	1248	+ public static function update_form_builder_fields( $fields, $form ) {
1468	1249	foreach ( $fields as $field ) {
1469	1250	$field->do_not_include_icons = true;
1470	1251	}
1471	1252	return $fields;
		@@ -1470,13 +1251,8 @@
1470	1251	}
1471	1252	return $fields;
1472	1253	}
1473	1254
1474		- /**
1475		- * @param string $message
1476		- *
1477		- * @return void
1478		- */
1479	1255	public static function maybe_update_form_builder_message( &$message ) {
1480	1256	if ( 'form_duplicated' === FrmAppHelper::simple_get( 'message' ) ) {
1481	1257	$message = __( 'Form was Successfully Copied', 'formidable' );
1482	1258	}
		@@ -1485,9 +1261,8 @@
1485	1261	/**
1486	1262	* @param int|string $id
1487	1263	* @param array $errors
1488	1264	* @param array|string $args
1489		- *
1490	1265	* @return void
1491	1266	*/
1492	1267	public static function get_settings_vars( $id, $errors = array(), $args = array() ) {
1493	1268	FrmAppHelper::permission_check( 'frm_edit_forms' );
		@@ -1509,12 +1284,13 @@
1509	1284	);
1510	1285	$args = array_merge( $defaults, $args );
1511	1286	$message = $args['message'];
1512	1287	$warnings = $args['warnings'];
1513		- $form = FrmForm::getOne( $id );
1514		- $fields = FrmField::get_all_for_form( $id );
1515		- $values = FrmAppHelper::setup_edit_vars( $form, 'forms', $fields, true );
1516	1288
	1289	+ $form = FrmForm::getOne( $id );
	1290	+ $fields = FrmField::get_all_for_form( $id );
	1291	+ $values = FrmAppHelper::setup_edit_vars( $form, 'forms', $fields, true );
	1292	+
1517	1293	/**
1518	1294	* Allows changing fields in the form settings.
1519	1295	*
1520	1296	* @since 5.0.04
		@@ -1554,12 +1330,8 @@
1554	1330	}
1555	1331
1556	1332	/**
1557	1333	* @since 4.0
1558		- *
1559		- * @param array $atts
1560		- *
1561		- * @return void
1562	1334	*/
1563	1335	public static function form_publish_button( $atts ) {
1564	1336	$values = $atts['values'];
1565	1337	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/_publish_box.php';
		@@ -1570,9 +1342,8 @@
1570	1342	*
1571	1343	* @since 4.0
1572	1344	*
1573	1345	* @param array $values
1574		- *
1575	1346	* @return array
1576	1347	*/
1577	1348	private static function get_settings_tabs( $values ) {
1578	1349	$sections = array(
		@@ -1578,25 +1349,20 @@
1578	1349	$sections = array(
1579	1350	'advanced' => array(
1580	1351	'name' => __( 'General', 'formidable' ),
1581	1352	'title' => __( 'General Form Settings', 'formidable' ),
1582		- 'function' => array( self::class, 'advanced_settings' ),
1583		- 'icon' => 'frmfont frm_small_settings_icon',
	1353	+ 'function' => array( __CLASS__, 'advanced_settings' ),
	1354	+ 'icon' => 'frm_icon_font frm_settings_icon',
1584	1355	),
1585	1356	'email' => array(
1586	1357	'name' => __( 'Actions & Notifications', 'formidable' ),
1587	1358	'function' => array( 'FrmFormActionsController', 'email_settings' ),
1588	1359	'id' => 'frm_notification_settings',
1589		- 'icon' => 'frmfont frm_notification_check_icon',
	1360	+ 'icon' => 'frm_icon_font frm_mail_bulk_icon',
1590	1361	),
1591		- 'spam' => array(
1592		- 'name' => __( 'Spam', 'formidable' ),
1593		- 'function' => array( self::class, 'spam_settings' ),
1594		- 'icon' => 'frmfont frm_shield_check2_icon',
1595		- ),
1596	1362	'permissions' => array(
1597	1363	'name' => __( 'Form Permissions', 'formidable' ),
1598		- 'icon' => 'frmfont frm_lock_closed2_icon',
	1364	+ 'icon' => 'frm_icon_font frm_lock_closed_icon',
1599	1365	'html_class' => 'frm_show_upgrade_tab frm_noallow',
1600	1366	'data' => array(
1601	1367	'medium' => 'permissions',
1602	1368	'upgrade' => __( 'Form Permissions', 'formidable' ),
		@@ -1601,37 +1367,35 @@
1601	1367	'medium' => 'permissions',
1602	1368	'upgrade' => __( 'Form Permissions', 'formidable' ),
1603	1369	'message' => __( 'Allow editing, protect forms and files, limit entries, and save drafts. Upgrade to get form and entry permissions.', 'formidable' ),
1604	1370	'screenshot' => 'permissions.png',
1605		- 'learn-more' => FrmAppHelper::get_doc_url( 'general-form-settings/#kb-form-permissions', 'form-permissions-settings' ),
1606	1371	),
1607	1372	),
1608	1373	'scheduling' => array(
1609	1374	'name' => __( 'Form Scheduling', 'formidable' ),
1610		- 'icon' => 'frmfont frm_schedule_icon',
	1375	+ 'icon' => 'frm_icon_font frm_calendar_icon',
1611	1376	'html_class' => 'frm_show_upgrade_tab frm_noallow',
1612	1377	'data' => array(
1613	1378	'medium' => 'scheduling',
1614	1379	'upgrade' => __( 'Form scheduling settings', 'formidable' ),
1615	1380	'screenshot' => 'scheduling.png',
1616		- 'learn-more' => FrmAppHelper::get_doc_url( 'general-form-settings/#kb-form-scheduling', 'form-scheduling-settings' ),
1617	1381	),
1618	1382	),
1619	1383	'buttons' => array(
1620	1384	'name' => __( 'Buttons', 'formidable' ),
1621		- 'class' => self::class,
	1385	+ 'class' => __CLASS__,
1622	1386	'function' => 'buttons_settings',
1623		- 'icon' => 'frmfont frm-buttons-style',
	1387	+ 'icon' => 'frm_icon_font frm_button_icon',
1624	1388	),
1625	1389	'landing' => array(
1626	1390	'name' => __( 'Form Landing Page', 'formidable' ),
1627		- 'icon' => 'frmfont frm_cross_device_icon',
	1391	+ 'icon' => 'frm_icon_font frm_file_text_icon',
1628	1392	'html_class' => 'frm_show_upgrade_tab frm_noallow',
1629	1393	'data' => FrmAppHelper::get_landing_page_upgrade_data_params(),
1630	1394	),
1631	1395	'chat' => array(
1632	1396	'name' => __( 'Conversational Forms', 'formidable' ),
1633		- 'icon' => 'frmfont frm_chat_bubbles_icon',
	1397	+ 'icon' => 'frm_icon_font frm_chat_forms_icon',
1634	1398	'html_class' => 'frm_show_upgrade_tab frm_noallow',
1635	1399	'data' => FrmAppHelper::get_upgrade_data_params(
1636	1400	'chat',
1637	1401	array(
		@@ -1637,15 +1401,14 @@
1637	1401	array(
1638	1402	'upgrade' => __( 'Conversational Forms', 'formidable' ),
1639	1403	'message' => __( 'Ask one question at a time for automated conversations.', 'formidable' ),
1640	1404	'screenshot' => 'chat.png',
1641		- 'learn-more' => FrmAppHelper::get_doc_url( 'conversational-forms', 'conversational-forms-settings', false ),
1642	1405	)
1643	1406	),
1644	1407	),
1645	1408	'abandonment' => array(
1646	1409	'name' => __( 'Form Abandonment', 'formidable' ),
1647		- 'icon' => 'frmfont frm_abandoned_icon',
	1410	+ 'icon' => 'frm_icon_font frm_abandoned_icon',
1648	1411	'html_class' => 'frm_show_upgrade_tab frm_noallow',
1649	1412	'data' => FrmAppHelper::get_upgrade_data_params(
1650	1413	'abandonment',
1651	1414	array(
		@@ -1651,17 +1414,16 @@
1651	1414	array(
1652	1415	'upgrade' => __( 'Form abandonment settings', 'formidable' ),
1653	1416	'message' => __( 'Unlock the power of data capture to boost lead generation and master the art of form optimization.', 'formidable' ),
1654	1417	'screenshot' => 'abandonment.png',
1655		- 'learn-more' => FrmAppHelper::get_doc_url( 'features/form-abandonment-wordpress-plugin', 'form-abandonment-settings', false ),
1656	1418	)
1657	1419	),
1658	1420	),
1659	1421	'html' => array(
1660	1422	'name' => __( 'Customize HTML', 'formidable' ),
1661		- 'class' => self::class,
	1423	+ 'class' => __CLASS__,
1662	1424	'function' => 'html_settings',
1663		- 'icon' => 'frmfont frm_code2_icon',
	1425	+ 'icon' => 'frm_icon_font frm_code_icon',
1664	1426	),
1665	1427	);
1666	1428
1667	1429	if ( ! has_action( 'frm_add_form_style_tab_options' ) && ! has_action( 'frm_add_form_button_options' ) ) {
		@@ -1667,8 +1429,14 @@
1667	1429	if ( ! has_action( 'frm_add_form_style_tab_options' ) && ! has_action( 'frm_add_form_button_options' ) ) {
1668	1430	unset( $sections['buttons'] );
1669	1431	}
1670	1432
	1433	+ foreach ( array( 'landing', 'chat', 'abandonment' ) as $feature ) {
	1434	+ if ( ! FrmAppHelper::show_new_feature( $feature ) ) {
	1435	+ unset( $sections[ $feature ] );
	1436	+ }
	1437	+ }
	1438	+
1671	1439	$sections = apply_filters( 'frm_add_form_settings_section', $sections, $values );
1672	1440
1673	1441	foreach ( $sections as $key => $section ) {
1674	1442	$defaults = array(
		@@ -1673,9 +1441,9 @@
1673	1441	foreach ( $sections as $key => $section ) {
1674	1442	$defaults = array(
1675	1443	'html_class' => '',
1676	1444	'name' => ucfirst( $key ),
1677		- 'icon' => 'frmfont frm_settings_icon',
	1445	+ 'icon' => 'frm_icon_font frm_settings_icon',
1678	1446	);
1679	1447
1680	1448	$section = array_merge( $defaults, $section );
1681	1449
		@@ -1681,9 +1449,8 @@
1681	1449
1682	1450	if ( ! isset( $section['anchor'] ) ) {
1683	1451	$section['anchor'] = $key;
1684	1452	}
1685		-
1686	1453	$section['anchor'] .= '_settings';
1687	1454
1688	1455	if ( ! isset( $section['title'] ) ) {
1689	1456	$section['title'] = $section['name'];
		@@ -1702,25 +1469,26 @@
1702	1469	/**
1703	1470	* @since 4.0
1704	1471	*
1705	1472	* @param array $values
1706		- *
1707	1473	* @return void
1708	1474	*/
1709	1475	public static function advanced_settings( $values ) {
1710	1476	$first_h3 = 'frm_first_h3';
	1477	+
1711	1478	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings-advanced.php';
1712	1479	}
1713	1480
1714	1481	/**
1715		- * @since 6.33
1716		- *
1717	1482	* @param array $values
1718		- *
1719	1483	* @return void
1720	1484	*/
1721		- public static function spam_settings( $values ) {
1722		- include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/spam-settings.php';
	1485	+ public static function render_spam_settings( $values ) {
	1486	+ if ( function_exists( 'akismet_http_post' ) ) {
	1487	+ include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/spam-settings/akismet.php';
	1488	+ }
	1489	+ include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/spam-settings/honeypot.php';
	1490	+ include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/spam-settings/antispam.php';
1723	1491	}
1724	1492
1725	1493	/**
1726	1494	* @since 4.0
		@@ -1725,9 +1493,8 @@
1725	1493	/**
1726	1494	* @since 4.0
1727	1495	*
1728	1496	* @param array $values
1729		- *
1730	1497	* @return void
1731	1498	*/
1732	1499	public static function buttons_settings( $values ) {
1733	1500	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings-buttons.php';
		@@ -1736,9 +1503,8 @@
1736	1503	/**
1737	1504	* @since 4.0
1738	1505	*
1739	1506	* @param array $values
1740		- *
1741	1507	* @return void
1742	1508	*/
1743	1509	public static function html_settings( $values ) {
1744	1510	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings-html.php';
		@@ -1749,9 +1515,8 @@
1749	1515	*
1750	1516	* @since 2.03.08
1751	1517	*
1752	1518	* @param array|bool $values
1753		- *
1754	1519	* @return void
1755	1520	*/
1756	1521	private static function clean_submit_html( &$values ) {
1757	1522	if ( is_array( $values ) && isset( $values['submit_html'] ) ) {
		@@ -1774,17 +1539,13 @@
1774	1539	return $classes;
1775	1540	}
1776	1541
1777	1542	/**
1778		- * @since 6.27 Added $template_path parameter.
1779		- *
1780	1543	* @param int|string $form_id
1781	1544	* @param string $class
1782		- * @param string $template_path The path to a template file to use instead of the default.
1783		- *
1784	1545	* @return void
1785	1546	*/
1786		- public static function mb_tags_box( $form_id, $class = '', $template_path = 'default' ) {
	1547	+ public static function mb_tags_box( $form_id, $class = '' ) {
1787	1548	$fields = FrmField::get_all_for_form( $form_id, '', 'include' );
1788	1549
1789	1550	/**
1790	1551	* Allows modifying the list of fields in the tags box.
		@@ -1793,30 +1554,23 @@
1793	1554	*
1794	1555	* @param array $fields The list of fields.
1795	1556	* @param array $args The arguments. Contains `form_id`.
1796	1557	*/
1797		- $fields = apply_filters( 'frm_fields_in_tags_box', $fields, compact( 'form_id' ) );
1798		- $linked_forms = array();
1799		- $col = 'one';
1800		- $settings_tab = FrmAppHelper::is_admin_page( 'formidable' );
	1558	+ $fields = apply_filters( 'frm_fields_in_tags_box', $fields, compact( 'form_id' ) );
	1559	+ $linked_forms = array();
	1560	+ $col = 'one';
	1561	+ $settings_tab = FrmAppHelper::is_admin_page( 'formidable' );
	1562	+
1801	1563	$cond_shortcodes = apply_filters( 'frm_conditional_shortcodes', array() );
1802		- $entry_shortcodes = self::get_shortcode_helpers( $settings_tab, $form_id );
	1564	+ $entry_shortcodes = self::get_shortcode_helpers( $settings_tab );
	1565	+
1803	1566	$advanced_helpers = self::advanced_helpers( compact( 'fields', 'form_id' ) );
1804	1567
1805		- if ( 'default' === $template_path || ! file_exists( $template_path ) ) {
1806		- include FrmAppHelper::plugin_path() . '/classes/views/shared/mb_adv_info.php';
1807		- return;
1808		- }
1809		-
1810		- include $template_path;
	1568	+ include FrmAppHelper::plugin_path() . '/classes/views/shared/mb_adv_info.php';
1811	1569	}
1812	1570
1813	1571	/**
1814	1572	* @since 3.04.01
1815		- *
1816		- * @param array $atts
1817		- *
1818		- * @return array
1819	1573	*/
1820	1574	private static function advanced_helpers( $atts ) {
1821	1575	$advanced_helpers = array(
1822	1576	'default' => array(
		@@ -1825,12 +1579,10 @@
1825	1579	),
1826	1580	);
1827	1581
1828	1582	$user_fields = self::user_shortcodes();
1829		-
1830	1583	if ( $user_fields ) {
1831	1584	$user_helpers = array();
1832		-
1833	1585	foreach ( $user_fields as $uk => $uf ) {
1834	1586	$user_helpers[ '|user_id| show="' . $uk . '"' ] = $uf;
1835	1587	unset( $uk, $uf );
1836	1588	}
		@@ -1851,132 +1603,12 @@
1851	1603	return apply_filters( 'frm_advanced_helpers', $advanced_helpers, $atts );
1852	1604	}
1853	1605
1854	1606	/**
1855		- * Adds a shortcode for each part of a multi-part field to the field shortcode list,
1856		- * so a single part can be used on its own, like [25 show=first] for a Name field.
1857		- *
1858		- * @since 6.35
1859		- *
1860		- * @param array $atts Includes 'field'.
1861		- *
1862		- * @return void
1863		- */
1864		- public static function field_part_shortcodes( $atts ) {
1865		- $field = $atts['field'];
1866		-
1867		- foreach ( self::get_field_parts( $field ) as $part => $label ) {
1868		- FrmFormsHelper::insert_opt_html(
1869		- array(
1870		- 'id' => $field->id . ' show=' . $part,
1871		- 'key' => $field->field_key . ' show=' . $part,
1872		- // Keep the part label and the option out of the truncated text so they stay readable.
1873		- 'key_label' => $field->field_key,
1874		- 'key_suffix' => ' show=' . $part,
1875		- 'name' => $field->name,
1876		- 'name_suffix' => ' (' . $label . ')',
1877		- 'type' => $field->type,
1878		- 'class' => 'frm-customize-list dropdown-item',
1879		- )
1880		- );
1881		- unset( $part, $label );
1882		- }
1883		- }
1884		-
1885		- /**
1886		- * Gets the parts of a multi-part field that can be shown on their own with a show= shortcode option.
1887		- *
1888		- * @since 6.35
1889		- *
1890		- * @param stdClass $field
1891		- *
1892		- * @return array Part labels keyed by the show= option value.
1893		- */
1894		- private static function get_field_parts( $field ) {
1895		- $parts = array();
1896		-
1897		- if ( 'name' === $field->type ) {
1898		- $parts = self::get_name_field_parts( $field );
1899		- } elseif ( 'address' === $field->type ) {
1900		- $parts = self::get_address_field_parts( $field );
1901		- }
1902		-
1903		- /**
1904		- * Allows add-ons to add the parts of their own multi-part fields.
1905		- *
1906		- * @since 6.35
1907		- *
1908		- * @param array $parts Part labels keyed by the show= option value.
1909		- * @param stdClass $field The field the parts belong to.
1910		- */
1911		- return apply_filters( 'frm_field_parts_for_shortcodes', $parts, $field );
1912		- }
1913		-
1914		- /**
1915		- * Gets the parts of a Name field that are in use. Only the parts included in the
1916		- * selected name layout hold a value, so the rest would always show as blank.
1917		- *
1918		- * @since 6.35
1919		- *
1920		- * @param stdClass $field
1921		- *
1922		- * @return array Part labels keyed by the show= option value, in layout order.
1923		- */
1924		- private static function get_name_field_parts( $field ) {
1925		- $labels = array(
1926		- 'first' => __( 'First', 'formidable' ),
1927		- 'middle' => __( 'Middle', 'formidable' ),
1928		- 'last' => __( 'Last', 'formidable' ),
1929		- );
1930		- $layout = FrmField::get_option( $field, 'name_layout' );
1931		-
1932		- if ( ! $layout ) {
1933		- $layout = 'first_last';
1934		- }
1935		-
1936		- // The layout option names the parts in use, in display order, like first_middle_last.
1937		- $parts = array();
1938		-
1939		- foreach ( explode( '_', $layout ) as $part ) {
1940		- if ( isset( $labels[ $part ] ) ) {
1941		- $parts[ $part ] = $labels[ $part ];
1942		- }
1943		- unset( $part );
1944		- }
1945		-
1946		- return $parts;
1947		- }
1948		-
1949		- /**
1950		- * Gets the parts of an Address field that are in use. The address type decides which
1951		- * parts are on the form, so the rest would always show as blank.
1952		- *
1953		- * @since 6.35
1954		- *
1955		- * @param stdClass $field
1956		- *
1957		- * @return array Part labels keyed by the show= option value.
1958		- */
1959		- private static function get_address_field_parts( $field ) {
1960		- $parts = FrmFieldAddress::get_part_labels();
1961		- $address_type = FrmField::get_option( $field, 'address_type' );
1962		-
1963		- if ( in_array( $address_type, array( 'us', 'generic' ), true ) ) {
1964		- unset( $parts['country'] );
1965		- } elseif ( 'europe' === $address_type ) {
1966		- unset( $parts['state'] );
1967		- }
1968		-
1969		- return $parts;
1970		- }
1971		-
1972		- /**
1973	1607	* Get an array of the options to display in the advanced tab
1974	1608	* of the customization panel
1975	1609	*
1976	1610	* @since 2.0.6
1977		- *
1978		- * @return array
1979	1611	*/
1980	1612	private static function get_advanced_shortcodes() {
1981	1613	$adv_shortcodes = array(
1982	1614	'x sep=", "' => array(
		@@ -1993,18 +1625,17 @@
1993	1625	'label' => __( 'No Auto P', 'formidable' ),
1994	1626	'title' => __( 'Do not automatically add any paragraphs or line breaks', 'formidable' ),
1995	1627	),
1996	1628	);
	1629	+ $adv_shortcodes = apply_filters( 'frm_advanced_shortcodes', $adv_shortcodes );
1997	1630
1998	1631	// __( 'Leave blank instead of defaulting to User Login', 'formidable' ) : blank=1
1999	1632
2000		- return apply_filters( 'frm_advanced_shortcodes', $adv_shortcodes );
	1633	+ return $adv_shortcodes;
2001	1634	}
2002	1635
2003	1636	/**
2004	1637	* @since 3.04.01
2005		- *
2006		- * @return array
2007	1638	*/
2008	1639	private static function user_shortcodes() {
2009	1640	$options = array(
2010	1641	'ID' => __( 'User ID', 'formidable' ),
		@@ -2023,15 +1654,10 @@
2023	1654	/**
2024	1655	* Get an array of the helper shortcodes to display in the customization panel
2025	1656	*
2026	1657	* @since 2.0.6
2027		- *
2028		- * @param bool $settings_tab
2029		- * @param int $form_id
2030		- *
2031		- * @return array
2032	1658	*/
2033		- private static function get_shortcode_helpers( $settings_tab, $form_id = 0 ) {
	1659	+ private static function get_shortcode_helpers( $settings_tab ) {
2034	1660	$entry_shortcodes = array(
2035	1661	'id' => __( 'Entry ID', 'formidable' ),
2036	1662	'key' => __( 'Entry Key', 'formidable' ),
2037	1663	'post_id' => __( 'Post ID', 'formidable' ),
		@@ -2044,9 +1670,8 @@
2044	1670	'form_name' => __( 'Form Name', 'formidable' ),
2045	1671	);
2046	1672
2047	1673	$entry_shortcodes = array_merge( FrmShortcodeHelper::get_contextual_shortcode_values(), $entry_shortcodes );
2048		-
2049	1674	if ( ! FrmAppHelper::pro_is_installed() ) {
2050	1675	unset( $entry_shortcodes['post_id'] );
2051	1676	}
2052	1677
		@@ -2054,14 +1679,12 @@
2054	1679	* Use this hook to add or remove buttons in the helpers section
2055	1680	* in the customization panel
2056	1681	*
2057	1682	* @since 2.0.6
2058		- *
2059		- * @param array $entry_shortcodes
2060		- * @param bool $settings_tab
2061		- * @param int $form_id
2062	1683	*/
2063		- return apply_filters( 'frm_helper_shortcodes', $entry_shortcodes, $settings_tab, $form_id );
	1684	+ $entry_shortcodes = apply_filters( 'frm_helper_shortcodes', $entry_shortcodes, $settings_tab );
	1685	+
	1686	+ return $entry_shortcodes;
2064	1687	}
2065	1688
2066	1689	/**
2067	1690	* Insert the form class setting into the form.
		@@ -2066,9 +1689,8 @@
2066	1689	/**
2067	1690	* Insert the form class setting into the form.
2068	1691	*
2069	1692	* @param stdClass $form
2070		- *
2071	1693	* @return void
2072	1694	*/
2073	1695	public static function form_classes( $form ) {
2074	1696	if ( isset( $form->options['form_class'] ) ) {
		@@ -2079,9 +1701,9 @@
2079	1701	echo ' frm_js_validate ';
2080	1702	self::add_js_validate_form_to_global_vars( $form );
2081	1703	}
2082	1704
2083		- if ( FrmForm::is_ajax_on( $form ) ) {
	1705	+ if ( ! FrmFormsHelper::should_use_pro_for_ajax_submit() && FrmForm::is_ajax_on( $form ) ) {
2084	1706	echo ' frm_ajax_submit ';
2085	1707	}
2086	1708	}
2087	1709
		@@ -2091,9 +1713,8 @@
2091	1713	* @param stdClass $form
2092	1714	*/
2093	1715	public static function add_js_validate_form_to_global_vars( $form ) {
2094	1716	global $frm_vars;
2095		-
2096	1717	if ( ! isset( $frm_vars['js_validate_forms'] ) ) {
2097	1718	$frm_vars['js_validate_forms'] = array();
2098	1719	}
2099	1720	$frm_vars['js_validate_forms'][ $form->id ] = $form;
		@@ -2116,9 +1737,8 @@
2116	1737	/**
2117	1738	* @param string $content
2118	1739	* @param int|stdClass|string $form
2119	1740	* @param false|int|stdClass|string $entry
2120		- *
2121	1741	* @return string
2122	1742	*/
2123	1743	public static function filter_content( $content, $form, $entry = false ) {
2124	1744	$content = self::replace_form_name_shortcodes( $content, $form );
		@@ -2123,9 +1743,8 @@
2123	1743	public static function filter_content( $content, $form, $entry = false ) {
2124	1744	$content = self::replace_form_name_shortcodes( $content, $form );
2125	1745
2126	1746	self::get_entry_by_param( $entry );
2127		-
2128	1747	if ( ! $entry ) {
2129	1748	return $content;
2130	1749	}
2131	1750
		@@ -2141,10 +1760,11 @@
2141	1760	$form = $entry->parent_entry->form_id;
2142	1761	}
2143	1762
2144	1763	$shortcodes = FrmFieldsHelper::get_shortcodes( $content, $form );
	1764	+ $content = apply_filters( 'frm_replace_content_shortcodes', $content, $entry, $shortcodes );
2145	1765
2146		- return apply_filters( 'frm_replace_content_shortcodes', $content, $entry, $shortcodes );
	1766	+ return $content;
2147	1767	}
2148	1768
2149	1769	/**
2150	1770	* Replace any [form_name] shortcodes in a string.
		@@ -2152,9 +1772,8 @@
2152	1772	* @since 5.5
2153	1773	*
2154	1774	* @param array|string $string
2155	1775	* @param int|stdClass|string $form
2156		- *
2157	1776	* @return array|string
2158	1777	*/
2159	1778	public static function replace_form_name_shortcodes( $string, $form ) {
2160	1779	if ( ! is_string( $string ) ) {
		@@ -2160,9 +1779,9 @@
2160	1779	if ( ! is_string( $string ) ) {
2161	1780	return $string;
2162	1781	}
2163	1782
2164		- if ( ! str_contains( $string, '[form_name]' ) ) {
	1783	+ if ( false === strpos( $string, '[form_name]' ) ) {
2165	1784	return $string;
2166	1785	}
2167	1786
2168	1787	if ( ! is_object( $form ) ) {
		@@ -2174,30 +1793,20 @@
2174	1793	}
2175	1794
2176	1795	/**
2177	1796	* @param false|int|stdClass|string $entry
2178		- *
2179	1797	* @return void
2180	1798	*/
2181	1799	private static function get_entry_by_param( &$entry ) {
2182		- if ( $entry && is_object( $entry ) ) {
2183		- return;
2184		- }
	1800	+ if ( ! $entry || ! is_object( $entry ) ) {
	1801	+ if ( ! $entry || ! is_numeric( $entry ) ) {
	1802	+ $entry = FrmAppHelper::get_post_param( 'id', false, 'sanitize_title' );
	1803	+ }
2185	1804
2186		- if ( ! $entry || ! is_numeric( $entry ) ) {
2187		- $entry = FrmAppHelper::get_post_param( 'id', false, 'sanitize_title' );
	1805	+ FrmEntry::maybe_get_entry( $entry );
2188	1806	}
2189		-
2190		- FrmEntry::maybe_get_entry( $entry );
2191	1807	}
2192	1808
2193		- /**
2194		- * @param string $content
2195		- * @param false|object $entry
2196		- * @param array $shortcodes
2197		- *
2198		- * @return string
2199		- */
2200	1809	public static function replace_content_shortcodes( $content, $entry, $shortcodes ) {
2201	1810	return FrmFieldsHelper::replace_content_shortcodes( $content, $entry, $shortcodes );
2202	1811	}
2203	1812
		@@ -2202,9 +1811,8 @@
2202	1811	}
2203	1812
2204	1813	/**
2205	1814	* @param array $errors
2206		- *
2207	1815	* @return array
2208	1816	*/
2209	1817	public static function process_bulk_form_actions( $errors ) {
2210	1818	if ( ! $_REQUEST ) {
		@@ -2211,30 +1819,29 @@
2211	1819	return $errors;
2212	1820	}
2213	1821
2214	1822	$bulkaction = FrmAppHelper::get_param( 'action', '', 'get', 'sanitize_text_field' );
2215		-
2216		- // phpcs:ignore Universal.Operators.StrictComparisons
2217	1823	if ( $bulkaction == - 1 ) {
2218	1824	$bulkaction = FrmAppHelper::get_param( 'action2', '', 'get', 'sanitize_title' );
2219	1825	}
2220	1826
2221		- if ( $bulkaction && str_starts_with( $bulkaction, 'bulk_' ) ) {
	1827	+ if ( ! empty( $bulkaction ) && strpos( $bulkaction, 'bulk_' ) === 0 ) {
2222	1828	FrmAppHelper::remove_get_action();
	1829	+
2223	1830	$bulkaction = str_replace( 'bulk_', '', $bulkaction );
2224	1831	}
2225	1832
2226	1833	$ids = FrmAppHelper::get_param( 'item-action', '', 'get', 'sanitize_text_field' );
	1834	+ if ( empty( $ids ) ) {
	1835	+ $errors[] = __( 'No forms were specified', 'formidable' );
2227	1836
2228		- if ( ! $ids ) {
2229		- $errors[] = __( 'No forms were specified', 'formidable' );
2230	1837	return $errors;
2231	1838	}
2232	1839
2233	1840	$permission_error = FrmAppHelper::permission_nonce_error( '', '_wpnonce', 'bulk-toplevel_page_formidable' );
2234		-
2235	1841	if ( $permission_error !== false ) {
2236	1842	$errors[] = $permission_error;
	1843	+
2237	1844	return $errors;
2238	1845	}
2239	1846
2240	1847	if ( ! is_array( $ids ) ) {
		@@ -2258,24 +1865,9 @@
2258	1865
2259	1866	return $errors;
2260	1867	}
2261	1868
2262		- /**
2263		- * Includes html that shows a message when the device is too small to use Formidable Forms admin pages.
2264		- *
2265		- * @since 6.20
2266		- *
2267		- * @return void
2268		- */
2269		- public static function include_device_too_small_message() {
2270		- if ( ! FrmAppHelper::is_formidable_admin() ) {
2271		- return;
2272		- }
2273		-
2274		- include FrmAppHelper::plugin_path() . '/classes/views/shared/small-device-message.php';
2275		- }
2276		-
2277		- public static function route() { // phpcs:ignore Generic.Metrics.CyclomaticComplexity.MaxExceeded
	1869	+ public static function route() {
2278	1870	$action = isset( $_REQUEST['frm_action'] ) ? 'frm_action' : 'action';
2279	1871	$vars = array();
2280	1872	FrmAppHelper::include_svg();
2281	1873
		@@ -2285,28 +1877,25 @@
2285	1877	// Javascript needs to be allowed in some field settings.
2286	1878	// phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized, WordPress.Security.NonceVerification.Missing
2287	1879	$json_vars = htmlspecialchars_decode( nl2br( str_replace( '&quot;', '"', wp_unslash( $_POST['frm_compact_fields'] ) ) ) );
2288	1880	$json_vars = json_decode( $json_vars, true );
	1881	+ if ( empty( $json_vars ) ) {
	1882	+ // json decoding failed so we should return an error message.
	1883	+ $action = FrmAppHelper::get_param( $action, '', 'get', 'sanitize_title' );
	1884	+ if ( 'edit' === $action ) {
	1885	+ $action = 'update';
	1886	+ }
2289	1887
2290		- if ( $json_vars ) {
	1888	+ add_filter( 'frm_validate_form', 'FrmFormsController::json_error' );
	1889	+ } else {
2291	1890	$vars = FrmAppHelper::json_to_array( $json_vars );
2292	1891	$action = $vars[ $action ];
2293	1892	unset( $_REQUEST['frm_compact_fields'], $_POST['frm_compact_fields'] ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
2294	1893	$_REQUEST = array_merge( $_REQUEST, $vars ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
2295	1894	$_POST = array_merge( $_POST, $_REQUEST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
2296		- } else {
2297		- // Json decoding failed so we should return an error message.
2298		- $action = FrmAppHelper::get_param( $action, '', 'get', 'sanitize_title' );
2299		-
2300		- if ( 'edit' === $action ) {
2301		- $action = 'update';
2302		- }
2303		-
2304		- add_filter( 'frm_validate_form', 'FrmFormsController::json_error' );
2305	1895	}
2306	1896	} else {
2307	1897	$action = FrmAppHelper::get_param( $action, '', 'get', 'sanitize_title' );
2308		-
2309	1898	if ( isset( $_REQUEST['delete_all'] ) ) {
2310	1899	// Override the action for this page.
2311	1900	$action = 'delete_all';
2312	1901	}
		@@ -2326,38 +1915,34 @@
2326	1915	case 'update_settings':
2327	1916	return self::$action( $vars );
2328	1917	case 'lite-reports':
2329	1918	self::no_reports( $vars );
2330		- return null;
	1919	+ return;
2331	1920	case 'views':
2332	1921	self::no_views( $vars );
2333		- return null;
	1922	+ return;
2334	1923	default:
2335	1924	do_action( 'frm_form_action_' . $action );
2336		-
2337	1925	if ( apply_filters( 'frm_form_stop_action_' . $action, false ) ) {
2338		- return null;
	1926	+ return;
2339	1927	}
2340	1928
2341	1929	$action = FrmAppHelper::get_param( 'action', '', 'get', 'sanitize_text_field' );
2342		-
2343		- // phpcs:ignore Universal.Operators.StrictComparisons
2344	1930	if ( $action == - 1 ) {
2345	1931	$action = FrmAppHelper::get_param( 'action2', '', 'get', 'sanitize_title' );
2346	1932	}
2347	1933
2348		- if ( str_starts_with( $action, 'bulk_' ) ) {
	1934	+ if ( strpos( $action, 'bulk_' ) === 0 ) {
2349	1935	FrmAppHelper::remove_get_action();
2350	1936
2351	1937	self::list_form();
2352		- return null;
	1938	+ return;
2353	1939	}
2354	1940
2355	1941	$message = FrmAppHelper::get_param( 'message' );
2356		-
2357	1942	if ( 'form_duplicate_error' === $message ) {
2358	1943	self::display_forms_list( array(), '', array( __( 'There was a problem duplicating the form', 'formidable' ) ) );
2359		- return null;
	1944	+ return;
2360	1945	}
2361	1946
2362	1947	if ( 'forms_permanently_deleted' === $message ) {
2363	1948	$count = FrmAppHelper::get_param( 'forms_deleted', 0, 'get', 'absint' );
		@@ -2363,14 +1948,14 @@
2363	1948	$count = FrmAppHelper::get_param( 'forms_deleted', 0, 'get', 'absint' );
2364	1949	/* translators: %1$s: Number of forms */
2365	1950	$message = sprintf( _n( '%1$s form permanently deleted.', '%1$s forms permanently deleted.', $count, 'formidable' ), $count );
2366	1951	self::display_forms_list( array(), $message, '' );
2367		- return null;
	1952	+ return;
2368	1953	}
2369	1954
2370	1955	self::display_forms_list();
2371	1956
2372		- return null;
	1957	+ return;
2373	1958	}//end switch
2374	1959	}
2375	1960
2376	1961	/**
		@@ -2389,44 +1974,19 @@
2389	1974
2390	1975	// Get posted data
2391	1976	$form_id = FrmAppHelper::get_post_param( 'form_id', '', 'absint' );
2392	1977	$name = FrmAppHelper::get_post_param( 'form_name', '', 'sanitize_text_field' );
2393		- $form = FrmForm::getOne( $form_id );
2394	1978
2395		- if ( ! $form ) {
2396		- wp_send_json_error( __( 'Form not found', 'formidable' ) );
2397		- }
	1979	+ // Update the form name and form key.
	1980	+ $form_key = FrmAppHelper::get_unique_key( sanitize_title( $name ), 'frm_forms', 'form_key' );
	1981	+ FrmForm::update( $form_id, compact( 'name', 'form_key' ) );
2398	1982
2399		- if ( $name === $form->name ) {
2400		- // Nothing to change so exit early.
2401		- $form_key = $form->form_key;
2402		- wp_send_json_success( compact( 'form_key' ) );
2403		- }
2404		-
2405		- $to_update = array(
2406		- 'name' => $name,
2407		- );
2408		-
2409		- if ( '' === $name ) {
2410		- $form_key = $form->form_key;
2411		- } else {
2412		- // Only update form_key if name is not empty.
2413		- $form_key = FrmAppHelper::get_unique_key( sanitize_title( $name ), 'frm_forms', 'form_key' );
2414		- $to_update['form_key'] = $form_key;
2415		- }
2416		-
2417		- FrmForm::update( $form_id, $to_update );
2418		-
2419	1983	wp_send_json_success( compact( 'form_key' ) );
2420	1984	}
2421	1985
2422		- /**
2423		- * @param array $errors
2424		- *
2425		- * @return array
2426		- */
2427	1986	public static function json_error( $errors ) {
2428	1987	$errors['json'] = __( 'Abnormal HTML characters prevented your form from saving correctly', 'formidable' );
	1988	+
2429	1989	return $errors;
2430	1990	}
2431	1991
2432	1992	/**
		@@ -2433,10 +1993,8 @@
2433	1993	* Add education about views.
2434	1994	*
2435	1995	* @since 4.07
2436	1996	*
2437		- * @param array $values
2438		- *
2439	1997	* @return void
2440	1998	*/
2441	1999	public static function no_views( $values = array() ) {
2442	2000	FrmAppHelper::include_svg();
		@@ -2450,10 +2008,8 @@
2450	2008	* Add education about reports.
2451	2009	*
2452	2010	* @since 4.07
2453	2011	*
2454		- * @param array $values
2455		- *
2456	2012	* @return void
2457	2013	*/
2458	2014	public static function no_reports( $values = array() ) {
2459	2015	$id = FrmAppHelper::get_param( 'form', '', 'get', 'absint' );
		@@ -2479,9 +2035,10 @@
2479	2035	/**
2480	2036	* @since 4.05.02
2481	2037	*/
2482	2038	private static function move_menu_to_footer() {
2483		- if ( empty( FrmAppHelper::get_settings()->admin_bar ) ) {
	2039	+ $settings = FrmAppHelper::get_settings();
	2040	+ if ( empty( $settings->admin_bar ) ) {
2484	2041	remove_action( 'wp_body_open', 'wp_admin_bar_render', 0 );
2485	2042	}
2486	2043	}
2487	2044
		@@ -2486,15 +2043,13 @@
2486	2043	}
2487	2044
2488	2045	public static function admin_bar_configure() {
2489	2046	global $frm_vars;
2490		-
2491	2047	if ( empty( $frm_vars['forms_loaded'] ) ) {
2492	2048	return;
2493	2049	}
2494	2050
2495	2051	$actions = array();
2496		-
2497	2052	foreach ( $frm_vars['forms_loaded'] as $form ) {
2498	2053	if ( is_object( $form ) ) {
2499	2054	$actions[ $form->id ] = $form->name;
2500	2055	}
		@@ -2500,9 +2055,9 @@
2500	2055	}
2501	2056	unset( $form );
2502	2057	}
2503	2058
2504		- if ( ! $actions ) {
	2059	+ if ( empty( $actions ) ) {
2505	2060	return;
2506	2061	}
2507	2062
2508	2063	self::add_menu_to_admin_bar();
		@@ -2528,12 +2083,8 @@
2528	2083	}
2529	2084
2530	2085	/**
2531	2086	* @since 2.05.07
2532		- *
2533		- * @param array $actions
2534		- *
2535		- * @return void
2536	2087	*/
2537	2088	private static function add_forms_to_admin_bar( $actions ) {
2538	2089	global $wp_admin_bar;
2539	2090
		@@ -2539,13 +2090,14 @@
2539	2090
2540	2091	asort( $actions );
2541	2092
2542	2093	foreach ( $actions as $form_id => $name ) {
	2094	+
2543	2095	$wp_admin_bar->add_node(
2544	2096	array(
2545	2097	'parent' => 'frm-forms',
2546	2098	'id' => 'edit_form_' . $form_id,
2547		- 'title' => $name ? $name : FrmFormsHelper::get_no_title_text(),
	2099	+ 'title' => empty( $name ) ? FrmFormsHelper::get_no_title_text() : $name,
2548	2100	'href' => FrmForm::get_edit_link( $form_id ),
2549	2101	)
2550	2102	);
2551	2103	}
		@@ -2554,14 +2106,12 @@
2554	2106	/**
2555	2107	* The formidable shortcode
2556	2108	*
2557	2109	* @param array $atts The params from the shortcode.
2558		- *
2559	2110	* @return string
2560	2111	*/
2561	2112	public static function get_form_shortcode( $atts ) {
2562	2113	global $frm_vars;
2563		-
2564	2114	if ( ! empty( $frm_vars['skip_shortcode'] ) ) {
2565	2115	$sc = '[formidable';
2566	2116	$sc .= FrmAppHelper::array_to_html_params( $atts );
2567	2117	return $sc . ']';
		@@ -2590,9 +2140,8 @@
2590	2140	* @since 5.2.01
2591	2141	*
2592	2142	* @param false|int|string $id
2593	2143	* @param false|string $key
2594		- *
2595	2144	* @return false|stdClass
2596	2145	*/
2597	2146	private static function maybe_get_form_by_id_or_key( $id, $key ) {
2598	2147	if ( ! $id ) {
		@@ -2606,9 +2155,8 @@
2606	2155	* @param false|string $key
2607	2156	* @param bool|int|string $title may be 'auto', true, false, 'true', 'false', 'yes', '1', 1, '0', 0.
2608	2157	* @param bool|int|string $description may be 'auto', true, false, 'true', 'false', 'yes', '1', 1, '0', 0.
2609	2158	* @param array $atts
2610		- *
2611	2159	* @return string
2612	2160	*/
2613	2161	public static function show_form( $id = '', $key = '', $title = false, $description = false, $atts = array() ) {
2614	2162	$form = self::maybe_get_form_by_id_or_key( $id, $key );
		@@ -2629,13 +2177,14 @@
2629	2177
2630	2178	add_action( 'frm_load_form_hooks', 'FrmHooksController::trigger_load_form_hooks' );
2631	2179	FrmAppHelper::trigger_hook_load( 'form', $form );
2632	2180
2633		- $form = apply_filters( 'frm_pre_display_form', $form );
	2181	+ $form = apply_filters( 'frm_pre_display_form', $form );
	2182	+
2634	2183	$frm_settings = FrmAppHelper::get_settings( array( 'current_form' => $form->id ) );
2635	2184
2636	2185	if ( self::is_viewable_draft_form( $form ) ) {
2637		- // Don't show a draft form on a page
	2186	+ // don't show a draft form on a page
2638	2187	$form = __( 'Please select a valid form', 'formidable' );
2639	2188	} elseif ( ! FrmForm::is_visible_to_user( $form ) ) {
2640	2189	$form = do_shortcode( $frm_settings->login_msg );
2641	2190	} else {
		@@ -2655,18 +2204,16 @@
2655	2204	}
2656	2205
2657	2206	/**
2658	2207	* @param false|int|string $id
2659		- *
2660	2208	* @return false|stdClass
2661	2209	*/
2662	2210	private static function maybe_get_form_to_show( $id ) {
2663	2211	$form = false;
2664	2212
2665		- if ( $id ) {
	2213	+ if ( ! empty( $id ) ) {
2666	2214	// Form id or key is set.
2667	2215	$form = FrmForm::getOne( $id );
2668		-
2669	2216	if ( ! $form || $form->parent_form_id || $form->status === 'trash' ) {
2670	2217	$form = false;
2671	2218	}
2672	2219	}
		@@ -2673,25 +2220,12 @@
2673	2220
2674	2221	return $form;
2675	2222	}
2676	2223
2677		- /**
2678		- * @param object $form
2679		- *
2680		- * @return bool
2681		- */
2682	2224	private static function is_viewable_draft_form( $form ) {
2683	2225	return $form->status === 'draft' && current_user_can( 'frm_edit_forms' ) && ! FrmAppHelper::is_preview_page();
2684	2226	}
2685	2227
2686		- /**
2687		- * @param object $form
2688		- * @param bool $title
2689		- * @param bool $description
2690		- * @param array $atts
2691		- *
2692		- * @return string
2693		- */
2694	2228	public static function get_form( $form, $title, $description, $atts = array() ) {
2695	2229	ob_start();
2696	2230
2697	2231	do_action( 'frm_before_get_form', $atts );
		@@ -2698,9 +2232,10 @@
2698	2232
2699	2233	self::get_form_contents( $form, $title, $description, $atts );
2700	2234	self::enqueue_scripts( FrmForm::get_params( $form ) );
2701	2235
2702		- $contents = ob_get_clean();
	2236	+ $contents = ob_get_contents();
	2237	+ ob_end_clean();
2703	2238
2704	2239	self::maybe_minimize_form( $atts, $contents );
2705	2240
2706	2241	return $contents;
		@@ -2705,25 +2240,12 @@
2705	2240
2706	2241	return $contents;
2707	2242	}
2708	2243
2709		- /**
2710		- * @param array $params
2711		- *
2712		- * @return void
2713		- */
2714	2244	public static function enqueue_scripts( $params ) {
2715	2245	do_action( 'frm_enqueue_form_scripts', $params );
2716	2246	}
2717	2247
2718		- /**
2719		- * @param object $form
2720		- * @param bool $title
2721		- * @param bool $description
2722		- * @param array $atts
2723		- *
2724		- * @return void
2725		- */
2726	2248	public static function get_form_contents( $form, $title, $description, $atts ) {
2727	2249	$params = FrmForm::get_params( $form );
2728	2250	$errors = self::get_saved_errors( $form, $params );
2729	2251	$fields = FrmFieldsHelper::get_form_fields( $form->id, $errors );
		@@ -2730,10 +2252,9 @@
2730	2252	$reset = false;
2731	2253	$pass_args = compact( 'form', 'fields', 'errors', 'title', 'description', 'reset' );
2732	2254
2733	2255	$pass_args['action'] = $params['action'];
2734		- // phpcs:ignore WordPress.Security.NonceVerification.Missing, Universal.Operators.StrictComparisons
2735		- $handle_process_here = $params['action'] === 'create' && $params['posted_form_id'] == $form->id && $_POST;
	2256	+ $handle_process_here = $params['action'] === 'create' && $params['posted_form_id'] == $form->id && $_POST; // phpcs:ignore WordPress.Security.NonceVerification.Missing
2736	2257
2737	2258	if ( ! $handle_process_here ) {
2738	2259	FrmFormState::set_initial_value( 'title', $title );
2739	2260	FrmFormState::set_initial_value( 'description', $description );
		@@ -2738,15 +2259,16 @@
2738	2259	FrmFormState::set_initial_value( 'title', $title );
2739	2260	FrmFormState::set_initial_value( 'description', $description );
2740	2261
2741	2262	do_action( 'frm_display_form_action', $params, $fields, $form, $title, $description );
2742		-
2743	2263	if ( apply_filters( 'frm_continue_to_new', true, $form->id, $params['action'] ) ) {
2744	2264	self::show_form_after_submit( $pass_args );
2745	2265	}
2746		- } elseif ( $errors ) {
	2266	+ } elseif ( ! empty( $errors ) ) {
2747	2267	self::show_form_after_submit( $pass_args );
	2268	+
2748	2269	} else {
	2270	+
2749	2271	do_action( 'frm_validate_form_creation', $params, $fields, $form, $title, $description );
2750	2272
2751	2273	if ( apply_filters( 'frm_continue_to_create', true, $form->id ) ) {
2752	2274	$entry_id = self::just_created_entry( $form->id );
		@@ -2769,19 +2291,13 @@
2769	2291	/**
2770	2292	* If the form was processed earlier (init), get the generated errors
2771	2293	*
2772	2294	* @since 2.05
2773		- *
2774		- * @param object $form
2775		- * @param array $params
2776		- *
2777		- * @return array
2778	2295	*/
2779	2296	private static function get_saved_errors( $form, $params ) {
2780	2297	global $frm_vars;
2781	2298
2782		- // phpcs:ignore WordPress.Security.NonceVerification.Missing, Universal.Operators.StrictComparisons
2783		- if ( $params['posted_form_id'] == $form->id && $_POST && isset( $frm_vars['created_entries'][ $form->id ] ) ) {
	2299	+ if ( $params['posted_form_id'] == $form->id && $_POST && isset( $frm_vars['created_entries'][ $form->id ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
2784	2300	$errors = $frm_vars['created_entries'][ $form->id ]['errors'];
2785	2301	} else {
2786	2302	$errors = array();
2787	2303	}
		@@ -2798,16 +2314,13 @@
2798	2314	}
2799	2315
2800	2316	/**
2801	2317	* @since 2.2.7
2802		- *
2803		- * @param int|string $form_id
2804		- *
2805		- * @return int
2806	2318	*/
2807	2319	public static function just_created_entry( $form_id ) {
2808	2320	global $frm_vars;
2809		- 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
	2321	+
	2322	+ 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;
2810	2323	}
2811	2324
2812	2325	/**
2813	2326	* Gets confirmation method.
		@@ -2820,9 +2333,8 @@
2820	2333	*
2821	2334	* @type object $form Form object.
2822	2335	* @type int $entry_id Entry ID.
2823	2336	* }
2824		- *
2825	2337	* @return array|string
2826	2338	*/
2827	2339	private static function get_confirmation_method( $atts ) {
2828	2340	$action = FrmOnSubmitHelper::current_event( $atts );
		@@ -2830,9 +2342,8 @@
2830	2342	$method = ! empty( $atts['form']->options[ $opt ] ) ? $atts['form']->options[ $opt ] : 'message';
2831	2343
2832	2344	if ( ! empty( $atts['entry_id'] ) ) {
2833	2345	$met_actions = self::get_met_on_submit_actions( $atts, $action );
2834		-
2835	2346	if ( $met_actions ) {
2836	2347	$method = $met_actions;
2837	2348	}
2838	2349	}
		@@ -2839,21 +2350,14 @@
2839	2350
2840	2351	$method = apply_filters( 'frm_success_filter', $method, $atts['form'], $action );
2841	2352
2842	2353	if ( $method !== 'message' && ( ! $atts['entry_id'] || ! is_numeric( $atts['entry_id'] ) ) ) {
2843		- return 'message';
	2354	+ $method = 'message';
2844	2355	}
2845	2356
2846	2357	return $method;
2847	2358	}
2848	2359
2849		- /**
2850		- * @param object $form
2851		- * @param array $params
2852		- * @param array $args
2853		- *
2854		- * @return void
2855		- */
2856	2360	public static function maybe_trigger_redirect( $form, $params, $args ) {
2857	2361	if ( ! isset( $params['id'] ) ) {
2858	2362	global $frm_vars;
2859	2363	$params['id'] = $frm_vars['created_entries'][ $form->id ]['entry_id'];
		@@ -2880,12 +2384,14 @@
2880	2384	* @param array $params See {@see FrmFormsController::maybe_trigger_redirect()}.
2881	2385	* @param array $args See {@see FrmFormsController::maybe_trigger_redirect()}.
2882	2386	*/
2883	2387	public static function maybe_trigger_redirect_with_action( $conf_method, $form, $params, $args ) {
2884		- 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
2885		- $event = FrmOnSubmitHelper::current_event( $params );
2886		- FrmOnSubmitHelper::populate_on_submit_data( $form->options, $conf_method[0], $event );
2887		- $conf_method = 'redirect';
	2388	+ if ( is_array( $conf_method ) && 1 === count( $conf_method ) ) {
	2389	+ if ( 'redirect' === FrmOnSubmitHelper::get_action_type( $conf_method[0] ) && empty( $conf_method[0]->post_content['redirect_delay'] ) ) {
	2390	+ $event = FrmOnSubmitHelper::current_event( $params );
	2391	+ FrmOnSubmitHelper::populate_on_submit_data( $form->options, $conf_method[0], $event );
	2392	+ $conf_method = 'redirect';
	2393	+ }
2888	2394	}
2889	2395
2890	2396	if ( 'redirect' === $conf_method ) {
2891	2397	self::trigger_redirect( $form, $params, $args );
		@@ -2891,15 +2397,8 @@
2891	2397	self::trigger_redirect( $form, $params, $args );
2892	2398	}
2893	2399	}
2894	2400
2895		- /**
2896		- * @param object $form
2897		- * @param array $params
2898		- * @param array $args
2899		- *
2900		- * @return void
2901		- */
2902	2401	public static function trigger_redirect( $form, $params, $args ) {
2903	2402	$success_args = array(
2904	2403	'action' => $params['action'],
2905	2404	'conf_method' => 'redirect',
		@@ -2958,9 +2457,8 @@
2958	2457	* @since 6.0
2959	2458	*
2960	2459	* @param array $args See {@see FrmFormsController::run_success_action()}.
2961	2460	* @param string $event Form event. Default is `create`.
2962		- *
2963	2461	* @return array Array of actions that meet the conditional logics.
2964	2462	*/
2965	2463	public static function get_met_on_submit_actions( $args, $event = 'create' ) {
2966	2464	if ( ! FrmOnSubmitHelper::form_has_migrated( $args['form'] ) ) {
		@@ -2987,11 +2485,13 @@
2987	2485	}
2988	2486
2989	2487	$action_type = FrmOnSubmitHelper::get_action_type( $action );
2990	2488
2991		- if ( 'redirect' === $action_type && $has_redirect ) {
2992		- // Do not process because we run the first redirect action only.
2993		- continue;
	2489	+ if ( 'redirect' === $action_type ) {
	2490	+ if ( $has_redirect ) {
	2491	+ // Do not process because we run the first redirect action only.
	2492	+ continue;
	2493	+ }
2994	2494	}
2995	2495
2996	2496	if ( ! self::is_valid_on_submit_action( $action, $args, $event ) ) {
2997	2497	continue;
		@@ -3016,10 +2516,10 @@
3016	2516	* @param array $args See {@see FrmFormsController::run_success_action()}. `$args['event']` is also added.
3017	2517	*/
3018	2518	$met_actions = apply_filters( 'frm_get_met_on_submit_actions', $met_actions, $args );
3019	2519
3020		- if ( ! $met_actions ) {
3021		- return array( FrmOnSubmitHelper::get_fallback_action( $event ) );
	2520	+ if ( empty( $met_actions ) ) {
	2521	+ $met_actions = array( FrmOnSubmitHelper::get_fallback_action( $event ) );
3022	2522	}
3023	2523
3024	2524	return $met_actions;
3025	2525	}
		@@ -3031,9 +2531,8 @@
3031	2531	*
3032	2532	* @param object $action Form action object.
3033	2533	* @param array $args See {@see FrmFormsController::run_success_action()}.
3034	2534	* @param string $event Form event. Default is `create`.
3035		- *
3036	2535	* @return bool
3037	2536	*/
3038	2537	private static function is_valid_on_submit_action( $action, $args, $event = 'create' ) {
3039	2538	$action_type = FrmOnSubmitHelper::get_action_type( $action );
		@@ -3055,9 +2554,8 @@
3055	2554	return false;
3056	2555	}
3057	2556
3058	2557	$page = get_post( $action->post_content['success_page_id'] );
3059		-
3060	2558	if ( ! $page || 'trash' === $page->post_status ) {
3061	2559	return false;
3062	2560	}
3063	2561	}
		@@ -3079,9 +2577,8 @@
3079	2577	'entry_id' => $args['entry_id'],
3080	2578	'action' => FrmOnSubmitHelper::current_event( $args ),
3081	2579	)
3082	2580	);
3083		-
3084	2581	if ( ! is_array( $args['conf_method'] ) ) {
3085	2582	self::run_success_action( $args );
3086	2583	return;
3087	2584	}
		@@ -3108,9 +2605,8 @@
3108	2605	* @param array $args See {@see FrmFormsController::run_success_action()}.
3109	2606	*/
3110	2607	public static function run_multi_on_submit_actions( $args ) {
3111	2608	$redirect_action = null;
3112		-
3113	2609	foreach ( $args['conf_method'] as $action ) {
3114	2610	if ( 'redirect' === FrmOnSubmitHelper::get_action_type( $action ) ) {
3115	2611	// We catch the redirect action to run it last.
3116	2612	$redirect_action = $action;
		@@ -3121,15 +2617,13 @@
3121	2617
3122	2618	unset( $action );
3123	2619	}
3124	2620
3125		- if ( ! $redirect_action ) {
3126		- return;
	2621	+ if ( $redirect_action ) {
	2622	+ // Show script to delay the redirection.
	2623	+ $args['force_delay_redirect'] = true;
	2624	+ self::run_single_on_submit_action( $args, $redirect_action );
3127	2625	}
3128		-
3129		- // Show script to delay the redirection.
3130		- $args['force_delay_redirect'] = true;
3131		- self::run_single_on_submit_action( $args, $redirect_action );
3132	2626	}
3133	2627
3134	2628	/**
3135	2629	* Runs single On Submit action.
		@@ -3150,9 +2644,8 @@
3150	2644	* @since 6.0
3151	2645	*
3152	2646	* @param array $args See {@see FrmFormsController::run_success_action()}.
3153	2647	* @param object $action On Submit action object.
3154		- *
3155	2648	* @return array
3156	2649	*/
3157	2650	private static function get_run_success_action_args( $args, $action ) {
3158	2651	$new_args = $args;
		@@ -3158,9 +2651,10 @@
3158	2651	$new_args = $args;
3159	2652
3160	2653	FrmOnSubmitHelper::populate_on_submit_data( $new_args['form']->options, $action, $args['action'] );
3161	2654
3162		- $opt = 'update' === $args['action'] ? 'edit_' : 'success_';
	2655	+ $opt = 'update' === $args['action'] ? 'edit_' : 'success_';
	2656	+
3163	2657	$new_args['conf_method'] = $new_args['form']->options[ $opt . 'action' ];
3164	2658
3165	2659	/**
3166	2660	* Filters the run success action args.
		@@ -3175,18 +2669,12 @@
3175	2669	}
3176	2670
3177	2671	/**
3178	2672	* @since 3.0
3179		- *
3180		- * @param array $args
3181		- *
3182		- * @return void
3183	2673	*/
3184	2674	private static function load_page_after_submit( $args ) {
3185	2675	global $post;
3186	2676	$opt = $args['success_opt'];
3187		-
3188		- // phpcs:ignore Universal.Operators.StrictComparisons
3189	2677	if ( ! $post || $args['form']->options[ $opt . '_page_id' ] != $post->ID ) {
3190	2678	$page = get_post( $args['form']->options[ $opt . '_page_id' ] );
3191	2679	$old_post = $post;
3192	2680	$post = $page;
		@@ -3210,9 +2698,8 @@
3210	2698	}
3211	2699
3212	2700	/**
3213	2701	* @since 3.0
3214		- *
3215	2702	* @param array $args See {@see FrmFormsController::run_success_action()}.
3216	2703	*/
3217	2704	private static function redirect_after_submit( $args ) {
3218	2705	add_filter( 'frm_use_wpautop', '__return_false' );
		@@ -3226,10 +2713,11 @@
3226	2713	FrmEntriesController::delete_entry_before_redirect( $success_url, $args['form'], $args );
3227	2714
3228	2715	add_filter( 'frm_redirect_url', 'FrmEntriesController::prepare_redirect_url' );
3229	2716	$success_url = apply_filters( 'frm_redirect_url', $success_url, $args['form'], $args );
3230		- $doing_ajax = FrmAppHelper::doing_ajax();
3231	2717
	2718	+ $doing_ajax = FrmAppHelper::doing_ajax();
	2719	+
3232	2720	if ( ! empty( $args['ajax'] ) && $doing_ajax && empty( $args['force_delay_redirect'] ) ) {
3233	2721	// Is AJAX submit and there is just one Redirect action runs.
3234	2722	echo json_encode( self::get_ajax_redirect_response_data( $args + compact( 'success_url' ) ) );
3235	2723	wp_die();
		@@ -3278,9 +2766,8 @@
3278	2766	*
3279	2767	* @since 6.3.1
3280	2768	*
3281	2769	* @param array $args See {@see FrmFormsController::run_success_action()}.
3282		- *
3283	2770	* @return array
3284	2771	*/
3285	2772	private static function get_ajax_redirect_response_data( $args ) {
3286	2773	$response_data = array(
		@@ -3303,9 +2790,8 @@
3303	2790	$args['message'] = FrmOnSubmitHelper::get_default_new_tab_msg();
3304	2791
3305	2792	$args['form']->options['success_msg'] = $args['message'];
3306	2793	$args['form']->options['edit_msg'] = $args['message'];
3307		-
3308	2794	if ( ! isset( $args['fields'] ) ) {
3309	2795	$args['fields'] = FrmField::get_all_for_form( $args['form']->id );
3310	2796	}
3311	2797
		@@ -3357,15 +2843,13 @@
3357	2843	add_filter( 'frm_use_wpautop', '__return_true' );
3358	2844
3359	2845	echo FrmAppHelper::maybe_kses( $redirect_msg ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
3360	2846	echo '<script>';
3361		-
3362	2847	if ( empty( $args['doing_ajax'] ) ) {
3363	2848	// Not AJAX submit, delay JS until window.load.
3364	2849	echo 'window.onload=function(){';
3365	2850	}
3366	2851	echo 'setTimeout(function(){' . $redirect_js . '}, ' . intval( $delay_time ) . ');'; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
3367		-
3368	2852	if ( empty( $args['doing_ajax'] ) ) {
3369	2853	echo '};';
3370	2854	}
3371	2855	echo '</script>';
		@@ -3378,16 +2862,13 @@
3378	2862	* @param string $success_msg
3379	2863	* @param array $args
3380	2864	*/
3381	2865	private static function get_redirect_message( $success_url, $success_msg, $args ) {
3382		- $success_msg = apply_filters( 'frm_content', $success_msg, $args['form'], $args['entry_id'] );
3383		- $success_msg = do_shortcode( FrmAppHelper::use_wpautop( $success_msg ) );
3384		-
3385		- // phpcs:disable Generic.WhiteSpace.ScopeIndent
3386		- $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
	2866	+ $success_msg = apply_filters( 'frm_content', $success_msg, $args['form'], $args['entry_id'] );
	2867	+ $success_msg = do_shortcode( FrmAppHelper::use_wpautop( $success_msg ) );
	2868	+ $redirect_msg = '<div class="' . esc_attr( FrmFormsHelper::get_form_style_class( $args['form'] ) ) . '"><div class="frm-redirect-msg" role="status">' . $success_msg . '<br/>' .
3387	2869	self::get_redirect_fallback_message( $success_url, $args ) .
3388	2870	'</div></div>';
3389		- // phpcs:enable Generic.WhiteSpace.ScopeIndent
3390	2871
3391	2872	$redirect_args = array(
3392	2873	'entry_id' => $args['entry_id'],
3393	2874	'form_id' => $args['form']->id,
		@@ -3403,14 +2884,12 @@
3403	2884	* @since 6.3.1
3404	2885	*
3405	2886	* @param string $success_url Redirect URL.
3406	2887	* @param array $args Contains `form` object.
3407		- *
3408	2888	* @return string
3409	2889	*/
3410	2890	private static function get_redirect_fallback_message( $success_url, $args ) {
3411	2891	$target = '';
3412		-
3413	2892	if ( ! empty( $args['form']->options['open_in_new_tab'] ) ) {
3414	2893	$target = ' target="_blank"';
3415	2894	}
3416	2895
		@@ -3425,12 +2904,8 @@
3425	2904	/**
3426	2905	* Prepare to show the success message and empty form after submit
3427	2906	*
3428	2907	* @since 2.05
3429		- *
3430		- * @param array $atts
3431		- *
3432		- * @return void
3433	2908	*/
3434	2909	public static function show_message_after_save( $atts ) {
3435	2910	$atts['message'] = self::prepare_submit_message( $atts['form'], $atts['entry_id'], $atts );
3436	2911
		@@ -3436,9 +2911,8 @@
3436	2911
3437	2912	if ( ! isset( $atts['form']->options['show_form'] ) || $atts['form']->options['show_form'] ) {
3438	2913	if ( isset( $atts['action'] ) && 'update' === $atts['action'] && is_callable( array( 'FrmProEntriesController', 'show_front_end_form_with_entry' ) ) ) {
3439	2914	$entry = FrmEntry::getOne( $atts['entry_id'] );
3440		-
3441	2915	if ( $entry ) {
3442	2916	// This is copied from the Pro plugin.
3443	2917	$atts['conf_message'] = FrmProEntriesController::confirmation( 'message', $atts['form'], $atts['form']->options, $entry->id, $atts );
3444	2918	$atts['show_form'] = FrmProEntriesController::is_form_displayed_after_edit( $atts['form'] );
		@@ -3455,12 +2929,8 @@
3455	2929	/**
3456	2930	* Show an empty form
3457	2931	*
3458	2932	* @since 2.05
3459		- *
3460		- * @param array $args
3461		- *
3462		- * @return void
3463	2933	*/
3464	2934	private static function show_form_after_submit( $args ) {
3465	2935	self::fill_atts_for_form_display( $args );
3466	2936
		@@ -3479,11 +2949,12 @@
3479	2949	}
3480	2950	unset( $args );
3481	2951
3482	2952	$include_form_tag = apply_filters( 'frm_include_form_tag', true, $form );
3483		- $frm_settings = FrmAppHelper::get_settings();
3484		- $submit = $form->options['submit_value'] ?? $frm_settings->submit_value;
3485	2953
	2954	+ $frm_settings = FrmAppHelper::get_settings();
	2955	+ $submit = isset( $form->options['submit_value'] ) ? $form->options['submit_value'] : $frm_settings->submit_value;
	2956	+
3486	2957	global $frm_vars;
3487	2958	self::maybe_load_css( $form, $values['custom_style'], $frm_vars['load_css'] );
3488	2959
3489	2960	$message_placement = self::message_placement( $form, $message );
		@@ -3491,36 +2962,25 @@
3491	2962	include FrmAppHelper::plugin_path() . '/classes/views/frm-entries/new.php';
3492	2963	}
3493	2964
3494	2965	/**
3495		- * Gets message placement.
3496		- *
3497	2966	* @since 4.05.02
3498		- * @since 6.26 This method changed from `private` to `public`.
3499		- *
3500		- * @param object $form Form object.
3501		- * @param string $message The message.
3502		- *
3503		- * @return string Accepts 'before', 'after', or 'submit'.
	2967	+ * @return string - 'before', 'after', or 'submit'
3504	2968	*/
3505		- public static function message_placement( $form, $message ) {
	2969	+ private static function message_placement( $form, $message ) {
3506	2970	$place = 'before';
3507	2971
3508	2972	if ( $message && isset( $form->options['form_class'] ) ) {
3509		- if ( str_contains( $form->options['form_class'], 'frm_below_success' ) ) {
	2973	+ if ( strpos( $form->options['form_class'], 'frm_below_success' ) !== false ) {
3510	2974	$place = 'after';
3511		- } elseif ( str_contains( $form->options['form_class'], 'frm_inline_success' ) ) {
	2975	+ } elseif ( strpos( $form->options['form_class'], 'frm_inline_success' ) !== false ) {
3512	2976	$place = 'submit';
3513	2977	}
3514	2978	}
3515	2979
3516	2980	/**
3517		- * Filter the message placement.
3518		- *
3519	2981	* @since 4.05.02
3520		- *
3521		- * @param string $place Accepts 'before', 'after', or 'submit'.
3522		- * @param array $args Args.
	2982	+ * @return string - 'before' or 'after'
3523	2983	*/
3524	2984	return apply_filters( 'frm_message_placement', $place, compact( 'form', 'message' ) );
3525	2985	}
3526	2986
		@@ -3527,12 +2987,8 @@
3527	2987	/**
3528	2988	* Get all the values needed on the new.php entry page
3529	2989	*
3530	2990	* @since 2.05
3531		- *
3532		- * @param array $args
3533		- *
3534		- * @return void
3535	2991	*/
3536	2992	private static function fill_atts_for_form_display( &$args ) {
3537	2993	if ( ! isset( $args['title'] ) && isset( $args['show_title'] ) ) {
3538	2994	$args['title'] = $args['show_title'];
		@@ -3557,12 +3013,8 @@
3557	3013	/**
3558	3014	* Show the success message without the form
3559	3015	*
3560	3016	* @since 2.05
3561		- *
3562		- * @param array $atts
3563		- *
3564		- * @return void
3565	3017	*/
3566	3018	private static function show_lone_success_message( $atts ) {
3567	3019	global $frm_vars;
3568	3020	$values = FrmEntriesHelper::setup_new_vars( $atts['fields'], $atts['form'], true );
		@@ -3568,12 +3020,13 @@
3568	3020	$values = FrmEntriesHelper::setup_new_vars( $atts['fields'], $atts['form'], true );
3569	3021	self::maybe_load_css( $atts['form'], $values['custom_style'], $frm_vars['load_css'] );
3570	3022
3571	3023	$include_extra_container = 'frm_forms' . FrmFormsHelper::get_form_style_class( $values );
3572		- $errors = array();
3573		- $form = $atts['form'];
3574		- $message = $atts['message'];
3575	3024
	3025	+ $errors = array();
	3026	+ $form = $atts['form'];
	3027	+ $message = $atts['message'];
	3028	+
3576	3029	include FrmAppHelper::plugin_path() . '/classes/views/frm-entries/errors.php';
3577	3030	}
3578	3031
3579	3032	/**
		@@ -3581,20 +3034,19 @@
3581	3034	*
3582	3035	* @since 2.05
3583	3036	* @since 6.0.x Added the third parameter.
3584	3037	*
3585		- * @param object $form Form object.
3586		- * @param int|string $entry_id Entry ID.
3587		- * @param array $args See {@see FrmFormsController::run_success_action()}.
3588		- *
	3038	+ * @param object $form Form object.
	3039	+ * @param int $entry_id Entry ID.
	3040	+ * @param array $args See {@see FrmFormsController::run_success_action()}.
3589	3041	* @return string
3590	3042	*/
3591	3043	private static function prepare_submit_message( $form, $entry_id, $args = array() ) {
3592	3044	$frm_settings = FrmAppHelper::get_settings( array( 'current_form' => $form->id ) );
3593		- $opt = $args['success_opt'] ?? 'success';
	3045	+ $opt = isset( $args['success_opt'] ) ? $args['success_opt'] : 'success';
3594	3046
3595	3047	if ( $entry_id && is_numeric( $entry_id ) ) {
3596		- $message = $form->options[ $opt . '_msg' ] ?? $frm_settings->success_msg;
	3048	+ $message = isset( $form->options[ $opt . '_msg' ] ) ? $form->options[ $opt . '_msg' ] : $frm_settings->success_msg;
3597	3049	$class = 'frm_message';
3598	3050	} else {
3599	3051	$message = $frm_settings->failed_msg;
3600	3052	$class = FrmFormsHelper::form_error_class();
		@@ -3611,9 +3063,9 @@
3611	3063	public static function front_head() {
3612	3064	$version = FrmAppHelper::plugin_version();
3613	3065	$suffix = FrmAppHelper::js_suffix();
3614	3066
3615		- if ( $suffix && self::has_combo_js_file() ) {
	3067	+ if ( ! empty( $suffix ) && self::has_combo_js_file() ) {
3616	3068	wp_register_script( 'formidable', FrmAppHelper::plugin_url() . '/js/frm.min.js', array( 'jquery' ), $version, true );
3617	3069	} else {
3618	3070	wp_register_script( 'formidable', FrmAppHelper::plugin_url() . "/js/formidable{$suffix}.js", array( 'jquery' ), $version, true );
3619	3071	}
		@@ -3620,9 +3072,9 @@
3620	3072
3621	3073	add_filter( 'script_loader_tag', 'FrmFormsController::defer_script_loading', 10, 2 );
3622	3074
3623	3075	if ( FrmAppHelper::is_admin() ) {
3624		- // Don't load this in back-end
	3076	+ // don't load this in back-end
3625	3077	return;
3626	3078	}
3627	3079
3628	3080	FrmAppHelper::localize_script( 'front' );
		@@ -3635,15 +3087,8 @@
3635	3087	public static function has_combo_js_file() {
3636	3088	return is_readable( FrmAppHelper::plugin_path() . '/js/frm.min.js' );
3637	3089	}
3638	3090
3639		- /**
3640		- * @param object $form
3641		- * @param int|string $this_load
3642		- * @param bool $global_load
3643		- *
3644		- * @return void
3645		- */
3646	3091	public static function maybe_load_css( $form, $this_load, $global_load ) {
3647	3092	$load_css = FrmForm::is_form_loaded( $form, $this_load, $global_load );
3648	3093
3649	3094	if ( ! $load_css ) {
		@@ -3673,9 +3118,8 @@
3673	3118	return;
3674	3119	}
3675	3120
3676	3121	global $wp_styles;
3677		-
3678	3122	if ( is_array( $wp_styles->queue ) && in_array( 'formidable', $wp_styles->queue, true ) ) {
3679	3123	wp_print_styles( 'formidable' );
3680	3124	}
3681	3125	}
		@@ -3690,57 +3134,32 @@
3690	3134	private static function should_load_late() {
3691	3135	return ! function_exists( 'aioseo' );
3692	3136	}
3693	3137
3694		- /**
3695		- * @param string $tag
3696		- * @param string $handle
3697		- *
3698		- * @return string
3699		- */
3700	3138	public static function defer_script_loading( $tag, $handle ) {
3701		- if ( 'captcha-api' === $handle && ! str_contains( $tag, 'defer' ) ) {
3702		- return str_replace( ' src', ' defer="defer" async="async" src', $tag );
	3139	+ if ( 'captcha-api' == $handle && ! strpos( $tag, 'defer' ) ) {
	3140	+ $tag = str_replace( ' src', ' defer="defer" async="async" src', $tag );
3703	3141	}
3704	3142
3705	3143	return $tag;
3706	3144	}
3707	3145
3708		- /**
3709		- * @param string $location
3710		- *
3711		- * @return void
3712		- */
3713	3146	public static function footer_js( $location = 'footer' ) {
3714	3147	global $frm_vars;
3715	3148
3716	3149	FrmStylesController::enqueue_css();
3717	3150
3718		- if ( FrmAppHelper::is_admin() || $location === 'header' || empty( $frm_vars['forms_loaded'] ) ) {
3719		- return;
	3151	+ if ( ! FrmAppHelper::is_admin() && $location !== 'header' && ! empty( $frm_vars['forms_loaded'] ) ) {
	3152	+ // load formidable js
	3153	+ wp_enqueue_script( 'formidable' );
3720	3154	}
3721		-
3722		- // Load formidable js
3723		- wp_enqueue_script( 'formidable' );
3724		-
3725		- FrmHoneypot::maybe_print_honeypot_js();
3726		-
3727		- if ( ! method_exists( 'FrmProFormsHelper', 'load_currency_js' ) ) {
3728		- // Load currency JS if Pro is not installed.
3729		- FrmFormsHelper::load_currency_js();
3730		- }
3731	3155	}
3732	3156
3733	3157	/**
3734	3158	* @since 2.0.8
3735		- *
3736		- * @param array $atts
3737		- * @param string $content
3738		- *
3739		- * @return void
3740	3159	*/
3741	3160	private static function maybe_minimize_form( $atts, &$content ) {
3742		- // Check if minimizing is turned on
	3161	+ // check if minimizing is turned on
3743	3162	if ( self::is_minification_on( $atts ) ) {
3744	3163	$content = str_replace( array( "\r\n", "\r", "\n", "\t", ' ' ), '', $content );
3745	3164	}
3746	3165	}
		@@ -3746,11 +3165,8 @@
3746	3165	}
3747	3166
3748	3167	/**
3749	3168	* @since 2.0.8
3750		- *
3751		- * @param array $atts
3752		- *
3753	3169	* @return bool
3754	3170	*/
3755	3171	private static function is_minification_on( $atts ) {
3756	3172	return ! empty( $atts['minimize'] );
		@@ -3762,13 +3178,11 @@
3762	3178	* @return void
3763	3179	*/
3764	3180	public static function landing_page_preview_option() {
3765	3181	$dir = apply_filters( 'frm_landing_page_preview_option', false );
3766		-
3767	3182	if ( false === $dir || ! file_exists( $dir . 'landing-page-preview-option.php' ) ) {
3768	3183	$dir = self::get_form_views_path();
3769	3184	}
3770		-
3771	3185	include $dir . 'landing-page-preview-option.php';
3772	3186	}
3773	3187
3774	3188	/**
		@@ -3794,15 +3208,13 @@
3794	3208
3795	3209	check_ajax_referer( 'frm_ajax', 'nonce' );
3796	3210
3797	3211	$type = FrmAppHelper::get_post_param( 'type', '', 'sanitize_text_field' );
3798		-
3799	3212	if ( ! $type || ! in_array( $type, array( 'form', 'view' ), true ) ) {
3800	3213	die( 0 );
3801	3214	}
3802	3215
3803	3216	$object_id = FrmAppHelper::get_post_param( 'object_id', '', 'absint' );
3804		-
3805	3217	if ( ! $object_id ) {
3806	3218	die( 0 );
3807	3219	}
3808	3220
		@@ -3814,15 +3226,13 @@
3814	3226	$postarr['post_content'] = apply_filters( 'frm_create_page_with_' . $type . '_shortcode_content', '', $object_id );
3815	3227	}
3816	3228
3817	3229	$name = FrmAppHelper::get_post_param( 'name', '', 'sanitize_text_field' );
3818		-
3819	3230	if ( $name ) {
3820	3231	$postarr['post_title'] = $name;
3821	3232	}
3822	3233
3823	3234	$success = wp_insert_post( $postarr );
3824		-
3825	3235	if ( ! is_numeric( $success ) || ! $success ) {
3826	3236	die( 0 );
3827	3237	}
3828	3238
		@@ -3836,9 +3246,8 @@
3836	3246	/**
3837	3247	* @since 5.3
3838	3248	*
3839	3249	* @param int $form_id
3840		- *
3841	3250	* @return string
3842	3251	*/
3843	3252	private static function get_page_shortcode_content_for_form( $form_id ) {
3844	3253	$shortcode = '[formidable id="' . $form_id . '"]';
		@@ -3858,9 +3267,9 @@
3858	3267	}
3859	3268
3860	3269	check_ajax_referer( 'frm_ajax', 'nonce' );
3861	3270
3862		- $html = FrmAppHelper::clip(
	3271	+ $html = FrmAppHelper::clip(
3863	3272	function () {
3864	3273	FrmAppHelper::maybe_autocomplete_pages_options(
3865	3274	array(
3866	3275	'field_name' => 'frm_page_dropdown',
		@@ -3869,53 +3278,19 @@
3869	3278	)
3870	3279	);
3871	3280	}
3872	3281	);
	3282	+ $post_type_object = get_post_type_object( 'page' );
3873	3283	wp_send_json(
3874	3284	array(
3875	3285	'html' => $html,
3876		- 'edit_page_url' => admin_url( sprintf( get_post_type_object( 'page' )->_edit_link . '&action=edit', 0 ) ),
	3286	+ 'edit_page_url' => admin_url( sprintf( $post_type_object->_edit_link . '&action=edit', 0 ) ),
3877	3287	)
3878	3288	);
3879	3289	}
3880	3290
3881	3291	/**
3882		- * Prints necessary templates for the forms list page.
3883		- *
3884		- * @since 6.32
3885		- *
3886		- * @return void
3887		- */
3888		- public static function print_forms_list_templates() {
3889		- if ( ! FrmAppHelper::on_form_listing_page() ) {
3890		- return;
3891		- }
3892		-
3893		- $screen = get_current_screen();
3894		-
3895		- if ( ! $screen ) {
3896		- return;
3897		- }
3898		-
3899		- $columns = get_column_headers( $screen );
3900		- $hidden = get_hidden_columns( $screen );
3901		- $skip_cols = array( 'cb', 'name', 'settings' );
3902		- $per_page = get_user_option( 'formidable_page_formidable_per_page' );
3903		- $show_screen_options = $screen->show_screen_options();
3904		-
3905		- if ( $per_page < 1 ) {
3906		- $per_page = 20;
3907		- }
3908		-
3909		- include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/forms-list-settings.php';
3910		- }
3911		-
3912		- /**
3913	3292	* @deprecated 4.0
3914		- *
3915		- * @param array $values
3916		- *
3917		- * @return void
3918	3293	*/
3919	3294	public static function create( $values = array() ) {
3920	3295	_deprecated_function( __METHOD__, '4.0', 'FrmFormsController::update' );
3921	3296	self::update( $values );
		@@ -3921,14 +3296,16 @@
3921	3296	self::update( $values );
3922	3297	}
3923	3298
3924	3299	/**
3925		- * @deprecated 6.33
	3300	+ * Education for premium features.
3926	3301	*
3927		- * @param array $values
	3302	+ * @since 4.05
	3303	+ * @deprecated 6.16.3
3928	3304	*
3929	3305	* @return void
3930	3306	*/
3931		- public static function render_spam_settings( $values ) {
3932		- _deprecated_function( __METHOD__, '6.33' );
	3307	+ public static function add_form_style_tab_options() {
	3308	+ _deprecated_function( __METHOD__, '6.16.3' );
	3309	+ include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/add_form_style_options.php';
3933	3310	}
3934	3311	}