← All changes | classes/controllers/FrmFormsController.php +289 -811 6.26 → 6.8.1 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 current tab.
	10	+ * message in the currect tab.
11	11	*
12	12	* @since 6.2
13	13	*
14	14	* @var array Keys are form IDs and values are 1.
		@@ -14,21 +14,10 @@
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		-
28	18	public static function menu() {
29	19	$menu_label = __( 'Forms', 'formidable' );
30		-
31	20	if ( ! FrmAppHelper::pro_is_installed() ) {
32	21	$menu_label .= ' (Lite)';
33	22	}
34	23	add_submenu_page( 'formidable', 'Formidable | ' . $menu_label, $menu_label, 'frm_view_forms', 'formidable', 'FrmFormsController::route' );
		@@ -65,12 +54,12 @@
65	54	*/
66	55	public static function logic_tip() {
67	56	$images_url = FrmAppHelper::plugin_url() . '/images/';
68	57	$data_message = __( 'Only show the fields you need and create branching forms. Upgrade to get conditional logic and question branching.', 'formidable' );
69		- $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' ) . '"/>';
	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' ) . '"/>';
70	59	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">';
71	60	esc_html_e( 'Conditional Logic', 'formidable' );
72		- FrmAppHelper::icon_by_class( 'frmfont frm_arrowdown8_icon', array( 'aria-hidden' => 'true' ) );
	61	+ FrmAppHelper::icon_by_class( 'frmfont frm_arrowdown6_icon', array( 'aria-hidden' => 'true' ) );
73	62	echo '</a>';
74	63	}
75	64
76	65	/**
		@@ -77,12 +66,8 @@
77	66	* By default, Divi processes form shortcodes on the edit post page.
78	67	* Now that won't do.
79	68	*
80	69	* @since 3.01
81		- *
82		- * @param array $shortcodes List of shortcodes to process.
83		- *
84		- * @return array
85	70	*/
86	71	public static function prevent_divi_conflict( $shortcodes ) {
87	72	$shortcodes[] = 'formidable';
88	73
		@@ -97,14 +82,12 @@
97	82
98	83	$message = '';
99	84	$params = FrmForm::list_page_params();
100	85	$errors = self::process_bulk_form_actions( array() );
101		-
102	86	if ( isset( $errors['message'] ) ) {
103	87	$message = $errors['message'];
104	88	unset( $errors['message'] );
105	89	}
106		-
107	90	$errors = apply_filters( 'frm_admin_list_form_action', $errors );
108	91
109	92	self::display_forms_list( $params, $message, $errors );
110	93	}
		@@ -113,25 +96,15 @@
113	96	* Create the default email action
114	97	*
115	98	* @since 2.02.11
116	99	*
117		- * @param int|object $form
118		- *
119		- * @return void
	100	+ * @param object|int $form
120	101	*/
121	102	private static function create_default_email_action( $form ) {
122	103	FrmForm::maybe_get_form( $form );
123		-
124		- if ( ! is_object( $form ) ) {
125		- return;
126		- }
127		-
128	104	$create_email = apply_filters( 'frm_create_default_email_action', true, $form );
129	105
130	106	if ( $create_email ) {
131		- /**
132		- * @var FrmFormAction
133		- */
134	107	$action_control = FrmFormActionsController::get_form_actions( 'email' );
135	108	$action_control->create( $form->id );
136	109	}
137	110	}
		@@ -140,19 +113,13 @@
140	113	* Create the default On submit action
141	114	*
142	115	* @since 6.0.0
143	116	*
144		- * @param int|object $form Form object or ID.
145		- *
146		- * @return void
	117	+ * @param object|int $form Form object or ID.
147	118	*/
148	119	private static function create_default_on_submit_action( $form ) {
149	120	FrmForm::maybe_get_form( $form );
150	121
151		- if ( ! is_object( $form ) ) {
152		- return;
153		- }
154		-
155	122	/**
156	123	* Enable or disable the default On Submit action.
157	124	*
158	125	* @since 6.0.0
		@@ -162,70 +129,21 @@
162	129	*/
163	130	$create = apply_filters( 'frm_create_default_on_submit_action', true, $form );
164	131
165	132	if ( $create ) {
166		- /**
167		- * @var FrmFormAction
168		- */
169	133	$action_control = FrmFormActionsController::get_form_actions( FrmOnSubmitAction::$slug );
170	134	$action_control->create( $form->id );
171	135	}
172	136	}
173	137
174		- /**
175		- * Creates submit button field.
176		- *
177		- * @since 6.9
178		- *
179		- * @param int|object $form Form ID or object.
180		- *
181		- * @return void
182		- */
183		- private static function create_submit_button_field( $form ) {
184		- FrmForm::maybe_get_form( $form );
185		-
186		- if ( ! is_object( $form ) ) {
187		- return;
188		- }
189		-
190		- if ( FrmSubmitHelper::get_submit_field( $form->id ) ) {
191		- // Do not create submit button field if it exists.
192		- return;
193		- }
194		-
195		- FrmField::create(
196		- array(
197		- 'type' => FrmSubmitHelper::FIELD_TYPE,
198		- 'name' => __( 'Submit', 'formidable' ),
199		- 'field_order' => FrmSubmitHelper::DEFAULT_ORDER,
200		- 'form_id' => $form->id,
201		- 'field_options' => FrmFieldsHelper::get_default_field_options( FrmSubmitHelper::FIELD_TYPE ),
202		- 'description' => '',
203		- 'default_value' => '',
204		- 'options' => array(),
205		- )
206		- );
207		- }
208		-
209		- /**
210		- * @param array|false $values
211		- *
212		- * @return void
213		- */
214	138	public static function edit( $values = false ) {
215	139	FrmAppHelper::permission_check( 'frm_edit_forms' );
216	140
217	141	$id = isset( $values['id'] ) ? absint( $values['id'] ) : FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
218	142
219		- self::get_edit_vars( $id );
	143	+ return self::get_edit_vars( $id );
220	144	}
221	145
222		- /**
223		- * @param mixed $id
224		- * @param string $message
225		- *
226		- * @return void
227		- */
228	146	public static function settings( $id = false, $message = '' ) {
229	147	FrmAppHelper::permission_check( 'frm_edit_forms' );
230	148
231	149	if ( ! $id || ! is_numeric( $id ) ) {
		@@ -233,9 +151,9 @@
233	151	}
234	152
235	153	FrmOnSubmitHelper::maybe_migrate_submit_settings_to_action( $id );
236	154
237		- self::get_settings_vars( $id, array(), $message );
	155	+ return self::get_settings_vars( $id, array(), $message );
238	156	}
239	157
240	158	public static function update_settings() {
241	159	FrmAppHelper::permission_check( 'frm_edit_forms' );
		@@ -242,9 +160,9 @@
242	160	$process_form = FrmAppHelper::get_post_param( 'process_form', '', 'sanitize_text_field' );
243	161
244	162	if ( ! wp_verify_nonce( $process_form, 'process_form_nonce' ) ) {
245	163	$frm_settings = FrmAppHelper::get_settings();
246		- $error_args = array(
	164	+ $error_args = array(
247	165	'title' => __( 'Verification failed', 'formidable' ),
248	166	'body' => $frm_settings->admin_permission,
249	167	'cancel_text' => __( 'Cancel', 'formidable' ),
250	168	);
		@@ -253,14 +171,13 @@
253	171	}
254	172
255	173	$id = FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
256	174
257		- $errors = FrmForm::validate( $_POST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
	175	+ $errors = FrmForm::validate( $_POST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
258	176	$warnings = FrmFormsHelper::check_for_warnings( $_POST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
259	177
260	178	if ( count( $errors ) > 0 ) {
261		- self::get_settings_vars( $id, $errors, compact( 'warnings' ) );
262		- return;
	179	+ return self::get_settings_vars( $id, $errors, compact( 'warnings' ) );
263	180	}
264	181
265	182	do_action( 'frm_before_update_form_settings', $id );
266	183
		@@ -268,9 +185,8 @@
268	185
269	186	FrmForm::update( $id, $_POST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
270	187
271	188	$antispam_is_on = ! empty( $_POST['options']['antispam'] ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
272		-
273	189	if ( $antispam_is_on !== $antispam_was_on ) {
274	190	FrmAntiSpam::clear_caches();
275	191	}
276	192
		@@ -275,14 +191,13 @@
275	191	}
276	192
277	193	$message = __( 'Settings Successfully Updated', 'formidable' );
278	194
279		- self::get_settings_vars( $id, array(), compact( 'message', 'warnings' ) );
	195	+ return self::get_settings_vars( $id, array(), compact( 'message', 'warnings' ) );
280	196	}
281	197
282	198	/**
283	199	* @param int $form_id
284		- *
285	200	* @return bool
286	201	*/
287	202	private static function antispam_was_on( $form_id ) {
288	203	$form = FrmForm::getOne( $form_id );
		@@ -288,13 +203,8 @@
288	203	$form = FrmForm::getOne( $form_id );
289	204	return ! empty( $form->options['antispam'] );
290	205	}
291	206
292		- /**
293		- * @param array $values
294		- *
295		- * @return void
296		- */
297	207	public static function update( $values = array() ) {
298	208	if ( empty( $values ) ) {
299	209	$values = $_POST; // phpcs:ignore WordPress.Security.NonceVerification.Missing
300	210	}
		@@ -305,9 +215,8 @@
305	215	}
306	216
307	217	$errors = FrmForm::validate( $values );
308	218	$permission_error = FrmAppHelper::permission_nonce_error( 'frm_edit_forms', 'frm_save_form', 'frm_save_form_nonce' );
309		-
310	219	if ( $permission_error !== false ) {
311	220	$errors['form'] = $permission_error;
312	221	}
313	222
		@@ -313,58 +222,42 @@
313	222
314	223	$id = isset( $values['id'] ) ? absint( $values['id'] ) : FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
315	224
316	225	if ( count( $errors ) > 0 ) {
317		- self::get_edit_vars( $id, $errors );
318		- return;
319		- }
	226	+ return self::get_edit_vars( $id, $errors );
	227	+ } else {
	228	+ self::maybe_remove_draft_option_from_fields( $id );
320	229
321		- self::maybe_remove_draft_option_from_fields( $id );
	230	+ FrmForm::update( $id, $values );
	231	+ $message = __( 'Form was successfully updated.', 'formidable' );
322	232
323		- FrmForm::update( $id, $values );
324		- $message = __( 'Form was successfully updated.', 'formidable' );
	233	+ if ( self::is_too_long( $values ) ) {
	234	+ $message .= '<br/> ' . sprintf(
	235	+ /* translators: %1$s: Start link HTML, %2$s: end link HTML */
	236	+ __( 'However, your form is very long and may be %1$sreaching server limits%2$s.', 'formidable' ),
	237	+ '<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">',
	238	+ '</a>'
	239	+ );
	240	+ }
325	241
326		- if ( self::is_too_long( $values ) ) {
327		- $message .= '<br/> ' . sprintf(
328		- /* translators: %1$s: Start link HTML, %2$s: end link HTML */
329		- __( 'However, your form is very long and may be %1$sreaching server limits%2$s.', 'formidable' ),
330		- '<a href="' . esc_url( self::get_form_too_long_docs_url() ) . '" target="_blank" rel="noopener">',
331		- '</a>'
332		- );
333		- }
	242	+ if ( defined( 'DOING_AJAX' ) ) {
	243	+ wp_die( FrmAppHelper::kses( $message, array( 'a' ) ) ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
	244	+ }
334	245
335		- if ( defined( 'DOING_AJAX' ) ) {
336		- wp_die( FrmAppHelper::kses( $message, array( 'a' ) ) ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
337		- }
338		-
339		- self::get_edit_vars( $id, array(), $message );
	246	+ return self::get_edit_vars( $id, array(), $message );
	247	+ }//end if
340	248	}
341	249
342	250	/**
343		- * @since 6.25.1
344		- *
345		- * @return string
346		- */
347		- private static function get_form_too_long_docs_url() {
348		- $utm = array(
349		- 'campaign' => 'builder',
350		- 'content' => 'form-too-long',
351		- );
352		- return FrmAppHelper::admin_upgrade_link( $utm, 'knowledgebase/i-have-a-long-form-why-did-the-options-at-the-end-of-the-form-stop-saving/' );
353		- }
354		-
355		- /**
356	251	* Remove the draft flag from any new fields from this current session.
357	252	*
358	253	* @since 6.8
359	254	*
360	255	* @param int $form_id
361		- *
362	256	* @return void
363	257	*/
364	258	private static function maybe_remove_draft_option_from_fields( $form_id ) {
365	259	$draft_field_ids_csv = FrmAppHelper::get_post_param( 'draft_fields', '', 'sanitize_text_field' );
366		-
367	260	if ( ! $draft_field_ids_csv ) {
368	261	// If the draft_fields input is empty there are no new fields in the session.
369	262	return;
370	263	}
		@@ -369,9 +262,8 @@
369	262	return;
370	263	}
371	264
372	265	$draft_field_ids = array_filter( explode( ',', $draft_field_ids_csv ), 'is_numeric' );
373		-
374	266	if ( ! $draft_field_ids ) {
375	267	// Exit early if the draft fields input is invalid. It should be a CSV of integer values.
376	268	return;
377	269	}
		@@ -376,9 +268,8 @@
376	268	return;
377	269	}
378	270
379	271	$draft_field_rows = FrmFieldsHelper::get_draft_field_results( $form_id, $draft_field_ids );
380		-
381	272	foreach ( $draft_field_rows as $row ) {
382	273	$row->field_options['draft'] = 0;
383	274	FrmField::update( $row->id, array( 'field_options' => $row->field_options ) );
384	275	}
		@@ -389,15 +280,35 @@
389	280	* If it's missing, it means other values at the end of the form
390	281	* were likely not saved either.
391	282	*
392	283	* @since 3.06.01
	284	+ */
	285	+ private static function is_too_long( $values ) {
	286	+ return ( ! isset( $values['frm_end'] ) ) || empty( $values['frm_end'] );
	287	+ }
	288	+
	289	+ /**
	290	+ * Redirect to the url for creating from a template
	291	+ * Also delete the current form
393	292	*
394		- * @param array $values
395		- *
396		- * @return bool
	293	+ * @since 2.0
	294	+ * @deprecated 3.06
397	295	*/
398		- private static function is_too_long( $values ) {
399		- return empty( $values['frm_end'] );
	296	+ public static function _create_from_template() {
	297	+ _deprecated_function( __FUNCTION__, '3.06' );
	298	+
	299	+ FrmAppHelper::permission_check( 'frm_edit_forms' );
	300	+ check_ajax_referer( 'frm_ajax', 'nonce' );
	301	+
	302	+ $current_form = FrmAppHelper::get_param( 'this_form', '', 'get', 'absint' );
	303	+ $template_id = FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
	304	+
	305	+ if ( $current_form ) {
	306	+ FrmForm::destroy( $current_form );
	307	+ }
	308	+
	309	+ echo esc_url_raw( admin_url( 'admin.php?page=formidable&frm_action=duplicate&id=' . absint( $template_id ) ) );
	310	+ wp_die();
400	311	}
401	312
402	313	public static function duplicate() {
403	314	FrmAppHelper::permission_check( 'frm_edit_forms' );
		@@ -414,10 +325,10 @@
414	325	$message = 'form_duplicate_error';
415	326
416	327	if ( $form ) {
417	328	$new_template = FrmAppHelper::simple_get( 'new_template' ) ? '&new_template=true' : '';
418		- $url = admin_url( 'admin.php?page=formidable&frm_action=edit&id=' . absint( $form ) . $new_template );
419		- $message = 'form_duplicated';
	329	+ $url = admin_url( 'admin.php?page=formidable&frm_action=edit&id=' . absint( $form ) . $new_template );
	330	+ $message = 'form_duplicated';
420	331	}
421	332
422	333	$url .= '&message=' . $message;
423	334
		@@ -425,26 +336,20 @@
425	336	exit();
426	337	}
427	338
428	339	/**
429		- * @return string|null
	340	+ * @return string
430	341	*/
431	342	public static function page_preview() {
432	343	$params = FrmForm::list_page_params();
433		-
434		- if ( ! $params['form'] || is_numeric( $params['form'] ) ) {
435		- return null;
	344	+ if ( ! $params['form'] ) {
	345	+ return;
436	346	}
437	347
438		- self::maybe_block_preview( $params['form'] );
439		-
440	348	$form = FrmForm::getOne( $params['form'] );
441		-
442		- if ( ! $form ) {
443		- return null;
	349	+ if ( $form ) {
	350	+ return self::show_form( $form->id, '', 'auto', 'auto' );
444	351	}
445		-
446		- return self::show_form( $form->id, '', 'auto', 'auto' );
447	352	}
448	353
449	354	/**
450	355	* @since 3.0
		@@ -451,19 +356,9 @@
451	356	*
452	357	* @return void
453	358	*/
454	359	public static function show_page_preview() {
455		- $preview = self::page_preview();
456		-
457		- if ( is_null( $preview ) ) {
458		- wp_die(
459		- '<h1>' . esc_html__( 'Form key is invalid', 'formidable' ) . '</h1>',
460		- '<p>' . esc_html__( 'Form key is invalid', 'formidable' ) . '</p>',
461		- 404
462		- );
463		- }
464		-
465		- echo $preview; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
	360	+ echo self::page_preview(); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
466	361	}
467	362
468	363	/**
469	364	* @return void
		@@ -474,19 +369,9 @@
474	369
475	370	global $frm_vars;
476	371	$frm_vars['preview'] = true;
477	372
478		- // print_emoji_styles is deprecated.
479		- remove_action( 'wp_print_styles', 'print_emoji_styles' );
480		-
481		- if ( FrmTestModeController::should_add_test_mode_container() ) {
482		- do_action( 'frm_test_mode_init' );
483		- add_action( 'wp_enqueue_scripts', 'FrmTestModeController::register_and_enqueue_required_scripts' );
484		- add_filter( 'frm_filter_final_form', 'FrmTestModeController::maybe_add_test_mode_container', 99 );
485		- }
486		-
487	373	$include_theme = FrmAppHelper::get_param( 'theme', '', 'get', 'absint' );
488		-
489	374	if ( $include_theme ) {
490	375	self::set_preview_query();
491	376	self::load_theme_preview();
492	377	} else {
		@@ -509,9 +394,8 @@
509	394	'post_type' => 'page',
510	395	);
511	396
512	397	$page_for_posts = get_option( 'page_for_posts' );
513		-
514	398	if ( is_numeric( $page_for_posts ) ) {
515	399	// Avoid querying for the "Posts Page" or "Blog Page" so we don't display 10 forms.
516	400	$page_query['post__not_in'] = array( $page_for_posts );
517	401	}
		@@ -516,15 +400,13 @@
516	400	$page_query['post__not_in'] = array( $page_for_posts );
517	401	}
518	402
519	403	$random_page = get_posts( $page_query );
520		-
521	404	if ( ! $random_page ) {
522	405	return;
523	406	}
524	407
525	408	$random_page = reset( $random_page );
526		-
527	409	if ( ! is_a( $random_page, 'WP_Post' ) ) {
528	410	// The return type can also be int.
529	411	return;
530	412	}
		@@ -546,9 +428,8 @@
546	428	*
547	429	* @since 5.5.2
548	430	*
549	431	* @param WP_Post $page The page object.
550		- *
551	432	* @return void
552	433	*/
553	434	private static function set_post_global( $page ) {
554	435	global $post;
		@@ -556,10 +437,8 @@
556	437	}
557	438
558	439	/**
559	440	* @since 3.0
560		- *
561		- * @return void
562	441	*/
563	442	private static function load_theme_preview() {
564	443	add_filter( 'wp_title', 'FrmFormsController::preview_title', 9999 );
565	444	add_filter( 'the_title', 'FrmFormsController::preview_page_title', 9999 );
		@@ -581,9 +460,8 @@
581	460	*
582	461	* @since 6.5.2
583	462	*
584	463	* @param array $classes The body classes list.
585		- *
586	464	* @return array
587	465	*/
588	466	public static function preview_block_theme_body_classnames( $classes ) {
589	467	$classes[] = 'has-global-padding';
		@@ -592,10 +470,8 @@
592	470
593	471	/**
594	472	* Not every theme supports get_template_part( 'page' ).
595	473	* When this is not supported, false is returned, and we can handle a fallback.
596		- *
597		- * @return void
598	474	*/
599	475	private static function fallback_when_page_template_part_is_not_supported_by_theme() {
600	476	if ( have_posts() ) {
601	477	the_post();
		@@ -607,12 +483,8 @@
607	483	echo '<div class="container entry-content">';
608	484	the_content();
609	485	echo '</div>';
610	486
611		- // Prevent extra unexpected forms in the footer.
612		- // For some reason this happens in the Twenty Twenty Five theme.
613		- add_filter( 'frm_filter_final_form', '__return_empty_string' );
614		-
615	487	self::get_template( 'footer' );
616	488	}
617	489	}
618	490
		@@ -617,14 +489,12 @@
617	489	}
618	490
619	491	/**
620	492	* Calls core function to get a template part if it doesn't cause deprecation warnings. Otherwise skips the deprecation function call
621		- * and renders required html fragments calling required functions.
	493	+ * and renders required html fragements calling required functions.
622	494	*
623	495	* @since 6.7.1
624		- *
625	496	* @param string $template
626		- *
627	497	* @return void
628	498	*/
629	499	private static function get_template( $template ) {
630	500	if ( self::should_try_getting_template( $template ) ) {
		@@ -645,11 +515,9 @@
645	515	/**
646	516	* Returns true if calling a template function doesn't trigger deprecation warnings.
647	517	*
648	518	* @since 6.7.1
649		- *
650	519	* @param string $template
651		- *
652	520	* @return bool
653	521	*/
654	522	private static function should_try_getting_template( $template ) {
655	523	$stylesheet_path = get_stylesheet_directory();
		@@ -663,12 +531,8 @@
663	531	/**
664	532	* Set the page title for the theme preview page
665	533	*
666	534	* @since 3.0
667		- *
668		- * @param string $title
669		- *
670		- * @return string
671	535	*/
672	536	public static function preview_page_title( $title ) {
673	537	if ( in_the_loop() ) {
674	538	$title = self::preview_title( $title );
		@@ -677,15 +541,11 @@
677	541	return $title;
678	542	}
679	543
680	544	/**
681		- * Set the page title for the theme preview page.
	545	+ * Set the page title for the theme preview page
682	546	*
683	547	* @since 3.0
684		- *
685		- * @param string $title
686		- *
687		- * @return string
688	548	*/
689	549	public static function preview_title( $title ) {
690	550	return __( 'Form Preview', 'formidable' );
691	551	}
		@@ -695,9 +555,8 @@
695	555	*
696	556	* @since 3.0
697	557	*
698	558	* @param string $content
699		- *
700	559	* @return string
701	560	*/
702	561	public static function preview_content( $content ) {
703	562	if ( in_the_loop() ) {
		@@ -712,92 +571,23 @@
712	571	/**
713	572	* @since 3.0
714	573	*/
715	574	private static function load_direct_preview() {
	575	+ header( 'Content-Type: text/html; charset=' . get_option( 'blog_charset' ) );
	576	+
716	577	$key = FrmAppHelper::simple_get( 'form', 'sanitize_title' );
717		-
718	578	if ( $key == '' ) {
719	579	$key = FrmAppHelper::get_post_param( 'form', '', 'sanitize_title' );
720	580	}
721	581
722		- if ( ! $key ) {
723		- $error = __( 'Form key is missing', 'formidable' );
724		- wp_die(
725		- '<h1>' . esc_html( $error ) . '</h1>',
726		- '<p>' . esc_html( $error ) . '</p>',
727		- 404
728		- );
729		- }
730		-
731		- self::maybe_block_preview( $key );
732		-
733	582	$form = FrmForm::getAll( array( 'form_key' => $key ), '', 1 );
734		-
735		- if ( ! $form ) {
736		- $error = __( 'Form does not exist', 'formidable' );
737		- wp_die(
738		- '<h1>' . esc_html( $error ) . '</h1>',
739		- '<p>' . esc_html( $error ) . '</p>',
740		- 404
741		- );
	583	+ if ( empty( $form ) ) {
	584	+ $form = FrmForm::getAll( array(), '', 1 );
742	585	}
743	586
744		- header( 'Content-Type: text/html; charset=' . get_option( 'blog_charset' ) );
745		-
746		- self::fix_deprecated_null_param_warning();
747		-
748		- require FrmAppHelper::plugin_path() . '/classes/views/frm-entries/direct.php';
	587	+ require( FrmAppHelper::plugin_path() . '/classes/views/frm-entries/direct.php' );
749	588	}
750	589
751		- /**
752		- * Block the form preview for the contact form by default if the user cannot view forms.
753		- * This is to prevent the contact form being exploited.
754		- * Since this form is added by default and every site uses the same key, it is too easy
755		- * to guess this form.
756		- *
757		- * @since 6.20
758		- *
759		- * @param string $form_key Form key.
760		- *
761		- * @return void
762		- */
763		- public static function maybe_block_preview( $form_key ) {
764		- if ( FrmFormsHelper::should_block_preview( $form_key ) ) {
765		- $error = __( 'You do not have permission to view this form', 'formidable' );
766		- wp_die(
767		- '<h1>' . esc_html( $error ) . '</h1>',
768		- '<p>' . esc_html( $error ) . '</p>',
769		- 403
770		- );
771		- }
772		- }
773		-
774		- /**
775		- * Some themes have a null $src value.
776		- * This function adds a filter to ensure that $src is not null.
777		- * WP will call str_starts_with with the null value triggering a deprecated message otherwise.
778		- *
779		- * @since 6.10
780		- *
781		- * @return void
782		- */
783		- private static function fix_deprecated_null_param_warning() {
784		- add_filter(
785		- 'script_loader_src',
786		- /**
787		- * @param string|null $src
788		- *
789		- * @return string
790		- */
791		- function ( $src ) {
792		- if ( is_null( $src ) ) {
793		- $src = '';
794		- }
795		- return $src;
796		- }
797		- );
798		- }
799		-
800	590	public static function untrash() {
801	591	self::change_form_status( 'untrash' );
802	592	}
803	593
		@@ -802,9 +592,8 @@
802	592	}
803	593
804	594	/**
805	595	* @param array $ids
806		- *
807	596	* @return string
808	597	*/
809	598	public static function bulk_untrash( $ids ) {
810	599	FrmAppHelper::permission_check( 'frm_edit_forms' );
		@@ -865,11 +654,10 @@
865	654	// Check nonce url.
866	655	check_admin_referer( $status . '_form_' . $params['id'] );
867	656
868	657	$count = 0;
869		-
870	658	if ( FrmForm::set_status( $params['id'], $available_status[ $status ]['new_status'] ) ) {
871		- ++$count;
	659	+ $count ++;
872	660	}
873	661
874	662	$form_type = FrmAppHelper::get_simple_request(
875	663	array(
		@@ -881,9 +669,9 @@
881	669	/* translators: %1$s: Number of forms */
882	670	$available_status['untrash']['message'] = sprintf( _n( '%1$s form restored from the Trash.', '%1$s forms restored from the Trash.', $count, 'formidable' ), $count );
883	671
884	672	/* translators: %1$s: Number of forms, %2$s: Start link HTML, %3$s: End link HTML */
885		- $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>' );
	673	+ $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>' );
886	674
887	675	$message = $available_status[ $status ]['message'];
888	676
889	677	self::display_forms_list( $params, $message );
		@@ -888,28 +676,18 @@
888	676
889	677	self::display_forms_list( $params, $message );
890	678	}
891	679
892		- /**
893		- * @param array $ids
894		- *
895		- * @return string
896		- */
897	680	public static function bulk_trash( $ids ) {
898	681	FrmAppHelper::permission_check( 'frm_delete_forms' );
899	682
900	683	$count = 0;
901		-
902	684	foreach ( $ids as $id ) {
903	685	if ( FrmForm::trash( $id ) ) {
904		- ++$count;
	686	+ $count ++;
905	687	}
906	688	}
907	689
908		- if ( ! $count ) {
909		- return '';
910		- }
911		-
912	690	$current_page = FrmAppHelper::get_simple_request(
913	691	array(
914	692	'param' => 'form_type',
915	693	'type' => 'request',
		@@ -934,11 +712,10 @@
934	712	// Check nonce url.
935	713	check_admin_referer( 'destroy_form_' . $params['id'] );
936	714
937	715	$count = 0;
938		-
939	716	if ( FrmForm::destroy( $params['id'] ) ) {
940		- ++$count;
	717	+ $count ++;
941	718	}
942	719
943	720	/* translators: %1$s: Number of forms */
944	721	$message = sprintf( _n( '%1$s Form Permanently Deleted', '%1$s Forms Permanently Deleted', $count, 'formidable' ), $count );
		@@ -945,23 +722,16 @@
945	722
946	723	self::display_forms_list( $params, $message );
947	724	}
948	725
949		- /**
950		- * @param array $ids
951		- *
952		- * @return string
953		- */
954	726	public static function bulk_destroy( $ids ) {
955	727	FrmAppHelper::permission_check( 'frm_delete_forms' );
956	728
957	729	$count = 0;
958		-
959	730	foreach ( $ids as $id ) {
960	731	$d = FrmForm::destroy( $id );
961		-
962	732	if ( $d ) {
963		- ++$count;
	733	+ $count ++;
964	734	}
965	735	}
966	736
967	737	if ( $count ) {
		@@ -977,9 +747,8 @@
977	747	*/
978	748	public static function delete_all() {
979	749	// Check nonce url.
980	750	$permission_error = FrmAppHelper::permission_nonce_error( 'frm_delete_forms', '_wpnonce', 'bulk-toplevel_page_formidable' );
981		-
982	751	if ( $permission_error !== false ) {
983	752	self::display_forms_list( array(), '', array( $permission_error ) );
984	753
985	754	return;
		@@ -987,9 +756,9 @@
987	756
988	757	$count = FrmForm::scheduled_delete( time() );
989	758	$url = remove_query_arg( array( 'delete_all' ) );
990	759
991		- $url .= '&message=forms_permanently_deleted&forms_deleted=' . $count;
	760	+ $url .= '&message=forms_permanently_deleted&forms_deleted=' . $count;
992	761
993	762	wp_safe_redirect( $url );
994	763	die();
995	764	}
		@@ -1005,9 +774,9 @@
1005	774
1006	775	$new_values = self::get_modal_values();
1007	776	$new_values['form_key'] = $new_values['name'];
1008	777	$new_values['options'] = array(
1009		- 'antispam' => 1,
	778	+ 'antispam' => 1,
1010	779	'on_submit_migrated' => 1,
1011	780	);
1012	781
1013	782	/**
		@@ -1026,9 +795,8 @@
1026	795	* @param int $form_id
1027	796	*/
1028	797	do_action( 'frm_build_new_form', $form_id );
1029	798
1030		- self::create_submit_button_field( $form_id );
1031	799	self::create_default_on_submit_action( $form_id );
1032	800	self::create_default_email_action( $form_id );
1033	801
1034	802	$response = array(
		@@ -1042,10 +810,8 @@
1042	810	/**
1043	811	* Before creating a new form, get the name and description from the modal.
1044	812	*
1045	813	* @since 4.0
1046		- *
1047		- * @return array<string,string>
1048	814	*/
1049	815	public static function get_modal_values() {
1050	816	$name = FrmAppHelper::get_param( 'name', '', 'post', 'sanitize_text_field' );
1051	817	$desc = FrmAppHelper::get_param( 'desc', '', 'post', 'sanitize_textarea_field' );
		@@ -1060,24 +826,17 @@
1060	826	* Inserts Formidable button
1061	827	* Hook exists since 2.5.0
1062	828	*
1063	829	* @since 2.0.15
1064		- *
1065		- * @return void
1066	830	*/
1067	831	public static function insert_form_button() {
1068	832	if ( current_user_can( 'frm_view_forms' ) ) {
1069		- // Store the result in memory and re-use it when this function is called multiple times.
1070		- // This helps speed up the form builder when there are a lot of HTML fields, where this
1071		- // button is inserted once per HTML field.
1072		- // In a form with 66 HTML fields, this saves 0.5 seconds on page load time, tested locally.
1073		- if ( ! isset( self::$formidable_tinymce_button ) ) {
1074		- FrmAppHelper::load_admin_wide_js();
1075		- $menu_name = FrmAppHelper::get_menu_name();
1076		- $icon = apply_filters( 'frm_media_icon', FrmAppHelper::svg_logo() );
1077		- 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>';
1078		- }
1079		- echo self::$formidable_tinymce_button; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
	833	+ FrmAppHelper::load_admin_wide_js();
	834	+ $menu_name = FrmAppHelper::get_menu_name();
	835	+ $icon = apply_filters( 'frm_media_icon', FrmAppHelper::svg_logo() );
	836	+ 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' ) . '">' .
	837	+ FrmAppHelper::kses( $icon, 'all' ) . // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
	838	+ ' ' . esc_html( $menu_name ) . '</a>';
1080	839	}
1081	840	}
1082	841
1083	842	/**
		@@ -1121,9 +880,8 @@
1121	880	private static function should_insert_form_popup() {
1122	881	if ( FrmAppHelper::is_form_builder_page() ) {
1123	882	return true;
1124	883	}
1125		-
1126	884	$page = basename( FrmAppHelper::get_server_value( 'PHP_SELF' ) );
1127	885	return in_array( $page, array( 'post.php', 'page.php', 'page-new.php', 'post-new.php' ), true );
1128	886	}
1129	887
		@@ -1131,9 +889,8 @@
1131	889	FrmAppHelper::permission_check( 'frm_view_forms' );
1132	890	check_ajax_referer( 'frm_ajax', 'nonce' );
1133	891
1134	892	$shortcode = FrmAppHelper::get_post_param( 'shortcode', '', 'sanitize_text_field' );
1135		-
1136	893	if ( empty( $shortcode ) ) {
1137	894	wp_die();
1138	895	}
1139	896
		@@ -1159,9 +916,8 @@
1159	916	'label' => __( 'Minimize form HTML', 'formidable' ),
1160	917	),
1161	918	);
1162	919	}
1163		-
1164	920	$opts = apply_filters( 'frm_sc_popup_opts', $opts, $shortcode );
1165	921
1166	922	if ( isset( $opts['form_id'] ) && is_string( $opts['form_id'] ) ) {
1167	923	// allow other shortcodes to use the required form id option
		@@ -1168,9 +924,9 @@
1168	924	$form_id = $opts['form_id'];
1169	925	unset( $opts['form_id'] );
1170	926	}
1171	927
1172		- include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/shortcode_opts.php';
	928	+ include( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/shortcode_opts.php' );
1173	929
1174	930	echo '</div>';
1175	931
1176	932	wp_die();
		@@ -1181,9 +937,8 @@
1181	937	*
1182	938	* @param array $params
1183	939	* @param string $message
1184	940	* @param array $errors
1185		- *
1186	941	* @return void
1187	942	*/
1188	943	public static function display_forms_list( $params = array(), $message = '', $errors = array() ) {
1189	944	FrmAppHelper::permission_check( 'frm_view_forms' );
		@@ -1206,39 +961,27 @@
1206	961
1207	962	$wp_list_table->prepare_items();
1208	963
1209	964	$total_pages = $wp_list_table->get_pagination_arg( 'total_pages' );
1210		-
1211	965	if ( $pagenum > $total_pages && $total_pages > 0 ) {
1212	966	wp_redirect( esc_url_raw( add_query_arg( 'paged', $total_pages ) ) );
1213	967	die();
1214	968	}
1215	969
1216		- $inbox = new FrmInbox();
1217		- $error = $inbox->check_for_error();
1218		-
1219		- if ( $error ) {
1220		- $show_messages = array( $error['subject'] . '. ' . $error['message'] );
1221		- }
1222		-
1223	970	require FrmAppHelper::plugin_path() . '/classes/views/frm-forms/list.php';
1224	971	}
1225	972
1226	973	/**
1227	974	* @param array<string,string> $columns
1228		- *
1229	975	* @return array<string,string>
1230	976	*/
1231	977	public static function get_columns( $columns ) {
1232		- $columns['cb'] = '<input type="checkbox" />';
1233		- $columns['name'] = esc_html__( 'Form Title', 'formidable' );
1234		- $columns['entries'] = esc_html__( 'Entries', 'formidable' );
1235		- $columns['id'] = 'ID';
1236		- $columns['form_key'] = esc_html__( 'Key', 'formidable' );
1237		-
1238		- if ( 'trash' !== FrmAppHelper::simple_get( 'form_type' ) ) {
1239		- $columns['shortcode'] = esc_html__( 'Actions', 'formidable' );
1240		- }
	978	+ $columns['cb'] = '<input type="checkbox" />';
	979	+ $columns['name'] = esc_html__( 'Form Title', 'formidable' );
	980	+ $columns['entries'] = esc_html__( 'Entries', 'formidable' );
	981	+ $columns['id'] = 'ID';
	982	+ $columns['form_key'] = esc_html__( 'Key', 'formidable' );
	983	+ $columns['shortcode'] = esc_html__( 'Actions', 'formidable' );
1241	984	$columns['created_at'] = esc_html__( 'Date', 'formidable' );
1242	985
1243	986	add_screen_option(
1244	987	'per_page',
		@@ -1251,11 +994,8 @@
1251	994
1252	995	return $columns;
1253	996	}
1254	997
1255		- /**
1256		- * @return array<string,string>
1257		- */
1258	998	public static function get_sortable_columns() {
1259	999	return array(
1260	1000	'id' => 'id',
1261	1001	'name' => 'name',
		@@ -1266,9 +1006,8 @@
1266	1006	}
1267	1007
1268	1008	/**
1269	1009	* @param mixed $hidden_columns
1270		- *
1271	1010	* @return array
1272	1011	*/
1273	1012	public static function hidden_columns( $hidden_columns ) {
1274	1013	if ( ! is_array( $hidden_columns ) ) {
		@@ -1289,17 +1028,10 @@
1289	1028
1290	1029	return $hidden_columns;
1291	1030	}
1292	1031
1293		- /**
1294		- * @param mixed $save
1295		- * @param string $option
1296		- * @param int|string $value
1297		- *
1298		- * @return mixed
1299		- */
1300	1032	public static function save_per_page( $save, $option, $value ) {
1301		- if ( $option === 'formidable_page_formidable_per_page' ) {
	1033	+ if ( $option == 'formidable_page_formidable_per_page' ) {
1302	1034	$save = (int) $value;
1303	1035	}
1304	1036
1305	1037	return $save;
		@@ -1304,24 +1036,16 @@
1304	1036
1305	1037	return $save;
1306	1038	}
1307	1039
1308		- /**
1309		- * @param int|string $id
1310		- * @param array $errors
1311		- * @param string $message
1312		- * @param bool $create_link
1313		- *
1314		- * @return void
1315		- */
1316	1040	private static function get_edit_vars( $id, $errors = array(), $message = '', $create_link = false ) {
1317	1041	global $frm_vars;
1318	1042
1319		- $form = FrmForm::getOne( $id );
	1043	+ $form = FrmForm::getOne( $id );
1320	1044	$error_args = array(
1321		- 'title' => __( 'You can\'t edit the form', 'formidable' ),
1322		- 'body' => __( 'You are trying to edit a form that does not exist', 'formidable' ),
1323		- 'cancel_url' => admin_url( 'admin.php?page=formidable' ),
	1045	+ 'title' => __( 'You can\'t edit the form', 'formidable' ),
	1046	+ 'body' => __( 'You are trying to edit a form that does not exist', 'formidable' ),
	1047	+ 'cancel_url' => admin_url( 'admin.php?page=formidable' ),
1324	1048	'continue_url' => add_query_arg(
1325	1049	array(
1326	1050	'page' => 'formidable',
1327	1051	)
		@@ -1326,9 +1050,8 @@
1326	1050	'page' => 'formidable',
1327	1051	)
1328	1052	),
1329	1053	);
1330		-
1331	1054	if ( ! $form ) {
1332	1055	FrmAppController::show_error_modal( $error_args );
1333	1056	return;
1334	1057	}
		@@ -1333,10 +1056,10 @@
1333	1056	return;
1334	1057	}
1335	1058
1336	1059	if ( 'trash' === $form->status ) {
1337		- $error_args['body'] = __( 'The form you\'re trying to edit is in trash. You must restore it first before you can make changes', 'formidable' );
1338		- $error_args['continue_url'] = add_query_arg(
	1060	+ $error_args['body'] = __( 'The form you\'re trying to edit is in trash. You must restore it first before you can make changes', 'formidable' );
	1061	+ $error_args['continue_url'] = add_query_arg(
1339	1062	array(
1340	1063	'page' => 'formidable',
1341	1064	'_wpnonce' => wp_create_nonce( 'untrash_form_' . $id ),
1342	1065	'form_type' => 'trash',
		@@ -1360,9 +1083,8 @@
1360	1083
1361	1084	// Automatically add end section fields if they don't exist (2.0 migration).
1362	1085	$reset_fields = false;
1363	1086	FrmFormsHelper::auto_add_end_section_fields( $form, $fields, $reset_fields );
1364		- FrmSubmitHelper::maybe_create_submit_field( $form, $fields, $reset_fields );
1365	1087
1366	1088	if ( $reset_fields ) {
1367	1089	$fields = FrmField::get_all_for_form( $form->id, '', 'exclude' );
1368	1090	}
		@@ -1382,9 +1104,8 @@
1382	1104	*/
1383	1105	$values['fields'] = apply_filters( 'frm_fields_in_form_builder', $fields, compact( 'form' ) );
1384	1106
1385	1107	$edit_message = __( 'Form was successfully updated.', 'formidable' );
1386		-
1387	1108	if ( $form->is_template && $message == $edit_message ) {
1388	1109	$message = __( 'Template was successfully updated.', 'formidable' );
1389	1110	}
1390	1111
		@@ -1389,9 +1110,10 @@
1389	1110	}
1390	1111
1391	1112	self::maybe_update_form_builder_message( $message );
1392	1113
1393		- $has_fields = ! empty( $values['fields'] ) && ! FrmSubmitHelper::only_contains_submit_field( $values['fields'] );
	1114	+ $all_templates = FrmForm::getAll( array( 'is_template' => 1 ), 'name' );
	1115	+ $has_fields = isset( $values['fields'] ) && ! empty( $values['fields'] );
1394	1116
1395	1117	if ( defined( 'DOING_AJAX' ) ) {
1396	1118	wp_die();
1397	1119	}
		@@ -1398,14 +1120,9 @@
1398	1120
1399	1121	require FrmAppHelper::plugin_path() . '/classes/views/frm-forms/edit.php';
1400	1122	}
1401	1123
1402		- /**
1403		- * @param array $fields
1404		- *
1405		- * @return array
1406		- */
1407		- public static function update_form_builder_fields( $fields ) {
	1124	+ public static function update_form_builder_fields( $fields, $form ) {
1408	1125	foreach ( $fields as $field ) {
1409	1126	$field->do_not_include_icons = true;
1410	1127	}
1411	1128	return $fields;
		@@ -1410,13 +1127,8 @@
1410	1127	}
1411	1128	return $fields;
1412	1129	}
1413	1130
1414		- /**
1415		- * @param string $message
1416		- *
1417		- * @return void
1418		- */
1419	1131	public static function maybe_update_form_builder_message( &$message ) {
1420	1132	if ( 'form_duplicated' === FrmAppHelper::simple_get( 'message' ) ) {
1421	1133	$message = __( 'Form was Successfully Copied', 'formidable' );
1422	1134	}
		@@ -1421,22 +1133,13 @@
1421	1133	$message = __( 'Form was Successfully Copied', 'formidable' );
1422	1134	}
1423	1135	}
1424	1136
1425		- /**
1426		- * @param int|string $id
1427		- * @param array $errors
1428		- * @param array|string $args
1429		- *
1430		- * @return void
1431		- */
1432	1137	public static function get_settings_vars( $id, $errors = array(), $args = array() ) {
1433	1138	FrmAppHelper::permission_check( 'frm_edit_forms' );
1434	1139
1435	1140	global $frm_vars;
1436	1141
1437		- self::maybe_print_media_templates();
1438		-
1439	1142	if ( ! is_array( $args ) ) {
1440	1143	// For reverse compatibility.
1441	1144	$args = array(
1442	1145	'message' => $args,
		@@ -1469,42 +1172,17 @@
1469	1172
1470	1173	$sections = self::get_settings_tabs( $values );
1471	1174	$current = FrmAppHelper::simple_get( 't', 'sanitize_title', 'advanced_settings' );
1472	1175
1473		- require FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings.php';
	1176	+ require( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings.php' );
1474	1177	}
1475	1178
1476	1179	/**
1477		- * 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.
1478		- *
1479		- * @since 6.10
1480		- *
1481		- * @return void
1482		- */
1483		- private static function maybe_print_media_templates() {
1484		- if ( FrmAppHelper::pro_is_included() ) {
1485		- // This issue does not exist when Pro is active so exit early.
1486		- return;
1487		- }
1488		-
1489		- add_action(
1490		- 'wp_enqueue_editor',
1491		- function () {
1492		- wp_print_media_templates();
1493		- }
1494		- );
1495		- }
1496		-
1497		- /**
1498	1180	* @since 4.0
1499		- *
1500		- * @param array $atts
1501		- *
1502		- * @return void
1503	1181	*/
1504	1182	public static function form_publish_button( $atts ) {
1505	1183	$values = $atts['values'];
1506		- include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/_publish_box.php';
	1184	+ include( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/_publish_box.php' );
1507	1185	}
1508	1186
1509	1187	/**
1510	1188	* Get a list of all the settings tabs for the form settings page.
		@@ -1511,9 +1189,8 @@
1511	1189	*
1512	1190	* @since 4.0
1513	1191	*
1514	1192	* @param array $values
1515		- *
1516	1193	* @return array
1517	1194	*/
1518	1195	private static function get_settings_tabs( $values ) {
1519	1196	$sections = array(
		@@ -1519,9 +1196,9 @@
1519	1196	$sections = array(
1520	1197	'advanced' => array(
1521	1198	'name' => __( 'General', 'formidable' ),
1522	1199	'title' => __( 'General Form Settings', 'formidable' ),
1523		- 'function' => array( self::class, 'advanced_settings' ),
	1200	+ 'function' => array( __CLASS__, 'advanced_settings' ),
1524	1201	'icon' => 'frm_icon_font frm_settings_icon',
1525	1202	),
1526	1203	'email' => array(
1527	1204	'name' => __( 'Actions & Notifications', 'formidable' ),
		@@ -1530,9 +1207,9 @@
1530	1207	'icon' => 'frm_icon_font frm_mail_bulk_icon',
1531	1208	),
1532	1209	'permissions' => array(
1533	1210	'name' => __( 'Form Permissions', 'formidable' ),
1534		- 'icon' => 'frm_icon_font frm_lock_closed_icon',
	1211	+ 'icon' => 'frm_icon_font frm_lock_icon',
1535	1212	'html_class' => 'frm_show_upgrade_tab frm_noallow',
1536	1213	'data' => array(
1537	1214	'medium' => 'permissions',
1538	1215	'upgrade' => __( 'Form Permissions', 'formidable' ),
		@@ -1537,12 +1214,11 @@
1537	1214	'medium' => 'permissions',
1538	1215	'upgrade' => __( 'Form Permissions', 'formidable' ),
1539	1216	'message' => __( 'Allow editing, protect forms and files, limit entries, and save drafts. Upgrade to get form and entry permissions.', 'formidable' ),
1540	1217	'screenshot' => 'permissions.png',
1541		- 'learn-more' => FrmAppHelper::get_doc_url( 'general-form-settings/#kb-form-permissions', 'form-permissions-settings' ),
1542	1218	),
1543	1219	),
1544		- 'scheduling' => array(
	1220	+ 'scheduling' => array(
1545	1221	'name' => __( 'Form Scheduling', 'formidable' ),
1546	1222	'icon' => 'frm_icon_font frm_calendar_icon',
1547	1223	'html_class' => 'frm_show_upgrade_tab frm_noallow',
1548	1224	'data' => array(
		@@ -1548,14 +1224,13 @@
1548	1224	'data' => array(
1549	1225	'medium' => 'scheduling',
1550	1226	'upgrade' => __( 'Form scheduling settings', 'formidable' ),
1551	1227	'screenshot' => 'scheduling.png',
1552		- 'learn-more' => FrmAppHelper::get_doc_url( 'general-form-settings/#kb-form-scheduling', 'form-scheduling-settings' ),
1553	1228	),
1554	1229	),
1555	1230	'buttons' => array(
1556	1231	'name' => __( 'Buttons', 'formidable' ),
1557		- 'class' => self::class,
	1232	+ 'class' => __CLASS__,
1558	1233	'function' => 'buttons_settings',
1559	1234	'icon' => 'frm_icon_font frm_button_icon',
1560	1235	),
1561	1236	'landing' => array(
		@@ -1573,13 +1248,12 @@
1573	1248	array(
1574	1249	'upgrade' => __( 'Conversational Forms', 'formidable' ),
1575	1250	'message' => __( 'Ask one question at a time for automated conversations.', 'formidable' ),
1576	1251	'screenshot' => 'chat.png',
1577		- 'learn-more' => FrmAppHelper::get_doc_url( 'conversational-forms', 'conversational-forms-settings', false ),
1578	1252	)
1579	1253	),
1580	1254	),
1581		- 'abandonment' => array(
	1255	+ 'abandonment' => array(
1582	1256	'name' => __( 'Form Abandonment', 'formidable' ),
1583	1257	'icon' => 'frm_icon_font frm_abandoned_icon',
1584	1258	'html_class' => 'frm_show_upgrade_tab frm_noallow',
1585	1259	'data' => FrmAppHelper::get_upgrade_data_params(
		@@ -1587,26 +1261,32 @@
1587	1261	array(
1588	1262	'upgrade' => __( 'Form abandonment settings', 'formidable' ),
1589	1263	'message' => __( 'Unlock the power of data capture to boost lead generation and master the art of form optimization.', 'formidable' ),
1590	1264	'screenshot' => 'abandonment.png',
1591		- 'learn-more' => FrmAppHelper::get_doc_url( 'features/form-abandonment-wordpress-plugin', 'form-abandonment-settings', false ),
1592	1265	)
1593	1266	),
1594	1267	),
1595	1268	'html' => array(
1596	1269	'name' => __( 'Customize HTML', 'formidable' ),
1597		- 'class' => self::class,
	1270	+ 'class' => __CLASS__,
1598	1271	'function' => 'html_settings',
1599	1272	'icon' => 'frm_icon_font frm_code_icon',
1600	1273	),
1601	1274	);
1602	1275
1603		- if ( ! has_action( 'frm_add_form_style_tab_options' ) && ! has_action( 'frm_add_form_button_options' ) ) {
1604		- unset( $sections['buttons'] );
	1276	+ foreach ( array( 'landing', 'chat', 'abandonment' ) as $feature ) {
	1277	+ if ( ! FrmAppHelper::show_new_feature( $feature ) ) {
	1278	+ unset( $sections[ $feature ] );
	1279	+ }
1605	1280	}
1606	1281
1607	1282	$sections = apply_filters( 'frm_add_form_settings_section', $sections, $values );
1608	1283
	1284	+ if ( FrmAppHelper::pro_is_installed() && ! FrmAppHelper::meets_min_pro_version( '4.0' ) ) {
	1285	+ // Prevent settings from showing in 2 spots.
	1286	+ unset( $sections['permissions'], $sections['scheduling'] );
	1287	+ }
	1288	+
1609	1289	foreach ( $sections as $key => $section ) {
1610	1290	$defaults = array(
1611	1291	'html_class' => '',
1612	1292	'name' => ucfirst( $key ),
		@@ -1637,10 +1317,8 @@
1637	1317	/**
1638	1318	* @since 4.0
1639	1319	*
1640	1320	* @param array $values
1641		- *
1642		- * @return void
1643	1321	*/
1644	1322	public static function advanced_settings( $values ) {
1645	1323	$first_h3 = 'frm_first_h3';
1646	1324
		@@ -1648,16 +1326,14 @@
1648	1326	}
1649	1327
1650	1328	/**
1651	1329	* @param array $values
1652		- *
1653		- * @return void
1654	1330	*/
1655	1331	public static function render_spam_settings( $values ) {
1656	1332	if ( function_exists( 'akismet_http_post' ) ) {
1657	1333	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/spam-settings/akismet.php';
1658	1334	}
1659		- include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/spam-settings/stopforumspam.php';
	1335	+ include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/spam-settings/honeypot.php';
1660	1336	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/spam-settings/antispam.php';
1661	1337	}
1662	1338
1663	1339	/**
		@@ -1663,13 +1339,16 @@
1663	1339	/**
1664	1340	* @since 4.0
1665	1341	*
1666	1342	* @param array $values
1667		- *
1668		- * @return void
1669	1343	*/
1670	1344	public static function buttons_settings( $values ) {
1671		- include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings-buttons.php';
	1345	+ $styles = apply_filters( 'frm_get_style_opts', array() );
	1346	+
	1347	+ $frm_settings = FrmAppHelper::get_settings();
	1348	+ $no_global_style = $frm_settings->load_style === 'none';
	1349	+
	1350	+ include( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings-buttons.php' );
1672	1351	}
1673	1352
1674	1353	/**
1675	1354	* @since 4.0
		@@ -1674,13 +1353,11 @@
1674	1353	/**
1675	1354	* @since 4.0
1676	1355	*
1677	1356	* @param array $values
1678		- *
1679		- * @return void
1680	1357	*/
1681	1358	public static function html_settings( $values ) {
1682		- include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings-html.php';
	1359	+ include( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings-html.php' );
1683	1360	}
1684	1361
1685	1362	/**
1686	1363	* Replace old Submit Button href with new href to avoid errors in Chrome
		@@ -1686,11 +1363,9 @@
1686	1363	* Replace old Submit Button href with new href to avoid errors in Chrome
1687	1364	*
1688	1365	* @since 2.03.08
1689	1366	*
1690		- * @param array|bool $values
1691		- *
1692		- * @return void
	1367	+ * @param array|boolean $values
1693	1368	*/
1694	1369	private static function clean_submit_html( &$values ) {
1695	1370	if ( is_array( $values ) && isset( $values['submit_html'] ) ) {
1696	1371	$values['submit_html'] = str_replace( 'javascript:void(0)', '#', $values['submit_html'] );
		@@ -1711,14 +1386,8 @@
1711	1386
1712	1387	return $classes;
1713	1388	}
1714	1389
1715		- /**
1716		- * @param int|string $form_id
1717		- * @param string $class
1718		- *
1719		- * @return void
1720		- */
1721	1390	public static function mb_tags_box( $form_id, $class = '' ) {
1722	1391	$fields = FrmField::get_all_for_form( $form_id, '', 'include' );
1723	1392
1724	1393	/**
		@@ -1731,9 +1400,9 @@
1731	1400	*/
1732	1401	$fields = apply_filters( 'frm_fields_in_tags_box', $fields, compact( 'form_id' ) );
1733	1402	$linked_forms = array();
1734	1403	$col = 'one';
1735		- $settings_tab = FrmAppHelper::is_admin_page( 'formidable' );
	1404	+ $settings_tab = FrmAppHelper::is_admin_page( 'formidable' ) ? true : false;
1736	1405
1737	1406	$cond_shortcodes = apply_filters( 'frm_conditional_shortcodes', array() );
1738	1407	$entry_shortcodes = self::get_shortcode_helpers( $settings_tab );
1739	1408
		@@ -1738,17 +1407,13 @@
1738	1407	$entry_shortcodes = self::get_shortcode_helpers( $settings_tab );
1739	1408
1740	1409	$advanced_helpers = self::advanced_helpers( compact( 'fields', 'form_id' ) );
1741	1410
1742		- include FrmAppHelper::plugin_path() . '/classes/views/shared/mb_adv_info.php';
	1411	+ include( FrmAppHelper::plugin_path() . '/classes/views/shared/mb_adv_info.php' );
1743	1412	}
1744	1413
1745	1414	/**
1746	1415	* @since 3.04.01
1747		- *
1748		- * @param array $atts
1749		- *
1750		- * @return array
1751	1416	*/
1752	1417	private static function advanced_helpers( $atts ) {
1753	1418	$advanced_helpers = array(
1754	1419	'default' => array(
		@@ -1757,12 +1422,10 @@
1757	1422	),
1758	1423	);
1759	1424
1760	1425	$user_fields = self::user_shortcodes();
1761		-
1762		- if ( $user_fields ) {
	1426	+ if ( ! empty( $user_fields ) ) {
1763	1427	$user_helpers = array();
1764		-
1765	1428	foreach ( $user_fields as $uk => $uf ) {
1766	1429	$user_helpers[ '|user_id| show="' . $uk . '"' ] = $uf;
1767	1430	unset( $uk, $uf );
1768	1431	}
		@@ -1767,9 +1430,9 @@
1767	1430	unset( $uk, $uf );
1768	1431	}
1769	1432
1770	1433	$advanced_helpers['user_id'] = array(
1771		- 'codes' => $user_helpers,
	1434	+ 'codes' => $user_helpers,
1772	1435	);
1773	1436	}
1774	1437
1775	1438	/**
		@@ -1787,10 +1450,8 @@
1787	1450	* Get an array of the options to display in the advanced tab
1788	1451	* of the customization panel
1789	1452	*
1790	1453	* @since 2.0.6
1791		- *
1792		- * @return array
1793	1454	*/
1794	1455	private static function get_advanced_shortcodes() {
1795	1456	$adv_shortcodes = array(
1796	1457	'x sep=", "' => array(
		@@ -1816,10 +1477,8 @@
1816	1477	}
1817	1478
1818	1479	/**
1819	1480	* @since 3.04.01
1820		- *
1821		- * @return array
1822	1481	*/
1823	1482	private static function user_shortcodes() {
1824	1483	$options = array(
1825	1484	'ID' => __( 'User ID', 'formidable' ),
		@@ -1838,12 +1497,8 @@
1838	1497	/**
1839	1498	* Get an array of the helper shortcodes to display in the customization panel
1840	1499	*
1841	1500	* @since 2.0.6
1842		- *
1843		- * @param bool $settings_tab
1844		- *
1845		- * @return array
1846	1501	*/
1847	1502	private static function get_shortcode_helpers( $settings_tab ) {
1848	1503	$entry_shortcodes = array(
1849	1504	'id' => __( 'Entry ID', 'formidable' ),
		@@ -1854,25 +1509,26 @@
1854	1509	'updated-at' => __( 'Entry updated', 'formidable' ),
1855	1510	'' => '',
1856	1511	'siteurl' => __( 'Site URL', 'formidable' ),
1857	1512	'sitename' => __( 'Site Name', 'formidable' ),
1858		- 'form_name' => __( 'Form Name', 'formidable' ),
1859	1513	);
1860	1514
1861		- $entry_shortcodes = array_merge( FrmShortcodeHelper::get_contextual_shortcode_values(), $entry_shortcodes );
1862		-
1863	1515	if ( ! FrmAppHelper::pro_is_installed() ) {
1864	1516	unset( $entry_shortcodes['post_id'] );
1865	1517	}
1866	1518
	1519	+ if ( $settings_tab ) {
	1520	+ $entry_shortcodes['default-message'] = __( 'Default Msg', 'formidable' );
	1521	+ $entry_shortcodes['default-html'] = __( 'Default HTML', 'formidable' );
	1522	+ $entry_shortcodes['default-plain'] = __( 'Default Plain', 'formidable' );
	1523	+ $entry_shortcodes['form_name'] = __( 'Form Name', 'formidable' );
	1524	+ }
	1525	+
1867	1526	/**
1868	1527	* Use this hook to add or remove buttons in the helpers section
1869	1528	* in the customization panel
1870	1529	*
1871	1530	* @since 2.0.6
1872		- *
1873		- * @param array $entry_shortcodes
1874		- * @param bool $settings_tab
1875	1531	*/
1876	1532	$entry_shortcodes = apply_filters( 'frm_helper_shortcodes', $entry_shortcodes, $settings_tab );
1877	1533
1878	1534	return $entry_shortcodes;
		@@ -1881,9 +1537,8 @@
1881	1537	/**
1882	1538	* Insert the form class setting into the form.
1883	1539	*
1884	1540	* @param stdClass $form
1885		- *
1886	1541	* @return void
1887	1542	*/
1888	1543	public static function form_classes( $form ) {
1889	1544	if ( isset( $form->options['form_class'] ) ) {
		@@ -1894,9 +1549,9 @@
1894	1549	echo ' frm_js_validate ';
1895	1550	self::add_js_validate_form_to_global_vars( $form );
1896	1551	}
1897	1552
1898		- if ( FrmForm::is_ajax_on( $form ) ) {
	1553	+ if ( ! FrmFormsHelper::should_use_pro_for_ajax_submit() && FrmForm::is_ajax_on( $form ) ) {
1899	1554	echo ' frm_ajax_submit ';
1900	1555	}
1901	1556	}
1902	1557
		@@ -1906,9 +1561,8 @@
1906	1561	* @param stdClass $form
1907	1562	*/
1908	1563	public static function add_js_validate_form_to_global_vars( $form ) {
1909	1564	global $frm_vars;
1910		-
1911	1565	if ( ! isset( $frm_vars['js_validate_forms'] ) ) {
1912	1566	$frm_vars['js_validate_forms'] = array();
1913	1567	}
1914	1568	$frm_vars['js_validate_forms'][ $form->id ] = $form;
		@@ -1919,11 +1573,11 @@
1919	1573	check_ajax_referer( 'frm_ajax', 'nonce' );
1920	1574
1921	1575	echo FrmEntriesController::show_entry_shortcode( // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
1922	1576	array(
1923		- 'form_id' => FrmAppHelper::get_post_param( 'form_id', '', 'absint' ), // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
	1577	+ 'form_id' => FrmAppHelper::get_post_param( 'form_id', '', 'absint' ),
1924	1578	'default_email' => true,
1925		- 'plain_text' => FrmAppHelper::get_post_param( 'plain_text', '', 'absint' ), // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
	1579	+ 'plain_text' => FrmAppHelper::get_post_param( 'plain_text', '', 'absint' ),
1926	1580	)
1927	1581	);
1928	1582	wp_die();
1929	1583	}
		@@ -1929,11 +1583,10 @@
1929	1583	}
1930	1584
1931	1585	/**
1932	1586	* @param string $content
1933		- * @param int|stdClass|string $form
1934		- * @param false|int|stdClass|string $entry
1935		- *
	1587	+ * @param stdClass|string|int $form
	1588	+ * @param stdClass|string|int|false $entry
1936	1589	* @return string
1937	1590	*/
1938	1591	public static function filter_content( $content, $form, $entry = false ) {
1939	1592	$content = self::replace_form_name_shortcodes( $content, $form );
		@@ -1938,9 +1591,8 @@
1938	1591	public static function filter_content( $content, $form, $entry = false ) {
1939	1592	$content = self::replace_form_name_shortcodes( $content, $form );
1940	1593
1941	1594	self::get_entry_by_param( $entry );
1942		-
1943	1595	if ( ! $entry ) {
1944	1596	return $content;
1945	1597	}
1946	1598
		@@ -1947,16 +1599,8 @@
1947	1599	if ( is_object( $form ) ) {
1948	1600	$form = $form->id;
1949	1601	}
1950	1602
1951		- /*
1952		- * Repeater actions adds `parent_entry` to `$entry` store the parent entry data. If `parent_entry` is not empty,
1953		- * use the parent form ID instead of repeater form ID to fix the parent form field shortcodes doesn't work.
1954		- */
1955		- if ( ! empty( $entry->parent_entry ) ) {
1956		- $form = $entry->parent_entry->form_id;
1957		- }
1958		-
1959	1603	$shortcodes = FrmFieldsHelper::get_shortcodes( $content, $form );
1960	1604	$content = apply_filters( 'frm_replace_content_shortcodes', $content, $entry, $shortcodes );
1961	1605
1962	1606	return $content;
		@@ -1966,12 +1610,11 @@
1966	1610	* Replace any [form_name] shortcodes in a string.
1967	1611	*
1968	1612	* @since 5.5
1969	1613	*
1970		- * @param array|string $string
1971		- * @param int|stdClass|string $form
1972		- *
1973		- * @return array|string
	1614	+ * @param string|array $string
	1615	+ * @param stdClass|string|int $form
	1616	+ * @return string|array
1974	1617	*/
1975	1618	public static function replace_form_name_shortcodes( $string, $form ) {
1976	1619	if ( ! is_string( $string ) ) {
1977	1620	return $string;
		@@ -1989,10 +1632,9 @@
1989	1632	return str_replace( '[form_name]', $form_name, $string );
1990	1633	}
1991	1634
1992	1635	/**
1993		- * @param false|int|stdClass|string $entry
1994		- *
	1636	+ * @param stdClass|string|int|false $entry
1995	1637	* @return void
1996	1638	*/
1997	1639	private static function get_entry_by_param( &$entry ) {
1998	1640	if ( ! $entry || ! is_object( $entry ) ) {
		@@ -2003,24 +1645,12 @@
2003	1645	FrmEntry::maybe_get_entry( $entry );
2004	1646	}
2005	1647	}
2006	1648
2007		- /**
2008		- * @param string $content
2009		- * @param false|object $entry
2010		- * @param array $shortcodes
2011		- *
2012		- * @return string
2013		- */
2014	1649	public static function replace_content_shortcodes( $content, $entry, $shortcodes ) {
2015	1650	return FrmFieldsHelper::replace_content_shortcodes( $content, $entry, $shortcodes );
2016	1651	}
2017	1652
2018		- /**
2019		- * @param array $errors
2020		- *
2021		- * @return array
2022		- */
2023	1653	public static function process_bulk_form_actions( $errors ) {
2024	1654	if ( ! $_REQUEST ) {
2025	1655	return $errors;
2026	1656	}
		@@ -2025,9 +1655,8 @@
2025	1655	return $errors;
2026	1656	}
2027	1657
2028	1658	$bulkaction = FrmAppHelper::get_param( 'action', '', 'get', 'sanitize_text_field' );
2029		-
2030	1659	if ( $bulkaction == - 1 ) {
2031	1660	$bulkaction = FrmAppHelper::get_param( 'action2', '', 'get', 'sanitize_title' );
2032	1661	}
2033	1662
		@@ -2037,9 +1666,8 @@
2037	1666	$bulkaction = str_replace( 'bulk_', '', $bulkaction );
2038	1667	}
2039	1668
2040	1669	$ids = FrmAppHelper::get_param( 'item-action', '', 'get', 'sanitize_text_field' );
2041		-
2042	1670	if ( empty( $ids ) ) {
2043	1671	$errors[] = __( 'No forms were specified', 'formidable' );
2044	1672
2045	1673	return $errors;
		@@ -2045,9 +1673,8 @@
2045	1673	return $errors;
2046	1674	}
2047	1675
2048	1676	$permission_error = FrmAppHelper::permission_nonce_error( '', '_wpnonce', 'bulk-toplevel_page_formidable' );
2049		-
2050	1677	if ( $permission_error !== false ) {
2051	1678	$errors[] = $permission_error;
2052	1679
2053	1680	return $errors;
		@@ -2067,9 +1694,9 @@
2067	1694	case 'untrash':
2068	1695	$message = self::bulk_untrash( $ids );
2069	1696	}
2070	1697
2071		- if ( ! empty( $message ) ) {
	1698	+ if ( isset( $message ) && ! empty( $message ) ) {
2072	1699	$errors['message'] = $message;
2073	1700	}
2074	1701
2075	1702	return $errors;
		@@ -2074,23 +1701,8 @@
2074	1701
2075	1702	return $errors;
2076	1703	}
2077	1704
2078		- /**
2079		- * Includes html that shows a message when the device is too small to use Formidable Forms admin pages.
2080		- *
2081		- * @since 6.20
2082		- *
2083		- * @return void
2084		- */
2085		- public static function include_device_too_small_message() {
2086		- if ( ! FrmAppHelper::is_formidable_admin() ) {
2087		- return;
2088		- }
2089		-
2090		- include FrmAppHelper::plugin_path() . '/classes/views/shared/small-device-message.php';
2091		- }
2092		-
2093	1705	public static function route() {
2094	1706	$action = isset( $_REQUEST['frm_action'] ) ? 'frm_action' : 'action';
2095	1707	$vars = array();
2096	1708	FrmAppHelper::include_svg();
		@@ -2101,14 +1713,12 @@
2101	1713	// Javascript needs to be allowed in some field settings.
2102	1714	// phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized, WordPress.Security.NonceVerification.Missing
2103	1715	$json_vars = htmlspecialchars_decode( nl2br( str_replace( '&quot;', '"', wp_unslash( $_POST['frm_compact_fields'] ) ) ) );
2104	1716	$json_vars = json_decode( $json_vars, true );
2105		-
2106	1717	if ( empty( $json_vars ) ) {
2107	1718	// json decoding failed so we should return an error message.
2108	1719	$action = FrmAppHelper::get_param( $action, '', 'get', 'sanitize_title' );
2109		-
2110		- if ( 'edit' === $action ) {
	1720	+ if ( 'edit' == $action ) {
2111	1721	$action = 'update';
2112	1722	}
2113	1723
2114	1724	add_filter( 'frm_validate_form', 'FrmFormsController::json_error' );
		@@ -2120,9 +1730,8 @@
2120	1730	$_POST = array_merge( $_POST, $_REQUEST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
2121	1731	}
2122	1732	} else {
2123	1733	$action = FrmAppHelper::get_param( $action, '', 'get', 'sanitize_title' );
2124		-
2125	1734	if ( isset( $_REQUEST['delete_all'] ) ) {
2126	1735	// Override the action for this page.
2127	1736	$action = 'delete_all';
2128	1737	}
		@@ -2131,8 +1740,10 @@
2131	1740	add_action( 'frm_load_form_hooks', 'FrmHooksController::trigger_load_form_hooks' );
2132	1741	FrmAppHelper::trigger_hook_load( 'form' );
2133	1742
2134	1743	switch ( $action ) {
	1744	+ case 'new':
	1745	+ return self::new_form( $vars );
2135	1746	case 'create':
2136	1747	case 'edit':
2137	1748	case 'update':
2138	1749	case 'trash':
		@@ -2141,22 +1752,18 @@
2141	1752	case 'settings':
2142	1753	case 'update_settings':
2143	1754	return self::$action( $vars );
2144	1755	case 'lite-reports':
2145		- self::no_reports( $vars );
2146		- return;
	1756	+ return self::no_reports( $vars );
2147	1757	case 'views':
2148		- self::no_views( $vars );
2149		- return;
	1758	+ return self::no_views( $vars );
2150	1759	default:
2151	1760	do_action( 'frm_form_action_' . $action );
2152		-
2153	1761	if ( apply_filters( 'frm_form_stop_action_' . $action, false ) ) {
2154	1762	return;
2155	1763	}
2156	1764
2157	1765	$action = FrmAppHelper::get_param( 'action', '', 'get', 'sanitize_text_field' );
2158		-
2159	1766	if ( $action == - 1 ) {
2160	1767	$action = FrmAppHelper::get_param( 'action2', '', 'get', 'sanitize_title' );
2161	1768	}
2162	1769
		@@ -2167,9 +1774,8 @@
2167	1774	return;
2168	1775	}
2169	1776
2170	1777	$message = FrmAppHelper::get_param( 'message' );
2171		-
2172	1778	if ( 'form_duplicate_error' === $message ) {
2173	1779	self::display_forms_list( array(), '', array( __( 'There was a problem duplicating the form', 'formidable' ) ) );
2174	1780	return;
2175	1781	}
		@@ -2205,45 +1811,28 @@
2205	1811	// Get posted data
2206	1812	$form_id = FrmAppHelper::get_post_param( 'form_id', '', 'absint' );
2207	1813	$name = FrmAppHelper::get_post_param( 'form_name', '', 'sanitize_text_field' );
2208	1814
2209		- $form = FrmForm::getOne( $form_id );
	1815	+ // Update the form name and form key.
	1816	+ $form_key = FrmAppHelper::get_unique_key( sanitize_title( $name ), 'frm_forms', 'form_key' );
	1817	+ FrmForm::update( $form_id, compact( 'name', 'form_key' ) );
2210	1818
2211		- if ( ! $form ) {
2212		- wp_send_json_error( __( 'Form not found', 'formidable' ) );
2213		- }
	1819	+ wp_send_json_success( compact( 'form_key' ) );
	1820	+ }
2214	1821
2215		- if ( $name === $form->name ) {
2216		- // Nothing to change so exit early.
2217		- wp_send_json_success();
2218		- }
	1822	+ public static function json_error( $errors ) {
	1823	+ $errors['json'] = __( 'Abnormal HTML characters prevented your form from saving correctly', 'formidable' );
2219	1824
2220		- $to_update = array(
2221		- 'name' => $name,
2222		- );
2223		-
2224		- if ( '' !== $name ) {
2225		- // Only update form_key if name is not empty.
2226		- $form_key = FrmAppHelper::get_unique_key( sanitize_title( $name ), 'frm_forms', 'form_key' );
2227		- $to_update['form_key'] = $form_key;
2228		- } else {
2229		- $form_key = $form->form_key;
2230		- }
2231		-
2232		- FrmForm::update( $form_id, $to_update );
2233		-
2234		- wp_send_json_success( compact( 'form_key' ) );
	1825	+ return $errors;
2235	1826	}
2236	1827
2237	1828	/**
2238		- * @param array $errors
	1829	+ * Education for premium features.
2239	1830	*
2240		- * @return array
	1831	+ * @since 4.05
2241	1832	*/
2242		- public static function json_error( $errors ) {
2243		- $errors['json'] = __( 'Abnormal HTML characters prevented your form from saving correctly', 'formidable' );
2244		-
2245		- return $errors;
	1833	+ public static function add_form_style_tab_options() {
	1834	+ include( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/add_form_style_options.php' );
2246	1835	}
2247	1836
2248	1837	/**
2249	1838	* Add education about views.
		@@ -2248,12 +1837,8 @@
2248	1837	/**
2249	1838	* Add education about views.
2250	1839	*
2251	1840	* @since 4.07
2252		- *
2253		- * @param array $values
2254		- *
2255		- * @return void
2256	1841	*/
2257	1842	public static function no_views( $values = array() ) {
2258	1843	FrmAppHelper::include_svg();
2259	1844	$id = FrmAppHelper::get_param( 'form', '', 'get', 'absint' );
		@@ -2265,12 +1850,8 @@
2265	1850	/**
2266	1851	* Add education about reports.
2267	1852	*
2268	1853	* @since 4.07
2269		- *
2270		- * @param array $values
2271		- *
2272		- * @return void
2273	1854	*/
2274	1855	public static function no_reports( $values = array() ) {
2275	1856	$id = FrmAppHelper::get_param( 'form', '', 'get', 'absint' );
2276	1857	$form = $id ? FrmForm::getOne( $id ) : false;
		@@ -2296,9 +1877,8 @@
2296	1877	* @since 4.05.02
2297	1878	*/
2298	1879	private static function move_menu_to_footer() {
2299	1880	$settings = FrmAppHelper::get_settings();
2300		-
2301	1881	if ( empty( $settings->admin_bar ) ) {
2302	1882	remove_action( 'wp_body_open', 'wp_admin_bar_render', 0 );
2303	1883	}
2304	1884	}
		@@ -2304,15 +1884,13 @@
2304	1884	}
2305	1885
2306	1886	public static function admin_bar_configure() {
2307	1887	global $frm_vars;
2308		-
2309	1888	if ( empty( $frm_vars['forms_loaded'] ) ) {
2310	1889	return;
2311	1890	}
2312	1891
2313	1892	$actions = array();
2314		-
2315	1893	foreach ( $frm_vars['forms_loaded'] as $form ) {
2316	1894	if ( is_object( $form ) ) {
2317	1895	$actions[ $form->id ] = $form->name;
2318	1896	}
		@@ -2346,12 +1924,8 @@
2346	1924	}
2347	1925
2348	1926	/**
2349	1927	* @since 2.05.07
2350		- *
2351		- * @param array $actions
2352		- *
2353		- * @return void
2354	1928	*/
2355	1929	private static function add_forms_to_admin_bar( $actions ) {
2356	1930	global $wp_admin_bar;
2357	1931
		@@ -2362,9 +1936,9 @@
2362	1936	$wp_admin_bar->add_node(
2363	1937	array(
2364	1938	'parent' => 'frm-forms',
2365	1939	'id' => 'edit_form_' . $form_id,
2366		- 'title' => empty( $name ) ? FrmFormsHelper::get_no_title_text() : $name,
	1940	+ 'title' => empty( $name ) ? __( '(no title)', 'formidable' ) : $name,
2367	1941	'href' => FrmForm::get_edit_link( $form_id ),
2368	1942	)
2369	1943	);
2370	1944	}
		@@ -2373,16 +1947,14 @@
2373	1947	/**
2374	1948	* The formidable shortcode
2375	1949	*
2376	1950	* @param array $atts The params from the shortcode.
2377		- *
2378	1951	* @return string
2379	1952	*/
2380	1953	public static function get_form_shortcode( $atts ) {
2381	1954	global $frm_vars;
2382		-
2383		- if ( ! empty( $frm_vars['skip_shortcode'] ) ) {
2384		- $sc = '[formidable';
	1955	+ if ( isset( $frm_vars['skip_shortcode'] ) && $frm_vars['skip_shortcode'] ) {
	1956	+ $sc = '[formidable';
2385	1957	$sc .= FrmAppHelper::array_to_html_params( $atts );
2386	1958	return $sc . ']';
2387	1959	}
2388	1960
		@@ -2407,12 +1979,11 @@
2407	1979
2408	1980	/**
2409	1981	* @since 5.2.01
2410	1982	*
2411		- * @param false|int|string $id
2412		- * @param false|string $key
2413		- *
2414		- * @return false|stdClass
	1983	+ * @param string|int|false $id
	1984	+ * @param string|false $key
	1985	+ * @return stdClass|false
2415	1986	*/
2416	1987	private static function maybe_get_form_by_id_or_key( $id, $key ) {
2417	1988	if ( ! $id ) {
2418	1989	$id = $key;
		@@ -2420,14 +1991,13 @@
2420	1991	return self::maybe_get_form_to_show( $id );
2421	1992	}
2422	1993
2423	1994	/**
2424		- * @param false|int|string $id
2425		- * @param false|string $key
2426		- * @param bool|int|string $title may be 'auto', true, false, 'true', 'false', 'yes', '1', 1, '0', 0.
2427		- * @param bool|int|string $description may be 'auto', true, false, 'true', 'false', 'yes', '1', 1, '0', 0.
	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.
2428	1999	* @param array $atts
2429		- *
2430	2000	* @return string
2431	2001	*/
2432	2002	public static function show_form( $id = '', $key = '', $title = false, $description = false, $atts = array() ) {
2433	2003	$form = self::maybe_get_form_by_id_or_key( $id, $key );
		@@ -2474,11 +2044,10 @@
2474	2044	return $form;
2475	2045	}
2476	2046
2477	2047	/**
2478		- * @param false|int|string $id
2479		- *
2480		- * @return false|stdClass
	2048	+ * @param string|int|false $id
	2049	+ * @return stdClass|false
2481	2050	*/
2482	2051	private static function maybe_get_form_to_show( $id ) {
2483	2052	$form = false;
2484	2053
		@@ -2484,9 +2053,8 @@
2484	2053
2485	2054	if ( ! empty( $id ) ) {
2486	2055	// Form id or key is set.
2487	2056	$form = FrmForm::getOne( $id );
2488		-
2489	2057	if ( ! $form || $form->parent_form_id || $form->status === 'trash' ) {
2490	2058	$form = false;
2491	2059	}
2492	2060	}
		@@ -2493,25 +2061,12 @@
2493	2061
2494	2062	return $form;
2495	2063	}
2496	2064
2497		- /**
2498		- * @param object $form
2499		- *
2500		- * @return bool
2501		- */
2502	2065	private static function is_viewable_draft_form( $form ) {
2503	2066	return $form->status === 'draft' && current_user_can( 'frm_edit_forms' ) && ! FrmAppHelper::is_preview_page();
2504	2067	}
2505	2068
2506		- /**
2507		- * @param object $form
2508		- * @param bool $title
2509		- * @param bool $description
2510		- * @param array $atts
2511		- *
2512		- * @return string
2513		- */
2514	2069	public static function get_form( $form, $title, $description, $atts = array() ) {
2515	2070	ob_start();
2516	2071
2517	2072	do_action( 'frm_before_get_form', $atts );
		@@ -2526,25 +2081,12 @@
2526	2081
2527	2082	return $contents;
2528	2083	}
2529	2084
2530		- /**
2531		- * @param array $params
2532		- *
2533		- * @return void
2534		- */
2535	2085	public static function enqueue_scripts( $params ) {
2536	2086	do_action( 'frm_enqueue_form_scripts', $params );
2537	2087	}
2538	2088
2539		- /**
2540		- * @param object $form
2541		- * @param bool $title
2542		- * @param bool $description
2543		- * @param array $atts
2544		- *
2545		- * @return void
2546		- */
2547	2089	public static function get_form_contents( $form, $title, $description, $atts ) {
2548	2090	$params = FrmForm::get_params( $form );
2549	2091	$errors = self::get_saved_errors( $form, $params );
2550	2092	$fields = FrmFieldsHelper::get_form_fields( $form->id, $errors );
		@@ -2558,9 +2100,8 @@
2558	2100	FrmFormState::set_initial_value( 'title', $title );
2559	2101	FrmFormState::set_initial_value( 'description', $description );
2560	2102
2561	2103	do_action( 'frm_display_form_action', $params, $fields, $form, $title, $description );
2562		-
2563	2104	if ( apply_filters( 'frm_continue_to_new', true, $form->id, $params['action'] ) ) {
2564	2105	self::show_form_after_submit( $pass_args );
2565	2106	}
2566	2107	} elseif ( ! empty( $errors ) ) {
		@@ -2570,11 +2111,11 @@
2570	2111
2571	2112	do_action( 'frm_validate_form_creation', $params, $fields, $form, $title, $description );
2572	2113
2573	2114	if ( apply_filters( 'frm_continue_to_create', true, $form->id ) ) {
2574		- $entry_id = self::just_created_entry( $form->id );
2575		- $pass_args['entry_id'] = $entry_id;
2576		- $pass_args['reset'] = true;
	2115	+ $entry_id = self::just_created_entry( $form->id );
	2116	+ $pass_args['entry_id'] = $entry_id;
	2117	+ $pass_args['reset'] = true;
2577	2118
2578	2119	self::run_on_submit_actions( $pass_args );
2579	2120
2580	2121	do_action(
		@@ -2591,13 +2132,8 @@
2591	2132	/**
2592	2133	* If the form was processed earlier (init), get the generated errors
2593	2134	*
2594	2135	* @since 2.05
2595		- *
2596		- * @param object $form
2597		- * @param array $params
2598		- *
2599		- * @return array
2600	2136	*/
2601	2137	private static function get_saved_errors( $form, $params ) {
2602	2138	global $frm_vars;
2603	2139
		@@ -2619,17 +2155,13 @@
2619	2155	}
2620	2156
2621	2157	/**
2622	2158	* @since 2.2.7
2623		- *
2624		- * @param int|string $form_id
2625		- *
2626		- * @return int
2627	2159	*/
2628	2160	public static function just_created_entry( $form_id ) {
2629	2161	global $frm_vars;
2630	2162
2631		- 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	+ 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;
2632	2164	}
2633	2165
2634	2166	/**
2635	2167	* Gets confirmation method.
		@@ -2642,19 +2174,17 @@
2642	2174	*
2643	2175	* @type object $form Form object.
2644	2176	* @type int $entry_id Entry ID.
2645	2177	* }
2646		- *
2647		- * @return array|string
	2178	+ * @return string|array
2648	2179	*/
2649	2180	private static function get_confirmation_method( $atts ) {
2650	2181	$action = FrmOnSubmitHelper::current_event( $atts );
2651	2182	$opt = 'update' === $action ? 'edit_action' : 'success_action';
2652		- $method = ! empty( $atts['form']->options[ $opt ] ) ? $atts['form']->options[ $opt ] : 'message';
	2183	+ $method = ( isset( $atts['form']->options[ $opt ] ) && ! empty( $atts['form']->options[ $opt ] ) ) ? $atts['form']->options[ $opt ] : 'message';
2653	2184
2654	2185	if ( ! empty( $atts['entry_id'] ) ) {
2655	2186	$met_actions = self::get_met_on_submit_actions( $atts, $action );
2656		-
2657	2187	if ( $met_actions ) {
2658	2188	$method = $met_actions;
2659	2189	}
2660	2190	}
		@@ -2660,9 +2190,9 @@
2660	2190	}
2661	2191
2662	2192	$method = apply_filters( 'frm_success_filter', $method, $atts['form'], $action );
2663	2193
2664		- if ( $method !== 'message' && ( ! $atts['entry_id'] || ! is_numeric( $atts['entry_id'] ) ) ) {
	2194	+ if ( $method != 'message' && ( ! $atts['entry_id'] || ! is_numeric( $atts['entry_id'] ) ) ) {
2665	2195	$method = 'message';
2666	2196	}
2667	2197
2668	2198	return $method;
		@@ -2667,15 +2197,8 @@
2667	2197
2668	2198	return $method;
2669	2199	}
2670	2200
2671		- /**
2672		- * @param object $form
2673		- * @param array $params
2674		- * @param array $args
2675		- *
2676		- * @return void
2677		- */
2678	2201	public static function maybe_trigger_redirect( $form, $params, $args ) {
2679	2202	if ( ! isset( $params['id'] ) ) {
2680	2203	global $frm_vars;
2681	2204	$params['id'] = $frm_vars['created_entries'][ $form->id ]['entry_id'];
		@@ -2703,9 +2226,9 @@
2703	2226	* @param array $args See {@see FrmFormsController::maybe_trigger_redirect()}.
2704	2227	*/
2705	2228	public static function maybe_trigger_redirect_with_action( $conf_method, $form, $params, $args ) {
2706	2229	if ( is_array( $conf_method ) && 1 === count( $conf_method ) ) {
2707		- if ( 'redirect' === FrmOnSubmitHelper::get_action_type( $conf_method[0] ) && empty( $conf_method[0]->post_content['redirect_delay'] ) ) {
	2230	+ if ( 'redirect' === FrmOnSubmitHelper::get_action_type( $conf_method[0] ) ) {
2708	2231	$event = FrmOnSubmitHelper::current_event( $params );
2709	2232	FrmOnSubmitHelper::populate_on_submit_data( $form->options, $conf_method[0], $event );
2710	2233	$conf_method = 'redirect';
2711	2234	}
		@@ -2715,15 +2238,8 @@
2715	2238	self::trigger_redirect( $form, $params, $args );
2716	2239	}
2717	2240	}
2718	2241
2719		- /**
2720		- * @param object $form
2721		- * @param array $params
2722		- * @param array $args
2723		- *
2724		- * @return void
2725		- */
2726	2242	public static function trigger_redirect( $form, $params, $args ) {
2727	2243	$success_args = array(
2728	2244	'action' => $params['action'],
2729	2245	'conf_method' => 'redirect',
		@@ -2761,9 +2277,9 @@
2761	2277	unset( $extra_args['form'] );
2762	2278
2763	2279	do_action( 'frm_success_action', $args['conf_method'], $args['form'], $args['form']->options, $args['entry_id'], $extra_args );
2764	2280
2765		- $opt = ! isset( $args['action'] ) || $args['action'] === 'create' ? 'success' : 'edit';
	2281	+ $opt = ( ! isset( $args['action'] ) || $args['action'] === 'create' ) ? 'success' : 'edit';
2766	2282
2767	2283	$args['success_opt'] = $opt;
2768	2284	$args['ajax'] = ! empty( $frm_vars['ajax'] );
2769	2285
		@@ -2782,9 +2298,8 @@
2782	2298	* @since 6.0
2783	2299	*
2784	2300	* @param array $args See {@see FrmFormsController::run_success_action()}.
2785	2301	* @param string $event Form event. Default is `create`.
2786		- *
2787	2302	* @return array Array of actions that meet the conditional logics.
2788	2303	*/
2789	2304	public static function get_met_on_submit_actions( $args, $event = 'create' ) {
2790	2305	if ( ! FrmOnSubmitHelper::form_has_migrated( $args['form'] ) ) {
		@@ -2790,16 +2305,16 @@
2790	2305	if ( ! FrmOnSubmitHelper::form_has_migrated( $args['form'] ) ) {
2791	2306	return array();
2792	2307	}
2793	2308
2794		- // If a redirect action has already opened the URL in a new tab, we show the default message in the current tab.
	2309	+ // If a redirect action has already opened the URL in a new tab, we show the default message in the currect tab.
2795	2310	if ( ! empty( self::$redirected_in_new_tab[ $args['form']->id ] ) ) {
2796	2311	return array( FrmOnSubmitHelper::get_fallback_action_after_open_in_new_tab( $event ) );
2797	2312	}
2798	2313
2799		- $entry = FrmEntry::getOne( $args['entry_id'], true );
2800		- $actions = FrmOnSubmitHelper::get_actions( $args['form']->id );
2801		- $met_actions = array();
	2314	+ $entry = FrmEntry::getOne( $args['entry_id'], true );
	2315	+ $actions = FrmOnSubmitHelper::get_actions( $args['form']->id );
	2316	+ $met_actions = array();
2802	2317	$has_redirect = false;
2803	2318
2804	2319	foreach ( $actions as $action ) {
2805	2320	if ( ! in_array( $event, $action->post_content['event'], true ) ) {
		@@ -2857,9 +2372,8 @@
2857	2372	*
2858	2373	* @param object $action Form action object.
2859	2374	* @param array $args See {@see FrmFormsController::run_success_action()}.
2860	2375	* @param string $event Form event. Default is `create`.
2861		- *
2862	2376	* @return bool
2863	2377	*/
2864	2378	private static function is_valid_on_submit_action( $action, $args, $event = 'create' ) {
2865	2379	$action_type = FrmOnSubmitHelper::get_action_type( $action );
		@@ -2881,9 +2395,8 @@
2881	2395	return false;
2882	2396	}
2883	2397
2884	2398	$page = get_post( $action->post_content['success_page_id'] );
2885		-
2886	2399	if ( ! $page || 'trash' === $page->post_status ) {
2887	2400	return false;
2888	2401	}
2889	2402	}
		@@ -2905,9 +2418,8 @@
2905	2418	'entry_id' => $args['entry_id'],
2906	2419	'action' => FrmOnSubmitHelper::current_event( $args ),
2907	2420	)
2908	2421	);
2909		-
2910	2422	if ( ! is_array( $args['conf_method'] ) ) {
2911	2423	self::run_success_action( $args );
2912	2424	return;
2913	2425	}
		@@ -2934,9 +2446,8 @@
2934	2446	* @param array $args See {@see FrmFormsController::run_success_action()}.
2935	2447	*/
2936	2448	public static function run_multi_on_submit_actions( $args ) {
2937	2449	$redirect_action = null;
2938		-
2939	2450	foreach ( $args['conf_method'] as $action ) {
2940	2451	if ( 'redirect' === FrmOnSubmitHelper::get_action_type( $action ) ) {
2941	2452	// We catch the redirect action to run it last.
2942	2453	$redirect_action = $action;
		@@ -2974,9 +2485,8 @@
2974	2485	* @since 6.0
2975	2486	*
2976	2487	* @param array $args See {@see FrmFormsController::run_success_action()}.
2977	2488	* @param object $action On Submit action object.
2978		- *
2979	2489	* @return array
2980	2490	*/
2981	2491	private static function get_run_success_action_args( $args, $action ) {
2982	2492	$new_args = $args;
		@@ -3000,17 +2510,12 @@
3000	2510	}
3001	2511
3002	2512	/**
3003	2513	* @since 3.0
3004		- *
3005		- * @param array $args
3006		- *
3007		- * @return void
3008	2514	*/
3009	2515	private static function load_page_after_submit( $args ) {
3010	2516	global $post;
3011	2517	$opt = $args['success_opt'];
3012		-
3013	2518	if ( ! $post || $args['form']->options[ $opt . '_page_id' ] != $post->ID ) {
3014	2519	$page = get_post( $args['form']->options[ $opt . '_page_id' ] );
3015	2520	$old_post = $post;
3016	2521	$post = $page;
		@@ -3034,9 +2539,8 @@
3034	2539	}
3035	2540
3036	2541	/**
3037	2542	* @since 3.0
3038		- *
3039	2543	* @param array $args See {@see FrmFormsController::run_success_action()}.
3040	2544	*/
3041	2545	private static function redirect_after_submit( $args ) {
3042	2546	add_filter( 'frm_use_wpautop', '__return_false' );
		@@ -3059,9 +2563,9 @@
3059	2563	echo json_encode( self::get_ajax_redirect_response_data( $args + compact( 'success_url' ) ) );
3060	2564	wp_die();
3061	2565	}
3062	2566
3063		- if ( ! headers_sent() && empty( $args['force_delay_redirect'] ) && empty( $args['form']->options['redirect_delay'] ) ) {
	2567	+ if ( ! headers_sent() && empty( $args['force_delay_redirect'] ) ) {
3064	2568	// Not AJAX submit, no headers sent, and there is just one Redirect action runs.
3065	2569	if ( ! empty( $args['form']->options['open_in_new_tab'] ) ) {
3066	2570	self::print_open_in_new_tab_js_with_fallback_handler( $success_url, $args );
3067	2571	self::$redirected_in_new_tab[ $args['form']->id ] = 1;
		@@ -3103,51 +2607,31 @@
3103	2607	*
3104	2608	* @since 6.3.1
3105	2609	*
3106	2610	* @param array $args See {@see FrmFormsController::run_success_action()}.
3107		- *
3108	2611	* @return array
3109	2612	*/
3110	2613	private static function get_ajax_redirect_response_data( $args ) {
3111		- $response_data = array(
3112		- 'redirect' => $args['success_url'],
3113		- 'content' => '',
3114		- );
3115		- $unset_content = true;
	2614	+ $response_data = array( 'redirect' => $args['success_url'] );
3116	2615
3117		- if ( ! empty( $args['form']->options['redirect_delay'] ) ) {
3118		- $response_data['delay'] = $args['form']->options['redirect_delay_time'];
3119		- $response_data['content'] .= self::get_redirect_message( $args['success_url'], $args['form']->options['redirect_delay_msg'], $args );
3120		- $unset_content = false;
3121		- }
3122		-
3123	2616	if ( ! empty( $args['form']->options['open_in_new_tab'] ) ) {
3124	2617	$response_data['openInNewTab'] = 1;
3125	2618
3126		- // Only show open in new tab text if there is no delay.
3127		- if ( empty( $response_data['content'] ) ) {
3128		- $args['message'] = FrmOnSubmitHelper::get_default_new_tab_msg();
	2619	+ $args['message'] = FrmOnSubmitHelper::get_default_new_tab_msg();
3129	2620
3130		- $args['form']->options['success_msg'] = $args['message'];
3131		- $args['form']->options['edit_msg'] = $args['message'];
	2621	+ $args['form']->options['success_msg'] = $args['message'];
	2622	+ $args['form']->options['edit_msg'] = $args['message'];
	2623	+ if ( ! isset( $args['fields'] ) ) {
	2624	+ $args['fields'] = FrmField::get_all_for_form( $args['form']->id );
	2625	+ }
3132	2626
3133		- if ( ! isset( $args['fields'] ) ) {
3134		- $args['fields'] = FrmField::get_all_for_form( $args['form']->id );
3135		- }
	2627	+ $args['message'] = self::prepare_submit_message( $args['form'], $args['entry_id'], $args );
3136	2628
3137		- $args['message'] = self::prepare_submit_message( $args['form'], $args['entry_id'], $args );
	2629	+ ob_start();
	2630	+ self::show_lone_success_messsage( $args );
	2631	+ $response_data['content'] = ob_get_clean();
3138	2632
3139		- ob_start();
3140		- self::show_lone_success_message( $args );
3141		- $response_data['content'] .= ob_get_clean();
3142		- $unset_content = false;
3143		- }//end if
3144		-
3145	2633	$response_data['fallbackMsg'] = self::get_redirect_fallback_message( $args['success_url'], $args );
3146		- }//end if
3147		-
3148		- if ( $unset_content && '' === $response_data['content'] ) {
3149		- unset( $response_data['content'] );
3150	2634	}
3151	2635
3152	2636	return $response_data;
3153	2637	}
		@@ -3159,9 +2643,9 @@
3159	2643	*
3160	2644	* @param array $args See {@see FrmFormsController::run_success_action()}.
3161	2645	*/
3162	2646	private static function redirect_after_submit_using_js( $args ) {
3163		- $success_msg = $args['form']->options['redirect_delay_msg'];
	2647	+ $success_msg = FrmOnSubmitHelper::get_default_redirect_msg();
3164	2648	$redirect_msg = self::get_redirect_message( $args['success_url'], $success_msg, $args );
3165	2649	$success_url = esc_url_raw( $args['success_url'] );
3166	2650
3167	2651	/**
		@@ -3168,11 +2652,11 @@
3168	2652	* Filters the delay time before redirecting when On Submit Redirect action is delayed.
3169	2653	*
3170	2654	* @since 6.0
3171	2655	*
3172		- * @param int $delay_time Delay time in milliseconds.
	2656	+ * @param int $delay_time Delay time in miliseconds.
3173	2657	*/
3174		- $delay_time = apply_filters( 'frm_redirect_delay_time', 1000 * $args['form']->options['redirect_delay_time'] );
	2658	+ $delay_time = apply_filters( 'frm_redirect_delay_time', 8000 );
3175	2659
3176	2660	if ( ! empty( $args['form']->options['open_in_new_tab'] ) ) {
3177	2661	$redirect_js = 'window.open("' . $success_url . '", "_blank")';
3178	2662	} else {
		@@ -3182,15 +2666,13 @@
3182	2666	add_filter( 'frm_use_wpautop', '__return_true' );
3183	2667
3184	2668	echo FrmAppHelper::maybe_kses( $redirect_msg ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
3185	2669	echo '<script>';
3186		-
3187	2670	if ( empty( $args['doing_ajax'] ) ) {
3188	2671	// Not AJAX submit, delay JS until window.load.
3189	2672	echo 'window.onload=function(){';
3190	2673	}
3191	2674	echo 'setTimeout(function(){' . $redirect_js . '}, ' . intval( $delay_time ) . ');'; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
3192		-
3193	2675	if ( empty( $args['doing_ajax'] ) ) {
3194	2676	echo '};';
3195	2677	}
3196	2678	echo '</script>';
		@@ -3203,10 +2685,8 @@
3203	2685	* @param string $success_msg
3204	2686	* @param array $args
3205	2687	*/
3206	2688	private static function get_redirect_message( $success_url, $success_msg, $args ) {
3207		- $success_msg = apply_filters( 'frm_content', $success_msg, $args['form'], $args['entry_id'] );
3208		- $success_msg = do_shortcode( FrmAppHelper::use_wpautop( $success_msg ) );
3209	2689	$redirect_msg = '<div class="' . esc_attr( FrmFormsHelper::get_form_style_class( $args['form'] ) ) . '"><div class="frm-redirect-msg" role="status">' . $success_msg . '<br/>' .
3210	2690	self::get_redirect_fallback_message( $success_url, $args ) .
3211	2691	'</div></div>';
3212	2692
		@@ -3225,14 +2705,12 @@
3225	2705	* @since 6.3.1
3226	2706	*
3227	2707	* @param string $success_url Redirect URL.
3228	2708	* @param array $args Contains `form` object.
3229		- *
3230	2709	* @return string
3231	2710	*/
3232	2711	private static function get_redirect_fallback_message( $success_url, $args ) {
3233	2712	$target = '';
3234		-
3235	2713	if ( ! empty( $args['form']->options['open_in_new_tab'] ) ) {
3236	2714	$target = ' target="_blank"';
3237	2715	}
3238	2716
		@@ -3247,12 +2725,8 @@
3247	2725	/**
3248	2726	* Prepare to show the success message and empty form after submit
3249	2727	*
3250	2728	* @since 2.05
3251		- *
3252		- * @param array $atts
3253		- *
3254		- * @return void
3255	2729	*/
3256	2730	public static function show_message_after_save( $atts ) {
3257	2731	$atts['message'] = self::prepare_submit_message( $atts['form'], $atts['entry_id'], $atts );
3258	2732
		@@ -3258,9 +2732,8 @@
3258	2732
3259	2733	if ( ! isset( $atts['form']->options['show_form'] ) || $atts['form']->options['show_form'] ) {
3260	2734	if ( isset( $atts['action'] ) && 'update' === $atts['action'] && is_callable( array( 'FrmProEntriesController', 'show_front_end_form_with_entry' ) ) ) {
3261	2735	$entry = FrmEntry::getOne( $atts['entry_id'] );
3262		-
3263	2736	if ( $entry ) {
3264	2737	// This is copied from the Pro plugin.
3265	2738	$atts['conf_message'] = FrmProEntriesController::confirmation( 'message', $atts['form'], $atts['form']->options, $entry->id, $atts );
3266	2739	$atts['show_form'] = FrmProEntriesController::is_form_displayed_after_edit( $atts['form'] );
		@@ -3269,9 +2742,9 @@
3269	2742	} else {
3270	2743	self::show_form_after_submit( $atts );
3271	2744	}
3272	2745	} else {
3273		- self::show_lone_success_message( $atts );
	2746	+ self::show_lone_success_messsage( $atts );
3274	2747	}
3275	2748	}
3276	2749
3277	2750	/**
		@@ -3277,12 +2750,8 @@
3277	2750	/**
3278	2751	* Show an empty form
3279	2752	*
3280	2753	* @since 2.05
3281		- *
3282		- * @param array $args
3283		- *
3284		- * @return void
3285	2754	*/
3286	2755	private static function show_form_after_submit( $args ) {
3287	2756	self::fill_atts_for_form_display( $args );
3288	2757
		@@ -3303,9 +2772,9 @@
3303	2772
3304	2773	$include_form_tag = apply_filters( 'frm_include_form_tag', true, $form );
3305	2774
3306	2775	$frm_settings = FrmAppHelper::get_settings();
3307		- $submit = $form->options['submit_value'] ?? $frm_settings->submit_value;
	2776	+ $submit = isset( $form->options['submit_value'] ) ? $form->options['submit_value'] : $frm_settings->submit_value;
3308	2777
3309	2778	global $frm_vars;
3310	2779	self::maybe_load_css( $form, $values['custom_style'], $frm_vars['load_css'] );
3311	2780
		@@ -3314,19 +2783,13 @@
3314	2783	include FrmAppHelper::plugin_path() . '/classes/views/frm-entries/new.php';
3315	2784	}
3316	2785
3317	2786	/**
3318		- * Gets message placement.
	2787	+ * @return string - 'before', 'after', or 'submit'
3319	2788	*
3320	2789	* @since 4.05.02
3321		- * @since 6.26 This method changed from `private` to `public`.
3322		- *
3323		- * @param object $form Form object.
3324		- * @param string $message The message.
3325		- *
3326		- * @return string Accepts 'before', 'after', or 'submit'.
3327	2790	*/
3328		- public static function message_placement( $form, $message ) {
	2791	+ private static function message_placement( $form, $message ) {
3329	2792	$place = 'before';
3330	2793
3331	2794	if ( $message && isset( $form->options['form_class'] ) ) {
3332	2795	if ( strpos( $form->options['form_class'], 'frm_below_success' ) !== false ) {
		@@ -3336,14 +2799,11 @@
3336	2799	}
3337	2800	}
3338	2801
3339	2802	/**
3340		- * Filter the message placement.
	2803	+ * @return string - 'before' or 'after'
3341	2804	*
3342	2805	* @since 4.05.02
3343		- *
3344		- * @param string $place Accepts 'before', 'after', or 'submit'.
3345		- * @param array $args Args.
3346	2806	*/
3347	2807	return apply_filters( 'frm_message_placement', $place, compact( 'form', 'message' ) );
3348	2808	}
3349	2809
		@@ -3350,12 +2810,8 @@
3350	2810	/**
3351	2811	* Get all the values needed on the new.php entry page
3352	2812	*
3353	2813	* @since 2.05
3354		- *
3355		- * @param array $args
3356		- *
3357		- * @return void
3358	2814	*/
3359	2815	private static function fill_atts_for_form_display( &$args ) {
3360	2816	if ( ! isset( $args['title'] ) && isset( $args['show_title'] ) ) {
3361	2817	$args['title'] = $args['show_title'];
		@@ -3380,14 +2836,10 @@
3380	2836	/**
3381	2837	* Show the success message without the form
3382	2838	*
3383	2839	* @since 2.05
3384		- *
3385		- * @param array $atts
3386		- *
3387		- * @return void
3388	2840	*/
3389		- private static function show_lone_success_message( $atts ) {
	2841	+ private static function show_lone_success_messsage( $atts ) {
3390	2842	global $frm_vars;
3391	2843	$values = FrmEntriesHelper::setup_new_vars( $atts['fields'], $atts['form'], true );
3392	2844	self::maybe_load_css( $atts['form'], $values['custom_style'], $frm_vars['load_css'] );
3393	2845
		@@ -3396,9 +2848,9 @@
3396	2848	$errors = array();
3397	2849	$form = $atts['form'];
3398	2850	$message = $atts['message'];
3399	2851
3400		- include FrmAppHelper::plugin_path() . '/classes/views/frm-entries/errors.php';
	2852	+ include( FrmAppHelper::plugin_path() . '/classes/views/frm-entries/errors.php' );
3401	2853	}
3402	2854
3403	2855	/**
3404	2856	* Prepare the success message before it's shown
		@@ -3408,17 +2860,16 @@
3408	2860	*
3409	2861	* @param object $form Form object.
3410	2862	* @param int $entry_id Entry ID.
3411	2863	* @param array $args See {@see FrmFormsController::run_success_action()}.
3412		- *
3413	2864	* @return string
3414	2865	*/
3415	2866	private static function prepare_submit_message( $form, $entry_id, $args = array() ) {
3416	2867	$frm_settings = FrmAppHelper::get_settings( array( 'current_form' => $form->id ) );
3417		- $opt = $args['success_opt'] ?? 'success';
	2868	+ $opt = isset( $args['success_opt'] ) ? $args['success_opt'] : 'success';
3418	2869
3419	2870	if ( $entry_id && is_numeric( $entry_id ) ) {
3420		- $message = $form->options[ $opt . '_msg' ] ?? $frm_settings->success_msg;
	2871	+ $message = isset( $form->options[ $opt . '_msg' ] ) ? $form->options[ $opt . '_msg' ] : $frm_settings->success_msg;
3421	2872	$class = 'frm_message';
3422	2873	} else {
3423	2874	$message = $frm_settings->failed_msg;
3424	2875	$class = FrmFormsHelper::form_error_class();
		@@ -3459,15 +2910,8 @@
3459	2910	public static function has_combo_js_file() {
3460	2911	return is_readable( FrmAppHelper::plugin_path() . '/js/frm.min.js' );
3461	2912	}
3462	2913
3463		- /**
3464		- * @param object $form
3465		- * @param int|string $this_load
3466		- * @param bool $global_load
3467		- *
3468		- * @return void
3469		- */
3470	2914	public static function maybe_load_css( $form, $this_load, $global_load ) {
3471	2915	$load_css = FrmForm::is_form_loaded( $form, $this_load, $global_load );
3472	2916
3473	2917	if ( ! $load_css ) {
		@@ -3497,9 +2941,8 @@
3497	2941	return;
3498	2942	}
3499	2943
3500	2944	global $wp_styles;
3501		-
3502	2945	if ( is_array( $wp_styles->queue ) && in_array( 'formidable', $wp_styles->queue, true ) ) {
3503	2946	wp_print_styles( 'formidable' );
3504	2947	}
3505	2948	}
		@@ -3514,16 +2957,10 @@
3514	2957	private static function should_load_late() {
3515	2958	return ! function_exists( 'aioseo' );
3516	2959	}
3517	2960
3518		- /**
3519		- * @param string $tag
3520		- * @param string $handle
3521		- *
3522		- * @return string
3523		- */
3524	2961	public static function defer_script_loading( $tag, $handle ) {
3525		- if ( 'captcha-api' === $handle && ! strpos( $tag, 'defer' ) ) {
	2962	+ if ( 'captcha-api' == $handle && ! strpos( $tag, 'defer' ) ) {
3526	2963	$tag = str_replace( ' src', ' defer="defer" async="async" src', $tag );
3527	2964	}
3528	2965
3529	2966	return $tag;
		@@ -3528,33 +2965,21 @@
3528	2965
3529	2966	return $tag;
3530	2967	}
3531	2968
3532		- /**
3533		- * @param string $location
3534		- *
3535		- * @return void
3536		- */
3537	2969	public static function footer_js( $location = 'footer' ) {
3538	2970	global $frm_vars;
3539	2971
3540	2972	FrmStylesController::enqueue_css();
3541	2973
3542		- if ( ! FrmAppHelper::is_admin() && $location !== 'header' && ! empty( $frm_vars['forms_loaded'] ) ) {
	2974	+ if ( ! FrmAppHelper::is_admin() && $location != 'header' && ! empty( $frm_vars['forms_loaded'] ) ) {
3543	2975	// load formidable js
3544	2976	wp_enqueue_script( 'formidable' );
3545		-
3546		- FrmHoneypot::maybe_print_honeypot_js();
3547	2977	}
3548	2978	}
3549	2979
3550	2980	/**
3551	2981	* @since 2.0.8
3552		- *
3553		- * @param array $atts
3554		- * @param string $content
3555		- *
3556		- * @return void
3557	2982	*/
3558	2983	private static function maybe_minimize_form( $atts, &$content ) {
3559	2984	// check if minimizing is turned on
3560	2985	if ( self::is_minification_on( $atts ) ) {
		@@ -3563,15 +2988,12 @@
3563	2988	}
3564	2989
3565	2990	/**
3566	2991	* @since 2.0.8
3567		- *
3568		- * @param array $atts
3569		- *
3570		- * @return bool
	2992	+ * @return boolean
3571	2993	*/
3572	2994	private static function is_minification_on( $atts ) {
3573		- return ! empty( $atts['minimize'] );
	2995	+ return isset( $atts['minimize'] ) && ! empty( $atts['minimize'] );
3574	2996	}
3575	2997
3576	2998	/**
3577	2999	* @since 5.0.16
		@@ -3579,9 +3001,8 @@
3579	3001	* @return void
3580	3002	*/
3581	3003	public static function landing_page_preview_option() {
3582	3004	$dir = apply_filters( 'frm_landing_page_preview_option', false );
3583		-
3584	3005	if ( false === $dir || ! file_exists( $dir . 'landing-page-preview-option.php' ) ) {
3585	3006	$dir = self::get_form_views_path();
3586	3007	}
3587	3008	include $dir . 'landing-page-preview-option.php';
		@@ -3610,15 +3031,13 @@
3610	3031
3611	3032	check_ajax_referer( 'frm_ajax', 'nonce' );
3612	3033
3613	3034	$type = FrmAppHelper::get_post_param( 'type', '', 'sanitize_text_field' );
3614		-
3615	3035	if ( ! $type || ! in_array( $type, array( 'form', 'view' ), true ) ) {
3616	3036	die( 0 );
3617	3037	}
3618	3038
3619	3039	$object_id = FrmAppHelper::get_post_param( 'object_id', '', 'absint' );
3620		-
3621	3040	if ( ! $object_id ) {
3622	3041	die( 0 );
3623	3042	}
3624	3043
		@@ -3630,15 +3049,13 @@
3630	3049	$postarr['post_content'] = apply_filters( 'frm_create_page_with_' . $type . '_shortcode_content', '', $object_id );
3631	3050	}
3632	3051
3633	3052	$name = FrmAppHelper::get_post_param( 'name', '', 'sanitize_text_field' );
3634		-
3635	3053	if ( $name ) {
3636	3054	$postarr['post_title'] = $name;
3637	3055	}
3638	3056
3639	3057	$success = wp_insert_post( $postarr );
3640		-
3641	3058	if ( ! is_numeric( $success ) || ! $success ) {
3642	3059	die( 0 );
3643	3060	}
3644	3061
		@@ -3652,9 +3069,8 @@
3652	3069	/**
3653	3070	* @since 5.3
3654	3071	*
3655	3072	* @param int $form_id
3656		- *
3657	3073	* @return string
3658	3074	*/
3659	3075	private static function get_page_shortcode_content_for_form( $form_id ) {
3660	3076	$shortcode = '[formidable id="' . $form_id . '"]';
		@@ -3675,9 +3091,9 @@
3675	3091
3676	3092	check_ajax_referer( 'frm_ajax', 'nonce' );
3677	3093
3678	3094	$html = FrmAppHelper::clip(
3679		- function () {
	3095	+ function() {
3680	3096	FrmAppHelper::maybe_autocomplete_pages_options(
3681	3097	array(
3682	3098	'field_name' => 'frm_page_dropdown',
3683	3099	'page_id' => '',
		@@ -3696,13 +3112,16 @@
3696	3112	}
3697	3113
3698	3114	/**
3699	3115	* @deprecated 4.0
3700		- *
3701		- * @param array $values
3702		- *
3703		- * @return void
3704	3116	*/
	3117	+ public static function new_form( $values = array() ) {
	3118	+ FrmDeprecated::new_form( $values );
	3119	+ }
	3120	+
	3121	+ /**
	3122	+ * @deprecated 4.0
	3123	+ */
3705	3124	public static function create( $values = array() ) {
3706	3125	_deprecated_function( __METHOD__, '4.0', 'FrmFormsController::update' );
3707	3126	self::update( $values );
3708	3127	}
		@@ -3707,16 +3126,75 @@
3707	3126	self::update( $values );
3708	3127	}
3709	3128
3710	3129	/**
3711		- * Education for premium features.
	3130	+ * @deprecated 3.0
	3131	+ * @codeCoverageIgnore
	3132	+ */
	3133	+ public static function bulk_create_template( $ids ) {
	3134	+ return FrmDeprecated::bulk_create_template( $ids );
	3135	+ }
	3136	+
	3137	+ /**
	3138	+ * @deprecated 3.0
	3139	+ * @codeCoverageIgnore
	3140	+ */
	3141	+ public static function edit_key() {
	3142	+ FrmDeprecated::edit_key();
	3143	+ }
	3144	+
	3145	+ /**
	3146	+ * @deprecated 3.0
	3147	+ * @codeCoverageIgnore
	3148	+ */
	3149	+ public static function edit_description() {
	3150	+ FrmDeprecated::edit_description();
	3151	+ }
	3152	+
	3153	+ /**
	3154	+ * @deprecated 4.08
	3155	+ * @since 3.06
	3156	+ */
	3157	+ public static function add_new() {
	3158	+ _deprecated_function( __FUNCTION__, '4.08' );
	3159	+ }
	3160	+
	3161	+ /**
	3162	+ * Create a custom template from a form
3712	3163	*
3713		- * @since 4.05
3714		- * @deprecated 6.16.3
	3164	+ * @since 3.06
	3165	+ * @deprecated 6.7
	3166	+ */
	3167	+ public static function build_template() {
	3168	+ _deprecated_function( __METHOD__, '6.7' );
	3169	+ }
	3170	+
	3171	+ /**
	3172	+ * @deprecated 6.7
3715	3173	*
	3174	+ * @return bool
	3175	+ */
	3176	+ public static function expired() {
	3177	+ _deprecated_function( __METHOD__, '6.7' );
	3178	+ return FrmAddonsController::is_license_expired();
	3179	+ }
	3180	+
	3181	+ /**
	3182	+ * Get data from api before rendering it so that we can flag the modal as expired
	3183	+ *
	3184	+ * @deprecated 6.7
	3185	+ *
3716	3186	* @return void
3717	3187	*/
3718		- public static function add_form_style_tab_options() {
3719		- _deprecated_function( __METHOD__, '6.16.3' );
3720		- include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/add_form_style_options.php';
	3188	+ public static function before_list_templates() {
	3189	+ _deprecated_function( __METHOD__, '6.7' );
	3190	+ }
	3191	+
	3192	+ /**
	3193	+ * @deprecated 6.7
	3194	+ *
	3195	+ * @return void
	3196	+ */
	3197	+ public static function list_templates() {
	3198	+ _deprecated_function( __METHOD__, '6.7' );
3721	3199	}
3722	3200	}