← All changes | classes/controllers/FrmFormsController.php +254 -578 6.30 → 6.21 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 ) {
		@@ -266,14 +247,13 @@
266	247	}
267	248
268	249	do_action( 'frm_before_update_form_settings', $id );
269	250
270		- $antispam_was_on = self::antispam_was_on( $id ); // phpcs:ignore Formidable.CodeAnalysis.InlineSingleUseVariable
	251	+ $antispam_was_on = self::antispam_was_on( $id );
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,21 @@
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>';
618		-
619		- // Prevent extra unexpected forms in the footer.
620		- // For some reason this happens in the Twenty Twenty Five theme.
621		- add_filter( 'frm_filter_final_form', '__return_empty_string' );
622		-
623		- self::get_template( 'footer' );
	556	+ self::get_template( 'footer' );
	557	+ }
624	558	}
625	559
626	560	/**
627	561	* Calls core function to get a template part if it doesn't cause deprecation warnings. Otherwise skips the deprecation function call
		@@ -627,11 +561,9 @@
627	561	* Calls core function to get a template part if it doesn't cause deprecation warnings. Otherwise skips the deprecation function call
628	562	* and renders required html fragments calling required functions.
629	563	*
630	564	* @since 6.7.1
631		- *
632	565	* @param string $template
633		- *
634	566	* @return void
635	567	*/
636	568	private static function get_template( $template ) {
637	569	if ( self::should_try_getting_template( $template ) ) {
		@@ -652,11 +584,9 @@
652	584	/**
653	585	* Returns true if calling a template function doesn't trigger deprecation warnings.
654	586	*
655	587	* @since 6.7.1
656		- *
657	588	* @param string $template
658		- *
659	589	* @return bool
660	590	*/
661	591	private static function should_try_getting_template( $template ) {
662	592	$stylesheet_path = get_stylesheet_directory();
		@@ -670,15 +600,15 @@
670	600	/**
671	601	* Set the page title for the theme preview page
672	602	*
673	603	* @since 3.0
674		- *
675		- * @param string $title
676		- *
677		- * @return string
678	604	*/
679	605	public static function preview_page_title( $title ) {
680		- return in_the_loop() ? self::preview_title( $title ) : $title;
	606	+ if ( in_the_loop() ) {
	607	+ $title = self::preview_title( $title );
	608	+ }
	609	+
	610	+ return $title;
681	611	}
682	612
683	613	/**
684	614	* Set the page title for the theme preview page.
		@@ -685,9 +615,8 @@
685	615	*
686	616	* @since 3.0
687	617	*
688	618	* @param string $title
689		- *
690	619	* @return string
691	620	*/
692	621	public static function preview_title( $title ) {
693	622	return __( 'Form Preview', 'formidable' );
		@@ -698,9 +627,8 @@
698	627	*
699	628	* @since 3.0
700	629	*
701	630	* @param string $content
702		- *
703	631	* @return string
704	632	*/
705	633	public static function preview_content( $content ) {
706	634	if ( in_the_loop() ) {
		@@ -716,10 +644,8 @@
716	644	* @since 3.0
717	645	*/
718	646	private static function load_direct_preview() {
719	647	$key = FrmAppHelper::simple_get( 'form', 'sanitize_title' );
720		-
721		- // phpcs:ignore Universal.Operators.StrictComparisons
722	648	if ( $key == '' ) {
723	649	$key = FrmAppHelper::get_post_param( 'form', '', 'sanitize_title' );
724	650	}
725	651
		@@ -734,9 +660,8 @@
734	660
735	661	self::maybe_block_preview( $key );
736	662
737	663	$form = FrmForm::getAll( array( 'form_key' => $key ), '', 1 );
738		-
739	664	if ( ! $form ) {
740	665	$error = __( 'Form does not exist', 'formidable' );
741	666	wp_die(
742	667	'<h1>' . esc_html( $error ) . '</h1>',
		@@ -760,22 +685,19 @@
760	685	*
761	686	* @since 6.20
762	687	*
763	688	* @param string $form_key Form key.
764		- *
765	689	* @return void
766	690	*/
767	691	public static function maybe_block_preview( $form_key ) {
768		- if ( ! FrmFormsHelper::should_block_preview( $form_key ) ) {
769		- return;
	692	+ if ( FrmFormsHelper::should_block_preview( $form_key ) ) {
	693	+ $error = __( 'You do not have permission to view this form', 'formidable' );
	694	+ wp_die(
	695	+ '<h1>' . esc_html( $error ) . '</h1>',
	696	+ '<p>' . esc_html( $error ) . '</p>',
	697	+ 403
	698	+ );
770	699	}
771		-
772		- $error = __( 'You do not have permission to view this form', 'formidable' );
773		- wp_die(
774		- '<h1>' . esc_html( $error ) . '</h1>',
775		- '<p>' . esc_html( $error ) . '</p>',
776		- 403
777		- );
778	700	}
779	701
780	702	/**
781	703	* Some themes have a null $src value.
		@@ -790,13 +712,15 @@
790	712	add_filter(
791	713	'script_loader_src',
792	714	/**
793	715	* @param string|null $src
794		- *
795	716	* @return string
796	717	*/
797	718	function ( $src ) {
798		- return is_null( $src ) ? '' : $src;
	719	+ if ( is_null( $src ) ) {
	720	+ $src = '';
	721	+ }
	722	+ return $src;
799	723	}
800	724	);
801	725	}
802	726
		@@ -805,9 +729,8 @@
805	729	}
806	730
807	731	/**
808	732	* @param array $ids
809		- *
810	733	* @return string
811	734	*/
812	735	public static function bulk_untrash( $ids ) {
813	736	FrmAppHelper::permission_check( 'frm_edit_forms' );
		@@ -819,9 +742,11 @@
819	742	return '';
820	743	}
821	744
822	745	/* translators: %1$s: Number of forms */
823		- return sprintf( _n( '%1$s form restored from the Trash.', '%1$s forms restored from the Trash.', $count, 'formidable' ), $count );
	746	+ $message = sprintf( _n( '%1$s form restored from the Trash.', '%1$s forms restored from the Trash.', $count, 'formidable' ), $count );
	747	+
	748	+ return $message;
824	749	}
825	750
826	751	/**
827	752	* @since 3.06
		@@ -866,9 +791,8 @@
866	791	// Check nonce url.
867	792	check_admin_referer( $status . '_form_' . $params['id'] );
868	793
869	794	$count = 0;
870		-
871	795	if ( FrmForm::set_status( $params['id'], $available_status[ $status ]['new_status'] ) ) {
872	796	++$count;
873	797	}
874	798
		@@ -882,9 +806,9 @@
882	806	/* translators: %1$s: Number of forms */
883	807	$available_status['untrash']['message'] = sprintf( _n( '%1$s form restored from the Trash.', '%1$s forms restored from the Trash.', $count, 'formidable' ), $count );
884	808
885	809	/* translators: %1$s: Number of forms, %2$s: Start link HTML, %3$s: End link HTML */
886		- $available_status['trash']['message'] = sprintf( _n( '%1$s form moved to the Trash. %2$sUndo%3$s', '%1$s forms moved to the Trash. %2$sUndo%3$s', $count, 'formidable' ), $count, '<a href="' . esc_url( wp_nonce_url( '?page=formidable&frm_action=untrash&form_type=' . $form_type . '&id=' . $params['id'], 'untrash_form_' . $params['id'] ) ) . '">', '</a>' ); // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong
	810	+ $available_status['trash']['message'] = sprintf( _n( '%1$s form moved to the Trash. %2$sUndo%3$s', '%1$s forms moved to the Trash. %2$sUndo%3$s', $count, 'formidable' ), $count, '<a href="' . esc_url( wp_nonce_url( '?page=formidable&frm_action=untrash&form_type=' . $form_type . '&id=' . $params['id'], 'untrash_form_' . $params['id'] ) ) . '">', '</a>' );
887	811
888	812	$message = $available_status[ $status ]['message'];
889	813
890	814	self::display_forms_list( $params, $message );
		@@ -891,9 +815,8 @@
891	815	}
892	816
893	817	/**
894	818	* @param array $ids
895		- *
896	819	* @return string
897	820	*/
898	821	public static function bulk_trash( $ids ) {
899	822	FrmAppHelper::permission_check( 'frm_delete_forms' );
		@@ -898,9 +821,8 @@
898	821	public static function bulk_trash( $ids ) {
899	822	FrmAppHelper::permission_check( 'frm_delete_forms' );
900	823
901	824	$count = 0;
902		-
903	825	foreach ( $ids as $id ) {
904	826	if ( FrmForm::trash( $id ) ) {
905	827	++$count;
906	828	}
		@@ -915,16 +837,17 @@
915	837	'param' => 'form_type',
916	838	'type' => 'request',
917	839	)
918	840	);
919		-
920		- return sprintf(
	841	+ $message = sprintf(
921	842	/* translators: %1$s: Number of forms, %2$s: Start link HTML, %3$s: End link HTML */
922	843	_n( '%1$s form moved to the Trash. %2$sUndo%3$s', '%1$s forms moved to the Trash. %2$sUndo%3$s', $count, 'formidable' ),
923	844	$count,
924		- '<a href="' . esc_url( wp_nonce_url( '?page=formidable&frm_action=list&action=bulk_untrash&form_type=' . $current_page . '&item-action=' . implode( ',', $ids ), 'bulk-toplevel_page_formidable' ) ) . '">', // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong
	845	+ '<a href="' . esc_url( wp_nonce_url( '?page=formidable&frm_action=list&action=bulk_untrash&form_type=' . $current_page . '&item-action=' . implode( ',', $ids ), 'bulk-toplevel_page_formidable' ) ) . '">',
925	846	'</a>'
926	847	);
	848	+
	849	+ return $message;
927	850	}
928	851
929	852	public static function destroy() {
930	853	FrmAppHelper::permission_check( 'frm_delete_forms' );
		@@ -934,9 +857,8 @@
934	857	// Check nonce url.
935	858	check_admin_referer( 'destroy_form_' . $params['id'] );
936	859
937	860	$count = 0;
938		-
939	861	if ( FrmForm::destroy( $params['id'] ) ) {
940	862	++$count;
941	863	}
942	864
		@@ -947,9 +869,8 @@
947	869	}
948	870
949	871	/**
950	872	* @param array $ids
951		- *
952	873	* @return string
953	874	*/
954	875	public static function bulk_destroy( $ids ) {
955	876	FrmAppHelper::permission_check( 'frm_delete_forms' );
		@@ -954,12 +875,10 @@
954	875	public static function bulk_destroy( $ids ) {
955	876	FrmAppHelper::permission_check( 'frm_delete_forms' );
956	877
957	878	$count = 0;
958		-
959	879	foreach ( $ids as $id ) {
960	880	$d = FrmForm::destroy( $id );
961		-
962	881	if ( $d ) {
963	882	++$count;
964	883	}
965	884	}
		@@ -977,18 +896,19 @@
977	896	*/
978	897	public static function delete_all() {
979	898	// Check nonce url.
980	899	$permission_error = FrmAppHelper::permission_nonce_error( 'frm_delete_forms', '_wpnonce', 'bulk-toplevel_page_formidable' );
981		-
982	900	if ( $permission_error !== false ) {
983	901	self::display_forms_list( array(), '', array( $permission_error ) );
	902	+
984	903	return;
985	904	}
986	905
987	906	$count = FrmForm::scheduled_delete( time() );
988	907	$url = remove_query_arg( array( 'delete_all' ) );
989		- $url .= '&message=forms_permanently_deleted&forms_deleted=' . $count;
990	908
	909	+ $url .= '&message=forms_permanently_deleted&forms_deleted=' . $count;
	910	+
991	911	wp_safe_redirect( $url );
992	912	die();
993	913	}
994	914
		@@ -1062,22 +982,21 @@
1062	982	*
1063	983	* @return void
1064	984	*/
1065	985	public static function insert_form_button() {
1066		- if ( ! current_user_can( 'frm_view_forms' ) ) {
1067		- return;
	986	+ if ( current_user_can( 'frm_view_forms' ) ) {
	987	+ // Store the result in memory and re-use it when this function is called multiple times.
	988	+ // This helps speed up the form builder when there are a lot of HTML fields, where this
	989	+ // button is inserted once per HTML field.
	990	+ // In a form with 66 HTML fields, this saves 0.5 seconds on page load time, tested locally.
	991	+ if ( ! isset( self::$formidable_tinymce_button ) ) {
	992	+ FrmAppHelper::load_admin_wide_js();
	993	+ $menu_name = FrmAppHelper::get_menu_name();
	994	+ $icon = apply_filters( 'frm_media_icon', FrmAppHelper::svg_logo() );
	995	+ 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>';
	996	+ }
	997	+ echo self::$formidable_tinymce_button; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
1068	998	}
1069		-
1070		- // Store the result in memory and re-use it when this function is called multiple times.
1071		- // This helps speed up the form builder when there are a lot of HTML fields, where this
1072		- // Button is inserted once per HTML field.
1073		- // In a form with 66 HTML fields, this saves 0.5 seconds on page load time, tested locally.
1074		- if ( ! isset( self::$formidable_tinymce_button ) ) {
1075		- FrmAppHelper::load_admin_wide_js();
1076		- $icon = apply_filters( 'frm_media_icon', FrmAppHelper::svg_logo() );
1077		- self::$formidable_tinymce_button = '<a href="#TB_inline?width=50&height=50&inlineId=frm_insert_form" class="thickbox button add_media frm_insert_form" title="' . esc_attr__( 'Add forms and content', 'formidable' ) . '">' . FrmAppHelper::kses( $icon, 'all' ) . ' ' . esc_html( FrmAppHelper::get_menu_name() ) . '</a>'; // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong
1078		- }
1079		- echo self::$formidable_tinymce_button; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
1080	999	}
1081	1000
1082	1001	/**
1083	1002	* @return void
		@@ -1098,21 +1017,17 @@
1098	1017	$shortcodes = apply_filters( 'frm_popup_shortcodes', $shortcodes );
1099	1018
1100	1019	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/insert_form_popup.php';
1101	1020
1102		- if ( ! FrmAppHelper::is_form_builder_page() || class_exists( '_WP_Editors', false ) ) {
1103		- return;
	1021	+ if ( FrmAppHelper::is_form_builder_page() && ! class_exists( '_WP_Editors', false ) ) {
	1022	+ // initialize a wysiwyg so we have usable settings defined in tinyMCEPreInit.mceInit
	1023	+ require ABSPATH . WPINC . '/class-wp-editor.php';
	1024	+ ?>
	1025	+ <div class="frm_hidden">
	1026	+ <?php wp_editor( '', 'frm_description_placeholder', array() ); ?>
	1027	+ </div>
	1028	+ <?php
1104	1029	}
1105		-
1106		- // Initialize a wysiwyg so we have usable settings defined in tinyMCEPreInit.mceInit
1107		- require ABSPATH . WPINC . '/class-wp-editor.php';
1108		- // phpcs:disable Generic.WhiteSpace.ScopeIndent
1109		- ?>
1110		- <div class="frm_hidden">
1111		- <?php wp_editor( '', 'frm_description_placeholder', array() ); ?>
1112		- </div>
1113		- <?php
1114		- // phpcs:enable Generic.WhiteSpace.ScopeIndent
1115	1030	}
1116	1031
1117	1032	/**
1118	1033	* Check the page being loaded, determine if this is a page that should include the form popup.
		@@ -1124,9 +1039,8 @@
1124	1039	private static function should_insert_form_popup() {
1125	1040	if ( FrmAppHelper::is_form_builder_page() ) {
1126	1041	return true;
1127	1042	}
1128		-
1129	1043	$page = basename( FrmAppHelper::get_server_value( 'PHP_SELF' ) );
1130	1044	return in_array( $page, array( 'post.php', 'page.php', 'page-new.php', 'post-new.php' ), true );
1131	1045	}
1132	1046
		@@ -1134,10 +1048,9 @@
1134	1048	FrmAppHelper::permission_check( 'frm_view_forms' );
1135	1049	check_ajax_referer( 'frm_ajax', 'nonce' );
1136	1050
1137	1051	$shortcode = FrmAppHelper::get_post_param( 'shortcode', '', 'sanitize_text_field' );
1138		-
1139		- if ( ! $shortcode ) {
	1052	+ if ( empty( $shortcode ) ) {
1140	1053	wp_die();
1141	1054	}
1142	1055
1143	1056	echo '<div id="sc-opts-' . esc_attr( $shortcode ) . '" class="frm_shortcode_option">';
		@@ -1162,13 +1075,12 @@
1162	1075	'label' => __( 'Minimize form HTML', 'formidable' ),
1163	1076	),
1164	1077	);
1165	1078	}
1166		-
1167	1079	$opts = apply_filters( 'frm_sc_popup_opts', $opts, $shortcode );
1168	1080
1169	1081	if ( isset( $opts['form_id'] ) && is_string( $opts['form_id'] ) ) {
1170		- // Allow other shortcodes to use the required form id option
	1082	+ // allow other shortcodes to use the required form id option
1171	1083	$form_id = $opts['form_id'];
1172	1084	unset( $opts['form_id'] );
1173	1085	}
1174	1086
		@@ -1184,9 +1096,8 @@
1184	1096	*
1185	1097	* @param array $params
1186	1098	* @param string $message
1187	1099	* @param array $errors
1188		- *
1189	1100	* @return void
1190	1101	*/
1191	1102	public static function display_forms_list( $params = array(), $message = '', $errors = array() ) {
1192	1103	FrmAppHelper::permission_check( 'frm_view_forms' );
		@@ -1203,21 +1114,21 @@
1203	1114	* @param string $table_class Class name for List Helper.
1204	1115	*/
1205	1116	$table_class = apply_filters( 'frm_forms_list_class', 'FrmFormsListHelper' );
1206	1117	$wp_list_table = new $table_class( compact( 'params' ) );
1207		- $pagenum = $wp_list_table->get_pagenum();
1208	1118
	1119	+ $pagenum = $wp_list_table->get_pagenum();
	1120	+
1209	1121	$wp_list_table->prepare_items();
1210	1122
1211	1123	$total_pages = $wp_list_table->get_pagination_arg( 'total_pages' );
1212		-
1213	1124	if ( $pagenum > $total_pages && $total_pages > 0 ) {
1214		- wp_safe_redirect( esc_url_raw( add_query_arg( 'paged', $total_pages ) ) );
	1125	+ wp_redirect( esc_url_raw( add_query_arg( 'paged', $total_pages ) ) );
1215	1126	die();
1216	1127	}
1217	1128
1218		- $error = FrmInbox::check_for_error();
1219		-
	1129	+ $inbox = new FrmInbox();
	1130	+ $error = $inbox->check_for_error();
1220	1131	if ( $error ) {
1221	1132	$show_messages = array( $error['subject'] . '. ' . $error['message'] );
1222	1133	}
1223	1134
		@@ -1225,9 +1136,8 @@
1225	1136	}
1226	1137
1227	1138	/**
1228	1139	* @param array<string,string> $columns
1229		- *
1230	1140	* @return array<string,string>
1231	1141	*/
1232	1142	public static function get_columns( $columns ) {
1233	1143	$columns['cb'] = '<input type="checkbox" />';
		@@ -1234,13 +1144,11 @@
1234	1144	$columns['name'] = esc_html__( 'Form Title', 'formidable' );
1235	1145	$columns['entries'] = esc_html__( 'Entries', 'formidable' );
1236	1146	$columns['id'] = 'ID';
1237	1147	$columns['form_key'] = esc_html__( 'Key', 'formidable' );
1238		-
1239	1148	if ( 'trash' !== FrmAppHelper::simple_get( 'form_type' ) ) {
1240	1149	$columns['shortcode'] = esc_html__( 'Actions', 'formidable' );
1241	1150	}
1242		-
1243	1151	$columns['created_at'] = esc_html__( 'Date', 'formidable' );
1244	1152
1245	1153	add_screen_option(
1246	1154	'per_page',
		@@ -1268,9 +1176,8 @@
1268	1176	}
1269	1177
1270	1178	/**
1271	1179	* @param mixed $hidden_columns
1272		- *
1273	1180	* @return array
1274	1181	*/
1275	1182	public static function hidden_columns( $hidden_columns ) {
1276	1183	if ( ! is_array( $hidden_columns ) ) {
		@@ -1291,18 +1198,11 @@
1291	1198
1292	1199	return $hidden_columns;
1293	1200	}
1294	1201
1295		- /**
1296		- * @param mixed $save
1297		- * @param string $option
1298		- * @param int|string $value
1299		- *
1300		- * @return mixed
1301		- */
1302	1202	public static function save_per_page( $save, $option, $value ) {
1303	1203	if ( $option === 'formidable_page_formidable_per_page' ) {
1304		- return (int) $value;
	1204	+ $save = (int) $value;
1305	1205	}
1306	1206
1307	1207	return $save;
1308	1208	}
		@@ -1311,9 +1211,8 @@
1311	1211	* @param int|string $id
1312	1212	* @param array $errors
1313	1213	* @param string $message
1314	1214	* @param bool $create_link
1315		- *
1316	1215	* @return void
1317	1216	*/
1318	1217	private static function get_edit_vars( $id, $errors = array(), $message = '', $create_link = false ) {
1319	1218	global $frm_vars;
		@@ -1328,9 +1227,8 @@
1328	1227	'page' => 'formidable',
1329	1228	)
1330	1229	),
1331	1230	);
1332		-
1333	1231	if ( ! $form ) {
1334	1232	FrmAppController::show_error_modal( $error_args );
1335	1233	return;
1336	1234	}
		@@ -1352,14 +1250,15 @@
1352	1250	}
1353	1251
1354	1252	if ( $form->parent_form_id ) {
1355	1253	/* translators: %1$s: Start link HTML, %2$s: End link HTML */
1356		- 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
	1254	+ 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>' ) );
1357	1255	}
1358	1256
1359	1257	$frm_field_selection = FrmField::field_selection();
1360		- $fields = FrmField::get_all_for_form( $form->id );
1361	1258
	1259	+ $fields = FrmField::get_all_for_form( $form->id );
	1260	+
1362	1261	// Automatically add end section fields if they don't exist (2.0 migration).
1363	1262	$reset_fields = false;
1364	1263	FrmFormsHelper::auto_add_end_section_fields( $form, $fields, $reset_fields );
1365	1264	FrmSubmitHelper::maybe_create_submit_field( $form, $fields, $reset_fields );
		@@ -1383,10 +1282,9 @@
1383	1282	*/
1384	1283	$values['fields'] = apply_filters( 'frm_fields_in_form_builder', $fields, compact( 'form' ) );
1385	1284
1386	1285	$edit_message = __( 'Form was successfully updated.', 'formidable' );
1387		-
1388		- if ( $form->is_template && $message === $edit_message ) {
	1286	+ if ( $form->is_template && $message == $edit_message ) {
1389	1287	$message = __( 'Template was successfully updated.', 'formidable' );
1390	1288	}
1391	1289
1392	1290	self::maybe_update_form_builder_message( $message );
		@@ -1401,12 +1299,11 @@
1401	1299	}
1402	1300
1403	1301	/**
1404	1302	* @param array $fields
1405		- *
1406	1303	* @return array
1407	1304	*/
1408		- public static function update_form_builder_fields( $fields ) {
	1305	+ public static function update_form_builder_fields( $fields, $form ) {
1409	1306	foreach ( $fields as $field ) {
1410	1307	$field->do_not_include_icons = true;
1411	1308	}
1412	1309	return $fields;
		@@ -1411,13 +1308,8 @@
1411	1308	}
1412	1309	return $fields;
1413	1310	}
1414	1311
1415		- /**
1416		- * @param string $message
1417		- *
1418		- * @return void
1419		- */
1420	1312	public static function maybe_update_form_builder_message( &$message ) {
1421	1313	if ( 'form_duplicated' === FrmAppHelper::simple_get( 'message' ) ) {
1422	1314	$message = __( 'Form was Successfully Copied', 'formidable' );
1423	1315	}
		@@ -1426,9 +1318,8 @@
1426	1318	/**
1427	1319	* @param int|string $id
1428	1320	* @param array $errors
1429	1321	* @param array|string $args
1430		- *
1431	1322	* @return void
1432	1323	*/
1433	1324	public static function get_settings_vars( $id, $errors = array(), $args = array() ) {
1434	1325	FrmAppHelper::permission_check( 'frm_edit_forms' );
		@@ -1450,12 +1341,13 @@
1450	1341	);
1451	1342	$args = array_merge( $defaults, $args );
1452	1343	$message = $args['message'];
1453	1344	$warnings = $args['warnings'];
1454		- $form = FrmForm::getOne( $id );
1455		- $fields = FrmField::get_all_for_form( $id );
1456		- $values = FrmAppHelper::setup_edit_vars( $form, 'forms', $fields, true );
1457	1345
	1346	+ $form = FrmForm::getOne( $id );
	1347	+ $fields = FrmField::get_all_for_form( $id );
	1348	+ $values = FrmAppHelper::setup_edit_vars( $form, 'forms', $fields, true );
	1349	+
1458	1350	/**
1459	1351	* Allows changing fields in the form settings.
1460	1352	*
1461	1353	* @since 5.0.04
		@@ -1495,12 +1387,8 @@
1495	1387	}
1496	1388
1497	1389	/**
1498	1390	* @since 4.0
1499		- *
1500		- * @param array $atts
1501		- *
1502		- * @return void
1503	1391	*/
1504	1392	public static function form_publish_button( $atts ) {
1505	1393	$values = $atts['values'];
1506	1394	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/_publish_box.php';
		@@ -1511,9 +1399,8 @@
1511	1399	*
1512	1400	* @since 4.0
1513	1401	*
1514	1402	* @param array $values
1515		- *
1516	1403	* @return array
1517	1404	*/
1518	1405	private static function get_settings_tabs( $values ) {
1519	1406	$sections = array(
		@@ -1519,20 +1406,20 @@
1519	1406	$sections = array(
1520	1407	'advanced' => array(
1521	1408	'name' => __( 'General', 'formidable' ),
1522	1409	'title' => __( 'General Form Settings', 'formidable' ),
1523		- 'function' => array( self::class, 'advanced_settings' ),
1524		- 'icon' => 'frmfont frm_settings_icon',
	1410	+ 'function' => array( __CLASS__, 'advanced_settings' ),
	1411	+ 'icon' => 'frm_icon_font frm_settings_icon',
1525	1412	),
1526	1413	'email' => array(
1527	1414	'name' => __( 'Actions & Notifications', 'formidable' ),
1528	1415	'function' => array( 'FrmFormActionsController', 'email_settings' ),
1529	1416	'id' => 'frm_notification_settings',
1530		- 'icon' => 'frmfont frm_mail_bulk_icon',
	1417	+ 'icon' => 'frm_icon_font frm_mail_bulk_icon',
1531	1418	),
1532	1419	'permissions' => array(
1533	1420	'name' => __( 'Form Permissions', 'formidable' ),
1534		- 'icon' => 'frmfont frm_lock_closed_icon',
	1421	+ 'icon' => 'frm_icon_font frm_lock_closed_icon',
1535	1422	'html_class' => 'frm_show_upgrade_tab frm_noallow',
1536	1423	'data' => array(
1537	1424	'medium' => 'permissions',
1538	1425	'upgrade' => __( 'Form Permissions', 'formidable' ),
		@@ -1537,37 +1424,35 @@
1537	1424	'medium' => 'permissions',
1538	1425	'upgrade' => __( 'Form Permissions', 'formidable' ),
1539	1426	'message' => __( 'Allow editing, protect forms and files, limit entries, and save drafts. Upgrade to get form and entry permissions.', 'formidable' ),
1540	1427	'screenshot' => 'permissions.png',
1541		- 'learn-more' => FrmAppHelper::get_doc_url( 'general-form-settings/#kb-form-permissions', 'form-permissions-settings' ),
1542	1428	),
1543	1429	),
1544	1430	'scheduling' => array(
1545	1431	'name' => __( 'Form Scheduling', 'formidable' ),
1546		- 'icon' => 'frmfont frm_calendar_icon',
	1432	+ 'icon' => 'frm_icon_font frm_calendar_icon',
1547	1433	'html_class' => 'frm_show_upgrade_tab frm_noallow',
1548	1434	'data' => array(
1549	1435	'medium' => 'scheduling',
1550	1436	'upgrade' => __( 'Form scheduling settings', 'formidable' ),
1551	1437	'screenshot' => 'scheduling.png',
1552		- 'learn-more' => FrmAppHelper::get_doc_url( 'general-form-settings/#kb-form-scheduling', 'form-scheduling-settings' ),
1553	1438	),
1554	1439	),
1555	1440	'buttons' => array(
1556	1441	'name' => __( 'Buttons', 'formidable' ),
1557		- 'class' => self::class,
	1442	+ 'class' => __CLASS__,
1558	1443	'function' => 'buttons_settings',
1559		- 'icon' => 'frmfont frm_button_icon',
	1444	+ 'icon' => 'frm_icon_font frm_button_icon',
1560	1445	),
1561	1446	'landing' => array(
1562	1447	'name' => __( 'Form Landing Page', 'formidable' ),
1563		- 'icon' => 'frmfont frm_file_text_icon',
	1448	+ 'icon' => 'frm_icon_font frm_file_text_icon',
1564	1449	'html_class' => 'frm_show_upgrade_tab frm_noallow',
1565	1450	'data' => FrmAppHelper::get_landing_page_upgrade_data_params(),
1566	1451	),
1567	1452	'chat' => array(
1568	1453	'name' => __( 'Conversational Forms', 'formidable' ),
1569		- 'icon' => 'frmfont frm_chat_forms_icon',
	1454	+ 'icon' => 'frm_icon_font frm_chat_forms_icon',
1570	1455	'html_class' => 'frm_show_upgrade_tab frm_noallow',
1571	1456	'data' => FrmAppHelper::get_upgrade_data_params(
1572	1457	'chat',
1573	1458	array(
		@@ -1573,15 +1458,14 @@
1573	1458	array(
1574	1459	'upgrade' => __( 'Conversational Forms', 'formidable' ),
1575	1460	'message' => __( 'Ask one question at a time for automated conversations.', 'formidable' ),
1576	1461	'screenshot' => 'chat.png',
1577		- 'learn-more' => FrmAppHelper::get_doc_url( 'conversational-forms', 'conversational-forms-settings', false ),
1578	1462	)
1579	1463	),
1580	1464	),
1581	1465	'abandonment' => array(
1582	1466	'name' => __( 'Form Abandonment', 'formidable' ),
1583		- 'icon' => 'frmfont frm_abandoned_icon',
	1467	+ 'icon' => 'frm_icon_font frm_abandoned_icon',
1584	1468	'html_class' => 'frm_show_upgrade_tab frm_noallow',
1585	1469	'data' => FrmAppHelper::get_upgrade_data_params(
1586	1470	'abandonment',
1587	1471	array(
		@@ -1587,17 +1471,16 @@
1587	1471	array(
1588	1472	'upgrade' => __( 'Form abandonment settings', 'formidable' ),
1589	1473	'message' => __( 'Unlock the power of data capture to boost lead generation and master the art of form optimization.', 'formidable' ),
1590	1474	'screenshot' => 'abandonment.png',
1591		- 'learn-more' => FrmAppHelper::get_doc_url( 'features/form-abandonment-wordpress-plugin', 'form-abandonment-settings', false ),
1592	1475	)
1593	1476	),
1594	1477	),
1595	1478	'html' => array(
1596	1479	'name' => __( 'Customize HTML', 'formidable' ),
1597		- 'class' => self::class,
	1480	+ 'class' => __CLASS__,
1598	1481	'function' => 'html_settings',
1599		- 'icon' => 'frmfont frm_code_icon',
	1482	+ 'icon' => 'frm_icon_font frm_code_icon',
1600	1483	),
1601	1484	);
1602	1485
1603	1486	if ( ! has_action( 'frm_add_form_style_tab_options' ) && ! has_action( 'frm_add_form_button_options' ) ) {
		@@ -1603,8 +1486,14 @@
1603	1486	if ( ! has_action( 'frm_add_form_style_tab_options' ) && ! has_action( 'frm_add_form_button_options' ) ) {
1604	1487	unset( $sections['buttons'] );
1605	1488	}
1606	1489
	1490	+ foreach ( array( 'landing', 'chat', 'abandonment' ) as $feature ) {
	1491	+ if ( ! FrmAppHelper::show_new_feature( $feature ) ) {
	1492	+ unset( $sections[ $feature ] );
	1493	+ }
	1494	+ }
	1495	+
1607	1496	$sections = apply_filters( 'frm_add_form_settings_section', $sections, $values );
1608	1497
1609	1498	foreach ( $sections as $key => $section ) {
1610	1499	$defaults = array(
		@@ -1609,9 +1498,9 @@
1609	1498	foreach ( $sections as $key => $section ) {
1610	1499	$defaults = array(
1611	1500	'html_class' => '',
1612	1501	'name' => ucfirst( $key ),
1613		- 'icon' => 'frmfont frm_settings_icon',
	1502	+ 'icon' => 'frm_icon_font frm_settings_icon',
1614	1503	);
1615	1504
1616	1505	$section = array_merge( $defaults, $section );
1617	1506
		@@ -1617,9 +1506,8 @@
1617	1506
1618	1507	if ( ! isset( $section['anchor'] ) ) {
1619	1508	$section['anchor'] = $key;
1620	1509	}
1621		-
1622	1510	$section['anchor'] .= '_settings';
1623	1511
1624	1512	if ( ! isset( $section['title'] ) ) {
1625	1513	$section['title'] = $section['name'];
		@@ -1638,19 +1526,18 @@
1638	1526	/**
1639	1527	* @since 4.0
1640	1528	*
1641	1529	* @param array $values
1642		- *
1643	1530	* @return void
1644	1531	*/
1645	1532	public static function advanced_settings( $values ) {
1646	1533	$first_h3 = 'frm_first_h3';
	1534	+
1647	1535	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings-advanced.php';
1648	1536	}
1649	1537
1650	1538	/**
1651	1539	* @param array $values
1652		- *
1653	1540	* @return void
1654	1541	*/
1655	1542	public static function render_spam_settings( $values ) {
1656	1543	if ( function_exists( 'akismet_http_post' ) ) {
		@@ -1663,9 +1550,8 @@
1663	1550	/**
1664	1551	* @since 4.0
1665	1552	*
1666	1553	* @param array $values
1667		- *
1668	1554	* @return void
1669	1555	*/
1670	1556	public static function buttons_settings( $values ) {
1671	1557	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings-buttons.php';
		@@ -1674,9 +1560,8 @@
1674	1560	/**
1675	1561	* @since 4.0
1676	1562	*
1677	1563	* @param array $values
1678		- *
1679	1564	* @return void
1680	1565	*/
1681	1566	public static function html_settings( $values ) {
1682	1567	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings-html.php';
		@@ -1687,9 +1572,8 @@
1687	1572	*
1688	1573	* @since 2.03.08
1689	1574	*
1690	1575	* @param array|bool $values
1691		- *
1692	1576	* @return void
1693	1577	*/
1694	1578	private static function clean_submit_html( &$values ) {
1695	1579	if ( is_array( $values ) && isset( $values['submit_html'] ) ) {
		@@ -1712,17 +1596,13 @@
1712	1596	return $classes;
1713	1597	}
1714	1598
1715	1599	/**
1716		- * @since 6.27 Added $template_path parameter.
1717		- *
1718	1600	* @param int|string $form_id
1719	1601	* @param string $class
1720		- * @param string $template_path The path to a template file to use instead of the default.
1721		- *
1722	1602	* @return void
1723	1603	*/
1724		- public static function mb_tags_box( $form_id, $class = '', $template_path = 'default' ) {
	1604	+ public static function mb_tags_box( $form_id, $class = '' ) {
1725	1605	$fields = FrmField::get_all_for_form( $form_id, '', 'include' );
1726	1606
1727	1607	/**
1728	1608	* Allows modifying the list of fields in the tags box.
		@@ -1731,30 +1611,23 @@
1731	1611	*
1732	1612	* @param array $fields The list of fields.
1733	1613	* @param array $args The arguments. Contains `form_id`.
1734	1614	*/
1735		- $fields = apply_filters( 'frm_fields_in_tags_box', $fields, compact( 'form_id' ) );
1736		- $linked_forms = array();
1737		- $col = 'one';
1738		- $settings_tab = FrmAppHelper::is_admin_page( 'formidable' );
	1615	+ $fields = apply_filters( 'frm_fields_in_tags_box', $fields, compact( 'form_id' ) );
	1616	+ $linked_forms = array();
	1617	+ $col = 'one';
	1618	+ $settings_tab = FrmAppHelper::is_admin_page( 'formidable' );
	1619	+
1739	1620	$cond_shortcodes = apply_filters( 'frm_conditional_shortcodes', array() );
1740	1621	$entry_shortcodes = self::get_shortcode_helpers( $settings_tab );
	1622	+
1741	1623	$advanced_helpers = self::advanced_helpers( compact( 'fields', 'form_id' ) );
1742	1624
1743		- if ( 'default' === $template_path || ! file_exists( $template_path ) ) {
1744		- include FrmAppHelper::plugin_path() . '/classes/views/shared/mb_adv_info.php';
1745		- return;
1746		- }
1747		-
1748		- include $template_path;
	1625	+ include FrmAppHelper::plugin_path() . '/classes/views/shared/mb_adv_info.php';
1749	1626	}
1750	1627
1751	1628	/**
1752	1629	* @since 3.04.01
1753		- *
1754		- * @param array $atts
1755		- *
1756		- * @return array
1757	1630	*/
1758	1631	private static function advanced_helpers( $atts ) {
1759	1632	$advanced_helpers = array(
1760	1633	'default' => array(
		@@ -1763,12 +1636,10 @@
1763	1636	),
1764	1637	);
1765	1638
1766	1639	$user_fields = self::user_shortcodes();
1767		-
1768	1640	if ( $user_fields ) {
1769	1641	$user_helpers = array();
1770		-
1771	1642	foreach ( $user_fields as $uk => $uf ) {
1772	1643	$user_helpers[ '|user_id| show="' . $uk . '"' ] = $uf;
1773	1644	unset( $uk, $uf );
1774	1645	}
		@@ -1793,10 +1664,8 @@
1793	1664	* Get an array of the options to display in the advanced tab
1794	1665	* of the customization panel
1795	1666	*
1796	1667	* @since 2.0.6
1797		- *
1798		- * @return array
1799	1668	*/
1800	1669	private static function get_advanced_shortcodes() {
1801	1670	$adv_shortcodes = array(
1802	1671	'x sep=", "' => array(
		@@ -1813,18 +1682,17 @@
1813	1682	'label' => __( 'No Auto P', 'formidable' ),
1814	1683	'title' => __( 'Do not automatically add any paragraphs or line breaks', 'formidable' ),
1815	1684	),
1816	1685	);
	1686	+ $adv_shortcodes = apply_filters( 'frm_advanced_shortcodes', $adv_shortcodes );
1817	1687
1818	1688	// __( 'Leave blank instead of defaulting to User Login', 'formidable' ) : blank=1
1819	1689
1820		- return apply_filters( 'frm_advanced_shortcodes', $adv_shortcodes );
	1690	+ return $adv_shortcodes;
1821	1691	}
1822	1692
1823	1693	/**
1824	1694	* @since 3.04.01
1825		- *
1826		- * @return array
1827	1695	*/
1828	1696	private static function user_shortcodes() {
1829	1697	$options = array(
1830	1698	'ID' => __( 'User ID', 'formidable' ),
		@@ -1843,12 +1711,8 @@
1843	1711	/**
1844	1712	* Get an array of the helper shortcodes to display in the customization panel
1845	1713	*
1846	1714	* @since 2.0.6
1847		- *
1848		- * @param bool $settings_tab
1849		- *
1850		- * @return array
1851	1715	*/
1852	1716	private static function get_shortcode_helpers( $settings_tab ) {
1853	1717	$entry_shortcodes = array(
1854	1718	'id' => __( 'Entry ID', 'formidable' ),
		@@ -1863,9 +1727,8 @@
1863	1727	'form_name' => __( 'Form Name', 'formidable' ),
1864	1728	);
1865	1729
1866	1730	$entry_shortcodes = array_merge( FrmShortcodeHelper::get_contextual_shortcode_values(), $entry_shortcodes );
1867		-
1868	1731	if ( ! FrmAppHelper::pro_is_installed() ) {
1869	1732	unset( $entry_shortcodes['post_id'] );
1870	1733	}
1871	1734
		@@ -1873,13 +1736,12 @@
1873	1736	* Use this hook to add or remove buttons in the helpers section
1874	1737	* in the customization panel
1875	1738	*
1876	1739	* @since 2.0.6
1877		- *
1878		- * @param array $entry_shortcodes
1879		- * @param bool $settings_tab
1880	1740	*/
1881		- return apply_filters( 'frm_helper_shortcodes', $entry_shortcodes, $settings_tab );
	1741	+ $entry_shortcodes = apply_filters( 'frm_helper_shortcodes', $entry_shortcodes, $settings_tab );
	1742	+
	1743	+ return $entry_shortcodes;
1882	1744	}
1883	1745
1884	1746	/**
1885	1747	* Insert the form class setting into the form.
		@@ -1884,9 +1746,8 @@
1884	1746	/**
1885	1747	* Insert the form class setting into the form.
1886	1748	*
1887	1749	* @param stdClass $form
1888		- *
1889	1750	* @return void
1890	1751	*/
1891	1752	public static function form_classes( $form ) {
1892	1753	if ( isset( $form->options['form_class'] ) ) {
		@@ -1909,9 +1770,8 @@
1909	1770	* @param stdClass $form
1910	1771	*/
1911	1772	public static function add_js_validate_form_to_global_vars( $form ) {
1912	1773	global $frm_vars;
1913		-
1914	1774	if ( ! isset( $frm_vars['js_validate_forms'] ) ) {
1915	1775	$frm_vars['js_validate_forms'] = array();
1916	1776	}
1917	1777	$frm_vars['js_validate_forms'][ $form->id ] = $form;
		@@ -1934,9 +1794,8 @@
1934	1794	/**
1935	1795	* @param string $content
1936	1796	* @param int|stdClass|string $form
1937	1797	* @param false|int|stdClass|string $entry
1938		- *
1939	1798	* @return string
1940	1799	*/
1941	1800	public static function filter_content( $content, $form, $entry = false ) {
1942	1801	$content = self::replace_form_name_shortcodes( $content, $form );
		@@ -1941,9 +1800,8 @@
1941	1800	public static function filter_content( $content, $form, $entry = false ) {
1942	1801	$content = self::replace_form_name_shortcodes( $content, $form );
1943	1802
1944	1803	self::get_entry_by_param( $entry );
1945		-
1946	1804	if ( ! $entry ) {
1947	1805	return $content;
1948	1806	}
1949	1807
		@@ -1959,10 +1817,11 @@
1959	1817	$form = $entry->parent_entry->form_id;
1960	1818	}
1961	1819
1962	1820	$shortcodes = FrmFieldsHelper::get_shortcodes( $content, $form );
	1821	+ $content = apply_filters( 'frm_replace_content_shortcodes', $content, $entry, $shortcodes );
1963	1822
1964		- return apply_filters( 'frm_replace_content_shortcodes', $content, $entry, $shortcodes );
	1823	+ return $content;
1965	1824	}
1966	1825
1967	1826	/**
1968	1827	* Replace any [form_name] shortcodes in a string.
		@@ -1970,9 +1829,8 @@
1970	1829	* @since 5.5
1971	1830	*
1972	1831	* @param array|string $string
1973	1832	* @param int|stdClass|string $form
1974		- *
1975	1833	* @return array|string
1976	1834	*/
1977	1835	public static function replace_form_name_shortcodes( $string, $form ) {
1978	1836	if ( ! is_string( $string ) ) {
		@@ -1978,9 +1836,9 @@
1978	1836	if ( ! is_string( $string ) ) {
1979	1837	return $string;
1980	1838	}
1981	1839
1982		- if ( ! str_contains( $string, '[form_name]' ) ) {
	1840	+ if ( false === strpos( $string, '[form_name]' ) ) {
1983	1841	return $string;
1984	1842	}
1985	1843
1986	1844	if ( ! is_object( $form ) ) {
		@@ -1992,30 +1850,20 @@
1992	1850	}
1993	1851
1994	1852	/**
1995	1853	* @param false|int|stdClass|string $entry
1996		- *
1997	1854	* @return void
1998	1855	*/
1999	1856	private static function get_entry_by_param( &$entry ) {
2000		- if ( $entry && is_object( $entry ) ) {
2001		- return;
2002		- }
	1857	+ if ( ! $entry || ! is_object( $entry ) ) {
	1858	+ if ( ! $entry || ! is_numeric( $entry ) ) {
	1859	+ $entry = FrmAppHelper::get_post_param( 'id', false, 'sanitize_title' );
	1860	+ }
2003	1861
2004		- if ( ! $entry || ! is_numeric( $entry ) ) {
2005		- $entry = FrmAppHelper::get_post_param( 'id', false, 'sanitize_title' );
	1862	+ FrmEntry::maybe_get_entry( $entry );
2006	1863	}
2007		-
2008		- FrmEntry::maybe_get_entry( $entry );
2009	1864	}
2010	1865
2011		- /**
2012		- * @param string $content
2013		- * @param false|object $entry
2014		- * @param array $shortcodes
2015		- *
2016		- * @return string
2017		- */
2018	1866	public static function replace_content_shortcodes( $content, $entry, $shortcodes ) {
2019	1867	return FrmFieldsHelper::replace_content_shortcodes( $content, $entry, $shortcodes );
2020	1868	}
2021	1869
		@@ -2020,9 +1868,8 @@
2020	1868	}
2021	1869
2022	1870	/**
2023	1871	* @param array $errors
2024		- *
2025	1872	* @return array
2026	1873	*/
2027	1874	public static function process_bulk_form_actions( $errors ) {
2028	1875	if ( ! $_REQUEST ) {
		@@ -2029,30 +1876,29 @@
2029	1876	return $errors;
2030	1877	}
2031	1878
2032	1879	$bulkaction = FrmAppHelper::get_param( 'action', '', 'get', 'sanitize_text_field' );
2033		-
2034		- // phpcs:ignore Universal.Operators.StrictComparisons
2035	1880	if ( $bulkaction == - 1 ) {
2036	1881	$bulkaction = FrmAppHelper::get_param( 'action2', '', 'get', 'sanitize_title' );
2037	1882	}
2038	1883
2039		- if ( $bulkaction && str_starts_with( $bulkaction, 'bulk_' ) ) {
	1884	+ if ( ! empty( $bulkaction ) && strpos( $bulkaction, 'bulk_' ) === 0 ) {
2040	1885	FrmAppHelper::remove_get_action();
	1886	+
2041	1887	$bulkaction = str_replace( 'bulk_', '', $bulkaction );
2042	1888	}
2043	1889
2044	1890	$ids = FrmAppHelper::get_param( 'item-action', '', 'get', 'sanitize_text_field' );
	1891	+ if ( empty( $ids ) ) {
	1892	+ $errors[] = __( 'No forms were specified', 'formidable' );
2045	1893
2046		- if ( ! $ids ) {
2047		- $errors[] = __( 'No forms were specified', 'formidable' );
2048	1894	return $errors;
2049	1895	}
2050	1896
2051	1897	$permission_error = FrmAppHelper::permission_nonce_error( '', '_wpnonce', 'bulk-toplevel_page_formidable' );
2052		-
2053	1898	if ( $permission_error !== false ) {
2054	1899	$errors[] = $permission_error;
	1900	+
2055	1901	return $errors;
2056	1902	}
2057	1903
2058	1904	if ( ! is_array( $ids ) ) {
		@@ -2080,9 +1926,8 @@
2080	1926	/**
2081	1927	* Includes html that shows a message when the device is too small to use Formidable Forms admin pages.
2082	1928	*
2083	1929	* @since 6.20
2084		- *
2085	1930	* @return void
2086	1931	*/
2087	1932	public static function include_device_too_small_message() {
2088	1933	if ( ! FrmAppHelper::is_formidable_admin() ) {
		@@ -2091,13 +1936,12 @@
2091	1936
2092	1937	include FrmAppHelper::plugin_path() . '/classes/views/shared/small-device-message.php';
2093	1938	}
2094	1939
2095		- public static function route() { // phpcs:ignore Generic.Metrics.CyclomaticComplexity.MaxExceeded
	1940	+ public static function route() {
2096	1941	$action = isset( $_REQUEST['frm_action'] ) ? 'frm_action' : 'action';
2097	1942	$vars = array();
2098	1943	FrmAppHelper::include_svg();
2099		-
2100	1944	if ( isset( $_POST['frm_compact_fields'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
2101	1945	FrmAppHelper::permission_check( 'frm_edit_forms' );
2102	1946
2103	1947	// Javascript needs to be allowed in some field settings.
		@@ -2103,28 +1947,25 @@
2103	1947	// Javascript needs to be allowed in some field settings.
2104	1948	// phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized, WordPress.Security.NonceVerification.Missing
2105	1949	$json_vars = htmlspecialchars_decode( nl2br( str_replace( '&quot;', '"', wp_unslash( $_POST['frm_compact_fields'] ) ) ) );
2106	1950	$json_vars = json_decode( $json_vars, true );
	1951	+ if ( empty( $json_vars ) ) {
	1952	+ // json decoding failed so we should return an error message.
	1953	+ $action = FrmAppHelper::get_param( $action, '', 'get', 'sanitize_title' );
	1954	+ if ( 'edit' === $action ) {
	1955	+ $action = 'update';
	1956	+ }
2107	1957
2108		- if ( $json_vars ) {
	1958	+ add_filter( 'frm_validate_form', 'FrmFormsController::json_error' );
	1959	+ } else {
2109	1960	$vars = FrmAppHelper::json_to_array( $json_vars );
2110	1961	$action = $vars[ $action ];
2111	1962	unset( $_REQUEST['frm_compact_fields'], $_POST['frm_compact_fields'] ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
2112	1963	$_REQUEST = array_merge( $_REQUEST, $vars ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
2113	1964	$_POST = array_merge( $_POST, $_REQUEST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
2114		- } else {
2115		- // Json decoding failed so we should return an error message.
2116		- $action = FrmAppHelper::get_param( $action, '', 'get', 'sanitize_title' );
2117		-
2118		- if ( 'edit' === $action ) {
2119		- $action = 'update';
2120		- }
2121		-
2122		- add_filter( 'frm_validate_form', 'FrmFormsController::json_error' );
2123	1965	}
2124	1966	} else {
2125	1967	$action = FrmAppHelper::get_param( $action, '', 'get', 'sanitize_title' );
2126		-
2127	1968	if ( isset( $_REQUEST['delete_all'] ) ) {
2128	1969	// Override the action for this page.
2129	1970	$action = 'delete_all';
2130	1971	}
		@@ -2144,38 +1985,34 @@
2144	1985	case 'update_settings':
2145	1986	return self::$action( $vars );
2146	1987	case 'lite-reports':
2147	1988	self::no_reports( $vars );
2148		- return null;
	1989	+ return;
2149	1990	case 'views':
2150	1991	self::no_views( $vars );
2151		- return null;
	1992	+ return;
2152	1993	default:
2153	1994	do_action( 'frm_form_action_' . $action );
2154		-
2155	1995	if ( apply_filters( 'frm_form_stop_action_' . $action, false ) ) {
2156		- return null;
	1996	+ return;
2157	1997	}
2158	1998
2159	1999	$action = FrmAppHelper::get_param( 'action', '', 'get', 'sanitize_text_field' );
2160		-
2161		- // phpcs:ignore Universal.Operators.StrictComparisons
2162	2000	if ( $action == - 1 ) {
2163	2001	$action = FrmAppHelper::get_param( 'action2', '', 'get', 'sanitize_title' );
2164	2002	}
2165	2003
2166		- if ( str_starts_with( $action, 'bulk_' ) ) {
	2004	+ if ( strpos( $action, 'bulk_' ) === 0 ) {
2167	2005	FrmAppHelper::remove_get_action();
2168	2006
2169	2007	self::list_form();
2170		- return null;
	2008	+ return;
2171	2009	}
2172	2010
2173	2011	$message = FrmAppHelper::get_param( 'message' );
2174		-
2175	2012	if ( 'form_duplicate_error' === $message ) {
2176	2013	self::display_forms_list( array(), '', array( __( 'There was a problem duplicating the form', 'formidable' ) ) );
2177		- return null;
	2014	+ return;
2178	2015	}
2179	2016
2180	2017	if ( 'forms_permanently_deleted' === $message ) {
2181	2018	$count = FrmAppHelper::get_param( 'forms_deleted', 0, 'get', 'absint' );
		@@ -2181,14 +2018,14 @@
2181	2018	$count = FrmAppHelper::get_param( 'forms_deleted', 0, 'get', 'absint' );
2182	2019	/* translators: %1$s: Number of forms */
2183	2020	$message = sprintf( _n( '%1$s form permanently deleted.', '%1$s forms permanently deleted.', $count, 'formidable' ), $count );
2184	2021	self::display_forms_list( array(), $message, '' );
2185		- return null;
	2022	+ return;
2186	2023	}
2187	2024
2188	2025	self::display_forms_list();
2189	2026
2190		- return null;
	2027	+ return;
2191	2028	}//end switch
2192	2029	}
2193	2030
2194	2031	/**
		@@ -2207,43 +2044,19 @@
2207	2044
2208	2045	// Get posted data
2209	2046	$form_id = FrmAppHelper::get_post_param( 'form_id', '', 'absint' );
2210	2047	$name = FrmAppHelper::get_post_param( 'form_name', '', 'sanitize_text_field' );
2211		- $form = FrmForm::getOne( $form_id );
2212	2048
2213		- if ( ! $form ) {
2214		- wp_send_json_error( __( 'Form not found', 'formidable' ) );
2215		- }
	2049	+ // Update the form name and form key.
	2050	+ $form_key = FrmAppHelper::get_unique_key( sanitize_title( $name ), 'frm_forms', 'form_key' );
	2051	+ FrmForm::update( $form_id, compact( 'name', 'form_key' ) );
2216	2052
2217		- if ( $name === $form->name ) {
2218		- // Nothing to change so exit early.
2219		- wp_send_json_success();
2220		- }
2221		-
2222		- $to_update = array(
2223		- 'name' => $name,
2224		- );
2225		-
2226		- if ( '' === $name ) {
2227		- $form_key = $form->form_key;
2228		- } else {
2229		- // Only update form_key if name is not empty.
2230		- $form_key = FrmAppHelper::get_unique_key( sanitize_title( $name ), 'frm_forms', 'form_key' );
2231		- $to_update['form_key'] = $form_key;
2232		- }
2233		-
2234		- FrmForm::update( $form_id, $to_update );
2235		-
2236	2053	wp_send_json_success( compact( 'form_key' ) );
2237	2054	}
2238	2055
2239		- /**
2240		- * @param array $errors
2241		- *
2242		- * @return array
2243		- */
2244	2056	public static function json_error( $errors ) {
2245	2057	$errors['json'] = __( 'Abnormal HTML characters prevented your form from saving correctly', 'formidable' );
	2058	+
2246	2059	return $errors;
2247	2060	}
2248	2061
2249	2062	/**
		@@ -2250,10 +2063,8 @@
2250	2063	* Add education about views.
2251	2064	*
2252	2065	* @since 4.07
2253	2066	*
2254		- * @param array $values
2255		- *
2256	2067	* @return void
2257	2068	*/
2258	2069	public static function no_views( $values = array() ) {
2259	2070	FrmAppHelper::include_svg();
		@@ -2267,10 +2078,8 @@
2267	2078	* Add education about reports.
2268	2079	*
2269	2080	* @since 4.07
2270	2081	*
2271		- * @param array $values
2272		- *
2273	2082	* @return void
2274	2083	*/
2275	2084	public static function no_reports( $values = array() ) {
2276	2085	$id = FrmAppHelper::get_param( 'form', '', 'get', 'absint' );
		@@ -2296,9 +2105,10 @@
2296	2105	/**
2297	2106	* @since 4.05.02
2298	2107	*/
2299	2108	private static function move_menu_to_footer() {
2300		- if ( empty( FrmAppHelper::get_settings()->admin_bar ) ) {
	2109	+ $settings = FrmAppHelper::get_settings();
	2110	+ if ( empty( $settings->admin_bar ) ) {
2301	2111	remove_action( 'wp_body_open', 'wp_admin_bar_render', 0 );
2302	2112	}
2303	2113	}
2304	2114
		@@ -2303,15 +2113,13 @@
2303	2113	}
2304	2114
2305	2115	public static function admin_bar_configure() {
2306	2116	global $frm_vars;
2307		-
2308	2117	if ( empty( $frm_vars['forms_loaded'] ) ) {
2309	2118	return;
2310	2119	}
2311	2120
2312	2121	$actions = array();
2313		-
2314	2122	foreach ( $frm_vars['forms_loaded'] as $form ) {
2315	2123	if ( is_object( $form ) ) {
2316	2124	$actions[ $form->id ] = $form->name;
2317	2125	}
		@@ -2317,9 +2125,9 @@
2317	2125	}
2318	2126	unset( $form );
2319	2127	}
2320	2128
2321		- if ( ! $actions ) {
	2129	+ if ( empty( $actions ) ) {
2322	2130	return;
2323	2131	}
2324	2132
2325	2133	self::add_menu_to_admin_bar();
		@@ -2345,12 +2153,8 @@
2345	2153	}
2346	2154
2347	2155	/**
2348	2156	* @since 2.05.07
2349		- *
2350		- * @param array $actions
2351		- *
2352		- * @return void
2353	2157	*/
2354	2158	private static function add_forms_to_admin_bar( $actions ) {
2355	2159	global $wp_admin_bar;
2356	2160
		@@ -2356,13 +2160,14 @@
2356	2160
2357	2161	asort( $actions );
2358	2162
2359	2163	foreach ( $actions as $form_id => $name ) {
	2164	+
2360	2165	$wp_admin_bar->add_node(
2361	2166	array(
2362	2167	'parent' => 'frm-forms',
2363	2168	'id' => 'edit_form_' . $form_id,
2364		- 'title' => $name ? $name : FrmFormsHelper::get_no_title_text(),
	2169	+ 'title' => empty( $name ) ? FrmFormsHelper::get_no_title_text() : $name,
2365	2170	'href' => FrmForm::get_edit_link( $form_id ),
2366	2171	)
2367	2172	);
2368	2173	}
		@@ -2371,14 +2176,12 @@
2371	2176	/**
2372	2177	* The formidable shortcode
2373	2178	*
2374	2179	* @param array $atts The params from the shortcode.
2375		- *
2376	2180	* @return string
2377	2181	*/
2378	2182	public static function get_form_shortcode( $atts ) {
2379	2183	global $frm_vars;
2380		-
2381	2184	if ( ! empty( $frm_vars['skip_shortcode'] ) ) {
2382	2185	$sc = '[formidable';
2383	2186	$sc .= FrmAppHelper::array_to_html_params( $atts );
2384	2187	return $sc . ']';
		@@ -2407,9 +2210,8 @@
2407	2210	* @since 5.2.01
2408	2211	*
2409	2212	* @param false|int|string $id
2410	2213	* @param false|string $key
2411		- *
2412	2214	* @return false|stdClass
2413	2215	*/
2414	2216	private static function maybe_get_form_by_id_or_key( $id, $key ) {
2415	2217	if ( ! $id ) {
		@@ -2423,9 +2225,8 @@
2423	2225	* @param false|string $key
2424	2226	* @param bool|int|string $title may be 'auto', true, false, 'true', 'false', 'yes', '1', 1, '0', 0.
2425	2227	* @param bool|int|string $description may be 'auto', true, false, 'true', 'false', 'yes', '1', 1, '0', 0.
2426	2228	* @param array $atts
2427		- *
2428	2229	* @return string
2429	2230	*/
2430	2231	public static function show_form( $id = '', $key = '', $title = false, $description = false, $atts = array() ) {
2431	2232	$form = self::maybe_get_form_by_id_or_key( $id, $key );
		@@ -2446,13 +2247,14 @@
2446	2247
2447	2248	add_action( 'frm_load_form_hooks', 'FrmHooksController::trigger_load_form_hooks' );
2448	2249	FrmAppHelper::trigger_hook_load( 'form', $form );
2449	2250
2450		- $form = apply_filters( 'frm_pre_display_form', $form );
	2251	+ $form = apply_filters( 'frm_pre_display_form', $form );
	2252	+
2451	2253	$frm_settings = FrmAppHelper::get_settings( array( 'current_form' => $form->id ) );
2452	2254
2453	2255	if ( self::is_viewable_draft_form( $form ) ) {
2454		- // Don't show a draft form on a page
	2256	+ // don't show a draft form on a page
2455	2257	$form = __( 'Please select a valid form', 'formidable' );
2456	2258	} elseif ( ! FrmForm::is_visible_to_user( $form ) ) {
2457	2259	$form = do_shortcode( $frm_settings->login_msg );
2458	2260	} else {
		@@ -2472,18 +2274,16 @@
2472	2274	}
2473	2275
2474	2276	/**
2475	2277	* @param false|int|string $id
2476		- *
2477	2278	* @return false|stdClass
2478	2279	*/
2479	2280	private static function maybe_get_form_to_show( $id ) {
2480	2281	$form = false;
2481	2282
2482		- if ( $id ) {
	2283	+ if ( ! empty( $id ) ) {
2483	2284	// Form id or key is set.
2484	2285	$form = FrmForm::getOne( $id );
2485		-
2486	2286	if ( ! $form || $form->parent_form_id || $form->status === 'trash' ) {
2487	2287	$form = false;
2488	2288	}
2489	2289	}
		@@ -2490,25 +2290,12 @@
2490	2290
2491	2291	return $form;
2492	2292	}
2493	2293
2494		- /**
2495		- * @param object $form
2496		- *
2497		- * @return bool
2498		- */
2499	2294	private static function is_viewable_draft_form( $form ) {
2500	2295	return $form->status === 'draft' && current_user_can( 'frm_edit_forms' ) && ! FrmAppHelper::is_preview_page();
2501	2296	}
2502	2297
2503		- /**
2504		- * @param object $form
2505		- * @param bool $title
2506		- * @param bool $description
2507		- * @param array $atts
2508		- *
2509		- * @return string
2510		- */
2511	2298	public static function get_form( $form, $title, $description, $atts = array() ) {
2512	2299	ob_start();
2513	2300
2514	2301	do_action( 'frm_before_get_form', $atts );
		@@ -2515,9 +2302,10 @@
2515	2302
2516	2303	self::get_form_contents( $form, $title, $description, $atts );
2517	2304	self::enqueue_scripts( FrmForm::get_params( $form ) );
2518	2305
2519		- $contents = ob_get_clean();
	2306	+ $contents = ob_get_contents();
	2307	+ ob_end_clean();
2520	2308
2521	2309	self::maybe_minimize_form( $atts, $contents );
2522	2310
2523	2311	return $contents;
		@@ -2522,25 +2310,12 @@
2522	2310
2523	2311	return $contents;
2524	2312	}
2525	2313
2526		- /**
2527		- * @param array $params
2528		- *
2529		- * @return void
2530		- */
2531	2314	public static function enqueue_scripts( $params ) {
2532	2315	do_action( 'frm_enqueue_form_scripts', $params );
2533	2316	}
2534	2317
2535		- /**
2536		- * @param object $form
2537		- * @param bool $title
2538		- * @param bool $description
2539		- * @param array $atts
2540		- *
2541		- * @return void
2542		- */
2543	2318	public static function get_form_contents( $form, $title, $description, $atts ) {
2544	2319	$params = FrmForm::get_params( $form );
2545	2320	$errors = self::get_saved_errors( $form, $params );
2546	2321	$fields = FrmFieldsHelper::get_form_fields( $form->id, $errors );
		@@ -2547,10 +2322,9 @@
2547	2322	$reset = false;
2548	2323	$pass_args = compact( 'form', 'fields', 'errors', 'title', 'description', 'reset' );
2549	2324
2550	2325	$pass_args['action'] = $params['action'];
2551		- // phpcs:ignore WordPress.Security.NonceVerification.Missing, Universal.Operators.StrictComparisons
2552		- $handle_process_here = $params['action'] === 'create' && $params['posted_form_id'] == $form->id && $_POST;
	2326	+ $handle_process_here = $params['action'] === 'create' && $params['posted_form_id'] == $form->id && $_POST; // phpcs:ignore WordPress.Security.NonceVerification.Missing
2553	2327
2554	2328	if ( ! $handle_process_here ) {
2555	2329	FrmFormState::set_initial_value( 'title', $title );
2556	2330	FrmFormState::set_initial_value( 'description', $description );
		@@ -2555,15 +2329,16 @@
2555	2329	FrmFormState::set_initial_value( 'title', $title );
2556	2330	FrmFormState::set_initial_value( 'description', $description );
2557	2331
2558	2332	do_action( 'frm_display_form_action', $params, $fields, $form, $title, $description );
2559		-
2560	2333	if ( apply_filters( 'frm_continue_to_new', true, $form->id, $params['action'] ) ) {
2561	2334	self::show_form_after_submit( $pass_args );
2562	2335	}
2563		- } elseif ( $errors ) {
	2336	+ } elseif ( ! empty( $errors ) ) {
2564	2337	self::show_form_after_submit( $pass_args );
	2338	+
2565	2339	} else {
	2340	+
2566	2341	do_action( 'frm_validate_form_creation', $params, $fields, $form, $title, $description );
2567	2342
2568	2343	if ( apply_filters( 'frm_continue_to_create', true, $form->id ) ) {
2569	2344	$entry_id = self::just_created_entry( $form->id );
		@@ -2586,19 +2361,13 @@
2586	2361	/**
2587	2362	* If the form was processed earlier (init), get the generated errors
2588	2363	*
2589	2364	* @since 2.05
2590		- *
2591		- * @param object $form
2592		- * @param array $params
2593		- *
2594		- * @return array
2595	2365	*/
2596	2366	private static function get_saved_errors( $form, $params ) {
2597	2367	global $frm_vars;
2598	2368
2599		- // phpcs:ignore WordPress.Security.NonceVerification.Missing, Universal.Operators.StrictComparisons
2600		- if ( $params['posted_form_id'] == $form->id && $_POST && isset( $frm_vars['created_entries'][ $form->id ] ) ) {
	2369	+ if ( $params['posted_form_id'] == $form->id && $_POST && isset( $frm_vars['created_entries'][ $form->id ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
2601	2370	$errors = $frm_vars['created_entries'][ $form->id ]['errors'];
2602	2371	} else {
2603	2372	$errors = array();
2604	2373	}
		@@ -2615,16 +2384,13 @@
2615	2384	}
2616	2385
2617	2386	/**
2618	2387	* @since 2.2.7
2619		- *
2620		- * @param int|string $form_id
2621		- *
2622		- * @return int
2623	2388	*/
2624	2389	public static function just_created_entry( $form_id ) {
2625	2390	global $frm_vars;
2626		- 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
	2391	+
	2392	+ 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;
2627	2393	}
2628	2394
2629	2395	/**
2630	2396	* Gets confirmation method.
		@@ -2637,9 +2403,8 @@
2637	2403	*
2638	2404	* @type object $form Form object.
2639	2405	* @type int $entry_id Entry ID.
2640	2406	* }
2641		- *
2642	2407	* @return array|string
2643	2408	*/
2644	2409	private static function get_confirmation_method( $atts ) {
2645	2410	$action = FrmOnSubmitHelper::current_event( $atts );
		@@ -2647,9 +2412,8 @@
2647	2412	$method = ! empty( $atts['form']->options[ $opt ] ) ? $atts['form']->options[ $opt ] : 'message';
2648	2413
2649	2414	if ( ! empty( $atts['entry_id'] ) ) {
2650	2415	$met_actions = self::get_met_on_submit_actions( $atts, $action );
2651		-
2652	2416	if ( $met_actions ) {
2653	2417	$method = $met_actions;
2654	2418	}
2655	2419	}
		@@ -2656,21 +2420,14 @@
2656	2420
2657	2421	$method = apply_filters( 'frm_success_filter', $method, $atts['form'], $action );
2658	2422
2659	2423	if ( $method !== 'message' && ( ! $atts['entry_id'] || ! is_numeric( $atts['entry_id'] ) ) ) {
2660		- return 'message';
	2424	+ $method = 'message';
2661	2425	}
2662	2426
2663	2427	return $method;
2664	2428	}
2665	2429
2666		- /**
2667		- * @param object $form
2668		- * @param array $params
2669		- * @param array $args
2670		- *
2671		- * @return void
2672		- */
2673	2430	public static function maybe_trigger_redirect( $form, $params, $args ) {
2674	2431	if ( ! isset( $params['id'] ) ) {
2675	2432	global $frm_vars;
2676	2433	$params['id'] = $frm_vars['created_entries'][ $form->id ]['entry_id'];
		@@ -2697,12 +2454,14 @@
2697	2454	* @param array $params See {@see FrmFormsController::maybe_trigger_redirect()}.
2698	2455	* @param array $args See {@see FrmFormsController::maybe_trigger_redirect()}.
2699	2456	*/
2700	2457	public static function maybe_trigger_redirect_with_action( $conf_method, $form, $params, $args ) {
2701		- if ( is_array( $conf_method ) && 1 === count( $conf_method ) && 'redirect' === FrmOnSubmitHelper::get_action_type( $conf_method[0] ) && empty( $conf_method[0]->post_content['redirect_delay'] ) ) { // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong
2702		- $event = FrmOnSubmitHelper::current_event( $params );
2703		- FrmOnSubmitHelper::populate_on_submit_data( $form->options, $conf_method[0], $event );
2704		- $conf_method = 'redirect';
	2458	+ if ( is_array( $conf_method ) && 1 === count( $conf_method ) ) {
	2459	+ if ( 'redirect' === FrmOnSubmitHelper::get_action_type( $conf_method[0] ) && empty( $conf_method[0]->post_content['redirect_delay'] ) ) {
	2460	+ $event = FrmOnSubmitHelper::current_event( $params );
	2461	+ FrmOnSubmitHelper::populate_on_submit_data( $form->options, $conf_method[0], $event );
	2462	+ $conf_method = 'redirect';
	2463	+ }
2705	2464	}
2706	2465
2707	2466	if ( 'redirect' === $conf_method ) {
2708	2467	self::trigger_redirect( $form, $params, $args );
		@@ -2708,15 +2467,8 @@
2708	2467	self::trigger_redirect( $form, $params, $args );
2709	2468	}
2710	2469	}
2711	2470
2712		- /**
2713		- * @param object $form
2714		- * @param array $params
2715		- * @param array $args
2716		- *
2717		- * @return void
2718		- */
2719	2471	public static function trigger_redirect( $form, $params, $args ) {
2720	2472	$success_args = array(
2721	2473	'action' => $params['action'],
2722	2474	'conf_method' => 'redirect',
		@@ -2775,9 +2527,8 @@
2775	2527	* @since 6.0
2776	2528	*
2777	2529	* @param array $args See {@see FrmFormsController::run_success_action()}.
2778	2530	* @param string $event Form event. Default is `create`.
2779		- *
2780	2531	* @return array Array of actions that meet the conditional logics.
2781	2532	*/
2782	2533	public static function get_met_on_submit_actions( $args, $event = 'create' ) {
2783	2534	if ( ! FrmOnSubmitHelper::form_has_migrated( $args['form'] ) ) {
		@@ -2804,11 +2555,13 @@
2804	2555	}
2805	2556
2806	2557	$action_type = FrmOnSubmitHelper::get_action_type( $action );
2807	2558
2808		- if ( 'redirect' === $action_type && $has_redirect ) {
2809		- // Do not process because we run the first redirect action only.
2810		- continue;
	2559	+ if ( 'redirect' === $action_type ) {
	2560	+ if ( $has_redirect ) {
	2561	+ // Do not process because we run the first redirect action only.
	2562	+ continue;
	2563	+ }
2811	2564	}
2812	2565
2813	2566	if ( ! self::is_valid_on_submit_action( $action, $args, $event ) ) {
2814	2567	continue;
		@@ -2833,10 +2586,10 @@
2833	2586	* @param array $args See {@see FrmFormsController::run_success_action()}. `$args['event']` is also added.
2834	2587	*/
2835	2588	$met_actions = apply_filters( 'frm_get_met_on_submit_actions', $met_actions, $args );
2836	2589
2837		- if ( ! $met_actions ) {
2838		- return array( FrmOnSubmitHelper::get_fallback_action( $event ) );
	2590	+ if ( empty( $met_actions ) ) {
	2591	+ $met_actions = array( FrmOnSubmitHelper::get_fallback_action( $event ) );
2839	2592	}
2840	2593
2841	2594	return $met_actions;
2842	2595	}
		@@ -2848,9 +2601,8 @@
2848	2601	*
2849	2602	* @param object $action Form action object.
2850	2603	* @param array $args See {@see FrmFormsController::run_success_action()}.
2851	2604	* @param string $event Form event. Default is `create`.
2852		- *
2853	2605	* @return bool
2854	2606	*/
2855	2607	private static function is_valid_on_submit_action( $action, $args, $event = 'create' ) {
2856	2608	$action_type = FrmOnSubmitHelper::get_action_type( $action );
		@@ -2872,9 +2624,8 @@
2872	2624	return false;
2873	2625	}
2874	2626
2875	2627	$page = get_post( $action->post_content['success_page_id'] );
2876		-
2877	2628	if ( ! $page || 'trash' === $page->post_status ) {
2878	2629	return false;
2879	2630	}
2880	2631	}
		@@ -2896,9 +2647,8 @@
2896	2647	'entry_id' => $args['entry_id'],
2897	2648	'action' => FrmOnSubmitHelper::current_event( $args ),
2898	2649	)
2899	2650	);
2900		-
2901	2651	if ( ! is_array( $args['conf_method'] ) ) {
2902	2652	self::run_success_action( $args );
2903	2653	return;
2904	2654	}
		@@ -2925,9 +2675,8 @@
2925	2675	* @param array $args See {@see FrmFormsController::run_success_action()}.
2926	2676	*/
2927	2677	public static function run_multi_on_submit_actions( $args ) {
2928	2678	$redirect_action = null;
2929		-
2930	2679	foreach ( $args['conf_method'] as $action ) {
2931	2680	if ( 'redirect' === FrmOnSubmitHelper::get_action_type( $action ) ) {
2932	2681	// We catch the redirect action to run it last.
2933	2682	$redirect_action = $action;
		@@ -2938,15 +2687,13 @@
2938	2687
2939	2688	unset( $action );
2940	2689	}
2941	2690
2942		- if ( ! $redirect_action ) {
2943		- return;
	2691	+ if ( $redirect_action ) {
	2692	+ // Show script to delay the redirection.
	2693	+ $args['force_delay_redirect'] = true;
	2694	+ self::run_single_on_submit_action( $args, $redirect_action );
2944	2695	}
2945		-
2946		- // Show script to delay the redirection.
2947		- $args['force_delay_redirect'] = true;
2948		- self::run_single_on_submit_action( $args, $redirect_action );
2949	2696	}
2950	2697
2951	2698	/**
2952	2699	* Runs single On Submit action.
		@@ -2967,9 +2714,8 @@
2967	2714	* @since 6.0
2968	2715	*
2969	2716	* @param array $args See {@see FrmFormsController::run_success_action()}.
2970	2717	* @param object $action On Submit action object.
2971		- *
2972	2718	* @return array
2973	2719	*/
2974	2720	private static function get_run_success_action_args( $args, $action ) {
2975	2721	$new_args = $args;
		@@ -2975,9 +2721,10 @@
2975	2721	$new_args = $args;
2976	2722
2977	2723	FrmOnSubmitHelper::populate_on_submit_data( $new_args['form']->options, $action, $args['action'] );
2978	2724
2979		- $opt = 'update' === $args['action'] ? 'edit_' : 'success_';
	2725	+ $opt = 'update' === $args['action'] ? 'edit_' : 'success_';
	2726	+
2980	2727	$new_args['conf_method'] = $new_args['form']->options[ $opt . 'action' ];
2981	2728
2982	2729	/**
2983	2730	* Filters the run success action args.
		@@ -2992,18 +2739,12 @@
2992	2739	}
2993	2740
2994	2741	/**
2995	2742	* @since 3.0
2996		- *
2997		- * @param array $args
2998		- *
2999		- * @return void
3000	2743	*/
3001	2744	private static function load_page_after_submit( $args ) {
3002	2745	global $post;
3003	2746	$opt = $args['success_opt'];
3004		-
3005		- // phpcs:ignore Universal.Operators.StrictComparisons
3006	2747	if ( ! $post || $args['form']->options[ $opt . '_page_id' ] != $post->ID ) {
3007	2748	$page = get_post( $args['form']->options[ $opt . '_page_id' ] );
3008	2749	$old_post = $post;
3009	2750	$post = $page;
		@@ -3027,9 +2768,8 @@
3027	2768	}
3028	2769
3029	2770	/**
3030	2771	* @since 3.0
3031		- *
3032	2772	* @param array $args See {@see FrmFormsController::run_success_action()}.
3033	2773	*/
3034	2774	private static function redirect_after_submit( $args ) {
3035	2775	add_filter( 'frm_use_wpautop', '__return_false' );
		@@ -3043,10 +2783,11 @@
3043	2783	FrmEntriesController::delete_entry_before_redirect( $success_url, $args['form'], $args );
3044	2784
3045	2785	add_filter( 'frm_redirect_url', 'FrmEntriesController::prepare_redirect_url' );
3046	2786	$success_url = apply_filters( 'frm_redirect_url', $success_url, $args['form'], $args );
3047		- $doing_ajax = FrmAppHelper::doing_ajax();
3048	2787
	2788	+ $doing_ajax = FrmAppHelper::doing_ajax();
	2789	+
3049	2790	if ( ! empty( $args['ajax'] ) && $doing_ajax && empty( $args['force_delay_redirect'] ) ) {
3050	2791	// Is AJAX submit and there is just one Redirect action runs.
3051	2792	echo json_encode( self::get_ajax_redirect_response_data( $args + compact( 'success_url' ) ) );
3052	2793	wp_die();
		@@ -3095,9 +2836,8 @@
3095	2836	*
3096	2837	* @since 6.3.1
3097	2838	*
3098	2839	* @param array $args See {@see FrmFormsController::run_success_action()}.
3099		- *
3100	2840	* @return array
3101	2841	*/
3102	2842	private static function get_ajax_redirect_response_data( $args ) {
3103	2843	$response_data = array(
		@@ -3120,9 +2860,8 @@
3120	2860	$args['message'] = FrmOnSubmitHelper::get_default_new_tab_msg();
3121	2861
3122	2862	$args['form']->options['success_msg'] = $args['message'];
3123	2863	$args['form']->options['edit_msg'] = $args['message'];
3124		-
3125	2864	if ( ! isset( $args['fields'] ) ) {
3126	2865	$args['fields'] = FrmField::get_all_for_form( $args['form']->id );
3127	2866	}
3128	2867
		@@ -3174,15 +2913,13 @@
3174	2913	add_filter( 'frm_use_wpautop', '__return_true' );
3175	2914
3176	2915	echo FrmAppHelper::maybe_kses( $redirect_msg ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
3177	2916	echo '<script>';
3178		-
3179	2917	if ( empty( $args['doing_ajax'] ) ) {
3180	2918	// Not AJAX submit, delay JS until window.load.
3181	2919	echo 'window.onload=function(){';
3182	2920	}
3183	2921	echo 'setTimeout(function(){' . $redirect_js . '}, ' . intval( $delay_time ) . ');'; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
3184		-
3185	2922	if ( empty( $args['doing_ajax'] ) ) {
3186	2923	echo '};';
3187	2924	}
3188	2925	echo '</script>';
		@@ -3195,16 +2932,13 @@
3195	2932	* @param string $success_msg
3196	2933	* @param array $args
3197	2934	*/
3198	2935	private static function get_redirect_message( $success_url, $success_msg, $args ) {
3199		- $success_msg = apply_filters( 'frm_content', $success_msg, $args['form'], $args['entry_id'] );
3200		- $success_msg = do_shortcode( FrmAppHelper::use_wpautop( $success_msg ) );
3201		-
3202		- // phpcs:disable Generic.WhiteSpace.ScopeIndent
3203		- $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
	2936	+ $success_msg = apply_filters( 'frm_content', $success_msg, $args['form'], $args['entry_id'] );
	2937	+ $success_msg = do_shortcode( FrmAppHelper::use_wpautop( $success_msg ) );
	2938	+ $redirect_msg = '<div class="' . esc_attr( FrmFormsHelper::get_form_style_class( $args['form'] ) ) . '"><div class="frm-redirect-msg" role="status">' . $success_msg . '<br/>' .
3204	2939	self::get_redirect_fallback_message( $success_url, $args ) .
3205	2940	'</div></div>';
3206		- // phpcs:enable Generic.WhiteSpace.ScopeIndent
3207	2941
3208	2942	$redirect_args = array(
3209	2943	'entry_id' => $args['entry_id'],
3210	2944	'form_id' => $args['form']->id,
		@@ -3220,14 +2954,12 @@
3220	2954	* @since 6.3.1
3221	2955	*
3222	2956	* @param string $success_url Redirect URL.
3223	2957	* @param array $args Contains `form` object.
3224		- *
3225	2958	* @return string
3226	2959	*/
3227	2960	private static function get_redirect_fallback_message( $success_url, $args ) {
3228	2961	$target = '';
3229		-
3230	2962	if ( ! empty( $args['form']->options['open_in_new_tab'] ) ) {
3231	2963	$target = ' target="_blank"';
3232	2964	}
3233	2965
		@@ -3242,12 +2974,8 @@
3242	2974	/**
3243	2975	* Prepare to show the success message and empty form after submit
3244	2976	*
3245	2977	* @since 2.05
3246		- *
3247		- * @param array $atts
3248		- *
3249		- * @return void
3250	2978	*/
3251	2979	public static function show_message_after_save( $atts ) {
3252	2980	$atts['message'] = self::prepare_submit_message( $atts['form'], $atts['entry_id'], $atts );
3253	2981
		@@ -3253,9 +2981,8 @@
3253	2981
3254	2982	if ( ! isset( $atts['form']->options['show_form'] ) || $atts['form']->options['show_form'] ) {
3255	2983	if ( isset( $atts['action'] ) && 'update' === $atts['action'] && is_callable( array( 'FrmProEntriesController', 'show_front_end_form_with_entry' ) ) ) {
3256	2984	$entry = FrmEntry::getOne( $atts['entry_id'] );
3257		-
3258	2985	if ( $entry ) {
3259	2986	// This is copied from the Pro plugin.
3260	2987	$atts['conf_message'] = FrmProEntriesController::confirmation( 'message', $atts['form'], $atts['form']->options, $entry->id, $atts );
3261	2988	$atts['show_form'] = FrmProEntriesController::is_form_displayed_after_edit( $atts['form'] );
		@@ -3272,12 +2999,8 @@
3272	2999	/**
3273	3000	* Show an empty form
3274	3001	*
3275	3002	* @since 2.05
3276		- *
3277		- * @param array $args
3278		- *
3279		- * @return void
3280	3003	*/
3281	3004	private static function show_form_after_submit( $args ) {
3282	3005	self::fill_atts_for_form_display( $args );
3283	3006
		@@ -3296,11 +3019,12 @@
3296	3019	}
3297	3020	unset( $args );
3298	3021
3299	3022	$include_form_tag = apply_filters( 'frm_include_form_tag', true, $form );
3300		- $frm_settings = FrmAppHelper::get_settings();
3301		- $submit = $form->options['submit_value'] ?? $frm_settings->submit_value;
3302	3023
	3024	+ $frm_settings = FrmAppHelper::get_settings();
	3025	+ $submit = isset( $form->options['submit_value'] ) ? $form->options['submit_value'] : $frm_settings->submit_value;
	3026	+
3303	3027	global $frm_vars;
3304	3028	self::maybe_load_css( $form, $values['custom_style'], $frm_vars['load_css'] );
3305	3029
3306	3030	$message_placement = self::message_placement( $form, $message );
		@@ -3308,36 +3032,25 @@
3308	3032	include FrmAppHelper::plugin_path() . '/classes/views/frm-entries/new.php';
3309	3033	}
3310	3034
3311	3035	/**
3312		- * Gets message placement.
3313		- *
3314	3036	* @since 4.05.02
3315		- * @since 6.26 This method changed from `private` to `public`.
3316		- *
3317		- * @param object $form Form object.
3318		- * @param string $message The message.
3319		- *
3320		- * @return string Accepts 'before', 'after', or 'submit'.
	3037	+ * @return string - 'before', 'after', or 'submit'
3321	3038	*/
3322		- public static function message_placement( $form, $message ) {
	3039	+ private static function message_placement( $form, $message ) {
3323	3040	$place = 'before';
3324	3041
3325	3042	if ( $message && isset( $form->options['form_class'] ) ) {
3326		- if ( str_contains( $form->options['form_class'], 'frm_below_success' ) ) {
	3043	+ if ( strpos( $form->options['form_class'], 'frm_below_success' ) !== false ) {
3327	3044	$place = 'after';
3328		- } elseif ( str_contains( $form->options['form_class'], 'frm_inline_success' ) ) {
	3045	+ } elseif ( strpos( $form->options['form_class'], 'frm_inline_success' ) !== false ) {
3329	3046	$place = 'submit';
3330	3047	}
3331	3048	}
3332	3049
3333	3050	/**
3334		- * Filter the message placement.
3335		- *
3336	3051	* @since 4.05.02
3337		- *
3338		- * @param string $place Accepts 'before', 'after', or 'submit'.
3339		- * @param array $args Args.
	3052	+ * @return string - 'before' or 'after'
3340	3053	*/
3341	3054	return apply_filters( 'frm_message_placement', $place, compact( 'form', 'message' ) );
3342	3055	}
3343	3056
		@@ -3344,12 +3057,8 @@
3344	3057	/**
3345	3058	* Get all the values needed on the new.php entry page
3346	3059	*
3347	3060	* @since 2.05
3348		- *
3349		- * @param array $args
3350		- *
3351		- * @return void
3352	3061	*/
3353	3062	private static function fill_atts_for_form_display( &$args ) {
3354	3063	if ( ! isset( $args['title'] ) && isset( $args['show_title'] ) ) {
3355	3064	$args['title'] = $args['show_title'];
		@@ -3374,12 +3083,8 @@
3374	3083	/**
3375	3084	* Show the success message without the form
3376	3085	*
3377	3086	* @since 2.05
3378		- *
3379		- * @param array $atts
3380		- *
3381		- * @return void
3382	3087	*/
3383	3088	private static function show_lone_success_message( $atts ) {
3384	3089	global $frm_vars;
3385	3090	$values = FrmEntriesHelper::setup_new_vars( $atts['fields'], $atts['form'], true );
		@@ -3385,12 +3090,13 @@
3385	3090	$values = FrmEntriesHelper::setup_new_vars( $atts['fields'], $atts['form'], true );
3386	3091	self::maybe_load_css( $atts['form'], $values['custom_style'], $frm_vars['load_css'] );
3387	3092
3388	3093	$include_extra_container = 'frm_forms' . FrmFormsHelper::get_form_style_class( $values );
3389		- $errors = array();
3390		- $form = $atts['form'];
3391		- $message = $atts['message'];
3392	3094
	3095	+ $errors = array();
	3096	+ $form = $atts['form'];
	3097	+ $message = $atts['message'];
	3098	+
3393	3099	include FrmAppHelper::plugin_path() . '/classes/views/frm-entries/errors.php';
3394	3100	}
3395	3101
3396	3102	/**
		@@ -3398,20 +3104,19 @@
3398	3104	*
3399	3105	* @since 2.05
3400	3106	* @since 6.0.x Added the third parameter.
3401	3107	*
3402		- * @param object $form Form object.
3403		- * @param int|string $entry_id Entry ID.
3404		- * @param array $args See {@see FrmFormsController::run_success_action()}.
3405		- *
	3108	+ * @param object $form Form object.
	3109	+ * @param int $entry_id Entry ID.
	3110	+ * @param array $args See {@see FrmFormsController::run_success_action()}.
3406	3111	* @return string
3407	3112	*/
3408	3113	private static function prepare_submit_message( $form, $entry_id, $args = array() ) {
3409	3114	$frm_settings = FrmAppHelper::get_settings( array( 'current_form' => $form->id ) );
3410		- $opt = $args['success_opt'] ?? 'success';
	3115	+ $opt = isset( $args['success_opt'] ) ? $args['success_opt'] : 'success';
3411	3116
3412	3117	if ( $entry_id && is_numeric( $entry_id ) ) {
3413		- $message = $form->options[ $opt . '_msg' ] ?? $frm_settings->success_msg;
	3118	+ $message = isset( $form->options[ $opt . '_msg' ] ) ? $form->options[ $opt . '_msg' ] : $frm_settings->success_msg;
3414	3119	$class = 'frm_message';
3415	3120	} else {
3416	3121	$message = $frm_settings->failed_msg;
3417	3122	$class = FrmFormsHelper::form_error_class();
		@@ -3428,9 +3133,9 @@
3428	3133	public static function front_head() {
3429	3134	$version = FrmAppHelper::plugin_version();
3430	3135	$suffix = FrmAppHelper::js_suffix();
3431	3136
3432		- if ( $suffix && self::has_combo_js_file() ) {
	3137	+ if ( ! empty( $suffix ) && self::has_combo_js_file() ) {
3433	3138	wp_register_script( 'formidable', FrmAppHelper::plugin_url() . '/js/frm.min.js', array( 'jquery' ), $version, true );
3434	3139	} else {
3435	3140	wp_register_script( 'formidable', FrmAppHelper::plugin_url() . "/js/formidable{$suffix}.js", array( 'jquery' ), $version, true );
3436	3141	}
		@@ -3437,9 +3142,9 @@
3437	3142
3438	3143	add_filter( 'script_loader_tag', 'FrmFormsController::defer_script_loading', 10, 2 );
3439	3144
3440	3145	if ( FrmAppHelper::is_admin() ) {
3441		- // Don't load this in back-end
	3146	+ // don't load this in back-end
3442	3147	return;
3443	3148	}
3444	3149
3445	3150	FrmAppHelper::localize_script( 'front' );
		@@ -3452,15 +3157,8 @@
3452	3157	public static function has_combo_js_file() {
3453	3158	return is_readable( FrmAppHelper::plugin_path() . '/js/frm.min.js' );
3454	3159	}
3455	3160
3456		- /**
3457		- * @param object $form
3458		- * @param int|string $this_load
3459		- * @param bool $global_load
3460		- *
3461		- * @return void
3462		- */
3463	3161	public static function maybe_load_css( $form, $this_load, $global_load ) {
3464	3162	$load_css = FrmForm::is_form_loaded( $form, $this_load, $global_load );
3465	3163
3466	3164	if ( ! $load_css ) {
		@@ -3490,9 +3188,8 @@
3490	3188	return;
3491	3189	}
3492	3190
3493	3191	global $wp_styles;
3494		-
3495	3192	if ( is_array( $wp_styles->queue ) && in_array( 'formidable', $wp_styles->queue, true ) ) {
3496	3193	wp_print_styles( 'formidable' );
3497	3194	}
3498	3195	}
		@@ -3507,57 +3204,36 @@
3507	3204	private static function should_load_late() {
3508	3205	return ! function_exists( 'aioseo' );
3509	3206	}
3510	3207
3511		- /**
3512		- * @param string $tag
3513		- * @param string $handle
3514		- *
3515		- * @return string
3516		- */
3517	3208	public static function defer_script_loading( $tag, $handle ) {
3518		- if ( 'captcha-api' === $handle && ! str_contains( $tag, 'defer' ) ) {
3519		- return str_replace( ' src', ' defer="defer" async="async" src', $tag );
	3209	+ if ( 'captcha-api' == $handle && ! strpos( $tag, 'defer' ) ) {
	3210	+ $tag = str_replace( ' src', ' defer="defer" async="async" src', $tag );
3520	3211	}
3521	3212
3522	3213	return $tag;
3523	3214	}
3524	3215
3525		- /**
3526		- * @param string $location
3527		- *
3528		- * @return void
3529		- */
3530	3216	public static function footer_js( $location = 'footer' ) {
3531	3217	global $frm_vars;
3532	3218
3533	3219	FrmStylesController::enqueue_css();
3534	3220
3535		- if ( FrmAppHelper::is_admin() || $location === 'header' || empty( $frm_vars['forms_loaded'] ) ) {
3536		- return;
	3221	+ if ( ! FrmAppHelper::is_admin() && $location !== 'header' && ! empty( $frm_vars['forms_loaded'] ) ) {
	3222	+ // load formidable js
	3223	+ wp_enqueue_script( 'formidable' );
3537	3224	}
3538	3225
3539		- // Load formidable js
3540		- wp_enqueue_script( 'formidable' );
3541		-
3542		- FrmHoneypot::maybe_print_honeypot_js();
3543		-
3544		- if ( ! method_exists( 'FrmProFormsHelper', 'load_currency_js' ) ) {
3545		- // Load currency JS if Pro is not installed.
3546		- FrmFormsHelper::load_currency_js();
	3226	+ if ( ! FrmAppHelper::is_admin() ) {
	3227	+ FrmHoneypot::maybe_print_honeypot_js();
3547	3228	}
3548	3229	}
3549	3230
3550	3231	/**
3551	3232	* @since 2.0.8
3552		- *
3553		- * @param array $atts
3554		- * @param string $content
3555		- *
3556		- * @return void
3557	3233	*/
3558	3234	private static function maybe_minimize_form( $atts, &$content ) {
3559		- // Check if minimizing is turned on
	3235	+ // check if minimizing is turned on
3560	3236	if ( self::is_minification_on( $atts ) ) {
3561	3237	$content = str_replace( array( "\r\n", "\r", "\n", "\t", ' ' ), '', $content );
3562	3238	}
3563	3239	}
		@@ -3563,11 +3239,8 @@
3563	3239	}
3564	3240
3565	3241	/**
3566	3242	* @since 2.0.8
3567		- *
3568		- * @param array $atts
3569		- *
3570	3243	* @return bool
3571	3244	*/
3572	3245	private static function is_minification_on( $atts ) {
3573	3246	return ! empty( $atts['minimize'] );
		@@ -3579,13 +3252,11 @@
3579	3252	* @return void
3580	3253	*/
3581	3254	public static function landing_page_preview_option() {
3582	3255	$dir = apply_filters( 'frm_landing_page_preview_option', false );
3583		-
3584	3256	if ( false === $dir || ! file_exists( $dir . 'landing-page-preview-option.php' ) ) {
3585	3257	$dir = self::get_form_views_path();
3586	3258	}
3587		-
3588	3259	include $dir . 'landing-page-preview-option.php';
3589	3260	}
3590	3261
3591	3262	/**
		@@ -3611,15 +3282,13 @@
3611	3282
3612	3283	check_ajax_referer( 'frm_ajax', 'nonce' );
3613	3284
3614	3285	$type = FrmAppHelper::get_post_param( 'type', '', 'sanitize_text_field' );
3615		-
3616	3286	if ( ! $type || ! in_array( $type, array( 'form', 'view' ), true ) ) {
3617	3287	die( 0 );
3618	3288	}
3619	3289
3620	3290	$object_id = FrmAppHelper::get_post_param( 'object_id', '', 'absint' );
3621		-
3622	3291	if ( ! $object_id ) {
3623	3292	die( 0 );
3624	3293	}
3625	3294
		@@ -3631,15 +3300,13 @@
3631	3300	$postarr['post_content'] = apply_filters( 'frm_create_page_with_' . $type . '_shortcode_content', '', $object_id );
3632	3301	}
3633	3302
3634	3303	$name = FrmAppHelper::get_post_param( 'name', '', 'sanitize_text_field' );
3635		-
3636	3304	if ( $name ) {
3637	3305	$postarr['post_title'] = $name;
3638	3306	}
3639	3307
3640	3308	$success = wp_insert_post( $postarr );
3641		-
3642	3309	if ( ! is_numeric( $success ) || ! $success ) {
3643	3310	die( 0 );
3644	3311	}
3645	3312
		@@ -3653,9 +3320,8 @@
3653	3320	/**
3654	3321	* @since 5.3
3655	3322	*
3656	3323	* @param int $form_id
3657		- *
3658	3324	* @return string
3659	3325	*/
3660	3326	private static function get_page_shortcode_content_for_form( $form_id ) {
3661	3327	$shortcode = '[formidable id="' . $form_id . '"]';
		@@ -3675,9 +3341,9 @@
3675	3341	}
3676	3342
3677	3343	check_ajax_referer( 'frm_ajax', 'nonce' );
3678	3344
3679		- $html = FrmAppHelper::clip(
	3345	+ $html = FrmAppHelper::clip(
3680	3346	function () {
3681	3347	FrmAppHelper::maybe_autocomplete_pages_options(
3682	3348	array(
3683	3349	'field_name' => 'frm_page_dropdown',
		@@ -3686,12 +3352,13 @@
3686	3352	)
3687	3353	);
3688	3354	}
3689	3355	);
	3356	+ $post_type_object = get_post_type_object( 'page' );
3690	3357	wp_send_json(
3691	3358	array(
3692	3359	'html' => $html,
3693		- 'edit_page_url' => admin_url( sprintf( get_post_type_object( 'page' )->_edit_link . '&action=edit', 0 ) ),
	3360	+ 'edit_page_url' => admin_url( sprintf( $post_type_object->_edit_link . '&action=edit', 0 ) ),
3694	3361	)
3695	3362	);
3696	3363	}
3697	3364
		@@ -3696,14 +3363,23 @@
3696	3363	}
3697	3364
3698	3365	/**
3699	3366	* @deprecated 4.0
	3367	+ */
	3368	+ public static function create( $values = array() ) {
	3369	+ _deprecated_function( __METHOD__, '4.0', 'FrmFormsController::update' );
	3370	+ self::update( $values );
	3371	+ }
	3372	+
	3373	+ /**
	3374	+ * Education for premium features.
3700	3375	*
3701		- * @param array $values
	3376	+ * @since 4.05
	3377	+ * @deprecated 6.16.3
3702	3378	*
3703	3379	* @return void
3704	3380	*/
3705		- public static function create( $values = array() ) {
3706		- _deprecated_function( __METHOD__, '4.0', 'FrmFormsController::update' );
3707		- self::update( $values );
	3381	+ public static function add_form_style_tab_options() {
	3382	+ _deprecated_function( __METHOD__, '6.16.3' );
	3383	+ include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/add_form_style_options.php';
3708	3384	}
3709	3385	}