← All changes | classes/controllers/FrmFormsController.php +1384 -589 6.5.2 → trunk View file →

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