← All changes | classes/controllers/FrmFormsController.php +512 -1680 6.25 → 5.0.02 View file →

		@@ -4,28 +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 current 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		- /**
19		- * The HTML for the Formdiable TinyMCE button (That triggers a popup to insert shortcodes)
20		- * is stored here and re-used as an optimization.
21		- *
22		- * @since 6.11
23		- *
24		- * @var string|null
25		- */
26		- private static $formidable_tinymce_button;
27		-
28	8	public static function menu() {
29	9	$menu_label = __( 'Forms', 'formidable' );
30	10	if ( ! FrmAppHelper::pro_is_installed() ) {
31	11	$menu_label .= ' (Lite)';
		@@ -35,9 +15,10 @@
35	15	self::maybe_load_listing_hooks();
36	16	}
37	17
38	18	public static function maybe_load_listing_hooks() {
39		- 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' ) ) ) {
40	21	return;
41	22	}
42	23
43	24	add_filter( 'get_user_option_managetoplevel_page_formidablecolumnshidden', 'FrmFormsController::hidden_columns' );
		@@ -52,9 +33,9 @@
52	33	}
53	34	}
54	35
55	36	public static function register_widgets() {
56		- require_once FrmAppHelper::plugin_path() . '/classes/widgets/FrmShowForm.php';
	37	+ require_once( FrmAppHelper::plugin_path() . '/classes/widgets/FrmShowForm.php' );
57	38	register_widget( 'FrmShowForm' );
58	39	}
59	40
60	41	/**
		@@ -62,14 +43,11 @@
62	43	*
63	44	* @since 4.06.03
64	45	*/
65	46	public static function logic_tip() {
66		- $images_url = FrmAppHelper::plugin_url() . '/images/';
67		- $data_message = __( 'Only show the fields you need and create branching forms. Upgrade to get conditional logic and question branching.', 'formidable' );
68		- $data_message .= ' <img src="' . esc_url( $images_url ) . '/survey-logic.png" srcset="' . esc_url( $images_url ) . 'survey-logic@2x.png 2x" alt="' . esc_attr__( 'Conditional Logic options', 'formidable' ) . '"/>';
69		- 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">';
70		- esc_html_e( 'Conditional Logic', 'formidable' );
71		- FrmAppHelper::icon_by_class( 'frmfont frm_arrowdown8_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' );
72	50	echo '</a>';
73	51	}
74	52
75	53	/**
		@@ -83,11 +61,8 @@
83	61
84	62	return $shortcodes;
85	63	}
86	64
87		- /**
88		- * @return void
89		- */
90	65	public static function list_form() {
91	66	FrmAppHelper::permission_check( 'frm_view_forms' );
92	67
93	68	$message = '';
		@@ -98,118 +73,46 @@
98	73	unset( $errors['message'] );
99	74	}
100	75	$errors = apply_filters( 'frm_admin_list_form_action', $errors );
101	76
102		- self::display_forms_list( $params, $message, $errors );
	77	+ return self::display_forms_list( $params, $message, $errors );
103	78	}
104	79
105	80	/**
	81	+ * Load the scripts before a modal can be triggered.
	82	+ *
	83	+ * @since 4.0
	84	+ */
	85	+ private static function init_modal() {
	86	+ wp_enqueue_script( 'jquery-ui-dialog' );
	87	+ wp_enqueue_style( 'jquery-ui-dialog' );
	88	+ }
	89	+
	90	+ /**
106	91	* Create the default email action
107	92	*
108	93	* @since 2.02.11
109	94	*
110		- * @param int|object $form
111		- * @return void
	95	+ * @param object $form
112	96	*/
113	97	private static function create_default_email_action( $form ) {
114	98	FrmForm::maybe_get_form( $form );
115		- if ( ! is_object( $form ) ) {
116		- return;
117		- }
118		-
119	99	$create_email = apply_filters( 'frm_create_default_email_action', true, $form );
120	100
121	101	if ( $create_email ) {
122		- /**
123		- * @var FrmFormAction
124		- */
125	102	$action_control = FrmFormActionsController::get_form_actions( 'email' );
126	103	$action_control->create( $form->id );
127	104	}
128	105	}
129	106
130		- /**
131		- * Create the default On submit action
132		- *
133		- * @since 6.0.0
134		- *
135		- * @param int|object $form Form object or ID.
136		- * @return void
137		- */
138		- private static function create_default_on_submit_action( $form ) {
139		- FrmForm::maybe_get_form( $form );
140		- if ( ! is_object( $form ) ) {
141		- return;
142		- }
143		-
144		- /**
145		- * Enable or disable the default On Submit action.
146		- *
147		- * @since 6.0.0
148		- *
149		- * @param bool $create Set to `false` if you want to disable.
150		- * @param object $form Form object.
151		- */
152		- $create = apply_filters( 'frm_create_default_on_submit_action', true, $form );
153		-
154		- if ( $create ) {
155		- /**
156		- * @var FrmFormAction
157		- */
158		- $action_control = FrmFormActionsController::get_form_actions( FrmOnSubmitAction::$slug );
159		- $action_control->create( $form->id );
160		- }
161		- }
162		-
163		- /**
164		- * Creates submit button field.
165		- *
166		- * @since 6.9
167		- *
168		- * @param int|object $form Form ID or object.
169		- * @return void
170		- */
171		- private static function create_submit_button_field( $form ) {
172		- FrmForm::maybe_get_form( $form );
173		- if ( ! is_object( $form ) ) {
174		- return;
175		- }
176		-
177		- if ( FrmSubmitHelper::get_submit_field( $form->id ) ) {
178		- // Do not create submit button field if it exists.
179		- return;
180		- }
181		-
182		- FrmField::create(
183		- array(
184		- 'type' => FrmSubmitHelper::FIELD_TYPE,
185		- 'name' => __( 'Submit', 'formidable' ),
186		- 'field_order' => FrmSubmitHelper::DEFAULT_ORDER,
187		- 'form_id' => $form->id,
188		- 'field_options' => FrmFieldsHelper::get_default_field_options( FrmSubmitHelper::FIELD_TYPE ),
189		- 'description' => '',
190		- 'default_value' => '',
191		- 'options' => array(),
192		- )
193		- );
194		- }
195		-
196		- /**
197		- * @return void
198		- */
199	107	public static function edit( $values = false ) {
200	108	FrmAppHelper::permission_check( 'frm_edit_forms' );
201	109
202	110	$id = isset( $values['id'] ) ? absint( $values['id'] ) : FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
203	111
204		- self::get_edit_vars( $id );
	112	+ return self::get_edit_vars( $id );
205	113	}
206	114
207		- /**
208		- * @param mixed $id
209		- * @param string $message
210		- * @return void
211		- */
212	115	public static function settings( $id = false, $message = '' ) {
213	116	FrmAppHelper::permission_check( 'frm_edit_forms' );
214	117
215	118	if ( ! $id || ! is_numeric( $id ) ) {
		@@ -215,36 +118,21 @@
215	118	if ( ! $id || ! is_numeric( $id ) ) {
216	119	$id = FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
217	120	}
218	121
219		- FrmOnSubmitHelper::maybe_migrate_submit_settings_to_action( $id );
220		-
221		- self::get_settings_vars( $id, array(), $message );
	122	+ return self::get_settings_vars( $id, array(), $message );
222	123	}
223	124
224	125	public static function update_settings() {
225	126	FrmAppHelper::permission_check( 'frm_edit_forms' );
226		- $process_form = FrmAppHelper::get_post_param( 'process_form', '', 'sanitize_text_field' );
227	127
228		- if ( ! wp_verify_nonce( $process_form, 'process_form_nonce' ) ) {
229		- $frm_settings = FrmAppHelper::get_settings();
230		- $error_args = array(
231		- 'title' => __( 'Verification failed', 'formidable' ),
232		- 'body' => $frm_settings->admin_permission,
233		- 'cancel_text' => __( 'Cancel', 'formidable' ),
234		- );
235		- FrmAppController::show_error_modal( $error_args );
236		- return;
237		- }
238		-
239	128	$id = FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
240	129
241		- $errors = FrmForm::validate( $_POST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
242		- $warnings = FrmFormsHelper::check_for_warnings( $_POST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
	130	+ $errors = FrmForm::validate( $_POST );
	131	+ $warnings = FrmFormsHelper::check_for_warnings( $_POST );
243	132
244	133	if ( count( $errors ) > 0 ) {
245		- self::get_settings_vars( $id, $errors, compact( 'warnings' ) );
246		- return;
	134	+ return self::get_settings_vars( $id, $errors, compact( 'warnings' ) );
247	135	}
248	136
249	137	do_action( 'frm_before_update_form_settings', $id );
250	138
		@@ -249,11 +137,11 @@
249	137	do_action( 'frm_before_update_form_settings', $id );
250	138
251	139	$antispam_was_on = self::antispam_was_on( $id );
252	140
253		- FrmForm::update( $id, $_POST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
	141	+ FrmForm::update( $id, $_POST );
254	142
255		- $antispam_is_on = ! empty( $_POST['options']['antispam'] ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
	143	+ $antispam_is_on = ! empty( $_POST['options']['antispam'] );
256	144	if ( $antispam_is_on !== $antispam_was_on ) {
257	145	FrmAntiSpam::clear_caches();
258	146	}
259	147
		@@ -258,9 +146,9 @@
258	146	}
259	147
260	148	$message = __( 'Settings Successfully Updated', 'formidable' );
261	149
262		- self::get_settings_vars( $id, array(), compact( 'message', 'warnings' ) );
	150	+ return self::get_settings_vars( $id, array(), compact( 'message', 'warnings' ) );
263	151	}
264	152
265	153	/**
266	154	* @param int $form_id
		@@ -270,14 +158,11 @@
270	158	$form = FrmForm::getOne( $form_id );
271	159	return ! empty( $form->options['antispam'] );
272	160	}
273	161
274		- /**
275		- * @return void
276		- */
277	162	public static function update( $values = array() ) {
278	163	if ( empty( $values ) ) {
279		- $values = $_POST; // phpcs:ignore WordPress.Security.NonceVerification.Missing
	164	+ $values = $_POST;
280	165	}
281	166
282	167	// Set radio button and checkbox meta equal to "other" value.
283	168	if ( FrmAppHelper::pro_is_installed() ) {
		@@ -292,156 +177,105 @@
292	177
293	178	$id = isset( $values['id'] ) ? absint( $values['id'] ) : FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
294	179
295	180	if ( count( $errors ) > 0 ) {
296		- self::get_edit_vars( $id, $errors );
297		- return;
298		- }
	181	+ return self::get_edit_vars( $id, $errors );
	182	+ } else {
	183	+ FrmForm::update( $id, $values );
	184	+ $message = __( 'Form was successfully updated.', 'formidable' );
299	185
300		- self::maybe_remove_draft_option_from_fields( $id );
	186	+ if ( self::is_too_long( $values ) ) {
	187	+ $message .= '<br/> ' . sprintf(
	188	+ /* translators: %1$s: Start link HTML, %2$s: end link HTML */
	189	+ __( 'However, your form is very long and may be %1$sreaching server limits%2$s.', 'formidable' ),
	190	+ '<a href="https://formidableforms.com/knowledgebase/i-have-a-long-form-why-did-the-options-at-the-end-of-the-form-stop-saving/?utm_source=WordPress&utm_medium=builder&utm_campaign=liteplugin" target="_blank" rel="noopener">',
	191	+ '</a>'
	192	+ );
	193	+ }
301	194
302		- FrmForm::update( $id, $values );
303		- $message = __( 'Form was successfully updated.', 'formidable' );
	195	+ if ( defined( 'DOING_AJAX' ) ) {
	196	+ wp_die( FrmAppHelper::kses( $message, array( 'a' ) ) ); // WPCS: XSS ok.
	197	+ }
304	198
305		- if ( self::is_too_long( $values ) ) {
306		- $message .= '<br/> ' . sprintf(
307		- /* translators: %1$s: Start link HTML, %2$s: end link HTML */
308		- __( 'However, your form is very long and may be %1$sreaching server limits%2$s.', 'formidable' ),
309		- '<a href="https://formidableforms.com/knowledgebase/i-have-a-long-form-why-did-the-options-at-the-end-of-the-form-stop-saving/?utm_source=WordPress&utm_medium=builder&utm_campaign=liteplugin" target="_blank" rel="noopener">',
310		- '</a>'
311		- );
	199	+ return self::get_edit_vars( $id, array(), $message );
312	200	}
313		-
314		- if ( defined( 'DOING_AJAX' ) ) {
315		- wp_die( FrmAppHelper::kses( $message, array( 'a' ) ) ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
316		- }
317		-
318		- self::get_edit_vars( $id, array(), $message );
319	201	}
320	202
321	203	/**
322		- * Remove the draft flag from any new fields from this current session.
323		- *
324		- * @since 6.8
325		- *
326		- * @param int $form_id
327		- * @return void
328		- */
329		- private static function maybe_remove_draft_option_from_fields( $form_id ) {
330		- $draft_field_ids_csv = FrmAppHelper::get_post_param( 'draft_fields', '', 'sanitize_text_field' );
331		- if ( ! $draft_field_ids_csv ) {
332		- // If the draft_fields input is empty there are no new fields in the session.
333		- return;
334		- }
335		-
336		- $draft_field_ids = array_filter( explode( ',', $draft_field_ids_csv ), 'is_numeric' );
337		- if ( ! $draft_field_ids ) {
338		- // Exit early if the draft fields input is invalid. It should be a CSV of integer values.
339		- return;
340		- }
341		-
342		- $draft_field_rows = FrmFieldsHelper::get_draft_field_results( $form_id, $draft_field_ids );
343		- foreach ( $draft_field_rows as $row ) {
344		- $row->field_options['draft'] = 0;
345		- FrmField::update( $row->id, array( 'field_options' => $row->field_options ) );
346		- }
347		- }
348		-
349		- /**
350	204	* Check if the value at the end of the form was included.
351	205	* If it's missing, it means other values at the end of the form
352	206	* were likely not saved either.
353	207	*
354	208	* @since 3.06.01
355		- *
356		- * @return bool
357	209	*/
358	210	private static function is_too_long( $values ) {
359		- return empty( $values['frm_end'] );
	211	+ return ( ! isset( $values['frm_end'] ) ) || empty( $values['frm_end'] );
360	212	}
361	213
362		- public static function duplicate() {
	214	+ /**
	215	+ * Redirect to the url for creating from a template
	216	+ * Also delete the current form
	217	+ *
	218	+ * @since 2.0
	219	+ * @deprecated 3.06
	220	+ */
	221	+ public static function _create_from_template() {
	222	+ _deprecated_function( __FUNCTION__, '3.06' );
	223	+
363	224	FrmAppHelper::permission_check( 'frm_edit_forms' );
364		- $nonce = FrmAppHelper::simple_get( '_wpnonce' );
	225	+ check_ajax_referer( 'frm_ajax', 'nonce' );
365	226
366		- if ( ! wp_verify_nonce( $nonce ) ) {
367		- $frm_settings = FrmAppHelper::get_settings();
368		- wp_die( esc_html( $frm_settings->admin_permission ) );
	227	+ $current_form = FrmAppHelper::get_param( 'this_form', '', 'get', 'absint' );
	228	+ $template_id = FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
	229	+
	230	+ if ( $current_form ) {
	231	+ FrmForm::destroy( $current_form );
369	232	}
370	233
	234	+ echo esc_url_raw( admin_url( 'admin.php?page=formidable&frm_action=duplicate&id=' . absint( $template_id ) ) );
	235	+ wp_die();
	236	+ }
	237	+
	238	+ public static function duplicate() {
	239	+ FrmAppHelper::permission_check( 'frm_edit_forms' );
	240	+
371	241	$params = FrmForm::list_page_params();
372	242	$form = FrmForm::duplicate( $params['id'], $params['template'], true );
373		- $url = admin_url( 'admin.php?page=formidable' );
374		- $message = 'form_duplicate_error';
375		-
	243	+ $message = $params['template'] ? __( 'Form template was Successfully Created', 'formidable' ) : __( 'Form was Successfully Copied', 'formidable' );
376	244	if ( $form ) {
377		- $new_template = FrmAppHelper::simple_get( 'new_template' ) ? '&new_template=true' : '';
378		- $url = admin_url( 'admin.php?page=formidable&frm_action=edit&id=' . absint( $form ) . $new_template );
379		- $message = 'form_duplicated';
	245	+ return self::get_edit_vars( $form, array(), $message, true );
	246	+ } else {
	247	+ return self::display_forms_list( $params, __( 'There was a problem creating the new template.', 'formidable' ) );
380	248	}
381		-
382		- $url .= '&message=' . $message;
383		-
384		- wp_safe_redirect( $url );
385		- exit();
386	249	}
387	250
388		- /**
389		- * @return string|null
390		- */
391	251	public static function page_preview() {
392	252	$params = FrmForm::list_page_params();
393		- if ( ! $params['form'] || is_numeric( $params['form'] ) ) {
394		- return null;
	253	+ if ( ! $params['form'] ) {
	254	+ return;
395	255	}
396	256
397		- self::maybe_block_preview( $params['form'] );
398		-
399	257	$form = FrmForm::getOne( $params['form'] );
400		- if ( ! $form ) {
401		- return null;
	258	+ if ( $form ) {
	259	+ return self::show_form( $form->id, '', true, true );
402	260	}
403		-
404		- return self::show_form( $form->id, '', 'auto', 'auto' );
405	261	}
406	262
407	263	/**
408	264	* @since 3.0
409		- *
410		- * @return void
411	265	*/
412	266	public static function show_page_preview() {
413		- $preview = self::page_preview();
414		- if ( is_null( $preview ) ) {
415		- wp_die(
416		- '<h1>' . esc_html__( 'Form key is invalid', 'formidable' ) . '</h1>',
417		- '<p>' . esc_html__( 'Form key is invalid', 'formidable' ) . '</p>',
418		- 404
419		- );
420		- }
421		-
422		- echo $preview; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
	267	+ echo self::page_preview(); // WPCS: XSS ok.
423	268	}
424	269
425		- /**
426		- * @return void
427		- */
428	270	public static function preview() {
429	271	do_action( 'frm_wp' );
430		- FrmAppHelper::set_current_screen_and_hook_suffix();
431	272
432	273	global $frm_vars;
433	274	$frm_vars['preview'] = true;
434	275
435		- // print_emoji_styles is deprecated.
436		- remove_action( 'wp_print_styles', 'print_emoji_styles' );
	276	+ self::load_wp();
437	277
438		- if ( FrmTestModeController::should_add_test_mode_container() ) {
439		- do_action( 'frm_test_mode_init' );
440		- add_action( 'wp_enqueue_scripts', 'FrmTestModeController::register_and_enqueue_required_scripts' );
441		- add_filter( 'frm_filter_final_form', 'FrmTestModeController::maybe_add_test_mode_container', 99 );
442		- }
443		-
444	278	$include_theme = FrmAppHelper::get_param( 'theme', '', 'get', 'absint' );
445	279	if ( $include_theme ) {
446	280	self::set_preview_query();
447	281	self::load_theme_preview();
		@@ -452,66 +286,43 @@
452	286	wp_die();
453	287	}
454	288
455	289	/**
456		- * Set the page global to any available page (except for the Blog Page).
457		- *
458		- * @return void
	290	+ * @since 3.0
459	291	*/
460		- private static function set_preview_query() {
461		- $page_query = array(
462		- 'numberposts' => 1,
463		- 'orderby' => 'date',
464		- 'order' => 'ASC',
465		- 'post_type' => 'page',
466		- );
467		-
468		- $page_for_posts = get_option( 'page_for_posts' );
469		- if ( is_numeric( $page_for_posts ) ) {
470		- // Avoid querying for the "Posts Page" or "Blog Page" so we don't display 10 forms.
471		- $page_query['post__not_in'] = array( $page_for_posts );
	292	+ private static function load_wp() {
	293	+ if ( ! defined( 'ABSPATH' ) && ! defined( 'XMLRPC_REQUEST' ) ) {
	294	+ global $wp;
	295	+ $root = dirname( dirname( dirname( dirname( __FILE__ ) ) ) );
	296	+ include_once( $root . '/wp-config.php' );
	297	+ $wp->init();
	298	+ $wp->register_globals();
472	299	}
	300	+ }
473	301
474		- $random_page = get_posts( $page_query );
475		- if ( ! $random_page ) {
476		- return;
477		- }
478		-
479		- $random_page = reset( $random_page );
480		- if ( ! is_a( $random_page, 'WP_Post' ) ) {
481		- // The return type can also be int.
482		- return;
483		- }
484		-
485		- query_posts(
	302	+ private static function set_preview_query() {
	303	+ $random_page = get_posts(
486	304	array(
487		- 'post_type' => 'page',
488		- 'page_id' => $random_page->ID,
	305	+ 'numberposts' => 1,
	306	+ 'orderby' => 'date',
	307	+ 'order' => 'ASC',
	308	+ 'post_type' => 'page',
489	309	)
490	310	);
491	311
492		- // Fixes Pro issue #3004. Prevent an undefined $post object.
493		- // Otherwise WordPress themes will trigger a warning "Attempt to read property "comment_count" on null".
494		- self::set_post_global( $random_page );
	312	+ if ( ! empty( $random_page ) ) {
	313	+ $random_page = reset( $random_page );
	314	+ query_posts(
	315	+ array(
	316	+ 'post_type' => 'page',
	317	+ 'page_id' => $random_page->ID,
	318	+ )
	319	+ );
	320	+ }
495	321	}
496	322
497	323	/**
498		- * Set the WP $post global object. Used for in-theme preview when defining a page.
499		- *
500		- * @since 5.5.2
501		- *
502		- * @param WP_Post $page The page object.
503		- * @return void
504		- */
505		- private static function set_post_global( $page ) {
506		- global $post;
507		- $post = $page; // phpcs:ignore WordPress.WP.GlobalVariablesOverride
508		- }
509		-
510		- /**
511	324	* @since 3.0
512		- *
513		- * @return void
514	325	*/
515	326	private static function load_theme_preview() {
516	327	add_filter( 'wp_title', 'FrmFormsController::preview_title', 9999 );
517	328	add_filter( 'the_title', 'FrmFormsController::preview_page_title', 9999 );
		@@ -520,39 +331,20 @@
520	331	add_filter( 'is_active_sidebar', '__return_false' );
521	332	FrmStylesController::enqueue_css( 'enqueue', true );
522	333
523	334	if ( false === get_template_part( 'page' ) ) {
524		- if ( function_exists( 'wp_is_block_theme' ) && wp_is_block_theme() ) {
525		- add_filter( 'body_class', 'FrmFormsController::preview_block_theme_body_classnames' );
526		- }
527	335	self::fallback_when_page_template_part_is_not_supported_by_theme();
528	336	}
529	337	}
530	338
531	339	/**
532		- * Add padding to the body for block themes.
533		- *
534		- * @since 6.5.2
535		- *
536		- * @param array $classes The body classes list.
537		- * @return array
538		- */
539		- public static function preview_block_theme_body_classnames( $classes ) {
540		- $classes[] = 'has-global-padding';
541		- return $classes;
542		- }
543		-
544		- /**
545	340	* Not every theme supports get_template_part( 'page' ).
546	341	* When this is not supported, false is returned, and we can handle a fallback.
547		- *
548		- * @return void
549	342	*/
550	343	private static function fallback_when_page_template_part_is_not_supported_by_theme() {
551	344	if ( have_posts() ) {
552	345	the_post();
553		- self::get_template( 'header' );
554		-
	346	+ get_header( '' );
555	347	// add some generic class names to the container to add some natural padding to the content.
556	348	// .entry-content catches the WordPress TwentyTwenty theme.
557	349	// .container catches Customizr content.
558	350	echo '<div class="container entry-content">';
		@@ -557,58 +349,13 @@
557	349	// .container catches Customizr content.
558	350	echo '<div class="container entry-content">';
559	351	the_content();
560	352	echo '</div>';
561		-
562		- // Prevent extra unexpected forms in the footer.
563		- // For some reason this happens in the Twenty Twenty Five theme.
564		- add_filter( 'frm_filter_final_form', '__return_empty_string' );
565		-
566		- self::get_template( 'footer' );
	353	+ get_footer();
567	354	}
568	355	}
569	356
570	357	/**
571		- * Calls core function to get a template part if it doesn't cause deprecation warnings. Otherwise skips the deprecation function call
572		- * and renders required html fragments calling required functions.
573		- *
574		- * @since 6.7.1
575		- * @param string $template
576		- * @return void
577		- */
578		- private static function get_template( $template ) {
579		- if ( self::should_try_getting_template( $template ) ) {
580		- call_user_func( 'get_' . $template );
581		- return;
582		- }
583		-
584		- if ( 'header' === $template ) {
585		- include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/preview/header.php';
586		- return;
587		- }
588		-
589		- if ( 'footer' === $template ) {
590		- include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/preview/footer.php';
591		- }
592		- }
593		-
594		- /**
595		- * Returns true if calling a template function doesn't trigger deprecation warnings.
596		- *
597		- * @since 6.7.1
598		- * @param string $template
599		- * @return bool
600		- */
601		- private static function should_try_getting_template( $template ) {
602		- $stylesheet_path = get_stylesheet_directory();
603		- $template_path = get_template_directory();
604		- $is_child_theme = $stylesheet_path !== $template_path;
605		- $template_name = $template . '.php';
606		-
607		- return file_exists( $stylesheet_path . '/' . $template_name ) || $is_child_theme && file_exists( $template_path . '/' . $template_name );
608		- }
609		-
610		- /**
611	358	* Set the page title for the theme preview page
612	359	*
613	360	* @since 3.0
614	361	*/
		@@ -620,14 +367,11 @@
620	367	return $title;
621	368	}
622	369
623	370	/**
624		- * Set the page title for the theme preview page.
	371	+ * Set the page title for the theme preview page
625	372	*
626	373	* @since 3.0
627		- *
628		- * @param string $title
629		- * @return string
630	374	*/
631	375	public static function preview_title( $title ) {
632	376	return __( 'Form Preview', 'formidable' );
633	377	}
		@@ -632,20 +376,15 @@
632	376	return __( 'Form Preview', 'formidable' );
633	377	}
634	378
635	379	/**
636		- * Set the page content for the theme preview page.
	380	+ * Set the page content for the theme preview page
637	381	*
638	382	* @since 3.0
639		- *
640		- * @param string $content
641		- * @return string
642	383	*/
643	384	public static function preview_content( $content ) {
644	385	if ( in_the_loop() ) {
645		- self::show_page_preview();
646		- // Clear the content for the page we're using.
647		- $content = '';
	386	+ $content = self::show_page_preview();
648	387	}
649	388
650	389	return $content;
651	390	}
		@@ -653,108 +392,34 @@
653	392	/**
654	393	* @since 3.0
655	394	*/
656	395	private static function load_direct_preview() {
	396	+ header( 'Content-Type: text/html; charset=' . get_option( 'blog_charset' ) );
	397	+
657	398	$key = FrmAppHelper::simple_get( 'form', 'sanitize_title' );
658	399	if ( $key == '' ) {
659	400	$key = FrmAppHelper::get_post_param( 'form', '', 'sanitize_title' );
660	401	}
661	402
662		- if ( ! $key ) {
663		- $error = __( 'Form key is missing', 'formidable' );
664		- wp_die(
665		- '<h1>' . esc_html( $error ) . '</h1>',
666		- '<p>' . esc_html( $error ) . '</p>',
667		- 404
668		- );
669		- }
670		-
671		- self::maybe_block_preview( $key );
672		-
673	403	$form = FrmForm::getAll( array( 'form_key' => $key ), '', 1 );
674		- if ( ! $form ) {
675		- $error = __( 'Form does not exist', 'formidable' );
676		- wp_die(
677		- '<h1>' . esc_html( $error ) . '</h1>',
678		- '<p>' . esc_html( $error ) . '</p>',
679		- 404
680		- );
	404	+ if ( empty( $form ) ) {
	405	+ $form = FrmForm::getAll( array(), '', 1 );
681	406	}
682	407
683		- header( 'Content-Type: text/html; charset=' . get_option( 'blog_charset' ) );
684		-
685		- self::fix_deprecated_null_param_warning();
686		-
687		- require FrmAppHelper::plugin_path() . '/classes/views/frm-entries/direct.php';
	408	+ require( FrmAppHelper::plugin_path() . '/classes/views/frm-entries/direct.php' );
688	409	}
689	410
690		- /**
691		- * Block the form preview for the contact form by default if the user cannot view forms.
692		- * This is to prevent the contact form being exploited.
693		- * Since this form is added by default and every site uses the same key, it is too easy
694		- * to guess this form.
695		- *
696		- * @since 6.20
697		- *
698		- * @param string $form_key Form key.
699		- * @return void
700		- */
701		- public static function maybe_block_preview( $form_key ) {
702		- if ( FrmFormsHelper::should_block_preview( $form_key ) ) {
703		- $error = __( 'You do not have permission to view this form', 'formidable' );
704		- wp_die(
705		- '<h1>' . esc_html( $error ) . '</h1>',
706		- '<p>' . esc_html( $error ) . '</p>',
707		- 403
708		- );
709		- }
710		- }
711		-
712		- /**
713		- * Some themes have a null $src value.
714		- * This function adds a filter to ensure that $src is not null.
715		- * WP will call str_starts_with with the null value triggering a deprecated message otherwise.
716		- *
717		- * @since 6.10
718		- *
719		- * @return void
720		- */
721		- private static function fix_deprecated_null_param_warning() {
722		- add_filter(
723		- 'script_loader_src',
724		- /**
725		- * @param string|null $src
726		- * @return string
727		- */
728		- function ( $src ) {
729		- if ( is_null( $src ) ) {
730		- $src = '';
731		- }
732		- return $src;
733		- }
734		- );
735		- }
736		-
737	411	public static function untrash() {
738	412	self::change_form_status( 'untrash' );
739	413	}
740	414
741		- /**
742		- * @param array $ids
743		- * @return string
744		- */
745	415	public static function bulk_untrash( $ids ) {
746	416	FrmAppHelper::permission_check( 'frm_edit_forms' );
747	417
748	418	$count = FrmForm::set_status( $ids, 'published' );
749	419
750		- if ( ! $count ) {
751		- // Don't show "0 forms restored" on refresh.
752		- return '';
753		- }
754		-
755	420	/* translators: %1$s: Number of forms */
756		- $message = sprintf( _n( '%1$s form restored from the Trash.', '%1$s forms restored from the Trash.', $count, 'formidable' ), $count );
	421	+ $message = sprintf( _n( '%1$s form restored from the Trash.', '%1$s forms restored from the Trash.', $count, 'formidable' ), 1 );
757	422
758	423	return $message;
759	424	}
760	425
		@@ -775,9 +440,9 @@
775	440
776	441	/**
777	442	* @param string $status
778	443	*
779		- * @return void
	444	+ * @return int The number of forms changed
780	445	*/
781	446	public static function change_form_status( $status ) {
782	447	$available_status = array(
783	448	'untrash' => array(
		@@ -797,14 +462,14 @@
797	462	FrmAppHelper::permission_check( $available_status[ $status ]['permission'] );
798	463
799	464	$params = FrmForm::list_page_params();
800	465
801		- // Check nonce url.
	466	+ //check nonce url
802	467	check_admin_referer( $status . '_form_' . $params['id'] );
803	468
804	469	$count = 0;
805	470	if ( FrmForm::set_status( $params['id'], $available_status[ $status ]['new_status'] ) ) {
806		- ++$count;
	471	+ $count ++;
807	472	}
808	473
809	474	$form_type = FrmAppHelper::get_simple_request(
810	475	array(
		@@ -816,9 +481,9 @@
816	481	/* translators: %1$s: Number of forms */
817	482	$available_status['untrash']['message'] = sprintf( _n( '%1$s form restored from the Trash.', '%1$s forms restored from the Trash.', $count, 'formidable' ), $count );
818	483
819	484	/* translators: %1$s: Number of forms, %2$s: Start link HTML, %3$s: End link HTML */
820		- $available_status['trash']['message'] = sprintf( _n( '%1$s form moved to the Trash. %2$sUndo%3$s', '%1$s forms moved to the Trash. %2$sUndo%3$s', $count, 'formidable' ), $count, '<a href="' . esc_url( wp_nonce_url( '?page=formidable&frm_action=untrash&form_type=' . $form_type . '&id=' . $params['id'], 'untrash_form_' . $params['id'] ) ) . '">', '</a>' );
	485	+ $available_status['trash']['message'] = sprintf( _n( '%1$s form moved to the Trash. %2$sUndo%3$s', '%1$s forms moved to the Trash. %2$sUndo%3$s', $count, 'formidable' ), $count, '<a href="' . esc_url( wp_nonce_url( '?page=formidable&frm_action=untrash&form_type=' . $form_type . '&id=' . $params['id'], 'untrash_form_' . $params['id'] ) ) . '">', '</a>' );
821	486
822	487	$message = $available_status[ $status ]['message'];
823	488
824	489	self::display_forms_list( $params, $message );
		@@ -823,12 +488,8 @@
823	488
824	489	self::display_forms_list( $params, $message );
825	490	}
826	491
827		- /**
828		- * @param array $ids
829		- * @return string
830		- */
831	492	public static function bulk_trash( $ids ) {
832	493	FrmAppHelper::permission_check( 'frm_delete_forms' );
833	494
834	495	$count = 0;
		@@ -833,16 +494,12 @@
833	494
834	495	$count = 0;
835	496	foreach ( $ids as $id ) {
836	497	if ( FrmForm::trash( $id ) ) {
837		- ++$count;
	498	+ $count ++;
838	499	}
839	500	}
840	501
841		- if ( ! $count ) {
842		- return '';
843		- }
844		-
845	502	$current_page = FrmAppHelper::get_simple_request(
846	503	array(
847	504	'param' => 'form_type',
848	505	'type' => 'request',
		@@ -868,9 +525,9 @@
868	525	check_admin_referer( 'destroy_form_' . $params['id'] );
869	526
870	527	$count = 0;
871	528	if ( FrmForm::destroy( $params['id'] ) ) {
872		- ++$count;
	529	+ $count ++;
873	530	}
874	531
875	532	/* translators: %1$s: Number of forms */
876	533	$message = sprintf( _n( '%1$s Form Permanently Deleted', '%1$s Forms Permanently Deleted', $count, 'formidable' ), $count );
		@@ -877,12 +534,8 @@
877	534
878	535	self::display_forms_list( $params, $message );
879	536	}
880	537
881		- /**
882		- * @param array $ids
883		- * @return string
884		- */
885	538	public static function bulk_destroy( $ids ) {
886	539	FrmAppHelper::permission_check( 'frm_delete_forms' );
887	540
888	541	$count = 0;
		@@ -888,24 +541,19 @@
888	541	$count = 0;
889	542	foreach ( $ids as $id ) {
890	543	$d = FrmForm::destroy( $id );
891	544	if ( $d ) {
892		- ++$count;
	545	+ $count ++;
893	546	}
894	547	}
895	548
896		- if ( $count ) {
897		- /* translators: %1$s: Number of forms */
898		- return sprintf( _n( '%1$s form permanently deleted.', '%1$s forms permanently deleted.', $count, 'formidable' ), $count );
899		- }
	549	+ /* translators: %1$s: Number of forms */
	550	+ $message = sprintf( _n( '%1$s form permanently deleted.', '%1$s forms permanently deleted.', $count, 'formidable' ), $count );
900	551
901		- return '';
	552	+ return $message;
902	553	}
903	554
904		- /**
905		- * @since 6.7.1 Function went from private to public.
906		- */
907		- public static function delete_all() {
	555	+ private static function delete_all() {
908	556	// Check nonce url.
909	557	$permission_error = FrmAppHelper::permission_nonce_error( 'frm_delete_forms', '_wpnonce', 'bulk-toplevel_page_formidable' );
910	558	if ( $permission_error !== false ) {
911	559	self::display_forms_list( array(), '', array( $permission_error ) );
		@@ -912,15 +560,14 @@
912	560
913	561	return;
914	562	}
915	563
916		- $count = FrmForm::scheduled_delete( time() );
917		- $url = remove_query_arg( array( 'delete_all' ) );
	564	+ $count = FrmForm::scheduled_delete( time() );
918	565
919		- $url .= '&message=forms_permanently_deleted&forms_deleted=' . $count;
	566	+ /* translators: %1$s: Number of forms */
	567	+ $message = sprintf( _n( '%1$s form permanently deleted.', '%1$s forms permanently deleted.', $count, 'formidable' ), $count );
920	568
921		- wp_safe_redirect( $url );
922		- die();
	569	+ self::display_forms_list( array(), $message );
923	570	}
924	571
925	572	/**
926	573	* Create a new form from the modal.
		@@ -927,41 +574,22 @@
927	574	*
928	575	* @since 4.0
929	576	*/
930	577	public static function build_new_form() {
	578	+ global $wpdb;
	579	+
931	580	FrmAppHelper::permission_check( 'frm_edit_forms' );
932	581	check_ajax_referer( 'frm_ajax', 'nonce' );
933	582
934	583	$new_values = self::get_modal_values();
935	584	$new_values['form_key'] = $new_values['name'];
936		- $new_values['options'] = array(
937		- 'antispam' => 1,
938		- 'on_submit_migrated' => 1,
939		- );
940	585
941		- /**
942		- * Allows changing form values before creating from the modal.
943		- *
944		- * @since 5.4
945		- *
946		- * @param array $values Form values.
947		- */
948		- $new_values = apply_filters( 'frm_new_form_values', $new_values );
949		-
950	586	$form_id = FrmForm::create( $new_values );
951		- /**
952		- * @since 5.3
953		- *
954		- * @param int $form_id
955		- */
956		- do_action( 'frm_build_new_form', $form_id );
957	587
958		- self::create_submit_button_field( $form_id );
959		- self::create_default_on_submit_action( $form_id );
960	588	self::create_default_email_action( $form_id );
961	589
962	590	$response = array(
963		- 'redirect' => FrmForm::get_edit_link( $form_id ) . '&new_template=true',
	591	+ 'redirect' => FrmForm::get_edit_link( $form_id ),
964	592	);
965	593
966	594	echo wp_json_encode( $response );
967	595	wp_die();
		@@ -967,15 +595,46 @@
967	595	wp_die();
968	596	}
969	597
970	598	/**
	599	+ * Create a custom template from a form
	600	+ *
	601	+ * @since 3.06
	602	+ */
	603	+ public static function build_template() {
	604	+ global $wpdb;
	605	+
	606	+ FrmAppHelper::permission_check( 'frm_edit_forms' );
	607	+ check_ajax_referer( 'frm_ajax', 'nonce' );
	608	+
	609	+ $form_id = FrmAppHelper::get_param( 'xml', '', 'post', 'absint' );
	610	+ $new_form_id = FrmForm::duplicate( $form_id, 1, true );
	611	+ if ( ! $new_form_id ) {
	612	+ $response = array(
	613	+ 'message' => __( 'There was an error creating a template.', 'formidable' ),
	614	+ );
	615	+ } else {
	616	+ $new_values = self::get_modal_values();
	617	+ $query_results = $wpdb->update( $wpdb->prefix . 'frm_forms', $new_values, array( 'id' => $new_form_id ) );
	618	+ if ( $query_results ) {
	619	+ FrmForm::clear_form_cache();
	620	+ }
	621	+
	622	+ $response = array(
	623	+ 'redirect' => admin_url( 'admin.php?page=formidable&frm_action=duplicate&id=' . $new_form_id ),
	624	+ );
	625	+ }
	626	+
	627	+ echo wp_json_encode( $response );
	628	+ wp_die();
	629	+ }
	630	+
	631	+ /**
971	632	* Before creating a new form, get the name and description from the modal.
972	633	*
973	634	* @since 4.0
974		- *
975		- * @return array<string,string>
976	635	*/
977		- public static function get_modal_values() {
	636	+ private static function get_modal_values() {
978	637	$name = FrmAppHelper::get_param( 'name', '', 'post', 'sanitize_text_field' );
979	638	$desc = FrmAppHelper::get_param( 'desc', '', 'post', 'sanitize_textarea_field' );
980	639
981	640	return array(
		@@ -988,32 +647,23 @@
988	647	* Inserts Formidable button
989	648	* Hook exists since 2.5.0
990	649	*
991	650	* @since 2.0.15
992		- *
993		- * @return void
994	651	*/
995	652	public static function insert_form_button() {
996	653	if ( current_user_can( 'frm_view_forms' ) ) {
997		- // Store the result in memory and re-use it when this function is called multiple times.
998		- // This helps speed up the form builder when there are a lot of HTML fields, where this
999		- // button is inserted once per HTML field.
1000		- // In a form with 66 HTML fields, this saves 0.5 seconds on page load time, tested locally.
1001		- if ( ! isset( self::$formidable_tinymce_button ) ) {
1002		- FrmAppHelper::load_admin_wide_js();
1003		- $menu_name = FrmAppHelper::get_menu_name();
1004		- $icon = apply_filters( 'frm_media_icon', FrmAppHelper::svg_logo() );
1005		- self::$formidable_tinymce_button = '<a href="#TB_inline?width=50&height=50&inlineId=frm_insert_form" class="thickbox button add_media frm_insert_form" title="' . esc_attr__( 'Add forms and content', 'formidable' ) . '">' . FrmAppHelper::kses( $icon, 'all' ) . ' ' . esc_html( $menu_name ) . '</a>';
1006		- }
1007		- echo self::$formidable_tinymce_button; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
	654	+ FrmAppHelper::load_admin_wide_js();
	655	+ $menu_name = FrmAppHelper::get_menu_name();
	656	+ $icon = apply_filters( 'frm_media_icon', FrmAppHelper::svg_logo() );
	657	+ echo '<a href="#TB_inline?width=50&height=50&inlineId=frm_insert_form" class="thickbox button add_media frm_insert_form" title="' . esc_attr__( 'Add forms and content', 'formidable' ) . '">' .
	658	+ FrmAppHelper::kses( $icon, 'all' ) .
	659	+ ' ' . esc_html( $menu_name ) . '</a>'; // WPCS: XSS ok.
1008	660	}
1009	661	}
1010	662
1011		- /**
1012		- * @return void
1013		- */
1014	663	public static function insert_form_popup() {
1015		- if ( ! self::should_insert_form_popup() ) {
	664	+ $page = basename( FrmAppHelper::get_server_value( 'PHP_SELF' ) );
	665	+ if ( ! in_array( $page, array( 'post.php', 'page.php', 'page-new.php', 'post-new.php' ) ) ) {
1016	666	return;
1017	667	}
1018	668
1019	669	FrmAppHelper::load_admin_wide_js();
		@@ -1023,38 +673,14 @@
1023	673	'name' => __( 'Form', 'formidable' ),
1024	674	'label' => __( 'Insert a Form', 'formidable' ),
1025	675	),
1026	676	);
	677	+
1027	678	$shortcodes = apply_filters( 'frm_popup_shortcodes', $shortcodes );
1028	679
1029		- include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/insert_form_popup.php';
1030		-
1031		- if ( FrmAppHelper::is_form_builder_page() && ! class_exists( '_WP_Editors', false ) ) {
1032		- // initialize a wysiwyg so we have usable settings defined in tinyMCEPreInit.mceInit
1033		- require ABSPATH . WPINC . '/class-wp-editor.php';
1034		- ?>
1035		- <div class="frm_hidden">
1036		- <?php wp_editor( '', 'frm_description_placeholder', array() ); ?>
1037		- </div>
1038		- <?php
1039		- }
	680	+ include( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/insert_form_popup.php' );
1040	681	}
1041	682
1042		- /**
1043		- * Check the page being loaded, determine if this is a page that should include the form popup.
1044		- *
1045		- * @since 5.0.14
1046		- *
1047		- * @return bool
1048		- */
1049		- private static function should_insert_form_popup() {
1050		- if ( FrmAppHelper::is_form_builder_page() ) {
1051		- return true;
1052		- }
1053		- $page = basename( FrmAppHelper::get_server_value( 'PHP_SELF' ) );
1054		- return in_array( $page, array( 'post.php', 'page.php', 'page-new.php', 'post-new.php' ), true );
1055		- }
1056		-
1057	683	public static function get_shortcode_opts() {
1058	684	FrmAppHelper::permission_check( 'frm_view_forms' );
1059	685	check_ajax_referer( 'frm_ajax', 'nonce' );
1060	686
		@@ -1093,9 +719,9 @@
1093	719	$form_id = $opts['form_id'];
1094	720	unset( $opts['form_id'] );
1095	721	}
1096	722
1097		- include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/shortcode_opts.php';
	723	+ include( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/shortcode_opts.php' );
1098	724
1099	725	echo '</div>';
1100	726
1101	727	wp_die();
		@@ -1100,32 +726,18 @@
1100	726
1101	727	wp_die();
1102	728	}
1103	729
1104		- /**
1105		- * Display list of forms in a table.
1106		- *
1107		- * @param array $params
1108		- * @param string $message
1109		- * @param array $errors
1110		- * @return void
1111		- */
1112	730	public static function display_forms_list( $params = array(), $message = '', $errors = array() ) {
1113	731	FrmAppHelper::permission_check( 'frm_view_forms' );
1114	732
1115	733	global $wpdb, $frm_vars;
1116	734
1117		- if ( ! $params ) {
	735	+ if ( empty( $params ) ) {
1118	736	$params = FrmForm::list_page_params();
1119	737	}
1120	738
1121		- /**
1122		- * @since 5.3.1
1123		- *
1124		- * @param string $table_class Class name for List Helper.
1125		- */
1126		- $table_class = apply_filters( 'frm_forms_list_class', 'FrmFormsListHelper' );
1127		- $wp_list_table = new $table_class( compact( 'params' ) );
	739	+ $wp_list_table = new FrmFormsListHelper( compact( 'params' ) );
1128	740
1129	741	$pagenum = $wp_list_table->get_pagenum();
1130	742
1131	743	$wp_list_table->prepare_items();
		@@ -1135,32 +747,36 @@
1135	747	wp_redirect( esc_url_raw( add_query_arg( 'paged', $total_pages ) ) );
1136	748	die();
1137	749	}
1138	750
1139		- $inbox = new FrmInbox();
1140		- $error = $inbox->check_for_error();
1141		- if ( $error ) {
1142		- $show_messages = array( $error['subject'] . '. ' . $error['message'] );
1143		- }
1144		-
1145		- require FrmAppHelper::plugin_path() . '/classes/views/frm-forms/list.php';
	751	+ require( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/list.php' );
1146	752	}
1147	753
1148		- /**
1149		- * @param array<string,string> $columns
1150		- * @return array<string,string>
1151		- */
1152	754	public static function get_columns( $columns ) {
1153		- $columns['cb'] = '<input type="checkbox" />';
1154		- $columns['name'] = esc_html__( 'Form Title', 'formidable' );
1155		- $columns['entries'] = esc_html__( 'Entries', 'formidable' );
1156		- $columns['id'] = 'ID';
1157		- $columns['form_key'] = esc_html__( 'Key', 'formidable' );
1158		- if ( 'trash' !== FrmAppHelper::simple_get( 'form_type' ) ) {
1159		- $columns['shortcode'] = esc_html__( 'Actions', 'formidable' );
	755	+ $columns['cb'] = '<input type="checkbox" />';
	756	+ $columns['id'] = 'ID';
	757	+
	758	+ $type = FrmAppHelper::get_simple_request(
	759	+ array(
	760	+ 'param' => 'form_type',
	761	+ 'type' => 'request',
	762	+ 'default' => 'published',
	763	+ )
	764	+ );
	765	+
	766	+ if ( 'template' == $type ) {
	767	+ $columns['name'] = __( 'Template Name', 'formidable' );
	768	+ $columns['type'] = __( 'Type', 'formidable' );
	769	+ $columns['form_key'] = __( 'Key', 'formidable' );
	770	+ } else {
	771	+ $columns['name'] = __( 'Form Title', 'formidable' );
	772	+ $columns['entries'] = __( 'Entries', 'formidable' );
	773	+ $columns['form_key'] = __( 'Key', 'formidable' );
	774	+ $columns['shortcode'] = __( 'Shortcodes', 'formidable' );
1160	775	}
1161		- $columns['created_at'] = esc_html__( 'Date', 'formidable' );
1162	776
	777	+ $columns['created_at'] = __( 'Date', 'formidable' );
	778	+
1163	779	add_screen_option(
1164	780	'per_page',
1165	781	array(
1166	782	'label' => __( 'Forms', 'formidable' ),
		@@ -1171,11 +787,8 @@
1171	787
1172	788	return $columns;
1173	789	}
1174	790
1175		- /**
1176		- * @return array<string,string>
1177		- */
1178	791	public static function get_sortable_columns() {
1179	792	return array(
1180	793	'id' => 'id',
1181	794	'name' => 'name',
		@@ -1184,17 +797,9 @@
1184	797	'created_at' => 'created_at',
1185	798	);
1186	799	}
1187	800
1188		- /**
1189		- * @param mixed $hidden_columns
1190		- * @return array
1191		- */
1192	801	public static function hidden_columns( $hidden_columns ) {
1193		- if ( ! is_array( $hidden_columns ) ) {
1194		- $hidden_columns = array();
1195		- }
1196		-
1197	802	$type = FrmAppHelper::get_simple_request(
1198	803	array(
1199	804	'param' => 'form_type',
1200	805	'type' => 'request',
		@@ -1209,9 +814,9 @@
1209	814	return $hidden_columns;
1210	815	}
1211	816
1212	817	public static function save_per_page( $save, $option, $value ) {
1213		- if ( $option === 'formidable_page_formidable_per_page' ) {
	818	+ if ( $option == 'formidable_page_formidable_per_page' ) {
1214	819	$save = (int) $value;
1215	820	}
1216	821
1217	822	return $save;
		@@ -1217,49 +822,141 @@
1217	822	return $save;
1218	823	}
1219	824
1220	825	/**
1221		- * @param int|string $id
1222		- * @param array $errors
1223		- * @param string $message
1224		- * @param bool $create_link
1225		- * @return void
	826	+ * @return bool
1226	827	*/
1227		- private static function get_edit_vars( $id, $errors = array(), $message = '', $create_link = false ) {
1228		- global $frm_vars;
	828	+ public static function expired() {
	829	+ global $frm_expired;
	830	+ return $frm_expired;
	831	+ }
1229	832
1230		- $form = FrmForm::getOne( $id );
1231		- $error_args = array(
1232		- 'title' => __( 'You can\'t edit the form', 'formidable' ),
1233		- 'body' => __( 'You are trying to edit a form that does not exist', 'formidable' ),
1234		- 'cancel_url' => admin_url( 'admin.php?page=formidable' ),
1235		- 'continue_url' => add_query_arg(
1236		- array(
1237		- 'page' => 'formidable',
1238		- )
1239		- ),
	833	+ /**
	834	+ * Get data from api before rendering it so that we can flag the modal as expired
	835	+ */
	836	+ public static function before_list_templates() {
	837	+ global $frm_templates;
	838	+ global $frm_expired;
	839	+ global $frm_license_type;
	840	+
	841	+ $api = new FrmFormTemplateApi();
	842	+ $frm_templates = $api->get_api_info();
	843	+ $expired = false;
	844	+ $license_type = '';
	845	+ if ( isset( $frm_templates['error'] ) ) {
	846	+ $error = $frm_templates['error']['message'];
	847	+ $error = str_replace( 'utm_medium=addons', 'utm_medium=form-templates', $error );
	848	+ $expired = 'expired' === $frm_templates['error']['code'];
	849	+ $license_type = isset( $frm_templates['error']['type'] ) ? $frm_templates['error']['type'] : '';
	850	+ unset( $frm_templates['error'] );
	851	+ }
	852	+
	853	+ $frm_expired = $expired;
	854	+ $frm_license_type = $license_type;
	855	+ }
	856	+
	857	+ public static function list_templates() {
	858	+ global $frm_templates;
	859	+ global $frm_license_type;
	860	+
	861	+ $templates = $frm_templates;
	862	+ $custom_templates = array();
	863	+ $templates_by_category = array();
	864	+
	865	+ self::add_user_templates( $custom_templates );
	866	+
	867	+ foreach ( $templates as $template ) {
	868	+ if ( ! isset( $template['categories'] ) ) {
	869	+ continue;
	870	+ }
	871	+
	872	+ foreach ( $template['categories'] as $category ) {
	873	+ if ( ! isset( $templates_by_category[ $category ] ) ) {
	874	+ $templates_by_category[ $category ] = array();
	875	+ }
	876	+
	877	+ $templates_by_category[ $category ][] = $template;
	878	+ }
	879	+ }
	880	+ unset( $template );
	881	+
	882	+ // Subcategories that are included elsewhere.
	883	+ $redundant_cats = array( 'PayPal', 'Stripe', 'Twilio' );
	884	+
	885	+ $categories = array_keys( $templates_by_category );
	886	+ $categories = array_diff( $categories, FrmFormsHelper::ignore_template_categories() );
	887	+ $categories = array_diff( $categories, $redundant_cats );
	888	+ sort( $categories );
	889	+
	890	+ array_walk(
	891	+ $custom_templates,
	892	+ function( &$template ) {
	893	+ $template['custom'] = true;
	894	+ }
1240	895	);
1241		- if ( ! $form ) {
1242		- FrmAppController::show_error_modal( $error_args );
1243		- return;
	896	+
	897	+ $my_templates_translation = __( 'My Templates', 'formidable' );
	898	+ $categories = array_merge( array( $my_templates_translation ), $categories );
	899	+ $pricing = FrmAppHelper::admin_upgrade_link( 'form-templates' );
	900	+ $license_type = $frm_license_type;
	901	+ $args = compact( 'pricing', 'license_type' );
	902	+ $where = apply_filters( 'frm_forms_dropdown', array(), '' );
	903	+ $forms = FrmForm::get_published_forms( $where );
	904	+ $view_path = FrmAppHelper::plugin_path() . '/classes/views/frm-forms/';
	905	+
	906	+ $templates_by_category[ $my_templates_translation ] = $custom_templates;
	907	+
	908	+ unset( $pricing, $license_type, $where );
	909	+ wp_enqueue_script( 'accordion' ); // register accordion for template groups
	910	+ require $view_path . 'list-templates.php';
	911	+ }
	912	+
	913	+ /**
	914	+ * @since 4.03.01
	915	+ */
	916	+ private static function get_template_categories( $templates ) {
	917	+ $categories = array();
	918	+ foreach ( $templates as $template ) {
	919	+ if ( isset( $template['categories'] ) ) {
	920	+ $categories = array_merge( $categories, $template['categories'] );
	921	+ }
1244	922	}
	923	+ $exclude_cats = FrmFormsHelper::ignore_template_categories();
	924	+ $categories = array_unique( $categories );
	925	+ $categories = array_diff( $categories, $exclude_cats );
	926	+ sort( $categories );
	927	+ return $categories;
	928	+ }
1245	929
1246		- if ( 'trash' === $form->status ) {
1247		- $error_args['body'] = __( 'The form you\'re trying to edit is in trash. You must restore it first before you can make changes', 'formidable' );
1248		- $error_args['continue_url'] = add_query_arg(
1249		- array(
1250		- 'page' => 'formidable',
1251		- '_wpnonce' => wp_create_nonce( 'untrash_form_' . $id ),
1252		- 'form_type' => 'trash',
1253		- 'frm_action' => 'untrash',
1254		- 'id' => $id,
1255		- )
	930	+ private static function add_user_templates( &$templates ) {
	931	+ $user_templates = array(
	932	+ 'is_template' => 1,
	933	+ 'default_template' => 0,
	934	+ );
	935	+ $user_templates = FrmForm::getAll( $user_templates, 'name' );
	936	+ foreach ( $user_templates as $template ) {
	937	+ $template = array(
	938	+ 'id' => $template->id,
	939	+ 'name' => $template->name,
	940	+ 'key' => $template->form_key,
	941	+ 'description' => $template->description,
	942	+ 'url' => admin_url( 'admin.php?page=formidable&frm_action=duplicate&id=' . absint( $template->id ) ),
	943	+ 'released' => $template->created_at,
	944	+ 'installed' => 1,
1256	945	);
1257		- $error_args['continue_text'] = __( 'Restore form', 'formidable' );
1258		- FrmAppController::show_error_modal( $error_args );
1259		- return;
	946	+ array_unshift( $templates, $template );
	947	+ unset( $template );
1260	948	}
	949	+ }
1261	950
	951	+ private static function get_edit_vars( $id, $errors = array(), $message = '', $create_link = false ) {
	952	+ global $frm_vars;
	953	+
	954	+ $form = FrmForm::getOne( $id );
	955	+ if ( ! $form ) {
	956	+ wp_die( esc_html__( 'You are trying to edit a form that does not exist.', 'formidable' ) );
	957	+ }
	958	+
1262	959	if ( $form->parent_form_id ) {
1263	960	/* translators: %1$s: Start link HTML, %2$s: End link HTML */
1264	961	wp_die( sprintf( esc_html__( 'You are trying to edit a child form. Please edit from %1$shere%2$s', 'formidable' ), '<a href="' . esc_url( FrmForm::get_edit_link( $form->parent_form_id ) ) . '">', '</a>' ) );
1265	962	}
		@@ -1270,9 +967,8 @@
1270	967
1271	968	// Automatically add end section fields if they don't exist (2.0 migration).
1272	969	$reset_fields = false;
1273	970	FrmFormsHelper::auto_add_end_section_fields( $form, $fields, $reset_fields );
1274		- FrmSubmitHelper::maybe_create_submit_field( $form, $fields, $reset_fields );
1275	971
1276	972	if ( $reset_fields ) {
1277	973	$fields = FrmField::get_all_for_form( $form->id, '', 'exclude' );
1278	974	}
		@@ -1278,67 +974,32 @@
1278	974	}
1279	975
1280	976	unset( $reset_fields );
1281	977
1282		- $args = array( 'parent_form_id' => $form->id );
1283		- $values = FrmAppHelper::setup_edit_vars( $form, 'forms', '', true, array(), $args );
	978	+ $args = array( 'parent_form_id' => $form->id );
	979	+ $values = FrmAppHelper::setup_edit_vars( $form, 'forms', '', true, array(), $args );
	980	+ $values['fields'] = $fields;
1284	981
1285		- /**
1286		- * Allows modifying the list of fields in the form builder.
1287		- *
1288		- * @since 5.0.04
1289		- *
1290		- * @param object[] $fields Array of fields.
1291		- * @param array $args The arguments. Contains `form`.
1292		- */
1293		- $values['fields'] = apply_filters( 'frm_fields_in_form_builder', $fields, compact( 'form' ) );
1294		-
1295	982	$edit_message = __( 'Form was successfully updated.', 'formidable' );
1296	983	if ( $form->is_template && $message == $edit_message ) {
1297	984	$message = __( 'Template was successfully updated.', 'formidable' );
1298	985	}
1299	986
1300		- self::maybe_update_form_builder_message( $message );
	987	+ $all_templates = FrmForm::getAll( array( 'is_template' => 1 ), 'name' );
	988	+ $has_fields = isset( $values['fields'] ) && ! empty( $values['fields'] );
1301	989
1302		- $has_fields = ! empty( $values['fields'] ) && ! FrmSubmitHelper::only_contains_submit_field( $values['fields'] );
1303		-
1304	990	if ( defined( 'DOING_AJAX' ) ) {
1305	991	wp_die();
	992	+ } else {
	993	+ require( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/edit.php' );
1306	994	}
1307		-
1308		- require FrmAppHelper::plugin_path() . '/classes/views/frm-forms/edit.php';
1309	995	}
1310	996
1311		- /**
1312		- * @param array $fields
1313		- * @return array
1314		- */
1315		- public static function update_form_builder_fields( $fields, $form ) {
1316		- foreach ( $fields as $field ) {
1317		- $field->do_not_include_icons = true;
1318		- }
1319		- return $fields;
1320		- }
1321		-
1322		- public static function maybe_update_form_builder_message( &$message ) {
1323		- if ( 'form_duplicated' === FrmAppHelper::simple_get( 'message' ) ) {
1324		- $message = __( 'Form was Successfully Copied', 'formidable' );
1325		- }
1326		- }
1327		-
1328		- /**
1329		- * @param int|string $id
1330		- * @param array $errors
1331		- * @param array|string $args
1332		- * @return void
1333		- */
1334	997	public static function get_settings_vars( $id, $errors = array(), $args = array() ) {
1335	998	FrmAppHelper::permission_check( 'frm_edit_forms' );
1336	999
1337	1000	global $frm_vars;
1338	1001
1339		- self::maybe_print_media_templates();
1340		-
1341	1002	if ( ! is_array( $args ) ) {
1342	1003	// For reverse compatibility.
1343	1004	$args = array(
1344	1005	'message' => $args,
		@@ -1356,53 +1017,22 @@
1356	1017	$form = FrmForm::getOne( $id );
1357	1018	$fields = FrmField::get_all_for_form( $id );
1358	1019	$values = FrmAppHelper::setup_edit_vars( $form, 'forms', $fields, true );
1359	1020
1360		- /**
1361		- * Allows changing fields in the form settings.
1362		- *
1363		- * @since 5.0.04
1364		- *
1365		- * @param array $fields Array of fields.
1366		- * @param array $args The arguments. Contains `form`.
1367		- */
1368		- $values['fields'] = apply_filters( 'frm_fields_in_settings', $values['fields'], compact( 'form' ) );
1369		-
1370	1021	self::clean_submit_html( $values );
1371	1022
1372	1023	$sections = self::get_settings_tabs( $values );
1373	1024	$current = FrmAppHelper::simple_get( 't', 'sanitize_title', 'advanced_settings' );
1374	1025
1375		- require FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings.php';
	1026	+ require( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings.php' );
1376	1027	}
1377	1028
1378	1029	/**
1379		- * Print WordPress media templates email actions does not trigger a "Uncaught Error: Template not found: #tmpl-media-selection" error when the media button is clicked.
1380		- *
1381		- * @since 6.10
1382		- *
1383		- * @return void
1384		- */
1385		- private static function maybe_print_media_templates() {
1386		- if ( FrmAppHelper::pro_is_included() ) {
1387		- // This issue does not exist when Pro is active so exit early.
1388		- return;
1389		- }
1390		-
1391		- add_action(
1392		- 'wp_enqueue_editor',
1393		- function () {
1394		- wp_print_media_templates();
1395		- }
1396		- );
1397		- }
1398		-
1399		- /**
1400	1030	* @since 4.0
1401	1031	*/
1402	1032	public static function form_publish_button( $atts ) {
1403	1033	$values = $atts['values'];
1404		- include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/_publish_box.php';
	1034	+ include( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/_publish_box.php' );
1405	1035	}
1406	1036
1407	1037	/**
1408	1038	* Get a list of all the settings tabs for the form settings page.
		@@ -1416,9 +1046,9 @@
1416	1046	$sections = array(
1417	1047	'advanced' => array(
1418	1048	'name' => __( 'General', 'formidable' ),
1419	1049	'title' => __( 'General Form Settings', 'formidable' ),
1420		- 'function' => array( self::class, 'advanced_settings' ),
	1050	+ 'function' => array( __CLASS__, 'advanced_settings' ),
1421	1051	'icon' => 'frm_icon_font frm_settings_icon',
1422	1052	),
1423	1053	'email' => array(
1424	1054	'name' => __( 'Actions & Notifications', 'formidable' ),
		@@ -1426,86 +1056,47 @@
1426	1056	'id' => 'frm_notification_settings',
1427	1057	'icon' => 'frm_icon_font frm_mail_bulk_icon',
1428	1058	),
1429	1059	'permissions' => array(
1430		- 'name' => __( 'Form Permissions', 'formidable' ),
1431		- 'icon' => 'frm_icon_font frm_lock_closed_icon',
1432		- 'html_class' => 'frm_show_upgrade_tab frm_noallow',
1433		- 'data' => array(
1434		- 'medium' => 'permissions',
1435		- 'upgrade' => __( 'Form Permissions', 'formidable' ),
1436		- 'message' => __( 'Allow editing, protect forms and files, limit entries, and save drafts. Upgrade to get form and entry permissions.', 'formidable' ),
1437		- 'screenshot' => 'permissions.png',
	1060	+ 'name' => __( 'Form Permissions', 'formidable' ),
	1061	+ 'icon' => 'frm_icon_font frm_lock_icon',
	1062	+ 'html_class' => 'frm_show_upgrade frm_noallow',
	1063	+ 'data' => array(
	1064	+ 'medium' => 'permissions',
	1065	+ 'upgrade' => __( 'Form Permissions', 'formidable' ),
	1066	+ 'message' => __( 'Allow editing, protect forms and files, limit entries, and save drafts. Upgrade to get form and entry permissions.', 'formidable' ),
1438	1067	),
1439	1068	),
1440		- 'scheduling' => array(
1441		- 'name' => __( 'Form Scheduling', 'formidable' ),
1442		- 'icon' => 'frm_icon_font frm_calendar_icon',
1443		- 'html_class' => 'frm_show_upgrade_tab frm_noallow',
1444		- 'data' => array(
1445		- 'medium' => 'scheduling',
1446		- 'upgrade' => __( 'Form scheduling settings', 'formidable' ),
1447		- 'screenshot' => 'scheduling.png',
	1069	+ 'scheduling' => array(
	1070	+ 'name' => __( 'Form Scheduling', 'formidable' ),
	1071	+ 'icon' => 'frm_icon_font frm_calendar_icon',
	1072	+ 'html_class' => 'frm_show_upgrade frm_noallow',
	1073	+ 'data' => array(
	1074	+ 'medium' => 'scheduling',
	1075	+ 'upgrade' => __( 'Form scheduling settings', 'formidable' ),
1448	1076	),
1449	1077	),
1450	1078	'buttons' => array(
1451		- 'name' => __( 'Buttons', 'formidable' ),
1452		- 'class' => self::class,
	1079	+ 'name' => __( 'Styling & Buttons', 'formidable' ),
	1080	+ 'class' => __CLASS__,
1453	1081	'function' => 'buttons_settings',
1454		- 'icon' => 'frm_icon_font frm_button_icon',
	1082	+ 'icon' => 'frm_icon_font frm_pallet_icon',
1455	1083	),
1456		- 'landing' => array(
1457		- 'name' => __( 'Form Landing Page', 'formidable' ),
1458		- 'icon' => 'frm_icon_font frm_file_text_icon',
1459		- 'html_class' => 'frm_show_upgrade_tab frm_noallow',
1460		- 'data' => FrmAppHelper::get_landing_page_upgrade_data_params(),
1461		- ),
1462		- 'chat' => array(
1463		- 'name' => __( 'Conversational Forms', 'formidable' ),
1464		- 'icon' => 'frm_icon_font frm_chat_forms_icon',
1465		- 'html_class' => 'frm_show_upgrade_tab frm_noallow',
1466		- 'data' => FrmAppHelper::get_upgrade_data_params(
1467		- 'chat',
1468		- array(
1469		- 'upgrade' => __( 'Conversational Forms', 'formidable' ),
1470		- 'message' => __( 'Ask one question at a time for automated conversations.', 'formidable' ),
1471		- 'screenshot' => 'chat.png',
1472		- )
1473		- ),
1474		- ),
1475		- 'abandonment' => array(
1476		- 'name' => __( 'Form Abandonment', 'formidable' ),
1477		- 'icon' => 'frm_icon_font frm_abandoned_icon',
1478		- 'html_class' => 'frm_show_upgrade_tab frm_noallow',
1479		- 'data' => FrmAppHelper::get_upgrade_data_params(
1480		- 'abandonment',
1481		- array(
1482		- 'upgrade' => __( 'Form abandonment settings', 'formidable' ),
1483		- 'message' => __( 'Unlock the power of data capture to boost lead generation and master the art of form optimization.', 'formidable' ),
1484		- 'screenshot' => 'abandonment.png',
1485		- )
1486		- ),
1487		- ),
1488	1084	'html' => array(
1489	1085	'name' => __( 'Customize HTML', 'formidable' ),
1490		- 'class' => self::class,
	1086	+ 'class' => __CLASS__,
1491	1087	'function' => 'html_settings',
1492	1088	'icon' => 'frm_icon_font frm_code_icon',
1493	1089	),
1494	1090	);
1495	1091
1496		- if ( ! has_action( 'frm_add_form_style_tab_options' ) && ! has_action( 'frm_add_form_button_options' ) ) {
1497		- unset( $sections['buttons'] );
1498		- }
	1092	+ $sections = apply_filters( 'frm_add_form_settings_section', $sections, $values );
1499	1093
1500		- foreach ( array( 'landing', 'chat', 'abandonment' ) as $feature ) {
1501		- if ( ! FrmAppHelper::show_new_feature( $feature ) ) {
1502		- unset( $sections[ $feature ] );
1503		- }
	1094	+ if ( FrmAppHelper::pro_is_installed() && ! FrmAppHelper::meets_min_pro_version( '4.0' ) ) {
	1095	+ // Prevent settings from showing in 2 spots.
	1096	+ unset( $sections['permissions'], $sections['scheduling'] );
1504	1097	}
1505	1098
1506		- $sections = apply_filters( 'frm_add_form_settings_section', $sections, $values );
1507		-
1508	1099	foreach ( $sections as $key => $section ) {
1509	1100	$defaults = array(
1510	1101	'html_class' => '',
1511	1102	'name' => ucfirst( $key ),
		@@ -1527,9 +1118,9 @@
1527	1118	$section['id'] = $section['anchor'];
1528	1119	}
1529	1120
1530	1121	$sections[ $key ] = $section;
1531		- }//end foreach
	1122	+ }
1532	1123
1533	1124	return $sections;
1534	1125	}
1535	1126
		@@ -1536,9 +1127,8 @@
1536	1127	/**
1537	1128	* @since 4.0
1538	1129	*
1539	1130	* @param array $values
1540		- * @return void
1541	1131	*/
1542	1132	public static function advanced_settings( $values ) {
1543	1133	$first_h3 = 'frm_first_h3';
1544	1134
		@@ -1546,15 +1136,14 @@
1546	1136	}
1547	1137
1548	1138	/**
1549	1139	* @param array $values
1550		- * @return void
1551	1140	*/
1552		- public static function render_spam_settings( $values ) {
	1141	+ private static function render_spam_settings( $values ) {
1553	1142	if ( function_exists( 'akismet_http_post' ) ) {
1554	1143	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/spam-settings/akismet.php';
1555	1144	}
1556		- include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/spam-settings/stopforumspam.php';
	1145	+ include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/spam-settings/honeypot.php';
1557	1146	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/spam-settings/antispam.php';
1558	1147	}
1559	1148
1560	1149	/**
		@@ -1560,12 +1149,16 @@
1560	1149	/**
1561	1150	* @since 4.0
1562	1151	*
1563	1152	* @param array $values
1564		- * @return void
1565	1153	*/
1566	1154	public static function buttons_settings( $values ) {
1567		- include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings-buttons.php';
	1155	+ $styles = apply_filters( 'frm_get_style_opts', array() );
	1156	+
	1157	+ $frm_settings = FrmAppHelper::get_settings();
	1158	+ $no_global_style = $frm_settings->load_style === 'none';
	1159	+
	1160	+ include( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings-buttons.php' );
1568	1161	}
1569	1162
1570	1163	/**
1571	1164	* @since 4.0
		@@ -1570,12 +1163,11 @@
1570	1163	/**
1571	1164	* @since 4.0
1572	1165	*
1573	1166	* @param array $values
1574		- * @return void
1575	1167	*/
1576	1168	public static function html_settings( $values ) {
1577		- include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings-html.php';
	1169	+ include( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings-html.php' );
1578	1170	}
1579	1171
1580	1172	/**
1581	1173	* Replace old Submit Button href with new href to avoid errors in Chrome
		@@ -1581,10 +1173,9 @@
1581	1173	* Replace old Submit Button href with new href to avoid errors in Chrome
1582	1174	*
1583	1175	* @since 2.03.08
1584	1176	*
1585		- * @param array|bool $values
1586		- * @return void
	1177	+ * @param array|boolean $values
1587	1178	*/
1588	1179	private static function clean_submit_html( &$values ) {
1589	1180	if ( is_array( $values ) && isset( $values['submit_html'] ) ) {
1590	1181	$values['submit_html'] = str_replace( 'javascript:void(0)', '#', $values['submit_html'] );
		@@ -1590,43 +1181,13 @@
1590	1181	$values['submit_html'] = str_replace( 'javascript:void(0)', '#', $values['submit_html'] );
1591	1182	}
1592	1183	}
1593	1184
1594		- /**
1595		- * Updates classes used in submit and prev buttons to avoid conflict with twenty twenty-one theme.
1596		- *
1597		- * @param array $classes
1598		- *
1599		- * @return array
1600		- */
1601		- public static function update_button_classes( $classes ) {
1602		- if ( function_exists( 'twenty_twenty_one_setup' ) ) {
1603		- $classes[] = 'has-text-color has-background';
1604		- }
1605		-
1606		- return $classes;
1607		- }
1608		-
1609		- /**
1610		- * @param int|string $form_id
1611		- * @param string $class
1612		- * @return void
1613		- */
1614	1185	public static function mb_tags_box( $form_id, $class = '' ) {
1615		- $fields = FrmField::get_all_for_form( $form_id, '', 'include' );
1616		-
1617		- /**
1618		- * Allows modifying the list of fields in the tags box.
1619		- *
1620		- * @since 5.0.04
1621		- *
1622		- * @param array $fields The list of fields.
1623		- * @param array $args The arguments. Contains `form_id`.
1624		- */
1625		- $fields = apply_filters( 'frm_fields_in_tags_box', $fields, compact( 'form_id' ) );
	1186	+ $fields = FrmField::get_all_for_form( $form_id, '', 'include' );
1626	1187	$linked_forms = array();
1627	1188	$col = 'one';
1628		- $settings_tab = FrmAppHelper::is_admin_page( 'formidable' );
	1189	+ $settings_tab = FrmAppHelper::is_admin_page( 'formidable' ) ? true : false;
1629	1190
1630	1191	$cond_shortcodes = apply_filters( 'frm_conditional_shortcodes', array() );
1631	1192	$entry_shortcodes = self::get_shortcode_helpers( $settings_tab );
1632	1193
		@@ -1631,9 +1192,9 @@
1631	1192	$entry_shortcodes = self::get_shortcode_helpers( $settings_tab );
1632	1193
1633	1194	$advanced_helpers = self::advanced_helpers( compact( 'fields', 'form_id' ) );
1634	1195
1635		- include FrmAppHelper::plugin_path() . '/classes/views/shared/mb_adv_info.php';
	1196	+ include( FrmAppHelper::plugin_path() . '/classes/views/shared/mb_adv_info.php' );
1636	1197	}
1637	1198
1638	1199	/**
1639	1200	* @since 3.04.01
		@@ -1646,9 +1207,9 @@
1646	1207	),
1647	1208	);
1648	1209
1649	1210	$user_fields = self::user_shortcodes();
1650		- if ( $user_fields ) {
	1211	+ if ( ! empty( $user_fields ) ) {
1651	1212	$user_helpers = array();
1652	1213	foreach ( $user_fields as $uk => $uf ) {
1653	1214	$user_helpers[ '|user_id| show="' . $uk . '"' ] = $uf;
1654	1215	unset( $uk, $uf );
		@@ -1654,9 +1215,9 @@
1654	1215	unset( $uk, $uf );
1655	1216	}
1656	1217
1657	1218	$advanced_helpers['user_id'] = array(
1658		- 'codes' => $user_helpers,
	1219	+ 'codes' => $user_helpers,
1659	1220	);
1660	1221	}
1661	1222
1662	1223	/**
		@@ -1663,9 +1224,8 @@
1663	1224	* Add extra helper shortcodes on the Advanced tab in form settings and views
1664	1225	*
1665	1226	* @since 3.04.01
1666	1227	*
1667		- * @param array $advanced_helpers
1668	1228	* @param array $atts - Includes fields and form_id
1669	1229	*/
1670	1230	return apply_filters( 'frm_advanced_helpers', $advanced_helpers, $atts );
1671	1231	}
		@@ -1733,16 +1293,20 @@
1733	1293	'updated-at' => __( 'Entry updated', 'formidable' ),
1734	1294	'' => '',
1735	1295	'siteurl' => __( 'Site URL', 'formidable' ),
1736	1296	'sitename' => __( 'Site Name', 'formidable' ),
1737		- 'form_name' => __( 'Form Name', 'formidable' ),
1738	1297	);
1739	1298
1740		- $entry_shortcodes = array_merge( FrmShortcodeHelper::get_contextual_shortcode_values(), $entry_shortcodes );
1741	1299	if ( ! FrmAppHelper::pro_is_installed() ) {
1742	1300	unset( $entry_shortcodes['post_id'] );
1743	1301	}
1744	1302
	1303	+ if ( $settings_tab ) {
	1304	+ $entry_shortcodes['default-message'] = __( 'Default Msg', 'formidable' );
	1305	+ $entry_shortcodes['default-html'] = __( 'Default HTML', 'formidable' );
	1306	+ $entry_shortcodes['default-plain'] = __( 'Default Plain', 'formidable' );
	1307	+ }
	1308	+
1745	1309	/**
1746	1310	* Use this hook to add or remove buttons in the helpers section
1747	1311	* in the customization panel
1748	1312	*
		@@ -1753,12 +1317,9 @@
1753	1317	return $entry_shortcodes;
1754	1318	}
1755	1319
1756	1320	/**
1757		- * Insert the form class setting into the form.
1758		- *
1759		- * @param stdClass $form
1760		- * @return void
	1321	+ * Insert the form class setting into the form
1761	1322	*/
1762	1323	public static function form_classes( $form ) {
1763	1324	if ( isset( $form->options['form_class'] ) ) {
1764	1325	echo esc_attr( sanitize_text_field( $form->options['form_class'] ) );
		@@ -1763,54 +1324,28 @@
1763	1324	if ( isset( $form->options['form_class'] ) ) {
1764	1325	echo esc_attr( sanitize_text_field( $form->options['form_class'] ) );
1765	1326	}
1766	1327
1767		- if ( ! empty( $form->options['js_validate'] ) ) {
	1328	+ if ( isset( $form->options['js_validate'] ) && $form->options['js_validate'] ) {
1768	1329	echo ' frm_js_validate ';
1769		- self::add_js_validate_form_to_global_vars( $form );
1770	1330	}
1771		-
1772		- if ( FrmForm::is_ajax_on( $form ) ) {
1773		- echo ' frm_ajax_submit ';
1774		- }
1775	1331	}
1776	1332
1777		- /**
1778		- * @since 5.0.03
1779		- *
1780		- * @param stdClass $form
1781		- */
1782		- public static function add_js_validate_form_to_global_vars( $form ) {
1783		- global $frm_vars;
1784		- if ( ! isset( $frm_vars['js_validate_forms'] ) ) {
1785		- $frm_vars['js_validate_forms'] = array();
1786		- }
1787		- $frm_vars['js_validate_forms'][ $form->id ] = $form;
1788		- }
1789		-
1790	1333	public static function get_email_html() {
1791	1334	FrmAppHelper::permission_check( 'frm_view_forms' );
1792	1335	check_ajax_referer( 'frm_ajax', 'nonce' );
1793	1336
1794		- echo FrmEntriesController::show_entry_shortcode( // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
	1337	+ echo FrmEntriesController::show_entry_shortcode( // WPCS: XSS ok.
1795	1338	array(
1796		- 'form_id' => FrmAppHelper::get_post_param( 'form_id', '', 'absint' ), // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
	1339	+ 'form_id' => FrmAppHelper::get_post_param( 'form_id', '', 'absint' ),
1797	1340	'default_email' => true,
1798		- 'plain_text' => FrmAppHelper::get_post_param( 'plain_text', '', 'absint' ), // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
	1341	+ 'plain_text' => FrmAppHelper::get_post_param( 'plain_text', '', 'absint' ),
1799	1342	)
1800	1343	);
1801	1344	wp_die();
1802	1345	}
1803	1346
1804		- /**
1805		- * @param string $content
1806		- * @param int|stdClass|string $form
1807		- * @param false|int|stdClass|string $entry
1808		- * @return string
1809		- */
1810	1347	public static function filter_content( $content, $form, $entry = false ) {
1811		- $content = self::replace_form_name_shortcodes( $content, $form );
1812		-
1813	1348	self::get_entry_by_param( $entry );
1814	1349	if ( ! $entry ) {
1815	1350	return $content;
1816	1351	}
		@@ -1818,16 +1353,8 @@
1818	1353	if ( is_object( $form ) ) {
1819	1354	$form = $form->id;
1820	1355	}
1821	1356
1822		- /*
1823		- * Repeater actions adds `parent_entry` to `$entry` store the parent entry data. If `parent_entry` is not empty,
1824		- * use the parent form ID instead of repeater form ID to fix the parent form field shortcodes doesn't work.
1825		- */
1826		- if ( ! empty( $entry->parent_entry ) ) {
1827		- $form = $entry->parent_entry->form_id;
1828		- }
1829		-
1830	1357	$shortcodes = FrmFieldsHelper::get_shortcodes( $content, $form );
1831	1358	$content = apply_filters( 'frm_replace_content_shortcodes', $content, $entry, $shortcodes );
1832	1359
1833	1360	return $content;
		@@ -1832,38 +1359,8 @@
1832	1359
1833	1360	return $content;
1834	1361	}
1835	1362
1836		- /**
1837		- * Replace any [form_name] shortcodes in a string.
1838		- *
1839		- * @since 5.5
1840		- *
1841		- * @param array|string $string
1842		- * @param int|stdClass|string $form
1843		- * @return array|string
1844		- */
1845		- public static function replace_form_name_shortcodes( $string, $form ) {
1846		- if ( ! is_string( $string ) ) {
1847		- return $string;
1848		- }
1849		-
1850		- if ( false === strpos( $string, '[form_name]' ) ) {
1851		- return $string;
1852		- }
1853		-
1854		- if ( ! is_object( $form ) ) {
1855		- $form = FrmForm::getOne( $form );
1856		- }
1857		-
1858		- $form_name = is_object( $form ) ? $form->name : '';
1859		- return str_replace( '[form_name]', $form_name, $string );
1860		- }
1861		-
1862		- /**
1863		- * @param false|int|stdClass|string $entry
1864		- * @return void
1865		- */
1866	1363	private static function get_entry_by_param( &$entry ) {
1867	1364	if ( ! $entry || ! is_object( $entry ) ) {
1868	1365	if ( ! $entry || ! is_numeric( $entry ) ) {
1869	1366	$entry = FrmAppHelper::get_post_param( 'id', false, 'sanitize_title' );
		@@ -1876,12 +1373,8 @@
1876	1373	public static function replace_content_shortcodes( $content, $entry, $shortcodes ) {
1877	1374	return FrmFieldsHelper::replace_content_shortcodes( $content, $entry, $shortcodes );
1878	1375	}
1879	1376
1880		- /**
1881		- * @param array $errors
1882		- * @return array
1883		- */
1884	1377	public static function process_bulk_form_actions( $errors ) {
1885	1378	if ( ! $_REQUEST ) {
1886	1379	return $errors;
1887	1380	}
		@@ -1925,9 +1418,9 @@
1925	1418	case 'untrash':
1926	1419	$message = self::bulk_untrash( $ids );
1927	1420	}
1928	1421
1929		- if ( ! empty( $message ) ) {
	1422	+ if ( isset( $message ) && ! empty( $message ) ) {
1930	1423	$errors['message'] = $message;
1931	1424	}
1932	1425
1933	1426	return $errors;
		@@ -1932,37 +1425,24 @@
1932	1425
1933	1426	return $errors;
1934	1427	}
1935	1428
1936		- /**
1937		- * Includes html that shows a message when the device is too small to use Formidable Forms admin pages.
1938		- *
1939		- * @since 6.20
1940		- * @return void
1941		- */
1942		- public static function include_device_too_small_message() {
1943		- if ( ! FrmAppHelper::is_formidable_admin() ) {
1944		- return;
1945		- }
1946		-
1947		- include FrmAppHelper::plugin_path() . '/classes/views/shared/small-device-message.php';
1948		- }
1949		-
1950	1429	public static function route() {
1951	1430	$action = isset( $_REQUEST['frm_action'] ) ? 'frm_action' : 'action';
1952	1431	$vars = array();
1953	1432	FrmAppHelper::include_svg();
1954		- if ( isset( $_POST['frm_compact_fields'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
	1433	+
	1434	+ if ( isset( $_POST['frm_compact_fields'] ) ) {
1955	1435	FrmAppHelper::permission_check( 'frm_edit_forms' );
1956	1436
1957	1437	// Javascript needs to be allowed in some field settings.
1958		- // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized, WordPress.Security.NonceVerification.Missing
	1438	+ // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized
1959	1439	$json_vars = htmlspecialchars_decode( nl2br( str_replace( '&quot;', '"', wp_unslash( $_POST['frm_compact_fields'] ) ) ) );
1960	1440	$json_vars = json_decode( $json_vars, true );
1961	1441	if ( empty( $json_vars ) ) {
1962	1442	// json decoding failed so we should return an error message.
1963	1443	$action = FrmAppHelper::get_param( $action, '', 'get', 'sanitize_title' );
1964		- if ( 'edit' === $action ) {
	1444	+ if ( 'edit' == $action ) {
1965	1445	$action = 'update';
1966	1446	}
1967	1447
1968	1448	add_filter( 'frm_validate_form', 'FrmFormsController::json_error' );
		@@ -1968,11 +1448,11 @@
1968	1448	add_filter( 'frm_validate_form', 'FrmFormsController::json_error' );
1969	1449	} else {
1970	1450	$vars = FrmAppHelper::json_to_array( $json_vars );
1971	1451	$action = $vars[ $action ];
1972		- unset( $_REQUEST['frm_compact_fields'], $_POST['frm_compact_fields'] ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
1973		- $_REQUEST = array_merge( $_REQUEST, $vars ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
1974		- $_POST = array_merge( $_POST, $_REQUEST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
	1452	+ unset( $_REQUEST['frm_compact_fields'], $_POST['frm_compact_fields'] );
	1453	+ $_REQUEST = array_merge( $_REQUEST, $vars );
	1454	+ $_POST = array_merge( $_POST, $_REQUEST );
1975	1455	}
1976	1456	} else {
1977	1457	$action = FrmAppHelper::get_param( $action, '', 'get', 'sanitize_title' );
1978	1458	if ( isset( $_REQUEST['delete_all'] ) ) {
		@@ -1978,29 +1458,31 @@
1978	1458	if ( isset( $_REQUEST['delete_all'] ) ) {
1979	1459	// Override the action for this page.
1980	1460	$action = 'delete_all';
1981	1461	}
1982		- }//end if
	1462	+ }
1983	1463
1984	1464	add_action( 'frm_load_form_hooks', 'FrmHooksController::trigger_load_form_hooks' );
1985	1465	FrmAppHelper::trigger_hook_load( 'form' );
1986	1466
1987	1467	switch ( $action ) {
	1468	+ case 'new':
	1469	+ return self::new_form( $vars );
1988	1470	case 'create':
1989	1471	case 'edit':
1990	1472	case 'update':
	1473	+ case 'duplicate':
1991	1474	case 'trash':
1992	1475	case 'untrash':
1993	1476	case 'destroy':
	1477	+ case 'delete_all':
1994	1478	case 'settings':
1995	1479	case 'update_settings':
1996	1480	return self::$action( $vars );
1997	1481	case 'lite-reports':
1998		- self::no_reports( $vars );
1999		- return;
	1482	+ return self::no_reports( $vars );
2000	1483	case 'views':
2001		- self::no_views( $vars );
2002		- return;
	1484	+ return self::no_views( $vars );
2003	1485	default:
2004	1486	do_action( 'frm_form_action_' . $action );
2005	1487	if ( apply_filters( 'frm_form_stop_action_' . $action, false ) ) {
2006	1488	return;
		@@ -2013,89 +1495,34 @@
2013	1495
2014	1496	if ( strpos( $action, 'bulk_' ) === 0 ) {
2015	1497	FrmAppHelper::remove_get_action();
2016	1498
2017		- self::list_form();
2018		- return;
	1499	+ return self::list_form();
2019	1500	}
2020	1501
2021		- $message = FrmAppHelper::get_param( 'message' );
2022		- if ( 'form_duplicate_error' === $message ) {
2023		- self::display_forms_list( array(), '', array( __( 'There was a problem duplicating the form', 'formidable' ) ) );
2024		- return;
2025		- }
	1502	+ return self::display_forms_list();
	1503	+ }
	1504	+ }
2026	1505
2027		- if ( 'forms_permanently_deleted' === $message ) {
2028		- $count = FrmAppHelper::get_param( 'forms_deleted', 0, 'get', 'absint' );
2029		- /* translators: %1$s: Number of forms */
2030		- $message = sprintf( _n( '%1$s form permanently deleted.', '%1$s forms permanently deleted.', $count, 'formidable' ), $count );
2031		- self::display_forms_list( array(), $message, '' );
2032		- return;
2033		- }
	1506	+ public static function json_error( $errors ) {
	1507	+ $errors['json'] = __( 'Abnormal HTML characters prevented your form from saving correctly', 'formidable' );
2034	1508
2035		- self::display_forms_list();
2036		-
2037		- return;
2038		- }//end switch
	1509	+ return $errors;
2039	1510	}
2040	1511
2041	1512	/**
2042		- * Rename a form.
	1513	+ * Education for premium features.
2043	1514	*
2044		- * Handles the AJAX request for renaming a form.
2045		- *
2046		- * @since 6.7
2047		- *
2048		- * @return void
	1515	+ * @since 4.05
2049	1516	*/
2050		- public static function rename_form() {
2051		- // Check permission and nonce
2052		- FrmAppHelper::permission_check( 'frm_edit_forms' );
2053		- check_ajax_referer( 'frm_ajax', 'nonce' );
2054		-
2055		- // Get posted data
2056		- $form_id = FrmAppHelper::get_post_param( 'form_id', '', 'absint' );
2057		- $name = FrmAppHelper::get_post_param( 'form_name', '', 'sanitize_text_field' );
2058		-
2059		- $form = FrmForm::getOne( $form_id );
2060		- if ( ! $form ) {
2061		- wp_send_json_error( __( 'Form not found', 'formidable' ) );
2062		- }
2063		-
2064		- if ( $name === $form->name ) {
2065		- // Nothing to change so exit early.
2066		- wp_send_json_success();
2067		- }
2068		-
2069		- $to_update = array(
2070		- 'name' => $name,
2071		- );
2072		-
2073		- if ( '' !== $name ) {
2074		- // Only update form_key if name is not empty.
2075		- $form_key = FrmAppHelper::get_unique_key( sanitize_title( $name ), 'frm_forms', 'form_key' );
2076		- $to_update['form_key'] = $form_key;
2077		- } else {
2078		- $form_key = $form->form_key;
2079		- }
2080		-
2081		- FrmForm::update( $form_id, $to_update );
2082		-
2083		- wp_send_json_success( compact( 'form_key' ) );
	1517	+ public static function add_form_style_tab_options() {
	1518	+ include( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/add_form_style_options.php' );
2084	1519	}
2085	1520
2086		- public static function json_error( $errors ) {
2087		- $errors['json'] = __( 'Abnormal HTML characters prevented your form from saving correctly', 'formidable' );
2088		-
2089		- return $errors;
2090		- }
2091		-
2092	1521	/**
2093	1522	* Add education about views.
2094	1523	*
2095	1524	* @since 4.07
2096		- *
2097		- * @return void
2098	1525	*/
2099	1526	public static function no_views( $values = array() ) {
2100	1527	FrmAppHelper::include_svg();
2101	1528	$id = FrmAppHelper::get_param( 'form', '', 'get', 'absint' );
		@@ -2107,10 +1534,8 @@
2107	1534	/**
2108	1535	* Add education about reports.
2109	1536	*
2110	1537	* @since 4.07
2111		- *
2112		- * @return void
2113	1538	*/
2114	1539	public static function no_reports( $values = array() ) {
2115	1540	$id = FrmAppHelper::get_param( 'form', '', 'get', 'absint' );
2116	1541	$form = $id ? FrmForm::getOne( $id ) : false;
		@@ -2117,11 +1542,9 @@
2117	1542
2118	1543	include FrmAppHelper::plugin_path() . '/classes/views/shared/reports-info.php';
2119	1544	}
2120	1545
2121		- /**
2122		- * FRONT-END FORMS.
2123		- */
	1546	+ /* FRONT-END FORMS */
2124	1547	public static function admin_bar_css() {
2125	1548	if ( is_admin() || ! current_user_can( 'frm_edit_forms' ) ) {
2126	1549	return;
2127	1550	}
		@@ -2195,9 +1618,9 @@
2195	1618	$wp_admin_bar->add_node(
2196	1619	array(
2197	1620	'parent' => 'frm-forms',
2198	1621	'id' => 'edit_form_' . $form_id,
2199		- 'title' => empty( $name ) ? FrmFormsHelper::get_no_title_text() : $name,
	1622	+ 'title' => empty( $name ) ? __( '(no title)', 'formidable' ) : $name,
2200	1623	'href' => FrmForm::get_edit_link( $form_id ),
2201	1624	)
2202	1625	);
2203	1626	}
		@@ -2206,14 +1629,13 @@
2206	1629	/**
2207	1630	* The formidable shortcode
2208	1631	*
2209	1632	* @param array $atts The params from the shortcode.
2210		- * @return string
2211	1633	*/
2212	1634	public static function get_form_shortcode( $atts ) {
2213	1635	global $frm_vars;
2214		- if ( ! empty( $frm_vars['skip_shortcode'] ) ) {
2215		- $sc = '[formidable';
	1636	+ if ( isset( $frm_vars['skip_shortcode'] ) && $frm_vars['skip_shortcode'] ) {
	1637	+ $sc = '[formidable';
2216	1638	$sc .= FrmAppHelper::array_to_html_params( $atts );
2217	1639	return $sc . ']';
2218	1640	}
2219	1641
		@@ -2220,10 +1642,10 @@
2220	1642	$shortcode_atts = shortcode_atts(
2221	1643	array(
2222	1644	'id' => '',
2223	1645	'key' => '',
2224		- 'title' => 'auto',
2225		- 'description' => 'auto',
	1646	+ 'title' => false,
	1647	+ 'description' => false,
2226	1648	'readonly' => false,
2227	1649	'entry_id' => false,
2228	1650	'fields' => array(),
2229	1651	'exclude_fields' => array(),
		@@ -2235,45 +1657,18 @@
2235	1657
2236	1658	return self::show_form( $shortcode_atts['id'], $shortcode_atts['key'], $shortcode_atts['title'], $shortcode_atts['description'], $atts );
2237	1659	}
2238	1660
2239		- /**
2240		- * @since 5.2.01
2241		- *
2242		- * @param false|int|string $id
2243		- * @param false|string $key
2244		- * @return false|stdClass
2245		- */
2246		- private static function maybe_get_form_by_id_or_key( $id, $key ) {
2247		- if ( ! $id ) {
	1661	+ public static function show_form( $id = '', $key = '', $title = false, $description = false, $atts = array() ) {
	1662	+ if ( empty( $id ) ) {
2248	1663	$id = $key;
2249	1664	}
2250		- return self::maybe_get_form_to_show( $id );
2251		- }
2252	1665
2253		- /**
2254		- * @param false|int|string $id
2255		- * @param false|string $key
2256		- * @param bool|int|string $title may be 'auto', true, false, 'true', 'false', 'yes', '1', 1, '0', 0.
2257		- * @param bool|int|string $description may be 'auto', true, false, 'true', 'false', 'yes', '1', 1, '0', 0.
2258		- * @param array $atts
2259		- * @return string
2260		- */
2261		- public static function show_form( $id = '', $key = '', $title = false, $description = false, $atts = array() ) {
2262		- $form = self::maybe_get_form_by_id_or_key( $id, $key );
2263		-
	1666	+ $form = self::maybe_get_form_to_show( $id );
2264	1667	if ( ! $form ) {
2265	1668	return __( 'Please select a valid form', 'formidable' );
2266	1669	}
2267	1670
2268		- if ( 'auto' === $title ) {
2269		- $title = ! empty( $form->options['show_title'] );
2270		- }
2271		-
2272		- if ( 'auto' === $description ) {
2273		- $description = ! empty( $form->options['show_description'] );
2274		- }
2275		-
2276	1671	FrmAppController::maybe_update_styles();
2277	1672
2278	1673	add_action( 'frm_load_form_hooks', 'FrmHooksController::trigger_load_form_hooks' );
2279	1674	FrmAppHelper::trigger_hook_load( 'form', $form );
		@@ -2302,19 +1697,14 @@
2302	1697
2303	1698	return $form;
2304	1699	}
2305	1700
2306		- /**
2307		- * @param false|int|string $id
2308		- * @return false|stdClass
2309		- */
2310	1701	private static function maybe_get_form_to_show( $id ) {
2311	1702	$form = false;
2312	1703
2313		- if ( ! empty( $id ) ) {
2314		- // Form id or key is set.
	1704	+ if ( ! empty( $id ) ) { // no form id or key set
2315	1705	$form = FrmForm::getOne( $id );
2316		- if ( ! $form || $form->parent_form_id || $form->status === 'trash' ) {
	1706	+ if ( ! $form || $form->parent_form_id || $form->status == 'trash' ) {
2317	1707	$form = false;
2318	1708	}
2319	1709	}
2320	1710
		@@ -2321,9 +1711,9 @@
2321	1711	return $form;
2322	1712	}
2323	1713
2324	1714	private static function is_viewable_draft_form( $form ) {
2325		- return $form->status === 'draft' && current_user_can( 'frm_edit_forms' ) && ! FrmAppHelper::is_preview_page();
	1715	+ return $form->status == 'draft' && current_user_can( 'frm_edit_forms' ) && ! FrmAppHelper::is_preview_page();
2326	1716	}
2327	1717
2328	1718	public static function get_form( $form, $title, $description, $atts = array() ) {
2329	1719	ob_start();
		@@ -2351,15 +1741,11 @@
2351	1741	$fields = FrmFieldsHelper::get_form_fields( $form->id, $errors );
2352	1742	$reset = false;
2353	1743	$pass_args = compact( 'form', 'fields', 'errors', 'title', 'description', 'reset' );
2354	1744
2355		- $pass_args['action'] = $params['action'];
2356		- $handle_process_here = $params['action'] === 'create' && $params['posted_form_id'] == $form->id && $_POST; // phpcs:ignore WordPress.Security.NonceVerification.Missing
	1745	+ $handle_process_here = $params['action'] == 'create' && $params['posted_form_id'] == $form->id && $_POST;
2357	1746
2358	1747	if ( ! $handle_process_here ) {
2359		- FrmFormState::set_initial_value( 'title', $title );
2360		- FrmFormState::set_initial_value( 'description', $description );
2361		-
2362	1748	do_action( 'frm_display_form_action', $params, $fields, $form, $title, $description );
2363	1749	if ( apply_filters( 'frm_continue_to_new', true, $form->id, $params['action'] ) ) {
2364	1750	self::show_form_after_submit( $pass_args );
2365	1751	}
		@@ -2370,13 +1756,14 @@
2370	1756
2371	1757	do_action( 'frm_validate_form_creation', $params, $fields, $form, $title, $description );
2372	1758
2373	1759	if ( apply_filters( 'frm_continue_to_create', true, $form->id ) ) {
2374		- $entry_id = self::just_created_entry( $form->id );
2375		- $pass_args['entry_id'] = $entry_id;
2376		- $pass_args['reset'] = true;
	1760	+ $entry_id = self::just_created_entry( $form->id );
	1761	+ $pass_args['entry_id'] = $entry_id;
	1762	+ $pass_args['reset'] = true;
	1763	+ $pass_args['conf_method'] = self::get_confirmation_method( compact( 'form', 'entry_id' ) );
2377	1764
2378		- self::run_on_submit_actions( $pass_args );
	1765	+ self::run_success_action( $pass_args );
2379	1766
2380	1767	do_action(
2381	1768	'frm_after_entry_processed',
2382	1769	array(
		@@ -2384,9 +1771,9 @@
2384	1771	'form' => $form,
2385	1772	)
2386	1773	);
2387	1774	}
2388		- }//end if
	1775	+ }
2389	1776	}
2390	1777
2391	1778	/**
2392	1779	* If the form was processed earlier (init), get the generated errors
		@@ -2395,23 +1782,15 @@
2395	1782	*/
2396	1783	private static function get_saved_errors( $form, $params ) {
2397	1784	global $frm_vars;
2398	1785
2399		- if ( $params['posted_form_id'] == $form->id && $_POST && isset( $frm_vars['created_entries'][ $form->id ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
	1786	+ if ( $params['posted_form_id'] == $form->id && $_POST && isset( $frm_vars['created_entries'][ $form->id ] ) ) {
2400	1787	$errors = $frm_vars['created_entries'][ $form->id ]['errors'];
2401	1788	} else {
2402	1789	$errors = array();
2403	1790	}
2404	1791
2405		- /**
2406		- * Allows modifying the generated errors if the form was processed earlier.
2407		- *
2408		- * @since 5.2.03
2409		- *
2410		- * @param array $errors Errors data. Is empty array if no errors found.
2411		- * @param array $params Form params. See {@see FrmForm::get_params()}.
2412		- */
2413		- return apply_filters( 'frm_saved_errors', $errors, $params );
	1792	+ return $errors;
2414	1793	}
2415	1794
2416	1795	/**
2417	1796	* @since 2.2.7
		@@ -2418,40 +1797,20 @@
2418	1797	*/
2419	1798	public static function just_created_entry( $form_id ) {
2420	1799	global $frm_vars;
2421	1800
2422		- 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;
	1801	+ return ( isset( $frm_vars['created_entries'] ) && isset( $frm_vars['created_entries'][ $form_id ] ) && isset( $frm_vars['created_entries'][ $form_id ]['entry_id'] ) ) ? $frm_vars['created_entries'][ $form_id ]['entry_id'] : 0;
2423	1802	}
2424	1803
2425	1804	/**
2426		- * Gets confirmation method.
2427		- *
2428	1805	* @since 3.0
2429		- * @since 6.0 This method can return an array of met On Submit actions.
2430		- *
2431		- * @param array $atts {
2432		- * Atts.
2433		- *
2434		- * @type object $form Form object.
2435		- * @type int $entry_id Entry ID.
2436		- * }
2437		- * @return array|string
2438	1806	*/
2439	1807	private static function get_confirmation_method( $atts ) {
2440		- $action = FrmOnSubmitHelper::current_event( $atts );
2441		- $opt = 'update' === $action ? 'edit_action' : 'success_action';
2442		- $method = ! empty( $atts['form']->options[ $opt ] ) ? $atts['form']->options[ $opt ] : 'message';
	1808	+ $opt = 'success_action';
	1809	+ $method = ( isset( $atts['form']->options[ $opt ] ) && ! empty( $atts['form']->options[ $opt ] ) ) ? $atts['form']->options[ $opt ] : 'message';
	1810	+ $method = apply_filters( 'frm_success_filter', $method, $atts['form'], 'create' );
2443	1811
2444		- if ( ! empty( $atts['entry_id'] ) ) {
2445		- $met_actions = self::get_met_on_submit_actions( $atts, $action );
2446		- if ( $met_actions ) {
2447		- $method = $met_actions;
2448		- }
2449		- }
2450		-
2451		- $method = apply_filters( 'frm_success_filter', $method, $atts['form'], $action );
2452		-
2453		- if ( $method !== 'message' && ( ! $atts['entry_id'] || ! is_numeric( $atts['entry_id'] ) ) ) {
	1812	+ if ( $method != 'message' && ( ! $atts['entry_id'] || ! is_numeric( $atts['entry_id'] ) ) ) {
2454	1813	$method = 'message';
2455	1814	}
2456	1815
2457	1816	return $method;
		@@ -2466,34 +1825,11 @@
2466	1825	$conf_method = self::get_confirmation_method(
2467	1826	array(
2468	1827	'form' => $form,
2469	1828	'entry_id' => $params['id'],
2470		- 'action' => FrmOnSubmitHelper::current_event( $params ),
2471	1829	)
2472	1830	);
2473	1831
2474		- self::maybe_trigger_redirect_with_action( $conf_method, $form, $params, $args );
2475		- }
2476		-
2477		- /**
2478		- * Maybe trigger redirect with the new Confirmation action.
2479		- *
2480		- * @since 6.1.1
2481		- *
2482		- * @param array|string $conf_method Array of confirmation actions or the action type string.
2483		- * @param object $form Form object.
2484		- * @param array $params See {@see FrmFormsController::maybe_trigger_redirect()}.
2485		- * @param array $args See {@see FrmFormsController::maybe_trigger_redirect()}.
2486		- */
2487		- public static function maybe_trigger_redirect_with_action( $conf_method, $form, $params, $args ) {
2488		- if ( is_array( $conf_method ) && 1 === count( $conf_method ) ) {
2489		- if ( 'redirect' === FrmOnSubmitHelper::get_action_type( $conf_method[0] ) && empty( $conf_method[0]->post_content['redirect_delay'] ) ) {
2490		- $event = FrmOnSubmitHelper::current_event( $params );
2491		- FrmOnSubmitHelper::populate_on_submit_data( $form->options, $conf_method[0], $event );
2492		- $conf_method = 'redirect';
2493		- }
2494		- }
2495		-
2496	1832	if ( 'redirect' === $conf_method ) {
2497	1833	self::trigger_redirect( $form, $params, $args );
2498	1834	}
2499	1835	}
		@@ -2516,36 +1852,21 @@
2516	1852	/**
2517	1853	* Used when the success action is not 'message'
2518	1854	*
2519	1855	* @since 2.05
2520		- * @since 6.0 `$args['force_delay_redirect']` is added.
2521		- *
2522		- * @param array $args {
2523		- * The args.
2524		- *
2525		- * @type string $conf_method The method.
2526		- * @type object $form Form object.
2527		- * @type int $entry_id Entry ID.
2528		- * @type string $action The action event. Accepts `create` or `update`.
2529		- * @type array $fields The array of fields.
2530		- * @type int $force_delay_redirect Force to show the message before redirecting in case redirect method runs.
2531		- * }
2532	1856	*/
2533	1857	public static function run_success_action( $args ) {
2534		- global $frm_vars;
2535	1858	$extra_args = $args;
2536	1859	unset( $extra_args['form'] );
2537	1860
2538	1861	do_action( 'frm_success_action', $args['conf_method'], $args['form'], $args['form']->options, $args['entry_id'], $extra_args );
2539	1862
2540		- $opt = ! isset( $args['action'] ) || $args['action'] === 'create' ? 'success' : 'edit';
	1863	+ $opt = ( ! isset( $args['action'] ) || $args['action'] == 'create' ) ? 'success' : 'edit';
2541	1864
2542	1865	$args['success_opt'] = $opt;
2543		- $args['ajax'] = ! empty( $frm_vars['ajax'] );
2544		-
2545		- if ( $args['conf_method'] === 'page' && is_numeric( $args['form']->options[ $opt . '_page_id' ] ) ) {
	1866	+ if ( $args['conf_method'] == 'page' && is_numeric( $args['form']->options[ $opt . '_page_id' ] ) ) {
2546	1867	self::load_page_after_submit( $args );
2547		- } elseif ( $args['conf_method'] === 'redirect' ) {
	1868	+ } elseif ( $args['conf_method'] == 'redirect' ) {
2548	1869	self::redirect_after_submit( $args );
2549	1870	} else {
2550	1871	self::show_message_after_save( $args );
2551	1872	}
		@@ -2551,225 +1872,8 @@
2551	1872	}
2552	1873	}
2553	1874
2554	1875	/**
2555		- * Gets met On Submit actions.
2556		- *
2557		- * @since 6.0
2558		- *
2559		- * @param array $args See {@see FrmFormsController::run_success_action()}.
2560		- * @param string $event Form event. Default is `create`.
2561		- * @return array Array of actions that meet the conditional logics.
2562		- */
2563		- public static function get_met_on_submit_actions( $args, $event = 'create' ) {
2564		- if ( ! FrmOnSubmitHelper::form_has_migrated( $args['form'] ) ) {
2565		- return array();
2566		- }
2567		-
2568		- // If a redirect action has already opened the URL in a new tab, we show the default message in the current tab.
2569		- if ( ! empty( self::$redirected_in_new_tab[ $args['form']->id ] ) ) {
2570		- return array( FrmOnSubmitHelper::get_fallback_action_after_open_in_new_tab( $event ) );
2571		- }
2572		-
2573		- $entry = FrmEntry::getOne( $args['entry_id'], true );
2574		- $actions = FrmOnSubmitHelper::get_actions( $args['form']->id );
2575		- $met_actions = array();
2576		- $has_redirect = false;
2577		-
2578		- foreach ( $actions as $action ) {
2579		- if ( ! in_array( $event, $action->post_content['event'], true ) ) {
2580		- continue;
2581		- }
2582		-
2583		- if ( FrmFormAction::action_conditions_met( $action, $entry ) ) {
2584		- continue;
2585		- }
2586		-
2587		- $action_type = FrmOnSubmitHelper::get_action_type( $action );
2588		-
2589		- if ( 'redirect' === $action_type ) {
2590		- if ( $has_redirect ) {
2591		- // Do not process because we run the first redirect action only.
2592		- continue;
2593		- }
2594		- }
2595		-
2596		- if ( ! self::is_valid_on_submit_action( $action, $args, $event ) ) {
2597		- continue;
2598		- }
2599		-
2600		- if ( 'redirect' === $action_type ) {
2601		- $has_redirect = true;
2602		- }
2603		-
2604		- $met_actions[] = $action;
2605		- unset( $action );
2606		- }//end foreach
2607		-
2608		- $args['event'] = $event;
2609		-
2610		- /**
2611		- * Filters the On Submit actions that meet the conditional logics.
2612		- *
2613		- * @since 6.0
2614		- *
2615		- * @param array $met_actions Actions that meet the conditional logics.
2616		- * @param array $args See {@see FrmFormsController::run_success_action()}. `$args['event']` is also added.
2617		- */
2618		- $met_actions = apply_filters( 'frm_get_met_on_submit_actions', $met_actions, $args );
2619		-
2620		- if ( empty( $met_actions ) ) {
2621		- $met_actions = array( FrmOnSubmitHelper::get_fallback_action( $event ) );
2622		- }
2623		-
2624		- return $met_actions;
2625		- }
2626		-
2627		- /**
2628		- * Checks if a Confirmation action has the valid data.
2629		- *
2630		- * @since 6.1.2
2631		- *
2632		- * @param object $action Form action object.
2633		- * @param array $args See {@see FrmFormsController::run_success_action()}.
2634		- * @param string $event Form event. Default is `create`.
2635		- * @return bool
2636		- */
2637		- private static function is_valid_on_submit_action( $action, $args, $event = 'create' ) {
2638		- $action_type = FrmOnSubmitHelper::get_action_type( $action );
2639		-
2640		- if ( 'redirect' === $action_type ) {
2641		- // Run through frm_redirect_url filter. This is used for the valid action check.
2642		- $action->post_content['success_url'] = apply_filters(
2643		- 'frm_redirect_url',
2644		- $action->post_content['success_url'],
2645		- $args['form'],
2646		- $args + array( 'action' => $event )
2647		- );
2648		-
2649		- return ! empty( $action->post_content['success_url'] );
2650		- }
2651		-
2652		- if ( 'page' === $action_type ) {
2653		- if ( empty( $action->post_content['success_page_id'] ) ) {
2654		- return false;
2655		- }
2656		-
2657		- $page = get_post( $action->post_content['success_page_id'] );
2658		- if ( ! $page || 'trash' === $page->post_status ) {
2659		- return false;
2660		- }
2661		- }
2662		-
2663		- return true;
2664		- }
2665		-
2666		- /**
2667		- * Runs On Submit actions.
2668		- *
2669		- * @since 6.0
2670		- *
2671		- * @param array $args See inside {@see FrmFormsController::get_form_contents()} method.
2672		- */
2673		- public static function run_on_submit_actions( $args ) {
2674		- $args['conf_method'] = self::get_confirmation_method(
2675		- array(
2676		- 'form' => $args['form'],
2677		- 'entry_id' => $args['entry_id'],
2678		- 'action' => FrmOnSubmitHelper::current_event( $args ),
2679		- )
2680		- );
2681		- if ( ! is_array( $args['conf_method'] ) ) {
2682		- self::run_success_action( $args );
2683		- return;
2684		- }
2685		-
2686		- // If conf_method is an array, run On Submit actions.
2687		- if ( ! $args['conf_method'] ) {
2688		- // Use default message.
2689		- FrmOnSubmitHelper::populate_on_submit_data( $args['form']->options );
2690		- self::run_success_action( $args );
2691		- } elseif ( 1 === count( $args['conf_method'] ) ) {
2692		- FrmOnSubmitHelper::populate_on_submit_data( $args['form']->options, reset( $args['conf_method'] ) );
2693		- $args['conf_method'] = $args['form']->options['success_action'];
2694		- self::run_success_action( $args );
2695		- } else {
2696		- self::run_multi_on_submit_actions( $args );
2697		- }
2698		- }
2699		-
2700		- /**
2701		- * Runs multiple success actions.
2702		- *
2703		- * @since 6.0
2704		- *
2705		- * @param array $args See {@see FrmFormsController::run_success_action()}.
2706		- */
2707		- public static function run_multi_on_submit_actions( $args ) {
2708		- $redirect_action = null;
2709		- foreach ( $args['conf_method'] as $action ) {
2710		- if ( 'redirect' === FrmOnSubmitHelper::get_action_type( $action ) ) {
2711		- // We catch the redirect action to run it last.
2712		- $redirect_action = $action;
2713		- continue;
2714		- }
2715		-
2716		- self::run_single_on_submit_action( $args, $action );
2717		-
2718		- unset( $action );
2719		- }
2720		-
2721		- if ( $redirect_action ) {
2722		- // Show script to delay the redirection.
2723		- $args['force_delay_redirect'] = true;
2724		- self::run_single_on_submit_action( $args, $redirect_action );
2725		- }
2726		- }
2727		-
2728		- /**
2729		- * Runs single On Submit action.
2730		- *
2731		- * @since 6.0
2732		- *
2733		- * @param array $args See {@see FrmFormsController::run_success_action()}.
2734		- * @param object $action On Submit action object.
2735		- */
2736		- public static function run_single_on_submit_action( $args, $action ) {
2737		- $new_args = self::get_run_success_action_args( $args, $action );
2738		- self::run_success_action( $new_args );
2739		- }
2740		-
2741		- /**
2742		- * Gets run_success_action() args from the On Submit action.
2743		- *
2744		- * @since 6.0
2745		- *
2746		- * @param array $args See {@see FrmFormsController::run_success_action()}.
2747		- * @param object $action On Submit action object.
2748		- * @return array
2749		- */
2750		- private static function get_run_success_action_args( $args, $action ) {
2751		- $new_args = $args;
2752		-
2753		- FrmOnSubmitHelper::populate_on_submit_data( $new_args['form']->options, $action, $args['action'] );
2754		-
2755		- $opt = 'update' === $args['action'] ? 'edit_' : 'success_';
2756		-
2757		- $new_args['conf_method'] = $new_args['form']->options[ $opt . 'action' ];
2758		-
2759		- /**
2760		- * Filters the run success action args.
2761		- *
2762		- * @since 6.0
2763		- *
2764		- * @param array $new_args The new args.
2765		- * @param array $args The old args. See {@see FrmFormsController::run_success_action()}.
2766		- * @param object $action On Submit action object.
2767		- */
2768		- return apply_filters( 'frm_get_run_success_action_args', $new_args, $args, $action );
2769		- }
2770		-
2771		- /**
2772	1876	* @since 3.0
2773	1877	*/
2774	1878	private static function load_page_after_submit( $args ) {
2775	1879	global $post;
		@@ -2778,31 +1882,19 @@
2778	1882	$page = get_post( $args['form']->options[ $opt . '_page_id' ] );
2779	1883	$old_post = $post;
2780	1884	$post = $page;
2781	1885	$content = apply_filters( 'frm_content', $page->post_content, $args['form'], $args['entry_id'] );
2782		-
2783		- // Fix the On Submit page content doesn't show when previewing In theme.
2784		- $has_preview_filter = has_filter( 'the_content', 'FrmFormsController::preview_content' );
2785		-
2786		- if ( $has_preview_filter ) {
2787		- remove_filter( 'the_content', 'FrmFormsController::preview_content', 9999 );
2788		- }
2789		-
2790		- echo apply_filters( 'the_content', $content ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
2791		-
2792		- if ( $has_preview_filter ) {
2793		- add_filter( 'the_content', 'FrmFormsController::preview_content', 9999 );
2794		- }
2795		-
	1886	+ echo apply_filters( 'the_content', $content ); // WPCS: XSS ok.
2796	1887	$post = $old_post;
2797		- }//end if
	1888	+ }
2798	1889	}
2799	1890
2800	1891	/**
2801	1892	* @since 3.0
2802		- * @param array $args See {@see FrmFormsController::run_success_action()}.
2803	1893	*/
2804	1894	private static function redirect_after_submit( $args ) {
	1895	+ global $frm_vars;
	1896	+
2805	1897	add_filter( 'frm_use_wpautop', '__return_false' );
2806	1898
2807	1899	$opt = $args['success_opt'];
2808	1900	$success_url = trim( $args['form']->options[ $opt . '_url' ] );
		@@ -2808,8 +1900,12 @@
2808	1900	$success_url = trim( $args['form']->options[ $opt . '_url' ] );
2809	1901	$success_url = apply_filters( 'frm_content', $success_url, $args['form'], $args['entry_id'] );
2810	1902	$success_url = do_shortcode( $success_url );
2811	1903
	1904	+ $success_msg = isset( $args['form']->options[ $opt . '_msg' ] ) ? $args['form']->options[ $opt . '_msg' ] : __( 'Please wait while you are redirected.', 'formidable' );
	1905	+
	1906	+ $redirect_msg = self::get_redirect_message( $success_url, $success_msg, $args );
	1907	+
2812	1908	$args['id'] = $args['entry_id'];
2813	1909	FrmEntriesController::delete_entry_before_redirect( $success_url, $args['form'], $args );
2814	1910
2815	1911	add_filter( 'frm_redirect_url', 'FrmEntriesController::prepare_redirect_url' );
		@@ -2816,144 +1912,20 @@
2816	1912	$success_url = apply_filters( 'frm_redirect_url', $success_url, $args['form'], $args );
2817	1913
2818	1914	$doing_ajax = FrmAppHelper::doing_ajax();
2819	1915
2820		- if ( ! empty( $args['ajax'] ) && $doing_ajax && empty( $args['force_delay_redirect'] ) ) {
2821		- // Is AJAX submit and there is just one Redirect action runs.
2822		- echo json_encode( self::get_ajax_redirect_response_data( $args + compact( 'success_url' ) ) );
	1916	+ if ( isset( $args['ajax'] ) && $args['ajax'] && $doing_ajax ) {
	1917	+ echo json_encode( array( 'redirect' => $success_url ) );
2823	1918	wp_die();
2824		- }
2825		-
2826		- if ( ! headers_sent() && empty( $args['force_delay_redirect'] ) && empty( $args['form']->options['redirect_delay'] ) ) {
2827		- // Not AJAX submit, no headers sent, and there is just one Redirect action runs.
2828		- if ( ! empty( $args['form']->options['open_in_new_tab'] ) ) {
2829		- self::print_open_in_new_tab_js_with_fallback_handler( $success_url, $args );
2830		- self::$redirected_in_new_tab[ $args['form']->id ] = 1;
2831		- return;
2832		- }
2833		-
	1919	+ } elseif ( ! headers_sent() ) {
2834	1920	wp_redirect( esc_url_raw( $success_url ) );
2835		- // Do not use wp_die or redirect fails.
2836		- die();
2837		- }
2838		-
2839		- // Redirect with a delay.
2840		- self::redirect_after_submit_using_js( $args + compact( 'success_url', 'doing_ajax' ) );
2841		- }
2842		-
2843		- /**
2844		- * Prints open in new tab js with fallback handler.
2845		- *
2846		- * @since 6.3.1
2847		- *
2848		- * @param string $success_url Success URL.
2849		- * @param array $args See {@see FrmFormsController::redirect_after_submit()}.
2850		- */
2851		- private static function print_open_in_new_tab_js_with_fallback_handler( $success_url, $args ) {
2852		- echo '<script>var newTab = window.open("' . esc_url_raw( $success_url ) . '", "_blank");';
2853		- echo 'if ( ! newTab ) {';
2854		-
2855		- $data = array(
2856		- 'formId' => intval( $args['form']->id ),
2857		- 'message' => self::get_redirect_fallback_message( $success_url, $args ),
2858		- );
2859		- // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
2860		- echo 'frmShowNewTabFallback = ' . FrmAppHelper::maybe_json_encode( $data ) . ';';
2861		- echo '}</script>';
2862		- }
2863		-
2864		- /**
2865		- * Gets response data for redirect action when AJAX submitting.
2866		- *
2867		- * @since 6.3.1
2868		- *
2869		- * @param array $args See {@see FrmFormsController::run_success_action()}.
2870		- * @return array
2871		- */
2872		- private static function get_ajax_redirect_response_data( $args ) {
2873		- $response_data = array(
2874		- 'redirect' => $args['success_url'],
2875		- 'content' => '',
2876		- );
2877		- $unset_content = true;
2878		-
2879		- if ( ! empty( $args['form']->options['redirect_delay'] ) ) {
2880		- $response_data['delay'] = $args['form']->options['redirect_delay_time'];
2881		- $response_data['content'] .= self::get_redirect_message( $args['success_url'], $args['form']->options['redirect_delay_msg'], $args );
2882		- $unset_content = false;
2883		- }
2884		-
2885		- if ( ! empty( $args['form']->options['open_in_new_tab'] ) ) {
2886		- $response_data['openInNewTab'] = 1;
2887		-
2888		- // Only show open in new tab text if there is no delay.
2889		- if ( empty( $response_data['content'] ) ) {
2890		- $args['message'] = FrmOnSubmitHelper::get_default_new_tab_msg();
2891		-
2892		- $args['form']->options['success_msg'] = $args['message'];
2893		- $args['form']->options['edit_msg'] = $args['message'];
2894		- if ( ! isset( $args['fields'] ) ) {
2895		- $args['fields'] = FrmField::get_all_for_form( $args['form']->id );
2896		- }
2897		-
2898		- $args['message'] = self::prepare_submit_message( $args['form'], $args['entry_id'], $args );
2899		-
2900		- ob_start();
2901		- self::show_lone_success_message( $args );
2902		- $response_data['content'] .= ob_get_clean();
2903		- $unset_content = false;
2904		- }//end if
2905		-
2906		- $response_data['fallbackMsg'] = self::get_redirect_fallback_message( $args['success_url'], $args );
2907		- }//end if
2908		-
2909		- if ( $unset_content && '' === $response_data['content'] ) {
2910		- unset( $response_data['content'] );
2911		- }
2912		-
2913		- return $response_data;
2914		- }
2915		-
2916		- /**
2917		- * Redirects after submitting using JS. This is used when showing message before redirecting.
2918		- *
2919		- * @since 6.0
2920		- *
2921		- * @param array $args See {@see FrmFormsController::run_success_action()}.
2922		- */
2923		- private static function redirect_after_submit_using_js( $args ) {
2924		- $success_msg = $args['form']->options['redirect_delay_msg'];
2925		- $redirect_msg = self::get_redirect_message( $args['success_url'], $success_msg, $args );
2926		- $success_url = esc_url_raw( $args['success_url'] );
2927		-
2928		- /**
2929		- * Filters the delay time before redirecting when On Submit Redirect action is delayed.
2930		- *
2931		- * @since 6.0
2932		- *
2933		- * @param int $delay_time Delay time in milliseconds.
2934		- */
2935		- $delay_time = apply_filters( 'frm_redirect_delay_time', 1000 * $args['form']->options['redirect_delay_time'] );
2936		-
2937		- if ( ! empty( $args['form']->options['open_in_new_tab'] ) ) {
2938		- $redirect_js = 'window.open("' . $success_url . '", "_blank")';
	1921	+ die(); // do not use wp_die or redirect fails
2939	1922	} else {
2940		- $redirect_js = 'window.location="' . $success_url . '";';
2941		- }
	1923	+ add_filter( 'frm_use_wpautop', '__return_true' );
2942	1924
2943		- add_filter( 'frm_use_wpautop', '__return_true' );
2944		-
2945		- echo FrmAppHelper::maybe_kses( $redirect_msg ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
2946		- echo '<script>';
2947		- if ( empty( $args['doing_ajax'] ) ) {
2948		- // Not AJAX submit, delay JS until window.load.
2949		- echo 'window.onload=function(){';
	1925	+ echo $redirect_msg; // WPCS: XSS ok.
	1926	+ echo "<script type='text/javascript'>window.onload = function(){setTimeout(window.location='" . esc_url_raw( $success_url ) . "', 8000);}</script>";
2950	1927	}
2951		- echo 'setTimeout(function(){' . $redirect_js . '}, ' . intval( $delay_time ) . ');'; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
2952		- if ( empty( $args['doing_ajax'] ) ) {
2953		- echo '};';
2954		- }
2955		- echo '</script>';
2956	1928	}
2957	1929
2958	1930	/**
2959	1931	* @since 3.0
		@@ -2959,15 +1931,14 @@
2959	1931	* @since 3.0
2960	1932	*
2961	1933	* @param string $success_url
2962	1934	* @param string $success_msg
2963		- * @param array $args
	1935	+ * @param array $args
2964	1936	*/
2965	1937	private static function get_redirect_message( $success_url, $success_msg, $args ) {
2966		- $success_msg = apply_filters( 'frm_content', $success_msg, $args['form'], $args['entry_id'] );
2967		- $success_msg = do_shortcode( FrmAppHelper::use_wpautop( $success_msg ) );
2968		- $redirect_msg = '<div class="' . esc_attr( FrmFormsHelper::get_form_style_class( $args['form'] ) ) . '"><div class="frm-redirect-msg" role="status">' . $success_msg . '<br/>' .
2969		- self::get_redirect_fallback_message( $success_url, $args ) .
	1938	+ $redirect_msg = '<div class="' . esc_attr( FrmFormsHelper::get_form_style_class( $args['form'] ) ) . '"><div class="frm-redirect-msg frm_message" role="status">' . $success_msg . '<br/>' .
	1939	+ /* translators: %1$s: Start link HTML, %2$s: End link HTML */
	1940	+ sprintf( __( '%1$sClick here%2$s if you are not automatically redirected.', 'formidable' ), '<a href="' . esc_url( $success_url ) . '">', '</a>' ) .
2970	1941	'</div></div>';
2971	1942
2972	1943	$redirect_args = array(
2973	1944	'entry_id' => $args['entry_id'],
		@@ -2978,52 +1949,19 @@
2978	1949	return apply_filters( 'frm_redirect_msg', $redirect_msg, $redirect_args );
2979	1950	}
2980	1951
2981	1952	/**
2982		- * Gets fallback message when redirecting failed.
2983		- *
2984		- * @since 6.3.1
2985		- *
2986		- * @param string $success_url Redirect URL.
2987		- * @param array $args Contains `form` object.
2988		- * @return string
2989		- */
2990		- private static function get_redirect_fallback_message( $success_url, $args ) {
2991		- $target = '';
2992		- if ( ! empty( $args['form']->options['open_in_new_tab'] ) ) {
2993		- $target = ' target="_blank"';
2994		- }
2995		-
2996		- return sprintf(
2997		- /* translators: %1$s: Start link HTML, %2$s: End link HTML */
2998		- __( '%1$sClick here%2$s if you are not automatically redirected.', 'formidable' ),
2999		- '<a href="' . esc_url( $success_url ) . '"' . $target . '>',
3000		- '</a>'
3001		- );
3002		- }
3003		-
3004		- /**
3005	1953	* Prepare to show the success message and empty form after submit
3006	1954	*
3007	1955	* @since 2.05
3008	1956	*/
3009	1957	public static function show_message_after_save( $atts ) {
3010		- $atts['message'] = self::prepare_submit_message( $atts['form'], $atts['entry_id'], $atts );
	1958	+ $atts['message'] = self::prepare_submit_message( $atts['form'], $atts['entry_id'] );
3011	1959
3012	1960	if ( ! isset( $atts['form']->options['show_form'] ) || $atts['form']->options['show_form'] ) {
3013		- if ( isset( $atts['action'] ) && 'update' === $atts['action'] && is_callable( array( 'FrmProEntriesController', 'show_front_end_form_with_entry' ) ) ) {
3014		- $entry = FrmEntry::getOne( $atts['entry_id'] );
3015		- if ( $entry ) {
3016		- // This is copied from the Pro plugin.
3017		- $atts['conf_message'] = FrmProEntriesController::confirmation( 'message', $atts['form'], $atts['form']->options, $entry->id, $atts );
3018		- $atts['show_form'] = FrmProEntriesController::is_form_displayed_after_edit( $atts['form'] );
3019		- FrmProEntriesController::show_front_end_form_with_entry( $entry, $atts );
3020		- }
3021		- } else {
3022		- self::show_form_after_submit( $atts );
3023		- }
	1961	+ self::show_form_after_submit( $atts );
3024	1962	} else {
3025		- self::show_lone_success_message( $atts );
	1963	+ self::show_lone_success_messsage( $atts );
3026	1964	}
3027	1965	}
3028	1966
3029	1967	/**
		@@ -3051,9 +1989,9 @@
3051	1989
3052	1990	$include_form_tag = apply_filters( 'frm_include_form_tag', true, $form );
3053	1991
3054	1992	$frm_settings = FrmAppHelper::get_settings();
3055		- $submit = $form->options['submit_value'] ?? $frm_settings->submit_value;
	1993	+ $submit = isset( $form->options['submit_value'] ) ? $form->options['submit_value'] : $frm_settings->submit_value;
3056	1994
3057	1995	global $frm_vars;
3058	1996	self::maybe_load_css( $form, $values['custom_style'], $frm_vars['load_css'] );
3059	1997
		@@ -3062,10 +2000,11 @@
3062	2000	include FrmAppHelper::plugin_path() . '/classes/views/frm-entries/new.php';
3063	2001	}
3064	2002
3065	2003	/**
	2004	+ * @return string - 'before', 'after', or 'submit'
	2005	+ *
3066	2006	* @since 4.05.02
3067		- * @return string - 'before', 'after', or 'submit'
3068	2007	*/
3069	2008	private static function message_placement( $form, $message ) {
3070	2009	$place = 'before';
3071	2010
		@@ -3077,10 +2016,11 @@
3077	2016	}
3078	2017	}
3079	2018
3080	2019	/**
	2020	+ * @return string - 'before' or 'after'
	2021	+ *
3081	2022	* @since 4.05.02
3082		- * @return string - 'before' or 'after'
3083	2023	*/
3084	2024	return apply_filters( 'frm_message_placement', $place, compact( 'form', 'message' ) );
3085	2025	}
3086	2026
		@@ -3089,16 +2029,8 @@
3089	2029	*
3090	2030	* @since 2.05
3091	2031	*/
3092	2032	private static function fill_atts_for_form_display( &$args ) {
3093		- if ( ! isset( $args['title'] ) && isset( $args['show_title'] ) ) {
3094		- $args['title'] = $args['show_title'];
3095		- }
3096		-
3097		- if ( ! isset( $args['description'] ) && isset( $args['show_description'] ) ) {
3098		- $args['description'] = $args['show_description'];
3099		- }
3100		-
3101	2033	$defaults = array(
3102	2034	'errors' => array(),
3103	2035	'message' => '',
3104	2036	'fields' => array(),
		@@ -3114,9 +2046,9 @@
3114	2046	* Show the success message without the form
3115	2047	*
3116	2048	* @since 2.05
3117	2049	*/
3118		- private static function show_lone_success_message( $atts ) {
	2050	+ private static function show_lone_success_messsage( $atts ) {
3119	2051	global $frm_vars;
3120	2052	$values = FrmEntriesHelper::setup_new_vars( $atts['fields'], $atts['form'], true );
3121	2053	self::maybe_load_css( $atts['form'], $values['custom_style'], $frm_vars['load_css'] );
3122	2054
		@@ -3125,9 +2057,9 @@
3125	2057	$errors = array();
3126	2058	$form = $atts['form'];
3127	2059	$message = $atts['message'];
3128	2060
3129		- include FrmAppHelper::plugin_path() . '/classes/views/frm-entries/errors.php';
	2061	+ include( FrmAppHelper::plugin_path() . '/classes/views/frm-entries/errors.php' );
3130	2062	}
3131	2063
3132	2064	/**
3133	2065	* Prepare the success message before it's shown
		@@ -3132,21 +2064,14 @@
3132	2064	/**
3133	2065	* Prepare the success message before it's shown
3134	2066	*
3135	2067	* @since 2.05
3136		- * @since 6.0.x Added the third parameter.
3137		- *
3138		- * @param object $form Form object.
3139		- * @param int $entry_id Entry ID.
3140		- * @param array $args See {@see FrmFormsController::run_success_action()}.
3141		- * @return string
3142	2068	*/
3143		- private static function prepare_submit_message( $form, $entry_id, $args = array() ) {
	2069	+ private static function prepare_submit_message( $form, $entry_id ) {
3144	2070	$frm_settings = FrmAppHelper::get_settings( array( 'current_form' => $form->id ) );
3145		- $opt = $args['success_opt'] ?? 'success';
3146	2071
3147	2072	if ( $entry_id && is_numeric( $entry_id ) ) {
3148		- $message = $form->options[ $opt . '_msg' ] ?? $frm_settings->success_msg;
	2073	+ $message = isset( $form->options['success_msg'] ) ? $form->options['success_msg'] : $frm_settings->success_msg;
3149	2074	$class = 'frm_message';
3150	2075	} else {
3151	2076	$message = $frm_settings->failed_msg;
3152	2077	$class = FrmFormsHelper::form_error_class();
		@@ -3156,11 +2081,8 @@
3156	2081
3157	2082	return apply_filters( 'frm_main_feedback', $message, $form, $entry_id );
3158	2083	}
3159	2084
3160		- /**
3161		- * @return void
3162		- */
3163	2085	public static function front_head() {
3164	2086	$version = FrmAppHelper::plugin_version();
3165	2087	$suffix = FrmAppHelper::js_suffix();
3166	2088
		@@ -3206,38 +2128,24 @@
3206	2128	* If css is loaded only on applicable pages, include it before the form loads
3207	2129	* to prevent a flash of unstyled form.
3208	2130	*
3209	2131	* @since 4.01
3210		- *
3211		- * @return void
3212	2132	*/
3213	2133	private static function load_late_css() {
3214	2134	$frm_settings = FrmAppHelper::get_settings();
3215		- $late_css = $frm_settings->load_style === 'dynamic';
3216		-
3217		- if ( ! $late_css || ! self::should_load_late() ) {
	2135	+ $late_css = $frm_settings->load_style === 'dynamic';
	2136	+ if ( ! $late_css ) {
3218	2137	return;
3219	2138	}
3220	2139
3221	2140	global $wp_styles;
3222		- if ( is_array( $wp_styles->queue ) && in_array( 'formidable', $wp_styles->queue, true ) ) {
	2141	+ if ( is_array( $wp_styles->queue ) && in_array( 'formidable', $wp_styles->queue ) ) {
3223	2142	wp_print_styles( 'formidable' );
3224	2143	}
3225	2144	}
3226	2145
3227		- /**
3228		- * Avoid late load if All in One SEO is active because it prevents CSS from loading entirely.
3229		- *
3230		- * @since 5.2.03
3231		- *
3232		- * @return bool
3233		- */
3234		- private static function should_load_late() {
3235		- return ! function_exists( 'aioseo' );
3236		- }
3237		-
3238	2146	public static function defer_script_loading( $tag, $handle ) {
3239		- if ( 'captcha-api' == $handle && ! strpos( $tag, 'defer' ) ) {
	2147	+ if ( 'recaptcha-api' == $handle && ! strpos( $tag, 'defer' ) ) {
3240	2148	$tag = str_replace( ' src', ' defer="defer" async="async" src', $tag );
3241	2149	}
3242	2150
3243	2151	return $tag;
		@@ -3247,13 +2155,11 @@
3247	2155	global $frm_vars;
3248	2156
3249	2157	FrmStylesController::enqueue_css();
3250	2158
3251		- if ( ! FrmAppHelper::is_admin() && $location !== 'header' && ! empty( $frm_vars['forms_loaded'] ) ) {
	2159	+ if ( ! FrmAppHelper::is_admin() && $location != 'header' && ! empty( $frm_vars['forms_loaded'] ) ) {
3252	2160	// load formidable js
3253	2161	wp_enqueue_script( 'formidable' );
3254		-
3255		- FrmHoneypot::maybe_print_honeypot_js();
3256	2162	}
3257	2163	}
3258	2164
3259	2165	/**
		@@ -3267,147 +2173,73 @@
3267	2173	}
3268	2174
3269	2175	/**
3270	2176	* @since 2.0.8
3271		- * @return bool
	2177	+ * @return boolean
3272	2178	*/
3273	2179	private static function is_minification_on( $atts ) {
3274		- return ! empty( $atts['minimize'] );
	2180	+ return isset( $atts['minimize'] ) && ! empty( $atts['minimize'] );
3275	2181	}
3276	2182
3277	2183	/**
3278		- * @since 5.0.16
3279		- *
3280		- * @return void
	2184	+ * @deprecated 4.0
3281	2185	*/
3282		- public static function landing_page_preview_option() {
3283		- $dir = apply_filters( 'frm_landing_page_preview_option', false );
3284		- if ( false === $dir || ! file_exists( $dir . 'landing-page-preview-option.php' ) ) {
3285		- $dir = self::get_form_views_path();
3286		- }
3287		- include $dir . 'landing-page-preview-option.php';
	2186	+ public static function new_form( $values = array() ) {
	2187	+ FrmDeprecated::new_form( $values );
3288	2188	}
3289	2189
3290	2190	/**
3291		- * @since 5.0.16
3292		- *
3293		- * @return string
	2191	+ * @deprecated 4.0
3294	2192	*/
3295		- private static function get_form_views_path() {
3296		- return FrmAppHelper::plugin_path() . '/classes/views/frm-forms/';
	2193	+ public static function create( $values = array() ) {
	2194	+ _deprecated_function( __METHOD__, '4.0', 'FrmFormsController::update' );
	2195	+ self::update( $values );
3297	2196	}
3298	2197
3299	2198	/**
3300		- * Create a page with an embedded formidable Gutenberg block.
3301		- *
3302		- * @since 5.2
3303		- *
3304		- * @return void
	2199	+ * @deprecated 1.07.05
	2200	+ * @codeCoverageIgnore
3305	2201	*/
3306		- public static function create_page_with_shortcode() {
3307		- if ( ! current_user_can( 'publish_posts' ) ) {
3308		- die( 0 );
3309		- }
	2202	+ public static function add_default_templates( $path, $default = true, $template = true ) {
	2203	+ FrmDeprecated::add_default_templates( $path, $default, $template );
	2204	+ }
3310	2205
3311		- check_ajax_referer( 'frm_ajax', 'nonce' );
3312		-
3313		- $type = FrmAppHelper::get_post_param( 'type', '', 'sanitize_text_field' );
3314		- if ( ! $type || ! in_array( $type, array( 'form', 'view' ), true ) ) {
3315		- die( 0 );
3316		- }
3317		-
3318		- $object_id = FrmAppHelper::get_post_param( 'object_id', '', 'absint' );
3319		- if ( ! $object_id ) {
3320		- die( 0 );
3321		- }
3322		-
3323		- $postarr = array( 'post_type' => 'page' );
3324		-
3325		- if ( 'form' === $type ) {
3326		- $postarr['post_content'] = self::get_page_shortcode_content_for_form( $object_id );
3327		- } else {
3328		- $postarr['post_content'] = apply_filters( 'frm_create_page_with_' . $type . '_shortcode_content', '', $object_id );
3329		- }
3330		-
3331		- $name = FrmAppHelper::get_post_param( 'name', '', 'sanitize_text_field' );
3332		- if ( $name ) {
3333		- $postarr['post_title'] = $name;
3334		- }
3335		-
3336		- $success = wp_insert_post( $postarr );
3337		- if ( ! is_numeric( $success ) || ! $success ) {
3338		- die( 0 );
3339		- }
3340		-
3341		- wp_send_json(
3342		- array(
3343		- 'redirect' => get_edit_post_link( $success, 'redirect' ),
3344		- )
3345		- );
	2206	+ /**
	2207	+ * @deprecated 3.0
	2208	+ * @codeCoverageIgnore
	2209	+ */
	2210	+ public static function bulk_create_template( $ids ) {
	2211	+ return FrmDeprecated::bulk_create_template( $ids );
3346	2212	}
3347	2213
3348	2214	/**
3349		- * @since 5.3
3350		- *
3351		- * @param int $form_id
3352		- * @return string
	2215	+ * @deprecated 2.03
	2216	+ * @codeCoverageIgnore
3353	2217	*/
3354		- private static function get_page_shortcode_content_for_form( $form_id ) {
3355		- $shortcode = '[formidable id="' . $form_id . '"]';
3356		- $html_comment_start = '<!-- wp:formidable/simple-form {"formId":"' . $form_id . '"} -->';
3357		- $html_comment_end = '<!-- /wp:formidable/simple-form -->';
3358		- return $html_comment_start . '<div>' . $shortcode . '</div>' . $html_comment_end;
	2218	+ public static function register_pro_scripts() {
	2219	+ FrmDeprecated::register_pro_scripts();
3359	2220	}
3360	2221
3361	2222	/**
3362		- * Get page dropdown for AJAX request for embedding form in an existing page.
3363		- *
3364		- * @return void
	2223	+ * @deprecated 3.0
	2224	+ * @codeCoverageIgnore
3365	2225	*/
3366		- public static function get_page_dropdown() {
3367		- if ( ! current_user_can( 'publish_posts' ) ) {
3368		- die( 0 );
3369		- }
3370		-
3371		- check_ajax_referer( 'frm_ajax', 'nonce' );
3372		-
3373		- $html = FrmAppHelper::clip(
3374		- function () {
3375		- FrmAppHelper::maybe_autocomplete_pages_options(
3376		- array(
3377		- 'field_name' => 'frm_page_dropdown',
3378		- 'page_id' => '',
3379		- 'placeholder' => __( 'Select a Page', 'formidable' ),
3380		- )
3381		- );
3382		- }
3383		- );
3384		- $post_type_object = get_post_type_object( 'page' );
3385		- wp_send_json(
3386		- array(
3387		- 'html' => $html,
3388		- 'edit_page_url' => admin_url( sprintf( $post_type_object->_edit_link . '&action=edit', 0 ) ),
3389		- )
3390		- );
	2226	+ public static function edit_key() {
	2227	+ FrmDeprecated::edit_key();
3391	2228	}
3392	2229
3393	2230	/**
3394		- * @deprecated 4.0
	2231	+ * @deprecated 3.0
	2232	+ * @codeCoverageIgnore
3395	2233	*/
3396		- public static function create( $values = array() ) {
3397		- _deprecated_function( __METHOD__, '4.0', 'FrmFormsController::update' );
3398		- self::update( $values );
	2234	+ public static function edit_description() {
	2235	+ FrmDeprecated::edit_description();
3399	2236	}
3400	2237
3401	2238	/**
3402		- * Education for premium features.
3403		- *
3404		- * @since 4.05
3405		- * @deprecated 6.16.3
3406		- *
3407		- * @return void
	2239	+ * @deprecated 4.08
	2240	+ * @since 3.06
3408	2241	*/
3409		- public static function add_form_style_tab_options() {
3410		- _deprecated_function( __METHOD__, '6.16.3' );
3411		- include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/add_form_style_options.php';
	2242	+ public static function add_new() {
	2243	+ _deprecated_function( __FUNCTION__, '4.08' );
3412	2244	}
3413	2245	}