← All changes | classes/controllers/FrmFormsController.php +499 -1465 6.25.1 → 5.2.06 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	/**
		@@ -64,12 +45,12 @@
64	45	*/
65	46	public static function logic_tip() {
66	47	$images_url = FrmAppHelper::plugin_url() . '/images/';
67	48	$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' ) );
	49	+ $data_message .= ' <img src="' . esc_attr( $images_url ) . '/survey-logic.png" srcset="' . esc_attr( $images_url ) . 'survey-logic@2x.png 2x" alt="' . esc_attr__( 'Conditional Logic options', 'formidable' ) . '"/>';
	50	+ 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( $data_message ) . '" data-medium="builder" data-content="logic">';
	51	+ FrmAppHelper::icon_by_class( 'frmfont frm_swap_icon' );
	52	+ esc_html_e( 'Add Conditional Logic', 'formidable' );
72	53	echo '</a>';
73	54	}
74	55
75	56	/**
		@@ -83,11 +64,8 @@
83	64
84	65	return $shortcodes;
85	66	}
86	67
87		- /**
88		- * @return void
89		- */
90	68	public static function list_form() {
91	69	FrmAppHelper::permission_check( 'frm_view_forms' );
92	70
93	71	$message = '';
		@@ -98,9 +76,9 @@
98	76	unset( $errors['message'] );
99	77	}
100	78	$errors = apply_filters( 'frm_admin_list_form_action', $errors );
101	79
102		- self::display_forms_list( $params, $message, $errors );
	80	+ return self::display_forms_list( $params, $message, $errors );
103	81	}
104	82
105	83	/**
106	84	* Create the default email action
		@@ -106,110 +84,28 @@
106	84	* Create the default email action
107	85	*
108	86	* @since 2.02.11
109	87	*
110		- * @param int|object $form
111		- * @return void
	88	+ * @param object|int $form
112	89	*/
113	90	private static function create_default_email_action( $form ) {
114	91	FrmForm::maybe_get_form( $form );
115		- if ( ! is_object( $form ) ) {
116		- return;
117		- }
118		-
119	92	$create_email = apply_filters( 'frm_create_default_email_action', true, $form );
120	93
121	94	if ( $create_email ) {
122		- /**
123		- * @var FrmFormAction
124		- */
125	95	$action_control = FrmFormActionsController::get_form_actions( 'email' );
126	96	$action_control->create( $form->id );
127	97	}
128	98	}
129	99
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	100	public static function edit( $values = false ) {
200	101	FrmAppHelper::permission_check( 'frm_edit_forms' );
201	102
202	103	$id = isset( $values['id'] ) ? absint( $values['id'] ) : FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
203	104
204		- self::get_edit_vars( $id );
	105	+ return self::get_edit_vars( $id );
205	106	}
206	107
207		- /**
208		- * @param mixed $id
209		- * @param string $message
210		- * @return void
211		- */
212	108	public static function settings( $id = false, $message = '' ) {
213	109	FrmAppHelper::permission_check( 'frm_edit_forms' );
214	110
215	111	if ( ! $id || ! is_numeric( $id ) ) {
		@@ -215,36 +111,21 @@
215	111	if ( ! $id || ! is_numeric( $id ) ) {
216	112	$id = FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
217	113	}
218	114
219		- FrmOnSubmitHelper::maybe_migrate_submit_settings_to_action( $id );
220		-
221		- self::get_settings_vars( $id, array(), $message );
	115	+ return self::get_settings_vars( $id, array(), $message );
222	116	}
223	117
224	118	public static function update_settings() {
225	119	FrmAppHelper::permission_check( 'frm_edit_forms' );
226		- $process_form = FrmAppHelper::get_post_param( 'process_form', '', 'sanitize_text_field' );
227	120
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	121	$id = FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
240	122
241		- $errors = FrmForm::validate( $_POST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
	123	+ $errors = FrmForm::validate( $_POST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
242	124	$warnings = FrmFormsHelper::check_for_warnings( $_POST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
243	125
244	126	if ( count( $errors ) > 0 ) {
245		- self::get_settings_vars( $id, $errors, compact( 'warnings' ) );
246		- return;
	127	+ return self::get_settings_vars( $id, $errors, compact( 'warnings' ) );
247	128	}
248	129
249	130	do_action( 'frm_before_update_form_settings', $id );
250	131
		@@ -258,9 +139,9 @@
258	139	}
259	140
260	141	$message = __( 'Settings Successfully Updated', 'formidable' );
261	142
262		- self::get_settings_vars( $id, array(), compact( 'message', 'warnings' ) );
	143	+ return self::get_settings_vars( $id, array(), compact( 'message', 'warnings' ) );
263	144	}
264	145
265	146	/**
266	147	* @param int $form_id
		@@ -270,11 +151,8 @@
270	151	$form = FrmForm::getOne( $form_id );
271	152	return ! empty( $form->options['antispam'] );
272	153	}
273	154
274		- /**
275		- * @return void
276		- */
277	155	public static function update( $values = array() ) {
278	156	if ( empty( $values ) ) {
279	157	$values = $_POST; // phpcs:ignore WordPress.Security.NonceVerification.Missing
280	158	}
		@@ -292,149 +170,98 @@
292	170
293	171	$id = isset( $values['id'] ) ? absint( $values['id'] ) : FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
294	172
295	173	if ( count( $errors ) > 0 ) {
296		- self::get_edit_vars( $id, $errors );
297		- return;
298		- }
	174	+ return self::get_edit_vars( $id, $errors );
	175	+ } else {
	176	+ FrmForm::update( $id, $values );
	177	+ $message = __( 'Form was successfully updated.', 'formidable' );
299	178
300		- self::maybe_remove_draft_option_from_fields( $id );
	179	+ if ( self::is_too_long( $values ) ) {
	180	+ $message .= '<br/> ' . sprintf(
	181	+ /* translators: %1$s: Start link HTML, %2$s: end link HTML */
	182	+ __( 'However, your form is very long and may be %1$sreaching server limits%2$s.', 'formidable' ),
	183	+ '<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">',
	184	+ '</a>'
	185	+ );
	186	+ }
301	187
302		- FrmForm::update( $id, $values );
303		- $message = __( 'Form was successfully updated.', 'formidable' );
	188	+ if ( defined( 'DOING_AJAX' ) ) {
	189	+ wp_die( FrmAppHelper::kses( $message, array( 'a' ) ) ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
	190	+ }
304	191
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		- );
	192	+ return self::get_edit_vars( $id, array(), $message );
312	193	}
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	194	}
320	195
321	196	/**
322		- * @since 6.25.1
	197	+ * Check if the value at the end of the form was included.
	198	+ * If it's missing, it means other values at the end of the form
	199	+ * were likely not saved either.
323	200	*
324		- * @return string
	201	+ * @since 3.06.01
325	202	*/
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/' );
	203	+ private static function is_too_long( $values ) {
	204	+ return ( ! isset( $values['frm_end'] ) ) || empty( $values['frm_end'] );
332	205	}
333	206
334	207	/**
335		- * Remove the draft flag from any new fields from this current session.
	208	+ * Redirect to the url for creating from a template
	209	+ * Also delete the current form
336	210	*
337		- * @since 6.8
338		- *
339		- * @param int $form_id
340		- * @return void
	211	+ * @since 2.0
	212	+ * @deprecated 3.06
341	213	*/
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		- }
	214	+ public static function _create_from_template() {
	215	+ _deprecated_function( __FUNCTION__, '3.06' );
348	216
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		- }
	217	+ FrmAppHelper::permission_check( 'frm_edit_forms' );
	218	+ check_ajax_referer( 'frm_ajax', 'nonce' );
354	219
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 ) );
	220	+ $current_form = FrmAppHelper::get_param( 'this_form', '', 'get', 'absint' );
	221	+ $template_id = FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
	222	+
	223	+ if ( $current_form ) {
	224	+ FrmForm::destroy( $current_form );
359	225	}
360		- }
361	226
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'] );
	227	+ echo esc_url_raw( admin_url( 'admin.php?page=formidable&frm_action=duplicate&id=' . absint( $template_id ) ) );
	228	+ wp_die();
374	229	}
375	230
376	231	public static function duplicate() {
377	232	FrmAppHelper::permission_check( 'frm_edit_forms' );
378		- $nonce = FrmAppHelper::simple_get( '_wpnonce' );
379	233
380		- if ( ! wp_verify_nonce( $nonce ) ) {
381		- $frm_settings = FrmAppHelper::get_settings();
382		- wp_die( esc_html( $frm_settings->admin_permission ) );
383		- }
384		-
385	234	$params = FrmForm::list_page_params();
386	235	$form = FrmForm::duplicate( $params['id'], $params['template'], true );
387		- $url = admin_url( 'admin.php?page=formidable' );
388		- $message = 'form_duplicate_error';
389		-
	236	+ $message = $params['template'] ? __( 'Form template was Successfully Created', 'formidable' ) : __( 'Form was Successfully Copied', 'formidable' );
390	237	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';
	238	+ return self::get_edit_vars( $form, array(), $message, true );
	239	+ } else {
	240	+ return self::display_forms_list( $params, __( 'There was a problem creating the new template.', 'formidable' ) );
394	241	}
395		-
396		- $url .= '&message=' . $message;
397		-
398		- wp_safe_redirect( $url );
399		- exit();
400	242	}
401	243
402	244	/**
403		- * @return string|null
	245	+ * @return string
404	246	*/
405	247	public static function page_preview() {
406	248	$params = FrmForm::list_page_params();
407		- if ( ! $params['form'] || is_numeric( $params['form'] ) ) {
408		- return null;
	249	+ if ( ! $params['form'] ) {
	250	+ return;
409	251	}
410	252
411		- self::maybe_block_preview( $params['form'] );
412		-
413	253	$form = FrmForm::getOne( $params['form'] );
414		- if ( ! $form ) {
415		- return null;
	254	+ if ( $form ) {
	255	+ return self::show_form( $form->id, '', 'auto', 'auto' );
416	256	}
417		-
418		- return self::show_form( $form->id, '', 'auto', 'auto' );
419	257	}
420	258
421	259	/**
422	260	* @since 3.0
423		- *
424		- * @return void
425	261	*/
426	262	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
	263	+ echo self::page_preview(); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
437	264	}
438	265
439	266	/**
440	267	* @return void
		@@ -445,17 +272,8 @@
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' );
451		-
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	276	$include_theme = FrmAppHelper::get_param( 'theme', '', 'get', 'absint' );
459	277	if ( $include_theme ) {
460	278	self::set_preview_query();
461	279	self::load_theme_preview();
		@@ -465,67 +283,31 @@
465	283
466	284	wp_die();
467	285	}
468	286
469		- /**
470		- * Set the page global to any available page (except for the Blog Page).
471		- *
472		- * @return void
473		- */
474	287	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 );
486		- }
487		-
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(
	288	+ $random_page = get_posts(
500	289	array(
501		- 'post_type' => 'page',
502		- 'page_id' => $random_page->ID,
	290	+ 'numberposts' => 1,
	291	+ 'orderby' => 'date',
	292	+ 'order' => 'ASC',
	293	+ 'post_type' => 'page',
503	294	)
504	295	);
505	296
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 );
	297	+ if ( ! empty( $random_page ) ) {
	298	+ $random_page = reset( $random_page );
	299	+ query_posts(
	300	+ array(
	301	+ 'post_type' => 'page',
	302	+ 'page_id' => $random_page->ID,
	303	+ )
	304	+ );
	305	+ }
509	306	}
510	307
511	308	/**
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	309	* @since 3.0
526		- *
527		- * @return void
528	310	*/
529	311	private static function load_theme_preview() {
530	312	add_filter( 'wp_title', 'FrmFormsController::preview_title', 9999 );
531	313	add_filter( 'the_title', 'FrmFormsController::preview_page_title', 9999 );
		@@ -534,39 +316,20 @@
534	316	add_filter( 'is_active_sidebar', '__return_false' );
535	317	FrmStylesController::enqueue_css( 'enqueue', true );
536	318
537	319	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	320	self::fallback_when_page_template_part_is_not_supported_by_theme();
542	321	}
543	322	}
544	323
545	324	/**
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	325	* Not every theme supports get_template_part( 'page' ).
560	326	* When this is not supported, false is returned, and we can handle a fallback.
561		- *
562		- * @return void
563	327	*/
564	328	private static function fallback_when_page_template_part_is_not_supported_by_theme() {
565	329	if ( have_posts() ) {
566	330	the_post();
567		- self::get_template( 'header' );
568		-
	331	+ get_header( '' );
569	332	// add some generic class names to the container to add some natural padding to the content.
570	333	// .entry-content catches the WordPress TwentyTwenty theme.
571	334	// .container catches Customizr content.
572	335	echo '<div class="container entry-content">';
		@@ -571,58 +334,13 @@
571	334	// .container catches Customizr content.
572	335	echo '<div class="container entry-content">';
573	336	the_content();
574	337	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' );
	338	+ get_footer();
581	339	}
582	340	}
583	341
584	342	/**
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	343	* Set the page title for the theme preview page
626	344	*
627	345	* @since 3.0
628	346	*/
		@@ -634,14 +352,11 @@
634	352	return $title;
635	353	}
636	354
637	355	/**
638		- * Set the page title for the theme preview page.
	356	+ * Set the page title for the theme preview page
639	357	*
640	358	* @since 3.0
641		- *
642		- * @param string $title
643		- * @return string
644	359	*/
645	360	public static function preview_title( $title ) {
646	361	return __( 'Form Preview', 'formidable' );
647	362	}
		@@ -646,20 +361,15 @@
646	361	return __( 'Form Preview', 'formidable' );
647	362	}
648	363
649	364	/**
650		- * Set the page content for the theme preview page.
	365	+ * Set the page content for the theme preview page
651	366	*
652	367	* @since 3.0
653		- *
654		- * @param string $content
655		- * @return string
656	368	*/
657	369	public static function preview_content( $content ) {
658	370	if ( in_the_loop() ) {
659		- self::show_page_preview();
660		- // Clear the content for the page we're using.
661		- $content = '';
	371	+ $content = self::show_page_preview();
662	372	}
663	373
664	374	return $content;
665	375	}
		@@ -667,108 +377,34 @@
667	377	/**
668	378	* @since 3.0
669	379	*/
670	380	private static function load_direct_preview() {
	381	+ header( 'Content-Type: text/html; charset=' . get_option( 'blog_charset' ) );
	382	+
671	383	$key = FrmAppHelper::simple_get( 'form', 'sanitize_title' );
672	384	if ( $key == '' ) {
673	385	$key = FrmAppHelper::get_post_param( 'form', '', 'sanitize_title' );
674	386	}
675	387
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	388	$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		- );
	389	+ if ( empty( $form ) ) {
	390	+ $form = FrmForm::getAll( array(), '', 1 );
695	391	}
696	392
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';
	393	+ require( FrmAppHelper::plugin_path() . '/classes/views/frm-entries/direct.php' );
702	394	}
703	395
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	396	public static function untrash() {
752	397	self::change_form_status( 'untrash' );
753	398	}
754	399
755		- /**
756		- * @param array $ids
757		- * @return string
758		- */
759	400	public static function bulk_untrash( $ids ) {
760	401	FrmAppHelper::permission_check( 'frm_edit_forms' );
761	402
762	403	$count = FrmForm::set_status( $ids, 'published' );
763	404
764		- if ( ! $count ) {
765		- // Don't show "0 forms restored" on refresh.
766		- return '';
767		- }
768		-
769	405	/* 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 );
	406	+ $message = sprintf( _n( '%1$s form restored from the Trash.', '%1$s forms restored from the Trash.', $count, 'formidable' ), 1 );
771	407
772	408	return $message;
773	409	}
774	410
		@@ -811,14 +447,14 @@
811	447	FrmAppHelper::permission_check( $available_status[ $status ]['permission'] );
812	448
813	449	$params = FrmForm::list_page_params();
814	450
815		- // Check nonce url.
	451	+ //check nonce url
816	452	check_admin_referer( $status . '_form_' . $params['id'] );
817	453
818	454	$count = 0;
819	455	if ( FrmForm::set_status( $params['id'], $available_status[ $status ]['new_status'] ) ) {
820		- ++$count;
	456	+ $count ++;
821	457	}
822	458
823	459	$form_type = FrmAppHelper::get_simple_request(
824	460	array(
		@@ -830,9 +466,9 @@
830	466	/* translators: %1$s: Number of forms */
831	467	$available_status['untrash']['message'] = sprintf( _n( '%1$s form restored from the Trash.', '%1$s forms restored from the Trash.', $count, 'formidable' ), $count );
832	468
833	469	/* 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>' );
	470	+ $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	471
836	472	$message = $available_status[ $status ]['message'];
837	473
838	474	self::display_forms_list( $params, $message );
		@@ -837,12 +473,8 @@
837	473
838	474	self::display_forms_list( $params, $message );
839	475	}
840	476
841		- /**
842		- * @param array $ids
843		- * @return string
844		- */
845	477	public static function bulk_trash( $ids ) {
846	478	FrmAppHelper::permission_check( 'frm_delete_forms' );
847	479
848	480	$count = 0;
		@@ -847,16 +479,12 @@
847	479
848	480	$count = 0;
849	481	foreach ( $ids as $id ) {
850	482	if ( FrmForm::trash( $id ) ) {
851		- ++$count;
	483	+ $count ++;
852	484	}
853	485	}
854	486
855		- if ( ! $count ) {
856		- return '';
857		- }
858		-
859	487	$current_page = FrmAppHelper::get_simple_request(
860	488	array(
861	489	'param' => 'form_type',
862	490	'type' => 'request',
		@@ -882,9 +510,9 @@
882	510	check_admin_referer( 'destroy_form_' . $params['id'] );
883	511
884	512	$count = 0;
885	513	if ( FrmForm::destroy( $params['id'] ) ) {
886		- ++$count;
	514	+ $count ++;
887	515	}
888	516
889	517	/* translators: %1$s: Number of forms */
890	518	$message = sprintf( _n( '%1$s Form Permanently Deleted', '%1$s Forms Permanently Deleted', $count, 'formidable' ), $count );
		@@ -891,12 +519,8 @@
891	519
892	520	self::display_forms_list( $params, $message );
893	521	}
894	522
895		- /**
896		- * @param array $ids
897		- * @return string
898		- */
899	523	public static function bulk_destroy( $ids ) {
900	524	FrmAppHelper::permission_check( 'frm_delete_forms' );
901	525
902	526	$count = 0;
		@@ -902,24 +526,19 @@
902	526	$count = 0;
903	527	foreach ( $ids as $id ) {
904	528	$d = FrmForm::destroy( $id );
905	529	if ( $d ) {
906		- ++$count;
	530	+ $count ++;
907	531	}
908	532	}
909	533
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		- }
	534	+ /* translators: %1$s: Number of forms */
	535	+ $message = sprintf( _n( '%1$s form permanently deleted.', '%1$s forms permanently deleted.', $count, 'formidable' ), $count );
914	536
915		- return '';
	537	+ return $message;
916	538	}
917	539
918		- /**
919		- * @since 6.7.1 Function went from private to public.
920		- */
921		- public static function delete_all() {
	540	+ private static function delete_all() {
922	541	// Check nonce url.
923	542	$permission_error = FrmAppHelper::permission_nonce_error( 'frm_delete_forms', '_wpnonce', 'bulk-toplevel_page_formidable' );
924	543	if ( $permission_error !== false ) {
925	544	self::display_forms_list( array(), '', array( $permission_error ) );
		@@ -926,15 +545,14 @@
926	545
927	546	return;
928	547	}
929	548
930		- $count = FrmForm::scheduled_delete( time() );
931		- $url = remove_query_arg( array( 'delete_all' ) );
	549	+ $count = FrmForm::scheduled_delete( time() );
932	550
933		- $url .= '&message=forms_permanently_deleted&forms_deleted=' . $count;
	551	+ /* translators: %1$s: Number of forms */
	552	+ $message = sprintf( _n( '%1$s form permanently deleted.', '%1$s forms permanently deleted.', $count, 'formidable' ), $count );
934	553
935		- wp_safe_redirect( $url );
936		- die();
	554	+ self::display_forms_list( array(), $message );
937	555	}
938	556
939	557	/**
940	558	* Create a new form from the modal.
		@@ -941,8 +559,10 @@
941	559	*
942	560	* @since 4.0
943	561	*/
944	562	public static function build_new_form() {
	563	+ global $wpdb;
	564	+
945	565	FrmAppHelper::permission_check( 'frm_edit_forms' );
946	566	check_ajax_referer( 'frm_ajax', 'nonce' );
947	567
948	568	$new_values = self::get_modal_values();
		@@ -947,35 +567,17 @@
947	567
948	568	$new_values = self::get_modal_values();
949	569	$new_values['form_key'] = $new_values['name'];
950	570	$new_values['options'] = array(
951		- 'antispam' => 1,
952		- 'on_submit_migrated' => 1,
	571	+ 'antispam' => 1,
953	572	);
954	573
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	574	$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	575
972		- self::create_submit_button_field( $form_id );
973		- self::create_default_on_submit_action( $form_id );
974	576	self::create_default_email_action( $form_id );
975	577
976	578	$response = array(
977		- 'redirect' => FrmForm::get_edit_link( $form_id ) . '&new_template=true',
	579	+ 'redirect' => FrmForm::get_edit_link( $form_id ),
978	580	);
979	581
980	582	echo wp_json_encode( $response );
981	583	wp_die();
		@@ -981,15 +583,46 @@
981	583	wp_die();
982	584	}
983	585
984	586	/**
	587	+ * Create a custom template from a form
	588	+ *
	589	+ * @since 3.06
	590	+ */
	591	+ public static function build_template() {
	592	+ global $wpdb;
	593	+
	594	+ FrmAppHelper::permission_check( 'frm_edit_forms' );
	595	+ check_ajax_referer( 'frm_ajax', 'nonce' );
	596	+
	597	+ $form_id = FrmAppHelper::get_param( 'xml', '', 'post', 'absint' );
	598	+ $new_form_id = FrmForm::duplicate( $form_id, 1, true );
	599	+ if ( ! $new_form_id ) {
	600	+ $response = array(
	601	+ 'message' => __( 'There was an error creating a template.', 'formidable' ),
	602	+ );
	603	+ } else {
	604	+ $new_values = self::get_modal_values();
	605	+ $query_results = $wpdb->update( $wpdb->prefix . 'frm_forms', $new_values, array( 'id' => $new_form_id ) );
	606	+ if ( $query_results ) {
	607	+ FrmForm::clear_form_cache();
	608	+ }
	609	+
	610	+ $response = array(
	611	+ 'redirect' => admin_url( 'admin.php?page=formidable&frm_action=duplicate&id=' . $new_form_id ),
	612	+ );
	613	+ }
	614	+
	615	+ echo wp_json_encode( $response );
	616	+ wp_die();
	617	+ }
	618	+
	619	+ /**
985	620	* Before creating a new form, get the name and description from the modal.
986	621	*
987	622	* @since 4.0
988		- *
989		- * @return array<string,string>
990	623	*/
991		- public static function get_modal_values() {
	624	+ private static function get_modal_values() {
992	625	$name = FrmAppHelper::get_param( 'name', '', 'post', 'sanitize_text_field' );
993	626	$desc = FrmAppHelper::get_param( 'desc', '', 'post', 'sanitize_textarea_field' );
994	627
995	628	return array(
		@@ -1002,24 +635,17 @@
1002	635	* Inserts Formidable button
1003	636	* Hook exists since 2.5.0
1004	637	*
1005	638	* @since 2.0.15
1006		- *
1007		- * @return void
1008	639	*/
1009	640	public static function insert_form_button() {
1010	641	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
	642	+ FrmAppHelper::load_admin_wide_js();
	643	+ $menu_name = FrmAppHelper::get_menu_name();
	644	+ $icon = apply_filters( 'frm_media_icon', FrmAppHelper::svg_logo() );
	645	+ 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' ) . '">' .
	646	+ FrmAppHelper::kses( $icon, 'all' ) . // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
	647	+ ' ' . esc_html( $menu_name ) . '</a>';
1022	648	}
1023	649	}
1024	650
1025	651	/**
		@@ -1107,9 +733,9 @@
1107	733	$form_id = $opts['form_id'];
1108	734	unset( $opts['form_id'] );
1109	735	}
1110	736
1111		- include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/shortcode_opts.php';
	737	+ include( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/shortcode_opts.php' );
1112	738
1113	739	echo '</div>';
1114	740
1115	741	wp_die();
		@@ -1114,32 +740,18 @@
1114	740
1115	741	wp_die();
1116	742	}
1117	743
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	744	public static function display_forms_list( $params = array(), $message = '', $errors = array() ) {
1127	745	FrmAppHelper::permission_check( 'frm_view_forms' );
1128	746
1129	747	global $wpdb, $frm_vars;
1130	748
1131		- if ( ! $params ) {
	749	+ if ( empty( $params ) ) {
1132	750	$params = FrmForm::list_page_params();
1133	751	}
1134	752
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' ) );
	753	+ $wp_list_table = new FrmFormsListHelper( compact( 'params' ) );
1142	754
1143	755	$pagenum = $wp_list_table->get_pagenum();
1144	756
1145	757	$wp_list_table->prepare_items();
		@@ -1149,32 +761,36 @@
1149	761	wp_redirect( esc_url_raw( add_query_arg( 'paged', $total_pages ) ) );
1150	762	die();
1151	763	}
1152	764
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';
	765	+ require( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/list.php' );
1160	766	}
1161	767
1162		- /**
1163		- * @param array<string,string> $columns
1164		- * @return array<string,string>
1165		- */
1166	768	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' );
	769	+ $columns['cb'] = '<input type="checkbox" />';
	770	+ $columns['id'] = 'ID';
	771	+
	772	+ $type = FrmAppHelper::get_simple_request(
	773	+ array(
	774	+ 'param' => 'form_type',
	775	+ 'type' => 'request',
	776	+ 'default' => 'published',
	777	+ )
	778	+ );
	779	+
	780	+ if ( 'template' == $type ) {
	781	+ $columns['name'] = __( 'Template Name', 'formidable' );
	782	+ $columns['type'] = __( 'Type', 'formidable' );
	783	+ $columns['form_key'] = __( 'Key', 'formidable' );
	784	+ } else {
	785	+ $columns['name'] = __( 'Form Title', 'formidable' );
	786	+ $columns['entries'] = __( 'Entries', 'formidable' );
	787	+ $columns['form_key'] = __( 'Key', 'formidable' );
	788	+ $columns['shortcode'] = __( 'Actions', 'formidable' );
1174	789	}
1175		- $columns['created_at'] = esc_html__( 'Date', 'formidable' );
1176	790
	791	+ $columns['created_at'] = __( 'Date', 'formidable' );
	792	+
1177	793	add_screen_option(
1178	794	'per_page',
1179	795	array(
1180	796	'label' => __( 'Forms', 'formidable' ),
		@@ -1185,11 +801,8 @@
1185	801
1186	802	return $columns;
1187	803	}
1188	804
1189		- /**
1190		- * @return array<string,string>
1191		- */
1192	805	public static function get_sortable_columns() {
1193	806	return array(
1194	807	'id' => 'id',
1195	808	'name' => 'name',
		@@ -1198,17 +811,9 @@
1198	811	'created_at' => 'created_at',
1199	812	);
1200	813	}
1201	814
1202		- /**
1203		- * @param mixed $hidden_columns
1204		- * @return array
1205		- */
1206	815	public static function hidden_columns( $hidden_columns ) {
1207		- if ( ! is_array( $hidden_columns ) ) {
1208		- $hidden_columns = array();
1209		- }
1210		-
1211	816	$type = FrmAppHelper::get_simple_request(
1212	817	array(
1213	818	'param' => 'form_type',
1214	819	'type' => 'request',
		@@ -1223,9 +828,9 @@
1223	828	return $hidden_columns;
1224	829	}
1225	830
1226	831	public static function save_per_page( $save, $option, $value ) {
1227		- if ( $option === 'formidable_page_formidable_per_page' ) {
	832	+ if ( $option == 'formidable_page_formidable_per_page' ) {
1228	833	$save = (int) $value;
1229	834	}
1230	835
1231	836	return $save;
		@@ -1231,49 +836,141 @@
1231	836	return $save;
1232	837	}
1233	838
1234	839	/**
1235		- * @param int|string $id
1236		- * @param array $errors
1237		- * @param string $message
1238		- * @param bool $create_link
1239		- * @return void
	840	+ * @return bool
1240	841	*/
1241		- private static function get_edit_vars( $id, $errors = array(), $message = '', $create_link = false ) {
1242		- global $frm_vars;
	842	+ public static function expired() {
	843	+ global $frm_expired;
	844	+ return $frm_expired;
	845	+ }
1243	846
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		- ),
	847	+ /**
	848	+ * Get data from api before rendering it so that we can flag the modal as expired
	849	+ */
	850	+ public static function before_list_templates() {
	851	+ global $frm_templates;
	852	+ global $frm_expired;
	853	+ global $frm_license_type;
	854	+
	855	+ $api = new FrmFormTemplateApi();
	856	+ $frm_templates = $api->get_api_info();
	857	+ $expired = false;
	858	+ $license_type = '';
	859	+ if ( isset( $frm_templates['error'] ) ) {
	860	+ $error = $frm_templates['error']['message'];
	861	+ $error = str_replace( 'utm_medium=addons', 'utm_medium=form-templates', $error );
	862	+ $expired = 'expired' === $frm_templates['error']['code'];
	863	+ $license_type = isset( $frm_templates['error']['type'] ) ? $frm_templates['error']['type'] : '';
	864	+ unset( $frm_templates['error'] );
	865	+ }
	866	+
	867	+ $frm_expired = $expired;
	868	+ $frm_license_type = $license_type;
	869	+ }
	870	+
	871	+ public static function list_templates() {
	872	+ global $frm_templates;
	873	+ global $frm_license_type;
	874	+
	875	+ $templates = $frm_templates;
	876	+ $custom_templates = array();
	877	+ $templates_by_category = array();
	878	+
	879	+ self::add_user_templates( $custom_templates );
	880	+
	881	+ foreach ( $templates as $template ) {
	882	+ if ( ! isset( $template['categories'] ) ) {
	883	+ continue;
	884	+ }
	885	+
	886	+ foreach ( $template['categories'] as $category ) {
	887	+ if ( ! isset( $templates_by_category[ $category ] ) ) {
	888	+ $templates_by_category[ $category ] = array();
	889	+ }
	890	+
	891	+ $templates_by_category[ $category ][] = $template;
	892	+ }
	893	+ }
	894	+ unset( $template );
	895	+
	896	+ // Subcategories that are included elsewhere.
	897	+ $redundant_cats = array( 'PayPal', 'Stripe', 'Twilio' );
	898	+
	899	+ $categories = array_keys( $templates_by_category );
	900	+ $categories = array_diff( $categories, FrmFormsHelper::ignore_template_categories() );
	901	+ $categories = array_diff( $categories, $redundant_cats );
	902	+ sort( $categories );
	903	+
	904	+ array_walk(
	905	+ $custom_templates,
	906	+ function( &$template ) {
	907	+ $template['custom'] = true;
	908	+ }
1254	909	);
1255		- if ( ! $form ) {
1256		- FrmAppController::show_error_modal( $error_args );
1257		- return;
	910	+
	911	+ $my_templates_translation = __( 'My Templates', 'formidable' );
	912	+ $categories = array_merge( array( $my_templates_translation ), $categories );
	913	+ $pricing = FrmAppHelper::admin_upgrade_link( 'form-templates' );
	914	+ $license_type = $frm_license_type;
	915	+ $args = compact( 'pricing', 'license_type' );
	916	+ $where = apply_filters( 'frm_forms_dropdown', array(), '' );
	917	+ $forms = FrmForm::get_published_forms( $where );
	918	+ $view_path = FrmAppHelper::plugin_path() . '/classes/views/frm-forms/';
	919	+
	920	+ $templates_by_category[ $my_templates_translation ] = $custom_templates;
	921	+
	922	+ unset( $pricing, $license_type, $where );
	923	+ wp_enqueue_script( 'accordion' ); // register accordion for template groups
	924	+ require $view_path . 'list-templates.php';
	925	+ }
	926	+
	927	+ /**
	928	+ * @since 4.03.01
	929	+ */
	930	+ private static function get_template_categories( $templates ) {
	931	+ $categories = array();
	932	+ foreach ( $templates as $template ) {
	933	+ if ( isset( $template['categories'] ) ) {
	934	+ $categories = array_merge( $categories, $template['categories'] );
	935	+ }
1258	936	}
	937	+ $exclude_cats = FrmFormsHelper::ignore_template_categories();
	938	+ $categories = array_unique( $categories );
	939	+ $categories = array_diff( $categories, $exclude_cats );
	940	+ sort( $categories );
	941	+ return $categories;
	942	+ }
1259	943
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		- )
	944	+ private static function add_user_templates( &$templates ) {
	945	+ $user_templates = array(
	946	+ 'is_template' => 1,
	947	+ 'default_template' => 0,
	948	+ );
	949	+ $user_templates = FrmForm::getAll( $user_templates, 'name' );
	950	+ foreach ( $user_templates as $template ) {
	951	+ $template = array(
	952	+ 'id' => $template->id,
	953	+ 'name' => $template->name,
	954	+ 'key' => $template->form_key,
	955	+ 'description' => $template->description,
	956	+ 'url' => admin_url( 'admin.php?page=formidable&frm_action=duplicate&id=' . absint( $template->id ) ),
	957	+ 'released' => $template->created_at,
	958	+ 'installed' => 1,
1270	959	);
1271		- $error_args['continue_text'] = __( 'Restore form', 'formidable' );
1272		- FrmAppController::show_error_modal( $error_args );
1273		- return;
	960	+ array_unshift( $templates, $template );
	961	+ unset( $template );
1274	962	}
	963	+ }
1275	964
	965	+ private static function get_edit_vars( $id, $errors = array(), $message = '', $create_link = false ) {
	966	+ global $frm_vars;
	967	+
	968	+ $form = FrmForm::getOne( $id );
	969	+ if ( ! $form ) {
	970	+ wp_die( esc_html__( 'You are trying to edit a form that does not exist.', 'formidable' ) );
	971	+ }
	972	+
1276	973	if ( $form->parent_form_id ) {
1277	974	/* translators: %1$s: Start link HTML, %2$s: End link HTML */
1278	975	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	976	}
		@@ -1284,9 +981,8 @@
1284	981
1285	982	// Automatically add end section fields if they don't exist (2.0 migration).
1286	983	$reset_fields = false;
1287	984	FrmFormsHelper::auto_add_end_section_fields( $form, $fields, $reset_fields );
1288		- FrmSubmitHelper::maybe_create_submit_field( $form, $fields, $reset_fields );
1289	985
1290	986	if ( $reset_fields ) {
1291	987	$fields = FrmField::get_all_for_form( $form->id, '', 'exclude' );
1292	988	}
		@@ -1310,49 +1006,23 @@
1310	1006	if ( $form->is_template && $message == $edit_message ) {
1311	1007	$message = __( 'Template was successfully updated.', 'formidable' );
1312	1008	}
1313	1009
1314		- self::maybe_update_form_builder_message( $message );
	1010	+ $all_templates = FrmForm::getAll( array( 'is_template' => 1 ), 'name' );
	1011	+ $has_fields = isset( $values['fields'] ) && ! empty( $values['fields'] );
1315	1012
1316		- $has_fields = ! empty( $values['fields'] ) && ! FrmSubmitHelper::only_contains_submit_field( $values['fields'] );
1317		-
1318	1013	if ( defined( 'DOING_AJAX' ) ) {
1319	1014	wp_die();
	1015	+ } else {
	1016	+ require( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/edit.php' );
1320	1017	}
1321		-
1322		- require FrmAppHelper::plugin_path() . '/classes/views/frm-forms/edit.php';
1323	1018	}
1324	1019
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	1020	public static function get_settings_vars( $id, $errors = array(), $args = array() ) {
1349	1021	FrmAppHelper::permission_check( 'frm_edit_forms' );
1350	1022
1351	1023	global $frm_vars;
1352	1024
1353		- self::maybe_print_media_templates();
1354		-
1355	1025	if ( ! is_array( $args ) ) {
1356	1026	// For reverse compatibility.
1357	1027	$args = array(
1358	1028	'message' => $args,
		@@ -1385,38 +1055,17 @@
1385	1055
1386	1056	$sections = self::get_settings_tabs( $values );
1387	1057	$current = FrmAppHelper::simple_get( 't', 'sanitize_title', 'advanced_settings' );
1388	1058
1389		- require FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings.php';
	1059	+ require( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings.php' );
1390	1060	}
1391	1061
1392	1062	/**
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	1063	* @since 4.0
1415	1064	*/
1416	1065	public static function form_publish_button( $atts ) {
1417	1066	$values = $atts['values'];
1418		- include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/_publish_box.php';
	1067	+ include( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/_publish_box.php' );
1419	1068	}
1420	1069
1421	1070	/**
1422	1071	* Get a list of all the settings tabs for the form settings page.
		@@ -1430,9 +1079,9 @@
1430	1079	$sections = array(
1431	1080	'advanced' => array(
1432	1081	'name' => __( 'General', 'formidable' ),
1433	1082	'title' => __( 'General Form Settings', 'formidable' ),
1434		- 'function' => array( self::class, 'advanced_settings' ),
	1083	+ 'function' => array( __CLASS__, 'advanced_settings' ),
1435	1084	'icon' => 'frm_icon_font frm_settings_icon',
1436	1085	),
1437	1086	'email' => array(
1438	1087	'name' => __( 'Actions & Notifications', 'formidable' ),
		@@ -1440,79 +1089,59 @@
1440	1089	'id' => 'frm_notification_settings',
1441	1090	'icon' => 'frm_icon_font frm_mail_bulk_icon',
1442	1091	),
1443	1092	'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',
	1093	+ 'name' => __( 'Form Permissions', 'formidable' ),
	1094	+ 'icon' => 'frm_icon_font frm_lock_icon',
	1095	+ 'html_class' => 'frm_show_upgrade frm_noallow',
	1096	+ 'data' => array(
	1097	+ 'medium' => 'permissions',
	1098	+ 'upgrade' => __( 'Form Permissions', 'formidable' ),
	1099	+ 'message' => __( 'Allow editing, protect forms and files, limit entries, and save drafts. Upgrade to get form and entry permissions.', 'formidable' ),
1452	1100	),
1453	1101	),
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',
	1102	+ 'scheduling' => array(
	1103	+ 'name' => __( 'Form Scheduling', 'formidable' ),
	1104	+ 'icon' => 'frm_icon_font frm_calendar_icon',
	1105	+ 'html_class' => 'frm_show_upgrade frm_noallow',
	1106	+ 'data' => array(
	1107	+ 'medium' => 'scheduling',
	1108	+ 'upgrade' => __( 'Form scheduling settings', 'formidable' ),
1462	1109	),
1463	1110	),
1464	1111	'buttons' => array(
1465		- 'name' => __( 'Buttons', 'formidable' ),
1466		- 'class' => self::class,
	1112	+ 'name' => __( 'Styling & Buttons', 'formidable' ),
	1113	+ 'class' => __CLASS__,
1467	1114	'function' => 'buttons_settings',
1468		- 'icon' => 'frm_icon_font frm_button_icon',
	1115	+ 'icon' => 'frm_icon_font frm_pallet_icon',
1469	1116	),
1470	1117	'landing' => array(
1471	1118	'name' => __( 'Form Landing Page', 'formidable' ),
1472	1119	'icon' => 'frm_icon_font frm_file_text_icon',
1473		- 'html_class' => 'frm_show_upgrade_tab frm_noallow',
	1120	+ 'html_class' => 'frm_show_upgrade frm_noallow',
1474	1121	'data' => FrmAppHelper::get_landing_page_upgrade_data_params(),
1475	1122	),
1476	1123	'chat' => array(
1477	1124	'name' => __( 'Conversational Forms', 'formidable' ),
1478	1125	'icon' => 'frm_icon_font frm_chat_forms_icon',
1479		- 'html_class' => 'frm_show_upgrade_tab frm_noallow',
	1126	+ 'html_class' => 'frm_show_upgrade frm_noallow',
1480	1127	'data' => FrmAppHelper::get_upgrade_data_params(
1481	1128	'chat',
1482	1129	array(
1483		- 'upgrade' => __( 'Conversational Forms', 'formidable' ),
1484		- 'message' => __( 'Ask one question at a time for automated conversations.', 'formidable' ),
1485		- 'screenshot' => 'chat.png',
	1130	+ 'upgrade' => __( 'Conversational Forms', 'formidable' ),
	1131	+ 'message' => __( 'Ask one question at a time for automated conversations.', 'formidable' ),
1486	1132	)
1487	1133	),
1488	1134	),
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	1135	'html' => array(
1503	1136	'name' => __( 'Customize HTML', 'formidable' ),
1504		- 'class' => self::class,
	1137	+ 'class' => __CLASS__,
1505	1138	'function' => 'html_settings',
1506	1139	'icon' => 'frm_icon_font frm_code_icon',
1507	1140	),
1508	1141	);
1509	1142
1510		- if ( ! has_action( 'frm_add_form_style_tab_options' ) && ! has_action( 'frm_add_form_button_options' ) ) {
1511		- unset( $sections['buttons'] );
1512		- }
1513		-
1514		- foreach ( array( 'landing', 'chat', 'abandonment' ) as $feature ) {
	1143	+ foreach ( array( 'landing', 'chat' ) as $feature ) {
1515	1144	if ( ! FrmAppHelper::show_new_feature( $feature ) ) {
1516	1145	unset( $sections[ $feature ] );
1517	1146	}
1518	1147	}
		@@ -1518,8 +1147,13 @@
1518	1147	}
1519	1148
1520	1149	$sections = apply_filters( 'frm_add_form_settings_section', $sections, $values );
1521	1150
	1151	+ if ( FrmAppHelper::pro_is_installed() && ! FrmAppHelper::meets_min_pro_version( '4.0' ) ) {
	1152	+ // Prevent settings from showing in 2 spots.
	1153	+ unset( $sections['permissions'], $sections['scheduling'] );
	1154	+ }
	1155	+
1522	1156	foreach ( $sections as $key => $section ) {
1523	1157	$defaults = array(
1524	1158	'html_class' => '',
1525	1159	'name' => ucfirst( $key ),
		@@ -1541,9 +1175,9 @@
1541	1175	$section['id'] = $section['anchor'];
1542	1176	}
1543	1177
1544	1178	$sections[ $key ] = $section;
1545		- }//end foreach
	1179	+ }
1546	1180
1547	1181	return $sections;
1548	1182	}
1549	1183
		@@ -1550,9 +1184,8 @@
1550	1184	/**
1551	1185	* @since 4.0
1552	1186	*
1553	1187	* @param array $values
1554		- * @return void
1555	1188	*/
1556	1189	public static function advanced_settings( $values ) {
1557	1190	$first_h3 = 'frm_first_h3';
1558	1191
		@@ -1560,15 +1193,14 @@
1560	1193	}
1561	1194
1562	1195	/**
1563	1196	* @param array $values
1564		- * @return void
1565	1197	*/
1566		- public static function render_spam_settings( $values ) {
	1198	+ private static function render_spam_settings( $values ) {
1567	1199	if ( function_exists( 'akismet_http_post' ) ) {
1568	1200	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/spam-settings/akismet.php';
1569	1201	}
1570		- include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/spam-settings/stopforumspam.php';
	1202	+ include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/spam-settings/honeypot.php';
1571	1203	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/spam-settings/antispam.php';
1572	1204	}
1573	1205
1574	1206	/**
		@@ -1574,12 +1206,16 @@
1574	1206	/**
1575	1207	* @since 4.0
1576	1208	*
1577	1209	* @param array $values
1578		- * @return void
1579	1210	*/
1580	1211	public static function buttons_settings( $values ) {
1581		- include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings-buttons.php';
	1212	+ $styles = apply_filters( 'frm_get_style_opts', array() );
	1213	+
	1214	+ $frm_settings = FrmAppHelper::get_settings();
	1215	+ $no_global_style = $frm_settings->load_style === 'none';
	1216	+
	1217	+ include( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings-buttons.php' );
1582	1218	}
1583	1219
1584	1220	/**
1585	1221	* @since 4.0
		@@ -1584,12 +1220,11 @@
1584	1220	/**
1585	1221	* @since 4.0
1586	1222	*
1587	1223	* @param array $values
1588		- * @return void
1589	1224	*/
1590	1225	public static function html_settings( $values ) {
1591		- include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings-html.php';
	1226	+ include( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings-html.php' );
1592	1227	}
1593	1228
1594	1229	/**
1595	1230	* Replace old Submit Button href with new href to avoid errors in Chrome
		@@ -1595,10 +1230,9 @@
1595	1230	* Replace old Submit Button href with new href to avoid errors in Chrome
1596	1231	*
1597	1232	* @since 2.03.08
1598	1233	*
1599		- * @param array|bool $values
1600		- * @return void
	1234	+ * @param array|boolean $values
1601	1235	*/
1602	1236	private static function clean_submit_html( &$values ) {
1603	1237	if ( is_array( $values ) && isset( $values['submit_html'] ) ) {
1604	1238	$values['submit_html'] = str_replace( 'javascript:void(0)', '#', $values['submit_html'] );
		@@ -1604,28 +1238,8 @@
1604	1238	$values['submit_html'] = str_replace( 'javascript:void(0)', '#', $values['submit_html'] );
1605	1239	}
1606	1240	}
1607	1241
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	1242	public static function mb_tags_box( $form_id, $class = '' ) {
1629	1243	$fields = FrmField::get_all_for_form( $form_id, '', 'include' );
1630	1244
1631	1245	/**
		@@ -1638,9 +1252,9 @@
1638	1252	*/
1639	1253	$fields = apply_filters( 'frm_fields_in_tags_box', $fields, compact( 'form_id' ) );
1640	1254	$linked_forms = array();
1641	1255	$col = 'one';
1642		- $settings_tab = FrmAppHelper::is_admin_page( 'formidable' );
	1256	+ $settings_tab = FrmAppHelper::is_admin_page( 'formidable' ) ? true : false;
1643	1257
1644	1258	$cond_shortcodes = apply_filters( 'frm_conditional_shortcodes', array() );
1645	1259	$entry_shortcodes = self::get_shortcode_helpers( $settings_tab );
1646	1260
		@@ -1645,9 +1259,9 @@
1645	1259	$entry_shortcodes = self::get_shortcode_helpers( $settings_tab );
1646	1260
1647	1261	$advanced_helpers = self::advanced_helpers( compact( 'fields', 'form_id' ) );
1648	1262
1649		- include FrmAppHelper::plugin_path() . '/classes/views/shared/mb_adv_info.php';
	1263	+ include( FrmAppHelper::plugin_path() . '/classes/views/shared/mb_adv_info.php' );
1650	1264	}
1651	1265
1652	1266	/**
1653	1267	* @since 3.04.01
		@@ -1660,9 +1274,9 @@
1660	1274	),
1661	1275	);
1662	1276
1663	1277	$user_fields = self::user_shortcodes();
1664		- if ( $user_fields ) {
	1278	+ if ( ! empty( $user_fields ) ) {
1665	1279	$user_helpers = array();
1666	1280	foreach ( $user_fields as $uk => $uf ) {
1667	1281	$user_helpers[ '|user_id| show="' . $uk . '"' ] = $uf;
1668	1282	unset( $uk, $uf );
		@@ -1668,9 +1282,9 @@
1668	1282	unset( $uk, $uf );
1669	1283	}
1670	1284
1671	1285	$advanced_helpers['user_id'] = array(
1672		- 'codes' => $user_helpers,
	1286	+ 'codes' => $user_helpers,
1673	1287	);
1674	1288	}
1675	1289
1676	1290	/**
		@@ -1747,16 +1361,20 @@
1747	1361	'updated-at' => __( 'Entry updated', 'formidable' ),
1748	1362	'' => '',
1749	1363	'siteurl' => __( 'Site URL', 'formidable' ),
1750	1364	'sitename' => __( 'Site Name', 'formidable' ),
1751		- 'form_name' => __( 'Form Name', 'formidable' ),
1752	1365	);
1753	1366
1754		- $entry_shortcodes = array_merge( FrmShortcodeHelper::get_contextual_shortcode_values(), $entry_shortcodes );
1755	1367	if ( ! FrmAppHelper::pro_is_installed() ) {
1756	1368	unset( $entry_shortcodes['post_id'] );
1757	1369	}
1758	1370
	1371	+ if ( $settings_tab ) {
	1372	+ $entry_shortcodes['default-message'] = __( 'Default Msg', 'formidable' );
	1373	+ $entry_shortcodes['default-html'] = __( 'Default HTML', 'formidable' );
	1374	+ $entry_shortcodes['default-plain'] = __( 'Default Plain', 'formidable' );
	1375	+ }
	1376	+
1759	1377	/**
1760	1378	* Use this hook to add or remove buttons in the helpers section
1761	1379	* in the customization panel
1762	1380	*
		@@ -1767,12 +1385,9 @@
1767	1385	return $entry_shortcodes;
1768	1386	}
1769	1387
1770	1388	/**
1771		- * Insert the form class setting into the form.
1772		- *
1773		- * @param stdClass $form
1774		- * @return void
	1389	+ * Insert the form class setting into the form
1775	1390	*/
1776	1391	public static function form_classes( $form ) {
1777	1392	if ( isset( $form->options['form_class'] ) ) {
1778	1393	echo esc_attr( sanitize_text_field( $form->options['form_class'] ) );
		@@ -1781,12 +1396,8 @@
1781	1396	if ( ! empty( $form->options['js_validate'] ) ) {
1782	1397	echo ' frm_js_validate ';
1783	1398	self::add_js_validate_form_to_global_vars( $form );
1784	1399	}
1785		-
1786		- if ( FrmForm::is_ajax_on( $form ) ) {
1787		- echo ' frm_ajax_submit ';
1788		- }
1789	1400	}
1790	1401
1791	1402	/**
1792	1403	* @since 5.0.03
		@@ -1806,25 +1417,17 @@
1806	1417	check_ajax_referer( 'frm_ajax', 'nonce' );
1807	1418
1808	1419	echo FrmEntriesController::show_entry_shortcode( // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
1809	1420	array(
1810		- 'form_id' => FrmAppHelper::get_post_param( 'form_id', '', 'absint' ), // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
	1421	+ 'form_id' => FrmAppHelper::get_post_param( 'form_id', '', 'absint' ),
1811	1422	'default_email' => true,
1812		- 'plain_text' => FrmAppHelper::get_post_param( 'plain_text', '', 'absint' ), // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
	1423	+ 'plain_text' => FrmAppHelper::get_post_param( 'plain_text', '', 'absint' ),
1813	1424	)
1814	1425	);
1815	1426	wp_die();
1816	1427	}
1817	1428
1818		- /**
1819		- * @param string $content
1820		- * @param int|stdClass|string $form
1821		- * @param false|int|stdClass|string $entry
1822		- * @return string
1823		- */
1824	1429	public static function filter_content( $content, $form, $entry = false ) {
1825		- $content = self::replace_form_name_shortcodes( $content, $form );
1826		-
1827	1430	self::get_entry_by_param( $entry );
1828	1431	if ( ! $entry ) {
1829	1432	return $content;
1830	1433	}
		@@ -1832,16 +1435,8 @@
1832	1435	if ( is_object( $form ) ) {
1833	1436	$form = $form->id;
1834	1437	}
1835	1438
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	1439	$shortcodes = FrmFieldsHelper::get_shortcodes( $content, $form );
1845	1440	$content = apply_filters( 'frm_replace_content_shortcodes', $content, $entry, $shortcodes );
1846	1441
1847	1442	return $content;
		@@ -1846,38 +1441,8 @@
1846	1441
1847	1442	return $content;
1848	1443	}
1849	1444
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	1445	private static function get_entry_by_param( &$entry ) {
1881	1446	if ( ! $entry || ! is_object( $entry ) ) {
1882	1447	if ( ! $entry || ! is_numeric( $entry ) ) {
1883	1448	$entry = FrmAppHelper::get_post_param( 'id', false, 'sanitize_title' );
		@@ -1890,12 +1455,8 @@
1890	1455	public static function replace_content_shortcodes( $content, $entry, $shortcodes ) {
1891	1456	return FrmFieldsHelper::replace_content_shortcodes( $content, $entry, $shortcodes );
1892	1457	}
1893	1458
1894		- /**
1895		- * @param array $errors
1896		- * @return array
1897		- */
1898	1459	public static function process_bulk_form_actions( $errors ) {
1899	1460	if ( ! $_REQUEST ) {
1900	1461	return $errors;
1901	1462	}
		@@ -1939,9 +1500,9 @@
1939	1500	case 'untrash':
1940	1501	$message = self::bulk_untrash( $ids );
1941	1502	}
1942	1503
1943		- if ( ! empty( $message ) ) {
	1504	+ if ( isset( $message ) && ! empty( $message ) ) {
1944	1505	$errors['message'] = $message;
1945	1506	}
1946	1507
1947	1508	return $errors;
		@@ -1946,26 +1507,13 @@
1946	1507
1947	1508	return $errors;
1948	1509	}
1949	1510
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	1511	public static function route() {
1965	1512	$action = isset( $_REQUEST['frm_action'] ) ? 'frm_action' : 'action';
1966	1513	$vars = array();
1967	1514	FrmAppHelper::include_svg();
	1515	+
1968	1516	if ( isset( $_POST['frm_compact_fields'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
1969	1517	FrmAppHelper::permission_check( 'frm_edit_forms' );
1970	1518
1971	1519	// Javascript needs to be allowed in some field settings.
		@@ -1974,9 +1522,9 @@
1974	1522	$json_vars = json_decode( $json_vars, true );
1975	1523	if ( empty( $json_vars ) ) {
1976	1524	// json decoding failed so we should return an error message.
1977	1525	$action = FrmAppHelper::get_param( $action, '', 'get', 'sanitize_title' );
1978		- if ( 'edit' === $action ) {
	1526	+ if ( 'edit' == $action ) {
1979	1527	$action = 'update';
1980	1528	}
1981	1529
1982	1530	add_filter( 'frm_validate_form', 'FrmFormsController::json_error' );
		@@ -1992,29 +1540,31 @@
1992	1540	if ( isset( $_REQUEST['delete_all'] ) ) {
1993	1541	// Override the action for this page.
1994	1542	$action = 'delete_all';
1995	1543	}
1996		- }//end if
	1544	+ }
1997	1545
1998	1546	add_action( 'frm_load_form_hooks', 'FrmHooksController::trigger_load_form_hooks' );
1999	1547	FrmAppHelper::trigger_hook_load( 'form' );
2000	1548
2001	1549	switch ( $action ) {
	1550	+ case 'new':
	1551	+ return self::new_form( $vars );
2002	1552	case 'create':
2003	1553	case 'edit':
2004	1554	case 'update':
	1555	+ case 'duplicate':
2005	1556	case 'trash':
2006	1557	case 'untrash':
2007	1558	case 'destroy':
	1559	+ case 'delete_all':
2008	1560	case 'settings':
2009	1561	case 'update_settings':
2010	1562	return self::$action( $vars );
2011	1563	case 'lite-reports':
2012		- self::no_reports( $vars );
2013		- return;
	1564	+ return self::no_reports( $vars );
2014	1565	case 'views':
2015		- self::no_views( $vars );
2016		- return;
	1566	+ return self::no_views( $vars );
2017	1567	default:
2018	1568	do_action( 'frm_form_action_' . $action );
2019	1569	if ( apply_filters( 'frm_form_stop_action_' . $action, false ) ) {
2020	1570	return;
		@@ -2027,89 +1577,34 @@
2027	1577
2028	1578	if ( strpos( $action, 'bulk_' ) === 0 ) {
2029	1579	FrmAppHelper::remove_get_action();
2030	1580
2031		- self::list_form();
2032		- return;
	1581	+ return self::list_form();
2033	1582	}
2034	1583
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		- }
	1584	+ return self::display_forms_list();
	1585	+ }
	1586	+ }
2040	1587
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		- }
	1588	+ public static function json_error( $errors ) {
	1589	+ $errors['json'] = __( 'Abnormal HTML characters prevented your form from saving correctly', 'formidable' );
2048	1590
2049		- self::display_forms_list();
2050		-
2051		- return;
2052		- }//end switch
	1591	+ return $errors;
2053	1592	}
2054	1593
2055	1594	/**
2056		- * Rename a form.
	1595	+ * Education for premium features.
2057	1596	*
2058		- * Handles the AJAX request for renaming a form.
2059		- *
2060		- * @since 6.7
2061		- *
2062		- * @return void
	1597	+ * @since 4.05
2063	1598	*/
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' ) );
	1599	+ public static function add_form_style_tab_options() {
	1600	+ include( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/add_form_style_options.php' );
2098	1601	}
2099	1602
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	1603	/**
2107	1604	* Add education about views.
2108	1605	*
2109	1606	* @since 4.07
2110		- *
2111		- * @return void
2112	1607	*/
2113	1608	public static function no_views( $values = array() ) {
2114	1609	FrmAppHelper::include_svg();
2115	1610	$id = FrmAppHelper::get_param( 'form', '', 'get', 'absint' );
		@@ -2121,10 +1616,8 @@
2121	1616	/**
2122	1617	* Add education about reports.
2123	1618	*
2124	1619	* @since 4.07
2125		- *
2126		- * @return void
2127	1620	*/
2128	1621	public static function no_reports( $values = array() ) {
2129	1622	$id = FrmAppHelper::get_param( 'form', '', 'get', 'absint' );
2130	1623	$form = $id ? FrmForm::getOne( $id ) : false;
		@@ -2131,11 +1624,9 @@
2131	1624
2132	1625	include FrmAppHelper::plugin_path() . '/classes/views/shared/reports-info.php';
2133	1626	}
2134	1627
2135		- /**
2136		- * FRONT-END FORMS.
2137		- */
	1628	+ /* FRONT-END FORMS */
2138	1629	public static function admin_bar_css() {
2139	1630	if ( is_admin() || ! current_user_can( 'frm_edit_forms' ) ) {
2140	1631	return;
2141	1632	}
		@@ -2209,9 +1700,9 @@
2209	1700	$wp_admin_bar->add_node(
2210	1701	array(
2211	1702	'parent' => 'frm-forms',
2212	1703	'id' => 'edit_form_' . $form_id,
2213		- 'title' => empty( $name ) ? FrmFormsHelper::get_no_title_text() : $name,
	1704	+ 'title' => empty( $name ) ? __( '(no title)', 'formidable' ) : $name,
2214	1705	'href' => FrmForm::get_edit_link( $form_id ),
2215	1706	)
2216	1707	);
2217	1708	}
		@@ -2224,10 +1715,10 @@
2224	1715	* @return string
2225	1716	*/
2226	1717	public static function get_form_shortcode( $atts ) {
2227	1718	global $frm_vars;
2228		- if ( ! empty( $frm_vars['skip_shortcode'] ) ) {
2229		- $sc = '[formidable';
	1719	+ if ( isset( $frm_vars['skip_shortcode'] ) && $frm_vars['skip_shortcode'] ) {
	1720	+ $sc = '[formidable';
2230	1721	$sc .= FrmAppHelper::array_to_html_params( $atts );
2231	1722	return $sc . ']';
2232	1723	}
2233	1724
		@@ -2252,11 +1743,11 @@
2252	1743
2253	1744	/**
2254	1745	* @since 5.2.01
2255	1746	*
2256		- * @param false|int|string $id
2257		- * @param false|string $key
2258		- * @return false|stdClass
	1747	+ * @param string|int|false $id
	1748	+ * @param string|false $key
	1749	+ * @return stdClass|false
2259	1750	*/
2260	1751	private static function maybe_get_form_by_id_or_key( $id, $key ) {
2261	1752	if ( ! $id ) {
2262	1753	$id = $key;
		@@ -2264,12 +1755,12 @@
2264	1755	return self::maybe_get_form_to_show( $id );
2265	1756	}
2266	1757
2267	1758	/**
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.
	1759	+ * @param string|int|false $id
	1760	+ * @param string|false $key
	1761	+ * @param string|int|bool $title may be 'auto', true, false, 'true', 'false', 'yes', '1', 1, '0', 0.
	1762	+ * @param string|int|bool $description may be 'auto', true, false, 'true', 'false', 'yes', '1', 1, '0', 0.
2272	1763	* @param array $atts
2273	1764	* @return string
2274	1765	*/
2275	1766	public static function show_form( $id = '', $key = '', $title = false, $description = false, $atts = array() ) {
		@@ -2317,16 +1808,15 @@
2317	1808	return $form;
2318	1809	}
2319	1810
2320	1811	/**
2321		- * @param false|int|string $id
2322		- * @return false|stdClass
	1812	+ * @param string|int|false $id
	1813	+ * @return stdClass|false
2323	1814	*/
2324	1815	private static function maybe_get_form_to_show( $id ) {
2325	1816	$form = false;
2326	1817
2327		- if ( ! empty( $id ) ) {
2328		- // Form id or key is set.
	1818	+ if ( ! empty( $id ) ) { // form id or key is set
2329	1819	$form = FrmForm::getOne( $id );
2330	1820	if ( ! $form || $form->parent_form_id || $form->status === 'trash' ) {
2331	1821	$form = false;
2332	1822	}
		@@ -2365,15 +1855,11 @@
2365	1855	$fields = FrmFieldsHelper::get_form_fields( $form->id, $errors );
2366	1856	$reset = false;
2367	1857	$pass_args = compact( 'form', 'fields', 'errors', 'title', 'description', 'reset' );
2368	1858
2369		- $pass_args['action'] = $params['action'];
2370	1859	$handle_process_here = $params['action'] === 'create' && $params['posted_form_id'] == $form->id && $_POST; // phpcs:ignore WordPress.Security.NonceVerification.Missing
2371	1860
2372	1861	if ( ! $handle_process_here ) {
2373		- FrmFormState::set_initial_value( 'title', $title );
2374		- FrmFormState::set_initial_value( 'description', $description );
2375		-
2376	1862	do_action( 'frm_display_form_action', $params, $fields, $form, $title, $description );
2377	1863	if ( apply_filters( 'frm_continue_to_new', true, $form->id, $params['action'] ) ) {
2378	1864	self::show_form_after_submit( $pass_args );
2379	1865	}
		@@ -2384,13 +1870,14 @@
2384	1870
2385	1871	do_action( 'frm_validate_form_creation', $params, $fields, $form, $title, $description );
2386	1872
2387	1873	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;
	1874	+ $entry_id = self::just_created_entry( $form->id );
	1875	+ $pass_args['entry_id'] = $entry_id;
	1876	+ $pass_args['reset'] = true;
	1877	+ $pass_args['conf_method'] = self::get_confirmation_method( compact( 'form', 'entry_id' ) );
2391	1878
2392		- self::run_on_submit_actions( $pass_args );
	1879	+ self::run_success_action( $pass_args );
2393	1880
2394	1881	do_action(
2395	1882	'frm_after_entry_processed',
2396	1883	array(
		@@ -2398,9 +1885,9 @@
2398	1885	'form' => $form,
2399	1886	)
2400	1887	);
2401	1888	}
2402		- }//end if
	1889	+ }
2403	1890	}
2404	1891
2405	1892	/**
2406	1893	* If the form was processed earlier (init), get the generated errors
		@@ -2432,40 +1919,20 @@
2432	1919	*/
2433	1920	public static function just_created_entry( $form_id ) {
2434	1921	global $frm_vars;
2435	1922
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;
	1923	+ 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	1924	}
2438	1925
2439	1926	/**
2440		- * Gets confirmation method.
2441		- *
2442	1927	* @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	1928	*/
2453	1929	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';
	1930	+ $opt = 'success_action';
	1931	+ $method = ( isset( $atts['form']->options[ $opt ] ) && ! empty( $atts['form']->options[ $opt ] ) ) ? $atts['form']->options[ $opt ] : 'message';
	1932	+ $method = apply_filters( 'frm_success_filter', $method, $atts['form'], 'create' );
2457	1933
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'] ) ) ) {
	1934	+ if ( $method != 'message' && ( ! $atts['entry_id'] || ! is_numeric( $atts['entry_id'] ) ) ) {
2468	1935	$method = 'message';
2469	1936	}
2470	1937
2471	1938	return $method;
		@@ -2480,34 +1947,11 @@
2480	1947	$conf_method = self::get_confirmation_method(
2481	1948	array(
2482	1949	'form' => $form,
2483	1950	'entry_id' => $params['id'],
2484		- 'action' => FrmOnSubmitHelper::current_event( $params ),
2485	1951	)
2486	1952	);
2487	1953
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	1954	if ( 'redirect' === $conf_method ) {
2511	1955	self::trigger_redirect( $form, $params, $args );
2512	1956	}
2513	1957	}
		@@ -2530,33 +1974,18 @@
2530	1974	/**
2531	1975	* Used when the success action is not 'message'
2532	1976	*
2533	1977	* @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	1978	*/
2547	1979	public static function run_success_action( $args ) {
2548		- global $frm_vars;
2549	1980	$extra_args = $args;
2550	1981	unset( $extra_args['form'] );
2551	1982
2552	1983	do_action( 'frm_success_action', $args['conf_method'], $args['form'], $args['form']->options, $args['entry_id'], $extra_args );
2553	1984
2554		- $opt = ! isset( $args['action'] ) || $args['action'] === 'create' ? 'success' : 'edit';
	1985	+ $opt = ( ! isset( $args['action'] ) || $args['action'] === 'create' ) ? 'success' : 'edit';
2555	1986
2556	1987	$args['success_opt'] = $opt;
2557		- $args['ajax'] = ! empty( $frm_vars['ajax'] );
2558		-
2559	1988	if ( $args['conf_method'] === 'page' && is_numeric( $args['form']->options[ $opt . '_page_id' ] ) ) {
2560	1989	self::load_page_after_submit( $args );
2561	1990	} elseif ( $args['conf_method'] === 'redirect' ) {
2562	1991	self::redirect_after_submit( $args );
		@@ -2565,225 +1994,8 @@
2565	1994	}
2566	1995	}
2567	1996
2568	1997	/**
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	1998	* @since 3.0
2787	1999	*/
2788	2000	private static function load_page_after_submit( $args ) {
2789	2001	global $post;
		@@ -2792,31 +2004,19 @@
2792	2004	$page = get_post( $args['form']->options[ $opt . '_page_id' ] );
2793	2005	$old_post = $post;
2794	2006	$post = $page;
2795	2007	$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	2008	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		-
2810	2009	$post = $old_post;
2811		- }//end if
	2010	+ }
2812	2011	}
2813	2012
2814	2013	/**
2815	2014	* @since 3.0
2816		- * @param array $args See {@see FrmFormsController::run_success_action()}.
2817	2015	*/
2818	2016	private static function redirect_after_submit( $args ) {
	2017	+ global $frm_vars;
	2018	+
2819	2019	add_filter( 'frm_use_wpautop', '__return_false' );
2820	2020
2821	2021	$opt = $args['success_opt'];
2822	2022	$success_url = trim( $args['form']->options[ $opt . '_url' ] );
		@@ -2822,8 +2022,12 @@
2822	2022	$success_url = trim( $args['form']->options[ $opt . '_url' ] );
2823	2023	$success_url = apply_filters( 'frm_content', $success_url, $args['form'], $args['entry_id'] );
2824	2024	$success_url = do_shortcode( $success_url );
2825	2025
	2026	+ $success_msg = isset( $args['form']->options[ $opt . '_msg' ] ) ? $args['form']->options[ $opt . '_msg' ] : __( 'Please wait while you are redirected.', 'formidable' );
	2027	+
	2028	+ $redirect_msg = self::get_redirect_message( $success_url, $success_msg, $args );
	2029	+
2826	2030	$args['id'] = $args['entry_id'];
2827	2031	FrmEntriesController::delete_entry_before_redirect( $success_url, $args['form'], $args );
2828	2032
2829	2033	add_filter( 'frm_redirect_url', 'FrmEntriesController::prepare_redirect_url' );
		@@ -2830,144 +2034,19 @@
2830	2034	$success_url = apply_filters( 'frm_redirect_url', $success_url, $args['form'], $args );
2831	2035
2832	2036	$doing_ajax = FrmAppHelper::doing_ajax();
2833	2037
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' ) ) );
	2038	+ if ( isset( $args['ajax'] ) && $args['ajax'] && $doing_ajax ) {
	2039	+ echo json_encode( array( 'redirect' => $success_url ) );
2837	2040	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		-
	2041	+ } elseif ( ! headers_sent() ) {
2848	2042	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")';
	2043	+ die(); // do not use wp_die or redirect fails
2953	2044	} else {
2954		- $redirect_js = 'window.location="' . $success_url . '";';
	2045	+ add_filter( 'frm_use_wpautop', '__return_true' );
	2046	+ echo FrmAppHelper::maybe_kses( $redirect_msg ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
	2047	+ echo "<script type='text/javascript'>window.onload = function(){setTimeout(window.location='" . esc_url_raw( $success_url ) . "', 8000);}</script>";
2955	2048	}
2956		-
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(){';
2964		- }
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	2049	}
2971	2050
2972	2051	/**
2973	2052	* @since 3.0
		@@ -2973,15 +2052,14 @@
2973	2052	* @since 3.0
2974	2053	*
2975	2054	* @param string $success_url
2976	2055	* @param string $success_msg
2977		- * @param array $args
	2056	+ * @param array $args
2978	2057	*/
2979	2058	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 ) .
	2059	+ $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/>' .
	2060	+ /* translators: %1$s: Start link HTML, %2$s: End link HTML */
	2061	+ sprintf( __( '%1$sClick here%2$s if you are not automatically redirected.', 'formidable' ), '<a href="' . esc_url( $success_url ) . '">', '</a>' ) .
2984	2062	'</div></div>';
2985	2063
2986	2064	$redirect_args = array(
2987	2065	'entry_id' => $args['entry_id'],
		@@ -2992,52 +2070,19 @@
2992	2070	return apply_filters( 'frm_redirect_msg', $redirect_msg, $redirect_args );
2993	2071	}
2994	2072
2995	2073	/**
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	2074	* Prepare to show the success message and empty form after submit
3020	2075	*
3021	2076	* @since 2.05
3022	2077	*/
3023	2078	public static function show_message_after_save( $atts ) {
3024		- $atts['message'] = self::prepare_submit_message( $atts['form'], $atts['entry_id'], $atts );
	2079	+ $atts['message'] = self::prepare_submit_message( $atts['form'], $atts['entry_id'] );
3025	2080
3026	2081	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		- }
	2082	+ self::show_form_after_submit( $atts );
3038	2083	} else {
3039		- self::show_lone_success_message( $atts );
	2084	+ self::show_lone_success_messsage( $atts );
3040	2085	}
3041	2086	}
3042	2087
3043	2088	/**
		@@ -3065,9 +2110,9 @@
3065	2110
3066	2111	$include_form_tag = apply_filters( 'frm_include_form_tag', true, $form );
3067	2112
3068	2113	$frm_settings = FrmAppHelper::get_settings();
3069		- $submit = $form->options['submit_value'] ?? $frm_settings->submit_value;
	2114	+ $submit = isset( $form->options['submit_value'] ) ? $form->options['submit_value'] : $frm_settings->submit_value;
3070	2115
3071	2116	global $frm_vars;
3072	2117	self::maybe_load_css( $form, $values['custom_style'], $frm_vars['load_css'] );
3073	2118
		@@ -3076,10 +2121,11 @@
3076	2121	include FrmAppHelper::plugin_path() . '/classes/views/frm-entries/new.php';
3077	2122	}
3078	2123
3079	2124	/**
	2125	+ * @return string - 'before', 'after', or 'submit'
	2126	+ *
3080	2127	* @since 4.05.02
3081		- * @return string - 'before', 'after', or 'submit'
3082	2128	*/
3083	2129	private static function message_placement( $form, $message ) {
3084	2130	$place = 'before';
3085	2131
		@@ -3091,10 +2137,11 @@
3091	2137	}
3092	2138	}
3093	2139
3094	2140	/**
	2141	+ * @return string - 'before' or 'after'
	2142	+ *
3095	2143	* @since 4.05.02
3096		- * @return string - 'before' or 'after'
3097	2144	*/
3098	2145	return apply_filters( 'frm_message_placement', $place, compact( 'form', 'message' ) );
3099	2146	}
3100	2147
		@@ -3103,16 +2150,8 @@
3103	2150	*
3104	2151	* @since 2.05
3105	2152	*/
3106	2153	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	2154	$defaults = array(
3116	2155	'errors' => array(),
3117	2156	'message' => '',
3118	2157	'fields' => array(),
		@@ -3128,9 +2167,9 @@
3128	2167	* Show the success message without the form
3129	2168	*
3130	2169	* @since 2.05
3131	2170	*/
3132		- private static function show_lone_success_message( $atts ) {
	2171	+ private static function show_lone_success_messsage( $atts ) {
3133	2172	global $frm_vars;
3134	2173	$values = FrmEntriesHelper::setup_new_vars( $atts['fields'], $atts['form'], true );
3135	2174	self::maybe_load_css( $atts['form'], $values['custom_style'], $frm_vars['load_css'] );
3136	2175
		@@ -3139,9 +2178,9 @@
3139	2178	$errors = array();
3140	2179	$form = $atts['form'];
3141	2180	$message = $atts['message'];
3142	2181
3143		- include FrmAppHelper::plugin_path() . '/classes/views/frm-entries/errors.php';
	2182	+ include( FrmAppHelper::plugin_path() . '/classes/views/frm-entries/errors.php' );
3144	2183	}
3145	2184
3146	2185	/**
3147	2186	* Prepare the success message before it's shown
		@@ -3146,21 +2185,14 @@
3146	2185	/**
3147	2186	* Prepare the success message before it's shown
3148	2187	*
3149	2188	* @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	2189	*/
3157		- private static function prepare_submit_message( $form, $entry_id, $args = array() ) {
	2190	+ private static function prepare_submit_message( $form, $entry_id ) {
3158	2191	$frm_settings = FrmAppHelper::get_settings( array( 'current_form' => $form->id ) );
3159		- $opt = $args['success_opt'] ?? 'success';
3160	2192
3161	2193	if ( $entry_id && is_numeric( $entry_id ) ) {
3162		- $message = $form->options[ $opt . '_msg' ] ?? $frm_settings->success_msg;
	2194	+ $message = isset( $form->options['success_msg'] ) ? $form->options['success_msg'] : $frm_settings->success_msg;
3163	2195	$class = 'frm_message';
3164	2196	} else {
3165	2197	$message = $frm_settings->failed_msg;
3166	2198	$class = FrmFormsHelper::form_error_class();
		@@ -3170,11 +2202,8 @@
3170	2202
3171	2203	return apply_filters( 'frm_main_feedback', $message, $form, $entry_id );
3172	2204	}
3173	2205
3174		- /**
3175		- * @return void
3176		- */
3177	2206	public static function front_head() {
3178	2207	$version = FrmAppHelper::plugin_version();
3179	2208	$suffix = FrmAppHelper::js_suffix();
3180	2209
		@@ -3220,38 +2249,24 @@
3220	2249	* If css is loaded only on applicable pages, include it before the form loads
3221	2250	* to prevent a flash of unstyled form.
3222	2251	*
3223	2252	* @since 4.01
3224		- *
3225		- * @return void
3226	2253	*/
3227	2254	private static function load_late_css() {
3228	2255	$frm_settings = FrmAppHelper::get_settings();
3229		- $late_css = $frm_settings->load_style === 'dynamic';
3230		-
3231		- if ( ! $late_css || ! self::should_load_late() ) {
	2256	+ $late_css = $frm_settings->load_style === 'dynamic';
	2257	+ if ( ! $late_css ) {
3232	2258	return;
3233	2259	}
3234	2260
3235	2261	global $wp_styles;
3236		- if ( is_array( $wp_styles->queue ) && in_array( 'formidable', $wp_styles->queue, true ) ) {
	2262	+ if ( is_array( $wp_styles->queue ) && in_array( 'formidable', $wp_styles->queue ) ) {
3237	2263	wp_print_styles( 'formidable' );
3238	2264	}
3239	2265	}
3240	2266
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	2267	public static function defer_script_loading( $tag, $handle ) {
3253		- if ( 'captcha-api' == $handle && ! strpos( $tag, 'defer' ) ) {
	2268	+ if ( 'recaptcha-api' == $handle && ! strpos( $tag, 'defer' ) ) {
3254	2269	$tag = str_replace( ' src', ' defer="defer" async="async" src', $tag );
3255	2270	}
3256	2271
3257	2272	return $tag;
		@@ -3261,13 +2276,11 @@
3261	2276	global $frm_vars;
3262	2277
3263	2278	FrmStylesController::enqueue_css();
3264	2279
3265		- if ( ! FrmAppHelper::is_admin() && $location !== 'header' && ! empty( $frm_vars['forms_loaded'] ) ) {
	2280	+ if ( ! FrmAppHelper::is_admin() && $location != 'header' && ! empty( $frm_vars['forms_loaded'] ) ) {
3266	2281	// load formidable js
3267	2282	wp_enqueue_script( 'formidable' );
3268		-
3269		- FrmHoneypot::maybe_print_honeypot_js();
3270	2283	}
3271	2284	}
3272	2285
3273	2286	/**
		@@ -3281,12 +2294,12 @@
3281	2294	}
3282	2295
3283	2296	/**
3284	2297	* @since 2.0.8
3285		- * @return bool
	2298	+ * @return boolean
3286	2299	*/
3287	2300	private static function is_minification_on( $atts ) {
3288		- return ! empty( $atts['minimize'] );
	2301	+ return isset( $atts['minimize'] ) && ! empty( $atts['minimize'] );
3289	2302	}
3290	2303
3291	2304	/**
3292	2305	* @since 5.0.16
		@@ -3314,9 +2327,9 @@
3314	2327	* Create a page with an embedded formidable Gutenberg block.
3315	2328	*
3316	2329	* @since 5.2
3317	2330	*
3318		- * @return void
	2331	+ * @return never
3319	2332	*/
3320	2333	public static function create_page_with_shortcode() {
3321	2334	if ( ! current_user_can( 'publish_posts' ) ) {
3322	2335	die( 0 );
		@@ -3323,26 +2336,18 @@
3323	2336	}
3324	2337
3325	2338	check_ajax_referer( 'frm_ajax', 'nonce' );
3326	2339
3327		- $type = FrmAppHelper::get_post_param( 'type', '', 'sanitize_text_field' );
3328		- if ( ! $type || ! in_array( $type, array( 'form', 'view' ), true ) ) {
	2340	+ $form_id = FrmAppHelper::get_post_param( 'form_id', '', 'absint' );
	2341	+ if ( ! $form_id ) {
3329	2342	die( 0 );
3330	2343	}
3331	2344
3332		- $object_id = FrmAppHelper::get_post_param( 'object_id', '', 'absint' );
3333		- if ( ! $object_id ) {
3334		- die( 0 );
3335		- }
	2345	+ $postarr = array(
	2346	+ 'post_type' => 'page',
	2347	+ 'post_content' => '<!-- wp:formidable/simple-form {"formId":"' . $form_id . '"} --><div>[formidable id="' . $form_id . '"]</div><!-- /wp:formidable/simple-form -->',
	2348	+ );
3336	2349
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	2350	$name = FrmAppHelper::get_post_param( 'name', '', 'sanitize_text_field' );
3346	2351	if ( $name ) {
3347	2352	$postarr['post_title'] = $name;
3348	2353	}
		@@ -3359,24 +2364,11 @@
3359	2364	);
3360	2365	}
3361	2366
3362	2367	/**
3363		- * @since 5.3
3364		- *
3365		- * @param int $form_id
3366		- * @return string
3367		- */
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;
3373		- }
3374		-
3375		- /**
3376	2368	* Get page dropdown for AJAX request for embedding form in an existing page.
3377	2369	*
3378		- * @return void
	2370	+ * @return never
3379	2371	*/
3380	2372	public static function get_page_dropdown() {
3381	2373	if ( ! current_user_can( 'publish_posts' ) ) {
3382	2374	die( 0 );
		@@ -3384,9 +2376,9 @@
3384	2376
3385	2377	check_ajax_referer( 'frm_ajax', 'nonce' );
3386	2378
3387	2379	$html = FrmAppHelper::clip(
3388		- function () {
	2380	+ function() {
3389	2381	FrmAppHelper::maybe_autocomplete_pages_options(
3390	2382	array(
3391	2383	'field_name' => 'frm_page_dropdown',
3392	2384	'page_id' => '',
		@@ -3406,8 +2398,15 @@
3406	2398
3407	2399	/**
3408	2400	* @deprecated 4.0
3409	2401	*/
	2402	+ public static function new_form( $values = array() ) {
	2403	+ FrmDeprecated::new_form( $values );
	2404	+ }
	2405	+
	2406	+ /**
	2407	+ * @deprecated 4.0
	2408	+ */
3410	2409	public static function create( $values = array() ) {
3411	2410	_deprecated_function( __METHOD__, '4.0', 'FrmFormsController::update' );
3412	2411	self::update( $values );
3413	2412	}
		@@ -3412,16 +2411,51 @@
3412	2411	self::update( $values );
3413	2412	}
3414	2413
3415	2414	/**
3416		- * Education for premium features.
3417		- *
3418		- * @since 4.05
3419		- * @deprecated 6.16.3
3420		- *
3421		- * @return void
	2415	+ * @deprecated 1.07.05
	2416	+ * @codeCoverageIgnore
3422	2417	*/
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';
	2418	+ public static function add_default_templates( $path, $default = true, $template = true ) {
	2419	+ FrmDeprecated::add_default_templates( $path, $default, $template );
	2420	+ }
	2421	+
	2422	+ /**
	2423	+ * @deprecated 3.0
	2424	+ * @codeCoverageIgnore
	2425	+ */
	2426	+ public static function bulk_create_template( $ids ) {
	2427	+ return FrmDeprecated::bulk_create_template( $ids );
	2428	+ }
	2429	+
	2430	+ /**
	2431	+ * @deprecated 2.03
	2432	+ * @codeCoverageIgnore
	2433	+ */
	2434	+ public static function register_pro_scripts() {
	2435	+ FrmDeprecated::register_pro_scripts();
	2436	+ }
	2437	+
	2438	+ /**
	2439	+ * @deprecated 3.0
	2440	+ * @codeCoverageIgnore
	2441	+ */
	2442	+ public static function edit_key() {
	2443	+ FrmDeprecated::edit_key();
	2444	+ }
	2445	+
	2446	+ /**
	2447	+ * @deprecated 3.0
	2448	+ * @codeCoverageIgnore
	2449	+ */
	2450	+ public static function edit_description() {
	2451	+ FrmDeprecated::edit_description();
	2452	+ }
	2453	+
	2454	+ /**
	2455	+ * @deprecated 4.08
	2456	+ * @since 3.06
	2457	+ */
	2458	+ public static function add_new() {
	2459	+ _deprecated_function( __FUNCTION__, '4.08' );
3426	2460	}
3427	2461	}