← All changes | classes/controllers/FrmFormsController.php +193 -640 6.27 → 6.10 View file →

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