← All changes | classes/controllers/FrmFormsController.php +439 -947 6.28 → 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	}
		@@ -66,12 +54,12 @@
66	54	*/
67	55	public static function logic_tip() {
68	56	$images_url = FrmAppHelper::plugin_url() . '/images/';
69	57	$data_message = __( 'Only show the fields you need and create branching forms. Upgrade to get conditional logic and question branching.', 'formidable' );
70		- $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
71		- 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">';
72	60	esc_html_e( 'Conditional Logic', 'formidable' );
73		- 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' ) );
74	62	echo '</a>';
75	63	}
76	64
77	65	/**
		@@ -78,15 +66,12 @@
78	66	* By default, Divi processes form shortcodes on the edit post page.
79	67	* Now that won't do.
80	68	*
81	69	* @since 3.01
82		- *
83		- * @param array $shortcodes List of shortcodes to process.
84		- *
85		- * @return array
86	70	*/
87	71	public static function prevent_divi_conflict( $shortcodes ) {
88	72	$shortcodes[] = 'formidable';
	73	+
89	74	return $shortcodes;
90	75	}
91	76
92	77	/**
		@@ -97,14 +82,12 @@
97	82
98	83	$message = '';
99	84	$params = FrmForm::list_page_params();
100	85	$errors = self::process_bulk_form_actions( array() );
101		-
102	86	if ( isset( $errors['message'] ) ) {
103	87	$message = $errors['message'];
104	88	unset( $errors['message'] );
105	89	}
106		-
107	90	$errors = apply_filters( 'frm_admin_list_form_action', $errors );
108	91
109	92	self::display_forms_list( $params, $message, $errors );
110	93	}
		@@ -113,30 +96,18 @@
113	96	* Create the default email action
114	97	*
115	98	* @since 2.02.11
116	99	*
117		- * @param int|object $form
118		- *
119		- * @return void
	100	+ * @param object|int $form
120	101	*/
121	102	private static function create_default_email_action( $form ) {
122	103	FrmForm::maybe_get_form( $form );
123		-
124		- if ( ! is_object( $form ) ) {
125		- return;
126		- }
127		-
128	104	$create_email = apply_filters( 'frm_create_default_email_action', true, $form );
129	105
130		- if ( ! $create_email ) {
131		- return;
	106	+ if ( $create_email ) {
	107	+ $action_control = FrmFormActionsController::get_form_actions( 'email' );
	108	+ $action_control->create( $form->id );
132	109	}
133		-
134		- /**
135		- * @var FrmFormAction
136		- */
137		- $action_control = FrmFormActionsController::get_form_actions( 'email' );
138		- $action_control->create( $form->id );
139	110	}
140	111
141	112	/**
142	113	* Create the default On submit action
		@@ -142,19 +113,13 @@
142	113	* Create the default On submit action
143	114	*
144	115	* @since 6.0.0
145	116	*
146		- * @param int|object $form Form object or ID.
147		- *
148		- * @return void
	117	+ * @param object|int $form Form object or ID.
149	118	*/
150	119	private static function create_default_on_submit_action( $form ) {
151	120	FrmForm::maybe_get_form( $form );
152	121
153		- if ( ! is_object( $form ) ) {
154		- return;
155		- }
156		-
157	122	/**
158	123	* Enable or disable the default On Submit action.
159	124	*
160	125	* @since 6.0.0
		@@ -163,73 +128,22 @@
163	128	* @param object $form Form object.
164	129	*/
165	130	$create = apply_filters( 'frm_create_default_on_submit_action', true, $form );
166	131
167		- if ( ! $create ) {
168		- return;
	132	+ if ( $create ) {
	133	+ $action_control = FrmFormActionsController::get_form_actions( FrmOnSubmitAction::$slug );
	134	+ $action_control->create( $form->id );
169	135	}
170		-
171		- /**
172		- * @var FrmFormAction
173		- */
174		- $action_control = FrmFormActionsController::get_form_actions( FrmOnSubmitAction::$slug );
175		- $action_control->create( $form->id );
176	136	}
177	137
178		- /**
179		- * Creates submit button field.
180		- *
181		- * @since 6.9
182		- *
183		- * @param int|object $form Form ID or object.
184		- *
185		- * @return void
186		- */
187		- private static function create_submit_button_field( $form ) {
188		- FrmForm::maybe_get_form( $form );
189		-
190		- if ( ! is_object( $form ) ) {
191		- return;
192		- }
193		-
194		- if ( FrmSubmitHelper::get_submit_field( $form->id ) ) {
195		- // Do not create submit button field if it exists.
196		- return;
197		- }
198		-
199		- FrmField::create(
200		- array(
201		- 'type' => FrmSubmitHelper::FIELD_TYPE,
202		- 'name' => __( 'Submit', 'formidable' ),
203		- 'field_order' => FrmSubmitHelper::DEFAULT_ORDER,
204		- 'form_id' => $form->id,
205		- 'field_options' => FrmFieldsHelper::get_default_field_options( FrmSubmitHelper::FIELD_TYPE ),
206		- 'description' => '',
207		- 'default_value' => '',
208		- 'options' => array(),
209		- )
210		- );
211		- }
212		-
213		- /**
214		- * @param array|false $values
215		- *
216		- * @return void
217		- */
218	138	public static function edit( $values = false ) {
219	139	FrmAppHelper::permission_check( 'frm_edit_forms' );
220	140
221	141	$id = isset( $values['id'] ) ? absint( $values['id'] ) : FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
222	142
223		- self::get_edit_vars( $id );
	143	+ return self::get_edit_vars( $id );
224	144	}
225	145
226		- /**
227		- * @param mixed $id
228		- * @param string $message
229		- *
230		- * @return void
231		- */
232	146	public static function settings( $id = false, $message = '' ) {
233	147	FrmAppHelper::permission_check( 'frm_edit_forms' );
234	148
235	149	if ( ! $id || ! is_numeric( $id ) ) {
		@@ -237,9 +151,9 @@
237	151	}
238	152
239	153	FrmOnSubmitHelper::maybe_migrate_submit_settings_to_action( $id );
240	154
241		- self::get_settings_vars( $id, array(), $message );
	155	+ return self::get_settings_vars( $id, array(), $message );
242	156	}
243	157
244	158	public static function update_settings() {
245	159	FrmAppHelper::permission_check( 'frm_edit_forms' );
		@@ -246,9 +160,9 @@
246	160	$process_form = FrmAppHelper::get_post_param( 'process_form', '', 'sanitize_text_field' );
247	161
248	162	if ( ! wp_verify_nonce( $process_form, 'process_form_nonce' ) ) {
249	163	$frm_settings = FrmAppHelper::get_settings();
250		- $error_args = array(
	164	+ $error_args = array(
251	165	'title' => __( 'Verification failed', 'formidable' ),
252	166	'body' => $frm_settings->admin_permission,
253	167	'cancel_text' => __( 'Cancel', 'formidable' ),
254	168	);
		@@ -255,15 +169,15 @@
255	169	FrmAppController::show_error_modal( $error_args );
256	170	return;
257	171	}
258	172
259		- $id = FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
260		- $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
261	176	$warnings = FrmFormsHelper::check_for_warnings( $_POST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
262	177
263	178	if ( count( $errors ) > 0 ) {
264		- self::get_settings_vars( $id, $errors, compact( 'warnings' ) );
265		- return;
	179	+ return self::get_settings_vars( $id, $errors, compact( 'warnings' ) );
266	180	}
267	181
268	182	do_action( 'frm_before_update_form_settings', $id );
269	183
		@@ -271,9 +185,8 @@
271	185
272	186	FrmForm::update( $id, $_POST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
273	187
274	188	$antispam_is_on = ! empty( $_POST['options']['antispam'] ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
275		-
276	189	if ( $antispam_is_on !== $antispam_was_on ) {
277	190	FrmAntiSpam::clear_caches();
278	191	}
279	192
		@@ -278,14 +191,13 @@
278	191	}
279	192
280	193	$message = __( 'Settings Successfully Updated', 'formidable' );
281	194
282		- self::get_settings_vars( $id, array(), compact( 'message', 'warnings' ) );
	195	+ return self::get_settings_vars( $id, array(), compact( 'message', 'warnings' ) );
283	196	}
284	197
285	198	/**
286	199	* @param int $form_id
287		- *
288	200	* @return bool
289	201	*/
290	202	private static function antispam_was_on( $form_id ) {
291	203	$form = FrmForm::getOne( $form_id );
		@@ -291,15 +203,10 @@
291	203	$form = FrmForm::getOne( $form_id );
292	204	return ! empty( $form->options['antispam'] );
293	205	}
294	206
295		- /**
296		- * @param array $values
297		- *
298		- * @return void
299		- */
300	207	public static function update( $values = array() ) {
301		- if ( ! $values ) {
	208	+ if ( empty( $values ) ) {
302	209	$values = $_POST; // phpcs:ignore WordPress.Security.NonceVerification.Missing
303	210	}
304	211
305	212	// Set radio button and checkbox meta equal to "other" value.
		@@ -308,9 +215,8 @@
308	215	}
309	216
310	217	$errors = FrmForm::validate( $values );
311	218	$permission_error = FrmAppHelper::permission_nonce_error( 'frm_edit_forms', 'frm_save_form', 'frm_save_form_nonce' );
312		-
313	219	if ( $permission_error !== false ) {
314	220	$errors['form'] = $permission_error;
315	221	}
316	222
		@@ -316,58 +222,42 @@
316	222
317	223	$id = isset( $values['id'] ) ? absint( $values['id'] ) : FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
318	224
319	225	if ( count( $errors ) > 0 ) {
320		- self::get_edit_vars( $id, $errors );
321		- return;
322		- }
	226	+ return self::get_edit_vars( $id, $errors );
	227	+ } else {
	228	+ self::maybe_remove_draft_option_from_fields( $id );
323	229
324		- self::maybe_remove_draft_option_from_fields( $id );
	230	+ FrmForm::update( $id, $values );
	231	+ $message = __( 'Form was successfully updated.', 'formidable' );
325	232
326		- FrmForm::update( $id, $values );
327		- $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	+ }
328	241
329		- if ( self::is_too_long( $values ) ) {
330		- $message .= '<br/> ' . sprintf(
331		- /* translators: %1$s: Start link HTML, %2$s: end link HTML */
332		- __( 'However, your form is very long and may be %1$sreaching server limits%2$s.', 'formidable' ),
333		- '<a href="' . esc_url( self::get_form_too_long_docs_url() ) . '" target="_blank" rel="noopener">',
334		- '</a>'
335		- );
336		- }
	242	+ if ( defined( 'DOING_AJAX' ) ) {
	243	+ wp_die( FrmAppHelper::kses( $message, array( 'a' ) ) ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
	244	+ }
337	245
338		- if ( defined( 'DOING_AJAX' ) ) {
339		- wp_die( FrmAppHelper::kses( $message, array( 'a' ) ) ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
340		- }
341		-
342		- self::get_edit_vars( $id, array(), $message );
	246	+ return self::get_edit_vars( $id, array(), $message );
	247	+ }//end if
343	248	}
344	249
345	250	/**
346		- * @since 6.25.1
347		- *
348		- * @return string
349		- */
350		- private static function get_form_too_long_docs_url() {
351		- $utm = array(
352		- 'campaign' => 'builder',
353		- 'content' => 'form-too-long',
354		- );
355		- return FrmAppHelper::admin_upgrade_link( $utm, 'knowledgebase/i-have-a-long-form-why-did-the-options-at-the-end-of-the-form-stop-saving/' );
356		- }
357		-
358		- /**
359	251	* Remove the draft flag from any new fields from this current session.
360	252	*
361	253	* @since 6.8
362	254	*
363	255	* @param int $form_id
364		- *
365	256	* @return void
366	257	*/
367	258	private static function maybe_remove_draft_option_from_fields( $form_id ) {
368	259	$draft_field_ids_csv = FrmAppHelper::get_post_param( 'draft_fields', '', 'sanitize_text_field' );
369		-
370	260	if ( ! $draft_field_ids_csv ) {
371	261	// If the draft_fields input is empty there are no new fields in the session.
372	262	return;
373	263	}
		@@ -372,9 +262,8 @@
372	262	return;
373	263	}
374	264
375	265	$draft_field_ids = array_filter( explode( ',', $draft_field_ids_csv ), 'is_numeric' );
376		-
377	266	if ( ! $draft_field_ids ) {
378	267	// Exit early if the draft fields input is invalid. It should be a CSV of integer values.
379	268	return;
380	269	}
		@@ -379,9 +268,8 @@
379	268	return;
380	269	}
381	270
382	271	$draft_field_rows = FrmFieldsHelper::get_draft_field_results( $form_id, $draft_field_ids );
383		-
384	272	foreach ( $draft_field_rows as $row ) {
385	273	$row->field_options['draft'] = 0;
386	274	FrmField::update( $row->id, array( 'field_options' => $row->field_options ) );
387	275	}
		@@ -392,15 +280,35 @@
392	280	* If it's missing, it means other values at the end of the form
393	281	* were likely not saved either.
394	282	*
395	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
396	292	*
397		- * @param array $values
398		- *
399		- * @return bool
	293	+ * @since 2.0
	294	+ * @deprecated 3.06
400	295	*/
401		- private static function is_too_long( $values ) {
402		- 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();
403	311	}
404	312
405	313	public static function duplicate() {
406	314	FrmAppHelper::permission_check( 'frm_edit_forms' );
		@@ -417,10 +325,10 @@
417	325	$message = 'form_duplicate_error';
418	326
419	327	if ( $form ) {
420	328	$new_template = FrmAppHelper::simple_get( 'new_template' ) ? '&new_template=true' : '';
421		- $url = admin_url( 'admin.php?page=formidable&frm_action=edit&id=' . absint( $form ) . $new_template );
422		- $message = 'form_duplicated';
	329	+ $url = admin_url( 'admin.php?page=formidable&frm_action=edit&id=' . absint( $form ) . $new_template );
	330	+ $message = 'form_duplicated';
423	331	}
424	332
425	333	$url .= '&message=' . $message;
426	334
		@@ -428,26 +336,20 @@
428	336	exit();
429	337	}
430	338
431	339	/**
432		- * @return string|null
	340	+ * @return string
433	341	*/
434	342	public static function page_preview() {
435	343	$params = FrmForm::list_page_params();
436		-
437		- if ( ! $params['form'] || is_numeric( $params['form'] ) ) {
438		- return null;
	344	+ if ( ! $params['form'] ) {
	345	+ return;
439	346	}
440	347
441		- self::maybe_block_preview( $params['form'] );
442		-
443	348	$form = FrmForm::getOne( $params['form'] );
444		-
445		- if ( ! $form ) {
446		- return null;
	349	+ if ( $form ) {
	350	+ return self::show_form( $form->id, '', 'auto', 'auto' );
447	351	}
448		-
449		- return self::show_form( $form->id, '', 'auto', 'auto' );
450	352	}
451	353
452	354	/**
453	355	* @since 3.0
		@@ -454,19 +356,9 @@
454	356	*
455	357	* @return void
456	358	*/
457	359	public static function show_page_preview() {
458		- $preview = self::page_preview();
459		-
460		- if ( is_null( $preview ) ) {
461		- wp_die(
462		- '<h1>' . esc_html__( 'Form key is invalid', 'formidable' ) . '</h1>',
463		- '<p>' . esc_html__( 'Form key is invalid', 'formidable' ) . '</p>',
464		- 404
465		- );
466		- }
467		-
468		- echo $preview; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
	360	+ echo self::page_preview(); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
469	361	}
470	362
471	363	/**
472	364	* @return void
		@@ -477,19 +369,9 @@
477	369
478	370	global $frm_vars;
479	371	$frm_vars['preview'] = true;
480	372
481		- // print_emoji_styles is deprecated.
482		- remove_action( 'wp_print_styles', 'print_emoji_styles' );
483		-
484		- if ( FrmTestModeController::should_add_test_mode_container() ) {
485		- do_action( 'frm_test_mode_init' );
486		- add_action( 'wp_enqueue_scripts', 'FrmTestModeController::register_and_enqueue_required_scripts' );
487		- add_filter( 'frm_filter_final_form', 'FrmTestModeController::maybe_add_test_mode_container', 99 );
488		- }
489		-
490	373	$include_theme = FrmAppHelper::get_param( 'theme', '', 'get', 'absint' );
491		-
492	374	if ( $include_theme ) {
493	375	self::set_preview_query();
494	376	self::load_theme_preview();
495	377	} else {
		@@ -512,9 +394,8 @@
512	394	'post_type' => 'page',
513	395	);
514	396
515	397	$page_for_posts = get_option( 'page_for_posts' );
516		-
517	398	if ( is_numeric( $page_for_posts ) ) {
518	399	// Avoid querying for the "Posts Page" or "Blog Page" so we don't display 10 forms.
519	400	$page_query['post__not_in'] = array( $page_for_posts );
520	401	}
		@@ -519,15 +400,13 @@
519	400	$page_query['post__not_in'] = array( $page_for_posts );
520	401	}
521	402
522	403	$random_page = get_posts( $page_query );
523		-
524	404	if ( ! $random_page ) {
525	405	return;
526	406	}
527	407
528	408	$random_page = reset( $random_page );
529		-
530	409	if ( ! is_a( $random_page, 'WP_Post' ) ) {
531	410	// The return type can also be int.
532	411	return;
533	412	}
		@@ -549,9 +428,8 @@
549	428	*
550	429	* @since 5.5.2
551	430	*
552	431	* @param WP_Post $page The page object.
553		- *
554	432	* @return void
555	433	*/
556	434	private static function set_post_global( $page ) {
557	435	global $post;
		@@ -559,10 +437,8 @@
559	437	}
560	438
561	439	/**
562	440	* @since 3.0
563		- *
564		- * @return void
565	441	*/
566	442	private static function load_theme_preview() {
567	443	add_filter( 'wp_title', 'FrmFormsController::preview_title', 9999 );
568	444	add_filter( 'the_title', 'FrmFormsController::preview_page_title', 9999 );
		@@ -570,16 +446,14 @@
570	446	add_action( 'loop_no_results', 'FrmFormsController::show_page_preview' );
571	447	add_filter( 'is_active_sidebar', '__return_false' );
572	448	FrmStylesController::enqueue_css( 'enqueue', true );
573	449
574		- if ( false !== get_template_part( 'page' ) ) {
575		- 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();
576	455	}
577		-
578		- if ( function_exists( 'wp_is_block_theme' ) && wp_is_block_theme() ) {
579		- add_filter( 'body_class', 'FrmFormsController::preview_block_theme_body_classnames' );
580		- }
581		- self::fallback_when_page_template_part_is_not_supported_by_theme();
582	456	}
583	457
584	458	/**
585	459	* Add padding to the body for block themes.
		@@ -586,9 +460,8 @@
586	460	*
587	461	* @since 6.5.2
588	462	*
589	463	* @param array $classes The body classes list.
590		- *
591	464	* @return array
592	465	*/
593	466	public static function preview_block_theme_body_classnames( $classes ) {
594	467	$classes[] = 'has-global-padding';
		@@ -597,41 +470,31 @@
597	470
598	471	/**
599	472	* Not every theme supports get_template_part( 'page' ).
600	473	* When this is not supported, false is returned, and we can handle a fallback.
601		- *
602		- * @return void
603	474	*/
604	475	private static function fallback_when_page_template_part_is_not_supported_by_theme() {
605		- if ( ! have_posts() ) {
606		- return;
607		- }
	476	+ if ( have_posts() ) {
	477	+ the_post();
	478	+ self::get_template( 'header' );
608	479
609		- the_post();
610		- 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>';
611	486
612		- // Add some generic class names to the container to add some natural padding to the content.
613		- // .entry-content catches the WordPress TwentyTwenty theme.
614		- // .container catches Customizr content.
615		- echo '<div class="container entry-content">';
616		- the_content();
617		- echo '</div>';
618		-
619		- // Prevent extra unexpected forms in the footer.
620		- // For some reason this happens in the Twenty Twenty Five theme.
621		- add_filter( 'frm_filter_final_form', '__return_empty_string' );
622		-
623		- self::get_template( 'footer' );
	487	+ self::get_template( 'footer' );
	488	+ }
624	489	}
625	490
626	491	/**
627	492	* Calls core function to get a template part if it doesn't cause deprecation warnings. Otherwise skips the deprecation function call
628		- * and renders required html fragments calling required functions.
	493	+ * and renders required html fragements calling required functions.
629	494	*
630	495	* @since 6.7.1
631		- *
632	496	* @param string $template
633		- *
634	497	* @return void
635	498	*/
636	499	private static function get_template( $template ) {
637	500	if ( self::should_try_getting_template( $template ) ) {
		@@ -652,11 +515,9 @@
652	515	/**
653	516	* Returns true if calling a template function doesn't trigger deprecation warnings.
654	517	*
655	518	* @since 6.7.1
656		- *
657	519	* @param string $template
658		- *
659	520	* @return bool
660	521	*/
661	522	private static function should_try_getting_template( $template ) {
662	523	$stylesheet_path = get_stylesheet_directory();
		@@ -670,25 +531,21 @@
670	531	/**
671	532	* Set the page title for the theme preview page
672	533	*
673	534	* @since 3.0
674		- *
675		- * @param string $title
676		- *
677		- * @return string
678	535	*/
679	536	public static function preview_page_title( $title ) {
680		- 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;
681	542	}
682	543
683	544	/**
684		- * Set the page title for the theme preview page.
	545	+ * Set the page title for the theme preview page
685	546	*
686	547	* @since 3.0
687		- *
688		- * @param string $title
689		- *
690		- * @return string
691	548	*/
692	549	public static function preview_title( $title ) {
693	550	return __( 'Form Preview', 'formidable' );
694	551	}
		@@ -698,9 +555,8 @@
698	555	*
699	556	* @since 3.0
700	557	*
701	558	* @param string $content
702		- *
703	559	* @return string
704	560	*/
705	561	public static function preview_content( $content ) {
706	562	if ( in_the_loop() ) {
		@@ -715,90 +571,23 @@
715	571	/**
716	572	* @since 3.0
717	573	*/
718	574	private static function load_direct_preview() {
	575	+ header( 'Content-Type: text/html; charset=' . get_option( 'blog_charset' ) );
	576	+
719	577	$key = FrmAppHelper::simple_get( 'form', 'sanitize_title' );
720		-
721		- // phpcs:ignore Universal.Operators.StrictComparisons
722	578	if ( $key == '' ) {
723	579	$key = FrmAppHelper::get_post_param( 'form', '', 'sanitize_title' );
724	580	}
725	581
726		- if ( ! $key ) {
727		- $error = __( 'Form key is missing', 'formidable' );
728		- wp_die(
729		- '<h1>' . esc_html( $error ) . '</h1>',
730		- '<p>' . esc_html( $error ) . '</p>',
731		- 404
732		- );
733		- }
734		-
735		- self::maybe_block_preview( $key );
736		-
737	582	$form = FrmForm::getAll( array( 'form_key' => $key ), '', 1 );
738		-
739		- if ( ! $form ) {
740		- $error = __( 'Form does not exist', 'formidable' );
741		- wp_die(
742		- '<h1>' . esc_html( $error ) . '</h1>',
743		- '<p>' . esc_html( $error ) . '</p>',
744		- 404
745		- );
	583	+ if ( empty( $form ) ) {
	584	+ $form = FrmForm::getAll( array(), '', 1 );
746	585	}
747	586
748		- header( 'Content-Type: text/html; charset=' . get_option( 'blog_charset' ) );
749		-
750		- self::fix_deprecated_null_param_warning();
751		-
752		- require FrmAppHelper::plugin_path() . '/classes/views/frm-entries/direct.php';
	587	+ require( FrmAppHelper::plugin_path() . '/classes/views/frm-entries/direct.php' );
753	588	}
754	589
755		- /**
756		- * Block the form preview for the contact form by default if the user cannot view forms.
757		- * This is to prevent the contact form being exploited.
758		- * Since this form is added by default and every site uses the same key, it is too easy
759		- * to guess this form.
760		- *
761		- * @since 6.20
762		- *
763		- * @param string $form_key Form key.
764		- *
765		- * @return void
766		- */
767		- public static function maybe_block_preview( $form_key ) {
768		- if ( FrmFormsHelper::should_block_preview( $form_key ) ) {
769		- $error = __( 'You do not have permission to view this form', 'formidable' );
770		- wp_die(
771		- '<h1>' . esc_html( $error ) . '</h1>',
772		- '<p>' . esc_html( $error ) . '</p>',
773		- 403
774		- );
775		- }
776		- }
777		-
778		- /**
779		- * Some themes have a null $src value.
780		- * This function adds a filter to ensure that $src is not null.
781		- * WP will call str_starts_with with the null value triggering a deprecated message otherwise.
782		- *
783		- * @since 6.10
784		- *
785		- * @return void
786		- */
787		- private static function fix_deprecated_null_param_warning() {
788		- add_filter(
789		- 'script_loader_src',
790		- /**
791		- * @param string|null $src
792		- *
793		- * @return string
794		- */
795		- function ( $src ) {
796		- return is_null( $src ) ? '' : $src;
797		- }
798		- );
799		- }
800		-
801	590	public static function untrash() {
802	591	self::change_form_status( 'untrash' );
803	592	}
804	593
		@@ -803,9 +592,8 @@
803	592	}
804	593
805	594	/**
806	595	* @param array $ids
807		- *
808	596	* @return string
809	597	*/
810	598	public static function bulk_untrash( $ids ) {
811	599	FrmAppHelper::permission_check( 'frm_edit_forms' );
		@@ -817,9 +605,11 @@
817	605	return '';
818	606	}
819	607
820	608	/* translators: %1$s: Number of forms */
821		- 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;
822	612	}
823	613
824	614	/**
825	615	* @since 3.06
		@@ -864,11 +654,10 @@
864	654	// Check nonce url.
865	655	check_admin_referer( $status . '_form_' . $params['id'] );
866	656
867	657	$count = 0;
868		-
869	658	if ( FrmForm::set_status( $params['id'], $available_status[ $status ]['new_status'] ) ) {
870		- ++$count;
	659	+ $count ++;
871	660	}
872	661
873	662	$form_type = FrmAppHelper::get_simple_request(
874	663	array(
		@@ -880,9 +669,9 @@
880	669	/* translators: %1$s: Number of forms */
881	670	$available_status['untrash']['message'] = sprintf( _n( '%1$s form restored from the Trash.', '%1$s forms restored from the Trash.', $count, 'formidable' ), $count );
882	671
883	672	/* translators: %1$s: Number of forms, %2$s: Start link HTML, %3$s: End link HTML */
884		- $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>' );
885	674
886	675	$message = $available_status[ $status ]['message'];
887	676
888	677	self::display_forms_list( $params, $message );
		@@ -887,28 +676,18 @@
887	676
888	677	self::display_forms_list( $params, $message );
889	678	}
890	679
891		- /**
892		- * @param array $ids
893		- *
894		- * @return string
895		- */
896	680	public static function bulk_trash( $ids ) {
897	681	FrmAppHelper::permission_check( 'frm_delete_forms' );
898	682
899	683	$count = 0;
900		-
901	684	foreach ( $ids as $id ) {
902	685	if ( FrmForm::trash( $id ) ) {
903		- ++$count;
	686	+ $count ++;
904	687	}
905	688	}
906	689
907		- if ( ! $count ) {
908		- return '';
909		- }
910		-
911	690	$current_page = FrmAppHelper::get_simple_request(
912	691	array(
913	692	'param' => 'form_type',
914	693	'type' => 'request',
		@@ -913,16 +692,17 @@
913	692	'param' => 'form_type',
914	693	'type' => 'request',
915	694	)
916	695	);
917		-
918		- return sprintf(
	696	+ $message = sprintf(
919	697	/* translators: %1$s: Number of forms, %2$s: Start link HTML, %3$s: End link HTML */
920	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' ),
921	699	$count,
922		- '<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' ) ) . '">',
923	701	'</a>'
924	702	);
	703	+
	704	+ return $message;
925	705	}
926	706
927	707	public static function destroy() {
928	708	FrmAppHelper::permission_check( 'frm_delete_forms' );
		@@ -932,11 +712,10 @@
932	712	// Check nonce url.
933	713	check_admin_referer( 'destroy_form_' . $params['id'] );
934	714
935	715	$count = 0;
936		-
937	716	if ( FrmForm::destroy( $params['id'] ) ) {
938		- ++$count;
	717	+ $count ++;
939	718	}
940	719
941	720	/* translators: %1$s: Number of forms */
942	721	$message = sprintf( _n( '%1$s Form Permanently Deleted', '%1$s Forms Permanently Deleted', $count, 'formidable' ), $count );
		@@ -943,23 +722,16 @@
943	722
944	723	self::display_forms_list( $params, $message );
945	724	}
946	725
947		- /**
948		- * @param array $ids
949		- *
950		- * @return string
951		- */
952	726	public static function bulk_destroy( $ids ) {
953	727	FrmAppHelper::permission_check( 'frm_delete_forms' );
954	728
955	729	$count = 0;
956		-
957	730	foreach ( $ids as $id ) {
958	731	$d = FrmForm::destroy( $id );
959		-
960	732	if ( $d ) {
961		- ++$count;
	733	+ $count ++;
962	734	}
963	735	}
964	736
965	737	if ( $count ) {
		@@ -975,16 +747,17 @@
975	747	*/
976	748	public static function delete_all() {
977	749	// Check nonce url.
978	750	$permission_error = FrmAppHelper::permission_nonce_error( 'frm_delete_forms', '_wpnonce', 'bulk-toplevel_page_formidable' );
979		-
980	751	if ( $permission_error !== false ) {
981	752	self::display_forms_list( array(), '', array( $permission_error ) );
	753	+
982	754	return;
983	755	}
984	756
985	757	$count = FrmForm::scheduled_delete( time() );
986	758	$url = remove_query_arg( array( 'delete_all' ) );
	759	+
987	760	$url .= '&message=forms_permanently_deleted&forms_deleted=' . $count;
988	761
989	762	wp_safe_redirect( $url );
990	763	die();
		@@ -1001,9 +774,9 @@
1001	774
1002	775	$new_values = self::get_modal_values();
1003	776	$new_values['form_key'] = $new_values['name'];
1004	777	$new_values['options'] = array(
1005		- 'antispam' => 1,
	778	+ 'antispam' => 1,
1006	779	'on_submit_migrated' => 1,
1007	780	);
1008	781
1009	782	/**
		@@ -1022,9 +795,8 @@
1022	795	* @param int $form_id
1023	796	*/
1024	797	do_action( 'frm_build_new_form', $form_id );
1025	798
1026		- self::create_submit_button_field( $form_id );
1027	799	self::create_default_on_submit_action( $form_id );
1028	800	self::create_default_email_action( $form_id );
1029	801
1030	802	$response = array(
		@@ -1038,10 +810,8 @@
1038	810	/**
1039	811	* Before creating a new form, get the name and description from the modal.
1040	812	*
1041	813	* @since 4.0
1042		- *
1043		- * @return array<string,string>
1044	814	*/
1045	815	public static function get_modal_values() {
1046	816	$name = FrmAppHelper::get_param( 'name', '', 'post', 'sanitize_text_field' );
1047	817	$desc = FrmAppHelper::get_param( 'desc', '', 'post', 'sanitize_textarea_field' );
		@@ -1056,27 +826,18 @@
1056	826	* Inserts Formidable button
1057	827	* Hook exists since 2.5.0
1058	828	*
1059	829	* @since 2.0.15
1060		- *
1061		- * @return void
1062	830	*/
1063	831	public static function insert_form_button() {
1064		- if ( ! current_user_can( 'frm_view_forms' ) ) {
1065		- return;
1066		- }
1067		-
1068		- // Store the result in memory and re-use it when this function is called multiple times.
1069		- // This helps speed up the form builder when there are a lot of HTML fields, where this
1070		- // Button is inserted once per HTML field.
1071		- // In a form with 66 HTML fields, this saves 0.5 seconds on page load time, tested locally.
1072		- if ( ! isset( self::$formidable_tinymce_button ) ) {
	832	+ if ( current_user_can( 'frm_view_forms' ) ) {
1073	833	FrmAppHelper::load_admin_wide_js();
1074		- $menu_name = FrmAppHelper::get_menu_name();
1075		- $icon = apply_filters( 'frm_media_icon', FrmAppHelper::svg_logo() );
1076		- 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( $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>';
1077	839	}
1078		- echo self::$formidable_tinymce_button; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
1079	840	}
1080	841
1081	842	/**
1082	843	* @return void
		@@ -1097,21 +858,17 @@
1097	858	$shortcodes = apply_filters( 'frm_popup_shortcodes', $shortcodes );
1098	859
1099	860	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/insert_form_popup.php';
1100	861
1101		- if ( ! FrmAppHelper::is_form_builder_page() || class_exists( '_WP_Editors', false ) ) {
1102		- 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
1103	870	}
1104		-
1105		- // Initialize a wysiwyg so we have usable settings defined in tinyMCEPreInit.mceInit
1106		- require ABSPATH . WPINC . '/class-wp-editor.php';
1107		- // phpcs:disable Generic.WhiteSpace.ScopeIndent
1108		- ?>
1109		- <div class="frm_hidden">
1110		- <?php wp_editor( '', 'frm_description_placeholder', array() ); ?>
1111		- </div>
1112		- <?php
1113		- // phpcs:enable Generic.WhiteSpace.ScopeIndent
1114	871	}
1115	872
1116	873	/**
1117	874	* Check the page being loaded, determine if this is a page that should include the form popup.
		@@ -1123,9 +880,8 @@
1123	880	private static function should_insert_form_popup() {
1124	881	if ( FrmAppHelper::is_form_builder_page() ) {
1125	882	return true;
1126	883	}
1127		-
1128	884	$page = basename( FrmAppHelper::get_server_value( 'PHP_SELF' ) );
1129	885	return in_array( $page, array( 'post.php', 'page.php', 'page-new.php', 'post-new.php' ), true );
1130	886	}
1131	887
		@@ -1133,10 +889,9 @@
1133	889	FrmAppHelper::permission_check( 'frm_view_forms' );
1134	890	check_ajax_referer( 'frm_ajax', 'nonce' );
1135	891
1136	892	$shortcode = FrmAppHelper::get_post_param( 'shortcode', '', 'sanitize_text_field' );
1137		-
1138		- if ( ! $shortcode ) {
	893	+ if ( empty( $shortcode ) ) {
1139	894	wp_die();
1140	895	}
1141	896
1142	897	echo '<div id="sc-opts-' . esc_attr( $shortcode ) . '" class="frm_shortcode_option">';
		@@ -1161,18 +916,17 @@
1161	916	'label' => __( 'Minimize form HTML', 'formidable' ),
1162	917	),
1163	918	);
1164	919	}
1165		-
1166	920	$opts = apply_filters( 'frm_sc_popup_opts', $opts, $shortcode );
1167	921
1168	922	if ( isset( $opts['form_id'] ) && is_string( $opts['form_id'] ) ) {
1169		- // Allow other shortcodes to use the required form id option
	923	+ // allow other shortcodes to use the required form id option
1170	924	$form_id = $opts['form_id'];
1171	925	unset( $opts['form_id'] );
1172	926	}
1173	927
1174		- include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/shortcode_opts.php';
	928	+ include( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/shortcode_opts.php' );
1175	929
1176	930	echo '</div>';
1177	931
1178	932	wp_die();
		@@ -1183,9 +937,8 @@
1183	937	*
1184	938	* @param array $params
1185	939	* @param string $message
1186	940	* @param array $errors
1187		- *
1188	941	* @return void
1189	942	*/
1190	943	public static function display_forms_list( $params = array(), $message = '', $errors = array() ) {
1191	944	FrmAppHelper::permission_check( 'frm_view_forms' );
		@@ -1202,44 +955,33 @@
1202	955	* @param string $table_class Class name for List Helper.
1203	956	*/
1204	957	$table_class = apply_filters( 'frm_forms_list_class', 'FrmFormsListHelper' );
1205	958	$wp_list_table = new $table_class( compact( 'params' ) );
1206		- $pagenum = $wp_list_table->get_pagenum();
1207	959
	960	+ $pagenum = $wp_list_table->get_pagenum();
	961	+
1208	962	$wp_list_table->prepare_items();
1209	963
1210	964	$total_pages = $wp_list_table->get_pagination_arg( 'total_pages' );
1211		-
1212	965	if ( $pagenum > $total_pages && $total_pages > 0 ) {
1213		- wp_safe_redirect( esc_url_raw( add_query_arg( 'paged', $total_pages ) ) );
	966	+ wp_redirect( esc_url_raw( add_query_arg( 'paged', $total_pages ) ) );
1214	967	die();
1215	968	}
1216	969
1217		- $error = FrmInbox::check_for_error();
1218		-
1219		- if ( $error ) {
1220		- $show_messages = array( $error['subject'] . '. ' . $error['message'] );
1221		- }
1222		-
1223	970	require FrmAppHelper::plugin_path() . '/classes/views/frm-forms/list.php';
1224	971	}
1225	972
1226	973	/**
1227	974	* @param array<string,string> $columns
1228		- *
1229	975	* @return array<string,string>
1230	976	*/
1231	977	public static function get_columns( $columns ) {
1232		- $columns['cb'] = '<input type="checkbox" />';
1233		- $columns['name'] = esc_html__( 'Form Title', 'formidable' );
1234		- $columns['entries'] = esc_html__( 'Entries', 'formidable' );
1235		- $columns['id'] = 'ID';
1236		- $columns['form_key'] = esc_html__( 'Key', 'formidable' );
1237		-
1238		- if ( 'trash' !== FrmAppHelper::simple_get( 'form_type' ) ) {
1239		- $columns['shortcode'] = esc_html__( 'Actions', 'formidable' );
1240		- }
1241		-
	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' );
1242	984	$columns['created_at'] = esc_html__( 'Date', 'formidable' );
1243	985
1244	986	add_screen_option(
1245	987	'per_page',
		@@ -1252,11 +994,8 @@
1252	994
1253	995	return $columns;
1254	996	}
1255	997
1256		- /**
1257		- * @return array<string,string>
1258		- */
1259	998	public static function get_sortable_columns() {
1260	999	return array(
1261	1000	'id' => 'id',
1262	1001	'name' => 'name',
		@@ -1267,9 +1006,8 @@
1267	1006	}
1268	1007
1269	1008	/**
1270	1009	* @param mixed $hidden_columns
1271		- *
1272	1010	* @return array
1273	1011	*/
1274	1012	public static function hidden_columns( $hidden_columns ) {
1275	1013	if ( ! is_array( $hidden_columns ) ) {
		@@ -1290,39 +1028,24 @@
1290	1028
1291	1029	return $hidden_columns;
1292	1030	}
1293	1031
1294		- /**
1295		- * @param mixed $save
1296		- * @param string $option
1297		- * @param int|string $value
1298		- *
1299		- * @return mixed
1300		- */
1301	1032	public static function save_per_page( $save, $option, $value ) {
1302		- if ( $option === 'formidable_page_formidable_per_page' ) {
1303		- return (int) $value;
	1033	+ if ( $option == 'formidable_page_formidable_per_page' ) {
	1034	+ $save = (int) $value;
1304	1035	}
1305	1036
1306	1037	return $save;
1307	1038	}
1308	1039
1309		- /**
1310		- * @param int|string $id
1311		- * @param array $errors
1312		- * @param string $message
1313		- * @param bool $create_link
1314		- *
1315		- * @return void
1316		- */
1317	1040	private static function get_edit_vars( $id, $errors = array(), $message = '', $create_link = false ) {
1318	1041	global $frm_vars;
1319	1042
1320		- $form = FrmForm::getOne( $id );
	1043	+ $form = FrmForm::getOne( $id );
1321	1044	$error_args = array(
1322		- 'title' => __( 'You can\'t edit the form', 'formidable' ),
1323		- 'body' => __( 'You are trying to edit a form that does not exist', 'formidable' ),
1324		- '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' ),
1325	1048	'continue_url' => add_query_arg(
1326	1049	array(
1327	1050	'page' => 'formidable',
1328	1051	)
		@@ -1327,9 +1050,8 @@
1327	1050	'page' => 'formidable',
1328	1051	)
1329	1052	),
1330	1053	);
1331		-
1332	1054	if ( ! $form ) {
1333	1055	FrmAppController::show_error_modal( $error_args );
1334	1056	return;
1335	1057	}
		@@ -1334,10 +1056,10 @@
1334	1056	return;
1335	1057	}
1336	1058
1337	1059	if ( 'trash' === $form->status ) {
1338		- $error_args['body'] = __( 'The form you\'re trying to edit is in trash. You must restore it first before you can make changes', 'formidable' );
1339		- $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(
1340	1062	array(
1341	1063	'page' => 'formidable',
1342	1064	'_wpnonce' => wp_create_nonce( 'untrash_form_' . $id ),
1343	1065	'form_type' => 'trash',
		@@ -1351,18 +1073,18 @@
1351	1073	}
1352	1074
1353	1075	if ( $form->parent_form_id ) {
1354	1076	/* translators: %1$s: Start link HTML, %2$s: End link HTML */
1355		- 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>' ) );
1356	1078	}
1357	1079
1358	1080	$frm_field_selection = FrmField::field_selection();
1359		- $fields = FrmField::get_all_for_form( $form->id );
1360	1081
	1082	+ $fields = FrmField::get_all_for_form( $form->id );
	1083	+
1361	1084	// Automatically add end section fields if they don't exist (2.0 migration).
1362	1085	$reset_fields = false;
1363	1086	FrmFormsHelper::auto_add_end_section_fields( $form, $fields, $reset_fields );
1364		- FrmSubmitHelper::maybe_create_submit_field( $form, $fields, $reset_fields );
1365	1087
1366	1088	if ( $reset_fields ) {
1367	1089	$fields = FrmField::get_all_for_form( $form->id, '', 'exclude' );
1368	1090	}
		@@ -1382,16 +1104,16 @@
1382	1104	*/
1383	1105	$values['fields'] = apply_filters( 'frm_fields_in_form_builder', $fields, compact( 'form' ) );
1384	1106
1385	1107	$edit_message = __( 'Form was successfully updated.', 'formidable' );
1386		-
1387		- if ( $form->is_template && $message === $edit_message ) {
	1108	+ if ( $form->is_template && $message == $edit_message ) {
1388	1109	$message = __( 'Template was successfully updated.', 'formidable' );
1389	1110	}
1390	1111
1391	1112	self::maybe_update_form_builder_message( $message );
1392	1113
1393		- $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'] );
1394	1116
1395	1117	if ( defined( 'DOING_AJAX' ) ) {
1396	1118	wp_die();
1397	1119	}
		@@ -1398,14 +1120,9 @@
1398	1120
1399	1121	require FrmAppHelper::plugin_path() . '/classes/views/frm-forms/edit.php';
1400	1122	}
1401	1123
1402		- /**
1403		- * @param array $fields
1404		- *
1405		- * @return array
1406		- */
1407		- public static function update_form_builder_fields( $fields ) {
	1124	+ public static function update_form_builder_fields( $fields, $form ) {
1408	1125	foreach ( $fields as $field ) {
1409	1126	$field->do_not_include_icons = true;
1410	1127	}
1411	1128	return $fields;
		@@ -1410,13 +1127,8 @@
1410	1127	}
1411	1128	return $fields;
1412	1129	}
1413	1130
1414		- /**
1415		- * @param string $message
1416		- *
1417		- * @return void
1418		- */
1419	1131	public static function maybe_update_form_builder_message( &$message ) {
1420	1132	if ( 'form_duplicated' === FrmAppHelper::simple_get( 'message' ) ) {
1421	1133	$message = __( 'Form was Successfully Copied', 'formidable' );
1422	1134	}
		@@ -1421,22 +1133,13 @@
1421	1133	$message = __( 'Form was Successfully Copied', 'formidable' );
1422	1134	}
1423	1135	}
1424	1136
1425		- /**
1426		- * @param int|string $id
1427		- * @param array $errors
1428		- * @param array|string $args
1429		- *
1430		- * @return void
1431		- */
1432	1137	public static function get_settings_vars( $id, $errors = array(), $args = array() ) {
1433	1138	FrmAppHelper::permission_check( 'frm_edit_forms' );
1434	1139
1435	1140	global $frm_vars;
1436	1141
1437		- self::maybe_print_media_templates();
1438		-
1439	1142	if ( ! is_array( $args ) ) {
1440	1143	// For reverse compatibility.
1441	1144	$args = array(
1442	1145	'message' => $args,
		@@ -1449,12 +1152,13 @@
1449	1152	);
1450	1153	$args = array_merge( $defaults, $args );
1451	1154	$message = $args['message'];
1452	1155	$warnings = $args['warnings'];
1453		- $form = FrmForm::getOne( $id );
1454		- $fields = FrmField::get_all_for_form( $id );
1455		- $values = FrmAppHelper::setup_edit_vars( $form, 'forms', $fields, true );
1456	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	+
1457	1161	/**
1458	1162	* Allows changing fields in the form settings.
1459	1163	*
1460	1164	* @since 5.0.04
		@@ -1468,42 +1172,17 @@
1468	1172
1469	1173	$sections = self::get_settings_tabs( $values );
1470	1174	$current = FrmAppHelper::simple_get( 't', 'sanitize_title', 'advanced_settings' );
1471	1175
1472		- require FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings.php';
	1176	+ require( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings.php' );
1473	1177	}
1474	1178
1475	1179	/**
1476		- * 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.
1477		- *
1478		- * @since 6.10
1479		- *
1480		- * @return void
1481		- */
1482		- private static function maybe_print_media_templates() {
1483		- if ( FrmAppHelper::pro_is_included() ) {
1484		- // This issue does not exist when Pro is active so exit early.
1485		- return;
1486		- }
1487		-
1488		- add_action(
1489		- 'wp_enqueue_editor',
1490		- function () {
1491		- wp_print_media_templates();
1492		- }
1493		- );
1494		- }
1495		-
1496		- /**
1497	1180	* @since 4.0
1498		- *
1499		- * @param array $atts
1500		- *
1501		- * @return void
1502	1181	*/
1503	1182	public static function form_publish_button( $atts ) {
1504	1183	$values = $atts['values'];
1505		- include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/_publish_box.php';
	1184	+ include( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/_publish_box.php' );
1506	1185	}
1507	1186
1508	1187	/**
1509	1188	* Get a list of all the settings tabs for the form settings page.
		@@ -1510,9 +1189,8 @@
1510	1189	*
1511	1190	* @since 4.0
1512	1191	*
1513	1192	* @param array $values
1514		- *
1515	1193	* @return array
1516	1194	*/
1517	1195	private static function get_settings_tabs( $values ) {
1518	1196	$sections = array(
		@@ -1518,20 +1196,20 @@
1518	1196	$sections = array(
1519	1197	'advanced' => array(
1520	1198	'name' => __( 'General', 'formidable' ),
1521	1199	'title' => __( 'General Form Settings', 'formidable' ),
1522		- 'function' => array( self::class, 'advanced_settings' ),
1523		- 'icon' => 'frmfont frm_settings_icon',
	1200	+ 'function' => array( __CLASS__, 'advanced_settings' ),
	1201	+ 'icon' => 'frm_icon_font frm_settings_icon',
1524	1202	),
1525	1203	'email' => array(
1526	1204	'name' => __( 'Actions & Notifications', 'formidable' ),
1527	1205	'function' => array( 'FrmFormActionsController', 'email_settings' ),
1528	1206	'id' => 'frm_notification_settings',
1529		- 'icon' => 'frmfont frm_mail_bulk_icon',
	1207	+ 'icon' => 'frm_icon_font frm_mail_bulk_icon',
1530	1208	),
1531	1209	'permissions' => array(
1532	1210	'name' => __( 'Form Permissions', 'formidable' ),
1533		- 'icon' => 'frmfont frm_lock_closed_icon',
	1211	+ 'icon' => 'frm_icon_font frm_lock_icon',
1534	1212	'html_class' => 'frm_show_upgrade_tab frm_noallow',
1535	1213	'data' => array(
1536	1214	'medium' => 'permissions',
1537	1215	'upgrade' => __( 'Form Permissions', 'formidable' ),
		@@ -1536,37 +1214,35 @@
1536	1214	'medium' => 'permissions',
1537	1215	'upgrade' => __( 'Form Permissions', 'formidable' ),
1538	1216	'message' => __( 'Allow editing, protect forms and files, limit entries, and save drafts. Upgrade to get form and entry permissions.', 'formidable' ),
1539	1217	'screenshot' => 'permissions.png',
1540		- 'learn-more' => FrmAppHelper::get_doc_url( 'general-form-settings/#kb-form-permissions', 'form-permissions-settings' ),
1541	1218	),
1542	1219	),
1543		- 'scheduling' => array(
	1220	+ 'scheduling' => array(
1544	1221	'name' => __( 'Form Scheduling', 'formidable' ),
1545		- 'icon' => 'frmfont frm_calendar_icon',
	1222	+ 'icon' => 'frm_icon_font frm_calendar_icon',
1546	1223	'html_class' => 'frm_show_upgrade_tab frm_noallow',
1547	1224	'data' => array(
1548	1225	'medium' => 'scheduling',
1549	1226	'upgrade' => __( 'Form scheduling settings', 'formidable' ),
1550	1227	'screenshot' => 'scheduling.png',
1551		- 'learn-more' => FrmAppHelper::get_doc_url( 'general-form-settings/#kb-form-scheduling', 'form-scheduling-settings' ),
1552	1228	),
1553	1229	),
1554	1230	'buttons' => array(
1555	1231	'name' => __( 'Buttons', 'formidable' ),
1556		- 'class' => self::class,
	1232	+ 'class' => __CLASS__,
1557	1233	'function' => 'buttons_settings',
1558		- 'icon' => 'frmfont frm_button_icon',
	1234	+ 'icon' => 'frm_icon_font frm_button_icon',
1559	1235	),
1560	1236	'landing' => array(
1561	1237	'name' => __( 'Form Landing Page', 'formidable' ),
1562		- 'icon' => 'frmfont frm_file_text_icon',
	1238	+ 'icon' => 'frm_icon_font frm_file_text_icon',
1563	1239	'html_class' => 'frm_show_upgrade_tab frm_noallow',
1564	1240	'data' => FrmAppHelper::get_landing_page_upgrade_data_params(),
1565	1241	),
1566	1242	'chat' => array(
1567	1243	'name' => __( 'Conversational Forms', 'formidable' ),
1568		- 'icon' => 'frmfont frm_chat_forms_icon',
	1244	+ 'icon' => 'frm_icon_font frm_chat_forms_icon',
1569	1245	'html_class' => 'frm_show_upgrade_tab frm_noallow',
1570	1246	'data' => FrmAppHelper::get_upgrade_data_params(
1571	1247	'chat',
1572	1248	array(
		@@ -1572,15 +1248,14 @@
1572	1248	array(
1573	1249	'upgrade' => __( 'Conversational Forms', 'formidable' ),
1574	1250	'message' => __( 'Ask one question at a time for automated conversations.', 'formidable' ),
1575	1251	'screenshot' => 'chat.png',
1576		- 'learn-more' => FrmAppHelper::get_doc_url( 'conversational-forms', 'conversational-forms-settings', false ),
1577	1252	)
1578	1253	),
1579	1254	),
1580		- 'abandonment' => array(
	1255	+ 'abandonment' => array(
1581	1256	'name' => __( 'Form Abandonment', 'formidable' ),
1582		- 'icon' => 'frmfont frm_abandoned_icon',
	1257	+ 'icon' => 'frm_icon_font frm_abandoned_icon',
1583	1258	'html_class' => 'frm_show_upgrade_tab frm_noallow',
1584	1259	'data' => FrmAppHelper::get_upgrade_data_params(
1585	1260	'abandonment',
1586	1261	array(
		@@ -1586,31 +1261,37 @@
1586	1261	array(
1587	1262	'upgrade' => __( 'Form abandonment settings', 'formidable' ),
1588	1263	'message' => __( 'Unlock the power of data capture to boost lead generation and master the art of form optimization.', 'formidable' ),
1589	1264	'screenshot' => 'abandonment.png',
1590		- 'learn-more' => FrmAppHelper::get_doc_url( 'features/form-abandonment-wordpress-plugin', 'form-abandonment-settings', false ),
1591	1265	)
1592	1266	),
1593	1267	),
1594	1268	'html' => array(
1595	1269	'name' => __( 'Customize HTML', 'formidable' ),
1596		- 'class' => self::class,
	1270	+ 'class' => __CLASS__,
1597	1271	'function' => 'html_settings',
1598		- 'icon' => 'frmfont frm_code_icon',
	1272	+ 'icon' => 'frm_icon_font frm_code_icon',
1599	1273	),
1600	1274	);
1601	1275
1602		- if ( ! has_action( 'frm_add_form_style_tab_options' ) && ! has_action( 'frm_add_form_button_options' ) ) {
1603		- unset( $sections['buttons'] );
	1276	+ foreach ( array( 'landing', 'chat', 'abandonment' ) as $feature ) {
	1277	+ if ( ! FrmAppHelper::show_new_feature( $feature ) ) {
	1278	+ unset( $sections[ $feature ] );
	1279	+ }
1604	1280	}
1605	1281
1606	1282	$sections = apply_filters( 'frm_add_form_settings_section', $sections, $values );
1607	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	+
1608	1289	foreach ( $sections as $key => $section ) {
1609	1290	$defaults = array(
1610	1291	'html_class' => '',
1611	1292	'name' => ucfirst( $key ),
1612		- 'icon' => 'frmfont frm_settings_icon',
	1293	+ 'icon' => 'frm_icon_font frm_settings_icon',
1613	1294	);
1614	1295
1615	1296	$section = array_merge( $defaults, $section );
1616	1297
		@@ -1616,9 +1297,8 @@
1616	1297
1617	1298	if ( ! isset( $section['anchor'] ) ) {
1618	1299	$section['anchor'] = $key;
1619	1300	}
1620		-
1621	1301	$section['anchor'] .= '_settings';
1622	1302
1623	1303	if ( ! isset( $section['title'] ) ) {
1624	1304	$section['title'] = $section['name'];
		@@ -1637,26 +1317,23 @@
1637	1317	/**
1638	1318	* @since 4.0
1639	1319	*
1640	1320	* @param array $values
1641		- *
1642		- * @return void
1643	1321	*/
1644	1322	public static function advanced_settings( $values ) {
1645	1323	$first_h3 = 'frm_first_h3';
	1324	+
1646	1325	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings-advanced.php';
1647	1326	}
1648	1327
1649	1328	/**
1650	1329	* @param array $values
1651		- *
1652		- * @return void
1653	1330	*/
1654	1331	public static function render_spam_settings( $values ) {
1655	1332	if ( function_exists( 'akismet_http_post' ) ) {
1656	1333	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/spam-settings/akismet.php';
1657	1334	}
1658		- include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/spam-settings/stopforumspam.php';
	1335	+ include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/spam-settings/honeypot.php';
1659	1336	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/spam-settings/antispam.php';
1660	1337	}
1661	1338
1662	1339	/**
		@@ -1662,13 +1339,16 @@
1662	1339	/**
1663	1340	* @since 4.0
1664	1341	*
1665	1342	* @param array $values
1666		- *
1667		- * @return void
1668	1343	*/
1669	1344	public static function buttons_settings( $values ) {
1670		- 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' );
1671	1351	}
1672	1352
1673	1353	/**
1674	1354	* @since 4.0
		@@ -1673,13 +1353,11 @@
1673	1353	/**
1674	1354	* @since 4.0
1675	1355	*
1676	1356	* @param array $values
1677		- *
1678		- * @return void
1679	1357	*/
1680	1358	public static function html_settings( $values ) {
1681		- include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings-html.php';
	1359	+ include( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings-html.php' );
1682	1360	}
1683	1361
1684	1362	/**
1685	1363	* Replace old Submit Button href with new href to avoid errors in Chrome
		@@ -1685,11 +1363,9 @@
1685	1363	* Replace old Submit Button href with new href to avoid errors in Chrome
1686	1364	*
1687	1365	* @since 2.03.08
1688	1366	*
1689		- * @param array|bool $values
1690		- *
1691		- * @return void
	1367	+ * @param array|boolean $values
1692	1368	*/
1693	1369	private static function clean_submit_html( &$values ) {
1694	1370	if ( is_array( $values ) && isset( $values['submit_html'] ) ) {
1695	1371	$values['submit_html'] = str_replace( 'javascript:void(0)', '#', $values['submit_html'] );
		@@ -1710,18 +1386,9 @@
1710	1386
1711	1387	return $classes;
1712	1388	}
1713	1389
1714		- /**
1715		- * @since 6.27 Added $template_path parameter.
1716		- *
1717		- * @param int|string $form_id
1718		- * @param string $class
1719		- * @param string $template_path The path to a template file to use instead of the default.
1720		- *
1721		- * @return void
1722		- */
1723		- public static function mb_tags_box( $form_id, $class = '', $template_path = 'default' ) {
	1390	+ public static function mb_tags_box( $form_id, $class = '' ) {
1724	1391	$fields = FrmField::get_all_for_form( $form_id, '', 'include' );
1725	1392
1726	1393	/**
1727	1394	* Allows modifying the list of fields in the tags box.
		@@ -1730,30 +1397,23 @@
1730	1397	*
1731	1398	* @param array $fields The list of fields.
1732	1399	* @param array $args The arguments. Contains `form_id`.
1733	1400	*/
1734		- $fields = apply_filters( 'frm_fields_in_tags_box', $fields, compact( 'form_id' ) );
1735		- $linked_forms = array();
1736		- $col = 'one';
1737		- $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	+
1738	1406	$cond_shortcodes = apply_filters( 'frm_conditional_shortcodes', array() );
1739	1407	$entry_shortcodes = self::get_shortcode_helpers( $settings_tab );
	1408	+
1740	1409	$advanced_helpers = self::advanced_helpers( compact( 'fields', 'form_id' ) );
1741	1410
1742		- if ( 'default' === $template_path || ! file_exists( $template_path ) ) {
1743		- include FrmAppHelper::plugin_path() . '/classes/views/shared/mb_adv_info.php';
1744		- return;
1745		- }
1746		-
1747		- include $template_path;
	1411	+ include( FrmAppHelper::plugin_path() . '/classes/views/shared/mb_adv_info.php' );
1748	1412	}
1749	1413
1750	1414	/**
1751	1415	* @since 3.04.01
1752		- *
1753		- * @param array $atts
1754		- *
1755		- * @return array
1756	1416	*/
1757	1417	private static function advanced_helpers( $atts ) {
1758	1418	$advanced_helpers = array(
1759	1419	'default' => array(
		@@ -1762,12 +1422,10 @@
1762	1422	),
1763	1423	);
1764	1424
1765	1425	$user_fields = self::user_shortcodes();
1766		-
1767		- if ( $user_fields ) {
	1426	+ if ( ! empty( $user_fields ) ) {
1768	1427	$user_helpers = array();
1769		-
1770	1428	foreach ( $user_fields as $uk => $uf ) {
1771	1429	$user_helpers[ '|user_id| show="' . $uk . '"' ] = $uf;
1772	1430	unset( $uk, $uf );
1773	1431	}
		@@ -1772,9 +1430,9 @@
1772	1430	unset( $uk, $uf );
1773	1431	}
1774	1432
1775	1433	$advanced_helpers['user_id'] = array(
1776		- 'codes' => $user_helpers,
	1434	+ 'codes' => $user_helpers,
1777	1435	);
1778	1436	}
1779	1437
1780	1438	/**
		@@ -1792,10 +1450,8 @@
1792	1450	* Get an array of the options to display in the advanced tab
1793	1451	* of the customization panel
1794	1452	*
1795	1453	* @since 2.0.6
1796		- *
1797		- * @return array
1798	1454	*/
1799	1455	private static function get_advanced_shortcodes() {
1800	1456	$adv_shortcodes = array(
1801	1457	'x sep=", "' => array(
		@@ -1812,18 +1468,17 @@
1812	1468	'label' => __( 'No Auto P', 'formidable' ),
1813	1469	'title' => __( 'Do not automatically add any paragraphs or line breaks', 'formidable' ),
1814	1470	),
1815	1471	);
	1472	+ $adv_shortcodes = apply_filters( 'frm_advanced_shortcodes', $adv_shortcodes );
1816	1473
1817	1474	// __( 'Leave blank instead of defaulting to User Login', 'formidable' ) : blank=1
1818	1475
1819		- return apply_filters( 'frm_advanced_shortcodes', $adv_shortcodes );
	1476	+ return $adv_shortcodes;
1820	1477	}
1821	1478
1822	1479	/**
1823	1480	* @since 3.04.01
1824		- *
1825		- * @return array
1826	1481	*/
1827	1482	private static function user_shortcodes() {
1828	1483	$options = array(
1829	1484	'ID' => __( 'User ID', 'formidable' ),
		@@ -1842,12 +1497,8 @@
1842	1497	/**
1843	1498	* Get an array of the helper shortcodes to display in the customization panel
1844	1499	*
1845	1500	* @since 2.0.6
1846		- *
1847		- * @param bool $settings_tab
1848		- *
1849		- * @return array
1850	1501	*/
1851	1502	private static function get_shortcode_helpers( $settings_tab ) {
1852	1503	$entry_shortcodes = array(
1853	1504	'id' => __( 'Entry ID', 'formidable' ),
		@@ -1858,27 +1509,30 @@
1858	1509	'updated-at' => __( 'Entry updated', 'formidable' ),
1859	1510	'' => '',
1860	1511	'siteurl' => __( 'Site URL', 'formidable' ),
1861	1512	'sitename' => __( 'Site Name', 'formidable' ),
1862		- 'form_name' => __( 'Form Name', 'formidable' ),
1863	1513	);
1864	1514
1865		- $entry_shortcodes = array_merge( FrmShortcodeHelper::get_contextual_shortcode_values(), $entry_shortcodes );
1866		-
1867	1515	if ( ! FrmAppHelper::pro_is_installed() ) {
1868	1516	unset( $entry_shortcodes['post_id'] );
1869	1517	}
1870	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	+
1871	1526	/**
1872	1527	* Use this hook to add or remove buttons in the helpers section
1873	1528	* in the customization panel
1874	1529	*
1875	1530	* @since 2.0.6
1876		- *
1877		- * @param array $entry_shortcodes
1878		- * @param bool $settings_tab
1879	1531	*/
1880		- return apply_filters( 'frm_helper_shortcodes', $entry_shortcodes, $settings_tab );
	1532	+ $entry_shortcodes = apply_filters( 'frm_helper_shortcodes', $entry_shortcodes, $settings_tab );
	1533	+
	1534	+ return $entry_shortcodes;
1881	1535	}
1882	1536
1883	1537	/**
1884	1538	* Insert the form class setting into the form.
		@@ -1883,9 +1537,8 @@
1883	1537	/**
1884	1538	* Insert the form class setting into the form.
1885	1539	*
1886	1540	* @param stdClass $form
1887		- *
1888	1541	* @return void
1889	1542	*/
1890	1543	public static function form_classes( $form ) {
1891	1544	if ( isset( $form->options['form_class'] ) ) {
		@@ -1896,9 +1549,9 @@
1896	1549	echo ' frm_js_validate ';
1897	1550	self::add_js_validate_form_to_global_vars( $form );
1898	1551	}
1899	1552
1900		- if ( FrmForm::is_ajax_on( $form ) ) {
	1553	+ if ( ! FrmFormsHelper::should_use_pro_for_ajax_submit() && FrmForm::is_ajax_on( $form ) ) {
1901	1554	echo ' frm_ajax_submit ';
1902	1555	}
1903	1556	}
1904	1557
		@@ -1908,9 +1561,8 @@
1908	1561	* @param stdClass $form
1909	1562	*/
1910	1563	public static function add_js_validate_form_to_global_vars( $form ) {
1911	1564	global $frm_vars;
1912		-
1913	1565	if ( ! isset( $frm_vars['js_validate_forms'] ) ) {
1914	1566	$frm_vars['js_validate_forms'] = array();
1915	1567	}
1916	1568	$frm_vars['js_validate_forms'][ $form->id ] = $form;
		@@ -1921,11 +1573,11 @@
1921	1573	check_ajax_referer( 'frm_ajax', 'nonce' );
1922	1574
1923	1575	echo FrmEntriesController::show_entry_shortcode( // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
1924	1576	array(
1925		- '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' ),
1926	1578	'default_email' => true,
1927		- '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' ),
1928	1580	)
1929	1581	);
1930	1582	wp_die();
1931	1583	}
		@@ -1931,11 +1583,10 @@
1931	1583	}
1932	1584
1933	1585	/**
1934	1586	* @param string $content
1935		- * @param int|stdClass|string $form
1936		- * @param false|int|stdClass|string $entry
1937		- *
	1587	+ * @param stdClass|string|int $form
	1588	+ * @param stdClass|string|int|false $entry
1938	1589	* @return string
1939	1590	*/
1940	1591	public static function filter_content( $content, $form, $entry = false ) {
1941	1592	$content = self::replace_form_name_shortcodes( $content, $form );
		@@ -1940,9 +1591,8 @@
1940	1591	public static function filter_content( $content, $form, $entry = false ) {
1941	1592	$content = self::replace_form_name_shortcodes( $content, $form );
1942	1593
1943	1594	self::get_entry_by_param( $entry );
1944		-
1945	1595	if ( ! $entry ) {
1946	1596	return $content;
1947	1597	}
1948	1598
		@@ -1949,19 +1599,12 @@
1949	1599	if ( is_object( $form ) ) {
1950	1600	$form = $form->id;
1951	1601	}
1952	1602
1953		- /*
1954		- * Repeater actions adds `parent_entry` to `$entry` store the parent entry data. If `parent_entry` is not empty,
1955		- * use the parent form ID instead of repeater form ID to fix the parent form field shortcodes doesn't work.
1956		- */
1957		- if ( ! empty( $entry->parent_entry ) ) {
1958		- $form = $entry->parent_entry->form_id;
1959		- }
1960		-
1961	1603	$shortcodes = FrmFieldsHelper::get_shortcodes( $content, $form );
	1604	+ $content = apply_filters( 'frm_replace_content_shortcodes', $content, $entry, $shortcodes );
1962	1605
1963		- return apply_filters( 'frm_replace_content_shortcodes', $content, $entry, $shortcodes );
	1606	+ return $content;
1964	1607	}
1965	1608
1966	1609	/**
1967	1610	* Replace any [form_name] shortcodes in a string.
		@@ -1967,12 +1610,11 @@
1967	1610	* Replace any [form_name] shortcodes in a string.
1968	1611	*
1969	1612	* @since 5.5
1970	1613	*
1971		- * @param array|string $string
1972		- * @param int|stdClass|string $form
1973		- *
1974		- * @return array|string
	1614	+ * @param string|array $string
	1615	+ * @param stdClass|string|int $form
	1616	+ * @return string|array
1975	1617	*/
1976	1618	public static function replace_form_name_shortcodes( $string, $form ) {
1977	1619	if ( ! is_string( $string ) ) {
1978	1620	return $string;
		@@ -1977,9 +1619,9 @@
1977	1619	if ( ! is_string( $string ) ) {
1978	1620	return $string;
1979	1621	}
1980	1622
1981		- if ( ! str_contains( $string, '[form_name]' ) ) {
	1623	+ if ( false === strpos( $string, '[form_name]' ) ) {
1982	1624	return $string;
1983	1625	}
1984	1626
1985	1627	if ( ! is_object( $form ) ) {
		@@ -1990,10 +1632,9 @@
1990	1632	return str_replace( '[form_name]', $form_name, $string );
1991	1633	}
1992	1634
1993	1635	/**
1994		- * @param false|int|stdClass|string $entry
1995		- *
	1636	+ * @param stdClass|string|int|false $entry
1996	1637	* @return void
1997	1638	*/
1998	1639	private static function get_entry_by_param( &$entry ) {
1999	1640	if ( ! $entry || ! is_object( $entry ) ) {
		@@ -2004,24 +1645,12 @@
2004	1645	FrmEntry::maybe_get_entry( $entry );
2005	1646	}
2006	1647	}
2007	1648
2008		- /**
2009		- * @param string $content
2010		- * @param false|object $entry
2011		- * @param array $shortcodes
2012		- *
2013		- * @return string
2014		- */
2015	1649	public static function replace_content_shortcodes( $content, $entry, $shortcodes ) {
2016	1650	return FrmFieldsHelper::replace_content_shortcodes( $content, $entry, $shortcodes );
2017	1651	}
2018	1652
2019		- /**
2020		- * @param array $errors
2021		- *
2022		- * @return array
2023		- */
2024	1653	public static function process_bulk_form_actions( $errors ) {
2025	1654	if ( ! $_REQUEST ) {
2026	1655	return $errors;
2027	1656	}
		@@ -2026,30 +1655,29 @@
2026	1655	return $errors;
2027	1656	}
2028	1657
2029	1658	$bulkaction = FrmAppHelper::get_param( 'action', '', 'get', 'sanitize_text_field' );
2030		-
2031		- // phpcs:ignore Universal.Operators.StrictComparisons
2032	1659	if ( $bulkaction == - 1 ) {
2033	1660	$bulkaction = FrmAppHelper::get_param( 'action2', '', 'get', 'sanitize_title' );
2034	1661	}
2035	1662
2036		- if ( $bulkaction && str_starts_with( $bulkaction, 'bulk_' ) ) {
	1663	+ if ( ! empty( $bulkaction ) && strpos( $bulkaction, 'bulk_' ) === 0 ) {
2037	1664	FrmAppHelper::remove_get_action();
	1665	+
2038	1666	$bulkaction = str_replace( 'bulk_', '', $bulkaction );
2039	1667	}
2040	1668
2041	1669	$ids = FrmAppHelper::get_param( 'item-action', '', 'get', 'sanitize_text_field' );
	1670	+ if ( empty( $ids ) ) {
	1671	+ $errors[] = __( 'No forms were specified', 'formidable' );
2042	1672
2043		- if ( ! $ids ) {
2044		- $errors[] = __( 'No forms were specified', 'formidable' );
2045	1673	return $errors;
2046	1674	}
2047	1675
2048	1676	$permission_error = FrmAppHelper::permission_nonce_error( '', '_wpnonce', 'bulk-toplevel_page_formidable' );
2049		-
2050	1677	if ( $permission_error !== false ) {
2051	1678	$errors[] = $permission_error;
	1679	+
2052	1680	return $errors;
2053	1681	}
2054	1682
2055	1683	if ( ! is_array( $ids ) ) {
		@@ -2066,9 +1694,9 @@
2066	1694	case 'untrash':
2067	1695	$message = self::bulk_untrash( $ids );
2068	1696	}
2069	1697
2070		- if ( ! empty( $message ) ) {
	1698	+ if ( isset( $message ) && ! empty( $message ) ) {
2071	1699	$errors['message'] = $message;
2072	1700	}
2073	1701
2074	1702	return $errors;
		@@ -2073,24 +1701,9 @@
2073	1701
2074	1702	return $errors;
2075	1703	}
2076	1704
2077		- /**
2078		- * Includes html that shows a message when the device is too small to use Formidable Forms admin pages.
2079		- *
2080		- * @since 6.20
2081		- *
2082		- * @return void
2083		- */
2084		- public static function include_device_too_small_message() {
2085		- if ( ! FrmAppHelper::is_formidable_admin() ) {
2086		- return;
2087		- }
2088		-
2089		- include FrmAppHelper::plugin_path() . '/classes/views/shared/small-device-message.php';
2090		- }
2091		-
2092		- public static function route() { // phpcs:ignore Generic.Metrics.CyclomaticComplexity.MaxExceeded
	1705	+ public static function route() {
2093	1706	$action = isset( $_REQUEST['frm_action'] ) ? 'frm_action' : 'action';
2094	1707	$vars = array();
2095	1708	FrmAppHelper::include_svg();
2096	1709
		@@ -2100,14 +1713,12 @@
2100	1713	// Javascript needs to be allowed in some field settings.
2101	1714	// phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized, WordPress.Security.NonceVerification.Missing
2102	1715	$json_vars = htmlspecialchars_decode( nl2br( str_replace( '&quot;', '"', wp_unslash( $_POST['frm_compact_fields'] ) ) ) );
2103	1716	$json_vars = json_decode( $json_vars, true );
2104		-
2105		- if ( ! $json_vars ) {
2106		- // Json decoding failed so we should return an error message.
	1717	+ if ( empty( $json_vars ) ) {
	1718	+ // json decoding failed so we should return an error message.
2107	1719	$action = FrmAppHelper::get_param( $action, '', 'get', 'sanitize_title' );
2108		-
2109		- if ( 'edit' === $action ) {
	1720	+ if ( 'edit' == $action ) {
2110	1721	$action = 'update';
2111	1722	}
2112	1723
2113	1724	add_filter( 'frm_validate_form', 'FrmFormsController::json_error' );
		@@ -2119,9 +1730,8 @@
2119	1730	$_POST = array_merge( $_POST, $_REQUEST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
2120	1731	}
2121	1732	} else {
2122	1733	$action = FrmAppHelper::get_param( $action, '', 'get', 'sanitize_title' );
2123		-
2124	1734	if ( isset( $_REQUEST['delete_all'] ) ) {
2125	1735	// Override the action for this page.
2126	1736	$action = 'delete_all';
2127	1737	}
		@@ -2130,8 +1740,10 @@
2130	1740	add_action( 'frm_load_form_hooks', 'FrmHooksController::trigger_load_form_hooks' );
2131	1741	FrmAppHelper::trigger_hook_load( 'form' );
2132	1742
2133	1743	switch ( $action ) {
	1744	+ case 'new':
	1745	+ return self::new_form( $vars );
2134	1746	case 'create':
2135	1747	case 'edit':
2136	1748	case 'update':
2137	1749	case 'trash':
		@@ -2140,39 +1752,33 @@
2140	1752	case 'settings':
2141	1753	case 'update_settings':
2142	1754	return self::$action( $vars );
2143	1755	case 'lite-reports':
2144		- self::no_reports( $vars );
2145		- return null;
	1756	+ return self::no_reports( $vars );
2146	1757	case 'views':
2147		- self::no_views( $vars );
2148		- return null;
	1758	+ return self::no_views( $vars );
2149	1759	default:
2150	1760	do_action( 'frm_form_action_' . $action );
2151		-
2152	1761	if ( apply_filters( 'frm_form_stop_action_' . $action, false ) ) {
2153		- return null;
	1762	+ return;
2154	1763	}
2155	1764
2156	1765	$action = FrmAppHelper::get_param( 'action', '', 'get', 'sanitize_text_field' );
2157		-
2158		- // phpcs:ignore Universal.Operators.StrictComparisons
2159	1766	if ( $action == - 1 ) {
2160	1767	$action = FrmAppHelper::get_param( 'action2', '', 'get', 'sanitize_title' );
2161	1768	}
2162	1769
2163		- if ( str_starts_with( $action, 'bulk_' ) ) {
	1770	+ if ( strpos( $action, 'bulk_' ) === 0 ) {
2164	1771	FrmAppHelper::remove_get_action();
2165	1772
2166	1773	self::list_form();
2167		- return null;
	1774	+ return;
2168	1775	}
2169	1776
2170	1777	$message = FrmAppHelper::get_param( 'message' );
2171		-
2172	1778	if ( 'form_duplicate_error' === $message ) {
2173	1779	self::display_forms_list( array(), '', array( __( 'There was a problem duplicating the form', 'formidable' ) ) );
2174		- return null;
	1780	+ return;
2175	1781	}
2176	1782
2177	1783	if ( 'forms_permanently_deleted' === $message ) {
2178	1784	$count = FrmAppHelper::get_param( 'forms_deleted', 0, 'get', 'absint' );
		@@ -2178,14 +1784,14 @@
2178	1784	$count = FrmAppHelper::get_param( 'forms_deleted', 0, 'get', 'absint' );
2179	1785	/* translators: %1$s: Number of forms */
2180	1786	$message = sprintf( _n( '%1$s form permanently deleted.', '%1$s forms permanently deleted.', $count, 'formidable' ), $count );
2181	1787	self::display_forms_list( array(), $message, '' );
2182		- return null;
	1788	+ return;
2183	1789	}
2184	1790
2185	1791	self::display_forms_list();
2186	1792
2187		- return null;
	1793	+ return;
2188	1794	}//end switch
2189	1795	}
2190	1796
2191	1797	/**
		@@ -2204,44 +1810,29 @@
2204	1810
2205	1811	// Get posted data
2206	1812	$form_id = FrmAppHelper::get_post_param( 'form_id', '', 'absint' );
2207	1813	$name = FrmAppHelper::get_post_param( 'form_name', '', 'sanitize_text_field' );
2208		- $form = FrmForm::getOne( $form_id );
2209	1814
2210		- if ( ! $form ) {
2211		- wp_send_json_error( __( 'Form not found', 'formidable' ) );
2212		- }
	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' ) );
2213	1818
2214		- if ( $name === $form->name ) {
2215		- // Nothing to change so exit early.
2216		- wp_send_json_success();
2217		- }
	1819	+ wp_send_json_success( compact( 'form_key' ) );
	1820	+ }
2218	1821
2219		- $to_update = array(
2220		- 'name' => $name,
2221		- );
	1822	+ public static function json_error( $errors ) {
	1823	+ $errors['json'] = __( 'Abnormal HTML characters prevented your form from saving correctly', 'formidable' );
2222	1824
2223		- if ( '' !== $name ) {
2224		- // Only update form_key if name is not empty.
2225		- $form_key = FrmAppHelper::get_unique_key( sanitize_title( $name ), 'frm_forms', 'form_key' );
2226		- $to_update['form_key'] = $form_key;
2227		- } else {
2228		- $form_key = $form->form_key;
2229		- }
2230		-
2231		- FrmForm::update( $form_id, $to_update );
2232		-
2233		- wp_send_json_success( compact( 'form_key' ) );
	1825	+ return $errors;
2234	1826	}
2235	1827
2236	1828	/**
2237		- * @param array $errors
	1829	+ * Education for premium features.
2238	1830	*
2239		- * @return array
	1831	+ * @since 4.05
2240	1832	*/
2241		- public static function json_error( $errors ) {
2242		- $errors['json'] = __( 'Abnormal HTML characters prevented your form from saving correctly', 'formidable' );
2243		- 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' );
2244	1835	}
2245	1836
2246	1837	/**
2247	1838	* Add education about views.
		@@ -2246,12 +1837,8 @@
2246	1837	/**
2247	1838	* Add education about views.
2248	1839	*
2249	1840	* @since 4.07
2250		- *
2251		- * @param array $values
2252		- *
2253		- * @return void
2254	1841	*/
2255	1842	public static function no_views( $values = array() ) {
2256	1843	FrmAppHelper::include_svg();
2257	1844	$id = FrmAppHelper::get_param( 'form', '', 'get', 'absint' );
		@@ -2263,12 +1850,8 @@
2263	1850	/**
2264	1851	* Add education about reports.
2265	1852	*
2266	1853	* @since 4.07
2267		- *
2268		- * @param array $values
2269		- *
2270		- * @return void
2271	1854	*/
2272	1855	public static function no_reports( $values = array() ) {
2273	1856	$id = FrmAppHelper::get_param( 'form', '', 'get', 'absint' );
2274	1857	$form = $id ? FrmForm::getOne( $id ) : false;
		@@ -2294,9 +1877,8 @@
2294	1877	* @since 4.05.02
2295	1878	*/
2296	1879	private static function move_menu_to_footer() {
2297	1880	$settings = FrmAppHelper::get_settings();
2298		-
2299	1881	if ( empty( $settings->admin_bar ) ) {
2300	1882	remove_action( 'wp_body_open', 'wp_admin_bar_render', 0 );
2301	1883	}
2302	1884	}
		@@ -2302,15 +1884,13 @@
2302	1884	}
2303	1885
2304	1886	public static function admin_bar_configure() {
2305	1887	global $frm_vars;
2306		-
2307	1888	if ( empty( $frm_vars['forms_loaded'] ) ) {
2308	1889	return;
2309	1890	}
2310	1891
2311	1892	$actions = array();
2312		-
2313	1893	foreach ( $frm_vars['forms_loaded'] as $form ) {
2314	1894	if ( is_object( $form ) ) {
2315	1895	$actions[ $form->id ] = $form->name;
2316	1896	}
		@@ -2316,9 +1896,9 @@
2316	1896	}
2317	1897	unset( $form );
2318	1898	}
2319	1899
2320		- if ( ! $actions ) {
	1900	+ if ( empty( $actions ) ) {
2321	1901	return;
2322	1902	}
2323	1903
2324	1904	self::add_menu_to_admin_bar();
		@@ -2344,12 +1924,8 @@
2344	1924	}
2345	1925
2346	1926	/**
2347	1927	* @since 2.05.07
2348		- *
2349		- * @param array $actions
2350		- *
2351		- * @return void
2352	1928	*/
2353	1929	private static function add_forms_to_admin_bar( $actions ) {
2354	1930	global $wp_admin_bar;
2355	1931
		@@ -2355,13 +1931,14 @@
2355	1931
2356	1932	asort( $actions );
2357	1933
2358	1934	foreach ( $actions as $form_id => $name ) {
	1935	+
2359	1936	$wp_admin_bar->add_node(
2360	1937	array(
2361	1938	'parent' => 'frm-forms',
2362	1939	'id' => 'edit_form_' . $form_id,
2363		- 'title' => $name ? $name : FrmFormsHelper::get_no_title_text(),
	1940	+ 'title' => empty( $name ) ? __( '(no title)', 'formidable' ) : $name,
2364	1941	'href' => FrmForm::get_edit_link( $form_id ),
2365	1942	)
2366	1943	);
2367	1944	}
		@@ -2370,16 +1947,14 @@
2370	1947	/**
2371	1948	* The formidable shortcode
2372	1949	*
2373	1950	* @param array $atts The params from the shortcode.
2374		- *
2375	1951	* @return string
2376	1952	*/
2377	1953	public static function get_form_shortcode( $atts ) {
2378	1954	global $frm_vars;
2379		-
2380		- if ( ! empty( $frm_vars['skip_shortcode'] ) ) {
2381		- $sc = '[formidable';
	1955	+ if ( isset( $frm_vars['skip_shortcode'] ) && $frm_vars['skip_shortcode'] ) {
	1956	+ $sc = '[formidable';
2382	1957	$sc .= FrmAppHelper::array_to_html_params( $atts );
2383	1958	return $sc . ']';
2384	1959	}
2385	1960
		@@ -2404,12 +1979,11 @@
2404	1979
2405	1980	/**
2406	1981	* @since 5.2.01
2407	1982	*
2408		- * @param false|int|string $id
2409		- * @param false|string $key
2410		- *
2411		- * @return false|stdClass
	1983	+ * @param string|int|false $id
	1984	+ * @param string|false $key
	1985	+ * @return stdClass|false
2412	1986	*/
2413	1987	private static function maybe_get_form_by_id_or_key( $id, $key ) {
2414	1988	if ( ! $id ) {
2415	1989	$id = $key;
		@@ -2417,14 +1991,13 @@
2417	1991	return self::maybe_get_form_to_show( $id );
2418	1992	}
2419	1993
2420	1994	/**
2421		- * @param false|int|string $id
2422		- * @param false|string $key
2423		- * @param bool|int|string $title may be 'auto', true, false, 'true', 'false', 'yes', '1', 1, '0', 0.
2424		- * @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.
2425	1999	* @param array $atts
2426		- *
2427	2000	* @return string
2428	2001	*/
2429	2002	public static function show_form( $id = '', $key = '', $title = false, $description = false, $atts = array() ) {
2430	2003	$form = self::maybe_get_form_by_id_or_key( $id, $key );
		@@ -2445,13 +2018,14 @@
2445	2018
2446	2019	add_action( 'frm_load_form_hooks', 'FrmHooksController::trigger_load_form_hooks' );
2447	2020	FrmAppHelper::trigger_hook_load( 'form', $form );
2448	2021
2449		- $form = apply_filters( 'frm_pre_display_form', $form );
	2022	+ $form = apply_filters( 'frm_pre_display_form', $form );
	2023	+
2450	2024	$frm_settings = FrmAppHelper::get_settings( array( 'current_form' => $form->id ) );
2451	2025
2452	2026	if ( self::is_viewable_draft_form( $form ) ) {
2453		- // Don't show a draft form on a page
	2027	+ // don't show a draft form on a page
2454	2028	$form = __( 'Please select a valid form', 'formidable' );
2455	2029	} elseif ( ! FrmForm::is_visible_to_user( $form ) ) {
2456	2030	$form = do_shortcode( $frm_settings->login_msg );
2457	2031	} else {
		@@ -2470,19 +2044,17 @@
2470	2044	return $form;
2471	2045	}
2472	2046
2473	2047	/**
2474		- * @param false|int|string $id
2475		- *
2476		- * @return false|stdClass
	2048	+ * @param string|int|false $id
	2049	+ * @return stdClass|false
2477	2050	*/
2478	2051	private static function maybe_get_form_to_show( $id ) {
2479	2052	$form = false;
2480	2053
2481		- if ( $id ) {
	2054	+ if ( ! empty( $id ) ) {
2482	2055	// Form id or key is set.
2483	2056	$form = FrmForm::getOne( $id );
2484		-
2485	2057	if ( ! $form || $form->parent_form_id || $form->status === 'trash' ) {
2486	2058	$form = false;
2487	2059	}
2488	2060	}
		@@ -2489,25 +2061,12 @@
2489	2061
2490	2062	return $form;
2491	2063	}
2492	2064
2493		- /**
2494		- * @param object $form
2495		- *
2496		- * @return bool
2497		- */
2498	2065	private static function is_viewable_draft_form( $form ) {
2499	2066	return $form->status === 'draft' && current_user_can( 'frm_edit_forms' ) && ! FrmAppHelper::is_preview_page();
2500	2067	}
2501	2068
2502		- /**
2503		- * @param object $form
2504		- * @param bool $title
2505		- * @param bool $description
2506		- * @param array $atts
2507		- *
2508		- * @return string
2509		- */
2510	2069	public static function get_form( $form, $title, $description, $atts = array() ) {
2511	2070	ob_start();
2512	2071
2513	2072	do_action( 'frm_before_get_form', $atts );
		@@ -2514,9 +2073,10 @@
2514	2073
2515	2074	self::get_form_contents( $form, $title, $description, $atts );
2516	2075	self::enqueue_scripts( FrmForm::get_params( $form ) );
2517	2076
2518		- $contents = ob_get_clean();
	2077	+ $contents = ob_get_contents();
	2078	+ ob_end_clean();
2519	2079
2520	2080	self::maybe_minimize_form( $atts, $contents );
2521	2081
2522	2082	return $contents;
		@@ -2521,25 +2081,12 @@
2521	2081
2522	2082	return $contents;
2523	2083	}
2524	2084
2525		- /**
2526		- * @param array $params
2527		- *
2528		- * @return void
2529		- */
2530	2085	public static function enqueue_scripts( $params ) {
2531	2086	do_action( 'frm_enqueue_form_scripts', $params );
2532	2087	}
2533	2088
2534		- /**
2535		- * @param object $form
2536		- * @param bool $title
2537		- * @param bool $description
2538		- * @param array $atts
2539		- *
2540		- * @return void
2541		- */
2542	2089	public static function get_form_contents( $form, $title, $description, $atts ) {
2543	2090	$params = FrmForm::get_params( $form );
2544	2091	$errors = self::get_saved_errors( $form, $params );
2545	2092	$fields = FrmFieldsHelper::get_form_fields( $form->id, $errors );
		@@ -2546,10 +2093,9 @@
2546	2093	$reset = false;
2547	2094	$pass_args = compact( 'form', 'fields', 'errors', 'title', 'description', 'reset' );
2548	2095
2549	2096	$pass_args['action'] = $params['action'];
2550		- // phpcs:ignore WordPress.Security.NonceVerification.Missing, Universal.Operators.StrictComparisons
2551		- $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
2552	2098
2553	2099	if ( ! $handle_process_here ) {
2554	2100	FrmFormState::set_initial_value( 'title', $title );
2555	2101	FrmFormState::set_initial_value( 'description', $description );
		@@ -2554,21 +2100,22 @@
2554	2100	FrmFormState::set_initial_value( 'title', $title );
2555	2101	FrmFormState::set_initial_value( 'description', $description );
2556	2102
2557	2103	do_action( 'frm_display_form_action', $params, $fields, $form, $title, $description );
2558		-
2559	2104	if ( apply_filters( 'frm_continue_to_new', true, $form->id, $params['action'] ) ) {
2560	2105	self::show_form_after_submit( $pass_args );
2561	2106	}
2562		- } elseif ( $errors ) {
	2107	+ } elseif ( ! empty( $errors ) ) {
2563	2108	self::show_form_after_submit( $pass_args );
	2109	+
2564	2110	} else {
	2111	+
2565	2112	do_action( 'frm_validate_form_creation', $params, $fields, $form, $title, $description );
2566	2113
2567	2114	if ( apply_filters( 'frm_continue_to_create', true, $form->id ) ) {
2568		- $entry_id = self::just_created_entry( $form->id );
2569		- $pass_args['entry_id'] = $entry_id;
2570		- $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;
2571	2118
2572	2119	self::run_on_submit_actions( $pass_args );
2573	2120
2574	2121	do_action(
		@@ -2585,19 +2132,13 @@
2585	2132	/**
2586	2133	* If the form was processed earlier (init), get the generated errors
2587	2134	*
2588	2135	* @since 2.05
2589		- *
2590		- * @param object $form
2591		- * @param array $params
2592		- *
2593		- * @return array
2594	2136	*/
2595	2137	private static function get_saved_errors( $form, $params ) {
2596	2138	global $frm_vars;
2597	2139
2598		- // phpcs:ignore WordPress.Security.NonceVerification.Missing, Universal.Operators.StrictComparisons
2599		- 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
2600	2141	$errors = $frm_vars['created_entries'][ $form->id ]['errors'];
2601	2142	} else {
2602	2143	$errors = array();
2603	2144	}
		@@ -2614,16 +2155,13 @@
2614	2155	}
2615	2156
2616	2157	/**
2617	2158	* @since 2.2.7
2618		- *
2619		- * @param int|string $form_id
2620		- *
2621		- * @return int
2622	2159	*/
2623	2160	public static function just_created_entry( $form_id ) {
2624	2161	global $frm_vars;
2625		- 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;
2626	2164	}
2627	2165
2628	2166	/**
2629	2167	* Gets confirmation method.
		@@ -2636,19 +2174,17 @@
2636	2174	*
2637	2175	* @type object $form Form object.
2638	2176	* @type int $entry_id Entry ID.
2639	2177	* }
2640		- *
2641		- * @return array|string
	2178	+ * @return string|array
2642	2179	*/
2643	2180	private static function get_confirmation_method( $atts ) {
2644	2181	$action = FrmOnSubmitHelper::current_event( $atts );
2645	2182	$opt = 'update' === $action ? 'edit_action' : 'success_action';
2646		- $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';
2647	2184
2648	2185	if ( ! empty( $atts['entry_id'] ) ) {
2649	2186	$met_actions = self::get_met_on_submit_actions( $atts, $action );
2650		-
2651	2187	if ( $met_actions ) {
2652	2188	$method = $met_actions;
2653	2189	}
2654	2190	}
		@@ -2654,22 +2190,15 @@
2654	2190	}
2655	2191
2656	2192	$method = apply_filters( 'frm_success_filter', $method, $atts['form'], $action );
2657	2193
2658		- if ( $method !== 'message' && ( ! $atts['entry_id'] || ! is_numeric( $atts['entry_id'] ) ) ) {
2659		- return 'message';
	2194	+ if ( $method != 'message' && ( ! $atts['entry_id'] || ! is_numeric( $atts['entry_id'] ) ) ) {
	2195	+ $method = 'message';
2660	2196	}
2661	2197
2662	2198	return $method;
2663	2199	}
2664	2200
2665		- /**
2666		- * @param object $form
2667		- * @param array $params
2668		- * @param array $args
2669		- *
2670		- * @return void
2671		- */
2672	2201	public static function maybe_trigger_redirect( $form, $params, $args ) {
2673	2202	if ( ! isset( $params['id'] ) ) {
2674	2203	global $frm_vars;
2675	2204	$params['id'] = $frm_vars['created_entries'][ $form->id ]['entry_id'];
		@@ -2697,9 +2226,9 @@
2697	2226	* @param array $args See {@see FrmFormsController::maybe_trigger_redirect()}.
2698	2227	*/
2699	2228	public static function maybe_trigger_redirect_with_action( $conf_method, $form, $params, $args ) {
2700	2229	if ( is_array( $conf_method ) && 1 === count( $conf_method ) ) {
2701		- if ( 'redirect' === FrmOnSubmitHelper::get_action_type( $conf_method[0] ) && empty( $conf_method[0]->post_content['redirect_delay'] ) ) {
	2230	+ if ( 'redirect' === FrmOnSubmitHelper::get_action_type( $conf_method[0] ) ) {
2702	2231	$event = FrmOnSubmitHelper::current_event( $params );
2703	2232	FrmOnSubmitHelper::populate_on_submit_data( $form->options, $conf_method[0], $event );
2704	2233	$conf_method = 'redirect';
2705	2234	}
		@@ -2709,15 +2238,8 @@
2709	2238	self::trigger_redirect( $form, $params, $args );
2710	2239	}
2711	2240	}
2712	2241
2713		- /**
2714		- * @param object $form
2715		- * @param array $params
2716		- * @param array $args
2717		- *
2718		- * @return void
2719		- */
2720	2242	public static function trigger_redirect( $form, $params, $args ) {
2721	2243	$success_args = array(
2722	2244	'action' => $params['action'],
2723	2245	'conf_method' => 'redirect',
		@@ -2755,9 +2277,9 @@
2755	2277	unset( $extra_args['form'] );
2756	2278
2757	2279	do_action( 'frm_success_action', $args['conf_method'], $args['form'], $args['form']->options, $args['entry_id'], $extra_args );
2758	2280
2759		- $opt = ! isset( $args['action'] ) || $args['action'] === 'create' ? 'success' : 'edit';
	2281	+ $opt = ( ! isset( $args['action'] ) || $args['action'] === 'create' ) ? 'success' : 'edit';
2760	2282
2761	2283	$args['success_opt'] = $opt;
2762	2284	$args['ajax'] = ! empty( $frm_vars['ajax'] );
2763	2285
		@@ -2776,9 +2298,8 @@
2776	2298	* @since 6.0
2777	2299	*
2778	2300	* @param array $args See {@see FrmFormsController::run_success_action()}.
2779	2301	* @param string $event Form event. Default is `create`.
2780		- *
2781	2302	* @return array Array of actions that meet the conditional logics.
2782	2303	*/
2783	2304	public static function get_met_on_submit_actions( $args, $event = 'create' ) {
2784	2305	if ( ! FrmOnSubmitHelper::form_has_migrated( $args['form'] ) ) {
		@@ -2784,16 +2305,16 @@
2784	2305	if ( ! FrmOnSubmitHelper::form_has_migrated( $args['form'] ) ) {
2785	2306	return array();
2786	2307	}
2787	2308
2788		- // 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.
2789	2310	if ( ! empty( self::$redirected_in_new_tab[ $args['form']->id ] ) ) {
2790	2311	return array( FrmOnSubmitHelper::get_fallback_action_after_open_in_new_tab( $event ) );
2791	2312	}
2792	2313
2793		- $entry = FrmEntry::getOne( $args['entry_id'], true );
2794		- $actions = FrmOnSubmitHelper::get_actions( $args['form']->id );
2795		- $met_actions = array();
	2314	+ $entry = FrmEntry::getOne( $args['entry_id'], true );
	2315	+ $actions = FrmOnSubmitHelper::get_actions( $args['form']->id );
	2316	+ $met_actions = array();
2796	2317	$has_redirect = false;
2797	2318
2798	2319	foreach ( $actions as $action ) {
2799	2320	if ( ! in_array( $event, $action->post_content['event'], true ) ) {
		@@ -2836,10 +2357,10 @@
2836	2357	* @param array $args See {@see FrmFormsController::run_success_action()}. `$args['event']` is also added.
2837	2358	*/
2838	2359	$met_actions = apply_filters( 'frm_get_met_on_submit_actions', $met_actions, $args );
2839	2360
2840		- if ( ! $met_actions ) {
2841		- return array( FrmOnSubmitHelper::get_fallback_action( $event ) );
	2361	+ if ( empty( $met_actions ) ) {
	2362	+ $met_actions = array( FrmOnSubmitHelper::get_fallback_action( $event ) );
2842	2363	}
2843	2364
2844	2365	return $met_actions;
2845	2366	}
		@@ -2851,9 +2372,8 @@
2851	2372	*
2852	2373	* @param object $action Form action object.
2853	2374	* @param array $args See {@see FrmFormsController::run_success_action()}.
2854	2375	* @param string $event Form event. Default is `create`.
2855		- *
2856	2376	* @return bool
2857	2377	*/
2858	2378	private static function is_valid_on_submit_action( $action, $args, $event = 'create' ) {
2859	2379	$action_type = FrmOnSubmitHelper::get_action_type( $action );
		@@ -2875,9 +2395,8 @@
2875	2395	return false;
2876	2396	}
2877	2397
2878	2398	$page = get_post( $action->post_content['success_page_id'] );
2879		-
2880	2399	if ( ! $page || 'trash' === $page->post_status ) {
2881	2400	return false;
2882	2401	}
2883	2402	}
		@@ -2899,9 +2418,8 @@
2899	2418	'entry_id' => $args['entry_id'],
2900	2419	'action' => FrmOnSubmitHelper::current_event( $args ),
2901	2420	)
2902	2421	);
2903		-
2904	2422	if ( ! is_array( $args['conf_method'] ) ) {
2905	2423	self::run_success_action( $args );
2906	2424	return;
2907	2425	}
		@@ -2928,9 +2446,8 @@
2928	2446	* @param array $args See {@see FrmFormsController::run_success_action()}.
2929	2447	*/
2930	2448	public static function run_multi_on_submit_actions( $args ) {
2931	2449	$redirect_action = null;
2932		-
2933	2450	foreach ( $args['conf_method'] as $action ) {
2934	2451	if ( 'redirect' === FrmOnSubmitHelper::get_action_type( $action ) ) {
2935	2452	// We catch the redirect action to run it last.
2936	2453	$redirect_action = $action;
		@@ -2941,15 +2458,13 @@
2941	2458
2942	2459	unset( $action );
2943	2460	}
2944	2461
2945		- if ( ! $redirect_action ) {
2946		- 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 );
2947	2466	}
2948		-
2949		- // Show script to delay the redirection.
2950		- $args['force_delay_redirect'] = true;
2951		- self::run_single_on_submit_action( $args, $redirect_action );
2952	2467	}
2953	2468
2954	2469	/**
2955	2470	* Runs single On Submit action.
		@@ -2970,9 +2485,8 @@
2970	2485	* @since 6.0
2971	2486	*
2972	2487	* @param array $args See {@see FrmFormsController::run_success_action()}.
2973	2488	* @param object $action On Submit action object.
2974		- *
2975	2489	* @return array
2976	2490	*/
2977	2491	private static function get_run_success_action_args( $args, $action ) {
2978	2492	$new_args = $args;
		@@ -2978,9 +2492,10 @@
2978	2492	$new_args = $args;
2979	2493
2980	2494	FrmOnSubmitHelper::populate_on_submit_data( $new_args['form']->options, $action, $args['action'] );
2981	2495
2982		- $opt = 'update' === $args['action'] ? 'edit_' : 'success_';
	2496	+ $opt = 'update' === $args['action'] ? 'edit_' : 'success_';
	2497	+
2983	2498	$new_args['conf_method'] = $new_args['form']->options[ $opt . 'action' ];
2984	2499
2985	2500	/**
2986	2501	* Filters the run success action args.
		@@ -2995,18 +2510,12 @@
2995	2510	}
2996	2511
2997	2512	/**
2998	2513	* @since 3.0
2999		- *
3000		- * @param array $args
3001		- *
3002		- * @return void
3003	2514	*/
3004	2515	private static function load_page_after_submit( $args ) {
3005	2516	global $post;
3006	2517	$opt = $args['success_opt'];
3007		-
3008		- // phpcs:ignore Universal.Operators.StrictComparisons
3009	2518	if ( ! $post || $args['form']->options[ $opt . '_page_id' ] != $post->ID ) {
3010	2519	$page = get_post( $args['form']->options[ $opt . '_page_id' ] );
3011	2520	$old_post = $post;
3012	2521	$post = $page;
		@@ -3030,9 +2539,8 @@
3030	2539	}
3031	2540
3032	2541	/**
3033	2542	* @since 3.0
3034		- *
3035	2543	* @param array $args See {@see FrmFormsController::run_success_action()}.
3036	2544	*/
3037	2545	private static function redirect_after_submit( $args ) {
3038	2546	add_filter( 'frm_use_wpautop', '__return_false' );
		@@ -3046,10 +2554,11 @@
3046	2554	FrmEntriesController::delete_entry_before_redirect( $success_url, $args['form'], $args );
3047	2555
3048	2556	add_filter( 'frm_redirect_url', 'FrmEntriesController::prepare_redirect_url' );
3049	2557	$success_url = apply_filters( 'frm_redirect_url', $success_url, $args['form'], $args );
3050		- $doing_ajax = FrmAppHelper::doing_ajax();
3051	2558
	2559	+ $doing_ajax = FrmAppHelper::doing_ajax();
	2560	+
3052	2561	if ( ! empty( $args['ajax'] ) && $doing_ajax && empty( $args['force_delay_redirect'] ) ) {
3053	2562	// Is AJAX submit and there is just one Redirect action runs.
3054	2563	echo json_encode( self::get_ajax_redirect_response_data( $args + compact( 'success_url' ) ) );
3055	2564	wp_die();
		@@ -3054,9 +2563,9 @@
3054	2563	echo json_encode( self::get_ajax_redirect_response_data( $args + compact( 'success_url' ) ) );
3055	2564	wp_die();
3056	2565	}
3057	2566
3058		- if ( ! headers_sent() && empty( $args['force_delay_redirect'] ) && empty( $args['form']->options['redirect_delay'] ) ) {
	2567	+ if ( ! headers_sent() && empty( $args['force_delay_redirect'] ) ) {
3059	2568	// Not AJAX submit, no headers sent, and there is just one Redirect action runs.
3060	2569	if ( ! empty( $args['form']->options['open_in_new_tab'] ) ) {
3061	2570	self::print_open_in_new_tab_js_with_fallback_handler( $success_url, $args );
3062	2571	self::$redirected_in_new_tab[ $args['form']->id ] = 1;
		@@ -3098,51 +2607,31 @@
3098	2607	*
3099	2608	* @since 6.3.1
3100	2609	*
3101	2610	* @param array $args See {@see FrmFormsController::run_success_action()}.
3102		- *
3103	2611	* @return array
3104	2612	*/
3105	2613	private static function get_ajax_redirect_response_data( $args ) {
3106		- $response_data = array(
3107		- 'redirect' => $args['success_url'],
3108		- 'content' => '',
3109		- );
3110		- $unset_content = true;
	2614	+ $response_data = array( 'redirect' => $args['success_url'] );
3111	2615
3112		- if ( ! empty( $args['form']->options['redirect_delay'] ) ) {
3113		- $response_data['delay'] = $args['form']->options['redirect_delay_time'];
3114		- $response_data['content'] .= self::get_redirect_message( $args['success_url'], $args['form']->options['redirect_delay_msg'], $args );
3115		- $unset_content = false;
3116		- }
3117		-
3118	2616	if ( ! empty( $args['form']->options['open_in_new_tab'] ) ) {
3119	2617	$response_data['openInNewTab'] = 1;
3120	2618
3121		- // Only show open in new tab text if there is no delay.
3122		- if ( empty( $response_data['content'] ) ) {
3123		- $args['message'] = FrmOnSubmitHelper::get_default_new_tab_msg();
	2619	+ $args['message'] = FrmOnSubmitHelper::get_default_new_tab_msg();
3124	2620
3125		- $args['form']->options['success_msg'] = $args['message'];
3126		- $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	+ }
3127	2626
3128		- if ( ! isset( $args['fields'] ) ) {
3129		- $args['fields'] = FrmField::get_all_for_form( $args['form']->id );
3130		- }
	2627	+ $args['message'] = self::prepare_submit_message( $args['form'], $args['entry_id'], $args );
3131	2628
3132		- $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();
3133	2632
3134		- ob_start();
3135		- self::show_lone_success_message( $args );
3136		- $response_data['content'] .= ob_get_clean();
3137		- $unset_content = false;
3138		- }//end if
3139		-
3140	2633	$response_data['fallbackMsg'] = self::get_redirect_fallback_message( $args['success_url'], $args );
3141		- }//end if
3142		-
3143		- if ( $unset_content && '' === $response_data['content'] ) {
3144		- unset( $response_data['content'] );
3145	2634	}
3146	2635
3147	2636	return $response_data;
3148	2637	}
		@@ -3154,9 +2643,9 @@
3154	2643	*
3155	2644	* @param array $args See {@see FrmFormsController::run_success_action()}.
3156	2645	*/
3157	2646	private static function redirect_after_submit_using_js( $args ) {
3158		- $success_msg = $args['form']->options['redirect_delay_msg'];
	2647	+ $success_msg = FrmOnSubmitHelper::get_default_redirect_msg();
3159	2648	$redirect_msg = self::get_redirect_message( $args['success_url'], $success_msg, $args );
3160	2649	$success_url = esc_url_raw( $args['success_url'] );
3161	2650
3162	2651	/**
		@@ -3163,11 +2652,11 @@
3163	2652	* Filters the delay time before redirecting when On Submit Redirect action is delayed.
3164	2653	*
3165	2654	* @since 6.0
3166	2655	*
3167		- * @param int $delay_time Delay time in milliseconds.
	2656	+ * @param int $delay_time Delay time in miliseconds.
3168	2657	*/
3169		- $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 );
3170	2659
3171	2660	if ( ! empty( $args['form']->options['open_in_new_tab'] ) ) {
3172	2661	$redirect_js = 'window.open("' . $success_url . '", "_blank")';
3173	2662	} else {
		@@ -3177,15 +2666,13 @@
3177	2666	add_filter( 'frm_use_wpautop', '__return_true' );
3178	2667
3179	2668	echo FrmAppHelper::maybe_kses( $redirect_msg ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
3180	2669	echo '<script>';
3181		-
3182	2670	if ( empty( $args['doing_ajax'] ) ) {
3183	2671	// Not AJAX submit, delay JS until window.load.
3184	2672	echo 'window.onload=function(){';
3185	2673	}
3186	2674	echo 'setTimeout(function(){' . $redirect_js . '}, ' . intval( $delay_time ) . ');'; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
3187		-
3188	2675	if ( empty( $args['doing_ajax'] ) ) {
3189	2676	echo '};';
3190	2677	}
3191	2678	echo '</script>';
		@@ -3198,16 +2685,11 @@
3198	2685	* @param string $success_msg
3199	2686	* @param array $args
3200	2687	*/
3201	2688	private static function get_redirect_message( $success_url, $success_msg, $args ) {
3202		- $success_msg = apply_filters( 'frm_content', $success_msg, $args['form'], $args['entry_id'] );
3203		- $success_msg = do_shortcode( FrmAppHelper::use_wpautop( $success_msg ) );
3204		-
3205		- // phpcs:disable Generic.WhiteSpace.ScopeIndent
3206		- $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/>' .
3207	2690	self::get_redirect_fallback_message( $success_url, $args ) .
3208	2691	'</div></div>';
3209		- // phpcs:enable Generic.WhiteSpace.ScopeIndent
3210	2692
3211	2693	$redirect_args = array(
3212	2694	'entry_id' => $args['entry_id'],
3213	2695	'form_id' => $args['form']->id,
		@@ -3223,14 +2705,12 @@
3223	2705	* @since 6.3.1
3224	2706	*
3225	2707	* @param string $success_url Redirect URL.
3226	2708	* @param array $args Contains `form` object.
3227		- *
3228	2709	* @return string
3229	2710	*/
3230	2711	private static function get_redirect_fallback_message( $success_url, $args ) {
3231	2712	$target = '';
3232		-
3233	2713	if ( ! empty( $args['form']->options['open_in_new_tab'] ) ) {
3234	2714	$target = ' target="_blank"';
3235	2715	}
3236	2716
		@@ -3245,12 +2725,8 @@
3245	2725	/**
3246	2726	* Prepare to show the success message and empty form after submit
3247	2727	*
3248	2728	* @since 2.05
3249		- *
3250		- * @param array $atts
3251		- *
3252		- * @return void
3253	2729	*/
3254	2730	public static function show_message_after_save( $atts ) {
3255	2731	$atts['message'] = self::prepare_submit_message( $atts['form'], $atts['entry_id'], $atts );
3256	2732
		@@ -3256,9 +2732,8 @@
3256	2732
3257	2733	if ( ! isset( $atts['form']->options['show_form'] ) || $atts['form']->options['show_form'] ) {
3258	2734	if ( isset( $atts['action'] ) && 'update' === $atts['action'] && is_callable( array( 'FrmProEntriesController', 'show_front_end_form_with_entry' ) ) ) {
3259	2735	$entry = FrmEntry::getOne( $atts['entry_id'] );
3260		-
3261	2736	if ( $entry ) {
3262	2737	// This is copied from the Pro plugin.
3263	2738	$atts['conf_message'] = FrmProEntriesController::confirmation( 'message', $atts['form'], $atts['form']->options, $entry->id, $atts );
3264	2739	$atts['show_form'] = FrmProEntriesController::is_form_displayed_after_edit( $atts['form'] );
		@@ -3267,9 +2742,9 @@
3267	2742	} else {
3268	2743	self::show_form_after_submit( $atts );
3269	2744	}
3270	2745	} else {
3271		- self::show_lone_success_message( $atts );
	2746	+ self::show_lone_success_messsage( $atts );
3272	2747	}
3273	2748	}
3274	2749
3275	2750	/**
		@@ -3275,12 +2750,8 @@
3275	2750	/**
3276	2751	* Show an empty form
3277	2752	*
3278	2753	* @since 2.05
3279		- *
3280		- * @param array $args
3281		- *
3282		- * @return void
3283	2754	*/
3284	2755	private static function show_form_after_submit( $args ) {
3285	2756	self::fill_atts_for_form_display( $args );
3286	2757
		@@ -3299,11 +2770,12 @@
3299	2770	}
3300	2771	unset( $args );
3301	2772
3302	2773	$include_form_tag = apply_filters( 'frm_include_form_tag', true, $form );
3303		- $frm_settings = FrmAppHelper::get_settings();
3304		- $submit = $form->options['submit_value'] ?? $frm_settings->submit_value;
3305	2774
	2775	+ $frm_settings = FrmAppHelper::get_settings();
	2776	+ $submit = isset( $form->options['submit_value'] ) ? $form->options['submit_value'] : $frm_settings->submit_value;
	2777	+
3306	2778	global $frm_vars;
3307	2779	self::maybe_load_css( $form, $values['custom_style'], $frm_vars['load_css'] );
3308	2780
3309	2781	$message_placement = self::message_placement( $form, $message );
		@@ -3311,36 +2783,27 @@
3311	2783	include FrmAppHelper::plugin_path() . '/classes/views/frm-entries/new.php';
3312	2784	}
3313	2785
3314	2786	/**
3315		- * Gets message placement.
	2787	+ * @return string - 'before', 'after', or 'submit'
3316	2788	*
3317	2789	* @since 4.05.02
3318		- * @since 6.26 This method changed from `private` to `public`.
3319		- *
3320		- * @param object $form Form object.
3321		- * @param string $message The message.
3322		- *
3323		- * @return string Accepts 'before', 'after', or 'submit'.
3324	2790	*/
3325		- public static function message_placement( $form, $message ) {
	2791	+ private static function message_placement( $form, $message ) {
3326	2792	$place = 'before';
3327	2793
3328	2794	if ( $message && isset( $form->options['form_class'] ) ) {
3329		- if ( str_contains( $form->options['form_class'], 'frm_below_success' ) ) {
	2795	+ if ( strpos( $form->options['form_class'], 'frm_below_success' ) !== false ) {
3330	2796	$place = 'after';
3331		- } elseif ( str_contains( $form->options['form_class'], 'frm_inline_success' ) ) {
	2797	+ } elseif ( strpos( $form->options['form_class'], 'frm_inline_success' ) !== false ) {
3332	2798	$place = 'submit';
3333	2799	}
3334	2800	}
3335	2801
3336	2802	/**
3337		- * Filter the message placement.
	2803	+ * @return string - 'before' or 'after'
3338	2804	*
3339	2805	* @since 4.05.02
3340		- *
3341		- * @param string $place Accepts 'before', 'after', or 'submit'.
3342		- * @param array $args Args.
3343	2806	*/
3344	2807	return apply_filters( 'frm_message_placement', $place, compact( 'form', 'message' ) );
3345	2808	}
3346	2809
		@@ -3347,12 +2810,8 @@
3347	2810	/**
3348	2811	* Get all the values needed on the new.php entry page
3349	2812	*
3350	2813	* @since 2.05
3351		- *
3352		- * @param array $args
3353		- *
3354		- * @return void
3355	2814	*/
3356	2815	private static function fill_atts_for_form_display( &$args ) {
3357	2816	if ( ! isset( $args['title'] ) && isset( $args['show_title'] ) ) {
3358	2817	$args['title'] = $args['show_title'];
		@@ -3377,24 +2836,21 @@
3377	2836	/**
3378	2837	* Show the success message without the form
3379	2838	*
3380	2839	* @since 2.05
3381		- *
3382		- * @param array $atts
3383		- *
3384		- * @return void
3385	2840	*/
3386		- private static function show_lone_success_message( $atts ) {
	2841	+ private static function show_lone_success_messsage( $atts ) {
3387	2842	global $frm_vars;
3388	2843	$values = FrmEntriesHelper::setup_new_vars( $atts['fields'], $atts['form'], true );
3389	2844	self::maybe_load_css( $atts['form'], $values['custom_style'], $frm_vars['load_css'] );
3390	2845
3391	2846	$include_extra_container = 'frm_forms' . FrmFormsHelper::get_form_style_class( $values );
3392		- $errors = array();
3393		- $form = $atts['form'];
3394		- $message = $atts['message'];
3395	2847
3396		- 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' );
3397	2853	}
3398	2854
3399	2855	/**
3400	2856	* Prepare the success message before it's shown
		@@ -3401,20 +2857,19 @@
3401	2857	*
3402	2858	* @since 2.05
3403	2859	* @since 6.0.x Added the third parameter.
3404	2860	*
3405		- * @param object $form Form object.
3406		- * @param int|string $entry_id Entry ID.
3407		- * @param array $args See {@see FrmFormsController::run_success_action()}.
3408		- *
	2861	+ * @param object $form Form object.
	2862	+ * @param int $entry_id Entry ID.
	2863	+ * @param array $args See {@see FrmFormsController::run_success_action()}.
3409	2864	* @return string
3410	2865	*/
3411	2866	private static function prepare_submit_message( $form, $entry_id, $args = array() ) {
3412	2867	$frm_settings = FrmAppHelper::get_settings( array( 'current_form' => $form->id ) );
3413		- $opt = $args['success_opt'] ?? 'success';
	2868	+ $opt = isset( $args['success_opt'] ) ? $args['success_opt'] : 'success';
3414	2869
3415	2870	if ( $entry_id && is_numeric( $entry_id ) ) {
3416		- $message = $form->options[ $opt . '_msg' ] ?? $frm_settings->success_msg;
	2871	+ $message = isset( $form->options[ $opt . '_msg' ] ) ? $form->options[ $opt . '_msg' ] : $frm_settings->success_msg;
3417	2872	$class = 'frm_message';
3418	2873	} else {
3419	2874	$message = $frm_settings->failed_msg;
3420	2875	$class = FrmFormsHelper::form_error_class();
		@@ -3431,9 +2886,9 @@
3431	2886	public static function front_head() {
3432	2887	$version = FrmAppHelper::plugin_version();
3433	2888	$suffix = FrmAppHelper::js_suffix();
3434	2889
3435		- if ( $suffix && self::has_combo_js_file() ) {
	2890	+ if ( ! empty( $suffix ) && self::has_combo_js_file() ) {
3436	2891	wp_register_script( 'formidable', FrmAppHelper::plugin_url() . '/js/frm.min.js', array( 'jquery' ), $version, true );
3437	2892	} else {
3438	2893	wp_register_script( 'formidable', FrmAppHelper::plugin_url() . "/js/formidable{$suffix}.js", array( 'jquery' ), $version, true );
3439	2894	}
		@@ -3440,9 +2895,9 @@
3440	2895
3441	2896	add_filter( 'script_loader_tag', 'FrmFormsController::defer_script_loading', 10, 2 );
3442	2897
3443	2898	if ( FrmAppHelper::is_admin() ) {
3444		- // Don't load this in back-end
	2899	+ // don't load this in back-end
3445	2900	return;
3446	2901	}
3447	2902
3448	2903	FrmAppHelper::localize_script( 'front' );
		@@ -3455,15 +2910,8 @@
3455	2910	public static function has_combo_js_file() {
3456	2911	return is_readable( FrmAppHelper::plugin_path() . '/js/frm.min.js' );
3457	2912	}
3458	2913
3459		- /**
3460		- * @param object $form
3461		- * @param int|string $this_load
3462		- * @param bool $global_load
3463		- *
3464		- * @return void
3465		- */
3466	2914	public static function maybe_load_css( $form, $this_load, $global_load ) {
3467	2915	$load_css = FrmForm::is_form_loaded( $form, $this_load, $global_load );
3468	2916
3469	2917	if ( ! $load_css ) {
		@@ -3493,9 +2941,8 @@
3493	2941	return;
3494	2942	}
3495	2943
3496	2944	global $wp_styles;
3497		-
3498	2945	if ( is_array( $wp_styles->queue ) && in_array( 'formidable', $wp_styles->queue, true ) ) {
3499	2946	wp_print_styles( 'formidable' );
3500	2947	}
3501	2948	}
		@@ -3510,52 +2957,32 @@
3510	2957	private static function should_load_late() {
3511	2958	return ! function_exists( 'aioseo' );
3512	2959	}
3513	2960
3514		- /**
3515		- * @param string $tag
3516		- * @param string $handle
3517		- *
3518		- * @return string
3519		- */
3520	2961	public static function defer_script_loading( $tag, $handle ) {
3521		- if ( 'captcha-api' === $handle && ! str_contains( $tag, 'defer' ) ) {
3522		- 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 );
3523	2964	}
3524	2965
3525	2966	return $tag;
3526	2967	}
3527	2968
3528		- /**
3529		- * @param string $location
3530		- *
3531		- * @return void
3532		- */
3533	2969	public static function footer_js( $location = 'footer' ) {
3534	2970	global $frm_vars;
3535	2971
3536	2972	FrmStylesController::enqueue_css();
3537	2973
3538		- if ( FrmAppHelper::is_admin() || $location === 'header' || empty( $frm_vars['forms_loaded'] ) ) {
3539		- return;
	2974	+ if ( ! FrmAppHelper::is_admin() && $location != 'header' && ! empty( $frm_vars['forms_loaded'] ) ) {
	2975	+ // load formidable js
	2976	+ wp_enqueue_script( 'formidable' );
3540	2977	}
3541		-
3542		- // Load formidable js
3543		- wp_enqueue_script( 'formidable' );
3544		-
3545		- FrmHoneypot::maybe_print_honeypot_js();
3546	2978	}
3547	2979
3548	2980	/**
3549	2981	* @since 2.0.8
3550		- *
3551		- * @param array $atts
3552		- * @param string $content
3553		- *
3554		- * @return void
3555	2982	*/
3556	2983	private static function maybe_minimize_form( $atts, &$content ) {
3557		- // Check if minimizing is turned on
	2984	+ // check if minimizing is turned on
3558	2985	if ( self::is_minification_on( $atts ) ) {
3559	2986	$content = str_replace( array( "\r\n", "\r", "\n", "\t", ' ' ), '', $content );
3560	2987	}
3561	2988	}
		@@ -3561,15 +2988,12 @@
3561	2988	}
3562	2989
3563	2990	/**
3564	2991	* @since 2.0.8
3565		- *
3566		- * @param array $atts
3567		- *
3568		- * @return bool
	2992	+ * @return boolean
3569	2993	*/
3570	2994	private static function is_minification_on( $atts ) {
3571		- return ! empty( $atts['minimize'] );
	2995	+ return isset( $atts['minimize'] ) && ! empty( $atts['minimize'] );
3572	2996	}
3573	2997
3574	2998	/**
3575	2999	* @since 5.0.16
		@@ -3577,13 +3001,11 @@
3577	3001	* @return void
3578	3002	*/
3579	3003	public static function landing_page_preview_option() {
3580	3004	$dir = apply_filters( 'frm_landing_page_preview_option', false );
3581		-
3582	3005	if ( false === $dir || ! file_exists( $dir . 'landing-page-preview-option.php' ) ) {
3583	3006	$dir = self::get_form_views_path();
3584	3007	}
3585		-
3586	3008	include $dir . 'landing-page-preview-option.php';
3587	3009	}
3588	3010
3589	3011	/**
		@@ -3609,15 +3031,13 @@
3609	3031
3610	3032	check_ajax_referer( 'frm_ajax', 'nonce' );
3611	3033
3612	3034	$type = FrmAppHelper::get_post_param( 'type', '', 'sanitize_text_field' );
3613		-
3614	3035	if ( ! $type || ! in_array( $type, array( 'form', 'view' ), true ) ) {
3615	3036	die( 0 );
3616	3037	}
3617	3038
3618	3039	$object_id = FrmAppHelper::get_post_param( 'object_id', '', 'absint' );
3619		-
3620	3040	if ( ! $object_id ) {
3621	3041	die( 0 );
3622	3042	}
3623	3043
		@@ -3629,15 +3049,13 @@
3629	3049	$postarr['post_content'] = apply_filters( 'frm_create_page_with_' . $type . '_shortcode_content', '', $object_id );
3630	3050	}
3631	3051
3632	3052	$name = FrmAppHelper::get_post_param( 'name', '', 'sanitize_text_field' );
3633		-
3634	3053	if ( $name ) {
3635	3054	$postarr['post_title'] = $name;
3636	3055	}
3637	3056
3638	3057	$success = wp_insert_post( $postarr );
3639		-
3640	3058	if ( ! is_numeric( $success ) || ! $success ) {
3641	3059	die( 0 );
3642	3060	}
3643	3061
		@@ -3651,9 +3069,8 @@
3651	3069	/**
3652	3070	* @since 5.3
3653	3071	*
3654	3072	* @param int $form_id
3655		- *
3656	3073	* @return string
3657	3074	*/
3658	3075	private static function get_page_shortcode_content_for_form( $form_id ) {
3659	3076	$shortcode = '[formidable id="' . $form_id . '"]';
		@@ -3674,9 +3091,9 @@
3674	3091
3675	3092	check_ajax_referer( 'frm_ajax', 'nonce' );
3676	3093
3677	3094	$html = FrmAppHelper::clip(
3678		- function () {
	3095	+ function() {
3679	3096	FrmAppHelper::maybe_autocomplete_pages_options(
3680	3097	array(
3681	3098	'field_name' => 'frm_page_dropdown',
3682	3099	'page_id' => '',
		@@ -3695,14 +3112,89 @@
3695	3112	}
3696	3113
3697	3114	/**
3698	3115	* @deprecated 4.0
	3116	+ */
	3117	+ public static function new_form( $values = array() ) {
	3118	+ FrmDeprecated::new_form( $values );
	3119	+ }
	3120	+
	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	+ }
	3128	+
	3129	+ /**
	3130	+ * @deprecated 3.0
	3131	+ * @codeCoverageIgnore
	3132	+ */
	3133	+ public static function bulk_create_template( $ids ) {
	3134	+ return FrmDeprecated::bulk_create_template( $ids );
	3135	+ }
	3136	+
	3137	+ /**
	3138	+ * @deprecated 3.0
	3139	+ * @codeCoverageIgnore
	3140	+ */
	3141	+ public static function edit_key() {
	3142	+ FrmDeprecated::edit_key();
	3143	+ }
	3144	+
	3145	+ /**
	3146	+ * @deprecated 3.0
	3147	+ * @codeCoverageIgnore
	3148	+ */
	3149	+ public static function edit_description() {
	3150	+ FrmDeprecated::edit_description();
	3151	+ }
	3152	+
	3153	+ /**
	3154	+ * @deprecated 4.08
	3155	+ * @since 3.06
	3156	+ */
	3157	+ public static function add_new() {
	3158	+ _deprecated_function( __FUNCTION__, '4.08' );
	3159	+ }
	3160	+
	3161	+ /**
	3162	+ * Create a custom template from a form
3699	3163	*
3700		- * @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
3701	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	+ *
3702	3186	* @return void
3703	3187	*/
3704		- public static function create( $values = array() ) {
3705		- _deprecated_function( __METHOD__, '4.0', 'FrmFormsController::update' );
3706		- self::update( $values );
	3188	+ public static function before_list_templates() {
	3189	+ _deprecated_function( __METHOD__, '6.7' );
	3190	+ }
	3191	+
	3192	+ /**
	3193	+ * @deprecated 6.7
	3194	+ *
	3195	+ * @return void
	3196	+ */
	3197	+ public static function list_templates() {
	3198	+ _deprecated_function( __METHOD__, '6.7' );
3707	3199	}
3708	3200	}