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