← All changes | classes/controllers/FrmFormsController.php +152 -536 6.27 → 6.18 View file →

		@@ -26,13 +26,11 @@
26	26	private static $formidable_tinymce_button;
27	27
28	28	public static function menu() {
29	29	$menu_label = __( 'Forms', 'formidable' );
30		-
31	30	if ( ! FrmAppHelper::pro_is_installed() ) {
32	31	$menu_label .= ' (Lite)';
33	32	}
34		-
35	33	add_submenu_page( 'formidable', 'Formidable | ' . $menu_label, $menu_label, 'frm_view_forms', 'formidable', 'FrmFormsController::route' );
36	34
37	35	self::maybe_load_listing_hooks();
38	36	}
		@@ -66,12 +64,12 @@
66	64	*/
67	65	public static function logic_tip() {
68	66	$images_url = FrmAppHelper::plugin_url() . '/images/';
69	67	$data_message = __( 'Only show the fields you need and create branching forms. Upgrade to get conditional logic and question branching.', 'formidable' );
70		- $data_message .= ' <img src="' . esc_url( $images_url ) . '/survey-logic.png" srcset="' . esc_url( $images_url ) . 'survey-logic@2x.png 2x" alt="' . esc_attr__( 'Conditional Logic options', 'formidable' ) . '"/>'; // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong
71		- echo '<a href="javascript:void(0)" class="frm_noallow frm_show_upgrade frm_add_logic_link frm-collapsed frm-flex-justify" data-upgrade="' . esc_attr__( 'Conditional Logic options', 'formidable' ) . '" data-message="' . esc_attr( $data_message ) . '" data-medium="builder" data-content="logic">'; // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong
	68	+ $data_message .= ' <img src="' . esc_url( $images_url ) . '/survey-logic.png" srcset="' . esc_url( $images_url ) . 'survey-logic@2x.png 2x" alt="' . esc_attr__( 'Conditional Logic options', 'formidable' ) . '"/>';
	69	+ echo '<a href="javascript:void(0)" class="frm_noallow frm_show_upgrade frm_add_logic_link frm-collapsed frm-flex-justify" data-upgrade="' . esc_attr__( 'Conditional Logic options', 'formidable' ) . '" data-message="' . esc_attr( $data_message ) . '" data-medium="builder" data-content="logic">';
72	70	esc_html_e( 'Conditional Logic', 'formidable' );
73		- FrmAppHelper::icon_by_class( 'frmfont frm_arrowdown8_icon', array( 'aria-hidden' => 'true' ) );
	71	+ FrmAppHelper::icon_by_class( 'frmfont frm_arrowdown6_icon', array( 'aria-hidden' => 'true' ) );
74	72	echo '</a>';
75	73	}
76	74
77	75	/**
		@@ -78,15 +76,12 @@
78	76	* By default, Divi processes form shortcodes on the edit post page.
79	77	* Now that won't do.
80	78	*
81	79	* @since 3.01
82		- *
83		- * @param array $shortcodes List of shortcodes to process.
84		- *
85		- * @return array
86	80	*/
87	81	public static function prevent_divi_conflict( $shortcodes ) {
88	82	$shortcodes[] = 'formidable';
	83	+
89	84	return $shortcodes;
90	85	}
91	86
92	87	/**
		@@ -97,14 +92,12 @@
97	92
98	93	$message = '';
99	94	$params = FrmForm::list_page_params();
100	95	$errors = self::process_bulk_form_actions( array() );
101		-
102	96	if ( isset( $errors['message'] ) ) {
103	97	$message = $errors['message'];
104	98	unset( $errors['message'] );
105	99	}
106		-
107	100	$errors = apply_filters( 'frm_admin_list_form_action', $errors );
108	101
109	102	self::display_forms_list( $params, $message, $errors );
110	103	}
		@@ -114,14 +107,12 @@
114	107	*
115	108	* @since 2.02.11
116	109	*
117	110	* @param int|object $form
118		- *
119	111	* @return void
120	112	*/
121	113	private static function create_default_email_action( $form ) {
122	114	FrmForm::maybe_get_form( $form );
123		-
124	115	if ( ! is_object( $form ) ) {
125	116	return;
126	117	}
127	118
		@@ -141,14 +132,12 @@
141	132	*
142	133	* @since 6.0.0
143	134	*
144	135	* @param int|object $form Form object or ID.
145		- *
146	136	* @return void
147	137	*/
148	138	private static function create_default_on_submit_action( $form ) {
149	139	FrmForm::maybe_get_form( $form );
150		-
151	140	if ( ! is_object( $form ) ) {
152	141	return;
153	142	}
154	143
		@@ -176,14 +165,12 @@
176	165	*
177	166	* @since 6.9
178	167	*
179	168	* @param int|object $form Form ID or object.
180		- *
181	169	* @return void
182	170	*/
183	171	private static function create_submit_button_field( $form ) {
184	172	FrmForm::maybe_get_form( $form );
185		-
186	173	if ( ! is_object( $form ) ) {
187	174	return;
188	175	}
189	176
		@@ -206,10 +193,8 @@
206	193	);
207	194	}
208	195
209	196	/**
210		- * @param array|false $values
211		- *
212	197	* @return void
213	198	*/
214	199	public static function edit( $values = false ) {
215	200	FrmAppHelper::permission_check( 'frm_edit_forms' );
		@@ -221,9 +206,8 @@
221	206
222	207	/**
223	208	* @param mixed $id
224	209	* @param string $message
225		- *
226	210	* @return void
227	211	*/
228	212	public static function settings( $id = false, $message = '' ) {
229	213	FrmAppHelper::permission_check( 'frm_edit_forms' );
		@@ -251,9 +235,10 @@
251	235	FrmAppController::show_error_modal( $error_args );
252	236	return;
253	237	}
254	238
255		- $id = FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
	239	+ $id = FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
	240	+
256	241	$errors = FrmForm::validate( $_POST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
257	242	$warnings = FrmFormsHelper::check_for_warnings( $_POST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
258	243
259	244	if ( count( $errors ) > 0 ) {
		@@ -267,9 +252,8 @@
267	252
268	253	FrmForm::update( $id, $_POST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
269	254
270	255	$antispam_is_on = ! empty( $_POST['options']['antispam'] ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
271		-
272	256	if ( $antispam_is_on !== $antispam_was_on ) {
273	257	FrmAntiSpam::clear_caches();
274	258	}
275	259
		@@ -279,9 +263,8 @@
279	263	}
280	264
281	265	/**
282	266	* @param int $form_id
283		- *
284	267	* @return bool
285	268	*/
286	269	private static function antispam_was_on( $form_id ) {
287	270	$form = FrmForm::getOne( $form_id );
		@@ -288,14 +271,12 @@
288	271	return ! empty( $form->options['antispam'] );
289	272	}
290	273
291	274	/**
292		- * @param array $values
293		- *
294	275	* @return void
295	276	*/
296	277	public static function update( $values = array() ) {
297		- if ( ! $values ) {
	278	+ if ( empty( $values ) ) {
298	279	$values = $_POST; // phpcs:ignore WordPress.Security.NonceVerification.Missing
299	280	}
300	281
301	282	// Set radio button and checkbox meta equal to "other" value.
		@@ -304,9 +285,8 @@
304	285	}
305	286
306	287	$errors = FrmForm::validate( $values );
307	288	$permission_error = FrmAppHelper::permission_nonce_error( 'frm_edit_forms', 'frm_save_form', 'frm_save_form_nonce' );
308		-
309	289	if ( $permission_error !== false ) {
310	290	$errors['form'] = $permission_error;
311	291	}
312	292
		@@ -325,9 +305,9 @@
325	305	if ( self::is_too_long( $values ) ) {
326	306	$message .= '<br/> ' . sprintf(
327	307	/* translators: %1$s: Start link HTML, %2$s: end link HTML */
328	308	__( 'However, your form is very long and may be %1$sreaching server limits%2$s.', 'formidable' ),
329		- '<a href="' . esc_url( self::get_form_too_long_docs_url() ) . '" target="_blank" rel="noopener">',
	309	+ '<a href="https://formidableforms.com/knowledgebase/i-have-a-long-form-why-did-the-options-at-the-end-of-the-form-stop-saving/?utm_source=WordPress&utm_medium=builder&utm_campaign=liteplugin" target="_blank" rel="noopener">',
330	310	'</a>'
331	311	);
332	312	}
333	313
		@@ -338,32 +318,17 @@
338	318	self::get_edit_vars( $id, array(), $message );
339	319	}
340	320
341	321	/**
342		- * @since 6.25.1
343		- *
344		- * @return string
345		- */
346		- private static function get_form_too_long_docs_url() {
347		- $utm = array(
348		- 'campaign' => 'builder',
349		- 'content' => 'form-too-long',
350		- );
351		- return FrmAppHelper::admin_upgrade_link( $utm, 'knowledgebase/i-have-a-long-form-why-did-the-options-at-the-end-of-the-form-stop-saving/' );
352		- }
353		-
354		- /**
355	322	* Remove the draft flag from any new fields from this current session.
356	323	*
357	324	* @since 6.8
358	325	*
359	326	* @param int $form_id
360		- *
361	327	* @return void
362	328	*/
363	329	private static function maybe_remove_draft_option_from_fields( $form_id ) {
364	330	$draft_field_ids_csv = FrmAppHelper::get_post_param( 'draft_fields', '', 'sanitize_text_field' );
365		-
366	331	if ( ! $draft_field_ids_csv ) {
367	332	// If the draft_fields input is empty there are no new fields in the session.
368	333	return;
369	334	}
		@@ -368,9 +333,8 @@
368	333	return;
369	334	}
370	335
371	336	$draft_field_ids = array_filter( explode( ',', $draft_field_ids_csv ), 'is_numeric' );
372		-
373	337	if ( ! $draft_field_ids ) {
374	338	// Exit early if the draft fields input is invalid. It should be a CSV of integer values.
375	339	return;
376	340	}
		@@ -375,9 +339,8 @@
375	339	return;
376	340	}
377	341
378	342	$draft_field_rows = FrmFieldsHelper::get_draft_field_results( $form_id, $draft_field_ids );
379		-
380	343	foreach ( $draft_field_rows as $row ) {
381	344	$row->field_options['draft'] = 0;
382	345	FrmField::update( $row->id, array( 'field_options' => $row->field_options ) );
383	346	}
		@@ -389,10 +352,8 @@
389	352	* were likely not saved either.
390	353	*
391	354	* @since 3.06.01
392	355	*
393		- * @param array $values
394		- *
395	356	* @return bool
396	357	*/
397	358	private static function is_too_long( $values ) {
398	359	return empty( $values['frm_end'] );
		@@ -428,17 +389,13 @@
428	389	* @return string|null
429	390	*/
430	391	public static function page_preview() {
431	392	$params = FrmForm::list_page_params();
432		-
433		- if ( ! $params['form'] || is_numeric( $params['form'] ) ) {
	393	+ if ( ! $params['form'] ) {
434	394	return null;
435	395	}
436	396
437		- self::maybe_block_preview( $params['form'] );
438		-
439	397	$form = FrmForm::getOne( $params['form'] );
440		-
441	398	if ( ! $form ) {
442	399	return null;
443	400	}
444	401
		@@ -450,19 +407,9 @@
450	407	*
451	408	* @return void
452	409	*/
453	410	public static function show_page_preview() {
454		- $preview = self::page_preview();
455		-
456		- if ( is_null( $preview ) ) {
457		- wp_die(
458		- '<h1>' . esc_html__( 'Form key is invalid', 'formidable' ) . '</h1>',
459		- '<p>' . esc_html__( 'Form key is invalid', 'formidable' ) . '</p>',
460		- 404
461		- );
462		- }
463		-
464		- echo $preview; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
	411	+ echo self::page_preview(); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
465	412	}
466	413
467	414	/**
468	415	* @return void
		@@ -473,19 +420,9 @@
473	420
474	421	global $frm_vars;
475	422	$frm_vars['preview'] = true;
476	423
477		- // print_emoji_styles is deprecated.
478		- remove_action( 'wp_print_styles', 'print_emoji_styles' );
479		-
480		- if ( FrmTestModeController::should_add_test_mode_container() ) {
481		- do_action( 'frm_test_mode_init' );
482		- add_action( 'wp_enqueue_scripts', 'FrmTestModeController::register_and_enqueue_required_scripts' );
483		- add_filter( 'frm_filter_final_form', 'FrmTestModeController::maybe_add_test_mode_container', 99 );
484		- }
485		-
486	424	$include_theme = FrmAppHelper::get_param( 'theme', '', 'get', 'absint' );
487		-
488	425	if ( $include_theme ) {
489	426	self::set_preview_query();
490	427	self::load_theme_preview();
491	428	} else {
		@@ -508,9 +445,8 @@
508	445	'post_type' => 'page',
509	446	);
510	447
511	448	$page_for_posts = get_option( 'page_for_posts' );
512		-
513	449	if ( is_numeric( $page_for_posts ) ) {
514	450	// Avoid querying for the "Posts Page" or "Blog Page" so we don't display 10 forms.
515	451	$page_query['post__not_in'] = array( $page_for_posts );
516	452	}
		@@ -515,15 +451,13 @@
515	451	$page_query['post__not_in'] = array( $page_for_posts );
516	452	}
517	453
518	454	$random_page = get_posts( $page_query );
519		-
520	455	if ( ! $random_page ) {
521	456	return;
522	457	}
523	458
524	459	$random_page = reset( $random_page );
525		-
526	460	if ( ! is_a( $random_page, 'WP_Post' ) ) {
527	461	// The return type can also be int.
528	462	return;
529	463	}
		@@ -545,9 +479,8 @@
545	479	*
546	480	* @since 5.5.2
547	481	*
548	482	* @param WP_Post $page The page object.
549		- *
550	483	* @return void
551	484	*/
552	485	private static function set_post_global( $page ) {
553	486	global $post;
		@@ -580,9 +513,8 @@
580	513	*
581	514	* @since 6.5.2
582	515	*
583	516	* @param array $classes The body classes list.
584		- *
585	517	* @return array
586	518	*/
587	519	public static function preview_block_theme_body_classnames( $classes ) {
588	520	$classes[] = 'has-global-padding';
		@@ -606,12 +538,8 @@
606	538	echo '<div class="container entry-content">';
607	539	the_content();
608	540	echo '</div>';
609	541
610		- // Prevent extra unexpected forms in the footer.
611		- // For some reason this happens in the Twenty Twenty Five theme.
612		- add_filter( 'frm_filter_final_form', '__return_empty_string' );
613		-
614	542	self::get_template( 'footer' );
615	543	}
616	544	}
617	545
		@@ -619,11 +547,9 @@
619	547	* Calls core function to get a template part if it doesn't cause deprecation warnings. Otherwise skips the deprecation function call
620	548	* and renders required html fragments calling required functions.
621	549	*
622	550	* @since 6.7.1
623		- *
624	551	* @param string $template
625		- *
626	552	* @return void
627	553	*/
628	554	private static function get_template( $template ) {
629	555	if ( self::should_try_getting_template( $template ) ) {
		@@ -644,11 +570,9 @@
644	570	/**
645	571	* Returns true if calling a template function doesn't trigger deprecation warnings.
646	572	*
647	573	* @since 6.7.1
648		- *
649	574	* @param string $template
650		- *
651	575	* @return bool
652	576	*/
653	577	private static function should_try_getting_template( $template ) {
654	578	$stylesheet_path = get_stylesheet_directory();
		@@ -662,12 +586,8 @@
662	586	/**
663	587	* Set the page title for the theme preview page
664	588	*
665	589	* @since 3.0
666		- *
667		- * @param string $title
668		- *
669		- * @return string
670	590	*/
671	591	public static function preview_page_title( $title ) {
672	592	if ( in_the_loop() ) {
673	593	$title = self::preview_title( $title );
		@@ -681,9 +601,8 @@
681	601	*
682	602	* @since 3.0
683	603	*
684	604	* @param string $title
685		- *
686	605	* @return string
687	606	*/
688	607	public static function preview_title( $title ) {
689	608	return __( 'Form Preview', 'formidable' );
		@@ -694,9 +613,8 @@
694	613	*
695	614	* @since 3.0
696	615	*
697	616	* @param string $content
698		- *
699	617	* @return string
700	618	*/
701	619	public static function preview_content( $content ) {
702	620	if ( in_the_loop() ) {
		@@ -711,39 +629,23 @@
711	629	/**
712	630	* @since 3.0
713	631	*/
714	632	private static function load_direct_preview() {
	633	+ header( 'Content-Type: text/html; charset=' . get_option( 'blog_charset' ) );
	634	+
	635	+ // print_emoji_styles is deprecated.
	636	+ remove_action( 'wp_print_styles', 'print_emoji_styles' );
	637	+
715	638	$key = FrmAppHelper::simple_get( 'form', 'sanitize_title' );
716		-
717		- // phpcs:ignore Universal.Operators.StrictComparisons
718	639	if ( $key == '' ) {
719	640	$key = FrmAppHelper::get_post_param( 'form', '', 'sanitize_title' );
720	641	}
721	642
722		- if ( ! $key ) {
723		- $error = __( 'Form key is missing', 'formidable' );
724		- wp_die(
725		- '<h1>' . esc_html( $error ) . '</h1>',
726		- '<p>' . esc_html( $error ) . '</p>',
727		- 404
728		- );
729		- }
730		-
731		- self::maybe_block_preview( $key );
732		-
733	643	$form = FrmForm::getAll( array( 'form_key' => $key ), '', 1 );
734		-
735		- if ( ! $form ) {
736		- $error = __( 'Form does not exist', 'formidable' );
737		- wp_die(
738		- '<h1>' . esc_html( $error ) . '</h1>',
739		- '<p>' . esc_html( $error ) . '</p>',
740		- 404
741		- );
	644	+ if ( empty( $form ) ) {
	645	+ $form = FrmForm::getAll( array(), '', 1 );
742	646	}
743	647
744		- header( 'Content-Type: text/html; charset=' . get_option( 'blog_charset' ) );
745		-
746	648	self::fix_deprecated_null_param_warning();
747	649
748	650	require FrmAppHelper::plugin_path() . '/classes/views/frm-entries/direct.php';
749	651	}
		@@ -748,31 +650,8 @@
748	650	require FrmAppHelper::plugin_path() . '/classes/views/frm-entries/direct.php';
749	651	}
750	652
751	653	/**
752		- * Block the form preview for the contact form by default if the user cannot view forms.
753		- * This is to prevent the contact form being exploited.
754		- * Since this form is added by default and every site uses the same key, it is too easy
755		- * to guess this form.
756		- *
757		- * @since 6.20
758		- *
759		- * @param string $form_key Form key.
760		- *
761		- * @return void
762		- */
763		- public static function maybe_block_preview( $form_key ) {
764		- if ( FrmFormsHelper::should_block_preview( $form_key ) ) {
765		- $error = __( 'You do not have permission to view this form', 'formidable' );
766		- wp_die(
767		- '<h1>' . esc_html( $error ) . '</h1>',
768		- '<p>' . esc_html( $error ) . '</p>',
769		- 403
770		- );
771		- }
772		- }
773		-
774		- /**
775	654	* Some themes have a null $src value.
776	655	* This function adds a filter to ensure that $src is not null.
777	656	* WP will call str_starts_with with the null value triggering a deprecated message otherwise.
778	657	*
		@@ -784,9 +663,8 @@
784	663	add_filter(
785	664	'script_loader_src',
786	665	/**
787	666	* @param string|null $src
788		- *
789	667	* @return string
790	668	*/
791	669	function ( $src ) {
792	670	if ( is_null( $src ) ) {
		@@ -802,9 +680,8 @@
802	680	}
803	681
804	682	/**
805	683	* @param array $ids
806		- *
807	684	* @return string
808	685	*/
809	686	public static function bulk_untrash( $ids ) {
810	687	FrmAppHelper::permission_check( 'frm_edit_forms' );
		@@ -816,9 +693,11 @@
816	693	return '';
817	694	}
818	695
819	696	/* translators: %1$s: Number of forms */
820		- return sprintf( _n( '%1$s form restored from the Trash.', '%1$s forms restored from the Trash.', $count, 'formidable' ), $count );
	697	+ $message = sprintf( _n( '%1$s form restored from the Trash.', '%1$s forms restored from the Trash.', $count, 'formidable' ), $count );
	698	+
	699	+ return $message;
821	700	}
822	701
823	702	/**
824	703	* @since 3.06
		@@ -863,9 +742,8 @@
863	742	// Check nonce url.
864	743	check_admin_referer( $status . '_form_' . $params['id'] );
865	744
866	745	$count = 0;
867		-
868	746	if ( FrmForm::set_status( $params['id'], $available_status[ $status ]['new_status'] ) ) {
869	747	++$count;
870	748	}
871	749
		@@ -879,9 +757,9 @@
879	757	/* translators: %1$s: Number of forms */
880	758	$available_status['untrash']['message'] = sprintf( _n( '%1$s form restored from the Trash.', '%1$s forms restored from the Trash.', $count, 'formidable' ), $count );
881	759
882	760	/* translators: %1$s: Number of forms, %2$s: Start link HTML, %3$s: End link HTML */
883		- $available_status['trash']['message'] = sprintf( _n( '%1$s form moved to the Trash. %2$sUndo%3$s', '%1$s forms moved to the Trash. %2$sUndo%3$s', $count, 'formidable' ), $count, '<a href="' . esc_url( wp_nonce_url( '?page=formidable&frm_action=untrash&form_type=' . $form_type . '&id=' . $params['id'], 'untrash_form_' . $params['id'] ) ) . '">', '</a>' ); // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong
	761	+ $available_status['trash']['message'] = sprintf( _n( '%1$s form moved to the Trash. %2$sUndo%3$s', '%1$s forms moved to the Trash. %2$sUndo%3$s', $count, 'formidable' ), $count, '<a href="' . esc_url( wp_nonce_url( '?page=formidable&frm_action=untrash&form_type=' . $form_type . '&id=' . $params['id'], 'untrash_form_' . $params['id'] ) ) . '">', '</a>' );
884	762
885	763	$message = $available_status[ $status ]['message'];
886	764
887	765	self::display_forms_list( $params, $message );
		@@ -888,9 +766,8 @@
888	766	}
889	767
890	768	/**
891	769	* @param array $ids
892		- *
893	770	* @return string
894	771	*/
895	772	public static function bulk_trash( $ids ) {
896	773	FrmAppHelper::permission_check( 'frm_delete_forms' );
		@@ -895,9 +772,8 @@
895	772	public static function bulk_trash( $ids ) {
896	773	FrmAppHelper::permission_check( 'frm_delete_forms' );
897	774
898	775	$count = 0;
899		-
900	776	foreach ( $ids as $id ) {
901	777	if ( FrmForm::trash( $id ) ) {
902	778	++$count;
903	779	}
		@@ -912,16 +788,17 @@
912	788	'param' => 'form_type',
913	789	'type' => 'request',
914	790	)
915	791	);
916		-
917		- return sprintf(
	792	+ $message = sprintf(
918	793	/* translators: %1$s: Number of forms, %2$s: Start link HTML, %3$s: End link HTML */
919	794	_n( '%1$s form moved to the Trash. %2$sUndo%3$s', '%1$s forms moved to the Trash. %2$sUndo%3$s', $count, 'formidable' ),
920	795	$count,
921		- '<a href="' . esc_url( wp_nonce_url( '?page=formidable&frm_action=list&action=bulk_untrash&form_type=' . $current_page . '&item-action=' . implode( ',', $ids ), 'bulk-toplevel_page_formidable' ) ) . '">', // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong
	796	+ '<a href="' . esc_url( wp_nonce_url( '?page=formidable&frm_action=list&action=bulk_untrash&form_type=' . $current_page . '&item-action=' . implode( ',', $ids ), 'bulk-toplevel_page_formidable' ) ) . '">',
922	797	'</a>'
923	798	);
	799	+
	800	+ return $message;
924	801	}
925	802
926	803	public static function destroy() {
927	804	FrmAppHelper::permission_check( 'frm_delete_forms' );
		@@ -931,9 +808,8 @@
931	808	// Check nonce url.
932	809	check_admin_referer( 'destroy_form_' . $params['id'] );
933	810
934	811	$count = 0;
935		-
936	812	if ( FrmForm::destroy( $params['id'] ) ) {
937	813	++$count;
938	814	}
939	815
		@@ -944,9 +820,8 @@
944	820	}
945	821
946	822	/**
947	823	* @param array $ids
948		- *
949	824	* @return string
950	825	*/
951	826	public static function bulk_destroy( $ids ) {
952	827	FrmAppHelper::permission_check( 'frm_delete_forms' );
		@@ -951,12 +826,10 @@
951	826	public static function bulk_destroy( $ids ) {
952	827	FrmAppHelper::permission_check( 'frm_delete_forms' );
953	828
954	829	$count = 0;
955		-
956	830	foreach ( $ids as $id ) {
957	831	$d = FrmForm::destroy( $id );
958		-
959	832	if ( $d ) {
960	833	++$count;
961	834	}
962	835	}
		@@ -974,18 +847,19 @@
974	847	*/
975	848	public static function delete_all() {
976	849	// Check nonce url.
977	850	$permission_error = FrmAppHelper::permission_nonce_error( 'frm_delete_forms', '_wpnonce', 'bulk-toplevel_page_formidable' );
978		-
979	851	if ( $permission_error !== false ) {
980	852	self::display_forms_list( array(), '', array( $permission_error ) );
	853	+
981	854	return;
982	855	}
983	856
984	857	$count = FrmForm::scheduled_delete( time() );
985	858	$url = remove_query_arg( array( 'delete_all' ) );
986		- $url .= '&message=forms_permanently_deleted&forms_deleted=' . $count;
987	859
	860	+ $url .= '&message=forms_permanently_deleted&forms_deleted=' . $count;
	861	+
988	862	wp_safe_redirect( $url );
989	863	die();
990	864	}
991	865
		@@ -1068,9 +942,9 @@
1068	942	if ( ! isset( self::$formidable_tinymce_button ) ) {
1069	943	FrmAppHelper::load_admin_wide_js();
1070	944	$menu_name = FrmAppHelper::get_menu_name();
1071	945	$icon = apply_filters( 'frm_media_icon', FrmAppHelper::svg_logo() );
1072		- self::$formidable_tinymce_button = '<a href="#TB_inline?width=50&height=50&inlineId=frm_insert_form" class="thickbox button add_media frm_insert_form" title="' . esc_attr__( 'Add forms and content', 'formidable' ) . '">' . FrmAppHelper::kses( $icon, 'all' ) . ' ' . esc_html( $menu_name ) . '</a>'; // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong
	946	+ self::$formidable_tinymce_button = '<a href="#TB_inline?width=50&height=50&inlineId=frm_insert_form" class="thickbox button add_media frm_insert_form" title="' . esc_attr__( 'Add forms and content', 'formidable' ) . '">' . FrmAppHelper::kses( $icon, 'all' ) . ' ' . esc_html( $menu_name ) . '</a>';
1073	947	}
1074	948	echo self::$formidable_tinymce_button; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
1075	949	}
1076	950	}
		@@ -1116,9 +990,8 @@
1116	990	private static function should_insert_form_popup() {
1117	991	if ( FrmAppHelper::is_form_builder_page() ) {
1118	992	return true;
1119	993	}
1120		-
1121	994	$page = basename( FrmAppHelper::get_server_value( 'PHP_SELF' ) );
1122	995	return in_array( $page, array( 'post.php', 'page.php', 'page-new.php', 'post-new.php' ), true );
1123	996	}
1124	997
		@@ -1126,10 +999,9 @@
1126	999	FrmAppHelper::permission_check( 'frm_view_forms' );
1127	1000	check_ajax_referer( 'frm_ajax', 'nonce' );
1128	1001
1129	1002	$shortcode = FrmAppHelper::get_post_param( 'shortcode', '', 'sanitize_text_field' );
1130		-
1131		- if ( ! $shortcode ) {
	1003	+ if ( empty( $shortcode ) ) {
1132	1004	wp_die();
1133	1005	}
1134	1006
1135	1007	echo '<div id="sc-opts-' . esc_attr( $shortcode ) . '" class="frm_shortcode_option">';
		@@ -1154,9 +1026,8 @@
1154	1026	'label' => __( 'Minimize form HTML', 'formidable' ),
1155	1027	),
1156	1028	);
1157	1029	}
1158		-
1159	1030	$opts = apply_filters( 'frm_sc_popup_opts', $opts, $shortcode );
1160	1031
1161	1032	if ( isset( $opts['form_id'] ) && is_string( $opts['form_id'] ) ) {
1162	1033	// allow other shortcodes to use the required form id option
		@@ -1176,9 +1047,8 @@
1176	1047	*
1177	1048	* @param array $params
1178	1049	* @param string $message
1179	1050	* @param array $errors
1180		- *
1181	1051	* @return void
1182	1052	*/
1183	1053	public static function display_forms_list( $params = array(), $message = '', $errors = array() ) {
1184	1054	FrmAppHelper::permission_check( 'frm_view_forms' );
		@@ -1195,44 +1065,33 @@
1195	1065	* @param string $table_class Class name for List Helper.
1196	1066	*/
1197	1067	$table_class = apply_filters( 'frm_forms_list_class', 'FrmFormsListHelper' );
1198	1068	$wp_list_table = new $table_class( compact( 'params' ) );
1199		- $pagenum = $wp_list_table->get_pagenum();
1200	1069
	1070	+ $pagenum = $wp_list_table->get_pagenum();
	1071	+
1201	1072	$wp_list_table->prepare_items();
1202	1073
1203	1074	$total_pages = $wp_list_table->get_pagination_arg( 'total_pages' );
1204		-
1205	1075	if ( $pagenum > $total_pages && $total_pages > 0 ) {
1206	1076	wp_redirect( esc_url_raw( add_query_arg( 'paged', $total_pages ) ) );
1207	1077	die();
1208	1078	}
1209	1079
1210		- $error = FrmInbox::check_for_error();
1211		-
1212		- if ( $error ) {
1213		- $show_messages = array( $error['subject'] . '. ' . $error['message'] );
1214		- }
1215		-
1216	1080	require FrmAppHelper::plugin_path() . '/classes/views/frm-forms/list.php';
1217	1081	}
1218	1082
1219	1083	/**
1220	1084	* @param array<string,string> $columns
1221		- *
1222	1085	* @return array<string,string>
1223	1086	*/
1224	1087	public static function get_columns( $columns ) {
1225		- $columns['cb'] = '<input type="checkbox" />';
1226		- $columns['name'] = esc_html__( 'Form Title', 'formidable' );
1227		- $columns['entries'] = esc_html__( 'Entries', 'formidable' );
1228		- $columns['id'] = 'ID';
1229		- $columns['form_key'] = esc_html__( 'Key', 'formidable' );
1230		-
1231		- if ( 'trash' !== FrmAppHelper::simple_get( 'form_type' ) ) {
1232		- $columns['shortcode'] = esc_html__( 'Actions', 'formidable' );
1233		- }
1234		-
	1088	+ $columns['cb'] = '<input type="checkbox" />';
	1089	+ $columns['name'] = esc_html__( 'Form Title', 'formidable' );
	1090	+ $columns['entries'] = esc_html__( 'Entries', 'formidable' );
	1091	+ $columns['id'] = 'ID';
	1092	+ $columns['form_key'] = esc_html__( 'Key', 'formidable' );
	1093	+ $columns['shortcode'] = esc_html__( 'Actions', 'formidable' );
1235	1094	$columns['created_at'] = esc_html__( 'Date', 'formidable' );
1236	1095
1237	1096	add_screen_option(
1238	1097	'per_page',
		@@ -1260,9 +1119,8 @@
1260	1119	}
1261	1120
1262	1121	/**
1263	1122	* @param mixed $hidden_columns
1264		- *
1265	1123	* @return array
1266	1124	*/
1267	1125	public static function hidden_columns( $hidden_columns ) {
1268	1126	if ( ! is_array( $hidden_columns ) ) {
		@@ -1283,15 +1141,8 @@
1283	1141
1284	1142	return $hidden_columns;
1285	1143	}
1286	1144
1287		- /**
1288		- * @param mixed $save
1289		- * @param string $option
1290		- * @param int|string $value
1291		- *
1292		- * @return mixed
1293		- */
1294	1145	public static function save_per_page( $save, $option, $value ) {
1295	1146	if ( $option === 'formidable_page_formidable_per_page' ) {
1296	1147	$save = (int) $value;
1297	1148	}
		@@ -1303,9 +1154,8 @@
1303	1154	* @param int|string $id
1304	1155	* @param array $errors
1305	1156	* @param string $message
1306	1157	* @param bool $create_link
1307		- *
1308	1158	* @return void
1309	1159	*/
1310	1160	private static function get_edit_vars( $id, $errors = array(), $message = '', $create_link = false ) {
1311	1161	global $frm_vars;
		@@ -1320,9 +1170,8 @@
1320	1170	'page' => 'formidable',
1321	1171	)
1322	1172	),
1323	1173	);
1324		-
1325	1174	if ( ! $form ) {
1326	1175	FrmAppController::show_error_modal( $error_args );
1327	1176	return;
1328	1177	}
		@@ -1344,14 +1193,15 @@
1344	1193	}
1345	1194
1346	1195	if ( $form->parent_form_id ) {
1347	1196	/* translators: %1$s: Start link HTML, %2$s: End link HTML */
1348		- wp_die( sprintf( esc_html__( 'You are trying to edit a child form. Please edit from %1$shere%2$s', 'formidable' ), '<a href="' . esc_url( FrmForm::get_edit_link( $form->parent_form_id ) ) . '">', '</a>' ) ); // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong
	1197	+ wp_die( sprintf( esc_html__( 'You are trying to edit a child form. Please edit from %1$shere%2$s', 'formidable' ), '<a href="' . esc_url( FrmForm::get_edit_link( $form->parent_form_id ) ) . '">', '</a>' ) );
1349	1198	}
1350	1199
1351	1200	$frm_field_selection = FrmField::field_selection();
1352		- $fields = FrmField::get_all_for_form( $form->id );
1353	1201
	1202	+ $fields = FrmField::get_all_for_form( $form->id );
	1203	+
1354	1204	// Automatically add end section fields if they don't exist (2.0 migration).
1355	1205	$reset_fields = false;
1356	1206	FrmFormsHelper::auto_add_end_section_fields( $form, $fields, $reset_fields );
1357	1207	FrmSubmitHelper::maybe_create_submit_field( $form, $fields, $reset_fields );
		@@ -1375,10 +1225,9 @@
1375	1225	*/
1376	1226	$values['fields'] = apply_filters( 'frm_fields_in_form_builder', $fields, compact( 'form' ) );
1377	1227
1378	1228	$edit_message = __( 'Form was successfully updated.', 'formidable' );
1379		-
1380		- if ( $form->is_template && $message === $edit_message ) {
	1229	+ if ( $form->is_template && $message == $edit_message ) {
1381	1230	$message = __( 'Template was successfully updated.', 'formidable' );
1382	1231	}
1383	1232
1384	1233	self::maybe_update_form_builder_message( $message );
		@@ -1393,12 +1242,11 @@
1393	1242	}
1394	1243
1395	1244	/**
1396	1245	* @param array $fields
1397		- *
1398	1246	* @return array
1399	1247	*/
1400		- public static function update_form_builder_fields( $fields ) {
	1248	+ public static function update_form_builder_fields( $fields, $form ) {
1401	1249	foreach ( $fields as $field ) {
1402	1250	$field->do_not_include_icons = true;
1403	1251	}
1404	1252	return $fields;
		@@ -1403,13 +1251,8 @@
1403	1251	}
1404	1252	return $fields;
1405	1253	}
1406	1254
1407		- /**
1408		- * @param string $message
1409		- *
1410		- * @return void
1411		- */
1412	1255	public static function maybe_update_form_builder_message( &$message ) {
1413	1256	if ( 'form_duplicated' === FrmAppHelper::simple_get( 'message' ) ) {
1414	1257	$message = __( 'Form was Successfully Copied', 'formidable' );
1415	1258	}
		@@ -1418,9 +1261,8 @@
1418	1261	/**
1419	1262	* @param int|string $id
1420	1263	* @param array $errors
1421	1264	* @param array|string $args
1422		- *
1423	1265	* @return void
1424	1266	*/
1425	1267	public static function get_settings_vars( $id, $errors = array(), $args = array() ) {
1426	1268	FrmAppHelper::permission_check( 'frm_edit_forms' );
		@@ -1442,12 +1284,13 @@
1442	1284	);
1443	1285	$args = array_merge( $defaults, $args );
1444	1286	$message = $args['message'];
1445	1287	$warnings = $args['warnings'];
1446		- $form = FrmForm::getOne( $id );
1447		- $fields = FrmField::get_all_for_form( $id );
1448		- $values = FrmAppHelper::setup_edit_vars( $form, 'forms', $fields, true );
1449	1288
	1289	+ $form = FrmForm::getOne( $id );
	1290	+ $fields = FrmField::get_all_for_form( $id );
	1291	+ $values = FrmAppHelper::setup_edit_vars( $form, 'forms', $fields, true );
	1292	+
1450	1293	/**
1451	1294	* Allows changing fields in the form settings.
1452	1295	*
1453	1296	* @since 5.0.04
		@@ -1487,12 +1330,8 @@
1487	1330	}
1488	1331
1489	1332	/**
1490	1333	* @since 4.0
1491		- *
1492		- * @param array $atts
1493		- *
1494		- * @return void
1495	1334	*/
1496	1335	public static function form_publish_button( $atts ) {
1497	1336	$values = $atts['values'];
1498	1337	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/_publish_box.php';
		@@ -1503,9 +1342,8 @@
1503	1342	*
1504	1343	* @since 4.0
1505	1344	*
1506	1345	* @param array $values
1507		- *
1508	1346	* @return array
1509	1347	*/
1510	1348	private static function get_settings_tabs( $values ) {
1511	1349	$sections = array(
		@@ -1511,20 +1349,20 @@
1511	1349	$sections = array(
1512	1350	'advanced' => array(
1513	1351	'name' => __( 'General', 'formidable' ),
1514	1352	'title' => __( 'General Form Settings', 'formidable' ),
1515		- 'function' => array( self::class, 'advanced_settings' ),
1516		- 'icon' => 'frmfont frm_settings_icon',
	1353	+ 'function' => array( __CLASS__, 'advanced_settings' ),
	1354	+ 'icon' => 'frm_icon_font frm_settings_icon',
1517	1355	),
1518	1356	'email' => array(
1519	1357	'name' => __( 'Actions & Notifications', 'formidable' ),
1520	1358	'function' => array( 'FrmFormActionsController', 'email_settings' ),
1521	1359	'id' => 'frm_notification_settings',
1522		- 'icon' => 'frmfont frm_mail_bulk_icon',
	1360	+ 'icon' => 'frm_icon_font frm_mail_bulk_icon',
1523	1361	),
1524	1362	'permissions' => array(
1525	1363	'name' => __( 'Form Permissions', 'formidable' ),
1526		- 'icon' => 'frmfont frm_lock_closed_icon',
	1364	+ 'icon' => 'frm_icon_font frm_lock_closed_icon',
1527	1365	'html_class' => 'frm_show_upgrade_tab frm_noallow',
1528	1366	'data' => array(
1529	1367	'medium' => 'permissions',
1530	1368	'upgrade' => __( 'Form Permissions', 'formidable' ),
		@@ -1529,37 +1367,35 @@
1529	1367	'medium' => 'permissions',
1530	1368	'upgrade' => __( 'Form Permissions', 'formidable' ),
1531	1369	'message' => __( 'Allow editing, protect forms and files, limit entries, and save drafts. Upgrade to get form and entry permissions.', 'formidable' ),
1532	1370	'screenshot' => 'permissions.png',
1533		- 'learn-more' => FrmAppHelper::get_doc_url( 'general-form-settings/#kb-form-permissions', 'form-permissions-settings' ),
1534	1371	),
1535	1372	),
1536	1373	'scheduling' => array(
1537	1374	'name' => __( 'Form Scheduling', 'formidable' ),
1538		- 'icon' => 'frmfont frm_calendar_icon',
	1375	+ 'icon' => 'frm_icon_font frm_calendar_icon',
1539	1376	'html_class' => 'frm_show_upgrade_tab frm_noallow',
1540	1377	'data' => array(
1541	1378	'medium' => 'scheduling',
1542	1379	'upgrade' => __( 'Form scheduling settings', 'formidable' ),
1543	1380	'screenshot' => 'scheduling.png',
1544		- 'learn-more' => FrmAppHelper::get_doc_url( 'general-form-settings/#kb-form-scheduling', 'form-scheduling-settings' ),
1545	1381	),
1546	1382	),
1547	1383	'buttons' => array(
1548	1384	'name' => __( 'Buttons', 'formidable' ),
1549		- 'class' => self::class,
	1385	+ 'class' => __CLASS__,
1550	1386	'function' => 'buttons_settings',
1551		- 'icon' => 'frmfont frm_button_icon',
	1387	+ 'icon' => 'frm_icon_font frm_button_icon',
1552	1388	),
1553	1389	'landing' => array(
1554	1390	'name' => __( 'Form Landing Page', 'formidable' ),
1555		- 'icon' => 'frmfont frm_file_text_icon',
	1391	+ 'icon' => 'frm_icon_font frm_file_text_icon',
1556	1392	'html_class' => 'frm_show_upgrade_tab frm_noallow',
1557	1393	'data' => FrmAppHelper::get_landing_page_upgrade_data_params(),
1558	1394	),
1559	1395	'chat' => array(
1560	1396	'name' => __( 'Conversational Forms', 'formidable' ),
1561		- 'icon' => 'frmfont frm_chat_forms_icon',
	1397	+ 'icon' => 'frm_icon_font frm_chat_forms_icon',
1562	1398	'html_class' => 'frm_show_upgrade_tab frm_noallow',
1563	1399	'data' => FrmAppHelper::get_upgrade_data_params(
1564	1400	'chat',
1565	1401	array(
		@@ -1565,15 +1401,14 @@
1565	1401	array(
1566	1402	'upgrade' => __( 'Conversational Forms', 'formidable' ),
1567	1403	'message' => __( 'Ask one question at a time for automated conversations.', 'formidable' ),
1568	1404	'screenshot' => 'chat.png',
1569		- 'learn-more' => FrmAppHelper::get_doc_url( 'conversational-forms', 'conversational-forms-settings', false ),
1570	1405	)
1571	1406	),
1572	1407	),
1573	1408	'abandonment' => array(
1574	1409	'name' => __( 'Form Abandonment', 'formidable' ),
1575		- 'icon' => 'frmfont frm_abandoned_icon',
	1410	+ 'icon' => 'frm_icon_font frm_abandoned_icon',
1576	1411	'html_class' => 'frm_show_upgrade_tab frm_noallow',
1577	1412	'data' => FrmAppHelper::get_upgrade_data_params(
1578	1413	'abandonment',
1579	1414	array(
		@@ -1579,17 +1414,16 @@
1579	1414	array(
1580	1415	'upgrade' => __( 'Form abandonment settings', 'formidable' ),
1581	1416	'message' => __( 'Unlock the power of data capture to boost lead generation and master the art of form optimization.', 'formidable' ),
1582	1417	'screenshot' => 'abandonment.png',
1583		- 'learn-more' => FrmAppHelper::get_doc_url( 'features/form-abandonment-wordpress-plugin', 'form-abandonment-settings', false ),
1584	1418	)
1585	1419	),
1586	1420	),
1587	1421	'html' => array(
1588	1422	'name' => __( 'Customize HTML', 'formidable' ),
1589		- 'class' => self::class,
	1423	+ 'class' => __CLASS__,
1590	1424	'function' => 'html_settings',
1591		- 'icon' => 'frmfont frm_code_icon',
	1425	+ 'icon' => 'frm_icon_font frm_code_icon',
1592	1426	),
1593	1427	);
1594	1428
1595	1429	if ( ! has_action( 'frm_add_form_style_tab_options' ) && ! has_action( 'frm_add_form_button_options' ) ) {
		@@ -1595,8 +1429,14 @@
1595	1429	if ( ! has_action( 'frm_add_form_style_tab_options' ) && ! has_action( 'frm_add_form_button_options' ) ) {
1596	1430	unset( $sections['buttons'] );
1597	1431	}
1598	1432
	1433	+ foreach ( array( 'landing', 'chat', 'abandonment' ) as $feature ) {
	1434	+ if ( ! FrmAppHelper::show_new_feature( $feature ) ) {
	1435	+ unset( $sections[ $feature ] );
	1436	+ }
	1437	+ }
	1438	+
1599	1439	$sections = apply_filters( 'frm_add_form_settings_section', $sections, $values );
1600	1440
1601	1441	foreach ( $sections as $key => $section ) {
1602	1442	$defaults = array(
		@@ -1601,9 +1441,9 @@
1601	1441	foreach ( $sections as $key => $section ) {
1602	1442	$defaults = array(
1603	1443	'html_class' => '',
1604	1444	'name' => ucfirst( $key ),
1605		- 'icon' => 'frmfont frm_settings_icon',
	1445	+ 'icon' => 'frm_icon_font frm_settings_icon',
1606	1446	);
1607	1447
1608	1448	$section = array_merge( $defaults, $section );
1609	1449
		@@ -1609,9 +1449,8 @@
1609	1449
1610	1450	if ( ! isset( $section['anchor'] ) ) {
1611	1451	$section['anchor'] = $key;
1612	1452	}
1613		-
1614	1453	$section['anchor'] .= '_settings';
1615	1454
1616	1455	if ( ! isset( $section['title'] ) ) {
1617	1456	$section['title'] = $section['name'];
		@@ -1630,19 +1469,18 @@
1630	1469	/**
1631	1470	* @since 4.0
1632	1471	*
1633	1472	* @param array $values
1634		- *
1635	1473	* @return void
1636	1474	*/
1637	1475	public static function advanced_settings( $values ) {
1638	1476	$first_h3 = 'frm_first_h3';
	1477	+
1639	1478	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings-advanced.php';
1640	1479	}
1641	1480
1642	1481	/**
1643	1482	* @param array $values
1644		- *
1645	1483	* @return void
1646	1484	*/
1647	1485	public static function render_spam_settings( $values ) {
1648	1486	if ( function_exists( 'akismet_http_post' ) ) {
		@@ -1647,9 +1485,9 @@
1647	1485	public static function render_spam_settings( $values ) {
1648	1486	if ( function_exists( 'akismet_http_post' ) ) {
1649	1487	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/spam-settings/akismet.php';
1650	1488	}
1651		- include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/spam-settings/stopforumspam.php';
	1489	+ include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/spam-settings/honeypot.php';
1652	1490	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/spam-settings/antispam.php';
1653	1491	}
1654	1492
1655	1493	/**
		@@ -1655,9 +1493,8 @@
1655	1493	/**
1656	1494	* @since 4.0
1657	1495	*
1658	1496	* @param array $values
1659		- *
1660	1497	* @return void
1661	1498	*/
1662	1499	public static function buttons_settings( $values ) {
1663	1500	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings-buttons.php';
		@@ -1666,9 +1503,8 @@
1666	1503	/**
1667	1504	* @since 4.0
1668	1505	*
1669	1506	* @param array $values
1670		- *
1671	1507	* @return void
1672	1508	*/
1673	1509	public static function html_settings( $values ) {
1674	1510	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings-html.php';
		@@ -1679,9 +1515,8 @@
1679	1515	*
1680	1516	* @since 2.03.08
1681	1517	*
1682	1518	* @param array|bool $values
1683		- *
1684	1519	* @return void
1685	1520	*/
1686	1521	private static function clean_submit_html( &$values ) {
1687	1522	if ( is_array( $values ) && isset( $values['submit_html'] ) ) {
		@@ -1704,17 +1539,13 @@
1704	1539	return $classes;
1705	1540	}
1706	1541
1707	1542	/**
1708		- * @since 6.27 Added $template_path parameter.
1709		- *
1710	1543	* @param int|string $form_id
1711	1544	* @param string $class
1712		- * @param string $template_path The path to a template file to use instead of the default.
1713		- *
1714	1545	* @return void
1715	1546	*/
1716		- public static function mb_tags_box( $form_id, $class = '', $template_path = 'default' ) {
	1547	+ public static function mb_tags_box( $form_id, $class = '' ) {
1717	1548	$fields = FrmField::get_all_for_form( $form_id, '', 'include' );
1718	1549
1719	1550	/**
1720	1551	* Allows modifying the list of fields in the tags box.
		@@ -1723,30 +1554,23 @@
1723	1554	*
1724	1555	* @param array $fields The list of fields.
1725	1556	* @param array $args The arguments. Contains `form_id`.
1726	1557	*/
1727		- $fields = apply_filters( 'frm_fields_in_tags_box', $fields, compact( 'form_id' ) );
1728		- $linked_forms = array();
1729		- $col = 'one';
1730		- $settings_tab = FrmAppHelper::is_admin_page( 'formidable' );
	1558	+ $fields = apply_filters( 'frm_fields_in_tags_box', $fields, compact( 'form_id' ) );
	1559	+ $linked_forms = array();
	1560	+ $col = 'one';
	1561	+ $settings_tab = FrmAppHelper::is_admin_page( 'formidable' );
	1562	+
1731	1563	$cond_shortcodes = apply_filters( 'frm_conditional_shortcodes', array() );
1732	1564	$entry_shortcodes = self::get_shortcode_helpers( $settings_tab );
	1565	+
1733	1566	$advanced_helpers = self::advanced_helpers( compact( 'fields', 'form_id' ) );
1734	1567
1735		- if ( 'default' === $template_path || ! file_exists( $template_path ) ) {
1736		- include FrmAppHelper::plugin_path() . '/classes/views/shared/mb_adv_info.php';
1737		- return;
1738		- }
1739		-
1740		- include $template_path;
	1568	+ include FrmAppHelper::plugin_path() . '/classes/views/shared/mb_adv_info.php';
1741	1569	}
1742	1570
1743	1571	/**
1744	1572	* @since 3.04.01
1745		- *
1746		- * @param array $atts
1747		- *
1748		- * @return array
1749	1573	*/
1750	1574	private static function advanced_helpers( $atts ) {
1751	1575	$advanced_helpers = array(
1752	1576	'default' => array(
		@@ -1755,12 +1579,10 @@
1755	1579	),
1756	1580	);
1757	1581
1758	1582	$user_fields = self::user_shortcodes();
1759		-
1760	1583	if ( $user_fields ) {
1761	1584	$user_helpers = array();
1762		-
1763	1585	foreach ( $user_fields as $uk => $uf ) {
1764	1586	$user_helpers[ '|user_id| show="' . $uk . '"' ] = $uf;
1765	1587	unset( $uk, $uf );
1766	1588	}
		@@ -1785,10 +1607,8 @@
1785	1607	* Get an array of the options to display in the advanced tab
1786	1608	* of the customization panel
1787	1609	*
1788	1610	* @since 2.0.6
1789		- *
1790		- * @return array
1791	1611	*/
1792	1612	private static function get_advanced_shortcodes() {
1793	1613	$adv_shortcodes = array(
1794	1614	'x sep=", "' => array(
		@@ -1805,18 +1625,17 @@
1805	1625	'label' => __( 'No Auto P', 'formidable' ),
1806	1626	'title' => __( 'Do not automatically add any paragraphs or line breaks', 'formidable' ),
1807	1627	),
1808	1628	);
	1629	+ $adv_shortcodes = apply_filters( 'frm_advanced_shortcodes', $adv_shortcodes );
1809	1630
1810	1631	// __( 'Leave blank instead of defaulting to User Login', 'formidable' ) : blank=1
1811	1632
1812		- return apply_filters( 'frm_advanced_shortcodes', $adv_shortcodes );
	1633	+ return $adv_shortcodes;
1813	1634	}
1814	1635
1815	1636	/**
1816	1637	* @since 3.04.01
1817		- *
1818		- * @return array
1819	1638	*/
1820	1639	private static function user_shortcodes() {
1821	1640	$options = array(
1822	1641	'ID' => __( 'User ID', 'formidable' ),
		@@ -1835,12 +1654,8 @@
1835	1654	/**
1836	1655	* Get an array of the helper shortcodes to display in the customization panel
1837	1656	*
1838	1657	* @since 2.0.6
1839		- *
1840		- * @param bool $settings_tab
1841		- *
1842		- * @return array
1843	1658	*/
1844	1659	private static function get_shortcode_helpers( $settings_tab ) {
1845	1660	$entry_shortcodes = array(
1846	1661	'id' => __( 'Entry ID', 'formidable' ),
		@@ -1855,9 +1670,8 @@
1855	1670	'form_name' => __( 'Form Name', 'formidable' ),
1856	1671	);
1857	1672
1858	1673	$entry_shortcodes = array_merge( FrmShortcodeHelper::get_contextual_shortcode_values(), $entry_shortcodes );
1859		-
1860	1674	if ( ! FrmAppHelper::pro_is_installed() ) {
1861	1675	unset( $entry_shortcodes['post_id'] );
1862	1676	}
1863	1677
		@@ -1865,13 +1679,12 @@
1865	1679	* Use this hook to add or remove buttons in the helpers section
1866	1680	* in the customization panel
1867	1681	*
1868	1682	* @since 2.0.6
1869		- *
1870		- * @param array $entry_shortcodes
1871		- * @param bool $settings_tab
1872	1683	*/
1873		- return apply_filters( 'frm_helper_shortcodes', $entry_shortcodes, $settings_tab );
	1684	+ $entry_shortcodes = apply_filters( 'frm_helper_shortcodes', $entry_shortcodes, $settings_tab );
	1685	+
	1686	+ return $entry_shortcodes;
1874	1687	}
1875	1688
1876	1689	/**
1877	1690	* Insert the form class setting into the form.
		@@ -1876,9 +1689,8 @@
1876	1689	/**
1877	1690	* Insert the form class setting into the form.
1878	1691	*
1879	1692	* @param stdClass $form
1880		- *
1881	1693	* @return void
1882	1694	*/
1883	1695	public static function form_classes( $form ) {
1884	1696	if ( isset( $form->options['form_class'] ) ) {
		@@ -1889,9 +1701,9 @@
1889	1701	echo ' frm_js_validate ';
1890	1702	self::add_js_validate_form_to_global_vars( $form );
1891	1703	}
1892	1704
1893		- if ( FrmForm::is_ajax_on( $form ) ) {
	1705	+ if ( ! FrmFormsHelper::should_use_pro_for_ajax_submit() && FrmForm::is_ajax_on( $form ) ) {
1894	1706	echo ' frm_ajax_submit ';
1895	1707	}
1896	1708	}
1897	1709
		@@ -1901,9 +1713,8 @@
1901	1713	* @param stdClass $form
1902	1714	*/
1903	1715	public static function add_js_validate_form_to_global_vars( $form ) {
1904	1716	global $frm_vars;
1905		-
1906	1717	if ( ! isset( $frm_vars['js_validate_forms'] ) ) {
1907	1718	$frm_vars['js_validate_forms'] = array();
1908	1719	}
1909	1720	$frm_vars['js_validate_forms'][ $form->id ] = $form;
		@@ -1926,9 +1737,8 @@
1926	1737	/**
1927	1738	* @param string $content
1928	1739	* @param int|stdClass|string $form
1929	1740	* @param false|int|stdClass|string $entry
1930		- *
1931	1741	* @return string
1932	1742	*/
1933	1743	public static function filter_content( $content, $form, $entry = false ) {
1934	1744	$content = self::replace_form_name_shortcodes( $content, $form );
		@@ -1933,9 +1743,8 @@
1933	1743	public static function filter_content( $content, $form, $entry = false ) {
1934	1744	$content = self::replace_form_name_shortcodes( $content, $form );
1935	1745
1936	1746	self::get_entry_by_param( $entry );
1937		-
1938	1747	if ( ! $entry ) {
1939	1748	return $content;
1940	1749	}
1941	1750
		@@ -1951,10 +1760,11 @@
1951	1760	$form = $entry->parent_entry->form_id;
1952	1761	}
1953	1762
1954	1763	$shortcodes = FrmFieldsHelper::get_shortcodes( $content, $form );
	1764	+ $content = apply_filters( 'frm_replace_content_shortcodes', $content, $entry, $shortcodes );
1955	1765
1956		- return apply_filters( 'frm_replace_content_shortcodes', $content, $entry, $shortcodes );
	1766	+ return $content;
1957	1767	}
1958	1768
1959	1769	/**
1960	1770	* Replace any [form_name] shortcodes in a string.
		@@ -1962,9 +1772,8 @@
1962	1772	* @since 5.5
1963	1773	*
1964	1774	* @param array|string $string
1965	1775	* @param int|stdClass|string $form
1966		- *
1967	1776	* @return array|string
1968	1777	*/
1969	1778	public static function replace_form_name_shortcodes( $string, $form ) {
1970	1779	if ( ! is_string( $string ) ) {
		@@ -1970,9 +1779,9 @@
1970	1779	if ( ! is_string( $string ) ) {
1971	1780	return $string;
1972	1781	}
1973	1782
1974		- if ( ! str_contains( $string, '[form_name]' ) ) {
	1783	+ if ( false === strpos( $string, '[form_name]' ) ) {
1975	1784	return $string;
1976	1785	}
1977	1786
1978	1787	if ( ! is_object( $form ) ) {
		@@ -1984,9 +1793,8 @@
1984	1793	}
1985	1794
1986	1795	/**
1987	1796	* @param false|int|stdClass|string $entry
1988		- *
1989	1797	* @return void
1990	1798	*/
1991	1799	private static function get_entry_by_param( &$entry ) {
1992	1800	if ( ! $entry || ! is_object( $entry ) ) {
		@@ -1997,15 +1805,8 @@
1997	1805	FrmEntry::maybe_get_entry( $entry );
1998	1806	}
1999	1807	}
2000	1808
2001		- /**
2002		- * @param string $content
2003		- * @param false|object $entry
2004		- * @param array $shortcodes
2005		- *
2006		- * @return string
2007		- */
2008	1809	public static function replace_content_shortcodes( $content, $entry, $shortcodes ) {
2009	1810	return FrmFieldsHelper::replace_content_shortcodes( $content, $entry, $shortcodes );
2010	1811	}
2011	1812
		@@ -2010,9 +1811,8 @@
2010	1811	}
2011	1812
2012	1813	/**
2013	1814	* @param array $errors
2014		- *
2015	1815	* @return array
2016	1816	*/
2017	1817	public static function process_bulk_form_actions( $errors ) {
2018	1818	if ( ! $_REQUEST ) {
		@@ -2019,30 +1819,29 @@
2019	1819	return $errors;
2020	1820	}
2021	1821
2022	1822	$bulkaction = FrmAppHelper::get_param( 'action', '', 'get', 'sanitize_text_field' );
2023		-
2024		- // phpcs:ignore Universal.Operators.StrictComparisons
2025	1823	if ( $bulkaction == - 1 ) {
2026	1824	$bulkaction = FrmAppHelper::get_param( 'action2', '', 'get', 'sanitize_title' );
2027	1825	}
2028	1826
2029		- if ( $bulkaction && str_starts_with( $bulkaction, 'bulk_' ) ) {
	1827	+ if ( ! empty( $bulkaction ) && strpos( $bulkaction, 'bulk_' ) === 0 ) {
2030	1828	FrmAppHelper::remove_get_action();
	1829	+
2031	1830	$bulkaction = str_replace( 'bulk_', '', $bulkaction );
2032	1831	}
2033	1832
2034	1833	$ids = FrmAppHelper::get_param( 'item-action', '', 'get', 'sanitize_text_field' );
	1834	+ if ( empty( $ids ) ) {
	1835	+ $errors[] = __( 'No forms were specified', 'formidable' );
2035	1836
2036		- if ( ! $ids ) {
2037		- $errors[] = __( 'No forms were specified', 'formidable' );
2038	1837	return $errors;
2039	1838	}
2040	1839
2041	1840	$permission_error = FrmAppHelper::permission_nonce_error( '', '_wpnonce', 'bulk-toplevel_page_formidable' );
2042		-
2043	1841	if ( $permission_error !== false ) {
2044	1842	$errors[] = $permission_error;
	1843	+
2045	1844	return $errors;
2046	1845	}
2047	1846
2048	1847	if ( ! is_array( $ids ) ) {
		@@ -2066,24 +1865,9 @@
2066	1865
2067	1866	return $errors;
2068	1867	}
2069	1868
2070		- /**
2071		- * Includes html that shows a message when the device is too small to use Formidable Forms admin pages.
2072		- *
2073		- * @since 6.20
2074		- *
2075		- * @return void
2076		- */
2077		- public static function include_device_too_small_message() {
2078		- if ( ! FrmAppHelper::is_formidable_admin() ) {
2079		- return;
2080		- }
2081		-
2082		- include FrmAppHelper::plugin_path() . '/classes/views/shared/small-device-message.php';
2083		- }
2084		-
2085		- public static function route() { // phpcs:ignore Generic.Metrics.CyclomaticComplexity.MaxExceeded
	1869	+ public static function route() {
2086	1870	$action = isset( $_REQUEST['frm_action'] ) ? 'frm_action' : 'action';
2087	1871	$vars = array();
2088	1872	FrmAppHelper::include_svg();
2089	1873
		@@ -2093,13 +1877,11 @@
2093	1877	// Javascript needs to be allowed in some field settings.
2094	1878	// phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized, WordPress.Security.NonceVerification.Missing
2095	1879	$json_vars = htmlspecialchars_decode( nl2br( str_replace( '&quot;', '"', wp_unslash( $_POST['frm_compact_fields'] ) ) ) );
2096	1880	$json_vars = json_decode( $json_vars, true );
2097		-
2098		- if ( ! $json_vars ) {
	1881	+ if ( empty( $json_vars ) ) {
2099	1882	// json decoding failed so we should return an error message.
2100	1883	$action = FrmAppHelper::get_param( $action, '', 'get', 'sanitize_title' );
2101		-
2102	1884	if ( 'edit' === $action ) {
2103	1885	$action = 'update';
2104	1886	}
2105	1887
		@@ -2112,9 +1894,8 @@
2112	1894	$_POST = array_merge( $_POST, $_REQUEST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
2113	1895	}
2114	1896	} else {
2115	1897	$action = FrmAppHelper::get_param( $action, '', 'get', 'sanitize_title' );
2116		-
2117	1898	if ( isset( $_REQUEST['delete_all'] ) ) {
2118	1899	// Override the action for this page.
2119	1900	$action = 'delete_all';
2120	1901	}
		@@ -2134,38 +1915,34 @@
2134	1915	case 'update_settings':
2135	1916	return self::$action( $vars );
2136	1917	case 'lite-reports':
2137	1918	self::no_reports( $vars );
2138		- return null;
	1919	+ return;
2139	1920	case 'views':
2140	1921	self::no_views( $vars );
2141		- return null;
	1922	+ return;
2142	1923	default:
2143	1924	do_action( 'frm_form_action_' . $action );
2144		-
2145	1925	if ( apply_filters( 'frm_form_stop_action_' . $action, false ) ) {
2146		- return null;
	1926	+ return;
2147	1927	}
2148	1928
2149	1929	$action = FrmAppHelper::get_param( 'action', '', 'get', 'sanitize_text_field' );
2150		-
2151		- // phpcs:ignore Universal.Operators.StrictComparisons
2152	1930	if ( $action == - 1 ) {
2153	1931	$action = FrmAppHelper::get_param( 'action2', '', 'get', 'sanitize_title' );
2154	1932	}
2155	1933
2156		- if ( str_starts_with( $action, 'bulk_' ) ) {
	1934	+ if ( strpos( $action, 'bulk_' ) === 0 ) {
2157	1935	FrmAppHelper::remove_get_action();
2158	1936
2159	1937	self::list_form();
2160		- return null;
	1938	+ return;
2161	1939	}
2162	1940
2163	1941	$message = FrmAppHelper::get_param( 'message' );
2164		-
2165	1942	if ( 'form_duplicate_error' === $message ) {
2166	1943	self::display_forms_list( array(), '', array( __( 'There was a problem duplicating the form', 'formidable' ) ) );
2167		- return null;
	1944	+ return;
2168	1945	}
2169	1946
2170	1947	if ( 'forms_permanently_deleted' === $message ) {
2171	1948	$count = FrmAppHelper::get_param( 'forms_deleted', 0, 'get', 'absint' );
		@@ -2171,14 +1948,14 @@
2171	1948	$count = FrmAppHelper::get_param( 'forms_deleted', 0, 'get', 'absint' );
2172	1949	/* translators: %1$s: Number of forms */
2173	1950	$message = sprintf( _n( '%1$s form permanently deleted.', '%1$s forms permanently deleted.', $count, 'formidable' ), $count );
2174	1951	self::display_forms_list( array(), $message, '' );
2175		- return null;
	1952	+ return;
2176	1953	}
2177	1954
2178	1955	self::display_forms_list();
2179	1956
2180		- return null;
	1957	+ return;
2181	1958	}//end switch
2182	1959	}
2183	1960
2184	1961	/**
		@@ -2197,43 +1974,19 @@
2197	1974
2198	1975	// Get posted data
2199	1976	$form_id = FrmAppHelper::get_post_param( 'form_id', '', 'absint' );
2200	1977	$name = FrmAppHelper::get_post_param( 'form_name', '', 'sanitize_text_field' );
2201		- $form = FrmForm::getOne( $form_id );
2202	1978
2203		- if ( ! $form ) {
2204		- wp_send_json_error( __( 'Form not found', 'formidable' ) );
2205		- }
	1979	+ // Update the form name and form key.
	1980	+ $form_key = FrmAppHelper::get_unique_key( sanitize_title( $name ), 'frm_forms', 'form_key' );
	1981	+ FrmForm::update( $form_id, compact( 'name', 'form_key' ) );
2206	1982
2207		- if ( $name === $form->name ) {
2208		- // Nothing to change so exit early.
2209		- wp_send_json_success();
2210		- }
2211		-
2212		- $to_update = array(
2213		- 'name' => $name,
2214		- );
2215		-
2216		- if ( '' !== $name ) {
2217		- // Only update form_key if name is not empty.
2218		- $form_key = FrmAppHelper::get_unique_key( sanitize_title( $name ), 'frm_forms', 'form_key' );
2219		- $to_update['form_key'] = $form_key;
2220		- } else {
2221		- $form_key = $form->form_key;
2222		- }
2223		-
2224		- FrmForm::update( $form_id, $to_update );
2225		-
2226	1983	wp_send_json_success( compact( 'form_key' ) );
2227	1984	}
2228	1985
2229		- /**
2230		- * @param array $errors
2231		- *
2232		- * @return array
2233		- */
2234	1986	public static function json_error( $errors ) {
2235	1987	$errors['json'] = __( 'Abnormal HTML characters prevented your form from saving correctly', 'formidable' );
	1988	+
2236	1989	return $errors;
2237	1990	}
2238	1991
2239	1992	/**
		@@ -2240,10 +1993,8 @@
2240	1993	* Add education about views.
2241	1994	*
2242	1995	* @since 4.07
2243	1996	*
2244		- * @param array $values
2245		- *
2246	1997	* @return void
2247	1998	*/
2248	1999	public static function no_views( $values = array() ) {
2249	2000	FrmAppHelper::include_svg();
		@@ -2257,10 +2008,8 @@
2257	2008	* Add education about reports.
2258	2009	*
2259	2010	* @since 4.07
2260	2011	*
2261		- * @param array $values
2262		- *
2263	2012	* @return void
2264	2013	*/
2265	2014	public static function no_reports( $values = array() ) {
2266	2015	$id = FrmAppHelper::get_param( 'form', '', 'get', 'absint' );
		@@ -2287,9 +2036,8 @@
2287	2036	* @since 4.05.02
2288	2037	*/
2289	2038	private static function move_menu_to_footer() {
2290	2039	$settings = FrmAppHelper::get_settings();
2291		-
2292	2040	if ( empty( $settings->admin_bar ) ) {
2293	2041	remove_action( 'wp_body_open', 'wp_admin_bar_render', 0 );
2294	2042	}
2295	2043	}
		@@ -2295,15 +2043,13 @@
2295	2043	}
2296	2044
2297	2045	public static function admin_bar_configure() {
2298	2046	global $frm_vars;
2299		-
2300	2047	if ( empty( $frm_vars['forms_loaded'] ) ) {
2301	2048	return;
2302	2049	}
2303	2050
2304	2051	$actions = array();
2305		-
2306	2052	foreach ( $frm_vars['forms_loaded'] as $form ) {
2307	2053	if ( is_object( $form ) ) {
2308	2054	$actions[ $form->id ] = $form->name;
2309	2055	}
		@@ -2309,9 +2055,9 @@
2309	2055	}
2310	2056	unset( $form );
2311	2057	}
2312	2058
2313		- if ( ! $actions ) {
	2059	+ if ( empty( $actions ) ) {
2314	2060	return;
2315	2061	}
2316	2062
2317	2063	self::add_menu_to_admin_bar();
		@@ -2337,12 +2083,8 @@
2337	2083	}
2338	2084
2339	2085	/**
2340	2086	* @since 2.05.07
2341		- *
2342		- * @param array $actions
2343		- *
2344		- * @return void
2345	2087	*/
2346	2088	private static function add_forms_to_admin_bar( $actions ) {
2347	2089	global $wp_admin_bar;
2348	2090
		@@ -2348,8 +2090,9 @@
2348	2090
2349	2091	asort( $actions );
2350	2092
2351	2093	foreach ( $actions as $form_id => $name ) {
	2094	+
2352	2095	$wp_admin_bar->add_node(
2353	2096	array(
2354	2097	'parent' => 'frm-forms',
2355	2098	'id' => 'edit_form_' . $form_id,
		@@ -2363,14 +2106,12 @@
2363	2106	/**
2364	2107	* The formidable shortcode
2365	2108	*
2366	2109	* @param array $atts The params from the shortcode.
2367		- *
2368	2110	* @return string
2369	2111	*/
2370	2112	public static function get_form_shortcode( $atts ) {
2371	2113	global $frm_vars;
2372		-
2373	2114	if ( ! empty( $frm_vars['skip_shortcode'] ) ) {
2374	2115	$sc = '[formidable';
2375	2116	$sc .= FrmAppHelper::array_to_html_params( $atts );
2376	2117	return $sc . ']';
		@@ -2399,9 +2140,8 @@
2399	2140	* @since 5.2.01
2400	2141	*
2401	2142	* @param false|int|string $id
2402	2143	* @param false|string $key
2403		- *
2404	2144	* @return false|stdClass
2405	2145	*/
2406	2146	private static function maybe_get_form_by_id_or_key( $id, $key ) {
2407	2147	if ( ! $id ) {
		@@ -2415,9 +2155,8 @@
2415	2155	* @param false|string $key
2416	2156	* @param bool|int|string $title may be 'auto', true, false, 'true', 'false', 'yes', '1', 1, '0', 0.
2417	2157	* @param bool|int|string $description may be 'auto', true, false, 'true', 'false', 'yes', '1', 1, '0', 0.
2418	2158	* @param array $atts
2419		- *
2420	2159	* @return string
2421	2160	*/
2422	2161	public static function show_form( $id = '', $key = '', $title = false, $description = false, $atts = array() ) {
2423	2162	$form = self::maybe_get_form_by_id_or_key( $id, $key );
		@@ -2438,9 +2177,10 @@
2438	2177
2439	2178	add_action( 'frm_load_form_hooks', 'FrmHooksController::trigger_load_form_hooks' );
2440	2179	FrmAppHelper::trigger_hook_load( 'form', $form );
2441	2180
2442		- $form = apply_filters( 'frm_pre_display_form', $form );
	2181	+ $form = apply_filters( 'frm_pre_display_form', $form );
	2182	+
2443	2183	$frm_settings = FrmAppHelper::get_settings( array( 'current_form' => $form->id ) );
2444	2184
2445	2185	if ( self::is_viewable_draft_form( $form ) ) {
2446	2186	// don't show a draft form on a page
		@@ -2464,18 +2204,16 @@
2464	2204	}
2465	2205
2466	2206	/**
2467	2207	* @param false|int|string $id
2468		- *
2469	2208	* @return false|stdClass
2470	2209	*/
2471	2210	private static function maybe_get_form_to_show( $id ) {
2472	2211	$form = false;
2473	2212
2474		- if ( $id ) {
	2213	+ if ( ! empty( $id ) ) {
2475	2214	// Form id or key is set.
2476	2215	$form = FrmForm::getOne( $id );
2477		-
2478	2216	if ( ! $form || $form->parent_form_id || $form->status === 'trash' ) {
2479	2217	$form = false;
2480	2218	}
2481	2219	}
		@@ -2482,25 +2220,12 @@
2482	2220
2483	2221	return $form;
2484	2222	}
2485	2223
2486		- /**
2487		- * @param object $form
2488		- *
2489		- * @return bool
2490		- */
2491	2224	private static function is_viewable_draft_form( $form ) {
2492	2225	return $form->status === 'draft' && current_user_can( 'frm_edit_forms' ) && ! FrmAppHelper::is_preview_page();
2493	2226	}
2494	2227
2495		- /**
2496		- * @param object $form
2497		- * @param bool $title
2498		- * @param bool $description
2499		- * @param array $atts
2500		- *
2501		- * @return string
2502		- */
2503	2228	public static function get_form( $form, $title, $description, $atts = array() ) {
2504	2229	ob_start();
2505	2230
2506	2231	do_action( 'frm_before_get_form', $atts );
		@@ -2507,9 +2232,10 @@
2507	2232
2508	2233	self::get_form_contents( $form, $title, $description, $atts );
2509	2234	self::enqueue_scripts( FrmForm::get_params( $form ) );
2510	2235
2511		- $contents = ob_get_clean();
	2236	+ $contents = ob_get_contents();
	2237	+ ob_end_clean();
2512	2238
2513	2239	self::maybe_minimize_form( $atts, $contents );
2514	2240
2515	2241	return $contents;
		@@ -2514,25 +2240,12 @@
2514	2240
2515	2241	return $contents;
2516	2242	}
2517	2243
2518		- /**
2519		- * @param array $params
2520		- *
2521		- * @return void
2522		- */
2523	2244	public static function enqueue_scripts( $params ) {
2524	2245	do_action( 'frm_enqueue_form_scripts', $params );
2525	2246	}
2526	2247
2527		- /**
2528		- * @param object $form
2529		- * @param bool $title
2530		- * @param bool $description
2531		- * @param array $atts
2532		- *
2533		- * @return void
2534		- */
2535	2248	public static function get_form_contents( $form, $title, $description, $atts ) {
2536	2249	$params = FrmForm::get_params( $form );
2537	2250	$errors = self::get_saved_errors( $form, $params );
2538	2251	$fields = FrmFieldsHelper::get_form_fields( $form->id, $errors );
		@@ -2539,10 +2252,9 @@
2539	2252	$reset = false;
2540	2253	$pass_args = compact( 'form', 'fields', 'errors', 'title', 'description', 'reset' );
2541	2254
2542	2255	$pass_args['action'] = $params['action'];
2543		- // phpcs:ignore WordPress.Security.NonceVerification.Missing, Universal.Operators.StrictComparisons
2544		- $handle_process_here = $params['action'] === 'create' && $params['posted_form_id'] == $form->id && $_POST;
	2256	+ $handle_process_here = $params['action'] === 'create' && $params['posted_form_id'] == $form->id && $_POST; // phpcs:ignore WordPress.Security.NonceVerification.Missing
2545	2257
2546	2258	if ( ! $handle_process_here ) {
2547	2259	FrmFormState::set_initial_value( 'title', $title );
2548	2260	FrmFormState::set_initial_value( 'description', $description );
		@@ -2547,16 +2259,16 @@
2547	2259	FrmFormState::set_initial_value( 'title', $title );
2548	2260	FrmFormState::set_initial_value( 'description', $description );
2549	2261
2550	2262	do_action( 'frm_display_form_action', $params, $fields, $form, $title, $description );
2551		-
2552	2263	if ( apply_filters( 'frm_continue_to_new', true, $form->id, $params['action'] ) ) {
2553	2264	self::show_form_after_submit( $pass_args );
2554	2265	}
2555		- } elseif ( $errors ) {
	2266	+ } elseif ( ! empty( $errors ) ) {
2556	2267	self::show_form_after_submit( $pass_args );
2557	2268
2558	2269	} else {
	2270	+
2559	2271	do_action( 'frm_validate_form_creation', $params, $fields, $form, $title, $description );
2560	2272
2561	2273	if ( apply_filters( 'frm_continue_to_create', true, $form->id ) ) {
2562	2274	$entry_id = self::just_created_entry( $form->id );
		@@ -2579,19 +2291,13 @@
2579	2291	/**
2580	2292	* If the form was processed earlier (init), get the generated errors
2581	2293	*
2582	2294	* @since 2.05
2583		- *
2584		- * @param object $form
2585		- * @param array $params
2586		- *
2587		- * @return array
2588	2295	*/
2589	2296	private static function get_saved_errors( $form, $params ) {
2590	2297	global $frm_vars;
2591	2298
2592		- // phpcs:ignore WordPress.Security.NonceVerification.Missing, Universal.Operators.StrictComparisons
2593		- if ( $params['posted_form_id'] == $form->id && $_POST && isset( $frm_vars['created_entries'][ $form->id ] ) ) {
	2299	+ if ( $params['posted_form_id'] == $form->id && $_POST && isset( $frm_vars['created_entries'][ $form->id ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
2594	2300	$errors = $frm_vars['created_entries'][ $form->id ]['errors'];
2595	2301	} else {
2596	2302	$errors = array();
2597	2303	}
		@@ -2608,16 +2314,13 @@
2608	2314	}
2609	2315
2610	2316	/**
2611	2317	* @since 2.2.7
2612		- *
2613		- * @param int|string $form_id
2614		- *
2615		- * @return int
2616	2318	*/
2617	2319	public static function just_created_entry( $form_id ) {
2618	2320	global $frm_vars;
2619		- return isset( $frm_vars['created_entries'] ) && isset( $frm_vars['created_entries'][ $form_id ] ) && isset( $frm_vars['created_entries'][ $form_id ]['entry_id'] ) ? $frm_vars['created_entries'][ $form_id ]['entry_id'] : 0; // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong
	2321	+
	2322	+ return isset( $frm_vars['created_entries'] ) && isset( $frm_vars['created_entries'][ $form_id ] ) && isset( $frm_vars['created_entries'][ $form_id ]['entry_id'] ) ? $frm_vars['created_entries'][ $form_id ]['entry_id'] : 0;
2620	2323	}
2621	2324
2622	2325	/**
2623	2326	* Gets confirmation method.
		@@ -2630,9 +2333,8 @@
2630	2333	*
2631	2334	* @type object $form Form object.
2632	2335	* @type int $entry_id Entry ID.
2633	2336	* }
2634		- *
2635	2337	* @return array|string
2636	2338	*/
2637	2339	private static function get_confirmation_method( $atts ) {
2638	2340	$action = FrmOnSubmitHelper::current_event( $atts );
		@@ -2640,9 +2342,8 @@
2640	2342	$method = ! empty( $atts['form']->options[ $opt ] ) ? $atts['form']->options[ $opt ] : 'message';
2641	2343
2642	2344	if ( ! empty( $atts['entry_id'] ) ) {
2643	2345	$met_actions = self::get_met_on_submit_actions( $atts, $action );
2644		-
2645	2346	if ( $met_actions ) {
2646	2347	$method = $met_actions;
2647	2348	}
2648	2349	}
		@@ -2655,15 +2356,8 @@
2655	2356
2656	2357	return $method;
2657	2358	}
2658	2359
2659		- /**
2660		- * @param object $form
2661		- * @param array $params
2662		- * @param array $args
2663		- *
2664		- * @return void
2665		- */
2666	2360	public static function maybe_trigger_redirect( $form, $params, $args ) {
2667	2361	if ( ! isset( $params['id'] ) ) {
2668	2362	global $frm_vars;
2669	2363	$params['id'] = $frm_vars['created_entries'][ $form->id ]['entry_id'];
		@@ -2703,15 +2397,8 @@
2703	2397	self::trigger_redirect( $form, $params, $args );
2704	2398	}
2705	2399	}
2706	2400
2707		- /**
2708		- * @param object $form
2709		- * @param array $params
2710		- * @param array $args
2711		- *
2712		- * @return void
2713		- */
2714	2401	public static function trigger_redirect( $form, $params, $args ) {
2715	2402	$success_args = array(
2716	2403	'action' => $params['action'],
2717	2404	'conf_method' => 'redirect',
		@@ -2770,9 +2457,8 @@
2770	2457	* @since 6.0
2771	2458	*
2772	2459	* @param array $args See {@see FrmFormsController::run_success_action()}.
2773	2460	* @param string $event Form event. Default is `create`.
2774		- *
2775	2461	* @return array Array of actions that meet the conditional logics.
2776	2462	*/
2777	2463	public static function get_met_on_submit_actions( $args, $event = 'create' ) {
2778	2464	if ( ! FrmOnSubmitHelper::form_has_migrated( $args['form'] ) ) {
		@@ -2830,9 +2516,9 @@
2830	2516	* @param array $args See {@see FrmFormsController::run_success_action()}. `$args['event']` is also added.
2831	2517	*/
2832	2518	$met_actions = apply_filters( 'frm_get_met_on_submit_actions', $met_actions, $args );
2833	2519
2834		- if ( ! $met_actions ) {
	2520	+ if ( empty( $met_actions ) ) {
2835	2521	$met_actions = array( FrmOnSubmitHelper::get_fallback_action( $event ) );
2836	2522	}
2837	2523
2838	2524	return $met_actions;
		@@ -2845,9 +2531,8 @@
2845	2531	*
2846	2532	* @param object $action Form action object.
2847	2533	* @param array $args See {@see FrmFormsController::run_success_action()}.
2848	2534	* @param string $event Form event. Default is `create`.
2849		- *
2850	2535	* @return bool
2851	2536	*/
2852	2537	private static function is_valid_on_submit_action( $action, $args, $event = 'create' ) {
2853	2538	$action_type = FrmOnSubmitHelper::get_action_type( $action );
		@@ -2869,9 +2554,8 @@
2869	2554	return false;
2870	2555	}
2871	2556
2872	2557	$page = get_post( $action->post_content['success_page_id'] );
2873		-
2874	2558	if ( ! $page || 'trash' === $page->post_status ) {
2875	2559	return false;
2876	2560	}
2877	2561	}
		@@ -2893,9 +2577,8 @@
2893	2577	'entry_id' => $args['entry_id'],
2894	2578	'action' => FrmOnSubmitHelper::current_event( $args ),
2895	2579	)
2896	2580	);
2897		-
2898	2581	if ( ! is_array( $args['conf_method'] ) ) {
2899	2582	self::run_success_action( $args );
2900	2583	return;
2901	2584	}
		@@ -2922,9 +2605,8 @@
2922	2605	* @param array $args See {@see FrmFormsController::run_success_action()}.
2923	2606	*/
2924	2607	public static function run_multi_on_submit_actions( $args ) {
2925	2608	$redirect_action = null;
2926		-
2927	2609	foreach ( $args['conf_method'] as $action ) {
2928	2610	if ( 'redirect' === FrmOnSubmitHelper::get_action_type( $action ) ) {
2929	2611	// We catch the redirect action to run it last.
2930	2612	$redirect_action = $action;
		@@ -2962,9 +2644,8 @@
2962	2644	* @since 6.0
2963	2645	*
2964	2646	* @param array $args See {@see FrmFormsController::run_success_action()}.
2965	2647	* @param object $action On Submit action object.
2966		- *
2967	2648	* @return array
2968	2649	*/
2969	2650	private static function get_run_success_action_args( $args, $action ) {
2970	2651	$new_args = $args;
		@@ -2970,9 +2651,10 @@
2970	2651	$new_args = $args;
2971	2652
2972	2653	FrmOnSubmitHelper::populate_on_submit_data( $new_args['form']->options, $action, $args['action'] );
2973	2654
2974		- $opt = 'update' === $args['action'] ? 'edit_' : 'success_';
	2655	+ $opt = 'update' === $args['action'] ? 'edit_' : 'success_';
	2656	+
2975	2657	$new_args['conf_method'] = $new_args['form']->options[ $opt . 'action' ];
2976	2658
2977	2659	/**
2978	2660	* Filters the run success action args.
		@@ -2987,18 +2669,12 @@
2987	2669	}
2988	2670
2989	2671	/**
2990	2672	* @since 3.0
2991		- *
2992		- * @param array $args
2993		- *
2994		- * @return void
2995	2673	*/
2996	2674	private static function load_page_after_submit( $args ) {
2997	2675	global $post;
2998	2676	$opt = $args['success_opt'];
2999		-
3000		- // phpcs:ignore Universal.Operators.StrictComparisons
3001	2677	if ( ! $post || $args['form']->options[ $opt . '_page_id' ] != $post->ID ) {
3002	2678	$page = get_post( $args['form']->options[ $opt . '_page_id' ] );
3003	2679	$old_post = $post;
3004	2680	$post = $page;
		@@ -3022,9 +2698,8 @@
3022	2698	}
3023	2699
3024	2700	/**
3025	2701	* @since 3.0
3026		- *
3027	2702	* @param array $args See {@see FrmFormsController::run_success_action()}.
3028	2703	*/
3029	2704	private static function redirect_after_submit( $args ) {
3030	2705	add_filter( 'frm_use_wpautop', '__return_false' );
		@@ -3038,10 +2713,11 @@
3038	2713	FrmEntriesController::delete_entry_before_redirect( $success_url, $args['form'], $args );
3039	2714
3040	2715	add_filter( 'frm_redirect_url', 'FrmEntriesController::prepare_redirect_url' );
3041	2716	$success_url = apply_filters( 'frm_redirect_url', $success_url, $args['form'], $args );
3042		- $doing_ajax = FrmAppHelper::doing_ajax();
3043	2717
	2718	+ $doing_ajax = FrmAppHelper::doing_ajax();
	2719	+
3044	2720	if ( ! empty( $args['ajax'] ) && $doing_ajax && empty( $args['force_delay_redirect'] ) ) {
3045	2721	// Is AJAX submit and there is just one Redirect action runs.
3046	2722	echo json_encode( self::get_ajax_redirect_response_data( $args + compact( 'success_url' ) ) );
3047	2723	wp_die();
		@@ -3090,9 +2766,8 @@
3090	2766	*
3091	2767	* @since 6.3.1
3092	2768	*
3093	2769	* @param array $args See {@see FrmFormsController::run_success_action()}.
3094		- *
3095	2770	* @return array
3096	2771	*/
3097	2772	private static function get_ajax_redirect_response_data( $args ) {
3098	2773	$response_data = array(
		@@ -3115,9 +2790,8 @@
3115	2790	$args['message'] = FrmOnSubmitHelper::get_default_new_tab_msg();
3116	2791
3117	2792	$args['form']->options['success_msg'] = $args['message'];
3118	2793	$args['form']->options['edit_msg'] = $args['message'];
3119		-
3120	2794	if ( ! isset( $args['fields'] ) ) {
3121	2795	$args['fields'] = FrmField::get_all_for_form( $args['form']->id );
3122	2796	}
3123	2797
		@@ -3169,15 +2843,13 @@
3169	2843	add_filter( 'frm_use_wpautop', '__return_true' );
3170	2844
3171	2845	echo FrmAppHelper::maybe_kses( $redirect_msg ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
3172	2846	echo '<script>';
3173		-
3174	2847	if ( empty( $args['doing_ajax'] ) ) {
3175	2848	// Not AJAX submit, delay JS until window.load.
3176	2849	echo 'window.onload=function(){';
3177	2850	}
3178	2851	echo 'setTimeout(function(){' . $redirect_js . '}, ' . intval( $delay_time ) . ');'; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
3179		-
3180	2852	if ( empty( $args['doing_ajax'] ) ) {
3181	2853	echo '};';
3182	2854	}
3183	2855	echo '</script>';
		@@ -3192,9 +2864,9 @@
3192	2864	*/
3193	2865	private static function get_redirect_message( $success_url, $success_msg, $args ) {
3194	2866	$success_msg = apply_filters( 'frm_content', $success_msg, $args['form'], $args['entry_id'] );
3195	2867	$success_msg = do_shortcode( FrmAppHelper::use_wpautop( $success_msg ) );
3196		- $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
	2868	+ $redirect_msg = '<div class="' . esc_attr( FrmFormsHelper::get_form_style_class( $args['form'] ) ) . '"><div class="frm-redirect-msg" role="status">' . $success_msg . '<br/>' .
3197	2869	self::get_redirect_fallback_message( $success_url, $args ) .
3198	2870	'</div></div>';
3199	2871
3200	2872	$redirect_args = array(
		@@ -3212,14 +2884,12 @@
3212	2884	* @since 6.3.1
3213	2885	*
3214	2886	* @param string $success_url Redirect URL.
3215	2887	* @param array $args Contains `form` object.
3216		- *
3217	2888	* @return string
3218	2889	*/
3219	2890	private static function get_redirect_fallback_message( $success_url, $args ) {
3220	2891	$target = '';
3221		-
3222	2892	if ( ! empty( $args['form']->options['open_in_new_tab'] ) ) {
3223	2893	$target = ' target="_blank"';
3224	2894	}
3225	2895
		@@ -3234,12 +2904,8 @@
3234	2904	/**
3235	2905	* Prepare to show the success message and empty form after submit
3236	2906	*
3237	2907	* @since 2.05
3238		- *
3239		- * @param array $atts
3240		- *
3241		- * @return void
3242	2908	*/
3243	2909	public static function show_message_after_save( $atts ) {
3244	2910	$atts['message'] = self::prepare_submit_message( $atts['form'], $atts['entry_id'], $atts );
3245	2911
		@@ -3245,9 +2911,8 @@
3245	2911
3246	2912	if ( ! isset( $atts['form']->options['show_form'] ) || $atts['form']->options['show_form'] ) {
3247	2913	if ( isset( $atts['action'] ) && 'update' === $atts['action'] && is_callable( array( 'FrmProEntriesController', 'show_front_end_form_with_entry' ) ) ) {
3248	2914	$entry = FrmEntry::getOne( $atts['entry_id'] );
3249		-
3250	2915	if ( $entry ) {
3251	2916	// This is copied from the Pro plugin.
3252	2917	$atts['conf_message'] = FrmProEntriesController::confirmation( 'message', $atts['form'], $atts['form']->options, $entry->id, $atts );
3253	2918	$atts['show_form'] = FrmProEntriesController::is_form_displayed_after_edit( $atts['form'] );
		@@ -3264,12 +2929,8 @@
3264	2929	/**
3265	2930	* Show an empty form
3266	2931	*
3267	2932	* @since 2.05
3268		- *
3269		- * @param array $args
3270		- *
3271		- * @return void
3272	2933	*/
3273	2934	private static function show_form_after_submit( $args ) {
3274	2935	self::fill_atts_for_form_display( $args );
3275	2936
		@@ -3288,11 +2949,12 @@
3288	2949	}
3289	2950	unset( $args );
3290	2951
3291	2952	$include_form_tag = apply_filters( 'frm_include_form_tag', true, $form );
3292		- $frm_settings = FrmAppHelper::get_settings();
3293		- $submit = $form->options['submit_value'] ?? $frm_settings->submit_value;
3294	2953
	2954	+ $frm_settings = FrmAppHelper::get_settings();
	2955	+ $submit = isset( $form->options['submit_value'] ) ? $form->options['submit_value'] : $frm_settings->submit_value;
	2956	+
3295	2957	global $frm_vars;
3296	2958	self::maybe_load_css( $form, $values['custom_style'], $frm_vars['load_css'] );
3297	2959
3298	2960	$message_placement = self::message_placement( $form, $message );
		@@ -3300,36 +2962,25 @@
3300	2962	include FrmAppHelper::plugin_path() . '/classes/views/frm-entries/new.php';
3301	2963	}
3302	2964
3303	2965	/**
3304		- * Gets message placement.
3305		- *
3306	2966	* @since 4.05.02
3307		- * @since 6.26 This method changed from `private` to `public`.
3308		- *
3309		- * @param object $form Form object.
3310		- * @param string $message The message.
3311		- *
3312		- * @return string Accepts 'before', 'after', or 'submit'.
	2967	+ * @return string - 'before', 'after', or 'submit'
3313	2968	*/
3314		- public static function message_placement( $form, $message ) {
	2969	+ private static function message_placement( $form, $message ) {
3315	2970	$place = 'before';
3316	2971
3317	2972	if ( $message && isset( $form->options['form_class'] ) ) {
3318		- if ( str_contains( $form->options['form_class'], 'frm_below_success' ) ) {
	2973	+ if ( strpos( $form->options['form_class'], 'frm_below_success' ) !== false ) {
3319	2974	$place = 'after';
3320		- } elseif ( str_contains( $form->options['form_class'], 'frm_inline_success' ) ) {
	2975	+ } elseif ( strpos( $form->options['form_class'], 'frm_inline_success' ) !== false ) {
3321	2976	$place = 'submit';
3322	2977	}
3323	2978	}
3324	2979
3325	2980	/**
3326		- * Filter the message placement.
3327		- *
3328	2981	* @since 4.05.02
3329		- *
3330		- * @param string $place Accepts 'before', 'after', or 'submit'.
3331		- * @param array $args Args.
	2982	+ * @return string - 'before' or 'after'
3332	2983	*/
3333	2984	return apply_filters( 'frm_message_placement', $place, compact( 'form', 'message' ) );
3334	2985	}
3335	2986
		@@ -3336,12 +2987,8 @@
3336	2987	/**
3337	2988	* Get all the values needed on the new.php entry page
3338	2989	*
3339	2990	* @since 2.05
3340		- *
3341		- * @param array $args
3342		- *
3343		- * @return void
3344	2991	*/
3345	2992	private static function fill_atts_for_form_display( &$args ) {
3346	2993	if ( ! isset( $args['title'] ) && isset( $args['show_title'] ) ) {
3347	2994	$args['title'] = $args['show_title'];
		@@ -3366,12 +3013,8 @@
3366	3013	/**
3367	3014	* Show the success message without the form
3368	3015	*
3369	3016	* @since 2.05
3370		- *
3371		- * @param array $atts
3372		- *
3373		- * @return void
3374	3017	*/
3375	3018	private static function show_lone_success_message( $atts ) {
3376	3019	global $frm_vars;
3377	3020	$values = FrmEntriesHelper::setup_new_vars( $atts['fields'], $atts['form'], true );
		@@ -3377,12 +3020,13 @@
3377	3020	$values = FrmEntriesHelper::setup_new_vars( $atts['fields'], $atts['form'], true );
3378	3021	self::maybe_load_css( $atts['form'], $values['custom_style'], $frm_vars['load_css'] );
3379	3022
3380	3023	$include_extra_container = 'frm_forms' . FrmFormsHelper::get_form_style_class( $values );
3381		- $errors = array();
3382		- $form = $atts['form'];
3383		- $message = $atts['message'];
3384	3024
	3025	+ $errors = array();
	3026	+ $form = $atts['form'];
	3027	+ $message = $atts['message'];
	3028	+
3385	3029	include FrmAppHelper::plugin_path() . '/classes/views/frm-entries/errors.php';
3386	3030	}
3387	3031
3388	3032	/**
		@@ -3393,17 +3037,16 @@
3393	3037	*
3394	3038	* @param object $form Form object.
3395	3039	* @param int $entry_id Entry ID.
3396	3040	* @param array $args See {@see FrmFormsController::run_success_action()}.
3397		- *
3398	3041	* @return string
3399	3042	*/
3400	3043	private static function prepare_submit_message( $form, $entry_id, $args = array() ) {
3401	3044	$frm_settings = FrmAppHelper::get_settings( array( 'current_form' => $form->id ) );
3402		- $opt = $args['success_opt'] ?? 'success';
	3045	+ $opt = isset( $args['success_opt'] ) ? $args['success_opt'] : 'success';
3403	3046
3404	3047	if ( $entry_id && is_numeric( $entry_id ) ) {
3405		- $message = $form->options[ $opt . '_msg' ] ?? $frm_settings->success_msg;
	3048	+ $message = isset( $form->options[ $opt . '_msg' ] ) ? $form->options[ $opt . '_msg' ] : $frm_settings->success_msg;
3406	3049	$class = 'frm_message';
3407	3050	} else {
3408	3051	$message = $frm_settings->failed_msg;
3409	3052	$class = FrmFormsHelper::form_error_class();
		@@ -3420,9 +3063,9 @@
3420	3063	public static function front_head() {
3421	3064	$version = FrmAppHelper::plugin_version();
3422	3065	$suffix = FrmAppHelper::js_suffix();
3423	3066
3424		- if ( $suffix && self::has_combo_js_file() ) {
	3067	+ if ( ! empty( $suffix ) && self::has_combo_js_file() ) {
3425	3068	wp_register_script( 'formidable', FrmAppHelper::plugin_url() . '/js/frm.min.js', array( 'jquery' ), $version, true );
3426	3069	} else {
3427	3070	wp_register_script( 'formidable', FrmAppHelper::plugin_url() . "/js/formidable{$suffix}.js", array( 'jquery' ), $version, true );
3428	3071	}
		@@ -3444,15 +3087,8 @@
3444	3087	public static function has_combo_js_file() {
3445	3088	return is_readable( FrmAppHelper::plugin_path() . '/js/frm.min.js' );
3446	3089	}
3447	3090
3448		- /**
3449		- * @param object $form
3450		- * @param int|string $this_load
3451		- * @param bool $global_load
3452		- *
3453		- * @return void
3454		- */
3455	3091	public static function maybe_load_css( $form, $this_load, $global_load ) {
3456	3092	$load_css = FrmForm::is_form_loaded( $form, $this_load, $global_load );
3457	3093
3458	3094	if ( ! $load_css ) {
		@@ -3482,9 +3118,8 @@
3482	3118	return;
3483	3119	}
3484	3120
3485	3121	global $wp_styles;
3486		-
3487	3122	if ( is_array( $wp_styles->queue ) && in_array( 'formidable', $wp_styles->queue, true ) ) {
3488	3123	wp_print_styles( 'formidable' );
3489	3124	}
3490	3125	}
		@@ -3499,16 +3134,10 @@
3499	3134	private static function should_load_late() {
3500	3135	return ! function_exists( 'aioseo' );
3501	3136	}
3502	3137
3503		- /**
3504		- * @param string $tag
3505		- * @param string $handle
3506		- *
3507		- * @return string
3508		- */
3509	3138	public static function defer_script_loading( $tag, $handle ) {
3510		- if ( 'captcha-api' === $handle && ! str_contains( $tag, 'defer' ) ) {
	3139	+ if ( 'captcha-api' == $handle && ! strpos( $tag, 'defer' ) ) {
3511	3140	$tag = str_replace( ' src', ' defer="defer" async="async" src', $tag );
3512	3141	}
3513	3142
3514	3143	return $tag;
		@@ -3513,13 +3142,8 @@
3513	3142
3514	3143	return $tag;
3515	3144	}
3516	3145
3517		- /**
3518		- * @param string $location
3519		- *
3520		- * @return void
3521		- */
3522	3146	public static function footer_js( $location = 'footer' ) {
3523	3147	global $frm_vars;
3524	3148
3525	3149	FrmStylesController::enqueue_css();
		@@ -3526,20 +3150,13 @@
3526	3150
3527	3151	if ( ! FrmAppHelper::is_admin() && $location !== 'header' && ! empty( $frm_vars['forms_loaded'] ) ) {
3528	3152	// load formidable js
3529	3153	wp_enqueue_script( 'formidable' );
3530		-
3531		- FrmHoneypot::maybe_print_honeypot_js();
3532	3154	}
3533	3155	}
3534	3156
3535	3157	/**
3536	3158	* @since 2.0.8
3537		- *
3538		- * @param array $atts
3539		- * @param string $content
3540		- *
3541		- * @return void
3542	3159	*/
3543	3160	private static function maybe_minimize_form( $atts, &$content ) {
3544	3161	// check if minimizing is turned on
3545	3162	if ( self::is_minification_on( $atts ) ) {
		@@ -3548,11 +3165,8 @@
3548	3165	}
3549	3166
3550	3167	/**
3551	3168	* @since 2.0.8
3552		- *
3553		- * @param array $atts
3554		- *
3555	3169	* @return bool
3556	3170	*/
3557	3171	private static function is_minification_on( $atts ) {
3558	3172	return ! empty( $atts['minimize'] );
		@@ -3564,13 +3178,11 @@
3564	3178	* @return void
3565	3179	*/
3566	3180	public static function landing_page_preview_option() {
3567	3181	$dir = apply_filters( 'frm_landing_page_preview_option', false );
3568		-
3569	3182	if ( false === $dir || ! file_exists( $dir . 'landing-page-preview-option.php' ) ) {
3570	3183	$dir = self::get_form_views_path();
3571	3184	}
3572		-
3573	3185	include $dir . 'landing-page-preview-option.php';
3574	3186	}
3575	3187
3576	3188	/**
		@@ -3596,15 +3208,13 @@
3596	3208
3597	3209	check_ajax_referer( 'frm_ajax', 'nonce' );
3598	3210
3599	3211	$type = FrmAppHelper::get_post_param( 'type', '', 'sanitize_text_field' );
3600		-
3601	3212	if ( ! $type || ! in_array( $type, array( 'form', 'view' ), true ) ) {
3602	3213	die( 0 );
3603	3214	}
3604	3215
3605	3216	$object_id = FrmAppHelper::get_post_param( 'object_id', '', 'absint' );
3606		-
3607	3217	if ( ! $object_id ) {
3608	3218	die( 0 );
3609	3219	}
3610	3220
		@@ -3616,15 +3226,13 @@
3616	3226	$postarr['post_content'] = apply_filters( 'frm_create_page_with_' . $type . '_shortcode_content', '', $object_id );
3617	3227	}
3618	3228
3619	3229	$name = FrmAppHelper::get_post_param( 'name', '', 'sanitize_text_field' );
3620		-
3621	3230	if ( $name ) {
3622	3231	$postarr['post_title'] = $name;
3623	3232	}
3624	3233
3625	3234	$success = wp_insert_post( $postarr );
3626		-
3627	3235	if ( ! is_numeric( $success ) || ! $success ) {
3628	3236	die( 0 );
3629	3237	}
3630	3238
		@@ -3638,9 +3246,8 @@
3638	3246	/**
3639	3247	* @since 5.3
3640	3248	*
3641	3249	* @param int $form_id
3642		- *
3643	3250	* @return string
3644	3251	*/
3645	3252	private static function get_page_shortcode_content_for_form( $form_id ) {
3646	3253	$shortcode = '[formidable id="' . $form_id . '"]';
		@@ -3682,14 +3289,23 @@
3682	3289	}
3683	3290
3684	3291	/**
3685	3292	* @deprecated 4.0
	3293	+ */
	3294	+ public static function create( $values = array() ) {
	3295	+ _deprecated_function( __METHOD__, '4.0', 'FrmFormsController::update' );
	3296	+ self::update( $values );
	3297	+ }
	3298	+
	3299	+ /**
	3300	+ * Education for premium features.
3686	3301	*
3687		- * @param array $values
	3302	+ * @since 4.05
	3303	+ * @deprecated 6.16.3
3688	3304	*
3689	3305	* @return void
3690	3306	*/
3691		- public static function create( $values = array() ) {
3692		- _deprecated_function( __METHOD__, '4.0', 'FrmFormsController::update' );
3693		- self::update( $values );
	3307	+ public static function add_form_style_tab_options() {
	3308	+ _deprecated_function( __METHOD__, '6.16.3' );
	3309	+ include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/add_form_style_options.php';
3694	3310	}
3695	3311	}