← All changes | classes/controllers/FrmFormsController.php +457 -1015 6.32 → 6.8 View file →

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