← All changes | classes/controllers/FrmFormsController.php +458 -1133 6.26 → 6.2 View file →

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