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