← All changes | classes/controllers/FrmFormsController.php +684 -1604 6.35 → 6.0 View file →

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