← All changes | classes/controllers/FrmFormsController.php +219 -1228 6.5.3 → 4.07.01 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,36 @@
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	+ * Choose which type of form to create
	82	+ *
	83	+ * @since 3.06
	84	+ */
	85	+ public static function add_new() {
	86	+ self::list_templates();
	87	+ }
	88	+
	89	+ /**
	90	+ * Load the scripts before a modal can be triggered.
	91	+ *
	92	+ * @since 4.0
	93	+ */
	94	+ private static function init_modal() {
	95	+ wp_enqueue_script( 'jquery-ui-dialog' );
	96	+ wp_enqueue_style( 'jquery-ui-dialog' );
	97	+ }
	98	+
	99	+ /**
96	100	* Create the default email action
97	101	*
98	102	* @since 2.02.11
99	103	*
100		- * @param object|int $form
	104	+ * @param object $form
101	105	*/
102	106	private static function create_default_email_action( $form ) {
103	107	FrmForm::maybe_get_form( $form );
104	108	$create_email = apply_filters( 'frm_create_default_email_action', true, $form );
		@@ -108,34 +112,8 @@
108	112	$action_control->create( $form->id );
109	113	}
110	114	}
111	115
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	116	public static function edit( $values = false ) {
139	117	FrmAppHelper::permission_check( 'frm_edit_forms' );
140	118
141	119	$id = isset( $values['id'] ) ? absint( $values['id'] ) : FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
		@@ -149,10 +127,8 @@
149	127	if ( ! $id || ! is_numeric( $id ) ) {
150	128	$id = FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
151	129	}
152	130
153		- FrmOnSubmitHelper::maybe_migrate_submit_settings_to_action( $id );
154		-
155	131	return self::get_settings_vars( $id, array(), $message );
156	132	}
157	133
158	134	public static function update_settings() {
		@@ -159,10 +135,10 @@
159	135	FrmAppHelper::permission_check( 'frm_edit_forms' );
160	136
161	137	$id = FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
162	138
163		- $errors = FrmForm::validate( $_POST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
164		- $warnings = FrmFormsHelper::check_for_warnings( $_POST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
	139	+ $errors = FrmForm::validate( $_POST );
	140	+ $warnings = FrmFormsHelper::check_for_warnings( $_POST );
165	141
166	142	if ( count( $errors ) > 0 ) {
167	143	return self::get_settings_vars( $id, $errors, compact( 'warnings' ) );
168	144	}
		@@ -168,34 +144,18 @@
168	144	}
169	145
170	146	do_action( 'frm_before_update_form_settings', $id );
171	147
172		- $antispam_was_on = self::antispam_was_on( $id );
	148	+ FrmForm::update( $id, $_POST );
173	149
174		- FrmForm::update( $id, $_POST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
175		-
176		- $antispam_is_on = ! empty( $_POST['options']['antispam'] ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
177		- if ( $antispam_is_on !== $antispam_was_on ) {
178		- FrmAntiSpam::clear_caches();
179		- }
180		-
181	150	$message = __( 'Settings Successfully Updated', 'formidable' );
182	151
183	152	return self::get_settings_vars( $id, array(), compact( 'message', 'warnings' ) );
184	153	}
185	154
186		- /**
187		- * @param int $form_id
188		- * @return bool
189		- */
190		- private static function antispam_was_on( $form_id ) {
191		- $form = FrmForm::getOne( $form_id );
192		- return ! empty( $form->options['antispam'] );
193		- }
194		-
195	155	public static function update( $values = array() ) {
196	156	if ( empty( $values ) ) {
197		- $values = $_POST; // phpcs:ignore WordPress.Security.NonceVerification.Missing
	157	+ $values = $_POST;
198	158	}
199	159
200	160	// Set radio button and checkbox meta equal to "other" value.
201	161	if ( FrmAppHelper::pro_is_installed() ) {
		@@ -225,9 +185,9 @@
225	185	);
226	186	}
227	187
228	188	if ( defined( 'DOING_AJAX' ) ) {
229		- wp_die( FrmAppHelper::kses( $message, array( 'a' ) ) ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
	189	+ wp_die( FrmAppHelper::kses( $message, array( 'a' ) ) ); // WPCS: XSS ok.
230	190	}
231	191
232	192	return self::get_edit_vars( $id, array(), $message );
233	193	}
		@@ -269,34 +229,19 @@
269	229	}
270	230
271	231	public static function duplicate() {
272	232	FrmAppHelper::permission_check( 'frm_edit_forms' );
273		- $nonce = FrmAppHelper::simple_get( '_wpnonce' );
274	233
275		- if ( ! wp_verify_nonce( $nonce ) ) {
276		- $frm_settings = FrmAppHelper::get_settings();
277		- wp_die( esc_html( $frm_settings->admin_permission ) );
278		- }
279		-
280	234	$params = FrmForm::list_page_params();
281	235	$form = FrmForm::duplicate( $params['id'], $params['template'], true );
282		- $url = admin_url( 'admin.php?page=formidable' );
283		- $message = 'form_duplicate_error';
284		-
	236	+ $message = $params['template'] ? __( 'Form template was Successfully Created', 'formidable' ) : __( 'Form was Successfully Copied', 'formidable' );
285	237	if ( $form ) {
286		- $url = admin_url( 'admin.php?page=formidable&frm_action=edit&id=' . absint( $form ) );
287		- $message = 'form_duplicated';
	238	+ return self::get_edit_vars( $form, array(), $message, true );
	239	+ } else {
	240	+ return self::display_forms_list( $params, __( 'There was a problem creating the new template.', 'formidable' ) );
288	241	}
289		-
290		- $url .= '&message=' . $message;
291		-
292		- wp_safe_redirect( $url );
293		- exit();
294	242	}
295	243
296		- /**
297		- * @return string
298		- */
299	244	public static function page_preview() {
300	245	$params = FrmForm::list_page_params();
301	246	if ( ! $params['form'] ) {
302	247	return;
		@@ -303,9 +248,9 @@
303	248	}
304	249
305	250	$form = FrmForm::getOne( $params['form'] );
306	251	if ( $form ) {
307		- return self::show_form( $form->id, '', 'auto', 'auto' );
	252	+ return self::show_form( $form->id, '', true, true );
308	253	}
309	254	}
310	255
311	256	/**
		@@ -311,21 +256,19 @@
311	256	/**
312	257	* @since 3.0
313	258	*/
314	259	public static function show_page_preview() {
315		- echo self::page_preview(); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
	260	+ echo self::page_preview(); // WPCS: XSS ok.
316	261	}
317	262
318		- /**
319		- * @return void
320		- */
321	263	public static function preview() {
322	264	do_action( 'frm_wp' );
323		- FrmAppHelper::set_current_screen_and_hook_suffix();
324	265
325	266	global $frm_vars;
326	267	$frm_vars['preview'] = true;
327	268
	269	+ self::load_wp();
	270	+
328	271	$include_theme = FrmAppHelper::get_param( 'theme', '', 'get', 'absint' );
329	272	if ( $include_theme ) {
330	273	self::set_preview_query();
331	274	self::load_theme_preview();
		@@ -336,58 +279,42 @@
336	279	wp_die();
337	280	}
338	281
339	282	/**
340		- * Set the page global to any available page (except for the Blog Page).
341		- *
342		- * @return void
	283	+ * @since 3.0
343	284	*/
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 );
	285	+ private static function load_wp() {
	286	+ if ( ! defined( 'ABSPATH' ) && ! defined( 'XMLRPC_REQUEST' ) ) {
	287	+ global $wp;
	288	+ $root = dirname( dirname( dirname( dirname( __FILE__ ) ) ) );
	289	+ include_once( $root . '/wp-config.php' );
	290	+ $wp->init();
	291	+ $wp->register_globals();
356	292	}
	293	+ }
357	294
358		- $random_page = get_posts( $page_query );
359		- if ( ! $random_page ) {
360		- return;
361		- }
362		-
363		- $random_page = reset( $random_page );
364		- query_posts(
	295	+ private static function set_preview_query() {
	296	+ $random_page = get_posts(
365	297	array(
366		- 'post_type' => 'page',
367		- 'page_id' => $random_page->ID,
	298	+ 'numberposts' => 1,
	299	+ 'orderby' => 'date',
	300	+ 'order' => 'ASC',
	301	+ 'post_type' => 'page',
368	302	)
369	303	);
370	304
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 );
	305	+ if ( ! empty( $random_page ) ) {
	306	+ $random_page = reset( $random_page );
	307	+ query_posts(
	308	+ array(
	309	+ 'post_type' => 'page',
	310	+ 'page_id' => $random_page->ID,
	311	+ )
	312	+ );
	313	+ }
374	314	}
375	315
376	316	/**
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	317	* @since 3.0
391	318	*/
392	319	private static function load_theme_preview() {
393	320	add_filter( 'wp_title', 'FrmFormsController::preview_title', 9999 );
		@@ -395,49 +322,12 @@
395	322	add_filter( 'the_content', 'FrmFormsController::preview_content', 9999 );
396	323	add_action( 'loop_no_results', 'FrmFormsController::show_page_preview' );
397	324	add_filter( 'is_active_sidebar', '__return_false' );
398	325	FrmStylesController::enqueue_css( 'enqueue', true );
399		-
400		- if ( false === get_template_part( 'page' ) ) {
401		- if ( function_exists( 'wp_is_block_theme' ) && wp_is_block_theme() ) {
402		- add_filter( 'body_class', 'FrmFormsController::preview_block_theme_body_classnames' );
403		- }
404		- self::fallback_when_page_template_part_is_not_supported_by_theme();
405		- }
	326	+ get_template_part( 'page' );
406	327	}
407	328
408	329	/**
409		- * Add padding to the body for block themes.
410		- *
411		- * @since 6.5.2
412		- *
413		- * @param array $classes The body classes list.
414		- * @return array
415		- */
416		- public static function preview_block_theme_body_classnames( $classes ) {
417		- $classes[] = 'has-global-padding';
418		- return $classes;
419		- }
420		-
421		- /**
422		- * Not every theme supports get_template_part( 'page' ).
423		- * When this is not supported, false is returned, and we can handle a fallback.
424		- */
425		- private static function fallback_when_page_template_part_is_not_supported_by_theme() {
426		- if ( have_posts() ) {
427		- the_post();
428		- get_header( '' );
429		- // add some generic class names to the container to add some natural padding to the content.
430		- // .entry-content catches the WordPress TwentyTwenty theme.
431		- // .container catches Customizr content.
432		- echo '<div class="container entry-content">';
433		- the_content();
434		- echo '</div>';
435		- get_footer();
436		- }
437		- }
438		-
439		- /**
440	330	* Set the page title for the theme preview page
441	331	*
442	332	* @since 3.0
443	333	*/
		@@ -493,24 +383,15 @@
493	383	public static function untrash() {
494	384	self::change_form_status( 'untrash' );
495	385	}
496	386
497		- /**
498		- * @param array $ids
499		- * @return string
500		- */
501	387	public static function bulk_untrash( $ids ) {
502	388	FrmAppHelper::permission_check( 'frm_edit_forms' );
503	389
504	390	$count = FrmForm::set_status( $ids, 'published' );
505	391
506		- if ( ! $count ) {
507		- // Don't show "0 forms restored" on refresh.
508		- return '';
509		- }
510		-
511	392	/* translators: %1$s: Number of forms */
512		- $message = sprintf( _n( '%1$s form restored from the Trash.', '%1$s forms restored from the Trash.', $count, 'formidable' ), $count );
	393	+ $message = sprintf( _n( '%1$s form restored from the Trash.', '%1$s forms restored from the Trash.', $count, 'formidable' ), 1 );
513	394
514	395	return $message;
515	396	}
516	397
		@@ -531,9 +412,9 @@
531	412
532	413	/**
533	414	* @param string $status
534	415	*
535		- * @return void
	416	+ * @return int The number of forms changed
536	417	*/
537	418	public static function change_form_status( $status ) {
538	419	$available_status = array(
539	420	'untrash' => array(
		@@ -665,36 +546,18 @@
665	546	*
666	547	* @since 4.0
667	548	*/
668	549	public static function build_new_form() {
	550	+ global $wpdb;
	551	+
669	552	FrmAppHelper::permission_check( 'frm_edit_forms' );
670	553	check_ajax_referer( 'frm_ajax', 'nonce' );
671	554
672	555	$new_values = self::get_modal_values();
673	556	$new_values['form_key'] = $new_values['name'];
674		- $new_values['options'] = array(
675		- 'antispam' => 1,
676		- 'on_submit_migrated' => 1,
677		- );
678	557
679		- /**
680		- * Allows changing form values before creating from the modal.
681		- *
682		- * @since 5.4
683		- *
684		- * @param array $values Form values.
685		- */
686		- $new_values = apply_filters( 'frm_new_form_values', $new_values );
687		-
688	558	$form_id = FrmForm::create( $new_values );
689		- /**
690		- * @since 5.3
691		- *
692		- * @param int $form_id
693		- */
694		- do_action( 'frm_build_new_form', $form_id );
695	559
696		- self::create_default_on_submit_action( $form_id );
697	560	self::create_default_email_action( $form_id );
698	561
699	562	$response = array(
700	563	'redirect' => FrmForm::get_edit_link( $form_id ),
		@@ -716,9 +579,9 @@
716	579	check_ajax_referer( 'frm_ajax', 'nonce' );
717	580
718	581	$form_id = FrmAppHelper::get_param( 'xml', '', 'post', 'absint' );
719	582	$new_form_id = FrmForm::duplicate( $form_id, 1, true );
720		- if ( ! $new_form_id ) {
	583	+ if ( empty( $new_form_id ) ) {
721	584	$response = array(
722	585	'message' => __( 'There was an error creating a template.', 'formidable' ),
723	586	);
724	587	} else {
		@@ -728,9 +591,9 @@
728	591	FrmForm::clear_form_cache();
729	592	}
730	593
731	594	$response = array(
732		- 'redirect' => admin_url( 'admin.php?page=formidable&frm_action=duplicate&id=' . $new_form_id ) . '&_wpnonce=' . wp_create_nonce(),
	595	+ 'redirect' => admin_url( 'admin.php?page=formidable&frm_action=list_templates' ),
733	596	);
734	597	}
735	598
736	599	echo wp_json_encode( $response );
		@@ -763,18 +626,16 @@
763	626	FrmAppHelper::load_admin_wide_js();
764	627	$menu_name = FrmAppHelper::get_menu_name();
765	628	$icon = apply_filters( 'frm_media_icon', FrmAppHelper::svg_logo() );
766	629	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' ) . '">' .
767		- FrmAppHelper::kses( $icon, 'all' ) . // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
768		- ' ' . esc_html( $menu_name ) . '</a>';
	630	+ FrmAppHelper::kses( $icon, 'all' ) .
	631	+ ' ' . esc_html( $menu_name ) . '</a>'; // WPCS: XSS ok.
769	632	}
770	633	}
771	634
772		- /**
773		- * @return void
774		- */
775	635	public static function insert_form_popup() {
776		- if ( ! self::should_insert_form_popup() ) {
	636	+ $page = basename( FrmAppHelper::get_server_value( 'PHP_SELF' ) );
	637	+ if ( ! in_array( $page, array( 'post.php', 'page.php', 'page-new.php', 'post-new.php' ) ) ) {
777	638	return;
778	639	}
779	640
780	641	FrmAppHelper::load_admin_wide_js();
		@@ -784,38 +645,14 @@
784	645	'name' => __( 'Form', 'formidable' ),
785	646	'label' => __( 'Insert a Form', 'formidable' ),
786	647	),
787	648	);
	649	+
788	650	$shortcodes = apply_filters( 'frm_popup_shortcodes', $shortcodes );
789	651
790		- include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/insert_form_popup.php';
791		-
792		- if ( FrmAppHelper::is_form_builder_page() && ! class_exists( '_WP_Editors', false ) ) {
793		- // initialize a wysiwyg so we have usable settings defined in tinyMCEPreInit.mceInit
794		- require ABSPATH . WPINC . '/class-wp-editor.php';
795		- ?>
796		- <div class="frm_hidden">
797		- <?php wp_editor( '', 'frm_description_placeholder', array() ); ?>
798		- </div>
799		- <?php
800		- }
	652	+ include( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/insert_form_popup.php' );
801	653	}
802	654
803		- /**
804		- * Check the page being loaded, determine if this is a page that should include the form popup.
805		- *
806		- * @since 5.0.14
807		- *
808		- * @return bool
809		- */
810		- private static function should_insert_form_popup() {
811		- if ( FrmAppHelper::is_form_builder_page() ) {
812		- return true;
813		- }
814		- $page = basename( FrmAppHelper::get_server_value( 'PHP_SELF' ) );
815		- return in_array( $page, array( 'post.php', 'page.php', 'page-new.php', 'post-new.php' ), true );
816		- }
817		-
818	655	public static function get_shortcode_opts() {
819	656	FrmAppHelper::permission_check( 'frm_view_forms' );
820	657	check_ajax_referer( 'frm_ajax', 'nonce' );
821	658
		@@ -861,32 +698,18 @@
861	698
862	699	wp_die();
863	700	}
864	701
865		- /**
866		- * Display list of forms in a table.
867		- *
868		- * @param array $params
869		- * @param string $message
870		- * @param array $errors
871		- * @return void
872		- */
873	702	public static function display_forms_list( $params = array(), $message = '', $errors = array() ) {
874	703	FrmAppHelper::permission_check( 'frm_view_forms' );
875	704
876	705	global $wpdb, $frm_vars;
877	706
878		- if ( ! $params ) {
	707	+ if ( empty( $params ) ) {
879	708	$params = FrmForm::list_page_params();
880	709	}
881	710
882		- /**
883		- * @since 5.3.1
884		- *
885		- * @param string $table_class Class name for List Helper.
886		- */
887		- $table_class = apply_filters( 'frm_forms_list_class', 'FrmFormsListHelper' );
888		- $wp_list_table = new $table_class( compact( 'params' ) );
	711	+ $wp_list_table = new FrmFormsListHelper( compact( 'params' ) );
889	712
890	713	$pagenum = $wp_list_table->get_pagenum();
891	714
892	715	$wp_list_table->prepare_items();
		@@ -896,24 +719,36 @@
896	719	wp_redirect( esc_url_raw( add_query_arg( 'paged', $total_pages ) ) );
897	720	die();
898	721	}
899	722
900		- require FrmAppHelper::plugin_path() . '/classes/views/frm-forms/list.php';
	723	+ require( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/list.php' );
901	724	}
902	725
903		- /**
904		- * @param array<string,string> $columns
905		- * @return array<string,string>
906		- */
907	726	public static function get_columns( $columns ) {
908		- $columns['cb'] = '<input type="checkbox" />';
909		- $columns['name'] = esc_html__( 'Form Title', 'formidable' );
910		- $columns['entries'] = esc_html__( 'Entries', 'formidable' );
911		- $columns['id'] = 'ID';
912		- $columns['form_key'] = esc_html__( 'Key', 'formidable' );
913		- $columns['shortcode'] = esc_html__( 'Actions', 'formidable' );
914		- $columns['created_at'] = esc_html__( 'Date', 'formidable' );
	727	+ $columns['cb'] = '<input type="checkbox" />';
	728	+ $columns['id'] = 'ID';
915	729
	730	+ $type = FrmAppHelper::get_simple_request(
	731	+ array(
	732	+ 'param' => 'form_type',
	733	+ 'type' => 'request',
	734	+ 'default' => 'published',
	735	+ )
	736	+ );
	737	+
	738	+ if ( 'template' == $type ) {
	739	+ $columns['name'] = __( 'Template Name', 'formidable' );
	740	+ $columns['type'] = __( 'Type', 'formidable' );
	741	+ $columns['form_key'] = __( 'Key', 'formidable' );
	742	+ } else {
	743	+ $columns['name'] = __( 'Form Title', 'formidable' );
	744	+ $columns['entries'] = __( 'Entries', 'formidable' );
	745	+ $columns['form_key'] = __( 'Key', 'formidable' );
	746	+ $columns['shortcode'] = __( 'Shortcodes', 'formidable' );
	747	+ }
	748	+
	749	+ $columns['created_at'] = __( 'Date', 'formidable' );
	750	+
916	751	add_screen_option(
917	752	'per_page',
918	753	array(
919	754	'label' => __( 'Forms', 'formidable' ),
		@@ -934,17 +769,9 @@
934	769	'created_at' => 'created_at',
935	770	);
936	771	}
937	772
938		- /**
939		- * @param mixed $hidden_columns
940		- * @return array
941		- */
942	773	public static function hidden_columns( $hidden_columns ) {
943		- if ( ! is_array( $hidden_columns ) ) {
944		- $hidden_columns = array();
945		- }
946		-
947	774	$type = FrmAppHelper::get_simple_request(
948	775	array(
949	776	'param' => 'form_type',
950	777	'type' => 'request',
		@@ -967,98 +794,41 @@
967	794	return $save;
968	795	}
969	796
970	797	/**
971		- * @return bool
972		- */
973		- public static function expired() {
974		- global $frm_expired;
975		- return $frm_expired;
976		- }
977		-
978		- /**
979		- * Get data from api before rendering it so that we can flag the modal as expired
	798	+ * Show the template listing page
980	799	*
981		- * @return void
	800	+ * @since 3.06
982	801	*/
983		- public static function before_list_templates() {
984		- global $frm_templates;
985		- global $frm_expired;
986		- global $frm_license_type;
	802	+ private static function list_templates() {
	803	+ self::init_modal();
987	804
988		- $api = new FrmFormTemplateApi();
989		- $frm_templates = $api->get_api_info();
990		- $expired = false;
991		- $license_type = '';
992		- if ( isset( $frm_templates['error'] ) ) {
993		- $error = $frm_templates['error']['message'];
994		- $error = str_replace( 'utm_medium=addons', 'utm_medium=form-templates', $error );
995		- $expired = 'expired' === $frm_templates['error']['code'];
996		- $license_type = isset( $frm_templates['error']['type'] ) ? $frm_templates['error']['type'] : '';
997		- unset( $frm_templates['error'] );
998		- }
	805	+ $where = apply_filters( 'frm_forms_dropdown', array(), '' );
	806	+ $forms = FrmForm::get_published_forms( $where );
999	807
1000		- $frm_expired = $expired;
1001		- $frm_license_type = $license_type;
1002		- }
	808	+ $api = new FrmFormTemplateApi();
	809	+ $templates = $api->get_api_info();
1003	810
1004		- /**
1005		- * @return void
1006		- */
1007		- public static function list_templates() {
1008		- global $frm_templates;
1009		- global $frm_license_type;
1010		-
1011		- $templates = $frm_templates;
1012		- $custom_templates = array();
1013		- $templates_by_category = array();
1014		-
	811	+ $custom_templates = array();
1015	812	self::add_user_templates( $custom_templates );
1016	813
1017		- foreach ( $templates as $template ) {
1018		- if ( ! isset( $template['categories'] ) ) {
1019		- continue;
1020		- }
	814	+ $error = '';
	815	+ $expired = false;
	816	+ $license_type = '';
	817	+ if ( isset( $templates['error'] ) ) {
	818	+ $error = $templates['error']['message'];
	819	+ $error = str_replace( 'utm_medium=addons', 'utm_medium=form-templates', $error );
	820	+ $expired = ( $templates['error']['code'] === 'expired' );
1021	821
1022		- foreach ( $template['categories'] as $category ) {
1023		- if ( ! isset( $templates_by_category[ $category ] ) ) {
1024		- $templates_by_category[ $category ] = array();
1025		- }
1026		-
1027		- $templates_by_category[ $category ][] = $template;
1028		- }
	822	+ $license_type = isset( $templates['error']['type'] ) ? $templates['error']['type'] : '';
	823	+ unset( $templates['error'] );
1029	824	}
1030		- unset( $template );
1031	825
1032		- // Subcategories that are included elsewhere.
1033		- $redundant_cats = array( 'PayPal', 'Stripe', 'Twilio' );
	826	+ $pricing = FrmAppHelper::admin_upgrade_link( 'form-templates' );
1034	827
1035		- $categories = array_keys( $templates_by_category );
1036		- $categories = array_diff( $categories, FrmFormsHelper::ignore_template_categories() );
1037		- $categories = array_diff( $categories, $redundant_cats );
1038		- sort( $categories );
	828	+ $categories = self::get_template_categories( $templates );
1039	829
1040		- array_walk(
1041		- $custom_templates,
1042		- function( &$template ) {
1043		- $template['custom'] = true;
1044		- }
1045		- );
1046		-
1047		- $my_templates_translation = __( 'My Templates', 'formidable' );
1048		- $categories = array_merge( array( $my_templates_translation ), $categories );
1049		- $pricing = FrmAppHelper::admin_upgrade_link( 'form-templates' );
1050		- $license_type = $frm_license_type;
1051		- $args = compact( 'pricing', 'license_type' );
1052		- $where = apply_filters( 'frm_forms_dropdown', array(), '' );
1053		- $forms = FrmForm::get_published_forms( $where );
1054		- $view_path = FrmAppHelper::plugin_path() . '/classes/views/frm-forms/';
1055		-
1056		- $templates_by_category[ $my_templates_translation ] = $custom_templates;
1057		-
1058		- unset( $pricing, $license_type, $where );
1059		- wp_enqueue_script( 'accordion' ); // register accordion for template groups
1060		- require $view_path . 'list-templates.php';
	830	+ require( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/list-templates.php' );
1061	831	}
1062	832
1063	833	/**
1064	834	* @since 4.03.01
		@@ -1088,9 +858,9 @@
1088	858	'id' => $template->id,
1089	859	'name' => $template->name,
1090	860	'key' => $template->form_key,
1091	861	'description' => $template->description,
1092		- 'url' => wp_nonce_url( admin_url( 'admin.php?page=formidable&frm_action=duplicate&id=' . absint( $template->id ) ) ),
	862	+ 'url' => admin_url( 'admin.php?page=formidable&frm_action=duplicate&id=' . absint( $template->id ) ),
1093	863	'released' => $template->created_at,
1094	864	'installed' => 1,
1095	865	);
1096	866	array_unshift( $templates, $template );
		@@ -1122,30 +892,19 @@
1122	892	if ( $reset_fields ) {
1123	893	$fields = FrmField::get_all_for_form( $form->id, '', 'exclude' );
1124	894	}
1125	895
1126		- unset( $reset_fields );
	896	+ unset( $end_section_values, $last_order, $open, $reset_fields );
1127	897
1128		- $args = array( 'parent_form_id' => $form->id );
1129		- $values = FrmAppHelper::setup_edit_vars( $form, 'forms', '', true, array(), $args );
	898	+ $args = array( 'parent_form_id' => $form->id );
	899	+ $values = FrmAppHelper::setup_edit_vars( $form, 'forms', '', true, array(), $args );
	900	+ $values['fields'] = $fields;
1130	901
1131		- /**
1132		- * Allows modifying the list of fields in the form builder.
1133		- *
1134		- * @since 5.0.04
1135		- *
1136		- * @param object[] $fields Array of fields.
1137		- * @param array $args The arguments. Contains `form`.
1138		- */
1139		- $values['fields'] = apply_filters( 'frm_fields_in_form_builder', $fields, compact( 'form' ) );
1140		-
1141	902	$edit_message = __( 'Form was successfully updated.', 'formidable' );
1142	903	if ( $form->is_template && $message == $edit_message ) {
1143	904	$message = __( 'Template was successfully updated.', 'formidable' );
1144	905	}
1145	906
1146		- self::maybe_update_form_builder_message( $message );
1147		-
1148	907	$all_templates = FrmForm::getAll( array( 'is_template' => 1 ), 'name' );
1149	908	$has_fields = isset( $values['fields'] ) && ! empty( $values['fields'] );
1150	909
1151	910	if ( defined( 'DOING_AJAX' ) ) {
		@@ -1154,21 +913,8 @@
1154	913	require( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/edit.php' );
1155	914	}
1156	915	}
1157	916
1158		- public static function update_form_builder_fields( $fields, $form ) {
1159		- foreach ( $fields as $field ) {
1160		- $field->do_not_include_icons = true;
1161		- }
1162		- return $fields;
1163		- }
1164		-
1165		- public static function maybe_update_form_builder_message( &$message ) {
1166		- if ( 'form_duplicated' === FrmAppHelper::simple_get( 'message' ) ) {
1167		- $message = __( 'Form was Successfully Copied', 'formidable' );
1168		- }
1169		- }
1170		-
1171	917	public static function get_settings_vars( $id, $errors = array(), $args = array() ) {
1172	918	FrmAppHelper::permission_check( 'frm_edit_forms' );
1173	919
1174	920	global $frm_vars;
		@@ -1191,18 +937,8 @@
1191	937	$form = FrmForm::getOne( $id );
1192	938	$fields = FrmField::get_all_for_form( $id );
1193	939	$values = FrmAppHelper::setup_edit_vars( $form, 'forms', $fields, true );
1194	940
1195		- /**
1196		- * Allows changing fields in the form settings.
1197		- *
1198		- * @since 5.0.04
1199		- *
1200		- * @param array $fields Array of fields.
1201		- * @param array $args The arguments. Contains `form`.
1202		- */
1203		- $values['fields'] = apply_filters( 'frm_fields_in_settings', $values['fields'], compact( 'form' ) );
1204		-
1205	941	self::clean_submit_html( $values );
1206	942
1207	943	$sections = self::get_settings_tabs( $values );
1208	944	$current = FrmAppHelper::simple_get( 't', 'sanitize_title', 'advanced_settings' );
		@@ -1240,66 +976,31 @@
1240	976	'id' => 'frm_notification_settings',
1241	977	'icon' => 'frm_icon_font frm_mail_bulk_icon',
1242	978	),
1243	979	'permissions' => array(
1244		- 'name' => __( 'Form Permissions', 'formidable' ),
1245		- 'icon' => 'frm_icon_font frm_lock_icon',
1246		- 'html_class' => 'frm_show_upgrade_tab frm_noallow',
1247		- 'data' => array(
1248		- 'medium' => 'permissions',
1249		- 'upgrade' => __( 'Form Permissions', 'formidable' ),
1250		- 'message' => __( 'Allow editing, protect forms and files, limit entries, and save drafts. Upgrade to get form and entry permissions.', 'formidable' ),
1251		- 'screenshot' => 'permissions.png',
	980	+ 'name' => __( 'Form Permissions', 'formidable' ),
	981	+ 'icon' => 'frm_icon_font frm_lock_icon',
	982	+ 'html_class' => 'frm_show_upgrade frm_noallow',
	983	+ 'data' => array(
	984	+ 'medium' => 'permissions',
	985	+ 'upgrade' => __( 'Form Permissions', 'formidable' ),
1252	986	),
1253	987	),
1254	988	'scheduling' => array(
1255		- 'name' => __( 'Form Scheduling', 'formidable' ),
1256		- 'icon' => 'frm_icon_font frm_calendar_icon',
1257		- 'html_class' => 'frm_show_upgrade_tab frm_noallow',
1258		- 'data' => array(
1259		- 'medium' => 'scheduling',
1260		- 'upgrade' => __( 'Form scheduling settings', 'formidable' ),
1261		- 'screenshot' => 'scheduling.png',
	989	+ 'name' => __( 'Form Scheduling', 'formidable' ),
	990	+ 'icon' => 'frm_icon_font frm_calendar_icon',
	991	+ 'html_class' => 'frm_show_upgrade frm_noallow',
	992	+ 'data' => array(
	993	+ 'medium' => 'scheduling',
	994	+ 'upgrade' => __( 'Form scheduling settings', 'formidable' ),
1262	995	),
1263	996	),
1264	997	'buttons' => array(
1265		- 'name' => __( 'Buttons', 'formidable' ),
	998	+ 'name' => __( 'Styling & Buttons', 'formidable' ),
1266	999	'class' => __CLASS__,
1267	1000	'function' => 'buttons_settings',
1268		- 'icon' => 'frm_icon_font frm_button_icon',
	1001	+ 'icon' => 'frm_icon_font frm_pallet_icon',
1269	1002	),
1270		- 'landing' => array(
1271		- 'name' => __( 'Form Landing Page', 'formidable' ),
1272		- 'icon' => 'frm_icon_font frm_file_text_icon',
1273		- 'html_class' => 'frm_show_upgrade_tab frm_noallow',
1274		- 'data' => FrmAppHelper::get_landing_page_upgrade_data_params(),
1275		- ),
1276		- 'chat' => array(
1277		- 'name' => __( 'Conversational Forms', 'formidable' ),
1278		- 'icon' => 'frm_icon_font frm_chat_forms_icon',
1279		- 'html_class' => 'frm_show_upgrade_tab frm_noallow',
1280		- 'data' => FrmAppHelper::get_upgrade_data_params(
1281		- 'chat',
1282		- array(
1283		- 'upgrade' => __( 'Conversational Forms', 'formidable' ),
1284		- 'message' => __( 'Ask one question at a time for automated conversations.', 'formidable' ),
1285		- 'screenshot' => 'chat.png',
1286		- )
1287		- ),
1288		- ),
1289		- 'abandonment' => array(
1290		- 'name' => __( 'Form Abandonment', 'formidable' ),
1291		- 'icon' => 'frm_icon_font frm_abandoned_icon',
1292		- 'html_class' => 'frm_show_upgrade_tab frm_noallow',
1293		- 'data' => FrmAppHelper::get_upgrade_data_params(
1294		- 'abandonment',
1295		- array(
1296		- 'upgrade' => __( 'Form abandonment settings', 'formidable' ),
1297		- 'message' => __( 'Unlock the power of data capture to boost lead generation and master the art of form optimization.', 'formidable' ),
1298		- 'screenshot' => 'abandonment.png',
1299		- )
1300		- ),
1301		- ),
1302	1003	'html' => array(
1303	1004	'name' => __( 'Customize HTML', 'formidable' ),
1304	1005	'class' => __CLASS__,
1305	1006	'function' => 'html_settings',
		@@ -1306,14 +1007,8 @@
1306	1007	'icon' => 'frm_icon_font frm_code_icon',
1307	1008	),
1308	1009	);
1309	1010
1310		- foreach ( array( 'landing', 'chat', 'abandonment' ) as $feature ) {
1311		- if ( ! FrmAppHelper::show_new_feature( $feature ) ) {
1312		- unset( $sections[ $feature ] );
1313		- }
1314		- }
1315		-
1316	1011	$sections = apply_filters( 'frm_add_form_settings_section', $sections, $values );
1317	1012
1318	1013	if ( FrmAppHelper::pro_is_installed() && ! FrmAppHelper::meets_min_pro_version( '4.0' ) ) {
1319	1014	// Prevent settings from showing in 2 spots.
		@@ -1355,23 +1050,12 @@
1355	1050	*/
1356	1051	public static function advanced_settings( $values ) {
1357	1052	$first_h3 = 'frm_first_h3';
1358	1053
1359		- include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings-advanced.php';
	1054	+ include( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings-advanced.php' );
1360	1055	}
1361	1056
1362	1057	/**
1363		- * @param array $values
1364		- */
1365		- public static function render_spam_settings( $values ) {
1366		- if ( function_exists( 'akismet_http_post' ) ) {
1367		- include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/spam-settings/akismet.php';
1368		- }
1369		- include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/spam-settings/honeypot.php';
1370		- include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/spam-settings/antispam.php';
1371		- }
1372		-
1373		- /**
1374	1058	* @since 4.0
1375	1059	*
1376	1060	* @param array $values
1377	1061	*/
		@@ -1405,35 +1089,10 @@
1405	1089	$values['submit_html'] = str_replace( 'javascript:void(0)', '#', $values['submit_html'] );
1406	1090	}
1407	1091	}
1408	1092
1409		- /**
1410		- * Updates classes used in submit and prev buttons to avoid conflict with twenty twenty-one theme.
1411		- *
1412		- * @param array $classes
1413		- *
1414		- * @return array
1415		- */
1416		- public static function update_button_classes( $classes ) {
1417		- if ( function_exists( 'twenty_twenty_one_setup' ) ) {
1418		- $classes[] = 'has-text-color has-background';
1419		- }
1420		-
1421		- return $classes;
1422		- }
1423		-
1424	1093	public static function mb_tags_box( $form_id, $class = '' ) {
1425		- $fields = FrmField::get_all_for_form( $form_id, '', 'include' );
1426		-
1427		- /**
1428		- * Allows modifying the list of fields in the tags box.
1429		- *
1430		- * @since 5.0.04
1431		- *
1432		- * @param array $fields The list of fields.
1433		- * @param array $args The arguments. Contains `form_id`.
1434		- */
1435		- $fields = apply_filters( 'frm_fields_in_tags_box', $fields, compact( 'form_id' ) );
	1094	+ $fields = FrmField::get_all_for_form( $form_id, '', 'include' );
1436	1095	$linked_forms = array();
1437	1096	$col = 'one';
1438	1097	$settings_tab = FrmAppHelper::is_admin_page( 'formidable' ) ? true : false;
1439	1098
		@@ -1473,9 +1132,8 @@
1473	1132	* Add extra helper shortcodes on the Advanced tab in form settings and views
1474	1133	*
1475	1134	* @since 3.04.01
1476	1135	*
1477		- * @param array $advanced_helpers
1478	1136	* @param array $atts - Includes fields and form_id
1479	1137	*/
1480	1138	return apply_filters( 'frm_advanced_helpers', $advanced_helpers, $atts );
1481	1139	}
		@@ -1553,9 +1211,8 @@
1553	1211	if ( $settings_tab ) {
1554	1212	$entry_shortcodes['default-message'] = __( 'Default Msg', 'formidable' );
1555	1213	$entry_shortcodes['default-html'] = __( 'Default HTML', 'formidable' );
1556	1214	$entry_shortcodes['default-plain'] = __( 'Default Plain', 'formidable' );
1557		- $entry_shortcodes['form_name'] = __( 'Form Name', 'formidable' );
1558	1215	}
1559	1216
1560	1217	/**
1561	1218	* Use this hook to add or remove buttons in the helpers section
		@@ -1568,12 +1225,9 @@
1568	1225	return $entry_shortcodes;
1569	1226	}
1570	1227
1571	1228	/**
1572		- * Insert the form class setting into the form.
1573		- *
1574		- * @param stdClass $form
1575		- * @return void
	1229	+ * Insert the form class setting into the form
1576	1230	*/
1577	1231	public static function form_classes( $form ) {
1578	1232	if ( isset( $form->options['form_class'] ) ) {
1579	1233	echo esc_attr( sanitize_text_field( $form->options['form_class'] ) );
		@@ -1578,36 +1232,18 @@
1578	1232	if ( isset( $form->options['form_class'] ) ) {
1579	1233	echo esc_attr( sanitize_text_field( $form->options['form_class'] ) );
1580	1234	}
1581	1235
1582		- if ( ! empty( $form->options['js_validate'] ) ) {
	1236	+ if ( isset( $form->options['js_validate'] ) && $form->options['js_validate'] ) {
1583	1237	echo ' frm_js_validate ';
1584		- self::add_js_validate_form_to_global_vars( $form );
1585	1238	}
1586		-
1587		- if ( ! FrmFormsHelper::should_use_pro_for_ajax_submit() && FrmForm::is_ajax_on( $form ) ) {
1588		- echo ' frm_ajax_submit ';
1589		- }
1590	1239	}
1591	1240
1592		- /**
1593		- * @since 5.0.03
1594		- *
1595		- * @param stdClass $form
1596		- */
1597		- public static function add_js_validate_form_to_global_vars( $form ) {
1598		- global $frm_vars;
1599		- if ( ! isset( $frm_vars['js_validate_forms'] ) ) {
1600		- $frm_vars['js_validate_forms'] = array();
1601		- }
1602		- $frm_vars['js_validate_forms'][ $form->id ] = $form;
1603		- }
1604		-
1605	1241	public static function get_email_html() {
1606	1242	FrmAppHelper::permission_check( 'frm_view_forms' );
1607	1243	check_ajax_referer( 'frm_ajax', 'nonce' );
1608	1244
1609		- echo FrmEntriesController::show_entry_shortcode( // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
	1245	+ echo FrmEntriesController::show_entry_shortcode( // WPCS: XSS ok.
1610	1246	array(
1611	1247	'form_id' => FrmAppHelper::get_post_param( 'form_id', '', 'absint' ),
1612	1248	'default_email' => true,
1613	1249	'plain_text' => FrmAppHelper::get_post_param( 'plain_text', '', 'absint' ),
		@@ -1615,17 +1251,9 @@
1615	1251	);
1616	1252	wp_die();
1617	1253	}
1618	1254
1619		- /**
1620		- * @param string $content
1621		- * @param stdClass|string|int $form
1622		- * @param stdClass|string|int|false $entry
1623		- * @return string
1624		- */
1625	1255	public static function filter_content( $content, $form, $entry = false ) {
1626		- $content = self::replace_form_name_shortcodes( $content, $form );
1627		-
1628	1256	self::get_entry_by_param( $entry );
1629	1257	if ( ! $entry ) {
1630	1258	return $content;
1631	1259	}
		@@ -1639,38 +1267,8 @@
1639	1267
1640	1268	return $content;
1641	1269	}
1642	1270
1643		- /**
1644		- * Replace any [form_name] shortcodes in a string.
1645		- *
1646		- * @since 5.5
1647		- *
1648		- * @param string|array $string
1649		- * @param stdClass|string|int $form
1650		- * @return string|array
1651		- */
1652		- public static function replace_form_name_shortcodes( $string, $form ) {
1653		- if ( ! is_string( $string ) ) {
1654		- return $string;
1655		- }
1656		-
1657		- if ( false === strpos( $string, '[form_name]' ) ) {
1658		- return $string;
1659		- }
1660		-
1661		- if ( ! is_object( $form ) ) {
1662		- $form = FrmForm::getOne( $form );
1663		- }
1664		-
1665		- $form_name = is_object( $form ) ? $form->name : '';
1666		- return str_replace( '[form_name]', $form_name, $string );
1667		- }
1668		-
1669		- /**
1670		- * @param stdClass|string|int|false $entry
1671		- * @return void
1672		- */
1673	1271	private static function get_entry_by_param( &$entry ) {
1674	1272	if ( ! $entry || ! is_object( $entry ) ) {
1675	1273	if ( ! $entry || ! is_numeric( $entry ) ) {
1676	1274	$entry = FrmAppHelper::get_post_param( 'id', false, 'sanitize_title' );
		@@ -1740,13 +1338,13 @@
1740	1338	$action = isset( $_REQUEST['frm_action'] ) ? 'frm_action' : 'action';
1741	1339	$vars = array();
1742	1340	FrmAppHelper::include_svg();
1743	1341
1744		- if ( isset( $_POST['frm_compact_fields'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
	1342	+ if ( isset( $_POST['frm_compact_fields'] ) ) {
1745	1343	FrmAppHelper::permission_check( 'frm_edit_forms' );
1746	1344
1747	1345	// Javascript needs to be allowed in some field settings.
1748		- // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized, WordPress.Security.NonceVerification.Missing
	1346	+ // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized
1749	1347	$json_vars = htmlspecialchars_decode( nl2br( str_replace( '&quot;', '"', wp_unslash( $_POST['frm_compact_fields'] ) ) ) );
1750	1348	$json_vars = json_decode( $json_vars, true );
1751	1349	if ( empty( $json_vars ) ) {
1752	1350	// json decoding failed so we should return an error message.
		@@ -1758,11 +1356,11 @@
1758	1356	add_filter( 'frm_validate_form', 'FrmFormsController::json_error' );
1759	1357	} else {
1760	1358	$vars = FrmAppHelper::json_to_array( $json_vars );
1761	1359	$action = $vars[ $action ];
1762		- unset( $_REQUEST['frm_compact_fields'], $_POST['frm_compact_fields'] ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
1763		- $_REQUEST = array_merge( $_REQUEST, $vars ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
1764		- $_POST = array_merge( $_POST, $_REQUEST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
	1360	+ unset( $_REQUEST['frm_compact_fields'], $_POST['frm_compact_fields'] );
	1361	+ $_REQUEST = array_merge( $_REQUEST, $vars );
	1362	+ $_POST = array_merge( $_POST, $_REQUEST );
1765	1363	}
1766	1364	} else {
1767	1365	$action = FrmAppHelper::get_param( $action, '', 'get', 'sanitize_title' );
1768	1366	if ( isset( $_REQUEST['delete_all'] ) ) {
		@@ -1776,11 +1374,15 @@
1776	1374
1777	1375	switch ( $action ) {
1778	1376	case 'new':
1779	1377	return self::new_form( $vars );
	1378	+ case 'add_new':
	1379	+ case 'list_templates':
	1380	+ return self::list_templates();
1780	1381	case 'create':
1781	1382	case 'edit':
1782	1383	case 'update':
	1384	+ case 'duplicate':
1783	1385	case 'trash':
1784	1386	case 'untrash':
1785	1387	case 'destroy':
1786	1388	case 'delete_all':
		@@ -1804,21 +1406,12 @@
1804	1406
1805	1407	if ( strpos( $action, 'bulk_' ) === 0 ) {
1806	1408	FrmAppHelper::remove_get_action();
1807	1409
1808		- self::list_form();
1809		- return;
	1410	+ return self::list_form();
1810	1411	}
1811	1412
1812		- $message = FrmAppHelper::get_param( 'message' );
1813		- if ( 'form_duplicate_error' === $message ) {
1814		- self::display_forms_list( array(), '', array( __( 'There was a problem duplicating the form', 'formidable' ) ) );
1815		- return;
1816		- }
1817		-
1818		- self::display_forms_list();
1819		-
1820		- return;
	1413	+ return self::display_forms_list();
1821	1414	}
1822	1415	}
1823	1416
1824	1417	public static function json_error( $errors ) {
		@@ -1947,9 +1540,8 @@
1947	1540	/**
1948	1541	* The formidable shortcode
1949	1542	*
1950	1543	* @param array $atts The params from the shortcode.
1951		- * @return string
1952	1544	*/
1953	1545	public static function get_form_shortcode( $atts ) {
1954	1546	global $frm_vars;
1955	1547	if ( isset( $frm_vars['skip_shortcode'] ) && $frm_vars['skip_shortcode'] ) {
		@@ -1961,10 +1553,10 @@
1961	1553	$shortcode_atts = shortcode_atts(
1962	1554	array(
1963	1555	'id' => '',
1964	1556	'key' => '',
1965		- 'title' => 'auto',
1966		- 'description' => 'auto',
	1557	+ 'title' => false,
	1558	+ 'description' => false,
1967	1559	'readonly' => false,
1968	1560	'entry_id' => false,
1969	1561	'fields' => array(),
1970	1562	'exclude_fields' => array(),
		@@ -1976,45 +1568,18 @@
1976	1568
1977	1569	return self::show_form( $shortcode_atts['id'], $shortcode_atts['key'], $shortcode_atts['title'], $shortcode_atts['description'], $atts );
1978	1570	}
1979	1571
1980		- /**
1981		- * @since 5.2.01
1982		- *
1983		- * @param string|int|false $id
1984		- * @param string|false $key
1985		- * @return stdClass|false
1986		- */
1987		- private static function maybe_get_form_by_id_or_key( $id, $key ) {
1988		- if ( ! $id ) {
	1572	+ public static function show_form( $id = '', $key = '', $title = false, $description = false, $atts = array() ) {
	1573	+ if ( empty( $id ) ) {
1989	1574	$id = $key;
1990	1575	}
1991		- return self::maybe_get_form_to_show( $id );
1992		- }
1993	1576
1994		- /**
1995		- * @param string|int|false $id
1996		- * @param string|false $key
1997		- * @param string|int|bool $title may be 'auto', true, false, 'true', 'false', 'yes', '1', 1, '0', 0.
1998		- * @param string|int|bool $description may be 'auto', true, false, 'true', 'false', 'yes', '1', 1, '0', 0.
1999		- * @param array $atts
2000		- * @return string
2001		- */
2002		- public static function show_form( $id = '', $key = '', $title = false, $description = false, $atts = array() ) {
2003		- $form = self::maybe_get_form_by_id_or_key( $id, $key );
2004		-
	1577	+ $form = self::maybe_get_form_to_show( $id );
2005	1578	if ( ! $form ) {
2006	1579	return __( 'Please select a valid form', 'formidable' );
2007	1580	}
2008	1581
2009		- if ( 'auto' === $title ) {
2010		- $title = ! empty( $form->options['show_title'] );
2011		- }
2012		-
2013		- if ( 'auto' === $description ) {
2014		- $description = ! empty( $form->options['show_description'] );
2015		- }
2016		-
2017	1582	FrmAppController::maybe_update_styles();
2018	1583
2019	1584	add_action( 'frm_load_form_hooks', 'FrmHooksController::trigger_load_form_hooks' );
2020	1585	FrmAppHelper::trigger_hook_load( 'form', $form );
		@@ -2043,18 +1608,14 @@
2043	1608
2044	1609	return $form;
2045	1610	}
2046	1611
2047		- /**
2048		- * @param string|int|false $id
2049		- * @return stdClass|false
2050		- */
2051	1612	private static function maybe_get_form_to_show( $id ) {
2052	1613	$form = false;
2053	1614
2054		- if ( ! empty( $id ) ) { // form id or key is set
	1615	+ if ( ! empty( $id ) ) { // no form id or key set
2055	1616	$form = FrmForm::getOne( $id );
2056		- if ( ! $form || $form->parent_form_id || $form->status === 'trash' ) {
	1617	+ if ( ! $form || $form->parent_form_id || $form->status == 'trash' ) {
2057	1618	$form = false;
2058	1619	}
2059	1620	}
2060	1621
		@@ -2061,9 +1622,9 @@
2061	1622	return $form;
2062	1623	}
2063	1624
2064	1625	private static function is_viewable_draft_form( $form ) {
2065		- return $form->status === 'draft' && current_user_can( 'frm_edit_forms' ) && ! FrmAppHelper::is_preview_page();
	1626	+ return $form->status == 'draft' && current_user_can( 'frm_edit_forms' ) && ! FrmAppHelper::is_preview_page();
2066	1627	}
2067	1628
2068	1629	public static function get_form( $form, $title, $description, $atts = array() ) {
2069	1630	ob_start();
		@@ -2091,15 +1652,11 @@
2091	1652	$fields = FrmFieldsHelper::get_form_fields( $form->id, $errors );
2092	1653	$reset = false;
2093	1654	$pass_args = compact( 'form', 'fields', 'errors', 'title', 'description', 'reset' );
2094	1655
2095		- $pass_args['action'] = $params['action'];
2096		- $handle_process_here = $params['action'] === 'create' && $params['posted_form_id'] == $form->id && $_POST; // phpcs:ignore WordPress.Security.NonceVerification.Missing
	1656	+ $handle_process_here = $params['action'] == 'create' && $params['posted_form_id'] == $form->id && $_POST;
2097	1657
2098	1658	if ( ! $handle_process_here ) {
2099		- FrmFormState::set_initial_value( 'title', $title );
2100		- FrmFormState::set_initial_value( 'description', $description );
2101		-
2102	1659	do_action( 'frm_display_form_action', $params, $fields, $form, $title, $description );
2103	1660	if ( apply_filters( 'frm_continue_to_new', true, $form->id, $params['action'] ) ) {
2104	1661	self::show_form_after_submit( $pass_args );
2105	1662	}
		@@ -2113,10 +1670,11 @@
2113	1670	if ( apply_filters( 'frm_continue_to_create', true, $form->id ) ) {
2114	1671	$entry_id = self::just_created_entry( $form->id );
2115	1672	$pass_args['entry_id'] = $entry_id;
2116	1673	$pass_args['reset'] = true;
	1674	+ $pass_args['conf_method'] = self::get_confirmation_method( compact( 'form', 'entry_id' ) );
2117	1675
2118		- self::run_on_submit_actions( $pass_args );
	1676	+ self::run_success_action( $pass_args );
2119	1677
2120	1678	do_action(
2121	1679	'frm_after_entry_processed',
2122	1680	array(
		@@ -2135,23 +1693,15 @@
2135	1693	*/
2136	1694	private static function get_saved_errors( $form, $params ) {
2137	1695	global $frm_vars;
2138	1696
2139		- if ( $params['posted_form_id'] == $form->id && $_POST && isset( $frm_vars['created_entries'][ $form->id ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
	1697	+ if ( $params['posted_form_id'] == $form->id && $_POST && isset( $frm_vars['created_entries'][ $form->id ] ) ) {
2140	1698	$errors = $frm_vars['created_entries'][ $form->id ]['errors'];
2141	1699	} else {
2142	1700	$errors = array();
2143	1701	}
2144	1702
2145		- /**
2146		- * Allows modifying the generated errors if the form was processed earlier.
2147		- *
2148		- * @since 5.2.03
2149		- *
2150		- * @param array $errors Errors data. Is empty array if no errors found.
2151		- * @param array $params Form params. See {@see FrmForm::get_params()}.
2152		- */
2153		- return apply_filters( 'frm_saved_errors', $errors, $params );
	1703	+ return $errors;
2154	1704	}
2155	1705
2156	1706	/**
2157	1707	* @since 2.2.7
		@@ -2162,35 +1712,15 @@
2162	1712	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;
2163	1713	}
2164	1714
2165	1715	/**
2166		- * Gets confirmation method.
2167		- *
2168	1716	* @since 3.0
2169		- * @since 6.0 This method can return an array of met On Submit actions.
2170		- *
2171		- * @param array $atts {
2172		- * Atts.
2173		- *
2174		- * @type object $form Form object.
2175		- * @type int $entry_id Entry ID.
2176		- * }
2177		- * @return string|array
2178	1717	*/
2179	1718	private static function get_confirmation_method( $atts ) {
2180		- $action = FrmOnSubmitHelper::current_event( $atts );
2181		- $opt = 'update' === $action ? 'edit_action' : 'success_action';
	1719	+ $opt = 'success_action';
2182	1720	$method = ( isset( $atts['form']->options[ $opt ] ) && ! empty( $atts['form']->options[ $opt ] ) ) ? $atts['form']->options[ $opt ] : 'message';
	1721	+ $method = apply_filters( 'frm_success_filter', $method, $atts['form'], 'create' );
2183	1722
2184		- if ( ! empty( $atts['entry_id'] ) ) {
2185		- $met_actions = self::get_met_on_submit_actions( $atts, $action );
2186		- if ( $met_actions ) {
2187		- $method = $met_actions;
2188		- }
2189		- }
2190		-
2191		- $method = apply_filters( 'frm_success_filter', $method, $atts['form'], $action );
2192		-
2193	1723	if ( $method != 'message' && ( ! $atts['entry_id'] || ! is_numeric( $atts['entry_id'] ) ) ) {
2194	1724	$method = 'message';
2195	1725	}
2196	1726
		@@ -2206,34 +1736,11 @@
2206	1736	$conf_method = self::get_confirmation_method(
2207	1737	array(
2208	1738	'form' => $form,
2209	1739	'entry_id' => $params['id'],
2210		- 'action' => FrmOnSubmitHelper::current_event( $params ),
2211	1740	)
2212	1741	);
2213	1742
2214		- self::maybe_trigger_redirect_with_action( $conf_method, $form, $params, $args );
2215		- }
2216		-
2217		- /**
2218		- * Maybe trigger redirect with the new Confirmation action.
2219		- *
2220		- * @since 6.1.1
2221		- *
2222		- * @param array|string $conf_method Array of confirmation actions or the action type string.
2223		- * @param object $form Form object.
2224		- * @param array $params See {@see FrmFormsController::maybe_trigger_redirect()}.
2225		- * @param array $args See {@see FrmFormsController::maybe_trigger_redirect()}.
2226		- */
2227		- public static function maybe_trigger_redirect_with_action( $conf_method, $form, $params, $args ) {
2228		- if ( is_array( $conf_method ) && 1 === count( $conf_method ) ) {
2229		- if ( 'redirect' === FrmOnSubmitHelper::get_action_type( $conf_method[0] ) ) {
2230		- $event = FrmOnSubmitHelper::current_event( $params );
2231		- FrmOnSubmitHelper::populate_on_submit_data( $form->options, $conf_method[0], $event );
2232		- $conf_method = 'redirect';
2233		- }
2234		- }
2235		-
2236	1743	if ( 'redirect' === $conf_method ) {
2237	1744	self::trigger_redirect( $form, $params, $args );
2238	1745	}
2239	1746	}
		@@ -2256,36 +1763,21 @@
2256	1763	/**
2257	1764	* Used when the success action is not 'message'
2258	1765	*
2259	1766	* @since 2.05
2260		- * @since 6.0 `$args['force_delay_redirect']` is added.
2261		- *
2262		- * @param array $args {
2263		- * The args.
2264		- *
2265		- * @type string $conf_method The method.
2266		- * @type object $form Form object.
2267		- * @type int $entry_id Entry ID.
2268		- * @type string $action The action event. Accepts `create` or `update`.
2269		- * @type array $fields The array of fields.
2270		- * @type int $force_delay_redirect Force to show the message before redirecting in case redirect method runs.
2271		- * }
2272	1767	*/
2273	1768	public static function run_success_action( $args ) {
2274		- global $frm_vars;
2275	1769	$extra_args = $args;
2276	1770	unset( $extra_args['form'] );
2277	1771
2278	1772	do_action( 'frm_success_action', $args['conf_method'], $args['form'], $args['form']->options, $args['entry_id'], $extra_args );
2279	1773
2280		- $opt = ( ! isset( $args['action'] ) || $args['action'] === 'create' ) ? 'success' : 'edit';
	1774	+ $opt = ( ! isset( $args['action'] ) || $args['action'] == 'create' ) ? 'success' : 'edit';
2281	1775
2282	1776	$args['success_opt'] = $opt;
2283		- $args['ajax'] = ! empty( $frm_vars['ajax'] );
2284		-
2285		- if ( $args['conf_method'] === 'page' && is_numeric( $args['form']->options[ $opt . '_page_id' ] ) ) {
	1777	+ if ( $args['conf_method'] == 'page' && is_numeric( $args['form']->options[ $opt . '_page_id' ] ) ) {
2286	1778	self::load_page_after_submit( $args );
2287		- } elseif ( $args['conf_method'] === 'redirect' ) {
	1779	+ } elseif ( $args['conf_method'] == 'redirect' ) {
2288	1780	self::redirect_after_submit( $args );
2289	1781	} else {
2290	1782	self::show_message_after_save( $args );
2291	1783	}
		@@ -2291,224 +1783,8 @@
2291	1783	}
2292	1784	}
2293	1785
2294	1786	/**
2295		- * Gets met On Submit actions.
2296		- *
2297		- * @since 6.0
2298		- *
2299		- * @param array $args See {@see FrmFormsController::run_success_action()}.
2300		- * @param string $event Form event. Default is `create`.
2301		- * @return array Array of actions that meet the conditional logics.
2302		- */
2303		- public static function get_met_on_submit_actions( $args, $event = 'create' ) {
2304		- if ( ! FrmOnSubmitHelper::form_has_migrated( $args['form'] ) ) {
2305		- return array();
2306		- }
2307		-
2308		- // If a redirect action has already opened the URL in a new tab, we show the default message in the currect tab.
2309		- if ( ! empty( self::$redirected_in_new_tab[ $args['form']->id ] ) ) {
2310		- return array( FrmOnSubmitHelper::get_fallback_action_after_open_in_new_tab( $event ) );
2311		- }
2312		-
2313		- $entry = FrmEntry::getOne( $args['entry_id'], true );
2314		- $actions = FrmOnSubmitHelper::get_actions( $args['form']->id );
2315		- $met_actions = array();
2316		- $has_redirect = false;
2317		-
2318		- foreach ( $actions as $action ) {
2319		- if ( ! in_array( $event, $action->post_content['event'], true ) ) {
2320		- continue;
2321		- }
2322		-
2323		- if ( FrmFormAction::action_conditions_met( $action, $entry ) ) {
2324		- continue;
2325		- }
2326		-
2327		- $action_type = FrmOnSubmitHelper::get_action_type( $action );
2328		-
2329		- if ( 'redirect' === $action_type ) {
2330		- if ( $has_redirect ) { // Do not process because we run the first redirect action only.
2331		- continue;
2332		- }
2333		- }
2334		-
2335		- if ( ! self::is_valid_on_submit_action( $action, $args, $event ) ) {
2336		- continue;
2337		- }
2338		-
2339		- if ( 'redirect' === $action_type ) {
2340		- $has_redirect = true;
2341		- }
2342		-
2343		- $met_actions[] = $action;
2344		- unset( $action );
2345		- }
2346		-
2347		- $args['event'] = $event;
2348		-
2349		- /**
2350		- * Filters the On Submit actions that meet the conditional logics.
2351		- *
2352		- * @since 6.0
2353		- *
2354		- * @param array $met_actions Actions that meet the conditional logics.
2355		- * @param array $args See {@see FrmFormsController::run_success_action()}. `$args['event']` is also added.
2356		- */
2357		- $met_actions = apply_filters( 'frm_get_met_on_submit_actions', $met_actions, $args );
2358		-
2359		- if ( empty( $met_actions ) ) {
2360		- $met_actions = array( FrmOnSubmitHelper::get_fallback_action( $event ) );
2361		- }
2362		-
2363		- return $met_actions;
2364		- }
2365		-
2366		- /**
2367		- * Checks if a Confirmation action has the valid data.
2368		- *
2369		- * @since 6.1.2
2370		- *
2371		- * @param object $action Form action object.
2372		- * @param array $args See {@see FrmFormsController::run_success_action()}.
2373		- * @param string $event Form event. Default is `create`.
2374		- * @return bool
2375		- */
2376		- private static function is_valid_on_submit_action( $action, $args, $event = 'create' ) {
2377		- $action_type = FrmOnSubmitHelper::get_action_type( $action );
2378		-
2379		- if ( 'redirect' === $action_type ) {
2380		- // Run through frm_redirect_url filter. This is used for the valid action check.
2381		- $action->post_content['success_url'] = apply_filters(
2382		- 'frm_redirect_url',
2383		- $action->post_content['success_url'],
2384		- $args['form'],
2385		- $args + array( 'action' => $event )
2386		- );
2387		-
2388		- return ! empty( $action->post_content['success_url'] );
2389		- }
2390		-
2391		- if ( 'page' === $action_type ) {
2392		- if ( empty( $action->post_content['success_page_id'] ) ) {
2393		- return false;
2394		- }
2395		-
2396		- $page = get_post( $action->post_content['success_page_id'] );
2397		- if ( ! $page || 'trash' === $page->post_status ) {
2398		- return false;
2399		- }
2400		- }
2401		-
2402		- return true;
2403		- }
2404		-
2405		- /**
2406		- * Runs On Submit actions.
2407		- *
2408		- * @since 6.0
2409		- *
2410		- * @param array $args See inside {@see FrmFormsController::get_form_contents()} method.
2411		- */
2412		- public static function run_on_submit_actions( $args ) {
2413		- $args['conf_method'] = self::get_confirmation_method(
2414		- array(
2415		- 'form' => $args['form'],
2416		- 'entry_id' => $args['entry_id'],
2417		- 'action' => FrmOnSubmitHelper::current_event( $args ),
2418		- )
2419		- );
2420		- if ( ! is_array( $args['conf_method'] ) ) {
2421		- self::run_success_action( $args );
2422		- return;
2423		- }
2424		-
2425		- // If conf_method is an array, run On Submit actions.
2426		- if ( ! $args['conf_method'] ) {
2427		- // Use default message.
2428		- FrmOnSubmitHelper::populate_on_submit_data( $args['form']->options );
2429		- self::run_success_action( $args );
2430		- } elseif ( 1 === count( $args['conf_method'] ) ) {
2431		- FrmOnSubmitHelper::populate_on_submit_data( $args['form']->options, reset( $args['conf_method'] ) );
2432		- $args['conf_method'] = $args['form']->options['success_action'];
2433		- self::run_success_action( $args );
2434		- } else {
2435		- self::run_multi_on_submit_actions( $args );
2436		- }
2437		- }
2438		-
2439		- /**
2440		- * Runs multiple success actions.
2441		- *
2442		- * @since 6.0
2443		- *
2444		- * @param array $args See {@see FrmFormsController::run_success_action()}.
2445		- */
2446		- public static function run_multi_on_submit_actions( $args ) {
2447		- $redirect_action = null;
2448		- foreach ( $args['conf_method'] as $action ) {
2449		- if ( 'redirect' === FrmOnSubmitHelper::get_action_type( $action ) ) {
2450		- // We catch the redirect action to run it last.
2451		- $redirect_action = $action;
2452		- continue;
2453		- }
2454		-
2455		- self::run_single_on_submit_action( $args, $action );
2456		-
2457		- unset( $action );
2458		- }
2459		-
2460		- if ( $redirect_action ) {
2461		- // Show script to delay the redirection.
2462		- $args['force_delay_redirect'] = true;
2463		- self::run_single_on_submit_action( $args, $redirect_action );
2464		- }
2465		- }
2466		-
2467		- /**
2468		- * Runs single On Submit action.
2469		- *
2470		- * @since 6.0
2471		- *
2472		- * @param array $args See {@see FrmFormsController::run_success_action()}.
2473		- * @param object $action On Submit action object.
2474		- */
2475		- public static function run_single_on_submit_action( $args, $action ) {
2476		- $new_args = self::get_run_success_action_args( $args, $action );
2477		- self::run_success_action( $new_args );
2478		- }
2479		-
2480		- /**
2481		- * Gets run_success_action() args from the On Submit action.
2482		- *
2483		- * @since 6.0
2484		- *
2485		- * @param array $args See {@see FrmFormsController::run_success_action()}.
2486		- * @param object $action On Submit action object.
2487		- * @return array
2488		- */
2489		- private static function get_run_success_action_args( $args, $action ) {
2490		- $new_args = $args;
2491		-
2492		- FrmOnSubmitHelper::populate_on_submit_data( $new_args['form']->options, $action, $args['action'] );
2493		-
2494		- $opt = 'update' === $args['action'] ? 'edit_' : 'success_';
2495		-
2496		- $new_args['conf_method'] = $new_args['form']->options[ $opt . 'action' ];
2497		-
2498		- /**
2499		- * Filters the run success action args.
2500		- *
2501		- * @since 6.0
2502		- *
2503		- * @param array $new_args The new args.
2504		- * @param array $args The old args. See {@see FrmFormsController::run_success_action()}.
2505		- * @param object $action On Submit action object.
2506		- */
2507		- return apply_filters( 'frm_get_run_success_action_args', $new_args, $args, $action );
2508		- }
2509		-
2510		- /**
2511	1787	* @since 3.0
2512	1788	*/
2513	1789	private static function load_page_after_submit( $args ) {
2514	1790	global $post;
		@@ -2517,22 +1793,9 @@
2517	1793	$page = get_post( $args['form']->options[ $opt . '_page_id' ] );
2518	1794	$old_post = $post;
2519	1795	$post = $page;
2520	1796	$content = apply_filters( 'frm_content', $page->post_content, $args['form'], $args['entry_id'] );
2521		-
2522		- // Fix the On Submit page content doesn't show when previewing In theme.
2523		- $has_preview_filter = has_filter( 'the_content', 'FrmFormsController::preview_content' );
2524		-
2525		- if ( $has_preview_filter ) {
2526		- remove_filter( 'the_content', 'FrmFormsController::preview_content', 9999 );
2527		- }
2528		-
2529		- echo apply_filters( 'the_content', $content ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
2530		-
2531		- if ( $has_preview_filter ) {
2532		- add_filter( 'the_content', 'FrmFormsController::preview_content', 9999 );
2533		- }
2534		-
	1797	+ echo apply_filters( 'the_content', $content ); // WPCS: XSS ok.
2535	1798	$post = $old_post;
2536	1799	}
2537	1800	}
2538	1801
		@@ -2537,11 +1800,12 @@
2537	1800	}
2538	1801
2539	1802	/**
2540	1803	* @since 3.0
2541		- * @param array $args See {@see FrmFormsController::run_success_action()}.
2542	1804	*/
2543	1805	private static function redirect_after_submit( $args ) {
	1806	+ global $frm_vars;
	1807	+
2544	1808	add_filter( 'frm_use_wpautop', '__return_false' );
2545	1809
2546	1810	$opt = $args['success_opt'];
2547	1811	$success_url = trim( $args['form']->options[ $opt . '_url' ] );
		@@ -2547,8 +1811,12 @@
2547	1811	$success_url = trim( $args['form']->options[ $opt . '_url' ] );
2548	1812	$success_url = apply_filters( 'frm_content', $success_url, $args['form'], $args['entry_id'] );
2549	1813	$success_url = do_shortcode( $success_url );
2550	1814
	1815	+ $success_msg = isset( $args['form']->options[ $opt . '_msg' ] ) ? $args['form']->options[ $opt . '_msg' ] : __( 'Please wait while you are redirected.', 'formidable' );
	1816	+
	1817	+ $redirect_msg = self::get_redirect_message( $success_url, $success_msg, $args );
	1818	+
2551	1819	$args['id'] = $args['entry_id'];
2552	1820	FrmEntriesController::delete_entry_before_redirect( $success_url, $args['form'], $args );
2553	1821
2554	1822	add_filter( 'frm_redirect_url', 'FrmEntriesController::prepare_redirect_url' );
		@@ -2555,122 +1823,20 @@
2555	1823	$success_url = apply_filters( 'frm_redirect_url', $success_url, $args['form'], $args );
2556	1824
2557	1825	$doing_ajax = FrmAppHelper::doing_ajax();
2558	1826
2559		- if ( ! empty( $args['ajax'] ) && $doing_ajax && empty( $args['force_delay_redirect'] ) ) { // Is AJAX submit and there is just one Redirect action runs.
2560		- echo json_encode( self::get_ajax_redirect_response_data( $args + compact( 'success_url' ) ) );
	1827	+ if ( isset( $args['ajax'] ) && $args['ajax'] && $doing_ajax ) {
	1828	+ echo json_encode( array( 'redirect' => $success_url ) );
2561	1829	wp_die();
2562		- }
2563		-
2564		- if ( ! headers_sent() && empty( $args['force_delay_redirect'] ) ) { // Not AJAX submit, no headers sent, and there is just one Redirect action runs.
2565		- if ( ! empty( $args['form']->options['open_in_new_tab'] ) ) {
2566		- self::print_open_in_new_tab_js_with_fallback_handler( $success_url, $args );
2567		- self::$redirected_in_new_tab[ $args['form']->id ] = 1;
2568		- return;
2569		- }
2570		-
	1830	+ } elseif ( ! headers_sent() ) {
2571	1831	wp_redirect( esc_url_raw( $success_url ) );
2572	1832	die(); // do not use wp_die or redirect fails
2573		- }
2574		-
2575		- // Redirect with a delay.
2576		- self::redirect_after_submit_using_js( $args + compact( 'success_url', 'doing_ajax' ) );
2577		- }
2578		-
2579		- /**
2580		- * Prints open in new tab js with fallback handler.
2581		- *
2582		- * @since 6.3.1
2583		- *
2584		- * @param string $success_url Success URL.
2585		- * @param array $args See {@see FrmFormsController::redirect_after_submit()}.
2586		- */
2587		- private static function print_open_in_new_tab_js_with_fallback_handler( $success_url, $args ) {
2588		- echo '<script>var newTab = window.open("' . esc_url_raw( $success_url ) . '", "_blank");';
2589		- echo 'if ( ! newTab ) {';
2590		-
2591		- $data = array(
2592		- 'formId' => intval( $args['form']->id ),
2593		- 'message' => self::get_redirect_fallback_message( $success_url, $args ),
2594		- );
2595		- // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
2596		- echo 'frmShowNewTabFallback = ' . FrmAppHelper::maybe_json_encode( $data ) . ';';
2597		- echo '}</script>';
2598		- }
2599		-
2600		- /**
2601		- * Gets response data for redirect action when AJAX submitting.
2602		- *
2603		- * @since 6.3.1
2604		- *
2605		- * @param array $args See {@see FrmFormsController::run_success_action()}.
2606		- * @return array
2607		- */
2608		- private static function get_ajax_redirect_response_data( $args ) {
2609		- $response_data = array( 'redirect' => $args['success_url'] );
2610		-
2611		- if ( ! empty( $args['form']->options['open_in_new_tab'] ) ) {
2612		- $response_data['openInNewTab'] = 1;
2613		-
2614		- $args['message'] = FrmOnSubmitHelper::get_default_new_tab_msg();
2615		-
2616		- $args['form']->options['success_msg'] = $args['message'];
2617		- $args['form']->options['edit_msg'] = $args['message'];
2618		- if ( ! isset( $args['fields'] ) ) {
2619		- $args['fields'] = FrmField::get_all_for_form( $args['form']->id );
2620		- }
2621		-
2622		- $args['message'] = self::prepare_submit_message( $args['form'], $args['entry_id'], $args );
2623		-
2624		- ob_start();
2625		- self::show_lone_success_messsage( $args );
2626		- $response_data['content'] = ob_get_clean();
2627		-
2628		- $response_data['fallbackMsg'] = self::get_redirect_fallback_message( $args['success_url'], $args );
2629		- }
2630		-
2631		- return $response_data;
2632		- }
2633		-
2634		- /**
2635		- * Redirects after submitting using JS. This is used when showing message before redirecting.
2636		- *
2637		- * @since 6.0
2638		- *
2639		- * @param array $args See {@see FrmFormsController::run_success_action()}.
2640		- */
2641		- private static function redirect_after_submit_using_js( $args ) {
2642		- $success_msg = FrmOnSubmitHelper::get_default_redirect_msg();
2643		- $redirect_msg = self::get_redirect_message( $args['success_url'], $success_msg, $args );
2644		- $success_url = esc_url_raw( $args['success_url'] );
2645		-
2646		- /**
2647		- * Filters the delay time before redirecting when On Submit Redirect action is delayed.
2648		- *
2649		- * @since 6.0
2650		- *
2651		- * @param int $delay_time Delay time in miliseconds.
2652		- */
2653		- $delay_time = apply_filters( 'frm_redirect_delay_time', 8000 );
2654		-
2655		- if ( ! empty( $args['form']->options['open_in_new_tab'] ) ) {
2656		- $redirect_js = 'window.open("' . $success_url . '", "_blank")';
2657	1833	} else {
2658		- $redirect_js = 'window.location="' . $success_url . '";';
2659		- }
	1834	+ add_filter( 'frm_use_wpautop', '__return_true' );
2660	1835
2661		- add_filter( 'frm_use_wpautop', '__return_true' );
2662		-
2663		- echo FrmAppHelper::maybe_kses( $redirect_msg ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
2664		- echo '<script>';
2665		- if ( empty( $args['doing_ajax'] ) ) { // Not AJAX submit, delay JS until window.load.
2666		- echo 'window.onload=function(){';
	1836	+ echo $redirect_msg; // WPCS: XSS ok.
	1837	+ echo "<script type='text/javascript'>window.onload = function(){setTimeout(window.location='" . esc_url_raw( $success_url ) . "', 8000);}</script>";
2667	1838	}
2668		- echo 'setTimeout(function(){' . $redirect_js . '}, ' . intval( $delay_time ) . ');'; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
2669		- if ( empty( $args['doing_ajax'] ) ) {
2670		- echo '};';
2671		- }
2672		- echo '</script>';
2673	1839	}
2674	1840
2675	1841	/**
2676	1842	* @since 3.0
		@@ -2679,10 +1845,11 @@
2679	1845	* @param string $success_msg
2680	1846	* @param array $args
2681	1847	*/
2682	1848	private static function get_redirect_message( $success_url, $success_msg, $args ) {
2683		- $redirect_msg = '<div class="' . esc_attr( FrmFormsHelper::get_form_style_class( $args['form'] ) ) . '"><div class="frm-redirect-msg" role="status">' . $success_msg . '<br/>' .
2684		- self::get_redirect_fallback_message( $success_url, $args ) .
	1849	+ $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/>' .
	1850	+ /* translators: %1$s: Start link HTML, %2$s: End link HTML */
	1851	+ sprintf( __( '%1$sClick here%2$s if you are not automatically redirected.', 'formidable' ), '<a href="' . esc_url( $success_url ) . '">', '</a>' ) .
2685	1852	'</div></div>';
2686	1853
2687	1854	$redirect_args = array(
2688	1855	'entry_id' => $args['entry_id'],
		@@ -2693,50 +1860,17 @@
2693	1860	return apply_filters( 'frm_redirect_msg', $redirect_msg, $redirect_args );
2694	1861	}
2695	1862
2696	1863	/**
2697		- * Gets fallback message when redirecting failed.
2698		- *
2699		- * @since 6.3.1
2700		- *
2701		- * @param string $success_url Redirect URL.
2702		- * @param array $args Contains `form` object.
2703		- * @return string
2704		- */
2705		- private static function get_redirect_fallback_message( $success_url, $args ) {
2706		- $target = '';
2707		- if ( ! empty( $args['form']->options['open_in_new_tab'] ) ) {
2708		- $target = ' target="_blank"';
2709		- }
2710		-
2711		- return sprintf(
2712		- /* translators: %1$s: Start link HTML, %2$s: End link HTML */
2713		- __( '%1$sClick here%2$s if you are not automatically redirected.', 'formidable' ),
2714		- '<a href="' . esc_url( $success_url ) . '"' . $target . '>',
2715		- '</a>'
2716		- );
2717		- }
2718		-
2719		- /**
2720	1864	* Prepare to show the success message and empty form after submit
2721	1865	*
2722	1866	* @since 2.05
2723	1867	*/
2724	1868	public static function show_message_after_save( $atts ) {
2725		- $atts['message'] = self::prepare_submit_message( $atts['form'], $atts['entry_id'], $atts );
	1869	+ $atts['message'] = self::prepare_submit_message( $atts['form'], $atts['entry_id'] );
2726	1870
2727	1871	if ( ! isset( $atts['form']->options['show_form'] ) || $atts['form']->options['show_form'] ) {
2728		- if ( isset( $atts['action'] ) && 'update' === $atts['action'] && is_callable( array( 'FrmProEntriesController', 'show_front_end_form_with_entry' ) ) ) {
2729		- $entry = FrmEntry::getOne( $atts['entry_id'] );
2730		- if ( $entry ) {
2731		- // This is copied from the Pro plugin.
2732		- $atts['conf_message'] = FrmProEntriesController::confirmation( 'message', $atts['form'], $atts['form']->options, $entry->id, $atts );
2733		- $atts['show_form'] = FrmProEntriesController::is_form_displayed_after_edit( $atts['form'] );
2734		- FrmProEntriesController::show_front_end_form_with_entry( $entry, $atts );
2735		- }
2736		- } else {
2737		- self::show_form_after_submit( $atts );
2738		- }
	1872	+ self::show_form_after_submit( $atts );
2739	1873	} else {
2740	1874	self::show_lone_success_messsage( $atts );
2741	1875	}
2742	1876	}
		@@ -2755,11 +1889,9 @@
2755	1889	$title = $args['title'];
2756	1890	$description = $args['description'];
2757	1891
2758	1892	if ( empty( $args['fields'] ) ) {
2759		- $values = array(
2760		- 'custom_style' => FrmAppHelper::custom_style_value( array() ),
2761		- );
	1893	+ $values = array();
2762	1894	} else {
2763	1895	$values = FrmEntriesHelper::setup_new_vars( $args['fields'], $form, $args['reset'] );
2764	1896	}
2765	1897	unset( $args );
		@@ -2773,9 +1905,9 @@
2773	1905	self::maybe_load_css( $form, $values['custom_style'], $frm_vars['load_css'] );
2774	1906
2775	1907	$message_placement = self::message_placement( $form, $message );
2776	1908
2777		- include FrmAppHelper::plugin_path() . '/classes/views/frm-entries/new.php';
	1909	+ include( FrmAppHelper::plugin_path() . '/classes/views/frm-entries/new.php' );
2778	1910	}
2779	1911
2780	1912	/**
2781	1913	* @return string - 'before', 'after', or 'submit'
		@@ -2806,16 +1938,8 @@
2806	1938	*
2807	1939	* @since 2.05
2808	1940	*/
2809	1941	private static function fill_atts_for_form_display( &$args ) {
2810		- if ( ! isset( $args['title'] ) && isset( $args['show_title'] ) ) {
2811		- $args['title'] = $args['show_title'];
2812		- }
2813		-
2814		- if ( ! isset( $args['description'] ) && isset( $args['show_description'] ) ) {
2815		- $args['description'] = $args['show_description'];
2816		- }
2817		-
2818	1942	$defaults = array(
2819	1943	'errors' => array(),
2820	1944	'message' => '',
2821	1945	'fields' => array(),
		@@ -2849,21 +1973,14 @@
2849	1973	/**
2850	1974	* Prepare the success message before it's shown
2851	1975	*
2852	1976	* @since 2.05
2853		- * @since 6.0.x Added the third parameter.
2854		- *
2855		- * @param object $form Form object.
2856		- * @param int $entry_id Entry ID.
2857		- * @param array $args See {@see FrmFormsController::run_success_action()}.
2858		- * @return string
2859	1977	*/
2860		- private static function prepare_submit_message( $form, $entry_id, $args = array() ) {
	1978	+ private static function prepare_submit_message( $form, $entry_id ) {
2861	1979	$frm_settings = FrmAppHelper::get_settings( array( 'current_form' => $form->id ) );
2862		- $opt = isset( $args['success_opt'] ) ? $args['success_opt'] : 'success';
2863	1980
2864	1981	if ( $entry_id && is_numeric( $entry_id ) ) {
2865		- $message = isset( $form->options[ $opt . '_msg' ] ) ? $form->options[ $opt . '_msg' ] : $frm_settings->success_msg;
	1982	+ $message = isset( $form->options['success_msg'] ) ? $form->options['success_msg'] : $frm_settings->success_msg;
2866	1983	$class = 'frm_message';
2867	1984	} else {
2868	1985	$message = $frm_settings->failed_msg;
2869	1986	$class = FrmFormsHelper::form_error_class();
		@@ -2873,11 +1990,8 @@
2873	1990
2874	1991	return apply_filters( 'frm_main_feedback', $message, $form, $entry_id );
2875	1992	}
2876	1993
2877		- /**
2878		- * @return void
2879		- */
2880	1994	public static function front_head() {
2881	1995	$version = FrmAppHelper::plugin_version();
2882	1996	$suffix = FrmAppHelper::js_suffix();
2883	1997
		@@ -2923,38 +2037,24 @@
2923	2037	* If css is loaded only on applicable pages, include it before the form loads
2924	2038	* to prevent a flash of unstyled form.
2925	2039	*
2926	2040	* @since 4.01
2927		- *
2928		- * @return void
2929	2041	*/
2930	2042	private static function load_late_css() {
2931	2043	$frm_settings = FrmAppHelper::get_settings();
2932		- $late_css = $frm_settings->load_style === 'dynamic';
2933		-
2934		- if ( ! $late_css || ! self::should_load_late() ) {
	2044	+ $late_css = $frm_settings->load_style === 'dynamic';
	2045	+ if ( ! $late_css ) {
2935	2046	return;
2936	2047	}
2937	2048
2938	2049	global $wp_styles;
2939		- if ( is_array( $wp_styles->queue ) && in_array( 'formidable', $wp_styles->queue, true ) ) {
	2050	+ if ( is_array( $wp_styles->queue ) && in_array( 'formidable', $wp_styles->queue ) ) {
2940	2051	wp_print_styles( 'formidable' );
2941	2052	}
2942	2053	}
2943	2054
2944		- /**
2945		- * Avoid late load if All in One SEO is active because it prevents CSS from loading entirely.
2946		- *
2947		- * @since 5.2.03
2948		- *
2949		- * @return bool
2950		- */
2951		- private static function should_load_late() {
2952		- return ! function_exists( 'aioseo' );
2953		- }
2954		-
2955	2055	public static function defer_script_loading( $tag, $handle ) {
2956		- if ( 'captcha-api' == $handle && ! strpos( $tag, 'defer' ) ) {
	2056	+ if ( 'recaptcha-api' == $handle && ! strpos( $tag, 'defer' ) ) {
2957	2057	$tag = str_replace( ' src', ' defer="defer" async="async" src', $tag );
2958	2058	}
2959	2059
2960	2060	return $tag;
		@@ -2989,125 +2089,8 @@
2989	2089	return isset( $atts['minimize'] ) && ! empty( $atts['minimize'] );
2990	2090	}
2991	2091
2992	2092	/**
2993		- * @since 5.0.16
2994		- *
2995		- * @return void
2996		- */
2997		- public static function landing_page_preview_option() {
2998		- $dir = apply_filters( 'frm_landing_page_preview_option', false );
2999		- if ( false === $dir || ! file_exists( $dir . 'landing-page-preview-option.php' ) ) {
3000		- $dir = self::get_form_views_path();
3001		- }
3002		- include $dir . 'landing-page-preview-option.php';
3003		- }
3004		-
3005		- /**
3006		- * @since 5.0.16
3007		- *
3008		- * @return string
3009		- */
3010		- private static function get_form_views_path() {
3011		- return FrmAppHelper::plugin_path() . '/classes/views/frm-forms/';
3012		- }
3013		-
3014		- /**
3015		- * Create a page with an embedded formidable Gutenberg block.
3016		- *
3017		- * @since 5.2
3018		- *
3019		- * @return never
3020		- */
3021		- public static function create_page_with_shortcode() {
3022		- if ( ! current_user_can( 'publish_posts' ) ) {
3023		- die( 0 );
3024		- }
3025		-
3026		- check_ajax_referer( 'frm_ajax', 'nonce' );
3027		-
3028		- $type = FrmAppHelper::get_post_param( 'type', '', 'sanitize_text_field' );
3029		- if ( ! $type || ! in_array( $type, array( 'form', 'view' ), true ) ) {
3030		- die( 0 );
3031		- }
3032		-
3033		- $object_id = FrmAppHelper::get_post_param( 'object_id', '', 'absint' );
3034		- if ( ! $object_id ) {
3035		- die( 0 );
3036		- }
3037		-
3038		- $postarr = array( 'post_type' => 'page' );
3039		-
3040		- if ( 'form' === $type ) {
3041		- $postarr['post_content'] = self::get_page_shortcode_content_for_form( $object_id );
3042		- } else {
3043		- $postarr['post_content'] = apply_filters( 'frm_create_page_with_' . $type . '_shortcode_content', '', $object_id );
3044		- }
3045		-
3046		- $name = FrmAppHelper::get_post_param( 'name', '', 'sanitize_text_field' );
3047		- if ( $name ) {
3048		- $postarr['post_title'] = $name;
3049		- }
3050		-
3051		- $success = wp_insert_post( $postarr );
3052		- if ( ! is_numeric( $success ) || ! $success ) {
3053		- die( 0 );
3054		- }
3055		-
3056		- wp_send_json(
3057		- array(
3058		- 'redirect' => get_edit_post_link( $success, 'redirect' ),
3059		- )
3060		- );
3061		- }
3062		-
3063		- /**
3064		- * @since 5.3
3065		- *
3066		- * @param string $content
3067		- * @param int $form_id
3068		- * @return string
3069		- */
3070		- private static function get_page_shortcode_content_for_form( $form_id ) {
3071		- $shortcode = '[formidable id="' . $form_id . '"]';
3072		- $html_comment_start = '<!-- wp:formidable/simple-form {"formId":"' . $form_id . '"} -->';
3073		- $html_comment_end = '<!-- /wp:formidable/simple-form -->';
3074		- return $html_comment_start . '<div>' . $shortcode . '</div>' . $html_comment_end;
3075		- }
3076		-
3077		- /**
3078		- * Get page dropdown for AJAX request for embedding form in an existing page.
3079		- *
3080		- * @return never
3081		- */
3082		- public static function get_page_dropdown() {
3083		- if ( ! current_user_can( 'publish_posts' ) ) {
3084		- die( 0 );
3085		- }
3086		-
3087		- check_ajax_referer( 'frm_ajax', 'nonce' );
3088		-
3089		- $html = FrmAppHelper::clip(
3090		- function() {
3091		- FrmAppHelper::maybe_autocomplete_pages_options(
3092		- array(
3093		- 'field_name' => 'frm_page_dropdown',
3094		- 'page_id' => '',
3095		- 'placeholder' => __( 'Select a Page', 'formidable' ),
3096		- )
3097		- );
3098		- }
3099		- );
3100		- $post_type_object = get_post_type_object( 'page' );
3101		- wp_send_json(
3102		- array(
3103		- 'html' => $html,
3104		- 'edit_page_url' => admin_url( sprintf( $post_type_object->_edit_link . '&action=edit', 0 ) ),
3105		- )
3106		- );
3107		- }
3108		-
3109		- /**
3110	2093	* @deprecated 4.0
3111	2094	*/
3112	2095	public static function new_form( $values = array() ) {
3113	2096	FrmDeprecated::new_form( $values );
		@@ -3121,8 +2104,16 @@
3121	2104	self::update( $values );
3122	2105	}
3123	2106
3124	2107	/**
	2108	+ * @deprecated 1.07.05
	2109	+ * @codeCoverageIgnore
	2110	+ */
	2111	+ public static function add_default_templates( $path, $default = true, $template = true ) {
	2112	+ FrmDeprecated::add_default_templates( $path, $default, $template );
	2113	+ }
	2114	+
	2115	+ /**
3125	2116	* @deprecated 3.0
3126	2117	* @codeCoverageIgnore
3127	2118	*/
3128	2119	public static function bulk_create_template( $ids ) {
		@@ -3129,8 +2120,16 @@
3129	2120	return FrmDeprecated::bulk_create_template( $ids );
3130	2121	}
3131	2122
3132	2123	/**
	2124	+ * @deprecated 2.03
	2125	+ * @codeCoverageIgnore
	2126	+ */
	2127	+ public static function register_pro_scripts() {
	2128	+ FrmDeprecated::register_pro_scripts();
	2129	+ }
	2130	+
	2131	+ /**
3133	2132	* @deprecated 3.0
3134	2133	* @codeCoverageIgnore
3135	2134	*/
3136	2135	public static function edit_key() {
		@@ -3142,14 +2141,6 @@
3142	2141	* @codeCoverageIgnore
3143	2142	*/
3144	2143	public static function edit_description() {
3145	2144	FrmDeprecated::edit_description();
3146		- }
3147		-
3148		- /**
3149		- * @deprecated 4.08
3150		- * @since 3.06
3151		- */
3152		- public static function add_new() {
3153		- _deprecated_function( __FUNCTION__, '4.08' );
3154	2145	}
3155	2146	}