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