← All changes | classes/controllers/FrmFormsController.php +224 -1221 6.3 → 4.01.02 View file →

		@@ -1,8 +1,5 @@
1	1	<?php
2		-if ( ! defined( 'ABSPATH' ) ) {
3		- die( 'You are not allowed to call this page directly.' );
4		-}
5	2
6	3	class FrmFormsController {
7	4
8	5	public static function menu() {
		@@ -15,9 +12,10 @@
15	12	self::maybe_load_listing_hooks();
16	13	}
17	14
18	15	public static function maybe_load_listing_hooks() {
19		- if ( ! FrmAppHelper::on_form_listing_page() ) {
	16	+ $action = FrmAppHelper::simple_get( 'frm_action', 'sanitize_title' );
	17	+ if ( ! empty( $action ) && ! in_array( $action, array( 'list', 'trash', 'untrash', 'destroy' ) ) ) {
20	18	return;
21	19	}
22	20
23	21	add_filter( 'get_user_option_managetoplevel_page_formidablecolumnshidden', 'FrmFormsController::hidden_columns' );
		@@ -32,28 +30,13 @@
32	30	}
33	31	}
34	32
35	33	public static function register_widgets() {
36		- require_once FrmAppHelper::plugin_path() . '/classes/widgets/FrmShowForm.php';
	34	+ require_once( FrmAppHelper::plugin_path() . '/classes/widgets/FrmShowForm.php' );
37	35	register_widget( 'FrmShowForm' );
38	36	}
39	37
40	38	/**
41		- * Show a message about conditional logic
42		- *
43		- * @since 4.06.03
44		- */
45		- public static function logic_tip() {
46		- $images_url = FrmAppHelper::plugin_url() . '/images/';
47		- $data_message = __( 'Only show the fields you need and create branching forms. Upgrade to get conditional logic and question branching.', 'formidable' );
48		- $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' ) . '"/>';
49		- 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">';
50		- esc_html_e( 'Conditional Logic', 'formidable' );
51		- FrmAppHelper::icon_by_class( 'frmfont frm_arrowdown6_icon', array( 'aria-hidden' => 'true' ) );
52		- echo '</a>';
53		- }
54		-
55		- /**
56	39	* By default, Divi processes form shortcodes on the edit post page.
57	40	* Now that won't do.
58	41	*
59	42	* @since 3.01
		@@ -63,11 +46,8 @@
63	46
64	47	return $shortcodes;
65	48	}
66	49
67		- /**
68		- * @return void
69		- */
70	50	public static function list_form() {
71	51	FrmAppHelper::permission_check( 'frm_view_forms' );
72	52
73	53	$message = '';
		@@ -78,17 +58,36 @@
78	58	unset( $errors['message'] );
79	59	}
80	60	$errors = apply_filters( 'frm_admin_list_form_action', $errors );
81	61
82		- self::display_forms_list( $params, $message, $errors );
	62	+ return self::display_forms_list( $params, $message, $errors );
83	63	}
84	64
85	65	/**
	66	+ * Choose which type of form to create
	67	+ *
	68	+ * @since 3.06
	69	+ */
	70	+ public static function add_new() {
	71	+ self::list_templates();
	72	+ }
	73	+
	74	+ /**
	75	+ * Load the scripts before a modal can be triggered.
	76	+ *
	77	+ * @since 4.0
	78	+ */
	79	+ private static function init_modal() {
	80	+ wp_enqueue_script( 'jquery-ui-dialog' );
	81	+ wp_enqueue_style( 'jquery-ui-dialog' );
	82	+ }
	83	+
	84	+ /**
86	85	* Create the default email action
87	86	*
88	87	* @since 2.02.11
89	88	*
90		- * @param object|int $form
	89	+ * @param object $form
91	90	*/
92	91	private static function create_default_email_action( $form ) {
93	92	FrmForm::maybe_get_form( $form );
94	93	$create_email = apply_filters( 'frm_create_default_email_action', true, $form );
		@@ -98,34 +97,8 @@
98	97	$action_control->create( $form->id );
99	98	}
100	99	}
101	100
102		- /**
103		- * Create the default On submit action
104		- *
105		- * @since 6.0.0
106		- *
107		- * @param object|int $form Form object or ID.
108		- */
109		- private static function create_default_on_submit_action( $form ) {
110		- FrmForm::maybe_get_form( $form );
111		-
112		- /**
113		- * Enable or disable the default On Submit action.
114		- *
115		- * @since 6.0.0
116		- *
117		- * @param bool $create Set to `false` if you want to disable.
118		- * @param object $form Form object.
119		- */
120		- $create = apply_filters( 'frm_create_default_on_submit_action', true, $form );
121		-
122		- if ( $create ) {
123		- $action_control = FrmFormActionsController::get_form_actions( FrmOnSubmitAction::$slug );
124		- $action_control->create( $form->id );
125		- }
126		- }
127		-
128	101	public static function edit( $values = false ) {
129	102	FrmAppHelper::permission_check( 'frm_edit_forms' );
130	103
131	104	$id = isset( $values['id'] ) ? absint( $values['id'] ) : FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
		@@ -139,10 +112,8 @@
139	112	if ( ! $id || ! is_numeric( $id ) ) {
140	113	$id = FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
141	114	}
142	115
143		- FrmOnSubmitHelper::maybe_migrate_submit_settings_to_action( $id );
144		-
145	116	return self::get_settings_vars( $id, array(), $message );
146	117	}
147	118
148	119	public static function update_settings() {
		@@ -149,43 +120,25 @@
149	120	FrmAppHelper::permission_check( 'frm_edit_forms' );
150	121
151	122	$id = FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
152	123
153		- $errors = FrmForm::validate( $_POST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
154		- $warnings = FrmFormsHelper::check_for_warnings( $_POST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
155		-
	124	+ $errors = FrmForm::validate( $_POST );
156	125	if ( count( $errors ) > 0 ) {
157		- return self::get_settings_vars( $id, $errors, compact( 'warnings' ) );
	126	+ return self::get_settings_vars( $id, $errors );
158	127	}
159	128
160	129	do_action( 'frm_before_update_form_settings', $id );
161	130
162		- $antispam_was_on = self::antispam_was_on( $id );
	131	+ FrmForm::update( $id, $_POST );
163	132
164		- FrmForm::update( $id, $_POST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
165		-
166		- $antispam_is_on = ! empty( $_POST['options']['antispam'] ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
167		- if ( $antispam_is_on !== $antispam_was_on ) {
168		- FrmAntiSpam::clear_caches();
169		- }
170		-
171	133	$message = __( 'Settings Successfully Updated', 'formidable' );
172	134
173		- return self::get_settings_vars( $id, array(), compact( 'message', 'warnings' ) );
	135	+ return self::get_settings_vars( $id, array(), $message );
174	136	}
175	137
176		- /**
177		- * @param int $form_id
178		- * @return bool
179		- */
180		- private static function antispam_was_on( $form_id ) {
181		- $form = FrmForm::getOne( $form_id );
182		- return ! empty( $form->options['antispam'] );
183		- }
184		-
185	138	public static function update( $values = array() ) {
186	139	if ( empty( $values ) ) {
187		- $values = $_POST; // phpcs:ignore WordPress.Security.NonceVerification.Missing
	140	+ $values = $_POST;
188	141	}
189	142
190	143	// Set radio button and checkbox meta equal to "other" value.
191	144	if ( FrmAppHelper::pro_is_installed() ) {
		@@ -215,9 +168,9 @@
215	168	);
216	169	}
217	170
218	171	if ( defined( 'DOING_AJAX' ) ) {
219		- wp_die( FrmAppHelper::kses( $message, array( 'a' ) ) ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
	172	+ wp_die( FrmAppHelper::kses( $message, array( 'a' ) ) ); // WPCS: XSS ok.
220	173	}
221	174
222	175	return self::get_edit_vars( $id, array(), $message );
223	176	}
		@@ -259,34 +212,19 @@
259	212	}
260	213
261	214	public static function duplicate() {
262	215	FrmAppHelper::permission_check( 'frm_edit_forms' );
263		- $nonce = FrmAppHelper::simple_get( '_wpnonce' );
264	216
265		- if ( ! wp_verify_nonce( $nonce ) ) {
266		- $frm_settings = FrmAppHelper::get_settings();
267		- wp_die( esc_html( $frm_settings->admin_permission ) );
268		- }
269		-
270	217	$params = FrmForm::list_page_params();
271	218	$form = FrmForm::duplicate( $params['id'], $params['template'], true );
272		- $url = admin_url( 'admin.php?page=formidable' );
273		- $message = 'form_duplicate_error';
274		-
	219	+ $message = $params['template'] ? __( 'Form template was Successfully Created', 'formidable' ) : __( 'Form was Successfully Copied', 'formidable' );
275	220	if ( $form ) {
276		- $url = admin_url( 'admin.php?page=formidable&frm_action=edit&id=' . absint( $form ) );
277		- $message = 'form_duplicated';
	221	+ return self::get_edit_vars( $form, array(), $message, true );
	222	+ } else {
	223	+ return self::display_forms_list( $params, __( 'There was a problem creating the new template.', 'formidable' ) );
278	224	}
279		-
280		- $url .= '&message=' . $message;
281		-
282		- wp_safe_redirect( $url );
283		- exit();
284	225	}
285	226
286		- /**
287		- * @return string
288		- */
289	227	public static function page_preview() {
290	228	$params = FrmForm::list_page_params();
291	229	if ( ! $params['form'] ) {
292	230	return;
		@@ -293,9 +231,9 @@
293	231	}
294	232
295	233	$form = FrmForm::getOne( $params['form'] );
296	234	if ( $form ) {
297		- return self::show_form( $form->id, '', 'auto', 'auto' );
	235	+ return self::show_form( $form->id, '', true, true );
298	236	}
299	237	}
300	238
301	239	/**
		@@ -301,21 +239,19 @@
301	239	/**
302	240	* @since 3.0
303	241	*/
304	242	public static function show_page_preview() {
305		- echo self::page_preview(); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
	243	+ echo self::page_preview(); // WPCS: XSS ok.
306	244	}
307	245
308		- /**
309		- * @return void
310		- */
311	246	public static function preview() {
312	247	do_action( 'frm_wp' );
313		- FrmAppHelper::set_current_screen_and_hook_suffix();
314	248
315	249	global $frm_vars;
316	250	$frm_vars['preview'] = true;
317	251
	252	+ self::load_wp();
	253	+
318	254	$include_theme = FrmAppHelper::get_param( 'theme', '', 'get', 'absint' );
319	255	if ( $include_theme ) {
320	256	self::set_preview_query();
321	257	self::load_theme_preview();
		@@ -326,58 +262,42 @@
326	262	wp_die();
327	263	}
328	264
329	265	/**
330		- * Set the page global to any available page (except for the Blog Page).
331		- *
332		- * @return void
	266	+ * @since 3.0
333	267	*/
334		- private static function set_preview_query() {
335		- $page_query = array(
336		- 'numberposts' => 1,
337		- 'orderby' => 'date',
338		- 'order' => 'ASC',
339		- 'post_type' => 'page',
340		- );
341		-
342		- $page_for_posts = get_option( 'page_for_posts' );
343		- if ( is_numeric( $page_for_posts ) ) {
344		- // Avoid querying for the "Posts Page" or "Blog Page" so we don't display 10 forms.
345		- $page_query['post__not_in'] = array( $page_for_posts );
	268	+ private static function load_wp() {
	269	+ if ( ! defined( 'ABSPATH' ) && ! defined( 'XMLRPC_REQUEST' ) ) {
	270	+ global $wp;
	271	+ $root = dirname( dirname( dirname( dirname( __FILE__ ) ) ) );
	272	+ include_once( $root . '/wp-config.php' );
	273	+ $wp->init();
	274	+ $wp->register_globals();
346	275	}
	276	+ }
347	277
348		- $random_page = get_posts( $page_query );
349		- if ( ! $random_page ) {
350		- return;
351		- }
352		-
353		- $random_page = reset( $random_page );
354		- query_posts(
	278	+ private static function set_preview_query() {
	279	+ $random_page = get_posts(
355	280	array(
356		- 'post_type' => 'page',
357		- 'page_id' => $random_page->ID,
	281	+ 'numberposts' => 1,
	282	+ 'orderby' => 'date',
	283	+ 'order' => 'ASC',
	284	+ 'post_type' => 'page',
358	285	)
359	286	);
360	287
361		- // Fixes Pro issue #3004. Prevent an undefined $post object.
362		- // Otherwise WordPress themes will trigger a warning "Attempt to read property "comment_count" on null".
363		- self::set_post_global( $random_page );
	288	+ if ( ! empty( $random_page ) ) {
	289	+ $random_page = reset( $random_page );
	290	+ query_posts(
	291	+ array(
	292	+ 'post_type' => 'page',
	293	+ 'page_id' => $random_page->ID,
	294	+ )
	295	+ );
	296	+ }
364	297	}
365	298
366	299	/**
367		- * Set the WP $post global object. Used for in-theme preview when defining a page.
368		- *
369		- * @since 5.5.2
370		- *
371		- * @param WP_Post $post
372		- * @return void
373		- */
374		- private static function set_post_global( $page ) {
375		- global $post;
376		- $post = $page; // phpcs:ignore WordPress.WP.GlobalVariablesOverride
377		- }
378		-
379		- /**
380	300	* @since 3.0
381	301	*/
382	302	private static function load_theme_preview() {
383	303	add_filter( 'wp_title', 'FrmFormsController::preview_title', 9999 );
		@@ -384,34 +304,12 @@
384	304	add_filter( 'the_title', 'FrmFormsController::preview_page_title', 9999 );
385	305	add_filter( 'the_content', 'FrmFormsController::preview_content', 9999 );
386	306	add_action( 'loop_no_results', 'FrmFormsController::show_page_preview' );
387	307	add_filter( 'is_active_sidebar', '__return_false' );
388		- FrmStylesController::enqueue_css( 'enqueue', true );
389		-
390		- if ( false === get_template_part( 'page' ) ) {
391		- self::fallback_when_page_template_part_is_not_supported_by_theme();
392		- }
	308	+ get_template_part( 'page' );
393	309	}
394	310
395	311	/**
396		- * Not every theme supports get_template_part( 'page' ).
397		- * When this is not supported, false is returned, and we can handle a fallback.
398		- */
399		- private static function fallback_when_page_template_part_is_not_supported_by_theme() {
400		- if ( have_posts() ) {
401		- the_post();
402		- get_header( '' );
403		- // add some generic class names to the container to add some natural padding to the content.
404		- // .entry-content catches the WordPress TwentyTwenty theme.
405		- // .container catches Customizr content.
406		- echo '<div class="container entry-content">';
407		- the_content();
408		- echo '</div>';
409		- get_footer();
410		- }
411		- }
412		-
413		- /**
414	312	* Set the page title for the theme preview page
415	313	*
416	314	* @since 3.0
417	315	*/
		@@ -467,24 +365,15 @@
467	365	public static function untrash() {
468	366	self::change_form_status( 'untrash' );
469	367	}
470	368
471		- /**
472		- * @param array $ids
473		- * @return string
474		- */
475	369	public static function bulk_untrash( $ids ) {
476	370	FrmAppHelper::permission_check( 'frm_edit_forms' );
477	371
478	372	$count = FrmForm::set_status( $ids, 'published' );
479	373
480		- if ( ! $count ) {
481		- // Don't show "0 forms restored" on refresh.
482		- return '';
483		- }
484		-
485	374	/* translators: %1$s: Number of forms */
486		- $message = sprintf( _n( '%1$s form restored from the Trash.', '%1$s forms restored from the Trash.', $count, 'formidable' ), $count );
	375	+ $message = sprintf( _n( '%1$s form restored from the Trash.', '%1$s forms restored from the Trash.', $count, 'formidable' ), 1 );
487	376
488	377	return $message;
489	378	}
490	379
		@@ -505,9 +394,9 @@
505	394
506	395	/**
507	396	* @param string $status
508	397	*
509		- * @return void
	398	+ * @return int The number of forms changed
510	399	*/
511	400	public static function change_form_status( $status ) {
512	401	$available_status = array(
513	402	'untrash' => array(
		@@ -639,36 +528,18 @@
639	528	*
640	529	* @since 4.0
641	530	*/
642	531	public static function build_new_form() {
	532	+ global $wpdb;
	533	+
643	534	FrmAppHelper::permission_check( 'frm_edit_forms' );
644	535	check_ajax_referer( 'frm_ajax', 'nonce' );
645	536
646	537	$new_values = self::get_modal_values();
647	538	$new_values['form_key'] = $new_values['name'];
648		- $new_values['options'] = array(
649		- 'antispam' => 1,
650		- 'on_submit_migrated' => 1,
651		- );
652	539
653		- /**
654		- * Allows changing form values before creating from the modal.
655		- *
656		- * @since 5.4
657		- *
658		- * @param array $values Form values.
659		- */
660		- $new_values = apply_filters( 'frm_new_form_values', $new_values );
661		-
662	540	$form_id = FrmForm::create( $new_values );
663		- /**
664		- * @since 5.3
665		- *
666		- * @param int $form_id
667		- */
668		- do_action( 'frm_build_new_form', $form_id );
669	541
670		- self::create_default_on_submit_action( $form_id );
671	542	self::create_default_email_action( $form_id );
672	543
673	544	$response = array(
674	545	'redirect' => FrmForm::get_edit_link( $form_id ),
		@@ -690,9 +561,9 @@
690	561	check_ajax_referer( 'frm_ajax', 'nonce' );
691	562
692	563	$form_id = FrmAppHelper::get_param( 'xml', '', 'post', 'absint' );
693	564	$new_form_id = FrmForm::duplicate( $form_id, 1, true );
694		- if ( ! $new_form_id ) {
	565	+ if ( empty( $new_form_id ) ) {
695	566	$response = array(
696	567	'message' => __( 'There was an error creating a template.', 'formidable' ),
697	568	);
698	569	} else {
		@@ -702,9 +573,9 @@
702	573	FrmForm::clear_form_cache();
703	574	}
704	575
705	576	$response = array(
706		- 'redirect' => admin_url( 'admin.php?page=formidable&frm_action=duplicate&id=' . $new_form_id ) . '&_wpnonce=' . wp_create_nonce(),
	577	+ 'redirect' => admin_url( 'admin.php?page=formidable&frm_action=list_templates' ),
707	578	);
708	579	}
709	580
710	581	echo wp_json_encode( $response );
		@@ -733,22 +604,19 @@
733	604	* @since 2.0.15
734	605	*/
735	606	public static function insert_form_button() {
736	607	if ( current_user_can( 'frm_view_forms' ) ) {
737		- FrmAppHelper::load_admin_wide_js();
738	608	$menu_name = FrmAppHelper::get_menu_name();
739	609	$icon = apply_filters( 'frm_media_icon', FrmAppHelper::svg_logo() );
740	610	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' ) . '">' .
741		- FrmAppHelper::kses( $icon, 'all' ) . // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
742		- ' ' . esc_html( $menu_name ) . '</a>';
	611	+ FrmAppHelper::kses( $icon, 'all' ) .
	612	+ ' ' . esc_html( $menu_name ) . '</a>'; // WPCS: XSS ok.
743	613	}
744	614	}
745	615
746		- /**
747		- * @return void
748		- */
749	616	public static function insert_form_popup() {
750		- if ( ! self::should_insert_form_popup() ) {
	617	+ $page = basename( FrmAppHelper::get_server_value( 'PHP_SELF' ) );
	618	+ if ( ! in_array( $page, array( 'post.php', 'page.php', 'page-new.php', 'post-new.php' ) ) ) {
751	619	return;
752	620	}
753	621
754	622	FrmAppHelper::load_admin_wide_js();
		@@ -758,38 +626,14 @@
758	626	'name' => __( 'Form', 'formidable' ),
759	627	'label' => __( 'Insert a Form', 'formidable' ),
760	628	),
761	629	);
	630	+
762	631	$shortcodes = apply_filters( 'frm_popup_shortcodes', $shortcodes );
763	632
764		- include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/insert_form_popup.php';
765		-
766		- if ( FrmAppHelper::is_form_builder_page() && ! class_exists( '_WP_Editors', false ) ) {
767		- // initialize a wysiwyg so we have usable settings defined in tinyMCEPreInit.mceInit
768		- require ABSPATH . WPINC . '/class-wp-editor.php';
769		- ?>
770		- <div class="frm_hidden">
771		- <?php wp_editor( '', 'frm_description_placeholder', array() ); ?>
772		- </div>
773		- <?php
774		- }
	633	+ include( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/insert_form_popup.php' );
775	634	}
776	635
777		- /**
778		- * Check the page being loaded, determine if this is a page that should include the form popup.
779		- *
780		- * @since 5.0.14
781		- *
782		- * @return bool
783		- */
784		- private static function should_insert_form_popup() {
785		- if ( FrmAppHelper::is_form_builder_page() ) {
786		- return true;
787		- }
788		- $page = basename( FrmAppHelper::get_server_value( 'PHP_SELF' ) );
789		- return in_array( $page, array( 'post.php', 'page.php', 'page-new.php', 'post-new.php' ), true );
790		- }
791		-
792	636	public static function get_shortcode_opts() {
793	637	FrmAppHelper::permission_check( 'frm_view_forms' );
794	638	check_ajax_referer( 'frm_ajax', 'nonce' );
795	639
		@@ -835,32 +679,18 @@
835	679
836	680	wp_die();
837	681	}
838	682
839		- /**
840		- * Display list of forms in a table.
841		- *
842		- * @param array $params
843		- * @param string $message
844		- * @param array $errors
845		- * @return void
846		- */
847	683	public static function display_forms_list( $params = array(), $message = '', $errors = array() ) {
848	684	FrmAppHelper::permission_check( 'frm_view_forms' );
849	685
850	686	global $wpdb, $frm_vars;
851	687
852		- if ( ! $params ) {
	688	+ if ( empty( $params ) ) {
853	689	$params = FrmForm::list_page_params();
854	690	}
855	691
856		- /**
857		- * @since 5.3.1
858		- *
859		- * @param string $table_class Class name for List Helper.
860		- */
861		- $table_class = apply_filters( 'frm_forms_list_class', 'FrmFormsListHelper' );
862		- $wp_list_table = new $table_class( compact( 'params' ) );
	692	+ $wp_list_table = new FrmFormsListHelper( compact( 'params' ) );
863	693
864	694	$pagenum = $wp_list_table->get_pagenum();
865	695
866	696	$wp_list_table->prepare_items();
		@@ -870,22 +700,34 @@
870	700	wp_redirect( esc_url_raw( add_query_arg( 'paged', $total_pages ) ) );
871	701	die();
872	702	}
873	703
874		- require FrmAppHelper::plugin_path() . '/classes/views/frm-forms/list.php';
	704	+ require( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/list.php' );
875	705	}
876	706
877		- /**
878		- * @param array<string,string> $columns
879		- * @return array<string,string>
880		- */
881	707	public static function get_columns( $columns ) {
882		- $columns['cb'] = '<input type="checkbox" />';
883		- $columns['name'] = __( 'Form Title', 'formidable' );
884		- $columns['entries'] = __( 'Entries', 'formidable' );
885		- $columns['id'] = 'ID';
886		- $columns['form_key'] = __( 'Key', 'formidable' );
887		- $columns['shortcode'] = __( 'Actions', 'formidable' );
	708	+ $columns['cb'] = '<input type="checkbox" />';
	709	+ $columns['id'] = 'ID';
	710	+
	711	+ $type = FrmAppHelper::get_simple_request(
	712	+ array(
	713	+ 'param' => 'form_type',
	714	+ 'type' => 'request',
	715	+ 'default' => 'published',
	716	+ )
	717	+ );
	718	+
	719	+ if ( 'template' == $type ) {
	720	+ $columns['name'] = __( 'Template Name', 'formidable' );
	721	+ $columns['type'] = __( 'Type', 'formidable' );
	722	+ $columns['form_key'] = __( 'Key', 'formidable' );
	723	+ } else {
	724	+ $columns['name'] = __( 'Form Title', 'formidable' );
	725	+ $columns['entries'] = __( 'Entries', 'formidable' );
	726	+ $columns['form_key'] = __( 'Key', 'formidable' );
	727	+ $columns['shortcode'] = __( 'Shortcodes', 'formidable' );
	728	+ }
	729	+
888	730	$columns['created_at'] = __( 'Date', 'formidable' );
889	731
890	732	add_screen_option(
891	733	'per_page',
		@@ -908,17 +750,9 @@
908	750	'created_at' => 'created_at',
909	751	);
910	752	}
911	753
912		- /**
913		- * @param mixed $hidden_columns
914		- * @return array
915		- */
916	754	public static function hidden_columns( $hidden_columns ) {
917		- if ( ! is_array( $hidden_columns ) ) {
918		- $hidden_columns = array();
919		- }
920		-
921	755	$type = FrmAppHelper::get_simple_request(
922	756	array(
923	757	'param' => 'form_type',
924	758	'type' => 'request',
		@@ -941,117 +775,39 @@
941	775	return $save;
942	776	}
943	777
944	778	/**
945		- * @return bool
946		- */
947		- public static function expired() {
948		- global $frm_expired;
949		- return $frm_expired;
950		- }
951		-
952		- /**
953		- * Get data from api before rendering it so that we can flag the modal as expired
	779	+ * Show the template listing page
954	780	*
955		- * @return void
	781	+ * @since 3.06
956	782	*/
957		- public static function before_list_templates() {
958		- global $frm_templates;
959		- global $frm_expired;
960		- global $frm_license_type;
	783	+ private static function list_templates() {
	784	+ self::init_modal();
961	785
962		- $api = new FrmFormTemplateApi();
963		- $frm_templates = $api->get_api_info();
964		- $expired = false;
965		- $license_type = '';
966		- if ( isset( $frm_templates['error'] ) ) {
967		- $error = $frm_templates['error']['message'];
968		- $error = str_replace( 'utm_medium=addons', 'utm_medium=form-templates', $error );
969		- $expired = 'expired' === $frm_templates['error']['code'];
970		- $license_type = isset( $frm_templates['error']['type'] ) ? $frm_templates['error']['type'] : '';
971		- unset( $frm_templates['error'] );
972		- }
	786	+ $where = apply_filters( 'frm_forms_dropdown', array(), '' );
	787	+ $forms = FrmForm::get_published_forms( $where );
973	788
974		- $frm_expired = $expired;
975		- $frm_license_type = $license_type;
976		- }
	789	+ $api = new FrmFormTemplateApi();
	790	+ $templates = $api->get_api_info();
	791	+ self::add_user_templates( $templates );
977	792
978		- /**
979		- * @return void
980		- */
981		- public static function list_templates() {
982		- global $frm_templates;
983		- global $frm_license_type;
	793	+ $error = '';
	794	+ $expired = false;
	795	+ $license_type = '';
	796	+ if ( isset( $templates['error'] ) ) {
	797	+ $error = $templates['error']['message'];
	798	+ $error = str_replace( 'utm_medium=addons', 'utm_medium=form-templates', $error );
	799	+ $expired = ( $templates['error']['code'] === 'expired' );
984	800
985		- $templates = $frm_templates;
986		- $custom_templates = array();
987		- $templates_by_category = array();
988		-
989		- self::add_user_templates( $custom_templates );
990		-
991		- foreach ( $templates as $template ) {
992		- if ( ! isset( $template['categories'] ) ) {
993		- continue;
994		- }
995		-
996		- foreach ( $template['categories'] as $category ) {
997		- if ( ! isset( $templates_by_category[ $category ] ) ) {
998		- $templates_by_category[ $category ] = array();
999		- }
1000		-
1001		- $templates_by_category[ $category ][] = $template;
1002		- }
	801	+ $license_type = isset( $templates['error']['type'] ) ? $templates['error']['type'] : '';
	802	+ unset( $templates['error'] );
1003	803	}
1004		- unset( $template );
1005	804
1006		- // Subcategories that are included elsewhere.
1007		- $redundant_cats = array( 'PayPal', 'Stripe', 'Twilio' );
	805	+ $pricing = FrmAppHelper::admin_upgrade_link( 'form-templates' );
1008	806
1009		- $categories = array_keys( $templates_by_category );
1010		- $categories = array_diff( $categories, FrmFormsHelper::ignore_template_categories() );
1011		- $categories = array_diff( $categories, $redundant_cats );
1012		- sort( $categories );
1013		-
1014		- array_walk(
1015		- $custom_templates,
1016		- function( &$template ) {
1017		- $template['custom'] = true;
1018		- }
1019		- );
1020		-
1021		- $my_templates_translation = __( 'My Templates', 'formidable' );
1022		- $categories = array_merge( array( $my_templates_translation ), $categories );
1023		- $pricing = FrmAppHelper::admin_upgrade_link( 'form-templates' );
1024		- $license_type = $frm_license_type;
1025		- $args = compact( 'pricing', 'license_type' );
1026		- $where = apply_filters( 'frm_forms_dropdown', array(), '' );
1027		- $forms = FrmForm::get_published_forms( $where );
1028		- $view_path = FrmAppHelper::plugin_path() . '/classes/views/frm-forms/';
1029		-
1030		- $templates_by_category[ $my_templates_translation ] = $custom_templates;
1031		-
1032		- unset( $pricing, $license_type, $where );
1033		- wp_enqueue_script( 'accordion' ); // register accordion for template groups
1034		- require $view_path . 'list-templates.php';
	807	+ require( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/list-templates.php' );
1035	808	}
1036	809
1037		- /**
1038		- * @since 4.03.01
1039		- */
1040		- private static function get_template_categories( $templates ) {
1041		- $categories = array();
1042		- foreach ( $templates as $template ) {
1043		- if ( isset( $template['categories'] ) ) {
1044		- $categories = array_merge( $categories, $template['categories'] );
1045		- }
1046		- }
1047		- $exclude_cats = FrmFormsHelper::ignore_template_categories();
1048		- $categories = array_unique( $categories );
1049		- $categories = array_diff( $categories, $exclude_cats );
1050		- sort( $categories );
1051		- return $categories;
1052		- }
1053		-
1054	810	private static function add_user_templates( &$templates ) {
1055	811	$user_templates = array(
1056	812	'is_template' => 1,
1057	813	'default_template' => 0,
		@@ -1062,9 +818,9 @@
1062	818	'id' => $template->id,
1063	819	'name' => $template->name,
1064	820	'key' => $template->form_key,
1065	821	'description' => $template->description,
1066		- 'url' => wp_nonce_url( admin_url( 'admin.php?page=formidable&frm_action=duplicate&id=' . absint( $template->id ) ) ),
	822	+ 'url' => admin_url( 'admin.php?page=formidable&frm_action=duplicate&id=' . absint( $template->id ) ),
1067	823	'released' => $template->created_at,
1068	824	'installed' => 1,
1069	825	);
1070	826	array_unshift( $templates, $template );
		@@ -1096,30 +852,19 @@
1096	852	if ( $reset_fields ) {
1097	853	$fields = FrmField::get_all_for_form( $form->id, '', 'exclude' );
1098	854	}
1099	855
1100		- unset( $reset_fields );
	856	+ unset( $end_section_values, $last_order, $open, $reset_fields );
1101	857
1102		- $args = array( 'parent_form_id' => $form->id );
1103		- $values = FrmAppHelper::setup_edit_vars( $form, 'forms', '', true, array(), $args );
	858	+ $args = array( 'parent_form_id' => $form->id );
	859	+ $values = FrmAppHelper::setup_edit_vars( $form, 'forms', '', true, array(), $args );
	860	+ $values['fields'] = $fields;
1104	861
1105		- /**
1106		- * Allows modifying the list of fields in the form builder.
1107		- *
1108		- * @since 5.0.04
1109		- *
1110		- * @param object[] $fields Array of fields.
1111		- * @param array $args The arguments. Contains `form`.
1112		- */
1113		- $values['fields'] = apply_filters( 'frm_fields_in_form_builder', $fields, compact( 'form' ) );
1114		-
1115	862	$edit_message = __( 'Form was successfully updated.', 'formidable' );
1116	863	if ( $form->is_template && $message == $edit_message ) {
1117	864	$message = __( 'Template was successfully updated.', 'formidable' );
1118	865	}
1119	866
1120		- self::maybe_update_form_builder_message( $message );
1121		-
1122	867	$all_templates = FrmForm::getAll( array( 'is_template' => 1 ), 'name' );
1123	868	$has_fields = isset( $values['fields'] ) && ! empty( $values['fields'] );
1124	869
1125	870	if ( defined( 'DOING_AJAX' ) ) {
		@@ -1128,55 +873,17 @@
1128	873	require( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/edit.php' );
1129	874	}
1130	875	}
1131	876
1132		- public static function update_form_builder_fields( $fields, $form ) {
1133		- foreach ( $fields as $field ) {
1134		- $field->do_not_include_icons = true;
1135		- }
1136		- return $fields;
1137		- }
1138		-
1139		- public static function maybe_update_form_builder_message( &$message ) {
1140		- if ( 'form_duplicated' === FrmAppHelper::simple_get( 'message' ) ) {
1141		- $message = __( 'Form was Successfully Copied', 'formidable' );
1142		- }
1143		- }
1144		-
1145		- public static function get_settings_vars( $id, $errors = array(), $args = array() ) {
	877	+ public static function get_settings_vars( $id, $errors = array(), $message = '' ) {
1146	878	FrmAppHelper::permission_check( 'frm_edit_forms' );
1147	879
1148	880	global $frm_vars;
1149	881
1150		- if ( ! is_array( $args ) ) {
1151		- // For reverse compatibility.
1152		- $args = array(
1153		- 'message' => $args,
1154		- );
1155		- }
1156		-
1157		- $defaults = array(
1158		- 'message' => '',
1159		- 'warnings' => array(),
1160		- );
1161		- $args = array_merge( $defaults, $args );
1162		- $message = $args['message'];
1163		- $warnings = $args['warnings'];
1164		-
1165	882	$form = FrmForm::getOne( $id );
1166	883	$fields = FrmField::get_all_for_form( $id );
1167	884	$values = FrmAppHelper::setup_edit_vars( $form, 'forms', $fields, true );
1168	885
1169		- /**
1170		- * Allows changing fields in the form settings.
1171		- *
1172		- * @since 5.0.04
1173		- *
1174		- * @param array $fields Array of fields.
1175		- * @param array $args The arguments. Contains `form`.
1176		- */
1177		- $values['fields'] = apply_filters( 'frm_fields_in_settings', $values['fields'], compact( 'form' ) );
1178		-
1179	886	self::clean_submit_html( $values );
1180	887
1181	888	$sections = self::get_settings_tabs( $values );
1182	889	$current = FrmAppHelper::simple_get( 't', 'sanitize_title', 'advanced_settings' );
		@@ -1214,53 +921,31 @@
1214	921	'id' => 'frm_notification_settings',
1215	922	'icon' => 'frm_icon_font frm_mail_bulk_icon',
1216	923	),
1217	924	'permissions' => array(
1218		- 'name' => __( 'Form Permissions', 'formidable' ),
1219		- 'icon' => 'frm_icon_font frm_lock_icon',
1220		- 'html_class' => 'frm_show_upgrade_tab frm_noallow',
1221		- 'data' => array(
1222		- 'medium' => 'permissions',
1223		- 'upgrade' => __( 'Form Permissions', 'formidable' ),
1224		- 'message' => __( 'Allow editing, protect forms and files, limit entries, and save drafts. Upgrade to get form and entry permissions.', 'formidable' ),
1225		- 'screenshot' => 'permissions.png',
	925	+ 'name' => __( 'Form Permissions', 'formidable' ),
	926	+ 'icon' => 'frm_icon_font frm_lock_icon',
	927	+ 'html_class' => 'frm_show_upgrade frm_noallow',
	928	+ 'data' => array(
	929	+ 'medium' => 'permissions',
	930	+ 'upgrade' => __( 'Form Permissions', 'formidable' ),
1226	931	),
1227	932	),
1228	933	'scheduling' => array(
1229		- 'name' => __( 'Form Scheduling', 'formidable' ),
1230		- 'icon' => 'frm_icon_font frm_calendar_icon',
1231		- 'html_class' => 'frm_show_upgrade_tab frm_noallow',
1232		- 'data' => array(
1233		- 'medium' => 'scheduling',
1234		- 'upgrade' => __( 'Form scheduling settings', 'formidable' ),
1235		- 'screenshot' => 'scheduling.png',
	934	+ 'name' => __( 'Form Scheduling', 'formidable' ),
	935	+ 'icon' => 'frm_icon_font frm_calendar_icon',
	936	+ 'html_class' => 'frm_show_upgrade frm_noallow',
	937	+ 'data' => array(
	938	+ 'medium' => 'scheduling',
	939	+ 'upgrade' => __( 'Form scheduling settings', 'formidable' ),
1236	940	),
1237	941	),
1238	942	'buttons' => array(
1239		- 'name' => __( 'Buttons', 'formidable' ),
	943	+ 'name' => __( 'Styling & Buttons', 'formidable' ),
1240	944	'class' => __CLASS__,
1241	945	'function' => 'buttons_settings',
1242		- 'icon' => 'frm_icon_font frm_button_icon',
	946	+ 'icon' => 'frm_icon_font frm_pallet_icon',
1243	947	),
1244		- 'landing' => array(
1245		- 'name' => __( 'Form Landing Page', 'formidable' ),
1246		- 'icon' => 'frm_icon_font frm_file_text_icon',
1247		- 'html_class' => 'frm_show_upgrade_tab frm_noallow',
1248		- 'data' => FrmAppHelper::get_landing_page_upgrade_data_params(),
1249		- ),
1250		- 'chat' => array(
1251		- 'name' => __( 'Conversational Forms', 'formidable' ),
1252		- 'icon' => 'frm_icon_font frm_chat_forms_icon',
1253		- 'html_class' => 'frm_show_upgrade_tab frm_noallow',
1254		- 'data' => FrmAppHelper::get_upgrade_data_params(
1255		- 'chat',
1256		- array(
1257		- 'upgrade' => __( 'Conversational Forms', 'formidable' ),
1258		- 'message' => __( 'Ask one question at a time for automated conversations.', 'formidable' ),
1259		- 'screenshot' => 'chat.png',
1260		- )
1261		- ),
1262		- ),
1263	948	'html' => array(
1264	949	'name' => __( 'Customize HTML', 'formidable' ),
1265	950	'class' => __CLASS__,
1266	951	'function' => 'html_settings',
		@@ -1267,14 +952,8 @@
1267	952	'icon' => 'frm_icon_font frm_code_icon',
1268	953	),
1269	954	);
1270	955
1271		- foreach ( array( 'landing', 'chat' ) as $feature ) {
1272		- if ( ! FrmAppHelper::show_new_feature( $feature ) ) {
1273		- unset( $sections[ $feature ] );
1274		- }
1275		- }
1276		-
1277	956	$sections = apply_filters( 'frm_add_form_settings_section', $sections, $values );
1278	957
1279	958	if ( FrmAppHelper::pro_is_installed() && ! FrmAppHelper::meets_min_pro_version( '4.0' ) ) {
1280	959	// Prevent settings from showing in 2 spots.
		@@ -1316,23 +995,12 @@
1316	995	*/
1317	996	public static function advanced_settings( $values ) {
1318	997	$first_h3 = 'frm_first_h3';
1319	998
1320		- include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings-advanced.php';
	999	+ include( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings-advanced.php' );
1321	1000	}
1322	1001
1323	1002	/**
1324		- * @param array $values
1325		- */
1326		- public static function render_spam_settings( $values ) {
1327		- if ( function_exists( 'akismet_http_post' ) ) {
1328		- include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/spam-settings/akismet.php';
1329		- }
1330		- include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/spam-settings/honeypot.php';
1331		- include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/spam-settings/antispam.php';
1332		- }
1333		-
1334		- /**
1335	1003	* @since 4.0
1336	1004	*
1337	1005	* @param array $values
1338	1006	*/
		@@ -1338,11 +1006,8 @@
1338	1006	*/
1339	1007	public static function buttons_settings( $values ) {
1340	1008	$styles = apply_filters( 'frm_get_style_opts', array() );
1341	1009
1342		- $frm_settings = FrmAppHelper::get_settings();
1343		- $no_global_style = $frm_settings->load_style === 'none';
1344		-
1345	1010	include( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings-buttons.php' );
1346	1011	}
1347	1012
1348	1013	/**
		@@ -1366,35 +1031,10 @@
1366	1031	$values['submit_html'] = str_replace( 'javascript:void(0)', '#', $values['submit_html'] );
1367	1032	}
1368	1033	}
1369	1034
1370		- /**
1371		- * Updates classes used in submit and prev buttons to avoid conflict with twenty twenty-one theme.
1372		- *
1373		- * @param array $classes
1374		- *
1375		- * @return array
1376		- */
1377		- public static function update_button_classes( $classes ) {
1378		- if ( function_exists( 'twenty_twenty_one_setup' ) ) {
1379		- $classes[] = 'has-text-color has-background';
1380		- }
1381		-
1382		- return $classes;
1383		- }
1384		-
1385	1035	public static function mb_tags_box( $form_id, $class = '' ) {
1386		- $fields = FrmField::get_all_for_form( $form_id, '', 'include' );
1387		-
1388		- /**
1389		- * Allows modifying the list of fields in the tags box.
1390		- *
1391		- * @since 5.0.04
1392		- *
1393		- * @param array $fields The list of fields.
1394		- * @param array $args The arguments. Contains `form_id`.
1395		- */
1396		- $fields = apply_filters( 'frm_fields_in_tags_box', $fields, compact( 'form_id' ) );
	1036	+ $fields = FrmField::get_all_for_form( $form_id, '', 'include' );
1397	1037	$linked_forms = array();
1398	1038	$col = 'one';
1399	1039	$settings_tab = FrmAppHelper::is_admin_page( 'formidable' ) ? true : false;
1400	1040
		@@ -1434,9 +1074,8 @@
1434	1074	* Add extra helper shortcodes on the Advanced tab in form settings and views
1435	1075	*
1436	1076	* @since 3.04.01
1437	1077	*
1438		- * @param array $advanced_helpers
1439	1078	* @param array $atts - Includes fields and form_id
1440	1079	*/
1441	1080	return apply_filters( 'frm_advanced_helpers', $advanced_helpers, $atts );
1442	1081	}
		@@ -1514,9 +1153,8 @@
1514	1153	if ( $settings_tab ) {
1515	1154	$entry_shortcodes['default-message'] = __( 'Default Msg', 'formidable' );
1516	1155	$entry_shortcodes['default-html'] = __( 'Default HTML', 'formidable' );
1517	1156	$entry_shortcodes['default-plain'] = __( 'Default Plain', 'formidable' );
1518		- $entry_shortcodes['form_name'] = __( 'Form Name', 'formidable' );
1519	1157	}
1520	1158
1521	1159	/**
1522	1160	* Use this hook to add or remove buttons in the helpers section
		@@ -1529,12 +1167,9 @@
1529	1167	return $entry_shortcodes;
1530	1168	}
1531	1169
1532	1170	/**
1533		- * Insert the form class setting into the form.
1534		- *
1535		- * @param stdClass $form
1536		- * @return void
	1171	+ * Insert the form class setting into the form
1537	1172	*/
1538	1173	public static function form_classes( $form ) {
1539	1174	if ( isset( $form->options['form_class'] ) ) {
1540	1175	echo esc_attr( sanitize_text_field( $form->options['form_class'] ) );
		@@ -1539,36 +1174,18 @@
1539	1174	if ( isset( $form->options['form_class'] ) ) {
1540	1175	echo esc_attr( sanitize_text_field( $form->options['form_class'] ) );
1541	1176	}
1542	1177
1543		- if ( ! empty( $form->options['js_validate'] ) ) {
	1178	+ if ( isset( $form->options['js_validate'] ) && $form->options['js_validate'] ) {
1544	1179	echo ' frm_js_validate ';
1545		- self::add_js_validate_form_to_global_vars( $form );
1546	1180	}
1547		-
1548		- if ( ! FrmFormsHelper::should_use_pro_for_ajax_submit() && FrmForm::is_ajax_on( $form ) ) {
1549		- echo ' frm_ajax_submit ';
1550		- }
1551	1181	}
1552	1182
1553		- /**
1554		- * @since 5.0.03
1555		- *
1556		- * @param stdClass $form
1557		- */
1558		- public static function add_js_validate_form_to_global_vars( $form ) {
1559		- global $frm_vars;
1560		- if ( ! isset( $frm_vars['js_validate_forms'] ) ) {
1561		- $frm_vars['js_validate_forms'] = array();
1562		- }
1563		- $frm_vars['js_validate_forms'][ $form->id ] = $form;
1564		- }
1565		-
1566	1183	public static function get_email_html() {
1567	1184	FrmAppHelper::permission_check( 'frm_view_forms' );
1568	1185	check_ajax_referer( 'frm_ajax', 'nonce' );
1569	1186
1570		- echo FrmEntriesController::show_entry_shortcode( // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
	1187	+ echo FrmEntriesController::show_entry_shortcode( // WPCS: XSS ok.
1571	1188	array(
1572	1189	'form_id' => FrmAppHelper::get_post_param( 'form_id', '', 'absint' ),
1573	1190	'default_email' => true,
1574	1191	'plain_text' => FrmAppHelper::get_post_param( 'plain_text', '', 'absint' ),
		@@ -1576,17 +1193,9 @@
1576	1193	);
1577	1194	wp_die();
1578	1195	}
1579	1196
1580		- /**
1581		- * @param string $content
1582		- * @param stdClass|string|int $form
1583		- * @param stdClass|string|int|false $entry
1584		- * @return string
1585		- */
1586	1197	public static function filter_content( $content, $form, $entry = false ) {
1587		- $content = self::replace_form_name_shortcodes( $content, $form );
1588		-
1589	1198	self::get_entry_by_param( $entry );
1590	1199	if ( ! $entry ) {
1591	1200	return $content;
1592	1201	}
		@@ -1600,34 +1209,8 @@
1600	1209
1601	1210	return $content;
1602	1211	}
1603	1212
1604		- /**
1605		- * Replace any [form_name] shortcodes in a string.
1606		- *
1607		- * @since 5.5
1608		- *
1609		- * @param string $string
1610		- * @param stdClass|string|int $form
1611		- * @return string
1612		- */
1613		- public static function replace_form_name_shortcodes( $string, $form ) {
1614		- if ( false === strpos( $string, '[form_name]' ) ) {
1615		- return $string;
1616		- }
1617		-
1618		- if ( ! is_object( $form ) ) {
1619		- $form = FrmForm::getOne( $form );
1620		- }
1621		-
1622		- $form_name = is_object( $form ) ? $form->name : '';
1623		- return str_replace( '[form_name]', $form_name, $string );
1624		- }
1625		-
1626		- /**
1627		- * @param stdClass|string|int|false $entry
1628		- * @return void
1629		- */
1630	1213	private static function get_entry_by_param( &$entry ) {
1631	1214	if ( ! $entry || ! is_object( $entry ) ) {
1632	1215	if ( ! $entry || ! is_numeric( $entry ) ) {
1633	1216	$entry = FrmAppHelper::get_post_param( 'id', false, 'sanitize_title' );
		@@ -1697,13 +1280,11 @@
1697	1280	$action = isset( $_REQUEST['frm_action'] ) ? 'frm_action' : 'action';
1698	1281	$vars = array();
1699	1282	FrmAppHelper::include_svg();
1700	1283
1701		- if ( isset( $_POST['frm_compact_fields'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
	1284	+ if ( isset( $_POST['frm_compact_fields'] ) ) {
1702	1285	FrmAppHelper::permission_check( 'frm_edit_forms' );
1703	1286
1704		- // Javascript needs to be allowed in some field settings.
1705		- // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized, WordPress.Security.NonceVerification.Missing
1706	1287	$json_vars = htmlspecialchars_decode( nl2br( str_replace( '&quot;', '"', wp_unslash( $_POST['frm_compact_fields'] ) ) ) );
1707	1288	$json_vars = json_decode( $json_vars, true );
1708	1289	if ( empty( $json_vars ) ) {
1709	1290	// json decoding failed so we should return an error message.
		@@ -1715,11 +1296,11 @@
1715	1296	add_filter( 'frm_validate_form', 'FrmFormsController::json_error' );
1716	1297	} else {
1717	1298	$vars = FrmAppHelper::json_to_array( $json_vars );
1718	1299	$action = $vars[ $action ];
1719		- unset( $_REQUEST['frm_compact_fields'], $_POST['frm_compact_fields'] ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
1720		- $_REQUEST = array_merge( $_REQUEST, $vars ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
1721		- $_POST = array_merge( $_POST, $_REQUEST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
	1300	+ unset( $_REQUEST['frm_compact_fields'], $_POST['frm_compact_fields'] );
	1301	+ $_REQUEST = array_merge( $_REQUEST, $vars );
	1302	+ $_POST = array_merge( $_POST, $_REQUEST );
1722	1303	}
1723	1304	} else {
1724	1305	$action = FrmAppHelper::get_param( $action, '', 'get', 'sanitize_title' );
1725	1306	if ( isset( $_REQUEST['delete_all'] ) ) {
		@@ -1733,11 +1314,15 @@
1733	1314
1734	1315	switch ( $action ) {
1735	1316	case 'new':
1736	1317	return self::new_form( $vars );
	1318	+ case 'add_new':
	1319	+ case 'list_templates':
	1320	+ return self::list_templates();
1737	1321	case 'create':
1738	1322	case 'edit':
1739	1323	case 'update':
	1324	+ case 'duplicate':
1740	1325	case 'trash':
1741	1326	case 'untrash':
1742	1327	case 'destroy':
1743	1328	case 'delete_all':
		@@ -1743,12 +1328,8 @@
1743	1328	case 'delete_all':
1744	1329	case 'settings':
1745	1330	case 'update_settings':
1746	1331	return self::$action( $vars );
1747		- case 'lite-reports':
1748		- return self::no_reports( $vars );
1749		- case 'views':
1750		- return self::no_views( $vars );
1751	1332	default:
1752	1333	do_action( 'frm_form_action_' . $action );
1753	1334	if ( apply_filters( 'frm_form_stop_action_' . $action, false ) ) {
1754	1335	return;
		@@ -1761,21 +1342,12 @@
1761	1342
1762	1343	if ( strpos( $action, 'bulk_' ) === 0 ) {
1763	1344	FrmAppHelper::remove_get_action();
1764	1345
1765		- self::list_form();
1766		- return;
	1346	+ return self::list_form();
1767	1347	}
1768	1348
1769		- $message = FrmAppHelper::get_param( 'message' );
1770		- if ( 'form_duplicate_error' === $message ) {
1771		- self::display_forms_list( array(), '', array( __( 'There was a problem duplicating the form', 'formidable' ) ) );
1772		- return;
1773		- }
1774		-
1775		- self::display_forms_list();
1776		-
1777		- return;
	1349	+ return self::display_forms_list();
1778	1350	}
1779	1351	}
1780	1352
1781	1353	public static function json_error( $errors ) {
		@@ -1783,42 +1355,8 @@
1783	1355
1784	1356	return $errors;
1785	1357	}
1786	1358
1787		- /**
1788		- * Education for premium features.
1789		- *
1790		- * @since 4.05
1791		- */
1792		- public static function add_form_style_tab_options() {
1793		- include( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/add_form_style_options.php' );
1794		- }
1795		-
1796		- /**
1797		- * Add education about views.
1798		- *
1799		- * @since 4.07
1800		- */
1801		- public static function no_views( $values = array() ) {
1802		- FrmAppHelper::include_svg();
1803		- $id = FrmAppHelper::get_param( 'form', '', 'get', 'absint' );
1804		- $form = $id ? FrmForm::getOne( $id ) : false;
1805		-
1806		- include FrmAppHelper::plugin_path() . '/classes/views/shared/views-info.php';
1807		- }
1808		-
1809		- /**
1810		- * Add education about reports.
1811		- *
1812		- * @since 4.07
1813		- */
1814		- public static function no_reports( $values = array() ) {
1815		- $id = FrmAppHelper::get_param( 'form', '', 'get', 'absint' );
1816		- $form = $id ? FrmForm::getOne( $id ) : false;
1817		-
1818		- include FrmAppHelper::plugin_path() . '/classes/views/shared/reports-info.php';
1819		- }
1820		-
1821	1359	/* FRONT-END FORMS */
1822	1360	public static function admin_bar_css() {
1823	1361	if ( is_admin() || ! current_user_can( 'frm_edit_forms' ) ) {
1824	1362	return;
		@@ -1823,24 +1361,12 @@
1823	1361	if ( is_admin() || ! current_user_can( 'frm_edit_forms' ) ) {
1824	1362	return;
1825	1363	}
1826	1364
1827		- self::move_menu_to_footer();
1828		-
1829	1365	add_action( 'wp_before_admin_bar_render', 'FrmFormsController::admin_bar_configure' );
1830	1366	FrmAppHelper::load_font_style();
1831	1367	}
1832	1368
1833		- /**
1834		- * @since 4.05.02
1835		- */
1836		- private static function move_menu_to_footer() {
1837		- $settings = FrmAppHelper::get_settings();
1838		- if ( empty( $settings->admin_bar ) ) {
1839		- remove_action( 'wp_body_open', 'wp_admin_bar_render', 0 );
1840		- }
1841		- }
1842		-
1843	1369	public static function admin_bar_configure() {
1844	1370	global $frm_vars;
1845	1371	if ( empty( $frm_vars['forms_loaded'] ) ) {
1846	1372	return;
		@@ -1904,9 +1430,8 @@
1904	1430	/**
1905	1431	* The formidable shortcode
1906	1432	*
1907	1433	* @param array $atts The params from the shortcode.
1908		- * @return string
1909	1434	*/
1910	1435	public static function get_form_shortcode( $atts ) {
1911	1436	global $frm_vars;
1912	1437	if ( isset( $frm_vars['skip_shortcode'] ) && $frm_vars['skip_shortcode'] ) {
		@@ -1918,10 +1443,10 @@
1918	1443	$shortcode_atts = shortcode_atts(
1919	1444	array(
1920	1445	'id' => '',
1921	1446	'key' => '',
1922		- 'title' => 'auto',
1923		- 'description' => 'auto',
	1447	+ 'title' => false,
	1448	+ 'description' => false,
1924	1449	'readonly' => false,
1925	1450	'entry_id' => false,
1926	1451	'fields' => array(),
1927	1452	'exclude_fields' => array(),
		@@ -1933,45 +1458,18 @@
1933	1458
1934	1459	return self::show_form( $shortcode_atts['id'], $shortcode_atts['key'], $shortcode_atts['title'], $shortcode_atts['description'], $atts );
1935	1460	}
1936	1461
1937		- /**
1938		- * @since 5.2.01
1939		- *
1940		- * @param string|int|false $id
1941		- * @param string|false $key
1942		- * @return stdClass|false
1943		- */
1944		- private static function maybe_get_form_by_id_or_key( $id, $key ) {
1945		- if ( ! $id ) {
	1462	+ public static function show_form( $id = '', $key = '', $title = false, $description = false, $atts = array() ) {
	1463	+ if ( empty( $id ) ) {
1946	1464	$id = $key;
1947	1465	}
1948		- return self::maybe_get_form_to_show( $id );
1949		- }
1950	1466
1951		- /**
1952		- * @param string|int|false $id
1953		- * @param string|false $key
1954		- * @param string|int|bool $title may be 'auto', true, false, 'true', 'false', 'yes', '1', 1, '0', 0.
1955		- * @param string|int|bool $description may be 'auto', true, false, 'true', 'false', 'yes', '1', 1, '0', 0.
1956		- * @param array $atts
1957		- * @return string
1958		- */
1959		- public static function show_form( $id = '', $key = '', $title = false, $description = false, $atts = array() ) {
1960		- $form = self::maybe_get_form_by_id_or_key( $id, $key );
1961		-
	1467	+ $form = self::maybe_get_form_to_show( $id );
1962	1468	if ( ! $form ) {
1963	1469	return __( 'Please select a valid form', 'formidable' );
1964	1470	}
1965	1471
1966		- if ( 'auto' === $title ) {
1967		- $title = ! empty( $form->options['show_title'] );
1968		- }
1969		-
1970		- if ( 'auto' === $description ) {
1971		- $description = ! empty( $form->options['show_description'] );
1972		- }
1973		-
1974	1472	FrmAppController::maybe_update_styles();
1975	1473
1976	1474	add_action( 'frm_load_form_hooks', 'FrmHooksController::trigger_load_form_hooks' );
1977	1475	FrmAppHelper::trigger_hook_load( 'form', $form );
		@@ -1982,10 +1480,12 @@
1982	1480
1983	1481	if ( self::is_viewable_draft_form( $form ) ) {
1984	1482	// don't show a draft form on a page
1985	1483	$form = __( 'Please select a valid form', 'formidable' );
1986		- } elseif ( ! FrmForm::is_visible_to_user( $form ) ) {
	1484	+ } elseif ( self::user_should_login( $form ) ) {
1987	1485	$form = do_shortcode( $frm_settings->login_msg );
	1486	+ } elseif ( self::user_has_permission_to_view( $form ) ) {
	1487	+ $form = do_shortcode( $frm_settings->login_msg );
1988	1488	} else {
1989	1489	do_action( 'frm_pre_get_form', $form );
1990	1490	$form = self::get_form( $form, $title, $description, $atts );
1991	1491
		@@ -2000,18 +1500,14 @@
2000	1500
2001	1501	return $form;
2002	1502	}
2003	1503
2004		- /**
2005		- * @param string|int|false $id
2006		- * @return stdClass|false
2007		- */
2008	1504	private static function maybe_get_form_to_show( $id ) {
2009	1505	$form = false;
2010	1506
2011		- if ( ! empty( $id ) ) { // form id or key is set
	1507	+ if ( ! empty( $id ) ) { // no form id or key set
2012	1508	$form = FrmForm::getOne( $id );
2013		- if ( ! $form || $form->parent_form_id || $form->status === 'trash' ) {
	1509	+ if ( ! $form || $form->parent_form_id || $form->status == 'trash' ) {
2014	1510	$form = false;
2015	1511	}
2016	1512	}
2017	1513
		@@ -2018,11 +1514,19 @@
2018	1514	return $form;
2019	1515	}
2020	1516
2021	1517	private static function is_viewable_draft_form( $form ) {
2022		- return $form->status === 'draft' && current_user_can( 'frm_edit_forms' ) && ! FrmAppHelper::is_preview_page();
	1518	+ return $form->status == 'draft' && current_user_can( 'frm_edit_forms' ) && ! FrmAppHelper::is_preview_page();
2023	1519	}
2024	1520
	1521	+ private static function user_should_login( $form ) {
	1522	+ return $form->logged_in && ! is_user_logged_in();
	1523	+ }
	1524	+
	1525	+ private static function user_has_permission_to_view( $form ) {
	1526	+ return $form->logged_in && get_current_user_id() && isset( $form->options['logged_in_role'] ) && $form->options['logged_in_role'] != '' && ! FrmAppHelper::user_has_permission( $form->options['logged_in_role'] );
	1527	+ }
	1528	+
2025	1529	public static function get_form( $form, $title, $description, $atts = array() ) {
2026	1530	ob_start();
2027	1531
2028	1532	do_action( 'frm_before_get_form', $atts );
		@@ -2048,15 +1552,11 @@
2048	1552	$fields = FrmFieldsHelper::get_form_fields( $form->id, $errors );
2049	1553	$reset = false;
2050	1554	$pass_args = compact( 'form', 'fields', 'errors', 'title', 'description', 'reset' );
2051	1555
2052		- $pass_args['action'] = $params['action'];
2053		- $handle_process_here = $params['action'] === 'create' && $params['posted_form_id'] == $form->id && $_POST; // phpcs:ignore WordPress.Security.NonceVerification.Missing
	1556	+ $handle_process_here = $params['action'] == 'create' && $params['posted_form_id'] == $form->id && $_POST;
2054	1557
2055	1558	if ( ! $handle_process_here ) {
2056		- FrmFormState::set_initial_value( 'title', $title );
2057		- FrmFormState::set_initial_value( 'description', $description );
2058		-
2059	1559	do_action( 'frm_display_form_action', $params, $fields, $form, $title, $description );
2060	1560	if ( apply_filters( 'frm_continue_to_new', true, $form->id, $params['action'] ) ) {
2061	1561	self::show_form_after_submit( $pass_args );
2062	1562	}
		@@ -2070,10 +1570,11 @@
2070	1570	if ( apply_filters( 'frm_continue_to_create', true, $form->id ) ) {
2071	1571	$entry_id = self::just_created_entry( $form->id );
2072	1572	$pass_args['entry_id'] = $entry_id;
2073	1573	$pass_args['reset'] = true;
	1574	+ $pass_args['conf_method'] = self::get_confirmation_method( compact( 'form', 'entry_id' ) );
2074	1575
2075		- self::run_on_submit_actions( $pass_args );
	1576	+ self::run_success_action( $pass_args );
2076	1577
2077	1578	do_action(
2078	1579	'frm_after_entry_processed',
2079	1580	array(
		@@ -2092,23 +1593,15 @@
2092	1593	*/
2093	1594	private static function get_saved_errors( $form, $params ) {
2094	1595	global $frm_vars;
2095	1596
2096		- if ( $params['posted_form_id'] == $form->id && $_POST && isset( $frm_vars['created_entries'][ $form->id ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
	1597	+ if ( $params['posted_form_id'] == $form->id && $_POST && isset( $frm_vars['created_entries'][ $form->id ] ) ) {
2097	1598	$errors = $frm_vars['created_entries'][ $form->id ]['errors'];
2098	1599	} else {
2099	1600	$errors = array();
2100	1601	}
2101	1602
2102		- /**
2103		- * Allows modifying the generated errors if the form was processed earlier.
2104		- *
2105		- * @since 5.2.03
2106		- *
2107		- * @param array $errors Errors data. Is empty array if no errors found.
2108		- * @param array $params Form params. See {@see FrmForm::get_params()}.
2109		- */
2110		- return apply_filters( 'frm_saved_errors', $errors, $params );
	1603	+ return $errors;
2111	1604	}
2112	1605
2113	1606	/**
2114	1607	* @since 2.2.7
		@@ -2119,35 +1612,15 @@
2119	1612	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;
2120	1613	}
2121	1614
2122	1615	/**
2123		- * Gets confirmation method.
2124		- *
2125	1616	* @since 3.0
2126		- * @since 6.0 This method can return an array of met On Submit actions.
2127		- *
2128		- * @param array $atts {
2129		- * Atts.
2130		- *
2131		- * @type object $form Form object.
2132		- * @type int $entry_id Entry ID.
2133		- * }
2134		- * @return string|array
2135	1617	*/
2136	1618	private static function get_confirmation_method( $atts ) {
2137		- $action = FrmOnSubmitHelper::current_event( $atts );
2138		- $opt = 'update' === $action ? 'edit_action' : 'success_action';
	1619	+ $opt = 'success_action';
2139	1620	$method = ( isset( $atts['form']->options[ $opt ] ) && ! empty( $atts['form']->options[ $opt ] ) ) ? $atts['form']->options[ $opt ] : 'message';
	1621	+ $method = apply_filters( 'frm_success_filter', $method, $atts['form'], 'create' );
2140	1622
2141		- if ( ! empty( $atts['entry_id'] ) ) {
2142		- $met_actions = self::get_met_on_submit_actions( $atts, $action );
2143		- if ( $met_actions ) {
2144		- $method = $met_actions;
2145		- }
2146		- }
2147		-
2148		- $method = apply_filters( 'frm_success_filter', $method, $atts['form'], $action );
2149		-
2150	1623	if ( $method != 'message' && ( ! $atts['entry_id'] || ! is_numeric( $atts['entry_id'] ) ) ) {
2151	1624	$method = 'message';
2152	1625	}
2153	1626
		@@ -2163,34 +1636,11 @@
2163	1636	$conf_method = self::get_confirmation_method(
2164	1637	array(
2165	1638	'form' => $form,
2166	1639	'entry_id' => $params['id'],
2167		- 'action' => FrmOnSubmitHelper::current_event( $params ),
2168	1640	)
2169	1641	);
2170	1642
2171		- self::maybe_trigger_redirect_with_action( $conf_method, $form, $params, $args );
2172		- }
2173		-
2174		- /**
2175		- * Maybe trigger redirect with the new Confirmation action.
2176		- *
2177		- * @since 6.1.1
2178		- *
2179		- * @param array|string $conf_method Array of confirmation actions or the action type string.
2180		- * @param object $form Form object.
2181		- * @param array $params See {@see FrmFormsController::maybe_trigger_redirect()}.
2182		- * @param array $args See {@see FrmFormsController::maybe_trigger_redirect()}.
2183		- */
2184		- public static function maybe_trigger_redirect_with_action( $conf_method, $form, $params, $args ) {
2185		- if ( is_array( $conf_method ) && 1 === count( $conf_method ) ) {
2186		- if ( 'redirect' === FrmOnSubmitHelper::get_action_type( $conf_method[0] ) ) {
2187		- $event = FrmOnSubmitHelper::current_event( $params );
2188		- FrmOnSubmitHelper::populate_on_submit_data( $form->options, $conf_method[0], $event );
2189		- $conf_method = 'redirect';
2190		- }
2191		- }
2192		-
2193	1643	if ( 'redirect' === $conf_method ) {
2194	1644	self::trigger_redirect( $form, $params, $args );
2195	1645	}
2196	1646	}
		@@ -2213,36 +1663,21 @@
2213	1663	/**
2214	1664	* Used when the success action is not 'message'
2215	1665	*
2216	1666	* @since 2.05
2217		- * @since 6.0 `$args['force_delay_redirect']` is added.
2218		- *
2219		- * @param array $args {
2220		- * The args.
2221		- *
2222		- * @type string $conf_method The method.
2223		- * @type object $form Form object.
2224		- * @type int $entry_id Entry ID.
2225		- * @type string $action The action event. Accepts `create` or `update`.
2226		- * @type array $fields The array of fields.
2227		- * @type int $force_delay_redirect Force to show the message before redirecting in case redirect method runs.
2228		- * }
2229	1667	*/
2230	1668	public static function run_success_action( $args ) {
2231		- global $frm_vars;
2232	1669	$extra_args = $args;
2233	1670	unset( $extra_args['form'] );
2234	1671
2235	1672	do_action( 'frm_success_action', $args['conf_method'], $args['form'], $args['form']->options, $args['entry_id'], $extra_args );
2236	1673
2237		- $opt = ( ! isset( $args['action'] ) || $args['action'] === 'create' ) ? 'success' : 'edit';
	1674	+ $opt = ( ! isset( $args['action'] ) || $args['action'] == 'create' ) ? 'success' : 'edit';
2238	1675
2239	1676	$args['success_opt'] = $opt;
2240		- $args['ajax'] = ! empty( $frm_vars['ajax'] );
2241		-
2242		- if ( $args['conf_method'] === 'page' && is_numeric( $args['form']->options[ $opt . '_page_id' ] ) ) {
	1677	+ if ( $args['conf_method'] == 'page' && is_numeric( $args['form']->options[ $opt . '_page_id' ] ) ) {
2243	1678	self::load_page_after_submit( $args );
2244		- } elseif ( $args['conf_method'] === 'redirect' ) {
	1679	+ } elseif ( $args['conf_method'] == 'redirect' ) {
2245	1680	self::redirect_after_submit( $args );
2246	1681	} else {
2247	1682	self::show_message_after_save( $args );
2248	1683	}
		@@ -2248,219 +1683,8 @@
2248	1683	}
2249	1684	}
2250	1685
2251	1686	/**
2252		- * Gets met On Submit actions.
2253		- *
2254		- * @since 6.0
2255		- *
2256		- * @param array $args See {@see FrmFormsController::run_success_action()}.
2257		- * @param string $event Form event. Default is `create`.
2258		- * @return array Array of actions that meet the conditional logics.
2259		- */
2260		- public static function get_met_on_submit_actions( $args, $event = 'create' ) {
2261		- if ( ! FrmOnSubmitHelper::form_has_migrated( $args['form'] ) ) {
2262		- return array();
2263		- }
2264		-
2265		- $entry = FrmEntry::getOne( $args['entry_id'], true );
2266		- $actions = FrmOnSubmitHelper::get_actions( $args['form']->id );
2267		- $met_actions = array();
2268		- $has_redirect = false;
2269		-
2270		- foreach ( $actions as $action ) {
2271		- if ( ! in_array( $event, $action->post_content['event'], true ) ) {
2272		- continue;
2273		- }
2274		-
2275		- if ( FrmFormAction::action_conditions_met( $action, $entry ) ) {
2276		- continue;
2277		- }
2278		-
2279		- $action_type = FrmOnSubmitHelper::get_action_type( $action );
2280		-
2281		- if ( 'redirect' === $action_type ) {
2282		- if ( $has_redirect ) { // Do not process because we run the first redirect action only.
2283		- continue;
2284		- }
2285		- }
2286		-
2287		- if ( ! self::is_valid_on_submit_action( $action, $args, $event ) ) {
2288		- continue;
2289		- }
2290		-
2291		- if ( 'redirect' === $action_type ) {
2292		- $has_redirect = true;
2293		- }
2294		-
2295		- $met_actions[] = $action;
2296		- unset( $action );
2297		- }
2298		-
2299		- $args['event'] = $event;
2300		-
2301		- /**
2302		- * Filters the On Submit actions that meet the conditional logics.
2303		- *
2304		- * @since 6.0
2305		- *
2306		- * @param array $met_actions Actions that meet the conditional logics.
2307		- * @param array $args See {@see FrmFormsController::run_success_action()}. `$args['event']` is also added.
2308		- */
2309		- $met_actions = apply_filters( 'frm_get_met_on_submit_actions', $met_actions, $args );
2310		-
2311		- if ( empty( $met_actions ) ) {
2312		- $met_actions = array( FrmOnSubmitHelper::get_fallback_action( $event ) );
2313		- }
2314		-
2315		- return $met_actions;
2316		- }
2317		-
2318		- /**
2319		- * Checks if a Confirmation action has the valid data.
2320		- *
2321		- * @since 6.1.2
2322		- *
2323		- * @param object $action Form action object.
2324		- * @param array $args See {@see FrmFormsController::run_success_action()}.
2325		- * @param string $event Form event. Default is `create`.
2326		- * @return bool
2327		- */
2328		- private static function is_valid_on_submit_action( $action, $args, $event = 'create' ) {
2329		- $action_type = FrmOnSubmitHelper::get_action_type( $action );
2330		-
2331		- if ( 'redirect' === $action_type ) {
2332		- // Run through frm_redirect_url filter. This is used for the valid action check.
2333		- $action->post_content['success_url'] = apply_filters(
2334		- 'frm_redirect_url',
2335		- $action->post_content['success_url'],
2336		- $args['form'],
2337		- $args + array( 'action' => $event )
2338		- );
2339		-
2340		- return ! empty( $action->post_content['success_url'] );
2341		- }
2342		-
2343		- if ( 'page' === $action_type ) {
2344		- if ( empty( $action->post_content['success_page_id'] ) ) {
2345		- return false;
2346		- }
2347		-
2348		- $page = get_post( $action->post_content['success_page_id'] );
2349		- if ( ! $page || 'trash' === $page->post_status ) {
2350		- return false;
2351		- }
2352		- }
2353		-
2354		- return true;
2355		- }
2356		-
2357		- /**
2358		- * Runs On Submit actions.
2359		- *
2360		- * @since 6.0
2361		- *
2362		- * @param array $args See inside {@see FrmFormsController::get_form_contents()} method.
2363		- */
2364		- public static function run_on_submit_actions( $args ) {
2365		- $args['conf_method'] = self::get_confirmation_method(
2366		- array(
2367		- 'form' => $args['form'],
2368		- 'entry_id' => $args['entry_id'],
2369		- 'action' => FrmOnSubmitHelper::current_event( $args ),
2370		- )
2371		- );
2372		- if ( ! is_array( $args['conf_method'] ) ) {
2373		- self::run_success_action( $args );
2374		- return;
2375		- }
2376		-
2377		- // If conf_method is an array, run On Submit actions.
2378		- if ( ! $args['conf_method'] ) {
2379		- // Use default message.
2380		- FrmOnSubmitHelper::populate_on_submit_data( $args['form']->options );
2381		- self::run_success_action( $args );
2382		- } elseif ( 1 === count( $args['conf_method'] ) ) {
2383		- FrmOnSubmitHelper::populate_on_submit_data( $args['form']->options, reset( $args['conf_method'] ) );
2384		- $args['conf_method'] = $args['form']->options['success_action'];
2385		- self::run_success_action( $args );
2386		- } else {
2387		- self::run_multi_on_submit_actions( $args );
2388		- }
2389		- }
2390		-
2391		- /**
2392		- * Runs multiple success actions.
2393		- *
2394		- * @since 6.0
2395		- *
2396		- * @param array $args See {@see FrmFormsController::run_success_action()}.
2397		- */
2398		- public static function run_multi_on_submit_actions( $args ) {
2399		- $redirect_action = null;
2400		- foreach ( $args['conf_method'] as $action ) {
2401		- if ( 'redirect' === FrmOnSubmitHelper::get_action_type( $action ) ) {
2402		- // We catch the redirect action to run it last.
2403		- $redirect_action = $action;
2404		- continue;
2405		- }
2406		-
2407		- self::run_single_on_submit_action( $args, $action );
2408		-
2409		- unset( $action );
2410		- }
2411		-
2412		- if ( $redirect_action ) {
2413		- // Show script to delay the redirection.
2414		- $args['force_delay_redirect'] = true;
2415		- self::run_single_on_submit_action( $args, $redirect_action );
2416		- }
2417		- }
2418		-
2419		- /**
2420		- * Runs single On Submit action.
2421		- *
2422		- * @since 6.0
2423		- *
2424		- * @param array $args See {@see FrmFormsController::run_success_action()}.
2425		- * @param object $action On Submit action object.
2426		- */
2427		- public static function run_single_on_submit_action( $args, $action ) {
2428		- $new_args = self::get_run_success_action_args( $args, $action );
2429		- self::run_success_action( $new_args );
2430		- }
2431		-
2432		- /**
2433		- * Gets run_success_action() args from the On Submit action.
2434		- *
2435		- * @since 6.0
2436		- *
2437		- * @param array $args See {@see FrmFormsController::run_success_action()}.
2438		- * @param object $action On Submit action object.
2439		- * @return array
2440		- */
2441		- private static function get_run_success_action_args( $args, $action ) {
2442		- $new_args = $args;
2443		-
2444		- FrmOnSubmitHelper::populate_on_submit_data( $new_args['form']->options, $action, $args['action'] );
2445		-
2446		- $opt = 'update' === $args['action'] ? 'edit_' : 'success_';
2447		-
2448		- $new_args['conf_method'] = $new_args['form']->options[ $opt . 'action' ];
2449		-
2450		- /**
2451		- * Filters the run success action args.
2452		- *
2453		- * @since 6.0
2454		- *
2455		- * @param array $new_args The new args.
2456		- * @param array $args The old args. See {@see FrmFormsController::run_success_action()}.
2457		- * @param object $action On Submit action object.
2458		- */
2459		- return apply_filters( 'frm_get_run_success_action_args', $new_args, $args, $action );
2460		- }
2461		-
2462		- /**
2463	1687	* @since 3.0
2464	1688	*/
2465	1689	private static function load_page_after_submit( $args ) {
2466	1690	global $post;
		@@ -2469,22 +1693,9 @@
2469	1693	$page = get_post( $args['form']->options[ $opt . '_page_id' ] );
2470	1694	$old_post = $post;
2471	1695	$post = $page;
2472	1696	$content = apply_filters( 'frm_content', $page->post_content, $args['form'], $args['entry_id'] );
2473		-
2474		- // Fix the On Submit page content doesn't show when previewing In theme.
2475		- $has_preview_filter = has_filter( 'the_content', 'FrmFormsController::preview_content' );
2476		-
2477		- if ( $has_preview_filter ) {
2478		- remove_filter( 'the_content', 'FrmFormsController::preview_content', 9999 );
2479		- }
2480		-
2481		- echo apply_filters( 'the_content', $content ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
2482		-
2483		- if ( $has_preview_filter ) {
2484		- add_filter( 'the_content', 'FrmFormsController::preview_content', 9999 );
2485		- }
2486		-
	1697	+ echo apply_filters( 'the_content', $content ); // WPCS: XSS ok.
2487	1698	$post = $old_post;
2488	1699	}
2489	1700	}
2490	1701
		@@ -2489,11 +1700,12 @@
2489	1700	}
2490	1701
2491	1702	/**
2492	1703	* @since 3.0
2493		- * @param array $args See {@see FrmFormsController::run_success_action()}.
2494	1704	*/
2495	1705	private static function redirect_after_submit( $args ) {
	1706	+ global $frm_vars;
	1707	+
2496	1708	add_filter( 'frm_use_wpautop', '__return_false' );
2497	1709
2498	1710	$opt = $args['success_opt'];
2499	1711	$success_url = trim( $args['form']->options[ $opt . '_url' ] );
		@@ -2499,8 +1711,12 @@
2499	1711	$success_url = trim( $args['form']->options[ $opt . '_url' ] );
2500	1712	$success_url = apply_filters( 'frm_content', $success_url, $args['form'], $args['entry_id'] );
2501	1713	$success_url = do_shortcode( $success_url );
2502	1714
	1715	+ $success_msg = isset( $args['form']->options[ $opt . '_msg' ] ) ? $args['form']->options[ $opt . '_msg' ] : __( 'Please wait while you are redirected.', 'formidable' );
	1716	+
	1717	+ $redirect_msg = self::get_redirect_message( $success_url, $success_msg, $args );
	1718	+
2503	1719	$args['id'] = $args['entry_id'];
2504	1720	FrmEntriesController::delete_entry_before_redirect( $success_url, $args['form'], $args );
2505	1721
2506	1722	add_filter( 'frm_redirect_url', 'FrmEntriesController::prepare_redirect_url' );
		@@ -2507,54 +1723,20 @@
2507	1723	$success_url = apply_filters( 'frm_redirect_url', $success_url, $args['form'], $args );
2508	1724
2509	1725	$doing_ajax = FrmAppHelper::doing_ajax();
2510	1726
2511		- if ( ! empty( $args['ajax'] ) && $doing_ajax && empty( $args['force_delay_redirect'] ) ) { // Is AJAX submit and there is just one Redirect action runs.
	1727	+ if ( isset( $args['ajax'] ) && $args['ajax'] && $doing_ajax ) {
2512	1728	echo json_encode( array( 'redirect' => $success_url ) );
2513	1729	wp_die();
2514		- }
2515		-
2516		- if ( ! headers_sent() && empty( $args['force_delay_redirect'] ) ) { // Not AJAX submit, no headers sent, and there is just one Redirect action runs.
	1730	+ } elseif ( ! headers_sent() ) {
2517	1731	wp_redirect( esc_url_raw( $success_url ) );
2518	1732	die(); // do not use wp_die or redirect fails
2519		- }
	1733	+ } else {
	1734	+ add_filter( 'frm_use_wpautop', '__return_true' );
2520	1735
2521		- // Redirect with a delay.
2522		- self::redirect_after_submit_using_js( $args + compact( 'success_url', 'doing_ajax' ) );
2523		- }
2524		-
2525		- /**
2526		- * Redirects after submitting using JS. This is used when showing message before redirecting.
2527		- *
2528		- * @since 6.0
2529		- *
2530		- * @param array $args See {@see FrmFormsController::run_success_action()}.
2531		- */
2532		- private static function redirect_after_submit_using_js( $args ) {
2533		- $success_msg = FrmOnSubmitHelper::get_default_redirect_msg();
2534		- $redirect_msg = self::get_redirect_message( $args['success_url'], $success_msg, $args );
2535		-
2536		- /**
2537		- * Filters the delay time before redirecting when On Submit Redirect action is delayed.
2538		- *
2539		- * @since 6.0
2540		- *
2541		- * @param int $delay_time Delay time in miliseconds.
2542		- */
2543		- $delay_time = apply_filters( 'frm_redirect_delay_time', 8000 );
2544		-
2545		- add_filter( 'frm_use_wpautop', '__return_true' );
2546		-
2547		- echo FrmAppHelper::maybe_kses( $redirect_msg ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
2548		- echo '<script>';
2549		- if ( empty( $args['doing_ajax'] ) ) { // Not AJAX submit, delay JS until window.load.
2550		- echo 'window.onload=function(){';
	1736	+ echo $redirect_msg; // WPCS: XSS ok.
	1737	+ echo "<script type='text/javascript'>window.onload = function(){setTimeout(window.location='" . esc_url_raw( $success_url ) . "', 8000);}</script>";
2551	1738	}
2552		- echo 'setTimeout(function(){window.location="' . esc_url_raw( $args['success_url'] ) . '";}, ' . intval( $delay_time ) . ');';
2553		- if ( empty( $args['doing_ajax'] ) ) {
2554		- echo '};';
2555		- }
2556		- echo '</script>';
2557	1739	}
2558	1740
2559	1741	/**
2560	1742	* @since 3.0
		@@ -2563,9 +1745,9 @@
2563	1745	* @param string $success_msg
2564	1746	* @param array $args
2565	1747	*/
2566	1748	private static function get_redirect_message( $success_url, $success_msg, $args ) {
2567		- $redirect_msg = '<div class="' . esc_attr( FrmFormsHelper::get_form_style_class( $args['form'] ) ) . '"><div class="frm-redirect-msg" role="status">' . $success_msg . '<br/>' .
	1749	+ $redirect_msg = '<div class="' . esc_attr( FrmFormsHelper::get_form_style_class( $args['form'] ) ) . '"><div class="frm-redirect-msg frm_message">' . $success_msg . '<br/>' .
2568	1750	/* translators: %1$s: Start link HTML, %2$s: End link HTML */
2569	1751	sprintf( __( '%1$sClick here%2$s if you are not automatically redirected.', 'formidable' ), '<a href="' . esc_url( $success_url ) . '">', '</a>' ) .
2570	1752	'</div></div>';
2571	1753
		@@ -2583,22 +1765,12 @@
2583	1765	*
2584	1766	* @since 2.05
2585	1767	*/
2586	1768	public static function show_message_after_save( $atts ) {
2587		- $atts['message'] = self::prepare_submit_message( $atts['form'], $atts['entry_id'], $atts );
	1769	+ $atts['message'] = self::prepare_submit_message( $atts['form'], $atts['entry_id'] );
2588	1770
2589	1771	if ( ! isset( $atts['form']->options['show_form'] ) || $atts['form']->options['show_form'] ) {
2590		- if ( isset( $atts['action'] ) && 'update' === $atts['action'] && is_callable( array( 'FrmProEntriesController', 'show_front_end_form_with_entry' ) ) ) {
2591		- $entry = FrmEntry::getOne( $atts['entry_id'] );
2592		- if ( $entry ) {
2593		- // This is copied from the Pro plugin.
2594		- $atts['conf_message'] = FrmProEntriesController::confirmation( 'message', $atts['form'], $atts['form']->options, $entry->id, $atts );
2595		- $atts['show_form'] = FrmProEntriesController::is_form_displayed_after_edit( $atts['form'] );
2596		- FrmProEntriesController::show_front_end_form_with_entry( $entry, $atts );
2597		- }
2598		- } else {
2599		- self::show_form_after_submit( $atts );
2600		- }
	1772	+ self::show_form_after_submit( $atts );
2601	1773	} else {
2602	1774	self::show_lone_success_messsage( $atts );
2603	1775	}
2604	1776	}
		@@ -2617,11 +1789,9 @@
2617	1789	$title = $args['title'];
2618	1790	$description = $args['description'];
2619	1791
2620	1792	if ( empty( $args['fields'] ) ) {
2621		- $values = array(
2622		- 'custom_style' => FrmAppHelper::custom_style_value( array() ),
2623		- );
	1793	+ $values = array();
2624	1794	} else {
2625	1795	$values = FrmEntriesHelper::setup_new_vars( $args['fields'], $form, $args['reset'] );
2626	1796	}
2627	1797	unset( $args );
		@@ -2633,51 +1803,17 @@
2633	1803
2634	1804	global $frm_vars;
2635	1805	self::maybe_load_css( $form, $values['custom_style'], $frm_vars['load_css'] );
2636	1806
2637		- $message_placement = self::message_placement( $form, $message );
2638		-
2639		- include FrmAppHelper::plugin_path() . '/classes/views/frm-entries/new.php';
	1807	+ include( FrmAppHelper::plugin_path() . '/classes/views/frm-entries/new.php' );
2640	1808	}
2641	1809
2642	1810	/**
2643		- * @return string - 'before', 'after', or 'submit'
2644		- *
2645		- * @since 4.05.02
2646		- */
2647		- private static function message_placement( $form, $message ) {
2648		- $place = 'before';
2649		-
2650		- if ( $message && isset( $form->options['form_class'] ) ) {
2651		- if ( strpos( $form->options['form_class'], 'frm_below_success' ) !== false ) {
2652		- $place = 'after';
2653		- } elseif ( strpos( $form->options['form_class'], 'frm_inline_success' ) !== false ) {
2654		- $place = 'submit';
2655		- }
2656		- }
2657		-
2658		- /**
2659		- * @return string - 'before' or 'after'
2660		- *
2661		- * @since 4.05.02
2662		- */
2663		- return apply_filters( 'frm_message_placement', $place, compact( 'form', 'message' ) );
2664		- }
2665		-
2666		- /**
2667	1811	* Get all the values needed on the new.php entry page
2668	1812	*
2669	1813	* @since 2.05
2670	1814	*/
2671	1815	private static function fill_atts_for_form_display( &$args ) {
2672		- if ( ! isset( $args['title'] ) && isset( $args['show_title'] ) ) {
2673		- $args['title'] = $args['show_title'];
2674		- }
2675		-
2676		- if ( ! isset( $args['description'] ) && isset( $args['show_description'] ) ) {
2677		- $args['description'] = $args['show_description'];
2678		- }
2679		-
2680	1816	$defaults = array(
2681	1817	'errors' => array(),
2682	1818	'message' => '',
2683	1819	'fields' => array(),
		@@ -2711,21 +1847,14 @@
2711	1847	/**
2712	1848	* Prepare the success message before it's shown
2713	1849	*
2714	1850	* @since 2.05
2715		- * @since 6.0.x Added the third parameter.
2716		- *
2717		- * @param object $form Form object.
2718		- * @param int $entry_id Entry ID.
2719		- * @param array $args See {@see FrmFormsController::run_success_action()}.
2720		- * @return string
2721	1851	*/
2722		- private static function prepare_submit_message( $form, $entry_id, $args = array() ) {
	1852	+ private static function prepare_submit_message( $form, $entry_id ) {
2723	1853	$frm_settings = FrmAppHelper::get_settings( array( 'current_form' => $form->id ) );
2724		- $opt = isset( $args['success_opt'] ) ? $args['success_opt'] : 'success';
2725	1854
2726	1855	if ( $entry_id && is_numeric( $entry_id ) ) {
2727		- $message = isset( $form->options[ $opt . '_msg' ] ) ? $form->options[ $opt . '_msg' ] : $frm_settings->success_msg;
	1856	+ $message = isset( $form->options['success_msg'] ) ? $form->options['success_msg'] : $frm_settings->success_msg;
2728	1857	$class = 'frm_message';
2729	1858	} else {
2730	1859	$message = $frm_settings->failed_msg;
2731	1860	$class = FrmFormsHelper::form_error_class();
		@@ -2735,11 +1864,8 @@
2735	1864
2736	1865	return apply_filters( 'frm_main_feedback', $message, $form, $entry_id );
2737	1866	}
2738	1867
2739		- /**
2740		- * @return void
2741		- */
2742	1868	public static function front_head() {
2743	1869	$version = FrmAppHelper::plugin_version();
2744	1870	$suffix = FrmAppHelper::js_suffix();
2745	1871
		@@ -2785,38 +1911,24 @@
2785	1911	* If css is loaded only on applicable pages, include it before the form loads
2786	1912	* to prevent a flash of unstyled form.
2787	1913	*
2788	1914	* @since 4.01
2789		- *
2790		- * @return void
2791	1915	*/
2792	1916	private static function load_late_css() {
2793	1917	$frm_settings = FrmAppHelper::get_settings();
2794		- $late_css = $frm_settings->load_style === 'dynamic';
2795		-
2796		- if ( ! $late_css || ! self::should_load_late() ) {
	1918	+ $late_css = $frm_settings->load_style === 'dynamic';
	1919	+ if ( ! $late_css ) {
2797	1920	return;
2798	1921	}
2799	1922
2800	1923	global $wp_styles;
2801		- if ( is_array( $wp_styles->queue ) && in_array( 'formidable', $wp_styles->queue, true ) ) {
	1924	+ if ( is_array( $wp_styles->queue ) && in_array( 'formidable', $wp_styles->queue ) ) {
2802	1925	wp_print_styles( 'formidable' );
2803	1926	}
2804	1927	}
2805	1928
2806		- /**
2807		- * Avoid late load if All in One SEO is active because it prevents CSS from loading entirely.
2808		- *
2809		- * @since 5.2.03
2810		- *
2811		- * @return bool
2812		- */
2813		- private static function should_load_late() {
2814		- return ! function_exists( 'aioseo' );
2815		- }
2816		-
2817	1929	public static function defer_script_loading( $tag, $handle ) {
2818		- if ( 'captcha-api' == $handle && ! strpos( $tag, 'defer' ) ) {
	1930	+ if ( 'recaptcha-api' == $handle && ! strpos( $tag, 'defer' ) ) {
2819	1931	$tag = str_replace( ' src', ' defer="defer" async="async" src', $tag );
2820	1932	}
2821	1933
2822	1934	return $tag;
		@@ -2851,125 +1963,8 @@
2851	1963	return isset( $atts['minimize'] ) && ! empty( $atts['minimize'] );
2852	1964	}
2853	1965
2854	1966	/**
2855		- * @since 5.0.16
2856		- *
2857		- * @return void
2858		- */
2859		- public static function landing_page_preview_option() {
2860		- $dir = apply_filters( 'frm_landing_page_preview_option', false );
2861		- if ( false === $dir || ! file_exists( $dir . 'landing-page-preview-option.php' ) ) {
2862		- $dir = self::get_form_views_path();
2863		- }
2864		- include $dir . 'landing-page-preview-option.php';
2865		- }
2866		-
2867		- /**
2868		- * @since 5.0.16
2869		- *
2870		- * @return string
2871		- */
2872		- private static function get_form_views_path() {
2873		- return FrmAppHelper::plugin_path() . '/classes/views/frm-forms/';
2874		- }
2875		-
2876		- /**
2877		- * Create a page with an embedded formidable Gutenberg block.
2878		- *
2879		- * @since 5.2
2880		- *
2881		- * @return never
2882		- */
2883		- public static function create_page_with_shortcode() {
2884		- if ( ! current_user_can( 'publish_posts' ) ) {
2885		- die( 0 );
2886		- }
2887		-
2888		- check_ajax_referer( 'frm_ajax', 'nonce' );
2889		-
2890		- $type = FrmAppHelper::get_post_param( 'type', '', 'sanitize_text_field' );
2891		- if ( ! $type || ! in_array( $type, array( 'form', 'view' ), true ) ) {
2892		- die( 0 );
2893		- }
2894		-
2895		- $object_id = FrmAppHelper::get_post_param( 'object_id', '', 'absint' );
2896		- if ( ! $object_id ) {
2897		- die( 0 );
2898		- }
2899		-
2900		- $postarr = array( 'post_type' => 'page' );
2901		-
2902		- if ( 'form' === $type ) {
2903		- $postarr['post_content'] = self::get_page_shortcode_content_for_form( $object_id );
2904		- } else {
2905		- $postarr['post_content'] = apply_filters( 'frm_create_page_with_' . $type . '_shortcode_content', '', $object_id );
2906		- }
2907		-
2908		- $name = FrmAppHelper::get_post_param( 'name', '', 'sanitize_text_field' );
2909		- if ( $name ) {
2910		- $postarr['post_title'] = $name;
2911		- }
2912		-
2913		- $success = wp_insert_post( $postarr );
2914		- if ( ! is_numeric( $success ) || ! $success ) {
2915		- die( 0 );
2916		- }
2917		-
2918		- wp_send_json(
2919		- array(
2920		- 'redirect' => get_edit_post_link( $success, 'redirect' ),
2921		- )
2922		- );
2923		- }
2924		-
2925		- /**
2926		- * @since 5.3
2927		- *
2928		- * @param string $content
2929		- * @param int $form_id
2930		- * @return string
2931		- */
2932		- private static function get_page_shortcode_content_for_form( $form_id ) {
2933		- $shortcode = '[formidable id="' . $form_id . '"]';
2934		- $html_comment_start = '<!-- wp:formidable/simple-form {"formId":"' . $form_id . '"} -->';
2935		- $html_comment_end = '<!-- /wp:formidable/simple-form -->';
2936		- return $html_comment_start . '<div>' . $shortcode . '</div>' . $html_comment_end;
2937		- }
2938		-
2939		- /**
2940		- * Get page dropdown for AJAX request for embedding form in an existing page.
2941		- *
2942		- * @return never
2943		- */
2944		- public static function get_page_dropdown() {
2945		- if ( ! current_user_can( 'publish_posts' ) ) {
2946		- die( 0 );
2947		- }
2948		-
2949		- check_ajax_referer( 'frm_ajax', 'nonce' );
2950		-
2951		- $html = FrmAppHelper::clip(
2952		- function() {
2953		- FrmAppHelper::maybe_autocomplete_pages_options(
2954		- array(
2955		- 'field_name' => 'frm_page_dropdown',
2956		- 'page_id' => '',
2957		- 'placeholder' => __( 'Select a Page', 'formidable' ),
2958		- )
2959		- );
2960		- }
2961		- );
2962		- $post_type_object = get_post_type_object( 'page' );
2963		- wp_send_json(
2964		- array(
2965		- 'html' => $html,
2966		- 'edit_page_url' => admin_url( sprintf( $post_type_object->_edit_link . '&action=edit', 0 ) ),
2967		- )
2968		- );
2969		- }
2970		-
2971		- /**
2972	1967	* @deprecated 4.0
2973	1968	*/
2974	1969	public static function new_form( $values = array() ) {
2975	1970	FrmDeprecated::new_form( $values );
		@@ -2983,8 +1978,16 @@
2983	1978	self::update( $values );
2984	1979	}
2985	1980
2986	1981	/**
	1982	+ * @deprecated 1.07.05
	1983	+ * @codeCoverageIgnore
	1984	+ */
	1985	+ public static function add_default_templates( $path, $default = true, $template = true ) {
	1986	+ FrmDeprecated::add_default_templates( $path, $default, $template );
	1987	+ }
	1988	+
	1989	+ /**
2987	1990	* @deprecated 3.0
2988	1991	* @codeCoverageIgnore
2989	1992	*/
2990	1993	public static function bulk_create_template( $ids ) {
		@@ -2991,8 +1994,16 @@
2991	1994	return FrmDeprecated::bulk_create_template( $ids );
2992	1995	}
2993	1996
2994	1997	/**
	1998	+ * @deprecated 2.03
	1999	+ * @codeCoverageIgnore
	2000	+ */
	2001	+ public static function register_pro_scripts() {
	2002	+ FrmDeprecated::register_pro_scripts();
	2003	+ }
	2004	+
	2005	+ /**
2995	2006	* @deprecated 3.0
2996	2007	* @codeCoverageIgnore
2997	2008	*/
2998	2009	public static function edit_key() {
		@@ -3004,14 +2015,6 @@
3004	2015	* @codeCoverageIgnore
3005	2016	*/
3006	2017	public static function edit_description() {
3007	2018	FrmDeprecated::edit_description();
3008		- }
3009		-
3010		- /**
3011		- * @deprecated 4.08
3012		- * @since 3.06
3013		- */
3014		- public static function add_new() {
3015		- _deprecated_function( __FUNCTION__, '4.08' );
3016	2019	}
3017	2020	}