← All changes | classes/controllers/FrmFormsController.php +278 -704 6.29 → 6.16 View file →

		@@ -26,13 +26,11 @@
26	26	private static $formidable_tinymce_button;
27	27
28	28	public static function menu() {
29	29	$menu_label = __( 'Forms', 'formidable' );
30		-
31	30	if ( ! FrmAppHelper::pro_is_installed() ) {
32	31	$menu_label .= ' (Lite)';
33	32	}
34		-
35	33	add_submenu_page( 'formidable', 'Formidable | ' . $menu_label, $menu_label, 'frm_view_forms', 'formidable', 'FrmFormsController::route' );
36	34
37	35	self::maybe_load_listing_hooks();
38	36	}
		@@ -66,12 +64,12 @@
66	64	*/
67	65	public static function logic_tip() {
68	66	$images_url = FrmAppHelper::plugin_url() . '/images/';
69	67	$data_message = __( 'Only show the fields you need and create branching forms. Upgrade to get conditional logic and question branching.', 'formidable' );
70		- $data_message .= ' <img src="' . esc_url( $images_url ) . '/survey-logic.png" srcset="' . esc_url( $images_url ) . 'survey-logic@2x.png 2x" alt="' . esc_attr__( 'Conditional Logic options', 'formidable' ) . '"/>'; // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong
71		- echo '<a href="javascript:void(0)" class="frm_noallow frm_show_upgrade frm_add_logic_link frm-collapsed frm-flex-justify" data-upgrade="' . esc_attr__( 'Conditional Logic options', 'formidable' ) . '" data-message="' . esc_attr( $data_message ) . '" data-medium="builder" data-content="logic">'; // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong
	68	+ $data_message .= ' <img src="' . esc_url( $images_url ) . '/survey-logic.png" srcset="' . esc_url( $images_url ) . 'survey-logic@2x.png 2x" alt="' . esc_attr__( 'Conditional Logic options', 'formidable' ) . '"/>';
	69	+ echo '<a href="javascript:void(0)" class="frm_noallow frm_show_upgrade frm_add_logic_link frm-collapsed frm-flex-justify" data-upgrade="' . esc_attr__( 'Conditional Logic options', 'formidable' ) . '" data-message="' . esc_attr( $data_message ) . '" data-medium="builder" data-content="logic">';
72	70	esc_html_e( 'Conditional Logic', 'formidable' );
73		- FrmAppHelper::icon_by_class( 'frmfont frm_arrowdown8_icon', array( 'aria-hidden' => 'true' ) );
	71	+ FrmAppHelper::icon_by_class( 'frmfont frm_arrowdown6_icon', array( 'aria-hidden' => 'true' ) );
74	72	echo '</a>';
75	73	}
76	74
77	75	/**
		@@ -78,15 +76,12 @@
78	76	* By default, Divi processes form shortcodes on the edit post page.
79	77	* Now that won't do.
80	78	*
81	79	* @since 3.01
82		- *
83		- * @param array $shortcodes List of shortcodes to process.
84		- *
85		- * @return array
86	80	*/
87	81	public static function prevent_divi_conflict( $shortcodes ) {
88	82	$shortcodes[] = 'formidable';
	83	+
89	84	return $shortcodes;
90	85	}
91	86
92	87	/**
		@@ -97,14 +92,12 @@
97	92
98	93	$message = '';
99	94	$params = FrmForm::list_page_params();
100	95	$errors = self::process_bulk_form_actions( array() );
101		-
102	96	if ( isset( $errors['message'] ) ) {
103	97	$message = $errors['message'];
104	98	unset( $errors['message'] );
105	99	}
106		-
107	100	$errors = apply_filters( 'frm_admin_list_form_action', $errors );
108	101
109	102	self::display_forms_list( $params, $message, $errors );
110	103	}
		@@ -114,29 +107,20 @@
114	107	*
115	108	* @since 2.02.11
116	109	*
117	110	* @param int|object $form
118		- *
119		- * @return void
120	111	*/
121	112	private static function create_default_email_action( $form ) {
122	113	FrmForm::maybe_get_form( $form );
123		-
124		- if ( ! is_object( $form ) ) {
125		- return;
126		- }
127		-
128	114	$create_email = apply_filters( 'frm_create_default_email_action', true, $form );
129	115
130		- if ( ! $create_email ) {
131		- return;
	116	+ if ( $create_email ) {
	117	+ /**
	118	+ * @var FrmFormAction
	119	+ */
	120	+ $action_control = FrmFormActionsController::get_form_actions( 'email' );
	121	+ $action_control->create( $form->id );
132	122	}
133		-
134		- /**
135		- * @var FrmFormAction
136		- */
137		- $action_control = FrmFormActionsController::get_form_actions( 'email' );
138		- $action_control->create( $form->id );
139	123	}
140	124
141	125	/**
142	126	* Create the default On submit action
		@@ -143,18 +127,12 @@
143	127	*
144	128	* @since 6.0.0
145	129	*
146	130	* @param int|object $form Form object or ID.
147		- *
148		- * @return void
149	131	*/
150	132	private static function create_default_on_submit_action( $form ) {
151	133	FrmForm::maybe_get_form( $form );
152	134
153		- if ( ! is_object( $form ) ) {
154		- return;
155		- }
156		-
157	135	/**
158	136	* Enable or disable the default On Submit action.
159	137	*
160	138	* @since 6.0.0
		@@ -163,17 +141,15 @@
163	141	* @param object $form Form object.
164	142	*/
165	143	$create = apply_filters( 'frm_create_default_on_submit_action', true, $form );
166	144
167		- if ( ! $create ) {
168		- return;
	145	+ if ( $create ) {
	146	+ /**
	147	+ * @var FrmFormAction
	148	+ */
	149	+ $action_control = FrmFormActionsController::get_form_actions( FrmOnSubmitAction::$slug );
	150	+ $action_control->create( $form->id );
169	151	}
170		-
171		- /**
172		- * @var FrmFormAction
173		- */
174		- $action_control = FrmFormActionsController::get_form_actions( FrmOnSubmitAction::$slug );
175		- $action_control->create( $form->id );
176	152	}
177	153
178	154	/**
179	155	* Creates submit button field.
		@@ -180,18 +156,12 @@
180	156	*
181	157	* @since 6.9
182	158	*
183	159	* @param int|object $form Form ID or object.
184		- *
185		- * @return void
186	160	*/
187	161	private static function create_submit_button_field( $form ) {
188	162	FrmForm::maybe_get_form( $form );
189	163
190		- if ( ! is_object( $form ) ) {
191		- return;
192		- }
193		-
194	164	if ( FrmSubmitHelper::get_submit_field( $form->id ) ) {
195	165	// Do not create submit button field if it exists.
196	166	return;
197	167	}
		@@ -199,9 +169,9 @@
199	169	FrmField::create(
200	170	array(
201	171	'type' => FrmSubmitHelper::FIELD_TYPE,
202	172	'name' => __( 'Submit', 'formidable' ),
203		- 'field_order' => FrmSubmitHelper::DEFAULT_ORDER,
	173	+ 'field_order' => 9999,
204	174	'form_id' => $form->id,
205	175	'field_options' => FrmFieldsHelper::get_default_field_options( FrmSubmitHelper::FIELD_TYPE ),
206	176	'description' => '',
207	177	'default_value' => '',
		@@ -210,10 +180,8 @@
210	180	);
211	181	}
212	182
213	183	/**
214		- * @param array|false $values
215		- *
216	184	* @return void
217	185	*/
218	186	public static function edit( $values = false ) {
219	187	FrmAppHelper::permission_check( 'frm_edit_forms' );
		@@ -225,9 +193,8 @@
225	193
226	194	/**
227	195	* @param mixed $id
228	196	* @param string $message
229		- *
230	197	* @return void
231	198	*/
232	199	public static function settings( $id = false, $message = '' ) {
233	200	FrmAppHelper::permission_check( 'frm_edit_forms' );
		@@ -255,9 +222,10 @@
255	222	FrmAppController::show_error_modal( $error_args );
256	223	return;
257	224	}
258	225
259		- $id = FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
	226	+ $id = FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
	227	+
260	228	$errors = FrmForm::validate( $_POST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
261	229	$warnings = FrmFormsHelper::check_for_warnings( $_POST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
262	230
263	231	if ( count( $errors ) > 0 ) {
		@@ -271,9 +239,8 @@
271	239
272	240	FrmForm::update( $id, $_POST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
273	241
274	242	$antispam_is_on = ! empty( $_POST['options']['antispam'] ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
275		-
276	243	if ( $antispam_is_on !== $antispam_was_on ) {
277	244	FrmAntiSpam::clear_caches();
278	245	}
279	246
		@@ -283,9 +250,8 @@
283	250	}
284	251
285	252	/**
286	253	* @param int $form_id
287		- *
288	254	* @return bool
289	255	*/
290	256	private static function antispam_was_on( $form_id ) {
291	257	$form = FrmForm::getOne( $form_id );
		@@ -292,14 +258,12 @@
292	258	return ! empty( $form->options['antispam'] );
293	259	}
294	260
295	261	/**
296		- * @param array $values
297		- *
298	262	* @return void
299	263	*/
300	264	public static function update( $values = array() ) {
301		- if ( ! $values ) {
	265	+ if ( empty( $values ) ) {
302	266	$values = $_POST; // phpcs:ignore WordPress.Security.NonceVerification.Missing
303	267	}
304	268
305	269	// Set radio button and checkbox meta equal to "other" value.
		@@ -308,9 +272,8 @@
308	272	}
309	273
310	274	$errors = FrmForm::validate( $values );
311	275	$permission_error = FrmAppHelper::permission_nonce_error( 'frm_edit_forms', 'frm_save_form', 'frm_save_form_nonce' );
312		-
313	276	if ( $permission_error !== false ) {
314	277	$errors['form'] = $permission_error;
315	278	}
316	279
		@@ -329,9 +292,9 @@
329	292	if ( self::is_too_long( $values ) ) {
330	293	$message .= '<br/> ' . sprintf(
331	294	/* translators: %1$s: Start link HTML, %2$s: end link HTML */
332	295	__( 'However, your form is very long and may be %1$sreaching server limits%2$s.', 'formidable' ),
333		- '<a href="' . esc_url( self::get_form_too_long_docs_url() ) . '" target="_blank" rel="noopener">',
	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">',
334	297	'</a>'
335	298	);
336	299	}
337	300
		@@ -342,32 +305,17 @@
342	305	self::get_edit_vars( $id, array(), $message );
343	306	}
344	307
345	308	/**
346		- * @since 6.25.1
347		- *
348		- * @return string
349		- */
350		- private static function get_form_too_long_docs_url() {
351		- $utm = array(
352		- 'campaign' => 'builder',
353		- 'content' => 'form-too-long',
354		- );
355		- return FrmAppHelper::admin_upgrade_link( $utm, 'knowledgebase/i-have-a-long-form-why-did-the-options-at-the-end-of-the-form-stop-saving/' );
356		- }
357		-
358		- /**
359	309	* Remove the draft flag from any new fields from this current session.
360	310	*
361	311	* @since 6.8
362	312	*
363	313	* @param int $form_id
364		- *
365	314	* @return void
366	315	*/
367	316	private static function maybe_remove_draft_option_from_fields( $form_id ) {
368	317	$draft_field_ids_csv = FrmAppHelper::get_post_param( 'draft_fields', '', 'sanitize_text_field' );
369		-
370	318	if ( ! $draft_field_ids_csv ) {
371	319	// If the draft_fields input is empty there are no new fields in the session.
372	320	return;
373	321	}
		@@ -372,9 +320,8 @@
372	320	return;
373	321	}
374	322
375	323	$draft_field_ids = array_filter( explode( ',', $draft_field_ids_csv ), 'is_numeric' );
376		-
377	324	if ( ! $draft_field_ids ) {
378	325	// Exit early if the draft fields input is invalid. It should be a CSV of integer values.
379	326	return;
380	327	}
		@@ -379,9 +326,8 @@
379	326	return;
380	327	}
381	328
382	329	$draft_field_rows = FrmFieldsHelper::get_draft_field_results( $form_id, $draft_field_ids );
383		-
384	330	foreach ( $draft_field_rows as $row ) {
385	331	$row->field_options['draft'] = 0;
386	332	FrmField::update( $row->id, array( 'field_options' => $row->field_options ) );
387	333	}
		@@ -393,10 +339,8 @@
393	339	* were likely not saved either.
394	340	*
395	341	* @since 3.06.01
396	342	*
397		- * @param array $values
398		- *
399	343	* @return bool
400	344	*/
401	345	private static function is_too_long( $values ) {
402	346	return empty( $values['frm_end'] );
		@@ -432,17 +376,13 @@
432	376	* @return string|null
433	377	*/
434	378	public static function page_preview() {
435	379	$params = FrmForm::list_page_params();
436		-
437		- if ( ! $params['form'] || is_numeric( $params['form'] ) ) {
	380	+ if ( ! $params['form'] ) {
438	381	return null;
439	382	}
440	383
441		- self::maybe_block_preview( $params['form'] );
442		-
443	384	$form = FrmForm::getOne( $params['form'] );
444		-
445	385	if ( ! $form ) {
446	386	return null;
447	387	}
448	388
		@@ -454,19 +394,9 @@
454	394	*
455	395	* @return void
456	396	*/
457	397	public static function show_page_preview() {
458		- $preview = self::page_preview();
459		-
460		- if ( is_null( $preview ) ) {
461		- wp_die(
462		- '<h1>' . esc_html__( 'Form key is invalid', 'formidable' ) . '</h1>',
463		- '<p>' . esc_html__( 'Form key is invalid', 'formidable' ) . '</p>',
464		- 404
465		- );
466		- }
467		-
468		- echo $preview; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
	398	+ echo self::page_preview(); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
469	399	}
470	400
471	401	/**
472	402	* @return void
		@@ -477,19 +407,9 @@
477	407
478	408	global $frm_vars;
479	409	$frm_vars['preview'] = true;
480	410
481		- // print_emoji_styles is deprecated.
482		- remove_action( 'wp_print_styles', 'print_emoji_styles' );
483		-
484		- if ( FrmTestModeController::should_add_test_mode_container() ) {
485		- do_action( 'frm_test_mode_init' );
486		- add_action( 'wp_enqueue_scripts', 'FrmTestModeController::register_and_enqueue_required_scripts' );
487		- add_filter( 'frm_filter_final_form', 'FrmTestModeController::maybe_add_test_mode_container', 99 );
488		- }
489		-
490	411	$include_theme = FrmAppHelper::get_param( 'theme', '', 'get', 'absint' );
491		-
492	412	if ( $include_theme ) {
493	413	self::set_preview_query();
494	414	self::load_theme_preview();
495	415	} else {
		@@ -512,9 +432,8 @@
512	432	'post_type' => 'page',
513	433	);
514	434
515	435	$page_for_posts = get_option( 'page_for_posts' );
516		-
517	436	if ( is_numeric( $page_for_posts ) ) {
518	437	// Avoid querying for the "Posts Page" or "Blog Page" so we don't display 10 forms.
519	438	$page_query['post__not_in'] = array( $page_for_posts );
520	439	}
		@@ -519,15 +438,13 @@
519	438	$page_query['post__not_in'] = array( $page_for_posts );
520	439	}
521	440
522	441	$random_page = get_posts( $page_query );
523		-
524	442	if ( ! $random_page ) {
525	443	return;
526	444	}
527	445
528	446	$random_page = reset( $random_page );
529		-
530	447	if ( ! is_a( $random_page, 'WP_Post' ) ) {
531	448	// The return type can also be int.
532	449	return;
533	450	}
		@@ -549,9 +466,8 @@
549	466	*
550	467	* @since 5.5.2
551	468	*
552	469	* @param WP_Post $page The page object.
553		- *
554	470	* @return void
555	471	*/
556	472	private static function set_post_global( $page ) {
557	473	global $post;
		@@ -570,16 +486,14 @@
570	486	add_action( 'loop_no_results', 'FrmFormsController::show_page_preview' );
571	487	add_filter( 'is_active_sidebar', '__return_false' );
572	488	FrmStylesController::enqueue_css( 'enqueue', true );
573	489
574		- if ( false !== get_template_part( 'page' ) ) {
575		- 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();
576	495	}
577		-
578		- if ( function_exists( 'wp_is_block_theme' ) && wp_is_block_theme() ) {
579		- add_filter( 'body_class', 'FrmFormsController::preview_block_theme_body_classnames' );
580		- }
581		- self::fallback_when_page_template_part_is_not_supported_by_theme();
582	496	}
583	497
584	498	/**
585	499	* Add padding to the body for block themes.
		@@ -586,9 +500,8 @@
586	500	*
587	501	* @since 6.5.2
588	502	*
589	503	* @param array $classes The body classes list.
590		- *
591	504	* @return array
592	505	*/
593	506	public static function preview_block_theme_body_classnames( $classes ) {
594	507	$classes[] = 'has-global-padding';
		@@ -601,27 +514,21 @@
601	514	*
602	515	* @return void
603	516	*/
604	517	private static function fallback_when_page_template_part_is_not_supported_by_theme() {
605		- if ( ! have_posts() ) {
606		- return;
607		- }
	518	+ if ( have_posts() ) {
	519	+ the_post();
	520	+ self::get_template( 'header' );
608	521
609		- the_post();
610		- 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>';
611	528
612		- // Add some generic class names to the container to add some natural padding to the content.
613		- // .entry-content catches the WordPress TwentyTwenty theme.
614		- // .container catches Customizr content.
615		- echo '<div class="container entry-content">';
616		- the_content();
617		- echo '</div>';
618		-
619		- // Prevent extra unexpected forms in the footer.
620		- // For some reason this happens in the Twenty Twenty Five theme.
621		- add_filter( 'frm_filter_final_form', '__return_empty_string' );
622		-
623		- self::get_template( 'footer' );
	529	+ self::get_template( 'footer' );
	530	+ }
624	531	}
625	532
626	533	/**
627	534	* Calls core function to get a template part if it doesn't cause deprecation warnings. Otherwise skips the deprecation function call
		@@ -627,11 +534,9 @@
627	534	* Calls core function to get a template part if it doesn't cause deprecation warnings. Otherwise skips the deprecation function call
628	535	* and renders required html fragments calling required functions.
629	536	*
630	537	* @since 6.7.1
631		- *
632	538	* @param string $template
633		- *
634	539	* @return void
635	540	*/
636	541	private static function get_template( $template ) {
637	542	if ( self::should_try_getting_template( $template ) ) {
		@@ -652,11 +557,9 @@
652	557	/**
653	558	* Returns true if calling a template function doesn't trigger deprecation warnings.
654	559	*
655	560	* @since 6.7.1
656		- *
657	561	* @param string $template
658		- *
659	562	* @return bool
660	563	*/
661	564	private static function should_try_getting_template( $template ) {
662	565	$stylesheet_path = get_stylesheet_directory();
		@@ -670,15 +573,15 @@
670	573	/**
671	574	* Set the page title for the theme preview page
672	575	*
673	576	* @since 3.0
674		- *
675		- * @param string $title
676		- *
677		- * @return string
678	577	*/
679	578	public static function preview_page_title( $title ) {
680		- 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;
681	584	}
682	585
683	586	/**
684	587	* Set the page title for the theme preview page.
		@@ -685,9 +588,8 @@
685	588	*
686	589	* @since 3.0
687	590	*
688	591	* @param string $title
689		- *
690	592	* @return string
691	593	*/
692	594	public static function preview_title( $title ) {
693	595	return __( 'Form Preview', 'formidable' );
		@@ -698,9 +600,8 @@
698	600	*
699	601	* @since 3.0
700	602	*
701	603	* @param string $content
702		- *
703	604	* @return string
704	605	*/
705	606	public static function preview_content( $content ) {
706	607	if ( in_the_loop() ) {
		@@ -715,39 +616,23 @@
715	616	/**
716	617	* @since 3.0
717	618	*/
718	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	+
719	625	$key = FrmAppHelper::simple_get( 'form', 'sanitize_title' );
720		-
721		- // phpcs:ignore Universal.Operators.StrictComparisons
722	626	if ( $key == '' ) {
723	627	$key = FrmAppHelper::get_post_param( 'form', '', 'sanitize_title' );
724	628	}
725	629
726		- if ( ! $key ) {
727		- $error = __( 'Form key is missing', 'formidable' );
728		- wp_die(
729		- '<h1>' . esc_html( $error ) . '</h1>',
730		- '<p>' . esc_html( $error ) . '</p>',
731		- 404
732		- );
733		- }
734		-
735		- self::maybe_block_preview( $key );
736		-
737	630	$form = FrmForm::getAll( array( 'form_key' => $key ), '', 1 );
738		-
739		- if ( ! $form ) {
740		- $error = __( 'Form does not exist', 'formidable' );
741		- wp_die(
742		- '<h1>' . esc_html( $error ) . '</h1>',
743		- '<p>' . esc_html( $error ) . '</p>',
744		- 404
745		- );
	631	+ if ( empty( $form ) ) {
	632	+ $form = FrmForm::getAll( array(), '', 1 );
746	633	}
747	634
748		- header( 'Content-Type: text/html; charset=' . get_option( 'blog_charset' ) );
749		-
750	635	self::fix_deprecated_null_param_warning();
751	636
752	637	require FrmAppHelper::plugin_path() . '/classes/views/frm-entries/direct.php';
753	638	}
		@@ -752,33 +637,8 @@
752	637	require FrmAppHelper::plugin_path() . '/classes/views/frm-entries/direct.php';
753	638	}
754	639
755	640	/**
756		- * Block the form preview for the contact form by default if the user cannot view forms.
757		- * This is to prevent the contact form being exploited.
758		- * Since this form is added by default and every site uses the same key, it is too easy
759		- * to guess this form.
760		- *
761		- * @since 6.20
762		- *
763		- * @param string $form_key Form key.
764		- *
765		- * @return void
766		- */
767		- public static function maybe_block_preview( $form_key ) {
768		- if ( ! FrmFormsHelper::should_block_preview( $form_key ) ) {
769		- return;
770		- }
771		-
772		- $error = __( 'You do not have permission to view this form', 'formidable' );
773		- wp_die(
774		- '<h1>' . esc_html( $error ) . '</h1>',
775		- '<p>' . esc_html( $error ) . '</p>',
776		- 403
777		- );
778		- }
779		-
780		- /**
781	641	* Some themes have a null $src value.
782	642	* This function adds a filter to ensure that $src is not null.
783	643	* WP will call str_starts_with with the null value triggering a deprecated message otherwise.
784	644	*
		@@ -790,13 +650,15 @@
790	650	add_filter(
791	651	'script_loader_src',
792	652	/**
793	653	* @param string|null $src
794		- *
795	654	* @return string
796	655	*/
797	656	function ( $src ) {
798		- return is_null( $src ) ? '' : $src;
	657	+ if ( is_null( $src ) ) {
	658	+ $src = '';
	659	+ }
	660	+ return $src;
799	661	}
800	662	);
801	663	}
802	664
		@@ -805,9 +667,8 @@
805	667	}
806	668
807	669	/**
808	670	* @param array $ids
809		- *
810	671	* @return string
811	672	*/
812	673	public static function bulk_untrash( $ids ) {
813	674	FrmAppHelper::permission_check( 'frm_edit_forms' );
		@@ -819,9 +680,11 @@
819	680	return '';
820	681	}
821	682
822	683	/* translators: %1$s: Number of forms */
823		- return sprintf( _n( '%1$s form restored from the Trash.', '%1$s forms restored from the Trash.', $count, 'formidable' ), $count );
	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;
824	687	}
825	688
826	689	/**
827	690	* @since 3.06
		@@ -866,9 +729,8 @@
866	729	// Check nonce url.
867	730	check_admin_referer( $status . '_form_' . $params['id'] );
868	731
869	732	$count = 0;
870		-
871	733	if ( FrmForm::set_status( $params['id'], $available_status[ $status ]['new_status'] ) ) {
872	734	++$count;
873	735	}
874	736
		@@ -882,9 +744,9 @@
882	744	/* translators: %1$s: Number of forms */
883	745	$available_status['untrash']['message'] = sprintf( _n( '%1$s form restored from the Trash.', '%1$s forms restored from the Trash.', $count, 'formidable' ), $count );
884	746
885	747	/* translators: %1$s: Number of forms, %2$s: Start link HTML, %3$s: End link HTML */
886		- $available_status['trash']['message'] = sprintf( _n( '%1$s form moved to the Trash. %2$sUndo%3$s', '%1$s forms moved to the Trash. %2$sUndo%3$s', $count, 'formidable' ), $count, '<a href="' . esc_url( wp_nonce_url( '?page=formidable&frm_action=untrash&form_type=' . $form_type . '&id=' . $params['id'], 'untrash_form_' . $params['id'] ) ) . '">', '</a>' ); // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong
	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>' );
887	749
888	750	$message = $available_status[ $status ]['message'];
889	751
890	752	self::display_forms_list( $params, $message );
		@@ -891,9 +753,8 @@
891	753	}
892	754
893	755	/**
894	756	* @param array $ids
895		- *
896	757	* @return string
897	758	*/
898	759	public static function bulk_trash( $ids ) {
899	760	FrmAppHelper::permission_check( 'frm_delete_forms' );
		@@ -898,9 +759,8 @@
898	759	public static function bulk_trash( $ids ) {
899	760	FrmAppHelper::permission_check( 'frm_delete_forms' );
900	761
901	762	$count = 0;
902		-
903	763	foreach ( $ids as $id ) {
904	764	if ( FrmForm::trash( $id ) ) {
905	765	++$count;
906	766	}
		@@ -905,12 +765,8 @@
905	765	++$count;
906	766	}
907	767	}
908	768
909		- if ( ! $count ) {
910		- return '';
911		- }
912		-
913	769	$current_page = FrmAppHelper::get_simple_request(
914	770	array(
915	771	'param' => 'form_type',
916	772	'type' => 'request',
		@@ -915,16 +771,17 @@
915	771	'param' => 'form_type',
916	772	'type' => 'request',
917	773	)
918	774	);
919		-
920		- return sprintf(
	775	+ $message = sprintf(
921	776	/* translators: %1$s: Number of forms, %2$s: Start link HTML, %3$s: End link HTML */
922	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' ),
923	778	$count,
924		- '<a href="' . esc_url( wp_nonce_url( '?page=formidable&frm_action=list&action=bulk_untrash&form_type=' . $current_page . '&item-action=' . implode( ',', $ids ), 'bulk-toplevel_page_formidable' ) ) . '">', // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong
	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' ) ) . '">',
925	780	'</a>'
926	781	);
	782	+
	783	+ return $message;
927	784	}
928	785
929	786	public static function destroy() {
930	787	FrmAppHelper::permission_check( 'frm_delete_forms' );
		@@ -934,9 +791,8 @@
934	791	// Check nonce url.
935	792	check_admin_referer( 'destroy_form_' . $params['id'] );
936	793
937	794	$count = 0;
938		-
939	795	if ( FrmForm::destroy( $params['id'] ) ) {
940	796	++$count;
941	797	}
942	798
		@@ -947,9 +803,8 @@
947	803	}
948	804
949	805	/**
950	806	* @param array $ids
951		- *
952	807	* @return string
953	808	*/
954	809	public static function bulk_destroy( $ids ) {
955	810	FrmAppHelper::permission_check( 'frm_delete_forms' );
		@@ -954,12 +809,10 @@
954	809	public static function bulk_destroy( $ids ) {
955	810	FrmAppHelper::permission_check( 'frm_delete_forms' );
956	811
957	812	$count = 0;
958		-
959	813	foreach ( $ids as $id ) {
960	814	$d = FrmForm::destroy( $id );
961		-
962	815	if ( $d ) {
963	816	++$count;
964	817	}
965	818	}
		@@ -977,18 +830,19 @@
977	830	*/
978	831	public static function delete_all() {
979	832	// Check nonce url.
980	833	$permission_error = FrmAppHelper::permission_nonce_error( 'frm_delete_forms', '_wpnonce', 'bulk-toplevel_page_formidable' );
981		-
982	834	if ( $permission_error !== false ) {
983	835	self::display_forms_list( array(), '', array( $permission_error ) );
	836	+
984	837	return;
985	838	}
986	839
987	840	$count = FrmForm::scheduled_delete( time() );
988	841	$url = remove_query_arg( array( 'delete_all' ) );
989		- $url .= '&message=forms_permanently_deleted&forms_deleted=' . $count;
990	842
	843	+ $url .= '&message=forms_permanently_deleted&forms_deleted=' . $count;
	844	+
991	845	wp_safe_redirect( $url );
992	846	die();
993	847	}
994	848
		@@ -1062,23 +916,21 @@
1062	916	*
1063	917	* @return void
1064	918	*/
1065	919	public static function insert_form_button() {
1066		- if ( ! current_user_can( 'frm_view_forms' ) ) {
1067		- 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
1068	932	}
1069		-
1070		- // Store the result in memory and re-use it when this function is called multiple times.
1071		- // This helps speed up the form builder when there are a lot of HTML fields, where this
1072		- // Button is inserted once per HTML field.
1073		- // In a form with 66 HTML fields, this saves 0.5 seconds on page load time, tested locally.
1074		- if ( ! isset( self::$formidable_tinymce_button ) ) {
1075		- FrmAppHelper::load_admin_wide_js();
1076		- $menu_name = FrmAppHelper::get_menu_name();
1077		- $icon = apply_filters( 'frm_media_icon', FrmAppHelper::svg_logo() );
1078		- self::$formidable_tinymce_button = '<a href="#TB_inline?width=50&height=50&inlineId=frm_insert_form" class="thickbox button add_media frm_insert_form" title="' . esc_attr__( 'Add forms and content', 'formidable' ) . '">' . FrmAppHelper::kses( $icon, 'all' ) . ' ' . esc_html( $menu_name ) . '</a>'; // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong
1079		- }
1080		- echo self::$formidable_tinymce_button; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
1081	933	}
1082	934
1083	935	/**
1084	936	* @return void
		@@ -1099,21 +951,17 @@
1099	951	$shortcodes = apply_filters( 'frm_popup_shortcodes', $shortcodes );
1100	952
1101	953	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/insert_form_popup.php';
1102	954
1103		- if ( ! FrmAppHelper::is_form_builder_page() || class_exists( '_WP_Editors', false ) ) {
1104		- 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
1105	963	}
1106		-
1107		- // Initialize a wysiwyg so we have usable settings defined in tinyMCEPreInit.mceInit
1108		- require ABSPATH . WPINC . '/class-wp-editor.php';
1109		- // phpcs:disable Generic.WhiteSpace.ScopeIndent
1110		- ?>
1111		- <div class="frm_hidden">
1112		- <?php wp_editor( '', 'frm_description_placeholder', array() ); ?>
1113		- </div>
1114		- <?php
1115		- // phpcs:enable Generic.WhiteSpace.ScopeIndent
1116	964	}
1117	965
1118	966	/**
1119	967	* Check the page being loaded, determine if this is a page that should include the form popup.
		@@ -1125,9 +973,8 @@
1125	973	private static function should_insert_form_popup() {
1126	974	if ( FrmAppHelper::is_form_builder_page() ) {
1127	975	return true;
1128	976	}
1129		-
1130	977	$page = basename( FrmAppHelper::get_server_value( 'PHP_SELF' ) );
1131	978	return in_array( $page, array( 'post.php', 'page.php', 'page-new.php', 'post-new.php' ), true );
1132	979	}
1133	980
		@@ -1135,10 +982,9 @@
1135	982	FrmAppHelper::permission_check( 'frm_view_forms' );
1136	983	check_ajax_referer( 'frm_ajax', 'nonce' );
1137	984
1138	985	$shortcode = FrmAppHelper::get_post_param( 'shortcode', '', 'sanitize_text_field' );
1139		-
1140		- if ( ! $shortcode ) {
	986	+ if ( empty( $shortcode ) ) {
1141	987	wp_die();
1142	988	}
1143	989
1144	990	echo '<div id="sc-opts-' . esc_attr( $shortcode ) . '" class="frm_shortcode_option">';
		@@ -1163,13 +1009,12 @@
1163	1009	'label' => __( 'Minimize form HTML', 'formidable' ),
1164	1010	),
1165	1011	);
1166	1012	}
1167		-
1168	1013	$opts = apply_filters( 'frm_sc_popup_opts', $opts, $shortcode );
1169	1014
1170	1015	if ( isset( $opts['form_id'] ) && is_string( $opts['form_id'] ) ) {
1171		- // Allow other shortcodes to use the required form id option
	1016	+ // allow other shortcodes to use the required form id option
1172	1017	$form_id = $opts['form_id'];
1173	1018	unset( $opts['form_id'] );
1174	1019	}
1175	1020
		@@ -1185,9 +1030,8 @@
1185	1030	*
1186	1031	* @param array $params
1187	1032	* @param string $message
1188	1033	* @param array $errors
1189		- *
1190	1034	* @return void
1191	1035	*/
1192	1036	public static function display_forms_list( $params = array(), $message = '', $errors = array() ) {
1193	1037	FrmAppHelper::permission_check( 'frm_view_forms' );
		@@ -1204,44 +1048,33 @@
1204	1048	* @param string $table_class Class name for List Helper.
1205	1049	*/
1206	1050	$table_class = apply_filters( 'frm_forms_list_class', 'FrmFormsListHelper' );
1207	1051	$wp_list_table = new $table_class( compact( 'params' ) );
1208		- $pagenum = $wp_list_table->get_pagenum();
1209	1052
	1053	+ $pagenum = $wp_list_table->get_pagenum();
	1054	+
1210	1055	$wp_list_table->prepare_items();
1211	1056
1212	1057	$total_pages = $wp_list_table->get_pagination_arg( 'total_pages' );
1213		-
1214	1058	if ( $pagenum > $total_pages && $total_pages > 0 ) {
1215		- wp_safe_redirect( esc_url_raw( add_query_arg( 'paged', $total_pages ) ) );
	1059	+ wp_redirect( esc_url_raw( add_query_arg( 'paged', $total_pages ) ) );
1216	1060	die();
1217	1061	}
1218	1062
1219		- $error = FrmInbox::check_for_error();
1220		-
1221		- if ( $error ) {
1222		- $show_messages = array( $error['subject'] . '. ' . $error['message'] );
1223		- }
1224		-
1225	1063	require FrmAppHelper::plugin_path() . '/classes/views/frm-forms/list.php';
1226	1064	}
1227	1065
1228	1066	/**
1229	1067	* @param array<string,string> $columns
1230		- *
1231	1068	* @return array<string,string>
1232	1069	*/
1233	1070	public static function get_columns( $columns ) {
1234		- $columns['cb'] = '<input type="checkbox" />';
1235		- $columns['name'] = esc_html__( 'Form Title', 'formidable' );
1236		- $columns['entries'] = esc_html__( 'Entries', 'formidable' );
1237		- $columns['id'] = 'ID';
1238		- $columns['form_key'] = esc_html__( 'Key', 'formidable' );
1239		-
1240		- if ( 'trash' !== FrmAppHelper::simple_get( 'form_type' ) ) {
1241		- $columns['shortcode'] = esc_html__( 'Actions', 'formidable' );
1242		- }
1243		-
	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' );
1244	1077	$columns['created_at'] = esc_html__( 'Date', 'formidable' );
1245	1078
1246	1079	add_screen_option(
1247	1080	'per_page',
		@@ -1269,9 +1102,8 @@
1269	1102	}
1270	1103
1271	1104	/**
1272	1105	* @param mixed $hidden_columns
1273		- *
1274	1106	* @return array
1275	1107	*/
1276	1108	public static function hidden_columns( $hidden_columns ) {
1277	1109	if ( ! is_array( $hidden_columns ) ) {
		@@ -1292,18 +1124,11 @@
1292	1124
1293	1125	return $hidden_columns;
1294	1126	}
1295	1127
1296		- /**
1297		- * @param mixed $save
1298		- * @param string $option
1299		- * @param int|string $value
1300		- *
1301		- * @return mixed
1302		- */
1303	1128	public static function save_per_page( $save, $option, $value ) {
1304	1129	if ( $option === 'formidable_page_formidable_per_page' ) {
1305		- return (int) $value;
	1130	+ $save = (int) $value;
1306	1131	}
1307	1132
1308	1133	return $save;
1309	1134	}
		@@ -1312,9 +1137,8 @@
1312	1137	* @param int|string $id
1313	1138	* @param array $errors
1314	1139	* @param string $message
1315	1140	* @param bool $create_link
1316		- *
1317	1141	* @return void
1318	1142	*/
1319	1143	private static function get_edit_vars( $id, $errors = array(), $message = '', $create_link = false ) {
1320	1144	global $frm_vars;
		@@ -1329,9 +1153,8 @@
1329	1153	'page' => 'formidable',
1330	1154	)
1331	1155	),
1332	1156	);
1333		-
1334	1157	if ( ! $form ) {
1335	1158	FrmAppController::show_error_modal( $error_args );
1336	1159	return;
1337	1160	}
		@@ -1353,14 +1176,15 @@
1353	1176	}
1354	1177
1355	1178	if ( $form->parent_form_id ) {
1356	1179	/* translators: %1$s: Start link HTML, %2$s: End link HTML */
1357		- 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>' ) );
1358	1181	}
1359	1182
1360	1183	$frm_field_selection = FrmField::field_selection();
1361		- $fields = FrmField::get_all_for_form( $form->id );
1362	1184
	1185	+ $fields = FrmField::get_all_for_form( $form->id );
	1186	+
1363	1187	// Automatically add end section fields if they don't exist (2.0 migration).
1364	1188	$reset_fields = false;
1365	1189	FrmFormsHelper::auto_add_end_section_fields( $form, $fields, $reset_fields );
1366	1190	FrmSubmitHelper::maybe_create_submit_field( $form, $fields, $reset_fields );
		@@ -1384,10 +1208,9 @@
1384	1208	*/
1385	1209	$values['fields'] = apply_filters( 'frm_fields_in_form_builder', $fields, compact( 'form' ) );
1386	1210
1387	1211	$edit_message = __( 'Form was successfully updated.', 'formidable' );
1388		-
1389		- if ( $form->is_template && $message === $edit_message ) {
	1212	+ if ( $form->is_template && $message == $edit_message ) {
1390	1213	$message = __( 'Template was successfully updated.', 'formidable' );
1391	1214	}
1392	1215
1393	1216	self::maybe_update_form_builder_message( $message );
		@@ -1402,12 +1225,11 @@
1402	1225	}
1403	1226
1404	1227	/**
1405	1228	* @param array $fields
1406		- *
1407	1229	* @return array
1408	1230	*/
1409		- public static function update_form_builder_fields( $fields ) {
	1231	+ public static function update_form_builder_fields( $fields, $form ) {
1410	1232	foreach ( $fields as $field ) {
1411	1233	$field->do_not_include_icons = true;
1412	1234	}
1413	1235	return $fields;
		@@ -1412,13 +1234,8 @@
1412	1234	}
1413	1235	return $fields;
1414	1236	}
1415	1237
1416		- /**
1417		- * @param string $message
1418		- *
1419		- * @return void
1420		- */
1421	1238	public static function maybe_update_form_builder_message( &$message ) {
1422	1239	if ( 'form_duplicated' === FrmAppHelper::simple_get( 'message' ) ) {
1423	1240	$message = __( 'Form was Successfully Copied', 'formidable' );
1424	1241	}
		@@ -1427,9 +1244,8 @@
1427	1244	/**
1428	1245	* @param int|string $id
1429	1246	* @param array $errors
1430	1247	* @param array|string $args
1431		- *
1432	1248	* @return void
1433	1249	*/
1434	1250	public static function get_settings_vars( $id, $errors = array(), $args = array() ) {
1435	1251	FrmAppHelper::permission_check( 'frm_edit_forms' );
		@@ -1451,12 +1267,13 @@
1451	1267	);
1452	1268	$args = array_merge( $defaults, $args );
1453	1269	$message = $args['message'];
1454	1270	$warnings = $args['warnings'];
1455		- $form = FrmForm::getOne( $id );
1456		- $fields = FrmField::get_all_for_form( $id );
1457		- $values = FrmAppHelper::setup_edit_vars( $form, 'forms', $fields, true );
1458	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	+
1459	1276	/**
1460	1277	* Allows changing fields in the form settings.
1461	1278	*
1462	1279	* @since 5.0.04
		@@ -1496,12 +1313,8 @@
1496	1313	}
1497	1314
1498	1315	/**
1499	1316	* @since 4.0
1500		- *
1501		- * @param array $atts
1502		- *
1503		- * @return void
1504	1317	*/
1505	1318	public static function form_publish_button( $atts ) {
1506	1319	$values = $atts['values'];
1507	1320	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/_publish_box.php';
		@@ -1512,9 +1325,8 @@
1512	1325	*
1513	1326	* @since 4.0
1514	1327	*
1515	1328	* @param array $values
1516		- *
1517	1329	* @return array
1518	1330	*/
1519	1331	private static function get_settings_tabs( $values ) {
1520	1332	$sections = array(
		@@ -1520,20 +1332,20 @@
1520	1332	$sections = array(
1521	1333	'advanced' => array(
1522	1334	'name' => __( 'General', 'formidable' ),
1523	1335	'title' => __( 'General Form Settings', 'formidable' ),
1524		- 'function' => array( self::class, 'advanced_settings' ),
1525		- 'icon' => 'frmfont frm_settings_icon',
	1336	+ 'function' => array( __CLASS__, 'advanced_settings' ),
	1337	+ 'icon' => 'frm_icon_font frm_settings_icon',
1526	1338	),
1527	1339	'email' => array(
1528	1340	'name' => __( 'Actions & Notifications', 'formidable' ),
1529	1341	'function' => array( 'FrmFormActionsController', 'email_settings' ),
1530	1342	'id' => 'frm_notification_settings',
1531		- 'icon' => 'frmfont frm_mail_bulk_icon',
	1343	+ 'icon' => 'frm_icon_font frm_mail_bulk_icon',
1532	1344	),
1533	1345	'permissions' => array(
1534	1346	'name' => __( 'Form Permissions', 'formidable' ),
1535		- 'icon' => 'frmfont frm_lock_closed_icon',
	1347	+ 'icon' => 'frm_icon_font frm_lock_closed_icon',
1536	1348	'html_class' => 'frm_show_upgrade_tab frm_noallow',
1537	1349	'data' => array(
1538	1350	'medium' => 'permissions',
1539	1351	'upgrade' => __( 'Form Permissions', 'formidable' ),
		@@ -1538,37 +1350,35 @@
1538	1350	'medium' => 'permissions',
1539	1351	'upgrade' => __( 'Form Permissions', 'formidable' ),
1540	1352	'message' => __( 'Allow editing, protect forms and files, limit entries, and save drafts. Upgrade to get form and entry permissions.', 'formidable' ),
1541	1353	'screenshot' => 'permissions.png',
1542		- 'learn-more' => FrmAppHelper::get_doc_url( 'general-form-settings/#kb-form-permissions', 'form-permissions-settings' ),
1543	1354	),
1544	1355	),
1545	1356	'scheduling' => array(
1546	1357	'name' => __( 'Form Scheduling', 'formidable' ),
1547		- 'icon' => 'frmfont frm_calendar_icon',
	1358	+ 'icon' => 'frm_icon_font frm_calendar_icon',
1548	1359	'html_class' => 'frm_show_upgrade_tab frm_noallow',
1549	1360	'data' => array(
1550	1361	'medium' => 'scheduling',
1551	1362	'upgrade' => __( 'Form scheduling settings', 'formidable' ),
1552	1363	'screenshot' => 'scheduling.png',
1553		- 'learn-more' => FrmAppHelper::get_doc_url( 'general-form-settings/#kb-form-scheduling', 'form-scheduling-settings' ),
1554	1364	),
1555	1365	),
1556	1366	'buttons' => array(
1557	1367	'name' => __( 'Buttons', 'formidable' ),
1558		- 'class' => self::class,
	1368	+ 'class' => __CLASS__,
1559	1369	'function' => 'buttons_settings',
1560		- 'icon' => 'frmfont frm_button_icon',
	1370	+ 'icon' => 'frm_icon_font frm_button_icon',
1561	1371	),
1562	1372	'landing' => array(
1563	1373	'name' => __( 'Form Landing Page', 'formidable' ),
1564		- 'icon' => 'frmfont frm_file_text_icon',
	1374	+ 'icon' => 'frm_icon_font frm_file_text_icon',
1565	1375	'html_class' => 'frm_show_upgrade_tab frm_noallow',
1566	1376	'data' => FrmAppHelper::get_landing_page_upgrade_data_params(),
1567	1377	),
1568	1378	'chat' => array(
1569	1379	'name' => __( 'Conversational Forms', 'formidable' ),
1570		- 'icon' => 'frmfont frm_chat_forms_icon',
	1380	+ 'icon' => 'frm_icon_font frm_chat_forms_icon',
1571	1381	'html_class' => 'frm_show_upgrade_tab frm_noallow',
1572	1382	'data' => FrmAppHelper::get_upgrade_data_params(
1573	1383	'chat',
1574	1384	array(
		@@ -1574,15 +1384,14 @@
1574	1384	array(
1575	1385	'upgrade' => __( 'Conversational Forms', 'formidable' ),
1576	1386	'message' => __( 'Ask one question at a time for automated conversations.', 'formidable' ),
1577	1387	'screenshot' => 'chat.png',
1578		- 'learn-more' => FrmAppHelper::get_doc_url( 'conversational-forms', 'conversational-forms-settings', false ),
1579	1388	)
1580	1389	),
1581	1390	),
1582	1391	'abandonment' => array(
1583	1392	'name' => __( 'Form Abandonment', 'formidable' ),
1584		- 'icon' => 'frmfont frm_abandoned_icon',
	1393	+ 'icon' => 'frm_icon_font frm_abandoned_icon',
1585	1394	'html_class' => 'frm_show_upgrade_tab frm_noallow',
1586	1395	'data' => FrmAppHelper::get_upgrade_data_params(
1587	1396	'abandonment',
1588	1397	array(
		@@ -1588,22 +1397,23 @@
1588	1397	array(
1589	1398	'upgrade' => __( 'Form abandonment settings', 'formidable' ),
1590	1399	'message' => __( 'Unlock the power of data capture to boost lead generation and master the art of form optimization.', 'formidable' ),
1591	1400	'screenshot' => 'abandonment.png',
1592		- 'learn-more' => FrmAppHelper::get_doc_url( 'features/form-abandonment-wordpress-plugin', 'form-abandonment-settings', false ),
1593	1401	)
1594	1402	),
1595	1403	),
1596	1404	'html' => array(
1597	1405	'name' => __( 'Customize HTML', 'formidable' ),
1598		- 'class' => self::class,
	1406	+ 'class' => __CLASS__,
1599	1407	'function' => 'html_settings',
1600		- 'icon' => 'frmfont frm_code_icon',
	1408	+ 'icon' => 'frm_icon_font frm_code_icon',
1601	1409	),
1602	1410	);
1603	1411
1604		- if ( ! has_action( 'frm_add_form_style_tab_options' ) && ! has_action( 'frm_add_form_button_options' ) ) {
1605		- unset( $sections['buttons'] );
	1412	+ foreach ( array( 'landing', 'chat', 'abandonment' ) as $feature ) {
	1413	+ if ( ! FrmAppHelper::show_new_feature( $feature ) ) {
	1414	+ unset( $sections[ $feature ] );
	1415	+ }
1606	1416	}
1607	1417
1608	1418	$sections = apply_filters( 'frm_add_form_settings_section', $sections, $values );
1609	1419
		@@ -1610,9 +1420,9 @@
1610	1420	foreach ( $sections as $key => $section ) {
1611	1421	$defaults = array(
1612	1422	'html_class' => '',
1613	1423	'name' => ucfirst( $key ),
1614		- 'icon' => 'frmfont frm_settings_icon',
	1424	+ 'icon' => 'frm_icon_font frm_settings_icon',
1615	1425	);
1616	1426
1617	1427	$section = array_merge( $defaults, $section );
1618	1428
		@@ -1618,9 +1428,8 @@
1618	1428
1619	1429	if ( ! isset( $section['anchor'] ) ) {
1620	1430	$section['anchor'] = $key;
1621	1431	}
1622		-
1623	1432	$section['anchor'] .= '_settings';
1624	1433
1625	1434	if ( ! isset( $section['title'] ) ) {
1626	1435	$section['title'] = $section['name'];
		@@ -1639,19 +1448,18 @@
1639	1448	/**
1640	1449	* @since 4.0
1641	1450	*
1642	1451	* @param array $values
1643		- *
1644	1452	* @return void
1645	1453	*/
1646	1454	public static function advanced_settings( $values ) {
1647	1455	$first_h3 = 'frm_first_h3';
	1456	+
1648	1457	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings-advanced.php';
1649	1458	}
1650	1459
1651	1460	/**
1652	1461	* @param array $values
1653		- *
1654	1462	* @return void
1655	1463	*/
1656	1464	public static function render_spam_settings( $values ) {
1657	1465	if ( function_exists( 'akismet_http_post' ) ) {
		@@ -1656,9 +1464,9 @@
1656	1464	public static function render_spam_settings( $values ) {
1657	1465	if ( function_exists( 'akismet_http_post' ) ) {
1658	1466	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/spam-settings/akismet.php';
1659	1467	}
1660		- 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';
1661	1469	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/spam-settings/antispam.php';
1662	1470	}
1663	1471
1664	1472	/**
		@@ -1664,9 +1472,8 @@
1664	1472	/**
1665	1473	* @since 4.0
1666	1474	*
1667	1475	* @param array $values
1668		- *
1669	1476	* @return void
1670	1477	*/
1671	1478	public static function buttons_settings( $values ) {
1672	1479	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings-buttons.php';
		@@ -1675,9 +1482,8 @@
1675	1482	/**
1676	1483	* @since 4.0
1677	1484	*
1678	1485	* @param array $values
1679		- *
1680	1486	* @return void
1681	1487	*/
1682	1488	public static function html_settings( $values ) {
1683	1489	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings-html.php';
		@@ -1688,9 +1494,8 @@
1688	1494	*
1689	1495	* @since 2.03.08
1690	1496	*
1691	1497	* @param array|bool $values
1692		- *
1693	1498	* @return void
1694	1499	*/
1695	1500	private static function clean_submit_html( &$values ) {
1696	1501	if ( is_array( $values ) && isset( $values['submit_html'] ) ) {
		@@ -1713,17 +1518,13 @@
1713	1518	return $classes;
1714	1519	}
1715	1520
1716	1521	/**
1717		- * @since 6.27 Added $template_path parameter.
1718		- *
1719	1522	* @param int|string $form_id
1720	1523	* @param string $class
1721		- * @param string $template_path The path to a template file to use instead of the default.
1722		- *
1723	1524	* @return void
1724	1525	*/
1725		- public static function mb_tags_box( $form_id, $class = '', $template_path = 'default' ) {
	1526	+ public static function mb_tags_box( $form_id, $class = '' ) {
1726	1527	$fields = FrmField::get_all_for_form( $form_id, '', 'include' );
1727	1528
1728	1529	/**
1729	1530	* Allows modifying the list of fields in the tags box.
		@@ -1732,30 +1533,23 @@
1732	1533	*
1733	1534	* @param array $fields The list of fields.
1734	1535	* @param array $args The arguments. Contains `form_id`.
1735	1536	*/
1736		- $fields = apply_filters( 'frm_fields_in_tags_box', $fields, compact( 'form_id' ) );
1737		- $linked_forms = array();
1738		- $col = 'one';
1739		- $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	+
1740	1542	$cond_shortcodes = apply_filters( 'frm_conditional_shortcodes', array() );
1741	1543	$entry_shortcodes = self::get_shortcode_helpers( $settings_tab );
	1544	+
1742	1545	$advanced_helpers = self::advanced_helpers( compact( 'fields', 'form_id' ) );
1743	1546
1744		- if ( 'default' === $template_path || ! file_exists( $template_path ) ) {
1745		- include FrmAppHelper::plugin_path() . '/classes/views/shared/mb_adv_info.php';
1746		- return;
1747		- }
1748		-
1749		- include $template_path;
	1547	+ include FrmAppHelper::plugin_path() . '/classes/views/shared/mb_adv_info.php';
1750	1548	}
1751	1549
1752	1550	/**
1753	1551	* @since 3.04.01
1754		- *
1755		- * @param array $atts
1756		- *
1757		- * @return array
1758	1552	*/
1759	1553	private static function advanced_helpers( $atts ) {
1760	1554	$advanced_helpers = array(
1761	1555	'default' => array(
		@@ -1764,12 +1558,10 @@
1764	1558	),
1765	1559	);
1766	1560
1767	1561	$user_fields = self::user_shortcodes();
1768		-
1769	1562	if ( $user_fields ) {
1770	1563	$user_helpers = array();
1771		-
1772	1564	foreach ( $user_fields as $uk => $uf ) {
1773	1565	$user_helpers[ '|user_id| show="' . $uk . '"' ] = $uf;
1774	1566	unset( $uk, $uf );
1775	1567	}
		@@ -1794,10 +1586,8 @@
1794	1586	* Get an array of the options to display in the advanced tab
1795	1587	* of the customization panel
1796	1588	*
1797	1589	* @since 2.0.6
1798		- *
1799		- * @return array
1800	1590	*/
1801	1591	private static function get_advanced_shortcodes() {
1802	1592	$adv_shortcodes = array(
1803	1593	'x sep=", "' => array(
		@@ -1814,18 +1604,17 @@
1814	1604	'label' => __( 'No Auto P', 'formidable' ),
1815	1605	'title' => __( 'Do not automatically add any paragraphs or line breaks', 'formidable' ),
1816	1606	),
1817	1607	);
	1608	+ $adv_shortcodes = apply_filters( 'frm_advanced_shortcodes', $adv_shortcodes );
1818	1609
1819	1610	// __( 'Leave blank instead of defaulting to User Login', 'formidable' ) : blank=1
1820	1611
1821		- return apply_filters( 'frm_advanced_shortcodes', $adv_shortcodes );
	1612	+ return $adv_shortcodes;
1822	1613	}
1823	1614
1824	1615	/**
1825	1616	* @since 3.04.01
1826		- *
1827		- * @return array
1828	1617	*/
1829	1618	private static function user_shortcodes() {
1830	1619	$options = array(
1831	1620	'ID' => __( 'User ID', 'formidable' ),
		@@ -1844,12 +1633,8 @@
1844	1633	/**
1845	1634	* Get an array of the helper shortcodes to display in the customization panel
1846	1635	*
1847	1636	* @since 2.0.6
1848		- *
1849		- * @param bool $settings_tab
1850		- *
1851		- * @return array
1852	1637	*/
1853	1638	private static function get_shortcode_helpers( $settings_tab ) {
1854	1639	$entry_shortcodes = array(
1855	1640	'id' => __( 'Entry ID', 'formidable' ),
		@@ -1860,27 +1645,30 @@
1860	1645	'updated-at' => __( 'Entry updated', 'formidable' ),
1861	1646	'' => '',
1862	1647	'siteurl' => __( 'Site URL', 'formidable' ),
1863	1648	'sitename' => __( 'Site Name', 'formidable' ),
1864		- 'form_name' => __( 'Form Name', 'formidable' ),
1865	1649	);
1866	1650
1867		- $entry_shortcodes = array_merge( FrmShortcodeHelper::get_contextual_shortcode_values(), $entry_shortcodes );
1868		-
1869	1651	if ( ! FrmAppHelper::pro_is_installed() ) {
1870	1652	unset( $entry_shortcodes['post_id'] );
1871	1653	}
1872	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	+
1873	1662	/**
1874	1663	* Use this hook to add or remove buttons in the helpers section
1875	1664	* in the customization panel
1876	1665	*
1877	1666	* @since 2.0.6
1878		- *
1879		- * @param array $entry_shortcodes
1880		- * @param bool $settings_tab
1881	1667	*/
1882		- 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;
1883	1671	}
1884	1672
1885	1673	/**
1886	1674	* Insert the form class setting into the form.
		@@ -1885,9 +1673,8 @@
1885	1673	/**
1886	1674	* Insert the form class setting into the form.
1887	1675	*
1888	1676	* @param stdClass $form
1889		- *
1890	1677	* @return void
1891	1678	*/
1892	1679	public static function form_classes( $form ) {
1893	1680	if ( isset( $form->options['form_class'] ) ) {
		@@ -1898,9 +1685,9 @@
1898	1685	echo ' frm_js_validate ';
1899	1686	self::add_js_validate_form_to_global_vars( $form );
1900	1687	}
1901	1688
1902		- if ( FrmForm::is_ajax_on( $form ) ) {
	1689	+ if ( ! FrmFormsHelper::should_use_pro_for_ajax_submit() && FrmForm::is_ajax_on( $form ) ) {
1903	1690	echo ' frm_ajax_submit ';
1904	1691	}
1905	1692	}
1906	1693
		@@ -1910,9 +1697,8 @@
1910	1697	* @param stdClass $form
1911	1698	*/
1912	1699	public static function add_js_validate_form_to_global_vars( $form ) {
1913	1700	global $frm_vars;
1914		-
1915	1701	if ( ! isset( $frm_vars['js_validate_forms'] ) ) {
1916	1702	$frm_vars['js_validate_forms'] = array();
1917	1703	}
1918	1704	$frm_vars['js_validate_forms'][ $form->id ] = $form;
		@@ -1935,9 +1721,8 @@
1935	1721	/**
1936	1722	* @param string $content
1937	1723	* @param int|stdClass|string $form
1938	1724	* @param false|int|stdClass|string $entry
1939		- *
1940	1725	* @return string
1941	1726	*/
1942	1727	public static function filter_content( $content, $form, $entry = false ) {
1943	1728	$content = self::replace_form_name_shortcodes( $content, $form );
		@@ -1942,9 +1727,8 @@
1942	1727	public static function filter_content( $content, $form, $entry = false ) {
1943	1728	$content = self::replace_form_name_shortcodes( $content, $form );
1944	1729
1945	1730	self::get_entry_by_param( $entry );
1946		-
1947	1731	if ( ! $entry ) {
1948	1732	return $content;
1949	1733	}
1950	1734
		@@ -1960,10 +1744,11 @@
1960	1744	$form = $entry->parent_entry->form_id;
1961	1745	}
1962	1746
1963	1747	$shortcodes = FrmFieldsHelper::get_shortcodes( $content, $form );
	1748	+ $content = apply_filters( 'frm_replace_content_shortcodes', $content, $entry, $shortcodes );
1964	1749
1965		- return apply_filters( 'frm_replace_content_shortcodes', $content, $entry, $shortcodes );
	1750	+ return $content;
1966	1751	}
1967	1752
1968	1753	/**
1969	1754	* Replace any [form_name] shortcodes in a string.
		@@ -1971,9 +1756,8 @@
1971	1756	* @since 5.5
1972	1757	*
1973	1758	* @param array|string $string
1974	1759	* @param int|stdClass|string $form
1975		- *
1976	1760	* @return array|string
1977	1761	*/
1978	1762	public static function replace_form_name_shortcodes( $string, $form ) {
1979	1763	if ( ! is_string( $string ) ) {
		@@ -1979,9 +1763,9 @@
1979	1763	if ( ! is_string( $string ) ) {
1980	1764	return $string;
1981	1765	}
1982	1766
1983		- if ( ! str_contains( $string, '[form_name]' ) ) {
	1767	+ if ( false === strpos( $string, '[form_name]' ) ) {
1984	1768	return $string;
1985	1769	}
1986	1770
1987	1771	if ( ! is_object( $form ) ) {
		@@ -1993,30 +1777,20 @@
1993	1777	}
1994	1778
1995	1779	/**
1996	1780	* @param false|int|stdClass|string $entry
1997		- *
1998	1781	* @return void
1999	1782	*/
2000	1783	private static function get_entry_by_param( &$entry ) {
2001		- if ( $entry && is_object( $entry ) ) {
2002		- return;
2003		- }
	1784	+ if ( ! $entry || ! is_object( $entry ) ) {
	1785	+ if ( ! $entry || ! is_numeric( $entry ) ) {
	1786	+ $entry = FrmAppHelper::get_post_param( 'id', false, 'sanitize_title' );
	1787	+ }
2004	1788
2005		- if ( ! $entry || ! is_numeric( $entry ) ) {
2006		- $entry = FrmAppHelper::get_post_param( 'id', false, 'sanitize_title' );
	1789	+ FrmEntry::maybe_get_entry( $entry );
2007	1790	}
2008		-
2009		- FrmEntry::maybe_get_entry( $entry );
2010	1791	}
2011	1792
2012		- /**
2013		- * @param string $content
2014		- * @param false|object $entry
2015		- * @param array $shortcodes
2016		- *
2017		- * @return string
2018		- */
2019	1793	public static function replace_content_shortcodes( $content, $entry, $shortcodes ) {
2020	1794	return FrmFieldsHelper::replace_content_shortcodes( $content, $entry, $shortcodes );
2021	1795	}
2022	1796
		@@ -2021,9 +1795,8 @@
2021	1795	}
2022	1796
2023	1797	/**
2024	1798	* @param array $errors
2025		- *
2026	1799	* @return array
2027	1800	*/
2028	1801	public static function process_bulk_form_actions( $errors ) {
2029	1802	if ( ! $_REQUEST ) {
		@@ -2030,30 +1803,29 @@
2030	1803	return $errors;
2031	1804	}
2032	1805
2033	1806	$bulkaction = FrmAppHelper::get_param( 'action', '', 'get', 'sanitize_text_field' );
2034		-
2035		- // phpcs:ignore Universal.Operators.StrictComparisons
2036	1807	if ( $bulkaction == - 1 ) {
2037	1808	$bulkaction = FrmAppHelper::get_param( 'action2', '', 'get', 'sanitize_title' );
2038	1809	}
2039	1810
2040		- if ( $bulkaction && str_starts_with( $bulkaction, 'bulk_' ) ) {
	1811	+ if ( ! empty( $bulkaction ) && strpos( $bulkaction, 'bulk_' ) === 0 ) {
2041	1812	FrmAppHelper::remove_get_action();
	1813	+
2042	1814	$bulkaction = str_replace( 'bulk_', '', $bulkaction );
2043	1815	}
2044	1816
2045	1817	$ids = FrmAppHelper::get_param( 'item-action', '', 'get', 'sanitize_text_field' );
	1818	+ if ( empty( $ids ) ) {
	1819	+ $errors[] = __( 'No forms were specified', 'formidable' );
2046	1820
2047		- if ( ! $ids ) {
2048		- $errors[] = __( 'No forms were specified', 'formidable' );
2049	1821	return $errors;
2050	1822	}
2051	1823
2052	1824	$permission_error = FrmAppHelper::permission_nonce_error( '', '_wpnonce', 'bulk-toplevel_page_formidable' );
2053		-
2054	1825	if ( $permission_error !== false ) {
2055	1826	$errors[] = $permission_error;
	1827	+
2056	1828	return $errors;
2057	1829	}
2058	1830
2059	1831	if ( ! is_array( $ids ) ) {
		@@ -2077,24 +1849,9 @@
2077	1849
2078	1850	return $errors;
2079	1851	}
2080	1852
2081		- /**
2082		- * Includes html that shows a message when the device is too small to use Formidable Forms admin pages.
2083		- *
2084		- * @since 6.20
2085		- *
2086		- * @return void
2087		- */
2088		- public static function include_device_too_small_message() {
2089		- if ( ! FrmAppHelper::is_formidable_admin() ) {
2090		- return;
2091		- }
2092		-
2093		- include FrmAppHelper::plugin_path() . '/classes/views/shared/small-device-message.php';
2094		- }
2095		-
2096		- public static function route() { // phpcs:ignore Generic.Metrics.CyclomaticComplexity.MaxExceeded
	1853	+ public static function route() {
2097	1854	$action = isset( $_REQUEST['frm_action'] ) ? 'frm_action' : 'action';
2098	1855	$vars = array();
2099	1856	FrmAppHelper::include_svg();
2100	1857
		@@ -2104,28 +1861,25 @@
2104	1861	// Javascript needs to be allowed in some field settings.
2105	1862	// phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized, WordPress.Security.NonceVerification.Missing
2106	1863	$json_vars = htmlspecialchars_decode( nl2br( str_replace( '&quot;', '"', wp_unslash( $_POST['frm_compact_fields'] ) ) ) );
2107	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	+ }
2108	1871
2109		- if ( $json_vars ) {
	1872	+ add_filter( 'frm_validate_form', 'FrmFormsController::json_error' );
	1873	+ } else {
2110	1874	$vars = FrmAppHelper::json_to_array( $json_vars );
2111	1875	$action = $vars[ $action ];
2112	1876	unset( $_REQUEST['frm_compact_fields'], $_POST['frm_compact_fields'] ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
2113	1877	$_REQUEST = array_merge( $_REQUEST, $vars ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
2114	1878	$_POST = array_merge( $_POST, $_REQUEST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
2115		- } else {
2116		- // Json decoding failed so we should return an error message.
2117		- $action = FrmAppHelper::get_param( $action, '', 'get', 'sanitize_title' );
2118		-
2119		- if ( 'edit' === $action ) {
2120		- $action = 'update';
2121		- }
2122		-
2123		- add_filter( 'frm_validate_form', 'FrmFormsController::json_error' );
2124	1879	}
2125	1880	} else {
2126	1881	$action = FrmAppHelper::get_param( $action, '', 'get', 'sanitize_title' );
2127		-
2128	1882	if ( isset( $_REQUEST['delete_all'] ) ) {
2129	1883	// Override the action for this page.
2130	1884	$action = 'delete_all';
2131	1885	}
		@@ -2145,38 +1899,34 @@
2145	1899	case 'update_settings':
2146	1900	return self::$action( $vars );
2147	1901	case 'lite-reports':
2148	1902	self::no_reports( $vars );
2149		- return null;
	1903	+ return;
2150	1904	case 'views':
2151	1905	self::no_views( $vars );
2152		- return null;
	1906	+ return;
2153	1907	default:
2154	1908	do_action( 'frm_form_action_' . $action );
2155		-
2156	1909	if ( apply_filters( 'frm_form_stop_action_' . $action, false ) ) {
2157		- return null;
	1910	+ return;
2158	1911	}
2159	1912
2160	1913	$action = FrmAppHelper::get_param( 'action', '', 'get', 'sanitize_text_field' );
2161		-
2162		- // phpcs:ignore Universal.Operators.StrictComparisons
2163	1914	if ( $action == - 1 ) {
2164	1915	$action = FrmAppHelper::get_param( 'action2', '', 'get', 'sanitize_title' );
2165	1916	}
2166	1917
2167		- if ( str_starts_with( $action, 'bulk_' ) ) {
	1918	+ if ( strpos( $action, 'bulk_' ) === 0 ) {
2168	1919	FrmAppHelper::remove_get_action();
2169	1920
2170	1921	self::list_form();
2171		- return null;
	1922	+ return;
2172	1923	}
2173	1924
2174	1925	$message = FrmAppHelper::get_param( 'message' );
2175		-
2176	1926	if ( 'form_duplicate_error' === $message ) {
2177	1927	self::display_forms_list( array(), '', array( __( 'There was a problem duplicating the form', 'formidable' ) ) );
2178		- return null;
	1928	+ return;
2179	1929	}
2180	1930
2181	1931	if ( 'forms_permanently_deleted' === $message ) {
2182	1932	$count = FrmAppHelper::get_param( 'forms_deleted', 0, 'get', 'absint' );
		@@ -2182,14 +1932,14 @@
2182	1932	$count = FrmAppHelper::get_param( 'forms_deleted', 0, 'get', 'absint' );
2183	1933	/* translators: %1$s: Number of forms */
2184	1934	$message = sprintf( _n( '%1$s form permanently deleted.', '%1$s forms permanently deleted.', $count, 'formidable' ), $count );
2185	1935	self::display_forms_list( array(), $message, '' );
2186		- return null;
	1936	+ return;
2187	1937	}
2188	1938
2189	1939	self::display_forms_list();
2190	1940
2191		- return null;
	1941	+ return;
2192	1942	}//end switch
2193	1943	}
2194	1944
2195	1945	/**
		@@ -2208,44 +1958,30 @@
2208	1958
2209	1959	// Get posted data
2210	1960	$form_id = FrmAppHelper::get_post_param( 'form_id', '', 'absint' );
2211	1961	$name = FrmAppHelper::get_post_param( 'form_name', '', 'sanitize_text_field' );
2212		- $form = FrmForm::getOne( $form_id );
2213	1962
2214		- if ( ! $form ) {
2215		- wp_send_json_error( __( 'Form not found', 'formidable' ) );
2216		- }
	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' ) );
2217	1966
2218		- if ( $name === $form->name ) {
2219		- // Nothing to change so exit early.
2220		- wp_send_json_success();
2221		- }
	1967	+ wp_send_json_success( compact( 'form_key' ) );
	1968	+ }
2222	1969
2223		- $to_update = array(
2224		- 'name' => $name,
2225		- );
	1970	+ public static function json_error( $errors ) {
	1971	+ $errors['json'] = __( 'Abnormal HTML characters prevented your form from saving correctly', 'formidable' );
2226	1972
2227		- if ( '' === $name ) {
2228		- $form_key = $form->form_key;
2229		- } else {
2230		- // Only update form_key if name is not empty.
2231		- $form_key = FrmAppHelper::get_unique_key( sanitize_title( $name ), 'frm_forms', 'form_key' );
2232		- $to_update['form_key'] = $form_key;
2233		- }
2234		-
2235		- FrmForm::update( $form_id, $to_update );
2236		-
2237		- wp_send_json_success( compact( 'form_key' ) );
	1973	+ return $errors;
2238	1974	}
2239	1975
2240	1976	/**
2241		- * @param array $errors
	1977	+ * Education for premium features.
2242	1978	*
2243		- * @return array
	1979	+ * @since 4.05
	1980	+ * @return void
2244	1981	*/
2245		- public static function json_error( $errors ) {
2246		- $errors['json'] = __( 'Abnormal HTML characters prevented your form from saving correctly', 'formidable' );
2247		- 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';
2248	1984	}
2249	1985
2250	1986	/**
2251	1987	* Add education about views.
		@@ -2251,10 +1987,8 @@
2251	1987	* Add education about views.
2252	1988	*
2253	1989	* @since 4.07
2254	1990	*
2255		- * @param array $values
2256		- *
2257	1991	* @return void
2258	1992	*/
2259	1993	public static function no_views( $values = array() ) {
2260	1994	FrmAppHelper::include_svg();
		@@ -2268,10 +2002,8 @@
2268	2002	* Add education about reports.
2269	2003	*
2270	2004	* @since 4.07
2271	2005	*
2272		- * @param array $values
2273		- *
2274	2006	* @return void
2275	2007	*/
2276	2008	public static function no_reports( $values = array() ) {
2277	2009	$id = FrmAppHelper::get_param( 'form', '', 'get', 'absint' );
		@@ -2298,9 +2030,8 @@
2298	2030	* @since 4.05.02
2299	2031	*/
2300	2032	private static function move_menu_to_footer() {
2301	2033	$settings = FrmAppHelper::get_settings();
2302		-
2303	2034	if ( empty( $settings->admin_bar ) ) {
2304	2035	remove_action( 'wp_body_open', 'wp_admin_bar_render', 0 );
2305	2036	}
2306	2037	}
		@@ -2306,15 +2037,13 @@
2306	2037	}
2307	2038
2308	2039	public static function admin_bar_configure() {
2309	2040	global $frm_vars;
2310		-
2311	2041	if ( empty( $frm_vars['forms_loaded'] ) ) {
2312	2042	return;
2313	2043	}
2314	2044
2315	2045	$actions = array();
2316		-
2317	2046	foreach ( $frm_vars['forms_loaded'] as $form ) {
2318	2047	if ( is_object( $form ) ) {
2319	2048	$actions[ $form->id ] = $form->name;
2320	2049	}
		@@ -2320,9 +2049,9 @@
2320	2049	}
2321	2050	unset( $form );
2322	2051	}
2323	2052
2324		- if ( ! $actions ) {
	2053	+ if ( empty( $actions ) ) {
2325	2054	return;
2326	2055	}
2327	2056
2328	2057	self::add_menu_to_admin_bar();
		@@ -2348,12 +2077,8 @@
2348	2077	}
2349	2078
2350	2079	/**
2351	2080	* @since 2.05.07
2352		- *
2353		- * @param array $actions
2354		- *
2355		- * @return void
2356	2081	*/
2357	2082	private static function add_forms_to_admin_bar( $actions ) {
2358	2083	global $wp_admin_bar;
2359	2084
		@@ -2359,13 +2084,14 @@
2359	2084
2360	2085	asort( $actions );
2361	2086
2362	2087	foreach ( $actions as $form_id => $name ) {
	2088	+
2363	2089	$wp_admin_bar->add_node(
2364	2090	array(
2365	2091	'parent' => 'frm-forms',
2366	2092	'id' => 'edit_form_' . $form_id,
2367		- 'title' => $name ? $name : FrmFormsHelper::get_no_title_text(),
	2093	+ 'title' => empty( $name ) ? __( '(no title)', 'formidable' ) : $name,
2368	2094	'href' => FrmForm::get_edit_link( $form_id ),
2369	2095	)
2370	2096	);
2371	2097	}
		@@ -2374,14 +2100,12 @@
2374	2100	/**
2375	2101	* The formidable shortcode
2376	2102	*
2377	2103	* @param array $atts The params from the shortcode.
2378		- *
2379	2104	* @return string
2380	2105	*/
2381	2106	public static function get_form_shortcode( $atts ) {
2382	2107	global $frm_vars;
2383		-
2384	2108	if ( ! empty( $frm_vars['skip_shortcode'] ) ) {
2385	2109	$sc = '[formidable';
2386	2110	$sc .= FrmAppHelper::array_to_html_params( $atts );
2387	2111	return $sc . ']';
		@@ -2410,9 +2134,8 @@
2410	2134	* @since 5.2.01
2411	2135	*
2412	2136	* @param false|int|string $id
2413	2137	* @param false|string $key
2414		- *
2415	2138	* @return false|stdClass
2416	2139	*/
2417	2140	private static function maybe_get_form_by_id_or_key( $id, $key ) {
2418	2141	if ( ! $id ) {
		@@ -2426,9 +2149,8 @@
2426	2149	* @param false|string $key
2427	2150	* @param bool|int|string $title may be 'auto', true, false, 'true', 'false', 'yes', '1', 1, '0', 0.
2428	2151	* @param bool|int|string $description may be 'auto', true, false, 'true', 'false', 'yes', '1', 1, '0', 0.
2429	2152	* @param array $atts
2430		- *
2431	2153	* @return string
2432	2154	*/
2433	2155	public static function show_form( $id = '', $key = '', $title = false, $description = false, $atts = array() ) {
2434	2156	$form = self::maybe_get_form_by_id_or_key( $id, $key );
		@@ -2449,13 +2171,14 @@
2449	2171
2450	2172	add_action( 'frm_load_form_hooks', 'FrmHooksController::trigger_load_form_hooks' );
2451	2173	FrmAppHelper::trigger_hook_load( 'form', $form );
2452	2174
2453		- $form = apply_filters( 'frm_pre_display_form', $form );
	2175	+ $form = apply_filters( 'frm_pre_display_form', $form );
	2176	+
2454	2177	$frm_settings = FrmAppHelper::get_settings( array( 'current_form' => $form->id ) );
2455	2178
2456	2179	if ( self::is_viewable_draft_form( $form ) ) {
2457		- // Don't show a draft form on a page
	2180	+ // don't show a draft form on a page
2458	2181	$form = __( 'Please select a valid form', 'formidable' );
2459	2182	} elseif ( ! FrmForm::is_visible_to_user( $form ) ) {
2460	2183	$form = do_shortcode( $frm_settings->login_msg );
2461	2184	} else {
		@@ -2475,18 +2198,16 @@
2475	2198	}
2476	2199
2477	2200	/**
2478	2201	* @param false|int|string $id
2479		- *
2480	2202	* @return false|stdClass
2481	2203	*/
2482	2204	private static function maybe_get_form_to_show( $id ) {
2483	2205	$form = false;
2484	2206
2485		- if ( $id ) {
	2207	+ if ( ! empty( $id ) ) {
2486	2208	// Form id or key is set.
2487	2209	$form = FrmForm::getOne( $id );
2488		-
2489	2210	if ( ! $form || $form->parent_form_id || $form->status === 'trash' ) {
2490	2211	$form = false;
2491	2212	}
2492	2213	}
		@@ -2493,25 +2214,12 @@
2493	2214
2494	2215	return $form;
2495	2216	}
2496	2217
2497		- /**
2498		- * @param object $form
2499		- *
2500		- * @return bool
2501		- */
2502	2218	private static function is_viewable_draft_form( $form ) {
2503	2219	return $form->status === 'draft' && current_user_can( 'frm_edit_forms' ) && ! FrmAppHelper::is_preview_page();
2504	2220	}
2505	2221
2506		- /**
2507		- * @param object $form
2508		- * @param bool $title
2509		- * @param bool $description
2510		- * @param array $atts
2511		- *
2512		- * @return string
2513		- */
2514	2222	public static function get_form( $form, $title, $description, $atts = array() ) {
2515	2223	ob_start();
2516	2224
2517	2225	do_action( 'frm_before_get_form', $atts );
		@@ -2518,9 +2226,10 @@
2518	2226
2519	2227	self::get_form_contents( $form, $title, $description, $atts );
2520	2228	self::enqueue_scripts( FrmForm::get_params( $form ) );
2521	2229
2522		- $contents = ob_get_clean();
	2230	+ $contents = ob_get_contents();
	2231	+ ob_end_clean();
2523	2232
2524	2233	self::maybe_minimize_form( $atts, $contents );
2525	2234
2526	2235	return $contents;
		@@ -2525,25 +2234,12 @@
2525	2234
2526	2235	return $contents;
2527	2236	}
2528	2237
2529		- /**
2530		- * @param array $params
2531		- *
2532		- * @return void
2533		- */
2534	2238	public static function enqueue_scripts( $params ) {
2535	2239	do_action( 'frm_enqueue_form_scripts', $params );
2536	2240	}
2537	2241
2538		- /**
2539		- * @param object $form
2540		- * @param bool $title
2541		- * @param bool $description
2542		- * @param array $atts
2543		- *
2544		- * @return void
2545		- */
2546	2242	public static function get_form_contents( $form, $title, $description, $atts ) {
2547	2243	$params = FrmForm::get_params( $form );
2548	2244	$errors = self::get_saved_errors( $form, $params );
2549	2245	$fields = FrmFieldsHelper::get_form_fields( $form->id, $errors );
		@@ -2550,10 +2246,9 @@
2550	2246	$reset = false;
2551	2247	$pass_args = compact( 'form', 'fields', 'errors', 'title', 'description', 'reset' );
2552	2248
2553	2249	$pass_args['action'] = $params['action'];
2554		- // phpcs:ignore WordPress.Security.NonceVerification.Missing, Universal.Operators.StrictComparisons
2555		- $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
2556	2251
2557	2252	if ( ! $handle_process_here ) {
2558	2253	FrmFormState::set_initial_value( 'title', $title );
2559	2254	FrmFormState::set_initial_value( 'description', $description );
		@@ -2558,15 +2253,16 @@
2558	2253	FrmFormState::set_initial_value( 'title', $title );
2559	2254	FrmFormState::set_initial_value( 'description', $description );
2560	2255
2561	2256	do_action( 'frm_display_form_action', $params, $fields, $form, $title, $description );
2562		-
2563	2257	if ( apply_filters( 'frm_continue_to_new', true, $form->id, $params['action'] ) ) {
2564	2258	self::show_form_after_submit( $pass_args );
2565	2259	}
2566		- } elseif ( $errors ) {
	2260	+ } elseif ( ! empty( $errors ) ) {
2567	2261	self::show_form_after_submit( $pass_args );
	2262	+
2568	2263	} else {
	2264	+
2569	2265	do_action( 'frm_validate_form_creation', $params, $fields, $form, $title, $description );
2570	2266
2571	2267	if ( apply_filters( 'frm_continue_to_create', true, $form->id ) ) {
2572	2268	$entry_id = self::just_created_entry( $form->id );
		@@ -2589,19 +2285,13 @@
2589	2285	/**
2590	2286	* If the form was processed earlier (init), get the generated errors
2591	2287	*
2592	2288	* @since 2.05
2593		- *
2594		- * @param object $form
2595		- * @param array $params
2596		- *
2597		- * @return array
2598	2289	*/
2599	2290	private static function get_saved_errors( $form, $params ) {
2600	2291	global $frm_vars;
2601	2292
2602		- // phpcs:ignore WordPress.Security.NonceVerification.Missing, Universal.Operators.StrictComparisons
2603		- 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
2604	2294	$errors = $frm_vars['created_entries'][ $form->id ]['errors'];
2605	2295	} else {
2606	2296	$errors = array();
2607	2297	}
		@@ -2618,16 +2308,13 @@
2618	2308	}
2619	2309
2620	2310	/**
2621	2311	* @since 2.2.7
2622		- *
2623		- * @param int|string $form_id
2624		- *
2625		- * @return int
2626	2312	*/
2627	2313	public static function just_created_entry( $form_id ) {
2628	2314	global $frm_vars;
2629		- 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;
2630	2317	}
2631	2318
2632	2319	/**
2633	2320	* Gets confirmation method.
		@@ -2640,9 +2327,8 @@
2640	2327	*
2641	2328	* @type object $form Form object.
2642	2329	* @type int $entry_id Entry ID.
2643	2330	* }
2644		- *
2645	2331	* @return array|string
2646	2332	*/
2647	2333	private static function get_confirmation_method( $atts ) {
2648	2334	$action = FrmOnSubmitHelper::current_event( $atts );
		@@ -2650,9 +2336,8 @@
2650	2336	$method = ! empty( $atts['form']->options[ $opt ] ) ? $atts['form']->options[ $opt ] : 'message';
2651	2337
2652	2338	if ( ! empty( $atts['entry_id'] ) ) {
2653	2339	$met_actions = self::get_met_on_submit_actions( $atts, $action );
2654		-
2655	2340	if ( $met_actions ) {
2656	2341	$method = $met_actions;
2657	2342	}
2658	2343	}
		@@ -2659,21 +2344,14 @@
2659	2344
2660	2345	$method = apply_filters( 'frm_success_filter', $method, $atts['form'], $action );
2661	2346
2662	2347	if ( $method !== 'message' && ( ! $atts['entry_id'] || ! is_numeric( $atts['entry_id'] ) ) ) {
2663		- return 'message';
	2348	+ $method = 'message';
2664	2349	}
2665	2350
2666	2351	return $method;
2667	2352	}
2668	2353
2669		- /**
2670		- * @param object $form
2671		- * @param array $params
2672		- * @param array $args
2673		- *
2674		- * @return void
2675		- */
2676	2354	public static function maybe_trigger_redirect( $form, $params, $args ) {
2677	2355	if ( ! isset( $params['id'] ) ) {
2678	2356	global $frm_vars;
2679	2357	$params['id'] = $frm_vars['created_entries'][ $form->id ]['entry_id'];
		@@ -2700,12 +2378,14 @@
2700	2378	* @param array $params See {@see FrmFormsController::maybe_trigger_redirect()}.
2701	2379	* @param array $args See {@see FrmFormsController::maybe_trigger_redirect()}.
2702	2380	*/
2703	2381	public static function maybe_trigger_redirect_with_action( $conf_method, $form, $params, $args ) {
2704		- 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
2705		- $event = FrmOnSubmitHelper::current_event( $params );
2706		- FrmOnSubmitHelper::populate_on_submit_data( $form->options, $conf_method[0], $event );
2707		- $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	+ }
2708	2388	}
2709	2389
2710	2390	if ( 'redirect' === $conf_method ) {
2711	2391	self::trigger_redirect( $form, $params, $args );
		@@ -2711,15 +2391,8 @@
2711	2391	self::trigger_redirect( $form, $params, $args );
2712	2392	}
2713	2393	}
2714	2394
2715		- /**
2716		- * @param object $form
2717		- * @param array $params
2718		- * @param array $args
2719		- *
2720		- * @return void
2721		- */
2722	2395	public static function trigger_redirect( $form, $params, $args ) {
2723	2396	$success_args = array(
2724	2397	'action' => $params['action'],
2725	2398	'conf_method' => 'redirect',
		@@ -2778,9 +2451,8 @@
2778	2451	* @since 6.0
2779	2452	*
2780	2453	* @param array $args See {@see FrmFormsController::run_success_action()}.
2781	2454	* @param string $event Form event. Default is `create`.
2782		- *
2783	2455	* @return array Array of actions that meet the conditional logics.
2784	2456	*/
2785	2457	public static function get_met_on_submit_actions( $args, $event = 'create' ) {
2786	2458	if ( ! FrmOnSubmitHelper::form_has_migrated( $args['form'] ) ) {
		@@ -2807,11 +2479,13 @@
2807	2479	}
2808	2480
2809	2481	$action_type = FrmOnSubmitHelper::get_action_type( $action );
2810	2482
2811		- if ( 'redirect' === $action_type && $has_redirect ) {
2812		- // Do not process because we run the first redirect action only.
2813		- 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	+ }
2814	2488	}
2815	2489
2816	2490	if ( ! self::is_valid_on_submit_action( $action, $args, $event ) ) {
2817	2491	continue;
		@@ -2836,10 +2510,10 @@
2836	2510	* @param array $args See {@see FrmFormsController::run_success_action()}. `$args['event']` is also added.
2837	2511	*/
2838	2512	$met_actions = apply_filters( 'frm_get_met_on_submit_actions', $met_actions, $args );
2839	2513
2840		- if ( ! $met_actions ) {
2841		- return array( FrmOnSubmitHelper::get_fallback_action( $event ) );
	2514	+ if ( empty( $met_actions ) ) {
	2515	+ $met_actions = array( FrmOnSubmitHelper::get_fallback_action( $event ) );
2842	2516	}
2843	2517
2844	2518	return $met_actions;
2845	2519	}
		@@ -2851,9 +2525,8 @@
2851	2525	*
2852	2526	* @param object $action Form action object.
2853	2527	* @param array $args See {@see FrmFormsController::run_success_action()}.
2854	2528	* @param string $event Form event. Default is `create`.
2855		- *
2856	2529	* @return bool
2857	2530	*/
2858	2531	private static function is_valid_on_submit_action( $action, $args, $event = 'create' ) {
2859	2532	$action_type = FrmOnSubmitHelper::get_action_type( $action );
		@@ -2875,9 +2548,8 @@
2875	2548	return false;
2876	2549	}
2877	2550
2878	2551	$page = get_post( $action->post_content['success_page_id'] );
2879		-
2880	2552	if ( ! $page || 'trash' === $page->post_status ) {
2881	2553	return false;
2882	2554	}
2883	2555	}
		@@ -2899,9 +2571,8 @@
2899	2571	'entry_id' => $args['entry_id'],
2900	2572	'action' => FrmOnSubmitHelper::current_event( $args ),
2901	2573	)
2902	2574	);
2903		-
2904	2575	if ( ! is_array( $args['conf_method'] ) ) {
2905	2576	self::run_success_action( $args );
2906	2577	return;
2907	2578	}
		@@ -2928,9 +2599,8 @@
2928	2599	* @param array $args See {@see FrmFormsController::run_success_action()}.
2929	2600	*/
2930	2601	public static function run_multi_on_submit_actions( $args ) {
2931	2602	$redirect_action = null;
2932		-
2933	2603	foreach ( $args['conf_method'] as $action ) {
2934	2604	if ( 'redirect' === FrmOnSubmitHelper::get_action_type( $action ) ) {
2935	2605	// We catch the redirect action to run it last.
2936	2606	$redirect_action = $action;
		@@ -2941,15 +2611,13 @@
2941	2611
2942	2612	unset( $action );
2943	2613	}
2944	2614
2945		- if ( ! $redirect_action ) {
2946		- 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 );
2947	2619	}
2948		-
2949		- // Show script to delay the redirection.
2950		- $args['force_delay_redirect'] = true;
2951		- self::run_single_on_submit_action( $args, $redirect_action );
2952	2620	}
2953	2621
2954	2622	/**
2955	2623	* Runs single On Submit action.
		@@ -2970,9 +2638,8 @@
2970	2638	* @since 6.0
2971	2639	*
2972	2640	* @param array $args See {@see FrmFormsController::run_success_action()}.
2973	2641	* @param object $action On Submit action object.
2974		- *
2975	2642	* @return array
2976	2643	*/
2977	2644	private static function get_run_success_action_args( $args, $action ) {
2978	2645	$new_args = $args;
		@@ -2978,9 +2645,10 @@
2978	2645	$new_args = $args;
2979	2646
2980	2647	FrmOnSubmitHelper::populate_on_submit_data( $new_args['form']->options, $action, $args['action'] );
2981	2648
2982		- $opt = 'update' === $args['action'] ? 'edit_' : 'success_';
	2649	+ $opt = 'update' === $args['action'] ? 'edit_' : 'success_';
	2650	+
2983	2651	$new_args['conf_method'] = $new_args['form']->options[ $opt . 'action' ];
2984	2652
2985	2653	/**
2986	2654	* Filters the run success action args.
		@@ -2995,18 +2663,12 @@
2995	2663	}
2996	2664
2997	2665	/**
2998	2666	* @since 3.0
2999		- *
3000		- * @param array $args
3001		- *
3002		- * @return void
3003	2667	*/
3004	2668	private static function load_page_after_submit( $args ) {
3005	2669	global $post;
3006	2670	$opt = $args['success_opt'];
3007		-
3008		- // phpcs:ignore Universal.Operators.StrictComparisons
3009	2671	if ( ! $post || $args['form']->options[ $opt . '_page_id' ] != $post->ID ) {
3010	2672	$page = get_post( $args['form']->options[ $opt . '_page_id' ] );
3011	2673	$old_post = $post;
3012	2674	$post = $page;
		@@ -3030,9 +2692,8 @@
3030	2692	}
3031	2693
3032	2694	/**
3033	2695	* @since 3.0
3034		- *
3035	2696	* @param array $args See {@see FrmFormsController::run_success_action()}.
3036	2697	*/
3037	2698	private static function redirect_after_submit( $args ) {
3038	2699	add_filter( 'frm_use_wpautop', '__return_false' );
		@@ -3046,10 +2707,11 @@
3046	2707	FrmEntriesController::delete_entry_before_redirect( $success_url, $args['form'], $args );
3047	2708
3048	2709	add_filter( 'frm_redirect_url', 'FrmEntriesController::prepare_redirect_url' );
3049	2710	$success_url = apply_filters( 'frm_redirect_url', $success_url, $args['form'], $args );
3050		- $doing_ajax = FrmAppHelper::doing_ajax();
3051	2711
	2712	+ $doing_ajax = FrmAppHelper::doing_ajax();
	2713	+
3052	2714	if ( ! empty( $args['ajax'] ) && $doing_ajax && empty( $args['force_delay_redirect'] ) ) {
3053	2715	// Is AJAX submit and there is just one Redirect action runs.
3054	2716	echo json_encode( self::get_ajax_redirect_response_data( $args + compact( 'success_url' ) ) );
3055	2717	wp_die();
		@@ -3054,9 +2716,9 @@
3054	2716	echo json_encode( self::get_ajax_redirect_response_data( $args + compact( 'success_url' ) ) );
3055	2717	wp_die();
3056	2718	}
3057	2719
3058		- if ( ! headers_sent() && empty( $args['force_delay_redirect'] ) && empty( $args['form']->options['redirect_delay'] ) ) {
	2720	+ if ( ! headers_sent() && empty( $args['force_delay_redirect'] ) ) {
3059	2721	// Not AJAX submit, no headers sent, and there is just one Redirect action runs.
3060	2722	if ( ! empty( $args['form']->options['open_in_new_tab'] ) ) {
3061	2723	self::print_open_in_new_tab_js_with_fallback_handler( $success_url, $args );
3062	2724	self::$redirected_in_new_tab[ $args['form']->id ] = 1;
		@@ -3098,51 +2760,31 @@
3098	2760	*
3099	2761	* @since 6.3.1
3100	2762	*
3101	2763	* @param array $args See {@see FrmFormsController::run_success_action()}.
3102		- *
3103	2764	* @return array
3104	2765	*/
3105	2766	private static function get_ajax_redirect_response_data( $args ) {
3106		- $response_data = array(
3107		- 'redirect' => $args['success_url'],
3108		- 'content' => '',
3109		- );
3110		- $unset_content = true;
	2767	+ $response_data = array( 'redirect' => $args['success_url'] );
3111	2768
3112		- if ( ! empty( $args['form']->options['redirect_delay'] ) ) {
3113		- $response_data['delay'] = $args['form']->options['redirect_delay_time'];
3114		- $response_data['content'] .= self::get_redirect_message( $args['success_url'], $args['form']->options['redirect_delay_msg'], $args );
3115		- $unset_content = false;
3116		- }
3117		-
3118	2769	if ( ! empty( $args['form']->options['open_in_new_tab'] ) ) {
3119	2770	$response_data['openInNewTab'] = 1;
3120	2771
3121		- // Only show open in new tab text if there is no delay.
3122		- if ( empty( $response_data['content'] ) ) {
3123		- $args['message'] = FrmOnSubmitHelper::get_default_new_tab_msg();
	2772	+ $args['message'] = FrmOnSubmitHelper::get_default_new_tab_msg();
3124	2773
3125		- $args['form']->options['success_msg'] = $args['message'];
3126		- $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	+ }
3127	2779
3128		- if ( ! isset( $args['fields'] ) ) {
3129		- $args['fields'] = FrmField::get_all_for_form( $args['form']->id );
3130		- }
	2780	+ $args['message'] = self::prepare_submit_message( $args['form'], $args['entry_id'], $args );
3131	2781
3132		- $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();
3133	2785
3134		- ob_start();
3135		- self::show_lone_success_message( $args );
3136		- $response_data['content'] .= ob_get_clean();
3137		- $unset_content = false;
3138		- }//end if
3139		-
3140	2786	$response_data['fallbackMsg'] = self::get_redirect_fallback_message( $args['success_url'], $args );
3141		- }//end if
3142		-
3143		- if ( $unset_content && '' === $response_data['content'] ) {
3144		- unset( $response_data['content'] );
3145	2787	}
3146	2788
3147	2789	return $response_data;
3148	2790	}
		@@ -3154,9 +2796,9 @@
3154	2796	*
3155	2797	* @param array $args See {@see FrmFormsController::run_success_action()}.
3156	2798	*/
3157	2799	private static function redirect_after_submit_using_js( $args ) {
3158		- $success_msg = $args['form']->options['redirect_delay_msg'];
	2800	+ $success_msg = FrmOnSubmitHelper::get_default_redirect_msg();
3159	2801	$redirect_msg = self::get_redirect_message( $args['success_url'], $success_msg, $args );
3160	2802	$success_url = esc_url_raw( $args['success_url'] );
3161	2803
3162	2804	/**
		@@ -3165,9 +2807,9 @@
3165	2807	* @since 6.0
3166	2808	*
3167	2809	* @param int $delay_time Delay time in milliseconds.
3168	2810	*/
3169		- $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 );
3170	2812
3171	2813	if ( ! empty( $args['form']->options['open_in_new_tab'] ) ) {
3172	2814	$redirect_js = 'window.open("' . $success_url . '", "_blank")';
3173	2815	} else {
		@@ -3177,15 +2819,13 @@
3177	2819	add_filter( 'frm_use_wpautop', '__return_true' );
3178	2820
3179	2821	echo FrmAppHelper::maybe_kses( $redirect_msg ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
3180	2822	echo '<script>';
3181		-
3182	2823	if ( empty( $args['doing_ajax'] ) ) {
3183	2824	// Not AJAX submit, delay JS until window.load.
3184	2825	echo 'window.onload=function(){';
3185	2826	}
3186	2827	echo 'setTimeout(function(){' . $redirect_js . '}, ' . intval( $delay_time ) . ');'; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
3187		-
3188	2828	if ( empty( $args['doing_ajax'] ) ) {
3189	2829	echo '};';
3190	2830	}
3191	2831	echo '</script>';
		@@ -3198,16 +2838,11 @@
3198	2838	* @param string $success_msg
3199	2839	* @param array $args
3200	2840	*/
3201	2841	private static function get_redirect_message( $success_url, $success_msg, $args ) {
3202		- $success_msg = apply_filters( 'frm_content', $success_msg, $args['form'], $args['entry_id'] );
3203		- $success_msg = do_shortcode( FrmAppHelper::use_wpautop( $success_msg ) );
3204		-
3205		- // phpcs:disable Generic.WhiteSpace.ScopeIndent
3206		- $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/>' .
3207	2843	self::get_redirect_fallback_message( $success_url, $args ) .
3208	2844	'</div></div>';
3209		- // phpcs:enable Generic.WhiteSpace.ScopeIndent
3210	2845
3211	2846	$redirect_args = array(
3212	2847	'entry_id' => $args['entry_id'],
3213	2848	'form_id' => $args['form']->id,
		@@ -3223,14 +2858,12 @@
3223	2858	* @since 6.3.1
3224	2859	*
3225	2860	* @param string $success_url Redirect URL.
3226	2861	* @param array $args Contains `form` object.
3227		- *
3228	2862	* @return string
3229	2863	*/
3230	2864	private static function get_redirect_fallback_message( $success_url, $args ) {
3231	2865	$target = '';
3232		-
3233	2866	if ( ! empty( $args['form']->options['open_in_new_tab'] ) ) {
3234	2867	$target = ' target="_blank"';
3235	2868	}
3236	2869
		@@ -3245,12 +2878,8 @@
3245	2878	/**
3246	2879	* Prepare to show the success message and empty form after submit
3247	2880	*
3248	2881	* @since 2.05
3249		- *
3250		- * @param array $atts
3251		- *
3252		- * @return void
3253	2882	*/
3254	2883	public static function show_message_after_save( $atts ) {
3255	2884	$atts['message'] = self::prepare_submit_message( $atts['form'], $atts['entry_id'], $atts );
3256	2885
		@@ -3256,9 +2885,8 @@
3256	2885
3257	2886	if ( ! isset( $atts['form']->options['show_form'] ) || $atts['form']->options['show_form'] ) {
3258	2887	if ( isset( $atts['action'] ) && 'update' === $atts['action'] && is_callable( array( 'FrmProEntriesController', 'show_front_end_form_with_entry' ) ) ) {
3259	2888	$entry = FrmEntry::getOne( $atts['entry_id'] );
3260		-
3261	2889	if ( $entry ) {
3262	2890	// This is copied from the Pro plugin.
3263	2891	$atts['conf_message'] = FrmProEntriesController::confirmation( 'message', $atts['form'], $atts['form']->options, $entry->id, $atts );
3264	2892	$atts['show_form'] = FrmProEntriesController::is_form_displayed_after_edit( $atts['form'] );
		@@ -3275,12 +2903,8 @@
3275	2903	/**
3276	2904	* Show an empty form
3277	2905	*
3278	2906	* @since 2.05
3279		- *
3280		- * @param array $args
3281		- *
3282		- * @return void
3283	2907	*/
3284	2908	private static function show_form_after_submit( $args ) {
3285	2909	self::fill_atts_for_form_display( $args );
3286	2910
		@@ -3299,11 +2923,12 @@
3299	2923	}
3300	2924	unset( $args );
3301	2925
3302	2926	$include_form_tag = apply_filters( 'frm_include_form_tag', true, $form );
3303		- $frm_settings = FrmAppHelper::get_settings();
3304		- $submit = $form->options['submit_value'] ?? $frm_settings->submit_value;
3305	2927
	2928	+ $frm_settings = FrmAppHelper::get_settings();
	2929	+ $submit = isset( $form->options['submit_value'] ) ? $form->options['submit_value'] : $frm_settings->submit_value;
	2930	+
3306	2931	global $frm_vars;
3307	2932	self::maybe_load_css( $form, $values['custom_style'], $frm_vars['load_css'] );
3308	2933
3309	2934	$message_placement = self::message_placement( $form, $message );
		@@ -3311,36 +2936,25 @@
3311	2936	include FrmAppHelper::plugin_path() . '/classes/views/frm-entries/new.php';
3312	2937	}
3313	2938
3314	2939	/**
3315		- * Gets message placement.
3316		- *
3317	2940	* @since 4.05.02
3318		- * @since 6.26 This method changed from `private` to `public`.
3319		- *
3320		- * @param object $form Form object.
3321		- * @param string $message The message.
3322		- *
3323		- * @return string Accepts 'before', 'after', or 'submit'.
	2941	+ * @return string - 'before', 'after', or 'submit'
3324	2942	*/
3325		- public static function message_placement( $form, $message ) {
	2943	+ private static function message_placement( $form, $message ) {
3326	2944	$place = 'before';
3327	2945
3328	2946	if ( $message && isset( $form->options['form_class'] ) ) {
3329		- if ( str_contains( $form->options['form_class'], 'frm_below_success' ) ) {
	2947	+ if ( strpos( $form->options['form_class'], 'frm_below_success' ) !== false ) {
3330	2948	$place = 'after';
3331		- } elseif ( str_contains( $form->options['form_class'], 'frm_inline_success' ) ) {
	2949	+ } elseif ( strpos( $form->options['form_class'], 'frm_inline_success' ) !== false ) {
3332	2950	$place = 'submit';
3333	2951	}
3334	2952	}
3335	2953
3336	2954	/**
3337		- * Filter the message placement.
3338		- *
3339	2955	* @since 4.05.02
3340		- *
3341		- * @param string $place Accepts 'before', 'after', or 'submit'.
3342		- * @param array $args Args.
	2956	+ * @return string - 'before' or 'after'
3343	2957	*/
3344	2958	return apply_filters( 'frm_message_placement', $place, compact( 'form', 'message' ) );
3345	2959	}
3346	2960
		@@ -3347,12 +2961,8 @@
3347	2961	/**
3348	2962	* Get all the values needed on the new.php entry page
3349	2963	*
3350	2964	* @since 2.05
3351		- *
3352		- * @param array $args
3353		- *
3354		- * @return void
3355	2965	*/
3356	2966	private static function fill_atts_for_form_display( &$args ) {
3357	2967	if ( ! isset( $args['title'] ) && isset( $args['show_title'] ) ) {
3358	2968	$args['title'] = $args['show_title'];
		@@ -3377,12 +2987,8 @@
3377	2987	/**
3378	2988	* Show the success message without the form
3379	2989	*
3380	2990	* @since 2.05
3381		- *
3382		- * @param array $atts
3383		- *
3384		- * @return void
3385	2991	*/
3386	2992	private static function show_lone_success_message( $atts ) {
3387	2993	global $frm_vars;
3388	2994	$values = FrmEntriesHelper::setup_new_vars( $atts['fields'], $atts['form'], true );
		@@ -3388,12 +2994,13 @@
3388	2994	$values = FrmEntriesHelper::setup_new_vars( $atts['fields'], $atts['form'], true );
3389	2995	self::maybe_load_css( $atts['form'], $values['custom_style'], $frm_vars['load_css'] );
3390	2996
3391	2997	$include_extra_container = 'frm_forms' . FrmFormsHelper::get_form_style_class( $values );
3392		- $errors = array();
3393		- $form = $atts['form'];
3394		- $message = $atts['message'];
3395	2998
	2999	+ $errors = array();
	3000	+ $form = $atts['form'];
	3001	+ $message = $atts['message'];
	3002	+
3396	3003	include FrmAppHelper::plugin_path() . '/classes/views/frm-entries/errors.php';
3397	3004	}
3398	3005
3399	3006	/**
		@@ -3401,20 +3008,19 @@
3401	3008	*
3402	3009	* @since 2.05
3403	3010	* @since 6.0.x Added the third parameter.
3404	3011	*
3405		- * @param object $form Form object.
3406		- * @param int|string $entry_id Entry ID.
3407		- * @param array $args See {@see FrmFormsController::run_success_action()}.
3408		- *
	3012	+ * @param object $form Form object.
	3013	+ * @param int $entry_id Entry ID.
	3014	+ * @param array $args See {@see FrmFormsController::run_success_action()}.
3409	3015	* @return string
3410	3016	*/
3411	3017	private static function prepare_submit_message( $form, $entry_id, $args = array() ) {
3412	3018	$frm_settings = FrmAppHelper::get_settings( array( 'current_form' => $form->id ) );
3413		- $opt = $args['success_opt'] ?? 'success';
	3019	+ $opt = isset( $args['success_opt'] ) ? $args['success_opt'] : 'success';
3414	3020
3415	3021	if ( $entry_id && is_numeric( $entry_id ) ) {
3416		- $message = $form->options[ $opt . '_msg' ] ?? $frm_settings->success_msg;
	3022	+ $message = isset( $form->options[ $opt . '_msg' ] ) ? $form->options[ $opt . '_msg' ] : $frm_settings->success_msg;
3417	3023	$class = 'frm_message';
3418	3024	} else {
3419	3025	$message = $frm_settings->failed_msg;
3420	3026	$class = FrmFormsHelper::form_error_class();
		@@ -3431,9 +3037,9 @@
3431	3037	public static function front_head() {
3432	3038	$version = FrmAppHelper::plugin_version();
3433	3039	$suffix = FrmAppHelper::js_suffix();
3434	3040
3435		- if ( $suffix && self::has_combo_js_file() ) {
	3041	+ if ( ! empty( $suffix ) && self::has_combo_js_file() ) {
3436	3042	wp_register_script( 'formidable', FrmAppHelper::plugin_url() . '/js/frm.min.js', array( 'jquery' ), $version, true );
3437	3043	} else {
3438	3044	wp_register_script( 'formidable', FrmAppHelper::plugin_url() . "/js/formidable{$suffix}.js", array( 'jquery' ), $version, true );
3439	3045	}
		@@ -3440,9 +3046,9 @@
3440	3046
3441	3047	add_filter( 'script_loader_tag', 'FrmFormsController::defer_script_loading', 10, 2 );
3442	3048
3443	3049	if ( FrmAppHelper::is_admin() ) {
3444		- // Don't load this in back-end
	3050	+ // don't load this in back-end
3445	3051	return;
3446	3052	}
3447	3053
3448	3054	FrmAppHelper::localize_script( 'front' );
		@@ -3455,15 +3061,8 @@
3455	3061	public static function has_combo_js_file() {
3456	3062	return is_readable( FrmAppHelper::plugin_path() . '/js/frm.min.js' );
3457	3063	}
3458	3064
3459		- /**
3460		- * @param object $form
3461		- * @param int|string $this_load
3462		- * @param bool $global_load
3463		- *
3464		- * @return void
3465		- */
3466	3065	public static function maybe_load_css( $form, $this_load, $global_load ) {
3467	3066	$load_css = FrmForm::is_form_loaded( $form, $this_load, $global_load );
3468	3067
3469	3068	if ( ! $load_css ) {
		@@ -3493,9 +3092,8 @@
3493	3092	return;
3494	3093	}
3495	3094
3496	3095	global $wp_styles;
3497		-
3498	3096	if ( is_array( $wp_styles->queue ) && in_array( 'formidable', $wp_styles->queue, true ) ) {
3499	3097	wp_print_styles( 'formidable' );
3500	3098	}
3501	3099	}
		@@ -3510,52 +3108,32 @@
3510	3108	private static function should_load_late() {
3511	3109	return ! function_exists( 'aioseo' );
3512	3110	}
3513	3111
3514		- /**
3515		- * @param string $tag
3516		- * @param string $handle
3517		- *
3518		- * @return string
3519		- */
3520	3112	public static function defer_script_loading( $tag, $handle ) {
3521		- if ( 'captcha-api' === $handle && ! str_contains( $tag, 'defer' ) ) {
3522		- 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 );
3523	3115	}
3524	3116
3525	3117	return $tag;
3526	3118	}
3527	3119
3528		- /**
3529		- * @param string $location
3530		- *
3531		- * @return void
3532		- */
3533	3120	public static function footer_js( $location = 'footer' ) {
3534	3121	global $frm_vars;
3535	3122
3536	3123	FrmStylesController::enqueue_css();
3537	3124
3538		- if ( FrmAppHelper::is_admin() || $location === 'header' || empty( $frm_vars['forms_loaded'] ) ) {
3539		- return;
	3125	+ if ( ! FrmAppHelper::is_admin() && $location !== 'header' && ! empty( $frm_vars['forms_loaded'] ) ) {
	3126	+ // load formidable js
	3127	+ wp_enqueue_script( 'formidable' );
3540	3128	}
3541		-
3542		- // Load formidable js
3543		- wp_enqueue_script( 'formidable' );
3544		-
3545		- FrmHoneypot::maybe_print_honeypot_js();
3546	3129	}
3547	3130
3548	3131	/**
3549	3132	* @since 2.0.8
3550		- *
3551		- * @param array $atts
3552		- * @param string $content
3553		- *
3554		- * @return void
3555	3133	*/
3556	3134	private static function maybe_minimize_form( $atts, &$content ) {
3557		- // Check if minimizing is turned on
	3135	+ // check if minimizing is turned on
3558	3136	if ( self::is_minification_on( $atts ) ) {
3559	3137	$content = str_replace( array( "\r\n", "\r", "\n", "\t", ' ' ), '', $content );
3560	3138	}
3561	3139	}
		@@ -3561,11 +3139,8 @@
3561	3139	}
3562	3140
3563	3141	/**
3564	3142	* @since 2.0.8
3565		- *
3566		- * @param array $atts
3567		- *
3568	3143	* @return bool
3569	3144	*/
3570	3145	private static function is_minification_on( $atts ) {
3571	3146	return ! empty( $atts['minimize'] );
		@@ -3577,13 +3152,11 @@
3577	3152	* @return void
3578	3153	*/
3579	3154	public static function landing_page_preview_option() {
3580	3155	$dir = apply_filters( 'frm_landing_page_preview_option', false );
3581		-
3582	3156	if ( false === $dir || ! file_exists( $dir . 'landing-page-preview-option.php' ) ) {
3583	3157	$dir = self::get_form_views_path();
3584	3158	}
3585		-
3586	3159	include $dir . 'landing-page-preview-option.php';
3587	3160	}
3588	3161
3589	3162	/**
		@@ -3609,15 +3182,13 @@
3609	3182
3610	3183	check_ajax_referer( 'frm_ajax', 'nonce' );
3611	3184
3612	3185	$type = FrmAppHelper::get_post_param( 'type', '', 'sanitize_text_field' );
3613		-
3614	3186	if ( ! $type || ! in_array( $type, array( 'form', 'view' ), true ) ) {
3615	3187	die( 0 );
3616	3188	}
3617	3189
3618	3190	$object_id = FrmAppHelper::get_post_param( 'object_id', '', 'absint' );
3619		-
3620	3191	if ( ! $object_id ) {
3621	3192	die( 0 );
3622	3193	}
3623	3194
		@@ -3629,15 +3200,13 @@
3629	3200	$postarr['post_content'] = apply_filters( 'frm_create_page_with_' . $type . '_shortcode_content', '', $object_id );
3630	3201	}
3631	3202
3632	3203	$name = FrmAppHelper::get_post_param( 'name', '', 'sanitize_text_field' );
3633		-
3634	3204	if ( $name ) {
3635	3205	$postarr['post_title'] = $name;
3636	3206	}
3637	3207
3638	3208	$success = wp_insert_post( $postarr );
3639		-
3640	3209	if ( ! is_numeric( $success ) || ! $success ) {
3641	3210	die( 0 );
3642	3211	}
3643	3212
		@@ -3651,9 +3220,8 @@
3651	3220	/**
3652	3221	* @since 5.3
3653	3222	*
3654	3223	* @param int $form_id
3655		- *
3656	3224	* @return string
3657	3225	*/
3658	3226	private static function get_page_shortcode_content_for_form( $form_id ) {
3659	3227	$shortcode = '[formidable id="' . $form_id . '"]';
		@@ -3695,14 +3263,20 @@
3695	3263	}
3696	3264
3697	3265	/**
3698	3266	* @deprecated 4.0
3699		- *
3700		- * @param array $values
3701		- *
3702		- * @return void
3703	3267	*/
3704	3268	public static function create( $values = array() ) {
3705	3269	_deprecated_function( __METHOD__, '4.0', 'FrmFormsController::update' );
3706	3270	self::update( $values );
	3271	+ }
	3272	+
	3273	+ /**
	3274	+ * @deprecated 6.7
	3275	+ *
	3276	+ * @return bool
	3277	+ */
	3278	+ public static function expired() {
	3279	+ _deprecated_function( __METHOD__, '6.7' );
	3280	+ return FrmAddonsController::is_license_expired();
3707	3281	}
3708	3282	}