← All changes | classes/controllers/FrmFormsController.php +182 -1063 6.4 → 5.0 View file →

		@@ -4,18 +4,8 @@
4	4	}
5	5
6	6	class FrmFormsController {
7	7
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 currect tab.
11		- *
12		- * @since 6.2
13		- *
14		- * @var array Keys are form IDs and values are 1.
15		- */
16		- private static $redirected_in_new_tab = array();
17		-
18	8	public static function menu() {
19	9	$menu_label = __( 'Forms', 'formidable' );
20	10	if ( ! FrmAppHelper::pro_is_installed() ) {
21	11	$menu_label .= ' (Lite)';
		@@ -25,9 +15,10 @@
25	15	self::maybe_load_listing_hooks();
26	16	}
27	17
28	18	public static function maybe_load_listing_hooks() {
29		- if ( ! FrmAppHelper::on_form_listing_page() ) {
	19	+ $action = FrmAppHelper::simple_get( 'frm_action', 'sanitize_title' );
	20	+ if ( ! empty( $action ) && ! in_array( $action, array( 'list', 'trash', 'untrash', 'destroy' ) ) ) {
30	21	return;
31	22	}
32	23
33	24	add_filter( 'get_user_option_managetoplevel_page_formidablecolumnshidden', 'FrmFormsController::hidden_columns' );
		@@ -42,9 +33,9 @@
42	33	}
43	34	}
44	35
45	36	public static function register_widgets() {
46		- require_once FrmAppHelper::plugin_path() . '/classes/widgets/FrmShowForm.php';
	37	+ require_once( FrmAppHelper::plugin_path() . '/classes/widgets/FrmShowForm.php' );
47	38	register_widget( 'FrmShowForm' );
48	39	}
49	40
50	41	/**
		@@ -52,14 +43,11 @@
52	43	*
53	44	* @since 4.06.03
54	45	*/
55	46	public static function logic_tip() {
56		- $images_url = FrmAppHelper::plugin_url() . '/images/';
57		- $data_message = __( 'Only show the fields you need and create branching forms. Upgrade to get conditional logic and question branching.', 'formidable' );
58		- $data_message .= ' <img src="' . esc_attr( $images_url ) . '/survey-logic.png" srcset="' . esc_attr( $images_url ) . 'survey-logic@2x.png 2x" alt="' . esc_attr__( 'Conditional Logic options', 'formidable' ) . '"/>';
59		- echo '<a href="javascript:void(0)" class="frm_noallow frm_show_upgrade frm_add_logic_link frm-collapsed frm-flex-justify" data-upgrade="' . esc_attr__( 'Conditional Logic options', 'formidable' ) . '" data-message="' . esc_attr( $data_message ) . '" data-medium="builder" data-content="logic">';
60		- esc_html_e( 'Conditional Logic', 'formidable' );
61		- FrmAppHelper::icon_by_class( 'frmfont frm_arrowdown6_icon', array( 'aria-hidden' => 'true' ) );
	47	+ echo '<a href="javascript:void(0)" class="frm_noallow frm_show_upgrade frm_add_logic_link" data-upgrade="' . esc_attr__( 'Conditional Logic options', 'formidable' ) . '" data-message="' . esc_attr__( 'Only show the fields you need and create branching forms. Upgrade to get conditional logic and question branching.', 'formidable' ) . esc_attr( ' <img src="https://cdn.formidableforms.com/wp-content/themes/fp2015git/images/survey/survey-logic.png" srcset="https://cdn.formidableforms.com/wp-content/themes/fp2015git/images/survey/survey-logic@2x.png 2x" alt="Conditional Logic options"/>' ) . '" data-medium="builder" data-content="logic">';
	48	+ FrmAppHelper::icon_by_class( 'frmfont frm_swap_icon' );
	49	+ esc_html_e( 'Add Conditional Logic', 'formidable' );
62	50	echo '</a>';
63	51	}
64	52
65	53	/**
		@@ -73,11 +61,8 @@
73	61
74	62	return $shortcodes;
75	63	}
76	64
77		- /**
78		- * @return void
79		- */
80	65	public static function list_form() {
81	66	FrmAppHelper::permission_check( 'frm_view_forms' );
82	67
83	68	$message = '';
		@@ -88,17 +73,27 @@
88	73	unset( $errors['message'] );
89	74	}
90	75	$errors = apply_filters( 'frm_admin_list_form_action', $errors );
91	76
92		- self::display_forms_list( $params, $message, $errors );
	77	+ return self::display_forms_list( $params, $message, $errors );
93	78	}
94	79
95	80	/**
	81	+ * Load the scripts before a modal can be triggered.
	82	+ *
	83	+ * @since 4.0
	84	+ */
	85	+ private static function init_modal() {
	86	+ wp_enqueue_script( 'jquery-ui-dialog' );
	87	+ wp_enqueue_style( 'jquery-ui-dialog' );
	88	+ }
	89	+
	90	+ /**
96	91	* Create the default email action
97	92	*
98	93	* @since 2.02.11
99	94	*
100		- * @param object|int $form
	95	+ * @param object $form
101	96	*/
102	97	private static function create_default_email_action( $form ) {
103	98	FrmForm::maybe_get_form( $form );
104	99	$create_email = apply_filters( 'frm_create_default_email_action', true, $form );
		@@ -108,34 +103,8 @@
108	103	$action_control->create( $form->id );
109	104	}
110	105	}
111	106
112		- /**
113		- * Create the default On submit action
114		- *
115		- * @since 6.0.0
116		- *
117		- * @param object|int $form Form object or ID.
118		- */
119		- private static function create_default_on_submit_action( $form ) {
120		- FrmForm::maybe_get_form( $form );
121		-
122		- /**
123		- * Enable or disable the default On Submit action.
124		- *
125		- * @since 6.0.0
126		- *
127		- * @param bool $create Set to `false` if you want to disable.
128		- * @param object $form Form object.
129		- */
130		- $create = apply_filters( 'frm_create_default_on_submit_action', true, $form );
131		-
132		- if ( $create ) {
133		- $action_control = FrmFormActionsController::get_form_actions( FrmOnSubmitAction::$slug );
134		- $action_control->create( $form->id );
135		- }
136		- }
137		-
138	107	public static function edit( $values = false ) {
139	108	FrmAppHelper::permission_check( 'frm_edit_forms' );
140	109
141	110	$id = isset( $values['id'] ) ? absint( $values['id'] ) : FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
		@@ -149,10 +118,8 @@
149	118	if ( ! $id || ! is_numeric( $id ) ) {
150	119	$id = FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
151	120	}
152	121
153		- FrmOnSubmitHelper::maybe_migrate_submit_settings_to_action( $id );
154		-
155	122	return self::get_settings_vars( $id, array(), $message );
156	123	}
157	124
158	125	public static function update_settings() {
		@@ -159,10 +126,10 @@
159	126	FrmAppHelper::permission_check( 'frm_edit_forms' );
160	127
161	128	$id = FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
162	129
163		- $errors = FrmForm::validate( $_POST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
164		- $warnings = FrmFormsHelper::check_for_warnings( $_POST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
	130	+ $errors = FrmForm::validate( $_POST );
	131	+ $warnings = FrmFormsHelper::check_for_warnings( $_POST );
165	132
166	133	if ( count( $errors ) > 0 ) {
167	134	return self::get_settings_vars( $id, $errors, compact( 'warnings' ) );
168	135	}
		@@ -170,11 +137,11 @@
170	137	do_action( 'frm_before_update_form_settings', $id );
171	138
172	139	$antispam_was_on = self::antispam_was_on( $id );
173	140
174		- FrmForm::update( $id, $_POST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
	141	+ FrmForm::update( $id, $_POST );
175	142
176		- $antispam_is_on = ! empty( $_POST['options']['antispam'] ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
	143	+ $antispam_is_on = ! empty( $_POST['options']['antispam'] );
177	144	if ( $antispam_is_on !== $antispam_was_on ) {
178	145	FrmAntiSpam::clear_caches();
179	146	}
180	147
		@@ -193,9 +160,9 @@
193	160	}
194	161
195	162	public static function update( $values = array() ) {
196	163	if ( empty( $values ) ) {
197		- $values = $_POST; // phpcs:ignore WordPress.Security.NonceVerification.Missing
	164	+ $values = $_POST;
198	165	}
199	166
200	167	// Set radio button and checkbox meta equal to "other" value.
201	168	if ( FrmAppHelper::pro_is_installed() ) {
		@@ -225,9 +192,9 @@
225	192	);
226	193	}
227	194
228	195	if ( defined( 'DOING_AJAX' ) ) {
229		- wp_die( FrmAppHelper::kses( $message, array( 'a' ) ) ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
	196	+ wp_die( FrmAppHelper::kses( $message, array( 'a' ) ) ); // WPCS: XSS ok.
230	197	}
231	198
232	199	return self::get_edit_vars( $id, array(), $message );
233	200	}
		@@ -269,34 +236,19 @@
269	236	}
270	237
271	238	public static function duplicate() {
272	239	FrmAppHelper::permission_check( 'frm_edit_forms' );
273		- $nonce = FrmAppHelper::simple_get( '_wpnonce' );
274	240
275		- if ( ! wp_verify_nonce( $nonce ) ) {
276		- $frm_settings = FrmAppHelper::get_settings();
277		- wp_die( esc_html( $frm_settings->admin_permission ) );
278		- }
279		-
280	241	$params = FrmForm::list_page_params();
281	242	$form = FrmForm::duplicate( $params['id'], $params['template'], true );
282		- $url = admin_url( 'admin.php?page=formidable' );
283		- $message = 'form_duplicate_error';
284		-
	243	+ $message = $params['template'] ? __( 'Form template was Successfully Created', 'formidable' ) : __( 'Form was Successfully Copied', 'formidable' );
285	244	if ( $form ) {
286		- $url = admin_url( 'admin.php?page=formidable&frm_action=edit&id=' . absint( $form ) );
287		- $message = 'form_duplicated';
	245	+ return self::get_edit_vars( $form, array(), $message, true );
	246	+ } else {
	247	+ return self::display_forms_list( $params, __( 'There was a problem creating the new template.', 'formidable' ) );
288	248	}
289		-
290		- $url .= '&message=' . $message;
291		-
292		- wp_safe_redirect( $url );
293		- exit();
294	249	}
295	250
296		- /**
297		- * @return string
298		- */
299	251	public static function page_preview() {
300	252	$params = FrmForm::list_page_params();
301	253	if ( ! $params['form'] ) {
302	254	return;
		@@ -303,9 +255,9 @@
303	255	}
304	256
305	257	$form = FrmForm::getOne( $params['form'] );
306	258	if ( $form ) {
307		- return self::show_form( $form->id, '', 'auto', 'auto' );
	259	+ return self::show_form( $form->id, '', true, true );
308	260	}
309	261	}
310	262
311	263	/**
		@@ -311,21 +263,19 @@
311	263	/**
312	264	* @since 3.0
313	265	*/
314	266	public static function show_page_preview() {
315		- echo self::page_preview(); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
	267	+ echo self::page_preview(); // WPCS: XSS ok.
316	268	}
317	269
318		- /**
319		- * @return void
320		- */
321	270	public static function preview() {
322	271	do_action( 'frm_wp' );
323		- FrmAppHelper::set_current_screen_and_hook_suffix();
324	272
325	273	global $frm_vars;
326	274	$frm_vars['preview'] = true;
327	275
	276	+ self::load_wp();
	277	+
328	278	$include_theme = FrmAppHelper::get_param( 'theme', '', 'get', 'absint' );
329	279	if ( $include_theme ) {
330	280	self::set_preview_query();
331	281	self::load_theme_preview();
		@@ -336,58 +286,42 @@
336	286	wp_die();
337	287	}
338	288
339	289	/**
340		- * Set the page global to any available page (except for the Blog Page).
341		- *
342		- * @return void
	290	+ * @since 3.0
343	291	*/
344		- private static function set_preview_query() {
345		- $page_query = array(
346		- 'numberposts' => 1,
347		- 'orderby' => 'date',
348		- 'order' => 'ASC',
349		- 'post_type' => 'page',
350		- );
351		-
352		- $page_for_posts = get_option( 'page_for_posts' );
353		- if ( is_numeric( $page_for_posts ) ) {
354		- // Avoid querying for the "Posts Page" or "Blog Page" so we don't display 10 forms.
355		- $page_query['post__not_in'] = array( $page_for_posts );
	292	+ private static function load_wp() {
	293	+ if ( ! defined( 'ABSPATH' ) && ! defined( 'XMLRPC_REQUEST' ) ) {
	294	+ global $wp;
	295	+ $root = dirname( dirname( dirname( dirname( __FILE__ ) ) ) );
	296	+ include_once( $root . '/wp-config.php' );
	297	+ $wp->init();
	298	+ $wp->register_globals();
356	299	}
	300	+ }
357	301
358		- $random_page = get_posts( $page_query );
359		- if ( ! $random_page ) {
360		- return;
361		- }
362		-
363		- $random_page = reset( $random_page );
364		- query_posts(
	302	+ private static function set_preview_query() {
	303	+ $random_page = get_posts(
365	304	array(
366		- 'post_type' => 'page',
367		- 'page_id' => $random_page->ID,
	305	+ 'numberposts' => 1,
	306	+ 'orderby' => 'date',
	307	+ 'order' => 'ASC',
	308	+ 'post_type' => 'page',
368	309	)
369	310	);
370	311
371		- // Fixes Pro issue #3004. Prevent an undefined $post object.
372		- // Otherwise WordPress themes will trigger a warning "Attempt to read property "comment_count" on null".
373		- self::set_post_global( $random_page );
	312	+ if ( ! empty( $random_page ) ) {
	313	+ $random_page = reset( $random_page );
	314	+ query_posts(
	315	+ array(
	316	+ 'post_type' => 'page',
	317	+ 'page_id' => $random_page->ID,
	318	+ )
	319	+ );
	320	+ }
374	321	}
375	322
376	323	/**
377		- * Set the WP $post global object. Used for in-theme preview when defining a page.
378		- *
379		- * @since 5.5.2
380		- *
381		- * @param WP_Post $post
382		- * @return void
383		- */
384		- private static function set_post_global( $page ) {
385		- global $post;
386		- $post = $page; // phpcs:ignore WordPress.WP.GlobalVariablesOverride
387		- }
388		-
389		- /**
390	324	* @since 3.0
391	325	*/
392	326	private static function load_theme_preview() {
393	327	add_filter( 'wp_title', 'FrmFormsController::preview_title', 9999 );
		@@ -477,24 +411,15 @@
477	411	public static function untrash() {
478	412	self::change_form_status( 'untrash' );
479	413	}
480	414
481		- /**
482		- * @param array $ids
483		- * @return string
484		- */
485	415	public static function bulk_untrash( $ids ) {
486	416	FrmAppHelper::permission_check( 'frm_edit_forms' );
487	417
488	418	$count = FrmForm::set_status( $ids, 'published' );
489	419
490		- if ( ! $count ) {
491		- // Don't show "0 forms restored" on refresh.
492		- return '';
493		- }
494		-
495	420	/* translators: %1$s: Number of forms */
496		- $message = sprintf( _n( '%1$s form restored from the Trash.', '%1$s forms restored from the Trash.', $count, 'formidable' ), $count );
	421	+ $message = sprintf( _n( '%1$s form restored from the Trash.', '%1$s forms restored from the Trash.', $count, 'formidable' ), 1 );
497	422
498	423	return $message;
499	424	}
500	425
		@@ -515,9 +440,9 @@
515	440
516	441	/**
517	442	* @param string $status
518	443	*
519		- * @return void
	444	+ * @return int The number of forms changed
520	445	*/
521	446	public static function change_form_status( $status ) {
522	447	$available_status = array(
523	448	'untrash' => array(
		@@ -649,36 +574,18 @@
649	574	*
650	575	* @since 4.0
651	576	*/
652	577	public static function build_new_form() {
	578	+ global $wpdb;
	579	+
653	580	FrmAppHelper::permission_check( 'frm_edit_forms' );
654	581	check_ajax_referer( 'frm_ajax', 'nonce' );
655	582
656	583	$new_values = self::get_modal_values();
657	584	$new_values['form_key'] = $new_values['name'];
658		- $new_values['options'] = array(
659		- 'antispam' => 1,
660		- 'on_submit_migrated' => 1,
661		- );
662	585
663		- /**
664		- * Allows changing form values before creating from the modal.
665		- *
666		- * @since 5.4
667		- *
668		- * @param array $values Form values.
669		- */
670		- $new_values = apply_filters( 'frm_new_form_values', $new_values );
671		-
672	586	$form_id = FrmForm::create( $new_values );
673		- /**
674		- * @since 5.3
675		- *
676		- * @param int $form_id
677		- */
678		- do_action( 'frm_build_new_form', $form_id );
679	587
680		- self::create_default_on_submit_action( $form_id );
681	588	self::create_default_email_action( $form_id );
682	589
683	590	$response = array(
684	591	'redirect' => FrmForm::get_edit_link( $form_id ),
		@@ -712,9 +619,9 @@
712	619	FrmForm::clear_form_cache();
713	620	}
714	621
715	622	$response = array(
716		- 'redirect' => admin_url( 'admin.php?page=formidable&frm_action=duplicate&id=' . $new_form_id ) . '&_wpnonce=' . wp_create_nonce(),
	623	+ 'redirect' => admin_url( 'admin.php?page=formidable&frm_action=duplicate&id=' . $new_form_id ),
717	624	);
718	625	}
719	626
720	627	echo wp_json_encode( $response );
		@@ -747,18 +654,16 @@
747	654	FrmAppHelper::load_admin_wide_js();
748	655	$menu_name = FrmAppHelper::get_menu_name();
749	656	$icon = apply_filters( 'frm_media_icon', FrmAppHelper::svg_logo() );
750	657	echo '<a href="#TB_inline?width=50&height=50&inlineId=frm_insert_form" class="thickbox button add_media frm_insert_form" title="' . esc_attr__( 'Add forms and content', 'formidable' ) . '">' .
751		- FrmAppHelper::kses( $icon, 'all' ) . // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
752		- ' ' . esc_html( $menu_name ) . '</a>';
	658	+ FrmAppHelper::kses( $icon, 'all' ) .
	659	+ ' ' . esc_html( $menu_name ) . '</a>'; // WPCS: XSS ok.
753	660	}
754	661	}
755	662
756		- /**
757		- * @return void
758		- */
759	663	public static function insert_form_popup() {
760		- if ( ! self::should_insert_form_popup() ) {
	664	+ $page = basename( FrmAppHelper::get_server_value( 'PHP_SELF' ) );
	665	+ if ( ! in_array( $page, array( 'post.php', 'page.php', 'page-new.php', 'post-new.php' ) ) ) {
761	666	return;
762	667	}
763	668
764	669	FrmAppHelper::load_admin_wide_js();
		@@ -768,38 +673,14 @@
768	673	'name' => __( 'Form', 'formidable' ),
769	674	'label' => __( 'Insert a Form', 'formidable' ),
770	675	),
771	676	);
	677	+
772	678	$shortcodes = apply_filters( 'frm_popup_shortcodes', $shortcodes );
773	679
774		- include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/insert_form_popup.php';
775		-
776		- if ( FrmAppHelper::is_form_builder_page() && ! class_exists( '_WP_Editors', false ) ) {
777		- // initialize a wysiwyg so we have usable settings defined in tinyMCEPreInit.mceInit
778		- require ABSPATH . WPINC . '/class-wp-editor.php';
779		- ?>
780		- <div class="frm_hidden">
781		- <?php wp_editor( '', 'frm_description_placeholder', array() ); ?>
782		- </div>
783		- <?php
784		- }
	680	+ include( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/insert_form_popup.php' );
785	681	}
786	682
787		- /**
788		- * Check the page being loaded, determine if this is a page that should include the form popup.
789		- *
790		- * @since 5.0.14
791		- *
792		- * @return bool
793		- */
794		- private static function should_insert_form_popup() {
795		- if ( FrmAppHelper::is_form_builder_page() ) {
796		- return true;
797		- }
798		- $page = basename( FrmAppHelper::get_server_value( 'PHP_SELF' ) );
799		- return in_array( $page, array( 'post.php', 'page.php', 'page-new.php', 'post-new.php' ), true );
800		- }
801		-
802	683	public static function get_shortcode_opts() {
803	684	FrmAppHelper::permission_check( 'frm_view_forms' );
804	685	check_ajax_referer( 'frm_ajax', 'nonce' );
805	686
		@@ -845,32 +726,18 @@
845	726
846	727	wp_die();
847	728	}
848	729
849		- /**
850		- * Display list of forms in a table.
851		- *
852		- * @param array $params
853		- * @param string $message
854		- * @param array $errors
855		- * @return void
856		- */
857	730	public static function display_forms_list( $params = array(), $message = '', $errors = array() ) {
858	731	FrmAppHelper::permission_check( 'frm_view_forms' );
859	732
860	733	global $wpdb, $frm_vars;
861	734
862		- if ( ! $params ) {
	735	+ if ( empty( $params ) ) {
863	736	$params = FrmForm::list_page_params();
864	737	}
865	738
866		- /**
867		- * @since 5.3.1
868		- *
869		- * @param string $table_class Class name for List Helper.
870		- */
871		- $table_class = apply_filters( 'frm_forms_list_class', 'FrmFormsListHelper' );
872		- $wp_list_table = new $table_class( compact( 'params' ) );
	739	+ $wp_list_table = new FrmFormsListHelper( compact( 'params' ) );
873	740
874	741	$pagenum = $wp_list_table->get_pagenum();
875	742
876	743	$wp_list_table->prepare_items();
		@@ -880,22 +747,34 @@
880	747	wp_redirect( esc_url_raw( add_query_arg( 'paged', $total_pages ) ) );
881	748	die();
882	749	}
883	750
884		- require FrmAppHelper::plugin_path() . '/classes/views/frm-forms/list.php';
	751	+ require( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/list.php' );
885	752	}
886	753
887		- /**
888		- * @param array<string,string> $columns
889		- * @return array<string,string>
890		- */
891	754	public static function get_columns( $columns ) {
892		- $columns['cb'] = '<input type="checkbox" />';
893		- $columns['name'] = __( 'Form Title', 'formidable' );
894		- $columns['entries'] = __( 'Entries', 'formidable' );
895		- $columns['id'] = 'ID';
896		- $columns['form_key'] = __( 'Key', 'formidable' );
897		- $columns['shortcode'] = __( 'Actions', 'formidable' );
	755	+ $columns['cb'] = '<input type="checkbox" />';
	756	+ $columns['id'] = 'ID';
	757	+
	758	+ $type = FrmAppHelper::get_simple_request(
	759	+ array(
	760	+ 'param' => 'form_type',
	761	+ 'type' => 'request',
	762	+ 'default' => 'published',
	763	+ )
	764	+ );
	765	+
	766	+ if ( 'template' == $type ) {
	767	+ $columns['name'] = __( 'Template Name', 'formidable' );
	768	+ $columns['type'] = __( 'Type', 'formidable' );
	769	+ $columns['form_key'] = __( 'Key', 'formidable' );
	770	+ } else {
	771	+ $columns['name'] = __( 'Form Title', 'formidable' );
	772	+ $columns['entries'] = __( 'Entries', 'formidable' );
	773	+ $columns['form_key'] = __( 'Key', 'formidable' );
	774	+ $columns['shortcode'] = __( 'Shortcodes', 'formidable' );
	775	+ }
	776	+
898	777	$columns['created_at'] = __( 'Date', 'formidable' );
899	778
900	779	add_screen_option(
901	780	'per_page',
		@@ -918,17 +797,9 @@
918	797	'created_at' => 'created_at',
919	798	);
920	799	}
921	800
922		- /**
923		- * @param mixed $hidden_columns
924		- * @return array
925		- */
926	801	public static function hidden_columns( $hidden_columns ) {
927		- if ( ! is_array( $hidden_columns ) ) {
928		- $hidden_columns = array();
929		- }
930		-
931	802	$type = FrmAppHelper::get_simple_request(
932	803	array(
933	804	'param' => 'form_type',
934	805	'type' => 'request',
		@@ -960,10 +831,8 @@
960	831	}
961	832
962	833	/**
963	834	* Get data from api before rendering it so that we can flag the modal as expired
964		- *
965		- * @return void
966	835	*/
967	836	public static function before_list_templates() {
968	837	global $frm_templates;
969	838	global $frm_expired;
		@@ -984,11 +853,8 @@
984	853	$frm_expired = $expired;
985	854	$frm_license_type = $license_type;
986	855	}
987	856
988		- /**
989		- * @return void
990		- */
991	857	public static function list_templates() {
992	858	global $frm_templates;
993	859	global $frm_license_type;
994	860
		@@ -1072,9 +938,9 @@
1072	938	'id' => $template->id,
1073	939	'name' => $template->name,
1074	940	'key' => $template->form_key,
1075	941	'description' => $template->description,
1076		- 'url' => wp_nonce_url( admin_url( 'admin.php?page=formidable&frm_action=duplicate&id=' . absint( $template->id ) ) ),
	942	+ 'url' => admin_url( 'admin.php?page=formidable&frm_action=duplicate&id=' . absint( $template->id ) ),
1077	943	'released' => $template->created_at,
1078	944	'installed' => 1,
1079	945	);
1080	946	array_unshift( $templates, $template );
		@@ -1108,28 +974,17 @@
1108	974	}
1109	975
1110	976	unset( $reset_fields );
1111	977
1112		- $args = array( 'parent_form_id' => $form->id );
1113		- $values = FrmAppHelper::setup_edit_vars( $form, 'forms', '', true, array(), $args );
	978	+ $args = array( 'parent_form_id' => $form->id );
	979	+ $values = FrmAppHelper::setup_edit_vars( $form, 'forms', '', true, array(), $args );
	980	+ $values['fields'] = $fields;
1114	981
1115		- /**
1116		- * Allows modifying the list of fields in the form builder.
1117		- *
1118		- * @since 5.0.04
1119		- *
1120		- * @param object[] $fields Array of fields.
1121		- * @param array $args The arguments. Contains `form`.
1122		- */
1123		- $values['fields'] = apply_filters( 'frm_fields_in_form_builder', $fields, compact( 'form' ) );
1124		-
1125	982	$edit_message = __( 'Form was successfully updated.', 'formidable' );
1126	983	if ( $form->is_template && $message == $edit_message ) {
1127	984	$message = __( 'Template was successfully updated.', 'formidable' );
1128	985	}
1129	986
1130		- self::maybe_update_form_builder_message( $message );
1131		-
1132	987	$all_templates = FrmForm::getAll( array( 'is_template' => 1 ), 'name' );
1133	988	$has_fields = isset( $values['fields'] ) && ! empty( $values['fields'] );
1134	989
1135	990	if ( defined( 'DOING_AJAX' ) ) {
		@@ -1138,21 +993,8 @@
1138	993	require( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/edit.php' );
1139	994	}
1140	995	}
1141	996
1142		- public static function update_form_builder_fields( $fields, $form ) {
1143		- foreach ( $fields as $field ) {
1144		- $field->do_not_include_icons = true;
1145		- }
1146		- return $fields;
1147		- }
1148		-
1149		- public static function maybe_update_form_builder_message( &$message ) {
1150		- if ( 'form_duplicated' === FrmAppHelper::simple_get( 'message' ) ) {
1151		- $message = __( 'Form was Successfully Copied', 'formidable' );
1152		- }
1153		- }
1154		-
1155	997	public static function get_settings_vars( $id, $errors = array(), $args = array() ) {
1156	998	FrmAppHelper::permission_check( 'frm_edit_forms' );
1157	999
1158	1000	global $frm_vars;
		@@ -1175,18 +1017,8 @@
1175	1017	$form = FrmForm::getOne( $id );
1176	1018	$fields = FrmField::get_all_for_form( $id );
1177	1019	$values = FrmAppHelper::setup_edit_vars( $form, 'forms', $fields, true );
1178	1020
1179		- /**
1180		- * Allows changing fields in the form settings.
1181		- *
1182		- * @since 5.0.04
1183		- *
1184		- * @param array $fields Array of fields.
1185		- * @param array $args The arguments. Contains `form`.
1186		- */
1187		- $values['fields'] = apply_filters( 'frm_fields_in_settings', $values['fields'], compact( 'form' ) );
1188		-
1189	1021	self::clean_submit_html( $values );
1190	1022
1191	1023	$sections = self::get_settings_tabs( $values );
1192	1024	$current = FrmAppHelper::simple_get( 't', 'sanitize_title', 'advanced_settings' );
		@@ -1224,53 +1056,32 @@
1224	1056	'id' => 'frm_notification_settings',
1225	1057	'icon' => 'frm_icon_font frm_mail_bulk_icon',
1226	1058	),
1227	1059	'permissions' => array(
1228		- 'name' => __( 'Form Permissions', 'formidable' ),
1229		- 'icon' => 'frm_icon_font frm_lock_icon',
1230		- 'html_class' => 'frm_show_upgrade_tab frm_noallow',
1231		- 'data' => array(
1232		- 'medium' => 'permissions',
1233		- 'upgrade' => __( 'Form Permissions', 'formidable' ),
1234		- 'message' => __( 'Allow editing, protect forms and files, limit entries, and save drafts. Upgrade to get form and entry permissions.', 'formidable' ),
1235		- 'screenshot' => 'permissions.png',
	1060	+ 'name' => __( 'Form Permissions', 'formidable' ),
	1061	+ 'icon' => 'frm_icon_font frm_lock_icon',
	1062	+ 'html_class' => 'frm_show_upgrade frm_noallow',
	1063	+ 'data' => array(
	1064	+ 'medium' => 'permissions',
	1065	+ 'upgrade' => __( 'Form Permissions', 'formidable' ),
	1066	+ 'message' => __( 'Allow editing, protect forms and files, limit entries, and save drafts. Upgrade to get form and entry permissions.', 'formidable' ),
1236	1067	),
1237	1068	),
1238	1069	'scheduling' => array(
1239		- 'name' => __( 'Form Scheduling', 'formidable' ),
1240		- 'icon' => 'frm_icon_font frm_calendar_icon',
1241		- 'html_class' => 'frm_show_upgrade_tab frm_noallow',
1242		- 'data' => array(
1243		- 'medium' => 'scheduling',
1244		- 'upgrade' => __( 'Form scheduling settings', 'formidable' ),
1245		- 'screenshot' => 'scheduling.png',
	1070	+ 'name' => __( 'Form Scheduling', 'formidable' ),
	1071	+ 'icon' => 'frm_icon_font frm_calendar_icon',
	1072	+ 'html_class' => 'frm_show_upgrade frm_noallow',
	1073	+ 'data' => array(
	1074	+ 'medium' => 'scheduling',
	1075	+ 'upgrade' => __( 'Form scheduling settings', 'formidable' ),
1246	1076	),
1247	1077	),
1248	1078	'buttons' => array(
1249		- 'name' => __( 'Buttons', 'formidable' ),
	1079	+ 'name' => __( 'Styling & Buttons', 'formidable' ),
1250	1080	'class' => __CLASS__,
1251	1081	'function' => 'buttons_settings',
1252		- 'icon' => 'frm_icon_font frm_button_icon',
	1082	+ 'icon' => 'frm_icon_font frm_pallet_icon',
1253	1083	),
1254		- 'landing' => array(
1255		- 'name' => __( 'Form Landing Page', 'formidable' ),
1256		- 'icon' => 'frm_icon_font frm_file_text_icon',
1257		- 'html_class' => 'frm_show_upgrade_tab frm_noallow',
1258		- 'data' => FrmAppHelper::get_landing_page_upgrade_data_params(),
1259		- ),
1260		- 'chat' => array(
1261		- 'name' => __( 'Conversational Forms', 'formidable' ),
1262		- 'icon' => 'frm_icon_font frm_chat_forms_icon',
1263		- 'html_class' => 'frm_show_upgrade_tab frm_noallow',
1264		- 'data' => FrmAppHelper::get_upgrade_data_params(
1265		- 'chat',
1266		- array(
1267		- 'upgrade' => __( 'Conversational Forms', 'formidable' ),
1268		- 'message' => __( 'Ask one question at a time for automated conversations.', 'formidable' ),
1269		- 'screenshot' => 'chat.png',
1270		- )
1271		- ),
1272		- ),
1273	1084	'html' => array(
1274	1085	'name' => __( 'Customize HTML', 'formidable' ),
1275	1086	'class' => __CLASS__,
1276	1087	'function' => 'html_settings',
		@@ -1277,14 +1088,8 @@
1277	1088	'icon' => 'frm_icon_font frm_code_icon',
1278	1089	),
1279	1090	);
1280	1091
1281		- foreach ( array( 'landing', 'chat' ) as $feature ) {
1282		- if ( ! FrmAppHelper::show_new_feature( $feature ) ) {
1283		- unset( $sections[ $feature ] );
1284		- }
1285		- }
1286		-
1287	1092	$sections = apply_filters( 'frm_add_form_settings_section', $sections, $values );
1288	1093
1289	1094	if ( FrmAppHelper::pro_is_installed() && ! FrmAppHelper::meets_min_pro_version( '4.0' ) ) {
1290	1095	// Prevent settings from showing in 2 spots.
		@@ -1332,9 +1137,9 @@
1332	1137
1333	1138	/**
1334	1139	* @param array $values
1335	1140	*/
1336		- public static function render_spam_settings( $values ) {
	1141	+ private static function render_spam_settings( $values ) {
1337	1142	if ( function_exists( 'akismet_http_post' ) ) {
1338	1143	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/spam-settings/akismet.php';
1339	1144	}
1340	1145	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/spam-settings/honeypot.php';
		@@ -1376,35 +1181,10 @@
1376	1181	$values['submit_html'] = str_replace( 'javascript:void(0)', '#', $values['submit_html'] );
1377	1182	}
1378	1183	}
1379	1184
1380		- /**
1381		- * Updates classes used in submit and prev buttons to avoid conflict with twenty twenty-one theme.
1382		- *
1383		- * @param array $classes
1384		- *
1385		- * @return array
1386		- */
1387		- public static function update_button_classes( $classes ) {
1388		- if ( function_exists( 'twenty_twenty_one_setup' ) ) {
1389		- $classes[] = 'has-text-color has-background';
1390		- }
1391		-
1392		- return $classes;
1393		- }
1394		-
1395	1185	public static function mb_tags_box( $form_id, $class = '' ) {
1396		- $fields = FrmField::get_all_for_form( $form_id, '', 'include' );
1397		-
1398		- /**
1399		- * Allows modifying the list of fields in the tags box.
1400		- *
1401		- * @since 5.0.04
1402		- *
1403		- * @param array $fields The list of fields.
1404		- * @param array $args The arguments. Contains `form_id`.
1405		- */
1406		- $fields = apply_filters( 'frm_fields_in_tags_box', $fields, compact( 'form_id' ) );
	1186	+ $fields = FrmField::get_all_for_form( $form_id, '', 'include' );
1407	1187	$linked_forms = array();
1408	1188	$col = 'one';
1409	1189	$settings_tab = FrmAppHelper::is_admin_page( 'formidable' ) ? true : false;
1410	1190
		@@ -1444,9 +1224,8 @@
1444	1224	* Add extra helper shortcodes on the Advanced tab in form settings and views
1445	1225	*
1446	1226	* @since 3.04.01
1447	1227	*
1448		- * @param array $advanced_helpers
1449	1228	* @param array $atts - Includes fields and form_id
1450	1229	*/
1451	1230	return apply_filters( 'frm_advanced_helpers', $advanced_helpers, $atts );
1452	1231	}
		@@ -1524,9 +1303,8 @@
1524	1303	if ( $settings_tab ) {
1525	1304	$entry_shortcodes['default-message'] = __( 'Default Msg', 'formidable' );
1526	1305	$entry_shortcodes['default-html'] = __( 'Default HTML', 'formidable' );
1527	1306	$entry_shortcodes['default-plain'] = __( 'Default Plain', 'formidable' );
1528		- $entry_shortcodes['form_name'] = __( 'Form Name', 'formidable' );
1529	1307	}
1530	1308
1531	1309	/**
1532	1310	* Use this hook to add or remove buttons in the helpers section
		@@ -1539,12 +1317,9 @@
1539	1317	return $entry_shortcodes;
1540	1318	}
1541	1319
1542	1320	/**
1543		- * Insert the form class setting into the form.
1544		- *
1545		- * @param stdClass $form
1546		- * @return void
	1321	+ * Insert the form class setting into the form
1547	1322	*/
1548	1323	public static function form_classes( $form ) {
1549	1324	if ( isset( $form->options['form_class'] ) ) {
1550	1325	echo esc_attr( sanitize_text_field( $form->options['form_class'] ) );
		@@ -1549,36 +1324,18 @@
1549	1324	if ( isset( $form->options['form_class'] ) ) {
1550	1325	echo esc_attr( sanitize_text_field( $form->options['form_class'] ) );
1551	1326	}
1552	1327
1553		- if ( ! empty( $form->options['js_validate'] ) ) {
	1328	+ if ( isset( $form->options['js_validate'] ) && $form->options['js_validate'] ) {
1554	1329	echo ' frm_js_validate ';
1555		- self::add_js_validate_form_to_global_vars( $form );
1556	1330	}
1557		-
1558		- if ( ! FrmFormsHelper::should_use_pro_for_ajax_submit() && FrmForm::is_ajax_on( $form ) ) {
1559		- echo ' frm_ajax_submit ';
1560		- }
1561	1331	}
1562	1332
1563		- /**
1564		- * @since 5.0.03
1565		- *
1566		- * @param stdClass $form
1567		- */
1568		- public static function add_js_validate_form_to_global_vars( $form ) {
1569		- global $frm_vars;
1570		- if ( ! isset( $frm_vars['js_validate_forms'] ) ) {
1571		- $frm_vars['js_validate_forms'] = array();
1572		- }
1573		- $frm_vars['js_validate_forms'][ $form->id ] = $form;
1574		- }
1575		-
1576	1333	public static function get_email_html() {
1577	1334	FrmAppHelper::permission_check( 'frm_view_forms' );
1578	1335	check_ajax_referer( 'frm_ajax', 'nonce' );
1579	1336
1580		- echo FrmEntriesController::show_entry_shortcode( // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
	1337	+ echo FrmEntriesController::show_entry_shortcode( // WPCS: XSS ok.
1581	1338	array(
1582	1339	'form_id' => FrmAppHelper::get_post_param( 'form_id', '', 'absint' ),
1583	1340	'default_email' => true,
1584	1341	'plain_text' => FrmAppHelper::get_post_param( 'plain_text', '', 'absint' ),
		@@ -1586,17 +1343,9 @@
1586	1343	);
1587	1344	wp_die();
1588	1345	}
1589	1346
1590		- /**
1591		- * @param string $content
1592		- * @param stdClass|string|int $form
1593		- * @param stdClass|string|int|false $entry
1594		- * @return string
1595		- */
1596	1347	public static function filter_content( $content, $form, $entry = false ) {
1597		- $content = self::replace_form_name_shortcodes( $content, $form );
1598		-
1599	1348	self::get_entry_by_param( $entry );
1600	1349	if ( ! $entry ) {
1601	1350	return $content;
1602	1351	}
		@@ -1610,38 +1359,8 @@
1610	1359
1611	1360	return $content;
1612	1361	}
1613	1362
1614		- /**
1615		- * Replace any [form_name] shortcodes in a string.
1616		- *
1617		- * @since 5.5
1618		- *
1619		- * @param string|array $string
1620		- * @param stdClass|string|int $form
1621		- * @return string|array
1622		- */
1623		- public static function replace_form_name_shortcodes( $string, $form ) {
1624		- if ( ! is_string( $string ) ) {
1625		- return $string;
1626		- }
1627		-
1628		- if ( false === strpos( $string, '[form_name]' ) ) {
1629		- return $string;
1630		- }
1631		-
1632		- if ( ! is_object( $form ) ) {
1633		- $form = FrmForm::getOne( $form );
1634		- }
1635		-
1636		- $form_name = is_object( $form ) ? $form->name : '';
1637		- return str_replace( '[form_name]', $form_name, $string );
1638		- }
1639		-
1640		- /**
1641		- * @param stdClass|string|int|false $entry
1642		- * @return void
1643		- */
1644	1363	private static function get_entry_by_param( &$entry ) {
1645	1364	if ( ! $entry || ! is_object( $entry ) ) {
1646	1365	if ( ! $entry || ! is_numeric( $entry ) ) {
1647	1366	$entry = FrmAppHelper::get_post_param( 'id', false, 'sanitize_title' );
		@@ -1711,13 +1430,13 @@
1711	1430	$action = isset( $_REQUEST['frm_action'] ) ? 'frm_action' : 'action';
1712	1431	$vars = array();
1713	1432	FrmAppHelper::include_svg();
1714	1433
1715		- if ( isset( $_POST['frm_compact_fields'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
	1434	+ if ( isset( $_POST['frm_compact_fields'] ) ) {
1716	1435	FrmAppHelper::permission_check( 'frm_edit_forms' );
1717	1436
1718	1437	// Javascript needs to be allowed in some field settings.
1719		- // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized, WordPress.Security.NonceVerification.Missing
	1438	+ // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized
1720	1439	$json_vars = htmlspecialchars_decode( nl2br( str_replace( '&quot;', '"', wp_unslash( $_POST['frm_compact_fields'] ) ) ) );
1721	1440	$json_vars = json_decode( $json_vars, true );
1722	1441	if ( empty( $json_vars ) ) {
1723	1442	// json decoding failed so we should return an error message.
		@@ -1729,11 +1448,11 @@
1729	1448	add_filter( 'frm_validate_form', 'FrmFormsController::json_error' );
1730	1449	} else {
1731	1450	$vars = FrmAppHelper::json_to_array( $json_vars );
1732	1451	$action = $vars[ $action ];
1733		- unset( $_REQUEST['frm_compact_fields'], $_POST['frm_compact_fields'] ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
1734		- $_REQUEST = array_merge( $_REQUEST, $vars ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
1735		- $_POST = array_merge( $_POST, $_REQUEST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
	1452	+ unset( $_REQUEST['frm_compact_fields'], $_POST['frm_compact_fields'] );
	1453	+ $_REQUEST = array_merge( $_REQUEST, $vars );
	1454	+ $_POST = array_merge( $_POST, $_REQUEST );
1736	1455	}
1737	1456	} else {
1738	1457	$action = FrmAppHelper::get_param( $action, '', 'get', 'sanitize_title' );
1739	1458	if ( isset( $_REQUEST['delete_all'] ) ) {
		@@ -1750,8 +1469,9 @@
1750	1469	return self::new_form( $vars );
1751	1470	case 'create':
1752	1471	case 'edit':
1753	1472	case 'update':
	1473	+ case 'duplicate':
1754	1474	case 'trash':
1755	1475	case 'untrash':
1756	1476	case 'destroy':
1757	1477	case 'delete_all':
		@@ -1775,21 +1495,12 @@
1775	1495
1776	1496	if ( strpos( $action, 'bulk_' ) === 0 ) {
1777	1497	FrmAppHelper::remove_get_action();
1778	1498
1779		- self::list_form();
1780		- return;
	1499	+ return self::list_form();
1781	1500	}
1782	1501
1783		- $message = FrmAppHelper::get_param( 'message' );
1784		- if ( 'form_duplicate_error' === $message ) {
1785		- self::display_forms_list( array(), '', array( __( 'There was a problem duplicating the form', 'formidable' ) ) );
1786		- return;
1787		- }
1788		-
1789		- self::display_forms_list();
1790		-
1791		- return;
	1502	+ return self::display_forms_list();
1792	1503	}
1793	1504	}
1794	1505
1795	1506	public static function json_error( $errors ) {
		@@ -1918,9 +1629,8 @@
1918	1629	/**
1919	1630	* The formidable shortcode
1920	1631	*
1921	1632	* @param array $atts The params from the shortcode.
1922		- * @return string
1923	1633	*/
1924	1634	public static function get_form_shortcode( $atts ) {
1925	1635	global $frm_vars;
1926	1636	if ( isset( $frm_vars['skip_shortcode'] ) && $frm_vars['skip_shortcode'] ) {
		@@ -1932,10 +1642,10 @@
1932	1642	$shortcode_atts = shortcode_atts(
1933	1643	array(
1934	1644	'id' => '',
1935	1645	'key' => '',
1936		- 'title' => 'auto',
1937		- 'description' => 'auto',
	1646	+ 'title' => false,
	1647	+ 'description' => false,
1938	1648	'readonly' => false,
1939	1649	'entry_id' => false,
1940	1650	'fields' => array(),
1941	1651	'exclude_fields' => array(),
		@@ -1947,45 +1657,18 @@
1947	1657
1948	1658	return self::show_form( $shortcode_atts['id'], $shortcode_atts['key'], $shortcode_atts['title'], $shortcode_atts['description'], $atts );
1949	1659	}
1950	1660
1951		- /**
1952		- * @since 5.2.01
1953		- *
1954		- * @param string|int|false $id
1955		- * @param string|false $key
1956		- * @return stdClass|false
1957		- */
1958		- private static function maybe_get_form_by_id_or_key( $id, $key ) {
1959		- if ( ! $id ) {
	1661	+ public static function show_form( $id = '', $key = '', $title = false, $description = false, $atts = array() ) {
	1662	+ if ( empty( $id ) ) {
1960	1663	$id = $key;
1961	1664	}
1962		- return self::maybe_get_form_to_show( $id );
1963		- }
1964	1665
1965		- /**
1966		- * @param string|int|false $id
1967		- * @param string|false $key
1968		- * @param string|int|bool $title may be 'auto', true, false, 'true', 'false', 'yes', '1', 1, '0', 0.
1969		- * @param string|int|bool $description may be 'auto', true, false, 'true', 'false', 'yes', '1', 1, '0', 0.
1970		- * @param array $atts
1971		- * @return string
1972		- */
1973		- public static function show_form( $id = '', $key = '', $title = false, $description = false, $atts = array() ) {
1974		- $form = self::maybe_get_form_by_id_or_key( $id, $key );
1975		-
	1666	+ $form = self::maybe_get_form_to_show( $id );
1976	1667	if ( ! $form ) {
1977	1668	return __( 'Please select a valid form', 'formidable' );
1978	1669	}
1979	1670
1980		- if ( 'auto' === $title ) {
1981		- $title = ! empty( $form->options['show_title'] );
1982		- }
1983		-
1984		- if ( 'auto' === $description ) {
1985		- $description = ! empty( $form->options['show_description'] );
1986		- }
1987		-
1988	1671	FrmAppController::maybe_update_styles();
1989	1672
1990	1673	add_action( 'frm_load_form_hooks', 'FrmHooksController::trigger_load_form_hooks' );
1991	1674	FrmAppHelper::trigger_hook_load( 'form', $form );
		@@ -2014,18 +1697,14 @@
2014	1697
2015	1698	return $form;
2016	1699	}
2017	1700
2018		- /**
2019		- * @param string|int|false $id
2020		- * @return stdClass|false
2021		- */
2022	1701	private static function maybe_get_form_to_show( $id ) {
2023	1702	$form = false;
2024	1703
2025		- if ( ! empty( $id ) ) { // form id or key is set
	1704	+ if ( ! empty( $id ) ) { // no form id or key set
2026	1705	$form = FrmForm::getOne( $id );
2027		- if ( ! $form || $form->parent_form_id || $form->status === 'trash' ) {
	1706	+ if ( ! $form || $form->parent_form_id || $form->status == 'trash' ) {
2028	1707	$form = false;
2029	1708	}
2030	1709	}
2031	1710
		@@ -2032,9 +1711,9 @@
2032	1711	return $form;
2033	1712	}
2034	1713
2035	1714	private static function is_viewable_draft_form( $form ) {
2036		- return $form->status === 'draft' && current_user_can( 'frm_edit_forms' ) && ! FrmAppHelper::is_preview_page();
	1715	+ return $form->status == 'draft' && current_user_can( 'frm_edit_forms' ) && ! FrmAppHelper::is_preview_page();
2037	1716	}
2038	1717
2039	1718	public static function get_form( $form, $title, $description, $atts = array() ) {
2040	1719	ob_start();
		@@ -2062,15 +1741,11 @@
2062	1741	$fields = FrmFieldsHelper::get_form_fields( $form->id, $errors );
2063	1742	$reset = false;
2064	1743	$pass_args = compact( 'form', 'fields', 'errors', 'title', 'description', 'reset' );
2065	1744
2066		- $pass_args['action'] = $params['action'];
2067		- $handle_process_here = $params['action'] === 'create' && $params['posted_form_id'] == $form->id && $_POST; // phpcs:ignore WordPress.Security.NonceVerification.Missing
	1745	+ $handle_process_here = $params['action'] == 'create' && $params['posted_form_id'] == $form->id && $_POST;
2068	1746
2069	1747	if ( ! $handle_process_here ) {
2070		- FrmFormState::set_initial_value( 'title', $title );
2071		- FrmFormState::set_initial_value( 'description', $description );
2072		-
2073	1748	do_action( 'frm_display_form_action', $params, $fields, $form, $title, $description );
2074	1749	if ( apply_filters( 'frm_continue_to_new', true, $form->id, $params['action'] ) ) {
2075	1750	self::show_form_after_submit( $pass_args );
2076	1751	}
		@@ -2084,10 +1759,11 @@
2084	1759	if ( apply_filters( 'frm_continue_to_create', true, $form->id ) ) {
2085	1760	$entry_id = self::just_created_entry( $form->id );
2086	1761	$pass_args['entry_id'] = $entry_id;
2087	1762	$pass_args['reset'] = true;
	1763	+ $pass_args['conf_method'] = self::get_confirmation_method( compact( 'form', 'entry_id' ) );
2088	1764
2089		- self::run_on_submit_actions( $pass_args );
	1765	+ self::run_success_action( $pass_args );
2090	1766
2091	1767	do_action(
2092	1768	'frm_after_entry_processed',
2093	1769	array(
		@@ -2106,23 +1782,15 @@
2106	1782	*/
2107	1783	private static function get_saved_errors( $form, $params ) {
2108	1784	global $frm_vars;
2109	1785
2110		- if ( $params['posted_form_id'] == $form->id && $_POST && isset( $frm_vars['created_entries'][ $form->id ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
	1786	+ if ( $params['posted_form_id'] == $form->id && $_POST && isset( $frm_vars['created_entries'][ $form->id ] ) ) {
2111	1787	$errors = $frm_vars['created_entries'][ $form->id ]['errors'];
2112	1788	} else {
2113	1789	$errors = array();
2114	1790	}
2115	1791
2116		- /**
2117		- * Allows modifying the generated errors if the form was processed earlier.
2118		- *
2119		- * @since 5.2.03
2120		- *
2121		- * @param array $errors Errors data. Is empty array if no errors found.
2122		- * @param array $params Form params. See {@see FrmForm::get_params()}.
2123		- */
2124		- return apply_filters( 'frm_saved_errors', $errors, $params );
	1792	+ return $errors;
2125	1793	}
2126	1794
2127	1795	/**
2128	1796	* @since 2.2.7
		@@ -2133,35 +1801,15 @@
2133	1801	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;
2134	1802	}
2135	1803
2136	1804	/**
2137		- * Gets confirmation method.
2138		- *
2139	1805	* @since 3.0
2140		- * @since 6.0 This method can return an array of met On Submit actions.
2141		- *
2142		- * @param array $atts {
2143		- * Atts.
2144		- *
2145		- * @type object $form Form object.
2146		- * @type int $entry_id Entry ID.
2147		- * }
2148		- * @return string|array
2149	1806	*/
2150	1807	private static function get_confirmation_method( $atts ) {
2151		- $action = FrmOnSubmitHelper::current_event( $atts );
2152		- $opt = 'update' === $action ? 'edit_action' : 'success_action';
	1808	+ $opt = 'success_action';
2153	1809	$method = ( isset( $atts['form']->options[ $opt ] ) && ! empty( $atts['form']->options[ $opt ] ) ) ? $atts['form']->options[ $opt ] : 'message';
	1810	+ $method = apply_filters( 'frm_success_filter', $method, $atts['form'], 'create' );
2154	1811
2155		- if ( ! empty( $atts['entry_id'] ) ) {
2156		- $met_actions = self::get_met_on_submit_actions( $atts, $action );
2157		- if ( $met_actions ) {
2158		- $method = $met_actions;
2159		- }
2160		- }
2161		-
2162		- $method = apply_filters( 'frm_success_filter', $method, $atts['form'], $action );
2163		-
2164	1812	if ( $method != 'message' && ( ! $atts['entry_id'] || ! is_numeric( $atts['entry_id'] ) ) ) {
2165	1813	$method = 'message';
2166	1814	}
2167	1815
		@@ -2177,34 +1825,11 @@
2177	1825	$conf_method = self::get_confirmation_method(
2178	1826	array(
2179	1827	'form' => $form,
2180	1828	'entry_id' => $params['id'],
2181		- 'action' => FrmOnSubmitHelper::current_event( $params ),
2182	1829	)
2183	1830	);
2184	1831
2185		- self::maybe_trigger_redirect_with_action( $conf_method, $form, $params, $args );
2186		- }
2187		-
2188		- /**
2189		- * Maybe trigger redirect with the new Confirmation action.
2190		- *
2191		- * @since 6.1.1
2192		- *
2193		- * @param array|string $conf_method Array of confirmation actions or the action type string.
2194		- * @param object $form Form object.
2195		- * @param array $params See {@see FrmFormsController::maybe_trigger_redirect()}.
2196		- * @param array $args See {@see FrmFormsController::maybe_trigger_redirect()}.
2197		- */
2198		- public static function maybe_trigger_redirect_with_action( $conf_method, $form, $params, $args ) {
2199		- if ( is_array( $conf_method ) && 1 === count( $conf_method ) ) {
2200		- if ( 'redirect' === FrmOnSubmitHelper::get_action_type( $conf_method[0] ) ) {
2201		- $event = FrmOnSubmitHelper::current_event( $params );
2202		- FrmOnSubmitHelper::populate_on_submit_data( $form->options, $conf_method[0], $event );
2203		- $conf_method = 'redirect';
2204		- }
2205		- }
2206		-
2207	1832	if ( 'redirect' === $conf_method ) {
2208	1833	self::trigger_redirect( $form, $params, $args );
2209	1834	}
2210	1835	}
		@@ -2227,36 +1852,21 @@
2227	1852	/**
2228	1853	* Used when the success action is not 'message'
2229	1854	*
2230	1855	* @since 2.05
2231		- * @since 6.0 `$args['force_delay_redirect']` is added.
2232		- *
2233		- * @param array $args {
2234		- * The args.
2235		- *
2236		- * @type string $conf_method The method.
2237		- * @type object $form Form object.
2238		- * @type int $entry_id Entry ID.
2239		- * @type string $action The action event. Accepts `create` or `update`.
2240		- * @type array $fields The array of fields.
2241		- * @type int $force_delay_redirect Force to show the message before redirecting in case redirect method runs.
2242		- * }
2243	1856	*/
2244	1857	public static function run_success_action( $args ) {
2245		- global $frm_vars;
2246	1858	$extra_args = $args;
2247	1859	unset( $extra_args['form'] );
2248	1860
2249	1861	do_action( 'frm_success_action', $args['conf_method'], $args['form'], $args['form']->options, $args['entry_id'], $extra_args );
2250	1862
2251		- $opt = ( ! isset( $args['action'] ) || $args['action'] === 'create' ) ? 'success' : 'edit';
	1863	+ $opt = ( ! isset( $args['action'] ) || $args['action'] == 'create' ) ? 'success' : 'edit';
2252	1864
2253	1865	$args['success_opt'] = $opt;
2254		- $args['ajax'] = ! empty( $frm_vars['ajax'] );
2255		-
2256		- if ( $args['conf_method'] === 'page' && is_numeric( $args['form']->options[ $opt . '_page_id' ] ) ) {
	1866	+ if ( $args['conf_method'] == 'page' && is_numeric( $args['form']->options[ $opt . '_page_id' ] ) ) {
2257	1867	self::load_page_after_submit( $args );
2258		- } elseif ( $args['conf_method'] === 'redirect' ) {
	1868	+ } elseif ( $args['conf_method'] == 'redirect' ) {
2259	1869	self::redirect_after_submit( $args );
2260	1870	} else {
2261	1871	self::show_message_after_save( $args );
2262	1872	}
		@@ -2262,224 +1872,8 @@
2262	1872	}
2263	1873	}
2264	1874
2265	1875	/**
2266		- * Gets met On Submit actions.
2267		- *
2268		- * @since 6.0
2269		- *
2270		- * @param array $args See {@see FrmFormsController::run_success_action()}.
2271		- * @param string $event Form event. Default is `create`.
2272		- * @return array Array of actions that meet the conditional logics.
2273		- */
2274		- public static function get_met_on_submit_actions( $args, $event = 'create' ) {
2275		- if ( ! FrmOnSubmitHelper::form_has_migrated( $args['form'] ) ) {
2276		- return array();
2277		- }
2278		-
2279		- // If a redirect action has already opened the URL in a new tab, we show the default message in the currect tab.
2280		- if ( ! empty( self::$redirected_in_new_tab[ $args['form']->id ] ) ) {
2281		- return array( FrmOnSubmitHelper::get_fallback_action_after_open_in_new_tab( $event ) );
2282		- }
2283		-
2284		- $entry = FrmEntry::getOne( $args['entry_id'], true );
2285		- $actions = FrmOnSubmitHelper::get_actions( $args['form']->id );
2286		- $met_actions = array();
2287		- $has_redirect = false;
2288		-
2289		- foreach ( $actions as $action ) {
2290		- if ( ! in_array( $event, $action->post_content['event'], true ) ) {
2291		- continue;
2292		- }
2293		-
2294		- if ( FrmFormAction::action_conditions_met( $action, $entry ) ) {
2295		- continue;
2296		- }
2297		-
2298		- $action_type = FrmOnSubmitHelper::get_action_type( $action );
2299		-
2300		- if ( 'redirect' === $action_type ) {
2301		- if ( $has_redirect ) { // Do not process because we run the first redirect action only.
2302		- continue;
2303		- }
2304		- }
2305		-
2306		- if ( ! self::is_valid_on_submit_action( $action, $args, $event ) ) {
2307		- continue;
2308		- }
2309		-
2310		- if ( 'redirect' === $action_type ) {
2311		- $has_redirect = true;
2312		- }
2313		-
2314		- $met_actions[] = $action;
2315		- unset( $action );
2316		- }
2317		-
2318		- $args['event'] = $event;
2319		-
2320		- /**
2321		- * Filters the On Submit actions that meet the conditional logics.
2322		- *
2323		- * @since 6.0
2324		- *
2325		- * @param array $met_actions Actions that meet the conditional logics.
2326		- * @param array $args See {@see FrmFormsController::run_success_action()}. `$args['event']` is also added.
2327		- */
2328		- $met_actions = apply_filters( 'frm_get_met_on_submit_actions', $met_actions, $args );
2329		-
2330		- if ( empty( $met_actions ) ) {
2331		- $met_actions = array( FrmOnSubmitHelper::get_fallback_action( $event ) );
2332		- }
2333		-
2334		- return $met_actions;
2335		- }
2336		-
2337		- /**
2338		- * Checks if a Confirmation action has the valid data.
2339		- *
2340		- * @since 6.1.2
2341		- *
2342		- * @param object $action Form action object.
2343		- * @param array $args See {@see FrmFormsController::run_success_action()}.
2344		- * @param string $event Form event. Default is `create`.
2345		- * @return bool
2346		- */
2347		- private static function is_valid_on_submit_action( $action, $args, $event = 'create' ) {
2348		- $action_type = FrmOnSubmitHelper::get_action_type( $action );
2349		-
2350		- if ( 'redirect' === $action_type ) {
2351		- // Run through frm_redirect_url filter. This is used for the valid action check.
2352		- $action->post_content['success_url'] = apply_filters(
2353		- 'frm_redirect_url',
2354		- $action->post_content['success_url'],
2355		- $args['form'],
2356		- $args + array( 'action' => $event )
2357		- );
2358		-
2359		- return ! empty( $action->post_content['success_url'] );
2360		- }
2361		-
2362		- if ( 'page' === $action_type ) {
2363		- if ( empty( $action->post_content['success_page_id'] ) ) {
2364		- return false;
2365		- }
2366		-
2367		- $page = get_post( $action->post_content['success_page_id'] );
2368		- if ( ! $page || 'trash' === $page->post_status ) {
2369		- return false;
2370		- }
2371		- }
2372		-
2373		- return true;
2374		- }
2375		-
2376		- /**
2377		- * Runs On Submit actions.
2378		- *
2379		- * @since 6.0
2380		- *
2381		- * @param array $args See inside {@see FrmFormsController::get_form_contents()} method.
2382		- */
2383		- public static function run_on_submit_actions( $args ) {
2384		- $args['conf_method'] = self::get_confirmation_method(
2385		- array(
2386		- 'form' => $args['form'],
2387		- 'entry_id' => $args['entry_id'],
2388		- 'action' => FrmOnSubmitHelper::current_event( $args ),
2389		- )
2390		- );
2391		- if ( ! is_array( $args['conf_method'] ) ) {
2392		- self::run_success_action( $args );
2393		- return;
2394		- }
2395		-
2396		- // If conf_method is an array, run On Submit actions.
2397		- if ( ! $args['conf_method'] ) {
2398		- // Use default message.
2399		- FrmOnSubmitHelper::populate_on_submit_data( $args['form']->options );
2400		- self::run_success_action( $args );
2401		- } elseif ( 1 === count( $args['conf_method'] ) ) {
2402		- FrmOnSubmitHelper::populate_on_submit_data( $args['form']->options, reset( $args['conf_method'] ) );
2403		- $args['conf_method'] = $args['form']->options['success_action'];
2404		- self::run_success_action( $args );
2405		- } else {
2406		- self::run_multi_on_submit_actions( $args );
2407		- }
2408		- }
2409		-
2410		- /**
2411		- * Runs multiple success actions.
2412		- *
2413		- * @since 6.0
2414		- *
2415		- * @param array $args See {@see FrmFormsController::run_success_action()}.
2416		- */
2417		- public static function run_multi_on_submit_actions( $args ) {
2418		- $redirect_action = null;
2419		- foreach ( $args['conf_method'] as $action ) {
2420		- if ( 'redirect' === FrmOnSubmitHelper::get_action_type( $action ) ) {
2421		- // We catch the redirect action to run it last.
2422		- $redirect_action = $action;
2423		- continue;
2424		- }
2425		-
2426		- self::run_single_on_submit_action( $args, $action );
2427		-
2428		- unset( $action );
2429		- }
2430		-
2431		- if ( $redirect_action ) {
2432		- // Show script to delay the redirection.
2433		- $args['force_delay_redirect'] = true;
2434		- self::run_single_on_submit_action( $args, $redirect_action );
2435		- }
2436		- }
2437		-
2438		- /**
2439		- * Runs single On Submit action.
2440		- *
2441		- * @since 6.0
2442		- *
2443		- * @param array $args See {@see FrmFormsController::run_success_action()}.
2444		- * @param object $action On Submit action object.
2445		- */
2446		- public static function run_single_on_submit_action( $args, $action ) {
2447		- $new_args = self::get_run_success_action_args( $args, $action );
2448		- self::run_success_action( $new_args );
2449		- }
2450		-
2451		- /**
2452		- * Gets run_success_action() args from the On Submit action.
2453		- *
2454		- * @since 6.0
2455		- *
2456		- * @param array $args See {@see FrmFormsController::run_success_action()}.
2457		- * @param object $action On Submit action object.
2458		- * @return array
2459		- */
2460		- private static function get_run_success_action_args( $args, $action ) {
2461		- $new_args = $args;
2462		-
2463		- FrmOnSubmitHelper::populate_on_submit_data( $new_args['form']->options, $action, $args['action'] );
2464		-
2465		- $opt = 'update' === $args['action'] ? 'edit_' : 'success_';
2466		-
2467		- $new_args['conf_method'] = $new_args['form']->options[ $opt . 'action' ];
2468		-
2469		- /**
2470		- * Filters the run success action args.
2471		- *
2472		- * @since 6.0
2473		- *
2474		- * @param array $new_args The new args.
2475		- * @param array $args The old args. See {@see FrmFormsController::run_success_action()}.
2476		- * @param object $action On Submit action object.
2477		- */
2478		- return apply_filters( 'frm_get_run_success_action_args', $new_args, $args, $action );
2479		- }
2480		-
2481		- /**
2482	1876	* @since 3.0
2483	1877	*/
2484	1878	private static function load_page_after_submit( $args ) {
2485	1879	global $post;
		@@ -2488,22 +1882,9 @@
2488	1882	$page = get_post( $args['form']->options[ $opt . '_page_id' ] );
2489	1883	$old_post = $post;
2490	1884	$post = $page;
2491	1885	$content = apply_filters( 'frm_content', $page->post_content, $args['form'], $args['entry_id'] );
2492		-
2493		- // Fix the On Submit page content doesn't show when previewing In theme.
2494		- $has_preview_filter = has_filter( 'the_content', 'FrmFormsController::preview_content' );
2495		-
2496		- if ( $has_preview_filter ) {
2497		- remove_filter( 'the_content', 'FrmFormsController::preview_content', 9999 );
2498		- }
2499		-
2500		- echo apply_filters( 'the_content', $content ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
2501		-
2502		- if ( $has_preview_filter ) {
2503		- add_filter( 'the_content', 'FrmFormsController::preview_content', 9999 );
2504		- }
2505		-
	1886	+ echo apply_filters( 'the_content', $content ); // WPCS: XSS ok.
2506	1887	$post = $old_post;
2507	1888	}
2508	1889	}
2509	1890
		@@ -2508,11 +1889,12 @@
2508	1889	}
2509	1890
2510	1891	/**
2511	1892	* @since 3.0
2512		- * @param array $args See {@see FrmFormsController::run_success_action()}.
2513	1893	*/
2514	1894	private static function redirect_after_submit( $args ) {
	1895	+ global $frm_vars;
	1896	+
2515	1897	add_filter( 'frm_use_wpautop', '__return_false' );
2516	1898
2517	1899	$opt = $args['success_opt'];
2518	1900	$success_url = trim( $args['form']->options[ $opt . '_url' ] );
		@@ -2518,8 +1900,12 @@
2518	1900	$success_url = trim( $args['form']->options[ $opt . '_url' ] );
2519	1901	$success_url = apply_filters( 'frm_content', $success_url, $args['form'], $args['entry_id'] );
2520	1902	$success_url = do_shortcode( $success_url );
2521	1903
	1904	+ $success_msg = isset( $args['form']->options[ $opt . '_msg' ] ) ? $args['form']->options[ $opt . '_msg' ] : __( 'Please wait while you are redirected.', 'formidable' );
	1905	+
	1906	+ $redirect_msg = self::get_redirect_message( $success_url, $success_msg, $args );
	1907	+
2522	1908	$args['id'] = $args['entry_id'];
2523	1909	FrmEntriesController::delete_entry_before_redirect( $success_url, $args['form'], $args );
2524	1910
2525	1911	add_filter( 'frm_redirect_url', 'FrmEntriesController::prepare_redirect_url' );
		@@ -2526,122 +1912,20 @@
2526	1912	$success_url = apply_filters( 'frm_redirect_url', $success_url, $args['form'], $args );
2527	1913
2528	1914	$doing_ajax = FrmAppHelper::doing_ajax();
2529	1915
2530		- if ( ! empty( $args['ajax'] ) && $doing_ajax && empty( $args['force_delay_redirect'] ) ) { // Is AJAX submit and there is just one Redirect action runs.
2531		- echo json_encode( self::get_ajax_redirect_response_data( $args + compact( 'success_url' ) ) );
	1916	+ if ( isset( $args['ajax'] ) && $args['ajax'] && $doing_ajax ) {
	1917	+ echo json_encode( array( 'redirect' => $success_url ) );
2532	1918	wp_die();
2533		- }
2534		-
2535		- if ( ! headers_sent() && empty( $args['force_delay_redirect'] ) ) { // Not AJAX submit, no headers sent, and there is just one Redirect action runs.
2536		- if ( ! empty( $args['form']->options['open_in_new_tab'] ) ) {
2537		- self::print_open_in_new_tab_js_with_fallback_handler( $success_url, $args );
2538		- self::$redirected_in_new_tab[ $args['form']->id ] = 1;
2539		- return;
2540		- }
2541		-
	1919	+ } elseif ( ! headers_sent() ) {
2542	1920	wp_redirect( esc_url_raw( $success_url ) );
2543	1921	die(); // do not use wp_die or redirect fails
2544		- }
2545		-
2546		- // Redirect with a delay.
2547		- self::redirect_after_submit_using_js( $args + compact( 'success_url', 'doing_ajax' ) );
2548		- }
2549		-
2550		- /**
2551		- * Prints open in new tab js with fallback handler.
2552		- *
2553		- * @since 6.x
2554		- *
2555		- * @param string $success_url Success URL.
2556		- * @param array $args See {@see FrmFormsController::redirect_after_submit()}.
2557		- */
2558		- private static function print_open_in_new_tab_js_with_fallback_handler( $success_url, $args ) {
2559		- echo '<script>var newTab = window.open("' . esc_url_raw( $success_url ) . '", "_blank");';
2560		- echo 'if ( ! newTab ) {';
2561		-
2562		- $data = array(
2563		- 'formId' => intval( $args['form']->id ),
2564		- 'message' => self::get_redirect_fallback_message( $success_url, $args ),
2565		- );
2566		- // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
2567		- echo 'frmShowNewTabFallback = ' . FrmAppHelper::maybe_json_encode( $data ) . ';';
2568		- echo '}</script>';
2569		- }
2570		-
2571		- /**
2572		- * Gets response data for redirect action when AJAX submitting.
2573		- *
2574		- * @since 6.x
2575		- *
2576		- * @param array $args See {@see FrmFormsController::run_success_action()}.
2577		- * @return array
2578		- */
2579		- private static function get_ajax_redirect_response_data( $args ) {
2580		- $response_data = array( 'redirect' => $args['success_url'] );
2581		-
2582		- if ( ! empty( $args['form']->options['open_in_new_tab'] ) ) {
2583		- $response_data['openInNewTab'] = 1;
2584		-
2585		- $args['message'] = FrmOnSubmitHelper::get_default_new_tab_msg();
2586		-
2587		- $args['form']->options['success_msg'] = $args['message'];
2588		- $args['form']->options['edit_msg'] = $args['message'];
2589		- if ( ! isset( $args['fields'] ) ) {
2590		- $args['fields'] = FrmField::get_all_for_form( $args['form']->id );
2591		- }
2592		-
2593		- $args['message'] = self::prepare_submit_message( $args['form'], $args['entry_id'], $args );
2594		-
2595		- ob_start();
2596		- self::show_lone_success_messsage( $args );
2597		- $response_data['content'] = ob_get_clean();
2598		-
2599		- $response_data['fallbackMsg'] = self::get_redirect_fallback_message( $args['success_url'], $args );
2600		- }
2601		-
2602		- return $response_data;
2603		- }
2604		-
2605		- /**
2606		- * Redirects after submitting using JS. This is used when showing message before redirecting.
2607		- *
2608		- * @since 6.0
2609		- *
2610		- * @param array $args See {@see FrmFormsController::run_success_action()}.
2611		- */
2612		- private static function redirect_after_submit_using_js( $args ) {
2613		- $success_msg = FrmOnSubmitHelper::get_default_redirect_msg();
2614		- $redirect_msg = self::get_redirect_message( $args['success_url'], $success_msg, $args );
2615		- $success_url = esc_url_raw( $args['success_url'] );
2616		-
2617		- /**
2618		- * Filters the delay time before redirecting when On Submit Redirect action is delayed.
2619		- *
2620		- * @since 6.0
2621		- *
2622		- * @param int $delay_time Delay time in miliseconds.
2623		- */
2624		- $delay_time = apply_filters( 'frm_redirect_delay_time', 8000 );
2625		-
2626		- if ( ! empty( $args['form']->options['open_in_new_tab'] ) ) {
2627		- $redirect_js = 'window.open("' . $success_url . '", "_blank")';
2628	1922	} else {
2629		- $redirect_js = 'window.location="' . $success_url . '";';
2630		- }
	1923	+ add_filter( 'frm_use_wpautop', '__return_true' );
2631	1924
2632		- add_filter( 'frm_use_wpautop', '__return_true' );
2633		-
2634		- echo FrmAppHelper::maybe_kses( $redirect_msg ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
2635		- echo '<script>';
2636		- if ( empty( $args['doing_ajax'] ) ) { // Not AJAX submit, delay JS until window.load.
2637		- echo 'window.onload=function(){';
	1925	+ echo $redirect_msg; // WPCS: XSS ok.
	1926	+ echo "<script type='text/javascript'>window.onload = function(){setTimeout(window.location='" . esc_url_raw( $success_url ) . "', 8000);}</script>";
2638	1927	}
2639		- echo 'setTimeout(function(){' . $redirect_js . '}, ' . intval( $delay_time ) . ');'; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
2640		- if ( empty( $args['doing_ajax'] ) ) {
2641		- echo '};';
2642		- }
2643		- echo '</script>';
2644	1928	}
2645	1929
2646	1930	/**
2647	1931	* @since 3.0
		@@ -2650,10 +1934,11 @@
2650	1934	* @param string $success_msg
2651	1935	* @param array $args
2652	1936	*/
2653	1937	private static function get_redirect_message( $success_url, $success_msg, $args ) {
2654		- $redirect_msg = '<div class="' . esc_attr( FrmFormsHelper::get_form_style_class( $args['form'] ) ) . '"><div class="frm-redirect-msg" role="status">' . $success_msg . '<br/>' .
2655		- self::get_redirect_fallback_message( $success_url, $args ) .
	1938	+ $redirect_msg = '<div class="' . esc_attr( FrmFormsHelper::get_form_style_class( $args['form'] ) ) . '"><div class="frm-redirect-msg frm_message" role="status">' . $success_msg . '<br/>' .
	1939	+ /* translators: %1$s: Start link HTML, %2$s: End link HTML */
	1940	+ sprintf( __( '%1$sClick here%2$s if you are not automatically redirected.', 'formidable' ), '<a href="' . esc_url( $success_url ) . '">', '</a>' ) .
2656	1941	'</div></div>';
2657	1942
2658	1943	$redirect_args = array(
2659	1944	'entry_id' => $args['entry_id'],
		@@ -2664,50 +1949,17 @@
2664	1949	return apply_filters( 'frm_redirect_msg', $redirect_msg, $redirect_args );
2665	1950	}
2666	1951
2667	1952	/**
2668		- * Gets fallback message when redirecting failed.
2669		- *
2670		- * @since 6.x
2671		- *
2672		- * @param string $success_url Redirect URL.
2673		- * @param array $args Contains `form` object.
2674		- * @return string
2675		- */
2676		- private static function get_redirect_fallback_message( $success_url, $args ) {
2677		- $target = '';
2678		- if ( ! empty( $args['form']->options['open_in_new_tab'] ) ) {
2679		- $target = ' target="_blank"';
2680		- }
2681		-
2682		- return sprintf(
2683		- /* translators: %1$s: Start link HTML, %2$s: End link HTML */
2684		- __( '%1$sClick here%2$s if you are not automatically redirected.', 'formidable' ),
2685		- '<a href="' . esc_url( $success_url ) . '"' . $target . '>',
2686		- '</a>'
2687		- );
2688		- }
2689		-
2690		- /**
2691	1953	* Prepare to show the success message and empty form after submit
2692	1954	*
2693	1955	* @since 2.05
2694	1956	*/
2695	1957	public static function show_message_after_save( $atts ) {
2696		- $atts['message'] = self::prepare_submit_message( $atts['form'], $atts['entry_id'], $atts );
	1958	+ $atts['message'] = self::prepare_submit_message( $atts['form'], $atts['entry_id'] );
2697	1959
2698	1960	if ( ! isset( $atts['form']->options['show_form'] ) || $atts['form']->options['show_form'] ) {
2699		- if ( isset( $atts['action'] ) && 'update' === $atts['action'] && is_callable( array( 'FrmProEntriesController', 'show_front_end_form_with_entry' ) ) ) {
2700		- $entry = FrmEntry::getOne( $atts['entry_id'] );
2701		- if ( $entry ) {
2702		- // This is copied from the Pro plugin.
2703		- $atts['conf_message'] = FrmProEntriesController::confirmation( 'message', $atts['form'], $atts['form']->options, $entry->id, $atts );
2704		- $atts['show_form'] = FrmProEntriesController::is_form_displayed_after_edit( $atts['form'] );
2705		- FrmProEntriesController::show_front_end_form_with_entry( $entry, $atts );
2706		- }
2707		- } else {
2708		- self::show_form_after_submit( $atts );
2709		- }
	1961	+ self::show_form_after_submit( $atts );
2710	1962	} else {
2711	1963	self::show_lone_success_messsage( $atts );
2712	1964	}
2713	1965	}
		@@ -2777,16 +2029,8 @@
2777	2029	*
2778	2030	* @since 2.05
2779	2031	*/
2780	2032	private static function fill_atts_for_form_display( &$args ) {
2781		- if ( ! isset( $args['title'] ) && isset( $args['show_title'] ) ) {
2782		- $args['title'] = $args['show_title'];
2783		- }
2784		-
2785		- if ( ! isset( $args['description'] ) && isset( $args['show_description'] ) ) {
2786		- $args['description'] = $args['show_description'];
2787		- }
2788		-
2789	2033	$defaults = array(
2790	2034	'errors' => array(),
2791	2035	'message' => '',
2792	2036	'fields' => array(),
		@@ -2820,21 +2064,14 @@
2820	2064	/**
2821	2065	* Prepare the success message before it's shown
2822	2066	*
2823	2067	* @since 2.05
2824		- * @since 6.0.x Added the third parameter.
2825		- *
2826		- * @param object $form Form object.
2827		- * @param int $entry_id Entry ID.
2828		- * @param array $args See {@see FrmFormsController::run_success_action()}.
2829		- * @return string
2830	2068	*/
2831		- private static function prepare_submit_message( $form, $entry_id, $args = array() ) {
	2069	+ private static function prepare_submit_message( $form, $entry_id ) {
2832	2070	$frm_settings = FrmAppHelper::get_settings( array( 'current_form' => $form->id ) );
2833		- $opt = isset( $args['success_opt'] ) ? $args['success_opt'] : 'success';
2834	2071
2835	2072	if ( $entry_id && is_numeric( $entry_id ) ) {
2836		- $message = isset( $form->options[ $opt . '_msg' ] ) ? $form->options[ $opt . '_msg' ] : $frm_settings->success_msg;
	2073	+ $message = isset( $form->options['success_msg'] ) ? $form->options['success_msg'] : $frm_settings->success_msg;
2837	2074	$class = 'frm_message';
2838	2075	} else {
2839	2076	$message = $frm_settings->failed_msg;
2840	2077	$class = FrmFormsHelper::form_error_class();
		@@ -2844,11 +2081,8 @@
2844	2081
2845	2082	return apply_filters( 'frm_main_feedback', $message, $form, $entry_id );
2846	2083	}
2847	2084
2848		- /**
2849		- * @return void
2850		- */
2851	2085	public static function front_head() {
2852	2086	$version = FrmAppHelper::plugin_version();
2853	2087	$suffix = FrmAppHelper::js_suffix();
2854	2088
		@@ -2894,38 +2128,24 @@
2894	2128	* If css is loaded only on applicable pages, include it before the form loads
2895	2129	* to prevent a flash of unstyled form.
2896	2130	*
2897	2131	* @since 4.01
2898		- *
2899		- * @return void
2900	2132	*/
2901	2133	private static function load_late_css() {
2902	2134	$frm_settings = FrmAppHelper::get_settings();
2903		- $late_css = $frm_settings->load_style === 'dynamic';
2904		-
2905		- if ( ! $late_css || ! self::should_load_late() ) {
	2135	+ $late_css = $frm_settings->load_style === 'dynamic';
	2136	+ if ( ! $late_css ) {
2906	2137	return;
2907	2138	}
2908	2139
2909	2140	global $wp_styles;
2910		- if ( is_array( $wp_styles->queue ) && in_array( 'formidable', $wp_styles->queue, true ) ) {
	2141	+ if ( is_array( $wp_styles->queue ) && in_array( 'formidable', $wp_styles->queue ) ) {
2911	2142	wp_print_styles( 'formidable' );
2912	2143	}
2913	2144	}
2914	2145
2915		- /**
2916		- * Avoid late load if All in One SEO is active because it prevents CSS from loading entirely.
2917		- *
2918		- * @since 5.2.03
2919		- *
2920		- * @return bool
2921		- */
2922		- private static function should_load_late() {
2923		- return ! function_exists( 'aioseo' );
2924		- }
2925		-
2926	2146	public static function defer_script_loading( $tag, $handle ) {
2927		- if ( 'captcha-api' == $handle && ! strpos( $tag, 'defer' ) ) {
	2147	+ if ( 'recaptcha-api' == $handle && ! strpos( $tag, 'defer' ) ) {
2928	2148	$tag = str_replace( ' src', ' defer="defer" async="async" src', $tag );
2929	2149	}
2930	2150
2931	2151	return $tag;
		@@ -2960,125 +2180,8 @@
2960	2180	return isset( $atts['minimize'] ) && ! empty( $atts['minimize'] );
2961	2181	}
2962	2182
2963	2183	/**
2964		- * @since 5.0.16
2965		- *
2966		- * @return void
2967		- */
2968		- public static function landing_page_preview_option() {
2969		- $dir = apply_filters( 'frm_landing_page_preview_option', false );
2970		- if ( false === $dir || ! file_exists( $dir . 'landing-page-preview-option.php' ) ) {
2971		- $dir = self::get_form_views_path();
2972		- }
2973		- include $dir . 'landing-page-preview-option.php';
2974		- }
2975		-
2976		- /**
2977		- * @since 5.0.16
2978		- *
2979		- * @return string
2980		- */
2981		- private static function get_form_views_path() {
2982		- return FrmAppHelper::plugin_path() . '/classes/views/frm-forms/';
2983		- }
2984		-
2985		- /**
2986		- * Create a page with an embedded formidable Gutenberg block.
2987		- *
2988		- * @since 5.2
2989		- *
2990		- * @return never
2991		- */
2992		- public static function create_page_with_shortcode() {
2993		- if ( ! current_user_can( 'publish_posts' ) ) {
2994		- die( 0 );
2995		- }
2996		-
2997		- check_ajax_referer( 'frm_ajax', 'nonce' );
2998		-
2999		- $type = FrmAppHelper::get_post_param( 'type', '', 'sanitize_text_field' );
3000		- if ( ! $type || ! in_array( $type, array( 'form', 'view' ), true ) ) {
3001		- die( 0 );
3002		- }
3003		-
3004		- $object_id = FrmAppHelper::get_post_param( 'object_id', '', 'absint' );
3005		- if ( ! $object_id ) {
3006		- die( 0 );
3007		- }
3008		-
3009		- $postarr = array( 'post_type' => 'page' );
3010		-
3011		- if ( 'form' === $type ) {
3012		- $postarr['post_content'] = self::get_page_shortcode_content_for_form( $object_id );
3013		- } else {
3014		- $postarr['post_content'] = apply_filters( 'frm_create_page_with_' . $type . '_shortcode_content', '', $object_id );
3015		- }
3016		-
3017		- $name = FrmAppHelper::get_post_param( 'name', '', 'sanitize_text_field' );
3018		- if ( $name ) {
3019		- $postarr['post_title'] = $name;
3020		- }
3021		-
3022		- $success = wp_insert_post( $postarr );
3023		- if ( ! is_numeric( $success ) || ! $success ) {
3024		- die( 0 );
3025		- }
3026		-
3027		- wp_send_json(
3028		- array(
3029		- 'redirect' => get_edit_post_link( $success, 'redirect' ),
3030		- )
3031		- );
3032		- }
3033		-
3034		- /**
3035		- * @since 5.3
3036		- *
3037		- * @param string $content
3038		- * @param int $form_id
3039		- * @return string
3040		- */
3041		- private static function get_page_shortcode_content_for_form( $form_id ) {
3042		- $shortcode = '[formidable id="' . $form_id . '"]';
3043		- $html_comment_start = '<!-- wp:formidable/simple-form {"formId":"' . $form_id . '"} -->';
3044		- $html_comment_end = '<!-- /wp:formidable/simple-form -->';
3045		- return $html_comment_start . '<div>' . $shortcode . '</div>' . $html_comment_end;
3046		- }
3047		-
3048		- /**
3049		- * Get page dropdown for AJAX request for embedding form in an existing page.
3050		- *
3051		- * @return never
3052		- */
3053		- public static function get_page_dropdown() {
3054		- if ( ! current_user_can( 'publish_posts' ) ) {
3055		- die( 0 );
3056		- }
3057		-
3058		- check_ajax_referer( 'frm_ajax', 'nonce' );
3059		-
3060		- $html = FrmAppHelper::clip(
3061		- function() {
3062		- FrmAppHelper::maybe_autocomplete_pages_options(
3063		- array(
3064		- 'field_name' => 'frm_page_dropdown',
3065		- 'page_id' => '',
3066		- 'placeholder' => __( 'Select a Page', 'formidable' ),
3067		- )
3068		- );
3069		- }
3070		- );
3071		- $post_type_object = get_post_type_object( 'page' );
3072		- wp_send_json(
3073		- array(
3074		- 'html' => $html,
3075		- 'edit_page_url' => admin_url( sprintf( $post_type_object->_edit_link . '&action=edit', 0 ) ),
3076		- )
3077		- );
3078		- }
3079		-
3080		- /**
3081	2184	* @deprecated 4.0
3082	2185	*/
3083	2186	public static function new_form( $values = array() ) {
3084	2187	FrmDeprecated::new_form( $values );
		@@ -3092,13 +2195,29 @@
3092	2195	self::update( $values );
3093	2196	}
3094	2197
3095	2198	/**
	2199	+ * @deprecated 1.07.05
	2200	+ * @codeCoverageIgnore
	2201	+ */
	2202	+ public static function add_default_templates( $path, $default = true, $template = true ) {
	2203	+ FrmDeprecated::add_default_templates( $path, $default, $template );
	2204	+ }
	2205	+
	2206	+ /**
3096	2207	* @deprecated 3.0
3097	2208	* @codeCoverageIgnore
3098	2209	*/
3099	2210	public static function bulk_create_template( $ids ) {
3100	2211	return FrmDeprecated::bulk_create_template( $ids );
	2212	+ }
	2213	+
	2214	+ /**
	2215	+ * @deprecated 2.03
	2216	+ * @codeCoverageIgnore
	2217	+ */
	2218	+ public static function register_pro_scripts() {
	2219	+ FrmDeprecated::register_pro_scripts();
3101	2220	}
3102	2221
3103	2222	/**
3104	2223	* @deprecated 3.0