← All changes | classes/controllers/FrmFormsController.php +274 -734 6.29 → 6.10 View file →

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