← All changes | classes/controllers/FrmFormsController.php +257 -686 6.33 → 6.24 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	}
		@@ -47,15 +45,8 @@
47	45	add_filter( 'manage_toplevel_page_formidable_columns', 'FrmFormsController::get_columns', 0 );
48	46	add_filter( 'manage_toplevel_page_formidable_sortable_columns', 'FrmFormsController::get_sortable_columns' );
49	47	}
50	48
51		- /**
52		- * Runs on admin head of the formidable forms page.
53		- *
54		- * @since 6.32 This adds screen options.
55		- *
56		- * @return void
57		- */
58	49	public static function head() {
59	50	if ( wp_is_mobile() ) {
60	51	wp_enqueue_script( 'jquery-touch-punch' );
61	52	}
		@@ -73,10 +64,10 @@
73	64	*/
74	65	public static function logic_tip() {
75	66	$images_url = FrmAppHelper::plugin_url() . '/images/';
76	67	$data_message = __( 'Only show the fields you need and create branching forms. Upgrade to get conditional logic and question branching.', 'formidable' );
77		- $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
78		- 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">';
79	70	esc_html_e( 'Conditional Logic', 'formidable' );
80	71	FrmAppHelper::icon_by_class( 'frmfont frm_arrowdown8_icon', array( 'aria-hidden' => 'true' ) );
81	72	echo '</a>';
82	73	}
		@@ -85,15 +76,12 @@
85	76	* By default, Divi processes form shortcodes on the edit post page.
86	77	* Now that won't do.
87	78	*
88	79	* @since 3.01
89		- *
90		- * @param array $shortcodes List of shortcodes to process.
91		- *
92		- * @return array
93	80	*/
94	81	public static function prevent_divi_conflict( $shortcodes ) {
95	82	$shortcodes[] = 'formidable';
	83	+
96	84	return $shortcodes;
97	85	}
98	86
99	87	/**
		@@ -104,14 +92,12 @@
104	92
105	93	$message = '';
106	94	$params = FrmForm::list_page_params();
107	95	$errors = self::process_bulk_form_actions( array() );
108		-
109	96	if ( isset( $errors['message'] ) ) {
110	97	$message = $errors['message'];
111	98	unset( $errors['message'] );
112	99	}
113		-
114	100	$errors = apply_filters( 'frm_admin_list_form_action', $errors );
115	101
116	102	self::display_forms_list( $params, $message, $errors );
117	103	}
		@@ -121,14 +107,12 @@
121	107	*
122	108	* @since 2.02.11
123	109	*
124	110	* @param int|object $form
125		- *
126	111	* @return void
127	112	*/
128	113	private static function create_default_email_action( $form ) {
129	114	FrmForm::maybe_get_form( $form );
130		-
131	115	if ( ! is_object( $form ) ) {
132	116	return;
133	117	}
134	118
		@@ -133,17 +117,15 @@
133	117	}
134	118
135	119	$create_email = apply_filters( 'frm_create_default_email_action', true, $form );
136	120
137		- if ( ! $create_email ) {
138		- return;
	121	+ if ( $create_email ) {
	122	+ /**
	123	+ * @var FrmFormAction
	124	+ */
	125	+ $action_control = FrmFormActionsController::get_form_actions( 'email' );
	126	+ $action_control->create( $form->id );
139	127	}
140		-
141		- /**
142		- * @var FrmFormAction
143		- */
144		- $action_control = FrmFormActionsController::get_form_actions( 'email' );
145		- $action_control->create( $form->id );
146	128	}
147	129
148	130	/**
149	131	* Create the default On submit action
		@@ -150,14 +132,12 @@
150	132	*
151	133	* @since 6.0.0
152	134	*
153	135	* @param int|object $form Form object or ID.
154		- *
155	136	* @return void
156	137	*/
157	138	private static function create_default_on_submit_action( $form ) {
158	139	FrmForm::maybe_get_form( $form );
159		-
160	140	if ( ! is_object( $form ) ) {
161	141	return;
162	142	}
163	143
		@@ -170,17 +150,15 @@
170	150	* @param object $form Form object.
171	151	*/
172	152	$create = apply_filters( 'frm_create_default_on_submit_action', true, $form );
173	153
174		- if ( ! $create ) {
175		- return;
	154	+ if ( $create ) {
	155	+ /**
	156	+ * @var FrmFormAction
	157	+ */
	158	+ $action_control = FrmFormActionsController::get_form_actions( FrmOnSubmitAction::$slug );
	159	+ $action_control->create( $form->id );
176	160	}
177		-
178		- /**
179		- * @var FrmFormAction
180		- */
181		- $action_control = FrmFormActionsController::get_form_actions( FrmOnSubmitAction::$slug );
182		- $action_control->create( $form->id );
183	161	}
184	162
185	163	/**
186	164	* Creates submit button field.
		@@ -187,14 +165,12 @@
187	165	*
188	166	* @since 6.9
189	167	*
190	168	* @param int|object $form Form ID or object.
191		- *
192	169	* @return void
193	170	*/
194	171	private static function create_submit_button_field( $form ) {
195	172	FrmForm::maybe_get_form( $form );
196		-
197	173	if ( ! is_object( $form ) ) {
198	174	return;
199	175	}
200	176
		@@ -217,10 +193,8 @@
217	193	);
218	194	}
219	195
220	196	/**
221		- * @param array|false $values
222		- *
223	197	* @return void
224	198	*/
225	199	public static function edit( $values = false ) {
226	200	FrmAppHelper::permission_check( 'frm_edit_forms' );
		@@ -232,9 +206,8 @@
232	206
233	207	/**
234	208	* @param mixed $id
235	209	* @param string $message
236		- *
237	210	* @return void
238	211	*/
239	212	public static function settings( $id = false, $message = '' ) {
240	213	FrmAppHelper::permission_check( 'frm_edit_forms' );
		@@ -262,9 +235,10 @@
262	235	FrmAppController::show_error_modal( $error_args );
263	236	return;
264	237	}
265	238
266		- $id = FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
	239	+ $id = FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
	240	+
267	241	$errors = FrmForm::validate( $_POST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
268	242	$warnings = FrmFormsHelper::check_for_warnings( $_POST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
269	243
270	244	if ( count( $errors ) > 0 ) {
		@@ -273,22 +247,17 @@
273	247	}
274	248
275	249	do_action( 'frm_before_update_form_settings', $id );
276	250
277		- $antispam_was_on = self::antispam_was_on( $id ); // phpcs:ignore Formidable.CodeAnalysis.InlineSingleUseVariable
	251	+ $antispam_was_on = self::antispam_was_on( $id );
278	252
279	253	FrmForm::update( $id, $_POST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
280	254
281	255	$antispam_is_on = ! empty( $_POST['options']['antispam'] ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
282		-
283	256	if ( $antispam_is_on !== $antispam_was_on ) {
284	257	FrmAntiSpam::clear_caches();
285	258	}
286	259
287		- // Handle captcha field inclusion
288		- $include_captcha = isset( $_POST['frm_include_captcha'] ) && '1' === $_POST['frm_include_captcha']; // phpcs:ignore WordPress.Security.NonceVerification.Missing
289		- self::handle_captcha_field( $id, $include_captcha );
290		-
291	260	$message = __( 'Settings Successfully Updated', 'formidable' );
292	261
293	262	self::get_settings_vars( $id, array(), compact( 'message', 'warnings' ) );
294	263	}
		@@ -294,9 +263,8 @@
294	263	}
295	264
296	265	/**
297	266	* @param int $form_id
298		- *
299	267	* @return bool
300	268	*/
301	269	private static function antispam_was_on( $form_id ) {
302	270	$form = FrmForm::getOne( $form_id );
		@@ -303,52 +271,12 @@
303	271	return ! empty( $form->options['antispam'] );
304	272	}
305	273
306	274	/**
307		- * Handle captcha field inclusion in form
308		- *
309		- * @since 6.33
310		- *
311		- * @param int $form_id Form ID.
312		- * @param bool $include_captcha Whether to include captcha field.
313		- *
314	275	* @return void
315	276	*/
316		- private static function handle_captcha_field( $form_id, $include_captcha ) {
317		- $form_fields = FrmField::get_all_for_form( $form_id, '', 'exclude' );
318		- $captcha_field_id = 0;
319		- $submit_field_order = 0;
320		-
321		- foreach ( $form_fields as $field ) {
322		- if ( 'captcha' === $field->type ) {
323		- $captcha_field_id = $field->id;
324		- break;
325		- }
326		-
327		- if ( 'submit' === $field->type ) {
328		- $submit_field_order = $field->field_order;
329		- }
330		- }
331		-
332		- if ( $include_captcha && ! $captcha_field_id ) {
333		- // Create captcha field just before submit button
334		- $field_values = FrmFieldsHelper::setup_new_vars( 'captcha', $form_id );
335		- $field_values['name'] = __( 'Captcha', 'formidable' );
336		- $field_values['field_order'] = $submit_field_order > 0 ? $submit_field_order - 1 : 0;
337		- FrmField::create( $field_values );
338		- } elseif ( ! $include_captcha && $captcha_field_id ) {
339		- // Delete captcha field
340		- FrmField::destroy( $captcha_field_id );
341		- }
342		- }
343		-
344		- /**
345		- * @param array $values
346		- *
347		- * @return void
348		- */
349	277	public static function update( $values = array() ) {
350		- if ( ! $values ) {
	278	+ if ( empty( $values ) ) {
351	279	$values = $_POST; // phpcs:ignore WordPress.Security.NonceVerification.Missing
352	280	}
353	281
354	282	// Set radio button and checkbox meta equal to "other" value.
		@@ -357,9 +285,8 @@
357	285	}
358	286
359	287	$errors = FrmForm::validate( $values );
360	288	$permission_error = FrmAppHelper::permission_nonce_error( 'frm_edit_forms', 'frm_save_form', 'frm_save_form_nonce' );
361		-
362	289	if ( $permission_error !== false ) {
363	290	$errors['form'] = $permission_error;
364	291	}
365	292
		@@ -378,9 +305,9 @@
378	305	if ( self::is_too_long( $values ) ) {
379	306	$message .= '<br/> ' . sprintf(
380	307	/* translators: %1$s: Start link HTML, %2$s: end link HTML */
381	308	__( 'However, your form is very long and may be %1$sreaching server limits%2$s.', 'formidable' ),
382		- '<a href="' . esc_url( self::get_form_too_long_docs_url() ) . '" target="_blank" rel="noopener">',
	309	+ '<a href="https://formidableforms.com/knowledgebase/i-have-a-long-form-why-did-the-options-at-the-end-of-the-form-stop-saving/?utm_source=WordPress&utm_medium=builder&utm_campaign=liteplugin" target="_blank" rel="noopener">',
383	310	'</a>'
384	311	);
385	312	}
386	313
		@@ -391,32 +318,17 @@
391	318	self::get_edit_vars( $id, array(), $message );
392	319	}
393	320
394	321	/**
395		- * @since 6.25.1
396		- *
397		- * @return string
398		- */
399		- private static function get_form_too_long_docs_url() {
400		- $utm = array(
401		- 'campaign' => 'builder',
402		- 'content' => 'form-too-long',
403		- );
404		- return FrmAppHelper::admin_upgrade_link( $utm, 'knowledgebase/i-have-a-long-form-why-did-the-options-at-the-end-of-the-form-stop-saving/' );
405		- }
406		-
407		- /**
408	322	* Remove the draft flag from any new fields from this current session.
409	323	*
410	324	* @since 6.8
411	325	*
412	326	* @param int $form_id
413		- *
414	327	* @return void
415	328	*/
416	329	private static function maybe_remove_draft_option_from_fields( $form_id ) {
417	330	$draft_field_ids_csv = FrmAppHelper::get_post_param( 'draft_fields', '', 'sanitize_text_field' );
418		-
419	331	if ( ! $draft_field_ids_csv ) {
420	332	// If the draft_fields input is empty there are no new fields in the session.
421	333	return;
422	334	}
		@@ -421,9 +333,8 @@
421	333	return;
422	334	}
423	335
424	336	$draft_field_ids = array_filter( explode( ',', $draft_field_ids_csv ), 'is_numeric' );
425		-
426	337	if ( ! $draft_field_ids ) {
427	338	// Exit early if the draft fields input is invalid. It should be a CSV of integer values.
428	339	return;
429	340	}
		@@ -428,9 +339,8 @@
428	339	return;
429	340	}
430	341
431	342	$draft_field_rows = FrmFieldsHelper::get_draft_field_results( $form_id, $draft_field_ids );
432		-
433	343	foreach ( $draft_field_rows as $row ) {
434	344	$row->field_options['draft'] = 0;
435	345	FrmField::update( $row->id, array( 'field_options' => $row->field_options ) );
436	346	}
		@@ -442,10 +352,8 @@
442	352	* were likely not saved either.
443	353	*
444	354	* @since 3.06.01
445	355	*
446		- * @param array $values
447		- *
448	356	* @return bool
449	357	*/
450	358	private static function is_too_long( $values ) {
451	359	return empty( $values['frm_end'] );
		@@ -481,9 +389,8 @@
481	389	* @return string|null
482	390	*/
483	391	public static function page_preview() {
484	392	$params = FrmForm::list_page_params();
485		-
486	393	if ( ! $params['form'] || is_numeric( $params['form'] ) ) {
487	394	return null;
488	395	}
489	396
		@@ -489,9 +396,8 @@
489	396
490	397	self::maybe_block_preview( $params['form'] );
491	398
492	399	$form = FrmForm::getOne( $params['form'] );
493		-
494	400	if ( ! $form ) {
495	401	return null;
496	402	}
497	403
		@@ -504,9 +410,8 @@
504	410	* @return void
505	411	*/
506	412	public static function show_page_preview() {
507	413	$preview = self::page_preview();
508		-
509	414	if ( is_null( $preview ) ) {
510	415	wp_die(
511	416	'<h1>' . esc_html__( 'Form key is invalid', 'formidable' ) . '</h1>',
512	417	'<p>' . esc_html__( 'Form key is invalid', 'formidable' ) . '</p>',
		@@ -529,16 +434,9 @@
529	434
530	435	// print_emoji_styles is deprecated.
531	436	remove_action( 'wp_print_styles', 'print_emoji_styles' );
532	437
533		- if ( FrmTestModeController::should_add_test_mode_container() ) {
534		- do_action( 'frm_test_mode_init' );
535		- add_action( 'wp_enqueue_scripts', 'FrmTestModeController::register_and_enqueue_required_scripts' );
536		- add_filter( 'frm_filter_final_form', 'FrmTestModeController::maybe_add_test_mode_container', 99 );
537		- }
538		-
539	438	$include_theme = FrmAppHelper::get_param( 'theme', '', 'get', 'absint' );
540		-
541	439	if ( $include_theme ) {
542	440	self::set_preview_query();
543	441	self::load_theme_preview();
544	442	} else {
		@@ -561,9 +459,8 @@
561	459	'post_type' => 'page',
562	460	);
563	461
564	462	$page_for_posts = get_option( 'page_for_posts' );
565		-
566	463	if ( is_numeric( $page_for_posts ) ) {
567	464	// Avoid querying for the "Posts Page" or "Blog Page" so we don't display 10 forms.
568	465	$page_query['post__not_in'] = array( $page_for_posts );
569	466	}
		@@ -568,15 +465,13 @@
568	465	$page_query['post__not_in'] = array( $page_for_posts );
569	466	}
570	467
571	468	$random_page = get_posts( $page_query );
572		-
573	469	if ( ! $random_page ) {
574	470	return;
575	471	}
576	472
577	473	$random_page = reset( $random_page );
578		-
579	474	if ( ! is_a( $random_page, 'WP_Post' ) ) {
580	475	// The return type can also be int.
581	476	return;
582	477	}
		@@ -598,9 +493,8 @@
598	493	*
599	494	* @since 5.5.2
600	495	*
601	496	* @param WP_Post $page The page object.
602		- *
603	497	* @return void
604	498	*/
605	499	private static function set_post_global( $page ) {
606	500	global $post;
		@@ -619,16 +513,14 @@
619	513	add_action( 'loop_no_results', 'FrmFormsController::show_page_preview' );
620	514	add_filter( 'is_active_sidebar', '__return_false' );
621	515	FrmStylesController::enqueue_css( 'enqueue', true );
622	516
623		- if ( false !== get_template_part( 'page' ) ) {
624		- return;
	517	+ if ( false === get_template_part( 'page' ) ) {
	518	+ if ( function_exists( 'wp_is_block_theme' ) && wp_is_block_theme() ) {
	519	+ add_filter( 'body_class', 'FrmFormsController::preview_block_theme_body_classnames' );
	520	+ }
	521	+ self::fallback_when_page_template_part_is_not_supported_by_theme();
625	522	}
626		-
627		- if ( function_exists( 'wp_is_block_theme' ) && wp_is_block_theme() ) {
628		- add_filter( 'body_class', 'FrmFormsController::preview_block_theme_body_classnames' );
629		- }
630		- self::fallback_when_page_template_part_is_not_supported_by_theme();
631	523	}
632	524
633	525	/**
634	526	* Add padding to the body for block themes.
		@@ -635,9 +527,8 @@
635	527	*
636	528	* @since 6.5.2
637	529	*
638	530	* @param array $classes The body classes list.
639		- *
640	531	* @return array
641	532	*/
642	533	public static function preview_block_theme_body_classnames( $classes ) {
643	534	$classes[] = 'has-global-padding';
		@@ -650,27 +541,25 @@
650	541	*
651	542	* @return void
652	543	*/
653	544	private static function fallback_when_page_template_part_is_not_supported_by_theme() {
654		- if ( ! have_posts() ) {
655		- return;
656		- }
	545	+ if ( have_posts() ) {
	546	+ the_post();
	547	+ self::get_template( 'header' );
657	548
658		- the_post();
659		- self::get_template( 'header' );
	549	+ // add some generic class names to the container to add some natural padding to the content.
	550	+ // .entry-content catches the WordPress TwentyTwenty theme.
	551	+ // .container catches Customizr content.
	552	+ echo '<div class="container entry-content">';
	553	+ the_content();
	554	+ echo '</div>';
660	555
661		- // Add some generic class names to the container to add some natural padding to the content.
662		- // .entry-content catches the WordPress TwentyTwenty theme.
663		- // .container catches Customizr content.
664		- echo '<div class="container entry-content">';
665		- the_content();
666		- echo '</div>';
	556	+ // Prevent extra unexpected forms in the footer.
	557	+ // For some reason this happens in the Twenty Twenty Five theme.
	558	+ add_filter( 'frm_filter_final_form', '__return_empty_string' );
667	559
668		- // Prevent extra unexpected forms in the footer.
669		- // For some reason this happens in the Twenty Twenty Five theme.
670		- add_filter( 'frm_filter_final_form', '__return_empty_string' );
671		-
672		- self::get_template( 'footer' );
	560	+ self::get_template( 'footer' );
	561	+ }
673	562	}
674	563
675	564	/**
676	565	* Calls core function to get a template part if it doesn't cause deprecation warnings. Otherwise skips the deprecation function call
		@@ -676,11 +565,9 @@
676	565	* Calls core function to get a template part if it doesn't cause deprecation warnings. Otherwise skips the deprecation function call
677	566	* and renders required html fragments calling required functions.
678	567	*
679	568	* @since 6.7.1
680		- *
681	569	* @param string $template
682		- *
683	570	* @return void
684	571	*/
685	572	private static function get_template( $template ) {
686	573	if ( self::should_try_getting_template( $template ) ) {
		@@ -701,11 +588,9 @@
701	588	/**
702	589	* Returns true if calling a template function doesn't trigger deprecation warnings.
703	590	*
704	591	* @since 6.7.1
705		- *
706	592	* @param string $template
707		- *
708	593	* @return bool
709	594	*/
710	595	private static function should_try_getting_template( $template ) {
711	596	$stylesheet_path = get_stylesheet_directory();
		@@ -719,15 +604,15 @@
719	604	/**
720	605	* Set the page title for the theme preview page
721	606	*
722	607	* @since 3.0
723		- *
724		- * @param string $title
725		- *
726		- * @return string
727	608	*/
728	609	public static function preview_page_title( $title ) {
729		- return in_the_loop() ? self::preview_title( $title ) : $title;
	610	+ if ( in_the_loop() ) {
	611	+ $title = self::preview_title( $title );
	612	+ }
	613	+
	614	+ return $title;
730	615	}
731	616
732	617	/**
733	618	* Set the page title for the theme preview page.
		@@ -734,9 +619,8 @@
734	619	*
735	620	* @since 3.0
736	621	*
737	622	* @param string $title
738		- *
739	623	* @return string
740	624	*/
741	625	public static function preview_title( $title ) {
742	626	return __( 'Form Preview', 'formidable' );
		@@ -747,9 +631,8 @@
747	631	*
748	632	* @since 3.0
749	633	*
750	634	* @param string $content
751		- *
752	635	* @return string
753	636	*/
754	637	public static function preview_content( $content ) {
755	638	if ( in_the_loop() ) {
		@@ -765,10 +648,8 @@
765	648	* @since 3.0
766	649	*/
767	650	private static function load_direct_preview() {
768	651	$key = FrmAppHelper::simple_get( 'form', 'sanitize_title' );
769		-
770		- // phpcs:ignore Universal.Operators.StrictComparisons
771	652	if ( $key == '' ) {
772	653	$key = FrmAppHelper::get_post_param( 'form', '', 'sanitize_title' );
773	654	}
774	655
		@@ -783,9 +664,8 @@
783	664
784	665	self::maybe_block_preview( $key );
785	666
786	667	$form = FrmForm::getAll( array( 'form_key' => $key ), '', 1 );
787		-
788	668	if ( ! $form ) {
789	669	$error = __( 'Form does not exist', 'formidable' );
790	670	wp_die(
791	671	'<h1>' . esc_html( $error ) . '</h1>',
		@@ -809,22 +689,19 @@
809	689	*
810	690	* @since 6.20
811	691	*
812	692	* @param string $form_key Form key.
813		- *
814	693	* @return void
815	694	*/
816	695	public static function maybe_block_preview( $form_key ) {
817		- if ( ! FrmFormsHelper::should_block_preview( $form_key ) ) {
818		- return;
	696	+ if ( FrmFormsHelper::should_block_preview( $form_key ) ) {
	697	+ $error = __( 'You do not have permission to view this form', 'formidable' );
	698	+ wp_die(
	699	+ '<h1>' . esc_html( $error ) . '</h1>',
	700	+ '<p>' . esc_html( $error ) . '</p>',
	701	+ 403
	702	+ );
819	703	}
820		-
821		- $error = __( 'You do not have permission to view this form', 'formidable' );
822		- wp_die(
823		- '<h1>' . esc_html( $error ) . '</h1>',
824		- '<p>' . esc_html( $error ) . '</p>',
825		- 403
826		- );
827	704	}
828	705
829	706	/**
830	707	* Some themes have a null $src value.
		@@ -839,13 +716,15 @@
839	716	add_filter(
840	717	'script_loader_src',
841	718	/**
842	719	* @param string|null $src
843		- *
844	720	* @return string
845	721	*/
846	722	function ( $src ) {
847		- return is_null( $src ) ? '' : $src;
	723	+ if ( is_null( $src ) ) {
	724	+ $src = '';
	725	+ }
	726	+ return $src;
848	727	}
849	728	);
850	729	}
851	730
		@@ -854,9 +733,8 @@
854	733	}
855	734
856	735	/**
857	736	* @param array $ids
858		- *
859	737	* @return string
860	738	*/
861	739	public static function bulk_untrash( $ids ) {
862	740	FrmAppHelper::permission_check( 'frm_edit_forms' );
		@@ -868,9 +746,11 @@
868	746	return '';
869	747	}
870	748
871	749	/* translators: %1$s: Number of forms */
872		- return sprintf( _n( '%1$s form restored from the Trash.', '%1$s forms restored from the Trash.', $count, 'formidable' ), $count );
	750	+ $message = sprintf( _n( '%1$s form restored from the Trash.', '%1$s forms restored from the Trash.', $count, 'formidable' ), $count );
	751	+
	752	+ return $message;
873	753	}
874	754
875	755	/**
876	756	* @since 3.06
		@@ -915,9 +795,8 @@
915	795	// Check nonce url.
916	796	check_admin_referer( $status . '_form_' . $params['id'] );
917	797
918	798	$count = 0;
919		-
920	799	if ( FrmForm::set_status( $params['id'], $available_status[ $status ]['new_status'] ) ) {
921	800	++$count;
922	801	}
923	802
		@@ -931,9 +810,9 @@
931	810	/* translators: %1$s: Number of forms */
932	811	$available_status['untrash']['message'] = sprintf( _n( '%1$s form restored from the Trash.', '%1$s forms restored from the Trash.', $count, 'formidable' ), $count );
933	812
934	813	/* translators: %1$s: Number of forms, %2$s: Start link HTML, %3$s: End link HTML */
935		- $available_status['trash']['message'] = sprintf( _n( '%1$s form moved to the Trash. %2$sUndo%3$s', '%1$s forms moved to the Trash. %2$sUndo%3$s', $count, 'formidable' ), $count, '<a href="' . esc_url( wp_nonce_url( '?page=formidable&frm_action=untrash&form_type=' . $form_type . '&id=' . $params['id'], 'untrash_form_' . $params['id'] ) ) . '">', '</a>' ); // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong
	814	+ $available_status['trash']['message'] = sprintf( _n( '%1$s form moved to the Trash. %2$sUndo%3$s', '%1$s forms moved to the Trash. %2$sUndo%3$s', $count, 'formidable' ), $count, '<a href="' . esc_url( wp_nonce_url( '?page=formidable&frm_action=untrash&form_type=' . $form_type . '&id=' . $params['id'], 'untrash_form_' . $params['id'] ) ) . '">', '</a>' );
936	815
937	816	$message = $available_status[ $status ]['message'];
938	817
939	818	self::display_forms_list( $params, $message );
		@@ -940,9 +819,8 @@
940	819	}
941	820
942	821	/**
943	822	* @param array $ids
944		- *
945	823	* @return string
946	824	*/
947	825	public static function bulk_trash( $ids ) {
948	826	FrmAppHelper::permission_check( 'frm_delete_forms' );
		@@ -947,9 +825,8 @@
947	825	public static function bulk_trash( $ids ) {
948	826	FrmAppHelper::permission_check( 'frm_delete_forms' );
949	827
950	828	$count = 0;
951		-
952	829	foreach ( $ids as $id ) {
953	830	if ( FrmForm::trash( $id ) ) {
954	831	++$count;
955	832	}
		@@ -964,16 +841,17 @@
964	841	'param' => 'form_type',
965	842	'type' => 'request',
966	843	)
967	844	);
968		-
969		- return sprintf(
	845	+ $message = sprintf(
970	846	/* translators: %1$s: Number of forms, %2$s: Start link HTML, %3$s: End link HTML */
971	847	_n( '%1$s form moved to the Trash. %2$sUndo%3$s', '%1$s forms moved to the Trash. %2$sUndo%3$s', $count, 'formidable' ),
972	848	$count,
973		- '<a href="' . esc_url( wp_nonce_url( '?page=formidable&frm_action=list&action=bulk_untrash&form_type=' . $current_page . '&item-action=' . implode( ',', $ids ), 'bulk-toplevel_page_formidable' ) ) . '">', // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong
	849	+ '<a href="' . esc_url( wp_nonce_url( '?page=formidable&frm_action=list&action=bulk_untrash&form_type=' . $current_page . '&item-action=' . implode( ',', $ids ), 'bulk-toplevel_page_formidable' ) ) . '">',
974	850	'</a>'
975	851	);
	852	+
	853	+ return $message;
976	854	}
977	855
978	856	public static function destroy() {
979	857	FrmAppHelper::permission_check( 'frm_delete_forms' );
		@@ -983,9 +861,8 @@
983	861	// Check nonce url.
984	862	check_admin_referer( 'destroy_form_' . $params['id'] );
985	863
986	864	$count = 0;
987		-
988	865	if ( FrmForm::destroy( $params['id'] ) ) {
989	866	++$count;
990	867	}
991	868
		@@ -996,9 +873,8 @@
996	873	}
997	874
998	875	/**
999	876	* @param array $ids
1000		- *
1001	877	* @return string
1002	878	*/
1003	879	public static function bulk_destroy( $ids ) {
1004	880	FrmAppHelper::permission_check( 'frm_delete_forms' );
		@@ -1003,12 +879,10 @@
1003	879	public static function bulk_destroy( $ids ) {
1004	880	FrmAppHelper::permission_check( 'frm_delete_forms' );
1005	881
1006	882	$count = 0;
1007		-
1008	883	foreach ( $ids as $id ) {
1009	884	$d = FrmForm::destroy( $id );
1010		-
1011	885	if ( $d ) {
1012	886	++$count;
1013	887	}
1014	888	}
		@@ -1026,18 +900,19 @@
1026	900	*/
1027	901	public static function delete_all() {
1028	902	// Check nonce url.
1029	903	$permission_error = FrmAppHelper::permission_nonce_error( 'frm_delete_forms', '_wpnonce', 'bulk-toplevel_page_formidable' );
1030		-
1031	904	if ( $permission_error !== false ) {
1032	905	self::display_forms_list( array(), '', array( $permission_error ) );
	906	+
1033	907	return;
1034	908	}
1035	909
1036	910	$count = FrmForm::scheduled_delete( time() );
1037	911	$url = remove_query_arg( array( 'delete_all' ) );
1038		- $url .= '&message=forms_permanently_deleted&forms_deleted=' . $count;
1039	912
	913	+ $url .= '&message=forms_permanently_deleted&forms_deleted=' . $count;
	914	+
1040	915	wp_safe_redirect( $url );
1041	916	die();
1042	917	}
1043	918
		@@ -1111,22 +986,21 @@
1111	986	*
1112	987	* @return void
1113	988	*/
1114	989	public static function insert_form_button() {
1115		- if ( ! current_user_can( 'frm_view_forms' ) ) {
1116		- return;
	990	+ if ( current_user_can( 'frm_view_forms' ) ) {
	991	+ // Store the result in memory and re-use it when this function is called multiple times.
	992	+ // This helps speed up the form builder when there are a lot of HTML fields, where this
	993	+ // button is inserted once per HTML field.
	994	+ // In a form with 66 HTML fields, this saves 0.5 seconds on page load time, tested locally.
	995	+ if ( ! isset( self::$formidable_tinymce_button ) ) {
	996	+ FrmAppHelper::load_admin_wide_js();
	997	+ $menu_name = FrmAppHelper::get_menu_name();
	998	+ $icon = apply_filters( 'frm_media_icon', FrmAppHelper::svg_logo() );
	999	+ self::$formidable_tinymce_button = '<a href="#TB_inline?width=50&height=50&inlineId=frm_insert_form" class="thickbox button add_media frm_insert_form" title="' . esc_attr__( 'Add forms and content', 'formidable' ) . '">' . FrmAppHelper::kses( $icon, 'all' ) . ' ' . esc_html( $menu_name ) . '</a>';
	1000	+ }
	1001	+ echo self::$formidable_tinymce_button; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
1117	1002	}
1118		-
1119		- // Store the result in memory and re-use it when this function is called multiple times.
1120		- // This helps speed up the form builder when there are a lot of HTML fields, where this
1121		- // Button is inserted once per HTML field.
1122		- // In a form with 66 HTML fields, this saves 0.5 seconds on page load time, tested locally.
1123		- if ( ! isset( self::$formidable_tinymce_button ) ) {
1124		- FrmAppHelper::load_admin_wide_js();
1125		- $icon = apply_filters( 'frm_media_icon', FrmAppHelper::svg_logo() );
1126		- self::$formidable_tinymce_button = '<a href="#TB_inline?width=50&height=50&inlineId=frm_insert_form" class="thickbox button add_media frm_insert_form" title="' . esc_attr__( 'Add forms and content', 'formidable' ) . '">' . FrmAppHelper::kses( $icon, 'all' ) . ' ' . esc_html( FrmAppHelper::get_menu_name() ) . '</a>'; // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong
1127		- }
1128		- echo self::$formidable_tinymce_button; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
1129	1003	}
1130	1004
1131	1005	/**
1132	1006	* @return void
		@@ -1147,21 +1021,17 @@
1147	1021	$shortcodes = apply_filters( 'frm_popup_shortcodes', $shortcodes );
1148	1022
1149	1023	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/insert_form_popup.php';
1150	1024
1151		- if ( ! FrmAppHelper::is_form_builder_page() || class_exists( '_WP_Editors', false ) ) {
1152		- return;
	1025	+ if ( FrmAppHelper::is_form_builder_page() && ! class_exists( '_WP_Editors', false ) ) {
	1026	+ // initialize a wysiwyg so we have usable settings defined in tinyMCEPreInit.mceInit
	1027	+ require ABSPATH . WPINC . '/class-wp-editor.php';
	1028	+ ?>
	1029	+ <div class="frm_hidden">
	1030	+ <?php wp_editor( '', 'frm_description_placeholder', array() ); ?>
	1031	+ </div>
	1032	+ <?php
1153	1033	}
1154		-
1155		- // Initialize a wysiwyg so we have usable settings defined in tinyMCEPreInit.mceInit
1156		- require ABSPATH . WPINC . '/class-wp-editor.php';
1157		- // phpcs:disable Generic.WhiteSpace.ScopeIndent
1158		- ?>
1159		- <div class="frm_hidden">
1160		- <?php wp_editor( '', 'frm_description_placeholder', array() ); ?>
1161		- </div>
1162		- <?php
1163		- // phpcs:enable Generic.WhiteSpace.ScopeIndent
1164	1034	}
1165	1035
1166	1036	/**
1167	1037	* Check the page being loaded, determine if this is a page that should include the form popup.
		@@ -1173,9 +1043,8 @@
1173	1043	private static function should_insert_form_popup() {
1174	1044	if ( FrmAppHelper::is_form_builder_page() ) {
1175	1045	return true;
1176	1046	}
1177		-
1178	1047	$page = basename( FrmAppHelper::get_server_value( 'PHP_SELF' ) );
1179	1048	return in_array( $page, array( 'post.php', 'page.php', 'page-new.php', 'post-new.php' ), true );
1180	1049	}
1181	1050
		@@ -1183,10 +1052,9 @@
1183	1052	FrmAppHelper::permission_check( 'frm_view_forms' );
1184	1053	check_ajax_referer( 'frm_ajax', 'nonce' );
1185	1054
1186	1055	$shortcode = FrmAppHelper::get_post_param( 'shortcode', '', 'sanitize_text_field' );
1187		-
1188		- if ( ! $shortcode ) {
	1056	+ if ( empty( $shortcode ) ) {
1189	1057	wp_die();
1190	1058	}
1191	1059
1192	1060	echo '<div id="sc-opts-' . esc_attr( $shortcode ) . '" class="frm_shortcode_option">';
		@@ -1211,13 +1079,12 @@
1211	1079	'label' => __( 'Minimize form HTML', 'formidable' ),
1212	1080	),
1213	1081	);
1214	1082	}
1215		-
1216	1083	$opts = apply_filters( 'frm_sc_popup_opts', $opts, $shortcode );
1217	1084
1218	1085	if ( isset( $opts['form_id'] ) && is_string( $opts['form_id'] ) ) {
1219		- // Allow other shortcodes to use the required form id option
	1086	+ // allow other shortcodes to use the required form id option
1220	1087	$form_id = $opts['form_id'];
1221	1088	unset( $opts['form_id'] );
1222	1089	}
1223	1090
		@@ -1233,9 +1100,8 @@
1233	1100	*
1234	1101	* @param array $params
1235	1102	* @param string $message
1236	1103	* @param array $errors
1237		- *
1238	1104	* @return void
1239	1105	*/
1240	1106	public static function display_forms_list( $params = array(), $message = '', $errors = array() ) {
1241	1107	FrmAppHelper::permission_check( 'frm_view_forms' );
		@@ -1252,21 +1118,21 @@
1252	1118	* @param string $table_class Class name for List Helper.
1253	1119	*/
1254	1120	$table_class = apply_filters( 'frm_forms_list_class', 'FrmFormsListHelper' );
1255	1121	$wp_list_table = new $table_class( compact( 'params' ) );
1256		- $pagenum = $wp_list_table->get_pagenum();
1257	1122
	1123	+ $pagenum = $wp_list_table->get_pagenum();
	1124	+
1258	1125	$wp_list_table->prepare_items();
1259	1126
1260	1127	$total_pages = $wp_list_table->get_pagination_arg( 'total_pages' );
1261		-
1262	1128	if ( $pagenum > $total_pages && $total_pages > 0 ) {
1263		- wp_safe_redirect( esc_url_raw( add_query_arg( 'paged', $total_pages ) ) );
	1129	+ wp_redirect( esc_url_raw( add_query_arg( 'paged', $total_pages ) ) );
1264	1130	die();
1265	1131	}
1266	1132
1267		- $error = FrmInbox::check_for_error();
1268		-
	1133	+ $inbox = new FrmInbox();
	1134	+ $error = $inbox->check_for_error();
1269	1135	if ( $error ) {
1270	1136	$show_messages = array( $error['subject'] . '. ' . $error['message'] );
1271	1137	}
1272	1138
		@@ -1274,9 +1140,8 @@
1274	1140	}
1275	1141
1276	1142	/**
1277	1143	* @param array<string,string> $columns
1278		- *
1279	1144	* @return array<string,string>
1280	1145	*/
1281	1146	public static function get_columns( $columns ) {
1282	1147	$columns['cb'] = '<input type="checkbox" />';
		@@ -1281,27 +1146,15 @@
1281	1146	public static function get_columns( $columns ) {
1282	1147	$columns['cb'] = '<input type="checkbox" />';
1283	1148	$columns['name'] = esc_html__( 'Form Title', 'formidable' );
1284	1149	$columns['entries'] = esc_html__( 'Entries', 'formidable' );
1285		- $columns['views'] = esc_html__( 'Views', 'formidable' );
1286	1150	$columns['id'] = 'ID';
1287	1151	$columns['form_key'] = esc_html__( 'Key', 'formidable' );
1288		-
1289		- if ( 'trash' !== FrmAppHelper::simple_get( 'form_type' ) && has_filter( 'frm_form_list_actions' ) ) {
1290		- // If there is any filters added, keep this column.
	1152	+ if ( 'trash' !== FrmAppHelper::simple_get( 'form_type' ) ) {
1291	1153	$columns['shortcode'] = esc_html__( 'Actions', 'formidable' );
1292	1154	}
1293		-
1294	1155	$columns['created_at'] = esc_html__( 'Date', 'formidable' );
1295	1156
1296		- if ( 'trash' !== FrmAppHelper::simple_get( 'form_type' ) ) {
1297		- $columns['embeds'] = esc_html__( 'Embeds', 'formidable' );
1298		- $columns['settings'] = '<div class="frm-forms-list-settings-btn-wrapper"><a href="#" class="frm-forms-list-settings-btn">';
1299		- $columns['settings'] .= FrmAppHelper::icon_by_class( 'frmfont frm_settings_icon', array( 'echo' => false ) );
1300		- $columns['settings'] .= '<span class="screen-reader-text">' . esc_html__( 'List settings', 'formidable' ) . '</span>';
1301		- $columns['settings'] .= '</a></div>';
1302		- }
1303		-
1304	1157	add_screen_option(
1305	1158	'per_page',
1306	1159	array(
1307	1160	'label' => __( 'Forms', 'formidable' ),
		@@ -1327,9 +1180,8 @@
1327	1180	}
1328	1181
1329	1182	/**
1330	1183	* @param mixed $hidden_columns
1331		- *
1332	1184	* @return array
1333	1185	*/
1334	1186	public static function hidden_columns( $hidden_columns ) {
1335	1187	if ( ! is_array( $hidden_columns ) ) {
		@@ -1350,18 +1202,11 @@
1350	1202
1351	1203	return $hidden_columns;
1352	1204	}
1353	1205
1354		- /**
1355		- * @param mixed $save
1356		- * @param string $option
1357		- * @param int|string $value
1358		- *
1359		- * @return mixed
1360		- */
1361	1206	public static function save_per_page( $save, $option, $value ) {
1362	1207	if ( $option === 'formidable_page_formidable_per_page' ) {
1363		- return (int) $value;
	1208	+ $save = (int) $value;
1364	1209	}
1365	1210
1366	1211	return $save;
1367	1212	}
		@@ -1370,9 +1215,8 @@
1370	1215	* @param int|string $id
1371	1216	* @param array $errors
1372	1217	* @param string $message
1373	1218	* @param bool $create_link
1374		- *
1375	1219	* @return void
1376	1220	*/
1377	1221	private static function get_edit_vars( $id, $errors = array(), $message = '', $create_link = false ) {
1378	1222	global $frm_vars;
		@@ -1387,9 +1231,8 @@
1387	1231	'page' => 'formidable',
1388	1232	)
1389	1233	),
1390	1234	);
1391		-
1392	1235	if ( ! $form ) {
1393	1236	FrmAppController::show_error_modal( $error_args );
1394	1237	return;
1395	1238	}
		@@ -1411,14 +1254,15 @@
1411	1254	}
1412	1255
1413	1256	if ( $form->parent_form_id ) {
1414	1257	/* translators: %1$s: Start link HTML, %2$s: End link HTML */
1415		- wp_die( sprintf( esc_html__( 'You are trying to edit a child form. Please edit from %1$shere%2$s', 'formidable' ), '<a href="' . esc_url( FrmForm::get_edit_link( $form->parent_form_id ) ) . '">', '</a>' ) ); // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong
	1258	+ wp_die( sprintf( esc_html__( 'You are trying to edit a child form. Please edit from %1$shere%2$s', 'formidable' ), '<a href="' . esc_url( FrmForm::get_edit_link( $form->parent_form_id ) ) . '">', '</a>' ) );
1416	1259	}
1417	1260
1418	1261	$frm_field_selection = FrmField::field_selection();
1419		- $fields = FrmField::get_all_for_form( $form->id );
1420	1262
	1263	+ $fields = FrmField::get_all_for_form( $form->id );
	1264	+
1421	1265	// Automatically add end section fields if they don't exist (2.0 migration).
1422	1266	$reset_fields = false;
1423	1267	FrmFormsHelper::auto_add_end_section_fields( $form, $fields, $reset_fields );
1424	1268	FrmSubmitHelper::maybe_create_submit_field( $form, $fields, $reset_fields );
		@@ -1442,10 +1286,9 @@
1442	1286	*/
1443	1287	$values['fields'] = apply_filters( 'frm_fields_in_form_builder', $fields, compact( 'form' ) );
1444	1288
1445	1289	$edit_message = __( 'Form was successfully updated.', 'formidable' );
1446		-
1447		- if ( $form->is_template && $message === $edit_message ) {
	1290	+ if ( $form->is_template && $message == $edit_message ) {
1448	1291	$message = __( 'Template was successfully updated.', 'formidable' );
1449	1292	}
1450	1293
1451	1294	self::maybe_update_form_builder_message( $message );
		@@ -1460,12 +1303,11 @@
1460	1303	}
1461	1304
1462	1305	/**
1463	1306	* @param array $fields
1464		- *
1465	1307	* @return array
1466	1308	*/
1467		- public static function update_form_builder_fields( $fields ) {
	1309	+ public static function update_form_builder_fields( $fields, $form ) {
1468	1310	foreach ( $fields as $field ) {
1469	1311	$field->do_not_include_icons = true;
1470	1312	}
1471	1313	return $fields;
		@@ -1470,13 +1312,8 @@
1470	1312	}
1471	1313	return $fields;
1472	1314	}
1473	1315
1474		- /**
1475		- * @param string $message
1476		- *
1477		- * @return void
1478		- */
1479	1316	public static function maybe_update_form_builder_message( &$message ) {
1480	1317	if ( 'form_duplicated' === FrmAppHelper::simple_get( 'message' ) ) {
1481	1318	$message = __( 'Form was Successfully Copied', 'formidable' );
1482	1319	}
		@@ -1485,9 +1322,8 @@
1485	1322	/**
1486	1323	* @param int|string $id
1487	1324	* @param array $errors
1488	1325	* @param array|string $args
1489		- *
1490	1326	* @return void
1491	1327	*/
1492	1328	public static function get_settings_vars( $id, $errors = array(), $args = array() ) {
1493	1329	FrmAppHelper::permission_check( 'frm_edit_forms' );
		@@ -1509,12 +1345,13 @@
1509	1345	);
1510	1346	$args = array_merge( $defaults, $args );
1511	1347	$message = $args['message'];
1512	1348	$warnings = $args['warnings'];
1513		- $form = FrmForm::getOne( $id );
1514		- $fields = FrmField::get_all_for_form( $id );
1515		- $values = FrmAppHelper::setup_edit_vars( $form, 'forms', $fields, true );
1516	1349
	1350	+ $form = FrmForm::getOne( $id );
	1351	+ $fields = FrmField::get_all_for_form( $id );
	1352	+ $values = FrmAppHelper::setup_edit_vars( $form, 'forms', $fields, true );
	1353	+
1517	1354	/**
1518	1355	* Allows changing fields in the form settings.
1519	1356	*
1520	1357	* @since 5.0.04
		@@ -1554,12 +1391,8 @@
1554	1391	}
1555	1392
1556	1393	/**
1557	1394	* @since 4.0
1558		- *
1559		- * @param array $atts
1560		- *
1561		- * @return void
1562	1395	*/
1563	1396	public static function form_publish_button( $atts ) {
1564	1397	$values = $atts['values'];
1565	1398	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/_publish_box.php';
		@@ -1570,9 +1403,8 @@
1570	1403	*
1571	1404	* @since 4.0
1572	1405	*
1573	1406	* @param array $values
1574		- *
1575	1407	* @return array
1576	1408	*/
1577	1409	private static function get_settings_tabs( $values ) {
1578	1410	$sections = array(
		@@ -1578,25 +1410,20 @@
1578	1410	$sections = array(
1579	1411	'advanced' => array(
1580	1412	'name' => __( 'General', 'formidable' ),
1581	1413	'title' => __( 'General Form Settings', 'formidable' ),
1582		- 'function' => array( self::class, 'advanced_settings' ),
1583		- 'icon' => 'frmfont frm_small_settings_icon',
	1414	+ 'function' => array( __CLASS__, 'advanced_settings' ),
	1415	+ 'icon' => 'frm_icon_font frm_settings_icon',
1584	1416	),
1585	1417	'email' => array(
1586	1418	'name' => __( 'Actions & Notifications', 'formidable' ),
1587	1419	'function' => array( 'FrmFormActionsController', 'email_settings' ),
1588	1420	'id' => 'frm_notification_settings',
1589		- 'icon' => 'frmfont frm_notification_check_icon',
	1421	+ 'icon' => 'frm_icon_font frm_mail_bulk_icon',
1590	1422	),
1591		- 'spam' => array(
1592		- 'name' => __( 'Spam', 'formidable' ),
1593		- 'function' => array( self::class, 'spam_settings' ),
1594		- 'icon' => 'frmfont frm_shield_check2_icon',
1595		- ),
1596	1423	'permissions' => array(
1597	1424	'name' => __( 'Form Permissions', 'formidable' ),
1598		- 'icon' => 'frmfont frm_lock_closed2_icon',
	1425	+ 'icon' => 'frm_icon_font frm_lock_closed_icon',
1599	1426	'html_class' => 'frm_show_upgrade_tab frm_noallow',
1600	1427	'data' => array(
1601	1428	'medium' => 'permissions',
1602	1429	'upgrade' => __( 'Form Permissions', 'formidable' ),
		@@ -1601,37 +1428,35 @@
1601	1428	'medium' => 'permissions',
1602	1429	'upgrade' => __( 'Form Permissions', 'formidable' ),
1603	1430	'message' => __( 'Allow editing, protect forms and files, limit entries, and save drafts. Upgrade to get form and entry permissions.', 'formidable' ),
1604	1431	'screenshot' => 'permissions.png',
1605		- 'learn-more' => FrmAppHelper::get_doc_url( 'general-form-settings/#kb-form-permissions', 'form-permissions-settings' ),
1606	1432	),
1607	1433	),
1608	1434	'scheduling' => array(
1609	1435	'name' => __( 'Form Scheduling', 'formidable' ),
1610		- 'icon' => 'frmfont frm_schedule_icon',
	1436	+ 'icon' => 'frm_icon_font frm_calendar_icon',
1611	1437	'html_class' => 'frm_show_upgrade_tab frm_noallow',
1612	1438	'data' => array(
1613	1439	'medium' => 'scheduling',
1614	1440	'upgrade' => __( 'Form scheduling settings', 'formidable' ),
1615	1441	'screenshot' => 'scheduling.png',
1616		- 'learn-more' => FrmAppHelper::get_doc_url( 'general-form-settings/#kb-form-scheduling', 'form-scheduling-settings' ),
1617	1442	),
1618	1443	),
1619	1444	'buttons' => array(
1620	1445	'name' => __( 'Buttons', 'formidable' ),
1621		- 'class' => self::class,
	1446	+ 'class' => __CLASS__,
1622	1447	'function' => 'buttons_settings',
1623		- 'icon' => 'frmfont frm-buttons-style',
	1448	+ 'icon' => 'frm_icon_font frm_button_icon',
1624	1449	),
1625	1450	'landing' => array(
1626	1451	'name' => __( 'Form Landing Page', 'formidable' ),
1627		- 'icon' => 'frmfont frm_cross_device_icon',
	1452	+ 'icon' => 'frm_icon_font frm_file_text_icon',
1628	1453	'html_class' => 'frm_show_upgrade_tab frm_noallow',
1629	1454	'data' => FrmAppHelper::get_landing_page_upgrade_data_params(),
1630	1455	),
1631	1456	'chat' => array(
1632	1457	'name' => __( 'Conversational Forms', 'formidable' ),
1633		- 'icon' => 'frmfont frm_chat_bubbles_icon',
	1458	+ 'icon' => 'frm_icon_font frm_chat_forms_icon',
1634	1459	'html_class' => 'frm_show_upgrade_tab frm_noallow',
1635	1460	'data' => FrmAppHelper::get_upgrade_data_params(
1636	1461	'chat',
1637	1462	array(
		@@ -1637,15 +1462,14 @@
1637	1462	array(
1638	1463	'upgrade' => __( 'Conversational Forms', 'formidable' ),
1639	1464	'message' => __( 'Ask one question at a time for automated conversations.', 'formidable' ),
1640	1465	'screenshot' => 'chat.png',
1641		- 'learn-more' => FrmAppHelper::get_doc_url( 'conversational-forms', 'conversational-forms-settings', false ),
1642	1466	)
1643	1467	),
1644	1468	),
1645	1469	'abandonment' => array(
1646	1470	'name' => __( 'Form Abandonment', 'formidable' ),
1647		- 'icon' => 'frmfont frm_abandoned_icon',
	1471	+ 'icon' => 'frm_icon_font frm_abandoned_icon',
1648	1472	'html_class' => 'frm_show_upgrade_tab frm_noallow',
1649	1473	'data' => FrmAppHelper::get_upgrade_data_params(
1650	1474	'abandonment',
1651	1475	array(
		@@ -1651,17 +1475,16 @@
1651	1475	array(
1652	1476	'upgrade' => __( 'Form abandonment settings', 'formidable' ),
1653	1477	'message' => __( 'Unlock the power of data capture to boost lead generation and master the art of form optimization.', 'formidable' ),
1654	1478	'screenshot' => 'abandonment.png',
1655		- 'learn-more' => FrmAppHelper::get_doc_url( 'features/form-abandonment-wordpress-plugin', 'form-abandonment-settings', false ),
1656	1479	)
1657	1480	),
1658	1481	),
1659	1482	'html' => array(
1660	1483	'name' => __( 'Customize HTML', 'formidable' ),
1661		- 'class' => self::class,
	1484	+ 'class' => __CLASS__,
1662	1485	'function' => 'html_settings',
1663		- 'icon' => 'frmfont frm_code2_icon',
	1486	+ 'icon' => 'frm_icon_font frm_code_icon',
1664	1487	),
1665	1488	);
1666	1489
1667	1490	if ( ! has_action( 'frm_add_form_style_tab_options' ) && ! has_action( 'frm_add_form_button_options' ) ) {
		@@ -1667,8 +1490,14 @@
1667	1490	if ( ! has_action( 'frm_add_form_style_tab_options' ) && ! has_action( 'frm_add_form_button_options' ) ) {
1668	1491	unset( $sections['buttons'] );
1669	1492	}
1670	1493
	1494	+ foreach ( array( 'landing', 'chat', 'abandonment' ) as $feature ) {
	1495	+ if ( ! FrmAppHelper::show_new_feature( $feature ) ) {
	1496	+ unset( $sections[ $feature ] );
	1497	+ }
	1498	+ }
	1499	+
1671	1500	$sections = apply_filters( 'frm_add_form_settings_section', $sections, $values );
1672	1501
1673	1502	foreach ( $sections as $key => $section ) {
1674	1503	$defaults = array(
		@@ -1673,9 +1502,9 @@
1673	1502	foreach ( $sections as $key => $section ) {
1674	1503	$defaults = array(
1675	1504	'html_class' => '',
1676	1505	'name' => ucfirst( $key ),
1677		- 'icon' => 'frmfont frm_settings_icon',
	1506	+ 'icon' => 'frm_icon_font frm_settings_icon',
1678	1507	);
1679	1508
1680	1509	$section = array_merge( $defaults, $section );
1681	1510
		@@ -1681,9 +1510,8 @@
1681	1510
1682	1511	if ( ! isset( $section['anchor'] ) ) {
1683	1512	$section['anchor'] = $key;
1684	1513	}
1685		-
1686	1514	$section['anchor'] .= '_settings';
1687	1515
1688	1516	if ( ! isset( $section['title'] ) ) {
1689	1517	$section['title'] = $section['name'];
		@@ -1702,25 +1530,26 @@
1702	1530	/**
1703	1531	* @since 4.0
1704	1532	*
1705	1533	* @param array $values
1706		- *
1707	1534	* @return void
1708	1535	*/
1709	1536	public static function advanced_settings( $values ) {
1710	1537	$first_h3 = 'frm_first_h3';
	1538	+
1711	1539	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings-advanced.php';
1712	1540	}
1713	1541
1714	1542	/**
1715		- * @since 6.33
1716		- *
1717	1543	* @param array $values
1718		- *
1719	1544	* @return void
1720	1545	*/
1721		- public static function spam_settings( $values ) {
1722		- include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/spam-settings.php';
	1546	+ public static function render_spam_settings( $values ) {
	1547	+ if ( function_exists( 'akismet_http_post' ) ) {
	1548	+ include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/spam-settings/akismet.php';
	1549	+ }
	1550	+ include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/spam-settings/stopforumspam.php';
	1551	+ include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/spam-settings/antispam.php';
1723	1552	}
1724	1553
1725	1554	/**
1726	1555	* @since 4.0
		@@ -1725,9 +1554,8 @@
1725	1554	/**
1726	1555	* @since 4.0
1727	1556	*
1728	1557	* @param array $values
1729		- *
1730	1558	* @return void
1731	1559	*/
1732	1560	public static function buttons_settings( $values ) {
1733	1561	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings-buttons.php';
		@@ -1736,9 +1564,8 @@
1736	1564	/**
1737	1565	* @since 4.0
1738	1566	*
1739	1567	* @param array $values
1740		- *
1741	1568	* @return void
1742	1569	*/
1743	1570	public static function html_settings( $values ) {
1744	1571	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings-html.php';
		@@ -1749,9 +1576,8 @@
1749	1576	*
1750	1577	* @since 2.03.08
1751	1578	*
1752	1579	* @param array|bool $values
1753		- *
1754	1580	* @return void
1755	1581	*/
1756	1582	private static function clean_submit_html( &$values ) {
1757	1583	if ( is_array( $values ) && isset( $values['submit_html'] ) ) {
		@@ -1774,17 +1600,13 @@
1774	1600	return $classes;
1775	1601	}
1776	1602
1777	1603	/**
1778		- * @since 6.27 Added $template_path parameter.
1779		- *
1780	1604	* @param int|string $form_id
1781	1605	* @param string $class
1782		- * @param string $template_path The path to a template file to use instead of the default.
1783		- *
1784	1606	* @return void
1785	1607	*/
1786		- public static function mb_tags_box( $form_id, $class = '', $template_path = 'default' ) {
	1608	+ public static function mb_tags_box( $form_id, $class = '' ) {
1787	1609	$fields = FrmField::get_all_for_form( $form_id, '', 'include' );
1788	1610
1789	1611	/**
1790	1612	* Allows modifying the list of fields in the tags box.
		@@ -1793,30 +1615,23 @@
1793	1615	*
1794	1616	* @param array $fields The list of fields.
1795	1617	* @param array $args The arguments. Contains `form_id`.
1796	1618	*/
1797		- $fields = apply_filters( 'frm_fields_in_tags_box', $fields, compact( 'form_id' ) );
1798		- $linked_forms = array();
1799		- $col = 'one';
1800		- $settings_tab = FrmAppHelper::is_admin_page( 'formidable' );
	1619	+ $fields = apply_filters( 'frm_fields_in_tags_box', $fields, compact( 'form_id' ) );
	1620	+ $linked_forms = array();
	1621	+ $col = 'one';
	1622	+ $settings_tab = FrmAppHelper::is_admin_page( 'formidable' );
	1623	+
1801	1624	$cond_shortcodes = apply_filters( 'frm_conditional_shortcodes', array() );
1802		- $entry_shortcodes = self::get_shortcode_helpers( $settings_tab, $form_id );
	1625	+ $entry_shortcodes = self::get_shortcode_helpers( $settings_tab );
	1626	+
1803	1627	$advanced_helpers = self::advanced_helpers( compact( 'fields', 'form_id' ) );
1804	1628
1805		- if ( 'default' === $template_path || ! file_exists( $template_path ) ) {
1806		- include FrmAppHelper::plugin_path() . '/classes/views/shared/mb_adv_info.php';
1807		- return;
1808		- }
1809		-
1810		- include $template_path;
	1629	+ include FrmAppHelper::plugin_path() . '/classes/views/shared/mb_adv_info.php';
1811	1630	}
1812	1631
1813	1632	/**
1814	1633	* @since 3.04.01
1815		- *
1816		- * @param array $atts
1817		- *
1818		- * @return array
1819	1634	*/
1820	1635	private static function advanced_helpers( $atts ) {
1821	1636	$advanced_helpers = array(
1822	1637	'default' => array(
		@@ -1825,12 +1640,10 @@
1825	1640	),
1826	1641	);
1827	1642
1828	1643	$user_fields = self::user_shortcodes();
1829		-
1830	1644	if ( $user_fields ) {
1831	1645	$user_helpers = array();
1832		-
1833	1646	foreach ( $user_fields as $uk => $uf ) {
1834	1647	$user_helpers[ '|user_id| show="' . $uk . '"' ] = $uf;
1835	1648	unset( $uk, $uf );
1836	1649	}
		@@ -1855,10 +1668,8 @@
1855	1668	* Get an array of the options to display in the advanced tab
1856	1669	* of the customization panel
1857	1670	*
1858	1671	* @since 2.0.6
1859		- *
1860		- * @return array
1861	1672	*/
1862	1673	private static function get_advanced_shortcodes() {
1863	1674	$adv_shortcodes = array(
1864	1675	'x sep=", "' => array(
		@@ -1875,18 +1686,17 @@
1875	1686	'label' => __( 'No Auto P', 'formidable' ),
1876	1687	'title' => __( 'Do not automatically add any paragraphs or line breaks', 'formidable' ),
1877	1688	),
1878	1689	);
	1690	+ $adv_shortcodes = apply_filters( 'frm_advanced_shortcodes', $adv_shortcodes );
1879	1691
1880	1692	// __( 'Leave blank instead of defaulting to User Login', 'formidable' ) : blank=1
1881	1693
1882		- return apply_filters( 'frm_advanced_shortcodes', $adv_shortcodes );
	1694	+ return $adv_shortcodes;
1883	1695	}
1884	1696
1885	1697	/**
1886	1698	* @since 3.04.01
1887		- *
1888		- * @return array
1889	1699	*/
1890	1700	private static function user_shortcodes() {
1891	1701	$options = array(
1892	1702	'ID' => __( 'User ID', 'formidable' ),
		@@ -1905,15 +1715,10 @@
1905	1715	/**
1906	1716	* Get an array of the helper shortcodes to display in the customization panel
1907	1717	*
1908	1718	* @since 2.0.6
1909		- *
1910		- * @param bool $settings_tab
1911		- * @param int $form_id
1912		- *
1913		- * @return array
1914	1719	*/
1915		- private static function get_shortcode_helpers( $settings_tab, $form_id = 0 ) {
	1720	+ private static function get_shortcode_helpers( $settings_tab ) {
1916	1721	$entry_shortcodes = array(
1917	1722	'id' => __( 'Entry ID', 'formidable' ),
1918	1723	'key' => __( 'Entry Key', 'formidable' ),
1919	1724	'post_id' => __( 'Post ID', 'formidable' ),
		@@ -1926,9 +1731,8 @@
1926	1731	'form_name' => __( 'Form Name', 'formidable' ),
1927	1732	);
1928	1733
1929	1734	$entry_shortcodes = array_merge( FrmShortcodeHelper::get_contextual_shortcode_values(), $entry_shortcodes );
1930		-
1931	1735	if ( ! FrmAppHelper::pro_is_installed() ) {
1932	1736	unset( $entry_shortcodes['post_id'] );
1933	1737	}
1934	1738
		@@ -1936,14 +1740,12 @@
1936	1740	* Use this hook to add or remove buttons in the helpers section
1937	1741	* in the customization panel
1938	1742	*
1939	1743	* @since 2.0.6
1940		- *
1941		- * @param array $entry_shortcodes
1942		- * @param bool $settings_tab
1943		- * @param int $form_id
1944	1744	*/
1945		- return apply_filters( 'frm_helper_shortcodes', $entry_shortcodes, $settings_tab, $form_id );
	1745	+ $entry_shortcodes = apply_filters( 'frm_helper_shortcodes', $entry_shortcodes, $settings_tab );
	1746	+
	1747	+ return $entry_shortcodes;
1946	1748	}
1947	1749
1948	1750	/**
1949	1751	* Insert the form class setting into the form.
		@@ -1948,9 +1750,8 @@
1948	1750	/**
1949	1751	* Insert the form class setting into the form.
1950	1752	*
1951	1753	* @param stdClass $form
1952		- *
1953	1754	* @return void
1954	1755	*/
1955	1756	public static function form_classes( $form ) {
1956	1757	if ( isset( $form->options['form_class'] ) ) {
		@@ -1973,9 +1774,8 @@
1973	1774	* @param stdClass $form
1974	1775	*/
1975	1776	public static function add_js_validate_form_to_global_vars( $form ) {
1976	1777	global $frm_vars;
1977		-
1978	1778	if ( ! isset( $frm_vars['js_validate_forms'] ) ) {
1979	1779	$frm_vars['js_validate_forms'] = array();
1980	1780	}
1981	1781	$frm_vars['js_validate_forms'][ $form->id ] = $form;
		@@ -1998,9 +1798,8 @@
1998	1798	/**
1999	1799	* @param string $content
2000	1800	* @param int|stdClass|string $form
2001	1801	* @param false|int|stdClass|string $entry
2002		- *
2003	1802	* @return string
2004	1803	*/
2005	1804	public static function filter_content( $content, $form, $entry = false ) {
2006	1805	$content = self::replace_form_name_shortcodes( $content, $form );
		@@ -2005,9 +1804,8 @@
2005	1804	public static function filter_content( $content, $form, $entry = false ) {
2006	1805	$content = self::replace_form_name_shortcodes( $content, $form );
2007	1806
2008	1807	self::get_entry_by_param( $entry );
2009		-
2010	1808	if ( ! $entry ) {
2011	1809	return $content;
2012	1810	}
2013	1811
		@@ -2023,10 +1821,11 @@
2023	1821	$form = $entry->parent_entry->form_id;
2024	1822	}
2025	1823
2026	1824	$shortcodes = FrmFieldsHelper::get_shortcodes( $content, $form );
	1825	+ $content = apply_filters( 'frm_replace_content_shortcodes', $content, $entry, $shortcodes );
2027	1826
2028		- return apply_filters( 'frm_replace_content_shortcodes', $content, $entry, $shortcodes );
	1827	+ return $content;
2029	1828	}
2030	1829
2031	1830	/**
2032	1831	* Replace any [form_name] shortcodes in a string.
		@@ -2034,9 +1833,8 @@
2034	1833	* @since 5.5
2035	1834	*
2036	1835	* @param array|string $string
2037	1836	* @param int|stdClass|string $form
2038		- *
2039	1837	* @return array|string
2040	1838	*/
2041	1839	public static function replace_form_name_shortcodes( $string, $form ) {
2042	1840	if ( ! is_string( $string ) ) {
		@@ -2042,9 +1840,9 @@
2042	1840	if ( ! is_string( $string ) ) {
2043	1841	return $string;
2044	1842	}
2045	1843
2046		- if ( ! str_contains( $string, '[form_name]' ) ) {
	1844	+ if ( false === strpos( $string, '[form_name]' ) ) {
2047	1845	return $string;
2048	1846	}
2049	1847
2050	1848	if ( ! is_object( $form ) ) {
		@@ -2056,30 +1854,20 @@
2056	1854	}
2057	1855
2058	1856	/**
2059	1857	* @param false|int|stdClass|string $entry
2060		- *
2061	1858	* @return void
2062	1859	*/
2063	1860	private static function get_entry_by_param( &$entry ) {
2064		- if ( $entry && is_object( $entry ) ) {
2065		- return;
2066		- }
	1861	+ if ( ! $entry || ! is_object( $entry ) ) {
	1862	+ if ( ! $entry || ! is_numeric( $entry ) ) {
	1863	+ $entry = FrmAppHelper::get_post_param( 'id', false, 'sanitize_title' );
	1864	+ }
2067	1865
2068		- if ( ! $entry || ! is_numeric( $entry ) ) {
2069		- $entry = FrmAppHelper::get_post_param( 'id', false, 'sanitize_title' );
	1866	+ FrmEntry::maybe_get_entry( $entry );
2070	1867	}
2071		-
2072		- FrmEntry::maybe_get_entry( $entry );
2073	1868	}
2074	1869
2075		- /**
2076		- * @param string $content
2077		- * @param false|object $entry
2078		- * @param array $shortcodes
2079		- *
2080		- * @return string
2081		- */
2082	1870	public static function replace_content_shortcodes( $content, $entry, $shortcodes ) {
2083	1871	return FrmFieldsHelper::replace_content_shortcodes( $content, $entry, $shortcodes );
2084	1872	}
2085	1873
		@@ -2084,9 +1872,8 @@
2084	1872	}
2085	1873
2086	1874	/**
2087	1875	* @param array $errors
2088		- *
2089	1876	* @return array
2090	1877	*/
2091	1878	public static function process_bulk_form_actions( $errors ) {
2092	1879	if ( ! $_REQUEST ) {
		@@ -2093,30 +1880,29 @@
2093	1880	return $errors;
2094	1881	}
2095	1882
2096	1883	$bulkaction = FrmAppHelper::get_param( 'action', '', 'get', 'sanitize_text_field' );
2097		-
2098		- // phpcs:ignore Universal.Operators.StrictComparisons
2099	1884	if ( $bulkaction == - 1 ) {
2100	1885	$bulkaction = FrmAppHelper::get_param( 'action2', '', 'get', 'sanitize_title' );
2101	1886	}
2102	1887
2103		- if ( $bulkaction && str_starts_with( $bulkaction, 'bulk_' ) ) {
	1888	+ if ( ! empty( $bulkaction ) && strpos( $bulkaction, 'bulk_' ) === 0 ) {
2104	1889	FrmAppHelper::remove_get_action();
	1890	+
2105	1891	$bulkaction = str_replace( 'bulk_', '', $bulkaction );
2106	1892	}
2107	1893
2108	1894	$ids = FrmAppHelper::get_param( 'item-action', '', 'get', 'sanitize_text_field' );
	1895	+ if ( empty( $ids ) ) {
	1896	+ $errors[] = __( 'No forms were specified', 'formidable' );
2109	1897
2110		- if ( ! $ids ) {
2111		- $errors[] = __( 'No forms were specified', 'formidable' );
2112	1898	return $errors;
2113	1899	}
2114	1900
2115	1901	$permission_error = FrmAppHelper::permission_nonce_error( '', '_wpnonce', 'bulk-toplevel_page_formidable' );
2116		-
2117	1902	if ( $permission_error !== false ) {
2118	1903	$errors[] = $permission_error;
	1904	+
2119	1905	return $errors;
2120	1906	}
2121	1907
2122	1908	if ( ! is_array( $ids ) ) {
		@@ -2144,9 +1930,8 @@
2144	1930	/**
2145	1931	* Includes html that shows a message when the device is too small to use Formidable Forms admin pages.
2146	1932	*
2147	1933	* @since 6.20
2148		- *
2149	1934	* @return void
2150	1935	*/
2151	1936	public static function include_device_too_small_message() {
2152	1937	if ( ! FrmAppHelper::is_formidable_admin() ) {
		@@ -2155,13 +1940,12 @@
2155	1940
2156	1941	include FrmAppHelper::plugin_path() . '/classes/views/shared/small-device-message.php';
2157	1942	}
2158	1943
2159		- public static function route() { // phpcs:ignore Generic.Metrics.CyclomaticComplexity.MaxExceeded
	1944	+ public static function route() {
2160	1945	$action = isset( $_REQUEST['frm_action'] ) ? 'frm_action' : 'action';
2161	1946	$vars = array();
2162	1947	FrmAppHelper::include_svg();
2163		-
2164	1948	if ( isset( $_POST['frm_compact_fields'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
2165	1949	FrmAppHelper::permission_check( 'frm_edit_forms' );
2166	1950
2167	1951	// Javascript needs to be allowed in some field settings.
		@@ -2167,28 +1951,25 @@
2167	1951	// Javascript needs to be allowed in some field settings.
2168	1952	// phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized, WordPress.Security.NonceVerification.Missing
2169	1953	$json_vars = htmlspecialchars_decode( nl2br( str_replace( '&quot;', '"', wp_unslash( $_POST['frm_compact_fields'] ) ) ) );
2170	1954	$json_vars = json_decode( $json_vars, true );
	1955	+ if ( empty( $json_vars ) ) {
	1956	+ // json decoding failed so we should return an error message.
	1957	+ $action = FrmAppHelper::get_param( $action, '', 'get', 'sanitize_title' );
	1958	+ if ( 'edit' === $action ) {
	1959	+ $action = 'update';
	1960	+ }
2171	1961
2172		- if ( $json_vars ) {
	1962	+ add_filter( 'frm_validate_form', 'FrmFormsController::json_error' );
	1963	+ } else {
2173	1964	$vars = FrmAppHelper::json_to_array( $json_vars );
2174	1965	$action = $vars[ $action ];
2175	1966	unset( $_REQUEST['frm_compact_fields'], $_POST['frm_compact_fields'] ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
2176	1967	$_REQUEST = array_merge( $_REQUEST, $vars ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
2177	1968	$_POST = array_merge( $_POST, $_REQUEST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
2178		- } else {
2179		- // Json decoding failed so we should return an error message.
2180		- $action = FrmAppHelper::get_param( $action, '', 'get', 'sanitize_title' );
2181		-
2182		- if ( 'edit' === $action ) {
2183		- $action = 'update';
2184		- }
2185		-
2186		- add_filter( 'frm_validate_form', 'FrmFormsController::json_error' );
2187	1969	}
2188	1970	} else {
2189	1971	$action = FrmAppHelper::get_param( $action, '', 'get', 'sanitize_title' );
2190		-
2191	1972	if ( isset( $_REQUEST['delete_all'] ) ) {
2192	1973	// Override the action for this page.
2193	1974	$action = 'delete_all';
2194	1975	}
		@@ -2208,38 +1989,34 @@
2208	1989	case 'update_settings':
2209	1990	return self::$action( $vars );
2210	1991	case 'lite-reports':
2211	1992	self::no_reports( $vars );
2212		- return null;
	1993	+ return;
2213	1994	case 'views':
2214	1995	self::no_views( $vars );
2215		- return null;
	1996	+ return;
2216	1997	default:
2217	1998	do_action( 'frm_form_action_' . $action );
2218		-
2219	1999	if ( apply_filters( 'frm_form_stop_action_' . $action, false ) ) {
2220		- return null;
	2000	+ return;
2221	2001	}
2222	2002
2223	2003	$action = FrmAppHelper::get_param( 'action', '', 'get', 'sanitize_text_field' );
2224		-
2225		- // phpcs:ignore Universal.Operators.StrictComparisons
2226	2004	if ( $action == - 1 ) {
2227	2005	$action = FrmAppHelper::get_param( 'action2', '', 'get', 'sanitize_title' );
2228	2006	}
2229	2007
2230		- if ( str_starts_with( $action, 'bulk_' ) ) {
	2008	+ if ( strpos( $action, 'bulk_' ) === 0 ) {
2231	2009	FrmAppHelper::remove_get_action();
2232	2010
2233	2011	self::list_form();
2234		- return null;
	2012	+ return;
2235	2013	}
2236	2014
2237	2015	$message = FrmAppHelper::get_param( 'message' );
2238		-
2239	2016	if ( 'form_duplicate_error' === $message ) {
2240	2017	self::display_forms_list( array(), '', array( __( 'There was a problem duplicating the form', 'formidable' ) ) );
2241		- return null;
	2018	+ return;
2242	2019	}
2243	2020
2244	2021	if ( 'forms_permanently_deleted' === $message ) {
2245	2022	$count = FrmAppHelper::get_param( 'forms_deleted', 0, 'get', 'absint' );
		@@ -2245,14 +2022,14 @@
2245	2022	$count = FrmAppHelper::get_param( 'forms_deleted', 0, 'get', 'absint' );
2246	2023	/* translators: %1$s: Number of forms */
2247	2024	$message = sprintf( _n( '%1$s form permanently deleted.', '%1$s forms permanently deleted.', $count, 'formidable' ), $count );
2248	2025	self::display_forms_list( array(), $message, '' );
2249		- return null;
	2026	+ return;
2250	2027	}
2251	2028
2252	2029	self::display_forms_list();
2253	2030
2254		- return null;
	2031	+ return;
2255	2032	}//end switch
2256	2033	}
2257	2034
2258	2035	/**
		@@ -2271,44 +2048,19 @@
2271	2048
2272	2049	// Get posted data
2273	2050	$form_id = FrmAppHelper::get_post_param( 'form_id', '', 'absint' );
2274	2051	$name = FrmAppHelper::get_post_param( 'form_name', '', 'sanitize_text_field' );
2275		- $form = FrmForm::getOne( $form_id );
2276	2052
2277		- if ( ! $form ) {
2278		- wp_send_json_error( __( 'Form not found', 'formidable' ) );
2279		- }
	2053	+ // Update the form name and form key.
	2054	+ $form_key = FrmAppHelper::get_unique_key( sanitize_title( $name ), 'frm_forms', 'form_key' );
	2055	+ FrmForm::update( $form_id, compact( 'name', 'form_key' ) );
2280	2056
2281		- if ( $name === $form->name ) {
2282		- // Nothing to change so exit early.
2283		- $form_key = $form->form_key;
2284		- wp_send_json_success( compact( 'form_key' ) );
2285		- }
2286		-
2287		- $to_update = array(
2288		- 'name' => $name,
2289		- );
2290		-
2291		- if ( '' === $name ) {
2292		- $form_key = $form->form_key;
2293		- } else {
2294		- // Only update form_key if name is not empty.
2295		- $form_key = FrmAppHelper::get_unique_key( sanitize_title( $name ), 'frm_forms', 'form_key' );
2296		- $to_update['form_key'] = $form_key;
2297		- }
2298		-
2299		- FrmForm::update( $form_id, $to_update );
2300		-
2301	2057	wp_send_json_success( compact( 'form_key' ) );
2302	2058	}
2303	2059
2304		- /**
2305		- * @param array $errors
2306		- *
2307		- * @return array
2308		- */
2309	2060	public static function json_error( $errors ) {
2310	2061	$errors['json'] = __( 'Abnormal HTML characters prevented your form from saving correctly', 'formidable' );
	2062	+
2311	2063	return $errors;
2312	2064	}
2313	2065
2314	2066	/**
		@@ -2315,10 +2067,8 @@
2315	2067	* Add education about views.
2316	2068	*
2317	2069	* @since 4.07
2318	2070	*
2319		- * @param array $values
2320		- *
2321	2071	* @return void
2322	2072	*/
2323	2073	public static function no_views( $values = array() ) {
2324	2074	FrmAppHelper::include_svg();
		@@ -2332,10 +2082,8 @@
2332	2082	* Add education about reports.
2333	2083	*
2334	2084	* @since 4.07
2335	2085	*
2336		- * @param array $values
2337		- *
2338	2086	* @return void
2339	2087	*/
2340	2088	public static function no_reports( $values = array() ) {
2341	2089	$id = FrmAppHelper::get_param( 'form', '', 'get', 'absint' );
		@@ -2361,9 +2109,10 @@
2361	2109	/**
2362	2110	* @since 4.05.02
2363	2111	*/
2364	2112	private static function move_menu_to_footer() {
2365		- if ( empty( FrmAppHelper::get_settings()->admin_bar ) ) {
	2113	+ $settings = FrmAppHelper::get_settings();
	2114	+ if ( empty( $settings->admin_bar ) ) {
2366	2115	remove_action( 'wp_body_open', 'wp_admin_bar_render', 0 );
2367	2116	}
2368	2117	}
2369	2118
		@@ -2368,15 +2117,13 @@
2368	2117	}
2369	2118
2370	2119	public static function admin_bar_configure() {
2371	2120	global $frm_vars;
2372		-
2373	2121	if ( empty( $frm_vars['forms_loaded'] ) ) {
2374	2122	return;
2375	2123	}
2376	2124
2377	2125	$actions = array();
2378		-
2379	2126	foreach ( $frm_vars['forms_loaded'] as $form ) {
2380	2127	if ( is_object( $form ) ) {
2381	2128	$actions[ $form->id ] = $form->name;
2382	2129	}
		@@ -2382,9 +2129,9 @@
2382	2129	}
2383	2130	unset( $form );
2384	2131	}
2385	2132
2386		- if ( ! $actions ) {
	2133	+ if ( empty( $actions ) ) {
2387	2134	return;
2388	2135	}
2389	2136
2390	2137	self::add_menu_to_admin_bar();
		@@ -2410,12 +2157,8 @@
2410	2157	}
2411	2158
2412	2159	/**
2413	2160	* @since 2.05.07
2414		- *
2415		- * @param array $actions
2416		- *
2417		- * @return void
2418	2161	*/
2419	2162	private static function add_forms_to_admin_bar( $actions ) {
2420	2163	global $wp_admin_bar;
2421	2164
		@@ -2421,13 +2164,14 @@
2421	2164
2422	2165	asort( $actions );
2423	2166
2424	2167	foreach ( $actions as $form_id => $name ) {
	2168	+
2425	2169	$wp_admin_bar->add_node(
2426	2170	array(
2427	2171	'parent' => 'frm-forms',
2428	2172	'id' => 'edit_form_' . $form_id,
2429		- 'title' => $name ? $name : FrmFormsHelper::get_no_title_text(),
	2173	+ 'title' => empty( $name ) ? FrmFormsHelper::get_no_title_text() : $name,
2430	2174	'href' => FrmForm::get_edit_link( $form_id ),
2431	2175	)
2432	2176	);
2433	2177	}
		@@ -2436,14 +2180,12 @@
2436	2180	/**
2437	2181	* The formidable shortcode
2438	2182	*
2439	2183	* @param array $atts The params from the shortcode.
2440		- *
2441	2184	* @return string
2442	2185	*/
2443	2186	public static function get_form_shortcode( $atts ) {
2444	2187	global $frm_vars;
2445		-
2446	2188	if ( ! empty( $frm_vars['skip_shortcode'] ) ) {
2447	2189	$sc = '[formidable';
2448	2190	$sc .= FrmAppHelper::array_to_html_params( $atts );
2449	2191	return $sc . ']';
		@@ -2472,9 +2214,8 @@
2472	2214	* @since 5.2.01
2473	2215	*
2474	2216	* @param false|int|string $id
2475	2217	* @param false|string $key
2476		- *
2477	2218	* @return false|stdClass
2478	2219	*/
2479	2220	private static function maybe_get_form_by_id_or_key( $id, $key ) {
2480	2221	if ( ! $id ) {
		@@ -2488,9 +2229,8 @@
2488	2229	* @param false|string $key
2489	2230	* @param bool|int|string $title may be 'auto', true, false, 'true', 'false', 'yes', '1', 1, '0', 0.
2490	2231	* @param bool|int|string $description may be 'auto', true, false, 'true', 'false', 'yes', '1', 1, '0', 0.
2491	2232	* @param array $atts
2492		- *
2493	2233	* @return string
2494	2234	*/
2495	2235	public static function show_form( $id = '', $key = '', $title = false, $description = false, $atts = array() ) {
2496	2236	$form = self::maybe_get_form_by_id_or_key( $id, $key );
		@@ -2511,13 +2251,14 @@
2511	2251
2512	2252	add_action( 'frm_load_form_hooks', 'FrmHooksController::trigger_load_form_hooks' );
2513	2253	FrmAppHelper::trigger_hook_load( 'form', $form );
2514	2254
2515		- $form = apply_filters( 'frm_pre_display_form', $form );
	2255	+ $form = apply_filters( 'frm_pre_display_form', $form );
	2256	+
2516	2257	$frm_settings = FrmAppHelper::get_settings( array( 'current_form' => $form->id ) );
2517	2258
2518	2259	if ( self::is_viewable_draft_form( $form ) ) {
2519		- // Don't show a draft form on a page
	2260	+ // don't show a draft form on a page
2520	2261	$form = __( 'Please select a valid form', 'formidable' );
2521	2262	} elseif ( ! FrmForm::is_visible_to_user( $form ) ) {
2522	2263	$form = do_shortcode( $frm_settings->login_msg );
2523	2264	} else {
		@@ -2537,18 +2278,16 @@
2537	2278	}
2538	2279
2539	2280	/**
2540	2281	* @param false|int|string $id
2541		- *
2542	2282	* @return false|stdClass
2543	2283	*/
2544	2284	private static function maybe_get_form_to_show( $id ) {
2545	2285	$form = false;
2546	2286
2547		- if ( $id ) {
	2287	+ if ( ! empty( $id ) ) {
2548	2288	// Form id or key is set.
2549	2289	$form = FrmForm::getOne( $id );
2550		-
2551	2290	if ( ! $form || $form->parent_form_id || $form->status === 'trash' ) {
2552	2291	$form = false;
2553	2292	}
2554	2293	}
		@@ -2555,25 +2294,12 @@
2555	2294
2556	2295	return $form;
2557	2296	}
2558	2297
2559		- /**
2560		- * @param object $form
2561		- *
2562		- * @return bool
2563		- */
2564	2298	private static function is_viewable_draft_form( $form ) {
2565	2299	return $form->status === 'draft' && current_user_can( 'frm_edit_forms' ) && ! FrmAppHelper::is_preview_page();
2566	2300	}
2567	2301
2568		- /**
2569		- * @param object $form
2570		- * @param bool $title
2571		- * @param bool $description
2572		- * @param array $atts
2573		- *
2574		- * @return string
2575		- */
2576	2302	public static function get_form( $form, $title, $description, $atts = array() ) {
2577	2303	ob_start();
2578	2304
2579	2305	do_action( 'frm_before_get_form', $atts );
		@@ -2580,9 +2306,10 @@
2580	2306
2581	2307	self::get_form_contents( $form, $title, $description, $atts );
2582	2308	self::enqueue_scripts( FrmForm::get_params( $form ) );
2583	2309
2584		- $contents = ob_get_clean();
	2310	+ $contents = ob_get_contents();
	2311	+ ob_end_clean();
2585	2312
2586	2313	self::maybe_minimize_form( $atts, $contents );
2587	2314
2588	2315	return $contents;
		@@ -2587,25 +2314,12 @@
2587	2314
2588	2315	return $contents;
2589	2316	}
2590	2317
2591		- /**
2592		- * @param array $params
2593		- *
2594		- * @return void
2595		- */
2596	2318	public static function enqueue_scripts( $params ) {
2597	2319	do_action( 'frm_enqueue_form_scripts', $params );
2598	2320	}
2599	2321
2600		- /**
2601		- * @param object $form
2602		- * @param bool $title
2603		- * @param bool $description
2604		- * @param array $atts
2605		- *
2606		- * @return void
2607		- */
2608	2322	public static function get_form_contents( $form, $title, $description, $atts ) {
2609	2323	$params = FrmForm::get_params( $form );
2610	2324	$errors = self::get_saved_errors( $form, $params );
2611	2325	$fields = FrmFieldsHelper::get_form_fields( $form->id, $errors );
		@@ -2612,10 +2326,9 @@
2612	2326	$reset = false;
2613	2327	$pass_args = compact( 'form', 'fields', 'errors', 'title', 'description', 'reset' );
2614	2328
2615	2329	$pass_args['action'] = $params['action'];
2616		- // phpcs:ignore WordPress.Security.NonceVerification.Missing, Universal.Operators.StrictComparisons
2617		- $handle_process_here = $params['action'] === 'create' && $params['posted_form_id'] == $form->id && $_POST;
	2330	+ $handle_process_here = $params['action'] === 'create' && $params['posted_form_id'] == $form->id && $_POST; // phpcs:ignore WordPress.Security.NonceVerification.Missing
2618	2331
2619	2332	if ( ! $handle_process_here ) {
2620	2333	FrmFormState::set_initial_value( 'title', $title );
2621	2334	FrmFormState::set_initial_value( 'description', $description );
		@@ -2620,15 +2333,16 @@
2620	2333	FrmFormState::set_initial_value( 'title', $title );
2621	2334	FrmFormState::set_initial_value( 'description', $description );
2622	2335
2623	2336	do_action( 'frm_display_form_action', $params, $fields, $form, $title, $description );
2624		-
2625	2337	if ( apply_filters( 'frm_continue_to_new', true, $form->id, $params['action'] ) ) {
2626	2338	self::show_form_after_submit( $pass_args );
2627	2339	}
2628		- } elseif ( $errors ) {
	2340	+ } elseif ( ! empty( $errors ) ) {
2629	2341	self::show_form_after_submit( $pass_args );
	2342	+
2630	2343	} else {
	2344	+
2631	2345	do_action( 'frm_validate_form_creation', $params, $fields, $form, $title, $description );
2632	2346
2633	2347	if ( apply_filters( 'frm_continue_to_create', true, $form->id ) ) {
2634	2348	$entry_id = self::just_created_entry( $form->id );
		@@ -2651,19 +2365,13 @@
2651	2365	/**
2652	2366	* If the form was processed earlier (init), get the generated errors
2653	2367	*
2654	2368	* @since 2.05
2655		- *
2656		- * @param object $form
2657		- * @param array $params
2658		- *
2659		- * @return array
2660	2369	*/
2661	2370	private static function get_saved_errors( $form, $params ) {
2662	2371	global $frm_vars;
2663	2372
2664		- // phpcs:ignore WordPress.Security.NonceVerification.Missing, Universal.Operators.StrictComparisons
2665		- if ( $params['posted_form_id'] == $form->id && $_POST && isset( $frm_vars['created_entries'][ $form->id ] ) ) {
	2373	+ if ( $params['posted_form_id'] == $form->id && $_POST && isset( $frm_vars['created_entries'][ $form->id ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
2666	2374	$errors = $frm_vars['created_entries'][ $form->id ]['errors'];
2667	2375	} else {
2668	2376	$errors = array();
2669	2377	}
		@@ -2680,16 +2388,13 @@
2680	2388	}
2681	2389
2682	2390	/**
2683	2391	* @since 2.2.7
2684		- *
2685		- * @param int|string $form_id
2686		- *
2687		- * @return int
2688	2392	*/
2689	2393	public static function just_created_entry( $form_id ) {
2690	2394	global $frm_vars;
2691		- return isset( $frm_vars['created_entries'] ) && isset( $frm_vars['created_entries'][ $form_id ] ) && isset( $frm_vars['created_entries'][ $form_id ]['entry_id'] ) ? $frm_vars['created_entries'][ $form_id ]['entry_id'] : 0; // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong
	2395	+
	2396	+ return isset( $frm_vars['created_entries'] ) && isset( $frm_vars['created_entries'][ $form_id ] ) && isset( $frm_vars['created_entries'][ $form_id ]['entry_id'] ) ? $frm_vars['created_entries'][ $form_id ]['entry_id'] : 0;
2692	2397	}
2693	2398
2694	2399	/**
2695	2400	* Gets confirmation method.
		@@ -2702,9 +2407,8 @@
2702	2407	*
2703	2408	* @type object $form Form object.
2704	2409	* @type int $entry_id Entry ID.
2705	2410	* }
2706		- *
2707	2411	* @return array|string
2708	2412	*/
2709	2413	private static function get_confirmation_method( $atts ) {
2710	2414	$action = FrmOnSubmitHelper::current_event( $atts );
		@@ -2712,9 +2416,8 @@
2712	2416	$method = ! empty( $atts['form']->options[ $opt ] ) ? $atts['form']->options[ $opt ] : 'message';
2713	2417
2714	2418	if ( ! empty( $atts['entry_id'] ) ) {
2715	2419	$met_actions = self::get_met_on_submit_actions( $atts, $action );
2716		-
2717	2420	if ( $met_actions ) {
2718	2421	$method = $met_actions;
2719	2422	}
2720	2423	}
		@@ -2721,21 +2424,14 @@
2721	2424
2722	2425	$method = apply_filters( 'frm_success_filter', $method, $atts['form'], $action );
2723	2426
2724	2427	if ( $method !== 'message' && ( ! $atts['entry_id'] || ! is_numeric( $atts['entry_id'] ) ) ) {
2725		- return 'message';
	2428	+ $method = 'message';
2726	2429	}
2727	2430
2728	2431	return $method;
2729	2432	}
2730	2433
2731		- /**
2732		- * @param object $form
2733		- * @param array $params
2734		- * @param array $args
2735		- *
2736		- * @return void
2737		- */
2738	2434	public static function maybe_trigger_redirect( $form, $params, $args ) {
2739	2435	if ( ! isset( $params['id'] ) ) {
2740	2436	global $frm_vars;
2741	2437	$params['id'] = $frm_vars['created_entries'][ $form->id ]['entry_id'];
		@@ -2762,12 +2458,14 @@
2762	2458	* @param array $params See {@see FrmFormsController::maybe_trigger_redirect()}.
2763	2459	* @param array $args See {@see FrmFormsController::maybe_trigger_redirect()}.
2764	2460	*/
2765	2461	public static function maybe_trigger_redirect_with_action( $conf_method, $form, $params, $args ) {
2766		- if ( is_array( $conf_method ) && 1 === count( $conf_method ) && 'redirect' === FrmOnSubmitHelper::get_action_type( $conf_method[0] ) && empty( $conf_method[0]->post_content['redirect_delay'] ) ) { // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong
2767		- $event = FrmOnSubmitHelper::current_event( $params );
2768		- FrmOnSubmitHelper::populate_on_submit_data( $form->options, $conf_method[0], $event );
2769		- $conf_method = 'redirect';
	2462	+ if ( is_array( $conf_method ) && 1 === count( $conf_method ) ) {
	2463	+ if ( 'redirect' === FrmOnSubmitHelper::get_action_type( $conf_method[0] ) && empty( $conf_method[0]->post_content['redirect_delay'] ) ) {
	2464	+ $event = FrmOnSubmitHelper::current_event( $params );
	2465	+ FrmOnSubmitHelper::populate_on_submit_data( $form->options, $conf_method[0], $event );
	2466	+ $conf_method = 'redirect';
	2467	+ }
2770	2468	}
2771	2469
2772	2470	if ( 'redirect' === $conf_method ) {
2773	2471	self::trigger_redirect( $form, $params, $args );
		@@ -2773,15 +2471,8 @@
2773	2471	self::trigger_redirect( $form, $params, $args );
2774	2472	}
2775	2473	}
2776	2474
2777		- /**
2778		- * @param object $form
2779		- * @param array $params
2780		- * @param array $args
2781		- *
2782		- * @return void
2783		- */
2784	2475	public static function trigger_redirect( $form, $params, $args ) {
2785	2476	$success_args = array(
2786	2477	'action' => $params['action'],
2787	2478	'conf_method' => 'redirect',
		@@ -2840,9 +2531,8 @@
2840	2531	* @since 6.0
2841	2532	*
2842	2533	* @param array $args See {@see FrmFormsController::run_success_action()}.
2843	2534	* @param string $event Form event. Default is `create`.
2844		- *
2845	2535	* @return array Array of actions that meet the conditional logics.
2846	2536	*/
2847	2537	public static function get_met_on_submit_actions( $args, $event = 'create' ) {
2848	2538	if ( ! FrmOnSubmitHelper::form_has_migrated( $args['form'] ) ) {
		@@ -2869,11 +2559,13 @@
2869	2559	}
2870	2560
2871	2561	$action_type = FrmOnSubmitHelper::get_action_type( $action );
2872	2562
2873		- if ( 'redirect' === $action_type && $has_redirect ) {
2874		- // Do not process because we run the first redirect action only.
2875		- continue;
	2563	+ if ( 'redirect' === $action_type ) {
	2564	+ if ( $has_redirect ) {
	2565	+ // Do not process because we run the first redirect action only.
	2566	+ continue;
	2567	+ }
2876	2568	}
2877	2569
2878	2570	if ( ! self::is_valid_on_submit_action( $action, $args, $event ) ) {
2879	2571	continue;
		@@ -2898,10 +2590,10 @@
2898	2590	* @param array $args See {@see FrmFormsController::run_success_action()}. `$args['event']` is also added.
2899	2591	*/
2900	2592	$met_actions = apply_filters( 'frm_get_met_on_submit_actions', $met_actions, $args );
2901	2593
2902		- if ( ! $met_actions ) {
2903		- return array( FrmOnSubmitHelper::get_fallback_action( $event ) );
	2594	+ if ( empty( $met_actions ) ) {
	2595	+ $met_actions = array( FrmOnSubmitHelper::get_fallback_action( $event ) );
2904	2596	}
2905	2597
2906	2598	return $met_actions;
2907	2599	}
		@@ -2913,9 +2605,8 @@
2913	2605	*
2914	2606	* @param object $action Form action object.
2915	2607	* @param array $args See {@see FrmFormsController::run_success_action()}.
2916	2608	* @param string $event Form event. Default is `create`.
2917		- *
2918	2609	* @return bool
2919	2610	*/
2920	2611	private static function is_valid_on_submit_action( $action, $args, $event = 'create' ) {
2921	2612	$action_type = FrmOnSubmitHelper::get_action_type( $action );
		@@ -2937,9 +2628,8 @@
2937	2628	return false;
2938	2629	}
2939	2630
2940	2631	$page = get_post( $action->post_content['success_page_id'] );
2941		-
2942	2632	if ( ! $page || 'trash' === $page->post_status ) {
2943	2633	return false;
2944	2634	}
2945	2635	}
		@@ -2961,9 +2651,8 @@
2961	2651	'entry_id' => $args['entry_id'],
2962	2652	'action' => FrmOnSubmitHelper::current_event( $args ),
2963	2653	)
2964	2654	);
2965		-
2966	2655	if ( ! is_array( $args['conf_method'] ) ) {
2967	2656	self::run_success_action( $args );
2968	2657	return;
2969	2658	}
		@@ -2990,9 +2679,8 @@
2990	2679	* @param array $args See {@see FrmFormsController::run_success_action()}.
2991	2680	*/
2992	2681	public static function run_multi_on_submit_actions( $args ) {
2993	2682	$redirect_action = null;
2994		-
2995	2683	foreach ( $args['conf_method'] as $action ) {
2996	2684	if ( 'redirect' === FrmOnSubmitHelper::get_action_type( $action ) ) {
2997	2685	// We catch the redirect action to run it last.
2998	2686	$redirect_action = $action;
		@@ -3003,15 +2691,13 @@
3003	2691
3004	2692	unset( $action );
3005	2693	}
3006	2694
3007		- if ( ! $redirect_action ) {
3008		- return;
	2695	+ if ( $redirect_action ) {
	2696	+ // Show script to delay the redirection.
	2697	+ $args['force_delay_redirect'] = true;
	2698	+ self::run_single_on_submit_action( $args, $redirect_action );
3009	2699	}
3010		-
3011		- // Show script to delay the redirection.
3012		- $args['force_delay_redirect'] = true;
3013		- self::run_single_on_submit_action( $args, $redirect_action );
3014	2700	}
3015	2701
3016	2702	/**
3017	2703	* Runs single On Submit action.
		@@ -3032,9 +2718,8 @@
3032	2718	* @since 6.0
3033	2719	*
3034	2720	* @param array $args See {@see FrmFormsController::run_success_action()}.
3035	2721	* @param object $action On Submit action object.
3036		- *
3037	2722	* @return array
3038	2723	*/
3039	2724	private static function get_run_success_action_args( $args, $action ) {
3040	2725	$new_args = $args;
		@@ -3040,9 +2725,10 @@
3040	2725	$new_args = $args;
3041	2726
3042	2727	FrmOnSubmitHelper::populate_on_submit_data( $new_args['form']->options, $action, $args['action'] );
3043	2728
3044		- $opt = 'update' === $args['action'] ? 'edit_' : 'success_';
	2729	+ $opt = 'update' === $args['action'] ? 'edit_' : 'success_';
	2730	+
3045	2731	$new_args['conf_method'] = $new_args['form']->options[ $opt . 'action' ];
3046	2732
3047	2733	/**
3048	2734	* Filters the run success action args.
		@@ -3057,18 +2743,12 @@
3057	2743	}
3058	2744
3059	2745	/**
3060	2746	* @since 3.0
3061		- *
3062		- * @param array $args
3063		- *
3064		- * @return void
3065	2747	*/
3066	2748	private static function load_page_after_submit( $args ) {
3067	2749	global $post;
3068	2750	$opt = $args['success_opt'];
3069		-
3070		- // phpcs:ignore Universal.Operators.StrictComparisons
3071	2751	if ( ! $post || $args['form']->options[ $opt . '_page_id' ] != $post->ID ) {
3072	2752	$page = get_post( $args['form']->options[ $opt . '_page_id' ] );
3073	2753	$old_post = $post;
3074	2754	$post = $page;
		@@ -3092,9 +2772,8 @@
3092	2772	}
3093	2773
3094	2774	/**
3095	2775	* @since 3.0
3096		- *
3097	2776	* @param array $args See {@see FrmFormsController::run_success_action()}.
3098	2777	*/
3099	2778	private static function redirect_after_submit( $args ) {
3100	2779	add_filter( 'frm_use_wpautop', '__return_false' );
		@@ -3108,10 +2787,11 @@
3108	2787	FrmEntriesController::delete_entry_before_redirect( $success_url, $args['form'], $args );
3109	2788
3110	2789	add_filter( 'frm_redirect_url', 'FrmEntriesController::prepare_redirect_url' );
3111	2790	$success_url = apply_filters( 'frm_redirect_url', $success_url, $args['form'], $args );
3112		- $doing_ajax = FrmAppHelper::doing_ajax();
3113	2791
	2792	+ $doing_ajax = FrmAppHelper::doing_ajax();
	2793	+
3114	2794	if ( ! empty( $args['ajax'] ) && $doing_ajax && empty( $args['force_delay_redirect'] ) ) {
3115	2795	// Is AJAX submit and there is just one Redirect action runs.
3116	2796	echo json_encode( self::get_ajax_redirect_response_data( $args + compact( 'success_url' ) ) );
3117	2797	wp_die();
		@@ -3160,9 +2840,8 @@
3160	2840	*
3161	2841	* @since 6.3.1
3162	2842	*
3163	2843	* @param array $args See {@see FrmFormsController::run_success_action()}.
3164		- *
3165	2844	* @return array
3166	2845	*/
3167	2846	private static function get_ajax_redirect_response_data( $args ) {
3168	2847	$response_data = array(
		@@ -3185,9 +2864,8 @@
3185	2864	$args['message'] = FrmOnSubmitHelper::get_default_new_tab_msg();
3186	2865
3187	2866	$args['form']->options['success_msg'] = $args['message'];
3188	2867	$args['form']->options['edit_msg'] = $args['message'];
3189		-
3190	2868	if ( ! isset( $args['fields'] ) ) {
3191	2869	$args['fields'] = FrmField::get_all_for_form( $args['form']->id );
3192	2870	}
3193	2871
		@@ -3239,15 +2917,13 @@
3239	2917	add_filter( 'frm_use_wpautop', '__return_true' );
3240	2918
3241	2919	echo FrmAppHelper::maybe_kses( $redirect_msg ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
3242	2920	echo '<script>';
3243		-
3244	2921	if ( empty( $args['doing_ajax'] ) ) {
3245	2922	// Not AJAX submit, delay JS until window.load.
3246	2923	echo 'window.onload=function(){';
3247	2924	}
3248	2925	echo 'setTimeout(function(){' . $redirect_js . '}, ' . intval( $delay_time ) . ');'; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
3249		-
3250	2926	if ( empty( $args['doing_ajax'] ) ) {
3251	2927	echo '};';
3252	2928	}
3253	2929	echo '</script>';
		@@ -3260,16 +2936,13 @@
3260	2936	* @param string $success_msg
3261	2937	* @param array $args
3262	2938	*/
3263	2939	private static function get_redirect_message( $success_url, $success_msg, $args ) {
3264		- $success_msg = apply_filters( 'frm_content', $success_msg, $args['form'], $args['entry_id'] );
3265		- $success_msg = do_shortcode( FrmAppHelper::use_wpautop( $success_msg ) );
3266		-
3267		- // phpcs:disable Generic.WhiteSpace.ScopeIndent
3268		- $redirect_msg = '<div class="' . esc_attr( FrmFormsHelper::get_form_style_class( $args['form'] ) ) . '"><div class="frm-redirect-msg" role="status">' . $success_msg . '<br/>' . // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong
	2940	+ $success_msg = apply_filters( 'frm_content', $success_msg, $args['form'], $args['entry_id'] );
	2941	+ $success_msg = do_shortcode( FrmAppHelper::use_wpautop( $success_msg ) );
	2942	+ $redirect_msg = '<div class="' . esc_attr( FrmFormsHelper::get_form_style_class( $args['form'] ) ) . '"><div class="frm-redirect-msg" role="status">' . $success_msg . '<br/>' .
3269	2943	self::get_redirect_fallback_message( $success_url, $args ) .
3270	2944	'</div></div>';
3271		- // phpcs:enable Generic.WhiteSpace.ScopeIndent
3272	2945
3273	2946	$redirect_args = array(
3274	2947	'entry_id' => $args['entry_id'],
3275	2948	'form_id' => $args['form']->id,
		@@ -3285,14 +2958,12 @@
3285	2958	* @since 6.3.1
3286	2959	*
3287	2960	* @param string $success_url Redirect URL.
3288	2961	* @param array $args Contains `form` object.
3289		- *
3290	2962	* @return string
3291	2963	*/
3292	2964	private static function get_redirect_fallback_message( $success_url, $args ) {
3293	2965	$target = '';
3294		-
3295	2966	if ( ! empty( $args['form']->options['open_in_new_tab'] ) ) {
3296	2967	$target = ' target="_blank"';
3297	2968	}
3298	2969
		@@ -3307,12 +2978,8 @@
3307	2978	/**
3308	2979	* Prepare to show the success message and empty form after submit
3309	2980	*
3310	2981	* @since 2.05
3311		- *
3312		- * @param array $atts
3313		- *
3314		- * @return void
3315	2982	*/
3316	2983	public static function show_message_after_save( $atts ) {
3317	2984	$atts['message'] = self::prepare_submit_message( $atts['form'], $atts['entry_id'], $atts );
3318	2985
		@@ -3318,9 +2985,8 @@
3318	2985
3319	2986	if ( ! isset( $atts['form']->options['show_form'] ) || $atts['form']->options['show_form'] ) {
3320	2987	if ( isset( $atts['action'] ) && 'update' === $atts['action'] && is_callable( array( 'FrmProEntriesController', 'show_front_end_form_with_entry' ) ) ) {
3321	2988	$entry = FrmEntry::getOne( $atts['entry_id'] );
3322		-
3323	2989	if ( $entry ) {
3324	2990	// This is copied from the Pro plugin.
3325	2991	$atts['conf_message'] = FrmProEntriesController::confirmation( 'message', $atts['form'], $atts['form']->options, $entry->id, $atts );
3326	2992	$atts['show_form'] = FrmProEntriesController::is_form_displayed_after_edit( $atts['form'] );
		@@ -3337,12 +3003,8 @@
3337	3003	/**
3338	3004	* Show an empty form
3339	3005	*
3340	3006	* @since 2.05
3341		- *
3342		- * @param array $args
3343		- *
3344		- * @return void
3345	3007	*/
3346	3008	private static function show_form_after_submit( $args ) {
3347	3009	self::fill_atts_for_form_display( $args );
3348	3010
		@@ -3361,11 +3023,12 @@
3361	3023	}
3362	3024	unset( $args );
3363	3025
3364	3026	$include_form_tag = apply_filters( 'frm_include_form_tag', true, $form );
3365		- $frm_settings = FrmAppHelper::get_settings();
3366		- $submit = $form->options['submit_value'] ?? $frm_settings->submit_value;
3367	3027
	3028	+ $frm_settings = FrmAppHelper::get_settings();
	3029	+ $submit = isset( $form->options['submit_value'] ) ? $form->options['submit_value'] : $frm_settings->submit_value;
	3030	+
3368	3031	global $frm_vars;
3369	3032	self::maybe_load_css( $form, $values['custom_style'], $frm_vars['load_css'] );
3370	3033
3371	3034	$message_placement = self::message_placement( $form, $message );
		@@ -3373,36 +3036,25 @@
3373	3036	include FrmAppHelper::plugin_path() . '/classes/views/frm-entries/new.php';
3374	3037	}
3375	3038
3376	3039	/**
3377		- * Gets message placement.
3378		- *
3379	3040	* @since 4.05.02
3380		- * @since 6.26 This method changed from `private` to `public`.
3381		- *
3382		- * @param object $form Form object.
3383		- * @param string $message The message.
3384		- *
3385		- * @return string Accepts 'before', 'after', or 'submit'.
	3041	+ * @return string - 'before', 'after', or 'submit'
3386	3042	*/
3387		- public static function message_placement( $form, $message ) {
	3043	+ private static function message_placement( $form, $message ) {
3388	3044	$place = 'before';
3389	3045
3390	3046	if ( $message && isset( $form->options['form_class'] ) ) {
3391		- if ( str_contains( $form->options['form_class'], 'frm_below_success' ) ) {
	3047	+ if ( strpos( $form->options['form_class'], 'frm_below_success' ) !== false ) {
3392	3048	$place = 'after';
3393		- } elseif ( str_contains( $form->options['form_class'], 'frm_inline_success' ) ) {
	3049	+ } elseif ( strpos( $form->options['form_class'], 'frm_inline_success' ) !== false ) {
3394	3050	$place = 'submit';
3395	3051	}
3396	3052	}
3397	3053
3398	3054	/**
3399		- * Filter the message placement.
3400		- *
3401	3055	* @since 4.05.02
3402		- *
3403		- * @param string $place Accepts 'before', 'after', or 'submit'.
3404		- * @param array $args Args.
	3056	+ * @return string - 'before' or 'after'
3405	3057	*/
3406	3058	return apply_filters( 'frm_message_placement', $place, compact( 'form', 'message' ) );
3407	3059	}
3408	3060
		@@ -3409,12 +3061,8 @@
3409	3061	/**
3410	3062	* Get all the values needed on the new.php entry page
3411	3063	*
3412	3064	* @since 2.05
3413		- *
3414		- * @param array $args
3415		- *
3416		- * @return void
3417	3065	*/
3418	3066	private static function fill_atts_for_form_display( &$args ) {
3419	3067	if ( ! isset( $args['title'] ) && isset( $args['show_title'] ) ) {
3420	3068	$args['title'] = $args['show_title'];
		@@ -3439,12 +3087,8 @@
3439	3087	/**
3440	3088	* Show the success message without the form
3441	3089	*
3442	3090	* @since 2.05
3443		- *
3444		- * @param array $atts
3445		- *
3446		- * @return void
3447	3091	*/
3448	3092	private static function show_lone_success_message( $atts ) {
3449	3093	global $frm_vars;
3450	3094	$values = FrmEntriesHelper::setup_new_vars( $atts['fields'], $atts['form'], true );
		@@ -3450,12 +3094,13 @@
3450	3094	$values = FrmEntriesHelper::setup_new_vars( $atts['fields'], $atts['form'], true );
3451	3095	self::maybe_load_css( $atts['form'], $values['custom_style'], $frm_vars['load_css'] );
3452	3096
3453	3097	$include_extra_container = 'frm_forms' . FrmFormsHelper::get_form_style_class( $values );
3454		- $errors = array();
3455		- $form = $atts['form'];
3456		- $message = $atts['message'];
3457	3098
	3099	+ $errors = array();
	3100	+ $form = $atts['form'];
	3101	+ $message = $atts['message'];
	3102	+
3458	3103	include FrmAppHelper::plugin_path() . '/classes/views/frm-entries/errors.php';
3459	3104	}
3460	3105
3461	3106	/**
		@@ -3463,20 +3108,19 @@
3463	3108	*
3464	3109	* @since 2.05
3465	3110	* @since 6.0.x Added the third parameter.
3466	3111	*
3467		- * @param object $form Form object.
3468		- * @param int|string $entry_id Entry ID.
3469		- * @param array $args See {@see FrmFormsController::run_success_action()}.
3470		- *
	3112	+ * @param object $form Form object.
	3113	+ * @param int $entry_id Entry ID.
	3114	+ * @param array $args See {@see FrmFormsController::run_success_action()}.
3471	3115	* @return string
3472	3116	*/
3473	3117	private static function prepare_submit_message( $form, $entry_id, $args = array() ) {
3474	3118	$frm_settings = FrmAppHelper::get_settings( array( 'current_form' => $form->id ) );
3475		- $opt = $args['success_opt'] ?? 'success';
	3119	+ $opt = isset( $args['success_opt'] ) ? $args['success_opt'] : 'success';
3476	3120
3477	3121	if ( $entry_id && is_numeric( $entry_id ) ) {
3478		- $message = $form->options[ $opt . '_msg' ] ?? $frm_settings->success_msg;
	3122	+ $message = isset( $form->options[ $opt . '_msg' ] ) ? $form->options[ $opt . '_msg' ] : $frm_settings->success_msg;
3479	3123	$class = 'frm_message';
3480	3124	} else {
3481	3125	$message = $frm_settings->failed_msg;
3482	3126	$class = FrmFormsHelper::form_error_class();
		@@ -3493,9 +3137,9 @@
3493	3137	public static function front_head() {
3494	3138	$version = FrmAppHelper::plugin_version();
3495	3139	$suffix = FrmAppHelper::js_suffix();
3496	3140
3497		- if ( $suffix && self::has_combo_js_file() ) {
	3141	+ if ( ! empty( $suffix ) && self::has_combo_js_file() ) {
3498	3142	wp_register_script( 'formidable', FrmAppHelper::plugin_url() . '/js/frm.min.js', array( 'jquery' ), $version, true );
3499	3143	} else {
3500	3144	wp_register_script( 'formidable', FrmAppHelper::plugin_url() . "/js/formidable{$suffix}.js", array( 'jquery' ), $version, true );
3501	3145	}
		@@ -3502,9 +3146,9 @@
3502	3146
3503	3147	add_filter( 'script_loader_tag', 'FrmFormsController::defer_script_loading', 10, 2 );
3504	3148
3505	3149	if ( FrmAppHelper::is_admin() ) {
3506		- // Don't load this in back-end
	3150	+ // don't load this in back-end
3507	3151	return;
3508	3152	}
3509	3153
3510	3154	FrmAppHelper::localize_script( 'front' );
		@@ -3517,15 +3161,8 @@
3517	3161	public static function has_combo_js_file() {
3518	3162	return is_readable( FrmAppHelper::plugin_path() . '/js/frm.min.js' );
3519	3163	}
3520	3164
3521		- /**
3522		- * @param object $form
3523		- * @param int|string $this_load
3524		- * @param bool $global_load
3525		- *
3526		- * @return void
3527		- */
3528	3165	public static function maybe_load_css( $form, $this_load, $global_load ) {
3529	3166	$load_css = FrmForm::is_form_loaded( $form, $this_load, $global_load );
3530	3167
3531	3168	if ( ! $load_css ) {
		@@ -3555,9 +3192,8 @@
3555	3192	return;
3556	3193	}
3557	3194
3558	3195	global $wp_styles;
3559		-
3560	3196	if ( is_array( $wp_styles->queue ) && in_array( 'formidable', $wp_styles->queue, true ) ) {
3561	3197	wp_print_styles( 'formidable' );
3562	3198	}
3563	3199	}
		@@ -3572,57 +3208,34 @@
3572	3208	private static function should_load_late() {
3573	3209	return ! function_exists( 'aioseo' );
3574	3210	}
3575	3211
3576		- /**
3577		- * @param string $tag
3578		- * @param string $handle
3579		- *
3580		- * @return string
3581		- */
3582	3212	public static function defer_script_loading( $tag, $handle ) {
3583		- if ( 'captcha-api' === $handle && ! str_contains( $tag, 'defer' ) ) {
3584		- return str_replace( ' src', ' defer="defer" async="async" src', $tag );
	3213	+ if ( 'captcha-api' == $handle && ! strpos( $tag, 'defer' ) ) {
	3214	+ $tag = str_replace( ' src', ' defer="defer" async="async" src', $tag );
3585	3215	}
3586	3216
3587	3217	return $tag;
3588	3218	}
3589	3219
3590		- /**
3591		- * @param string $location
3592		- *
3593		- * @return void
3594		- */
3595	3220	public static function footer_js( $location = 'footer' ) {
3596	3221	global $frm_vars;
3597	3222
3598	3223	FrmStylesController::enqueue_css();
3599	3224
3600		- if ( FrmAppHelper::is_admin() || $location === 'header' || empty( $frm_vars['forms_loaded'] ) ) {
3601		- return;
3602		- }
	3225	+ if ( ! FrmAppHelper::is_admin() && $location !== 'header' && ! empty( $frm_vars['forms_loaded'] ) ) {
	3226	+ // load formidable js
	3227	+ wp_enqueue_script( 'formidable' );
3603	3228
3604		- // Load formidable js
3605		- wp_enqueue_script( 'formidable' );
3606		-
3607		- FrmHoneypot::maybe_print_honeypot_js();
3608		-
3609		- if ( ! method_exists( 'FrmProFormsHelper', 'load_currency_js' ) ) {
3610		- // Load currency JS if Pro is not installed.
3611		- FrmFormsHelper::load_currency_js();
	3229	+ FrmHoneypot::maybe_print_honeypot_js();
3612	3230	}
3613	3231	}
3614	3232
3615	3233	/**
3616	3234	* @since 2.0.8
3617		- *
3618		- * @param array $atts
3619		- * @param string $content
3620		- *
3621		- * @return void
3622	3235	*/
3623	3236	private static function maybe_minimize_form( $atts, &$content ) {
3624		- // Check if minimizing is turned on
	3237	+ // check if minimizing is turned on
3625	3238	if ( self::is_minification_on( $atts ) ) {
3626	3239	$content = str_replace( array( "\r\n", "\r", "\n", "\t", ' ' ), '', $content );
3627	3240	}
3628	3241	}
		@@ -3628,11 +3241,8 @@
3628	3241	}
3629	3242
3630	3243	/**
3631	3244	* @since 2.0.8
3632		- *
3633		- * @param array $atts
3634		- *
3635	3245	* @return bool
3636	3246	*/
3637	3247	private static function is_minification_on( $atts ) {
3638	3248	return ! empty( $atts['minimize'] );
		@@ -3644,13 +3254,11 @@
3644	3254	* @return void
3645	3255	*/
3646	3256	public static function landing_page_preview_option() {
3647	3257	$dir = apply_filters( 'frm_landing_page_preview_option', false );
3648		-
3649	3258	if ( false === $dir || ! file_exists( $dir . 'landing-page-preview-option.php' ) ) {
3650	3259	$dir = self::get_form_views_path();
3651	3260	}
3652		-
3653	3261	include $dir . 'landing-page-preview-option.php';
3654	3262	}
3655	3263
3656	3264	/**
		@@ -3676,15 +3284,13 @@
3676	3284
3677	3285	check_ajax_referer( 'frm_ajax', 'nonce' );
3678	3286
3679	3287	$type = FrmAppHelper::get_post_param( 'type', '', 'sanitize_text_field' );
3680		-
3681	3288	if ( ! $type || ! in_array( $type, array( 'form', 'view' ), true ) ) {
3682	3289	die( 0 );
3683	3290	}
3684	3291
3685	3292	$object_id = FrmAppHelper::get_post_param( 'object_id', '', 'absint' );
3686		-
3687	3293	if ( ! $object_id ) {
3688	3294	die( 0 );
3689	3295	}
3690	3296
		@@ -3696,15 +3302,13 @@
3696	3302	$postarr['post_content'] = apply_filters( 'frm_create_page_with_' . $type . '_shortcode_content', '', $object_id );
3697	3303	}
3698	3304
3699	3305	$name = FrmAppHelper::get_post_param( 'name', '', 'sanitize_text_field' );
3700		-
3701	3306	if ( $name ) {
3702	3307	$postarr['post_title'] = $name;
3703	3308	}
3704	3309
3705	3310	$success = wp_insert_post( $postarr );
3706		-
3707	3311	if ( ! is_numeric( $success ) || ! $success ) {
3708	3312	die( 0 );
3709	3313	}
3710	3314
		@@ -3718,9 +3322,8 @@
3718	3322	/**
3719	3323	* @since 5.3
3720	3324	*
3721	3325	* @param int $form_id
3722		- *
3723	3326	* @return string
3724	3327	*/
3725	3328	private static function get_page_shortcode_content_for_form( $form_id ) {
3726	3329	$shortcode = '[formidable id="' . $form_id . '"]';
		@@ -3740,9 +3343,9 @@
3740	3343	}
3741	3344
3742	3345	check_ajax_referer( 'frm_ajax', 'nonce' );
3743	3346
3744		- $html = FrmAppHelper::clip(
	3347	+ $html = FrmAppHelper::clip(
3745	3348	function () {
3746	3349	FrmAppHelper::maybe_autocomplete_pages_options(
3747	3350	array(
3748	3351	'field_name' => 'frm_page_dropdown',
		@@ -3751,53 +3354,19 @@
3751	3354	)
3752	3355	);
3753	3356	}
3754	3357	);
	3358	+ $post_type_object = get_post_type_object( 'page' );
3755	3359	wp_send_json(
3756	3360	array(
3757	3361	'html' => $html,
3758		- 'edit_page_url' => admin_url( sprintf( get_post_type_object( 'page' )->_edit_link . '&action=edit', 0 ) ),
	3362	+ 'edit_page_url' => admin_url( sprintf( $post_type_object->_edit_link . '&action=edit', 0 ) ),
3759	3363	)
3760	3364	);
3761	3365	}
3762	3366
3763	3367	/**
3764		- * Prints necessary templates for the forms list page.
3765		- *
3766		- * @since 6.32
3767		- *
3768		- * @return void
3769		- */
3770		- public static function print_forms_list_templates() {
3771		- if ( ! FrmAppHelper::on_form_listing_page() ) {
3772		- return;
3773		- }
3774		-
3775		- $screen = get_current_screen();
3776		-
3777		- if ( ! $screen ) {
3778		- return;
3779		- }
3780		-
3781		- $columns = get_column_headers( $screen );
3782		- $hidden = get_hidden_columns( $screen );
3783		- $skip_cols = array( 'cb', 'name', 'settings' );
3784		- $per_page = get_user_option( 'formidable_page_formidable_per_page' );
3785		- $show_screen_options = $screen->show_screen_options();
3786		-
3787		- if ( $per_page < 1 ) {
3788		- $per_page = 20;
3789		- }
3790		-
3791		- include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/forms-list-settings.php';
3792		- }
3793		-
3794		- /**
3795	3368	* @deprecated 4.0
3796		- *
3797		- * @param array $values
3798		- *
3799		- * @return void
3800	3369	*/
3801	3370	public static function create( $values = array() ) {
3802	3371	_deprecated_function( __METHOD__, '4.0', 'FrmFormsController::update' );
3803	3372	self::update( $values );
		@@ -3803,14 +3372,16 @@
3803	3372	self::update( $values );
3804	3373	}
3805	3374
3806	3375	/**
3807		- * @deprecated 6.33
	3376	+ * Education for premium features.
3808	3377	*
3809		- * @param array $values
	3378	+ * @since 4.05
	3379	+ * @deprecated 6.16.3
3810	3380	*
3811	3381	* @return void
3812	3382	*/
3813		- public static function render_spam_settings( $values ) {
3814		- _deprecated_function( __METHOD__, '6.33' );
	3383	+ public static function add_form_style_tab_options() {
	3384	+ _deprecated_function( __METHOD__, '6.16.3' );
	3385	+ include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/add_form_style_options.php';
3815	3386	}
3816	3387	}