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