← All changes | classes/controllers/FrmFormsController.php +658 -426 6.5.3 → 6.24 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,12 +64,12 @@
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		- FrmAppHelper::icon_by_class( 'frmfont frm_arrowdown6_icon', array( 'aria-hidden' => 'true' ) );
	71	+ FrmAppHelper::icon_by_class( 'frmfont frm_arrowdown8_icon', array( 'aria-hidden' => 'true' ) );
62	72	echo '</a>';
63	73	}
64	74
65	75	/**
		@@ -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 );
		@@ -420,13 +537,16 @@
420	537
421	538	/**
422	539	* Not every theme supports get_template_part( 'page' ).
423	540	* When this is not supported, false is returned, and we can handle a fallback.
	541	+ *
	542	+ * @return void
424	543	*/
425	544	private static function fallback_when_page_template_part_is_not_supported_by_theme() {
426	545	if ( have_posts() ) {
427	546	the_post();
428		- get_header( '' );
	547	+ self::get_template( 'header' );
	548	+
429	549	// add some generic class names to the container to add some natural padding to the content.
430	550	// .entry-content catches the WordPress TwentyTwenty theme.
431	551	// .container catches Customizr content.
432	552	echo '<div class="container entry-content">';
		@@ -431,13 +551,58 @@
431	551	// .container catches Customizr content.
432	552	echo '<div class="container entry-content">';
433	553	the_content();
434	554	echo '</div>';
435		- get_footer();
	555	+
	556	+ // Prevent extra unexpected forms in the footer.
	557	+ // For some reason this happens in the Twenty Twenty Five theme.
	558	+ add_filter( 'frm_filter_final_form', '__return_empty_string' );
	559	+
	560	+ self::get_template( 'footer' );
436	561	}
437	562	}
438	563
439	564	/**
	565	+ * Calls core function to get a template part if it doesn't cause deprecation warnings. Otherwise skips the deprecation function call
	566	+ * and renders required html fragments calling required functions.
	567	+ *
	568	+ * @since 6.7.1
	569	+ * @param string $template
	570	+ * @return void
	571	+ */
	572	+ private static function get_template( $template ) {
	573	+ if ( self::should_try_getting_template( $template ) ) {
	574	+ call_user_func( 'get_' . $template );
	575	+ return;
	576	+ }
	577	+
	578	+ if ( 'header' === $template ) {
	579	+ include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/preview/header.php';
	580	+ return;
	581	+ }
	582	+
	583	+ if ( 'footer' === $template ) {
	584	+ include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/preview/footer.php';
	585	+ }
	586	+ }
	587	+
	588	+ /**
	589	+ * Returns true if calling a template function doesn't trigger deprecation warnings.
	590	+ *
	591	+ * @since 6.7.1
	592	+ * @param string $template
	593	+ * @return bool
	594	+ */
	595	+ private static function should_try_getting_template( $template ) {
	596	+ $stylesheet_path = get_stylesheet_directory();
	597	+ $template_path = get_template_directory();
	598	+ $is_child_theme = $stylesheet_path !== $template_path;
	599	+ $template_name = $template . '.php';
	600	+
	601	+ return file_exists( $stylesheet_path . '/' . $template_name ) || $is_child_theme && file_exists( $template_path . '/' . $template_name );
	602	+ }
	603	+
	604	+ /**
440	605	* Set the page title for the theme preview page
441	606	*
442	607	* @since 3.0
443	608	*/
		@@ -449,11 +614,14 @@
449	614	return $title;
450	615	}
451	616
452	617	/**
453		- * Set the page title for the theme preview page
	618	+ * Set the page title for the theme preview page.
454	619	*
455	620	* @since 3.0
	621	+ *
	622	+ * @param string $title
	623	+ * @return string
456	624	*/
457	625	public static function preview_title( $title ) {
458	626	return __( 'Form Preview', 'formidable' );
459	627	}
		@@ -458,15 +626,20 @@
458	626	return __( 'Form Preview', 'formidable' );
459	627	}
460	628
461	629	/**
462		- * Set the page content for the theme preview page
	630	+ * Set the page content for the theme preview page.
463	631	*
464	632	* @since 3.0
	633	+ *
	634	+ * @param string $content
	635	+ * @return string
465	636	*/
466	637	public static function preview_content( $content ) {
467	638	if ( in_the_loop() ) {
468		- $content = self::show_page_preview();
	639	+ self::show_page_preview();
	640	+ // Clear the content for the page we're using.
	641	+ $content = '';
469	642	}
470	643
471	644	return $content;
472	645	}
		@@ -474,23 +647,88 @@
474	647	/**
475	648	* @since 3.0
476	649	*/
477	650	private static function load_direct_preview() {
478		- header( 'Content-Type: text/html; charset=' . get_option( 'blog_charset' ) );
479		-
480	651	$key = FrmAppHelper::simple_get( 'form', 'sanitize_title' );
481	652	if ( $key == '' ) {
482	653	$key = FrmAppHelper::get_post_param( 'form', '', 'sanitize_title' );
483	654	}
484	655
	656	+ if ( ! $key ) {
	657	+ $error = __( 'Form key is missing', 'formidable' );
	658	+ wp_die(
	659	+ '<h1>' . esc_html( $error ) . '</h1>',
	660	+ '<p>' . esc_html( $error ) . '</p>',
	661	+ 404
	662	+ );
	663	+ }
	664	+
	665	+ self::maybe_block_preview( $key );
	666	+
485	667	$form = FrmForm::getAll( array( 'form_key' => $key ), '', 1 );
486		- if ( empty( $form ) ) {
487		- $form = FrmForm::getAll( array(), '', 1 );
	668	+ if ( ! $form ) {
	669	+ $error = __( 'Form does not exist', 'formidable' );
	670	+ wp_die(
	671	+ '<h1>' . esc_html( $error ) . '</h1>',
	672	+ '<p>' . esc_html( $error ) . '</p>',
	673	+ 404
	674	+ );
488	675	}
489	676
490		- require( FrmAppHelper::plugin_path() . '/classes/views/frm-entries/direct.php' );
	677	+ header( 'Content-Type: text/html; charset=' . get_option( 'blog_charset' ) );
	678	+
	679	+ self::fix_deprecated_null_param_warning();
	680	+
	681	+ require FrmAppHelper::plugin_path() . '/classes/views/frm-entries/direct.php';
491	682	}
492	683
	684	+ /**
	685	+ * Block the form preview for the contact form by default if the user cannot view forms.
	686	+ * This is to prevent the contact form being exploited.
	687	+ * Since this form is added by default and every site uses the same key, it is too easy
	688	+ * to guess this form.
	689	+ *
	690	+ * @since 6.20
	691	+ *
	692	+ * @param string $form_key Form key.
	693	+ * @return void
	694	+ */
	695	+ public static function maybe_block_preview( $form_key ) {
	696	+ if ( FrmFormsHelper::should_block_preview( $form_key ) ) {
	697	+ $error = __( 'You do not have permission to view this form', 'formidable' );
	698	+ wp_die(
	699	+ '<h1>' . esc_html( $error ) . '</h1>',
	700	+ '<p>' . esc_html( $error ) . '</p>',
	701	+ 403
	702	+ );
	703	+ }
	704	+ }
	705	+
	706	+ /**
	707	+ * Some themes have a null $src value.
	708	+ * This function adds a filter to ensure that $src is not null.
	709	+ * WP will call str_starts_with with the null value triggering a deprecated message otherwise.
	710	+ *
	711	+ * @since 6.10
	712	+ *
	713	+ * @return void
	714	+ */
	715	+ private static function fix_deprecated_null_param_warning() {
	716	+ add_filter(
	717	+ 'script_loader_src',
	718	+ /**
	719	+ * @param string|null $src
	720	+ * @return string
	721	+ */
	722	+ function ( $src ) {
	723	+ if ( is_null( $src ) ) {
	724	+ $src = '';
	725	+ }
	726	+ return $src;
	727	+ }
	728	+ );
	729	+ }
	730	+
493	731	public static function untrash() {
494	732	self::change_form_status( 'untrash' );
495	733	}
496	734
		@@ -553,14 +791,14 @@
553	791	FrmAppHelper::permission_check( $available_status[ $status ]['permission'] );
554	792
555	793	$params = FrmForm::list_page_params();
556	794
557		- //check nonce url
	795	+ // Check nonce url.
558	796	check_admin_referer( $status . '_form_' . $params['id'] );
559	797
560	798	$count = 0;
561	799	if ( FrmForm::set_status( $params['id'], $available_status[ $status ]['new_status'] ) ) {
562		- $count ++;
	800	+ ++$count;
563	801	}
564	802
565	803	$form_type = FrmAppHelper::get_simple_request(
566	804	array(
		@@ -572,9 +810,9 @@
572	810	/* translators: %1$s: Number of forms */
573	811	$available_status['untrash']['message'] = sprintf( _n( '%1$s form restored from the Trash.', '%1$s forms restored from the Trash.', $count, 'formidable' ), $count );
574	812
575	813	/* translators: %1$s: Number of forms, %2$s: Start link HTML, %3$s: End link HTML */
576		- $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>' );
	814	+ $available_status['trash']['message'] = sprintf( _n( '%1$s form moved to the Trash. %2$sUndo%3$s', '%1$s forms moved to the Trash. %2$sUndo%3$s', $count, 'formidable' ), $count, '<a href="' . esc_url( wp_nonce_url( '?page=formidable&frm_action=untrash&form_type=' . $form_type . '&id=' . $params['id'], 'untrash_form_' . $params['id'] ) ) . '">', '</a>' );
577	815
578	816	$message = $available_status[ $status ]['message'];
579	817
580	818	self::display_forms_list( $params, $message );
		@@ -579,8 +817,12 @@
579	817
580	818	self::display_forms_list( $params, $message );
581	819	}
582	820
	821	+ /**
	822	+ * @param array $ids
	823	+ * @return string
	824	+ */
583	825	public static function bulk_trash( $ids ) {
584	826	FrmAppHelper::permission_check( 'frm_delete_forms' );
585	827
586	828	$count = 0;
		@@ -585,12 +827,16 @@
585	827
586	828	$count = 0;
587	829	foreach ( $ids as $id ) {
588	830	if ( FrmForm::trash( $id ) ) {
589		- $count ++;
	831	+ ++$count;
590	832	}
591	833	}
592	834
	835	+ if ( ! $count ) {
	836	+ return '';
	837	+ }
	838	+
593	839	$current_page = FrmAppHelper::get_simple_request(
594	840	array(
595	841	'param' => 'form_type',
596	842	'type' => 'request',
		@@ -616,9 +862,9 @@
616	862	check_admin_referer( 'destroy_form_' . $params['id'] );
617	863
618	864	$count = 0;
619	865	if ( FrmForm::destroy( $params['id'] ) ) {
620		- $count ++;
	866	+ ++$count;
621	867	}
622	868
623	869	/* translators: %1$s: Number of forms */
624	870	$message = sprintf( _n( '%1$s Form Permanently Deleted', '%1$s Forms Permanently Deleted', $count, 'formidable' ), $count );
		@@ -625,8 +871,12 @@
625	871
626	872	self::display_forms_list( $params, $message );
627	873	}
628	874
	875	+ /**
	876	+ * @param array $ids
	877	+ * @return string
	878	+ */
629	879	public static function bulk_destroy( $ids ) {
630	880	FrmAppHelper::permission_check( 'frm_delete_forms' );
631	881
632	882	$count = 0;
		@@ -632,19 +882,24 @@
632	882	$count = 0;
633	883	foreach ( $ids as $id ) {
634	884	$d = FrmForm::destroy( $id );
635	885	if ( $d ) {
636		- $count ++;
	886	+ ++$count;
637	887	}
638	888	}
639	889
640		- /* translators: %1$s: Number of forms */
641		- $message = sprintf( _n( '%1$s form permanently deleted.', '%1$s forms permanently deleted.', $count, 'formidable' ), $count );
	890	+ if ( $count ) {
	891	+ /* translators: %1$s: Number of forms */
	892	+ return sprintf( _n( '%1$s form permanently deleted.', '%1$s forms permanently deleted.', $count, 'formidable' ), $count );
	893	+ }
642	894
643		- return $message;
	895	+ return '';
644	896	}
645	897
646		- private static function delete_all() {
	898	+ /**
	899	+ * @since 6.7.1 Function went from private to public.
	900	+ */
	901	+ public static function delete_all() {
647	902	// Check nonce url.
648	903	$permission_error = FrmAppHelper::permission_nonce_error( 'frm_delete_forms', '_wpnonce', 'bulk-toplevel_page_formidable' );
649	904	if ( $permission_error !== false ) {
650	905	self::display_forms_list( array(), '', array( $permission_error ) );
		@@ -651,14 +906,15 @@
651	906
652	907	return;
653	908	}
654	909
655		- $count = FrmForm::scheduled_delete( time() );
	910	+ $count = FrmForm::scheduled_delete( time() );
	911	+ $url = remove_query_arg( array( 'delete_all' ) );
656	912
657		- /* translators: %1$s: Number of forms */
658		- $message = sprintf( _n( '%1$s form permanently deleted.', '%1$s forms permanently deleted.', $count, 'formidable' ), $count );
	913	+ $url .= '&message=forms_permanently_deleted&forms_deleted=' . $count;
659	914
660		- self::display_forms_list( array(), $message );
	915	+ wp_safe_redirect( $url );
	916	+ die();
661	917	}
662	918
663	919	/**
664	920	* Create a new form from the modal.
		@@ -671,9 +927,9 @@
671	927
672	928	$new_values = self::get_modal_values();
673	929	$new_values['form_key'] = $new_values['name'];
674	930	$new_values['options'] = array(
675		- 'antispam' => 1,
	931	+ 'antispam' => 1,
676	932	'on_submit_migrated' => 1,
677	933	);
678	934
679	935	/**
		@@ -692,13 +948,14 @@
692	948	* @param int $form_id
693	949	*/
694	950	do_action( 'frm_build_new_form', $form_id );
695	951
	952	+ self::create_submit_button_field( $form_id );
696	953	self::create_default_on_submit_action( $form_id );
697	954	self::create_default_email_action( $form_id );
698	955
699	956	$response = array(
700		- 'redirect' => FrmForm::get_edit_link( $form_id ),
	957	+ 'redirect' => FrmForm::get_edit_link( $form_id ) . '&new_template=true',
701	958	);
702	959
703	960	echo wp_json_encode( $response );
704	961	wp_die();
		@@ -704,46 +961,15 @@
704	961	wp_die();
705	962	}
706	963
707	964	/**
708		- * Create a custom template from a form
709		- *
710		- * @since 3.06
711		- */
712		- public static function build_template() {
713		- global $wpdb;
714		-
715		- FrmAppHelper::permission_check( 'frm_edit_forms' );
716		- check_ajax_referer( 'frm_ajax', 'nonce' );
717		-
718		- $form_id = FrmAppHelper::get_param( 'xml', '', 'post', 'absint' );
719		- $new_form_id = FrmForm::duplicate( $form_id, 1, true );
720		- if ( ! $new_form_id ) {
721		- $response = array(
722		- 'message' => __( 'There was an error creating a template.', 'formidable' ),
723		- );
724		- } else {
725		- $new_values = self::get_modal_values();
726		- $query_results = $wpdb->update( $wpdb->prefix . 'frm_forms', $new_values, array( 'id' => $new_form_id ) );
727		- if ( $query_results ) {
728		- FrmForm::clear_form_cache();
729		- }
730		-
731		- $response = array(
732		- 'redirect' => admin_url( 'admin.php?page=formidable&frm_action=duplicate&id=' . $new_form_id ) . '&_wpnonce=' . wp_create_nonce(),
733		- );
734		- }
735		-
736		- echo wp_json_encode( $response );
737		- wp_die();
738		- }
739		-
740		- /**
741	965	* Before creating a new form, get the name and description from the modal.
742	966	*
743	967	* @since 4.0
	968	+ *
	969	+ * @return array<string,string>
744	970	*/
745		- private static function get_modal_values() {
	971	+ public static function get_modal_values() {
746	972	$name = FrmAppHelper::get_param( 'name', '', 'post', 'sanitize_text_field' );
747	973	$desc = FrmAppHelper::get_param( 'desc', '', 'post', 'sanitize_textarea_field' );
748	974
749	975	return array(
		@@ -756,17 +982,24 @@
756	982	* Inserts Formidable button
757	983	* Hook exists since 2.5.0
758	984	*
759	985	* @since 2.0.15
	986	+ *
	987	+ * @return void
760	988	*/
761	989	public static function insert_form_button() {
762	990	if ( current_user_can( 'frm_view_forms' ) ) {
763		- FrmAppHelper::load_admin_wide_js();
764		- $menu_name = FrmAppHelper::get_menu_name();
765		- $icon = apply_filters( 'frm_media_icon', FrmAppHelper::svg_logo() );
766		- 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' ) . '">' .
767		- FrmAppHelper::kses( $icon, 'all' ) . // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
768		- ' ' . esc_html( $menu_name ) . '</a>';
	991	+ // Store the result in memory and re-use it when this function is called multiple times.
	992	+ // This helps speed up the form builder when there are a lot of HTML fields, where this
	993	+ // button is inserted once per HTML field.
	994	+ // In a form with 66 HTML fields, this saves 0.5 seconds on page load time, tested locally.
	995	+ if ( ! isset( self::$formidable_tinymce_button ) ) {
	996	+ FrmAppHelper::load_admin_wide_js();
	997	+ $menu_name = FrmAppHelper::get_menu_name();
	998	+ $icon = apply_filters( 'frm_media_icon', FrmAppHelper::svg_logo() );
	999	+ self::$formidable_tinymce_button = '<a href="#TB_inline?width=50&height=50&inlineId=frm_insert_form" class="thickbox button add_media frm_insert_form" title="' . esc_attr__( 'Add forms and content', 'formidable' ) . '">' . FrmAppHelper::kses( $icon, 'all' ) . ' ' . esc_html( $menu_name ) . '</a>';
	1000	+ }
	1001	+ echo self::$formidable_tinymce_button; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
769	1002	}
770	1003	}
771	1004
772	1005	/**
		@@ -854,9 +1087,9 @@
854	1087	$form_id = $opts['form_id'];
855	1088	unset( $opts['form_id'] );
856	1089	}
857	1090
858		- include( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/shortcode_opts.php' );
	1091	+ include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/shortcode_opts.php';
859	1092
860	1093	echo '</div>';
861	1094
862	1095	wp_die();
		@@ -896,8 +1129,14 @@
896	1129	wp_redirect( esc_url_raw( add_query_arg( 'paged', $total_pages ) ) );
897	1130	die();
898	1131	}
899	1132
	1133	+ $inbox = new FrmInbox();
	1134	+ $error = $inbox->check_for_error();
	1135	+ if ( $error ) {
	1136	+ $show_messages = array( $error['subject'] . '. ' . $error['message'] );
	1137	+ }
	1138	+
900	1139	require FrmAppHelper::plugin_path() . '/classes/views/frm-forms/list.php';
901	1140	}
902	1141
903	1142	/**
		@@ -904,14 +1143,16 @@
904	1143	* @param array<string,string> $columns
905	1144	* @return array<string,string>
906	1145	*/
907	1146	public static function get_columns( $columns ) {
908		- $columns['cb'] = '<input type="checkbox" />';
909		- $columns['name'] = esc_html__( 'Form Title', 'formidable' );
910		- $columns['entries'] = esc_html__( 'Entries', 'formidable' );
911		- $columns['id'] = 'ID';
912		- $columns['form_key'] = esc_html__( 'Key', 'formidable' );
913		- $columns['shortcode'] = esc_html__( 'Actions', 'formidable' );
	1147	+ $columns['cb'] = '<input type="checkbox" />';
	1148	+ $columns['name'] = esc_html__( 'Form Title', 'formidable' );
	1149	+ $columns['entries'] = esc_html__( 'Entries', 'formidable' );
	1150	+ $columns['id'] = 'ID';
	1151	+ $columns['form_key'] = esc_html__( 'Key', 'formidable' );
	1152	+ if ( 'trash' !== FrmAppHelper::simple_get( 'form_type' ) ) {
	1153	+ $columns['shortcode'] = esc_html__( 'Actions', 'formidable' );
	1154	+ }
914	1155	$columns['created_at'] = esc_html__( 'Date', 'formidable' );
915	1156
916	1157	add_screen_option(
917	1158	'per_page',
		@@ -924,8 +1165,11 @@
924	1165
925	1166	return $columns;
926	1167	}
927	1168
	1169	+ /**
	1170	+ * @return array<string,string>
	1171	+ */
928	1172	public static function get_sortable_columns() {
929	1173	return array(
930	1174	'id' => 'id',
931	1175	'name' => 'name',
		@@ -959,9 +1203,9 @@
959	1203	return $hidden_columns;
960	1204	}
961	1205
962	1206	public static function save_per_page( $save, $option, $value ) {
963		- if ( $option == 'formidable_page_formidable_per_page' ) {
	1207	+ if ( $option === 'formidable_page_formidable_per_page' ) {
964	1208	$save = (int) $value;
965	1209	}
966	1210
967	1211	return $save;
		@@ -967,146 +1211,49 @@
967	1211	return $save;
968	1212	}
969	1213
970	1214	/**
971		- * @return bool
972		- */
973		- public static function expired() {
974		- global $frm_expired;
975		- return $frm_expired;
976		- }
977		-
978		- /**
979		- * Get data from api before rendering it so that we can flag the modal as expired
980		- *
	1215	+ * @param int|string $id
	1216	+ * @param array $errors
	1217	+ * @param string $message
	1218	+ * @param bool $create_link
981	1219	* @return void
982	1220	*/
983		- public static function before_list_templates() {
984		- global $frm_templates;
985		- global $frm_expired;
986		- global $frm_license_type;
	1221	+ private static function get_edit_vars( $id, $errors = array(), $message = '', $create_link = false ) {
	1222	+ global $frm_vars;
987	1223
988		- $api = new FrmFormTemplateApi();
989		- $frm_templates = $api->get_api_info();
990		- $expired = false;
991		- $license_type = '';
992		- if ( isset( $frm_templates['error'] ) ) {
993		- $error = $frm_templates['error']['message'];
994		- $error = str_replace( 'utm_medium=addons', 'utm_medium=form-templates', $error );
995		- $expired = 'expired' === $frm_templates['error']['code'];
996		- $license_type = isset( $frm_templates['error']['type'] ) ? $frm_templates['error']['type'] : '';
997		- unset( $frm_templates['error'] );
998		- }
999		-
1000		- $frm_expired = $expired;
1001		- $frm_license_type = $license_type;
1002		- }
1003		-
1004		- /**
1005		- * @return void
1006		- */
1007		- public static function list_templates() {
1008		- global $frm_templates;
1009		- global $frm_license_type;
1010		-
1011		- $templates = $frm_templates;
1012		- $custom_templates = array();
1013		- $templates_by_category = array();
1014		-
1015		- self::add_user_templates( $custom_templates );
1016		-
1017		- foreach ( $templates as $template ) {
1018		- if ( ! isset( $template['categories'] ) ) {
1019		- continue;
1020		- }
1021		-
1022		- foreach ( $template['categories'] as $category ) {
1023		- if ( ! isset( $templates_by_category[ $category ] ) ) {
1024		- $templates_by_category[ $category ] = array();
1025		- }
1026		-
1027		- $templates_by_category[ $category ][] = $template;
1028		- }
1029		- }
1030		- unset( $template );
1031		-
1032		- // Subcategories that are included elsewhere.
1033		- $redundant_cats = array( 'PayPal', 'Stripe', 'Twilio' );
1034		-
1035		- $categories = array_keys( $templates_by_category );
1036		- $categories = array_diff( $categories, FrmFormsHelper::ignore_template_categories() );
1037		- $categories = array_diff( $categories, $redundant_cats );
1038		- sort( $categories );
1039		-
1040		- array_walk(
1041		- $custom_templates,
1042		- function( &$template ) {
1043		- $template['custom'] = true;
1044		- }
	1224	+ $form = FrmForm::getOne( $id );
	1225	+ $error_args = array(
	1226	+ 'title' => __( 'You can\'t edit the form', 'formidable' ),
	1227	+ 'body' => __( 'You are trying to edit a form that does not exist', 'formidable' ),
	1228	+ 'cancel_url' => admin_url( 'admin.php?page=formidable' ),
	1229	+ 'continue_url' => add_query_arg(
	1230	+ array(
	1231	+ 'page' => 'formidable',
	1232	+ )
	1233	+ ),
1045	1234	);
1046		-
1047		- $my_templates_translation = __( 'My Templates', 'formidable' );
1048		- $categories = array_merge( array( $my_templates_translation ), $categories );
1049		- $pricing = FrmAppHelper::admin_upgrade_link( 'form-templates' );
1050		- $license_type = $frm_license_type;
1051		- $args = compact( 'pricing', 'license_type' );
1052		- $where = apply_filters( 'frm_forms_dropdown', array(), '' );
1053		- $forms = FrmForm::get_published_forms( $where );
1054		- $view_path = FrmAppHelper::plugin_path() . '/classes/views/frm-forms/';
1055		-
1056		- $templates_by_category[ $my_templates_translation ] = $custom_templates;
1057		-
1058		- unset( $pricing, $license_type, $where );
1059		- wp_enqueue_script( 'accordion' ); // register accordion for template groups
1060		- require $view_path . 'list-templates.php';
1061		- }
1062		-
1063		- /**
1064		- * @since 4.03.01
1065		- */
1066		- private static function get_template_categories( $templates ) {
1067		- $categories = array();
1068		- foreach ( $templates as $template ) {
1069		- if ( isset( $template['categories'] ) ) {
1070		- $categories = array_merge( $categories, $template['categories'] );
1071		- }
	1235	+ if ( ! $form ) {
	1236	+ FrmAppController::show_error_modal( $error_args );
	1237	+ return;
1072	1238	}
1073		- $exclude_cats = FrmFormsHelper::ignore_template_categories();
1074		- $categories = array_unique( $categories );
1075		- $categories = array_diff( $categories, $exclude_cats );
1076		- sort( $categories );
1077		- return $categories;
1078		- }
1079	1239
1080		- private static function add_user_templates( &$templates ) {
1081		- $user_templates = array(
1082		- 'is_template' => 1,
1083		- 'default_template' => 0,
1084		- );
1085		- $user_templates = FrmForm::getAll( $user_templates, 'name' );
1086		- foreach ( $user_templates as $template ) {
1087		- $template = array(
1088		- 'id' => $template->id,
1089		- 'name' => $template->name,
1090		- 'key' => $template->form_key,
1091		- 'description' => $template->description,
1092		- 'url' => wp_nonce_url( admin_url( 'admin.php?page=formidable&frm_action=duplicate&id=' . absint( $template->id ) ) ),
1093		- 'released' => $template->created_at,
1094		- 'installed' => 1,
	1240	+ if ( 'trash' === $form->status ) {
	1241	+ $error_args['body'] = __( 'The form you\'re trying to edit is in trash. You must restore it first before you can make changes', 'formidable' );
	1242	+ $error_args['continue_url'] = add_query_arg(
	1243	+ array(
	1244	+ 'page' => 'formidable',
	1245	+ '_wpnonce' => wp_create_nonce( 'untrash_form_' . $id ),
	1246	+ 'form_type' => 'trash',
	1247	+ 'frm_action' => 'untrash',
	1248	+ 'id' => $id,
	1249	+ )
1095	1250	);
1096		- array_unshift( $templates, $template );
1097		- unset( $template );
	1251	+ $error_args['continue_text'] = __( 'Restore form', 'formidable' );
	1252	+ FrmAppController::show_error_modal( $error_args );
	1253	+ return;
1098	1254	}
1099		- }
1100	1255
1101		- private static function get_edit_vars( $id, $errors = array(), $message = '', $create_link = false ) {
1102		- global $frm_vars;
1103		-
1104		- $form = FrmForm::getOne( $id );
1105		- if ( ! $form ) {
1106		- wp_die( esc_html__( 'You are trying to edit a form that does not exist.', 'formidable' ) );
1107		- }
1108		-
1109	1256	if ( $form->parent_form_id ) {
1110	1257	/* translators: %1$s: Start link HTML, %2$s: End link HTML */
1111	1258	wp_die( sprintf( esc_html__( 'You are trying to edit a child form. Please edit from %1$shere%2$s', 'formidable' ), '<a href="' . esc_url( FrmForm::get_edit_link( $form->parent_form_id ) ) . '">', '</a>' ) );
1112	1259	}
		@@ -1117,8 +1264,9 @@
1117	1264
1118	1265	// Automatically add end section fields if they don't exist (2.0 migration).
1119	1266	$reset_fields = false;
1120	1267	FrmFormsHelper::auto_add_end_section_fields( $form, $fields, $reset_fields );
	1268	+ FrmSubmitHelper::maybe_create_submit_field( $form, $fields, $reset_fields );
1121	1269
1122	1270	if ( $reset_fields ) {
1123	1271	$fields = FrmField::get_all_for_form( $form->id, '', 'exclude' );
1124	1272	}
		@@ -1144,18 +1292,21 @@
1144	1292	}
1145	1293
1146	1294	self::maybe_update_form_builder_message( $message );
1147	1295
1148		- $all_templates = FrmForm::getAll( array( 'is_template' => 1 ), 'name' );
1149		- $has_fields = isset( $values['fields'] ) && ! empty( $values['fields'] );
	1296	+ $has_fields = ! empty( $values['fields'] ) && ! FrmSubmitHelper::only_contains_submit_field( $values['fields'] );
1150	1297
1151	1298	if ( defined( 'DOING_AJAX' ) ) {
1152	1299	wp_die();
1153		- } else {
1154		- require( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/edit.php' );
1155	1300	}
	1301	+
	1302	+ require FrmAppHelper::plugin_path() . '/classes/views/frm-forms/edit.php';
1156	1303	}
1157	1304
	1305	+ /**
	1306	+ * @param array $fields
	1307	+ * @return array
	1308	+ */
1158	1309	public static function update_form_builder_fields( $fields, $form ) {
1159	1310	foreach ( $fields as $field ) {
1160	1311	$field->do_not_include_icons = true;
1161	1312	}
		@@ -1167,13 +1318,21 @@
1167	1318	$message = __( 'Form was Successfully Copied', 'formidable' );
1168	1319	}
1169	1320	}
1170	1321
	1322	+ /**
	1323	+ * @param int|string $id
	1324	+ * @param array $errors
	1325	+ * @param array|string $args
	1326	+ * @return void
	1327	+ */
1171	1328	public static function get_settings_vars( $id, $errors = array(), $args = array() ) {
1172	1329	FrmAppHelper::permission_check( 'frm_edit_forms' );
1173	1330
1174	1331	global $frm_vars;
1175	1332
	1333	+ self::maybe_print_media_templates();
	1334	+
1176	1335	if ( ! is_array( $args ) ) {
1177	1336	// For reverse compatibility.
1178	1337	$args = array(
1179	1338	'message' => $args,
		@@ -1206,17 +1365,38 @@
1206	1365
1207	1366	$sections = self::get_settings_tabs( $values );
1208	1367	$current = FrmAppHelper::simple_get( 't', 'sanitize_title', 'advanced_settings' );
1209	1368
1210		- require( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings.php' );
	1369	+ require FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings.php';
1211	1370	}
1212	1371
1213	1372	/**
	1373	+ * 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.
	1374	+ *
	1375	+ * @since 6.10
	1376	+ *
	1377	+ * @return void
	1378	+ */
	1379	+ private static function maybe_print_media_templates() {
	1380	+ if ( FrmAppHelper::pro_is_included() ) {
	1381	+ // This issue does not exist when Pro is active so exit early.
	1382	+ return;
	1383	+ }
	1384	+
	1385	+ add_action(
	1386	+ 'wp_enqueue_editor',
	1387	+ function () {
	1388	+ wp_print_media_templates();
	1389	+ }
	1390	+ );
	1391	+ }
	1392	+
	1393	+ /**
1214	1394	* @since 4.0
1215	1395	*/
1216	1396	public static function form_publish_button( $atts ) {
1217	1397	$values = $atts['values'];
1218		- include( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/_publish_box.php' );
	1398	+ include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/_publish_box.php';
1219	1399	}
1220	1400
1221	1401	/**
1222	1402	* Get a list of all the settings tabs for the form settings page.
		@@ -1241,9 +1421,9 @@
1241	1421	'icon' => 'frm_icon_font frm_mail_bulk_icon',
1242	1422	),
1243	1423	'permissions' => array(
1244	1424	'name' => __( 'Form Permissions', 'formidable' ),
1245		- 'icon' => 'frm_icon_font frm_lock_icon',
	1425	+ 'icon' => 'frm_icon_font frm_lock_closed_icon',
1246	1426	'html_class' => 'frm_show_upgrade_tab frm_noallow',
1247	1427	'data' => array(
1248	1428	'medium' => 'permissions',
1249	1429	'upgrade' => __( 'Form Permissions', 'formidable' ),
		@@ -1250,9 +1430,9 @@
1250	1430	'message' => __( 'Allow editing, protect forms and files, limit entries, and save drafts. Upgrade to get form and entry permissions.', 'formidable' ),
1251	1431	'screenshot' => 'permissions.png',
1252	1432	),
1253	1433	),
1254		- 'scheduling' => array(
	1434	+ 'scheduling' => array(
1255	1435	'name' => __( 'Form Scheduling', 'formidable' ),
1256	1436	'icon' => 'frm_icon_font frm_calendar_icon',
1257	1437	'html_class' => 'frm_show_upgrade_tab frm_noallow',
1258	1438	'data' => array(
		@@ -1285,9 +1465,9 @@
1285	1465	'screenshot' => 'chat.png',
1286	1466	)
1287	1467	),
1288	1468	),
1289		- 'abandonment' => array(
	1469	+ 'abandonment' => array(
1290	1470	'name' => __( 'Form Abandonment', 'formidable' ),
1291	1471	'icon' => 'frm_icon_font frm_abandoned_icon',
1292	1472	'html_class' => 'frm_show_upgrade_tab frm_noallow',
1293	1473	'data' => FrmAppHelper::get_upgrade_data_params(
		@@ -1306,8 +1486,12 @@
1306	1486	'icon' => 'frm_icon_font frm_code_icon',
1307	1487	),
1308	1488	);
1309	1489
	1490	+ if ( ! has_action( 'frm_add_form_style_tab_options' ) && ! has_action( 'frm_add_form_button_options' ) ) {
	1491	+ unset( $sections['buttons'] );
	1492	+ }
	1493	+
1310	1494	foreach ( array( 'landing', 'chat', 'abandonment' ) as $feature ) {
1311	1495	if ( ! FrmAppHelper::show_new_feature( $feature ) ) {
1312	1496	unset( $sections[ $feature ] );
1313	1497	}
		@@ -1314,13 +1498,8 @@
1314	1498	}
1315	1499
1316	1500	$sections = apply_filters( 'frm_add_form_settings_section', $sections, $values );
1317	1501
1318		- if ( FrmAppHelper::pro_is_installed() && ! FrmAppHelper::meets_min_pro_version( '4.0' ) ) {
1319		- // Prevent settings from showing in 2 spots.
1320		- unset( $sections['permissions'], $sections['scheduling'] );
1321		- }
1322		-
1323	1502	foreach ( $sections as $key => $section ) {
1324	1503	$defaults = array(
1325	1504	'html_class' => '',
1326	1505	'name' => ucfirst( $key ),
		@@ -1342,9 +1521,9 @@
1342	1521	$section['id'] = $section['anchor'];
1343	1522	}
1344	1523
1345	1524	$sections[ $key ] = $section;
1346		- }
	1525	+ }//end foreach
1347	1526
1348	1527	return $sections;
1349	1528	}
1350	1529
		@@ -1351,8 +1530,9 @@
1351	1530	/**
1352	1531	* @since 4.0
1353	1532	*
1354	1533	* @param array $values
	1534	+ * @return void
1355	1535	*/
1356	1536	public static function advanced_settings( $values ) {
1357	1537	$first_h3 = 'frm_first_h3';
1358	1538
		@@ -1360,14 +1540,15 @@
1360	1540	}
1361	1541
1362	1542	/**
1363	1543	* @param array $values
	1544	+ * @return void
1364	1545	*/
1365	1546	public static function render_spam_settings( $values ) {
1366	1547	if ( function_exists( 'akismet_http_post' ) ) {
1367	1548	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/spam-settings/akismet.php';
1368	1549	}
1369		- include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/spam-settings/honeypot.php';
	1550	+ include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/spam-settings/stopforumspam.php';
1370	1551	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/spam-settings/antispam.php';
1371	1552	}
1372	1553
1373	1554	/**
		@@ -1373,16 +1554,12 @@
1373	1554	/**
1374	1555	* @since 4.0
1375	1556	*
1376	1557	* @param array $values
	1558	+ * @return void
1377	1559	*/
1378	1560	public static function buttons_settings( $values ) {
1379		- $styles = apply_filters( 'frm_get_style_opts', array() );
1380		-
1381		- $frm_settings = FrmAppHelper::get_settings();
1382		- $no_global_style = $frm_settings->load_style === 'none';
1383		-
1384		- include( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings-buttons.php' );
	1561	+ include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings-buttons.php';
1385	1562	}
1386	1563
1387	1564	/**
1388	1565	* @since 4.0
		@@ -1387,11 +1564,12 @@
1387	1564	/**
1388	1565	* @since 4.0
1389	1566	*
1390	1567	* @param array $values
	1568	+ * @return void
1391	1569	*/
1392	1570	public static function html_settings( $values ) {
1393		- include( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings-html.php' );
	1571	+ include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings-html.php';
1394	1572	}
1395	1573
1396	1574	/**
1397	1575	* Replace old Submit Button href with new href to avoid errors in Chrome
		@@ -1397,9 +1575,10 @@
1397	1575	* Replace old Submit Button href with new href to avoid errors in Chrome
1398	1576	*
1399	1577	* @since 2.03.08
1400	1578	*
1401		- * @param array|boolean $values
	1579	+ * @param array|bool $values
	1580	+ * @return void
1402	1581	*/
1403	1582	private static function clean_submit_html( &$values ) {
1404	1583	if ( is_array( $values ) && isset( $values['submit_html'] ) ) {
1405	1584	$values['submit_html'] = str_replace( 'javascript:void(0)', '#', $values['submit_html'] );
		@@ -1420,8 +1599,13 @@
1420	1599
1421	1600	return $classes;
1422	1601	}
1423	1602
	1603	+ /**
	1604	+ * @param int|string $form_id
	1605	+ * @param string $class
	1606	+ * @return void
	1607	+ */
1424	1608	public static function mb_tags_box( $form_id, $class = '' ) {
1425	1609	$fields = FrmField::get_all_for_form( $form_id, '', 'include' );
1426	1610
1427	1611	/**
		@@ -1434,9 +1618,9 @@
1434	1618	*/
1435	1619	$fields = apply_filters( 'frm_fields_in_tags_box', $fields, compact( 'form_id' ) );
1436	1620	$linked_forms = array();
1437	1621	$col = 'one';
1438		- $settings_tab = FrmAppHelper::is_admin_page( 'formidable' ) ? true : false;
	1622	+ $settings_tab = FrmAppHelper::is_admin_page( 'formidable' );
1439	1623
1440	1624	$cond_shortcodes = apply_filters( 'frm_conditional_shortcodes', array() );
1441	1625	$entry_shortcodes = self::get_shortcode_helpers( $settings_tab );
1442	1626
		@@ -1441,9 +1625,9 @@
1441	1625	$entry_shortcodes = self::get_shortcode_helpers( $settings_tab );
1442	1626
1443	1627	$advanced_helpers = self::advanced_helpers( compact( 'fields', 'form_id' ) );
1444	1628
1445		- include( FrmAppHelper::plugin_path() . '/classes/views/shared/mb_adv_info.php' );
	1629	+ include FrmAppHelper::plugin_path() . '/classes/views/shared/mb_adv_info.php';
1446	1630	}
1447	1631
1448	1632	/**
1449	1633	* @since 3.04.01
		@@ -1456,9 +1640,9 @@
1456	1640	),
1457	1641	);
1458	1642
1459	1643	$user_fields = self::user_shortcodes();
1460		- if ( ! empty( $user_fields ) ) {
	1644	+ if ( $user_fields ) {
1461	1645	$user_helpers = array();
1462	1646	foreach ( $user_fields as $uk => $uf ) {
1463	1647	$user_helpers[ '|user_id| show="' . $uk . '"' ] = $uf;
1464	1648	unset( $uk, $uf );
		@@ -1464,9 +1648,9 @@
1464	1648	unset( $uk, $uf );
1465	1649	}
1466	1650
1467	1651	$advanced_helpers['user_id'] = array(
1468		- 'codes' => $user_helpers,
	1652	+ 'codes' => $user_helpers,
1469	1653	);
1470	1654	}
1471	1655
1472	1656	/**
		@@ -1543,21 +1727,16 @@
1543	1727	'updated-at' => __( 'Entry updated', 'formidable' ),
1544	1728	'' => '',
1545	1729	'siteurl' => __( 'Site URL', 'formidable' ),
1546	1730	'sitename' => __( 'Site Name', 'formidable' ),
	1731	+ 'form_name' => __( 'Form Name', 'formidable' ),
1547	1732	);
1548	1733
	1734	+ $entry_shortcodes = array_merge( FrmShortcodeHelper::get_contextual_shortcode_values(), $entry_shortcodes );
1549	1735	if ( ! FrmAppHelper::pro_is_installed() ) {
1550	1736	unset( $entry_shortcodes['post_id'] );
1551	1737	}
1552	1738
1553		- if ( $settings_tab ) {
1554		- $entry_shortcodes['default-message'] = __( 'Default Msg', 'formidable' );
1555		- $entry_shortcodes['default-html'] = __( 'Default HTML', 'formidable' );
1556		- $entry_shortcodes['default-plain'] = __( 'Default Plain', 'formidable' );
1557		- $entry_shortcodes['form_name'] = __( 'Form Name', 'formidable' );
1558		- }
1559		-
1560	1739	/**
1561	1740	* Use this hook to add or remove buttons in the helpers section
1562	1741	* in the customization panel
1563	1742	*
		@@ -1583,9 +1762,9 @@
1583	1762	echo ' frm_js_validate ';
1584	1763	self::add_js_validate_form_to_global_vars( $form );
1585	1764	}
1586	1765
1587		- if ( ! FrmFormsHelper::should_use_pro_for_ajax_submit() && FrmForm::is_ajax_on( $form ) ) {
	1766	+ if ( FrmForm::is_ajax_on( $form ) ) {
1588	1767	echo ' frm_ajax_submit ';
1589	1768	}
1590	1769	}
1591	1770
		@@ -1607,11 +1786,11 @@
1607	1786	check_ajax_referer( 'frm_ajax', 'nonce' );
1608	1787
1609	1788	echo FrmEntriesController::show_entry_shortcode( // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
1610	1789	array(
1611		- 'form_id' => FrmAppHelper::get_post_param( 'form_id', '', 'absint' ),
	1790	+ 'form_id' => FrmAppHelper::get_post_param( 'form_id', '', 'absint' ), // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
1612	1791	'default_email' => true,
1613		- 'plain_text' => FrmAppHelper::get_post_param( 'plain_text', '', 'absint' ),
	1792	+ 'plain_text' => FrmAppHelper::get_post_param( 'plain_text', '', 'absint' ), // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
1614	1793	)
1615	1794	);
1616	1795	wp_die();
1617	1796	}
		@@ -1617,10 +1796,10 @@
1617	1796	}
1618	1797
1619	1798	/**
1620	1799	* @param string $content
1621		- * @param stdClass|string|int $form
1622		- * @param stdClass|string|int|false $entry
	1800	+ * @param int|stdClass|string $form
	1801	+ * @param false|int|stdClass|string $entry
1623	1802	* @return string
1624	1803	*/
1625	1804	public static function filter_content( $content, $form, $entry = false ) {
1626	1805	$content = self::replace_form_name_shortcodes( $content, $form );
		@@ -1633,8 +1812,16 @@
1633	1812	if ( is_object( $form ) ) {
1634	1813	$form = $form->id;
1635	1814	}
1636	1815
	1816	+ /*
	1817	+ * Repeater actions adds `parent_entry` to `$entry` store the parent entry data. If `parent_entry` is not empty,
	1818	+ * use the parent form ID instead of repeater form ID to fix the parent form field shortcodes doesn't work.
	1819	+ */
	1820	+ if ( ! empty( $entry->parent_entry ) ) {
	1821	+ $form = $entry->parent_entry->form_id;
	1822	+ }
	1823	+
1637	1824	$shortcodes = FrmFieldsHelper::get_shortcodes( $content, $form );
1638	1825	$content = apply_filters( 'frm_replace_content_shortcodes', $content, $entry, $shortcodes );
1639	1826
1640	1827	return $content;
		@@ -1644,11 +1831,11 @@
1644	1831	* Replace any [form_name] shortcodes in a string.
1645	1832	*
1646	1833	* @since 5.5
1647	1834	*
1648		- * @param string|array $string
1649		- * @param stdClass|string|int $form
1650		- * @return string|array
	1835	+ * @param array|string $string
	1836	+ * @param int|stdClass|string $form
	1837	+ * @return array|string
1651	1838	*/
1652	1839	public static function replace_form_name_shortcodes( $string, $form ) {
1653	1840	if ( ! is_string( $string ) ) {
1654	1841	return $string;
		@@ -1666,9 +1853,9 @@
1666	1853	return str_replace( '[form_name]', $form_name, $string );
1667	1854	}
1668	1855
1669	1856	/**
1670		- * @param stdClass|string|int|false $entry
	1857	+ * @param false|int|stdClass|string $entry
1671	1858	* @return void
1672	1859	*/
1673	1860	private static function get_entry_by_param( &$entry ) {
1674	1861	if ( ! $entry || ! is_object( $entry ) ) {
		@@ -1683,8 +1870,12 @@
1683	1870	public static function replace_content_shortcodes( $content, $entry, $shortcodes ) {
1684	1871	return FrmFieldsHelper::replace_content_shortcodes( $content, $entry, $shortcodes );
1685	1872	}
1686	1873
	1874	+ /**
	1875	+ * @param array $errors
	1876	+ * @return array
	1877	+ */
1687	1878	public static function process_bulk_form_actions( $errors ) {
1688	1879	if ( ! $_REQUEST ) {
1689	1880	return $errors;
1690	1881	}
		@@ -1728,9 +1919,9 @@
1728	1919	case 'untrash':
1729	1920	$message = self::bulk_untrash( $ids );
1730	1921	}
1731	1922
1732		- if ( isset( $message ) && ! empty( $message ) ) {
	1923	+ if ( ! empty( $message ) ) {
1733	1924	$errors['message'] = $message;
1734	1925	}
1735	1926
1736	1927	return $errors;
		@@ -1735,13 +1926,26 @@
1735	1926
1736	1927	return $errors;
1737	1928	}
1738	1929
	1930	+ /**
	1931	+ * Includes html that shows a message when the device is too small to use Formidable Forms admin pages.
	1932	+ *
	1933	+ * @since 6.20
	1934	+ * @return void
	1935	+ */
	1936	+ public static function include_device_too_small_message() {
	1937	+ if ( ! FrmAppHelper::is_formidable_admin() ) {
	1938	+ return;
	1939	+ }
	1940	+
	1941	+ include FrmAppHelper::plugin_path() . '/classes/views/shared/small-device-message.php';
	1942	+ }
	1943	+
1739	1944	public static function route() {
1740	1945	$action = isset( $_REQUEST['frm_action'] ) ? 'frm_action' : 'action';
1741	1946	$vars = array();
1742	1947	FrmAppHelper::include_svg();
1743		-
1744	1948	if ( isset( $_POST['frm_compact_fields'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
1745	1949	FrmAppHelper::permission_check( 'frm_edit_forms' );
1746	1950
1747	1951	// Javascript needs to be allowed in some field settings.
		@@ -1750,9 +1954,9 @@
1750	1954	$json_vars = json_decode( $json_vars, true );
1751	1955	if ( empty( $json_vars ) ) {
1752	1956	// json decoding failed so we should return an error message.
1753	1957	$action = FrmAppHelper::get_param( $action, '', 'get', 'sanitize_title' );
1754		- if ( 'edit' == $action ) {
	1958	+ if ( 'edit' === $action ) {
1755	1959	$action = 'update';
1756	1960	}
1757	1961
1758	1962	add_filter( 'frm_validate_form', 'FrmFormsController::json_error' );
		@@ -1768,16 +1972,14 @@
1768	1972	if ( isset( $_REQUEST['delete_all'] ) ) {
1769	1973	// Override the action for this page.
1770	1974	$action = 'delete_all';
1771	1975	}
1772		- }
	1976	+ }//end if
1773	1977
1774	1978	add_action( 'frm_load_form_hooks', 'FrmHooksController::trigger_load_form_hooks' );
1775	1979	FrmAppHelper::trigger_hook_load( 'form' );
1776	1980
1777	1981	switch ( $action ) {
1778		- case 'new':
1779		- return self::new_form( $vars );
1780	1982	case 'create':
1781	1983	case 'edit':
1782	1984	case 'update':
1783	1985	case 'trash':
		@@ -1782,16 +1984,17 @@
1782	1984	case 'update':
1783	1985	case 'trash':
1784	1986	case 'untrash':
1785	1987	case 'destroy':
1786		- case 'delete_all':
1787	1988	case 'settings':
1788	1989	case 'update_settings':
1789	1990	return self::$action( $vars );
1790	1991	case 'lite-reports':
1791		- return self::no_reports( $vars );
	1992	+ self::no_reports( $vars );
	1993	+ return;
1792	1994	case 'views':
1793		- return self::no_views( $vars );
	1995	+ self::no_views( $vars );
	1996	+ return;
1794	1997	default:
1795	1998	do_action( 'frm_form_action_' . $action );
1796	1999	if ( apply_filters( 'frm_form_stop_action_' . $action, false ) ) {
1797	2000	return;
		@@ -1814,14 +2017,47 @@
1814	2017	self::display_forms_list( array(), '', array( __( 'There was a problem duplicating the form', 'formidable' ) ) );
1815	2018	return;
1816	2019	}
1817	2020
	2021	+ if ( 'forms_permanently_deleted' === $message ) {
	2022	+ $count = FrmAppHelper::get_param( 'forms_deleted', 0, 'get', 'absint' );
	2023	+ /* translators: %1$s: Number of forms */
	2024	+ $message = sprintf( _n( '%1$s form permanently deleted.', '%1$s forms permanently deleted.', $count, 'formidable' ), $count );
	2025	+ self::display_forms_list( array(), $message, '' );
	2026	+ return;
	2027	+ }
	2028	+
1818	2029	self::display_forms_list();
1819	2030
1820	2031	return;
1821		- }
	2032	+ }//end switch
1822	2033	}
1823	2034
	2035	+ /**
	2036	+ * Rename a form.
	2037	+ *
	2038	+ * Handles the AJAX request for renaming a form.
	2039	+ *
	2040	+ * @since 6.7
	2041	+ *
	2042	+ * @return void
	2043	+ */
	2044	+ public static function rename_form() {
	2045	+ // Check permission and nonce
	2046	+ FrmAppHelper::permission_check( 'frm_edit_forms' );
	2047	+ check_ajax_referer( 'frm_ajax', 'nonce' );
	2048	+
	2049	+ // Get posted data
	2050	+ $form_id = FrmAppHelper::get_post_param( 'form_id', '', 'absint' );
	2051	+ $name = FrmAppHelper::get_post_param( 'form_name', '', 'sanitize_text_field' );
	2052	+
	2053	+ // Update the form name and form key.
	2054	+ $form_key = FrmAppHelper::get_unique_key( sanitize_title( $name ), 'frm_forms', 'form_key' );
	2055	+ FrmForm::update( $form_id, compact( 'name', 'form_key' ) );
	2056	+
	2057	+ wp_send_json_success( compact( 'form_key' ) );
	2058	+ }
	2059	+
1824	2060	public static function json_error( $errors ) {
1825	2061	$errors['json'] = __( 'Abnormal HTML characters prevented your form from saving correctly', 'formidable' );
1826	2062
1827	2063	return $errors;
		@@ -1827,20 +2063,13 @@
1827	2063	return $errors;
1828	2064	}
1829	2065
1830	2066	/**
1831		- * Education for premium features.
1832		- *
1833		- * @since 4.05
1834		- */
1835		- public static function add_form_style_tab_options() {
1836		- include( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/add_form_style_options.php' );
1837		- }
1838		-
1839		- /**
1840	2067	* Add education about views.
1841	2068	*
1842	2069	* @since 4.07
	2070	+ *
	2071	+ * @return void
1843	2072	*/
1844	2073	public static function no_views( $values = array() ) {
1845	2074	FrmAppHelper::include_svg();
1846	2075	$id = FrmAppHelper::get_param( 'form', '', 'get', 'absint' );
		@@ -1852,8 +2081,10 @@
1852	2081	/**
1853	2082	* Add education about reports.
1854	2083	*
1855	2084	* @since 4.07
	2085	+ *
	2086	+ * @return void
1856	2087	*/
1857	2088	public static function no_reports( $values = array() ) {
1858	2089	$id = FrmAppHelper::get_param( 'form', '', 'get', 'absint' );
1859	2090	$form = $id ? FrmForm::getOne( $id ) : false;
		@@ -1860,9 +2091,11 @@
1860	2091
1861	2092	include FrmAppHelper::plugin_path() . '/classes/views/shared/reports-info.php';
1862	2093	}
1863	2094
1864		- /* FRONT-END FORMS */
	2095	+ /**
	2096	+ * FRONT-END FORMS.
	2097	+ */
1865	2098	public static function admin_bar_css() {
1866	2099	if ( is_admin() || ! current_user_can( 'frm_edit_forms' ) ) {
1867	2100	return;
1868	2101	}
		@@ -1936,9 +2169,9 @@
1936	2169	$wp_admin_bar->add_node(
1937	2170	array(
1938	2171	'parent' => 'frm-forms',
1939	2172	'id' => 'edit_form_' . $form_id,
1940		- 'title' => empty( $name ) ? __( '(no title)', 'formidable' ) : $name,
	2173	+ 'title' => empty( $name ) ? FrmFormsHelper::get_no_title_text() : $name,
1941	2174	'href' => FrmForm::get_edit_link( $form_id ),
1942	2175	)
1943	2176	);
1944	2177	}
		@@ -1951,10 +2184,10 @@
1951	2184	* @return string
1952	2185	*/
1953	2186	public static function get_form_shortcode( $atts ) {
1954	2187	global $frm_vars;
1955		- if ( isset( $frm_vars['skip_shortcode'] ) && $frm_vars['skip_shortcode'] ) {
1956		- $sc = '[formidable';
	2188	+ if ( ! empty( $frm_vars['skip_shortcode'] ) ) {
	2189	+ $sc = '[formidable';
1957	2190	$sc .= FrmAppHelper::array_to_html_params( $atts );
1958	2191	return $sc . ']';
1959	2192	}
1960	2193
		@@ -1979,11 +2212,11 @@
1979	2212
1980	2213	/**
1981	2214	* @since 5.2.01
1982	2215	*
1983		- * @param string|int|false $id
1984		- * @param string|false $key
1985		- * @return stdClass|false
	2216	+ * @param false|int|string $id
	2217	+ * @param false|string $key
	2218	+ * @return false|stdClass
1986	2219	*/
1987	2220	private static function maybe_get_form_by_id_or_key( $id, $key ) {
1988	2221	if ( ! $id ) {
1989	2222	$id = $key;
		@@ -1991,12 +2224,12 @@
1991	2224	return self::maybe_get_form_to_show( $id );
1992	2225	}
1993	2226
1994	2227	/**
1995		- * @param string|int|false $id
1996		- * @param string|false $key
1997		- * @param string|int|bool $title may be 'auto', true, false, 'true', 'false', 'yes', '1', 1, '0', 0.
1998		- * @param string|int|bool $description may be 'auto', true, false, 'true', 'false', 'yes', '1', 1, '0', 0.
	2228	+ * @param false|int|string $id
	2229	+ * @param false|string $key
	2230	+ * @param bool|int|string $title may be 'auto', true, false, 'true', 'false', 'yes', '1', 1, '0', 0.
	2231	+ * @param bool|int|string $description may be 'auto', true, false, 'true', 'false', 'yes', '1', 1, '0', 0.
1999	2232	* @param array $atts
2000	2233	* @return string
2001	2234	*/
2002	2235	public static function show_form( $id = '', $key = '', $title = false, $description = false, $atts = array() ) {
		@@ -2044,15 +2277,16 @@
2044	2277	return $form;
2045	2278	}
2046	2279
2047	2280	/**
2048		- * @param string|int|false $id
2049		- * @return stdClass|false
	2281	+ * @param false|int|string $id
	2282	+ * @return false|stdClass
2050	2283	*/
2051	2284	private static function maybe_get_form_to_show( $id ) {
2052	2285	$form = false;
2053	2286
2054		- if ( ! empty( $id ) ) { // form id or key is set
	2287	+ if ( ! empty( $id ) ) {
	2288	+ // Form id or key is set.
2055	2289	$form = FrmForm::getOne( $id );
2056	2290	if ( ! $form || $form->parent_form_id || $form->status === 'trash' ) {
2057	2291	$form = false;
2058	2292	}
		@@ -2110,11 +2344,11 @@
2110	2344
2111	2345	do_action( 'frm_validate_form_creation', $params, $fields, $form, $title, $description );
2112	2346
2113	2347	if ( apply_filters( 'frm_continue_to_create', true, $form->id ) ) {
2114		- $entry_id = self::just_created_entry( $form->id );
2115		- $pass_args['entry_id'] = $entry_id;
2116		- $pass_args['reset'] = true;
	2348	+ $entry_id = self::just_created_entry( $form->id );
	2349	+ $pass_args['entry_id'] = $entry_id;
	2350	+ $pass_args['reset'] = true;
2117	2351
2118	2352	self::run_on_submit_actions( $pass_args );
2119	2353
2120	2354	do_action(
		@@ -2124,9 +2358,9 @@
2124	2358	'form' => $form,
2125	2359	)
2126	2360	);
2127	2361	}
2128		- }
	2362	+ }//end if
2129	2363	}
2130	2364
2131	2365	/**
2132	2366	* If the form was processed earlier (init), get the generated errors
		@@ -2158,9 +2392,9 @@
2158	2392	*/
2159	2393	public static function just_created_entry( $form_id ) {
2160	2394	global $frm_vars;
2161	2395
2162		- 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;
	2396	+ return isset( $frm_vars['created_entries'] ) && isset( $frm_vars['created_entries'][ $form_id ] ) && isset( $frm_vars['created_entries'][ $form_id ]['entry_id'] ) ? $frm_vars['created_entries'][ $form_id ]['entry_id'] : 0;
2163	2397	}
2164	2398
2165	2399	/**
2166	2400	* Gets confirmation method.
		@@ -2173,14 +2407,14 @@
2173	2407	*
2174	2408	* @type object $form Form object.
2175	2409	* @type int $entry_id Entry ID.
2176	2410	* }
2177		- * @return string|array
	2411	+ * @return array|string
2178	2412	*/
2179	2413	private static function get_confirmation_method( $atts ) {
2180	2414	$action = FrmOnSubmitHelper::current_event( $atts );
2181	2415	$opt = 'update' === $action ? 'edit_action' : 'success_action';
2182		- $method = ( isset( $atts['form']->options[ $opt ] ) && ! empty( $atts['form']->options[ $opt ] ) ) ? $atts['form']->options[ $opt ] : 'message';
	2416	+ $method = ! empty( $atts['form']->options[ $opt ] ) ? $atts['form']->options[ $opt ] : 'message';
2183	2417
2184	2418	if ( ! empty( $atts['entry_id'] ) ) {
2185	2419	$met_actions = self::get_met_on_submit_actions( $atts, $action );
2186	2420	if ( $met_actions ) {
		@@ -2189,9 +2423,9 @@
2189	2423	}
2190	2424
2191	2425	$method = apply_filters( 'frm_success_filter', $method, $atts['form'], $action );
2192	2426
2193		- if ( $method != 'message' && ( ! $atts['entry_id'] || ! is_numeric( $atts['entry_id'] ) ) ) {
	2427	+ if ( $method !== 'message' && ( ! $atts['entry_id'] || ! is_numeric( $atts['entry_id'] ) ) ) {
2194	2428	$method = 'message';
2195	2429	}
2196	2430
2197	2431	return $method;
		@@ -2225,9 +2459,9 @@
2225	2459	* @param array $args See {@see FrmFormsController::maybe_trigger_redirect()}.
2226	2460	*/
2227	2461	public static function maybe_trigger_redirect_with_action( $conf_method, $form, $params, $args ) {
2228	2462	if ( is_array( $conf_method ) && 1 === count( $conf_method ) ) {
2229		- if ( 'redirect' === FrmOnSubmitHelper::get_action_type( $conf_method[0] ) ) {
	2463	+ if ( 'redirect' === FrmOnSubmitHelper::get_action_type( $conf_method[0] ) && empty( $conf_method[0]->post_content['redirect_delay'] ) ) {
2230	2464	$event = FrmOnSubmitHelper::current_event( $params );
2231	2465	FrmOnSubmitHelper::populate_on_submit_data( $form->options, $conf_method[0], $event );
2232	2466	$conf_method = 'redirect';
2233	2467	}
		@@ -2276,9 +2510,9 @@
2276	2510	unset( $extra_args['form'] );
2277	2511
2278	2512	do_action( 'frm_success_action', $args['conf_method'], $args['form'], $args['form']->options, $args['entry_id'], $extra_args );
2279	2513
2280		- $opt = ( ! isset( $args['action'] ) || $args['action'] === 'create' ) ? 'success' : 'edit';
	2514	+ $opt = ! isset( $args['action'] ) || $args['action'] === 'create' ? 'success' : 'edit';
2281	2515
2282	2516	$args['success_opt'] = $opt;
2283	2517	$args['ajax'] = ! empty( $frm_vars['ajax'] );
2284	2518
		@@ -2304,16 +2538,16 @@
2304	2538	if ( ! FrmOnSubmitHelper::form_has_migrated( $args['form'] ) ) {
2305	2539	return array();
2306	2540	}
2307	2541
2308		- // If a redirect action has already opened the URL in a new tab, we show the default message in the currect tab.
	2542	+ // If a redirect action has already opened the URL in a new tab, we show the default message in the current tab.
2309	2543	if ( ! empty( self::$redirected_in_new_tab[ $args['form']->id ] ) ) {
2310	2544	return array( FrmOnSubmitHelper::get_fallback_action_after_open_in_new_tab( $event ) );
2311	2545	}
2312	2546
2313		- $entry = FrmEntry::getOne( $args['entry_id'], true );
2314		- $actions = FrmOnSubmitHelper::get_actions( $args['form']->id );
2315		- $met_actions = array();
	2547	+ $entry = FrmEntry::getOne( $args['entry_id'], true );
	2548	+ $actions = FrmOnSubmitHelper::get_actions( $args['form']->id );
	2549	+ $met_actions = array();
2316	2550	$has_redirect = false;
2317	2551
2318	2552	foreach ( $actions as $action ) {
2319	2553	if ( ! in_array( $event, $action->post_content['event'], true ) ) {
		@@ -2326,9 +2560,10 @@
2326	2560
2327	2561	$action_type = FrmOnSubmitHelper::get_action_type( $action );
2328	2562
2329	2563	if ( 'redirect' === $action_type ) {
2330		- if ( $has_redirect ) { // Do not process because we run the first redirect action only.
	2564	+ if ( $has_redirect ) {
	2565	+ // Do not process because we run the first redirect action only.
2331	2566	continue;
2332	2567	}
2333	2568	}
2334	2569
		@@ -2341,9 +2576,9 @@
2341	2576	}
2342	2577
2343	2578	$met_actions[] = $action;
2344	2579	unset( $action );
2345		- }
	2580	+ }//end foreach
2346	2581
2347	2582	$args['event'] = $event;
2348	2583
2349	2584	/**
		@@ -2532,9 +2767,9 @@
2532	2767	add_filter( 'the_content', 'FrmFormsController::preview_content', 9999 );
2533	2768	}
2534	2769
2535	2770	$post = $old_post;
2536		- }
	2771	+ }//end if
2537	2772	}
2538	2773
2539	2774	/**
2540	2775	* @since 3.0
		@@ -2555,14 +2790,16 @@
2555	2790	$success_url = apply_filters( 'frm_redirect_url', $success_url, $args['form'], $args );
2556	2791
2557	2792	$doing_ajax = FrmAppHelper::doing_ajax();
2558	2793
2559		- if ( ! empty( $args['ajax'] ) && $doing_ajax && empty( $args['force_delay_redirect'] ) ) { // Is AJAX submit and there is just one Redirect action runs.
	2794	+ if ( ! empty( $args['ajax'] ) && $doing_ajax && empty( $args['force_delay_redirect'] ) ) {
	2795	+ // Is AJAX submit and there is just one Redirect action runs.
2560	2796	echo json_encode( self::get_ajax_redirect_response_data( $args + compact( 'success_url' ) ) );
2561	2797	wp_die();
2562	2798	}
2563	2799
2564		- if ( ! headers_sent() && empty( $args['force_delay_redirect'] ) ) { // Not AJAX submit, no headers sent, and there is just one Redirect action runs.
	2800	+ if ( ! headers_sent() && empty( $args['force_delay_redirect'] ) && empty( $args['form']->options['redirect_delay'] ) ) {
	2801	+ // Not AJAX submit, no headers sent, and there is just one Redirect action runs.
2565	2802	if ( ! empty( $args['form']->options['open_in_new_tab'] ) ) {
2566	2803	self::print_open_in_new_tab_js_with_fallback_handler( $success_url, $args );
2567	2804	self::$redirected_in_new_tab[ $args['form']->id ] = 1;
2568	2805	return;
		@@ -2568,9 +2805,10 @@
2568	2805	return;
2569	2806	}
2570	2807
2571	2808	wp_redirect( esc_url_raw( $success_url ) );
2572		- die(); // do not use wp_die or redirect fails
	2809	+ // Do not use wp_die or redirect fails.
	2810	+ die();
2573	2811	}
2574	2812
2575	2813	// Redirect with a delay.
2576	2814	self::redirect_after_submit_using_js( $args + compact( 'success_url', 'doing_ajax' ) );
		@@ -2605,28 +2843,46 @@
2605	2843	* @param array $args See {@see FrmFormsController::run_success_action()}.
2606	2844	* @return array
2607	2845	*/
2608	2846	private static function get_ajax_redirect_response_data( $args ) {
2609		- $response_data = array( 'redirect' => $args['success_url'] );
	2847	+ $response_data = array(
	2848	+ 'redirect' => $args['success_url'],
	2849	+ 'content' => '',
	2850	+ );
	2851	+ $unset_content = true;
2610	2852
	2853	+ if ( ! empty( $args['form']->options['redirect_delay'] ) ) {
	2854	+ $response_data['delay'] = $args['form']->options['redirect_delay_time'];
	2855	+ $response_data['content'] .= self::get_redirect_message( $args['success_url'], $args['form']->options['redirect_delay_msg'], $args );
	2856	+ $unset_content = false;
	2857	+ }
	2858	+
2611	2859	if ( ! empty( $args['form']->options['open_in_new_tab'] ) ) {
2612	2860	$response_data['openInNewTab'] = 1;
2613	2861
2614		- $args['message'] = FrmOnSubmitHelper::get_default_new_tab_msg();
	2862	+ // Only show open in new tab text if there is no delay.
	2863	+ if ( empty( $response_data['content'] ) ) {
	2864	+ $args['message'] = FrmOnSubmitHelper::get_default_new_tab_msg();
2615	2865
2616		- $args['form']->options['success_msg'] = $args['message'];
2617		- $args['form']->options['edit_msg'] = $args['message'];
2618		- if ( ! isset( $args['fields'] ) ) {
2619		- $args['fields'] = FrmField::get_all_for_form( $args['form']->id );
2620		- }
	2866	+ $args['form']->options['success_msg'] = $args['message'];
	2867	+ $args['form']->options['edit_msg'] = $args['message'];
	2868	+ if ( ! isset( $args['fields'] ) ) {
	2869	+ $args['fields'] = FrmField::get_all_for_form( $args['form']->id );
	2870	+ }
2621	2871
2622		- $args['message'] = self::prepare_submit_message( $args['form'], $args['entry_id'], $args );
	2872	+ $args['message'] = self::prepare_submit_message( $args['form'], $args['entry_id'], $args );
2623	2873
2624		- ob_start();
2625		- self::show_lone_success_messsage( $args );
2626		- $response_data['content'] = ob_get_clean();
	2874	+ ob_start();
	2875	+ self::show_lone_success_message( $args );
	2876	+ $response_data['content'] .= ob_get_clean();
	2877	+ $unset_content = false;
	2878	+ }//end if
2627	2879
2628	2880	$response_data['fallbackMsg'] = self::get_redirect_fallback_message( $args['success_url'], $args );
	2881	+ }//end if
	2882	+
	2883	+ if ( $unset_content && '' === $response_data['content'] ) {
	2884	+ unset( $response_data['content'] );
2629	2885	}
2630	2886
2631	2887	return $response_data;
2632	2888	}
		@@ -2638,9 +2894,9 @@
2638	2894	*
2639	2895	* @param array $args See {@see FrmFormsController::run_success_action()}.
2640	2896	*/
2641	2897	private static function redirect_after_submit_using_js( $args ) {
2642		- $success_msg = FrmOnSubmitHelper::get_default_redirect_msg();
	2898	+ $success_msg = $args['form']->options['redirect_delay_msg'];
2643	2899	$redirect_msg = self::get_redirect_message( $args['success_url'], $success_msg, $args );
2644	2900	$success_url = esc_url_raw( $args['success_url'] );
2645	2901
2646	2902	/**
		@@ -2647,11 +2903,11 @@
2647	2903	* Filters the delay time before redirecting when On Submit Redirect action is delayed.
2648	2904	*
2649	2905	* @since 6.0
2650	2906	*
2651		- * @param int $delay_time Delay time in miliseconds.
	2907	+ * @param int $delay_time Delay time in milliseconds.
2652	2908	*/
2653		- $delay_time = apply_filters( 'frm_redirect_delay_time', 8000 );
	2909	+ $delay_time = apply_filters( 'frm_redirect_delay_time', 1000 * $args['form']->options['redirect_delay_time'] );
2654	2910
2655	2911	if ( ! empty( $args['form']->options['open_in_new_tab'] ) ) {
2656	2912	$redirect_js = 'window.open("' . $success_url . '", "_blank")';
2657	2913	} else {
		@@ -2661,9 +2917,10 @@
2661	2917	add_filter( 'frm_use_wpautop', '__return_true' );
2662	2918
2663	2919	echo FrmAppHelper::maybe_kses( $redirect_msg ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
2664	2920	echo '<script>';
2665		- if ( empty( $args['doing_ajax'] ) ) { // Not AJAX submit, delay JS until window.load.
	2921	+ if ( empty( $args['doing_ajax'] ) ) {
	2922	+ // Not AJAX submit, delay JS until window.load.
2666	2923	echo 'window.onload=function(){';
2667	2924	}
2668	2925	echo 'setTimeout(function(){' . $redirect_js . '}, ' . intval( $delay_time ) . ');'; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
2669	2926	if ( empty( $args['doing_ajax'] ) ) {
		@@ -2676,11 +2933,13 @@
2676	2933	* @since 3.0
2677	2934	*
2678	2935	* @param string $success_url
2679	2936	* @param string $success_msg
2680		- * @param array $args
	2937	+ * @param array $args
2681	2938	*/
2682	2939	private static function get_redirect_message( $success_url, $success_msg, $args ) {
	2940	+ $success_msg = apply_filters( 'frm_content', $success_msg, $args['form'], $args['entry_id'] );
	2941	+ $success_msg = do_shortcode( FrmAppHelper::use_wpautop( $success_msg ) );
2683	2942	$redirect_msg = '<div class="' . esc_attr( FrmFormsHelper::get_form_style_class( $args['form'] ) ) . '"><div class="frm-redirect-msg" role="status">' . $success_msg . '<br/>' .
2684	2943	self::get_redirect_fallback_message( $success_url, $args ) .
2685	2944	'</div></div>';
2686	2945
		@@ -2736,9 +2995,9 @@
2736	2995	} else {
2737	2996	self::show_form_after_submit( $atts );
2738	2997	}
2739	2998	} else {
2740		- self::show_lone_success_messsage( $atts );
	2999	+ self::show_lone_success_message( $atts );
2741	3000	}
2742	3001	}
2743	3002
2744	3003	/**
		@@ -2777,11 +3036,10 @@
2777	3036	include FrmAppHelper::plugin_path() . '/classes/views/frm-entries/new.php';
2778	3037	}
2779	3038
2780	3039	/**
	3040	+ * @since 4.05.02
2781	3041	* @return string - 'before', 'after', or 'submit'
2782		- *
2783		- * @since 4.05.02
2784	3042	*/
2785	3043	private static function message_placement( $form, $message ) {
2786	3044	$place = 'before';
2787	3045
		@@ -2793,11 +3051,10 @@
2793	3051	}
2794	3052	}
2795	3053
2796	3054	/**
	3055	+ * @since 4.05.02
2797	3056	* @return string - 'before' or 'after'
2798		- *
2799		- * @since 4.05.02
2800	3057	*/
2801	3058	return apply_filters( 'frm_message_placement', $place, compact( 'form', 'message' ) );
2802	3059	}
2803	3060
		@@ -2831,9 +3088,9 @@
2831	3088	* Show the success message without the form
2832	3089	*
2833	3090	* @since 2.05
2834	3091	*/
2835		- private static function show_lone_success_messsage( $atts ) {
	3092	+ private static function show_lone_success_message( $atts ) {
2836	3093	global $frm_vars;
2837	3094	$values = FrmEntriesHelper::setup_new_vars( $atts['fields'], $atts['form'], true );
2838	3095	self::maybe_load_css( $atts['form'], $values['custom_style'], $frm_vars['load_css'] );
2839	3096
		@@ -2842,9 +3099,9 @@
2842	3099	$errors = array();
2843	3100	$form = $atts['form'];
2844	3101	$message = $atts['message'];
2845	3102
2846		- include( FrmAppHelper::plugin_path() . '/classes/views/frm-entries/errors.php' );
	3103	+ include FrmAppHelper::plugin_path() . '/classes/views/frm-entries/errors.php';
2847	3104	}
2848	3105
2849	3106	/**
2850	3107	* Prepare the success message before it's shown
		@@ -2964,11 +3221,13 @@
2964	3221	global $frm_vars;
2965	3222
2966	3223	FrmStylesController::enqueue_css();
2967	3224
2968		- if ( ! FrmAppHelper::is_admin() && $location != 'header' && ! empty( $frm_vars['forms_loaded'] ) ) {
	3225	+ if ( ! FrmAppHelper::is_admin() && $location !== 'header' && ! empty( $frm_vars['forms_loaded'] ) ) {
2969	3226	// load formidable js
2970	3227	wp_enqueue_script( 'formidable' );
	3228	+
	3229	+ FrmHoneypot::maybe_print_honeypot_js();
2971	3230	}
2972	3231	}
2973	3232
2974	3233	/**
		@@ -2982,12 +3241,12 @@
2982	3241	}
2983	3242
2984	3243	/**
2985	3244	* @since 2.0.8
2986		- * @return boolean
	3245	+ * @return bool
2987	3246	*/
2988	3247	private static function is_minification_on( $atts ) {
2989		- return isset( $atts['minimize'] ) && ! empty( $atts['minimize'] );
	3248	+ return ! empty( $atts['minimize'] );
2990	3249	}
2991	3250
2992	3251	/**
2993	3252	* @since 5.0.16
		@@ -3015,9 +3274,9 @@
3015	3274	* Create a page with an embedded formidable Gutenberg block.
3016	3275	*
3017	3276	* @since 5.2
3018	3277	*
3019		- * @return never
	3278	+ * @return void
3020	3279	*/
3021	3280	public static function create_page_with_shortcode() {
3022	3281	if ( ! current_user_can( 'publish_posts' ) ) {
3023	3282	die( 0 );
		@@ -3062,10 +3321,9 @@
3062	3321
3063	3322	/**
3064	3323	* @since 5.3
3065	3324	*
3066		- * @param string $content
3067		- * @param int $form_id
	3325	+ * @param int $form_id
3068	3326	* @return string
3069	3327	*/
3070	3328	private static function get_page_shortcode_content_for_form( $form_id ) {
3071	3329	$shortcode = '[formidable id="' . $form_id . '"]';
		@@ -3076,9 +3334,9 @@
3076	3334
3077	3335	/**
3078	3336	* Get page dropdown for AJAX request for embedding form in an existing page.
3079	3337	*
3080		- * @return never
	3338	+ * @return void
3081	3339	*/
3082	3340	public static function get_page_dropdown() {
3083	3341	if ( ! current_user_can( 'publish_posts' ) ) {
3084	3342	die( 0 );
		@@ -3086,9 +3344,9 @@
3086	3344
3087	3345	check_ajax_referer( 'frm_ajax', 'nonce' );
3088	3346
3089	3347	$html = FrmAppHelper::clip(
3090		- function() {
	3348	+ function () {
3091	3349	FrmAppHelper::maybe_autocomplete_pages_options(
3092	3350	array(
3093	3351	'field_name' => 'frm_page_dropdown',
3094	3352	'page_id' => '',
		@@ -3108,15 +3366,8 @@
3108	3366
3109	3367	/**
3110	3368	* @deprecated 4.0
3111	3369	*/
3112		- public static function new_form( $values = array() ) {
3113		- FrmDeprecated::new_form( $values );
3114		- }
3115		-
3116		- /**
3117		- * @deprecated 4.0
3118		- */
3119	3370	public static function create( $values = array() ) {
3120	3371	_deprecated_function( __METHOD__, '4.0', 'FrmFormsController::update' );
3121	3372	self::update( $values );
3122	3373	}
		@@ -3121,35 +3372,16 @@
3121	3372	self::update( $values );
3122	3373	}
3123	3374
3124	3375	/**
3125		- * @deprecated 3.0
3126		- * @codeCoverageIgnore
	3376	+ * Education for premium features.
	3377	+ *
	3378	+ * @since 4.05
	3379	+ * @deprecated 6.16.3
	3380	+ *
	3381	+ * @return void
3127	3382	*/
3128		- public static function bulk_create_template( $ids ) {
3129		- return FrmDeprecated::bulk_create_template( $ids );
3130		- }
3131		-
3132		- /**
3133		- * @deprecated 3.0
3134		- * @codeCoverageIgnore
3135		- */
3136		- public static function edit_key() {
3137		- FrmDeprecated::edit_key();
3138		- }
3139		-
3140		- /**
3141		- * @deprecated 3.0
3142		- * @codeCoverageIgnore
3143		- */
3144		- public static function edit_description() {
3145		- FrmDeprecated::edit_description();
3146		- }
3147		-
3148		- /**
3149		- * @deprecated 4.08
3150		- * @since 3.06
3151		- */
3152		- public static function add_new() {
3153		- _deprecated_function( __FUNCTION__, '4.08' );
	3383	+ public static function add_form_style_tab_options() {
	3384	+ _deprecated_function( __METHOD__, '6.16.3' );
	3385	+ include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/add_form_style_options.php';
3154	3386	}
3155	3387	}