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