← All changes | classes/controllers/FrmFormsController.php +384 -879 6.27 → 6.8 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,25 +14,13 @@
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		-
35	23	add_submenu_page( 'formidable', 'Formidable | ' . $menu_label, $menu_label, 'frm_view_forms', 'formidable', 'FrmFormsController::route' );
36	24
37	25	self::maybe_load_listing_hooks();
38	26	}
		@@ -66,12 +54,12 @@
66	54	*/
67	55	public static function logic_tip() {
68	56	$images_url = FrmAppHelper::plugin_url() . '/images/';
69	57	$data_message = __( 'Only show the fields you need and create branching forms. Upgrade to get conditional logic and question branching.', 'formidable' );
70		- $data_message .= ' <img src="' . esc_url( $images_url ) . '/survey-logic.png" srcset="' . esc_url( $images_url ) . 'survey-logic@2x.png 2x" alt="' . esc_attr__( 'Conditional Logic options', 'formidable' ) . '"/>'; // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong
71		- echo '<a href="javascript:void(0)" class="frm_noallow frm_show_upgrade frm_add_logic_link frm-collapsed frm-flex-justify" data-upgrade="' . esc_attr__( 'Conditional Logic options', 'formidable' ) . '" data-message="' . esc_attr( $data_message ) . '" data-medium="builder" data-content="logic">'; // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong
	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' ) . '"/>';
	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">';
72	60	esc_html_e( 'Conditional Logic', 'formidable' );
73		- 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' ) );
74	62	echo '</a>';
75	63	}
76	64
77	65	/**
		@@ -78,15 +66,12 @@
78	66	* By default, Divi processes form shortcodes on the edit post page.
79	67	* Now that won't do.
80	68	*
81	69	* @since 3.01
82		- *
83		- * @param array $shortcodes List of shortcodes to process.
84		- *
85		- * @return array
86	70	*/
87	71	public static function prevent_divi_conflict( $shortcodes ) {
88	72	$shortcodes[] = 'formidable';
	73	+
89	74	return $shortcodes;
90	75	}
91	76
92	77	/**
		@@ -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	);
		@@ -251,15 +169,15 @@
251	169	FrmAppController::show_error_modal( $error_args );
252	170	return;
253	171	}
254	172
255		- $id = FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
256		- $errors = FrmForm::validate( $_POST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
	173	+ $id = FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
	174	+
	175	+ $errors = FrmForm::validate( $_POST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
257	176	$warnings = FrmFormsHelper::check_for_warnings( $_POST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
258	177
259	178	if ( count( $errors ) > 0 ) {
260		- self::get_settings_vars( $id, $errors, compact( 'warnings' ) );
261		- return;
	179	+ return self::get_settings_vars( $id, $errors, compact( 'warnings' ) );
262	180	}
263	181
264	182	do_action( 'frm_before_update_form_settings', $id );
265	183
		@@ -267,9 +185,8 @@
267	185
268	186	FrmForm::update( $id, $_POST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
269	187
270	188	$antispam_is_on = ! empty( $_POST['options']['antispam'] ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
271		-
272	189	if ( $antispam_is_on !== $antispam_was_on ) {
273	190	FrmAntiSpam::clear_caches();
274	191	}
275	192
		@@ -274,14 +191,13 @@
274	191	}
275	192
276	193	$message = __( 'Settings Successfully Updated', 'formidable' );
277	194
278		- self::get_settings_vars( $id, array(), compact( 'message', 'warnings' ) );
	195	+ return self::get_settings_vars( $id, array(), compact( 'message', 'warnings' ) );
279	196	}
280	197
281	198	/**
282	199	* @param int $form_id
283		- *
284	200	* @return bool
285	201	*/
286	202	private static function antispam_was_on( $form_id ) {
287	203	$form = FrmForm::getOne( $form_id );
		@@ -287,15 +203,10 @@
287	203	$form = FrmForm::getOne( $form_id );
288	204	return ! empty( $form->options['antispam'] );
289	205	}
290	206
291		- /**
292		- * @param array $values
293		- *
294		- * @return void
295		- */
296	207	public static function update( $values = array() ) {
297		- if ( ! $values ) {
	208	+ if ( empty( $values ) ) {
298	209	$values = $_POST; // phpcs:ignore WordPress.Security.NonceVerification.Missing
299	210	}
300	211
301	212	// Set radio button and checkbox meta equal to "other" value.
		@@ -304,9 +215,8 @@
304	215	}
305	216
306	217	$errors = FrmForm::validate( $values );
307	218	$permission_error = FrmAppHelper::permission_nonce_error( 'frm_edit_forms', 'frm_save_form', 'frm_save_form_nonce' );
308		-
309	219	if ( $permission_error !== false ) {
310	220	$errors['form'] = $permission_error;
311	221	}
312	222
		@@ -312,58 +222,42 @@
312	222
313	223	$id = isset( $values['id'] ) ? absint( $values['id'] ) : FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
314	224
315	225	if ( count( $errors ) > 0 ) {
316		- self::get_edit_vars( $id, $errors );
317		- return;
318		- }
	226	+ return self::get_edit_vars( $id, $errors );
	227	+ } else {
	228	+ self::maybe_remove_draft_option_from_fields( $id );
319	229
320		- self::maybe_remove_draft_option_from_fields( $id );
	230	+ FrmForm::update( $id, $values );
	231	+ $message = __( 'Form was successfully updated.', 'formidable' );
321	232
322		- FrmForm::update( $id, $values );
323		- $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	+ }
324	241
325		- if ( self::is_too_long( $values ) ) {
326		- $message .= '<br/> ' . sprintf(
327		- /* translators: %1$s: Start link HTML, %2$s: end link HTML */
328		- __( 'However, your form is very long and may be %1$sreaching server limits%2$s.', 'formidable' ),
329		- '<a href="' . esc_url( self::get_form_too_long_docs_url() ) . '" target="_blank" rel="noopener">',
330		- '</a>'
331		- );
332		- }
	242	+ if ( defined( 'DOING_AJAX' ) ) {
	243	+ wp_die( FrmAppHelper::kses( $message, array( 'a' ) ) ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
	244	+ }
333	245
334		- if ( defined( 'DOING_AJAX' ) ) {
335		- wp_die( FrmAppHelper::kses( $message, array( 'a' ) ) ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
336		- }
337		-
338		- self::get_edit_vars( $id, array(), $message );
	246	+ return self::get_edit_vars( $id, array(), $message );
	247	+ }//end if
339	248	}
340	249
341	250	/**
342		- * @since 6.25.1
343		- *
344		- * @return string
345		- */
346		- private static function get_form_too_long_docs_url() {
347		- $utm = array(
348		- 'campaign' => 'builder',
349		- 'content' => 'form-too-long',
350		- );
351		- return FrmAppHelper::admin_upgrade_link( $utm, 'knowledgebase/i-have-a-long-form-why-did-the-options-at-the-end-of-the-form-stop-saving/' );
352		- }
353		-
354		- /**
355	251	* Remove the draft flag from any new fields from this current session.
356	252	*
357	253	* @since 6.8
358	254	*
359	255	* @param int $form_id
360		- *
361	256	* @return void
362	257	*/
363	258	private static function maybe_remove_draft_option_from_fields( $form_id ) {
364	259	$draft_field_ids_csv = FrmAppHelper::get_post_param( 'draft_fields', '', 'sanitize_text_field' );
365		-
366	260	if ( ! $draft_field_ids_csv ) {
367	261	// If the draft_fields input is empty there are no new fields in the session.
368	262	return;
369	263	}
		@@ -368,9 +262,8 @@
368	262	return;
369	263	}
370	264
371	265	$draft_field_ids = array_filter( explode( ',', $draft_field_ids_csv ), 'is_numeric' );
372		-
373	266	if ( ! $draft_field_ids ) {
374	267	// Exit early if the draft fields input is invalid. It should be a CSV of integer values.
375	268	return;
376	269	}
		@@ -375,9 +268,8 @@
375	268	return;
376	269	}
377	270
378	271	$draft_field_rows = FrmFieldsHelper::get_draft_field_results( $form_id, $draft_field_ids );
379		-
380	272	foreach ( $draft_field_rows as $row ) {
381	273	$row->field_options['draft'] = 0;
382	274	FrmField::update( $row->id, array( 'field_options' => $row->field_options ) );
383	275	}
		@@ -388,15 +280,35 @@
388	280	* If it's missing, it means other values at the end of the form
389	281	* were likely not saved either.
390	282	*
391	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
392	292	*
393		- * @param array $values
394		- *
395		- * @return bool
	293	+ * @since 2.0
	294	+ * @deprecated 3.06
396	295	*/
397		- private static function is_too_long( $values ) {
398		- 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();
399	311	}
400	312
401	313	public static function duplicate() {
402	314	FrmAppHelper::permission_check( 'frm_edit_forms' );
		@@ -413,10 +325,10 @@
413	325	$message = 'form_duplicate_error';
414	326
415	327	if ( $form ) {
416	328	$new_template = FrmAppHelper::simple_get( 'new_template' ) ? '&new_template=true' : '';
417		- $url = admin_url( 'admin.php?page=formidable&frm_action=edit&id=' . absint( $form ) . $new_template );
418		- $message = 'form_duplicated';
	329	+ $url = admin_url( 'admin.php?page=formidable&frm_action=edit&id=' . absint( $form ) . $new_template );
	330	+ $message = 'form_duplicated';
419	331	}
420	332
421	333	$url .= '&message=' . $message;
422	334
		@@ -424,26 +336,20 @@
424	336	exit();
425	337	}
426	338
427	339	/**
428		- * @return string|null
	340	+ * @return string
429	341	*/
430	342	public static function page_preview() {
431	343	$params = FrmForm::list_page_params();
432		-
433		- if ( ! $params['form'] || is_numeric( $params['form'] ) ) {
434		- return null;
	344	+ if ( ! $params['form'] ) {
	345	+ return;
435	346	}
436	347
437		- self::maybe_block_preview( $params['form'] );
438		-
439	348	$form = FrmForm::getOne( $params['form'] );
440		-
441		- if ( ! $form ) {
442		- return null;
	349	+ if ( $form ) {
	350	+ return self::show_form( $form->id, '', 'auto', 'auto' );
443	351	}
444		-
445		- return self::show_form( $form->id, '', 'auto', 'auto' );
446	352	}
447	353
448	354	/**
449	355	* @since 3.0
		@@ -450,19 +356,9 @@
450	356	*
451	357	* @return void
452	358	*/
453	359	public static function show_page_preview() {
454		- $preview = self::page_preview();
455		-
456		- if ( is_null( $preview ) ) {
457		- wp_die(
458		- '<h1>' . esc_html__( 'Form key is invalid', 'formidable' ) . '</h1>',
459		- '<p>' . esc_html__( 'Form key is invalid', 'formidable' ) . '</p>',
460		- 404
461		- );
462		- }
463		-
464		- echo $preview; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
	360	+ echo self::page_preview(); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
465	361	}
466	362
467	363	/**
468	364	* @return void
		@@ -473,19 +369,9 @@
473	369
474	370	global $frm_vars;
475	371	$frm_vars['preview'] = true;
476	372
477		- // print_emoji_styles is deprecated.
478		- remove_action( 'wp_print_styles', 'print_emoji_styles' );
479		-
480		- if ( FrmTestModeController::should_add_test_mode_container() ) {
481		- do_action( 'frm_test_mode_init' );
482		- add_action( 'wp_enqueue_scripts', 'FrmTestModeController::register_and_enqueue_required_scripts' );
483		- add_filter( 'frm_filter_final_form', 'FrmTestModeController::maybe_add_test_mode_container', 99 );
484		- }
485		-
486	373	$include_theme = FrmAppHelper::get_param( 'theme', '', 'get', 'absint' );
487		-
488	374	if ( $include_theme ) {
489	375	self::set_preview_query();
490	376	self::load_theme_preview();
491	377	} else {
		@@ -508,9 +394,8 @@
508	394	'post_type' => 'page',
509	395	);
510	396
511	397	$page_for_posts = get_option( 'page_for_posts' );
512		-
513	398	if ( is_numeric( $page_for_posts ) ) {
514	399	// Avoid querying for the "Posts Page" or "Blog Page" so we don't display 10 forms.
515	400	$page_query['post__not_in'] = array( $page_for_posts );
516	401	}
		@@ -515,15 +400,13 @@
515	400	$page_query['post__not_in'] = array( $page_for_posts );
516	401	}
517	402
518	403	$random_page = get_posts( $page_query );
519		-
520	404	if ( ! $random_page ) {
521	405	return;
522	406	}
523	407
524	408	$random_page = reset( $random_page );
525		-
526	409	if ( ! is_a( $random_page, 'WP_Post' ) ) {
527	410	// The return type can also be int.
528	411	return;
529	412	}
		@@ -545,9 +428,8 @@
545	428	*
546	429	* @since 5.5.2
547	430	*
548	431	* @param WP_Post $page The page object.
549		- *
550	432	* @return void
551	433	*/
552	434	private static function set_post_global( $page ) {
553	435	global $post;
		@@ -555,10 +437,8 @@
555	437	}
556	438
557	439	/**
558	440	* @since 3.0
559		- *
560		- * @return void
561	441	*/
562	442	private static function load_theme_preview() {
563	443	add_filter( 'wp_title', 'FrmFormsController::preview_title', 9999 );
564	444	add_filter( 'the_title', 'FrmFormsController::preview_page_title', 9999 );
		@@ -580,9 +460,8 @@
580	460	*
581	461	* @since 6.5.2
582	462	*
583	463	* @param array $classes The body classes list.
584		- *
585	464	* @return array
586	465	*/
587	466	public static function preview_block_theme_body_classnames( $classes ) {
588	467	$classes[] = 'has-global-padding';
		@@ -591,10 +470,8 @@
591	470
592	471	/**
593	472	* Not every theme supports get_template_part( 'page' ).
594	473	* When this is not supported, false is returned, and we can handle a fallback.
595		- *
596		- * @return void
597	474	*/
598	475	private static function fallback_when_page_template_part_is_not_supported_by_theme() {
599	476	if ( have_posts() ) {
600	477	the_post();
		@@ -606,12 +483,8 @@
606	483	echo '<div class="container entry-content">';
607	484	the_content();
608	485	echo '</div>';
609	486
610		- // Prevent extra unexpected forms in the footer.
611		- // For some reason this happens in the Twenty Twenty Five theme.
612		- add_filter( 'frm_filter_final_form', '__return_empty_string' );
613		-
614	487	self::get_template( 'footer' );
615	488	}
616	489	}
617	490
		@@ -616,14 +489,12 @@
616	489	}
617	490
618	491	/**
619	492	* Calls core function to get a template part if it doesn't cause deprecation warnings. Otherwise skips the deprecation function call
620		- * and renders required html fragments calling required functions.
	493	+ * and renders required html fragements calling required functions.
621	494	*
622	495	* @since 6.7.1
623		- *
624	496	* @param string $template
625		- *
626	497	* @return void
627	498	*/
628	499	private static function get_template( $template ) {
629	500	if ( self::should_try_getting_template( $template ) ) {
		@@ -644,11 +515,9 @@
644	515	/**
645	516	* Returns true if calling a template function doesn't trigger deprecation warnings.
646	517	*
647	518	* @since 6.7.1
648		- *
649	519	* @param string $template
650		- *
651	520	* @return bool
652	521	*/
653	522	private static function should_try_getting_template( $template ) {
654	523	$stylesheet_path = get_stylesheet_directory();
		@@ -662,12 +531,8 @@
662	531	/**
663	532	* Set the page title for the theme preview page
664	533	*
665	534	* @since 3.0
666		- *
667		- * @param string $title
668		- *
669		- * @return string
670	535	*/
671	536	public static function preview_page_title( $title ) {
672	537	if ( in_the_loop() ) {
673	538	$title = self::preview_title( $title );
		@@ -676,15 +541,11 @@
676	541	return $title;
677	542	}
678	543
679	544	/**
680		- * Set the page title for the theme preview page.
	545	+ * Set the page title for the theme preview page
681	546	*
682	547	* @since 3.0
683		- *
684		- * @param string $title
685		- *
686		- * @return string
687	548	*/
688	549	public static function preview_title( $title ) {
689	550	return __( 'Form Preview', 'formidable' );
690	551	}
		@@ -694,9 +555,8 @@
694	555	*
695	556	* @since 3.0
696	557	*
697	558	* @param string $content
698		- *
699	559	* @return string
700	560	*/
701	561	public static function preview_content( $content ) {
702	562	if ( in_the_loop() ) {
		@@ -711,93 +571,23 @@
711	571	/**
712	572	* @since 3.0
713	573	*/
714	574	private static function load_direct_preview() {
	575	+ header( 'Content-Type: text/html; charset=' . get_option( 'blog_charset' ) );
	576	+
715	577	$key = FrmAppHelper::simple_get( 'form', 'sanitize_title' );
716		-
717		- // phpcs:ignore Universal.Operators.StrictComparisons
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' );
		@@ -816,9 +605,11 @@
816	605	return '';
817	606	}
818	607
819	608	/* translators: %1$s: Number of forms */
820		- return sprintf( _n( '%1$s form restored from the Trash.', '%1$s forms restored from the Trash.', $count, 'formidable' ), $count );
	609	+ $message = sprintf( _n( '%1$s form restored from the Trash.', '%1$s forms restored from the Trash.', $count, 'formidable' ), $count );
	610	+
	611	+ return $message;
821	612	}
822	613
823	614	/**
824	615	* @since 3.06
		@@ -863,11 +654,10 @@
863	654	// Check nonce url.
864	655	check_admin_referer( $status . '_form_' . $params['id'] );
865	656
866	657	$count = 0;
867		-
868	658	if ( FrmForm::set_status( $params['id'], $available_status[ $status ]['new_status'] ) ) {
869		- ++$count;
	659	+ $count ++;
870	660	}
871	661
872	662	$form_type = FrmAppHelper::get_simple_request(
873	663	array(
		@@ -879,9 +669,9 @@
879	669	/* translators: %1$s: Number of forms */
880	670	$available_status['untrash']['message'] = sprintf( _n( '%1$s form restored from the Trash.', '%1$s forms restored from the Trash.', $count, 'formidable' ), $count );
881	671
882	672	/* translators: %1$s: Number of forms, %2$s: Start link HTML, %3$s: End link HTML */
883		- $available_status['trash']['message'] = sprintf( _n( '%1$s form moved to the Trash. %2$sUndo%3$s', '%1$s forms moved to the Trash. %2$sUndo%3$s', $count, 'formidable' ), $count, '<a href="' . esc_url( wp_nonce_url( '?page=formidable&frm_action=untrash&form_type=' . $form_type . '&id=' . $params['id'], 'untrash_form_' . $params['id'] ) ) . '">', '</a>' ); // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong
	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>' );
884	674
885	675	$message = $available_status[ $status ]['message'];
886	676
887	677	self::display_forms_list( $params, $message );
		@@ -886,28 +676,18 @@
886	676
887	677	self::display_forms_list( $params, $message );
888	678	}
889	679
890		- /**
891		- * @param array $ids
892		- *
893		- * @return string
894		- */
895	680	public static function bulk_trash( $ids ) {
896	681	FrmAppHelper::permission_check( 'frm_delete_forms' );
897	682
898	683	$count = 0;
899		-
900	684	foreach ( $ids as $id ) {
901	685	if ( FrmForm::trash( $id ) ) {
902		- ++$count;
	686	+ $count ++;
903	687	}
904	688	}
905	689
906		- if ( ! $count ) {
907		- return '';
908		- }
909		-
910	690	$current_page = FrmAppHelper::get_simple_request(
911	691	array(
912	692	'param' => 'form_type',
913	693	'type' => 'request',
		@@ -912,16 +692,17 @@
912	692	'param' => 'form_type',
913	693	'type' => 'request',
914	694	)
915	695	);
916		-
917		- return sprintf(
	696	+ $message = sprintf(
918	697	/* translators: %1$s: Number of forms, %2$s: Start link HTML, %3$s: End link HTML */
919	698	_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' ),
920	699	$count,
921		- '<a href="' . esc_url( wp_nonce_url( '?page=formidable&frm_action=list&action=bulk_untrash&form_type=' . $current_page . '&item-action=' . implode( ',', $ids ), 'bulk-toplevel_page_formidable' ) ) . '">', // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong
	700	+ '<a href="' . esc_url( wp_nonce_url( '?page=formidable&frm_action=list&action=bulk_untrash&form_type=' . $current_page . '&item-action=' . implode( ',', $ids ), 'bulk-toplevel_page_formidable' ) ) . '">',
922	701	'</a>'
923	702	);
	703	+
	704	+ return $message;
924	705	}
925	706
926	707	public static function destroy() {
927	708	FrmAppHelper::permission_check( 'frm_delete_forms' );
		@@ -931,11 +712,10 @@
931	712	// Check nonce url.
932	713	check_admin_referer( 'destroy_form_' . $params['id'] );
933	714
934	715	$count = 0;
935		-
936	716	if ( FrmForm::destroy( $params['id'] ) ) {
937		- ++$count;
	717	+ $count ++;
938	718	}
939	719
940	720	/* translators: %1$s: Number of forms */
941	721	$message = sprintf( _n( '%1$s Form Permanently Deleted', '%1$s Forms Permanently Deleted', $count, 'formidable' ), $count );
		@@ -942,23 +722,16 @@
942	722
943	723	self::display_forms_list( $params, $message );
944	724	}
945	725
946		- /**
947		- * @param array $ids
948		- *
949		- * @return string
950		- */
951	726	public static function bulk_destroy( $ids ) {
952	727	FrmAppHelper::permission_check( 'frm_delete_forms' );
953	728
954	729	$count = 0;
955		-
956	730	foreach ( $ids as $id ) {
957	731	$d = FrmForm::destroy( $id );
958		-
959	732	if ( $d ) {
960		- ++$count;
	733	+ $count ++;
961	734	}
962	735	}
963	736
964	737	if ( $count ) {
		@@ -974,16 +747,17 @@
974	747	*/
975	748	public static function delete_all() {
976	749	// Check nonce url.
977	750	$permission_error = FrmAppHelper::permission_nonce_error( 'frm_delete_forms', '_wpnonce', 'bulk-toplevel_page_formidable' );
978		-
979	751	if ( $permission_error !== false ) {
980	752	self::display_forms_list( array(), '', array( $permission_error ) );
	753	+
981	754	return;
982	755	}
983	756
984	757	$count = FrmForm::scheduled_delete( time() );
985	758	$url = remove_query_arg( array( 'delete_all' ) );
	759	+
986	760	$url .= '&message=forms_permanently_deleted&forms_deleted=' . $count;
987	761
988	762	wp_safe_redirect( $url );
989	763	die();
		@@ -1000,9 +774,9 @@
1000	774
1001	775	$new_values = self::get_modal_values();
1002	776	$new_values['form_key'] = $new_values['name'];
1003	777	$new_values['options'] = array(
1004		- 'antispam' => 1,
	778	+ 'antispam' => 1,
1005	779	'on_submit_migrated' => 1,
1006	780	);
1007	781
1008	782	/**
		@@ -1021,9 +795,8 @@
1021	795	* @param int $form_id
1022	796	*/
1023	797	do_action( 'frm_build_new_form', $form_id );
1024	798
1025		- self::create_submit_button_field( $form_id );
1026	799	self::create_default_on_submit_action( $form_id );
1027	800	self::create_default_email_action( $form_id );
1028	801
1029	802	$response = array(
		@@ -1037,10 +810,8 @@
1037	810	/**
1038	811	* Before creating a new form, get the name and description from the modal.
1039	812	*
1040	813	* @since 4.0
1041		- *
1042		- * @return array<string,string>
1043	814	*/
1044	815	public static function get_modal_values() {
1045	816	$name = FrmAppHelper::get_param( 'name', '', 'post', 'sanitize_text_field' );
1046	817	$desc = FrmAppHelper::get_param( 'desc', '', 'post', 'sanitize_textarea_field' );
		@@ -1055,24 +826,17 @@
1055	826	* Inserts Formidable button
1056	827	* Hook exists since 2.5.0
1057	828	*
1058	829	* @since 2.0.15
1059		- *
1060		- * @return void
1061	830	*/
1062	831	public static function insert_form_button() {
1063	832	if ( current_user_can( 'frm_view_forms' ) ) {
1064		- // Store the result in memory and re-use it when this function is called multiple times.
1065		- // This helps speed up the form builder when there are a lot of HTML fields, where this
1066		- // button is inserted once per HTML field.
1067		- // In a form with 66 HTML fields, this saves 0.5 seconds on page load time, tested locally.
1068		- if ( ! isset( self::$formidable_tinymce_button ) ) {
1069		- FrmAppHelper::load_admin_wide_js();
1070		- $menu_name = FrmAppHelper::get_menu_name();
1071		- $icon = apply_filters( 'frm_media_icon', FrmAppHelper::svg_logo() );
1072		- self::$formidable_tinymce_button = '<a href="#TB_inline?width=50&height=50&inlineId=frm_insert_form" class="thickbox button add_media frm_insert_form" title="' . esc_attr__( 'Add forms and content', 'formidable' ) . '">' . FrmAppHelper::kses( $icon, 'all' ) . ' ' . esc_html( $menu_name ) . '</a>'; // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong
1073		- }
1074		- 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>';
1075	839	}
1076	840	}
1077	841
1078	842	/**
		@@ -1116,9 +880,8 @@
1116	880	private static function should_insert_form_popup() {
1117	881	if ( FrmAppHelper::is_form_builder_page() ) {
1118	882	return true;
1119	883	}
1120		-
1121	884	$page = basename( FrmAppHelper::get_server_value( 'PHP_SELF' ) );
1122	885	return in_array( $page, array( 'post.php', 'page.php', 'page-new.php', 'post-new.php' ), true );
1123	886	}
1124	887
		@@ -1126,10 +889,9 @@
1126	889	FrmAppHelper::permission_check( 'frm_view_forms' );
1127	890	check_ajax_referer( 'frm_ajax', 'nonce' );
1128	891
1129	892	$shortcode = FrmAppHelper::get_post_param( 'shortcode', '', 'sanitize_text_field' );
1130		-
1131		- if ( ! $shortcode ) {
	893	+ if ( empty( $shortcode ) ) {
1132	894	wp_die();
1133	895	}
1134	896
1135	897	echo '<div id="sc-opts-' . esc_attr( $shortcode ) . '" class="frm_shortcode_option">';
		@@ -1154,9 +916,8 @@
1154	916	'label' => __( 'Minimize form HTML', 'formidable' ),
1155	917	),
1156	918	);
1157	919	}
1158		-
1159	920	$opts = apply_filters( 'frm_sc_popup_opts', $opts, $shortcode );
1160	921
1161	922	if ( isset( $opts['form_id'] ) && is_string( $opts['form_id'] ) ) {
1162	923	// allow other shortcodes to use the required form id option
		@@ -1163,9 +924,9 @@
1163	924	$form_id = $opts['form_id'];
1164	925	unset( $opts['form_id'] );
1165	926	}
1166	927
1167		- include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/shortcode_opts.php';
	928	+ include( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/shortcode_opts.php' );
1168	929
1169	930	echo '</div>';
1170	931
1171	932	wp_die();
		@@ -1176,9 +937,8 @@
1176	937	*
1177	938	* @param array $params
1178	939	* @param string $message
1179	940	* @param array $errors
1180		- *
1181	941	* @return void
1182	942	*/
1183	943	public static function display_forms_list( $params = array(), $message = '', $errors = array() ) {
1184	944	FrmAppHelper::permission_check( 'frm_view_forms' );
		@@ -1195,44 +955,33 @@
1195	955	* @param string $table_class Class name for List Helper.
1196	956	*/
1197	957	$table_class = apply_filters( 'frm_forms_list_class', 'FrmFormsListHelper' );
1198	958	$wp_list_table = new $table_class( compact( 'params' ) );
1199		- $pagenum = $wp_list_table->get_pagenum();
1200	959
	960	+ $pagenum = $wp_list_table->get_pagenum();
	961	+
1201	962	$wp_list_table->prepare_items();
1202	963
1203	964	$total_pages = $wp_list_table->get_pagination_arg( 'total_pages' );
1204		-
1205	965	if ( $pagenum > $total_pages && $total_pages > 0 ) {
1206	966	wp_redirect( esc_url_raw( add_query_arg( 'paged', $total_pages ) ) );
1207	967	die();
1208	968	}
1209	969
1210		- $error = FrmInbox::check_for_error();
1211		-
1212		- if ( $error ) {
1213		- $show_messages = array( $error['subject'] . '. ' . $error['message'] );
1214		- }
1215		-
1216	970	require FrmAppHelper::plugin_path() . '/classes/views/frm-forms/list.php';
1217	971	}
1218	972
1219	973	/**
1220	974	* @param array<string,string> $columns
1221		- *
1222	975	* @return array<string,string>
1223	976	*/
1224	977	public static function get_columns( $columns ) {
1225		- $columns['cb'] = '<input type="checkbox" />';
1226		- $columns['name'] = esc_html__( 'Form Title', 'formidable' );
1227		- $columns['entries'] = esc_html__( 'Entries', 'formidable' );
1228		- $columns['id'] = 'ID';
1229		- $columns['form_key'] = esc_html__( 'Key', 'formidable' );
1230		-
1231		- if ( 'trash' !== FrmAppHelper::simple_get( 'form_type' ) ) {
1232		- $columns['shortcode'] = esc_html__( 'Actions', 'formidable' );
1233		- }
1234		-
	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' );
1235	984	$columns['created_at'] = esc_html__( 'Date', 'formidable' );
1236	985
1237	986	add_screen_option(
1238	987	'per_page',
		@@ -1245,11 +994,8 @@
1245	994
1246	995	return $columns;
1247	996	}
1248	997
1249		- /**
1250		- * @return array<string,string>
1251		- */
1252	998	public static function get_sortable_columns() {
1253	999	return array(
1254	1000	'id' => 'id',
1255	1001	'name' => 'name',
		@@ -1260,9 +1006,8 @@
1260	1006	}
1261	1007
1262	1008	/**
1263	1009	* @param mixed $hidden_columns
1264		- *
1265	1010	* @return array
1266	1011	*/
1267	1012	public static function hidden_columns( $hidden_columns ) {
1268	1013	if ( ! is_array( $hidden_columns ) ) {
		@@ -1283,17 +1028,10 @@
1283	1028
1284	1029	return $hidden_columns;
1285	1030	}
1286	1031
1287		- /**
1288		- * @param mixed $save
1289		- * @param string $option
1290		- * @param int|string $value
1291		- *
1292		- * @return mixed
1293		- */
1294	1032	public static function save_per_page( $save, $option, $value ) {
1295		- if ( $option === 'formidable_page_formidable_per_page' ) {
	1033	+ if ( $option == 'formidable_page_formidable_per_page' ) {
1296	1034	$save = (int) $value;
1297	1035	}
1298	1036
1299	1037	return $save;
		@@ -1298,24 +1036,16 @@
1298	1036
1299	1037	return $save;
1300	1038	}
1301	1039
1302		- /**
1303		- * @param int|string $id
1304		- * @param array $errors
1305		- * @param string $message
1306		- * @param bool $create_link
1307		- *
1308		- * @return void
1309		- */
1310	1040	private static function get_edit_vars( $id, $errors = array(), $message = '', $create_link = false ) {
1311	1041	global $frm_vars;
1312	1042
1313		- $form = FrmForm::getOne( $id );
	1043	+ $form = FrmForm::getOne( $id );
1314	1044	$error_args = array(
1315		- 'title' => __( 'You can\'t edit the form', 'formidable' ),
1316		- 'body' => __( 'You are trying to edit a form that does not exist', 'formidable' ),
1317		- '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' ),
1318	1048	'continue_url' => add_query_arg(
1319	1049	array(
1320	1050	'page' => 'formidable',
1321	1051	)
		@@ -1320,9 +1050,8 @@
1320	1050	'page' => 'formidable',
1321	1051	)
1322	1052	),
1323	1053	);
1324		-
1325	1054	if ( ! $form ) {
1326	1055	FrmAppController::show_error_modal( $error_args );
1327	1056	return;
1328	1057	}
		@@ -1327,10 +1056,10 @@
1327	1056	return;
1328	1057	}
1329	1058
1330	1059	if ( 'trash' === $form->status ) {
1331		- $error_args['body'] = __( 'The form you\'re trying to edit is in trash. You must restore it first before you can make changes', 'formidable' );
1332		- $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(
1333	1062	array(
1334	1063	'page' => 'formidable',
1335	1064	'_wpnonce' => wp_create_nonce( 'untrash_form_' . $id ),
1336	1065	'form_type' => 'trash',
		@@ -1344,18 +1073,18 @@
1344	1073	}
1345	1074
1346	1075	if ( $form->parent_form_id ) {
1347	1076	/* translators: %1$s: Start link HTML, %2$s: End link HTML */
1348		- wp_die( sprintf( esc_html__( 'You are trying to edit a child form. Please edit from %1$shere%2$s', 'formidable' ), '<a href="' . esc_url( FrmForm::get_edit_link( $form->parent_form_id ) ) . '">', '</a>' ) ); // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong
	1077	+ wp_die( sprintf( esc_html__( 'You are trying to edit a child form. Please edit from %1$shere%2$s', 'formidable' ), '<a href="' . esc_url( FrmForm::get_edit_link( $form->parent_form_id ) ) . '">', '</a>' ) );
1349	1078	}
1350	1079
1351	1080	$frm_field_selection = FrmField::field_selection();
1352		- $fields = FrmField::get_all_for_form( $form->id );
1353	1081
	1082	+ $fields = FrmField::get_all_for_form( $form->id );
	1083	+
1354	1084	// Automatically add end section fields if they don't exist (2.0 migration).
1355	1085	$reset_fields = false;
1356	1086	FrmFormsHelper::auto_add_end_section_fields( $form, $fields, $reset_fields );
1357		- FrmSubmitHelper::maybe_create_submit_field( $form, $fields, $reset_fields );
1358	1087
1359	1088	if ( $reset_fields ) {
1360	1089	$fields = FrmField::get_all_for_form( $form->id, '', 'exclude' );
1361	1090	}
		@@ -1375,16 +1104,16 @@
1375	1104	*/
1376	1105	$values['fields'] = apply_filters( 'frm_fields_in_form_builder', $fields, compact( 'form' ) );
1377	1106
1378	1107	$edit_message = __( 'Form was successfully updated.', 'formidable' );
1379		-
1380		- if ( $form->is_template && $message === $edit_message ) {
	1108	+ if ( $form->is_template && $message == $edit_message ) {
1381	1109	$message = __( 'Template was successfully updated.', 'formidable' );
1382	1110	}
1383	1111
1384	1112	self::maybe_update_form_builder_message( $message );
1385	1113
1386		- $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'] );
1387	1116
1388	1117	if ( defined( 'DOING_AJAX' ) ) {
1389	1118	wp_die();
1390	1119	}
		@@ -1391,14 +1120,9 @@
1391	1120
1392	1121	require FrmAppHelper::plugin_path() . '/classes/views/frm-forms/edit.php';
1393	1122	}
1394	1123
1395		- /**
1396		- * @param array $fields
1397		- *
1398		- * @return array
1399		- */
1400		- public static function update_form_builder_fields( $fields ) {
	1124	+ public static function update_form_builder_fields( $fields, $form ) {
1401	1125	foreach ( $fields as $field ) {
1402	1126	$field->do_not_include_icons = true;
1403	1127	}
1404	1128	return $fields;
		@@ -1403,13 +1127,8 @@
1403	1127	}
1404	1128	return $fields;
1405	1129	}
1406	1130
1407		- /**
1408		- * @param string $message
1409		- *
1410		- * @return void
1411		- */
1412	1131	public static function maybe_update_form_builder_message( &$message ) {
1413	1132	if ( 'form_duplicated' === FrmAppHelper::simple_get( 'message' ) ) {
1414	1133	$message = __( 'Form was Successfully Copied', 'formidable' );
1415	1134	}
		@@ -1414,22 +1133,13 @@
1414	1133	$message = __( 'Form was Successfully Copied', 'formidable' );
1415	1134	}
1416	1135	}
1417	1136
1418		- /**
1419		- * @param int|string $id
1420		- * @param array $errors
1421		- * @param array|string $args
1422		- *
1423		- * @return void
1424		- */
1425	1137	public static function get_settings_vars( $id, $errors = array(), $args = array() ) {
1426	1138	FrmAppHelper::permission_check( 'frm_edit_forms' );
1427	1139
1428	1140	global $frm_vars;
1429	1141
1430		- self::maybe_print_media_templates();
1431		-
1432	1142	if ( ! is_array( $args ) ) {
1433	1143	// For reverse compatibility.
1434	1144	$args = array(
1435	1145	'message' => $args,
		@@ -1442,12 +1152,13 @@
1442	1152	);
1443	1153	$args = array_merge( $defaults, $args );
1444	1154	$message = $args['message'];
1445	1155	$warnings = $args['warnings'];
1446		- $form = FrmForm::getOne( $id );
1447		- $fields = FrmField::get_all_for_form( $id );
1448		- $values = FrmAppHelper::setup_edit_vars( $form, 'forms', $fields, true );
1449	1156
	1157	+ $form = FrmForm::getOne( $id );
	1158	+ $fields = FrmField::get_all_for_form( $id );
	1159	+ $values = FrmAppHelper::setup_edit_vars( $form, 'forms', $fields, true );
	1160	+
1450	1161	/**
1451	1162	* Allows changing fields in the form settings.
1452	1163	*
1453	1164	* @since 5.0.04
		@@ -1461,42 +1172,17 @@
1461	1172
1462	1173	$sections = self::get_settings_tabs( $values );
1463	1174	$current = FrmAppHelper::simple_get( 't', 'sanitize_title', 'advanced_settings' );
1464	1175
1465		- require FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings.php';
	1176	+ require( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings.php' );
1466	1177	}
1467	1178
1468	1179	/**
1469		- * 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.
1470		- *
1471		- * @since 6.10
1472		- *
1473		- * @return void
1474		- */
1475		- private static function maybe_print_media_templates() {
1476		- if ( FrmAppHelper::pro_is_included() ) {
1477		- // This issue does not exist when Pro is active so exit early.
1478		- return;
1479		- }
1480		-
1481		- add_action(
1482		- 'wp_enqueue_editor',
1483		- function () {
1484		- wp_print_media_templates();
1485		- }
1486		- );
1487		- }
1488		-
1489		- /**
1490	1180	* @since 4.0
1491		- *
1492		- * @param array $atts
1493		- *
1494		- * @return void
1495	1181	*/
1496	1182	public static function form_publish_button( $atts ) {
1497	1183	$values = $atts['values'];
1498		- include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/_publish_box.php';
	1184	+ include( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/_publish_box.php' );
1499	1185	}
1500	1186
1501	1187	/**
1502	1188	* Get a list of all the settings tabs for the form settings page.
		@@ -1503,9 +1189,8 @@
1503	1189	*
1504	1190	* @since 4.0
1505	1191	*
1506	1192	* @param array $values
1507		- *
1508	1193	* @return array
1509	1194	*/
1510	1195	private static function get_settings_tabs( $values ) {
1511	1196	$sections = array(
		@@ -1511,20 +1196,20 @@
1511	1196	$sections = array(
1512	1197	'advanced' => array(
1513	1198	'name' => __( 'General', 'formidable' ),
1514	1199	'title' => __( 'General Form Settings', 'formidable' ),
1515		- 'function' => array( self::class, 'advanced_settings' ),
1516		- 'icon' => 'frmfont frm_settings_icon',
	1200	+ 'function' => array( __CLASS__, 'advanced_settings' ),
	1201	+ 'icon' => 'frm_icon_font frm_settings_icon',
1517	1202	),
1518	1203	'email' => array(
1519	1204	'name' => __( 'Actions & Notifications', 'formidable' ),
1520	1205	'function' => array( 'FrmFormActionsController', 'email_settings' ),
1521	1206	'id' => 'frm_notification_settings',
1522		- 'icon' => 'frmfont frm_mail_bulk_icon',
	1207	+ 'icon' => 'frm_icon_font frm_mail_bulk_icon',
1523	1208	),
1524	1209	'permissions' => array(
1525	1210	'name' => __( 'Form Permissions', 'formidable' ),
1526		- 'icon' => 'frmfont frm_lock_closed_icon',
	1211	+ 'icon' => 'frm_icon_font frm_lock_icon',
1527	1212	'html_class' => 'frm_show_upgrade_tab frm_noallow',
1528	1213	'data' => array(
1529	1214	'medium' => 'permissions',
1530	1215	'upgrade' => __( 'Form Permissions', 'formidable' ),
		@@ -1529,37 +1214,35 @@
1529	1214	'medium' => 'permissions',
1530	1215	'upgrade' => __( 'Form Permissions', 'formidable' ),
1531	1216	'message' => __( 'Allow editing, protect forms and files, limit entries, and save drafts. Upgrade to get form and entry permissions.', 'formidable' ),
1532	1217	'screenshot' => 'permissions.png',
1533		- 'learn-more' => FrmAppHelper::get_doc_url( 'general-form-settings/#kb-form-permissions', 'form-permissions-settings' ),
1534	1218	),
1535	1219	),
1536		- 'scheduling' => array(
	1220	+ 'scheduling' => array(
1537	1221	'name' => __( 'Form Scheduling', 'formidable' ),
1538		- 'icon' => 'frmfont frm_calendar_icon',
	1222	+ 'icon' => 'frm_icon_font frm_calendar_icon',
1539	1223	'html_class' => 'frm_show_upgrade_tab frm_noallow',
1540	1224	'data' => array(
1541	1225	'medium' => 'scheduling',
1542	1226	'upgrade' => __( 'Form scheduling settings', 'formidable' ),
1543	1227	'screenshot' => 'scheduling.png',
1544		- 'learn-more' => FrmAppHelper::get_doc_url( 'general-form-settings/#kb-form-scheduling', 'form-scheduling-settings' ),
1545	1228	),
1546	1229	),
1547	1230	'buttons' => array(
1548	1231	'name' => __( 'Buttons', 'formidable' ),
1549		- 'class' => self::class,
	1232	+ 'class' => __CLASS__,
1550	1233	'function' => 'buttons_settings',
1551		- 'icon' => 'frmfont frm_button_icon',
	1234	+ 'icon' => 'frm_icon_font frm_button_icon',
1552	1235	),
1553	1236	'landing' => array(
1554	1237	'name' => __( 'Form Landing Page', 'formidable' ),
1555		- 'icon' => 'frmfont frm_file_text_icon',
	1238	+ 'icon' => 'frm_icon_font frm_file_text_icon',
1556	1239	'html_class' => 'frm_show_upgrade_tab frm_noallow',
1557	1240	'data' => FrmAppHelper::get_landing_page_upgrade_data_params(),
1558	1241	),
1559	1242	'chat' => array(
1560	1243	'name' => __( 'Conversational Forms', 'formidable' ),
1561		- 'icon' => 'frmfont frm_chat_forms_icon',
	1244	+ 'icon' => 'frm_icon_font frm_chat_forms_icon',
1562	1245	'html_class' => 'frm_show_upgrade_tab frm_noallow',
1563	1246	'data' => FrmAppHelper::get_upgrade_data_params(
1564	1247	'chat',
1565	1248	array(
		@@ -1565,15 +1248,14 @@
1565	1248	array(
1566	1249	'upgrade' => __( 'Conversational Forms', 'formidable' ),
1567	1250	'message' => __( 'Ask one question at a time for automated conversations.', 'formidable' ),
1568	1251	'screenshot' => 'chat.png',
1569		- 'learn-more' => FrmAppHelper::get_doc_url( 'conversational-forms', 'conversational-forms-settings', false ),
1570	1252	)
1571	1253	),
1572	1254	),
1573		- 'abandonment' => array(
	1255	+ 'abandonment' => array(
1574	1256	'name' => __( 'Form Abandonment', 'formidable' ),
1575		- 'icon' => 'frmfont frm_abandoned_icon',
	1257	+ 'icon' => 'frm_icon_font frm_abandoned_icon',
1576	1258	'html_class' => 'frm_show_upgrade_tab frm_noallow',
1577	1259	'data' => FrmAppHelper::get_upgrade_data_params(
1578	1260	'abandonment',
1579	1261	array(
		@@ -1579,31 +1261,37 @@
1579	1261	array(
1580	1262	'upgrade' => __( 'Form abandonment settings', 'formidable' ),
1581	1263	'message' => __( 'Unlock the power of data capture to boost lead generation and master the art of form optimization.', 'formidable' ),
1582	1264	'screenshot' => 'abandonment.png',
1583		- 'learn-more' => FrmAppHelper::get_doc_url( 'features/form-abandonment-wordpress-plugin', 'form-abandonment-settings', false ),
1584	1265	)
1585	1266	),
1586	1267	),
1587	1268	'html' => array(
1588	1269	'name' => __( 'Customize HTML', 'formidable' ),
1589		- 'class' => self::class,
	1270	+ 'class' => __CLASS__,
1590	1271	'function' => 'html_settings',
1591		- 'icon' => 'frmfont frm_code_icon',
	1272	+ 'icon' => 'frm_icon_font frm_code_icon',
1592	1273	),
1593	1274	);
1594	1275
1595		- if ( ! has_action( 'frm_add_form_style_tab_options' ) && ! has_action( 'frm_add_form_button_options' ) ) {
1596		- unset( $sections['buttons'] );
	1276	+ foreach ( array( 'landing', 'chat', 'abandonment' ) as $feature ) {
	1277	+ if ( ! FrmAppHelper::show_new_feature( $feature ) ) {
	1278	+ unset( $sections[ $feature ] );
	1279	+ }
1597	1280	}
1598	1281
1599	1282	$sections = apply_filters( 'frm_add_form_settings_section', $sections, $values );
1600	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	+
1601	1289	foreach ( $sections as $key => $section ) {
1602	1290	$defaults = array(
1603	1291	'html_class' => '',
1604	1292	'name' => ucfirst( $key ),
1605		- 'icon' => 'frmfont frm_settings_icon',
	1293	+ 'icon' => 'frm_icon_font frm_settings_icon',
1606	1294	);
1607	1295
1608	1296	$section = array_merge( $defaults, $section );
1609	1297
		@@ -1609,9 +1297,8 @@
1609	1297
1610	1298	if ( ! isset( $section['anchor'] ) ) {
1611	1299	$section['anchor'] = $key;
1612	1300	}
1613		-
1614	1301	$section['anchor'] .= '_settings';
1615	1302
1616	1303	if ( ! isset( $section['title'] ) ) {
1617	1304	$section['title'] = $section['name'];
		@@ -1630,26 +1317,23 @@
1630	1317	/**
1631	1318	* @since 4.0
1632	1319	*
1633	1320	* @param array $values
1634		- *
1635		- * @return void
1636	1321	*/
1637	1322	public static function advanced_settings( $values ) {
1638	1323	$first_h3 = 'frm_first_h3';
	1324	+
1639	1325	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings-advanced.php';
1640	1326	}
1641	1327
1642	1328	/**
1643	1329	* @param array $values
1644		- *
1645		- * @return void
1646	1330	*/
1647	1331	public static function render_spam_settings( $values ) {
1648	1332	if ( function_exists( 'akismet_http_post' ) ) {
1649	1333	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/spam-settings/akismet.php';
1650	1334	}
1651		- 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';
1652	1336	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/spam-settings/antispam.php';
1653	1337	}
1654	1338
1655	1339	/**
		@@ -1655,13 +1339,16 @@
1655	1339	/**
1656	1340	* @since 4.0
1657	1341	*
1658	1342	* @param array $values
1659		- *
1660		- * @return void
1661	1343	*/
1662	1344	public static function buttons_settings( $values ) {
1663		- 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' );
1664	1351	}
1665	1352
1666	1353	/**
1667	1354	* @since 4.0
		@@ -1666,13 +1353,11 @@
1666	1353	/**
1667	1354	* @since 4.0
1668	1355	*
1669	1356	* @param array $values
1670		- *
1671		- * @return void
1672	1357	*/
1673	1358	public static function html_settings( $values ) {
1674		- include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings-html.php';
	1359	+ include( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings-html.php' );
1675	1360	}
1676	1361
1677	1362	/**
1678	1363	* Replace old Submit Button href with new href to avoid errors in Chrome
		@@ -1678,11 +1363,9 @@
1678	1363	* Replace old Submit Button href with new href to avoid errors in Chrome
1679	1364	*
1680	1365	* @since 2.03.08
1681	1366	*
1682		- * @param array|bool $values
1683		- *
1684		- * @return void
	1367	+ * @param array|boolean $values
1685	1368	*/
1686	1369	private static function clean_submit_html( &$values ) {
1687	1370	if ( is_array( $values ) && isset( $values['submit_html'] ) ) {
1688	1371	$values['submit_html'] = str_replace( 'javascript:void(0)', '#', $values['submit_html'] );
		@@ -1703,18 +1386,9 @@
1703	1386
1704	1387	return $classes;
1705	1388	}
1706	1389
1707		- /**
1708		- * @since 6.27 Added $template_path parameter.
1709		- *
1710		- * @param int|string $form_id
1711		- * @param string $class
1712		- * @param string $template_path The path to a template file to use instead of the default.
1713		- *
1714		- * @return void
1715		- */
1716		- public static function mb_tags_box( $form_id, $class = '', $template_path = 'default' ) {
	1390	+ public static function mb_tags_box( $form_id, $class = '' ) {
1717	1391	$fields = FrmField::get_all_for_form( $form_id, '', 'include' );
1718	1392
1719	1393	/**
1720	1394	* Allows modifying the list of fields in the tags box.
		@@ -1723,30 +1397,23 @@
1723	1397	*
1724	1398	* @param array $fields The list of fields.
1725	1399	* @param array $args The arguments. Contains `form_id`.
1726	1400	*/
1727		- $fields = apply_filters( 'frm_fields_in_tags_box', $fields, compact( 'form_id' ) );
1728		- $linked_forms = array();
1729		- $col = 'one';
1730		- $settings_tab = FrmAppHelper::is_admin_page( 'formidable' );
	1401	+ $fields = apply_filters( 'frm_fields_in_tags_box', $fields, compact( 'form_id' ) );
	1402	+ $linked_forms = array();
	1403	+ $col = 'one';
	1404	+ $settings_tab = FrmAppHelper::is_admin_page( 'formidable' ) ? true : false;
	1405	+
1731	1406	$cond_shortcodes = apply_filters( 'frm_conditional_shortcodes', array() );
1732	1407	$entry_shortcodes = self::get_shortcode_helpers( $settings_tab );
	1408	+
1733	1409	$advanced_helpers = self::advanced_helpers( compact( 'fields', 'form_id' ) );
1734	1410
1735		- if ( 'default' === $template_path || ! file_exists( $template_path ) ) {
1736		- include FrmAppHelper::plugin_path() . '/classes/views/shared/mb_adv_info.php';
1737		- return;
1738		- }
1739		-
1740		- include $template_path;
	1411	+ include( FrmAppHelper::plugin_path() . '/classes/views/shared/mb_adv_info.php' );
1741	1412	}
1742	1413
1743	1414	/**
1744	1415	* @since 3.04.01
1745		- *
1746		- * @param array $atts
1747		- *
1748		- * @return array
1749	1416	*/
1750	1417	private static function advanced_helpers( $atts ) {
1751	1418	$advanced_helpers = array(
1752	1419	'default' => array(
		@@ -1755,12 +1422,10 @@
1755	1422	),
1756	1423	);
1757	1424
1758	1425	$user_fields = self::user_shortcodes();
1759		-
1760		- if ( $user_fields ) {
	1426	+ if ( ! empty( $user_fields ) ) {
1761	1427	$user_helpers = array();
1762		-
1763	1428	foreach ( $user_fields as $uk => $uf ) {
1764	1429	$user_helpers[ '|user_id| show="' . $uk . '"' ] = $uf;
1765	1430	unset( $uk, $uf );
1766	1431	}
		@@ -1765,9 +1430,9 @@
1765	1430	unset( $uk, $uf );
1766	1431	}
1767	1432
1768	1433	$advanced_helpers['user_id'] = array(
1769		- 'codes' => $user_helpers,
	1434	+ 'codes' => $user_helpers,
1770	1435	);
1771	1436	}
1772	1437
1773	1438	/**
		@@ -1785,10 +1450,8 @@
1785	1450	* Get an array of the options to display in the advanced tab
1786	1451	* of the customization panel
1787	1452	*
1788	1453	* @since 2.0.6
1789		- *
1790		- * @return array
1791	1454	*/
1792	1455	private static function get_advanced_shortcodes() {
1793	1456	$adv_shortcodes = array(
1794	1457	'x sep=", "' => array(
		@@ -1805,18 +1468,17 @@
1805	1468	'label' => __( 'No Auto P', 'formidable' ),
1806	1469	'title' => __( 'Do not automatically add any paragraphs or line breaks', 'formidable' ),
1807	1470	),
1808	1471	);
	1472	+ $adv_shortcodes = apply_filters( 'frm_advanced_shortcodes', $adv_shortcodes );
1809	1473
1810	1474	// __( 'Leave blank instead of defaulting to User Login', 'formidable' ) : blank=1
1811	1475
1812		- return apply_filters( 'frm_advanced_shortcodes', $adv_shortcodes );
	1476	+ return $adv_shortcodes;
1813	1477	}
1814	1478
1815	1479	/**
1816	1480	* @since 3.04.01
1817		- *
1818		- * @return array
1819	1481	*/
1820	1482	private static function user_shortcodes() {
1821	1483	$options = array(
1822	1484	'ID' => __( 'User ID', 'formidable' ),
		@@ -1835,12 +1497,8 @@
1835	1497	/**
1836	1498	* Get an array of the helper shortcodes to display in the customization panel
1837	1499	*
1838	1500	* @since 2.0.6
1839		- *
1840		- * @param bool $settings_tab
1841		- *
1842		- * @return array
1843	1501	*/
1844	1502	private static function get_shortcode_helpers( $settings_tab ) {
1845	1503	$entry_shortcodes = array(
1846	1504	'id' => __( 'Entry ID', 'formidable' ),
		@@ -1851,27 +1509,30 @@
1851	1509	'updated-at' => __( 'Entry updated', 'formidable' ),
1852	1510	'' => '',
1853	1511	'siteurl' => __( 'Site URL', 'formidable' ),
1854	1512	'sitename' => __( 'Site Name', 'formidable' ),
1855		- 'form_name' => __( 'Form Name', 'formidable' ),
1856	1513	);
1857	1514
1858		- $entry_shortcodes = array_merge( FrmShortcodeHelper::get_contextual_shortcode_values(), $entry_shortcodes );
1859		-
1860	1515	if ( ! FrmAppHelper::pro_is_installed() ) {
1861	1516	unset( $entry_shortcodes['post_id'] );
1862	1517	}
1863	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	+
1864	1526	/**
1865	1527	* Use this hook to add or remove buttons in the helpers section
1866	1528	* in the customization panel
1867	1529	*
1868	1530	* @since 2.0.6
1869		- *
1870		- * @param array $entry_shortcodes
1871		- * @param bool $settings_tab
1872	1531	*/
1873		- return apply_filters( 'frm_helper_shortcodes', $entry_shortcodes, $settings_tab );
	1532	+ $entry_shortcodes = apply_filters( 'frm_helper_shortcodes', $entry_shortcodes, $settings_tab );
	1533	+
	1534	+ return $entry_shortcodes;
1874	1535	}
1875	1536
1876	1537	/**
1877	1538	* Insert the form class setting into the form.
		@@ -1876,9 +1537,8 @@
1876	1537	/**
1877	1538	* Insert the form class setting into the form.
1878	1539	*
1879	1540	* @param stdClass $form
1880		- *
1881	1541	* @return void
1882	1542	*/
1883	1543	public static function form_classes( $form ) {
1884	1544	if ( isset( $form->options['form_class'] ) ) {
		@@ -1889,9 +1549,9 @@
1889	1549	echo ' frm_js_validate ';
1890	1550	self::add_js_validate_form_to_global_vars( $form );
1891	1551	}
1892	1552
1893		- if ( FrmForm::is_ajax_on( $form ) ) {
	1553	+ if ( ! FrmFormsHelper::should_use_pro_for_ajax_submit() && FrmForm::is_ajax_on( $form ) ) {
1894	1554	echo ' frm_ajax_submit ';
1895	1555	}
1896	1556	}
1897	1557
		@@ -1901,9 +1561,8 @@
1901	1561	* @param stdClass $form
1902	1562	*/
1903	1563	public static function add_js_validate_form_to_global_vars( $form ) {
1904	1564	global $frm_vars;
1905		-
1906	1565	if ( ! isset( $frm_vars['js_validate_forms'] ) ) {
1907	1566	$frm_vars['js_validate_forms'] = array();
1908	1567	}
1909	1568	$frm_vars['js_validate_forms'][ $form->id ] = $form;
		@@ -1914,11 +1573,11 @@
1914	1573	check_ajax_referer( 'frm_ajax', 'nonce' );
1915	1574
1916	1575	echo FrmEntriesController::show_entry_shortcode( // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
1917	1576	array(
1918		- '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' ),
1919	1578	'default_email' => true,
1920		- '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' ),
1921	1580	)
1922	1581	);
1923	1582	wp_die();
1924	1583	}
		@@ -1924,11 +1583,10 @@
1924	1583	}
1925	1584
1926	1585	/**
1927	1586	* @param string $content
1928		- * @param int|stdClass|string $form
1929		- * @param false|int|stdClass|string $entry
1930		- *
	1587	+ * @param stdClass|string|int $form
	1588	+ * @param stdClass|string|int|false $entry
1931	1589	* @return string
1932	1590	*/
1933	1591	public static function filter_content( $content, $form, $entry = false ) {
1934	1592	$content = self::replace_form_name_shortcodes( $content, $form );
		@@ -1933,9 +1591,8 @@
1933	1591	public static function filter_content( $content, $form, $entry = false ) {
1934	1592	$content = self::replace_form_name_shortcodes( $content, $form );
1935	1593
1936	1594	self::get_entry_by_param( $entry );
1937		-
1938	1595	if ( ! $entry ) {
1939	1596	return $content;
1940	1597	}
1941	1598
		@@ -1942,19 +1599,12 @@
1942	1599	if ( is_object( $form ) ) {
1943	1600	$form = $form->id;
1944	1601	}
1945	1602
1946		- /*
1947		- * Repeater actions adds `parent_entry` to `$entry` store the parent entry data. If `parent_entry` is not empty,
1948		- * use the parent form ID instead of repeater form ID to fix the parent form field shortcodes doesn't work.
1949		- */
1950		- if ( ! empty( $entry->parent_entry ) ) {
1951		- $form = $entry->parent_entry->form_id;
1952		- }
1953		-
1954	1603	$shortcodes = FrmFieldsHelper::get_shortcodes( $content, $form );
	1604	+ $content = apply_filters( 'frm_replace_content_shortcodes', $content, $entry, $shortcodes );
1955	1605
1956		- return apply_filters( 'frm_replace_content_shortcodes', $content, $entry, $shortcodes );
	1606	+ return $content;
1957	1607	}
1958	1608
1959	1609	/**
1960	1610	* Replace any [form_name] shortcodes in a string.
		@@ -1960,12 +1610,11 @@
1960	1610	* Replace any [form_name] shortcodes in a string.
1961	1611	*
1962	1612	* @since 5.5
1963	1613	*
1964		- * @param array|string $string
1965		- * @param int|stdClass|string $form
1966		- *
1967		- * @return array|string
	1614	+ * @param string|array $string
	1615	+ * @param stdClass|string|int $form
	1616	+ * @return string|array
1968	1617	*/
1969	1618	public static function replace_form_name_shortcodes( $string, $form ) {
1970	1619	if ( ! is_string( $string ) ) {
1971	1620	return $string;
		@@ -1970,9 +1619,9 @@
1970	1619	if ( ! is_string( $string ) ) {
1971	1620	return $string;
1972	1621	}
1973	1622
1974		- if ( ! str_contains( $string, '[form_name]' ) ) {
	1623	+ if ( false === strpos( $string, '[form_name]' ) ) {
1975	1624	return $string;
1976	1625	}
1977	1626
1978	1627	if ( ! is_object( $form ) ) {
		@@ -1983,10 +1632,9 @@
1983	1632	return str_replace( '[form_name]', $form_name, $string );
1984	1633	}
1985	1634
1986	1635	/**
1987		- * @param false|int|stdClass|string $entry
1988		- *
	1636	+ * @param stdClass|string|int|false $entry
1989	1637	* @return void
1990	1638	*/
1991	1639	private static function get_entry_by_param( &$entry ) {
1992	1640	if ( ! $entry || ! is_object( $entry ) ) {
		@@ -1997,24 +1645,12 @@
1997	1645	FrmEntry::maybe_get_entry( $entry );
1998	1646	}
1999	1647	}
2000	1648
2001		- /**
2002		- * @param string $content
2003		- * @param false|object $entry
2004		- * @param array $shortcodes
2005		- *
2006		- * @return string
2007		- */
2008	1649	public static function replace_content_shortcodes( $content, $entry, $shortcodes ) {
2009	1650	return FrmFieldsHelper::replace_content_shortcodes( $content, $entry, $shortcodes );
2010	1651	}
2011	1652
2012		- /**
2013		- * @param array $errors
2014		- *
2015		- * @return array
2016		- */
2017	1653	public static function process_bulk_form_actions( $errors ) {
2018	1654	if ( ! $_REQUEST ) {
2019	1655	return $errors;
2020	1656	}
		@@ -2019,30 +1655,29 @@
2019	1655	return $errors;
2020	1656	}
2021	1657
2022	1658	$bulkaction = FrmAppHelper::get_param( 'action', '', 'get', 'sanitize_text_field' );
2023		-
2024		- // phpcs:ignore Universal.Operators.StrictComparisons
2025	1659	if ( $bulkaction == - 1 ) {
2026	1660	$bulkaction = FrmAppHelper::get_param( 'action2', '', 'get', 'sanitize_title' );
2027	1661	}
2028	1662
2029		- if ( $bulkaction && str_starts_with( $bulkaction, 'bulk_' ) ) {
	1663	+ if ( ! empty( $bulkaction ) && strpos( $bulkaction, 'bulk_' ) === 0 ) {
2030	1664	FrmAppHelper::remove_get_action();
	1665	+
2031	1666	$bulkaction = str_replace( 'bulk_', '', $bulkaction );
2032	1667	}
2033	1668
2034	1669	$ids = FrmAppHelper::get_param( 'item-action', '', 'get', 'sanitize_text_field' );
	1670	+ if ( empty( $ids ) ) {
	1671	+ $errors[] = __( 'No forms were specified', 'formidable' );
2035	1672
2036		- if ( ! $ids ) {
2037		- $errors[] = __( 'No forms were specified', 'formidable' );
2038	1673	return $errors;
2039	1674	}
2040	1675
2041	1676	$permission_error = FrmAppHelper::permission_nonce_error( '', '_wpnonce', 'bulk-toplevel_page_formidable' );
2042		-
2043	1677	if ( $permission_error !== false ) {
2044	1678	$errors[] = $permission_error;
	1679	+
2045	1680	return $errors;
2046	1681	}
2047	1682
2048	1683	if ( ! is_array( $ids ) ) {
		@@ -2059,9 +1694,9 @@
2059	1694	case 'untrash':
2060	1695	$message = self::bulk_untrash( $ids );
2061	1696	}
2062	1697
2063		- if ( ! empty( $message ) ) {
	1698	+ if ( isset( $message ) && ! empty( $message ) ) {
2064	1699	$errors['message'] = $message;
2065	1700	}
2066	1701
2067	1702	return $errors;
		@@ -2066,24 +1701,9 @@
2066	1701
2067	1702	return $errors;
2068	1703	}
2069	1704
2070		- /**
2071		- * Includes html that shows a message when the device is too small to use Formidable Forms admin pages.
2072		- *
2073		- * @since 6.20
2074		- *
2075		- * @return void
2076		- */
2077		- public static function include_device_too_small_message() {
2078		- if ( ! FrmAppHelper::is_formidable_admin() ) {
2079		- return;
2080		- }
2081		-
2082		- include FrmAppHelper::plugin_path() . '/classes/views/shared/small-device-message.php';
2083		- }
2084		-
2085		- public static function route() { // phpcs:ignore Generic.Metrics.CyclomaticComplexity.MaxExceeded
	1705	+ public static function route() {
2086	1706	$action = isset( $_REQUEST['frm_action'] ) ? 'frm_action' : 'action';
2087	1707	$vars = array();
2088	1708	FrmAppHelper::include_svg();
2089	1709
		@@ -2093,14 +1713,12 @@
2093	1713	// Javascript needs to be allowed in some field settings.
2094	1714	// phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized, WordPress.Security.NonceVerification.Missing
2095	1715	$json_vars = htmlspecialchars_decode( nl2br( str_replace( '&quot;', '"', wp_unslash( $_POST['frm_compact_fields'] ) ) ) );
2096	1716	$json_vars = json_decode( $json_vars, true );
2097		-
2098		- if ( ! $json_vars ) {
	1717	+ if ( empty( $json_vars ) ) {
2099	1718	// json decoding failed so we should return an error message.
2100	1719	$action = FrmAppHelper::get_param( $action, '', 'get', 'sanitize_title' );
2101		-
2102		- if ( 'edit' === $action ) {
	1720	+ if ( 'edit' == $action ) {
2103	1721	$action = 'update';
2104	1722	}
2105	1723
2106	1724	add_filter( 'frm_validate_form', 'FrmFormsController::json_error' );
		@@ -2112,9 +1730,8 @@
2112	1730	$_POST = array_merge( $_POST, $_REQUEST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
2113	1731	}
2114	1732	} else {
2115	1733	$action = FrmAppHelper::get_param( $action, '', 'get', 'sanitize_title' );
2116		-
2117	1734	if ( isset( $_REQUEST['delete_all'] ) ) {
2118	1735	// Override the action for this page.
2119	1736	$action = 'delete_all';
2120	1737	}
		@@ -2123,8 +1740,10 @@
2123	1740	add_action( 'frm_load_form_hooks', 'FrmHooksController::trigger_load_form_hooks' );
2124	1741	FrmAppHelper::trigger_hook_load( 'form' );
2125	1742
2126	1743	switch ( $action ) {
	1744	+ case 'new':
	1745	+ return self::new_form( $vars );
2127	1746	case 'create':
2128	1747	case 'edit':
2129	1748	case 'update':
2130	1749	case 'trash':
		@@ -2133,39 +1752,33 @@
2133	1752	case 'settings':
2134	1753	case 'update_settings':
2135	1754	return self::$action( $vars );
2136	1755	case 'lite-reports':
2137		- self::no_reports( $vars );
2138		- return null;
	1756	+ return self::no_reports( $vars );
2139	1757	case 'views':
2140		- self::no_views( $vars );
2141		- return null;
	1758	+ return self::no_views( $vars );
2142	1759	default:
2143	1760	do_action( 'frm_form_action_' . $action );
2144		-
2145	1761	if ( apply_filters( 'frm_form_stop_action_' . $action, false ) ) {
2146		- return null;
	1762	+ return;
2147	1763	}
2148	1764
2149	1765	$action = FrmAppHelper::get_param( 'action', '', 'get', 'sanitize_text_field' );
2150		-
2151		- // phpcs:ignore Universal.Operators.StrictComparisons
2152	1766	if ( $action == - 1 ) {
2153	1767	$action = FrmAppHelper::get_param( 'action2', '', 'get', 'sanitize_title' );
2154	1768	}
2155	1769
2156		- if ( str_starts_with( $action, 'bulk_' ) ) {
	1770	+ if ( strpos( $action, 'bulk_' ) === 0 ) {
2157	1771	FrmAppHelper::remove_get_action();
2158	1772
2159	1773	self::list_form();
2160		- return null;
	1774	+ return;
2161	1775	}
2162	1776
2163	1777	$message = FrmAppHelper::get_param( 'message' );
2164		-
2165	1778	if ( 'form_duplicate_error' === $message ) {
2166	1779	self::display_forms_list( array(), '', array( __( 'There was a problem duplicating the form', 'formidable' ) ) );
2167		- return null;
	1780	+ return;
2168	1781	}
2169	1782
2170	1783	if ( 'forms_permanently_deleted' === $message ) {
2171	1784	$count = FrmAppHelper::get_param( 'forms_deleted', 0, 'get', 'absint' );
		@@ -2171,14 +1784,14 @@
2171	1784	$count = FrmAppHelper::get_param( 'forms_deleted', 0, 'get', 'absint' );
2172	1785	/* translators: %1$s: Number of forms */
2173	1786	$message = sprintf( _n( '%1$s form permanently deleted.', '%1$s forms permanently deleted.', $count, 'formidable' ), $count );
2174	1787	self::display_forms_list( array(), $message, '' );
2175		- return null;
	1788	+ return;
2176	1789	}
2177	1790
2178	1791	self::display_forms_list();
2179	1792
2180		- return null;
	1793	+ return;
2181	1794	}//end switch
2182	1795	}
2183	1796
2184	1797	/**
		@@ -2197,44 +1810,29 @@
2197	1810
2198	1811	// Get posted data
2199	1812	$form_id = FrmAppHelper::get_post_param( 'form_id', '', 'absint' );
2200	1813	$name = FrmAppHelper::get_post_param( 'form_name', '', 'sanitize_text_field' );
2201		- $form = FrmForm::getOne( $form_id );
2202	1814
2203		- if ( ! $form ) {
2204		- wp_send_json_error( __( 'Form not found', 'formidable' ) );
2205		- }
	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' ) );
2206	1818
2207		- if ( $name === $form->name ) {
2208		- // Nothing to change so exit early.
2209		- wp_send_json_success();
2210		- }
	1819	+ wp_send_json_success( compact( 'form_key' ) );
	1820	+ }
2211	1821
2212		- $to_update = array(
2213		- 'name' => $name,
2214		- );
	1822	+ public static function json_error( $errors ) {
	1823	+ $errors['json'] = __( 'Abnormal HTML characters prevented your form from saving correctly', 'formidable' );
2215	1824
2216		- if ( '' !== $name ) {
2217		- // Only update form_key if name is not empty.
2218		- $form_key = FrmAppHelper::get_unique_key( sanitize_title( $name ), 'frm_forms', 'form_key' );
2219		- $to_update['form_key'] = $form_key;
2220		- } else {
2221		- $form_key = $form->form_key;
2222		- }
2223		-
2224		- FrmForm::update( $form_id, $to_update );
2225		-
2226		- wp_send_json_success( compact( 'form_key' ) );
	1825	+ return $errors;
2227	1826	}
2228	1827
2229	1828	/**
2230		- * @param array $errors
	1829	+ * Education for premium features.
2231	1830	*
2232		- * @return array
	1831	+ * @since 4.05
2233	1832	*/
2234		- public static function json_error( $errors ) {
2235		- $errors['json'] = __( 'Abnormal HTML characters prevented your form from saving correctly', 'formidable' );
2236		- 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' );
2237	1835	}
2238	1836
2239	1837	/**
2240	1838	* Add education about views.
		@@ -2239,12 +1837,8 @@
2239	1837	/**
2240	1838	* Add education about views.
2241	1839	*
2242	1840	* @since 4.07
2243		- *
2244		- * @param array $values
2245		- *
2246		- * @return void
2247	1841	*/
2248	1842	public static function no_views( $values = array() ) {
2249	1843	FrmAppHelper::include_svg();
2250	1844	$id = FrmAppHelper::get_param( 'form', '', 'get', 'absint' );
		@@ -2256,12 +1850,8 @@
2256	1850	/**
2257	1851	* Add education about reports.
2258	1852	*
2259	1853	* @since 4.07
2260		- *
2261		- * @param array $values
2262		- *
2263		- * @return void
2264	1854	*/
2265	1855	public static function no_reports( $values = array() ) {
2266	1856	$id = FrmAppHelper::get_param( 'form', '', 'get', 'absint' );
2267	1857	$form = $id ? FrmForm::getOne( $id ) : false;
		@@ -2287,9 +1877,8 @@
2287	1877	* @since 4.05.02
2288	1878	*/
2289	1879	private static function move_menu_to_footer() {
2290	1880	$settings = FrmAppHelper::get_settings();
2291		-
2292	1881	if ( empty( $settings->admin_bar ) ) {
2293	1882	remove_action( 'wp_body_open', 'wp_admin_bar_render', 0 );
2294	1883	}
2295	1884	}
		@@ -2295,15 +1884,13 @@
2295	1884	}
2296	1885
2297	1886	public static function admin_bar_configure() {
2298	1887	global $frm_vars;
2299		-
2300	1888	if ( empty( $frm_vars['forms_loaded'] ) ) {
2301	1889	return;
2302	1890	}
2303	1891
2304	1892	$actions = array();
2305		-
2306	1893	foreach ( $frm_vars['forms_loaded'] as $form ) {
2307	1894	if ( is_object( $form ) ) {
2308	1895	$actions[ $form->id ] = $form->name;
2309	1896	}
		@@ -2309,9 +1896,9 @@
2309	1896	}
2310	1897	unset( $form );
2311	1898	}
2312	1899
2313		- if ( ! $actions ) {
	1900	+ if ( empty( $actions ) ) {
2314	1901	return;
2315	1902	}
2316	1903
2317	1904	self::add_menu_to_admin_bar();
		@@ -2337,12 +1924,8 @@
2337	1924	}
2338	1925
2339	1926	/**
2340	1927	* @since 2.05.07
2341		- *
2342		- * @param array $actions
2343		- *
2344		- * @return void
2345	1928	*/
2346	1929	private static function add_forms_to_admin_bar( $actions ) {
2347	1930	global $wp_admin_bar;
2348	1931
		@@ -2348,13 +1931,14 @@
2348	1931
2349	1932	asort( $actions );
2350	1933
2351	1934	foreach ( $actions as $form_id => $name ) {
	1935	+
2352	1936	$wp_admin_bar->add_node(
2353	1937	array(
2354	1938	'parent' => 'frm-forms',
2355	1939	'id' => 'edit_form_' . $form_id,
2356		- 'title' => empty( $name ) ? FrmFormsHelper::get_no_title_text() : $name,
	1940	+ 'title' => empty( $name ) ? __( '(no title)', 'formidable' ) : $name,
2357	1941	'href' => FrmForm::get_edit_link( $form_id ),
2358	1942	)
2359	1943	);
2360	1944	}
		@@ -2363,16 +1947,14 @@
2363	1947	/**
2364	1948	* The formidable shortcode
2365	1949	*
2366	1950	* @param array $atts The params from the shortcode.
2367		- *
2368	1951	* @return string
2369	1952	*/
2370	1953	public static function get_form_shortcode( $atts ) {
2371	1954	global $frm_vars;
2372		-
2373		- if ( ! empty( $frm_vars['skip_shortcode'] ) ) {
2374		- $sc = '[formidable';
	1955	+ if ( isset( $frm_vars['skip_shortcode'] ) && $frm_vars['skip_shortcode'] ) {
	1956	+ $sc = '[formidable';
2375	1957	$sc .= FrmAppHelper::array_to_html_params( $atts );
2376	1958	return $sc . ']';
2377	1959	}
2378	1960
		@@ -2397,12 +1979,11 @@
2397	1979
2398	1980	/**
2399	1981	* @since 5.2.01
2400	1982	*
2401		- * @param false|int|string $id
2402		- * @param false|string $key
2403		- *
2404		- * @return false|stdClass
	1983	+ * @param string|int|false $id
	1984	+ * @param string|false $key
	1985	+ * @return stdClass|false
2405	1986	*/
2406	1987	private static function maybe_get_form_by_id_or_key( $id, $key ) {
2407	1988	if ( ! $id ) {
2408	1989	$id = $key;
		@@ -2410,14 +1991,13 @@
2410	1991	return self::maybe_get_form_to_show( $id );
2411	1992	}
2412	1993
2413	1994	/**
2414		- * @param false|int|string $id
2415		- * @param false|string $key
2416		- * @param bool|int|string $title may be 'auto', true, false, 'true', 'false', 'yes', '1', 1, '0', 0.
2417		- * @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.
2418	1999	* @param array $atts
2419		- *
2420	2000	* @return string
2421	2001	*/
2422	2002	public static function show_form( $id = '', $key = '', $title = false, $description = false, $atts = array() ) {
2423	2003	$form = self::maybe_get_form_by_id_or_key( $id, $key );
		@@ -2438,9 +2018,10 @@
2438	2018
2439	2019	add_action( 'frm_load_form_hooks', 'FrmHooksController::trigger_load_form_hooks' );
2440	2020	FrmAppHelper::trigger_hook_load( 'form', $form );
2441	2021
2442		- $form = apply_filters( 'frm_pre_display_form', $form );
	2022	+ $form = apply_filters( 'frm_pre_display_form', $form );
	2023	+
2443	2024	$frm_settings = FrmAppHelper::get_settings( array( 'current_form' => $form->id ) );
2444	2025
2445	2026	if ( self::is_viewable_draft_form( $form ) ) {
2446	2027	// don't show a draft form on a page
		@@ -2463,19 +2044,17 @@
2463	2044	return $form;
2464	2045	}
2465	2046
2466	2047	/**
2467		- * @param false|int|string $id
2468		- *
2469		- * @return false|stdClass
	2048	+ * @param string|int|false $id
	2049	+ * @return stdClass|false
2470	2050	*/
2471	2051	private static function maybe_get_form_to_show( $id ) {
2472	2052	$form = false;
2473	2053
2474		- if ( $id ) {
	2054	+ if ( ! empty( $id ) ) {
2475	2055	// Form id or key is set.
2476	2056	$form = FrmForm::getOne( $id );
2477		-
2478	2057	if ( ! $form || $form->parent_form_id || $form->status === 'trash' ) {
2479	2058	$form = false;
2480	2059	}
2481	2060	}
		@@ -2482,25 +2061,12 @@
2482	2061
2483	2062	return $form;
2484	2063	}
2485	2064
2486		- /**
2487		- * @param object $form
2488		- *
2489		- * @return bool
2490		- */
2491	2065	private static function is_viewable_draft_form( $form ) {
2492	2066	return $form->status === 'draft' && current_user_can( 'frm_edit_forms' ) && ! FrmAppHelper::is_preview_page();
2493	2067	}
2494	2068
2495		- /**
2496		- * @param object $form
2497		- * @param bool $title
2498		- * @param bool $description
2499		- * @param array $atts
2500		- *
2501		- * @return string
2502		- */
2503	2069	public static function get_form( $form, $title, $description, $atts = array() ) {
2504	2070	ob_start();
2505	2071
2506	2072	do_action( 'frm_before_get_form', $atts );
		@@ -2507,9 +2073,10 @@
2507	2073
2508	2074	self::get_form_contents( $form, $title, $description, $atts );
2509	2075	self::enqueue_scripts( FrmForm::get_params( $form ) );
2510	2076
2511		- $contents = ob_get_clean();
	2077	+ $contents = ob_get_contents();
	2078	+ ob_end_clean();
2512	2079
2513	2080	self::maybe_minimize_form( $atts, $contents );
2514	2081
2515	2082	return $contents;
		@@ -2514,25 +2081,12 @@
2514	2081
2515	2082	return $contents;
2516	2083	}
2517	2084
2518		- /**
2519		- * @param array $params
2520		- *
2521		- * @return void
2522		- */
2523	2085	public static function enqueue_scripts( $params ) {
2524	2086	do_action( 'frm_enqueue_form_scripts', $params );
2525	2087	}
2526	2088
2527		- /**
2528		- * @param object $form
2529		- * @param bool $title
2530		- * @param bool $description
2531		- * @param array $atts
2532		- *
2533		- * @return void
2534		- */
2535	2089	public static function get_form_contents( $form, $title, $description, $atts ) {
2536	2090	$params = FrmForm::get_params( $form );
2537	2091	$errors = self::get_saved_errors( $form, $params );
2538	2092	$fields = FrmFieldsHelper::get_form_fields( $form->id, $errors );
		@@ -2539,10 +2093,9 @@
2539	2093	$reset = false;
2540	2094	$pass_args = compact( 'form', 'fields', 'errors', 'title', 'description', 'reset' );
2541	2095
2542	2096	$pass_args['action'] = $params['action'];
2543		- // phpcs:ignore WordPress.Security.NonceVerification.Missing, Universal.Operators.StrictComparisons
2544		- $handle_process_here = $params['action'] === 'create' && $params['posted_form_id'] == $form->id && $_POST;
	2097	+ $handle_process_here = $params['action'] === 'create' && $params['posted_form_id'] == $form->id && $_POST; // phpcs:ignore WordPress.Security.NonceVerification.Missing
2545	2098
2546	2099	if ( ! $handle_process_here ) {
2547	2100	FrmFormState::set_initial_value( 'title', $title );
2548	2101	FrmFormState::set_initial_value( 'description', $description );
		@@ -2547,22 +2100,22 @@
2547	2100	FrmFormState::set_initial_value( 'title', $title );
2548	2101	FrmFormState::set_initial_value( 'description', $description );
2549	2102
2550	2103	do_action( 'frm_display_form_action', $params, $fields, $form, $title, $description );
2551		-
2552	2104	if ( apply_filters( 'frm_continue_to_new', true, $form->id, $params['action'] ) ) {
2553	2105	self::show_form_after_submit( $pass_args );
2554	2106	}
2555		- } elseif ( $errors ) {
	2107	+ } elseif ( ! empty( $errors ) ) {
2556	2108	self::show_form_after_submit( $pass_args );
2557	2109
2558	2110	} else {
	2111	+
2559	2112	do_action( 'frm_validate_form_creation', $params, $fields, $form, $title, $description );
2560	2113
2561	2114	if ( apply_filters( 'frm_continue_to_create', true, $form->id ) ) {
2562		- $entry_id = self::just_created_entry( $form->id );
2563		- $pass_args['entry_id'] = $entry_id;
2564		- $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;
2565	2118
2566	2119	self::run_on_submit_actions( $pass_args );
2567	2120
2568	2121	do_action(
		@@ -2579,19 +2132,13 @@
2579	2132	/**
2580	2133	* If the form was processed earlier (init), get the generated errors
2581	2134	*
2582	2135	* @since 2.05
2583		- *
2584		- * @param object $form
2585		- * @param array $params
2586		- *
2587		- * @return array
2588	2136	*/
2589	2137	private static function get_saved_errors( $form, $params ) {
2590	2138	global $frm_vars;
2591	2139
2592		- // phpcs:ignore WordPress.Security.NonceVerification.Missing, Universal.Operators.StrictComparisons
2593		- if ( $params['posted_form_id'] == $form->id && $_POST && isset( $frm_vars['created_entries'][ $form->id ] ) ) {
	2140	+ if ( $params['posted_form_id'] == $form->id && $_POST && isset( $frm_vars['created_entries'][ $form->id ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
2594	2141	$errors = $frm_vars['created_entries'][ $form->id ]['errors'];
2595	2142	} else {
2596	2143	$errors = array();
2597	2144	}
		@@ -2608,16 +2155,13 @@
2608	2155	}
2609	2156
2610	2157	/**
2611	2158	* @since 2.2.7
2612		- *
2613		- * @param int|string $form_id
2614		- *
2615		- * @return int
2616	2159	*/
2617	2160	public static function just_created_entry( $form_id ) {
2618	2161	global $frm_vars;
2619		- return isset( $frm_vars['created_entries'] ) && isset( $frm_vars['created_entries'][ $form_id ] ) && isset( $frm_vars['created_entries'][ $form_id ]['entry_id'] ) ? $frm_vars['created_entries'][ $form_id ]['entry_id'] : 0; // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong
	2162	+
	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;
2620	2164	}
2621	2165
2622	2166	/**
2623	2167	* Gets confirmation method.
		@@ -2630,19 +2174,17 @@
2630	2174	*
2631	2175	* @type object $form Form object.
2632	2176	* @type int $entry_id Entry ID.
2633	2177	* }
2634		- *
2635		- * @return array|string
	2178	+ * @return string|array
2636	2179	*/
2637	2180	private static function get_confirmation_method( $atts ) {
2638	2181	$action = FrmOnSubmitHelper::current_event( $atts );
2639	2182	$opt = 'update' === $action ? 'edit_action' : 'success_action';
2640		- $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';
2641	2184
2642	2185	if ( ! empty( $atts['entry_id'] ) ) {
2643	2186	$met_actions = self::get_met_on_submit_actions( $atts, $action );
2644		-
2645	2187	if ( $met_actions ) {
2646	2188	$method = $met_actions;
2647	2189	}
2648	2190	}
		@@ -2648,9 +2190,9 @@
2648	2190	}
2649	2191
2650	2192	$method = apply_filters( 'frm_success_filter', $method, $atts['form'], $action );
2651	2193
2652		- if ( $method !== 'message' && ( ! $atts['entry_id'] || ! is_numeric( $atts['entry_id'] ) ) ) {
	2194	+ if ( $method != 'message' && ( ! $atts['entry_id'] || ! is_numeric( $atts['entry_id'] ) ) ) {
2653	2195	$method = 'message';
2654	2196	}
2655	2197
2656	2198	return $method;
		@@ -2655,15 +2197,8 @@
2655	2197
2656	2198	return $method;
2657	2199	}
2658	2200
2659		- /**
2660		- * @param object $form
2661		- * @param array $params
2662		- * @param array $args
2663		- *
2664		- * @return void
2665		- */
2666	2201	public static function maybe_trigger_redirect( $form, $params, $args ) {
2667	2202	if ( ! isset( $params['id'] ) ) {
2668	2203	global $frm_vars;
2669	2204	$params['id'] = $frm_vars['created_entries'][ $form->id ]['entry_id'];
		@@ -2691,9 +2226,9 @@
2691	2226	* @param array $args See {@see FrmFormsController::maybe_trigger_redirect()}.
2692	2227	*/
2693	2228	public static function maybe_trigger_redirect_with_action( $conf_method, $form, $params, $args ) {
2694	2229	if ( is_array( $conf_method ) && 1 === count( $conf_method ) ) {
2695		- 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] ) ) {
2696	2231	$event = FrmOnSubmitHelper::current_event( $params );
2697	2232	FrmOnSubmitHelper::populate_on_submit_data( $form->options, $conf_method[0], $event );
2698	2233	$conf_method = 'redirect';
2699	2234	}
		@@ -2703,15 +2238,8 @@
2703	2238	self::trigger_redirect( $form, $params, $args );
2704	2239	}
2705	2240	}
2706	2241
2707		- /**
2708		- * @param object $form
2709		- * @param array $params
2710		- * @param array $args
2711		- *
2712		- * @return void
2713		- */
2714	2242	public static function trigger_redirect( $form, $params, $args ) {
2715	2243	$success_args = array(
2716	2244	'action' => $params['action'],
2717	2245	'conf_method' => 'redirect',
		@@ -2749,9 +2277,9 @@
2749	2277	unset( $extra_args['form'] );
2750	2278
2751	2279	do_action( 'frm_success_action', $args['conf_method'], $args['form'], $args['form']->options, $args['entry_id'], $extra_args );
2752	2280
2753		- $opt = ! isset( $args['action'] ) || $args['action'] === 'create' ? 'success' : 'edit';
	2281	+ $opt = ( ! isset( $args['action'] ) || $args['action'] === 'create' ) ? 'success' : 'edit';
2754	2282
2755	2283	$args['success_opt'] = $opt;
2756	2284	$args['ajax'] = ! empty( $frm_vars['ajax'] );
2757	2285
		@@ -2770,9 +2298,8 @@
2770	2298	* @since 6.0
2771	2299	*
2772	2300	* @param array $args See {@see FrmFormsController::run_success_action()}.
2773	2301	* @param string $event Form event. Default is `create`.
2774		- *
2775	2302	* @return array Array of actions that meet the conditional logics.
2776	2303	*/
2777	2304	public static function get_met_on_submit_actions( $args, $event = 'create' ) {
2778	2305	if ( ! FrmOnSubmitHelper::form_has_migrated( $args['form'] ) ) {
		@@ -2778,16 +2305,16 @@
2778	2305	if ( ! FrmOnSubmitHelper::form_has_migrated( $args['form'] ) ) {
2779	2306	return array();
2780	2307	}
2781	2308
2782		- // 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.
2783	2310	if ( ! empty( self::$redirected_in_new_tab[ $args['form']->id ] ) ) {
2784	2311	return array( FrmOnSubmitHelper::get_fallback_action_after_open_in_new_tab( $event ) );
2785	2312	}
2786	2313
2787		- $entry = FrmEntry::getOne( $args['entry_id'], true );
2788		- $actions = FrmOnSubmitHelper::get_actions( $args['form']->id );
2789		- $met_actions = array();
	2314	+ $entry = FrmEntry::getOne( $args['entry_id'], true );
	2315	+ $actions = FrmOnSubmitHelper::get_actions( $args['form']->id );
	2316	+ $met_actions = array();
2790	2317	$has_redirect = false;
2791	2318
2792	2319	foreach ( $actions as $action ) {
2793	2320	if ( ! in_array( $event, $action->post_content['event'], true ) ) {
		@@ -2830,9 +2357,9 @@
2830	2357	* @param array $args See {@see FrmFormsController::run_success_action()}. `$args['event']` is also added.
2831	2358	*/
2832	2359	$met_actions = apply_filters( 'frm_get_met_on_submit_actions', $met_actions, $args );
2833	2360
2834		- if ( ! $met_actions ) {
	2361	+ if ( empty( $met_actions ) ) {
2835	2362	$met_actions = array( FrmOnSubmitHelper::get_fallback_action( $event ) );
2836	2363	}
2837	2364
2838	2365	return $met_actions;
		@@ -2845,9 +2372,8 @@
2845	2372	*
2846	2373	* @param object $action Form action object.
2847	2374	* @param array $args See {@see FrmFormsController::run_success_action()}.
2848	2375	* @param string $event Form event. Default is `create`.
2849		- *
2850	2376	* @return bool
2851	2377	*/
2852	2378	private static function is_valid_on_submit_action( $action, $args, $event = 'create' ) {
2853	2379	$action_type = FrmOnSubmitHelper::get_action_type( $action );
		@@ -2869,9 +2395,8 @@
2869	2395	return false;
2870	2396	}
2871	2397
2872	2398	$page = get_post( $action->post_content['success_page_id'] );
2873		-
2874	2399	if ( ! $page || 'trash' === $page->post_status ) {
2875	2400	return false;
2876	2401	}
2877	2402	}
		@@ -2893,9 +2418,8 @@
2893	2418	'entry_id' => $args['entry_id'],
2894	2419	'action' => FrmOnSubmitHelper::current_event( $args ),
2895	2420	)
2896	2421	);
2897		-
2898	2422	if ( ! is_array( $args['conf_method'] ) ) {
2899	2423	self::run_success_action( $args );
2900	2424	return;
2901	2425	}
		@@ -2922,9 +2446,8 @@
2922	2446	* @param array $args See {@see FrmFormsController::run_success_action()}.
2923	2447	*/
2924	2448	public static function run_multi_on_submit_actions( $args ) {
2925	2449	$redirect_action = null;
2926		-
2927	2450	foreach ( $args['conf_method'] as $action ) {
2928	2451	if ( 'redirect' === FrmOnSubmitHelper::get_action_type( $action ) ) {
2929	2452	// We catch the redirect action to run it last.
2930	2453	$redirect_action = $action;
		@@ -2962,9 +2485,8 @@
2962	2485	* @since 6.0
2963	2486	*
2964	2487	* @param array $args See {@see FrmFormsController::run_success_action()}.
2965	2488	* @param object $action On Submit action object.
2966		- *
2967	2489	* @return array
2968	2490	*/
2969	2491	private static function get_run_success_action_args( $args, $action ) {
2970	2492	$new_args = $args;
		@@ -2970,9 +2492,10 @@
2970	2492	$new_args = $args;
2971	2493
2972	2494	FrmOnSubmitHelper::populate_on_submit_data( $new_args['form']->options, $action, $args['action'] );
2973	2495
2974		- $opt = 'update' === $args['action'] ? 'edit_' : 'success_';
	2496	+ $opt = 'update' === $args['action'] ? 'edit_' : 'success_';
	2497	+
2975	2498	$new_args['conf_method'] = $new_args['form']->options[ $opt . 'action' ];
2976	2499
2977	2500	/**
2978	2501	* Filters the run success action args.
		@@ -2987,18 +2510,12 @@
2987	2510	}
2988	2511
2989	2512	/**
2990	2513	* @since 3.0
2991		- *
2992		- * @param array $args
2993		- *
2994		- * @return void
2995	2514	*/
2996	2515	private static function load_page_after_submit( $args ) {
2997	2516	global $post;
2998	2517	$opt = $args['success_opt'];
2999		-
3000		- // phpcs:ignore Universal.Operators.StrictComparisons
3001	2518	if ( ! $post || $args['form']->options[ $opt . '_page_id' ] != $post->ID ) {
3002	2519	$page = get_post( $args['form']->options[ $opt . '_page_id' ] );
3003	2520	$old_post = $post;
3004	2521	$post = $page;
		@@ -3022,9 +2539,8 @@
3022	2539	}
3023	2540
3024	2541	/**
3025	2542	* @since 3.0
3026		- *
3027	2543	* @param array $args See {@see FrmFormsController::run_success_action()}.
3028	2544	*/
3029	2545	private static function redirect_after_submit( $args ) {
3030	2546	add_filter( 'frm_use_wpautop', '__return_false' );
		@@ -3038,10 +2554,11 @@
3038	2554	FrmEntriesController::delete_entry_before_redirect( $success_url, $args['form'], $args );
3039	2555
3040	2556	add_filter( 'frm_redirect_url', 'FrmEntriesController::prepare_redirect_url' );
3041	2557	$success_url = apply_filters( 'frm_redirect_url', $success_url, $args['form'], $args );
3042		- $doing_ajax = FrmAppHelper::doing_ajax();
3043	2558
	2559	+ $doing_ajax = FrmAppHelper::doing_ajax();
	2560	+
3044	2561	if ( ! empty( $args['ajax'] ) && $doing_ajax && empty( $args['force_delay_redirect'] ) ) {
3045	2562	// Is AJAX submit and there is just one Redirect action runs.
3046	2563	echo json_encode( self::get_ajax_redirect_response_data( $args + compact( 'success_url' ) ) );
3047	2564	wp_die();
		@@ -3046,9 +2563,9 @@
3046	2563	echo json_encode( self::get_ajax_redirect_response_data( $args + compact( 'success_url' ) ) );
3047	2564	wp_die();
3048	2565	}
3049	2566
3050		- if ( ! headers_sent() && empty( $args['force_delay_redirect'] ) && empty( $args['form']->options['redirect_delay'] ) ) {
	2567	+ if ( ! headers_sent() && empty( $args['force_delay_redirect'] ) ) {
3051	2568	// Not AJAX submit, no headers sent, and there is just one Redirect action runs.
3052	2569	if ( ! empty( $args['form']->options['open_in_new_tab'] ) ) {
3053	2570	self::print_open_in_new_tab_js_with_fallback_handler( $success_url, $args );
3054	2571	self::$redirected_in_new_tab[ $args['form']->id ] = 1;
		@@ -3090,51 +2607,31 @@
3090	2607	*
3091	2608	* @since 6.3.1
3092	2609	*
3093	2610	* @param array $args See {@see FrmFormsController::run_success_action()}.
3094		- *
3095	2611	* @return array
3096	2612	*/
3097	2613	private static function get_ajax_redirect_response_data( $args ) {
3098		- $response_data = array(
3099		- 'redirect' => $args['success_url'],
3100		- 'content' => '',
3101		- );
3102		- $unset_content = true;
	2614	+ $response_data = array( 'redirect' => $args['success_url'] );
3103	2615
3104		- if ( ! empty( $args['form']->options['redirect_delay'] ) ) {
3105		- $response_data['delay'] = $args['form']->options['redirect_delay_time'];
3106		- $response_data['content'] .= self::get_redirect_message( $args['success_url'], $args['form']->options['redirect_delay_msg'], $args );
3107		- $unset_content = false;
3108		- }
3109		-
3110	2616	if ( ! empty( $args['form']->options['open_in_new_tab'] ) ) {
3111	2617	$response_data['openInNewTab'] = 1;
3112	2618
3113		- // Only show open in new tab text if there is no delay.
3114		- if ( empty( $response_data['content'] ) ) {
3115		- $args['message'] = FrmOnSubmitHelper::get_default_new_tab_msg();
	2619	+ $args['message'] = FrmOnSubmitHelper::get_default_new_tab_msg();
3116	2620
3117		- $args['form']->options['success_msg'] = $args['message'];
3118		- $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	+ }
3119	2626
3120		- if ( ! isset( $args['fields'] ) ) {
3121		- $args['fields'] = FrmField::get_all_for_form( $args['form']->id );
3122		- }
	2627	+ $args['message'] = self::prepare_submit_message( $args['form'], $args['entry_id'], $args );
3123	2628
3124		- $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();
3125	2632
3126		- ob_start();
3127		- self::show_lone_success_message( $args );
3128		- $response_data['content'] .= ob_get_clean();
3129		- $unset_content = false;
3130		- }//end if
3131		-
3132	2633	$response_data['fallbackMsg'] = self::get_redirect_fallback_message( $args['success_url'], $args );
3133		- }//end if
3134		-
3135		- if ( $unset_content && '' === $response_data['content'] ) {
3136		- unset( $response_data['content'] );
3137	2634	}
3138	2635
3139	2636	return $response_data;
3140	2637	}
		@@ -3146,9 +2643,9 @@
3146	2643	*
3147	2644	* @param array $args See {@see FrmFormsController::run_success_action()}.
3148	2645	*/
3149	2646	private static function redirect_after_submit_using_js( $args ) {
3150		- $success_msg = $args['form']->options['redirect_delay_msg'];
	2647	+ $success_msg = FrmOnSubmitHelper::get_default_redirect_msg();
3151	2648	$redirect_msg = self::get_redirect_message( $args['success_url'], $success_msg, $args );
3152	2649	$success_url = esc_url_raw( $args['success_url'] );
3153	2650
3154	2651	/**
		@@ -3155,11 +2652,11 @@
3155	2652	* Filters the delay time before redirecting when On Submit Redirect action is delayed.
3156	2653	*
3157	2654	* @since 6.0
3158	2655	*
3159		- * @param int $delay_time Delay time in milliseconds.
	2656	+ * @param int $delay_time Delay time in miliseconds.
3160	2657	*/
3161		- $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 );
3162	2659
3163	2660	if ( ! empty( $args['form']->options['open_in_new_tab'] ) ) {
3164	2661	$redirect_js = 'window.open("' . $success_url . '", "_blank")';
3165	2662	} else {
		@@ -3169,15 +2666,13 @@
3169	2666	add_filter( 'frm_use_wpautop', '__return_true' );
3170	2667
3171	2668	echo FrmAppHelper::maybe_kses( $redirect_msg ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
3172	2669	echo '<script>';
3173		-
3174	2670	if ( empty( $args['doing_ajax'] ) ) {
3175	2671	// Not AJAX submit, delay JS until window.load.
3176	2672	echo 'window.onload=function(){';
3177	2673	}
3178	2674	echo 'setTimeout(function(){' . $redirect_js . '}, ' . intval( $delay_time ) . ');'; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
3179		-
3180	2675	if ( empty( $args['doing_ajax'] ) ) {
3181	2676	echo '};';
3182	2677	}
3183	2678	echo '</script>';
		@@ -3190,11 +2685,9 @@
3190	2685	* @param string $success_msg
3191	2686	* @param array $args
3192	2687	*/
3193	2688	private static function get_redirect_message( $success_url, $success_msg, $args ) {
3194		- $success_msg = apply_filters( 'frm_content', $success_msg, $args['form'], $args['entry_id'] );
3195		- $success_msg = do_shortcode( FrmAppHelper::use_wpautop( $success_msg ) );
3196		- $redirect_msg = '<div class="' . esc_attr( FrmFormsHelper::get_form_style_class( $args['form'] ) ) . '"><div class="frm-redirect-msg" role="status">' . $success_msg . '<br/>' . // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong
	2689	+ $redirect_msg = '<div class="' . esc_attr( FrmFormsHelper::get_form_style_class( $args['form'] ) ) . '"><div class="frm-redirect-msg" role="status">' . $success_msg . '<br/>' .
3197	2690	self::get_redirect_fallback_message( $success_url, $args ) .
3198	2691	'</div></div>';
3199	2692
3200	2693	$redirect_args = array(
		@@ -3212,14 +2705,12 @@
3212	2705	* @since 6.3.1
3213	2706	*
3214	2707	* @param string $success_url Redirect URL.
3215	2708	* @param array $args Contains `form` object.
3216		- *
3217	2709	* @return string
3218	2710	*/
3219	2711	private static function get_redirect_fallback_message( $success_url, $args ) {
3220	2712	$target = '';
3221		-
3222	2713	if ( ! empty( $args['form']->options['open_in_new_tab'] ) ) {
3223	2714	$target = ' target="_blank"';
3224	2715	}
3225	2716
		@@ -3234,12 +2725,8 @@
3234	2725	/**
3235	2726	* Prepare to show the success message and empty form after submit
3236	2727	*
3237	2728	* @since 2.05
3238		- *
3239		- * @param array $atts
3240		- *
3241		- * @return void
3242	2729	*/
3243	2730	public static function show_message_after_save( $atts ) {
3244	2731	$atts['message'] = self::prepare_submit_message( $atts['form'], $atts['entry_id'], $atts );
3245	2732
		@@ -3245,9 +2732,8 @@
3245	2732
3246	2733	if ( ! isset( $atts['form']->options['show_form'] ) || $atts['form']->options['show_form'] ) {
3247	2734	if ( isset( $atts['action'] ) && 'update' === $atts['action'] && is_callable( array( 'FrmProEntriesController', 'show_front_end_form_with_entry' ) ) ) {
3248	2735	$entry = FrmEntry::getOne( $atts['entry_id'] );
3249		-
3250	2736	if ( $entry ) {
3251	2737	// This is copied from the Pro plugin.
3252	2738	$atts['conf_message'] = FrmProEntriesController::confirmation( 'message', $atts['form'], $atts['form']->options, $entry->id, $atts );
3253	2739	$atts['show_form'] = FrmProEntriesController::is_form_displayed_after_edit( $atts['form'] );
		@@ -3256,9 +2742,9 @@
3256	2742	} else {
3257	2743	self::show_form_after_submit( $atts );
3258	2744	}
3259	2745	} else {
3260		- self::show_lone_success_message( $atts );
	2746	+ self::show_lone_success_messsage( $atts );
3261	2747	}
3262	2748	}
3263	2749
3264	2750	/**
		@@ -3264,12 +2750,8 @@
3264	2750	/**
3265	2751	* Show an empty form
3266	2752	*
3267	2753	* @since 2.05
3268		- *
3269		- * @param array $args
3270		- *
3271		- * @return void
3272	2754	*/
3273	2755	private static function show_form_after_submit( $args ) {
3274	2756	self::fill_atts_for_form_display( $args );
3275	2757
		@@ -3288,11 +2770,12 @@
3288	2770	}
3289	2771	unset( $args );
3290	2772
3291	2773	$include_form_tag = apply_filters( 'frm_include_form_tag', true, $form );
3292		- $frm_settings = FrmAppHelper::get_settings();
3293		- $submit = $form->options['submit_value'] ?? $frm_settings->submit_value;
3294	2774
	2775	+ $frm_settings = FrmAppHelper::get_settings();
	2776	+ $submit = isset( $form->options['submit_value'] ) ? $form->options['submit_value'] : $frm_settings->submit_value;
	2777	+
3295	2778	global $frm_vars;
3296	2779	self::maybe_load_css( $form, $values['custom_style'], $frm_vars['load_css'] );
3297	2780
3298	2781	$message_placement = self::message_placement( $form, $message );
		@@ -3300,36 +2783,27 @@
3300	2783	include FrmAppHelper::plugin_path() . '/classes/views/frm-entries/new.php';
3301	2784	}
3302	2785
3303	2786	/**
3304		- * Gets message placement.
	2787	+ * @return string - 'before', 'after', or 'submit'
3305	2788	*
3306	2789	* @since 4.05.02
3307		- * @since 6.26 This method changed from `private` to `public`.
3308		- *
3309		- * @param object $form Form object.
3310		- * @param string $message The message.
3311		- *
3312		- * @return string Accepts 'before', 'after', or 'submit'.
3313	2790	*/
3314		- public static function message_placement( $form, $message ) {
	2791	+ private static function message_placement( $form, $message ) {
3315	2792	$place = 'before';
3316	2793
3317	2794	if ( $message && isset( $form->options['form_class'] ) ) {
3318		- if ( str_contains( $form->options['form_class'], 'frm_below_success' ) ) {
	2795	+ if ( strpos( $form->options['form_class'], 'frm_below_success' ) !== false ) {
3319	2796	$place = 'after';
3320		- } elseif ( str_contains( $form->options['form_class'], 'frm_inline_success' ) ) {
	2797	+ } elseif ( strpos( $form->options['form_class'], 'frm_inline_success' ) !== false ) {
3321	2798	$place = 'submit';
3322	2799	}
3323	2800	}
3324	2801
3325	2802	/**
3326		- * Filter the message placement.
	2803	+ * @return string - 'before' or 'after'
3327	2804	*
3328	2805	* @since 4.05.02
3329		- *
3330		- * @param string $place Accepts 'before', 'after', or 'submit'.
3331		- * @param array $args Args.
3332	2806	*/
3333	2807	return apply_filters( 'frm_message_placement', $place, compact( 'form', 'message' ) );
3334	2808	}
3335	2809
		@@ -3336,12 +2810,8 @@
3336	2810	/**
3337	2811	* Get all the values needed on the new.php entry page
3338	2812	*
3339	2813	* @since 2.05
3340		- *
3341		- * @param array $args
3342		- *
3343		- * @return void
3344	2814	*/
3345	2815	private static function fill_atts_for_form_display( &$args ) {
3346	2816	if ( ! isset( $args['title'] ) && isset( $args['show_title'] ) ) {
3347	2817	$args['title'] = $args['show_title'];
		@@ -3366,24 +2836,21 @@
3366	2836	/**
3367	2837	* Show the success message without the form
3368	2838	*
3369	2839	* @since 2.05
3370		- *
3371		- * @param array $atts
3372		- *
3373		- * @return void
3374	2840	*/
3375		- private static function show_lone_success_message( $atts ) {
	2841	+ private static function show_lone_success_messsage( $atts ) {
3376	2842	global $frm_vars;
3377	2843	$values = FrmEntriesHelper::setup_new_vars( $atts['fields'], $atts['form'], true );
3378	2844	self::maybe_load_css( $atts['form'], $values['custom_style'], $frm_vars['load_css'] );
3379	2845
3380	2846	$include_extra_container = 'frm_forms' . FrmFormsHelper::get_form_style_class( $values );
3381		- $errors = array();
3382		- $form = $atts['form'];
3383		- $message = $atts['message'];
3384	2847
3385		- include FrmAppHelper::plugin_path() . '/classes/views/frm-entries/errors.php';
	2848	+ $errors = array();
	2849	+ $form = $atts['form'];
	2850	+ $message = $atts['message'];
	2851	+
	2852	+ include( FrmAppHelper::plugin_path() . '/classes/views/frm-entries/errors.php' );
3386	2853	}
3387	2854
3388	2855	/**
3389	2856	* Prepare the success message before it's shown
		@@ -3393,17 +2860,16 @@
3393	2860	*
3394	2861	* @param object $form Form object.
3395	2862	* @param int $entry_id Entry ID.
3396	2863	* @param array $args See {@see FrmFormsController::run_success_action()}.
3397		- *
3398	2864	* @return string
3399	2865	*/
3400	2866	private static function prepare_submit_message( $form, $entry_id, $args = array() ) {
3401	2867	$frm_settings = FrmAppHelper::get_settings( array( 'current_form' => $form->id ) );
3402		- $opt = $args['success_opt'] ?? 'success';
	2868	+ $opt = isset( $args['success_opt'] ) ? $args['success_opt'] : 'success';
3403	2869
3404	2870	if ( $entry_id && is_numeric( $entry_id ) ) {
3405		- $message = $form->options[ $opt . '_msg' ] ?? $frm_settings->success_msg;
	2871	+ $message = isset( $form->options[ $opt . '_msg' ] ) ? $form->options[ $opt . '_msg' ] : $frm_settings->success_msg;
3406	2872	$class = 'frm_message';
3407	2873	} else {
3408	2874	$message = $frm_settings->failed_msg;
3409	2875	$class = FrmFormsHelper::form_error_class();
		@@ -3420,9 +2886,9 @@
3420	2886	public static function front_head() {
3421	2887	$version = FrmAppHelper::plugin_version();
3422	2888	$suffix = FrmAppHelper::js_suffix();
3423	2889
3424		- if ( $suffix && self::has_combo_js_file() ) {
	2890	+ if ( ! empty( $suffix ) && self::has_combo_js_file() ) {
3425	2891	wp_register_script( 'formidable', FrmAppHelper::plugin_url() . '/js/frm.min.js', array( 'jquery' ), $version, true );
3426	2892	} else {
3427	2893	wp_register_script( 'formidable', FrmAppHelper::plugin_url() . "/js/formidable{$suffix}.js", array( 'jquery' ), $version, true );
3428	2894	}
		@@ -3444,15 +2910,8 @@
3444	2910	public static function has_combo_js_file() {
3445	2911	return is_readable( FrmAppHelper::plugin_path() . '/js/frm.min.js' );
3446	2912	}
3447	2913
3448		- /**
3449		- * @param object $form
3450		- * @param int|string $this_load
3451		- * @param bool $global_load
3452		- *
3453		- * @return void
3454		- */
3455	2914	public static function maybe_load_css( $form, $this_load, $global_load ) {
3456	2915	$load_css = FrmForm::is_form_loaded( $form, $this_load, $global_load );
3457	2916
3458	2917	if ( ! $load_css ) {
		@@ -3482,9 +2941,8 @@
3482	2941	return;
3483	2942	}
3484	2943
3485	2944	global $wp_styles;
3486		-
3487	2945	if ( is_array( $wp_styles->queue ) && in_array( 'formidable', $wp_styles->queue, true ) ) {
3488	2946	wp_print_styles( 'formidable' );
3489	2947	}
3490	2948	}
		@@ -3499,16 +2957,10 @@
3499	2957	private static function should_load_late() {
3500	2958	return ! function_exists( 'aioseo' );
3501	2959	}
3502	2960
3503		- /**
3504		- * @param string $tag
3505		- * @param string $handle
3506		- *
3507		- * @return string
3508		- */
3509	2961	public static function defer_script_loading( $tag, $handle ) {
3510		- if ( 'captcha-api' === $handle && ! str_contains( $tag, 'defer' ) ) {
	2962	+ if ( 'captcha-api' == $handle && ! strpos( $tag, 'defer' ) ) {
3511	2963	$tag = str_replace( ' src', ' defer="defer" async="async" src', $tag );
3512	2964	}
3513	2965
3514	2966	return $tag;
		@@ -3513,33 +2965,21 @@
3513	2965
3514	2966	return $tag;
3515	2967	}
3516	2968
3517		- /**
3518		- * @param string $location
3519		- *
3520		- * @return void
3521		- */
3522	2969	public static function footer_js( $location = 'footer' ) {
3523	2970	global $frm_vars;
3524	2971
3525	2972	FrmStylesController::enqueue_css();
3526	2973
3527		- if ( ! FrmAppHelper::is_admin() && $location !== 'header' && ! empty( $frm_vars['forms_loaded'] ) ) {
	2974	+ if ( ! FrmAppHelper::is_admin() && $location != 'header' && ! empty( $frm_vars['forms_loaded'] ) ) {
3528	2975	// load formidable js
3529	2976	wp_enqueue_script( 'formidable' );
3530		-
3531		- FrmHoneypot::maybe_print_honeypot_js();
3532	2977	}
3533	2978	}
3534	2979
3535	2980	/**
3536	2981	* @since 2.0.8
3537		- *
3538		- * @param array $atts
3539		- * @param string $content
3540		- *
3541		- * @return void
3542	2982	*/
3543	2983	private static function maybe_minimize_form( $atts, &$content ) {
3544	2984	// check if minimizing is turned on
3545	2985	if ( self::is_minification_on( $atts ) ) {
		@@ -3548,15 +2988,12 @@
3548	2988	}
3549	2989
3550	2990	/**
3551	2991	* @since 2.0.8
3552		- *
3553		- * @param array $atts
3554		- *
3555		- * @return bool
	2992	+ * @return boolean
3556	2993	*/
3557	2994	private static function is_minification_on( $atts ) {
3558		- return ! empty( $atts['minimize'] );
	2995	+ return isset( $atts['minimize'] ) && ! empty( $atts['minimize'] );
3559	2996	}
3560	2997
3561	2998	/**
3562	2999	* @since 5.0.16
		@@ -3564,13 +3001,11 @@
3564	3001	* @return void
3565	3002	*/
3566	3003	public static function landing_page_preview_option() {
3567	3004	$dir = apply_filters( 'frm_landing_page_preview_option', false );
3568		-
3569	3005	if ( false === $dir || ! file_exists( $dir . 'landing-page-preview-option.php' ) ) {
3570	3006	$dir = self::get_form_views_path();
3571	3007	}
3572		-
3573	3008	include $dir . 'landing-page-preview-option.php';
3574	3009	}
3575	3010
3576	3011	/**
		@@ -3596,15 +3031,13 @@
3596	3031
3597	3032	check_ajax_referer( 'frm_ajax', 'nonce' );
3598	3033
3599	3034	$type = FrmAppHelper::get_post_param( 'type', '', 'sanitize_text_field' );
3600		-
3601	3035	if ( ! $type || ! in_array( $type, array( 'form', 'view' ), true ) ) {
3602	3036	die( 0 );
3603	3037	}
3604	3038
3605	3039	$object_id = FrmAppHelper::get_post_param( 'object_id', '', 'absint' );
3606		-
3607	3040	if ( ! $object_id ) {
3608	3041	die( 0 );
3609	3042	}
3610	3043
		@@ -3616,15 +3049,13 @@
3616	3049	$postarr['post_content'] = apply_filters( 'frm_create_page_with_' . $type . '_shortcode_content', '', $object_id );
3617	3050	}
3618	3051
3619	3052	$name = FrmAppHelper::get_post_param( 'name', '', 'sanitize_text_field' );
3620		-
3621	3053	if ( $name ) {
3622	3054	$postarr['post_title'] = $name;
3623	3055	}
3624	3056
3625	3057	$success = wp_insert_post( $postarr );
3626		-
3627	3058	if ( ! is_numeric( $success ) || ! $success ) {
3628	3059	die( 0 );
3629	3060	}
3630	3061
		@@ -3638,9 +3069,8 @@
3638	3069	/**
3639	3070	* @since 5.3
3640	3071	*
3641	3072	* @param int $form_id
3642		- *
3643	3073	* @return string
3644	3074	*/
3645	3075	private static function get_page_shortcode_content_for_form( $form_id ) {
3646	3076	$shortcode = '[formidable id="' . $form_id . '"]';
		@@ -3661,9 +3091,9 @@
3661	3091
3662	3092	check_ajax_referer( 'frm_ajax', 'nonce' );
3663	3093
3664	3094	$html = FrmAppHelper::clip(
3665		- function () {
	3095	+ function() {
3666	3096	FrmAppHelper::maybe_autocomplete_pages_options(
3667	3097	array(
3668	3098	'field_name' => 'frm_page_dropdown',
3669	3099	'page_id' => '',
		@@ -3682,14 +3112,89 @@
3682	3112	}
3683	3113
3684	3114	/**
3685	3115	* @deprecated 4.0
	3116	+ */
	3117	+ public static function new_form( $values = array() ) {
	3118	+ FrmDeprecated::new_form( $values );
	3119	+ }
	3120	+
	3121	+ /**
	3122	+ * @deprecated 4.0
	3123	+ */
	3124	+ public static function create( $values = array() ) {
	3125	+ _deprecated_function( __METHOD__, '4.0', 'FrmFormsController::update' );
	3126	+ self::update( $values );
	3127	+ }
	3128	+
	3129	+ /**
	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
3686	3163	*
3687		- * @param array $values
	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
3688	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	+ *
3689	3186	* @return void
3690	3187	*/
3691		- public static function create( $values = array() ) {
3692		- _deprecated_function( __METHOD__, '4.0', 'FrmFormsController::update' );
3693		- self::update( $values );
	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' );
3694	3199	}
3695	3200	}