← All changes | classes/controllers/FrmFormsController.php +285 -766 6.32 → 6.11 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.
		@@ -26,13 +26,11 @@
26	26	private static $formidable_tinymce_button;
27	27
28	28	public static function menu() {
29	29	$menu_label = __( 'Forms', 'formidable' );
30		-
31	30	if ( ! FrmAppHelper::pro_is_installed() ) {
32	31	$menu_label .= ' (Lite)';
33	32	}
34		-
35	33	add_submenu_page( 'formidable', 'Formidable | ' . $menu_label, $menu_label, 'frm_view_forms', 'formidable', 'FrmFormsController::route' );
36	34
37	35	self::maybe_load_listing_hooks();
38	36	}
		@@ -47,15 +45,8 @@
47	45	add_filter( 'manage_toplevel_page_formidable_columns', 'FrmFormsController::get_columns', 0 );
48	46	add_filter( 'manage_toplevel_page_formidable_sortable_columns', 'FrmFormsController::get_sortable_columns' );
49	47	}
50	48
51		- /**
52		- * Runs on admin head of the formidable forms page.
53		- *
54		- * @since 6.32 This adds screen options.
55		- *
56		- * @return void
57		- */
58	49	public static function head() {
59	50	if ( wp_is_mobile() ) {
60	51	wp_enqueue_script( 'jquery-touch-punch' );
61	52	}
		@@ -73,12 +64,12 @@
73	64	*/
74	65	public static function logic_tip() {
75	66	$images_url = FrmAppHelper::plugin_url() . '/images/';
76	67	$data_message = __( 'Only show the fields you need and create branching forms. Upgrade to get conditional logic and question branching.', 'formidable' );
77		- $data_message .= ' <img src="' . esc_url( $images_url ) . '/survey-logic.png" srcset="' . esc_url( $images_url ) . 'survey-logic@2x.png 2x" alt="' . esc_attr__( 'Conditional Logic options', 'formidable' ) . '"/>'; // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong
78		- echo '<a href="javascript:void(0)" class="frm_noallow frm_show_upgrade frm_add_logic_link frm-collapsed frm-flex-justify" data-upgrade="' . esc_attr__( 'Conditional Logic options', 'formidable' ) . '" data-message="' . esc_attr( $data_message ) . '" data-medium="builder" data-content="logic">'; // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong
	68	+ $data_message .= ' <img src="' . esc_url( $images_url ) . '/survey-logic.png" srcset="' . esc_url( $images_url ) . 'survey-logic@2x.png 2x" alt="' . esc_attr__( 'Conditional Logic options', 'formidable' ) . '"/>';
	69	+ echo '<a href="javascript:void(0)" class="frm_noallow frm_show_upgrade frm_add_logic_link frm-collapsed frm-flex-justify" data-upgrade="' . esc_attr__( 'Conditional Logic options', 'formidable' ) . '" data-message="' . esc_attr( $data_message ) . '" data-medium="builder" data-content="logic">';
79	70	esc_html_e( 'Conditional Logic', 'formidable' );
80		- FrmAppHelper::icon_by_class( 'frmfont frm_arrowdown8_icon', array( 'aria-hidden' => 'true' ) );
	71	+ FrmAppHelper::icon_by_class( 'frmfont frm_arrowdown6_icon', array( 'aria-hidden' => 'true' ) );
81	72	echo '</a>';
82	73	}
83	74
84	75	/**
		@@ -85,15 +76,12 @@
85	76	* By default, Divi processes form shortcodes on the edit post page.
86	77	* Now that won't do.
87	78	*
88	79	* @since 3.01
89		- *
90		- * @param array $shortcodes List of shortcodes to process.
91		- *
92		- * @return array
93	80	*/
94	81	public static function prevent_divi_conflict( $shortcodes ) {
95	82	$shortcodes[] = 'formidable';
	83	+
96	84	return $shortcodes;
97	85	}
98	86
99	87	/**
		@@ -104,14 +92,12 @@
104	92
105	93	$message = '';
106	94	$params = FrmForm::list_page_params();
107	95	$errors = self::process_bulk_form_actions( array() );
108		-
109	96	if ( isset( $errors['message'] ) ) {
110	97	$message = $errors['message'];
111	98	unset( $errors['message'] );
112	99	}
113		-
114	100	$errors = apply_filters( 'frm_admin_list_form_action', $errors );
115	101
116	102	self::display_forms_list( $params, $message, $errors );
117	103	}
		@@ -121,29 +107,17 @@
121	107	*
122	108	* @since 2.02.11
123	109	*
124	110	* @param int|object $form
125		- *
126		- * @return void
127	111	*/
128	112	private static function create_default_email_action( $form ) {
129	113	FrmForm::maybe_get_form( $form );
130		-
131		- if ( ! is_object( $form ) ) {
132		- return;
133		- }
134		-
135	114	$create_email = apply_filters( 'frm_create_default_email_action', true, $form );
136	115
137		- if ( ! $create_email ) {
138		- return;
	116	+ if ( $create_email ) {
	117	+ $action_control = FrmFormActionsController::get_form_actions( 'email' );
	118	+ $action_control->create( $form->id );
139	119	}
140		-
141		- /**
142		- * @var FrmFormAction
143		- */
144		- $action_control = FrmFormActionsController::get_form_actions( 'email' );
145		- $action_control->create( $form->id );
146	120	}
147	121
148	122	/**
149	123	* Create the default On submit action
		@@ -150,18 +124,12 @@
150	124	*
151	125	* @since 6.0.0
152	126	*
153	127	* @param int|object $form Form object or ID.
154		- *
155		- * @return void
156	128	*/
157	129	private static function create_default_on_submit_action( $form ) {
158	130	FrmForm::maybe_get_form( $form );
159	131
160		- if ( ! is_object( $form ) ) {
161		- return;
162		- }
163		-
164	132	/**
165	133	* Enable or disable the default On Submit action.
166	134	*
167	135	* @since 6.0.0
		@@ -170,17 +138,12 @@
170	138	* @param object $form Form object.
171	139	*/
172	140	$create = apply_filters( 'frm_create_default_on_submit_action', true, $form );
173	141
174		- if ( ! $create ) {
175		- return;
	142	+ if ( $create ) {
	143	+ $action_control = FrmFormActionsController::get_form_actions( FrmOnSubmitAction::$slug );
	144	+ $action_control->create( $form->id );
176	145	}
177		-
178		- /**
179		- * @var FrmFormAction
180		- */
181		- $action_control = FrmFormActionsController::get_form_actions( FrmOnSubmitAction::$slug );
182		- $action_control->create( $form->id );
183	146	}
184	147
185	148	/**
186	149	* Creates submit button field.
		@@ -187,18 +150,12 @@
187	150	*
188	151	* @since 6.9
189	152	*
190	153	* @param int|object $form Form ID or object.
191		- *
192		- * @return void
193	154	*/
194	155	private static function create_submit_button_field( $form ) {
195	156	FrmForm::maybe_get_form( $form );
196	157
197		- if ( ! is_object( $form ) ) {
198		- return;
199		- }
200		-
201	158	if ( FrmSubmitHelper::get_submit_field( $form->id ) ) {
202	159	// Do not create submit button field if it exists.
203	160	return;
204	161	}
		@@ -206,9 +163,9 @@
206	163	FrmField::create(
207	164	array(
208	165	'type' => FrmSubmitHelper::FIELD_TYPE,
209	166	'name' => __( 'Submit', 'formidable' ),
210		- 'field_order' => FrmSubmitHelper::DEFAULT_ORDER,
	167	+ 'field_order' => 9999,
211	168	'form_id' => $form->id,
212	169	'field_options' => FrmFieldsHelper::get_default_field_options( FrmSubmitHelper::FIELD_TYPE ),
213	170	'description' => '',
214	171	'default_value' => '',
		@@ -217,10 +174,8 @@
217	174	);
218	175	}
219	176
220	177	/**
221		- * @param array|false $values
222		- *
223	178	* @return void
224	179	*/
225	180	public static function edit( $values = false ) {
226	181	FrmAppHelper::permission_check( 'frm_edit_forms' );
		@@ -232,9 +187,8 @@
232	187
233	188	/**
234	189	* @param mixed $id
235	190	* @param string $message
236		- *
237	191	* @return void
238	192	*/
239	193	public static function settings( $id = false, $message = '' ) {
240	194	FrmAppHelper::permission_check( 'frm_edit_forms' );
		@@ -262,9 +216,10 @@
262	216	FrmAppController::show_error_modal( $error_args );
263	217	return;
264	218	}
265	219
266		- $id = FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
	220	+ $id = FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
	221	+
267	222	$errors = FrmForm::validate( $_POST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
268	223	$warnings = FrmFormsHelper::check_for_warnings( $_POST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
269	224
270	225	if ( count( $errors ) > 0 ) {
		@@ -273,14 +228,13 @@
273	228	}
274	229
275	230	do_action( 'frm_before_update_form_settings', $id );
276	231
277		- $antispam_was_on = self::antispam_was_on( $id ); // phpcs:ignore Formidable.CodeAnalysis.InlineSingleUseVariable
	232	+ $antispam_was_on = self::antispam_was_on( $id );
278	233
279	234	FrmForm::update( $id, $_POST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
280	235
281	236	$antispam_is_on = ! empty( $_POST['options']['antispam'] ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
282		-
283	237	if ( $antispam_is_on !== $antispam_was_on ) {
284	238	FrmAntiSpam::clear_caches();
285	239	}
286	240
		@@ -290,9 +244,8 @@
290	244	}
291	245
292	246	/**
293	247	* @param int $form_id
294		- *
295	248	* @return bool
296	249	*/
297	250	private static function antispam_was_on( $form_id ) {
298	251	$form = FrmForm::getOne( $form_id );
		@@ -299,14 +252,12 @@
299	252	return ! empty( $form->options['antispam'] );
300	253	}
301	254
302	255	/**
303		- * @param array $values
304		- *
305	256	* @return void
306	257	*/
307	258	public static function update( $values = array() ) {
308		- if ( ! $values ) {
	259	+ if ( empty( $values ) ) {
309	260	$values = $_POST; // phpcs:ignore WordPress.Security.NonceVerification.Missing
310	261	}
311	262
312	263	// Set radio button and checkbox meta equal to "other" value.
		@@ -315,9 +266,8 @@
315	266	}
316	267
317	268	$errors = FrmForm::validate( $values );
318	269	$permission_error = FrmAppHelper::permission_nonce_error( 'frm_edit_forms', 'frm_save_form', 'frm_save_form_nonce' );
319		-
320	270	if ( $permission_error !== false ) {
321	271	$errors['form'] = $permission_error;
322	272	}
323	273
		@@ -336,9 +286,9 @@
336	286	if ( self::is_too_long( $values ) ) {
337	287	$message .= '<br/> ' . sprintf(
338	288	/* translators: %1$s: Start link HTML, %2$s: end link HTML */
339	289	__( 'However, your form is very long and may be %1$sreaching server limits%2$s.', 'formidable' ),
340		- '<a href="' . esc_url( self::get_form_too_long_docs_url() ) . '" target="_blank" rel="noopener">',
	290	+ '<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">',
341	291	'</a>'
342	292	);
343	293	}
344	294
		@@ -349,32 +299,17 @@
349	299	self::get_edit_vars( $id, array(), $message );
350	300	}
351	301
352	302	/**
353		- * @since 6.25.1
354		- *
355		- * @return string
356		- */
357		- private static function get_form_too_long_docs_url() {
358		- $utm = array(
359		- 'campaign' => 'builder',
360		- 'content' => 'form-too-long',
361		- );
362		- return FrmAppHelper::admin_upgrade_link( $utm, 'knowledgebase/i-have-a-long-form-why-did-the-options-at-the-end-of-the-form-stop-saving/' );
363		- }
364		-
365		- /**
366	303	* Remove the draft flag from any new fields from this current session.
367	304	*
368	305	* @since 6.8
369	306	*
370	307	* @param int $form_id
371		- *
372	308	* @return void
373	309	*/
374	310	private static function maybe_remove_draft_option_from_fields( $form_id ) {
375	311	$draft_field_ids_csv = FrmAppHelper::get_post_param( 'draft_fields', '', 'sanitize_text_field' );
376		-
377	312	if ( ! $draft_field_ids_csv ) {
378	313	// If the draft_fields input is empty there are no new fields in the session.
379	314	return;
380	315	}
		@@ -379,9 +314,8 @@
379	314	return;
380	315	}
381	316
382	317	$draft_field_ids = array_filter( explode( ',', $draft_field_ids_csv ), 'is_numeric' );
383		-
384	318	if ( ! $draft_field_ids ) {
385	319	// Exit early if the draft fields input is invalid. It should be a CSV of integer values.
386	320	return;
387	321	}
		@@ -386,9 +320,8 @@
386	320	return;
387	321	}
388	322
389	323	$draft_field_rows = FrmFieldsHelper::get_draft_field_results( $form_id, $draft_field_ids );
390		-
391	324	foreach ( $draft_field_rows as $row ) {
392	325	$row->field_options['draft'] = 0;
393	326	FrmField::update( $row->id, array( 'field_options' => $row->field_options ) );
394	327	}
		@@ -400,10 +333,8 @@
400	333	* were likely not saved either.
401	334	*
402	335	* @since 3.06.01
403	336	*
404		- * @param array $values
405		- *
406	337	* @return bool
407	338	*/
408	339	private static function is_too_long( $values ) {
409	340	return empty( $values['frm_end'] );
		@@ -439,17 +370,13 @@
439	370	* @return string|null
440	371	*/
441	372	public static function page_preview() {
442	373	$params = FrmForm::list_page_params();
443		-
444		- if ( ! $params['form'] || is_numeric( $params['form'] ) ) {
	374	+ if ( ! $params['form'] ) {
445	375	return null;
446	376	}
447	377
448		- self::maybe_block_preview( $params['form'] );
449		-
450	378	$form = FrmForm::getOne( $params['form'] );
451		-
452	379	if ( ! $form ) {
453	380	return null;
454	381	}
455	382
		@@ -461,19 +388,9 @@
461	388	*
462	389	* @return void
463	390	*/
464	391	public static function show_page_preview() {
465		- $preview = self::page_preview();
466		-
467		- if ( is_null( $preview ) ) {
468		- wp_die(
469		- '<h1>' . esc_html__( 'Form key is invalid', 'formidable' ) . '</h1>',
470		- '<p>' . esc_html__( 'Form key is invalid', 'formidable' ) . '</p>',
471		- 404
472		- );
473		- }
474		-
475		- echo $preview; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
	392	+ echo self::page_preview(); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
476	393	}
477	394
478	395	/**
479	396	* @return void
		@@ -484,19 +401,9 @@
484	401
485	402	global $frm_vars;
486	403	$frm_vars['preview'] = true;
487	404
488		- // print_emoji_styles is deprecated.
489		- remove_action( 'wp_print_styles', 'print_emoji_styles' );
490		-
491		- if ( FrmTestModeController::should_add_test_mode_container() ) {
492		- do_action( 'frm_test_mode_init' );
493		- add_action( 'wp_enqueue_scripts', 'FrmTestModeController::register_and_enqueue_required_scripts' );
494		- add_filter( 'frm_filter_final_form', 'FrmTestModeController::maybe_add_test_mode_container', 99 );
495		- }
496		-
497	405	$include_theme = FrmAppHelper::get_param( 'theme', '', 'get', 'absint' );
498		-
499	406	if ( $include_theme ) {
500	407	self::set_preview_query();
501	408	self::load_theme_preview();
502	409	} else {
		@@ -519,9 +426,8 @@
519	426	'post_type' => 'page',
520	427	);
521	428
522	429	$page_for_posts = get_option( 'page_for_posts' );
523		-
524	430	if ( is_numeric( $page_for_posts ) ) {
525	431	// Avoid querying for the "Posts Page" or "Blog Page" so we don't display 10 forms.
526	432	$page_query['post__not_in'] = array( $page_for_posts );
527	433	}
		@@ -526,15 +432,13 @@
526	432	$page_query['post__not_in'] = array( $page_for_posts );
527	433	}
528	434
529	435	$random_page = get_posts( $page_query );
530		-
531	436	if ( ! $random_page ) {
532	437	return;
533	438	}
534	439
535	440	$random_page = reset( $random_page );
536		-
537	441	if ( ! is_a( $random_page, 'WP_Post' ) ) {
538	442	// The return type can also be int.
539	443	return;
540	444	}
		@@ -556,9 +460,8 @@
556	460	*
557	461	* @since 5.5.2
558	462	*
559	463	* @param WP_Post $page The page object.
560		- *
561	464	* @return void
562	465	*/
563	466	private static function set_post_global( $page ) {
564	467	global $post;
		@@ -577,16 +480,14 @@
577	480	add_action( 'loop_no_results', 'FrmFormsController::show_page_preview' );
578	481	add_filter( 'is_active_sidebar', '__return_false' );
579	482	FrmStylesController::enqueue_css( 'enqueue', true );
580	483
581		- if ( false !== get_template_part( 'page' ) ) {
582		- return;
	484	+ if ( false === get_template_part( 'page' ) ) {
	485	+ if ( function_exists( 'wp_is_block_theme' ) && wp_is_block_theme() ) {
	486	+ add_filter( 'body_class', 'FrmFormsController::preview_block_theme_body_classnames' );
	487	+ }
	488	+ self::fallback_when_page_template_part_is_not_supported_by_theme();
583	489	}
584		-
585		- if ( function_exists( 'wp_is_block_theme' ) && wp_is_block_theme() ) {
586		- add_filter( 'body_class', 'FrmFormsController::preview_block_theme_body_classnames' );
587		- }
588		- self::fallback_when_page_template_part_is_not_supported_by_theme();
589	490	}
590	491
591	492	/**
592	493	* Add padding to the body for block themes.
		@@ -593,9 +494,8 @@
593	494	*
594	495	* @since 6.5.2
595	496	*
596	497	* @param array $classes The body classes list.
597		- *
598	498	* @return array
599	499	*/
600	500	public static function preview_block_theme_body_classnames( $classes ) {
601	501	$classes[] = 'has-global-padding';
		@@ -608,37 +508,29 @@
608	508	*
609	509	* @return void
610	510	*/
611	511	private static function fallback_when_page_template_part_is_not_supported_by_theme() {
612		- if ( ! have_posts() ) {
613		- return;
614		- }
	512	+ if ( have_posts() ) {
	513	+ the_post();
	514	+ self::get_template( 'header' );
615	515
616		- the_post();
617		- self::get_template( 'header' );
	516	+ // add some generic class names to the container to add some natural padding to the content.
	517	+ // .entry-content catches the WordPress TwentyTwenty theme.
	518	+ // .container catches Customizr content.
	519	+ echo '<div class="container entry-content">';
	520	+ the_content();
	521	+ echo '</div>';
618	522
619		- // Add some generic class names to the container to add some natural padding to the content.
620		- // .entry-content catches the WordPress TwentyTwenty theme.
621		- // .container catches Customizr content.
622		- echo '<div class="container entry-content">';
623		- the_content();
624		- echo '</div>';
625		-
626		- // Prevent extra unexpected forms in the footer.
627		- // For some reason this happens in the Twenty Twenty Five theme.
628		- add_filter( 'frm_filter_final_form', '__return_empty_string' );
629		-
630		- self::get_template( 'footer' );
	523	+ self::get_template( 'footer' );
	524	+ }
631	525	}
632	526
633	527	/**
634	528	* Calls core function to get a template part if it doesn't cause deprecation warnings. Otherwise skips the deprecation function call
635		- * and renders required html fragments calling required functions.
	529	+ * and renders required html fragements calling required functions.
636	530	*
637	531	* @since 6.7.1
638		- *
639	532	* @param string $template
640		- *
641	533	* @return void
642	534	*/
643	535	private static function get_template( $template ) {
644	536	if ( self::should_try_getting_template( $template ) ) {
		@@ -659,11 +551,9 @@
659	551	/**
660	552	* Returns true if calling a template function doesn't trigger deprecation warnings.
661	553	*
662	554	* @since 6.7.1
663		- *
664	555	* @param string $template
665		- *
666	556	* @return bool
667	557	*/
668	558	private static function should_try_getting_template( $template ) {
669	559	$stylesheet_path = get_stylesheet_directory();
		@@ -677,15 +567,15 @@
677	567	/**
678	568	* Set the page title for the theme preview page
679	569	*
680	570	* @since 3.0
681		- *
682		- * @param string $title
683		- *
684		- * @return string
685	571	*/
686	572	public static function preview_page_title( $title ) {
687		- return in_the_loop() ? self::preview_title( $title ) : $title;
	573	+ if ( in_the_loop() ) {
	574	+ $title = self::preview_title( $title );
	575	+ }
	576	+
	577	+ return $title;
688	578	}
689	579
690	580	/**
691	581	* Set the page title for the theme preview page.
		@@ -692,9 +582,8 @@
692	582	*
693	583	* @since 3.0
694	584	*
695	585	* @param string $title
696		- *
697	586	* @return string
698	587	*/
699	588	public static function preview_title( $title ) {
700	589	return __( 'Form Preview', 'formidable' );
		@@ -705,9 +594,8 @@
705	594	*
706	595	* @since 3.0
707	596	*
708	597	* @param string $content
709		- *
710	598	* @return string
711	599	*/
712	600	public static function preview_content( $content ) {
713	601	if ( in_the_loop() ) {
		@@ -722,39 +610,23 @@
722	610	/**
723	611	* @since 3.0
724	612	*/
725	613	private static function load_direct_preview() {
	614	+ header( 'Content-Type: text/html; charset=' . get_option( 'blog_charset' ) );
	615	+
	616	+ // print_emoji_styles is deprecated.
	617	+ remove_action( 'wp_print_styles', 'print_emoji_styles' );
	618	+
726	619	$key = FrmAppHelper::simple_get( 'form', 'sanitize_title' );
727		-
728		- // phpcs:ignore Universal.Operators.StrictComparisons
729	620	if ( $key == '' ) {
730	621	$key = FrmAppHelper::get_post_param( 'form', '', 'sanitize_title' );
731	622	}
732	623
733		- if ( ! $key ) {
734		- $error = __( 'Form key is missing', 'formidable' );
735		- wp_die(
736		- '<h1>' . esc_html( $error ) . '</h1>',
737		- '<p>' . esc_html( $error ) . '</p>',
738		- 404
739		- );
740		- }
741		-
742		- self::maybe_block_preview( $key );
743		-
744	624	$form = FrmForm::getAll( array( 'form_key' => $key ), '', 1 );
745		-
746		- if ( ! $form ) {
747		- $error = __( 'Form does not exist', 'formidable' );
748		- wp_die(
749		- '<h1>' . esc_html( $error ) . '</h1>',
750		- '<p>' . esc_html( $error ) . '</p>',
751		- 404
752		- );
	625	+ if ( empty( $form ) ) {
	626	+ $form = FrmForm::getAll( array(), '', 1 );
753	627	}
754	628
755		- header( 'Content-Type: text/html; charset=' . get_option( 'blog_charset' ) );
756		-
757	629	self::fix_deprecated_null_param_warning();
758	630
759	631	require FrmAppHelper::plugin_path() . '/classes/views/frm-entries/direct.php';
760	632	}
		@@ -759,33 +631,8 @@
759	631	require FrmAppHelper::plugin_path() . '/classes/views/frm-entries/direct.php';
760	632	}
761	633
762	634	/**
763		- * Block the form preview for the contact form by default if the user cannot view forms.
764		- * This is to prevent the contact form being exploited.
765		- * Since this form is added by default and every site uses the same key, it is too easy
766		- * to guess this form.
767		- *
768		- * @since 6.20
769		- *
770		- * @param string $form_key Form key.
771		- *
772		- * @return void
773		- */
774		- public static function maybe_block_preview( $form_key ) {
775		- if ( ! FrmFormsHelper::should_block_preview( $form_key ) ) {
776		- return;
777		- }
778		-
779		- $error = __( 'You do not have permission to view this form', 'formidable' );
780		- wp_die(
781		- '<h1>' . esc_html( $error ) . '</h1>',
782		- '<p>' . esc_html( $error ) . '</p>',
783		- 403
784		- );
785		- }
786		-
787		- /**
788	635	* Some themes have a null $src value.
789	636	* This function adds a filter to ensure that $src is not null.
790	637	* WP will call str_starts_with with the null value triggering a deprecated message otherwise.
791	638	*
		@@ -797,13 +644,15 @@
797	644	add_filter(
798	645	'script_loader_src',
799	646	/**
800	647	* @param string|null $src
801		- *
802	648	* @return string
803	649	*/
804	650	function ( $src ) {
805		- return is_null( $src ) ? '' : $src;
	651	+ if ( is_null( $src ) ) {
	652	+ $src = '';
	653	+ }
	654	+ return $src;
806	655	}
807	656	);
808	657	}
809	658
		@@ -812,9 +661,8 @@
812	661	}
813	662
814	663	/**
815	664	* @param array $ids
816		- *
817	665	* @return string
818	666	*/
819	667	public static function bulk_untrash( $ids ) {
820	668	FrmAppHelper::permission_check( 'frm_edit_forms' );
		@@ -826,9 +674,11 @@
826	674	return '';
827	675	}
828	676
829	677	/* translators: %1$s: Number of forms */
830		- return sprintf( _n( '%1$s form restored from the Trash.', '%1$s forms restored from the Trash.', $count, 'formidable' ), $count );
	678	+ $message = sprintf( _n( '%1$s form restored from the Trash.', '%1$s forms restored from the Trash.', $count, 'formidable' ), $count );
	679	+
	680	+ return $message;
831	681	}
832	682
833	683	/**
834	684	* @since 3.06
		@@ -873,9 +723,8 @@
873	723	// Check nonce url.
874	724	check_admin_referer( $status . '_form_' . $params['id'] );
875	725
876	726	$count = 0;
877		-
878	727	if ( FrmForm::set_status( $params['id'], $available_status[ $status ]['new_status'] ) ) {
879	728	++$count;
880	729	}
881	730
		@@ -889,9 +738,9 @@
889	738	/* translators: %1$s: Number of forms */
890	739	$available_status['untrash']['message'] = sprintf( _n( '%1$s form restored from the Trash.', '%1$s forms restored from the Trash.', $count, 'formidable' ), $count );
891	740
892	741	/* translators: %1$s: Number of forms, %2$s: Start link HTML, %3$s: End link HTML */
893		- $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
	742	+ $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>' );
894	743
895	744	$message = $available_status[ $status ]['message'];
896	745
897	746	self::display_forms_list( $params, $message );
		@@ -898,9 +747,8 @@
898	747	}
899	748
900	749	/**
901	750	* @param array $ids
902		- *
903	751	* @return string
904	752	*/
905	753	public static function bulk_trash( $ids ) {
906	754	FrmAppHelper::permission_check( 'frm_delete_forms' );
		@@ -905,9 +753,8 @@
905	753	public static function bulk_trash( $ids ) {
906	754	FrmAppHelper::permission_check( 'frm_delete_forms' );
907	755
908	756	$count = 0;
909		-
910	757	foreach ( $ids as $id ) {
911	758	if ( FrmForm::trash( $id ) ) {
912	759	++$count;
913	760	}
		@@ -912,12 +759,8 @@
912	759	++$count;
913	760	}
914	761	}
915	762
916		- if ( ! $count ) {
917		- return '';
918		- }
919		-
920	763	$current_page = FrmAppHelper::get_simple_request(
921	764	array(
922	765	'param' => 'form_type',
923	766	'type' => 'request',
		@@ -922,16 +765,17 @@
922	765	'param' => 'form_type',
923	766	'type' => 'request',
924	767	)
925	768	);
926		-
927		- return sprintf(
	769	+ $message = sprintf(
928	770	/* translators: %1$s: Number of forms, %2$s: Start link HTML, %3$s: End link HTML */
929	771	_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' ),
930	772	$count,
931		- '<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
	773	+ '<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' ) ) . '">',
932	774	'</a>'
933	775	);
	776	+
	777	+ return $message;
934	778	}
935	779
936	780	public static function destroy() {
937	781	FrmAppHelper::permission_check( 'frm_delete_forms' );
		@@ -941,9 +785,8 @@
941	785	// Check nonce url.
942	786	check_admin_referer( 'destroy_form_' . $params['id'] );
943	787
944	788	$count = 0;
945		-
946	789	if ( FrmForm::destroy( $params['id'] ) ) {
947	790	++$count;
948	791	}
949	792
		@@ -954,9 +797,8 @@
954	797	}
955	798
956	799	/**
957	800	* @param array $ids
958		- *
959	801	* @return string
960	802	*/
961	803	public static function bulk_destroy( $ids ) {
962	804	FrmAppHelper::permission_check( 'frm_delete_forms' );
		@@ -961,12 +803,10 @@
961	803	public static function bulk_destroy( $ids ) {
962	804	FrmAppHelper::permission_check( 'frm_delete_forms' );
963	805
964	806	$count = 0;
965		-
966	807	foreach ( $ids as $id ) {
967	808	$d = FrmForm::destroy( $id );
968		-
969	809	if ( $d ) {
970	810	++$count;
971	811	}
972	812	}
		@@ -984,18 +824,19 @@
984	824	*/
985	825	public static function delete_all() {
986	826	// Check nonce url.
987	827	$permission_error = FrmAppHelper::permission_nonce_error( 'frm_delete_forms', '_wpnonce', 'bulk-toplevel_page_formidable' );
988		-
989	828	if ( $permission_error !== false ) {
990	829	self::display_forms_list( array(), '', array( $permission_error ) );
	830	+
991	831	return;
992	832	}
993	833
994	834	$count = FrmForm::scheduled_delete( time() );
995	835	$url = remove_query_arg( array( 'delete_all' ) );
996		- $url .= '&message=forms_permanently_deleted&forms_deleted=' . $count;
997	836
	837	+ $url .= '&message=forms_permanently_deleted&forms_deleted=' . $count;
	838	+
998	839	wp_safe_redirect( $url );
999	840	die();
1000	841	}
1001	842
		@@ -1069,22 +910,21 @@
1069	910	*
1070	911	* @return void
1071	912	*/
1072	913	public static function insert_form_button() {
1073		- if ( ! current_user_can( 'frm_view_forms' ) ) {
1074		- return;
	914	+ if ( current_user_can( 'frm_view_forms' ) ) {
	915	+ // Store the result in memory and re-use it when this function is called multiple times.
	916	+ // This helps speed up the form builder when there are a lot of HTML fields, where this
	917	+ // button is inserted once per HTML field.
	918	+ // In a form with 66 HTML fields, this saves 0.5 seconds on page load time, tested locally.
	919	+ if ( ! isset( self::$formidable_tinymce_button ) ) {
	920	+ FrmAppHelper::load_admin_wide_js();
	921	+ $menu_name = FrmAppHelper::get_menu_name();
	922	+ $icon = apply_filters( 'frm_media_icon', FrmAppHelper::svg_logo() );
	923	+ 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>';
	924	+ }
	925	+ echo self::$formidable_tinymce_button; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
1075	926	}
1076		-
1077		- // Store the result in memory and re-use it when this function is called multiple times.
1078		- // This helps speed up the form builder when there are a lot of HTML fields, where this
1079		- // Button is inserted once per HTML field.
1080		- // In a form with 66 HTML fields, this saves 0.5 seconds on page load time, tested locally.
1081		- if ( ! isset( self::$formidable_tinymce_button ) ) {
1082		- FrmAppHelper::load_admin_wide_js();
1083		- $icon = apply_filters( 'frm_media_icon', FrmAppHelper::svg_logo() );
1084		- self::$formidable_tinymce_button = '<a href="#TB_inline?width=50&height=50&inlineId=frm_insert_form" class="thickbox button add_media frm_insert_form" title="' . esc_attr__( 'Add forms and content', 'formidable' ) . '">' . FrmAppHelper::kses( $icon, 'all' ) . ' ' . esc_html( FrmAppHelper::get_menu_name() ) . '</a>'; // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong
1085		- }
1086		- echo self::$formidable_tinymce_button; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
1087	927	}
1088	928
1089	929	/**
1090	930	* @return void
		@@ -1105,21 +945,17 @@
1105	945	$shortcodes = apply_filters( 'frm_popup_shortcodes', $shortcodes );
1106	946
1107	947	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/insert_form_popup.php';
1108	948
1109		- if ( ! FrmAppHelper::is_form_builder_page() || class_exists( '_WP_Editors', false ) ) {
1110		- return;
	949	+ if ( FrmAppHelper::is_form_builder_page() && ! class_exists( '_WP_Editors', false ) ) {
	950	+ // initialize a wysiwyg so we have usable settings defined in tinyMCEPreInit.mceInit
	951	+ require ABSPATH . WPINC . '/class-wp-editor.php';
	952	+ ?>
	953	+ <div class="frm_hidden">
	954	+ <?php wp_editor( '', 'frm_description_placeholder', array() ); ?>
	955	+ </div>
	956	+ <?php
1111	957	}
1112		-
1113		- // Initialize a wysiwyg so we have usable settings defined in tinyMCEPreInit.mceInit
1114		- require ABSPATH . WPINC . '/class-wp-editor.php';
1115		- // phpcs:disable Generic.WhiteSpace.ScopeIndent
1116		- ?>
1117		- <div class="frm_hidden">
1118		- <?php wp_editor( '', 'frm_description_placeholder', array() ); ?>
1119		- </div>
1120		- <?php
1121		- // phpcs:enable Generic.WhiteSpace.ScopeIndent
1122	958	}
1123	959
1124	960	/**
1125	961	* Check the page being loaded, determine if this is a page that should include the form popup.
		@@ -1131,9 +967,8 @@
1131	967	private static function should_insert_form_popup() {
1132	968	if ( FrmAppHelper::is_form_builder_page() ) {
1133	969	return true;
1134	970	}
1135		-
1136	971	$page = basename( FrmAppHelper::get_server_value( 'PHP_SELF' ) );
1137	972	return in_array( $page, array( 'post.php', 'page.php', 'page-new.php', 'post-new.php' ), true );
1138	973	}
1139	974
		@@ -1141,10 +976,9 @@
1141	976	FrmAppHelper::permission_check( 'frm_view_forms' );
1142	977	check_ajax_referer( 'frm_ajax', 'nonce' );
1143	978
1144	979	$shortcode = FrmAppHelper::get_post_param( 'shortcode', '', 'sanitize_text_field' );
1145		-
1146		- if ( ! $shortcode ) {
	980	+ if ( empty( $shortcode ) ) {
1147	981	wp_die();
1148	982	}
1149	983
1150	984	echo '<div id="sc-opts-' . esc_attr( $shortcode ) . '" class="frm_shortcode_option">';
		@@ -1169,13 +1003,12 @@
1169	1003	'label' => __( 'Minimize form HTML', 'formidable' ),
1170	1004	),
1171	1005	);
1172	1006	}
1173		-
1174	1007	$opts = apply_filters( 'frm_sc_popup_opts', $opts, $shortcode );
1175	1008
1176	1009	if ( isset( $opts['form_id'] ) && is_string( $opts['form_id'] ) ) {
1177		- // Allow other shortcodes to use the required form id option
	1010	+ // allow other shortcodes to use the required form id option
1178	1011	$form_id = $opts['form_id'];
1179	1012	unset( $opts['form_id'] );
1180	1013	}
1181	1014
		@@ -1191,9 +1024,8 @@
1191	1024	*
1192	1025	* @param array $params
1193	1026	* @param string $message
1194	1027	* @param array $errors
1195		- *
1196	1028	* @return void
1197	1029	*/
1198	1030	public static function display_forms_list( $params = array(), $message = '', $errors = array() ) {
1199	1031	FrmAppHelper::permission_check( 'frm_view_forms' );
		@@ -1210,56 +1042,35 @@
1210	1042	* @param string $table_class Class name for List Helper.
1211	1043	*/
1212	1044	$table_class = apply_filters( 'frm_forms_list_class', 'FrmFormsListHelper' );
1213	1045	$wp_list_table = new $table_class( compact( 'params' ) );
1214		- $pagenum = $wp_list_table->get_pagenum();
1215	1046
	1047	+ $pagenum = $wp_list_table->get_pagenum();
	1048	+
1216	1049	$wp_list_table->prepare_items();
1217	1050
1218	1051	$total_pages = $wp_list_table->get_pagination_arg( 'total_pages' );
1219		-
1220	1052	if ( $pagenum > $total_pages && $total_pages > 0 ) {
1221		- wp_safe_redirect( esc_url_raw( add_query_arg( 'paged', $total_pages ) ) );
	1053	+ wp_redirect( esc_url_raw( add_query_arg( 'paged', $total_pages ) ) );
1222	1054	die();
1223	1055	}
1224	1056
1225		- $error = FrmInbox::check_for_error();
1226		-
1227		- if ( $error ) {
1228		- $show_messages = array( $error['subject'] . '. ' . $error['message'] );
1229		- }
1230		-
1231	1057	require FrmAppHelper::plugin_path() . '/classes/views/frm-forms/list.php';
1232	1058	}
1233	1059
1234	1060	/**
1235	1061	* @param array<string,string> $columns
1236		- *
1237	1062	* @return array<string,string>
1238	1063	*/
1239	1064	public static function get_columns( $columns ) {
1240		- $columns['cb'] = '<input type="checkbox" />';
1241		- $columns['name'] = esc_html__( 'Form Title', 'formidable' );
1242		- $columns['entries'] = esc_html__( 'Entries', 'formidable' );
1243		- $columns['views'] = esc_html__( 'Views', 'formidable' );
1244		- $columns['id'] = 'ID';
1245		- $columns['form_key'] = esc_html__( 'Key', 'formidable' );
1246		-
1247		- if ( 'trash' !== FrmAppHelper::simple_get( 'form_type' ) && has_filter( 'frm_form_list_actions' ) ) {
1248		- // If there is any filters added, keep this column.
1249		- $columns['shortcode'] = esc_html__( 'Actions', 'formidable' );
1250		- }
1251		-
	1065	+ $columns['cb'] = '<input type="checkbox" />';
	1066	+ $columns['name'] = esc_html__( 'Form Title', 'formidable' );
	1067	+ $columns['entries'] = esc_html__( 'Entries', 'formidable' );
	1068	+ $columns['id'] = 'ID';
	1069	+ $columns['form_key'] = esc_html__( 'Key', 'formidable' );
	1070	+ $columns['shortcode'] = esc_html__( 'Actions', 'formidable' );
1252	1071	$columns['created_at'] = esc_html__( 'Date', 'formidable' );
1253	1072
1254		- if ( 'trash' !== FrmAppHelper::simple_get( 'form_type' ) ) {
1255		- $columns['embeds'] = esc_html__( 'Embeds', 'formidable' );
1256		- $columns['settings'] = '<div class="frm-forms-list-settings-btn-wrapper"><a href="#" class="frm-forms-list-settings-btn">';
1257		- $columns['settings'] .= FrmAppHelper::icon_by_class( 'frmfont frm_settings_icon', array( 'echo' => false ) );
1258		- $columns['settings'] .= '<span class="screen-reader-text">' . esc_html__( 'List settings', 'formidable' ) . '</span>';
1259		- $columns['settings'] .= '</a></div>';
1260		- }
1261		-
1262	1073	add_screen_option(
1263	1074	'per_page',
1264	1075	array(
1265	1076	'label' => __( 'Forms', 'formidable' ),
		@@ -1285,9 +1096,8 @@
1285	1096	}
1286	1097
1287	1098	/**
1288	1099	* @param mixed $hidden_columns
1289		- *
1290	1100	* @return array
1291	1101	*/
1292	1102	public static function hidden_columns( $hidden_columns ) {
1293	1103	if ( ! is_array( $hidden_columns ) ) {
		@@ -1308,18 +1118,11 @@
1308	1118
1309	1119	return $hidden_columns;
1310	1120	}
1311	1121
1312		- /**
1313		- * @param mixed $save
1314		- * @param string $option
1315		- * @param int|string $value
1316		- *
1317		- * @return mixed
1318		- */
1319	1122	public static function save_per_page( $save, $option, $value ) {
1320	1123	if ( $option === 'formidable_page_formidable_per_page' ) {
1321		- return (int) $value;
	1124	+ $save = (int) $value;
1322	1125	}
1323	1126
1324	1127	return $save;
1325	1128	}
		@@ -1328,9 +1131,8 @@
1328	1131	* @param int|string $id
1329	1132	* @param array $errors
1330	1133	* @param string $message
1331	1134	* @param bool $create_link
1332		- *
1333	1135	* @return void
1334	1136	*/
1335	1137	private static function get_edit_vars( $id, $errors = array(), $message = '', $create_link = false ) {
1336	1138	global $frm_vars;
		@@ -1345,9 +1147,8 @@
1345	1147	'page' => 'formidable',
1346	1148	)
1347	1149	),
1348	1150	);
1349		-
1350	1151	if ( ! $form ) {
1351	1152	FrmAppController::show_error_modal( $error_args );
1352	1153	return;
1353	1154	}
		@@ -1369,14 +1170,15 @@
1369	1170	}
1370	1171
1371	1172	if ( $form->parent_form_id ) {
1372	1173	/* translators: %1$s: Start link HTML, %2$s: End link HTML */
1373		- 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
	1174	+ 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>' ) );
1374	1175	}
1375	1176
1376	1177	$frm_field_selection = FrmField::field_selection();
1377		- $fields = FrmField::get_all_for_form( $form->id );
1378	1178
	1179	+ $fields = FrmField::get_all_for_form( $form->id );
	1180	+
1379	1181	// Automatically add end section fields if they don't exist (2.0 migration).
1380	1182	$reset_fields = false;
1381	1183	FrmFormsHelper::auto_add_end_section_fields( $form, $fields, $reset_fields );
1382	1184	FrmSubmitHelper::maybe_create_submit_field( $form, $fields, $reset_fields );
		@@ -1400,16 +1202,16 @@
1400	1202	*/
1401	1203	$values['fields'] = apply_filters( 'frm_fields_in_form_builder', $fields, compact( 'form' ) );
1402	1204
1403	1205	$edit_message = __( 'Form was successfully updated.', 'formidable' );
1404		-
1405		- if ( $form->is_template && $message === $edit_message ) {
	1206	+ if ( $form->is_template && $message == $edit_message ) {
1406	1207	$message = __( 'Template was successfully updated.', 'formidable' );
1407	1208	}
1408	1209
1409	1210	self::maybe_update_form_builder_message( $message );
1410	1211
1411		- $has_fields = ! empty( $values['fields'] ) && ! FrmSubmitHelper::only_contains_submit_field( $values['fields'] );
	1212	+ $all_templates = FrmForm::getAll( array( 'is_template' => 1 ), 'name' );
	1213	+ $has_fields = ! empty( $values['fields'] ) && ! FrmSubmitHelper::only_contains_submit_field( $values['fields'] );
1412	1214
1413	1215	if ( defined( 'DOING_AJAX' ) ) {
1414	1216	wp_die();
1415	1217	}
		@@ -1418,12 +1220,11 @@
1418	1220	}
1419	1221
1420	1222	/**
1421	1223	* @param array $fields
1422		- *
1423	1224	* @return array
1424	1225	*/
1425		- public static function update_form_builder_fields( $fields ) {
	1226	+ public static function update_form_builder_fields( $fields, $form ) {
1426	1227	foreach ( $fields as $field ) {
1427	1228	$field->do_not_include_icons = true;
1428	1229	}
1429	1230	return $fields;
		@@ -1428,13 +1229,8 @@
1428	1229	}
1429	1230	return $fields;
1430	1231	}
1431	1232
1432		- /**
1433		- * @param string $message
1434		- *
1435		- * @return void
1436		- */
1437	1233	public static function maybe_update_form_builder_message( &$message ) {
1438	1234	if ( 'form_duplicated' === FrmAppHelper::simple_get( 'message' ) ) {
1439	1235	$message = __( 'Form was Successfully Copied', 'formidable' );
1440	1236	}
		@@ -1443,9 +1239,8 @@
1443	1239	/**
1444	1240	* @param int|string $id
1445	1241	* @param array $errors
1446	1242	* @param array|string $args
1447		- *
1448	1243	* @return void
1449	1244	*/
1450	1245	public static function get_settings_vars( $id, $errors = array(), $args = array() ) {
1451	1246	FrmAppHelper::permission_check( 'frm_edit_forms' );
		@@ -1467,12 +1262,13 @@
1467	1262	);
1468	1263	$args = array_merge( $defaults, $args );
1469	1264	$message = $args['message'];
1470	1265	$warnings = $args['warnings'];
1471		- $form = FrmForm::getOne( $id );
1472		- $fields = FrmField::get_all_for_form( $id );
1473		- $values = FrmAppHelper::setup_edit_vars( $form, 'forms', $fields, true );
1474	1266
	1267	+ $form = FrmForm::getOne( $id );
	1268	+ $fields = FrmField::get_all_for_form( $id );
	1269	+ $values = FrmAppHelper::setup_edit_vars( $form, 'forms', $fields, true );
	1270	+
1475	1271	/**
1476	1272	* Allows changing fields in the form settings.
1477	1273	*
1478	1274	* @since 5.0.04
		@@ -1512,12 +1308,8 @@
1512	1308	}
1513	1309
1514	1310	/**
1515	1311	* @since 4.0
1516		- *
1517		- * @param array $atts
1518		- *
1519		- * @return void
1520	1312	*/
1521	1313	public static function form_publish_button( $atts ) {
1522	1314	$values = $atts['values'];
1523	1315	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/_publish_box.php';
		@@ -1528,9 +1320,8 @@
1528	1320	*
1529	1321	* @since 4.0
1530	1322	*
1531	1323	* @param array $values
1532		- *
1533	1324	* @return array
1534	1325	*/
1535	1326	private static function get_settings_tabs( $values ) {
1536	1327	$sections = array(
		@@ -1536,20 +1327,20 @@
1536	1327	$sections = array(
1537	1328	'advanced' => array(
1538	1329	'name' => __( 'General', 'formidable' ),
1539	1330	'title' => __( 'General Form Settings', 'formidable' ),
1540		- 'function' => array( self::class, 'advanced_settings' ),
1541		- 'icon' => 'frmfont frm_small_settings_icon',
	1331	+ 'function' => array( __CLASS__, 'advanced_settings' ),
	1332	+ 'icon' => 'frm_icon_font frm_settings_icon',
1542	1333	),
1543	1334	'email' => array(
1544	1335	'name' => __( 'Actions & Notifications', 'formidable' ),
1545	1336	'function' => array( 'FrmFormActionsController', 'email_settings' ),
1546	1337	'id' => 'frm_notification_settings',
1547		- 'icon' => 'frmfont frm_notification_check_icon',
	1338	+ 'icon' => 'frm_icon_font frm_mail_bulk_icon',
1548	1339	),
1549	1340	'permissions' => array(
1550	1341	'name' => __( 'Form Permissions', 'formidable' ),
1551		- 'icon' => 'frmfont frm_lock_closed2_icon',
	1342	+ 'icon' => 'frm_icon_font frm_lock_closed_icon',
1552	1343	'html_class' => 'frm_show_upgrade_tab frm_noallow',
1553	1344	'data' => array(
1554	1345	'medium' => 'permissions',
1555	1346	'upgrade' => __( 'Form Permissions', 'formidable' ),
		@@ -1554,37 +1345,35 @@
1554	1345	'medium' => 'permissions',
1555	1346	'upgrade' => __( 'Form Permissions', 'formidable' ),
1556	1347	'message' => __( 'Allow editing, protect forms and files, limit entries, and save drafts. Upgrade to get form and entry permissions.', 'formidable' ),
1557	1348	'screenshot' => 'permissions.png',
1558		- 'learn-more' => FrmAppHelper::get_doc_url( 'general-form-settings/#kb-form-permissions', 'form-permissions-settings' ),
1559	1349	),
1560	1350	),
1561	1351	'scheduling' => array(
1562	1352	'name' => __( 'Form Scheduling', 'formidable' ),
1563		- 'icon' => 'frmfont frm_schedule_icon',
	1353	+ 'icon' => 'frm_icon_font frm_calendar_icon',
1564	1354	'html_class' => 'frm_show_upgrade_tab frm_noallow',
1565	1355	'data' => array(
1566	1356	'medium' => 'scheduling',
1567	1357	'upgrade' => __( 'Form scheduling settings', 'formidable' ),
1568	1358	'screenshot' => 'scheduling.png',
1569		- 'learn-more' => FrmAppHelper::get_doc_url( 'general-form-settings/#kb-form-scheduling', 'form-scheduling-settings' ),
1570	1359	),
1571	1360	),
1572	1361	'buttons' => array(
1573	1362	'name' => __( 'Buttons', 'formidable' ),
1574		- 'class' => self::class,
	1363	+ 'class' => __CLASS__,
1575	1364	'function' => 'buttons_settings',
1576		- 'icon' => 'frmfont frm-buttons-style',
	1365	+ 'icon' => 'frm_icon_font frm_button_icon',
1577	1366	),
1578	1367	'landing' => array(
1579	1368	'name' => __( 'Form Landing Page', 'formidable' ),
1580		- 'icon' => 'frmfont frm_cross_device_icon',
	1369	+ 'icon' => 'frm_icon_font frm_file_text_icon',
1581	1370	'html_class' => 'frm_show_upgrade_tab frm_noallow',
1582	1371	'data' => FrmAppHelper::get_landing_page_upgrade_data_params(),
1583	1372	),
1584	1373	'chat' => array(
1585	1374	'name' => __( 'Conversational Forms', 'formidable' ),
1586		- 'icon' => 'frmfont frm_chat_bubbles_icon',
	1375	+ 'icon' => 'frm_icon_font frm_chat_forms_icon',
1587	1376	'html_class' => 'frm_show_upgrade_tab frm_noallow',
1588	1377	'data' => FrmAppHelper::get_upgrade_data_params(
1589	1378	'chat',
1590	1379	array(
		@@ -1590,15 +1379,14 @@
1590	1379	array(
1591	1380	'upgrade' => __( 'Conversational Forms', 'formidable' ),
1592	1381	'message' => __( 'Ask one question at a time for automated conversations.', 'formidable' ),
1593	1382	'screenshot' => 'chat.png',
1594		- 'learn-more' => FrmAppHelper::get_doc_url( 'conversational-forms', 'conversational-forms-settings', false ),
1595	1383	)
1596	1384	),
1597	1385	),
1598	1386	'abandonment' => array(
1599	1387	'name' => __( 'Form Abandonment', 'formidable' ),
1600		- 'icon' => 'frmfont frm_abandoned_icon',
	1388	+ 'icon' => 'frm_icon_font frm_abandoned_icon',
1601	1389	'html_class' => 'frm_show_upgrade_tab frm_noallow',
1602	1390	'data' => FrmAppHelper::get_upgrade_data_params(
1603	1391	'abandonment',
1604	1392	array(
		@@ -1604,22 +1392,23 @@
1604	1392	array(
1605	1393	'upgrade' => __( 'Form abandonment settings', 'formidable' ),
1606	1394	'message' => __( 'Unlock the power of data capture to boost lead generation and master the art of form optimization.', 'formidable' ),
1607	1395	'screenshot' => 'abandonment.png',
1608		- 'learn-more' => FrmAppHelper::get_doc_url( 'features/form-abandonment-wordpress-plugin', 'form-abandonment-settings', false ),
1609	1396	)
1610	1397	),
1611	1398	),
1612	1399	'html' => array(
1613	1400	'name' => __( 'Customize HTML', 'formidable' ),
1614		- 'class' => self::class,
	1401	+ 'class' => __CLASS__,
1615	1402	'function' => 'html_settings',
1616		- 'icon' => 'frmfont frm_code2_icon',
	1403	+ 'icon' => 'frm_icon_font frm_code_icon',
1617	1404	),
1618	1405	);
1619	1406
1620		- if ( ! has_action( 'frm_add_form_style_tab_options' ) && ! has_action( 'frm_add_form_button_options' ) ) {
1621		- unset( $sections['buttons'] );
	1407	+ foreach ( array( 'landing', 'chat', 'abandonment' ) as $feature ) {
	1408	+ if ( ! FrmAppHelper::show_new_feature( $feature ) ) {
	1409	+ unset( $sections[ $feature ] );
	1410	+ }
1622	1411	}
1623	1412
1624	1413	$sections = apply_filters( 'frm_add_form_settings_section', $sections, $values );
1625	1414
		@@ -1626,9 +1415,9 @@
1626	1415	foreach ( $sections as $key => $section ) {
1627	1416	$defaults = array(
1628	1417	'html_class' => '',
1629	1418	'name' => ucfirst( $key ),
1630		- 'icon' => 'frmfont frm_settings_icon',
	1419	+ 'icon' => 'frm_icon_font frm_settings_icon',
1631	1420	);
1632	1421
1633	1422	$section = array_merge( $defaults, $section );
1634	1423
		@@ -1634,9 +1423,8 @@
1634	1423
1635	1424	if ( ! isset( $section['anchor'] ) ) {
1636	1425	$section['anchor'] = $key;
1637	1426	}
1638		-
1639	1427	$section['anchor'] .= '_settings';
1640	1428
1641	1429	if ( ! isset( $section['title'] ) ) {
1642	1430	$section['title'] = $section['name'];
		@@ -1655,19 +1443,18 @@
1655	1443	/**
1656	1444	* @since 4.0
1657	1445	*
1658	1446	* @param array $values
1659		- *
1660	1447	* @return void
1661	1448	*/
1662	1449	public static function advanced_settings( $values ) {
1663	1450	$first_h3 = 'frm_first_h3';
	1451	+
1664	1452	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings-advanced.php';
1665	1453	}
1666	1454
1667	1455	/**
1668	1456	* @param array $values
1669		- *
1670	1457	* @return void
1671	1458	*/
1672	1459	public static function render_spam_settings( $values ) {
1673	1460	if ( function_exists( 'akismet_http_post' ) ) {
		@@ -1672,9 +1459,9 @@
1672	1459	public static function render_spam_settings( $values ) {
1673	1460	if ( function_exists( 'akismet_http_post' ) ) {
1674	1461	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/spam-settings/akismet.php';
1675	1462	}
1676		- include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/spam-settings/stopforumspam.php';
	1463	+ include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/spam-settings/honeypot.php';
1677	1464	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/spam-settings/antispam.php';
1678	1465	}
1679	1466
1680	1467	/**
		@@ -1680,9 +1467,8 @@
1680	1467	/**
1681	1468	* @since 4.0
1682	1469	*
1683	1470	* @param array $values
1684		- *
1685	1471	* @return void
1686	1472	*/
1687	1473	public static function buttons_settings( $values ) {
1688	1474	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings-buttons.php';
		@@ -1691,9 +1477,8 @@
1691	1477	/**
1692	1478	* @since 4.0
1693	1479	*
1694	1480	* @param array $values
1695		- *
1696	1481	* @return void
1697	1482	*/
1698	1483	public static function html_settings( $values ) {
1699	1484	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings-html.php';
		@@ -1704,9 +1489,8 @@
1704	1489	*
1705	1490	* @since 2.03.08
1706	1491	*
1707	1492	* @param array|bool $values
1708		- *
1709	1493	* @return void
1710	1494	*/
1711	1495	private static function clean_submit_html( &$values ) {
1712	1496	if ( is_array( $values ) && isset( $values['submit_html'] ) ) {
		@@ -1729,17 +1513,13 @@
1729	1513	return $classes;
1730	1514	}
1731	1515
1732	1516	/**
1733		- * @since 6.27 Added $template_path parameter.
1734		- *
1735	1517	* @param int|string $form_id
1736	1518	* @param string $class
1737		- * @param string $template_path The path to a template file to use instead of the default.
1738		- *
1739	1519	* @return void
1740	1520	*/
1741		- public static function mb_tags_box( $form_id, $class = '', $template_path = 'default' ) {
	1521	+ public static function mb_tags_box( $form_id, $class = '' ) {
1742	1522	$fields = FrmField::get_all_for_form( $form_id, '', 'include' );
1743	1523
1744	1524	/**
1745	1525	* Allows modifying the list of fields in the tags box.
		@@ -1748,30 +1528,23 @@
1748	1528	*
1749	1529	* @param array $fields The list of fields.
1750	1530	* @param array $args The arguments. Contains `form_id`.
1751	1531	*/
1752		- $fields = apply_filters( 'frm_fields_in_tags_box', $fields, compact( 'form_id' ) );
1753		- $linked_forms = array();
1754		- $col = 'one';
1755		- $settings_tab = FrmAppHelper::is_admin_page( 'formidable' );
	1532	+ $fields = apply_filters( 'frm_fields_in_tags_box', $fields, compact( 'form_id' ) );
	1533	+ $linked_forms = array();
	1534	+ $col = 'one';
	1535	+ $settings_tab = FrmAppHelper::is_admin_page( 'formidable' );
	1536	+
1756	1537	$cond_shortcodes = apply_filters( 'frm_conditional_shortcodes', array() );
1757	1538	$entry_shortcodes = self::get_shortcode_helpers( $settings_tab );
	1539	+
1758	1540	$advanced_helpers = self::advanced_helpers( compact( 'fields', 'form_id' ) );
1759	1541
1760		- if ( 'default' === $template_path || ! file_exists( $template_path ) ) {
1761		- include FrmAppHelper::plugin_path() . '/classes/views/shared/mb_adv_info.php';
1762		- return;
1763		- }
1764		-
1765		- include $template_path;
	1542	+ include FrmAppHelper::plugin_path() . '/classes/views/shared/mb_adv_info.php';
1766	1543	}
1767	1544
1768	1545	/**
1769	1546	* @since 3.04.01
1770		- *
1771		- * @param array $atts
1772		- *
1773		- * @return array
1774	1547	*/
1775	1548	private static function advanced_helpers( $atts ) {
1776	1549	$advanced_helpers = array(
1777	1550	'default' => array(
		@@ -1780,12 +1553,10 @@
1780	1553	),
1781	1554	);
1782	1555
1783	1556	$user_fields = self::user_shortcodes();
1784		-
1785	1557	if ( $user_fields ) {
1786	1558	$user_helpers = array();
1787		-
1788	1559	foreach ( $user_fields as $uk => $uf ) {
1789	1560	$user_helpers[ '|user_id| show="' . $uk . '"' ] = $uf;
1790	1561	unset( $uk, $uf );
1791	1562	}
		@@ -1810,10 +1581,8 @@
1810	1581	* Get an array of the options to display in the advanced tab
1811	1582	* of the customization panel
1812	1583	*
1813	1584	* @since 2.0.6
1814		- *
1815		- * @return array
1816	1585	*/
1817	1586	private static function get_advanced_shortcodes() {
1818	1587	$adv_shortcodes = array(
1819	1588	'x sep=", "' => array(
		@@ -1830,18 +1599,17 @@
1830	1599	'label' => __( 'No Auto P', 'formidable' ),
1831	1600	'title' => __( 'Do not automatically add any paragraphs or line breaks', 'formidable' ),
1832	1601	),
1833	1602	);
	1603	+ $adv_shortcodes = apply_filters( 'frm_advanced_shortcodes', $adv_shortcodes );
1834	1604
1835	1605	// __( 'Leave blank instead of defaulting to User Login', 'formidable' ) : blank=1
1836	1606
1837		- return apply_filters( 'frm_advanced_shortcodes', $adv_shortcodes );
	1607	+ return $adv_shortcodes;
1838	1608	}
1839	1609
1840	1610	/**
1841	1611	* @since 3.04.01
1842		- *
1843		- * @return array
1844	1612	*/
1845	1613	private static function user_shortcodes() {
1846	1614	$options = array(
1847	1615	'ID' => __( 'User ID', 'formidable' ),
		@@ -1860,12 +1628,8 @@
1860	1628	/**
1861	1629	* Get an array of the helper shortcodes to display in the customization panel
1862	1630	*
1863	1631	* @since 2.0.6
1864		- *
1865		- * @param bool $settings_tab
1866		- *
1867		- * @return array
1868	1632	*/
1869	1633	private static function get_shortcode_helpers( $settings_tab ) {
1870	1634	$entry_shortcodes = array(
1871	1635	'id' => __( 'Entry ID', 'formidable' ),
		@@ -1876,27 +1640,30 @@
1876	1640	'updated-at' => __( 'Entry updated', 'formidable' ),
1877	1641	'' => '',
1878	1642	'siteurl' => __( 'Site URL', 'formidable' ),
1879	1643	'sitename' => __( 'Site Name', 'formidable' ),
1880		- 'form_name' => __( 'Form Name', 'formidable' ),
1881	1644	);
1882	1645
1883		- $entry_shortcodes = array_merge( FrmShortcodeHelper::get_contextual_shortcode_values(), $entry_shortcodes );
1884		-
1885	1646	if ( ! FrmAppHelper::pro_is_installed() ) {
1886	1647	unset( $entry_shortcodes['post_id'] );
1887	1648	}
1888	1649
	1650	+ if ( $settings_tab ) {
	1651	+ $entry_shortcodes['default-message'] = __( 'Default Msg', 'formidable' );
	1652	+ $entry_shortcodes['default-html'] = __( 'Default HTML', 'formidable' );
	1653	+ $entry_shortcodes['default-plain'] = __( 'Default Plain', 'formidable' );
	1654	+ $entry_shortcodes['form_name'] = __( 'Form Name', 'formidable' );
	1655	+ }
	1656	+
1889	1657	/**
1890	1658	* Use this hook to add or remove buttons in the helpers section
1891	1659	* in the customization panel
1892	1660	*
1893	1661	* @since 2.0.6
1894		- *
1895		- * @param array $entry_shortcodes
1896		- * @param bool $settings_tab
1897	1662	*/
1898		- return apply_filters( 'frm_helper_shortcodes', $entry_shortcodes, $settings_tab );
	1663	+ $entry_shortcodes = apply_filters( 'frm_helper_shortcodes', $entry_shortcodes, $settings_tab );
	1664	+
	1665	+ return $entry_shortcodes;
1899	1666	}
1900	1667
1901	1668	/**
1902	1669	* Insert the form class setting into the form.
		@@ -1901,9 +1668,8 @@
1901	1668	/**
1902	1669	* Insert the form class setting into the form.
1903	1670	*
1904	1671	* @param stdClass $form
1905		- *
1906	1672	* @return void
1907	1673	*/
1908	1674	public static function form_classes( $form ) {
1909	1675	if ( isset( $form->options['form_class'] ) ) {
		@@ -1914,9 +1680,9 @@
1914	1680	echo ' frm_js_validate ';
1915	1681	self::add_js_validate_form_to_global_vars( $form );
1916	1682	}
1917	1683
1918		- if ( FrmForm::is_ajax_on( $form ) ) {
	1684	+ if ( ! FrmFormsHelper::should_use_pro_for_ajax_submit() && FrmForm::is_ajax_on( $form ) ) {
1919	1685	echo ' frm_ajax_submit ';
1920	1686	}
1921	1687	}
1922	1688
		@@ -1926,9 +1692,8 @@
1926	1692	* @param stdClass $form
1927	1693	*/
1928	1694	public static function add_js_validate_form_to_global_vars( $form ) {
1929	1695	global $frm_vars;
1930		-
1931	1696	if ( ! isset( $frm_vars['js_validate_forms'] ) ) {
1932	1697	$frm_vars['js_validate_forms'] = array();
1933	1698	}
1934	1699	$frm_vars['js_validate_forms'][ $form->id ] = $form;
		@@ -1951,9 +1716,8 @@
1951	1716	/**
1952	1717	* @param string $content
1953	1718	* @param int|stdClass|string $form
1954	1719	* @param false|int|stdClass|string $entry
1955		- *
1956	1720	* @return string
1957	1721	*/
1958	1722	public static function filter_content( $content, $form, $entry = false ) {
1959	1723	$content = self::replace_form_name_shortcodes( $content, $form );
		@@ -1958,9 +1722,8 @@
1958	1722	public static function filter_content( $content, $form, $entry = false ) {
1959	1723	$content = self::replace_form_name_shortcodes( $content, $form );
1960	1724
1961	1725	self::get_entry_by_param( $entry );
1962		-
1963	1726	if ( ! $entry ) {
1964	1727	return $content;
1965	1728	}
1966	1729
		@@ -1976,10 +1739,11 @@
1976	1739	$form = $entry->parent_entry->form_id;
1977	1740	}
1978	1741
1979	1742	$shortcodes = FrmFieldsHelper::get_shortcodes( $content, $form );
	1743	+ $content = apply_filters( 'frm_replace_content_shortcodes', $content, $entry, $shortcodes );
1980	1744
1981		- return apply_filters( 'frm_replace_content_shortcodes', $content, $entry, $shortcodes );
	1745	+ return $content;
1982	1746	}
1983	1747
1984	1748	/**
1985	1749	* Replace any [form_name] shortcodes in a string.
		@@ -1987,9 +1751,8 @@
1987	1751	* @since 5.5
1988	1752	*
1989	1753	* @param array|string $string
1990	1754	* @param int|stdClass|string $form
1991		- *
1992	1755	* @return array|string
1993	1756	*/
1994	1757	public static function replace_form_name_shortcodes( $string, $form ) {
1995	1758	if ( ! is_string( $string ) ) {
		@@ -1995,9 +1758,9 @@
1995	1758	if ( ! is_string( $string ) ) {
1996	1759	return $string;
1997	1760	}
1998	1761
1999		- if ( ! str_contains( $string, '[form_name]' ) ) {
	1762	+ if ( false === strpos( $string, '[form_name]' ) ) {
2000	1763	return $string;
2001	1764	}
2002	1765
2003	1766	if ( ! is_object( $form ) ) {
		@@ -2009,30 +1772,20 @@
2009	1772	}
2010	1773
2011	1774	/**
2012	1775	* @param false|int|stdClass|string $entry
2013		- *
2014	1776	* @return void
2015	1777	*/
2016	1778	private static function get_entry_by_param( &$entry ) {
2017		- if ( $entry && is_object( $entry ) ) {
2018		- return;
2019		- }
	1779	+ if ( ! $entry || ! is_object( $entry ) ) {
	1780	+ if ( ! $entry || ! is_numeric( $entry ) ) {
	1781	+ $entry = FrmAppHelper::get_post_param( 'id', false, 'sanitize_title' );
	1782	+ }
2020	1783
2021		- if ( ! $entry || ! is_numeric( $entry ) ) {
2022		- $entry = FrmAppHelper::get_post_param( 'id', false, 'sanitize_title' );
	1784	+ FrmEntry::maybe_get_entry( $entry );
2023	1785	}
2024		-
2025		- FrmEntry::maybe_get_entry( $entry );
2026	1786	}
2027	1787
2028		- /**
2029		- * @param string $content
2030		- * @param false|object $entry
2031		- * @param array $shortcodes
2032		- *
2033		- * @return string
2034		- */
2035	1788	public static function replace_content_shortcodes( $content, $entry, $shortcodes ) {
2036	1789	return FrmFieldsHelper::replace_content_shortcodes( $content, $entry, $shortcodes );
2037	1790	}
2038	1791
		@@ -2037,9 +1790,8 @@
2037	1790	}
2038	1791
2039	1792	/**
2040	1793	* @param array $errors
2041		- *
2042	1794	* @return array
2043	1795	*/
2044	1796	public static function process_bulk_form_actions( $errors ) {
2045	1797	if ( ! $_REQUEST ) {
		@@ -2046,30 +1798,29 @@
2046	1798	return $errors;
2047	1799	}
2048	1800
2049	1801	$bulkaction = FrmAppHelper::get_param( 'action', '', 'get', 'sanitize_text_field' );
2050		-
2051		- // phpcs:ignore Universal.Operators.StrictComparisons
2052	1802	if ( $bulkaction == - 1 ) {
2053	1803	$bulkaction = FrmAppHelper::get_param( 'action2', '', 'get', 'sanitize_title' );
2054	1804	}
2055	1805
2056		- if ( $bulkaction && str_starts_with( $bulkaction, 'bulk_' ) ) {
	1806	+ if ( ! empty( $bulkaction ) && strpos( $bulkaction, 'bulk_' ) === 0 ) {
2057	1807	FrmAppHelper::remove_get_action();
	1808	+
2058	1809	$bulkaction = str_replace( 'bulk_', '', $bulkaction );
2059	1810	}
2060	1811
2061	1812	$ids = FrmAppHelper::get_param( 'item-action', '', 'get', 'sanitize_text_field' );
	1813	+ if ( empty( $ids ) ) {
	1814	+ $errors[] = __( 'No forms were specified', 'formidable' );
2062	1815
2063		- if ( ! $ids ) {
2064		- $errors[] = __( 'No forms were specified', 'formidable' );
2065	1816	return $errors;
2066	1817	}
2067	1818
2068	1819	$permission_error = FrmAppHelper::permission_nonce_error( '', '_wpnonce', 'bulk-toplevel_page_formidable' );
2069		-
2070	1820	if ( $permission_error !== false ) {
2071	1821	$errors[] = $permission_error;
	1822	+
2072	1823	return $errors;
2073	1824	}
2074	1825
2075	1826	if ( ! is_array( $ids ) ) {
		@@ -2093,24 +1844,9 @@
2093	1844
2094	1845	return $errors;
2095	1846	}
2096	1847
2097		- /**
2098		- * Includes html that shows a message when the device is too small to use Formidable Forms admin pages.
2099		- *
2100		- * @since 6.20
2101		- *
2102		- * @return void
2103		- */
2104		- public static function include_device_too_small_message() {
2105		- if ( ! FrmAppHelper::is_formidable_admin() ) {
2106		- return;
2107		- }
2108		-
2109		- include FrmAppHelper::plugin_path() . '/classes/views/shared/small-device-message.php';
2110		- }
2111		-
2112		- public static function route() { // phpcs:ignore Generic.Metrics.CyclomaticComplexity.MaxExceeded
	1848	+ public static function route() {
2113	1849	$action = isset( $_REQUEST['frm_action'] ) ? 'frm_action' : 'action';
2114	1850	$vars = array();
2115	1851	FrmAppHelper::include_svg();
2116	1852
		@@ -2120,28 +1856,25 @@
2120	1856	// Javascript needs to be allowed in some field settings.
2121	1857	// phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized, WordPress.Security.NonceVerification.Missing
2122	1858	$json_vars = htmlspecialchars_decode( nl2br( str_replace( '&quot;', '"', wp_unslash( $_POST['frm_compact_fields'] ) ) ) );
2123	1859	$json_vars = json_decode( $json_vars, true );
	1860	+ if ( empty( $json_vars ) ) {
	1861	+ // json decoding failed so we should return an error message.
	1862	+ $action = FrmAppHelper::get_param( $action, '', 'get', 'sanitize_title' );
	1863	+ if ( 'edit' === $action ) {
	1864	+ $action = 'update';
	1865	+ }
2124	1866
2125		- if ( $json_vars ) {
	1867	+ add_filter( 'frm_validate_form', 'FrmFormsController::json_error' );
	1868	+ } else {
2126	1869	$vars = FrmAppHelper::json_to_array( $json_vars );
2127	1870	$action = $vars[ $action ];
2128	1871	unset( $_REQUEST['frm_compact_fields'], $_POST['frm_compact_fields'] ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
2129	1872	$_REQUEST = array_merge( $_REQUEST, $vars ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
2130	1873	$_POST = array_merge( $_POST, $_REQUEST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
2131		- } else {
2132		- // Json decoding failed so we should return an error message.
2133		- $action = FrmAppHelper::get_param( $action, '', 'get', 'sanitize_title' );
2134		-
2135		- if ( 'edit' === $action ) {
2136		- $action = 'update';
2137		- }
2138		-
2139		- add_filter( 'frm_validate_form', 'FrmFormsController::json_error' );
2140	1874	}
2141	1875	} else {
2142	1876	$action = FrmAppHelper::get_param( $action, '', 'get', 'sanitize_title' );
2143		-
2144	1877	if ( isset( $_REQUEST['delete_all'] ) ) {
2145	1878	// Override the action for this page.
2146	1879	$action = 'delete_all';
2147	1880	}
		@@ -2161,38 +1894,34 @@
2161	1894	case 'update_settings':
2162	1895	return self::$action( $vars );
2163	1896	case 'lite-reports':
2164	1897	self::no_reports( $vars );
2165		- return null;
	1898	+ return;
2166	1899	case 'views':
2167	1900	self::no_views( $vars );
2168		- return null;
	1901	+ return;
2169	1902	default:
2170	1903	do_action( 'frm_form_action_' . $action );
2171		-
2172	1904	if ( apply_filters( 'frm_form_stop_action_' . $action, false ) ) {
2173		- return null;
	1905	+ return;
2174	1906	}
2175	1907
2176	1908	$action = FrmAppHelper::get_param( 'action', '', 'get', 'sanitize_text_field' );
2177		-
2178		- // phpcs:ignore Universal.Operators.StrictComparisons
2179	1909	if ( $action == - 1 ) {
2180	1910	$action = FrmAppHelper::get_param( 'action2', '', 'get', 'sanitize_title' );
2181	1911	}
2182	1912
2183		- if ( str_starts_with( $action, 'bulk_' ) ) {
	1913	+ if ( strpos( $action, 'bulk_' ) === 0 ) {
2184	1914	FrmAppHelper::remove_get_action();
2185	1915
2186	1916	self::list_form();
2187		- return null;
	1917	+ return;
2188	1918	}
2189	1919
2190	1920	$message = FrmAppHelper::get_param( 'message' );
2191		-
2192	1921	if ( 'form_duplicate_error' === $message ) {
2193	1922	self::display_forms_list( array(), '', array( __( 'There was a problem duplicating the form', 'formidable' ) ) );
2194		- return null;
	1923	+ return;
2195	1924	}
2196	1925
2197	1926	if ( 'forms_permanently_deleted' === $message ) {
2198	1927	$count = FrmAppHelper::get_param( 'forms_deleted', 0, 'get', 'absint' );
		@@ -2198,14 +1927,14 @@
2198	1927	$count = FrmAppHelper::get_param( 'forms_deleted', 0, 'get', 'absint' );
2199	1928	/* translators: %1$s: Number of forms */
2200	1929	$message = sprintf( _n( '%1$s form permanently deleted.', '%1$s forms permanently deleted.', $count, 'formidable' ), $count );
2201	1930	self::display_forms_list( array(), $message, '' );
2202		- return null;
	1931	+ return;
2203	1932	}
2204	1933
2205	1934	self::display_forms_list();
2206	1935
2207		- return null;
	1936	+ return;
2208	1937	}//end switch
2209	1938	}
2210	1939
2211	1940	/**
		@@ -2224,45 +1953,30 @@
2224	1953
2225	1954	// Get posted data
2226	1955	$form_id = FrmAppHelper::get_post_param( 'form_id', '', 'absint' );
2227	1956	$name = FrmAppHelper::get_post_param( 'form_name', '', 'sanitize_text_field' );
2228		- $form = FrmForm::getOne( $form_id );
2229	1957
2230		- if ( ! $form ) {
2231		- wp_send_json_error( __( 'Form not found', 'formidable' ) );
2232		- }
	1958	+ // Update the form name and form key.
	1959	+ $form_key = FrmAppHelper::get_unique_key( sanitize_title( $name ), 'frm_forms', 'form_key' );
	1960	+ FrmForm::update( $form_id, compact( 'name', 'form_key' ) );
2233	1961
2234		- if ( $name === $form->name ) {
2235		- // Nothing to change so exit early.
2236		- $form_key = $form->form_key;
2237		- wp_send_json_success( compact( 'form_key' ) );
2238		- }
	1962	+ wp_send_json_success( compact( 'form_key' ) );
	1963	+ }
2239	1964
2240		- $to_update = array(
2241		- 'name' => $name,
2242		- );
	1965	+ public static function json_error( $errors ) {
	1966	+ $errors['json'] = __( 'Abnormal HTML characters prevented your form from saving correctly', 'formidable' );
2243	1967
2244		- if ( '' === $name ) {
2245		- $form_key = $form->form_key;
2246		- } else {
2247		- // Only update form_key if name is not empty.
2248		- $form_key = FrmAppHelper::get_unique_key( sanitize_title( $name ), 'frm_forms', 'form_key' );
2249		- $to_update['form_key'] = $form_key;
2250		- }
2251		-
2252		- FrmForm::update( $form_id, $to_update );
2253		-
2254		- wp_send_json_success( compact( 'form_key' ) );
	1968	+ return $errors;
2255	1969	}
2256	1970
2257	1971	/**
2258		- * @param array $errors
	1972	+ * Education for premium features.
2259	1973	*
2260		- * @return array
	1974	+ * @since 4.05
	1975	+ * @return void
2261	1976	*/
2262		- public static function json_error( $errors ) {
2263		- $errors['json'] = __( 'Abnormal HTML characters prevented your form from saving correctly', 'formidable' );
2264		- return $errors;
	1977	+ public static function add_form_style_tab_options() {
	1978	+ include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/add_form_style_options.php';
2265	1979	}
2266	1980
2267	1981	/**
2268	1982	* Add education about views.
		@@ -2268,10 +1982,8 @@
2268	1982	* Add education about views.
2269	1983	*
2270	1984	* @since 4.07
2271	1985	*
2272		- * @param array $values
2273		- *
2274	1986	* @return void
2275	1987	*/
2276	1988	public static function no_views( $values = array() ) {
2277	1989	FrmAppHelper::include_svg();
		@@ -2285,10 +1997,8 @@
2285	1997	* Add education about reports.
2286	1998	*
2287	1999	* @since 4.07
2288	2000	*
2289		- * @param array $values
2290		- *
2291	2001	* @return void
2292	2002	*/
2293	2003	public static function no_reports( $values = array() ) {
2294	2004	$id = FrmAppHelper::get_param( 'form', '', 'get', 'absint' );
		@@ -2314,9 +2024,10 @@
2314	2024	/**
2315	2025	* @since 4.05.02
2316	2026	*/
2317	2027	private static function move_menu_to_footer() {
2318		- if ( empty( FrmAppHelper::get_settings()->admin_bar ) ) {
	2028	+ $settings = FrmAppHelper::get_settings();
	2029	+ if ( empty( $settings->admin_bar ) ) {
2319	2030	remove_action( 'wp_body_open', 'wp_admin_bar_render', 0 );
2320	2031	}
2321	2032	}
2322	2033
		@@ -2321,15 +2032,13 @@
2321	2032	}
2322	2033
2323	2034	public static function admin_bar_configure() {
2324	2035	global $frm_vars;
2325		-
2326	2036	if ( empty( $frm_vars['forms_loaded'] ) ) {
2327	2037	return;
2328	2038	}
2329	2039
2330	2040	$actions = array();
2331		-
2332	2041	foreach ( $frm_vars['forms_loaded'] as $form ) {
2333	2042	if ( is_object( $form ) ) {
2334	2043	$actions[ $form->id ] = $form->name;
2335	2044	}
		@@ -2335,9 +2044,9 @@
2335	2044	}
2336	2045	unset( $form );
2337	2046	}
2338	2047
2339		- if ( ! $actions ) {
	2048	+ if ( empty( $actions ) ) {
2340	2049	return;
2341	2050	}
2342	2051
2343	2052	self::add_menu_to_admin_bar();
		@@ -2363,12 +2072,8 @@
2363	2072	}
2364	2073
2365	2074	/**
2366	2075	* @since 2.05.07
2367		- *
2368		- * @param array $actions
2369		- *
2370		- * @return void
2371	2076	*/
2372	2077	private static function add_forms_to_admin_bar( $actions ) {
2373	2078	global $wp_admin_bar;
2374	2079
		@@ -2374,13 +2079,14 @@
2374	2079
2375	2080	asort( $actions );
2376	2081
2377	2082	foreach ( $actions as $form_id => $name ) {
	2083	+
2378	2084	$wp_admin_bar->add_node(
2379	2085	array(
2380	2086	'parent' => 'frm-forms',
2381	2087	'id' => 'edit_form_' . $form_id,
2382		- 'title' => $name ? $name : FrmFormsHelper::get_no_title_text(),
	2088	+ 'title' => empty( $name ) ? __( '(no title)', 'formidable' ) : $name,
2383	2089	'href' => FrmForm::get_edit_link( $form_id ),
2384	2090	)
2385	2091	);
2386	2092	}
		@@ -2389,14 +2095,12 @@
2389	2095	/**
2390	2096	* The formidable shortcode
2391	2097	*
2392	2098	* @param array $atts The params from the shortcode.
2393		- *
2394	2099	* @return string
2395	2100	*/
2396	2101	public static function get_form_shortcode( $atts ) {
2397	2102	global $frm_vars;
2398		-
2399	2103	if ( ! empty( $frm_vars['skip_shortcode'] ) ) {
2400	2104	$sc = '[formidable';
2401	2105	$sc .= FrmAppHelper::array_to_html_params( $atts );
2402	2106	return $sc . ']';
		@@ -2425,9 +2129,8 @@
2425	2129	* @since 5.2.01
2426	2130	*
2427	2131	* @param false|int|string $id
2428	2132	* @param false|string $key
2429		- *
2430	2133	* @return false|stdClass
2431	2134	*/
2432	2135	private static function maybe_get_form_by_id_or_key( $id, $key ) {
2433	2136	if ( ! $id ) {
		@@ -2441,9 +2144,8 @@
2441	2144	* @param false|string $key
2442	2145	* @param bool|int|string $title may be 'auto', true, false, 'true', 'false', 'yes', '1', 1, '0', 0.
2443	2146	* @param bool|int|string $description may be 'auto', true, false, 'true', 'false', 'yes', '1', 1, '0', 0.
2444	2147	* @param array $atts
2445		- *
2446	2148	* @return string
2447	2149	*/
2448	2150	public static function show_form( $id = '', $key = '', $title = false, $description = false, $atts = array() ) {
2449	2151	$form = self::maybe_get_form_by_id_or_key( $id, $key );
		@@ -2464,13 +2166,14 @@
2464	2166
2465	2167	add_action( 'frm_load_form_hooks', 'FrmHooksController::trigger_load_form_hooks' );
2466	2168	FrmAppHelper::trigger_hook_load( 'form', $form );
2467	2169
2468		- $form = apply_filters( 'frm_pre_display_form', $form );
	2170	+ $form = apply_filters( 'frm_pre_display_form', $form );
	2171	+
2469	2172	$frm_settings = FrmAppHelper::get_settings( array( 'current_form' => $form->id ) );
2470	2173
2471	2174	if ( self::is_viewable_draft_form( $form ) ) {
2472		- // Don't show a draft form on a page
	2175	+ // don't show a draft form on a page
2473	2176	$form = __( 'Please select a valid form', 'formidable' );
2474	2177	} elseif ( ! FrmForm::is_visible_to_user( $form ) ) {
2475	2178	$form = do_shortcode( $frm_settings->login_msg );
2476	2179	} else {
		@@ -2490,18 +2193,16 @@
2490	2193	}
2491	2194
2492	2195	/**
2493	2196	* @param false|int|string $id
2494		- *
2495	2197	* @return false|stdClass
2496	2198	*/
2497	2199	private static function maybe_get_form_to_show( $id ) {
2498	2200	$form = false;
2499	2201
2500		- if ( $id ) {
	2202	+ if ( ! empty( $id ) ) {
2501	2203	// Form id or key is set.
2502	2204	$form = FrmForm::getOne( $id );
2503		-
2504	2205	if ( ! $form || $form->parent_form_id || $form->status === 'trash' ) {
2505	2206	$form = false;
2506	2207	}
2507	2208	}
		@@ -2508,25 +2209,12 @@
2508	2209
2509	2210	return $form;
2510	2211	}
2511	2212
2512		- /**
2513		- * @param object $form
2514		- *
2515		- * @return bool
2516		- */
2517	2213	private static function is_viewable_draft_form( $form ) {
2518	2214	return $form->status === 'draft' && current_user_can( 'frm_edit_forms' ) && ! FrmAppHelper::is_preview_page();
2519	2215	}
2520	2216
2521		- /**
2522		- * @param object $form
2523		- * @param bool $title
2524		- * @param bool $description
2525		- * @param array $atts
2526		- *
2527		- * @return string
2528		- */
2529	2217	public static function get_form( $form, $title, $description, $atts = array() ) {
2530	2218	ob_start();
2531	2219
2532	2220	do_action( 'frm_before_get_form', $atts );
		@@ -2533,9 +2221,10 @@
2533	2221
2534	2222	self::get_form_contents( $form, $title, $description, $atts );
2535	2223	self::enqueue_scripts( FrmForm::get_params( $form ) );
2536	2224
2537		- $contents = ob_get_clean();
	2225	+ $contents = ob_get_contents();
	2226	+ ob_end_clean();
2538	2227
2539	2228	self::maybe_minimize_form( $atts, $contents );
2540	2229
2541	2230	return $contents;
		@@ -2540,25 +2229,12 @@
2540	2229
2541	2230	return $contents;
2542	2231	}
2543	2232
2544		- /**
2545		- * @param array $params
2546		- *
2547		- * @return void
2548		- */
2549	2233	public static function enqueue_scripts( $params ) {
2550	2234	do_action( 'frm_enqueue_form_scripts', $params );
2551	2235	}
2552	2236
2553		- /**
2554		- * @param object $form
2555		- * @param bool $title
2556		- * @param bool $description
2557		- * @param array $atts
2558		- *
2559		- * @return void
2560		- */
2561	2237	public static function get_form_contents( $form, $title, $description, $atts ) {
2562	2238	$params = FrmForm::get_params( $form );
2563	2239	$errors = self::get_saved_errors( $form, $params );
2564	2240	$fields = FrmFieldsHelper::get_form_fields( $form->id, $errors );
		@@ -2565,10 +2241,9 @@
2565	2241	$reset = false;
2566	2242	$pass_args = compact( 'form', 'fields', 'errors', 'title', 'description', 'reset' );
2567	2243
2568	2244	$pass_args['action'] = $params['action'];
2569		- // phpcs:ignore WordPress.Security.NonceVerification.Missing, Universal.Operators.StrictComparisons
2570		- $handle_process_here = $params['action'] === 'create' && $params['posted_form_id'] == $form->id && $_POST;
	2245	+ $handle_process_here = $params['action'] === 'create' && $params['posted_form_id'] == $form->id && $_POST; // phpcs:ignore WordPress.Security.NonceVerification.Missing
2571	2246
2572	2247	if ( ! $handle_process_here ) {
2573	2248	FrmFormState::set_initial_value( 'title', $title );
2574	2249	FrmFormState::set_initial_value( 'description', $description );
		@@ -2573,15 +2248,16 @@
2573	2248	FrmFormState::set_initial_value( 'title', $title );
2574	2249	FrmFormState::set_initial_value( 'description', $description );
2575	2250
2576	2251	do_action( 'frm_display_form_action', $params, $fields, $form, $title, $description );
2577		-
2578	2252	if ( apply_filters( 'frm_continue_to_new', true, $form->id, $params['action'] ) ) {
2579	2253	self::show_form_after_submit( $pass_args );
2580	2254	}
2581		- } elseif ( $errors ) {
	2255	+ } elseif ( ! empty( $errors ) ) {
2582	2256	self::show_form_after_submit( $pass_args );
	2257	+
2583	2258	} else {
	2259	+
2584	2260	do_action( 'frm_validate_form_creation', $params, $fields, $form, $title, $description );
2585	2261
2586	2262	if ( apply_filters( 'frm_continue_to_create', true, $form->id ) ) {
2587	2263	$entry_id = self::just_created_entry( $form->id );
		@@ -2604,19 +2280,13 @@
2604	2280	/**
2605	2281	* If the form was processed earlier (init), get the generated errors
2606	2282	*
2607	2283	* @since 2.05
2608		- *
2609		- * @param object $form
2610		- * @param array $params
2611		- *
2612		- * @return array
2613	2284	*/
2614	2285	private static function get_saved_errors( $form, $params ) {
2615	2286	global $frm_vars;
2616	2287
2617		- // phpcs:ignore WordPress.Security.NonceVerification.Missing, Universal.Operators.StrictComparisons
2618		- if ( $params['posted_form_id'] == $form->id && $_POST && isset( $frm_vars['created_entries'][ $form->id ] ) ) {
	2288	+ if ( $params['posted_form_id'] == $form->id && $_POST && isset( $frm_vars['created_entries'][ $form->id ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
2619	2289	$errors = $frm_vars['created_entries'][ $form->id ]['errors'];
2620	2290	} else {
2621	2291	$errors = array();
2622	2292	}
		@@ -2633,16 +2303,13 @@
2633	2303	}
2634	2304
2635	2305	/**
2636	2306	* @since 2.2.7
2637		- *
2638		- * @param int|string $form_id
2639		- *
2640		- * @return int
2641	2307	*/
2642	2308	public static function just_created_entry( $form_id ) {
2643	2309	global $frm_vars;
2644		- 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
	2310	+
	2311	+ 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;
2645	2312	}
2646	2313
2647	2314	/**
2648	2315	* Gets confirmation method.
		@@ -2655,9 +2322,8 @@
2655	2322	*
2656	2323	* @type object $form Form object.
2657	2324	* @type int $entry_id Entry ID.
2658	2325	* }
2659		- *
2660	2326	* @return array|string
2661	2327	*/
2662	2328	private static function get_confirmation_method( $atts ) {
2663	2329	$action = FrmOnSubmitHelper::current_event( $atts );
		@@ -2665,9 +2331,8 @@
2665	2331	$method = ! empty( $atts['form']->options[ $opt ] ) ? $atts['form']->options[ $opt ] : 'message';
2666	2332
2667	2333	if ( ! empty( $atts['entry_id'] ) ) {
2668	2334	$met_actions = self::get_met_on_submit_actions( $atts, $action );
2669		-
2670	2335	if ( $met_actions ) {
2671	2336	$method = $met_actions;
2672	2337	}
2673	2338	}
		@@ -2674,21 +2339,14 @@
2674	2339
2675	2340	$method = apply_filters( 'frm_success_filter', $method, $atts['form'], $action );
2676	2341
2677	2342	if ( $method !== 'message' && ( ! $atts['entry_id'] || ! is_numeric( $atts['entry_id'] ) ) ) {
2678		- return 'message';
	2343	+ $method = 'message';
2679	2344	}
2680	2345
2681	2346	return $method;
2682	2347	}
2683	2348
2684		- /**
2685		- * @param object $form
2686		- * @param array $params
2687		- * @param array $args
2688		- *
2689		- * @return void
2690		- */
2691	2349	public static function maybe_trigger_redirect( $form, $params, $args ) {
2692	2350	if ( ! isset( $params['id'] ) ) {
2693	2351	global $frm_vars;
2694	2352	$params['id'] = $frm_vars['created_entries'][ $form->id ]['entry_id'];
		@@ -2715,12 +2373,14 @@
2715	2373	* @param array $params See {@see FrmFormsController::maybe_trigger_redirect()}.
2716	2374	* @param array $args See {@see FrmFormsController::maybe_trigger_redirect()}.
2717	2375	*/
2718	2376	public static function maybe_trigger_redirect_with_action( $conf_method, $form, $params, $args ) {
2719		- 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
2720		- $event = FrmOnSubmitHelper::current_event( $params );
2721		- FrmOnSubmitHelper::populate_on_submit_data( $form->options, $conf_method[0], $event );
2722		- $conf_method = 'redirect';
	2377	+ if ( is_array( $conf_method ) && 1 === count( $conf_method ) ) {
	2378	+ if ( 'redirect' === FrmOnSubmitHelper::get_action_type( $conf_method[0] ) ) {
	2379	+ $event = FrmOnSubmitHelper::current_event( $params );
	2380	+ FrmOnSubmitHelper::populate_on_submit_data( $form->options, $conf_method[0], $event );
	2381	+ $conf_method = 'redirect';
	2382	+ }
2723	2383	}
2724	2384
2725	2385	if ( 'redirect' === $conf_method ) {
2726	2386	self::trigger_redirect( $form, $params, $args );
		@@ -2726,15 +2386,8 @@
2726	2386	self::trigger_redirect( $form, $params, $args );
2727	2387	}
2728	2388	}
2729	2389
2730		- /**
2731		- * @param object $form
2732		- * @param array $params
2733		- * @param array $args
2734		- *
2735		- * @return void
2736		- */
2737	2390	public static function trigger_redirect( $form, $params, $args ) {
2738	2391	$success_args = array(
2739	2392	'action' => $params['action'],
2740	2393	'conf_method' => 'redirect',
		@@ -2793,9 +2446,8 @@
2793	2446	* @since 6.0
2794	2447	*
2795	2448	* @param array $args See {@see FrmFormsController::run_success_action()}.
2796	2449	* @param string $event Form event. Default is `create`.
2797		- *
2798	2450	* @return array Array of actions that meet the conditional logics.
2799	2451	*/
2800	2452	public static function get_met_on_submit_actions( $args, $event = 'create' ) {
2801	2453	if ( ! FrmOnSubmitHelper::form_has_migrated( $args['form'] ) ) {
		@@ -2801,9 +2453,9 @@
2801	2453	if ( ! FrmOnSubmitHelper::form_has_migrated( $args['form'] ) ) {
2802	2454	return array();
2803	2455	}
2804	2456
2805		- // If a redirect action has already opened the URL in a new tab, we show the default message in the current tab.
	2457	+ // If a redirect action has already opened the URL in a new tab, we show the default message in the currect tab.
2806	2458	if ( ! empty( self::$redirected_in_new_tab[ $args['form']->id ] ) ) {
2807	2459	return array( FrmOnSubmitHelper::get_fallback_action_after_open_in_new_tab( $event ) );
2808	2460	}
2809	2461
		@@ -2822,11 +2474,13 @@
2822	2474	}
2823	2475
2824	2476	$action_type = FrmOnSubmitHelper::get_action_type( $action );
2825	2477
2826		- if ( 'redirect' === $action_type && $has_redirect ) {
2827		- // Do not process because we run the first redirect action only.
2828		- continue;
	2478	+ if ( 'redirect' === $action_type ) {
	2479	+ if ( $has_redirect ) {
	2480	+ // Do not process because we run the first redirect action only.
	2481	+ continue;
	2482	+ }
2829	2483	}
2830	2484
2831	2485	if ( ! self::is_valid_on_submit_action( $action, $args, $event ) ) {
2832	2486	continue;
		@@ -2851,10 +2505,10 @@
2851	2505	* @param array $args See {@see FrmFormsController::run_success_action()}. `$args['event']` is also added.
2852	2506	*/
2853	2507	$met_actions = apply_filters( 'frm_get_met_on_submit_actions', $met_actions, $args );
2854	2508
2855		- if ( ! $met_actions ) {
2856		- return array( FrmOnSubmitHelper::get_fallback_action( $event ) );
	2509	+ if ( empty( $met_actions ) ) {
	2510	+ $met_actions = array( FrmOnSubmitHelper::get_fallback_action( $event ) );
2857	2511	}
2858	2512
2859	2513	return $met_actions;
2860	2514	}
		@@ -2866,9 +2520,8 @@
2866	2520	*
2867	2521	* @param object $action Form action object.
2868	2522	* @param array $args See {@see FrmFormsController::run_success_action()}.
2869	2523	* @param string $event Form event. Default is `create`.
2870		- *
2871	2524	* @return bool
2872	2525	*/
2873	2526	private static function is_valid_on_submit_action( $action, $args, $event = 'create' ) {
2874	2527	$action_type = FrmOnSubmitHelper::get_action_type( $action );
		@@ -2890,9 +2543,8 @@
2890	2543	return false;
2891	2544	}
2892	2545
2893	2546	$page = get_post( $action->post_content['success_page_id'] );
2894		-
2895	2547	if ( ! $page || 'trash' === $page->post_status ) {
2896	2548	return false;
2897	2549	}
2898	2550	}
		@@ -2914,9 +2566,8 @@
2914	2566	'entry_id' => $args['entry_id'],
2915	2567	'action' => FrmOnSubmitHelper::current_event( $args ),
2916	2568	)
2917	2569	);
2918		-
2919	2570	if ( ! is_array( $args['conf_method'] ) ) {
2920	2571	self::run_success_action( $args );
2921	2572	return;
2922	2573	}
		@@ -2943,9 +2594,8 @@
2943	2594	* @param array $args See {@see FrmFormsController::run_success_action()}.
2944	2595	*/
2945	2596	public static function run_multi_on_submit_actions( $args ) {
2946	2597	$redirect_action = null;
2947		-
2948	2598	foreach ( $args['conf_method'] as $action ) {
2949	2599	if ( 'redirect' === FrmOnSubmitHelper::get_action_type( $action ) ) {
2950	2600	// We catch the redirect action to run it last.
2951	2601	$redirect_action = $action;
		@@ -2956,15 +2606,13 @@
2956	2606
2957	2607	unset( $action );
2958	2608	}
2959	2609
2960		- if ( ! $redirect_action ) {
2961		- return;
	2610	+ if ( $redirect_action ) {
	2611	+ // Show script to delay the redirection.
	2612	+ $args['force_delay_redirect'] = true;
	2613	+ self::run_single_on_submit_action( $args, $redirect_action );
2962	2614	}
2963		-
2964		- // Show script to delay the redirection.
2965		- $args['force_delay_redirect'] = true;
2966		- self::run_single_on_submit_action( $args, $redirect_action );
2967	2615	}
2968	2616
2969	2617	/**
2970	2618	* Runs single On Submit action.
		@@ -2985,9 +2633,8 @@
2985	2633	* @since 6.0
2986	2634	*
2987	2635	* @param array $args See {@see FrmFormsController::run_success_action()}.
2988	2636	* @param object $action On Submit action object.
2989		- *
2990	2637	* @return array
2991	2638	*/
2992	2639	private static function get_run_success_action_args( $args, $action ) {
2993	2640	$new_args = $args;
		@@ -2993,9 +2640,10 @@
2993	2640	$new_args = $args;
2994	2641
2995	2642	FrmOnSubmitHelper::populate_on_submit_data( $new_args['form']->options, $action, $args['action'] );
2996	2643
2997		- $opt = 'update' === $args['action'] ? 'edit_' : 'success_';
	2644	+ $opt = 'update' === $args['action'] ? 'edit_' : 'success_';
	2645	+
2998	2646	$new_args['conf_method'] = $new_args['form']->options[ $opt . 'action' ];
2999	2647
3000	2648	/**
3001	2649	* Filters the run success action args.
		@@ -3010,18 +2658,12 @@
3010	2658	}
3011	2659
3012	2660	/**
3013	2661	* @since 3.0
3014		- *
3015		- * @param array $args
3016		- *
3017		- * @return void
3018	2662	*/
3019	2663	private static function load_page_after_submit( $args ) {
3020	2664	global $post;
3021	2665	$opt = $args['success_opt'];
3022		-
3023		- // phpcs:ignore Universal.Operators.StrictComparisons
3024	2666	if ( ! $post || $args['form']->options[ $opt . '_page_id' ] != $post->ID ) {
3025	2667	$page = get_post( $args['form']->options[ $opt . '_page_id' ] );
3026	2668	$old_post = $post;
3027	2669	$post = $page;
		@@ -3045,9 +2687,8 @@
3045	2687	}
3046	2688
3047	2689	/**
3048	2690	* @since 3.0
3049		- *
3050	2691	* @param array $args See {@see FrmFormsController::run_success_action()}.
3051	2692	*/
3052	2693	private static function redirect_after_submit( $args ) {
3053	2694	add_filter( 'frm_use_wpautop', '__return_false' );
		@@ -3061,10 +2702,11 @@
3061	2702	FrmEntriesController::delete_entry_before_redirect( $success_url, $args['form'], $args );
3062	2703
3063	2704	add_filter( 'frm_redirect_url', 'FrmEntriesController::prepare_redirect_url' );
3064	2705	$success_url = apply_filters( 'frm_redirect_url', $success_url, $args['form'], $args );
3065		- $doing_ajax = FrmAppHelper::doing_ajax();
3066	2706
	2707	+ $doing_ajax = FrmAppHelper::doing_ajax();
	2708	+
3067	2709	if ( ! empty( $args['ajax'] ) && $doing_ajax && empty( $args['force_delay_redirect'] ) ) {
3068	2710	// Is AJAX submit and there is just one Redirect action runs.
3069	2711	echo json_encode( self::get_ajax_redirect_response_data( $args + compact( 'success_url' ) ) );
3070	2712	wp_die();
		@@ -3069,9 +2711,9 @@
3069	2711	echo json_encode( self::get_ajax_redirect_response_data( $args + compact( 'success_url' ) ) );
3070	2712	wp_die();
3071	2713	}
3072	2714
3073		- if ( ! headers_sent() && empty( $args['force_delay_redirect'] ) && empty( $args['form']->options['redirect_delay'] ) ) {
	2715	+ if ( ! headers_sent() && empty( $args['force_delay_redirect'] ) ) {
3074	2716	// Not AJAX submit, no headers sent, and there is just one Redirect action runs.
3075	2717	if ( ! empty( $args['form']->options['open_in_new_tab'] ) ) {
3076	2718	self::print_open_in_new_tab_js_with_fallback_handler( $success_url, $args );
3077	2719	self::$redirected_in_new_tab[ $args['form']->id ] = 1;
		@@ -3113,51 +2755,31 @@
3113	2755	*
3114	2756	* @since 6.3.1
3115	2757	*
3116	2758	* @param array $args See {@see FrmFormsController::run_success_action()}.
3117		- *
3118	2759	* @return array
3119	2760	*/
3120	2761	private static function get_ajax_redirect_response_data( $args ) {
3121		- $response_data = array(
3122		- 'redirect' => $args['success_url'],
3123		- 'content' => '',
3124		- );
3125		- $unset_content = true;
	2762	+ $response_data = array( 'redirect' => $args['success_url'] );
3126	2763
3127		- if ( ! empty( $args['form']->options['redirect_delay'] ) ) {
3128		- $response_data['delay'] = $args['form']->options['redirect_delay_time'];
3129		- $response_data['content'] .= self::get_redirect_message( $args['success_url'], $args['form']->options['redirect_delay_msg'], $args );
3130		- $unset_content = false;
3131		- }
3132		-
3133	2764	if ( ! empty( $args['form']->options['open_in_new_tab'] ) ) {
3134	2765	$response_data['openInNewTab'] = 1;
3135	2766
3136		- // Only show open in new tab text if there is no delay.
3137		- if ( empty( $response_data['content'] ) ) {
3138		- $args['message'] = FrmOnSubmitHelper::get_default_new_tab_msg();
	2767	+ $args['message'] = FrmOnSubmitHelper::get_default_new_tab_msg();
3139	2768
3140		- $args['form']->options['success_msg'] = $args['message'];
3141		- $args['form']->options['edit_msg'] = $args['message'];
	2769	+ $args['form']->options['success_msg'] = $args['message'];
	2770	+ $args['form']->options['edit_msg'] = $args['message'];
	2771	+ if ( ! isset( $args['fields'] ) ) {
	2772	+ $args['fields'] = FrmField::get_all_for_form( $args['form']->id );
	2773	+ }
3142	2774
3143		- if ( ! isset( $args['fields'] ) ) {
3144		- $args['fields'] = FrmField::get_all_for_form( $args['form']->id );
3145		- }
	2775	+ $args['message'] = self::prepare_submit_message( $args['form'], $args['entry_id'], $args );
3146	2776
3147		- $args['message'] = self::prepare_submit_message( $args['form'], $args['entry_id'], $args );
	2777	+ ob_start();
	2778	+ self::show_lone_success_messsage( $args );
	2779	+ $response_data['content'] = ob_get_clean();
3148	2780
3149		- ob_start();
3150		- self::show_lone_success_message( $args );
3151		- $response_data['content'] .= ob_get_clean();
3152		- $unset_content = false;
3153		- }//end if
3154		-
3155	2781	$response_data['fallbackMsg'] = self::get_redirect_fallback_message( $args['success_url'], $args );
3156		- }//end if
3157		-
3158		- if ( $unset_content && '' === $response_data['content'] ) {
3159		- unset( $response_data['content'] );
3160	2782	}
3161	2783
3162	2784	return $response_data;
3163	2785	}
		@@ -3169,9 +2791,9 @@
3169	2791	*
3170	2792	* @param array $args See {@see FrmFormsController::run_success_action()}.
3171	2793	*/
3172	2794	private static function redirect_after_submit_using_js( $args ) {
3173		- $success_msg = $args['form']->options['redirect_delay_msg'];
	2795	+ $success_msg = FrmOnSubmitHelper::get_default_redirect_msg();
3174	2796	$redirect_msg = self::get_redirect_message( $args['success_url'], $success_msg, $args );
3175	2797	$success_url = esc_url_raw( $args['success_url'] );
3176	2798
3177	2799	/**
		@@ -3178,11 +2800,11 @@
3178	2800	* Filters the delay time before redirecting when On Submit Redirect action is delayed.
3179	2801	*
3180	2802	* @since 6.0
3181	2803	*
3182		- * @param int $delay_time Delay time in milliseconds.
	2804	+ * @param int $delay_time Delay time in miliseconds.
3183	2805	*/
3184		- $delay_time = apply_filters( 'frm_redirect_delay_time', 1000 * $args['form']->options['redirect_delay_time'] );
	2806	+ $delay_time = apply_filters( 'frm_redirect_delay_time', 8000 );
3185	2807
3186	2808	if ( ! empty( $args['form']->options['open_in_new_tab'] ) ) {
3187	2809	$redirect_js = 'window.open("' . $success_url . '", "_blank")';
3188	2810	} else {
		@@ -3192,15 +2814,13 @@
3192	2814	add_filter( 'frm_use_wpautop', '__return_true' );
3193	2815
3194	2816	echo FrmAppHelper::maybe_kses( $redirect_msg ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
3195	2817	echo '<script>';
3196		-
3197	2818	if ( empty( $args['doing_ajax'] ) ) {
3198	2819	// Not AJAX submit, delay JS until window.load.
3199	2820	echo 'window.onload=function(){';
3200	2821	}
3201	2822	echo 'setTimeout(function(){' . $redirect_js . '}, ' . intval( $delay_time ) . ');'; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
3202		-
3203	2823	if ( empty( $args['doing_ajax'] ) ) {
3204	2824	echo '};';
3205	2825	}
3206	2826	echo '</script>';
		@@ -3213,16 +2833,11 @@
3213	2833	* @param string $success_msg
3214	2834	* @param array $args
3215	2835	*/
3216	2836	private static function get_redirect_message( $success_url, $success_msg, $args ) {
3217		- $success_msg = apply_filters( 'frm_content', $success_msg, $args['form'], $args['entry_id'] );
3218		- $success_msg = do_shortcode( FrmAppHelper::use_wpautop( $success_msg ) );
3219		-
3220		- // phpcs:disable Generic.WhiteSpace.ScopeIndent
3221		- $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
	2837	+ $redirect_msg = '<div class="' . esc_attr( FrmFormsHelper::get_form_style_class( $args['form'] ) ) . '"><div class="frm-redirect-msg" role="status">' . $success_msg . '<br/>' .
3222	2838	self::get_redirect_fallback_message( $success_url, $args ) .
3223	2839	'</div></div>';
3224		- // phpcs:enable Generic.WhiteSpace.ScopeIndent
3225	2840
3226	2841	$redirect_args = array(
3227	2842	'entry_id' => $args['entry_id'],
3228	2843	'form_id' => $args['form']->id,
		@@ -3238,14 +2853,12 @@
3238	2853	* @since 6.3.1
3239	2854	*
3240	2855	* @param string $success_url Redirect URL.
3241	2856	* @param array $args Contains `form` object.
3242		- *
3243	2857	* @return string
3244	2858	*/
3245	2859	private static function get_redirect_fallback_message( $success_url, $args ) {
3246	2860	$target = '';
3247		-
3248	2861	if ( ! empty( $args['form']->options['open_in_new_tab'] ) ) {
3249	2862	$target = ' target="_blank"';
3250	2863	}
3251	2864
		@@ -3260,12 +2873,8 @@
3260	2873	/**
3261	2874	* Prepare to show the success message and empty form after submit
3262	2875	*
3263	2876	* @since 2.05
3264		- *
3265		- * @param array $atts
3266		- *
3267		- * @return void
3268	2877	*/
3269	2878	public static function show_message_after_save( $atts ) {
3270	2879	$atts['message'] = self::prepare_submit_message( $atts['form'], $atts['entry_id'], $atts );
3271	2880
		@@ -3271,9 +2880,8 @@
3271	2880
3272	2881	if ( ! isset( $atts['form']->options['show_form'] ) || $atts['form']->options['show_form'] ) {
3273	2882	if ( isset( $atts['action'] ) && 'update' === $atts['action'] && is_callable( array( 'FrmProEntriesController', 'show_front_end_form_with_entry' ) ) ) {
3274	2883	$entry = FrmEntry::getOne( $atts['entry_id'] );
3275		-
3276	2884	if ( $entry ) {
3277	2885	// This is copied from the Pro plugin.
3278	2886	$atts['conf_message'] = FrmProEntriesController::confirmation( 'message', $atts['form'], $atts['form']->options, $entry->id, $atts );
3279	2887	$atts['show_form'] = FrmProEntriesController::is_form_displayed_after_edit( $atts['form'] );
		@@ -3282,9 +2890,9 @@
3282	2890	} else {
3283	2891	self::show_form_after_submit( $atts );
3284	2892	}
3285	2893	} else {
3286		- self::show_lone_success_message( $atts );
	2894	+ self::show_lone_success_messsage( $atts );
3287	2895	}
3288	2896	}
3289	2897
3290	2898	/**
		@@ -3290,12 +2898,8 @@
3290	2898	/**
3291	2899	* Show an empty form
3292	2900	*
3293	2901	* @since 2.05
3294		- *
3295		- * @param array $args
3296		- *
3297		- * @return void
3298	2902	*/
3299	2903	private static function show_form_after_submit( $args ) {
3300	2904	self::fill_atts_for_form_display( $args );
3301	2905
		@@ -3314,11 +2918,12 @@
3314	2918	}
3315	2919	unset( $args );
3316	2920
3317	2921	$include_form_tag = apply_filters( 'frm_include_form_tag', true, $form );
3318		- $frm_settings = FrmAppHelper::get_settings();
3319		- $submit = $form->options['submit_value'] ?? $frm_settings->submit_value;
3320	2922
	2923	+ $frm_settings = FrmAppHelper::get_settings();
	2924	+ $submit = isset( $form->options['submit_value'] ) ? $form->options['submit_value'] : $frm_settings->submit_value;
	2925	+
3321	2926	global $frm_vars;
3322	2927	self::maybe_load_css( $form, $values['custom_style'], $frm_vars['load_css'] );
3323	2928
3324	2929	$message_placement = self::message_placement( $form, $message );
		@@ -3326,36 +2931,25 @@
3326	2931	include FrmAppHelper::plugin_path() . '/classes/views/frm-entries/new.php';
3327	2932	}
3328	2933
3329	2934	/**
3330		- * Gets message placement.
3331		- *
3332	2935	* @since 4.05.02
3333		- * @since 6.26 This method changed from `private` to `public`.
3334		- *
3335		- * @param object $form Form object.
3336		- * @param string $message The message.
3337		- *
3338		- * @return string Accepts 'before', 'after', or 'submit'.
	2936	+ * @return string - 'before', 'after', or 'submit'
3339	2937	*/
3340		- public static function message_placement( $form, $message ) {
	2938	+ private static function message_placement( $form, $message ) {
3341	2939	$place = 'before';
3342	2940
3343	2941	if ( $message && isset( $form->options['form_class'] ) ) {
3344		- if ( str_contains( $form->options['form_class'], 'frm_below_success' ) ) {
	2942	+ if ( strpos( $form->options['form_class'], 'frm_below_success' ) !== false ) {
3345	2943	$place = 'after';
3346		- } elseif ( str_contains( $form->options['form_class'], 'frm_inline_success' ) ) {
	2944	+ } elseif ( strpos( $form->options['form_class'], 'frm_inline_success' ) !== false ) {
3347	2945	$place = 'submit';
3348	2946	}
3349	2947	}
3350	2948
3351	2949	/**
3352		- * Filter the message placement.
3353		- *
3354	2950	* @since 4.05.02
3355		- *
3356		- * @param string $place Accepts 'before', 'after', or 'submit'.
3357		- * @param array $args Args.
	2951	+ * @return string - 'before' or 'after'
3358	2952	*/
3359	2953	return apply_filters( 'frm_message_placement', $place, compact( 'form', 'message' ) );
3360	2954	}
3361	2955
		@@ -3362,12 +2956,8 @@
3362	2956	/**
3363	2957	* Get all the values needed on the new.php entry page
3364	2958	*
3365	2959	* @since 2.05
3366		- *
3367		- * @param array $args
3368		- *
3369		- * @return void
3370	2960	*/
3371	2961	private static function fill_atts_for_form_display( &$args ) {
3372	2962	if ( ! isset( $args['title'] ) && isset( $args['show_title'] ) ) {
3373	2963	$args['title'] = $args['show_title'];
		@@ -3392,23 +2982,20 @@
3392	2982	/**
3393	2983	* Show the success message without the form
3394	2984	*
3395	2985	* @since 2.05
3396		- *
3397		- * @param array $atts
3398		- *
3399		- * @return void
3400	2986	*/
3401		- private static function show_lone_success_message( $atts ) {
	2987	+ private static function show_lone_success_messsage( $atts ) {
3402	2988	global $frm_vars;
3403	2989	$values = FrmEntriesHelper::setup_new_vars( $atts['fields'], $atts['form'], true );
3404	2990	self::maybe_load_css( $atts['form'], $values['custom_style'], $frm_vars['load_css'] );
3405	2991
3406	2992	$include_extra_container = 'frm_forms' . FrmFormsHelper::get_form_style_class( $values );
3407		- $errors = array();
3408		- $form = $atts['form'];
3409		- $message = $atts['message'];
3410	2993
	2994	+ $errors = array();
	2995	+ $form = $atts['form'];
	2996	+ $message = $atts['message'];
	2997	+
3411	2998	include FrmAppHelper::plugin_path() . '/classes/views/frm-entries/errors.php';
3412	2999	}
3413	3000
3414	3001	/**
		@@ -3416,20 +3003,19 @@
3416	3003	*
3417	3004	* @since 2.05
3418	3005	* @since 6.0.x Added the third parameter.
3419	3006	*
3420		- * @param object $form Form object.
3421		- * @param int|string $entry_id Entry ID.
3422		- * @param array $args See {@see FrmFormsController::run_success_action()}.
3423		- *
	3007	+ * @param object $form Form object.
	3008	+ * @param int $entry_id Entry ID.
	3009	+ * @param array $args See {@see FrmFormsController::run_success_action()}.
3424	3010	* @return string
3425	3011	*/
3426	3012	private static function prepare_submit_message( $form, $entry_id, $args = array() ) {
3427	3013	$frm_settings = FrmAppHelper::get_settings( array( 'current_form' => $form->id ) );
3428		- $opt = $args['success_opt'] ?? 'success';
	3014	+ $opt = isset( $args['success_opt'] ) ? $args['success_opt'] : 'success';
3429	3015
3430	3016	if ( $entry_id && is_numeric( $entry_id ) ) {
3431		- $message = $form->options[ $opt . '_msg' ] ?? $frm_settings->success_msg;
	3017	+ $message = isset( $form->options[ $opt . '_msg' ] ) ? $form->options[ $opt . '_msg' ] : $frm_settings->success_msg;
3432	3018	$class = 'frm_message';
3433	3019	} else {
3434	3020	$message = $frm_settings->failed_msg;
3435	3021	$class = FrmFormsHelper::form_error_class();
		@@ -3446,9 +3032,9 @@
3446	3032	public static function front_head() {
3447	3033	$version = FrmAppHelper::plugin_version();
3448	3034	$suffix = FrmAppHelper::js_suffix();
3449	3035
3450		- if ( $suffix && self::has_combo_js_file() ) {
	3036	+ if ( ! empty( $suffix ) && self::has_combo_js_file() ) {
3451	3037	wp_register_script( 'formidable', FrmAppHelper::plugin_url() . '/js/frm.min.js', array( 'jquery' ), $version, true );
3452	3038	} else {
3453	3039	wp_register_script( 'formidable', FrmAppHelper::plugin_url() . "/js/formidable{$suffix}.js", array( 'jquery' ), $version, true );
3454	3040	}
		@@ -3455,9 +3041,9 @@
3455	3041
3456	3042	add_filter( 'script_loader_tag', 'FrmFormsController::defer_script_loading', 10, 2 );
3457	3043
3458	3044	if ( FrmAppHelper::is_admin() ) {
3459		- // Don't load this in back-end
	3045	+ // don't load this in back-end
3460	3046	return;
3461	3047	}
3462	3048
3463	3049	FrmAppHelper::localize_script( 'front' );
		@@ -3470,15 +3056,8 @@
3470	3056	public static function has_combo_js_file() {
3471	3057	return is_readable( FrmAppHelper::plugin_path() . '/js/frm.min.js' );
3472	3058	}
3473	3059
3474		- /**
3475		- * @param object $form
3476		- * @param int|string $this_load
3477		- * @param bool $global_load
3478		- *
3479		- * @return void
3480		- */
3481	3060	public static function maybe_load_css( $form, $this_load, $global_load ) {
3482	3061	$load_css = FrmForm::is_form_loaded( $form, $this_load, $global_load );
3483	3062
3484	3063	if ( ! $load_css ) {
		@@ -3508,9 +3087,8 @@
3508	3087	return;
3509	3088	}
3510	3089
3511	3090	global $wp_styles;
3512		-
3513	3091	if ( is_array( $wp_styles->queue ) && in_array( 'formidable', $wp_styles->queue, true ) ) {
3514	3092	wp_print_styles( 'formidable' );
3515	3093	}
3516	3094	}
		@@ -3525,57 +3103,32 @@
3525	3103	private static function should_load_late() {
3526	3104	return ! function_exists( 'aioseo' );
3527	3105	}
3528	3106
3529		- /**
3530		- * @param string $tag
3531		- * @param string $handle
3532		- *
3533		- * @return string
3534		- */
3535	3107	public static function defer_script_loading( $tag, $handle ) {
3536		- if ( 'captcha-api' === $handle && ! str_contains( $tag, 'defer' ) ) {
3537		- return str_replace( ' src', ' defer="defer" async="async" src', $tag );
	3108	+ if ( 'captcha-api' == $handle && ! strpos( $tag, 'defer' ) ) {
	3109	+ $tag = str_replace( ' src', ' defer="defer" async="async" src', $tag );
3538	3110	}
3539	3111
3540	3112	return $tag;
3541	3113	}
3542	3114
3543		- /**
3544		- * @param string $location
3545		- *
3546		- * @return void
3547		- */
3548	3115	public static function footer_js( $location = 'footer' ) {
3549	3116	global $frm_vars;
3550	3117
3551	3118	FrmStylesController::enqueue_css();
3552	3119
3553		- if ( FrmAppHelper::is_admin() || $location === 'header' || empty( $frm_vars['forms_loaded'] ) ) {
3554		- return;
	3120	+ if ( ! FrmAppHelper::is_admin() && $location !== 'header' && ! empty( $frm_vars['forms_loaded'] ) ) {
	3121	+ // load formidable js
	3122	+ wp_enqueue_script( 'formidable' );
3555	3123	}
3556		-
3557		- // Load formidable js
3558		- wp_enqueue_script( 'formidable' );
3559		-
3560		- FrmHoneypot::maybe_print_honeypot_js();
3561		-
3562		- if ( ! method_exists( 'FrmProFormsHelper', 'load_currency_js' ) ) {
3563		- // Load currency JS if Pro is not installed.
3564		- FrmFormsHelper::load_currency_js();
3565		- }
3566	3124	}
3567	3125
3568	3126	/**
3569	3127	* @since 2.0.8
3570		- *
3571		- * @param array $atts
3572		- * @param string $content
3573		- *
3574		- * @return void
3575	3128	*/
3576	3129	private static function maybe_minimize_form( $atts, &$content ) {
3577		- // Check if minimizing is turned on
	3130	+ // check if minimizing is turned on
3578	3131	if ( self::is_minification_on( $atts ) ) {
3579	3132	$content = str_replace( array( "\r\n", "\r", "\n", "\t", ' ' ), '', $content );
3580	3133	}
3581	3134	}
		@@ -3581,11 +3134,8 @@
3581	3134	}
3582	3135
3583	3136	/**
3584	3137	* @since 2.0.8
3585		- *
3586		- * @param array $atts
3587		- *
3588	3138	* @return bool
3589	3139	*/
3590	3140	private static function is_minification_on( $atts ) {
3591	3141	return ! empty( $atts['minimize'] );
		@@ -3597,13 +3147,11 @@
3597	3147	* @return void
3598	3148	*/
3599	3149	public static function landing_page_preview_option() {
3600	3150	$dir = apply_filters( 'frm_landing_page_preview_option', false );
3601		-
3602	3151	if ( false === $dir || ! file_exists( $dir . 'landing-page-preview-option.php' ) ) {
3603	3152	$dir = self::get_form_views_path();
3604	3153	}
3605		-
3606	3154	include $dir . 'landing-page-preview-option.php';
3607	3155	}
3608	3156
3609	3157	/**
		@@ -3629,15 +3177,13 @@
3629	3177
3630	3178	check_ajax_referer( 'frm_ajax', 'nonce' );
3631	3179
3632	3180	$type = FrmAppHelper::get_post_param( 'type', '', 'sanitize_text_field' );
3633		-
3634	3181	if ( ! $type || ! in_array( $type, array( 'form', 'view' ), true ) ) {
3635	3182	die( 0 );
3636	3183	}
3637	3184
3638	3185	$object_id = FrmAppHelper::get_post_param( 'object_id', '', 'absint' );
3639		-
3640	3186	if ( ! $object_id ) {
3641	3187	die( 0 );
3642	3188	}
3643	3189
		@@ -3649,15 +3195,13 @@
3649	3195	$postarr['post_content'] = apply_filters( 'frm_create_page_with_' . $type . '_shortcode_content', '', $object_id );
3650	3196	}
3651	3197
3652	3198	$name = FrmAppHelper::get_post_param( 'name', '', 'sanitize_text_field' );
3653		-
3654	3199	if ( $name ) {
3655	3200	$postarr['post_title'] = $name;
3656	3201	}
3657	3202
3658	3203	$success = wp_insert_post( $postarr );
3659		-
3660	3204	if ( ! is_numeric( $success ) || ! $success ) {
3661	3205	die( 0 );
3662	3206	}
3663	3207
		@@ -3671,9 +3215,8 @@
3671	3215	/**
3672	3216	* @since 5.3
3673	3217	*
3674	3218	* @param int $form_id
3675		- *
3676	3219	* @return string
3677	3220	*/
3678	3221	private static function get_page_shortcode_content_for_form( $form_id ) {
3679	3222	$shortcode = '[formidable id="' . $form_id . '"]';
		@@ -3693,9 +3236,9 @@
3693	3236	}
3694	3237
3695	3238	check_ajax_referer( 'frm_ajax', 'nonce' );
3696	3239
3697		- $html = FrmAppHelper::clip(
	3240	+ $html = FrmAppHelper::clip(
3698	3241	function () {
3699	3242	FrmAppHelper::maybe_autocomplete_pages_options(
3700	3243	array(
3701	3244	'field_name' => 'frm_page_dropdown',
		@@ -3704,55 +3247,31 @@
3704	3247	)
3705	3248	);
3706	3249	}
3707	3250	);
	3251	+ $post_type_object = get_post_type_object( 'page' );
3708	3252	wp_send_json(
3709	3253	array(
3710	3254	'html' => $html,
3711		- 'edit_page_url' => admin_url( sprintf( get_post_type_object( 'page' )->_edit_link . '&action=edit', 0 ) ),
	3255	+ 'edit_page_url' => admin_url( sprintf( $post_type_object->_edit_link . '&action=edit', 0 ) ),
3712	3256	)
3713	3257	);
3714	3258	}
3715	3259
3716	3260	/**
3717		- * Prints necessary templates for the forms list page.
3718		- *
3719		- * @since 6.32
3720		- *
3721		- * @return void
	3261	+ * @deprecated 4.0
3722	3262	*/
3723		- public static function print_forms_list_templates() {
3724		- if ( ! FrmAppHelper::on_form_listing_page() ) {
3725		- return;
3726		- }
3727		-
3728		- $screen = get_current_screen();
3729		-
3730		- if ( ! $screen ) {
3731		- return;
3732		- }
3733		-
3734		- $columns = get_column_headers( $screen );
3735		- $hidden = get_hidden_columns( $screen );
3736		- $skip_cols = array( 'cb', 'name', 'settings' );
3737		- $per_page = get_user_option( 'formidable_page_formidable_per_page' );
3738		- $show_screen_options = $screen->show_screen_options();
3739		-
3740		- if ( $per_page < 1 ) {
3741		- $per_page = 20;
3742		- }
3743		-
3744		- include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/forms-list-settings.php';
	3263	+ public static function create( $values = array() ) {
	3264	+ _deprecated_function( __METHOD__, '4.0', 'FrmFormsController::update' );
	3265	+ self::update( $values );
3745	3266	}
3746	3267
3747	3268	/**
3748		- * @deprecated 4.0
	3269	+ * @deprecated 6.7
3749	3270	*
3750		- * @param array $values
3751		- *
3752		- * @return void
	3271	+ * @return bool
3753	3272	*/
3754		- public static function create( $values = array() ) {
3755		- _deprecated_function( __METHOD__, '4.0', 'FrmFormsController::update' );
3756		- self::update( $values );
	3273	+ public static function expired() {
	3274	+ _deprecated_function( __METHOD__, '6.7' );
	3275	+ return FrmAddonsController::is_license_expired();
3757	3276	}
3758	3277	}