← All changes | classes/controllers/FrmFormsController.php +182 -600 6.27 → 6.13 View file →

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