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