← All changes | classes/controllers/FrmFormsController.php +576 -1317 6.32 → 6.2.2 View file →

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