← All changes | classes/controllers/FrmFormsController.php +1496 -579 6.3 → trunk View file →

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