← All changes | classes/controllers/FrmFormsController.php +137 -445 6.27 → 6.22.2 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,9 +389,8 @@
428	389	* @return string|null
429	390	*/
430	391	public static function page_preview() {
431	392	$params = FrmForm::list_page_params();
432		-
433	393	if ( ! $params['form'] || is_numeric( $params['form'] ) ) {
434	394	return null;
435	395	}
436	396
		@@ -436,9 +396,8 @@
436	396
437	397	self::maybe_block_preview( $params['form'] );
438	398
439	399	$form = FrmForm::getOne( $params['form'] );
440		-
441	400	if ( ! $form ) {
442	401	return null;
443	402	}
444	403
		@@ -451,9 +410,8 @@
451	410	* @return void
452	411	*/
453	412	public static function show_page_preview() {
454	413	$preview = self::page_preview();
455		-
456	414	if ( is_null( $preview ) ) {
457	415	wp_die(
458	416	'<h1>' . esc_html__( 'Form key is invalid', 'formidable' ) . '</h1>',
459	417	'<p>' . esc_html__( 'Form key is invalid', 'formidable' ) . '</p>',
		@@ -476,16 +434,9 @@
476	434
477	435	// print_emoji_styles is deprecated.
478	436	remove_action( 'wp_print_styles', 'print_emoji_styles' );
479	437
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	438	$include_theme = FrmAppHelper::get_param( 'theme', '', 'get', 'absint' );
487		-
488	439	if ( $include_theme ) {
489	440	self::set_preview_query();
490	441	self::load_theme_preview();
491	442	} else {
		@@ -508,9 +459,8 @@
508	459	'post_type' => 'page',
509	460	);
510	461
511	462	$page_for_posts = get_option( 'page_for_posts' );
512		-
513	463	if ( is_numeric( $page_for_posts ) ) {
514	464	// Avoid querying for the "Posts Page" or "Blog Page" so we don't display 10 forms.
515	465	$page_query['post__not_in'] = array( $page_for_posts );
516	466	}
		@@ -515,15 +465,13 @@
515	465	$page_query['post__not_in'] = array( $page_for_posts );
516	466	}
517	467
518	468	$random_page = get_posts( $page_query );
519		-
520	469	if ( ! $random_page ) {
521	470	return;
522	471	}
523	472
524	473	$random_page = reset( $random_page );
525		-
526	474	if ( ! is_a( $random_page, 'WP_Post' ) ) {
527	475	// The return type can also be int.
528	476	return;
529	477	}
		@@ -545,9 +493,8 @@
545	493	*
546	494	* @since 5.5.2
547	495	*
548	496	* @param WP_Post $page The page object.
549		- *
550	497	* @return void
551	498	*/
552	499	private static function set_post_global( $page ) {
553	500	global $post;
		@@ -580,9 +527,8 @@
580	527	*
581	528	* @since 6.5.2
582	529	*
583	530	* @param array $classes The body classes list.
584		- *
585	531	* @return array
586	532	*/
587	533	public static function preview_block_theme_body_classnames( $classes ) {
588	534	$classes[] = 'has-global-padding';
		@@ -619,11 +565,9 @@
619	565	* Calls core function to get a template part if it doesn't cause deprecation warnings. Otherwise skips the deprecation function call
620	566	* and renders required html fragments calling required functions.
621	567	*
622	568	* @since 6.7.1
623		- *
624	569	* @param string $template
625		- *
626	570	* @return void
627	571	*/
628	572	private static function get_template( $template ) {
629	573	if ( self::should_try_getting_template( $template ) ) {
		@@ -644,11 +588,9 @@
644	588	/**
645	589	* Returns true if calling a template function doesn't trigger deprecation warnings.
646	590	*
647	591	* @since 6.7.1
648		- *
649	592	* @param string $template
650		- *
651	593	* @return bool
652	594	*/
653	595	private static function should_try_getting_template( $template ) {
654	596	$stylesheet_path = get_stylesheet_directory();
		@@ -662,12 +604,8 @@
662	604	/**
663	605	* Set the page title for the theme preview page
664	606	*
665	607	* @since 3.0
666		- *
667		- * @param string $title
668		- *
669		- * @return string
670	608	*/
671	609	public static function preview_page_title( $title ) {
672	610	if ( in_the_loop() ) {
673	611	$title = self::preview_title( $title );
		@@ -681,9 +619,8 @@
681	619	*
682	620	* @since 3.0
683	621	*
684	622	* @param string $title
685		- *
686	623	* @return string
687	624	*/
688	625	public static function preview_title( $title ) {
689	626	return __( 'Form Preview', 'formidable' );
		@@ -694,9 +631,8 @@
694	631	*
695	632	* @since 3.0
696	633	*
697	634	* @param string $content
698		- *
699	635	* @return string
700	636	*/
701	637	public static function preview_content( $content ) {
702	638	if ( in_the_loop() ) {
		@@ -712,10 +648,8 @@
712	648	* @since 3.0
713	649	*/
714	650	private static function load_direct_preview() {
715	651	$key = FrmAppHelper::simple_get( 'form', 'sanitize_title' );
716		-
717		- // phpcs:ignore Universal.Operators.StrictComparisons
718	652	if ( $key == '' ) {
719	653	$key = FrmAppHelper::get_post_param( 'form', '', 'sanitize_title' );
720	654	}
721	655
		@@ -730,9 +664,8 @@
730	664
731	665	self::maybe_block_preview( $key );
732	666
733	667	$form = FrmForm::getAll( array( 'form_key' => $key ), '', 1 );
734		-
735	668	if ( ! $form ) {
736	669	$error = __( 'Form does not exist', 'formidable' );
737	670	wp_die(
738	671	'<h1>' . esc_html( $error ) . '</h1>',
		@@ -756,9 +689,8 @@
756	689	*
757	690	* @since 6.20
758	691	*
759	692	* @param string $form_key Form key.
760		- *
761	693	* @return void
762	694	*/
763	695	public static function maybe_block_preview( $form_key ) {
764	696	if ( FrmFormsHelper::should_block_preview( $form_key ) ) {
		@@ -784,9 +716,8 @@
784	716	add_filter(
785	717	'script_loader_src',
786	718	/**
787	719	* @param string|null $src
788		- *
789	720	* @return string
790	721	*/
791	722	function ( $src ) {
792	723	if ( is_null( $src ) ) {
		@@ -802,9 +733,8 @@
802	733	}
803	734
804	735	/**
805	736	* @param array $ids
806		- *
807	737	* @return string
808	738	*/
809	739	public static function bulk_untrash( $ids ) {
810	740	FrmAppHelper::permission_check( 'frm_edit_forms' );
		@@ -816,9 +746,11 @@
816	746	return '';
817	747	}
818	748
819	749	/* 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 );
	750	+ $message = sprintf( _n( '%1$s form restored from the Trash.', '%1$s forms restored from the Trash.', $count, 'formidable' ), $count );
	751	+
	752	+ return $message;
821	753	}
822	754
823	755	/**
824	756	* @since 3.06
		@@ -863,9 +795,8 @@
863	795	// Check nonce url.
864	796	check_admin_referer( $status . '_form_' . $params['id'] );
865	797
866	798	$count = 0;
867		-
868	799	if ( FrmForm::set_status( $params['id'], $available_status[ $status ]['new_status'] ) ) {
869	800	++$count;
870	801	}
871	802
		@@ -879,9 +810,9 @@
879	810	/* translators: %1$s: Number of forms */
880	811	$available_status['untrash']['message'] = sprintf( _n( '%1$s form restored from the Trash.', '%1$s forms restored from the Trash.', $count, 'formidable' ), $count );
881	812
882	813	/* 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
	814	+ $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	815
885	816	$message = $available_status[ $status ]['message'];
886	817
887	818	self::display_forms_list( $params, $message );
		@@ -888,9 +819,8 @@
888	819	}
889	820
890	821	/**
891	822	* @param array $ids
892		- *
893	823	* @return string
894	824	*/
895	825	public static function bulk_trash( $ids ) {
896	826	FrmAppHelper::permission_check( 'frm_delete_forms' );
		@@ -895,9 +825,8 @@
895	825	public static function bulk_trash( $ids ) {
896	826	FrmAppHelper::permission_check( 'frm_delete_forms' );
897	827
898	828	$count = 0;
899		-
900	829	foreach ( $ids as $id ) {
901	830	if ( FrmForm::trash( $id ) ) {
902	831	++$count;
903	832	}
		@@ -912,16 +841,17 @@
912	841	'param' => 'form_type',
913	842	'type' => 'request',
914	843	)
915	844	);
916		-
917		- return sprintf(
	845	+ $message = sprintf(
918	846	/* translators: %1$s: Number of forms, %2$s: Start link HTML, %3$s: End link HTML */
919	847	_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	848	$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
	849	+ '<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	850	'</a>'
923	851	);
	852	+
	853	+ return $message;
924	854	}
925	855
926	856	public static function destroy() {
927	857	FrmAppHelper::permission_check( 'frm_delete_forms' );
		@@ -931,9 +861,8 @@
931	861	// Check nonce url.
932	862	check_admin_referer( 'destroy_form_' . $params['id'] );
933	863
934	864	$count = 0;
935		-
936	865	if ( FrmForm::destroy( $params['id'] ) ) {
937	866	++$count;
938	867	}
939	868
		@@ -944,9 +873,8 @@
944	873	}
945	874
946	875	/**
947	876	* @param array $ids
948		- *
949	877	* @return string
950	878	*/
951	879	public static function bulk_destroy( $ids ) {
952	880	FrmAppHelper::permission_check( 'frm_delete_forms' );
		@@ -951,12 +879,10 @@
951	879	public static function bulk_destroy( $ids ) {
952	880	FrmAppHelper::permission_check( 'frm_delete_forms' );
953	881
954	882	$count = 0;
955		-
956	883	foreach ( $ids as $id ) {
957	884	$d = FrmForm::destroy( $id );
958		-
959	885	if ( $d ) {
960	886	++$count;
961	887	}
962	888	}
		@@ -974,18 +900,19 @@
974	900	*/
975	901	public static function delete_all() {
976	902	// Check nonce url.
977	903	$permission_error = FrmAppHelper::permission_nonce_error( 'frm_delete_forms', '_wpnonce', 'bulk-toplevel_page_formidable' );
978		-
979	904	if ( $permission_error !== false ) {
980	905	self::display_forms_list( array(), '', array( $permission_error ) );
	906	+
981	907	return;
982	908	}
983	909
984	910	$count = FrmForm::scheduled_delete( time() );
985	911	$url = remove_query_arg( array( 'delete_all' ) );
986		- $url .= '&message=forms_permanently_deleted&forms_deleted=' . $count;
987	912
	913	+ $url .= '&message=forms_permanently_deleted&forms_deleted=' . $count;
	914	+
988	915	wp_safe_redirect( $url );
989	916	die();
990	917	}
991	918
		@@ -1068,9 +995,9 @@
1068	995	if ( ! isset( self::$formidable_tinymce_button ) ) {
1069	996	FrmAppHelper::load_admin_wide_js();
1070	997	$menu_name = FrmAppHelper::get_menu_name();
1071	998	$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
	999	+ 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	1000	}
1074	1001	echo self::$formidable_tinymce_button; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
1075	1002	}
1076	1003	}
		@@ -1116,9 +1043,8 @@
1116	1043	private static function should_insert_form_popup() {
1117	1044	if ( FrmAppHelper::is_form_builder_page() ) {
1118	1045	return true;
1119	1046	}
1120		-
1121	1047	$page = basename( FrmAppHelper::get_server_value( 'PHP_SELF' ) );
1122	1048	return in_array( $page, array( 'post.php', 'page.php', 'page-new.php', 'post-new.php' ), true );
1123	1049	}
1124	1050
		@@ -1126,10 +1052,9 @@
1126	1052	FrmAppHelper::permission_check( 'frm_view_forms' );
1127	1053	check_ajax_referer( 'frm_ajax', 'nonce' );
1128	1054
1129	1055	$shortcode = FrmAppHelper::get_post_param( 'shortcode', '', 'sanitize_text_field' );
1130		-
1131		- if ( ! $shortcode ) {
	1056	+ if ( empty( $shortcode ) ) {
1132	1057	wp_die();
1133	1058	}
1134	1059
1135	1060	echo '<div id="sc-opts-' . esc_attr( $shortcode ) . '" class="frm_shortcode_option">';
		@@ -1154,9 +1079,8 @@
1154	1079	'label' => __( 'Minimize form HTML', 'formidable' ),
1155	1080	),
1156	1081	);
1157	1082	}
1158		-
1159	1083	$opts = apply_filters( 'frm_sc_popup_opts', $opts, $shortcode );
1160	1084
1161	1085	if ( isset( $opts['form_id'] ) && is_string( $opts['form_id'] ) ) {
1162	1086	// allow other shortcodes to use the required form id option
		@@ -1176,9 +1100,8 @@
1176	1100	*
1177	1101	* @param array $params
1178	1102	* @param string $message
1179	1103	* @param array $errors
1180		- *
1181	1104	* @return void
1182	1105	*/
1183	1106	public static function display_forms_list( $params = array(), $message = '', $errors = array() ) {
1184	1107	FrmAppHelper::permission_check( 'frm_view_forms' );
		@@ -1195,21 +1118,21 @@
1195	1118	* @param string $table_class Class name for List Helper.
1196	1119	*/
1197	1120	$table_class = apply_filters( 'frm_forms_list_class', 'FrmFormsListHelper' );
1198	1121	$wp_list_table = new $table_class( compact( 'params' ) );
1199		- $pagenum = $wp_list_table->get_pagenum();
1200	1122
	1123	+ $pagenum = $wp_list_table->get_pagenum();
	1124	+
1201	1125	$wp_list_table->prepare_items();
1202	1126
1203	1127	$total_pages = $wp_list_table->get_pagination_arg( 'total_pages' );
1204		-
1205	1128	if ( $pagenum > $total_pages && $total_pages > 0 ) {
1206	1129	wp_redirect( esc_url_raw( add_query_arg( 'paged', $total_pages ) ) );
1207	1130	die();
1208	1131	}
1209	1132
1210		- $error = FrmInbox::check_for_error();
1211		-
	1133	+ $inbox = new FrmInbox();
	1134	+ $error = $inbox->check_for_error();
1212	1135	if ( $error ) {
1213	1136	$show_messages = array( $error['subject'] . '. ' . $error['message'] );
1214	1137	}
1215	1138
		@@ -1217,9 +1140,8 @@
1217	1140	}
1218	1141
1219	1142	/**
1220	1143	* @param array<string,string> $columns
1221		- *
1222	1144	* @return array<string,string>
1223	1145	*/
1224	1146	public static function get_columns( $columns ) {
1225	1147	$columns['cb'] = '<input type="checkbox" />';
		@@ -1226,13 +1148,11 @@
1226	1148	$columns['name'] = esc_html__( 'Form Title', 'formidable' );
1227	1149	$columns['entries'] = esc_html__( 'Entries', 'formidable' );
1228	1150	$columns['id'] = 'ID';
1229	1151	$columns['form_key'] = esc_html__( 'Key', 'formidable' );
1230		-
1231	1152	if ( 'trash' !== FrmAppHelper::simple_get( 'form_type' ) ) {
1232	1153	$columns['shortcode'] = esc_html__( 'Actions', 'formidable' );
1233	1154	}
1234		-
1235	1155	$columns['created_at'] = esc_html__( 'Date', 'formidable' );
1236	1156
1237	1157	add_screen_option(
1238	1158	'per_page',
		@@ -1260,9 +1180,8 @@
1260	1180	}
1261	1181
1262	1182	/**
1263	1183	* @param mixed $hidden_columns
1264		- *
1265	1184	* @return array
1266	1185	*/
1267	1186	public static function hidden_columns( $hidden_columns ) {
1268	1187	if ( ! is_array( $hidden_columns ) ) {
		@@ -1283,15 +1202,8 @@
1283	1202
1284	1203	return $hidden_columns;
1285	1204	}
1286	1205
1287		- /**
1288		- * @param mixed $save
1289		- * @param string $option
1290		- * @param int|string $value
1291		- *
1292		- * @return mixed
1293		- */
1294	1206	public static function save_per_page( $save, $option, $value ) {
1295	1207	if ( $option === 'formidable_page_formidable_per_page' ) {
1296	1208	$save = (int) $value;
1297	1209	}
		@@ -1303,9 +1215,8 @@
1303	1215	* @param int|string $id
1304	1216	* @param array $errors
1305	1217	* @param string $message
1306	1218	* @param bool $create_link
1307		- *
1308	1219	* @return void
1309	1220	*/
1310	1221	private static function get_edit_vars( $id, $errors = array(), $message = '', $create_link = false ) {
1311	1222	global $frm_vars;
		@@ -1320,9 +1231,8 @@
1320	1231	'page' => 'formidable',
1321	1232	)
1322	1233	),
1323	1234	);
1324		-
1325	1235	if ( ! $form ) {
1326	1236	FrmAppController::show_error_modal( $error_args );
1327	1237	return;
1328	1238	}
		@@ -1344,14 +1254,15 @@
1344	1254	}
1345	1255
1346	1256	if ( $form->parent_form_id ) {
1347	1257	/* 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
	1258	+ 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	1259	}
1350	1260
1351	1261	$frm_field_selection = FrmField::field_selection();
1352		- $fields = FrmField::get_all_for_form( $form->id );
1353	1262
	1263	+ $fields = FrmField::get_all_for_form( $form->id );
	1264	+
1354	1265	// Automatically add end section fields if they don't exist (2.0 migration).
1355	1266	$reset_fields = false;
1356	1267	FrmFormsHelper::auto_add_end_section_fields( $form, $fields, $reset_fields );
1357	1268	FrmSubmitHelper::maybe_create_submit_field( $form, $fields, $reset_fields );
		@@ -1375,10 +1286,9 @@
1375	1286	*/
1376	1287	$values['fields'] = apply_filters( 'frm_fields_in_form_builder', $fields, compact( 'form' ) );
1377	1288
1378	1289	$edit_message = __( 'Form was successfully updated.', 'formidable' );
1379		-
1380		- if ( $form->is_template && $message === $edit_message ) {
	1290	+ if ( $form->is_template && $message == $edit_message ) {
1381	1291	$message = __( 'Template was successfully updated.', 'formidable' );
1382	1292	}
1383	1293
1384	1294	self::maybe_update_form_builder_message( $message );
		@@ -1393,12 +1303,11 @@
1393	1303	}
1394	1304
1395	1305	/**
1396	1306	* @param array $fields
1397		- *
1398	1307	* @return array
1399	1308	*/
1400		- public static function update_form_builder_fields( $fields ) {
	1309	+ public static function update_form_builder_fields( $fields, $form ) {
1401	1310	foreach ( $fields as $field ) {
1402	1311	$field->do_not_include_icons = true;
1403	1312	}
1404	1313	return $fields;
		@@ -1403,13 +1312,8 @@
1403	1312	}
1404	1313	return $fields;
1405	1314	}
1406	1315
1407		- /**
1408		- * @param string $message
1409		- *
1410		- * @return void
1411		- */
1412	1316	public static function maybe_update_form_builder_message( &$message ) {
1413	1317	if ( 'form_duplicated' === FrmAppHelper::simple_get( 'message' ) ) {
1414	1318	$message = __( 'Form was Successfully Copied', 'formidable' );
1415	1319	}
		@@ -1418,9 +1322,8 @@
1418	1322	/**
1419	1323	* @param int|string $id
1420	1324	* @param array $errors
1421	1325	* @param array|string $args
1422		- *
1423	1326	* @return void
1424	1327	*/
1425	1328	public static function get_settings_vars( $id, $errors = array(), $args = array() ) {
1426	1329	FrmAppHelper::permission_check( 'frm_edit_forms' );
		@@ -1442,12 +1345,13 @@
1442	1345	);
1443	1346	$args = array_merge( $defaults, $args );
1444	1347	$message = $args['message'];
1445	1348	$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	1349
	1350	+ $form = FrmForm::getOne( $id );
	1351	+ $fields = FrmField::get_all_for_form( $id );
	1352	+ $values = FrmAppHelper::setup_edit_vars( $form, 'forms', $fields, true );
	1353	+
1450	1354	/**
1451	1355	* Allows changing fields in the form settings.
1452	1356	*
1453	1357	* @since 5.0.04
		@@ -1487,12 +1391,8 @@
1487	1391	}
1488	1392
1489	1393	/**
1490	1394	* @since 4.0
1491		- *
1492		- * @param array $atts
1493		- *
1494		- * @return void
1495	1395	*/
1496	1396	public static function form_publish_button( $atts ) {
1497	1397	$values = $atts['values'];
1498	1398	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/_publish_box.php';
		@@ -1503,9 +1403,8 @@
1503	1403	*
1504	1404	* @since 4.0
1505	1405	*
1506	1406	* @param array $values
1507		- *
1508	1407	* @return array
1509	1408	*/
1510	1409	private static function get_settings_tabs( $values ) {
1511	1410	$sections = array(
		@@ -1511,20 +1410,20 @@
1511	1410	$sections = array(
1512	1411	'advanced' => array(
1513	1412	'name' => __( 'General', 'formidable' ),
1514	1413	'title' => __( 'General Form Settings', 'formidable' ),
1515		- 'function' => array( self::class, 'advanced_settings' ),
1516		- 'icon' => 'frmfont frm_settings_icon',
	1414	+ 'function' => array( __CLASS__, 'advanced_settings' ),
	1415	+ 'icon' => 'frm_icon_font frm_settings_icon',
1517	1416	),
1518	1417	'email' => array(
1519	1418	'name' => __( 'Actions & Notifications', 'formidable' ),
1520	1419	'function' => array( 'FrmFormActionsController', 'email_settings' ),
1521	1420	'id' => 'frm_notification_settings',
1522		- 'icon' => 'frmfont frm_mail_bulk_icon',
	1421	+ 'icon' => 'frm_icon_font frm_mail_bulk_icon',
1523	1422	),
1524	1423	'permissions' => array(
1525	1424	'name' => __( 'Form Permissions', 'formidable' ),
1526		- 'icon' => 'frmfont frm_lock_closed_icon',
	1425	+ 'icon' => 'frm_icon_font frm_lock_closed_icon',
1527	1426	'html_class' => 'frm_show_upgrade_tab frm_noallow',
1528	1427	'data' => array(
1529	1428	'medium' => 'permissions',
1530	1429	'upgrade' => __( 'Form Permissions', 'formidable' ),
		@@ -1529,37 +1428,35 @@
1529	1428	'medium' => 'permissions',
1530	1429	'upgrade' => __( 'Form Permissions', 'formidable' ),
1531	1430	'message' => __( 'Allow editing, protect forms and files, limit entries, and save drafts. Upgrade to get form and entry permissions.', 'formidable' ),
1532	1431	'screenshot' => 'permissions.png',
1533		- 'learn-more' => FrmAppHelper::get_doc_url( 'general-form-settings/#kb-form-permissions', 'form-permissions-settings' ),
1534	1432	),
1535	1433	),
1536	1434	'scheduling' => array(
1537	1435	'name' => __( 'Form Scheduling', 'formidable' ),
1538		- 'icon' => 'frmfont frm_calendar_icon',
	1436	+ 'icon' => 'frm_icon_font frm_calendar_icon',
1539	1437	'html_class' => 'frm_show_upgrade_tab frm_noallow',
1540	1438	'data' => array(
1541	1439	'medium' => 'scheduling',
1542	1440	'upgrade' => __( 'Form scheduling settings', 'formidable' ),
1543	1441	'screenshot' => 'scheduling.png',
1544		- 'learn-more' => FrmAppHelper::get_doc_url( 'general-form-settings/#kb-form-scheduling', 'form-scheduling-settings' ),
1545	1442	),
1546	1443	),
1547	1444	'buttons' => array(
1548	1445	'name' => __( 'Buttons', 'formidable' ),
1549		- 'class' => self::class,
	1446	+ 'class' => __CLASS__,
1550	1447	'function' => 'buttons_settings',
1551		- 'icon' => 'frmfont frm_button_icon',
	1448	+ 'icon' => 'frm_icon_font frm_button_icon',
1552	1449	),
1553	1450	'landing' => array(
1554	1451	'name' => __( 'Form Landing Page', 'formidable' ),
1555		- 'icon' => 'frmfont frm_file_text_icon',
	1452	+ 'icon' => 'frm_icon_font frm_file_text_icon',
1556	1453	'html_class' => 'frm_show_upgrade_tab frm_noallow',
1557	1454	'data' => FrmAppHelper::get_landing_page_upgrade_data_params(),
1558	1455	),
1559	1456	'chat' => array(
1560	1457	'name' => __( 'Conversational Forms', 'formidable' ),
1561		- 'icon' => 'frmfont frm_chat_forms_icon',
	1458	+ 'icon' => 'frm_icon_font frm_chat_forms_icon',
1562	1459	'html_class' => 'frm_show_upgrade_tab frm_noallow',
1563	1460	'data' => FrmAppHelper::get_upgrade_data_params(
1564	1461	'chat',
1565	1462	array(
		@@ -1565,15 +1462,14 @@
1565	1462	array(
1566	1463	'upgrade' => __( 'Conversational Forms', 'formidable' ),
1567	1464	'message' => __( 'Ask one question at a time for automated conversations.', 'formidable' ),
1568	1465	'screenshot' => 'chat.png',
1569		- 'learn-more' => FrmAppHelper::get_doc_url( 'conversational-forms', 'conversational-forms-settings', false ),
1570	1466	)
1571	1467	),
1572	1468	),
1573	1469	'abandonment' => array(
1574	1470	'name' => __( 'Form Abandonment', 'formidable' ),
1575		- 'icon' => 'frmfont frm_abandoned_icon',
	1471	+ 'icon' => 'frm_icon_font frm_abandoned_icon',
1576	1472	'html_class' => 'frm_show_upgrade_tab frm_noallow',
1577	1473	'data' => FrmAppHelper::get_upgrade_data_params(
1578	1474	'abandonment',
1579	1475	array(
		@@ -1579,17 +1475,16 @@
1579	1475	array(
1580	1476	'upgrade' => __( 'Form abandonment settings', 'formidable' ),
1581	1477	'message' => __( 'Unlock the power of data capture to boost lead generation and master the art of form optimization.', 'formidable' ),
1582	1478	'screenshot' => 'abandonment.png',
1583		- 'learn-more' => FrmAppHelper::get_doc_url( 'features/form-abandonment-wordpress-plugin', 'form-abandonment-settings', false ),
1584	1479	)
1585	1480	),
1586	1481	),
1587	1482	'html' => array(
1588	1483	'name' => __( 'Customize HTML', 'formidable' ),
1589		- 'class' => self::class,
	1484	+ 'class' => __CLASS__,
1590	1485	'function' => 'html_settings',
1591		- 'icon' => 'frmfont frm_code_icon',
	1486	+ 'icon' => 'frm_icon_font frm_code_icon',
1592	1487	),
1593	1488	);
1594	1489
1595	1490	if ( ! has_action( 'frm_add_form_style_tab_options' ) && ! has_action( 'frm_add_form_button_options' ) ) {
		@@ -1595,8 +1490,14 @@
1595	1490	if ( ! has_action( 'frm_add_form_style_tab_options' ) && ! has_action( 'frm_add_form_button_options' ) ) {
1596	1491	unset( $sections['buttons'] );
1597	1492	}
1598	1493
	1494	+ foreach ( array( 'landing', 'chat', 'abandonment' ) as $feature ) {
	1495	+ if ( ! FrmAppHelper::show_new_feature( $feature ) ) {
	1496	+ unset( $sections[ $feature ] );
	1497	+ }
	1498	+ }
	1499	+
1599	1500	$sections = apply_filters( 'frm_add_form_settings_section', $sections, $values );
1600	1501
1601	1502	foreach ( $sections as $key => $section ) {
1602	1503	$defaults = array(
		@@ -1601,9 +1502,9 @@
1601	1502	foreach ( $sections as $key => $section ) {
1602	1503	$defaults = array(
1603	1504	'html_class' => '',
1604	1505	'name' => ucfirst( $key ),
1605		- 'icon' => 'frmfont frm_settings_icon',
	1506	+ 'icon' => 'frm_icon_font frm_settings_icon',
1606	1507	);
1607	1508
1608	1509	$section = array_merge( $defaults, $section );
1609	1510
		@@ -1609,9 +1510,8 @@
1609	1510
1610	1511	if ( ! isset( $section['anchor'] ) ) {
1611	1512	$section['anchor'] = $key;
1612	1513	}
1613		-
1614	1514	$section['anchor'] .= '_settings';
1615	1515
1616	1516	if ( ! isset( $section['title'] ) ) {
1617	1517	$section['title'] = $section['name'];
		@@ -1630,19 +1530,18 @@
1630	1530	/**
1631	1531	* @since 4.0
1632	1532	*
1633	1533	* @param array $values
1634		- *
1635	1534	* @return void
1636	1535	*/
1637	1536	public static function advanced_settings( $values ) {
1638	1537	$first_h3 = 'frm_first_h3';
	1538	+
1639	1539	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings-advanced.php';
1640	1540	}
1641	1541
1642	1542	/**
1643	1543	* @param array $values
1644		- *
1645	1544	* @return void
1646	1545	*/
1647	1546	public static function render_spam_settings( $values ) {
1648	1547	if ( function_exists( 'akismet_http_post' ) ) {
		@@ -1655,9 +1554,8 @@
1655	1554	/**
1656	1555	* @since 4.0
1657	1556	*
1658	1557	* @param array $values
1659		- *
1660	1558	* @return void
1661	1559	*/
1662	1560	public static function buttons_settings( $values ) {
1663	1561	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings-buttons.php';
		@@ -1666,9 +1564,8 @@
1666	1564	/**
1667	1565	* @since 4.0
1668	1566	*
1669	1567	* @param array $values
1670		- *
1671	1568	* @return void
1672	1569	*/
1673	1570	public static function html_settings( $values ) {
1674	1571	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings-html.php';
		@@ -1679,9 +1576,8 @@
1679	1576	*
1680	1577	* @since 2.03.08
1681	1578	*
1682	1579	* @param array|bool $values
1683		- *
1684	1580	* @return void
1685	1581	*/
1686	1582	private static function clean_submit_html( &$values ) {
1687	1583	if ( is_array( $values ) && isset( $values['submit_html'] ) ) {
		@@ -1704,17 +1600,13 @@
1704	1600	return $classes;
1705	1601	}
1706	1602
1707	1603	/**
1708		- * @since 6.27 Added $template_path parameter.
1709		- *
1710	1604	* @param int|string $form_id
1711	1605	* @param string $class
1712		- * @param string $template_path The path to a template file to use instead of the default.
1713		- *
1714	1606	* @return void
1715	1607	*/
1716		- public static function mb_tags_box( $form_id, $class = '', $template_path = 'default' ) {
	1608	+ public static function mb_tags_box( $form_id, $class = '' ) {
1717	1609	$fields = FrmField::get_all_for_form( $form_id, '', 'include' );
1718	1610
1719	1611	/**
1720	1612	* Allows modifying the list of fields in the tags box.
		@@ -1723,30 +1615,23 @@
1723	1615	*
1724	1616	* @param array $fields The list of fields.
1725	1617	* @param array $args The arguments. Contains `form_id`.
1726	1618	*/
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' );
	1619	+ $fields = apply_filters( 'frm_fields_in_tags_box', $fields, compact( 'form_id' ) );
	1620	+ $linked_forms = array();
	1621	+ $col = 'one';
	1622	+ $settings_tab = FrmAppHelper::is_admin_page( 'formidable' );
	1623	+
1731	1624	$cond_shortcodes = apply_filters( 'frm_conditional_shortcodes', array() );
1732	1625	$entry_shortcodes = self::get_shortcode_helpers( $settings_tab );
	1626	+
1733	1627	$advanced_helpers = self::advanced_helpers( compact( 'fields', 'form_id' ) );
1734	1628
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;
	1629	+ include FrmAppHelper::plugin_path() . '/classes/views/shared/mb_adv_info.php';
1741	1630	}
1742	1631
1743	1632	/**
1744	1633	* @since 3.04.01
1745		- *
1746		- * @param array $atts
1747		- *
1748		- * @return array
1749	1634	*/
1750	1635	private static function advanced_helpers( $atts ) {
1751	1636	$advanced_helpers = array(
1752	1637	'default' => array(
		@@ -1755,12 +1640,10 @@
1755	1640	),
1756	1641	);
1757	1642
1758	1643	$user_fields = self::user_shortcodes();
1759		-
1760	1644	if ( $user_fields ) {
1761	1645	$user_helpers = array();
1762		-
1763	1646	foreach ( $user_fields as $uk => $uf ) {
1764	1647	$user_helpers[ '|user_id| show="' . $uk . '"' ] = $uf;
1765	1648	unset( $uk, $uf );
1766	1649	}
		@@ -1785,10 +1668,8 @@
1785	1668	* Get an array of the options to display in the advanced tab
1786	1669	* of the customization panel
1787	1670	*
1788	1671	* @since 2.0.6
1789		- *
1790		- * @return array
1791	1672	*/
1792	1673	private static function get_advanced_shortcodes() {
1793	1674	$adv_shortcodes = array(
1794	1675	'x sep=", "' => array(
		@@ -1805,18 +1686,17 @@
1805	1686	'label' => __( 'No Auto P', 'formidable' ),
1806	1687	'title' => __( 'Do not automatically add any paragraphs or line breaks', 'formidable' ),
1807	1688	),
1808	1689	);
	1690	+ $adv_shortcodes = apply_filters( 'frm_advanced_shortcodes', $adv_shortcodes );
1809	1691
1810	1692	// __( 'Leave blank instead of defaulting to User Login', 'formidable' ) : blank=1
1811	1693
1812		- return apply_filters( 'frm_advanced_shortcodes', $adv_shortcodes );
	1694	+ return $adv_shortcodes;
1813	1695	}
1814	1696
1815	1697	/**
1816	1698	* @since 3.04.01
1817		- *
1818		- * @return array
1819	1699	*/
1820	1700	private static function user_shortcodes() {
1821	1701	$options = array(
1822	1702	'ID' => __( 'User ID', 'formidable' ),
		@@ -1835,12 +1715,8 @@
1835	1715	/**
1836	1716	* Get an array of the helper shortcodes to display in the customization panel
1837	1717	*
1838	1718	* @since 2.0.6
1839		- *
1840		- * @param bool $settings_tab
1841		- *
1842		- * @return array
1843	1719	*/
1844	1720	private static function get_shortcode_helpers( $settings_tab ) {
1845	1721	$entry_shortcodes = array(
1846	1722	'id' => __( 'Entry ID', 'formidable' ),
		@@ -1855,9 +1731,8 @@
1855	1731	'form_name' => __( 'Form Name', 'formidable' ),
1856	1732	);
1857	1733
1858	1734	$entry_shortcodes = array_merge( FrmShortcodeHelper::get_contextual_shortcode_values(), $entry_shortcodes );
1859		-
1860	1735	if ( ! FrmAppHelper::pro_is_installed() ) {
1861	1736	unset( $entry_shortcodes['post_id'] );
1862	1737	}
1863	1738
		@@ -1865,13 +1740,12 @@
1865	1740	* Use this hook to add or remove buttons in the helpers section
1866	1741	* in the customization panel
1867	1742	*
1868	1743	* @since 2.0.6
1869		- *
1870		- * @param array $entry_shortcodes
1871		- * @param bool $settings_tab
1872	1744	*/
1873		- return apply_filters( 'frm_helper_shortcodes', $entry_shortcodes, $settings_tab );
	1745	+ $entry_shortcodes = apply_filters( 'frm_helper_shortcodes', $entry_shortcodes, $settings_tab );
	1746	+
	1747	+ return $entry_shortcodes;
1874	1748	}
1875	1749
1876	1750	/**
1877	1751	* Insert the form class setting into the form.
		@@ -1876,9 +1750,8 @@
1876	1750	/**
1877	1751	* Insert the form class setting into the form.
1878	1752	*
1879	1753	* @param stdClass $form
1880		- *
1881	1754	* @return void
1882	1755	*/
1883	1756	public static function form_classes( $form ) {
1884	1757	if ( isset( $form->options['form_class'] ) ) {
		@@ -1901,9 +1774,8 @@
1901	1774	* @param stdClass $form
1902	1775	*/
1903	1776	public static function add_js_validate_form_to_global_vars( $form ) {
1904	1777	global $frm_vars;
1905		-
1906	1778	if ( ! isset( $frm_vars['js_validate_forms'] ) ) {
1907	1779	$frm_vars['js_validate_forms'] = array();
1908	1780	}
1909	1781	$frm_vars['js_validate_forms'][ $form->id ] = $form;
		@@ -1926,9 +1798,8 @@
1926	1798	/**
1927	1799	* @param string $content
1928	1800	* @param int|stdClass|string $form
1929	1801	* @param false|int|stdClass|string $entry
1930		- *
1931	1802	* @return string
1932	1803	*/
1933	1804	public static function filter_content( $content, $form, $entry = false ) {
1934	1805	$content = self::replace_form_name_shortcodes( $content, $form );
		@@ -1933,9 +1804,8 @@
1933	1804	public static function filter_content( $content, $form, $entry = false ) {
1934	1805	$content = self::replace_form_name_shortcodes( $content, $form );
1935	1806
1936	1807	self::get_entry_by_param( $entry );
1937		-
1938	1808	if ( ! $entry ) {
1939	1809	return $content;
1940	1810	}
1941	1811
		@@ -1951,10 +1821,11 @@
1951	1821	$form = $entry->parent_entry->form_id;
1952	1822	}
1953	1823
1954	1824	$shortcodes = FrmFieldsHelper::get_shortcodes( $content, $form );
	1825	+ $content = apply_filters( 'frm_replace_content_shortcodes', $content, $entry, $shortcodes );
1955	1826
1956		- return apply_filters( 'frm_replace_content_shortcodes', $content, $entry, $shortcodes );
	1827	+ return $content;
1957	1828	}
1958	1829
1959	1830	/**
1960	1831	* Replace any [form_name] shortcodes in a string.
		@@ -1962,9 +1833,8 @@
1962	1833	* @since 5.5
1963	1834	*
1964	1835	* @param array|string $string
1965	1836	* @param int|stdClass|string $form
1966		- *
1967	1837	* @return array|string
1968	1838	*/
1969	1839	public static function replace_form_name_shortcodes( $string, $form ) {
1970	1840	if ( ! is_string( $string ) ) {
		@@ -1970,9 +1840,9 @@
1970	1840	if ( ! is_string( $string ) ) {
1971	1841	return $string;
1972	1842	}
1973	1843
1974		- if ( ! str_contains( $string, '[form_name]' ) ) {
	1844	+ if ( false === strpos( $string, '[form_name]' ) ) {
1975	1845	return $string;
1976	1846	}
1977	1847
1978	1848	if ( ! is_object( $form ) ) {
		@@ -1984,9 +1854,8 @@
1984	1854	}
1985	1855
1986	1856	/**
1987	1857	* @param false|int|stdClass|string $entry
1988		- *
1989	1858	* @return void
1990	1859	*/
1991	1860	private static function get_entry_by_param( &$entry ) {
1992	1861	if ( ! $entry || ! is_object( $entry ) ) {
		@@ -1997,15 +1866,8 @@
1997	1866	FrmEntry::maybe_get_entry( $entry );
1998	1867	}
1999	1868	}
2000	1869
2001		- /**
2002		- * @param string $content
2003		- * @param false|object $entry
2004		- * @param array $shortcodes
2005		- *
2006		- * @return string
2007		- */
2008	1870	public static function replace_content_shortcodes( $content, $entry, $shortcodes ) {
2009	1871	return FrmFieldsHelper::replace_content_shortcodes( $content, $entry, $shortcodes );
2010	1872	}
2011	1873
		@@ -2010,9 +1872,8 @@
2010	1872	}
2011	1873
2012	1874	/**
2013	1875	* @param array $errors
2014		- *
2015	1876	* @return array
2016	1877	*/
2017	1878	public static function process_bulk_form_actions( $errors ) {
2018	1879	if ( ! $_REQUEST ) {
		@@ -2019,30 +1880,29 @@
2019	1880	return $errors;
2020	1881	}
2021	1882
2022	1883	$bulkaction = FrmAppHelper::get_param( 'action', '', 'get', 'sanitize_text_field' );
2023		-
2024		- // phpcs:ignore Universal.Operators.StrictComparisons
2025	1884	if ( $bulkaction == - 1 ) {
2026	1885	$bulkaction = FrmAppHelper::get_param( 'action2', '', 'get', 'sanitize_title' );
2027	1886	}
2028	1887
2029		- if ( $bulkaction && str_starts_with( $bulkaction, 'bulk_' ) ) {
	1888	+ if ( ! empty( $bulkaction ) && strpos( $bulkaction, 'bulk_' ) === 0 ) {
2030	1889	FrmAppHelper::remove_get_action();
	1890	+
2031	1891	$bulkaction = str_replace( 'bulk_', '', $bulkaction );
2032	1892	}
2033	1893
2034	1894	$ids = FrmAppHelper::get_param( 'item-action', '', 'get', 'sanitize_text_field' );
	1895	+ if ( empty( $ids ) ) {
	1896	+ $errors[] = __( 'No forms were specified', 'formidable' );
2035	1897
2036		- if ( ! $ids ) {
2037		- $errors[] = __( 'No forms were specified', 'formidable' );
2038	1898	return $errors;
2039	1899	}
2040	1900
2041	1901	$permission_error = FrmAppHelper::permission_nonce_error( '', '_wpnonce', 'bulk-toplevel_page_formidable' );
2042		-
2043	1902	if ( $permission_error !== false ) {
2044	1903	$errors[] = $permission_error;
	1904	+
2045	1905	return $errors;
2046	1906	}
2047	1907
2048	1908	if ( ! is_array( $ids ) ) {
		@@ -2070,9 +1930,8 @@
2070	1930	/**
2071	1931	* Includes html that shows a message when the device is too small to use Formidable Forms admin pages.
2072	1932	*
2073	1933	* @since 6.20
2074		- *
2075	1934	* @return void
2076	1935	*/
2077	1936	public static function include_device_too_small_message() {
2078	1937	if ( ! FrmAppHelper::is_formidable_admin() ) {
		@@ -2081,13 +1940,12 @@
2081	1940
2082	1941	include FrmAppHelper::plugin_path() . '/classes/views/shared/small-device-message.php';
2083	1942	}
2084	1943
2085		- public static function route() { // phpcs:ignore Generic.Metrics.CyclomaticComplexity.MaxExceeded
	1944	+ public static function route() {
2086	1945	$action = isset( $_REQUEST['frm_action'] ) ? 'frm_action' : 'action';
2087	1946	$vars = array();
2088	1947	FrmAppHelper::include_svg();
2089		-
2090	1948	if ( isset( $_POST['frm_compact_fields'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
2091	1949	FrmAppHelper::permission_check( 'frm_edit_forms' );
2092	1950
2093	1951	// Javascript needs to be allowed in some field settings.
		@@ -2093,13 +1951,11 @@
2093	1951	// Javascript needs to be allowed in some field settings.
2094	1952	// phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized, WordPress.Security.NonceVerification.Missing
2095	1953	$json_vars = htmlspecialchars_decode( nl2br( str_replace( '&quot;', '"', wp_unslash( $_POST['frm_compact_fields'] ) ) ) );
2096	1954	$json_vars = json_decode( $json_vars, true );
2097		-
2098		- if ( ! $json_vars ) {
	1955	+ if ( empty( $json_vars ) ) {
2099	1956	// json decoding failed so we should return an error message.
2100	1957	$action = FrmAppHelper::get_param( $action, '', 'get', 'sanitize_title' );
2101		-
2102	1958	if ( 'edit' === $action ) {
2103	1959	$action = 'update';
2104	1960	}
2105	1961
		@@ -2112,9 +1968,8 @@
2112	1968	$_POST = array_merge( $_POST, $_REQUEST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
2113	1969	}
2114	1970	} else {
2115	1971	$action = FrmAppHelper::get_param( $action, '', 'get', 'sanitize_title' );
2116		-
2117	1972	if ( isset( $_REQUEST['delete_all'] ) ) {
2118	1973	// Override the action for this page.
2119	1974	$action = 'delete_all';
2120	1975	}
		@@ -2134,38 +1989,34 @@
2134	1989	case 'update_settings':
2135	1990	return self::$action( $vars );
2136	1991	case 'lite-reports':
2137	1992	self::no_reports( $vars );
2138		- return null;
	1993	+ return;
2139	1994	case 'views':
2140	1995	self::no_views( $vars );
2141		- return null;
	1996	+ return;
2142	1997	default:
2143	1998	do_action( 'frm_form_action_' . $action );
2144		-
2145	1999	if ( apply_filters( 'frm_form_stop_action_' . $action, false ) ) {
2146		- return null;
	2000	+ return;
2147	2001	}
2148	2002
2149	2003	$action = FrmAppHelper::get_param( 'action', '', 'get', 'sanitize_text_field' );
2150		-
2151		- // phpcs:ignore Universal.Operators.StrictComparisons
2152	2004	if ( $action == - 1 ) {
2153	2005	$action = FrmAppHelper::get_param( 'action2', '', 'get', 'sanitize_title' );
2154	2006	}
2155	2007
2156		- if ( str_starts_with( $action, 'bulk_' ) ) {
	2008	+ if ( strpos( $action, 'bulk_' ) === 0 ) {
2157	2009	FrmAppHelper::remove_get_action();
2158	2010
2159	2011	self::list_form();
2160		- return null;
	2012	+ return;
2161	2013	}
2162	2014
2163	2015	$message = FrmAppHelper::get_param( 'message' );
2164		-
2165	2016	if ( 'form_duplicate_error' === $message ) {
2166	2017	self::display_forms_list( array(), '', array( __( 'There was a problem duplicating the form', 'formidable' ) ) );
2167		- return null;
	2018	+ return;
2168	2019	}
2169	2020
2170	2021	if ( 'forms_permanently_deleted' === $message ) {
2171	2022	$count = FrmAppHelper::get_param( 'forms_deleted', 0, 'get', 'absint' );
		@@ -2171,14 +2022,14 @@
2171	2022	$count = FrmAppHelper::get_param( 'forms_deleted', 0, 'get', 'absint' );
2172	2023	/* translators: %1$s: Number of forms */
2173	2024	$message = sprintf( _n( '%1$s form permanently deleted.', '%1$s forms permanently deleted.', $count, 'formidable' ), $count );
2174	2025	self::display_forms_list( array(), $message, '' );
2175		- return null;
	2026	+ return;
2176	2027	}
2177	2028
2178	2029	self::display_forms_list();
2179	2030
2180		- return null;
	2031	+ return;
2181	2032	}//end switch
2182	2033	}
2183	2034
2184	2035	/**
		@@ -2197,43 +2048,19 @@
2197	2048
2198	2049	// Get posted data
2199	2050	$form_id = FrmAppHelper::get_post_param( 'form_id', '', 'absint' );
2200	2051	$name = FrmAppHelper::get_post_param( 'form_name', '', 'sanitize_text_field' );
2201		- $form = FrmForm::getOne( $form_id );
2202	2052
2203		- if ( ! $form ) {
2204		- wp_send_json_error( __( 'Form not found', 'formidable' ) );
2205		- }
	2053	+ // Update the form name and form key.
	2054	+ $form_key = FrmAppHelper::get_unique_key( sanitize_title( $name ), 'frm_forms', 'form_key' );
	2055	+ FrmForm::update( $form_id, compact( 'name', 'form_key' ) );
2206	2056
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	2057	wp_send_json_success( compact( 'form_key' ) );
2227	2058	}
2228	2059
2229		- /**
2230		- * @param array $errors
2231		- *
2232		- * @return array
2233		- */
2234	2060	public static function json_error( $errors ) {
2235	2061	$errors['json'] = __( 'Abnormal HTML characters prevented your form from saving correctly', 'formidable' );
	2062	+
2236	2063	return $errors;
2237	2064	}
2238	2065
2239	2066	/**
		@@ -2240,10 +2067,8 @@
2240	2067	* Add education about views.
2241	2068	*
2242	2069	* @since 4.07
2243	2070	*
2244		- * @param array $values
2245		- *
2246	2071	* @return void
2247	2072	*/
2248	2073	public static function no_views( $values = array() ) {
2249	2074	FrmAppHelper::include_svg();
		@@ -2257,10 +2082,8 @@
2257	2082	* Add education about reports.
2258	2083	*
2259	2084	* @since 4.07
2260	2085	*
2261		- * @param array $values
2262		- *
2263	2086	* @return void
2264	2087	*/
2265	2088	public static function no_reports( $values = array() ) {
2266	2089	$id = FrmAppHelper::get_param( 'form', '', 'get', 'absint' );
		@@ -2287,9 +2110,8 @@
2287	2110	* @since 4.05.02
2288	2111	*/
2289	2112	private static function move_menu_to_footer() {
2290	2113	$settings = FrmAppHelper::get_settings();
2291		-
2292	2114	if ( empty( $settings->admin_bar ) ) {
2293	2115	remove_action( 'wp_body_open', 'wp_admin_bar_render', 0 );
2294	2116	}
2295	2117	}
		@@ -2295,15 +2117,13 @@
2295	2117	}
2296	2118
2297	2119	public static function admin_bar_configure() {
2298	2120	global $frm_vars;
2299		-
2300	2121	if ( empty( $frm_vars['forms_loaded'] ) ) {
2301	2122	return;
2302	2123	}
2303	2124
2304	2125	$actions = array();
2305		-
2306	2126	foreach ( $frm_vars['forms_loaded'] as $form ) {
2307	2127	if ( is_object( $form ) ) {
2308	2128	$actions[ $form->id ] = $form->name;
2309	2129	}
		@@ -2309,9 +2129,9 @@
2309	2129	}
2310	2130	unset( $form );
2311	2131	}
2312	2132
2313		- if ( ! $actions ) {
	2133	+ if ( empty( $actions ) ) {
2314	2134	return;
2315	2135	}
2316	2136
2317	2137	self::add_menu_to_admin_bar();
		@@ -2337,12 +2157,8 @@
2337	2157	}
2338	2158
2339	2159	/**
2340	2160	* @since 2.05.07
2341		- *
2342		- * @param array $actions
2343		- *
2344		- * @return void
2345	2161	*/
2346	2162	private static function add_forms_to_admin_bar( $actions ) {
2347	2163	global $wp_admin_bar;
2348	2164
		@@ -2348,8 +2164,9 @@
2348	2164
2349	2165	asort( $actions );
2350	2166
2351	2167	foreach ( $actions as $form_id => $name ) {
	2168	+
2352	2169	$wp_admin_bar->add_node(
2353	2170	array(
2354	2171	'parent' => 'frm-forms',
2355	2172	'id' => 'edit_form_' . $form_id,
		@@ -2363,14 +2180,12 @@
2363	2180	/**
2364	2181	* The formidable shortcode
2365	2182	*
2366	2183	* @param array $atts The params from the shortcode.
2367		- *
2368	2184	* @return string
2369	2185	*/
2370	2186	public static function get_form_shortcode( $atts ) {
2371	2187	global $frm_vars;
2372		-
2373	2188	if ( ! empty( $frm_vars['skip_shortcode'] ) ) {
2374	2189	$sc = '[formidable';
2375	2190	$sc .= FrmAppHelper::array_to_html_params( $atts );
2376	2191	return $sc . ']';
		@@ -2399,9 +2214,8 @@
2399	2214	* @since 5.2.01
2400	2215	*
2401	2216	* @param false|int|string $id
2402	2217	* @param false|string $key
2403		- *
2404	2218	* @return false|stdClass
2405	2219	*/
2406	2220	private static function maybe_get_form_by_id_or_key( $id, $key ) {
2407	2221	if ( ! $id ) {
		@@ -2415,9 +2229,8 @@
2415	2229	* @param false|string $key
2416	2230	* @param bool|int|string $title may be 'auto', true, false, 'true', 'false', 'yes', '1', 1, '0', 0.
2417	2231	* @param bool|int|string $description may be 'auto', true, false, 'true', 'false', 'yes', '1', 1, '0', 0.
2418	2232	* @param array $atts
2419		- *
2420	2233	* @return string
2421	2234	*/
2422	2235	public static function show_form( $id = '', $key = '', $title = false, $description = false, $atts = array() ) {
2423	2236	$form = self::maybe_get_form_by_id_or_key( $id, $key );
		@@ -2438,9 +2251,10 @@
2438	2251
2439	2252	add_action( 'frm_load_form_hooks', 'FrmHooksController::trigger_load_form_hooks' );
2440	2253	FrmAppHelper::trigger_hook_load( 'form', $form );
2441	2254
2442		- $form = apply_filters( 'frm_pre_display_form', $form );
	2255	+ $form = apply_filters( 'frm_pre_display_form', $form );
	2256	+
2443	2257	$frm_settings = FrmAppHelper::get_settings( array( 'current_form' => $form->id ) );
2444	2258
2445	2259	if ( self::is_viewable_draft_form( $form ) ) {
2446	2260	// don't show a draft form on a page
		@@ -2464,18 +2278,16 @@
2464	2278	}
2465	2279
2466	2280	/**
2467	2281	* @param false|int|string $id
2468		- *
2469	2282	* @return false|stdClass
2470	2283	*/
2471	2284	private static function maybe_get_form_to_show( $id ) {
2472	2285	$form = false;
2473	2286
2474		- if ( $id ) {
	2287	+ if ( ! empty( $id ) ) {
2475	2288	// Form id or key is set.
2476	2289	$form = FrmForm::getOne( $id );
2477		-
2478	2290	if ( ! $form || $form->parent_form_id || $form->status === 'trash' ) {
2479	2291	$form = false;
2480	2292	}
2481	2293	}
		@@ -2482,25 +2294,12 @@
2482	2294
2483	2295	return $form;
2484	2296	}
2485	2297
2486		- /**
2487		- * @param object $form
2488		- *
2489		- * @return bool
2490		- */
2491	2298	private static function is_viewable_draft_form( $form ) {
2492	2299	return $form->status === 'draft' && current_user_can( 'frm_edit_forms' ) && ! FrmAppHelper::is_preview_page();
2493	2300	}
2494	2301
2495		- /**
2496		- * @param object $form
2497		- * @param bool $title
2498		- * @param bool $description
2499		- * @param array $atts
2500		- *
2501		- * @return string
2502		- */
2503	2302	public static function get_form( $form, $title, $description, $atts = array() ) {
2504	2303	ob_start();
2505	2304
2506	2305	do_action( 'frm_before_get_form', $atts );
		@@ -2507,9 +2306,10 @@
2507	2306
2508	2307	self::get_form_contents( $form, $title, $description, $atts );
2509	2308	self::enqueue_scripts( FrmForm::get_params( $form ) );
2510	2309
2511		- $contents = ob_get_clean();
	2310	+ $contents = ob_get_contents();
	2311	+ ob_end_clean();
2512	2312
2513	2313	self::maybe_minimize_form( $atts, $contents );
2514	2314
2515	2315	return $contents;
		@@ -2514,25 +2314,12 @@
2514	2314
2515	2315	return $contents;
2516	2316	}
2517	2317
2518		- /**
2519		- * @param array $params
2520		- *
2521		- * @return void
2522		- */
2523	2318	public static function enqueue_scripts( $params ) {
2524	2319	do_action( 'frm_enqueue_form_scripts', $params );
2525	2320	}
2526	2321
2527		- /**
2528		- * @param object $form
2529		- * @param bool $title
2530		- * @param bool $description
2531		- * @param array $atts
2532		- *
2533		- * @return void
2534		- */
2535	2322	public static function get_form_contents( $form, $title, $description, $atts ) {
2536	2323	$params = FrmForm::get_params( $form );
2537	2324	$errors = self::get_saved_errors( $form, $params );
2538	2325	$fields = FrmFieldsHelper::get_form_fields( $form->id, $errors );
		@@ -2539,10 +2326,9 @@
2539	2326	$reset = false;
2540	2327	$pass_args = compact( 'form', 'fields', 'errors', 'title', 'description', 'reset' );
2541	2328
2542	2329	$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;
	2330	+ $handle_process_here = $params['action'] === 'create' && $params['posted_form_id'] == $form->id && $_POST; // phpcs:ignore WordPress.Security.NonceVerification.Missing
2545	2331
2546	2332	if ( ! $handle_process_here ) {
2547	2333	FrmFormState::set_initial_value( 'title', $title );
2548	2334	FrmFormState::set_initial_value( 'description', $description );
		@@ -2547,16 +2333,16 @@
2547	2333	FrmFormState::set_initial_value( 'title', $title );
2548	2334	FrmFormState::set_initial_value( 'description', $description );
2549	2335
2550	2336	do_action( 'frm_display_form_action', $params, $fields, $form, $title, $description );
2551		-
2552	2337	if ( apply_filters( 'frm_continue_to_new', true, $form->id, $params['action'] ) ) {
2553	2338	self::show_form_after_submit( $pass_args );
2554	2339	}
2555		- } elseif ( $errors ) {
	2340	+ } elseif ( ! empty( $errors ) ) {
2556	2341	self::show_form_after_submit( $pass_args );
2557	2342
2558	2343	} else {
	2344	+
2559	2345	do_action( 'frm_validate_form_creation', $params, $fields, $form, $title, $description );
2560	2346
2561	2347	if ( apply_filters( 'frm_continue_to_create', true, $form->id ) ) {
2562	2348	$entry_id = self::just_created_entry( $form->id );
		@@ -2579,19 +2365,13 @@
2579	2365	/**
2580	2366	* If the form was processed earlier (init), get the generated errors
2581	2367	*
2582	2368	* @since 2.05
2583		- *
2584		- * @param object $form
2585		- * @param array $params
2586		- *
2587		- * @return array
2588	2369	*/
2589	2370	private static function get_saved_errors( $form, $params ) {
2590	2371	global $frm_vars;
2591	2372
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 ] ) ) {
	2373	+ if ( $params['posted_form_id'] == $form->id && $_POST && isset( $frm_vars['created_entries'][ $form->id ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
2594	2374	$errors = $frm_vars['created_entries'][ $form->id ]['errors'];
2595	2375	} else {
2596	2376	$errors = array();
2597	2377	}
		@@ -2608,16 +2388,13 @@
2608	2388	}
2609	2389
2610	2390	/**
2611	2391	* @since 2.2.7
2612		- *
2613		- * @param int|string $form_id
2614		- *
2615		- * @return int
2616	2392	*/
2617	2393	public static function just_created_entry( $form_id ) {
2618	2394	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
	2395	+
	2396	+ 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	2397	}
2621	2398
2622	2399	/**
2623	2400	* Gets confirmation method.
		@@ -2630,9 +2407,8 @@
2630	2407	*
2631	2408	* @type object $form Form object.
2632	2409	* @type int $entry_id Entry ID.
2633	2410	* }
2634		- *
2635	2411	* @return array|string
2636	2412	*/
2637	2413	private static function get_confirmation_method( $atts ) {
2638	2414	$action = FrmOnSubmitHelper::current_event( $atts );
		@@ -2640,9 +2416,8 @@
2640	2416	$method = ! empty( $atts['form']->options[ $opt ] ) ? $atts['form']->options[ $opt ] : 'message';
2641	2417
2642	2418	if ( ! empty( $atts['entry_id'] ) ) {
2643	2419	$met_actions = self::get_met_on_submit_actions( $atts, $action );
2644		-
2645	2420	if ( $met_actions ) {
2646	2421	$method = $met_actions;
2647	2422	}
2648	2423	}
		@@ -2655,15 +2430,8 @@
2655	2430
2656	2431	return $method;
2657	2432	}
2658	2433
2659		- /**
2660		- * @param object $form
2661		- * @param array $params
2662		- * @param array $args
2663		- *
2664		- * @return void
2665		- */
2666	2434	public static function maybe_trigger_redirect( $form, $params, $args ) {
2667	2435	if ( ! isset( $params['id'] ) ) {
2668	2436	global $frm_vars;
2669	2437	$params['id'] = $frm_vars['created_entries'][ $form->id ]['entry_id'];
		@@ -2703,15 +2471,8 @@
2703	2471	self::trigger_redirect( $form, $params, $args );
2704	2472	}
2705	2473	}
2706	2474
2707		- /**
2708		- * @param object $form
2709		- * @param array $params
2710		- * @param array $args
2711		- *
2712		- * @return void
2713		- */
2714	2475	public static function trigger_redirect( $form, $params, $args ) {
2715	2476	$success_args = array(
2716	2477	'action' => $params['action'],
2717	2478	'conf_method' => 'redirect',
		@@ -2770,9 +2531,8 @@
2770	2531	* @since 6.0
2771	2532	*
2772	2533	* @param array $args See {@see FrmFormsController::run_success_action()}.
2773	2534	* @param string $event Form event. Default is `create`.
2774		- *
2775	2535	* @return array Array of actions that meet the conditional logics.
2776	2536	*/
2777	2537	public static function get_met_on_submit_actions( $args, $event = 'create' ) {
2778	2538	if ( ! FrmOnSubmitHelper::form_has_migrated( $args['form'] ) ) {
		@@ -2830,9 +2590,9 @@
2830	2590	* @param array $args See {@see FrmFormsController::run_success_action()}. `$args['event']` is also added.
2831	2591	*/
2832	2592	$met_actions = apply_filters( 'frm_get_met_on_submit_actions', $met_actions, $args );
2833	2593
2834		- if ( ! $met_actions ) {
	2594	+ if ( empty( $met_actions ) ) {
2835	2595	$met_actions = array( FrmOnSubmitHelper::get_fallback_action( $event ) );
2836	2596	}
2837	2597
2838	2598	return $met_actions;
		@@ -2845,9 +2605,8 @@
2845	2605	*
2846	2606	* @param object $action Form action object.
2847	2607	* @param array $args See {@see FrmFormsController::run_success_action()}.
2848	2608	* @param string $event Form event. Default is `create`.
2849		- *
2850	2609	* @return bool
2851	2610	*/
2852	2611	private static function is_valid_on_submit_action( $action, $args, $event = 'create' ) {
2853	2612	$action_type = FrmOnSubmitHelper::get_action_type( $action );
		@@ -2869,9 +2628,8 @@
2869	2628	return false;
2870	2629	}
2871	2630
2872	2631	$page = get_post( $action->post_content['success_page_id'] );
2873		-
2874	2632	if ( ! $page || 'trash' === $page->post_status ) {
2875	2633	return false;
2876	2634	}
2877	2635	}
		@@ -2893,9 +2651,8 @@
2893	2651	'entry_id' => $args['entry_id'],
2894	2652	'action' => FrmOnSubmitHelper::current_event( $args ),
2895	2653	)
2896	2654	);
2897		-
2898	2655	if ( ! is_array( $args['conf_method'] ) ) {
2899	2656	self::run_success_action( $args );
2900	2657	return;
2901	2658	}
		@@ -2922,9 +2679,8 @@
2922	2679	* @param array $args See {@see FrmFormsController::run_success_action()}.
2923	2680	*/
2924	2681	public static function run_multi_on_submit_actions( $args ) {
2925	2682	$redirect_action = null;
2926		-
2927	2683	foreach ( $args['conf_method'] as $action ) {
2928	2684	if ( 'redirect' === FrmOnSubmitHelper::get_action_type( $action ) ) {
2929	2685	// We catch the redirect action to run it last.
2930	2686	$redirect_action = $action;
		@@ -2962,9 +2718,8 @@
2962	2718	* @since 6.0
2963	2719	*
2964	2720	* @param array $args See {@see FrmFormsController::run_success_action()}.
2965	2721	* @param object $action On Submit action object.
2966		- *
2967	2722	* @return array
2968	2723	*/
2969	2724	private static function get_run_success_action_args( $args, $action ) {
2970	2725	$new_args = $args;
		@@ -2970,9 +2725,10 @@
2970	2725	$new_args = $args;
2971	2726
2972	2727	FrmOnSubmitHelper::populate_on_submit_data( $new_args['form']->options, $action, $args['action'] );
2973	2728
2974		- $opt = 'update' === $args['action'] ? 'edit_' : 'success_';
	2729	+ $opt = 'update' === $args['action'] ? 'edit_' : 'success_';
	2730	+
2975	2731	$new_args['conf_method'] = $new_args['form']->options[ $opt . 'action' ];
2976	2732
2977	2733	/**
2978	2734	* Filters the run success action args.
		@@ -2987,18 +2743,12 @@
2987	2743	}
2988	2744
2989	2745	/**
2990	2746	* @since 3.0
2991		- *
2992		- * @param array $args
2993		- *
2994		- * @return void
2995	2747	*/
2996	2748	private static function load_page_after_submit( $args ) {
2997	2749	global $post;
2998	2750	$opt = $args['success_opt'];
2999		-
3000		- // phpcs:ignore Universal.Operators.StrictComparisons
3001	2751	if ( ! $post || $args['form']->options[ $opt . '_page_id' ] != $post->ID ) {
3002	2752	$page = get_post( $args['form']->options[ $opt . '_page_id' ] );
3003	2753	$old_post = $post;
3004	2754	$post = $page;
		@@ -3022,9 +2772,8 @@
3022	2772	}
3023	2773
3024	2774	/**
3025	2775	* @since 3.0
3026		- *
3027	2776	* @param array $args See {@see FrmFormsController::run_success_action()}.
3028	2777	*/
3029	2778	private static function redirect_after_submit( $args ) {
3030	2779	add_filter( 'frm_use_wpautop', '__return_false' );
		@@ -3038,10 +2787,11 @@
3038	2787	FrmEntriesController::delete_entry_before_redirect( $success_url, $args['form'], $args );
3039	2788
3040	2789	add_filter( 'frm_redirect_url', 'FrmEntriesController::prepare_redirect_url' );
3041	2790	$success_url = apply_filters( 'frm_redirect_url', $success_url, $args['form'], $args );
3042		- $doing_ajax = FrmAppHelper::doing_ajax();
3043	2791
	2792	+ $doing_ajax = FrmAppHelper::doing_ajax();
	2793	+
3044	2794	if ( ! empty( $args['ajax'] ) && $doing_ajax && empty( $args['force_delay_redirect'] ) ) {
3045	2795	// Is AJAX submit and there is just one Redirect action runs.
3046	2796	echo json_encode( self::get_ajax_redirect_response_data( $args + compact( 'success_url' ) ) );
3047	2797	wp_die();
		@@ -3090,9 +2840,8 @@
3090	2840	*
3091	2841	* @since 6.3.1
3092	2842	*
3093	2843	* @param array $args See {@see FrmFormsController::run_success_action()}.
3094		- *
3095	2844	* @return array
3096	2845	*/
3097	2846	private static function get_ajax_redirect_response_data( $args ) {
3098	2847	$response_data = array(
		@@ -3115,9 +2864,8 @@
3115	2864	$args['message'] = FrmOnSubmitHelper::get_default_new_tab_msg();
3116	2865
3117	2866	$args['form']->options['success_msg'] = $args['message'];
3118	2867	$args['form']->options['edit_msg'] = $args['message'];
3119		-
3120	2868	if ( ! isset( $args['fields'] ) ) {
3121	2869	$args['fields'] = FrmField::get_all_for_form( $args['form']->id );
3122	2870	}
3123	2871
		@@ -3169,15 +2917,13 @@
3169	2917	add_filter( 'frm_use_wpautop', '__return_true' );
3170	2918
3171	2919	echo FrmAppHelper::maybe_kses( $redirect_msg ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
3172	2920	echo '<script>';
3173		-
3174	2921	if ( empty( $args['doing_ajax'] ) ) {
3175	2922	// Not AJAX submit, delay JS until window.load.
3176	2923	echo 'window.onload=function(){';
3177	2924	}
3178	2925	echo 'setTimeout(function(){' . $redirect_js . '}, ' . intval( $delay_time ) . ');'; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
3179		-
3180	2926	if ( empty( $args['doing_ajax'] ) ) {
3181	2927	echo '};';
3182	2928	}
3183	2929	echo '</script>';
		@@ -3192,9 +2938,9 @@
3192	2938	*/
3193	2939	private static function get_redirect_message( $success_url, $success_msg, $args ) {
3194	2940	$success_msg = apply_filters( 'frm_content', $success_msg, $args['form'], $args['entry_id'] );
3195	2941	$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
	2942	+ $redirect_msg = '<div class="' . esc_attr( FrmFormsHelper::get_form_style_class( $args['form'] ) ) . '"><div class="frm-redirect-msg" role="status">' . $success_msg . '<br/>' .
3197	2943	self::get_redirect_fallback_message( $success_url, $args ) .
3198	2944	'</div></div>';
3199	2945
3200	2946	$redirect_args = array(
		@@ -3212,14 +2958,12 @@
3212	2958	* @since 6.3.1
3213	2959	*
3214	2960	* @param string $success_url Redirect URL.
3215	2961	* @param array $args Contains `form` object.
3216		- *
3217	2962	* @return string
3218	2963	*/
3219	2964	private static function get_redirect_fallback_message( $success_url, $args ) {
3220	2965	$target = '';
3221		-
3222	2966	if ( ! empty( $args['form']->options['open_in_new_tab'] ) ) {
3223	2967	$target = ' target="_blank"';
3224	2968	}
3225	2969
		@@ -3234,12 +2978,8 @@
3234	2978	/**
3235	2979	* Prepare to show the success message and empty form after submit
3236	2980	*
3237	2981	* @since 2.05
3238		- *
3239		- * @param array $atts
3240		- *
3241		- * @return void
3242	2982	*/
3243	2983	public static function show_message_after_save( $atts ) {
3244	2984	$atts['message'] = self::prepare_submit_message( $atts['form'], $atts['entry_id'], $atts );
3245	2985
		@@ -3245,9 +2985,8 @@
3245	2985
3246	2986	if ( ! isset( $atts['form']->options['show_form'] ) || $atts['form']->options['show_form'] ) {
3247	2987	if ( isset( $atts['action'] ) && 'update' === $atts['action'] && is_callable( array( 'FrmProEntriesController', 'show_front_end_form_with_entry' ) ) ) {
3248	2988	$entry = FrmEntry::getOne( $atts['entry_id'] );
3249		-
3250	2989	if ( $entry ) {
3251	2990	// This is copied from the Pro plugin.
3252	2991	$atts['conf_message'] = FrmProEntriesController::confirmation( 'message', $atts['form'], $atts['form']->options, $entry->id, $atts );
3253	2992	$atts['show_form'] = FrmProEntriesController::is_form_displayed_after_edit( $atts['form'] );
		@@ -3264,12 +3003,8 @@
3264	3003	/**
3265	3004	* Show an empty form
3266	3005	*
3267	3006	* @since 2.05
3268		- *
3269		- * @param array $args
3270		- *
3271		- * @return void
3272	3007	*/
3273	3008	private static function show_form_after_submit( $args ) {
3274	3009	self::fill_atts_for_form_display( $args );
3275	3010
		@@ -3288,11 +3023,12 @@
3288	3023	}
3289	3024	unset( $args );
3290	3025
3291	3026	$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	3027
	3028	+ $frm_settings = FrmAppHelper::get_settings();
	3029	+ $submit = isset( $form->options['submit_value'] ) ? $form->options['submit_value'] : $frm_settings->submit_value;
	3030	+
3295	3031	global $frm_vars;
3296	3032	self::maybe_load_css( $form, $values['custom_style'], $frm_vars['load_css'] );
3297	3033
3298	3034	$message_placement = self::message_placement( $form, $message );
		@@ -3300,36 +3036,25 @@
3300	3036	include FrmAppHelper::plugin_path() . '/classes/views/frm-entries/new.php';
3301	3037	}
3302	3038
3303	3039	/**
3304		- * Gets message placement.
3305		- *
3306	3040	* @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'.
	3041	+ * @return string - 'before', 'after', or 'submit'
3313	3042	*/
3314		- public static function message_placement( $form, $message ) {
	3043	+ private static function message_placement( $form, $message ) {
3315	3044	$place = 'before';
3316	3045
3317	3046	if ( $message && isset( $form->options['form_class'] ) ) {
3318		- if ( str_contains( $form->options['form_class'], 'frm_below_success' ) ) {
	3047	+ if ( strpos( $form->options['form_class'], 'frm_below_success' ) !== false ) {
3319	3048	$place = 'after';
3320		- } elseif ( str_contains( $form->options['form_class'], 'frm_inline_success' ) ) {
	3049	+ } elseif ( strpos( $form->options['form_class'], 'frm_inline_success' ) !== false ) {
3321	3050	$place = 'submit';
3322	3051	}
3323	3052	}
3324	3053
3325	3054	/**
3326		- * Filter the message placement.
3327		- *
3328	3055	* @since 4.05.02
3329		- *
3330		- * @param string $place Accepts 'before', 'after', or 'submit'.
3331		- * @param array $args Args.
	3056	+ * @return string - 'before' or 'after'
3332	3057	*/
3333	3058	return apply_filters( 'frm_message_placement', $place, compact( 'form', 'message' ) );
3334	3059	}
3335	3060
		@@ -3336,12 +3061,8 @@
3336	3061	/**
3337	3062	* Get all the values needed on the new.php entry page
3338	3063	*
3339	3064	* @since 2.05
3340		- *
3341		- * @param array $args
3342		- *
3343		- * @return void
3344	3065	*/
3345	3066	private static function fill_atts_for_form_display( &$args ) {
3346	3067	if ( ! isset( $args['title'] ) && isset( $args['show_title'] ) ) {
3347	3068	$args['title'] = $args['show_title'];
		@@ -3366,12 +3087,8 @@
3366	3087	/**
3367	3088	* Show the success message without the form
3368	3089	*
3369	3090	* @since 2.05
3370		- *
3371		- * @param array $atts
3372		- *
3373		- * @return void
3374	3091	*/
3375	3092	private static function show_lone_success_message( $atts ) {
3376	3093	global $frm_vars;
3377	3094	$values = FrmEntriesHelper::setup_new_vars( $atts['fields'], $atts['form'], true );
		@@ -3377,12 +3094,13 @@
3377	3094	$values = FrmEntriesHelper::setup_new_vars( $atts['fields'], $atts['form'], true );
3378	3095	self::maybe_load_css( $atts['form'], $values['custom_style'], $frm_vars['load_css'] );
3379	3096
3380	3097	$include_extra_container = 'frm_forms' . FrmFormsHelper::get_form_style_class( $values );
3381		- $errors = array();
3382		- $form = $atts['form'];
3383		- $message = $atts['message'];
3384	3098
	3099	+ $errors = array();
	3100	+ $form = $atts['form'];
	3101	+ $message = $atts['message'];
	3102	+
3385	3103	include FrmAppHelper::plugin_path() . '/classes/views/frm-entries/errors.php';
3386	3104	}
3387	3105
3388	3106	/**
		@@ -3393,17 +3111,16 @@
3393	3111	*
3394	3112	* @param object $form Form object.
3395	3113	* @param int $entry_id Entry ID.
3396	3114	* @param array $args See {@see FrmFormsController::run_success_action()}.
3397		- *
3398	3115	* @return string
3399	3116	*/
3400	3117	private static function prepare_submit_message( $form, $entry_id, $args = array() ) {
3401	3118	$frm_settings = FrmAppHelper::get_settings( array( 'current_form' => $form->id ) );
3402		- $opt = $args['success_opt'] ?? 'success';
	3119	+ $opt = isset( $args['success_opt'] ) ? $args['success_opt'] : 'success';
3403	3120
3404	3121	if ( $entry_id && is_numeric( $entry_id ) ) {
3405		- $message = $form->options[ $opt . '_msg' ] ?? $frm_settings->success_msg;
	3122	+ $message = isset( $form->options[ $opt . '_msg' ] ) ? $form->options[ $opt . '_msg' ] : $frm_settings->success_msg;
3406	3123	$class = 'frm_message';
3407	3124	} else {
3408	3125	$message = $frm_settings->failed_msg;
3409	3126	$class = FrmFormsHelper::form_error_class();
		@@ -3420,9 +3137,9 @@
3420	3137	public static function front_head() {
3421	3138	$version = FrmAppHelper::plugin_version();
3422	3139	$suffix = FrmAppHelper::js_suffix();
3423	3140
3424		- if ( $suffix && self::has_combo_js_file() ) {
	3141	+ if ( ! empty( $suffix ) && self::has_combo_js_file() ) {
3425	3142	wp_register_script( 'formidable', FrmAppHelper::plugin_url() . '/js/frm.min.js', array( 'jquery' ), $version, true );
3426	3143	} else {
3427	3144	wp_register_script( 'formidable', FrmAppHelper::plugin_url() . "/js/formidable{$suffix}.js", array( 'jquery' ), $version, true );
3428	3145	}
		@@ -3444,15 +3161,8 @@
3444	3161	public static function has_combo_js_file() {
3445	3162	return is_readable( FrmAppHelper::plugin_path() . '/js/frm.min.js' );
3446	3163	}
3447	3164
3448		- /**
3449		- * @param object $form
3450		- * @param int|string $this_load
3451		- * @param bool $global_load
3452		- *
3453		- * @return void
3454		- */
3455	3165	public static function maybe_load_css( $form, $this_load, $global_load ) {
3456	3166	$load_css = FrmForm::is_form_loaded( $form, $this_load, $global_load );
3457	3167
3458	3168	if ( ! $load_css ) {
		@@ -3482,9 +3192,8 @@
3482	3192	return;
3483	3193	}
3484	3194
3485	3195	global $wp_styles;
3486		-
3487	3196	if ( is_array( $wp_styles->queue ) && in_array( 'formidable', $wp_styles->queue, true ) ) {
3488	3197	wp_print_styles( 'formidable' );
3489	3198	}
3490	3199	}
		@@ -3499,16 +3208,10 @@
3499	3208	private static function should_load_late() {
3500	3209	return ! function_exists( 'aioseo' );
3501	3210	}
3502	3211
3503		- /**
3504		- * @param string $tag
3505		- * @param string $handle
3506		- *
3507		- * @return string
3508		- */
3509	3212	public static function defer_script_loading( $tag, $handle ) {
3510		- if ( 'captcha-api' === $handle && ! str_contains( $tag, 'defer' ) ) {
	3213	+ if ( 'captcha-api' == $handle && ! strpos( $tag, 'defer' ) ) {
3511	3214	$tag = str_replace( ' src', ' defer="defer" async="async" src', $tag );
3512	3215	}
3513	3216
3514	3217	return $tag;
		@@ -3513,13 +3216,8 @@
3513	3216
3514	3217	return $tag;
3515	3218	}
3516	3219
3517		- /**
3518		- * @param string $location
3519		- *
3520		- * @return void
3521		- */
3522	3220	public static function footer_js( $location = 'footer' ) {
3523	3221	global $frm_vars;
3524	3222
3525	3223	FrmStylesController::enqueue_css();
		@@ -3533,13 +3231,8 @@
3533	3231	}
3534	3232
3535	3233	/**
3536	3234	* @since 2.0.8
3537		- *
3538		- * @param array $atts
3539		- * @param string $content
3540		- *
3541		- * @return void
3542	3235	*/
3543	3236	private static function maybe_minimize_form( $atts, &$content ) {
3544	3237	// check if minimizing is turned on
3545	3238	if ( self::is_minification_on( $atts ) ) {
		@@ -3548,11 +3241,8 @@
3548	3241	}
3549	3242
3550	3243	/**
3551	3244	* @since 2.0.8
3552		- *
3553		- * @param array $atts
3554		- *
3555	3245	* @return bool
3556	3246	*/
3557	3247	private static function is_minification_on( $atts ) {
3558	3248	return ! empty( $atts['minimize'] );
		@@ -3564,13 +3254,11 @@
3564	3254	* @return void
3565	3255	*/
3566	3256	public static function landing_page_preview_option() {
3567	3257	$dir = apply_filters( 'frm_landing_page_preview_option', false );
3568		-
3569	3258	if ( false === $dir || ! file_exists( $dir . 'landing-page-preview-option.php' ) ) {
3570	3259	$dir = self::get_form_views_path();
3571	3260	}
3572		-
3573	3261	include $dir . 'landing-page-preview-option.php';
3574	3262	}
3575	3263
3576	3264	/**
		@@ -3596,15 +3284,13 @@
3596	3284
3597	3285	check_ajax_referer( 'frm_ajax', 'nonce' );
3598	3286
3599	3287	$type = FrmAppHelper::get_post_param( 'type', '', 'sanitize_text_field' );
3600		-
3601	3288	if ( ! $type || ! in_array( $type, array( 'form', 'view' ), true ) ) {
3602	3289	die( 0 );
3603	3290	}
3604	3291
3605	3292	$object_id = FrmAppHelper::get_post_param( 'object_id', '', 'absint' );
3606		-
3607	3293	if ( ! $object_id ) {
3608	3294	die( 0 );
3609	3295	}
3610	3296
		@@ -3616,15 +3302,13 @@
3616	3302	$postarr['post_content'] = apply_filters( 'frm_create_page_with_' . $type . '_shortcode_content', '', $object_id );
3617	3303	}
3618	3304
3619	3305	$name = FrmAppHelper::get_post_param( 'name', '', 'sanitize_text_field' );
3620		-
3621	3306	if ( $name ) {
3622	3307	$postarr['post_title'] = $name;
3623	3308	}
3624	3309
3625	3310	$success = wp_insert_post( $postarr );
3626		-
3627	3311	if ( ! is_numeric( $success ) || ! $success ) {
3628	3312	die( 0 );
3629	3313	}
3630	3314
		@@ -3638,9 +3322,8 @@
3638	3322	/**
3639	3323	* @since 5.3
3640	3324	*
3641	3325	* @param int $form_id
3642		- *
3643	3326	* @return string
3644	3327	*/
3645	3328	private static function get_page_shortcode_content_for_form( $form_id ) {
3646	3329	$shortcode = '[formidable id="' . $form_id . '"]';
		@@ -3682,14 +3365,23 @@
3682	3365	}
3683	3366
3684	3367	/**
3685	3368	* @deprecated 4.0
	3369	+ */
	3370	+ public static function create( $values = array() ) {
	3371	+ _deprecated_function( __METHOD__, '4.0', 'FrmFormsController::update' );
	3372	+ self::update( $values );
	3373	+ }
	3374	+
	3375	+ /**
	3376	+ * Education for premium features.
3686	3377	*
3687		- * @param array $values
	3378	+ * @since 4.05
	3379	+ * @deprecated 6.16.3
3688	3380	*
3689	3381	* @return void
3690	3382	*/
3691		- public static function create( $values = array() ) {
3692		- _deprecated_function( __METHOD__, '4.0', 'FrmFormsController::update' );
3693		- self::update( $values );
	3383	+ public static function add_form_style_tab_options() {
	3384	+ _deprecated_function( __METHOD__, '6.16.3' );
	3385	+ include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/add_form_style_options.php';
3694	3386	}
3695	3387	}