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