← All changes | classes/controllers/FrmFormsController.php +283 -759 6.32 → 6.14 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,12 +64,12 @@
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		- FrmAppHelper::icon_by_class( 'frmfont frm_arrowdown8_icon', array( 'aria-hidden' => 'true' ) );
	71	+ FrmAppHelper::icon_by_class( 'frmfont frm_arrowdown6_icon', array( 'aria-hidden' => 'true' ) );
81	72	echo '</a>';
82	73	}
83	74
84	75	/**
		@@ -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,29 +107,20 @@
121	107	*
122	108	* @since 2.02.11
123	109	*
124	110	* @param int|object $form
125		- *
126		- * @return void
127	111	*/
128	112	private static function create_default_email_action( $form ) {
129	113	FrmForm::maybe_get_form( $form );
130		-
131		- if ( ! is_object( $form ) ) {
132		- return;
133		- }
134		-
135	114	$create_email = apply_filters( 'frm_create_default_email_action', true, $form );
136	115
137		- if ( ! $create_email ) {
138		- return;
	116	+ if ( $create_email ) {
	117	+ /**
	118	+ * @var FrmFormAction
	119	+ */
	120	+ $action_control = FrmFormActionsController::get_form_actions( 'email' );
	121	+ $action_control->create( $form->id );
139	122	}
140		-
141		- /**
142		- * @var FrmFormAction
143		- */
144		- $action_control = FrmFormActionsController::get_form_actions( 'email' );
145		- $action_control->create( $form->id );
146	123	}
147	124
148	125	/**
149	126	* Create the default On submit action
		@@ -150,18 +127,12 @@
150	127	*
151	128	* @since 6.0.0
152	129	*
153	130	* @param int|object $form Form object or ID.
154		- *
155		- * @return void
156	131	*/
157	132	private static function create_default_on_submit_action( $form ) {
158	133	FrmForm::maybe_get_form( $form );
159	134
160		- if ( ! is_object( $form ) ) {
161		- return;
162		- }
163		-
164	135	/**
165	136	* Enable or disable the default On Submit action.
166	137	*
167	138	* @since 6.0.0
		@@ -170,17 +141,15 @@
170	141	* @param object $form Form object.
171	142	*/
172	143	$create = apply_filters( 'frm_create_default_on_submit_action', true, $form );
173	144
174		- if ( ! $create ) {
175		- return;
	145	+ if ( $create ) {
	146	+ /**
	147	+ * @var FrmFormAction
	148	+ */
	149	+ $action_control = FrmFormActionsController::get_form_actions( FrmOnSubmitAction::$slug );
	150	+ $action_control->create( $form->id );
176	151	}
177		-
178		- /**
179		- * @var FrmFormAction
180		- */
181		- $action_control = FrmFormActionsController::get_form_actions( FrmOnSubmitAction::$slug );
182		- $action_control->create( $form->id );
183	152	}
184	153
185	154	/**
186	155	* Creates submit button field.
		@@ -187,18 +156,12 @@
187	156	*
188	157	* @since 6.9
189	158	*
190	159	* @param int|object $form Form ID or object.
191		- *
192		- * @return void
193	160	*/
194	161	private static function create_submit_button_field( $form ) {
195	162	FrmForm::maybe_get_form( $form );
196	163
197		- if ( ! is_object( $form ) ) {
198		- return;
199		- }
200		-
201	164	if ( FrmSubmitHelper::get_submit_field( $form->id ) ) {
202	165	// Do not create submit button field if it exists.
203	166	return;
204	167	}
		@@ -206,9 +169,9 @@
206	169	FrmField::create(
207	170	array(
208	171	'type' => FrmSubmitHelper::FIELD_TYPE,
209	172	'name' => __( 'Submit', 'formidable' ),
210		- 'field_order' => FrmSubmitHelper::DEFAULT_ORDER,
	173	+ 'field_order' => 9999,
211	174	'form_id' => $form->id,
212	175	'field_options' => FrmFieldsHelper::get_default_field_options( FrmSubmitHelper::FIELD_TYPE ),
213	176	'description' => '',
214	177	'default_value' => '',
		@@ -217,10 +180,8 @@
217	180	);
218	181	}
219	182
220	183	/**
221		- * @param array|false $values
222		- *
223	184	* @return void
224	185	*/
225	186	public static function edit( $values = false ) {
226	187	FrmAppHelper::permission_check( 'frm_edit_forms' );
		@@ -232,9 +193,8 @@
232	193
233	194	/**
234	195	* @param mixed $id
235	196	* @param string $message
236		- *
237	197	* @return void
238	198	*/
239	199	public static function settings( $id = false, $message = '' ) {
240	200	FrmAppHelper::permission_check( 'frm_edit_forms' );
		@@ -262,9 +222,10 @@
262	222	FrmAppController::show_error_modal( $error_args );
263	223	return;
264	224	}
265	225
266		- $id = FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
	226	+ $id = FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
	227	+
267	228	$errors = FrmForm::validate( $_POST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
268	229	$warnings = FrmFormsHelper::check_for_warnings( $_POST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
269	230
270	231	if ( count( $errors ) > 0 ) {
		@@ -273,14 +234,13 @@
273	234	}
274	235
275	236	do_action( 'frm_before_update_form_settings', $id );
276	237
277		- $antispam_was_on = self::antispam_was_on( $id ); // phpcs:ignore Formidable.CodeAnalysis.InlineSingleUseVariable
	238	+ $antispam_was_on = self::antispam_was_on( $id );
278	239
279	240	FrmForm::update( $id, $_POST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
280	241
281	242	$antispam_is_on = ! empty( $_POST['options']['antispam'] ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
282		-
283	243	if ( $antispam_is_on !== $antispam_was_on ) {
284	244	FrmAntiSpam::clear_caches();
285	245	}
286	246
		@@ -290,9 +250,8 @@
290	250	}
291	251
292	252	/**
293	253	* @param int $form_id
294		- *
295	254	* @return bool
296	255	*/
297	256	private static function antispam_was_on( $form_id ) {
298	257	$form = FrmForm::getOne( $form_id );
		@@ -299,14 +258,12 @@
299	258	return ! empty( $form->options['antispam'] );
300	259	}
301	260
302	261	/**
303		- * @param array $values
304		- *
305	262	* @return void
306	263	*/
307	264	public static function update( $values = array() ) {
308		- if ( ! $values ) {
	265	+ if ( empty( $values ) ) {
309	266	$values = $_POST; // phpcs:ignore WordPress.Security.NonceVerification.Missing
310	267	}
311	268
312	269	// Set radio button and checkbox meta equal to "other" value.
		@@ -315,9 +272,8 @@
315	272	}
316	273
317	274	$errors = FrmForm::validate( $values );
318	275	$permission_error = FrmAppHelper::permission_nonce_error( 'frm_edit_forms', 'frm_save_form', 'frm_save_form_nonce' );
319		-
320	276	if ( $permission_error !== false ) {
321	277	$errors['form'] = $permission_error;
322	278	}
323	279
		@@ -336,9 +292,9 @@
336	292	if ( self::is_too_long( $values ) ) {
337	293	$message .= '<br/> ' . sprintf(
338	294	/* translators: %1$s: Start link HTML, %2$s: end link HTML */
339	295	__( 'However, your form is very long and may be %1$sreaching server limits%2$s.', 'formidable' ),
340		- '<a href="' . esc_url( self::get_form_too_long_docs_url() ) . '" target="_blank" rel="noopener">',
	296	+ '<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">',
341	297	'</a>'
342	298	);
343	299	}
344	300
		@@ -349,32 +305,17 @@
349	305	self::get_edit_vars( $id, array(), $message );
350	306	}
351	307
352	308	/**
353		- * @since 6.25.1
354		- *
355		- * @return string
356		- */
357		- private static function get_form_too_long_docs_url() {
358		- $utm = array(
359		- 'campaign' => 'builder',
360		- 'content' => 'form-too-long',
361		- );
362		- return FrmAppHelper::admin_upgrade_link( $utm, 'knowledgebase/i-have-a-long-form-why-did-the-options-at-the-end-of-the-form-stop-saving/' );
363		- }
364		-
365		- /**
366	309	* Remove the draft flag from any new fields from this current session.
367	310	*
368	311	* @since 6.8
369	312	*
370	313	* @param int $form_id
371		- *
372	314	* @return void
373	315	*/
374	316	private static function maybe_remove_draft_option_from_fields( $form_id ) {
375	317	$draft_field_ids_csv = FrmAppHelper::get_post_param( 'draft_fields', '', 'sanitize_text_field' );
376		-
377	318	if ( ! $draft_field_ids_csv ) {
378	319	// If the draft_fields input is empty there are no new fields in the session.
379	320	return;
380	321	}
		@@ -379,9 +320,8 @@
379	320	return;
380	321	}
381	322
382	323	$draft_field_ids = array_filter( explode( ',', $draft_field_ids_csv ), 'is_numeric' );
383		-
384	324	if ( ! $draft_field_ids ) {
385	325	// Exit early if the draft fields input is invalid. It should be a CSV of integer values.
386	326	return;
387	327	}
		@@ -386,9 +326,8 @@
386	326	return;
387	327	}
388	328
389	329	$draft_field_rows = FrmFieldsHelper::get_draft_field_results( $form_id, $draft_field_ids );
390		-
391	330	foreach ( $draft_field_rows as $row ) {
392	331	$row->field_options['draft'] = 0;
393	332	FrmField::update( $row->id, array( 'field_options' => $row->field_options ) );
394	333	}
		@@ -400,10 +339,8 @@
400	339	* were likely not saved either.
401	340	*
402	341	* @since 3.06.01
403	342	*
404		- * @param array $values
405		- *
406	343	* @return bool
407	344	*/
408	345	private static function is_too_long( $values ) {
409	346	return empty( $values['frm_end'] );
		@@ -439,17 +376,13 @@
439	376	* @return string|null
440	377	*/
441	378	public static function page_preview() {
442	379	$params = FrmForm::list_page_params();
443		-
444		- if ( ! $params['form'] || is_numeric( $params['form'] ) ) {
	380	+ if ( ! $params['form'] ) {
445	381	return null;
446	382	}
447	383
448		- self::maybe_block_preview( $params['form'] );
449		-
450	384	$form = FrmForm::getOne( $params['form'] );
451		-
452	385	if ( ! $form ) {
453	386	return null;
454	387	}
455	388
		@@ -461,19 +394,9 @@
461	394	*
462	395	* @return void
463	396	*/
464	397	public static function show_page_preview() {
465		- $preview = self::page_preview();
466		-
467		- if ( is_null( $preview ) ) {
468		- wp_die(
469		- '<h1>' . esc_html__( 'Form key is invalid', 'formidable' ) . '</h1>',
470		- '<p>' . esc_html__( 'Form key is invalid', 'formidable' ) . '</p>',
471		- 404
472		- );
473		- }
474		-
475		- echo $preview; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
	398	+ echo self::page_preview(); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
476	399	}
477	400
478	401	/**
479	402	* @return void
		@@ -484,19 +407,9 @@
484	407
485	408	global $frm_vars;
486	409	$frm_vars['preview'] = true;
487	410
488		- // print_emoji_styles is deprecated.
489		- remove_action( 'wp_print_styles', 'print_emoji_styles' );
490		-
491		- if ( FrmTestModeController::should_add_test_mode_container() ) {
492		- do_action( 'frm_test_mode_init' );
493		- add_action( 'wp_enqueue_scripts', 'FrmTestModeController::register_and_enqueue_required_scripts' );
494		- add_filter( 'frm_filter_final_form', 'FrmTestModeController::maybe_add_test_mode_container', 99 );
495		- }
496		-
497	411	$include_theme = FrmAppHelper::get_param( 'theme', '', 'get', 'absint' );
498		-
499	412	if ( $include_theme ) {
500	413	self::set_preview_query();
501	414	self::load_theme_preview();
502	415	} else {
		@@ -519,9 +432,8 @@
519	432	'post_type' => 'page',
520	433	);
521	434
522	435	$page_for_posts = get_option( 'page_for_posts' );
523		-
524	436	if ( is_numeric( $page_for_posts ) ) {
525	437	// Avoid querying for the "Posts Page" or "Blog Page" so we don't display 10 forms.
526	438	$page_query['post__not_in'] = array( $page_for_posts );
527	439	}
		@@ -526,15 +438,13 @@
526	438	$page_query['post__not_in'] = array( $page_for_posts );
527	439	}
528	440
529	441	$random_page = get_posts( $page_query );
530		-
531	442	if ( ! $random_page ) {
532	443	return;
533	444	}
534	445
535	446	$random_page = reset( $random_page );
536		-
537	447	if ( ! is_a( $random_page, 'WP_Post' ) ) {
538	448	// The return type can also be int.
539	449	return;
540	450	}
		@@ -556,9 +466,8 @@
556	466	*
557	467	* @since 5.5.2
558	468	*
559	469	* @param WP_Post $page The page object.
560		- *
561	470	* @return void
562	471	*/
563	472	private static function set_post_global( $page ) {
564	473	global $post;
		@@ -577,16 +486,14 @@
577	486	add_action( 'loop_no_results', 'FrmFormsController::show_page_preview' );
578	487	add_filter( 'is_active_sidebar', '__return_false' );
579	488	FrmStylesController::enqueue_css( 'enqueue', true );
580	489
581		- if ( false !== get_template_part( 'page' ) ) {
582		- return;
	490	+ if ( false === get_template_part( 'page' ) ) {
	491	+ if ( function_exists( 'wp_is_block_theme' ) && wp_is_block_theme() ) {
	492	+ add_filter( 'body_class', 'FrmFormsController::preview_block_theme_body_classnames' );
	493	+ }
	494	+ self::fallback_when_page_template_part_is_not_supported_by_theme();
583	495	}
584		-
585		- if ( function_exists( 'wp_is_block_theme' ) && wp_is_block_theme() ) {
586		- add_filter( 'body_class', 'FrmFormsController::preview_block_theme_body_classnames' );
587		- }
588		- self::fallback_when_page_template_part_is_not_supported_by_theme();
589	496	}
590	497
591	498	/**
592	499	* Add padding to the body for block themes.
		@@ -593,9 +500,8 @@
593	500	*
594	501	* @since 6.5.2
595	502	*
596	503	* @param array $classes The body classes list.
597		- *
598	504	* @return array
599	505	*/
600	506	public static function preview_block_theme_body_classnames( $classes ) {
601	507	$classes[] = 'has-global-padding';
		@@ -608,27 +514,21 @@
608	514	*
609	515	* @return void
610	516	*/
611	517	private static function fallback_when_page_template_part_is_not_supported_by_theme() {
612		- if ( ! have_posts() ) {
613		- return;
614		- }
	518	+ if ( have_posts() ) {
	519	+ the_post();
	520	+ self::get_template( 'header' );
615	521
616		- the_post();
617		- self::get_template( 'header' );
	522	+ // add some generic class names to the container to add some natural padding to the content.
	523	+ // .entry-content catches the WordPress TwentyTwenty theme.
	524	+ // .container catches Customizr content.
	525	+ echo '<div class="container entry-content">';
	526	+ the_content();
	527	+ echo '</div>';
618	528
619		- // Add some generic class names to the container to add some natural padding to the content.
620		- // .entry-content catches the WordPress TwentyTwenty theme.
621		- // .container catches Customizr content.
622		- echo '<div class="container entry-content">';
623		- the_content();
624		- echo '</div>';
625		-
626		- // Prevent extra unexpected forms in the footer.
627		- // For some reason this happens in the Twenty Twenty Five theme.
628		- add_filter( 'frm_filter_final_form', '__return_empty_string' );
629		-
630		- self::get_template( 'footer' );
	529	+ self::get_template( 'footer' );
	530	+ }
631	531	}
632	532
633	533	/**
634	534	* Calls core function to get a template part if it doesn't cause deprecation warnings. Otherwise skips the deprecation function call
		@@ -634,11 +534,9 @@
634	534	* Calls core function to get a template part if it doesn't cause deprecation warnings. Otherwise skips the deprecation function call
635	535	* and renders required html fragments calling required functions.
636	536	*
637	537	* @since 6.7.1
638		- *
639	538	* @param string $template
640		- *
641	539	* @return void
642	540	*/
643	541	private static function get_template( $template ) {
644	542	if ( self::should_try_getting_template( $template ) ) {
		@@ -659,11 +557,9 @@
659	557	/**
660	558	* Returns true if calling a template function doesn't trigger deprecation warnings.
661	559	*
662	560	* @since 6.7.1
663		- *
664	561	* @param string $template
665		- *
666	562	* @return bool
667	563	*/
668	564	private static function should_try_getting_template( $template ) {
669	565	$stylesheet_path = get_stylesheet_directory();
		@@ -677,15 +573,15 @@
677	573	/**
678	574	* Set the page title for the theme preview page
679	575	*
680	576	* @since 3.0
681		- *
682		- * @param string $title
683		- *
684		- * @return string
685	577	*/
686	578	public static function preview_page_title( $title ) {
687		- return in_the_loop() ? self::preview_title( $title ) : $title;
	579	+ if ( in_the_loop() ) {
	580	+ $title = self::preview_title( $title );
	581	+ }
	582	+
	583	+ return $title;
688	584	}
689	585
690	586	/**
691	587	* Set the page title for the theme preview page.
		@@ -692,9 +588,8 @@
692	588	*
693	589	* @since 3.0
694	590	*
695	591	* @param string $title
696		- *
697	592	* @return string
698	593	*/
699	594	public static function preview_title( $title ) {
700	595	return __( 'Form Preview', 'formidable' );
		@@ -705,9 +600,8 @@
705	600	*
706	601	* @since 3.0
707	602	*
708	603	* @param string $content
709		- *
710	604	* @return string
711	605	*/
712	606	public static function preview_content( $content ) {
713	607	if ( in_the_loop() ) {
		@@ -722,39 +616,23 @@
722	616	/**
723	617	* @since 3.0
724	618	*/
725	619	private static function load_direct_preview() {
	620	+ header( 'Content-Type: text/html; charset=' . get_option( 'blog_charset' ) );
	621	+
	622	+ // print_emoji_styles is deprecated.
	623	+ remove_action( 'wp_print_styles', 'print_emoji_styles' );
	624	+
726	625	$key = FrmAppHelper::simple_get( 'form', 'sanitize_title' );
727		-
728		- // phpcs:ignore Universal.Operators.StrictComparisons
729	626	if ( $key == '' ) {
730	627	$key = FrmAppHelper::get_post_param( 'form', '', 'sanitize_title' );
731	628	}
732	629
733		- if ( ! $key ) {
734		- $error = __( 'Form key is missing', 'formidable' );
735		- wp_die(
736		- '<h1>' . esc_html( $error ) . '</h1>',
737		- '<p>' . esc_html( $error ) . '</p>',
738		- 404
739		- );
740		- }
741		-
742		- self::maybe_block_preview( $key );
743		-
744	630	$form = FrmForm::getAll( array( 'form_key' => $key ), '', 1 );
745		-
746		- if ( ! $form ) {
747		- $error = __( 'Form does not exist', 'formidable' );
748		- wp_die(
749		- '<h1>' . esc_html( $error ) . '</h1>',
750		- '<p>' . esc_html( $error ) . '</p>',
751		- 404
752		- );
	631	+ if ( empty( $form ) ) {
	632	+ $form = FrmForm::getAll( array(), '', 1 );
753	633	}
754	634
755		- header( 'Content-Type: text/html; charset=' . get_option( 'blog_charset' ) );
756		-
757	635	self::fix_deprecated_null_param_warning();
758	636
759	637	require FrmAppHelper::plugin_path() . '/classes/views/frm-entries/direct.php';
760	638	}
		@@ -759,33 +637,8 @@
759	637	require FrmAppHelper::plugin_path() . '/classes/views/frm-entries/direct.php';
760	638	}
761	639
762	640	/**
763		- * Block the form preview for the contact form by default if the user cannot view forms.
764		- * This is to prevent the contact form being exploited.
765		- * Since this form is added by default and every site uses the same key, it is too easy
766		- * to guess this form.
767		- *
768		- * @since 6.20
769		- *
770		- * @param string $form_key Form key.
771		- *
772		- * @return void
773		- */
774		- public static function maybe_block_preview( $form_key ) {
775		- if ( ! FrmFormsHelper::should_block_preview( $form_key ) ) {
776		- return;
777		- }
778		-
779		- $error = __( 'You do not have permission to view this form', 'formidable' );
780		- wp_die(
781		- '<h1>' . esc_html( $error ) . '</h1>',
782		- '<p>' . esc_html( $error ) . '</p>',
783		- 403
784		- );
785		- }
786		-
787		- /**
788	641	* Some themes have a null $src value.
789	642	* This function adds a filter to ensure that $src is not null.
790	643	* WP will call str_starts_with with the null value triggering a deprecated message otherwise.
791	644	*
		@@ -797,13 +650,15 @@
797	650	add_filter(
798	651	'script_loader_src',
799	652	/**
800	653	* @param string|null $src
801		- *
802	654	* @return string
803	655	*/
804	656	function ( $src ) {
805		- return is_null( $src ) ? '' : $src;
	657	+ if ( is_null( $src ) ) {
	658	+ $src = '';
	659	+ }
	660	+ return $src;
806	661	}
807	662	);
808	663	}
809	664
		@@ -812,9 +667,8 @@
812	667	}
813	668
814	669	/**
815	670	* @param array $ids
816		- *
817	671	* @return string
818	672	*/
819	673	public static function bulk_untrash( $ids ) {
820	674	FrmAppHelper::permission_check( 'frm_edit_forms' );
		@@ -826,9 +680,11 @@
826	680	return '';
827	681	}
828	682
829	683	/* translators: %1$s: Number of forms */
830		- return sprintf( _n( '%1$s form restored from the Trash.', '%1$s forms restored from the Trash.', $count, 'formidable' ), $count );
	684	+ $message = sprintf( _n( '%1$s form restored from the Trash.', '%1$s forms restored from the Trash.', $count, 'formidable' ), $count );
	685	+
	686	+ return $message;
831	687	}
832	688
833	689	/**
834	690	* @since 3.06
		@@ -873,9 +729,8 @@
873	729	// Check nonce url.
874	730	check_admin_referer( $status . '_form_' . $params['id'] );
875	731
876	732	$count = 0;
877		-
878	733	if ( FrmForm::set_status( $params['id'], $available_status[ $status ]['new_status'] ) ) {
879	734	++$count;
880	735	}
881	736
		@@ -889,9 +744,9 @@
889	744	/* translators: %1$s: Number of forms */
890	745	$available_status['untrash']['message'] = sprintf( _n( '%1$s form restored from the Trash.', '%1$s forms restored from the Trash.', $count, 'formidable' ), $count );
891	746
892	747	/* translators: %1$s: Number of forms, %2$s: Start link HTML, %3$s: End link HTML */
893		- $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
	748	+ $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>' );
894	749
895	750	$message = $available_status[ $status ]['message'];
896	751
897	752	self::display_forms_list( $params, $message );
		@@ -898,9 +753,8 @@
898	753	}
899	754
900	755	/**
901	756	* @param array $ids
902		- *
903	757	* @return string
904	758	*/
905	759	public static function bulk_trash( $ids ) {
906	760	FrmAppHelper::permission_check( 'frm_delete_forms' );
		@@ -905,9 +759,8 @@
905	759	public static function bulk_trash( $ids ) {
906	760	FrmAppHelper::permission_check( 'frm_delete_forms' );
907	761
908	762	$count = 0;
909		-
910	763	foreach ( $ids as $id ) {
911	764	if ( FrmForm::trash( $id ) ) {
912	765	++$count;
913	766	}
		@@ -912,12 +765,8 @@
912	765	++$count;
913	766	}
914	767	}
915	768
916		- if ( ! $count ) {
917		- return '';
918		- }
919		-
920	769	$current_page = FrmAppHelper::get_simple_request(
921	770	array(
922	771	'param' => 'form_type',
923	772	'type' => 'request',
		@@ -922,16 +771,17 @@
922	771	'param' => 'form_type',
923	772	'type' => 'request',
924	773	)
925	774	);
926		-
927		- return sprintf(
	775	+ $message = sprintf(
928	776	/* translators: %1$s: Number of forms, %2$s: Start link HTML, %3$s: End link HTML */
929	777	_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' ),
930	778	$count,
931		- '<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
	779	+ '<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' ) ) . '">',
932	780	'</a>'
933	781	);
	782	+
	783	+ return $message;
934	784	}
935	785
936	786	public static function destroy() {
937	787	FrmAppHelper::permission_check( 'frm_delete_forms' );
		@@ -941,9 +791,8 @@
941	791	// Check nonce url.
942	792	check_admin_referer( 'destroy_form_' . $params['id'] );
943	793
944	794	$count = 0;
945		-
946	795	if ( FrmForm::destroy( $params['id'] ) ) {
947	796	++$count;
948	797	}
949	798
		@@ -954,9 +803,8 @@
954	803	}
955	804
956	805	/**
957	806	* @param array $ids
958		- *
959	807	* @return string
960	808	*/
961	809	public static function bulk_destroy( $ids ) {
962	810	FrmAppHelper::permission_check( 'frm_delete_forms' );
		@@ -961,12 +809,10 @@
961	809	public static function bulk_destroy( $ids ) {
962	810	FrmAppHelper::permission_check( 'frm_delete_forms' );
963	811
964	812	$count = 0;
965		-
966	813	foreach ( $ids as $id ) {
967	814	$d = FrmForm::destroy( $id );
968		-
969	815	if ( $d ) {
970	816	++$count;
971	817	}
972	818	}
		@@ -984,18 +830,19 @@
984	830	*/
985	831	public static function delete_all() {
986	832	// Check nonce url.
987	833	$permission_error = FrmAppHelper::permission_nonce_error( 'frm_delete_forms', '_wpnonce', 'bulk-toplevel_page_formidable' );
988		-
989	834	if ( $permission_error !== false ) {
990	835	self::display_forms_list( array(), '', array( $permission_error ) );
	836	+
991	837	return;
992	838	}
993	839
994	840	$count = FrmForm::scheduled_delete( time() );
995	841	$url = remove_query_arg( array( 'delete_all' ) );
996		- $url .= '&message=forms_permanently_deleted&forms_deleted=' . $count;
997	842
	843	+ $url .= '&message=forms_permanently_deleted&forms_deleted=' . $count;
	844	+
998	845	wp_safe_redirect( $url );
999	846	die();
1000	847	}
1001	848
		@@ -1069,22 +916,21 @@
1069	916	*
1070	917	* @return void
1071	918	*/
1072	919	public static function insert_form_button() {
1073		- if ( ! current_user_can( 'frm_view_forms' ) ) {
1074		- return;
	920	+ if ( current_user_can( 'frm_view_forms' ) ) {
	921	+ // Store the result in memory and re-use it when this function is called multiple times.
	922	+ // This helps speed up the form builder when there are a lot of HTML fields, where this
	923	+ // button is inserted once per HTML field.
	924	+ // In a form with 66 HTML fields, this saves 0.5 seconds on page load time, tested locally.
	925	+ if ( ! isset( self::$formidable_tinymce_button ) ) {
	926	+ FrmAppHelper::load_admin_wide_js();
	927	+ $menu_name = FrmAppHelper::get_menu_name();
	928	+ $icon = apply_filters( 'frm_media_icon', FrmAppHelper::svg_logo() );
	929	+ 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>';
	930	+ }
	931	+ echo self::$formidable_tinymce_button; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
1075	932	}
1076		-
1077		- // Store the result in memory and re-use it when this function is called multiple times.
1078		- // This helps speed up the form builder when there are a lot of HTML fields, where this
1079		- // Button is inserted once per HTML field.
1080		- // In a form with 66 HTML fields, this saves 0.5 seconds on page load time, tested locally.
1081		- if ( ! isset( self::$formidable_tinymce_button ) ) {
1082		- FrmAppHelper::load_admin_wide_js();
1083		- $icon = apply_filters( 'frm_media_icon', FrmAppHelper::svg_logo() );
1084		- 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
1085		- }
1086		- echo self::$formidable_tinymce_button; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
1087	933	}
1088	934
1089	935	/**
1090	936	* @return void
		@@ -1105,21 +951,17 @@
1105	951	$shortcodes = apply_filters( 'frm_popup_shortcodes', $shortcodes );
1106	952
1107	953	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/insert_form_popup.php';
1108	954
1109		- if ( ! FrmAppHelper::is_form_builder_page() || class_exists( '_WP_Editors', false ) ) {
1110		- return;
	955	+ if ( FrmAppHelper::is_form_builder_page() && ! class_exists( '_WP_Editors', false ) ) {
	956	+ // initialize a wysiwyg so we have usable settings defined in tinyMCEPreInit.mceInit
	957	+ require ABSPATH . WPINC . '/class-wp-editor.php';
	958	+ ?>
	959	+ <div class="frm_hidden">
	960	+ <?php wp_editor( '', 'frm_description_placeholder', array() ); ?>
	961	+ </div>
	962	+ <?php
1111	963	}
1112		-
1113		- // Initialize a wysiwyg so we have usable settings defined in tinyMCEPreInit.mceInit
1114		- require ABSPATH . WPINC . '/class-wp-editor.php';
1115		- // phpcs:disable Generic.WhiteSpace.ScopeIndent
1116		- ?>
1117		- <div class="frm_hidden">
1118		- <?php wp_editor( '', 'frm_description_placeholder', array() ); ?>
1119		- </div>
1120		- <?php
1121		- // phpcs:enable Generic.WhiteSpace.ScopeIndent
1122	964	}
1123	965
1124	966	/**
1125	967	* Check the page being loaded, determine if this is a page that should include the form popup.
		@@ -1131,9 +973,8 @@
1131	973	private static function should_insert_form_popup() {
1132	974	if ( FrmAppHelper::is_form_builder_page() ) {
1133	975	return true;
1134	976	}
1135		-
1136	977	$page = basename( FrmAppHelper::get_server_value( 'PHP_SELF' ) );
1137	978	return in_array( $page, array( 'post.php', 'page.php', 'page-new.php', 'post-new.php' ), true );
1138	979	}
1139	980
		@@ -1141,10 +982,9 @@
1141	982	FrmAppHelper::permission_check( 'frm_view_forms' );
1142	983	check_ajax_referer( 'frm_ajax', 'nonce' );
1143	984
1144	985	$shortcode = FrmAppHelper::get_post_param( 'shortcode', '', 'sanitize_text_field' );
1145		-
1146		- if ( ! $shortcode ) {
	986	+ if ( empty( $shortcode ) ) {
1147	987	wp_die();
1148	988	}
1149	989
1150	990	echo '<div id="sc-opts-' . esc_attr( $shortcode ) . '" class="frm_shortcode_option">';
		@@ -1169,13 +1009,12 @@
1169	1009	'label' => __( 'Minimize form HTML', 'formidable' ),
1170	1010	),
1171	1011	);
1172	1012	}
1173		-
1174	1013	$opts = apply_filters( 'frm_sc_popup_opts', $opts, $shortcode );
1175	1014
1176	1015	if ( isset( $opts['form_id'] ) && is_string( $opts['form_id'] ) ) {
1177		- // Allow other shortcodes to use the required form id option
	1016	+ // allow other shortcodes to use the required form id option
1178	1017	$form_id = $opts['form_id'];
1179	1018	unset( $opts['form_id'] );
1180	1019	}
1181	1020
		@@ -1191,9 +1030,8 @@
1191	1030	*
1192	1031	* @param array $params
1193	1032	* @param string $message
1194	1033	* @param array $errors
1195		- *
1196	1034	* @return void
1197	1035	*/
1198	1036	public static function display_forms_list( $params = array(), $message = '', $errors = array() ) {
1199	1037	FrmAppHelper::permission_check( 'frm_view_forms' );
		@@ -1210,56 +1048,35 @@
1210	1048	* @param string $table_class Class name for List Helper.
1211	1049	*/
1212	1050	$table_class = apply_filters( 'frm_forms_list_class', 'FrmFormsListHelper' );
1213	1051	$wp_list_table = new $table_class( compact( 'params' ) );
1214		- $pagenum = $wp_list_table->get_pagenum();
1215	1052
	1053	+ $pagenum = $wp_list_table->get_pagenum();
	1054	+
1216	1055	$wp_list_table->prepare_items();
1217	1056
1218	1057	$total_pages = $wp_list_table->get_pagination_arg( 'total_pages' );
1219		-
1220	1058	if ( $pagenum > $total_pages && $total_pages > 0 ) {
1221		- wp_safe_redirect( esc_url_raw( add_query_arg( 'paged', $total_pages ) ) );
	1059	+ wp_redirect( esc_url_raw( add_query_arg( 'paged', $total_pages ) ) );
1222	1060	die();
1223	1061	}
1224	1062
1225		- $error = FrmInbox::check_for_error();
1226		-
1227		- if ( $error ) {
1228		- $show_messages = array( $error['subject'] . '. ' . $error['message'] );
1229		- }
1230		-
1231	1063	require FrmAppHelper::plugin_path() . '/classes/views/frm-forms/list.php';
1232	1064	}
1233	1065
1234	1066	/**
1235	1067	* @param array<string,string> $columns
1236		- *
1237	1068	* @return array<string,string>
1238	1069	*/
1239	1070	public static function get_columns( $columns ) {
1240		- $columns['cb'] = '<input type="checkbox" />';
1241		- $columns['name'] = esc_html__( 'Form Title', 'formidable' );
1242		- $columns['entries'] = esc_html__( 'Entries', 'formidable' );
1243		- $columns['views'] = esc_html__( 'Views', 'formidable' );
1244		- $columns['id'] = 'ID';
1245		- $columns['form_key'] = esc_html__( 'Key', 'formidable' );
1246		-
1247		- if ( 'trash' !== FrmAppHelper::simple_get( 'form_type' ) && has_filter( 'frm_form_list_actions' ) ) {
1248		- // If there is any filters added, keep this column.
1249		- $columns['shortcode'] = esc_html__( 'Actions', 'formidable' );
1250		- }
1251		-
	1071	+ $columns['cb'] = '<input type="checkbox" />';
	1072	+ $columns['name'] = esc_html__( 'Form Title', 'formidable' );
	1073	+ $columns['entries'] = esc_html__( 'Entries', 'formidable' );
	1074	+ $columns['id'] = 'ID';
	1075	+ $columns['form_key'] = esc_html__( 'Key', 'formidable' );
	1076	+ $columns['shortcode'] = esc_html__( 'Actions', 'formidable' );
1252	1077	$columns['created_at'] = esc_html__( 'Date', 'formidable' );
1253	1078
1254		- if ( 'trash' !== FrmAppHelper::simple_get( 'form_type' ) ) {
1255		- $columns['embeds'] = esc_html__( 'Embeds', 'formidable' );
1256		- $columns['settings'] = '<div class="frm-forms-list-settings-btn-wrapper"><a href="#" class="frm-forms-list-settings-btn">';
1257		- $columns['settings'] .= FrmAppHelper::icon_by_class( 'frmfont frm_settings_icon', array( 'echo' => false ) );
1258		- $columns['settings'] .= '<span class="screen-reader-text">' . esc_html__( 'List settings', 'formidable' ) . '</span>';
1259		- $columns['settings'] .= '</a></div>';
1260		- }
1261		-
1262	1079	add_screen_option(
1263	1080	'per_page',
1264	1081	array(
1265	1082	'label' => __( 'Forms', 'formidable' ),
		@@ -1285,9 +1102,8 @@
1285	1102	}
1286	1103
1287	1104	/**
1288	1105	* @param mixed $hidden_columns
1289		- *
1290	1106	* @return array
1291	1107	*/
1292	1108	public static function hidden_columns( $hidden_columns ) {
1293	1109	if ( ! is_array( $hidden_columns ) ) {
		@@ -1308,18 +1124,11 @@
1308	1124
1309	1125	return $hidden_columns;
1310	1126	}
1311	1127
1312		- /**
1313		- * @param mixed $save
1314		- * @param string $option
1315		- * @param int|string $value
1316		- *
1317		- * @return mixed
1318		- */
1319	1128	public static function save_per_page( $save, $option, $value ) {
1320	1129	if ( $option === 'formidable_page_formidable_per_page' ) {
1321		- return (int) $value;
	1130	+ $save = (int) $value;
1322	1131	}
1323	1132
1324	1133	return $save;
1325	1134	}
		@@ -1328,9 +1137,8 @@
1328	1137	* @param int|string $id
1329	1138	* @param array $errors
1330	1139	* @param string $message
1331	1140	* @param bool $create_link
1332		- *
1333	1141	* @return void
1334	1142	*/
1335	1143	private static function get_edit_vars( $id, $errors = array(), $message = '', $create_link = false ) {
1336	1144	global $frm_vars;
		@@ -1345,9 +1153,8 @@
1345	1153	'page' => 'formidable',
1346	1154	)
1347	1155	),
1348	1156	);
1349		-
1350	1157	if ( ! $form ) {
1351	1158	FrmAppController::show_error_modal( $error_args );
1352	1159	return;
1353	1160	}
		@@ -1369,14 +1176,15 @@
1369	1176	}
1370	1177
1371	1178	if ( $form->parent_form_id ) {
1372	1179	/* translators: %1$s: Start link HTML, %2$s: End link HTML */
1373		- 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
	1180	+ 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>' ) );
1374	1181	}
1375	1182
1376	1183	$frm_field_selection = FrmField::field_selection();
1377		- $fields = FrmField::get_all_for_form( $form->id );
1378	1184
	1185	+ $fields = FrmField::get_all_for_form( $form->id );
	1186	+
1379	1187	// Automatically add end section fields if they don't exist (2.0 migration).
1380	1188	$reset_fields = false;
1381	1189	FrmFormsHelper::auto_add_end_section_fields( $form, $fields, $reset_fields );
1382	1190	FrmSubmitHelper::maybe_create_submit_field( $form, $fields, $reset_fields );
		@@ -1400,10 +1208,9 @@
1400	1208	*/
1401	1209	$values['fields'] = apply_filters( 'frm_fields_in_form_builder', $fields, compact( 'form' ) );
1402	1210
1403	1211	$edit_message = __( 'Form was successfully updated.', 'formidable' );
1404		-
1405		- if ( $form->is_template && $message === $edit_message ) {
	1212	+ if ( $form->is_template && $message == $edit_message ) {
1406	1213	$message = __( 'Template was successfully updated.', 'formidable' );
1407	1214	}
1408	1215
1409	1216	self::maybe_update_form_builder_message( $message );
		@@ -1418,12 +1225,11 @@
1418	1225	}
1419	1226
1420	1227	/**
1421	1228	* @param array $fields
1422		- *
1423	1229	* @return array
1424	1230	*/
1425		- public static function update_form_builder_fields( $fields ) {
	1231	+ public static function update_form_builder_fields( $fields, $form ) {
1426	1232	foreach ( $fields as $field ) {
1427	1233	$field->do_not_include_icons = true;
1428	1234	}
1429	1235	return $fields;
		@@ -1428,13 +1234,8 @@
1428	1234	}
1429	1235	return $fields;
1430	1236	}
1431	1237
1432		- /**
1433		- * @param string $message
1434		- *
1435		- * @return void
1436		- */
1437	1238	public static function maybe_update_form_builder_message( &$message ) {
1438	1239	if ( 'form_duplicated' === FrmAppHelper::simple_get( 'message' ) ) {
1439	1240	$message = __( 'Form was Successfully Copied', 'formidable' );
1440	1241	}
		@@ -1443,9 +1244,8 @@
1443	1244	/**
1444	1245	* @param int|string $id
1445	1246	* @param array $errors
1446	1247	* @param array|string $args
1447		- *
1448	1248	* @return void
1449	1249	*/
1450	1250	public static function get_settings_vars( $id, $errors = array(), $args = array() ) {
1451	1251	FrmAppHelper::permission_check( 'frm_edit_forms' );
		@@ -1467,12 +1267,13 @@
1467	1267	);
1468	1268	$args = array_merge( $defaults, $args );
1469	1269	$message = $args['message'];
1470	1270	$warnings = $args['warnings'];
1471		- $form = FrmForm::getOne( $id );
1472		- $fields = FrmField::get_all_for_form( $id );
1473		- $values = FrmAppHelper::setup_edit_vars( $form, 'forms', $fields, true );
1474	1271
	1272	+ $form = FrmForm::getOne( $id );
	1273	+ $fields = FrmField::get_all_for_form( $id );
	1274	+ $values = FrmAppHelper::setup_edit_vars( $form, 'forms', $fields, true );
	1275	+
1475	1276	/**
1476	1277	* Allows changing fields in the form settings.
1477	1278	*
1478	1279	* @since 5.0.04
		@@ -1512,12 +1313,8 @@
1512	1313	}
1513	1314
1514	1315	/**
1515	1316	* @since 4.0
1516		- *
1517		- * @param array $atts
1518		- *
1519		- * @return void
1520	1317	*/
1521	1318	public static function form_publish_button( $atts ) {
1522	1319	$values = $atts['values'];
1523	1320	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/_publish_box.php';
		@@ -1528,9 +1325,8 @@
1528	1325	*
1529	1326	* @since 4.0
1530	1327	*
1531	1328	* @param array $values
1532		- *
1533	1329	* @return array
1534	1330	*/
1535	1331	private static function get_settings_tabs( $values ) {
1536	1332	$sections = array(
		@@ -1536,20 +1332,20 @@
1536	1332	$sections = array(
1537	1333	'advanced' => array(
1538	1334	'name' => __( 'General', 'formidable' ),
1539	1335	'title' => __( 'General Form Settings', 'formidable' ),
1540		- 'function' => array( self::class, 'advanced_settings' ),
1541		- 'icon' => 'frmfont frm_small_settings_icon',
	1336	+ 'function' => array( __CLASS__, 'advanced_settings' ),
	1337	+ 'icon' => 'frm_icon_font frm_settings_icon',
1542	1338	),
1543	1339	'email' => array(
1544	1340	'name' => __( 'Actions & Notifications', 'formidable' ),
1545	1341	'function' => array( 'FrmFormActionsController', 'email_settings' ),
1546	1342	'id' => 'frm_notification_settings',
1547		- 'icon' => 'frmfont frm_notification_check_icon',
	1343	+ 'icon' => 'frm_icon_font frm_mail_bulk_icon',
1548	1344	),
1549	1345	'permissions' => array(
1550	1346	'name' => __( 'Form Permissions', 'formidable' ),
1551		- 'icon' => 'frmfont frm_lock_closed2_icon',
	1347	+ 'icon' => 'frm_icon_font frm_lock_closed_icon',
1552	1348	'html_class' => 'frm_show_upgrade_tab frm_noallow',
1553	1349	'data' => array(
1554	1350	'medium' => 'permissions',
1555	1351	'upgrade' => __( 'Form Permissions', 'formidable' ),
		@@ -1554,37 +1350,35 @@
1554	1350	'medium' => 'permissions',
1555	1351	'upgrade' => __( 'Form Permissions', 'formidable' ),
1556	1352	'message' => __( 'Allow editing, protect forms and files, limit entries, and save drafts. Upgrade to get form and entry permissions.', 'formidable' ),
1557	1353	'screenshot' => 'permissions.png',
1558		- 'learn-more' => FrmAppHelper::get_doc_url( 'general-form-settings/#kb-form-permissions', 'form-permissions-settings' ),
1559	1354	),
1560	1355	),
1561	1356	'scheduling' => array(
1562	1357	'name' => __( 'Form Scheduling', 'formidable' ),
1563		- 'icon' => 'frmfont frm_schedule_icon',
	1358	+ 'icon' => 'frm_icon_font frm_calendar_icon',
1564	1359	'html_class' => 'frm_show_upgrade_tab frm_noallow',
1565	1360	'data' => array(
1566	1361	'medium' => 'scheduling',
1567	1362	'upgrade' => __( 'Form scheduling settings', 'formidable' ),
1568	1363	'screenshot' => 'scheduling.png',
1569		- 'learn-more' => FrmAppHelper::get_doc_url( 'general-form-settings/#kb-form-scheduling', 'form-scheduling-settings' ),
1570	1364	),
1571	1365	),
1572	1366	'buttons' => array(
1573	1367	'name' => __( 'Buttons', 'formidable' ),
1574		- 'class' => self::class,
	1368	+ 'class' => __CLASS__,
1575	1369	'function' => 'buttons_settings',
1576		- 'icon' => 'frmfont frm-buttons-style',
	1370	+ 'icon' => 'frm_icon_font frm_button_icon',
1577	1371	),
1578	1372	'landing' => array(
1579	1373	'name' => __( 'Form Landing Page', 'formidable' ),
1580		- 'icon' => 'frmfont frm_cross_device_icon',
	1374	+ 'icon' => 'frm_icon_font frm_file_text_icon',
1581	1375	'html_class' => 'frm_show_upgrade_tab frm_noallow',
1582	1376	'data' => FrmAppHelper::get_landing_page_upgrade_data_params(),
1583	1377	),
1584	1378	'chat' => array(
1585	1379	'name' => __( 'Conversational Forms', 'formidable' ),
1586		- 'icon' => 'frmfont frm_chat_bubbles_icon',
	1380	+ 'icon' => 'frm_icon_font frm_chat_forms_icon',
1587	1381	'html_class' => 'frm_show_upgrade_tab frm_noallow',
1588	1382	'data' => FrmAppHelper::get_upgrade_data_params(
1589	1383	'chat',
1590	1384	array(
		@@ -1590,15 +1384,14 @@
1590	1384	array(
1591	1385	'upgrade' => __( 'Conversational Forms', 'formidable' ),
1592	1386	'message' => __( 'Ask one question at a time for automated conversations.', 'formidable' ),
1593	1387	'screenshot' => 'chat.png',
1594		- 'learn-more' => FrmAppHelper::get_doc_url( 'conversational-forms', 'conversational-forms-settings', false ),
1595	1388	)
1596	1389	),
1597	1390	),
1598	1391	'abandonment' => array(
1599	1392	'name' => __( 'Form Abandonment', 'formidable' ),
1600		- 'icon' => 'frmfont frm_abandoned_icon',
	1393	+ 'icon' => 'frm_icon_font frm_abandoned_icon',
1601	1394	'html_class' => 'frm_show_upgrade_tab frm_noallow',
1602	1395	'data' => FrmAppHelper::get_upgrade_data_params(
1603	1396	'abandonment',
1604	1397	array(
		@@ -1604,22 +1397,23 @@
1604	1397	array(
1605	1398	'upgrade' => __( 'Form abandonment settings', 'formidable' ),
1606	1399	'message' => __( 'Unlock the power of data capture to boost lead generation and master the art of form optimization.', 'formidable' ),
1607	1400	'screenshot' => 'abandonment.png',
1608		- 'learn-more' => FrmAppHelper::get_doc_url( 'features/form-abandonment-wordpress-plugin', 'form-abandonment-settings', false ),
1609	1401	)
1610	1402	),
1611	1403	),
1612	1404	'html' => array(
1613	1405	'name' => __( 'Customize HTML', 'formidable' ),
1614		- 'class' => self::class,
	1406	+ 'class' => __CLASS__,
1615	1407	'function' => 'html_settings',
1616		- 'icon' => 'frmfont frm_code2_icon',
	1408	+ 'icon' => 'frm_icon_font frm_code_icon',
1617	1409	),
1618	1410	);
1619	1411
1620		- if ( ! has_action( 'frm_add_form_style_tab_options' ) && ! has_action( 'frm_add_form_button_options' ) ) {
1621		- unset( $sections['buttons'] );
	1412	+ foreach ( array( 'landing', 'chat', 'abandonment' ) as $feature ) {
	1413	+ if ( ! FrmAppHelper::show_new_feature( $feature ) ) {
	1414	+ unset( $sections[ $feature ] );
	1415	+ }
1622	1416	}
1623	1417
1624	1418	$sections = apply_filters( 'frm_add_form_settings_section', $sections, $values );
1625	1419
		@@ -1626,9 +1420,9 @@
1626	1420	foreach ( $sections as $key => $section ) {
1627	1421	$defaults = array(
1628	1422	'html_class' => '',
1629	1423	'name' => ucfirst( $key ),
1630		- 'icon' => 'frmfont frm_settings_icon',
	1424	+ 'icon' => 'frm_icon_font frm_settings_icon',
1631	1425	);
1632	1426
1633	1427	$section = array_merge( $defaults, $section );
1634	1428
		@@ -1634,9 +1428,8 @@
1634	1428
1635	1429	if ( ! isset( $section['anchor'] ) ) {
1636	1430	$section['anchor'] = $key;
1637	1431	}
1638		-
1639	1432	$section['anchor'] .= '_settings';
1640	1433
1641	1434	if ( ! isset( $section['title'] ) ) {
1642	1435	$section['title'] = $section['name'];
		@@ -1655,19 +1448,18 @@
1655	1448	/**
1656	1449	* @since 4.0
1657	1450	*
1658	1451	* @param array $values
1659		- *
1660	1452	* @return void
1661	1453	*/
1662	1454	public static function advanced_settings( $values ) {
1663	1455	$first_h3 = 'frm_first_h3';
	1456	+
1664	1457	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings-advanced.php';
1665	1458	}
1666	1459
1667	1460	/**
1668	1461	* @param array $values
1669		- *
1670	1462	* @return void
1671	1463	*/
1672	1464	public static function render_spam_settings( $values ) {
1673	1465	if ( function_exists( 'akismet_http_post' ) ) {
		@@ -1672,9 +1464,9 @@
1672	1464	public static function render_spam_settings( $values ) {
1673	1465	if ( function_exists( 'akismet_http_post' ) ) {
1674	1466	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/spam-settings/akismet.php';
1675	1467	}
1676		- include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/spam-settings/stopforumspam.php';
	1468	+ include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/spam-settings/honeypot.php';
1677	1469	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/spam-settings/antispam.php';
1678	1470	}
1679	1471
1680	1472	/**
		@@ -1680,9 +1472,8 @@
1680	1472	/**
1681	1473	* @since 4.0
1682	1474	*
1683	1475	* @param array $values
1684		- *
1685	1476	* @return void
1686	1477	*/
1687	1478	public static function buttons_settings( $values ) {
1688	1479	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings-buttons.php';
		@@ -1691,9 +1482,8 @@
1691	1482	/**
1692	1483	* @since 4.0
1693	1484	*
1694	1485	* @param array $values
1695		- *
1696	1486	* @return void
1697	1487	*/
1698	1488	public static function html_settings( $values ) {
1699	1489	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings-html.php';
		@@ -1704,9 +1494,8 @@
1704	1494	*
1705	1495	* @since 2.03.08
1706	1496	*
1707	1497	* @param array|bool $values
1708		- *
1709	1498	* @return void
1710	1499	*/
1711	1500	private static function clean_submit_html( &$values ) {
1712	1501	if ( is_array( $values ) && isset( $values['submit_html'] ) ) {
		@@ -1729,17 +1518,13 @@
1729	1518	return $classes;
1730	1519	}
1731	1520
1732	1521	/**
1733		- * @since 6.27 Added $template_path parameter.
1734		- *
1735	1522	* @param int|string $form_id
1736	1523	* @param string $class
1737		- * @param string $template_path The path to a template file to use instead of the default.
1738		- *
1739	1524	* @return void
1740	1525	*/
1741		- public static function mb_tags_box( $form_id, $class = '', $template_path = 'default' ) {
	1526	+ public static function mb_tags_box( $form_id, $class = '' ) {
1742	1527	$fields = FrmField::get_all_for_form( $form_id, '', 'include' );
1743	1528
1744	1529	/**
1745	1530	* Allows modifying the list of fields in the tags box.
		@@ -1748,30 +1533,23 @@
1748	1533	*
1749	1534	* @param array $fields The list of fields.
1750	1535	* @param array $args The arguments. Contains `form_id`.
1751	1536	*/
1752		- $fields = apply_filters( 'frm_fields_in_tags_box', $fields, compact( 'form_id' ) );
1753		- $linked_forms = array();
1754		- $col = 'one';
1755		- $settings_tab = FrmAppHelper::is_admin_page( 'formidable' );
	1537	+ $fields = apply_filters( 'frm_fields_in_tags_box', $fields, compact( 'form_id' ) );
	1538	+ $linked_forms = array();
	1539	+ $col = 'one';
	1540	+ $settings_tab = FrmAppHelper::is_admin_page( 'formidable' );
	1541	+
1756	1542	$cond_shortcodes = apply_filters( 'frm_conditional_shortcodes', array() );
1757	1543	$entry_shortcodes = self::get_shortcode_helpers( $settings_tab );
	1544	+
1758	1545	$advanced_helpers = self::advanced_helpers( compact( 'fields', 'form_id' ) );
1759	1546
1760		- if ( 'default' === $template_path || ! file_exists( $template_path ) ) {
1761		- include FrmAppHelper::plugin_path() . '/classes/views/shared/mb_adv_info.php';
1762		- return;
1763		- }
1764		-
1765		- include $template_path;
	1547	+ include FrmAppHelper::plugin_path() . '/classes/views/shared/mb_adv_info.php';
1766	1548	}
1767	1549
1768	1550	/**
1769	1551	* @since 3.04.01
1770		- *
1771		- * @param array $atts
1772		- *
1773		- * @return array
1774	1552	*/
1775	1553	private static function advanced_helpers( $atts ) {
1776	1554	$advanced_helpers = array(
1777	1555	'default' => array(
		@@ -1780,12 +1558,10 @@
1780	1558	),
1781	1559	);
1782	1560
1783	1561	$user_fields = self::user_shortcodes();
1784		-
1785	1562	if ( $user_fields ) {
1786	1563	$user_helpers = array();
1787		-
1788	1564	foreach ( $user_fields as $uk => $uf ) {
1789	1565	$user_helpers[ '|user_id| show="' . $uk . '"' ] = $uf;
1790	1566	unset( $uk, $uf );
1791	1567	}
		@@ -1810,10 +1586,8 @@
1810	1586	* Get an array of the options to display in the advanced tab
1811	1587	* of the customization panel
1812	1588	*
1813	1589	* @since 2.0.6
1814		- *
1815		- * @return array
1816	1590	*/
1817	1591	private static function get_advanced_shortcodes() {
1818	1592	$adv_shortcodes = array(
1819	1593	'x sep=", "' => array(
		@@ -1830,18 +1604,17 @@
1830	1604	'label' => __( 'No Auto P', 'formidable' ),
1831	1605	'title' => __( 'Do not automatically add any paragraphs or line breaks', 'formidable' ),
1832	1606	),
1833	1607	);
	1608	+ $adv_shortcodes = apply_filters( 'frm_advanced_shortcodes', $adv_shortcodes );
1834	1609
1835	1610	// __( 'Leave blank instead of defaulting to User Login', 'formidable' ) : blank=1
1836	1611
1837		- return apply_filters( 'frm_advanced_shortcodes', $adv_shortcodes );
	1612	+ return $adv_shortcodes;
1838	1613	}
1839	1614
1840	1615	/**
1841	1616	* @since 3.04.01
1842		- *
1843		- * @return array
1844	1617	*/
1845	1618	private static function user_shortcodes() {
1846	1619	$options = array(
1847	1620	'ID' => __( 'User ID', 'formidable' ),
		@@ -1860,12 +1633,8 @@
1860	1633	/**
1861	1634	* Get an array of the helper shortcodes to display in the customization panel
1862	1635	*
1863	1636	* @since 2.0.6
1864		- *
1865		- * @param bool $settings_tab
1866		- *
1867		- * @return array
1868	1637	*/
1869	1638	private static function get_shortcode_helpers( $settings_tab ) {
1870	1639	$entry_shortcodes = array(
1871	1640	'id' => __( 'Entry ID', 'formidable' ),
		@@ -1876,27 +1645,30 @@
1876	1645	'updated-at' => __( 'Entry updated', 'formidable' ),
1877	1646	'' => '',
1878	1647	'siteurl' => __( 'Site URL', 'formidable' ),
1879	1648	'sitename' => __( 'Site Name', 'formidable' ),
1880		- 'form_name' => __( 'Form Name', 'formidable' ),
1881	1649	);
1882	1650
1883		- $entry_shortcodes = array_merge( FrmShortcodeHelper::get_contextual_shortcode_values(), $entry_shortcodes );
1884		-
1885	1651	if ( ! FrmAppHelper::pro_is_installed() ) {
1886	1652	unset( $entry_shortcodes['post_id'] );
1887	1653	}
1888	1654
	1655	+ if ( $settings_tab ) {
	1656	+ $entry_shortcodes['default-message'] = __( 'Default Msg', 'formidable' );
	1657	+ $entry_shortcodes['default-html'] = __( 'Default HTML', 'formidable' );
	1658	+ $entry_shortcodes['default-plain'] = __( 'Default Plain', 'formidable' );
	1659	+ $entry_shortcodes['form_name'] = __( 'Form Name', 'formidable' );
	1660	+ }
	1661	+
1889	1662	/**
1890	1663	* Use this hook to add or remove buttons in the helpers section
1891	1664	* in the customization panel
1892	1665	*
1893	1666	* @since 2.0.6
1894		- *
1895		- * @param array $entry_shortcodes
1896		- * @param bool $settings_tab
1897	1667	*/
1898		- return apply_filters( 'frm_helper_shortcodes', $entry_shortcodes, $settings_tab );
	1668	+ $entry_shortcodes = apply_filters( 'frm_helper_shortcodes', $entry_shortcodes, $settings_tab );
	1669	+
	1670	+ return $entry_shortcodes;
1899	1671	}
1900	1672
1901	1673	/**
1902	1674	* Insert the form class setting into the form.
		@@ -1901,9 +1673,8 @@
1901	1673	/**
1902	1674	* Insert the form class setting into the form.
1903	1675	*
1904	1676	* @param stdClass $form
1905		- *
1906	1677	* @return void
1907	1678	*/
1908	1679	public static function form_classes( $form ) {
1909	1680	if ( isset( $form->options['form_class'] ) ) {
		@@ -1914,9 +1685,9 @@
1914	1685	echo ' frm_js_validate ';
1915	1686	self::add_js_validate_form_to_global_vars( $form );
1916	1687	}
1917	1688
1918		- if ( FrmForm::is_ajax_on( $form ) ) {
	1689	+ if ( ! FrmFormsHelper::should_use_pro_for_ajax_submit() && FrmForm::is_ajax_on( $form ) ) {
1919	1690	echo ' frm_ajax_submit ';
1920	1691	}
1921	1692	}
1922	1693
		@@ -1926,9 +1697,8 @@
1926	1697	* @param stdClass $form
1927	1698	*/
1928	1699	public static function add_js_validate_form_to_global_vars( $form ) {
1929	1700	global $frm_vars;
1930		-
1931	1701	if ( ! isset( $frm_vars['js_validate_forms'] ) ) {
1932	1702	$frm_vars['js_validate_forms'] = array();
1933	1703	}
1934	1704	$frm_vars['js_validate_forms'][ $form->id ] = $form;
		@@ -1951,9 +1721,8 @@
1951	1721	/**
1952	1722	* @param string $content
1953	1723	* @param int|stdClass|string $form
1954	1724	* @param false|int|stdClass|string $entry
1955		- *
1956	1725	* @return string
1957	1726	*/
1958	1727	public static function filter_content( $content, $form, $entry = false ) {
1959	1728	$content = self::replace_form_name_shortcodes( $content, $form );
		@@ -1958,9 +1727,8 @@
1958	1727	public static function filter_content( $content, $form, $entry = false ) {
1959	1728	$content = self::replace_form_name_shortcodes( $content, $form );
1960	1729
1961	1730	self::get_entry_by_param( $entry );
1962		-
1963	1731	if ( ! $entry ) {
1964	1732	return $content;
1965	1733	}
1966	1734
		@@ -1976,10 +1744,11 @@
1976	1744	$form = $entry->parent_entry->form_id;
1977	1745	}
1978	1746
1979	1747	$shortcodes = FrmFieldsHelper::get_shortcodes( $content, $form );
	1748	+ $content = apply_filters( 'frm_replace_content_shortcodes', $content, $entry, $shortcodes );
1980	1749
1981		- return apply_filters( 'frm_replace_content_shortcodes', $content, $entry, $shortcodes );
	1750	+ return $content;
1982	1751	}
1983	1752
1984	1753	/**
1985	1754	* Replace any [form_name] shortcodes in a string.
		@@ -1987,9 +1756,8 @@
1987	1756	* @since 5.5
1988	1757	*
1989	1758	* @param array|string $string
1990	1759	* @param int|stdClass|string $form
1991		- *
1992	1760	* @return array|string
1993	1761	*/
1994	1762	public static function replace_form_name_shortcodes( $string, $form ) {
1995	1763	if ( ! is_string( $string ) ) {
		@@ -1995,9 +1763,9 @@
1995	1763	if ( ! is_string( $string ) ) {
1996	1764	return $string;
1997	1765	}
1998	1766
1999		- if ( ! str_contains( $string, '[form_name]' ) ) {
	1767	+ if ( false === strpos( $string, '[form_name]' ) ) {
2000	1768	return $string;
2001	1769	}
2002	1770
2003	1771	if ( ! is_object( $form ) ) {
		@@ -2009,30 +1777,20 @@
2009	1777	}
2010	1778
2011	1779	/**
2012	1780	* @param false|int|stdClass|string $entry
2013		- *
2014	1781	* @return void
2015	1782	*/
2016	1783	private static function get_entry_by_param( &$entry ) {
2017		- if ( $entry && is_object( $entry ) ) {
2018		- return;
2019		- }
	1784	+ if ( ! $entry || ! is_object( $entry ) ) {
	1785	+ if ( ! $entry || ! is_numeric( $entry ) ) {
	1786	+ $entry = FrmAppHelper::get_post_param( 'id', false, 'sanitize_title' );
	1787	+ }
2020	1788
2021		- if ( ! $entry || ! is_numeric( $entry ) ) {
2022		- $entry = FrmAppHelper::get_post_param( 'id', false, 'sanitize_title' );
	1789	+ FrmEntry::maybe_get_entry( $entry );
2023	1790	}
2024		-
2025		- FrmEntry::maybe_get_entry( $entry );
2026	1791	}
2027	1792
2028		- /**
2029		- * @param string $content
2030		- * @param false|object $entry
2031		- * @param array $shortcodes
2032		- *
2033		- * @return string
2034		- */
2035	1793	public static function replace_content_shortcodes( $content, $entry, $shortcodes ) {
2036	1794	return FrmFieldsHelper::replace_content_shortcodes( $content, $entry, $shortcodes );
2037	1795	}
2038	1796
		@@ -2037,9 +1795,8 @@
2037	1795	}
2038	1796
2039	1797	/**
2040	1798	* @param array $errors
2041		- *
2042	1799	* @return array
2043	1800	*/
2044	1801	public static function process_bulk_form_actions( $errors ) {
2045	1802	if ( ! $_REQUEST ) {
		@@ -2046,30 +1803,29 @@
2046	1803	return $errors;
2047	1804	}
2048	1805
2049	1806	$bulkaction = FrmAppHelper::get_param( 'action', '', 'get', 'sanitize_text_field' );
2050		-
2051		- // phpcs:ignore Universal.Operators.StrictComparisons
2052	1807	if ( $bulkaction == - 1 ) {
2053	1808	$bulkaction = FrmAppHelper::get_param( 'action2', '', 'get', 'sanitize_title' );
2054	1809	}
2055	1810
2056		- if ( $bulkaction && str_starts_with( $bulkaction, 'bulk_' ) ) {
	1811	+ if ( ! empty( $bulkaction ) && strpos( $bulkaction, 'bulk_' ) === 0 ) {
2057	1812	FrmAppHelper::remove_get_action();
	1813	+
2058	1814	$bulkaction = str_replace( 'bulk_', '', $bulkaction );
2059	1815	}
2060	1816
2061	1817	$ids = FrmAppHelper::get_param( 'item-action', '', 'get', 'sanitize_text_field' );
	1818	+ if ( empty( $ids ) ) {
	1819	+ $errors[] = __( 'No forms were specified', 'formidable' );
2062	1820
2063		- if ( ! $ids ) {
2064		- $errors[] = __( 'No forms were specified', 'formidable' );
2065	1821	return $errors;
2066	1822	}
2067	1823
2068	1824	$permission_error = FrmAppHelper::permission_nonce_error( '', '_wpnonce', 'bulk-toplevel_page_formidable' );
2069		-
2070	1825	if ( $permission_error !== false ) {
2071	1826	$errors[] = $permission_error;
	1827	+
2072	1828	return $errors;
2073	1829	}
2074	1830
2075	1831	if ( ! is_array( $ids ) ) {
		@@ -2093,24 +1849,9 @@
2093	1849
2094	1850	return $errors;
2095	1851	}
2096	1852
2097		- /**
2098		- * Includes html that shows a message when the device is too small to use Formidable Forms admin pages.
2099		- *
2100		- * @since 6.20
2101		- *
2102		- * @return void
2103		- */
2104		- public static function include_device_too_small_message() {
2105		- if ( ! FrmAppHelper::is_formidable_admin() ) {
2106		- return;
2107		- }
2108		-
2109		- include FrmAppHelper::plugin_path() . '/classes/views/shared/small-device-message.php';
2110		- }
2111		-
2112		- public static function route() { // phpcs:ignore Generic.Metrics.CyclomaticComplexity.MaxExceeded
	1853	+ public static function route() {
2113	1854	$action = isset( $_REQUEST['frm_action'] ) ? 'frm_action' : 'action';
2114	1855	$vars = array();
2115	1856	FrmAppHelper::include_svg();
2116	1857
		@@ -2120,28 +1861,25 @@
2120	1861	// Javascript needs to be allowed in some field settings.
2121	1862	// phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized, WordPress.Security.NonceVerification.Missing
2122	1863	$json_vars = htmlspecialchars_decode( nl2br( str_replace( '&quot;', '"', wp_unslash( $_POST['frm_compact_fields'] ) ) ) );
2123	1864	$json_vars = json_decode( $json_vars, true );
	1865	+ if ( empty( $json_vars ) ) {
	1866	+ // json decoding failed so we should return an error message.
	1867	+ $action = FrmAppHelper::get_param( $action, '', 'get', 'sanitize_title' );
	1868	+ if ( 'edit' === $action ) {
	1869	+ $action = 'update';
	1870	+ }
2124	1871
2125		- if ( $json_vars ) {
	1872	+ add_filter( 'frm_validate_form', 'FrmFormsController::json_error' );
	1873	+ } else {
2126	1874	$vars = FrmAppHelper::json_to_array( $json_vars );
2127	1875	$action = $vars[ $action ];
2128	1876	unset( $_REQUEST['frm_compact_fields'], $_POST['frm_compact_fields'] ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
2129	1877	$_REQUEST = array_merge( $_REQUEST, $vars ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
2130	1878	$_POST = array_merge( $_POST, $_REQUEST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
2131		- } else {
2132		- // Json decoding failed so we should return an error message.
2133		- $action = FrmAppHelper::get_param( $action, '', 'get', 'sanitize_title' );
2134		-
2135		- if ( 'edit' === $action ) {
2136		- $action = 'update';
2137		- }
2138		-
2139		- add_filter( 'frm_validate_form', 'FrmFormsController::json_error' );
2140	1879	}
2141	1880	} else {
2142	1881	$action = FrmAppHelper::get_param( $action, '', 'get', 'sanitize_title' );
2143		-
2144	1882	if ( isset( $_REQUEST['delete_all'] ) ) {
2145	1883	// Override the action for this page.
2146	1884	$action = 'delete_all';
2147	1885	}
		@@ -2161,38 +1899,34 @@
2161	1899	case 'update_settings':
2162	1900	return self::$action( $vars );
2163	1901	case 'lite-reports':
2164	1902	self::no_reports( $vars );
2165		- return null;
	1903	+ return;
2166	1904	case 'views':
2167	1905	self::no_views( $vars );
2168		- return null;
	1906	+ return;
2169	1907	default:
2170	1908	do_action( 'frm_form_action_' . $action );
2171		-
2172	1909	if ( apply_filters( 'frm_form_stop_action_' . $action, false ) ) {
2173		- return null;
	1910	+ return;
2174	1911	}
2175	1912
2176	1913	$action = FrmAppHelper::get_param( 'action', '', 'get', 'sanitize_text_field' );
2177		-
2178		- // phpcs:ignore Universal.Operators.StrictComparisons
2179	1914	if ( $action == - 1 ) {
2180	1915	$action = FrmAppHelper::get_param( 'action2', '', 'get', 'sanitize_title' );
2181	1916	}
2182	1917
2183		- if ( str_starts_with( $action, 'bulk_' ) ) {
	1918	+ if ( strpos( $action, 'bulk_' ) === 0 ) {
2184	1919	FrmAppHelper::remove_get_action();
2185	1920
2186	1921	self::list_form();
2187		- return null;
	1922	+ return;
2188	1923	}
2189	1924
2190	1925	$message = FrmAppHelper::get_param( 'message' );
2191		-
2192	1926	if ( 'form_duplicate_error' === $message ) {
2193	1927	self::display_forms_list( array(), '', array( __( 'There was a problem duplicating the form', 'formidable' ) ) );
2194		- return null;
	1928	+ return;
2195	1929	}
2196	1930
2197	1931	if ( 'forms_permanently_deleted' === $message ) {
2198	1932	$count = FrmAppHelper::get_param( 'forms_deleted', 0, 'get', 'absint' );
		@@ -2198,14 +1932,14 @@
2198	1932	$count = FrmAppHelper::get_param( 'forms_deleted', 0, 'get', 'absint' );
2199	1933	/* translators: %1$s: Number of forms */
2200	1934	$message = sprintf( _n( '%1$s form permanently deleted.', '%1$s forms permanently deleted.', $count, 'formidable' ), $count );
2201	1935	self::display_forms_list( array(), $message, '' );
2202		- return null;
	1936	+ return;
2203	1937	}
2204	1938
2205	1939	self::display_forms_list();
2206	1940
2207		- return null;
	1941	+ return;
2208	1942	}//end switch
2209	1943	}
2210	1944
2211	1945	/**
		@@ -2224,45 +1958,30 @@
2224	1958
2225	1959	// Get posted data
2226	1960	$form_id = FrmAppHelper::get_post_param( 'form_id', '', 'absint' );
2227	1961	$name = FrmAppHelper::get_post_param( 'form_name', '', 'sanitize_text_field' );
2228		- $form = FrmForm::getOne( $form_id );
2229	1962
2230		- if ( ! $form ) {
2231		- wp_send_json_error( __( 'Form not found', 'formidable' ) );
2232		- }
	1963	+ // Update the form name and form key.
	1964	+ $form_key = FrmAppHelper::get_unique_key( sanitize_title( $name ), 'frm_forms', 'form_key' );
	1965	+ FrmForm::update( $form_id, compact( 'name', 'form_key' ) );
2233	1966
2234		- if ( $name === $form->name ) {
2235		- // Nothing to change so exit early.
2236		- $form_key = $form->form_key;
2237		- wp_send_json_success( compact( 'form_key' ) );
2238		- }
	1967	+ wp_send_json_success( compact( 'form_key' ) );
	1968	+ }
2239	1969
2240		- $to_update = array(
2241		- 'name' => $name,
2242		- );
	1970	+ public static function json_error( $errors ) {
	1971	+ $errors['json'] = __( 'Abnormal HTML characters prevented your form from saving correctly', 'formidable' );
2243	1972
2244		- if ( '' === $name ) {
2245		- $form_key = $form->form_key;
2246		- } else {
2247		- // Only update form_key if name is not empty.
2248		- $form_key = FrmAppHelper::get_unique_key( sanitize_title( $name ), 'frm_forms', 'form_key' );
2249		- $to_update['form_key'] = $form_key;
2250		- }
2251		-
2252		- FrmForm::update( $form_id, $to_update );
2253		-
2254		- wp_send_json_success( compact( 'form_key' ) );
	1973	+ return $errors;
2255	1974	}
2256	1975
2257	1976	/**
2258		- * @param array $errors
	1977	+ * Education for premium features.
2259	1978	*
2260		- * @return array
	1979	+ * @since 4.05
	1980	+ * @return void
2261	1981	*/
2262		- public static function json_error( $errors ) {
2263		- $errors['json'] = __( 'Abnormal HTML characters prevented your form from saving correctly', 'formidable' );
2264		- return $errors;
	1982	+ public static function add_form_style_tab_options() {
	1983	+ include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/add_form_style_options.php';
2265	1984	}
2266	1985
2267	1986	/**
2268	1987	* Add education about views.
		@@ -2268,10 +1987,8 @@
2268	1987	* Add education about views.
2269	1988	*
2270	1989	* @since 4.07
2271	1990	*
2272		- * @param array $values
2273		- *
2274	1991	* @return void
2275	1992	*/
2276	1993	public static function no_views( $values = array() ) {
2277	1994	FrmAppHelper::include_svg();
		@@ -2285,10 +2002,8 @@
2285	2002	* Add education about reports.
2286	2003	*
2287	2004	* @since 4.07
2288	2005	*
2289		- * @param array $values
2290		- *
2291	2006	* @return void
2292	2007	*/
2293	2008	public static function no_reports( $values = array() ) {
2294	2009	$id = FrmAppHelper::get_param( 'form', '', 'get', 'absint' );
		@@ -2314,9 +2029,10 @@
2314	2029	/**
2315	2030	* @since 4.05.02
2316	2031	*/
2317	2032	private static function move_menu_to_footer() {
2318		- if ( empty( FrmAppHelper::get_settings()->admin_bar ) ) {
	2033	+ $settings = FrmAppHelper::get_settings();
	2034	+ if ( empty( $settings->admin_bar ) ) {
2319	2035	remove_action( 'wp_body_open', 'wp_admin_bar_render', 0 );
2320	2036	}
2321	2037	}
2322	2038
		@@ -2321,15 +2037,13 @@
2321	2037	}
2322	2038
2323	2039	public static function admin_bar_configure() {
2324	2040	global $frm_vars;
2325		-
2326	2041	if ( empty( $frm_vars['forms_loaded'] ) ) {
2327	2042	return;
2328	2043	}
2329	2044
2330	2045	$actions = array();
2331		-
2332	2046	foreach ( $frm_vars['forms_loaded'] as $form ) {
2333	2047	if ( is_object( $form ) ) {
2334	2048	$actions[ $form->id ] = $form->name;
2335	2049	}
		@@ -2335,9 +2049,9 @@
2335	2049	}
2336	2050	unset( $form );
2337	2051	}
2338	2052
2339		- if ( ! $actions ) {
	2053	+ if ( empty( $actions ) ) {
2340	2054	return;
2341	2055	}
2342	2056
2343	2057	self::add_menu_to_admin_bar();
		@@ -2363,12 +2077,8 @@
2363	2077	}
2364	2078
2365	2079	/**
2366	2080	* @since 2.05.07
2367		- *
2368		- * @param array $actions
2369		- *
2370		- * @return void
2371	2081	*/
2372	2082	private static function add_forms_to_admin_bar( $actions ) {
2373	2083	global $wp_admin_bar;
2374	2084
		@@ -2374,13 +2084,14 @@
2374	2084
2375	2085	asort( $actions );
2376	2086
2377	2087	foreach ( $actions as $form_id => $name ) {
	2088	+
2378	2089	$wp_admin_bar->add_node(
2379	2090	array(
2380	2091	'parent' => 'frm-forms',
2381	2092	'id' => 'edit_form_' . $form_id,
2382		- 'title' => $name ? $name : FrmFormsHelper::get_no_title_text(),
	2093	+ 'title' => empty( $name ) ? __( '(no title)', 'formidable' ) : $name,
2383	2094	'href' => FrmForm::get_edit_link( $form_id ),
2384	2095	)
2385	2096	);
2386	2097	}
		@@ -2389,14 +2100,12 @@
2389	2100	/**
2390	2101	* The formidable shortcode
2391	2102	*
2392	2103	* @param array $atts The params from the shortcode.
2393		- *
2394	2104	* @return string
2395	2105	*/
2396	2106	public static function get_form_shortcode( $atts ) {
2397	2107	global $frm_vars;
2398		-
2399	2108	if ( ! empty( $frm_vars['skip_shortcode'] ) ) {
2400	2109	$sc = '[formidable';
2401	2110	$sc .= FrmAppHelper::array_to_html_params( $atts );
2402	2111	return $sc . ']';
		@@ -2425,9 +2134,8 @@
2425	2134	* @since 5.2.01
2426	2135	*
2427	2136	* @param false|int|string $id
2428	2137	* @param false|string $key
2429		- *
2430	2138	* @return false|stdClass
2431	2139	*/
2432	2140	private static function maybe_get_form_by_id_or_key( $id, $key ) {
2433	2141	if ( ! $id ) {
		@@ -2441,9 +2149,8 @@
2441	2149	* @param false|string $key
2442	2150	* @param bool|int|string $title may be 'auto', true, false, 'true', 'false', 'yes', '1', 1, '0', 0.
2443	2151	* @param bool|int|string $description may be 'auto', true, false, 'true', 'false', 'yes', '1', 1, '0', 0.
2444	2152	* @param array $atts
2445		- *
2446	2153	* @return string
2447	2154	*/
2448	2155	public static function show_form( $id = '', $key = '', $title = false, $description = false, $atts = array() ) {
2449	2156	$form = self::maybe_get_form_by_id_or_key( $id, $key );
		@@ -2464,13 +2171,14 @@
2464	2171
2465	2172	add_action( 'frm_load_form_hooks', 'FrmHooksController::trigger_load_form_hooks' );
2466	2173	FrmAppHelper::trigger_hook_load( 'form', $form );
2467	2174
2468		- $form = apply_filters( 'frm_pre_display_form', $form );
	2175	+ $form = apply_filters( 'frm_pre_display_form', $form );
	2176	+
2469	2177	$frm_settings = FrmAppHelper::get_settings( array( 'current_form' => $form->id ) );
2470	2178
2471	2179	if ( self::is_viewable_draft_form( $form ) ) {
2472		- // Don't show a draft form on a page
	2180	+ // don't show a draft form on a page
2473	2181	$form = __( 'Please select a valid form', 'formidable' );
2474	2182	} elseif ( ! FrmForm::is_visible_to_user( $form ) ) {
2475	2183	$form = do_shortcode( $frm_settings->login_msg );
2476	2184	} else {
		@@ -2490,18 +2198,16 @@
2490	2198	}
2491	2199
2492	2200	/**
2493	2201	* @param false|int|string $id
2494		- *
2495	2202	* @return false|stdClass
2496	2203	*/
2497	2204	private static function maybe_get_form_to_show( $id ) {
2498	2205	$form = false;
2499	2206
2500		- if ( $id ) {
	2207	+ if ( ! empty( $id ) ) {
2501	2208	// Form id or key is set.
2502	2209	$form = FrmForm::getOne( $id );
2503		-
2504	2210	if ( ! $form || $form->parent_form_id || $form->status === 'trash' ) {
2505	2211	$form = false;
2506	2212	}
2507	2213	}
		@@ -2508,25 +2214,12 @@
2508	2214
2509	2215	return $form;
2510	2216	}
2511	2217
2512		- /**
2513		- * @param object $form
2514		- *
2515		- * @return bool
2516		- */
2517	2218	private static function is_viewable_draft_form( $form ) {
2518	2219	return $form->status === 'draft' && current_user_can( 'frm_edit_forms' ) && ! FrmAppHelper::is_preview_page();
2519	2220	}
2520	2221
2521		- /**
2522		- * @param object $form
2523		- * @param bool $title
2524		- * @param bool $description
2525		- * @param array $atts
2526		- *
2527		- * @return string
2528		- */
2529	2222	public static function get_form( $form, $title, $description, $atts = array() ) {
2530	2223	ob_start();
2531	2224
2532	2225	do_action( 'frm_before_get_form', $atts );
		@@ -2533,9 +2226,10 @@
2533	2226
2534	2227	self::get_form_contents( $form, $title, $description, $atts );
2535	2228	self::enqueue_scripts( FrmForm::get_params( $form ) );
2536	2229
2537		- $contents = ob_get_clean();
	2230	+ $contents = ob_get_contents();
	2231	+ ob_end_clean();
2538	2232
2539	2233	self::maybe_minimize_form( $atts, $contents );
2540	2234
2541	2235	return $contents;
		@@ -2540,25 +2234,12 @@
2540	2234
2541	2235	return $contents;
2542	2236	}
2543	2237
2544		- /**
2545		- * @param array $params
2546		- *
2547		- * @return void
2548		- */
2549	2238	public static function enqueue_scripts( $params ) {
2550	2239	do_action( 'frm_enqueue_form_scripts', $params );
2551	2240	}
2552	2241
2553		- /**
2554		- * @param object $form
2555		- * @param bool $title
2556		- * @param bool $description
2557		- * @param array $atts
2558		- *
2559		- * @return void
2560		- */
2561	2242	public static function get_form_contents( $form, $title, $description, $atts ) {
2562	2243	$params = FrmForm::get_params( $form );
2563	2244	$errors = self::get_saved_errors( $form, $params );
2564	2245	$fields = FrmFieldsHelper::get_form_fields( $form->id, $errors );
		@@ -2565,10 +2246,9 @@
2565	2246	$reset = false;
2566	2247	$pass_args = compact( 'form', 'fields', 'errors', 'title', 'description', 'reset' );
2567	2248
2568	2249	$pass_args['action'] = $params['action'];
2569		- // phpcs:ignore WordPress.Security.NonceVerification.Missing, Universal.Operators.StrictComparisons
2570		- $handle_process_here = $params['action'] === 'create' && $params['posted_form_id'] == $form->id && $_POST;
	2250	+ $handle_process_here = $params['action'] === 'create' && $params['posted_form_id'] == $form->id && $_POST; // phpcs:ignore WordPress.Security.NonceVerification.Missing
2571	2251
2572	2252	if ( ! $handle_process_here ) {
2573	2253	FrmFormState::set_initial_value( 'title', $title );
2574	2254	FrmFormState::set_initial_value( 'description', $description );
		@@ -2573,15 +2253,16 @@
2573	2253	FrmFormState::set_initial_value( 'title', $title );
2574	2254	FrmFormState::set_initial_value( 'description', $description );
2575	2255
2576	2256	do_action( 'frm_display_form_action', $params, $fields, $form, $title, $description );
2577		-
2578	2257	if ( apply_filters( 'frm_continue_to_new', true, $form->id, $params['action'] ) ) {
2579	2258	self::show_form_after_submit( $pass_args );
2580	2259	}
2581		- } elseif ( $errors ) {
	2260	+ } elseif ( ! empty( $errors ) ) {
2582	2261	self::show_form_after_submit( $pass_args );
	2262	+
2583	2263	} else {
	2264	+
2584	2265	do_action( 'frm_validate_form_creation', $params, $fields, $form, $title, $description );
2585	2266
2586	2267	if ( apply_filters( 'frm_continue_to_create', true, $form->id ) ) {
2587	2268	$entry_id = self::just_created_entry( $form->id );
		@@ -2604,19 +2285,13 @@
2604	2285	/**
2605	2286	* If the form was processed earlier (init), get the generated errors
2606	2287	*
2607	2288	* @since 2.05
2608		- *
2609		- * @param object $form
2610		- * @param array $params
2611		- *
2612		- * @return array
2613	2289	*/
2614	2290	private static function get_saved_errors( $form, $params ) {
2615	2291	global $frm_vars;
2616	2292
2617		- // phpcs:ignore WordPress.Security.NonceVerification.Missing, Universal.Operators.StrictComparisons
2618		- if ( $params['posted_form_id'] == $form->id && $_POST && isset( $frm_vars['created_entries'][ $form->id ] ) ) {
	2293	+ if ( $params['posted_form_id'] == $form->id && $_POST && isset( $frm_vars['created_entries'][ $form->id ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
2619	2294	$errors = $frm_vars['created_entries'][ $form->id ]['errors'];
2620	2295	} else {
2621	2296	$errors = array();
2622	2297	}
		@@ -2633,16 +2308,13 @@
2633	2308	}
2634	2309
2635	2310	/**
2636	2311	* @since 2.2.7
2637		- *
2638		- * @param int|string $form_id
2639		- *
2640		- * @return int
2641	2312	*/
2642	2313	public static function just_created_entry( $form_id ) {
2643	2314	global $frm_vars;
2644		- 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
	2315	+
	2316	+ 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;
2645	2317	}
2646	2318
2647	2319	/**
2648	2320	* Gets confirmation method.
		@@ -2655,9 +2327,8 @@
2655	2327	*
2656	2328	* @type object $form Form object.
2657	2329	* @type int $entry_id Entry ID.
2658	2330	* }
2659		- *
2660	2331	* @return array|string
2661	2332	*/
2662	2333	private static function get_confirmation_method( $atts ) {
2663	2334	$action = FrmOnSubmitHelper::current_event( $atts );
		@@ -2665,9 +2336,8 @@
2665	2336	$method = ! empty( $atts['form']->options[ $opt ] ) ? $atts['form']->options[ $opt ] : 'message';
2666	2337
2667	2338	if ( ! empty( $atts['entry_id'] ) ) {
2668	2339	$met_actions = self::get_met_on_submit_actions( $atts, $action );
2669		-
2670	2340	if ( $met_actions ) {
2671	2341	$method = $met_actions;
2672	2342	}
2673	2343	}
		@@ -2674,21 +2344,14 @@
2674	2344
2675	2345	$method = apply_filters( 'frm_success_filter', $method, $atts['form'], $action );
2676	2346
2677	2347	if ( $method !== 'message' && ( ! $atts['entry_id'] || ! is_numeric( $atts['entry_id'] ) ) ) {
2678		- return 'message';
	2348	+ $method = 'message';
2679	2349	}
2680	2350
2681	2351	return $method;
2682	2352	}
2683	2353
2684		- /**
2685		- * @param object $form
2686		- * @param array $params
2687		- * @param array $args
2688		- *
2689		- * @return void
2690		- */
2691	2354	public static function maybe_trigger_redirect( $form, $params, $args ) {
2692	2355	if ( ! isset( $params['id'] ) ) {
2693	2356	global $frm_vars;
2694	2357	$params['id'] = $frm_vars['created_entries'][ $form->id ]['entry_id'];
		@@ -2715,12 +2378,14 @@
2715	2378	* @param array $params See {@see FrmFormsController::maybe_trigger_redirect()}.
2716	2379	* @param array $args See {@see FrmFormsController::maybe_trigger_redirect()}.
2717	2380	*/
2718	2381	public static function maybe_trigger_redirect_with_action( $conf_method, $form, $params, $args ) {
2719		- 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
2720		- $event = FrmOnSubmitHelper::current_event( $params );
2721		- FrmOnSubmitHelper::populate_on_submit_data( $form->options, $conf_method[0], $event );
2722		- $conf_method = 'redirect';
	2382	+ if ( is_array( $conf_method ) && 1 === count( $conf_method ) ) {
	2383	+ if ( 'redirect' === FrmOnSubmitHelper::get_action_type( $conf_method[0] ) ) {
	2384	+ $event = FrmOnSubmitHelper::current_event( $params );
	2385	+ FrmOnSubmitHelper::populate_on_submit_data( $form->options, $conf_method[0], $event );
	2386	+ $conf_method = 'redirect';
	2387	+ }
2723	2388	}
2724	2389
2725	2390	if ( 'redirect' === $conf_method ) {
2726	2391	self::trigger_redirect( $form, $params, $args );
		@@ -2726,15 +2391,8 @@
2726	2391	self::trigger_redirect( $form, $params, $args );
2727	2392	}
2728	2393	}
2729	2394
2730		- /**
2731		- * @param object $form
2732		- * @param array $params
2733		- * @param array $args
2734		- *
2735		- * @return void
2736		- */
2737	2395	public static function trigger_redirect( $form, $params, $args ) {
2738	2396	$success_args = array(
2739	2397	'action' => $params['action'],
2740	2398	'conf_method' => 'redirect',
		@@ -2793,9 +2451,8 @@
2793	2451	* @since 6.0
2794	2452	*
2795	2453	* @param array $args See {@see FrmFormsController::run_success_action()}.
2796	2454	* @param string $event Form event. Default is `create`.
2797		- *
2798	2455	* @return array Array of actions that meet the conditional logics.
2799	2456	*/
2800	2457	public static function get_met_on_submit_actions( $args, $event = 'create' ) {
2801	2458	if ( ! FrmOnSubmitHelper::form_has_migrated( $args['form'] ) ) {
		@@ -2822,11 +2479,13 @@
2822	2479	}
2823	2480
2824	2481	$action_type = FrmOnSubmitHelper::get_action_type( $action );
2825	2482
2826		- if ( 'redirect' === $action_type && $has_redirect ) {
2827		- // Do not process because we run the first redirect action only.
2828		- continue;
	2483	+ if ( 'redirect' === $action_type ) {
	2484	+ if ( $has_redirect ) {
	2485	+ // Do not process because we run the first redirect action only.
	2486	+ continue;
	2487	+ }
2829	2488	}
2830	2489
2831	2490	if ( ! self::is_valid_on_submit_action( $action, $args, $event ) ) {
2832	2491	continue;
		@@ -2851,10 +2510,10 @@
2851	2510	* @param array $args See {@see FrmFormsController::run_success_action()}. `$args['event']` is also added.
2852	2511	*/
2853	2512	$met_actions = apply_filters( 'frm_get_met_on_submit_actions', $met_actions, $args );
2854	2513
2855		- if ( ! $met_actions ) {
2856		- return array( FrmOnSubmitHelper::get_fallback_action( $event ) );
	2514	+ if ( empty( $met_actions ) ) {
	2515	+ $met_actions = array( FrmOnSubmitHelper::get_fallback_action( $event ) );
2857	2516	}
2858	2517
2859	2518	return $met_actions;
2860	2519	}
		@@ -2866,9 +2525,8 @@
2866	2525	*
2867	2526	* @param object $action Form action object.
2868	2527	* @param array $args See {@see FrmFormsController::run_success_action()}.
2869	2528	* @param string $event Form event. Default is `create`.
2870		- *
2871	2529	* @return bool
2872	2530	*/
2873	2531	private static function is_valid_on_submit_action( $action, $args, $event = 'create' ) {
2874	2532	$action_type = FrmOnSubmitHelper::get_action_type( $action );
		@@ -2890,9 +2548,8 @@
2890	2548	return false;
2891	2549	}
2892	2550
2893	2551	$page = get_post( $action->post_content['success_page_id'] );
2894		-
2895	2552	if ( ! $page || 'trash' === $page->post_status ) {
2896	2553	return false;
2897	2554	}
2898	2555	}
		@@ -2914,9 +2571,8 @@
2914	2571	'entry_id' => $args['entry_id'],
2915	2572	'action' => FrmOnSubmitHelper::current_event( $args ),
2916	2573	)
2917	2574	);
2918		-
2919	2575	if ( ! is_array( $args['conf_method'] ) ) {
2920	2576	self::run_success_action( $args );
2921	2577	return;
2922	2578	}
		@@ -2943,9 +2599,8 @@
2943	2599	* @param array $args See {@see FrmFormsController::run_success_action()}.
2944	2600	*/
2945	2601	public static function run_multi_on_submit_actions( $args ) {
2946	2602	$redirect_action = null;
2947		-
2948	2603	foreach ( $args['conf_method'] as $action ) {
2949	2604	if ( 'redirect' === FrmOnSubmitHelper::get_action_type( $action ) ) {
2950	2605	// We catch the redirect action to run it last.
2951	2606	$redirect_action = $action;
		@@ -2956,15 +2611,13 @@
2956	2611
2957	2612	unset( $action );
2958	2613	}
2959	2614
2960		- if ( ! $redirect_action ) {
2961		- return;
	2615	+ if ( $redirect_action ) {
	2616	+ // Show script to delay the redirection.
	2617	+ $args['force_delay_redirect'] = true;
	2618	+ self::run_single_on_submit_action( $args, $redirect_action );
2962	2619	}
2963		-
2964		- // Show script to delay the redirection.
2965		- $args['force_delay_redirect'] = true;
2966		- self::run_single_on_submit_action( $args, $redirect_action );
2967	2620	}
2968	2621
2969	2622	/**
2970	2623	* Runs single On Submit action.
		@@ -2985,9 +2638,8 @@
2985	2638	* @since 6.0
2986	2639	*
2987	2640	* @param array $args See {@see FrmFormsController::run_success_action()}.
2988	2641	* @param object $action On Submit action object.
2989		- *
2990	2642	* @return array
2991	2643	*/
2992	2644	private static function get_run_success_action_args( $args, $action ) {
2993	2645	$new_args = $args;
		@@ -2993,9 +2645,10 @@
2993	2645	$new_args = $args;
2994	2646
2995	2647	FrmOnSubmitHelper::populate_on_submit_data( $new_args['form']->options, $action, $args['action'] );
2996	2648
2997		- $opt = 'update' === $args['action'] ? 'edit_' : 'success_';
	2649	+ $opt = 'update' === $args['action'] ? 'edit_' : 'success_';
	2650	+
2998	2651	$new_args['conf_method'] = $new_args['form']->options[ $opt . 'action' ];
2999	2652
3000	2653	/**
3001	2654	* Filters the run success action args.
		@@ -3010,18 +2663,12 @@
3010	2663	}
3011	2664
3012	2665	/**
3013	2666	* @since 3.0
3014		- *
3015		- * @param array $args
3016		- *
3017		- * @return void
3018	2667	*/
3019	2668	private static function load_page_after_submit( $args ) {
3020	2669	global $post;
3021	2670	$opt = $args['success_opt'];
3022		-
3023		- // phpcs:ignore Universal.Operators.StrictComparisons
3024	2671	if ( ! $post || $args['form']->options[ $opt . '_page_id' ] != $post->ID ) {
3025	2672	$page = get_post( $args['form']->options[ $opt . '_page_id' ] );
3026	2673	$old_post = $post;
3027	2674	$post = $page;
		@@ -3045,9 +2692,8 @@
3045	2692	}
3046	2693
3047	2694	/**
3048	2695	* @since 3.0
3049		- *
3050	2696	* @param array $args See {@see FrmFormsController::run_success_action()}.
3051	2697	*/
3052	2698	private static function redirect_after_submit( $args ) {
3053	2699	add_filter( 'frm_use_wpautop', '__return_false' );
		@@ -3061,10 +2707,11 @@
3061	2707	FrmEntriesController::delete_entry_before_redirect( $success_url, $args['form'], $args );
3062	2708
3063	2709	add_filter( 'frm_redirect_url', 'FrmEntriesController::prepare_redirect_url' );
3064	2710	$success_url = apply_filters( 'frm_redirect_url', $success_url, $args['form'], $args );
3065		- $doing_ajax = FrmAppHelper::doing_ajax();
3066	2711
	2712	+ $doing_ajax = FrmAppHelper::doing_ajax();
	2713	+
3067	2714	if ( ! empty( $args['ajax'] ) && $doing_ajax && empty( $args['force_delay_redirect'] ) ) {
3068	2715	// Is AJAX submit and there is just one Redirect action runs.
3069	2716	echo json_encode( self::get_ajax_redirect_response_data( $args + compact( 'success_url' ) ) );
3070	2717	wp_die();
		@@ -3069,9 +2716,9 @@
3069	2716	echo json_encode( self::get_ajax_redirect_response_data( $args + compact( 'success_url' ) ) );
3070	2717	wp_die();
3071	2718	}
3072	2719
3073		- if ( ! headers_sent() && empty( $args['force_delay_redirect'] ) && empty( $args['form']->options['redirect_delay'] ) ) {
	2720	+ if ( ! headers_sent() && empty( $args['force_delay_redirect'] ) ) {
3074	2721	// Not AJAX submit, no headers sent, and there is just one Redirect action runs.
3075	2722	if ( ! empty( $args['form']->options['open_in_new_tab'] ) ) {
3076	2723	self::print_open_in_new_tab_js_with_fallback_handler( $success_url, $args );
3077	2724	self::$redirected_in_new_tab[ $args['form']->id ] = 1;
		@@ -3113,51 +2760,31 @@
3113	2760	*
3114	2761	* @since 6.3.1
3115	2762	*
3116	2763	* @param array $args See {@see FrmFormsController::run_success_action()}.
3117		- *
3118	2764	* @return array
3119	2765	*/
3120	2766	private static function get_ajax_redirect_response_data( $args ) {
3121		- $response_data = array(
3122		- 'redirect' => $args['success_url'],
3123		- 'content' => '',
3124		- );
3125		- $unset_content = true;
	2767	+ $response_data = array( 'redirect' => $args['success_url'] );
3126	2768
3127		- if ( ! empty( $args['form']->options['redirect_delay'] ) ) {
3128		- $response_data['delay'] = $args['form']->options['redirect_delay_time'];
3129		- $response_data['content'] .= self::get_redirect_message( $args['success_url'], $args['form']->options['redirect_delay_msg'], $args );
3130		- $unset_content = false;
3131		- }
3132		-
3133	2769	if ( ! empty( $args['form']->options['open_in_new_tab'] ) ) {
3134	2770	$response_data['openInNewTab'] = 1;
3135	2771
3136		- // Only show open in new tab text if there is no delay.
3137		- if ( empty( $response_data['content'] ) ) {
3138		- $args['message'] = FrmOnSubmitHelper::get_default_new_tab_msg();
	2772	+ $args['message'] = FrmOnSubmitHelper::get_default_new_tab_msg();
3139	2773
3140		- $args['form']->options['success_msg'] = $args['message'];
3141		- $args['form']->options['edit_msg'] = $args['message'];
	2774	+ $args['form']->options['success_msg'] = $args['message'];
	2775	+ $args['form']->options['edit_msg'] = $args['message'];
	2776	+ if ( ! isset( $args['fields'] ) ) {
	2777	+ $args['fields'] = FrmField::get_all_for_form( $args['form']->id );
	2778	+ }
3142	2779
3143		- if ( ! isset( $args['fields'] ) ) {
3144		- $args['fields'] = FrmField::get_all_for_form( $args['form']->id );
3145		- }
	2780	+ $args['message'] = self::prepare_submit_message( $args['form'], $args['entry_id'], $args );
3146	2781
3147		- $args['message'] = self::prepare_submit_message( $args['form'], $args['entry_id'], $args );
	2782	+ ob_start();
	2783	+ self::show_lone_success_message( $args );
	2784	+ $response_data['content'] = ob_get_clean();
3148	2785
3149		- ob_start();
3150		- self::show_lone_success_message( $args );
3151		- $response_data['content'] .= ob_get_clean();
3152		- $unset_content = false;
3153		- }//end if
3154		-
3155	2786	$response_data['fallbackMsg'] = self::get_redirect_fallback_message( $args['success_url'], $args );
3156		- }//end if
3157		-
3158		- if ( $unset_content && '' === $response_data['content'] ) {
3159		- unset( $response_data['content'] );
3160	2787	}
3161	2788
3162	2789	return $response_data;
3163	2790	}
		@@ -3169,9 +2796,9 @@
3169	2796	*
3170	2797	* @param array $args See {@see FrmFormsController::run_success_action()}.
3171	2798	*/
3172	2799	private static function redirect_after_submit_using_js( $args ) {
3173		- $success_msg = $args['form']->options['redirect_delay_msg'];
	2800	+ $success_msg = FrmOnSubmitHelper::get_default_redirect_msg();
3174	2801	$redirect_msg = self::get_redirect_message( $args['success_url'], $success_msg, $args );
3175	2802	$success_url = esc_url_raw( $args['success_url'] );
3176	2803
3177	2804	/**
		@@ -3180,9 +2807,9 @@
3180	2807	* @since 6.0
3181	2808	*
3182	2809	* @param int $delay_time Delay time in milliseconds.
3183	2810	*/
3184		- $delay_time = apply_filters( 'frm_redirect_delay_time', 1000 * $args['form']->options['redirect_delay_time'] );
	2811	+ $delay_time = apply_filters( 'frm_redirect_delay_time', 8000 );
3185	2812
3186	2813	if ( ! empty( $args['form']->options['open_in_new_tab'] ) ) {
3187	2814	$redirect_js = 'window.open("' . $success_url . '", "_blank")';
3188	2815	} else {
		@@ -3192,15 +2819,13 @@
3192	2819	add_filter( 'frm_use_wpautop', '__return_true' );
3193	2820
3194	2821	echo FrmAppHelper::maybe_kses( $redirect_msg ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
3195	2822	echo '<script>';
3196		-
3197	2823	if ( empty( $args['doing_ajax'] ) ) {
3198	2824	// Not AJAX submit, delay JS until window.load.
3199	2825	echo 'window.onload=function(){';
3200	2826	}
3201	2827	echo 'setTimeout(function(){' . $redirect_js . '}, ' . intval( $delay_time ) . ');'; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
3202		-
3203	2828	if ( empty( $args['doing_ajax'] ) ) {
3204	2829	echo '};';
3205	2830	}
3206	2831	echo '</script>';
		@@ -3213,16 +2838,11 @@
3213	2838	* @param string $success_msg
3214	2839	* @param array $args
3215	2840	*/
3216	2841	private static function get_redirect_message( $success_url, $success_msg, $args ) {
3217		- $success_msg = apply_filters( 'frm_content', $success_msg, $args['form'], $args['entry_id'] );
3218		- $success_msg = do_shortcode( FrmAppHelper::use_wpautop( $success_msg ) );
3219		-
3220		- // phpcs:disable Generic.WhiteSpace.ScopeIndent
3221		- $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
	2842	+ $redirect_msg = '<div class="' . esc_attr( FrmFormsHelper::get_form_style_class( $args['form'] ) ) . '"><div class="frm-redirect-msg" role="status">' . $success_msg . '<br/>' .
3222	2843	self::get_redirect_fallback_message( $success_url, $args ) .
3223	2844	'</div></div>';
3224		- // phpcs:enable Generic.WhiteSpace.ScopeIndent
3225	2845
3226	2846	$redirect_args = array(
3227	2847	'entry_id' => $args['entry_id'],
3228	2848	'form_id' => $args['form']->id,
		@@ -3238,14 +2858,12 @@
3238	2858	* @since 6.3.1
3239	2859	*
3240	2860	* @param string $success_url Redirect URL.
3241	2861	* @param array $args Contains `form` object.
3242		- *
3243	2862	* @return string
3244	2863	*/
3245	2864	private static function get_redirect_fallback_message( $success_url, $args ) {
3246	2865	$target = '';
3247		-
3248	2866	if ( ! empty( $args['form']->options['open_in_new_tab'] ) ) {
3249	2867	$target = ' target="_blank"';
3250	2868	}
3251	2869
		@@ -3260,12 +2878,8 @@
3260	2878	/**
3261	2879	* Prepare to show the success message and empty form after submit
3262	2880	*
3263	2881	* @since 2.05
3264		- *
3265		- * @param array $atts
3266		- *
3267		- * @return void
3268	2882	*/
3269	2883	public static function show_message_after_save( $atts ) {
3270	2884	$atts['message'] = self::prepare_submit_message( $atts['form'], $atts['entry_id'], $atts );
3271	2885
		@@ -3271,9 +2885,8 @@
3271	2885
3272	2886	if ( ! isset( $atts['form']->options['show_form'] ) || $atts['form']->options['show_form'] ) {
3273	2887	if ( isset( $atts['action'] ) && 'update' === $atts['action'] && is_callable( array( 'FrmProEntriesController', 'show_front_end_form_with_entry' ) ) ) {
3274	2888	$entry = FrmEntry::getOne( $atts['entry_id'] );
3275		-
3276	2889	if ( $entry ) {
3277	2890	// This is copied from the Pro plugin.
3278	2891	$atts['conf_message'] = FrmProEntriesController::confirmation( 'message', $atts['form'], $atts['form']->options, $entry->id, $atts );
3279	2892	$atts['show_form'] = FrmProEntriesController::is_form_displayed_after_edit( $atts['form'] );
		@@ -3290,12 +2903,8 @@
3290	2903	/**
3291	2904	* Show an empty form
3292	2905	*
3293	2906	* @since 2.05
3294		- *
3295		- * @param array $args
3296		- *
3297		- * @return void
3298	2907	*/
3299	2908	private static function show_form_after_submit( $args ) {
3300	2909	self::fill_atts_for_form_display( $args );
3301	2910
		@@ -3314,11 +2923,12 @@
3314	2923	}
3315	2924	unset( $args );
3316	2925
3317	2926	$include_form_tag = apply_filters( 'frm_include_form_tag', true, $form );
3318		- $frm_settings = FrmAppHelper::get_settings();
3319		- $submit = $form->options['submit_value'] ?? $frm_settings->submit_value;
3320	2927
	2928	+ $frm_settings = FrmAppHelper::get_settings();
	2929	+ $submit = isset( $form->options['submit_value'] ) ? $form->options['submit_value'] : $frm_settings->submit_value;
	2930	+
3321	2931	global $frm_vars;
3322	2932	self::maybe_load_css( $form, $values['custom_style'], $frm_vars['load_css'] );
3323	2933
3324	2934	$message_placement = self::message_placement( $form, $message );
		@@ -3326,36 +2936,25 @@
3326	2936	include FrmAppHelper::plugin_path() . '/classes/views/frm-entries/new.php';
3327	2937	}
3328	2938
3329	2939	/**
3330		- * Gets message placement.
3331		- *
3332	2940	* @since 4.05.02
3333		- * @since 6.26 This method changed from `private` to `public`.
3334		- *
3335		- * @param object $form Form object.
3336		- * @param string $message The message.
3337		- *
3338		- * @return string Accepts 'before', 'after', or 'submit'.
	2941	+ * @return string - 'before', 'after', or 'submit'
3339	2942	*/
3340		- public static function message_placement( $form, $message ) {
	2943	+ private static function message_placement( $form, $message ) {
3341	2944	$place = 'before';
3342	2945
3343	2946	if ( $message && isset( $form->options['form_class'] ) ) {
3344		- if ( str_contains( $form->options['form_class'], 'frm_below_success' ) ) {
	2947	+ if ( strpos( $form->options['form_class'], 'frm_below_success' ) !== false ) {
3345	2948	$place = 'after';
3346		- } elseif ( str_contains( $form->options['form_class'], 'frm_inline_success' ) ) {
	2949	+ } elseif ( strpos( $form->options['form_class'], 'frm_inline_success' ) !== false ) {
3347	2950	$place = 'submit';
3348	2951	}
3349	2952	}
3350	2953
3351	2954	/**
3352		- * Filter the message placement.
3353		- *
3354	2955	* @since 4.05.02
3355		- *
3356		- * @param string $place Accepts 'before', 'after', or 'submit'.
3357		- * @param array $args Args.
	2956	+ * @return string - 'before' or 'after'
3358	2957	*/
3359	2958	return apply_filters( 'frm_message_placement', $place, compact( 'form', 'message' ) );
3360	2959	}
3361	2960
		@@ -3362,12 +2961,8 @@
3362	2961	/**
3363	2962	* Get all the values needed on the new.php entry page
3364	2963	*
3365	2964	* @since 2.05
3366		- *
3367		- * @param array $args
3368		- *
3369		- * @return void
3370	2965	*/
3371	2966	private static function fill_atts_for_form_display( &$args ) {
3372	2967	if ( ! isset( $args['title'] ) && isset( $args['show_title'] ) ) {
3373	2968	$args['title'] = $args['show_title'];
		@@ -3392,12 +2987,8 @@
3392	2987	/**
3393	2988	* Show the success message without the form
3394	2989	*
3395	2990	* @since 2.05
3396		- *
3397		- * @param array $atts
3398		- *
3399		- * @return void
3400	2991	*/
3401	2992	private static function show_lone_success_message( $atts ) {
3402	2993	global $frm_vars;
3403	2994	$values = FrmEntriesHelper::setup_new_vars( $atts['fields'], $atts['form'], true );
		@@ -3403,12 +2994,13 @@
3403	2994	$values = FrmEntriesHelper::setup_new_vars( $atts['fields'], $atts['form'], true );
3404	2995	self::maybe_load_css( $atts['form'], $values['custom_style'], $frm_vars['load_css'] );
3405	2996
3406	2997	$include_extra_container = 'frm_forms' . FrmFormsHelper::get_form_style_class( $values );
3407		- $errors = array();
3408		- $form = $atts['form'];
3409		- $message = $atts['message'];
3410	2998
	2999	+ $errors = array();
	3000	+ $form = $atts['form'];
	3001	+ $message = $atts['message'];
	3002	+
3411	3003	include FrmAppHelper::plugin_path() . '/classes/views/frm-entries/errors.php';
3412	3004	}
3413	3005
3414	3006	/**
		@@ -3416,20 +3008,19 @@
3416	3008	*
3417	3009	* @since 2.05
3418	3010	* @since 6.0.x Added the third parameter.
3419	3011	*
3420		- * @param object $form Form object.
3421		- * @param int|string $entry_id Entry ID.
3422		- * @param array $args See {@see FrmFormsController::run_success_action()}.
3423		- *
	3012	+ * @param object $form Form object.
	3013	+ * @param int $entry_id Entry ID.
	3014	+ * @param array $args See {@see FrmFormsController::run_success_action()}.
3424	3015	* @return string
3425	3016	*/
3426	3017	private static function prepare_submit_message( $form, $entry_id, $args = array() ) {
3427	3018	$frm_settings = FrmAppHelper::get_settings( array( 'current_form' => $form->id ) );
3428		- $opt = $args['success_opt'] ?? 'success';
	3019	+ $opt = isset( $args['success_opt'] ) ? $args['success_opt'] : 'success';
3429	3020
3430	3021	if ( $entry_id && is_numeric( $entry_id ) ) {
3431		- $message = $form->options[ $opt . '_msg' ] ?? $frm_settings->success_msg;
	3022	+ $message = isset( $form->options[ $opt . '_msg' ] ) ? $form->options[ $opt . '_msg' ] : $frm_settings->success_msg;
3432	3023	$class = 'frm_message';
3433	3024	} else {
3434	3025	$message = $frm_settings->failed_msg;
3435	3026	$class = FrmFormsHelper::form_error_class();
		@@ -3446,9 +3037,9 @@
3446	3037	public static function front_head() {
3447	3038	$version = FrmAppHelper::plugin_version();
3448	3039	$suffix = FrmAppHelper::js_suffix();
3449	3040
3450		- if ( $suffix && self::has_combo_js_file() ) {
	3041	+ if ( ! empty( $suffix ) && self::has_combo_js_file() ) {
3451	3042	wp_register_script( 'formidable', FrmAppHelper::plugin_url() . '/js/frm.min.js', array( 'jquery' ), $version, true );
3452	3043	} else {
3453	3044	wp_register_script( 'formidable', FrmAppHelper::plugin_url() . "/js/formidable{$suffix}.js", array( 'jquery' ), $version, true );
3454	3045	}
		@@ -3455,9 +3046,9 @@
3455	3046
3456	3047	add_filter( 'script_loader_tag', 'FrmFormsController::defer_script_loading', 10, 2 );
3457	3048
3458	3049	if ( FrmAppHelper::is_admin() ) {
3459		- // Don't load this in back-end
	3050	+ // don't load this in back-end
3460	3051	return;
3461	3052	}
3462	3053
3463	3054	FrmAppHelper::localize_script( 'front' );
		@@ -3470,15 +3061,8 @@
3470	3061	public static function has_combo_js_file() {
3471	3062	return is_readable( FrmAppHelper::plugin_path() . '/js/frm.min.js' );
3472	3063	}
3473	3064
3474		- /**
3475		- * @param object $form
3476		- * @param int|string $this_load
3477		- * @param bool $global_load
3478		- *
3479		- * @return void
3480		- */
3481	3065	public static function maybe_load_css( $form, $this_load, $global_load ) {
3482	3066	$load_css = FrmForm::is_form_loaded( $form, $this_load, $global_load );
3483	3067
3484	3068	if ( ! $load_css ) {
		@@ -3508,9 +3092,8 @@
3508	3092	return;
3509	3093	}
3510	3094
3511	3095	global $wp_styles;
3512		-
3513	3096	if ( is_array( $wp_styles->queue ) && in_array( 'formidable', $wp_styles->queue, true ) ) {
3514	3097	wp_print_styles( 'formidable' );
3515	3098	}
3516	3099	}
		@@ -3525,57 +3108,32 @@
3525	3108	private static function should_load_late() {
3526	3109	return ! function_exists( 'aioseo' );
3527	3110	}
3528	3111
3529		- /**
3530		- * @param string $tag
3531		- * @param string $handle
3532		- *
3533		- * @return string
3534		- */
3535	3112	public static function defer_script_loading( $tag, $handle ) {
3536		- if ( 'captcha-api' === $handle && ! str_contains( $tag, 'defer' ) ) {
3537		- return str_replace( ' src', ' defer="defer" async="async" src', $tag );
	3113	+ if ( 'captcha-api' == $handle && ! strpos( $tag, 'defer' ) ) {
	3114	+ $tag = str_replace( ' src', ' defer="defer" async="async" src', $tag );
3538	3115	}
3539	3116
3540	3117	return $tag;
3541	3118	}
3542	3119
3543		- /**
3544		- * @param string $location
3545		- *
3546		- * @return void
3547		- */
3548	3120	public static function footer_js( $location = 'footer' ) {
3549	3121	global $frm_vars;
3550	3122
3551	3123	FrmStylesController::enqueue_css();
3552	3124
3553		- if ( FrmAppHelper::is_admin() || $location === 'header' || empty( $frm_vars['forms_loaded'] ) ) {
3554		- return;
	3125	+ if ( ! FrmAppHelper::is_admin() && $location !== 'header' && ! empty( $frm_vars['forms_loaded'] ) ) {
	3126	+ // load formidable js
	3127	+ wp_enqueue_script( 'formidable' );
3555	3128	}
3556		-
3557		- // Load formidable js
3558		- wp_enqueue_script( 'formidable' );
3559		-
3560		- FrmHoneypot::maybe_print_honeypot_js();
3561		-
3562		- if ( ! method_exists( 'FrmProFormsHelper', 'load_currency_js' ) ) {
3563		- // Load currency JS if Pro is not installed.
3564		- FrmFormsHelper::load_currency_js();
3565		- }
3566	3129	}
3567	3130
3568	3131	/**
3569	3132	* @since 2.0.8
3570		- *
3571		- * @param array $atts
3572		- * @param string $content
3573		- *
3574		- * @return void
3575	3133	*/
3576	3134	private static function maybe_minimize_form( $atts, &$content ) {
3577		- // Check if minimizing is turned on
	3135	+ // check if minimizing is turned on
3578	3136	if ( self::is_minification_on( $atts ) ) {
3579	3137	$content = str_replace( array( "\r\n", "\r", "\n", "\t", ' ' ), '', $content );
3580	3138	}
3581	3139	}
		@@ -3581,11 +3139,8 @@
3581	3139	}
3582	3140
3583	3141	/**
3584	3142	* @since 2.0.8
3585		- *
3586		- * @param array $atts
3587		- *
3588	3143	* @return bool
3589	3144	*/
3590	3145	private static function is_minification_on( $atts ) {
3591	3146	return ! empty( $atts['minimize'] );
		@@ -3597,13 +3152,11 @@
3597	3152	* @return void
3598	3153	*/
3599	3154	public static function landing_page_preview_option() {
3600	3155	$dir = apply_filters( 'frm_landing_page_preview_option', false );
3601		-
3602	3156	if ( false === $dir || ! file_exists( $dir . 'landing-page-preview-option.php' ) ) {
3603	3157	$dir = self::get_form_views_path();
3604	3158	}
3605		-
3606	3159	include $dir . 'landing-page-preview-option.php';
3607	3160	}
3608	3161
3609	3162	/**
		@@ -3629,15 +3182,13 @@
3629	3182
3630	3183	check_ajax_referer( 'frm_ajax', 'nonce' );
3631	3184
3632	3185	$type = FrmAppHelper::get_post_param( 'type', '', 'sanitize_text_field' );
3633		-
3634	3186	if ( ! $type || ! in_array( $type, array( 'form', 'view' ), true ) ) {
3635	3187	die( 0 );
3636	3188	}
3637	3189
3638	3190	$object_id = FrmAppHelper::get_post_param( 'object_id', '', 'absint' );
3639		-
3640	3191	if ( ! $object_id ) {
3641	3192	die( 0 );
3642	3193	}
3643	3194
		@@ -3649,15 +3200,13 @@
3649	3200	$postarr['post_content'] = apply_filters( 'frm_create_page_with_' . $type . '_shortcode_content', '', $object_id );
3650	3201	}
3651	3202
3652	3203	$name = FrmAppHelper::get_post_param( 'name', '', 'sanitize_text_field' );
3653		-
3654	3204	if ( $name ) {
3655	3205	$postarr['post_title'] = $name;
3656	3206	}
3657	3207
3658	3208	$success = wp_insert_post( $postarr );
3659		-
3660	3209	if ( ! is_numeric( $success ) || ! $success ) {
3661	3210	die( 0 );
3662	3211	}
3663	3212
		@@ -3671,9 +3220,8 @@
3671	3220	/**
3672	3221	* @since 5.3
3673	3222	*
3674	3223	* @param int $form_id
3675		- *
3676	3224	* @return string
3677	3225	*/
3678	3226	private static function get_page_shortcode_content_for_form( $form_id ) {
3679	3227	$shortcode = '[formidable id="' . $form_id . '"]';
		@@ -3693,9 +3241,9 @@
3693	3241	}
3694	3242
3695	3243	check_ajax_referer( 'frm_ajax', 'nonce' );
3696	3244
3697		- $html = FrmAppHelper::clip(
	3245	+ $html = FrmAppHelper::clip(
3698	3246	function () {
3699	3247	FrmAppHelper::maybe_autocomplete_pages_options(
3700	3248	array(
3701	3249	'field_name' => 'frm_page_dropdown',
		@@ -3704,55 +3252,31 @@
3704	3252	)
3705	3253	);
3706	3254	}
3707	3255	);
	3256	+ $post_type_object = get_post_type_object( 'page' );
3708	3257	wp_send_json(
3709	3258	array(
3710	3259	'html' => $html,
3711		- 'edit_page_url' => admin_url( sprintf( get_post_type_object( 'page' )->_edit_link . '&action=edit', 0 ) ),
	3260	+ 'edit_page_url' => admin_url( sprintf( $post_type_object->_edit_link . '&action=edit', 0 ) ),
3712	3261	)
3713	3262	);
3714	3263	}
3715	3264
3716	3265	/**
3717		- * Prints necessary templates for the forms list page.
3718		- *
3719		- * @since 6.32
3720		- *
3721		- * @return void
	3266	+ * @deprecated 4.0
3722	3267	*/
3723		- public static function print_forms_list_templates() {
3724		- if ( ! FrmAppHelper::on_form_listing_page() ) {
3725		- return;
3726		- }
3727		-
3728		- $screen = get_current_screen();
3729		-
3730		- if ( ! $screen ) {
3731		- return;
3732		- }
3733		-
3734		- $columns = get_column_headers( $screen );
3735		- $hidden = get_hidden_columns( $screen );
3736		- $skip_cols = array( 'cb', 'name', 'settings' );
3737		- $per_page = get_user_option( 'formidable_page_formidable_per_page' );
3738		- $show_screen_options = $screen->show_screen_options();
3739		-
3740		- if ( $per_page < 1 ) {
3741		- $per_page = 20;
3742		- }
3743		-
3744		- include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/forms-list-settings.php';
	3268	+ public static function create( $values = array() ) {
	3269	+ _deprecated_function( __METHOD__, '4.0', 'FrmFormsController::update' );
	3270	+ self::update( $values );
3745	3271	}
3746	3272
3747	3273	/**
3748		- * @deprecated 4.0
	3274	+ * @deprecated 6.7
3749	3275	*
3750		- * @param array $values
3751		- *
3752		- * @return void
	3276	+ * @return bool
3753	3277	*/
3754		- public static function create( $values = array() ) {
3755		- _deprecated_function( __METHOD__, '4.0', 'FrmFormsController::update' );
3756		- self::update( $values );
	3278	+ public static function expired() {
	3279	+ _deprecated_function( __METHOD__, '6.7' );
	3280	+ return FrmAddonsController::is_license_expired();
3757	3281	}
3758	3282	}