← All changes | classes/controllers/FrmFormsController.php +679 -426 6.4 → 6.20 View file →

		@@ -6,9 +6,9 @@
6	6	class FrmFormsController {
7	7
8	8	/**
9	9	* Track the form that opened the redirect URL in a new tab. This is used to check if we should show the default
10		- * message in the currect tab.
	10	+ * message in the current tab.
11	11	*
12	12	* @since 6.2
13	13	*
14	14	* @var array Keys are form IDs and values are 1.
		@@ -14,8 +14,18 @@
14	14	* @var array Keys are form IDs and values are 1.
15	15	*/
16	16	private static $redirected_in_new_tab = array();
17	17
	18	+ /**
	19	+ * The HTML for the Formdiable TinyMCE button (That triggers a popup to insert shortcodes)
	20	+ * is stored here and re-used as an optimization.
	21	+ *
	22	+ * @since 6.11
	23	+ *
	24	+ * @var string|null
	25	+ */
	26	+ private static $formidable_tinymce_button;
	27	+
18	28	public static function menu() {
19	29	$menu_label = __( 'Forms', 'formidable' );
20	30	if ( ! FrmAppHelper::pro_is_installed() ) {
21	31	$menu_label .= ' (Lite)';
		@@ -54,9 +64,9 @@
54	64	*/
55	65	public static function logic_tip() {
56	66	$images_url = FrmAppHelper::plugin_url() . '/images/';
57	67	$data_message = __( 'Only show the fields you need and create branching forms. Upgrade to get conditional logic and question branching.', 'formidable' );
58		- $data_message .= ' <img src="' . esc_attr( $images_url ) . '/survey-logic.png" srcset="' . esc_attr( $images_url ) . 'survey-logic@2x.png 2x" alt="' . esc_attr__( 'Conditional Logic options', 'formidable' ) . '"/>';
	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' ) . '"/>';
59	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">';
60	70	esc_html_e( 'Conditional Logic', 'formidable' );
61	71	FrmAppHelper::icon_by_class( 'frmfont frm_arrowdown6_icon', array( 'aria-hidden' => 'true' ) );
62	72	echo '</a>';
		@@ -96,15 +106,23 @@
96	106	* Create the default email action
97	107	*
98	108	* @since 2.02.11
99	109	*
100		- * @param object|int $form
	110	+ * @param int|object $form
	111	+ * @return void
101	112	*/
102	113	private static function create_default_email_action( $form ) {
103	114	FrmForm::maybe_get_form( $form );
	115	+ if ( ! is_object( $form ) ) {
	116	+ return;
	117	+ }
	118	+
104	119	$create_email = apply_filters( 'frm_create_default_email_action', true, $form );
105	120
106	121	if ( $create_email ) {
	122	+ /**
	123	+ * @var FrmFormAction
	124	+ */
107	125	$action_control = FrmFormActionsController::get_form_actions( 'email' );
108	126	$action_control->create( $form->id );
109	127	}
110	128	}
		@@ -113,12 +131,16 @@
113	131	* Create the default On submit action
114	132	*
115	133	* @since 6.0.0
116	134	*
117		- * @param object|int $form Form object or ID.
	135	+ * @param int|object $form Form object or ID.
	136	+ * @return void
118	137	*/
119	138	private static function create_default_on_submit_action( $form ) {
120	139	FrmForm::maybe_get_form( $form );
	140	+ if ( ! is_object( $form ) ) {
	141	+ return;
	142	+ }
121	143
122	144	/**
123	145	* Enable or disable the default On Submit action.
124	146	*
		@@ -129,21 +151,65 @@
129	151	*/
130	152	$create = apply_filters( 'frm_create_default_on_submit_action', true, $form );
131	153
132	154	if ( $create ) {
	155	+ /**
	156	+ * @var FrmFormAction
	157	+ */
133	158	$action_control = FrmFormActionsController::get_form_actions( FrmOnSubmitAction::$slug );
134	159	$action_control->create( $form->id );
135	160	}
136	161	}
137	162
	163	+ /**
	164	+ * Creates submit button field.
	165	+ *
	166	+ * @since 6.9
	167	+ *
	168	+ * @param int|object $form Form ID or object.
	169	+ * @return void
	170	+ */
	171	+ private static function create_submit_button_field( $form ) {
	172	+ FrmForm::maybe_get_form( $form );
	173	+ if ( ! is_object( $form ) ) {
	174	+ return;
	175	+ }
	176	+
	177	+ if ( FrmSubmitHelper::get_submit_field( $form->id ) ) {
	178	+ // Do not create submit button field if it exists.
	179	+ return;
	180	+ }
	181	+
	182	+ FrmField::create(
	183	+ array(
	184	+ 'type' => FrmSubmitHelper::FIELD_TYPE,
	185	+ 'name' => __( 'Submit', 'formidable' ),
	186	+ 'field_order' => FrmSubmitHelper::DEFAULT_ORDER,
	187	+ 'form_id' => $form->id,
	188	+ 'field_options' => FrmFieldsHelper::get_default_field_options( FrmSubmitHelper::FIELD_TYPE ),
	189	+ 'description' => '',
	190	+ 'default_value' => '',
	191	+ 'options' => array(),
	192	+ )
	193	+ );
	194	+ }
	195	+
	196	+ /**
	197	+ * @return void
	198	+ */
138	199	public static function edit( $values = false ) {
139	200	FrmAppHelper::permission_check( 'frm_edit_forms' );
140	201
141	202	$id = isset( $values['id'] ) ? absint( $values['id'] ) : FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
142	203
143		- return self::get_edit_vars( $id );
	204	+ self::get_edit_vars( $id );
144	205	}
145	206
	207	+ /**
	208	+ * @param mixed $id
	209	+ * @param string $message
	210	+ * @return void
	211	+ */
146	212	public static function settings( $id = false, $message = '' ) {
147	213	FrmAppHelper::permission_check( 'frm_edit_forms' );
148	214
149	215	if ( ! $id || ! is_numeric( $id ) ) {
		@@ -151,21 +217,34 @@
151	217	}
152	218
153	219	FrmOnSubmitHelper::maybe_migrate_submit_settings_to_action( $id );
154	220
155		- return self::get_settings_vars( $id, array(), $message );
	221	+ self::get_settings_vars( $id, array(), $message );
156	222	}
157	223
158	224	public static function update_settings() {
159	225	FrmAppHelper::permission_check( 'frm_edit_forms' );
	226	+ $process_form = FrmAppHelper::get_post_param( 'process_form', '', 'sanitize_text_field' );
160	227
	228	+ if ( ! wp_verify_nonce( $process_form, 'process_form_nonce' ) ) {
	229	+ $frm_settings = FrmAppHelper::get_settings();
	230	+ $error_args = array(
	231	+ 'title' => __( 'Verification failed', 'formidable' ),
	232	+ 'body' => $frm_settings->admin_permission,
	233	+ 'cancel_text' => __( 'Cancel', 'formidable' ),
	234	+ );
	235	+ FrmAppController::show_error_modal( $error_args );
	236	+ return;
	237	+ }
	238	+
161	239	$id = FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
162	240
163		- $errors = FrmForm::validate( $_POST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
	241	+ $errors = FrmForm::validate( $_POST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
164	242	$warnings = FrmFormsHelper::check_for_warnings( $_POST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
165	243
166	244	if ( count( $errors ) > 0 ) {
167		- return self::get_settings_vars( $id, $errors, compact( 'warnings' ) );
	245	+ self::get_settings_vars( $id, $errors, compact( 'warnings' ) );
	246	+ return;
168	247	}
169	248
170	249	do_action( 'frm_before_update_form_settings', $id );
171	250
		@@ -179,9 +258,9 @@
179	258	}
180	259
181	260	$message = __( 'Settings Successfully Updated', 'formidable' );
182	261
183		- return self::get_settings_vars( $id, array(), compact( 'message', 'warnings' ) );
	262	+ self::get_settings_vars( $id, array(), compact( 'message', 'warnings' ) );
184	263	}
185	264
186	265	/**
187	266	* @param int $form_id
		@@ -191,8 +270,11 @@
191	270	$form = FrmForm::getOne( $form_id );
192	271	return ! empty( $form->options['antispam'] );
193	272	}
194	273
	274	+ /**
	275	+ * @return void
	276	+ */
195	277	public static function update( $values = array() ) {
196	278	if ( empty( $values ) ) {
197	279	$values = $_POST; // phpcs:ignore WordPress.Security.NonceVerification.Missing
198	280	}
		@@ -210,65 +292,74 @@
210	292
211	293	$id = isset( $values['id'] ) ? absint( $values['id'] ) : FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
212	294
213	295	if ( count( $errors ) > 0 ) {
214		- return self::get_edit_vars( $id, $errors );
215		- } else {
216		- FrmForm::update( $id, $values );
217		- $message = __( 'Form was successfully updated.', 'formidable' );
	296	+ self::get_edit_vars( $id, $errors );
	297	+ return;
	298	+ }
218	299
219		- if ( self::is_too_long( $values ) ) {
220		- $message .= '<br/> ' . sprintf(
221		- /* translators: %1$s: Start link HTML, %2$s: end link HTML */
222		- __( 'However, your form is very long and may be %1$sreaching server limits%2$s.', 'formidable' ),
223		- '<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">',
224		- '</a>'
225		- );
226		- }
	300	+ self::maybe_remove_draft_option_from_fields( $id );
227	301
228		- if ( defined( 'DOING_AJAX' ) ) {
229		- wp_die( FrmAppHelper::kses( $message, array( 'a' ) ) ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
230		- }
	302	+ FrmForm::update( $id, $values );
	303	+ $message = __( 'Form was successfully updated.', 'formidable' );
231	304
232		- return self::get_edit_vars( $id, array(), $message );
	305	+ if ( self::is_too_long( $values ) ) {
	306	+ $message .= '<br/> ' . sprintf(
	307	+ /* translators: %1$s: Start link HTML, %2$s: end link HTML */
	308	+ __( 'However, your form is very long and may be %1$sreaching server limits%2$s.', 'formidable' ),
	309	+ '<a href="https://formidableforms.com/knowledgebase/i-have-a-long-form-why-did-the-options-at-the-end-of-the-form-stop-saving/?utm_source=WordPress&utm_medium=builder&utm_campaign=liteplugin" target="_blank" rel="noopener">',
	310	+ '</a>'
	311	+ );
233	312	}
	313	+
	314	+ if ( defined( 'DOING_AJAX' ) ) {
	315	+ wp_die( FrmAppHelper::kses( $message, array( 'a' ) ) ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
	316	+ }
	317	+
	318	+ self::get_edit_vars( $id, array(), $message );
234	319	}
235	320
236	321	/**
	322	+ * Remove the draft flag from any new fields from this current session.
	323	+ *
	324	+ * @since 6.8
	325	+ *
	326	+ * @param int $form_id
	327	+ * @return void
	328	+ */
	329	+ private static function maybe_remove_draft_option_from_fields( $form_id ) {
	330	+ $draft_field_ids_csv = FrmAppHelper::get_post_param( 'draft_fields', '', 'sanitize_text_field' );
	331	+ if ( ! $draft_field_ids_csv ) {
	332	+ // If the draft_fields input is empty there are no new fields in the session.
	333	+ return;
	334	+ }
	335	+
	336	+ $draft_field_ids = array_filter( explode( ',', $draft_field_ids_csv ), 'is_numeric' );
	337	+ if ( ! $draft_field_ids ) {
	338	+ // Exit early if the draft fields input is invalid. It should be a CSV of integer values.
	339	+ return;
	340	+ }
	341	+
	342	+ $draft_field_rows = FrmFieldsHelper::get_draft_field_results( $form_id, $draft_field_ids );
	343	+ foreach ( $draft_field_rows as $row ) {
	344	+ $row->field_options['draft'] = 0;
	345	+ FrmField::update( $row->id, array( 'field_options' => $row->field_options ) );
	346	+ }
	347	+ }
	348	+
	349	+ /**
237	350	* Check if the value at the end of the form was included.
238	351	* If it's missing, it means other values at the end of the form
239	352	* were likely not saved either.
240	353	*
241	354	* @since 3.06.01
	355	+ *
	356	+ * @return bool
242	357	*/
243	358	private static function is_too_long( $values ) {
244		- return ( ! isset( $values['frm_end'] ) ) || empty( $values['frm_end'] );
	359	+ return empty( $values['frm_end'] );
245	360	}
246	361
247		- /**
248		- * Redirect to the url for creating from a template
249		- * Also delete the current form
250		- *
251		- * @since 2.0
252		- * @deprecated 3.06
253		- */
254		- public static function _create_from_template() {
255		- _deprecated_function( __FUNCTION__, '3.06' );
256		-
257		- FrmAppHelper::permission_check( 'frm_edit_forms' );
258		- check_ajax_referer( 'frm_ajax', 'nonce' );
259		-
260		- $current_form = FrmAppHelper::get_param( 'this_form', '', 'get', 'absint' );
261		- $template_id = FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
262		-
263		- if ( $current_form ) {
264		- FrmForm::destroy( $current_form );
265		- }
266		-
267		- echo esc_url_raw( admin_url( 'admin.php?page=formidable&frm_action=duplicate&id=' . absint( $template_id ) ) );
268		- wp_die();
269		- }
270		-
271	362	public static function duplicate() {
272	363	FrmAppHelper::permission_check( 'frm_edit_forms' );
273	364	$nonce = FrmAppHelper::simple_get( '_wpnonce' );
274	365
		@@ -282,10 +373,11 @@
282	373	$url = admin_url( 'admin.php?page=formidable' );
283	374	$message = 'form_duplicate_error';
284	375
285	376	if ( $form ) {
286		- $url = admin_url( 'admin.php?page=formidable&frm_action=edit&id=' . absint( $form ) );
287		- $message = 'form_duplicated';
	377	+ $new_template = FrmAppHelper::simple_get( 'new_template' ) ? '&new_template=true' : '';
	378	+ $url = admin_url( 'admin.php?page=formidable&frm_action=edit&id=' . absint( $form ) . $new_template );
	379	+ $message = 'form_duplicated';
288	380	}
289	381
290	382	$url .= '&message=' . $message;
291	383
		@@ -293,27 +385,42 @@
293	385	exit();
294	386	}
295	387
296	388	/**
297		- * @return string
	389	+ * @return string|null
298	390	*/
299	391	public static function page_preview() {
300	392	$params = FrmForm::list_page_params();
301		- if ( ! $params['form'] ) {
302		- return;
	393	+ if ( ! $params['form'] || is_numeric( $params['form'] ) ) {
	394	+ return null;
303	395	}
304	396
	397	+ self::maybe_block_preview( $params['form'] );
	398	+
305	399	$form = FrmForm::getOne( $params['form'] );
306		- if ( $form ) {
307		- return self::show_form( $form->id, '', 'auto', 'auto' );
	400	+ if ( ! $form ) {
	401	+ return null;
308	402	}
	403	+
	404	+ return self::show_form( $form->id, '', 'auto', 'auto' );
309	405	}
310	406
311	407	/**
312	408	* @since 3.0
	409	+ *
	410	+ * @return void
313	411	*/
314	412	public static function show_page_preview() {
315		- echo self::page_preview(); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
	413	+ $preview = self::page_preview();
	414	+ if ( is_null( $preview ) ) {
	415	+ wp_die(
	416	+ '<h1>' . esc_html__( 'Form key is invalid', 'formidable' ) . '</h1>',
	417	+ '<p>' . esc_html__( 'Form key is invalid', 'formidable' ) . '</p>',
	418	+ 404
	419	+ );
	420	+ }
	421	+
	422	+ echo $preview; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
316	423	}
317	424
318	425	/**
319	426	* @return void
		@@ -324,8 +431,11 @@
324	431
325	432	global $frm_vars;
326	433	$frm_vars['preview'] = true;
327	434
	435	+ // print_emoji_styles is deprecated.
	436	+ remove_action( 'wp_print_styles', 'print_emoji_styles' );
	437	+
328	438	$include_theme = FrmAppHelper::get_param( 'theme', '', 'get', 'absint' );
329	439	if ( $include_theme ) {
330	440	self::set_preview_query();
331	441	self::load_theme_preview();
		@@ -360,8 +470,13 @@
360	470	return;
361	471	}
362	472
363	473	$random_page = reset( $random_page );
	474	+ if ( ! is_a( $random_page, 'WP_Post' ) ) {
	475	+ // The return type can also be int.
	476	+ return;
	477	+ }
	478	+
364	479	query_posts(
365	480	array(
366	481	'post_type' => 'page',
367	482	'page_id' => $random_page->ID,
		@@ -377,9 +492,9 @@
377	492	* Set the WP $post global object. Used for in-theme preview when defining a page.
378	493	*
379	494	* @since 5.5.2
380	495	*
381		- * @param WP_Post $post
	496	+ * @param WP_Post $page The page object.
382	497	* @return void
383	498	*/
384	499	private static function set_post_global( $page ) {
385	500	global $post;
		@@ -387,8 +502,10 @@
387	502	}
388	503
389	504	/**
390	505	* @since 3.0
	506	+ *
	507	+ * @return void
391	508	*/
392	509	private static function load_theme_preview() {
393	510	add_filter( 'wp_title', 'FrmFormsController::preview_title', 9999 );
394	511	add_filter( 'the_title', 'FrmFormsController::preview_page_title', 9999 );
		@@ -397,20 +514,39 @@
397	514	add_filter( 'is_active_sidebar', '__return_false' );
398	515	FrmStylesController::enqueue_css( 'enqueue', true );
399	516
400	517	if ( false === get_template_part( 'page' ) ) {
	518	+ if ( function_exists( 'wp_is_block_theme' ) && wp_is_block_theme() ) {
	519	+ add_filter( 'body_class', 'FrmFormsController::preview_block_theme_body_classnames' );
	520	+ }
401	521	self::fallback_when_page_template_part_is_not_supported_by_theme();
402	522	}
403	523	}
404	524
405	525	/**
	526	+ * Add padding to the body for block themes.
	527	+ *
	528	+ * @since 6.5.2
	529	+ *
	530	+ * @param array $classes The body classes list.
	531	+ * @return array
	532	+ */
	533	+ public static function preview_block_theme_body_classnames( $classes ) {
	534	+ $classes[] = 'has-global-padding';
	535	+ return $classes;
	536	+ }
	537	+
	538	+ /**
406	539	* Not every theme supports get_template_part( 'page' ).
407	540	* When this is not supported, false is returned, and we can handle a fallback.
	541	+ *
	542	+ * @return void
408	543	*/
409	544	private static function fallback_when_page_template_part_is_not_supported_by_theme() {
410	545	if ( have_posts() ) {
411	546	the_post();
412		- get_header( '' );
	547	+ self::get_template( 'header' );
	548	+
413	549	// add some generic class names to the container to add some natural padding to the content.
414	550	// .entry-content catches the WordPress TwentyTwenty theme.
415	551	// .container catches Customizr content.
416	552	echo '<div class="container entry-content">';
		@@ -415,13 +551,54 @@
415	551	// .container catches Customizr content.
416	552	echo '<div class="container entry-content">';
417	553	the_content();
418	554	echo '</div>';
419		- get_footer();
	555	+
	556	+ self::get_template( 'footer' );
420	557	}
421	558	}
422	559
423	560	/**
	561	+ * Calls core function to get a template part if it doesn't cause deprecation warnings. Otherwise skips the deprecation function call
	562	+ * and renders required html fragments calling required functions.
	563	+ *
	564	+ * @since 6.7.1
	565	+ * @param string $template
	566	+ * @return void
	567	+ */
	568	+ private static function get_template( $template ) {
	569	+ if ( self::should_try_getting_template( $template ) ) {
	570	+ call_user_func( 'get_' . $template );
	571	+ return;
	572	+ }
	573	+
	574	+ if ( 'header' === $template ) {
	575	+ include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/preview/header.php';
	576	+ return;
	577	+ }
	578	+
	579	+ if ( 'footer' === $template ) {
	580	+ include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/preview/footer.php';
	581	+ }
	582	+ }
	583	+
	584	+ /**
	585	+ * Returns true if calling a template function doesn't trigger deprecation warnings.
	586	+ *
	587	+ * @since 6.7.1
	588	+ * @param string $template
	589	+ * @return bool
	590	+ */
	591	+ private static function should_try_getting_template( $template ) {
	592	+ $stylesheet_path = get_stylesheet_directory();
	593	+ $template_path = get_template_directory();
	594	+ $is_child_theme = $stylesheet_path !== $template_path;
	595	+ $template_name = $template . '.php';
	596	+
	597	+ return file_exists( $stylesheet_path . '/' . $template_name ) || $is_child_theme && file_exists( $template_path . '/' . $template_name );
	598	+ }
	599	+
	600	+ /**
424	601	* Set the page title for the theme preview page
425	602	*
426	603	* @since 3.0
427	604	*/
		@@ -433,11 +610,14 @@
433	610	return $title;
434	611	}
435	612
436	613	/**
437		- * Set the page title for the theme preview page
	614	+ * Set the page title for the theme preview page.
438	615	*
439	616	* @since 3.0
	617	+ *
	618	+ * @param string $title
	619	+ * @return string
440	620	*/
441	621	public static function preview_title( $title ) {
442	622	return __( 'Form Preview', 'formidable' );
443	623	}
		@@ -442,15 +622,20 @@
442	622	return __( 'Form Preview', 'formidable' );
443	623	}
444	624
445	625	/**
446		- * Set the page content for the theme preview page
	626	+ * Set the page content for the theme preview page.
447	627	*
448	628	* @since 3.0
	629	+ *
	630	+ * @param string $content
	631	+ * @return string
449	632	*/
450	633	public static function preview_content( $content ) {
451	634	if ( in_the_loop() ) {
452		- $content = self::show_page_preview();
	635	+ self::show_page_preview();
	636	+ // Clear the content for the page we're using.
	637	+ $content = '';
453	638	}
454	639
455	640	return $content;
456	641	}
		@@ -458,23 +643,88 @@
458	643	/**
459	644	* @since 3.0
460	645	*/
461	646	private static function load_direct_preview() {
462		- header( 'Content-Type: text/html; charset=' . get_option( 'blog_charset' ) );
463		-
464	647	$key = FrmAppHelper::simple_get( 'form', 'sanitize_title' );
465	648	if ( $key == '' ) {
466	649	$key = FrmAppHelper::get_post_param( 'form', '', 'sanitize_title' );
467	650	}
468	651
	652	+ if ( ! $key ) {
	653	+ $error = __( 'Form key is missing', 'formidable' );
	654	+ wp_die(
	655	+ '<h1>' . esc_html( $error ) . '</h1>',
	656	+ '<p>' . esc_html( $error ) . '</p>',
	657	+ 404
	658	+ );
	659	+ }
	660	+
	661	+ self::maybe_block_preview( $key );
	662	+
469	663	$form = FrmForm::getAll( array( 'form_key' => $key ), '', 1 );
470		- if ( empty( $form ) ) {
471		- $form = FrmForm::getAll( array(), '', 1 );
	664	+ if ( ! $form ) {
	665	+ $error = __( 'Form does not exist', 'formidable' );
	666	+ wp_die(
	667	+ '<h1>' . esc_html( $error ) . '</h1>',
	668	+ '<p>' . esc_html( $error ) . '</p>',
	669	+ 404
	670	+ );
472	671	}
473	672
474		- require( FrmAppHelper::plugin_path() . '/classes/views/frm-entries/direct.php' );
	673	+ header( 'Content-Type: text/html; charset=' . get_option( 'blog_charset' ) );
	674	+
	675	+ self::fix_deprecated_null_param_warning();
	676	+
	677	+ require FrmAppHelper::plugin_path() . '/classes/views/frm-entries/direct.php';
475	678	}
476	679
	680	+ /**
	681	+ * Block the form preview for the contact form by default if the user cannot view forms.
	682	+ * This is to prevent the contact form being exploited.
	683	+ * Since this form is added by default and every site uses the same key, it is too easy
	684	+ * to guess this form.
	685	+ *
	686	+ * @since 6.20
	687	+ *
	688	+ * @param string $form_key Form key.
	689	+ * @return void
	690	+ */
	691	+ public static function maybe_block_preview( $form_key ) {
	692	+ if ( FrmFormsHelper::should_block_preview( $form_key ) ) {
	693	+ $error = __( 'You do not have permission to view this form', 'formidable' );
	694	+ wp_die(
	695	+ '<h1>' . esc_html( $error ) . '</h1>',
	696	+ '<p>' . esc_html( $error ) . '</p>',
	697	+ 403
	698	+ );
	699	+ }
	700	+ }
	701	+
	702	+ /**
	703	+ * Some themes have a null $src value.
	704	+ * This function adds a filter to ensure that $src is not null.
	705	+ * WP will call str_starts_with with the null value triggering a deprecated message otherwise.
	706	+ *
	707	+ * @since 6.10
	708	+ *
	709	+ * @return void
	710	+ */
	711	+ private static function fix_deprecated_null_param_warning() {
	712	+ add_filter(
	713	+ 'script_loader_src',
	714	+ /**
	715	+ * @param string|null $src
	716	+ * @return string
	717	+ */
	718	+ function ( $src ) {
	719	+ if ( is_null( $src ) ) {
	720	+ $src = '';
	721	+ }
	722	+ return $src;
	723	+ }
	724	+ );
	725	+ }
	726	+
477	727	public static function untrash() {
478	728	self::change_form_status( 'untrash' );
479	729	}
480	730
		@@ -537,14 +787,14 @@
537	787	FrmAppHelper::permission_check( $available_status[ $status ]['permission'] );
538	788
539	789	$params = FrmForm::list_page_params();
540	790
541		- //check nonce url
	791	+ // Check nonce url.
542	792	check_admin_referer( $status . '_form_' . $params['id'] );
543	793
544	794	$count = 0;
545	795	if ( FrmForm::set_status( $params['id'], $available_status[ $status ]['new_status'] ) ) {
546		- $count ++;
	796	+ ++$count;
547	797	}
548	798
549	799	$form_type = FrmAppHelper::get_simple_request(
550	800	array(
		@@ -556,9 +806,9 @@
556	806	/* translators: %1$s: Number of forms */
557	807	$available_status['untrash']['message'] = sprintf( _n( '%1$s form restored from the Trash.', '%1$s forms restored from the Trash.', $count, 'formidable' ), $count );
558	808
559	809	/* translators: %1$s: Number of forms, %2$s: Start link HTML, %3$s: End link HTML */
560		- $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>' );
	810	+ $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>' );
561	811
562	812	$message = $available_status[ $status ]['message'];
563	813
564	814	self::display_forms_list( $params, $message );
		@@ -563,8 +813,12 @@
563	813
564	814	self::display_forms_list( $params, $message );
565	815	}
566	816
	817	+ /**
	818	+ * @param array $ids
	819	+ * @return string
	820	+ */
567	821	public static function bulk_trash( $ids ) {
568	822	FrmAppHelper::permission_check( 'frm_delete_forms' );
569	823
570	824	$count = 0;
		@@ -569,12 +823,16 @@
569	823
570	824	$count = 0;
571	825	foreach ( $ids as $id ) {
572	826	if ( FrmForm::trash( $id ) ) {
573		- $count ++;
	827	+ ++$count;
574	828	}
575	829	}
576	830
	831	+ if ( ! $count ) {
	832	+ return '';
	833	+ }
	834	+
577	835	$current_page = FrmAppHelper::get_simple_request(
578	836	array(
579	837	'param' => 'form_type',
580	838	'type' => 'request',
		@@ -600,9 +858,9 @@
600	858	check_admin_referer( 'destroy_form_' . $params['id'] );
601	859
602	860	$count = 0;
603	861	if ( FrmForm::destroy( $params['id'] ) ) {
604		- $count ++;
	862	+ ++$count;
605	863	}
606	864
607	865	/* translators: %1$s: Number of forms */
608	866	$message = sprintf( _n( '%1$s Form Permanently Deleted', '%1$s Forms Permanently Deleted', $count, 'formidable' ), $count );
		@@ -609,8 +867,12 @@
609	867
610	868	self::display_forms_list( $params, $message );
611	869	}
612	870
	871	+ /**
	872	+ * @param array $ids
	873	+ * @return string
	874	+ */
613	875	public static function bulk_destroy( $ids ) {
614	876	FrmAppHelper::permission_check( 'frm_delete_forms' );
615	877
616	878	$count = 0;
		@@ -616,19 +878,24 @@
616	878	$count = 0;
617	879	foreach ( $ids as $id ) {
618	880	$d = FrmForm::destroy( $id );
619	881	if ( $d ) {
620		- $count ++;
	882	+ ++$count;
621	883	}
622	884	}
623	885
624		- /* translators: %1$s: Number of forms */
625		- $message = sprintf( _n( '%1$s form permanently deleted.', '%1$s forms permanently deleted.', $count, 'formidable' ), $count );
	886	+ if ( $count ) {
	887	+ /* translators: %1$s: Number of forms */
	888	+ return sprintf( _n( '%1$s form permanently deleted.', '%1$s forms permanently deleted.', $count, 'formidable' ), $count );
	889	+ }
626	890
627		- return $message;
	891	+ return '';
628	892	}
629	893
630		- private static function delete_all() {
	894	+ /**
	895	+ * @since 6.7.1 Function went from private to public.
	896	+ */
	897	+ public static function delete_all() {
631	898	// Check nonce url.
632	899	$permission_error = FrmAppHelper::permission_nonce_error( 'frm_delete_forms', '_wpnonce', 'bulk-toplevel_page_formidable' );
633	900	if ( $permission_error !== false ) {
634	901	self::display_forms_list( array(), '', array( $permission_error ) );
		@@ -635,14 +902,15 @@
635	902
636	903	return;
637	904	}
638	905
639		- $count = FrmForm::scheduled_delete( time() );
	906	+ $count = FrmForm::scheduled_delete( time() );
	907	+ $url = remove_query_arg( array( 'delete_all' ) );
640	908
641		- /* translators: %1$s: Number of forms */
642		- $message = sprintf( _n( '%1$s form permanently deleted.', '%1$s forms permanently deleted.', $count, 'formidable' ), $count );
	909	+ $url .= '&message=forms_permanently_deleted&forms_deleted=' . $count;
643	910
644		- self::display_forms_list( array(), $message );
	911	+ wp_safe_redirect( $url );
	912	+ die();
645	913	}
646	914
647	915	/**
648	916	* Create a new form from the modal.
		@@ -655,9 +923,9 @@
655	923
656	924	$new_values = self::get_modal_values();
657	925	$new_values['form_key'] = $new_values['name'];
658	926	$new_values['options'] = array(
659		- 'antispam' => 1,
	927	+ 'antispam' => 1,
660	928	'on_submit_migrated' => 1,
661	929	);
662	930
663	931	/**
		@@ -676,13 +944,14 @@
676	944	* @param int $form_id
677	945	*/
678	946	do_action( 'frm_build_new_form', $form_id );
679	947
	948	+ self::create_submit_button_field( $form_id );
680	949	self::create_default_on_submit_action( $form_id );
681	950	self::create_default_email_action( $form_id );
682	951
683	952	$response = array(
684		- 'redirect' => FrmForm::get_edit_link( $form_id ),
	953	+ 'redirect' => FrmForm::get_edit_link( $form_id ) . '&new_template=true',
685	954	);
686	955
687	956	echo wp_json_encode( $response );
688	957	wp_die();
		@@ -688,46 +957,15 @@
688	957	wp_die();
689	958	}
690	959
691	960	/**
692		- * Create a custom template from a form
693		- *
694		- * @since 3.06
695		- */
696		- public static function build_template() {
697		- global $wpdb;
698		-
699		- FrmAppHelper::permission_check( 'frm_edit_forms' );
700		- check_ajax_referer( 'frm_ajax', 'nonce' );
701		-
702		- $form_id = FrmAppHelper::get_param( 'xml', '', 'post', 'absint' );
703		- $new_form_id = FrmForm::duplicate( $form_id, 1, true );
704		- if ( ! $new_form_id ) {
705		- $response = array(
706		- 'message' => __( 'There was an error creating a template.', 'formidable' ),
707		- );
708		- } else {
709		- $new_values = self::get_modal_values();
710		- $query_results = $wpdb->update( $wpdb->prefix . 'frm_forms', $new_values, array( 'id' => $new_form_id ) );
711		- if ( $query_results ) {
712		- FrmForm::clear_form_cache();
713		- }
714		-
715		- $response = array(
716		- 'redirect' => admin_url( 'admin.php?page=formidable&frm_action=duplicate&id=' . $new_form_id ) . '&_wpnonce=' . wp_create_nonce(),
717		- );
718		- }
719		-
720		- echo wp_json_encode( $response );
721		- wp_die();
722		- }
723		-
724		- /**
725	961	* Before creating a new form, get the name and description from the modal.
726	962	*
727	963	* @since 4.0
	964	+ *
	965	+ * @return array<string,string>
728	966	*/
729		- private static function get_modal_values() {
	967	+ public static function get_modal_values() {
730	968	$name = FrmAppHelper::get_param( 'name', '', 'post', 'sanitize_text_field' );
731	969	$desc = FrmAppHelper::get_param( 'desc', '', 'post', 'sanitize_textarea_field' );
732	970
733	971	return array(
		@@ -740,17 +978,24 @@
740	978	* Inserts Formidable button
741	979	* Hook exists since 2.5.0
742	980	*
743	981	* @since 2.0.15
	982	+ *
	983	+ * @return void
744	984	*/
745	985	public static function insert_form_button() {
746	986	if ( current_user_can( 'frm_view_forms' ) ) {
747		- FrmAppHelper::load_admin_wide_js();
748		- $menu_name = FrmAppHelper::get_menu_name();
749		- $icon = apply_filters( 'frm_media_icon', FrmAppHelper::svg_logo() );
750		- echo '<a href="#TB_inline?width=50&height=50&inlineId=frm_insert_form" class="thickbox button add_media frm_insert_form" title="' . esc_attr__( 'Add forms and content', 'formidable' ) . '">' .
751		- FrmAppHelper::kses( $icon, 'all' ) . // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
752		- ' ' . esc_html( $menu_name ) . '</a>';
	987	+ // Store the result in memory and re-use it when this function is called multiple times.
	988	+ // This helps speed up the form builder when there are a lot of HTML fields, where this
	989	+ // button is inserted once per HTML field.
	990	+ // In a form with 66 HTML fields, this saves 0.5 seconds on page load time, tested locally.
	991	+ if ( ! isset( self::$formidable_tinymce_button ) ) {
	992	+ FrmAppHelper::load_admin_wide_js();
	993	+ $menu_name = FrmAppHelper::get_menu_name();
	994	+ $icon = apply_filters( 'frm_media_icon', FrmAppHelper::svg_logo() );
	995	+ 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>';
	996	+ }
	997	+ echo self::$formidable_tinymce_button; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
753	998	}
754	999	}
755	1000
756	1001	/**
		@@ -838,9 +1083,9 @@
838	1083	$form_id = $opts['form_id'];
839	1084	unset( $opts['form_id'] );
840	1085	}
841	1086
842		- include( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/shortcode_opts.php' );
	1087	+ include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/shortcode_opts.php';
843	1088
844	1089	echo '</div>';
845	1090
846	1091	wp_die();
		@@ -880,8 +1125,14 @@
880	1125	wp_redirect( esc_url_raw( add_query_arg( 'paged', $total_pages ) ) );
881	1126	die();
882	1127	}
883	1128
	1129	+ $inbox = new FrmInbox();
	1130	+ $error = $inbox->check_for_error();
	1131	+ if ( $error ) {
	1132	+ $show_messages = array( $error['subject'] . '. ' . $error['message'] );
	1133	+ }
	1134	+
884	1135	require FrmAppHelper::plugin_path() . '/classes/views/frm-forms/list.php';
885	1136	}
886	1137
887	1138	/**
		@@ -889,14 +1140,14 @@
889	1140	* @return array<string,string>
890	1141	*/
891	1142	public static function get_columns( $columns ) {
892	1143	$columns['cb'] = '<input type="checkbox" />';
893		- $columns['name'] = __( 'Form Title', 'formidable' );
894		- $columns['entries'] = __( 'Entries', 'formidable' );
	1144	+ $columns['name'] = esc_html__( 'Form Title', 'formidable' );
	1145	+ $columns['entries'] = esc_html__( 'Entries', 'formidable' );
895	1146	$columns['id'] = 'ID';
896		- $columns['form_key'] = __( 'Key', 'formidable' );
897		- $columns['shortcode'] = __( 'Actions', 'formidable' );
898		- $columns['created_at'] = __( 'Date', 'formidable' );
	1147	+ $columns['form_key'] = esc_html__( 'Key', 'formidable' );
	1148	+ $columns['shortcode'] = esc_html__( 'Actions', 'formidable' );
	1149	+ $columns['created_at'] = esc_html__( 'Date', 'formidable' );
899	1150
900	1151	add_screen_option(
901	1152	'per_page',
902	1153	array(
		@@ -908,8 +1159,11 @@
908	1159
909	1160	return $columns;
910	1161	}
911	1162
	1163	+ /**
	1164	+ * @return array<string,string>
	1165	+ */
912	1166	public static function get_sortable_columns() {
913	1167	return array(
914	1168	'id' => 'id',
915	1169	'name' => 'name',
		@@ -943,9 +1197,9 @@
943	1197	return $hidden_columns;
944	1198	}
945	1199
946	1200	public static function save_per_page( $save, $option, $value ) {
947		- if ( $option == 'formidable_page_formidable_per_page' ) {
	1201	+ if ( $option === 'formidable_page_formidable_per_page' ) {
948	1202	$save = (int) $value;
949	1203	}
950	1204
951	1205	return $save;
		@@ -951,146 +1205,49 @@
951	1205	return $save;
952	1206	}
953	1207
954	1208	/**
955		- * @return bool
956		- */
957		- public static function expired() {
958		- global $frm_expired;
959		- return $frm_expired;
960		- }
961		-
962		- /**
963		- * Get data from api before rendering it so that we can flag the modal as expired
964		- *
	1209	+ * @param int|string $id
	1210	+ * @param array $errors
	1211	+ * @param string $message
	1212	+ * @param bool $create_link
965	1213	* @return void
966	1214	*/
967		- public static function before_list_templates() {
968		- global $frm_templates;
969		- global $frm_expired;
970		- global $frm_license_type;
	1215	+ private static function get_edit_vars( $id, $errors = array(), $message = '', $create_link = false ) {
	1216	+ global $frm_vars;
971	1217
972		- $api = new FrmFormTemplateApi();
973		- $frm_templates = $api->get_api_info();
974		- $expired = false;
975		- $license_type = '';
976		- if ( isset( $frm_templates['error'] ) ) {
977		- $error = $frm_templates['error']['message'];
978		- $error = str_replace( 'utm_medium=addons', 'utm_medium=form-templates', $error );
979		- $expired = 'expired' === $frm_templates['error']['code'];
980		- $license_type = isset( $frm_templates['error']['type'] ) ? $frm_templates['error']['type'] : '';
981		- unset( $frm_templates['error'] );
982		- }
983		-
984		- $frm_expired = $expired;
985		- $frm_license_type = $license_type;
986		- }
987		-
988		- /**
989		- * @return void
990		- */
991		- public static function list_templates() {
992		- global $frm_templates;
993		- global $frm_license_type;
994		-
995		- $templates = $frm_templates;
996		- $custom_templates = array();
997		- $templates_by_category = array();
998		-
999		- self::add_user_templates( $custom_templates );
1000		-
1001		- foreach ( $templates as $template ) {
1002		- if ( ! isset( $template['categories'] ) ) {
1003		- continue;
1004		- }
1005		-
1006		- foreach ( $template['categories'] as $category ) {
1007		- if ( ! isset( $templates_by_category[ $category ] ) ) {
1008		- $templates_by_category[ $category ] = array();
1009		- }
1010		-
1011		- $templates_by_category[ $category ][] = $template;
1012		- }
1013		- }
1014		- unset( $template );
1015		-
1016		- // Subcategories that are included elsewhere.
1017		- $redundant_cats = array( 'PayPal', 'Stripe', 'Twilio' );
1018		-
1019		- $categories = array_keys( $templates_by_category );
1020		- $categories = array_diff( $categories, FrmFormsHelper::ignore_template_categories() );
1021		- $categories = array_diff( $categories, $redundant_cats );
1022		- sort( $categories );
1023		-
1024		- array_walk(
1025		- $custom_templates,
1026		- function( &$template ) {
1027		- $template['custom'] = true;
1028		- }
	1218	+ $form = FrmForm::getOne( $id );
	1219	+ $error_args = array(
	1220	+ 'title' => __( 'You can\'t edit the form', 'formidable' ),
	1221	+ 'body' => __( 'You are trying to edit a form that does not exist', 'formidable' ),
	1222	+ 'cancel_url' => admin_url( 'admin.php?page=formidable' ),
	1223	+ 'continue_url' => add_query_arg(
	1224	+ array(
	1225	+ 'page' => 'formidable',
	1226	+ )
	1227	+ ),
1029	1228	);
1030		-
1031		- $my_templates_translation = __( 'My Templates', 'formidable' );
1032		- $categories = array_merge( array( $my_templates_translation ), $categories );
1033		- $pricing = FrmAppHelper::admin_upgrade_link( 'form-templates' );
1034		- $license_type = $frm_license_type;
1035		- $args = compact( 'pricing', 'license_type' );
1036		- $where = apply_filters( 'frm_forms_dropdown', array(), '' );
1037		- $forms = FrmForm::get_published_forms( $where );
1038		- $view_path = FrmAppHelper::plugin_path() . '/classes/views/frm-forms/';
1039		-
1040		- $templates_by_category[ $my_templates_translation ] = $custom_templates;
1041		-
1042		- unset( $pricing, $license_type, $where );
1043		- wp_enqueue_script( 'accordion' ); // register accordion for template groups
1044		- require $view_path . 'list-templates.php';
1045		- }
1046		-
1047		- /**
1048		- * @since 4.03.01
1049		- */
1050		- private static function get_template_categories( $templates ) {
1051		- $categories = array();
1052		- foreach ( $templates as $template ) {
1053		- if ( isset( $template['categories'] ) ) {
1054		- $categories = array_merge( $categories, $template['categories'] );
1055		- }
	1229	+ if ( ! $form ) {
	1230	+ FrmAppController::show_error_modal( $error_args );
	1231	+ return;
1056	1232	}
1057		- $exclude_cats = FrmFormsHelper::ignore_template_categories();
1058		- $categories = array_unique( $categories );
1059		- $categories = array_diff( $categories, $exclude_cats );
1060		- sort( $categories );
1061		- return $categories;
1062		- }
1063	1233
1064		- private static function add_user_templates( &$templates ) {
1065		- $user_templates = array(
1066		- 'is_template' => 1,
1067		- 'default_template' => 0,
1068		- );
1069		- $user_templates = FrmForm::getAll( $user_templates, 'name' );
1070		- foreach ( $user_templates as $template ) {
1071		- $template = array(
1072		- 'id' => $template->id,
1073		- 'name' => $template->name,
1074		- 'key' => $template->form_key,
1075		- 'description' => $template->description,
1076		- 'url' => wp_nonce_url( admin_url( 'admin.php?page=formidable&frm_action=duplicate&id=' . absint( $template->id ) ) ),
1077		- 'released' => $template->created_at,
1078		- 'installed' => 1,
	1234	+ if ( 'trash' === $form->status ) {
	1235	+ $error_args['body'] = __( 'The form you\'re trying to edit is in trash. You must restore it first before you can make changes', 'formidable' );
	1236	+ $error_args['continue_url'] = add_query_arg(
	1237	+ array(
	1238	+ 'page' => 'formidable',
	1239	+ '_wpnonce' => wp_create_nonce( 'untrash_form_' . $id ),
	1240	+ 'form_type' => 'trash',
	1241	+ 'frm_action' => 'untrash',
	1242	+ 'id' => $id,
	1243	+ )
1079	1244	);
1080		- array_unshift( $templates, $template );
1081		- unset( $template );
	1245	+ $error_args['continue_text'] = __( 'Restore form', 'formidable' );
	1246	+ FrmAppController::show_error_modal( $error_args );
	1247	+ return;
1082	1248	}
1083		- }
1084	1249
1085		- private static function get_edit_vars( $id, $errors = array(), $message = '', $create_link = false ) {
1086		- global $frm_vars;
1087		-
1088		- $form = FrmForm::getOne( $id );
1089		- if ( ! $form ) {
1090		- wp_die( esc_html__( 'You are trying to edit a form that does not exist.', 'formidable' ) );
1091		- }
1092		-
1093	1250	if ( $form->parent_form_id ) {
1094	1251	/* translators: %1$s: Start link HTML, %2$s: End link HTML */
1095	1252	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>' ) );
1096	1253	}
		@@ -1101,8 +1258,9 @@
1101	1258
1102	1259	// Automatically add end section fields if they don't exist (2.0 migration).
1103	1260	$reset_fields = false;
1104	1261	FrmFormsHelper::auto_add_end_section_fields( $form, $fields, $reset_fields );
	1262	+ FrmSubmitHelper::maybe_create_submit_field( $form, $fields, $reset_fields );
1105	1263
1106	1264	if ( $reset_fields ) {
1107	1265	$fields = FrmField::get_all_for_form( $form->id, '', 'exclude' );
1108	1266	}
		@@ -1128,18 +1286,21 @@
1128	1286	}
1129	1287
1130	1288	self::maybe_update_form_builder_message( $message );
1131	1289
1132		- $all_templates = FrmForm::getAll( array( 'is_template' => 1 ), 'name' );
1133		- $has_fields = isset( $values['fields'] ) && ! empty( $values['fields'] );
	1290	+ $has_fields = ! empty( $values['fields'] ) && ! FrmSubmitHelper::only_contains_submit_field( $values['fields'] );
1134	1291
1135	1292	if ( defined( 'DOING_AJAX' ) ) {
1136	1293	wp_die();
1137		- } else {
1138		- require( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/edit.php' );
1139	1294	}
	1295	+
	1296	+ require FrmAppHelper::plugin_path() . '/classes/views/frm-forms/edit.php';
1140	1297	}
1141	1298
	1299	+ /**
	1300	+ * @param array $fields
	1301	+ * @return array
	1302	+ */
1142	1303	public static function update_form_builder_fields( $fields, $form ) {
1143	1304	foreach ( $fields as $field ) {
1144	1305	$field->do_not_include_icons = true;
1145	1306	}
		@@ -1151,13 +1312,21 @@
1151	1312	$message = __( 'Form was Successfully Copied', 'formidable' );
1152	1313	}
1153	1314	}
1154	1315
	1316	+ /**
	1317	+ * @param int|string $id
	1318	+ * @param array $errors
	1319	+ * @param array|string $args
	1320	+ * @return void
	1321	+ */
1155	1322	public static function get_settings_vars( $id, $errors = array(), $args = array() ) {
1156	1323	FrmAppHelper::permission_check( 'frm_edit_forms' );
1157	1324
1158	1325	global $frm_vars;
1159	1326
	1327	+ self::maybe_print_media_templates();
	1328	+
1160	1329	if ( ! is_array( $args ) ) {
1161	1330	// For reverse compatibility.
1162	1331	$args = array(
1163	1332	'message' => $args,
		@@ -1190,17 +1359,38 @@
1190	1359
1191	1360	$sections = self::get_settings_tabs( $values );
1192	1361	$current = FrmAppHelper::simple_get( 't', 'sanitize_title', 'advanced_settings' );
1193	1362
1194		- require( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings.php' );
	1363	+ require FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings.php';
1195	1364	}
1196	1365
1197	1366	/**
	1367	+ * Print WordPress media templates email actions does not trigger a "Uncaught Error: Template not found: #tmpl-media-selection" error when the media button is clicked.
	1368	+ *
	1369	+ * @since 6.10
	1370	+ *
	1371	+ * @return void
	1372	+ */
	1373	+ private static function maybe_print_media_templates() {
	1374	+ if ( FrmAppHelper::pro_is_included() ) {
	1375	+ // This issue does not exist when Pro is active so exit early.
	1376	+ return;
	1377	+ }
	1378	+
	1379	+ add_action(
	1380	+ 'wp_enqueue_editor',
	1381	+ function () {
	1382	+ wp_print_media_templates();
	1383	+ }
	1384	+ );
	1385	+ }
	1386	+
	1387	+ /**
1198	1388	* @since 4.0
1199	1389	*/
1200	1390	public static function form_publish_button( $atts ) {
1201	1391	$values = $atts['values'];
1202		- include( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/_publish_box.php' );
	1392	+ include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/_publish_box.php';
1203	1393	}
1204	1394
1205	1395	/**
1206	1396	* Get a list of all the settings tabs for the form settings page.
		@@ -1225,9 +1415,9 @@
1225	1415	'icon' => 'frm_icon_font frm_mail_bulk_icon',
1226	1416	),
1227	1417	'permissions' => array(
1228	1418	'name' => __( 'Form Permissions', 'formidable' ),
1229		- 'icon' => 'frm_icon_font frm_lock_icon',
	1419	+ 'icon' => 'frm_icon_font frm_lock_closed_icon',
1230	1420	'html_class' => 'frm_show_upgrade_tab frm_noallow',
1231	1421	'data' => array(
1232	1422	'medium' => 'permissions',
1233	1423	'upgrade' => __( 'Form Permissions', 'formidable' ),
		@@ -1234,9 +1424,9 @@
1234	1424	'message' => __( 'Allow editing, protect forms and files, limit entries, and save drafts. Upgrade to get form and entry permissions.', 'formidable' ),
1235	1425	'screenshot' => 'permissions.png',
1236	1426	),
1237	1427	),
1238		- 'scheduling' => array(
	1428	+ 'scheduling' => array(
1239	1429	'name' => __( 'Form Scheduling', 'formidable' ),
1240	1430	'icon' => 'frm_icon_font frm_calendar_icon',
1241	1431	'html_class' => 'frm_show_upgrade_tab frm_noallow',
1242	1432	'data' => array(
		@@ -1269,8 +1459,21 @@
1269	1459	'screenshot' => 'chat.png',
1270	1460	)
1271	1461	),
1272	1462	),
	1463	+ 'abandonment' => array(
	1464	+ 'name' => __( 'Form Abandonment', 'formidable' ),
	1465	+ 'icon' => 'frm_icon_font frm_abandoned_icon',
	1466	+ 'html_class' => 'frm_show_upgrade_tab frm_noallow',
	1467	+ 'data' => FrmAppHelper::get_upgrade_data_params(
	1468	+ 'abandonment',
	1469	+ array(
	1470	+ 'upgrade' => __( 'Form abandonment settings', 'formidable' ),
	1471	+ 'message' => __( 'Unlock the power of data capture to boost lead generation and master the art of form optimization.', 'formidable' ),
	1472	+ 'screenshot' => 'abandonment.png',
	1473	+ )
	1474	+ ),
	1475	+ ),
1273	1476	'html' => array(
1274	1477	'name' => __( 'Customize HTML', 'formidable' ),
1275	1478	'class' => __CLASS__,
1276	1479	'function' => 'html_settings',
		@@ -1277,9 +1480,13 @@
1277	1480	'icon' => 'frm_icon_font frm_code_icon',
1278	1481	),
1279	1482	);
1280	1483
1281		- foreach ( array( 'landing', 'chat' ) as $feature ) {
	1484	+ if ( ! has_action( 'frm_add_form_style_tab_options' ) && ! has_action( 'frm_add_form_button_options' ) ) {
	1485	+ unset( $sections['buttons'] );
	1486	+ }
	1487	+
	1488	+ foreach ( array( 'landing', 'chat', 'abandonment' ) as $feature ) {
1282	1489	if ( ! FrmAppHelper::show_new_feature( $feature ) ) {
1283	1490	unset( $sections[ $feature ] );
1284	1491	}
1285	1492	}
		@@ -1285,13 +1492,8 @@
1285	1492	}
1286	1493
1287	1494	$sections = apply_filters( 'frm_add_form_settings_section', $sections, $values );
1288	1495
1289		- if ( FrmAppHelper::pro_is_installed() && ! FrmAppHelper::meets_min_pro_version( '4.0' ) ) {
1290		- // Prevent settings from showing in 2 spots.
1291		- unset( $sections['permissions'], $sections['scheduling'] );
1292		- }
1293		-
1294	1496	foreach ( $sections as $key => $section ) {
1295	1497	$defaults = array(
1296	1498	'html_class' => '',
1297	1499	'name' => ucfirst( $key ),
		@@ -1313,9 +1515,9 @@
1313	1515	$section['id'] = $section['anchor'];
1314	1516	}
1315	1517
1316	1518	$sections[ $key ] = $section;
1317		- }
	1519	+ }//end foreach
1318	1520
1319	1521	return $sections;
1320	1522	}
1321	1523
		@@ -1322,8 +1524,9 @@
1322	1524	/**
1323	1525	* @since 4.0
1324	1526	*
1325	1527	* @param array $values
	1528	+ * @return void
1326	1529	*/
1327	1530	public static function advanced_settings( $values ) {
1328	1531	$first_h3 = 'frm_first_h3';
1329	1532
		@@ -1331,8 +1534,9 @@
1331	1534	}
1332	1535
1333	1536	/**
1334	1537	* @param array $values
	1538	+ * @return void
1335	1539	*/
1336	1540	public static function render_spam_settings( $values ) {
1337	1541	if ( function_exists( 'akismet_http_post' ) ) {
1338	1542	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/spam-settings/akismet.php';
		@@ -1344,16 +1548,12 @@
1344	1548	/**
1345	1549	* @since 4.0
1346	1550	*
1347	1551	* @param array $values
	1552	+ * @return void
1348	1553	*/
1349	1554	public static function buttons_settings( $values ) {
1350		- $styles = apply_filters( 'frm_get_style_opts', array() );
1351		-
1352		- $frm_settings = FrmAppHelper::get_settings();
1353		- $no_global_style = $frm_settings->load_style === 'none';
1354		-
1355		- include( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings-buttons.php' );
	1555	+ include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings-buttons.php';
1356	1556	}
1357	1557
1358	1558	/**
1359	1559	* @since 4.0
		@@ -1358,11 +1558,12 @@
1358	1558	/**
1359	1559	* @since 4.0
1360	1560	*
1361	1561	* @param array $values
	1562	+ * @return void
1362	1563	*/
1363	1564	public static function html_settings( $values ) {
1364		- include( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings-html.php' );
	1565	+ include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings-html.php';
1365	1566	}
1366	1567
1367	1568	/**
1368	1569	* Replace old Submit Button href with new href to avoid errors in Chrome
		@@ -1368,9 +1569,10 @@
1368	1569	* Replace old Submit Button href with new href to avoid errors in Chrome
1369	1570	*
1370	1571	* @since 2.03.08
1371	1572	*
1372		- * @param array|boolean $values
	1573	+ * @param array|bool $values
	1574	+ * @return void
1373	1575	*/
1374	1576	private static function clean_submit_html( &$values ) {
1375	1577	if ( is_array( $values ) && isset( $values['submit_html'] ) ) {
1376	1578	$values['submit_html'] = str_replace( 'javascript:void(0)', '#', $values['submit_html'] );
		@@ -1391,8 +1593,13 @@
1391	1593
1392	1594	return $classes;
1393	1595	}
1394	1596
	1597	+ /**
	1598	+ * @param int|string $form_id
	1599	+ * @param string $class
	1600	+ * @return void
	1601	+ */
1395	1602	public static function mb_tags_box( $form_id, $class = '' ) {
1396	1603	$fields = FrmField::get_all_for_form( $form_id, '', 'include' );
1397	1604
1398	1605	/**
		@@ -1405,9 +1612,9 @@
1405	1612	*/
1406	1613	$fields = apply_filters( 'frm_fields_in_tags_box', $fields, compact( 'form_id' ) );
1407	1614	$linked_forms = array();
1408	1615	$col = 'one';
1409		- $settings_tab = FrmAppHelper::is_admin_page( 'formidable' ) ? true : false;
	1616	+ $settings_tab = FrmAppHelper::is_admin_page( 'formidable' );
1410	1617
1411	1618	$cond_shortcodes = apply_filters( 'frm_conditional_shortcodes', array() );
1412	1619	$entry_shortcodes = self::get_shortcode_helpers( $settings_tab );
1413	1620
		@@ -1412,9 +1619,9 @@
1412	1619	$entry_shortcodes = self::get_shortcode_helpers( $settings_tab );
1413	1620
1414	1621	$advanced_helpers = self::advanced_helpers( compact( 'fields', 'form_id' ) );
1415	1622
1416		- include( FrmAppHelper::plugin_path() . '/classes/views/shared/mb_adv_info.php' );
	1623	+ include FrmAppHelper::plugin_path() . '/classes/views/shared/mb_adv_info.php';
1417	1624	}
1418	1625
1419	1626	/**
1420	1627	* @since 3.04.01
		@@ -1427,9 +1634,9 @@
1427	1634	),
1428	1635	);
1429	1636
1430	1637	$user_fields = self::user_shortcodes();
1431		- if ( ! empty( $user_fields ) ) {
	1638	+ if ( $user_fields ) {
1432	1639	$user_helpers = array();
1433	1640	foreach ( $user_fields as $uk => $uf ) {
1434	1641	$user_helpers[ '|user_id| show="' . $uk . '"' ] = $uf;
1435	1642	unset( $uk, $uf );
		@@ -1435,9 +1642,9 @@
1435	1642	unset( $uk, $uf );
1436	1643	}
1437	1644
1438	1645	$advanced_helpers['user_id'] = array(
1439		- 'codes' => $user_helpers,
	1646	+ 'codes' => $user_helpers,
1440	1647	);
1441	1648	}
1442	1649
1443	1650	/**
		@@ -1514,21 +1721,16 @@
1514	1721	'updated-at' => __( 'Entry updated', 'formidable' ),
1515	1722	'' => '',
1516	1723	'siteurl' => __( 'Site URL', 'formidable' ),
1517	1724	'sitename' => __( 'Site Name', 'formidable' ),
	1725	+ 'form_name' => __( 'Form Name', 'formidable' ),
1518	1726	);
1519	1727
	1728	+ $entry_shortcodes = array_merge( FrmShortcodeHelper::get_contextual_shortcode_values(), $entry_shortcodes );
1520	1729	if ( ! FrmAppHelper::pro_is_installed() ) {
1521	1730	unset( $entry_shortcodes['post_id'] );
1522	1731	}
1523	1732
1524		- if ( $settings_tab ) {
1525		- $entry_shortcodes['default-message'] = __( 'Default Msg', 'formidable' );
1526		- $entry_shortcodes['default-html'] = __( 'Default HTML', 'formidable' );
1527		- $entry_shortcodes['default-plain'] = __( 'Default Plain', 'formidable' );
1528		- $entry_shortcodes['form_name'] = __( 'Form Name', 'formidable' );
1529		- }
1530		-
1531	1733	/**
1532	1734	* Use this hook to add or remove buttons in the helpers section
1533	1735	* in the customization panel
1534	1736	*
		@@ -1554,9 +1756,9 @@
1554	1756	echo ' frm_js_validate ';
1555	1757	self::add_js_validate_form_to_global_vars( $form );
1556	1758	}
1557	1759
1558		- if ( ! FrmFormsHelper::should_use_pro_for_ajax_submit() && FrmForm::is_ajax_on( $form ) ) {
	1760	+ if ( FrmForm::is_ajax_on( $form ) ) {
1559	1761	echo ' frm_ajax_submit ';
1560	1762	}
1561	1763	}
1562	1764
		@@ -1578,11 +1780,11 @@
1578	1780	check_ajax_referer( 'frm_ajax', 'nonce' );
1579	1781
1580	1782	echo FrmEntriesController::show_entry_shortcode( // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
1581	1783	array(
1582		- 'form_id' => FrmAppHelper::get_post_param( 'form_id', '', 'absint' ),
	1784	+ 'form_id' => FrmAppHelper::get_post_param( 'form_id', '', 'absint' ), // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
1583	1785	'default_email' => true,
1584		- 'plain_text' => FrmAppHelper::get_post_param( 'plain_text', '', 'absint' ),
	1786	+ 'plain_text' => FrmAppHelper::get_post_param( 'plain_text', '', 'absint' ), // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
1585	1787	)
1586	1788	);
1587	1789	wp_die();
1588	1790	}
		@@ -1588,10 +1790,10 @@
1588	1790	}
1589	1791
1590	1792	/**
1591	1793	* @param string $content
1592		- * @param stdClass|string|int $form
1593		- * @param stdClass|string|int|false $entry
	1794	+ * @param int|stdClass|string $form
	1795	+ * @param false|int|stdClass|string $entry
1594	1796	* @return string
1595	1797	*/
1596	1798	public static function filter_content( $content, $form, $entry = false ) {
1597	1799	$content = self::replace_form_name_shortcodes( $content, $form );
		@@ -1604,8 +1806,16 @@
1604	1806	if ( is_object( $form ) ) {
1605	1807	$form = $form->id;
1606	1808	}
1607	1809
	1810	+ /*
	1811	+ * Repeater actions adds `parent_entry` to `$entry` store the parent entry data. If `parent_entry` is not empty,
	1812	+ * use the parent form ID instead of repeater form ID to fix the parent form field shortcodes doesn't work.
	1813	+ */
	1814	+ if ( ! empty( $entry->parent_entry ) ) {
	1815	+ $form = $entry->parent_entry->form_id;
	1816	+ }
	1817	+
1608	1818	$shortcodes = FrmFieldsHelper::get_shortcodes( $content, $form );
1609	1819	$content = apply_filters( 'frm_replace_content_shortcodes', $content, $entry, $shortcodes );
1610	1820
1611	1821	return $content;
		@@ -1615,11 +1825,11 @@
1615	1825	* Replace any [form_name] shortcodes in a string.
1616	1826	*
1617	1827	* @since 5.5
1618	1828	*
1619		- * @param string|array $string
1620		- * @param stdClass|string|int $form
1621		- * @return string|array
	1829	+ * @param array|string $string
	1830	+ * @param int|stdClass|string $form
	1831	+ * @return array|string
1622	1832	*/
1623	1833	public static function replace_form_name_shortcodes( $string, $form ) {
1624	1834	if ( ! is_string( $string ) ) {
1625	1835	return $string;
		@@ -1637,9 +1847,9 @@
1637	1847	return str_replace( '[form_name]', $form_name, $string );
1638	1848	}
1639	1849
1640	1850	/**
1641		- * @param stdClass|string|int|false $entry
	1851	+ * @param false|int|stdClass|string $entry
1642	1852	* @return void
1643	1853	*/
1644	1854	private static function get_entry_by_param( &$entry ) {
1645	1855	if ( ! $entry || ! is_object( $entry ) ) {
		@@ -1654,8 +1864,12 @@
1654	1864	public static function replace_content_shortcodes( $content, $entry, $shortcodes ) {
1655	1865	return FrmFieldsHelper::replace_content_shortcodes( $content, $entry, $shortcodes );
1656	1866	}
1657	1867
	1868	+ /**
	1869	+ * @param array $errors
	1870	+ * @return array
	1871	+ */
1658	1872	public static function process_bulk_form_actions( $errors ) {
1659	1873	if ( ! $_REQUEST ) {
1660	1874	return $errors;
1661	1875	}
		@@ -1699,9 +1913,9 @@
1699	1913	case 'untrash':
1700	1914	$message = self::bulk_untrash( $ids );
1701	1915	}
1702	1916
1703		- if ( isset( $message ) && ! empty( $message ) ) {
	1917	+ if ( ! empty( $message ) ) {
1704	1918	$errors['message'] = $message;
1705	1919	}
1706	1920
1707	1921	return $errors;
		@@ -1706,13 +1920,26 @@
1706	1920
1707	1921	return $errors;
1708	1922	}
1709	1923
	1924	+ /**
	1925	+ * Includes html that shows a message when the device is too small to use Formidable Forms admin pages.
	1926	+ *
	1927	+ * @since 6.20
	1928	+ * @return void
	1929	+ */
	1930	+ public static function include_device_too_small_message() {
	1931	+ if ( ! FrmAppHelper::is_formidable_admin() ) {
	1932	+ return;
	1933	+ }
	1934	+
	1935	+ include FrmAppHelper::plugin_path() . '/classes/views/shared/small-device-message.php';
	1936	+ }
	1937	+
1710	1938	public static function route() {
1711	1939	$action = isset( $_REQUEST['frm_action'] ) ? 'frm_action' : 'action';
1712	1940	$vars = array();
1713	1941	FrmAppHelper::include_svg();
1714		-
1715	1942	if ( isset( $_POST['frm_compact_fields'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
1716	1943	FrmAppHelper::permission_check( 'frm_edit_forms' );
1717	1944
1718	1945	// Javascript needs to be allowed in some field settings.
		@@ -1721,9 +1948,9 @@
1721	1948	$json_vars = json_decode( $json_vars, true );
1722	1949	if ( empty( $json_vars ) ) {
1723	1950	// json decoding failed so we should return an error message.
1724	1951	$action = FrmAppHelper::get_param( $action, '', 'get', 'sanitize_title' );
1725		- if ( 'edit' == $action ) {
	1952	+ if ( 'edit' === $action ) {
1726	1953	$action = 'update';
1727	1954	}
1728	1955
1729	1956	add_filter( 'frm_validate_form', 'FrmFormsController::json_error' );
		@@ -1739,16 +1966,14 @@
1739	1966	if ( isset( $_REQUEST['delete_all'] ) ) {
1740	1967	// Override the action for this page.
1741	1968	$action = 'delete_all';
1742	1969	}
1743		- }
	1970	+ }//end if
1744	1971
1745	1972	add_action( 'frm_load_form_hooks', 'FrmHooksController::trigger_load_form_hooks' );
1746	1973	FrmAppHelper::trigger_hook_load( 'form' );
1747	1974
1748	1975	switch ( $action ) {
1749		- case 'new':
1750		- return self::new_form( $vars );
1751	1976	case 'create':
1752	1977	case 'edit':
1753	1978	case 'update':
1754	1979	case 'trash':
		@@ -1753,16 +1978,17 @@
1753	1978	case 'update':
1754	1979	case 'trash':
1755	1980	case 'untrash':
1756	1981	case 'destroy':
1757		- case 'delete_all':
1758	1982	case 'settings':
1759	1983	case 'update_settings':
1760	1984	return self::$action( $vars );
1761	1985	case 'lite-reports':
1762		- return self::no_reports( $vars );
	1986	+ self::no_reports( $vars );
	1987	+ return;
1763	1988	case 'views':
1764		- return self::no_views( $vars );
	1989	+ self::no_views( $vars );
	1990	+ return;
1765	1991	default:
1766	1992	do_action( 'frm_form_action_' . $action );
1767	1993	if ( apply_filters( 'frm_form_stop_action_' . $action, false ) ) {
1768	1994	return;
		@@ -1785,14 +2011,47 @@
1785	2011	self::display_forms_list( array(), '', array( __( 'There was a problem duplicating the form', 'formidable' ) ) );
1786	2012	return;
1787	2013	}
1788	2014
	2015	+ if ( 'forms_permanently_deleted' === $message ) {
	2016	+ $count = FrmAppHelper::get_param( 'forms_deleted', 0, 'get', 'absint' );
	2017	+ /* translators: %1$s: Number of forms */
	2018	+ $message = sprintf( _n( '%1$s form permanently deleted.', '%1$s forms permanently deleted.', $count, 'formidable' ), $count );
	2019	+ self::display_forms_list( array(), $message, '' );
	2020	+ return;
	2021	+ }
	2022	+
1789	2023	self::display_forms_list();
1790	2024
1791	2025	return;
1792		- }
	2026	+ }//end switch
1793	2027	}
1794	2028
	2029	+ /**
	2030	+ * Rename a form.
	2031	+ *
	2032	+ * Handles the AJAX request for renaming a form.
	2033	+ *
	2034	+ * @since 6.7
	2035	+ *
	2036	+ * @return void
	2037	+ */
	2038	+ public static function rename_form() {
	2039	+ // Check permission and nonce
	2040	+ FrmAppHelper::permission_check( 'frm_edit_forms' );
	2041	+ check_ajax_referer( 'frm_ajax', 'nonce' );
	2042	+
	2043	+ // Get posted data
	2044	+ $form_id = FrmAppHelper::get_post_param( 'form_id', '', 'absint' );
	2045	+ $name = FrmAppHelper::get_post_param( 'form_name', '', 'sanitize_text_field' );
	2046	+
	2047	+ // Update the form name and form key.
	2048	+ $form_key = FrmAppHelper::get_unique_key( sanitize_title( $name ), 'frm_forms', 'form_key' );
	2049	+ FrmForm::update( $form_id, compact( 'name', 'form_key' ) );
	2050	+
	2051	+ wp_send_json_success( compact( 'form_key' ) );
	2052	+ }
	2053	+
1795	2054	public static function json_error( $errors ) {
1796	2055	$errors['json'] = __( 'Abnormal HTML characters prevented your form from saving correctly', 'formidable' );
1797	2056
1798	2057	return $errors;
		@@ -1798,20 +2057,13 @@
1798	2057	return $errors;
1799	2058	}
1800	2059
1801	2060	/**
1802		- * Education for premium features.
1803		- *
1804		- * @since 4.05
1805		- */
1806		- public static function add_form_style_tab_options() {
1807		- include( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/add_form_style_options.php' );
1808		- }
1809		-
1810		- /**
1811	2061	* Add education about views.
1812	2062	*
1813	2063	* @since 4.07
	2064	+ *
	2065	+ * @return void
1814	2066	*/
1815	2067	public static function no_views( $values = array() ) {
1816	2068	FrmAppHelper::include_svg();
1817	2069	$id = FrmAppHelper::get_param( 'form', '', 'get', 'absint' );
		@@ -1823,8 +2075,10 @@
1823	2075	/**
1824	2076	* Add education about reports.
1825	2077	*
1826	2078	* @since 4.07
	2079	+ *
	2080	+ * @return void
1827	2081	*/
1828	2082	public static function no_reports( $values = array() ) {
1829	2083	$id = FrmAppHelper::get_param( 'form', '', 'get', 'absint' );
1830	2084	$form = $id ? FrmForm::getOne( $id ) : false;
		@@ -1831,9 +2085,11 @@
1831	2085
1832	2086	include FrmAppHelper::plugin_path() . '/classes/views/shared/reports-info.php';
1833	2087	}
1834	2088
1835		- /* FRONT-END FORMS */
	2089	+ /**
	2090	+ * FRONT-END FORMS.
	2091	+ */
1836	2092	public static function admin_bar_css() {
1837	2093	if ( is_admin() || ! current_user_can( 'frm_edit_forms' ) ) {
1838	2094	return;
1839	2095	}
		@@ -1907,9 +2163,9 @@
1907	2163	$wp_admin_bar->add_node(
1908	2164	array(
1909	2165	'parent' => 'frm-forms',
1910	2166	'id' => 'edit_form_' . $form_id,
1911		- 'title' => empty( $name ) ? __( '(no title)', 'formidable' ) : $name,
	2167	+ 'title' => empty( $name ) ? FrmFormsHelper::get_no_title_text() : $name,
1912	2168	'href' => FrmForm::get_edit_link( $form_id ),
1913	2169	)
1914	2170	);
1915	2171	}
		@@ -1922,10 +2178,10 @@
1922	2178	* @return string
1923	2179	*/
1924	2180	public static function get_form_shortcode( $atts ) {
1925	2181	global $frm_vars;
1926		- if ( isset( $frm_vars['skip_shortcode'] ) && $frm_vars['skip_shortcode'] ) {
1927		- $sc = '[formidable';
	2182	+ if ( ! empty( $frm_vars['skip_shortcode'] ) ) {
	2183	+ $sc = '[formidable';
1928	2184	$sc .= FrmAppHelper::array_to_html_params( $atts );
1929	2185	return $sc . ']';
1930	2186	}
1931	2187
		@@ -1950,11 +2206,11 @@
1950	2206
1951	2207	/**
1952	2208	* @since 5.2.01
1953	2209	*
1954		- * @param string|int|false $id
1955		- * @param string|false $key
1956		- * @return stdClass|false
	2210	+ * @param false|int|string $id
	2211	+ * @param false|string $key
	2212	+ * @return false|stdClass
1957	2213	*/
1958	2214	private static function maybe_get_form_by_id_or_key( $id, $key ) {
1959	2215	if ( ! $id ) {
1960	2216	$id = $key;
		@@ -1962,12 +2218,12 @@
1962	2218	return self::maybe_get_form_to_show( $id );
1963	2219	}
1964	2220
1965	2221	/**
1966		- * @param string|int|false $id
1967		- * @param string|false $key
1968		- * @param string|int|bool $title may be 'auto', true, false, 'true', 'false', 'yes', '1', 1, '0', 0.
1969		- * @param string|int|bool $description may be 'auto', true, false, 'true', 'false', 'yes', '1', 1, '0', 0.
	2222	+ * @param false|int|string $id
	2223	+ * @param false|string $key
	2224	+ * @param bool|int|string $title may be 'auto', true, false, 'true', 'false', 'yes', '1', 1, '0', 0.
	2225	+ * @param bool|int|string $description may be 'auto', true, false, 'true', 'false', 'yes', '1', 1, '0', 0.
1970	2226	* @param array $atts
1971	2227	* @return string
1972	2228	*/
1973	2229	public static function show_form( $id = '', $key = '', $title = false, $description = false, $atts = array() ) {
		@@ -2015,15 +2271,16 @@
2015	2271	return $form;
2016	2272	}
2017	2273
2018	2274	/**
2019		- * @param string|int|false $id
2020		- * @return stdClass|false
	2275	+ * @param false|int|string $id
	2276	+ * @return false|stdClass
2021	2277	*/
2022	2278	private static function maybe_get_form_to_show( $id ) {
2023	2279	$form = false;
2024	2280
2025		- if ( ! empty( $id ) ) { // form id or key is set
	2281	+ if ( ! empty( $id ) ) {
	2282	+ // Form id or key is set.
2026	2283	$form = FrmForm::getOne( $id );
2027	2284	if ( ! $form || $form->parent_form_id || $form->status === 'trash' ) {
2028	2285	$form = false;
2029	2286	}
		@@ -2081,11 +2338,11 @@
2081	2338
2082	2339	do_action( 'frm_validate_form_creation', $params, $fields, $form, $title, $description );
2083	2340
2084	2341	if ( apply_filters( 'frm_continue_to_create', true, $form->id ) ) {
2085		- $entry_id = self::just_created_entry( $form->id );
2086		- $pass_args['entry_id'] = $entry_id;
2087		- $pass_args['reset'] = true;
	2342	+ $entry_id = self::just_created_entry( $form->id );
	2343	+ $pass_args['entry_id'] = $entry_id;
	2344	+ $pass_args['reset'] = true;
2088	2345
2089	2346	self::run_on_submit_actions( $pass_args );
2090	2347
2091	2348	do_action(
		@@ -2095,9 +2352,9 @@
2095	2352	'form' => $form,
2096	2353	)
2097	2354	);
2098	2355	}
2099		- }
	2356	+ }//end if
2100	2357	}
2101	2358
2102	2359	/**
2103	2360	* If the form was processed earlier (init), get the generated errors
		@@ -2129,9 +2386,9 @@
2129	2386	*/
2130	2387	public static function just_created_entry( $form_id ) {
2131	2388	global $frm_vars;
2132	2389
2133		- 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;
	2390	+ 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;
2134	2391	}
2135	2392
2136	2393	/**
2137	2394	* Gets confirmation method.
		@@ -2144,14 +2401,14 @@
2144	2401	*
2145	2402	* @type object $form Form object.
2146	2403	* @type int $entry_id Entry ID.
2147	2404	* }
2148		- * @return string|array
	2405	+ * @return array|string
2149	2406	*/
2150	2407	private static function get_confirmation_method( $atts ) {
2151	2408	$action = FrmOnSubmitHelper::current_event( $atts );
2152	2409	$opt = 'update' === $action ? 'edit_action' : 'success_action';
2153		- $method = ( isset( $atts['form']->options[ $opt ] ) && ! empty( $atts['form']->options[ $opt ] ) ) ? $atts['form']->options[ $opt ] : 'message';
	2410	+ $method = ! empty( $atts['form']->options[ $opt ] ) ? $atts['form']->options[ $opt ] : 'message';
2154	2411
2155	2412	if ( ! empty( $atts['entry_id'] ) ) {
2156	2413	$met_actions = self::get_met_on_submit_actions( $atts, $action );
2157	2414	if ( $met_actions ) {
		@@ -2160,9 +2417,9 @@
2160	2417	}
2161	2418
2162	2419	$method = apply_filters( 'frm_success_filter', $method, $atts['form'], $action );
2163	2420
2164		- if ( $method != 'message' && ( ! $atts['entry_id'] || ! is_numeric( $atts['entry_id'] ) ) ) {
	2421	+ if ( $method !== 'message' && ( ! $atts['entry_id'] || ! is_numeric( $atts['entry_id'] ) ) ) {
2165	2422	$method = 'message';
2166	2423	}
2167	2424
2168	2425	return $method;
		@@ -2196,9 +2453,9 @@
2196	2453	* @param array $args See {@see FrmFormsController::maybe_trigger_redirect()}.
2197	2454	*/
2198	2455	public static function maybe_trigger_redirect_with_action( $conf_method, $form, $params, $args ) {
2199	2456	if ( is_array( $conf_method ) && 1 === count( $conf_method ) ) {
2200		- if ( 'redirect' === FrmOnSubmitHelper::get_action_type( $conf_method[0] ) ) {
	2457	+ if ( 'redirect' === FrmOnSubmitHelper::get_action_type( $conf_method[0] ) && empty( $conf_method[0]->post_content['redirect_delay'] ) ) {
2201	2458	$event = FrmOnSubmitHelper::current_event( $params );
2202	2459	FrmOnSubmitHelper::populate_on_submit_data( $form->options, $conf_method[0], $event );
2203	2460	$conf_method = 'redirect';
2204	2461	}
		@@ -2247,9 +2504,9 @@
2247	2504	unset( $extra_args['form'] );
2248	2505
2249	2506	do_action( 'frm_success_action', $args['conf_method'], $args['form'], $args['form']->options, $args['entry_id'], $extra_args );
2250	2507
2251		- $opt = ( ! isset( $args['action'] ) || $args['action'] === 'create' ) ? 'success' : 'edit';
	2508	+ $opt = ! isset( $args['action'] ) || $args['action'] === 'create' ? 'success' : 'edit';
2252	2509
2253	2510	$args['success_opt'] = $opt;
2254	2511	$args['ajax'] = ! empty( $frm_vars['ajax'] );
2255	2512
		@@ -2275,16 +2532,16 @@
2275	2532	if ( ! FrmOnSubmitHelper::form_has_migrated( $args['form'] ) ) {
2276	2533	return array();
2277	2534	}
2278	2535
2279		- // If a redirect action has already opened the URL in a new tab, we show the default message in the currect tab.
	2536	+ // If a redirect action has already opened the URL in a new tab, we show the default message in the current tab.
2280	2537	if ( ! empty( self::$redirected_in_new_tab[ $args['form']->id ] ) ) {
2281	2538	return array( FrmOnSubmitHelper::get_fallback_action_after_open_in_new_tab( $event ) );
2282	2539	}
2283	2540
2284		- $entry = FrmEntry::getOne( $args['entry_id'], true );
2285		- $actions = FrmOnSubmitHelper::get_actions( $args['form']->id );
2286		- $met_actions = array();
	2541	+ $entry = FrmEntry::getOne( $args['entry_id'], true );
	2542	+ $actions = FrmOnSubmitHelper::get_actions( $args['form']->id );
	2543	+ $met_actions = array();
2287	2544	$has_redirect = false;
2288	2545
2289	2546	foreach ( $actions as $action ) {
2290	2547	if ( ! in_array( $event, $action->post_content['event'], true ) ) {
		@@ -2297,9 +2554,10 @@
2297	2554
2298	2555	$action_type = FrmOnSubmitHelper::get_action_type( $action );
2299	2556
2300	2557	if ( 'redirect' === $action_type ) {
2301		- if ( $has_redirect ) { // Do not process because we run the first redirect action only.
	2558	+ if ( $has_redirect ) {
	2559	+ // Do not process because we run the first redirect action only.
2302	2560	continue;
2303	2561	}
2304	2562	}
2305	2563
		@@ -2312,9 +2570,9 @@
2312	2570	}
2313	2571
2314	2572	$met_actions[] = $action;
2315	2573	unset( $action );
2316		- }
	2574	+ }//end foreach
2317	2575
2318	2576	$args['event'] = $event;
2319	2577
2320	2578	/**
		@@ -2503,9 +2761,9 @@
2503	2761	add_filter( 'the_content', 'FrmFormsController::preview_content', 9999 );
2504	2762	}
2505	2763
2506	2764	$post = $old_post;
2507		- }
	2765	+ }//end if
2508	2766	}
2509	2767
2510	2768	/**
2511	2769	* @since 3.0
		@@ -2526,14 +2784,16 @@
2526	2784	$success_url = apply_filters( 'frm_redirect_url', $success_url, $args['form'], $args );
2527	2785
2528	2786	$doing_ajax = FrmAppHelper::doing_ajax();
2529	2787
2530		- if ( ! empty( $args['ajax'] ) && $doing_ajax && empty( $args['force_delay_redirect'] ) ) { // Is AJAX submit and there is just one Redirect action runs.
	2788	+ if ( ! empty( $args['ajax'] ) && $doing_ajax && empty( $args['force_delay_redirect'] ) ) {
	2789	+ // Is AJAX submit and there is just one Redirect action runs.
2531	2790	echo json_encode( self::get_ajax_redirect_response_data( $args + compact( 'success_url' ) ) );
2532	2791	wp_die();
2533	2792	}
2534	2793
2535		- if ( ! headers_sent() && empty( $args['force_delay_redirect'] ) ) { // Not AJAX submit, no headers sent, and there is just one Redirect action runs.
	2794	+ if ( ! headers_sent() && empty( $args['force_delay_redirect'] ) && empty( $args['form']->options['redirect_delay'] ) ) {
	2795	+ // Not AJAX submit, no headers sent, and there is just one Redirect action runs.
2536	2796	if ( ! empty( $args['form']->options['open_in_new_tab'] ) ) {
2537	2797	self::print_open_in_new_tab_js_with_fallback_handler( $success_url, $args );
2538	2798	self::$redirected_in_new_tab[ $args['form']->id ] = 1;
2539	2799	return;
		@@ -2539,9 +2799,10 @@
2539	2799	return;
2540	2800	}
2541	2801
2542	2802	wp_redirect( esc_url_raw( $success_url ) );
2543		- die(); // do not use wp_die or redirect fails
	2803	+ // Do not use wp_die or redirect fails.
	2804	+ die();
2544	2805	}
2545	2806
2546	2807	// Redirect with a delay.
2547	2808	self::redirect_after_submit_using_js( $args + compact( 'success_url', 'doing_ajax' ) );
		@@ -2549,9 +2810,9 @@
2549	2810
2550	2811	/**
2551	2812	* Prints open in new tab js with fallback handler.
2552	2813	*
2553		- * @since 6.x
	2814	+ * @since 6.3.1
2554	2815	*
2555	2816	* @param string $success_url Success URL.
2556	2817	* @param array $args See {@see FrmFormsController::redirect_after_submit()}.
2557	2818	*/
		@@ -2570,34 +2831,52 @@
2570	2831
2571	2832	/**
2572	2833	* Gets response data for redirect action when AJAX submitting.
2573	2834	*
2574		- * @since 6.x
	2835	+ * @since 6.3.1
2575	2836	*
2576	2837	* @param array $args See {@see FrmFormsController::run_success_action()}.
2577	2838	* @return array
2578	2839	*/
2579	2840	private static function get_ajax_redirect_response_data( $args ) {
2580		- $response_data = array( 'redirect' => $args['success_url'] );
	2841	+ $response_data = array(
	2842	+ 'redirect' => $args['success_url'],
	2843	+ 'content' => '',
	2844	+ );
	2845	+ $unset_content = true;
2581	2846
	2847	+ if ( ! empty( $args['form']->options['redirect_delay'] ) ) {
	2848	+ $response_data['delay'] = $args['form']->options['redirect_delay_time'];
	2849	+ $response_data['content'] .= self::get_redirect_message( $args['success_url'], $args['form']->options['redirect_delay_msg'], $args );
	2850	+ $unset_content = false;
	2851	+ }
	2852	+
2582	2853	if ( ! empty( $args['form']->options['open_in_new_tab'] ) ) {
2583	2854	$response_data['openInNewTab'] = 1;
2584	2855
2585		- $args['message'] = FrmOnSubmitHelper::get_default_new_tab_msg();
	2856	+ // Only show open in new tab text if there is no delay.
	2857	+ if ( empty( $response_data['content'] ) ) {
	2858	+ $args['message'] = FrmOnSubmitHelper::get_default_new_tab_msg();
2586	2859
2587		- $args['form']->options['success_msg'] = $args['message'];
2588		- $args['form']->options['edit_msg'] = $args['message'];
2589		- if ( ! isset( $args['fields'] ) ) {
2590		- $args['fields'] = FrmField::get_all_for_form( $args['form']->id );
2591		- }
	2860	+ $args['form']->options['success_msg'] = $args['message'];
	2861	+ $args['form']->options['edit_msg'] = $args['message'];
	2862	+ if ( ! isset( $args['fields'] ) ) {
	2863	+ $args['fields'] = FrmField::get_all_for_form( $args['form']->id );
	2864	+ }
2592	2865
2593		- $args['message'] = self::prepare_submit_message( $args['form'], $args['entry_id'], $args );
	2866	+ $args['message'] = self::prepare_submit_message( $args['form'], $args['entry_id'], $args );
2594	2867
2595		- ob_start();
2596		- self::show_lone_success_messsage( $args );
2597		- $response_data['content'] = ob_get_clean();
	2868	+ ob_start();
	2869	+ self::show_lone_success_message( $args );
	2870	+ $response_data['content'] .= ob_get_clean();
	2871	+ $unset_content = false;
	2872	+ }//end if
2598	2873
2599	2874	$response_data['fallbackMsg'] = self::get_redirect_fallback_message( $args['success_url'], $args );
	2875	+ }//end if
	2876	+
	2877	+ if ( $unset_content && '' === $response_data['content'] ) {
	2878	+ unset( $response_data['content'] );
2600	2879	}
2601	2880
2602	2881	return $response_data;
2603	2882	}
		@@ -2609,9 +2888,9 @@
2609	2888	*
2610	2889	* @param array $args See {@see FrmFormsController::run_success_action()}.
2611	2890	*/
2612	2891	private static function redirect_after_submit_using_js( $args ) {
2613		- $success_msg = FrmOnSubmitHelper::get_default_redirect_msg();
	2892	+ $success_msg = $args['form']->options['redirect_delay_msg'];
2614	2893	$redirect_msg = self::get_redirect_message( $args['success_url'], $success_msg, $args );
2615	2894	$success_url = esc_url_raw( $args['success_url'] );
2616	2895
2617	2896	/**
		@@ -2618,11 +2897,11 @@
2618	2897	* Filters the delay time before redirecting when On Submit Redirect action is delayed.
2619	2898	*
2620	2899	* @since 6.0
2621	2900	*
2622		- * @param int $delay_time Delay time in miliseconds.
	2901	+ * @param int $delay_time Delay time in milliseconds.
2623	2902	*/
2624		- $delay_time = apply_filters( 'frm_redirect_delay_time', 8000 );
	2903	+ $delay_time = apply_filters( 'frm_redirect_delay_time', 1000 * $args['form']->options['redirect_delay_time'] );
2625	2904
2626	2905	if ( ! empty( $args['form']->options['open_in_new_tab'] ) ) {
2627	2906	$redirect_js = 'window.open("' . $success_url . '", "_blank")';
2628	2907	} else {
		@@ -2632,9 +2911,10 @@
2632	2911	add_filter( 'frm_use_wpautop', '__return_true' );
2633	2912
2634	2913	echo FrmAppHelper::maybe_kses( $redirect_msg ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
2635	2914	echo '<script>';
2636		- if ( empty( $args['doing_ajax'] ) ) { // Not AJAX submit, delay JS until window.load.
	2915	+ if ( empty( $args['doing_ajax'] ) ) {
	2916	+ // Not AJAX submit, delay JS until window.load.
2637	2917	echo 'window.onload=function(){';
2638	2918	}
2639	2919	echo 'setTimeout(function(){' . $redirect_js . '}, ' . intval( $delay_time ) . ');'; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
2640	2920	if ( empty( $args['doing_ajax'] ) ) {
		@@ -2647,11 +2927,13 @@
2647	2927	* @since 3.0
2648	2928	*
2649	2929	* @param string $success_url
2650	2930	* @param string $success_msg
2651		- * @param array $args
	2931	+ * @param array $args
2652	2932	*/
2653	2933	private static function get_redirect_message( $success_url, $success_msg, $args ) {
	2934	+ $success_msg = apply_filters( 'frm_content', $success_msg, $args['form'], $args['entry_id'] );
	2935	+ $success_msg = do_shortcode( FrmAppHelper::use_wpautop( $success_msg ) );
2654	2936	$redirect_msg = '<div class="' . esc_attr( FrmFormsHelper::get_form_style_class( $args['form'] ) ) . '"><div class="frm-redirect-msg" role="status">' . $success_msg . '<br/>' .
2655	2937	self::get_redirect_fallback_message( $success_url, $args ) .
2656	2938	'</div></div>';
2657	2939
		@@ -2666,9 +2948,9 @@
2666	2948
2667	2949	/**
2668	2950	* Gets fallback message when redirecting failed.
2669	2951	*
2670		- * @since 6.x
	2952	+ * @since 6.3.1
2671	2953	*
2672	2954	* @param string $success_url Redirect URL.
2673	2955	* @param array $args Contains `form` object.
2674	2956	* @return string
		@@ -2707,9 +2989,9 @@
2707	2989	} else {
2708	2990	self::show_form_after_submit( $atts );
2709	2991	}
2710	2992	} else {
2711		- self::show_lone_success_messsage( $atts );
	2993	+ self::show_lone_success_message( $atts );
2712	2994	}
2713	2995	}
2714	2996
2715	2997	/**
		@@ -2748,11 +3030,10 @@
2748	3030	include FrmAppHelper::plugin_path() . '/classes/views/frm-entries/new.php';
2749	3031	}
2750	3032
2751	3033	/**
	3034	+ * @since 4.05.02
2752	3035	* @return string - 'before', 'after', or 'submit'
2753		- *
2754		- * @since 4.05.02
2755	3036	*/
2756	3037	private static function message_placement( $form, $message ) {
2757	3038	$place = 'before';
2758	3039
		@@ -2764,11 +3045,10 @@
2764	3045	}
2765	3046	}
2766	3047
2767	3048	/**
	3049	+ * @since 4.05.02
2768	3050	* @return string - 'before' or 'after'
2769		- *
2770		- * @since 4.05.02
2771	3051	*/
2772	3052	return apply_filters( 'frm_message_placement', $place, compact( 'form', 'message' ) );
2773	3053	}
2774	3054
		@@ -2802,9 +3082,9 @@
2802	3082	* Show the success message without the form
2803	3083	*
2804	3084	* @since 2.05
2805	3085	*/
2806		- private static function show_lone_success_messsage( $atts ) {
	3086	+ private static function show_lone_success_message( $atts ) {
2807	3087	global $frm_vars;
2808	3088	$values = FrmEntriesHelper::setup_new_vars( $atts['fields'], $atts['form'], true );
2809	3089	self::maybe_load_css( $atts['form'], $values['custom_style'], $frm_vars['load_css'] );
2810	3090
		@@ -2813,9 +3093,9 @@
2813	3093	$errors = array();
2814	3094	$form = $atts['form'];
2815	3095	$message = $atts['message'];
2816	3096
2817		- include( FrmAppHelper::plugin_path() . '/classes/views/frm-entries/errors.php' );
	3097	+ include FrmAppHelper::plugin_path() . '/classes/views/frm-entries/errors.php';
2818	3098	}
2819	3099
2820	3100	/**
2821	3101	* Prepare the success message before it's shown
		@@ -2935,9 +3215,9 @@
2935	3215	global $frm_vars;
2936	3216
2937	3217	FrmStylesController::enqueue_css();
2938	3218
2939		- if ( ! FrmAppHelper::is_admin() && $location != 'header' && ! empty( $frm_vars['forms_loaded'] ) ) {
	3219	+ if ( ! FrmAppHelper::is_admin() && $location !== 'header' && ! empty( $frm_vars['forms_loaded'] ) ) {
2940	3220	// load formidable js
2941	3221	wp_enqueue_script( 'formidable' );
2942	3222	}
2943	3223	}
		@@ -2953,12 +3233,12 @@
2953	3233	}
2954	3234
2955	3235	/**
2956	3236	* @since 2.0.8
2957		- * @return boolean
	3237	+ * @return bool
2958	3238	*/
2959	3239	private static function is_minification_on( $atts ) {
2960		- return isset( $atts['minimize'] ) && ! empty( $atts['minimize'] );
	3240	+ return ! empty( $atts['minimize'] );
2961	3241	}
2962	3242
2963	3243	/**
2964	3244	* @since 5.0.16
		@@ -2986,9 +3266,9 @@
2986	3266	* Create a page with an embedded formidable Gutenberg block.
2987	3267	*
2988	3268	* @since 5.2
2989	3269	*
2990		- * @return never
	3270	+ * @return void
2991	3271	*/
2992	3272	public static function create_page_with_shortcode() {
2993	3273	if ( ! current_user_can( 'publish_posts' ) ) {
2994	3274	die( 0 );
		@@ -3033,10 +3313,9 @@
3033	3313
3034	3314	/**
3035	3315	* @since 5.3
3036	3316	*
3037		- * @param string $content
3038		- * @param int $form_id
	3317	+ * @param int $form_id
3039	3318	* @return string
3040	3319	*/
3041	3320	private static function get_page_shortcode_content_for_form( $form_id ) {
3042	3321	$shortcode = '[formidable id="' . $form_id . '"]';
		@@ -3047,9 +3326,9 @@
3047	3326
3048	3327	/**
3049	3328	* Get page dropdown for AJAX request for embedding form in an existing page.
3050	3329	*
3051		- * @return never
	3330	+ * @return void
3052	3331	*/
3053	3332	public static function get_page_dropdown() {
3054	3333	if ( ! current_user_can( 'publish_posts' ) ) {
3055	3334	die( 0 );
		@@ -3057,9 +3336,9 @@
3057	3336
3058	3337	check_ajax_referer( 'frm_ajax', 'nonce' );
3059	3338
3060	3339	$html = FrmAppHelper::clip(
3061		- function() {
	3340	+ function () {
3062	3341	FrmAppHelper::maybe_autocomplete_pages_options(
3063	3342	array(
3064	3343	'field_name' => 'frm_page_dropdown',
3065	3344	'page_id' => '',
		@@ -3079,15 +3358,8 @@
3079	3358
3080	3359	/**
3081	3360	* @deprecated 4.0
3082	3361	*/
3083		- public static function new_form( $values = array() ) {
3084		- FrmDeprecated::new_form( $values );
3085		- }
3086		-
3087		- /**
3088		- * @deprecated 4.0
3089		- */
3090	3362	public static function create( $values = array() ) {
3091	3363	_deprecated_function( __METHOD__, '4.0', 'FrmFormsController::update' );
3092	3364	self::update( $values );
3093	3365	}
		@@ -3092,35 +3364,16 @@
3092	3364	self::update( $values );
3093	3365	}
3094	3366
3095	3367	/**
3096		- * @deprecated 3.0
3097		- * @codeCoverageIgnore
	3368	+ * Education for premium features.
	3369	+ *
	3370	+ * @since 4.05
	3371	+ * @deprecated 6.16.3
	3372	+ *
	3373	+ * @return void
3098	3374	*/
3099		- public static function bulk_create_template( $ids ) {
3100		- return FrmDeprecated::bulk_create_template( $ids );
3101		- }
3102		-
3103		- /**
3104		- * @deprecated 3.0
3105		- * @codeCoverageIgnore
3106		- */
3107		- public static function edit_key() {
3108		- FrmDeprecated::edit_key();
3109		- }
3110		-
3111		- /**
3112		- * @deprecated 3.0
3113		- * @codeCoverageIgnore
3114		- */
3115		- public static function edit_description() {
3116		- FrmDeprecated::edit_description();
3117		- }
3118		-
3119		- /**
3120		- * @deprecated 4.08
3121		- * @since 3.06
3122		- */
3123		- public static function add_new() {
3124		- _deprecated_function( __FUNCTION__, '4.08' );
	3375	+ public static function add_form_style_tab_options() {
	3376	+ _deprecated_function( __METHOD__, '6.16.3' );
	3377	+ include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/add_form_style_options.php';
3125	3378	}
3126	3379	}