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