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