← All changes | classes/controllers/FrmFormsController.php +459 -1010 6.30 → 6.7.2 View file →

		@@ -6,9 +6,9 @@
6	6	class FrmFormsController {
7	7
8	8	/**
9	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.
	10	+ * message in the currect tab.
11	11	*
12	12	* @since 6.2
13	13	*
14	14	* @var array Keys are form IDs and values are 1.
		@@ -14,25 +14,13 @@
14	14	* @var array Keys are form IDs and values are 1.
15	15	*/
16	16	private static $redirected_in_new_tab = array();
17	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	18	public static function menu() {
29	19	$menu_label = __( 'Forms', 'formidable' );
30		-
31	20	if ( ! FrmAppHelper::pro_is_installed() ) {
32	21	$menu_label .= ' (Lite)';
33	22	}
34		-
35	23	add_submenu_page( 'formidable', 'Formidable | ' . $menu_label, $menu_label, 'frm_view_forms', 'formidable', 'FrmFormsController::route' );
36	24
37	25	self::maybe_load_listing_hooks();
38	26	}
		@@ -66,12 +54,12 @@
66	54	*/
67	55	public static function logic_tip() {
68	56	$images_url = FrmAppHelper::plugin_url() . '/images/';
69	57	$data_message = __( 'Only show the fields you need and create branching forms. Upgrade to get conditional logic and question branching.', 'formidable' );
70		- $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' ) . '"/>'; // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong
71		- 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">'; // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong
	58	+ $data_message .= ' <img src="' . esc_attr( $images_url ) . '/survey-logic.png" srcset="' . esc_attr( $images_url ) . 'survey-logic@2x.png 2x" alt="' . esc_attr__( 'Conditional Logic options', 'formidable' ) . '"/>';
	59	+ echo '<a href="javascript:void(0)" class="frm_noallow frm_show_upgrade frm_add_logic_link frm-collapsed frm-flex-justify" data-upgrade="' . esc_attr__( 'Conditional Logic options', 'formidable' ) . '" data-message="' . esc_attr( $data_message ) . '" data-medium="builder" data-content="logic">';
72	60	esc_html_e( 'Conditional Logic', 'formidable' );
73		- FrmAppHelper::icon_by_class( 'frmfont frm_arrowdown8_icon', array( 'aria-hidden' => 'true' ) );
	61	+ FrmAppHelper::icon_by_class( 'frmfont frm_arrowdown6_icon', array( 'aria-hidden' => 'true' ) );
74	62	echo '</a>';
75	63	}
76	64
77	65	/**
		@@ -78,15 +66,12 @@
78	66	* By default, Divi processes form shortcodes on the edit post page.
79	67	* Now that won't do.
80	68	*
81	69	* @since 3.01
82		- *
83		- * @param array $shortcodes List of shortcodes to process.
84		- *
85		- * @return array
86	70	*/
87	71	public static function prevent_divi_conflict( $shortcodes ) {
88	72	$shortcodes[] = 'formidable';
	73	+
89	74	return $shortcodes;
90	75	}
91	76
92	77	/**
		@@ -97,14 +82,12 @@
97	82
98	83	$message = '';
99	84	$params = FrmForm::list_page_params();
100	85	$errors = self::process_bulk_form_actions( array() );
101		-
102	86	if ( isset( $errors['message'] ) ) {
103	87	$message = $errors['message'];
104	88	unset( $errors['message'] );
105	89	}
106		-
107	90	$errors = apply_filters( 'frm_admin_list_form_action', $errors );
108	91
109	92	self::display_forms_list( $params, $message, $errors );
110	93	}
		@@ -113,30 +96,18 @@
113	96	* Create the default email action
114	97	*
115	98	* @since 2.02.11
116	99	*
117		- * @param int|object $form
118		- *
119		- * @return void
	100	+ * @param object|int $form
120	101	*/
121	102	private static function create_default_email_action( $form ) {
122	103	FrmForm::maybe_get_form( $form );
123		-
124		- if ( ! is_object( $form ) ) {
125		- return;
126		- }
127		-
128	104	$create_email = apply_filters( 'frm_create_default_email_action', true, $form );
129	105
130		- if ( ! $create_email ) {
131		- return;
	106	+ if ( $create_email ) {
	107	+ $action_control = FrmFormActionsController::get_form_actions( 'email' );
	108	+ $action_control->create( $form->id );
132	109	}
133		-
134		- /**
135		- * @var FrmFormAction
136		- */
137		- $action_control = FrmFormActionsController::get_form_actions( 'email' );
138		- $action_control->create( $form->id );
139	110	}
140	111
141	112	/**
142	113	* Create the default On submit action
		@@ -142,19 +113,13 @@
142	113	* Create the default On submit action
143	114	*
144	115	* @since 6.0.0
145	116	*
146		- * @param int|object $form Form object or ID.
147		- *
148		- * @return void
	117	+ * @param object|int $form Form object or ID.
149	118	*/
150	119	private static function create_default_on_submit_action( $form ) {
151	120	FrmForm::maybe_get_form( $form );
152	121
153		- if ( ! is_object( $form ) ) {
154		- return;
155		- }
156		-
157	122	/**
158	123	* Enable or disable the default On Submit action.
159	124	*
160	125	* @since 6.0.0
		@@ -163,73 +128,22 @@
163	128	* @param object $form Form object.
164	129	*/
165	130	$create = apply_filters( 'frm_create_default_on_submit_action', true, $form );
166	131
167		- if ( ! $create ) {
168		- return;
	132	+ if ( $create ) {
	133	+ $action_control = FrmFormActionsController::get_form_actions( FrmOnSubmitAction::$slug );
	134	+ $action_control->create( $form->id );
169	135	}
170		-
171		- /**
172		- * @var FrmFormAction
173		- */
174		- $action_control = FrmFormActionsController::get_form_actions( FrmOnSubmitAction::$slug );
175		- $action_control->create( $form->id );
176	136	}
177	137
178		- /**
179		- * Creates submit button field.
180		- *
181		- * @since 6.9
182		- *
183		- * @param int|object $form Form ID or object.
184		- *
185		- * @return void
186		- */
187		- private static function create_submit_button_field( $form ) {
188		- FrmForm::maybe_get_form( $form );
189		-
190		- if ( ! is_object( $form ) ) {
191		- return;
192		- }
193		-
194		- if ( FrmSubmitHelper::get_submit_field( $form->id ) ) {
195		- // Do not create submit button field if it exists.
196		- return;
197		- }
198		-
199		- FrmField::create(
200		- array(
201		- 'type' => FrmSubmitHelper::FIELD_TYPE,
202		- 'name' => __( 'Submit', 'formidable' ),
203		- 'field_order' => FrmSubmitHelper::DEFAULT_ORDER,
204		- 'form_id' => $form->id,
205		- 'field_options' => FrmFieldsHelper::get_default_field_options( FrmSubmitHelper::FIELD_TYPE ),
206		- 'description' => '',
207		- 'default_value' => '',
208		- 'options' => array(),
209		- )
210		- );
211		- }
212		-
213		- /**
214		- * @param array|false $values
215		- *
216		- * @return void
217		- */
218	138	public static function edit( $values = false ) {
219	139	FrmAppHelper::permission_check( 'frm_edit_forms' );
220	140
221	141	$id = isset( $values['id'] ) ? absint( $values['id'] ) : FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
222	142
223		- self::get_edit_vars( $id );
	143	+ return self::get_edit_vars( $id );
224	144	}
225	145
226		- /**
227		- * @param mixed $id
228		- * @param string $message
229		- *
230		- * @return void
231		- */
232	146	public static function settings( $id = false, $message = '' ) {
233	147	FrmAppHelper::permission_check( 'frm_edit_forms' );
234	148
235	149	if ( ! $id || ! is_numeric( $id ) ) {
		@@ -237,43 +151,30 @@
237	151	}
238	152
239	153	FrmOnSubmitHelper::maybe_migrate_submit_settings_to_action( $id );
240	154
241		- self::get_settings_vars( $id, array(), $message );
	155	+ return self::get_settings_vars( $id, array(), $message );
242	156	}
243	157
244	158	public static function update_settings() {
245	159	FrmAppHelper::permission_check( 'frm_edit_forms' );
246		- $process_form = FrmAppHelper::get_post_param( 'process_form', '', 'sanitize_text_field' );
247	160
248		- if ( ! wp_verify_nonce( $process_form, 'process_form_nonce' ) ) {
249		- $frm_settings = FrmAppHelper::get_settings();
250		- $error_args = array(
251		- 'title' => __( 'Verification failed', 'formidable' ),
252		- 'body' => $frm_settings->admin_permission,
253		- 'cancel_text' => __( 'Cancel', 'formidable' ),
254		- );
255		- FrmAppController::show_error_modal( $error_args );
256		- return;
257		- }
	161	+ $id = FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
258	162
259		- $id = FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
260		- $errors = FrmForm::validate( $_POST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
	163	+ $errors = FrmForm::validate( $_POST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
261	164	$warnings = FrmFormsHelper::check_for_warnings( $_POST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
262	165
263	166	if ( count( $errors ) > 0 ) {
264		- self::get_settings_vars( $id, $errors, compact( 'warnings' ) );
265		- return;
	167	+ return self::get_settings_vars( $id, $errors, compact( 'warnings' ) );
266	168	}
267	169
268	170	do_action( 'frm_before_update_form_settings', $id );
269	171
270		- $antispam_was_on = self::antispam_was_on( $id ); // phpcs:ignore Formidable.CodeAnalysis.InlineSingleUseVariable
	172	+ $antispam_was_on = self::antispam_was_on( $id );
271	173
272	174	FrmForm::update( $id, $_POST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
273	175
274	176	$antispam_is_on = ! empty( $_POST['options']['antispam'] ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
275		-
276	177	if ( $antispam_is_on !== $antispam_was_on ) {
277	178	FrmAntiSpam::clear_caches();
278	179	}
279	180
		@@ -278,14 +179,13 @@
278	179	}
279	180
280	181	$message = __( 'Settings Successfully Updated', 'formidable' );
281	182
282		- self::get_settings_vars( $id, array(), compact( 'message', 'warnings' ) );
	183	+ return self::get_settings_vars( $id, array(), compact( 'message', 'warnings' ) );
283	184	}
284	185
285	186	/**
286	187	* @param int $form_id
287		- *
288	188	* @return bool
289	189	*/
290	190	private static function antispam_was_on( $form_id ) {
291	191	$form = FrmForm::getOne( $form_id );
		@@ -291,15 +191,10 @@
291	191	$form = FrmForm::getOne( $form_id );
292	192	return ! empty( $form->options['antispam'] );
293	193	}
294	194
295		- /**
296		- * @param array $values
297		- *
298		- * @return void
299		- */
300	195	public static function update( $values = array() ) {
301		- if ( ! $values ) {
	196	+ if ( empty( $values ) ) {
302	197	$values = $_POST; // phpcs:ignore WordPress.Security.NonceVerification.Missing
303	198	}
304	199
305	200	// Set radio button and checkbox meta equal to "other" value.
		@@ -308,9 +203,8 @@
308	203	}
309	204
310	205	$errors = FrmForm::validate( $values );
311	206	$permission_error = FrmAppHelper::permission_nonce_error( 'frm_edit_forms', 'frm_save_form', 'frm_save_form_nonce' );
312		-
313	207	if ( $permission_error !== false ) {
314	208	$errors['form'] = $permission_error;
315	209	}
316	210
		@@ -316,93 +210,65 @@
316	210
317	211	$id = isset( $values['id'] ) ? absint( $values['id'] ) : FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
318	212
319	213	if ( count( $errors ) > 0 ) {
320		- self::get_edit_vars( $id, $errors );
321		- return;
322		- }
	214	+ return self::get_edit_vars( $id, $errors );
	215	+ } else {
	216	+ FrmForm::update( $id, $values );
	217	+ $message = __( 'Form was successfully updated.', 'formidable' );
323	218
324		- self::maybe_remove_draft_option_from_fields( $id );
	219	+ if ( self::is_too_long( $values ) ) {
	220	+ $message .= '<br/> ' . sprintf(
	221	+ /* translators: %1$s: Start link HTML, %2$s: end link HTML */
	222	+ __( 'However, your form is very long and may be %1$sreaching server limits%2$s.', 'formidable' ),
	223	+ '<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">',
	224	+ '</a>'
	225	+ );
	226	+ }
325	227
326		- FrmForm::update( $id, $values );
327		- $message = __( 'Form was successfully updated.', 'formidable' );
	228	+ if ( defined( 'DOING_AJAX' ) ) {
	229	+ wp_die( FrmAppHelper::kses( $message, array( 'a' ) ) ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
	230	+ }
328	231
329		- if ( self::is_too_long( $values ) ) {
330		- $message .= '<br/> ' . sprintf(
331		- /* translators: %1$s: Start link HTML, %2$s: end link HTML */
332		- __( 'However, your form is very long and may be %1$sreaching server limits%2$s.', 'formidable' ),
333		- '<a href="' . esc_url( self::get_form_too_long_docs_url() ) . '" target="_blank" rel="noopener">',
334		- '</a>'
335		- );
336		- }
337		-
338		- if ( defined( 'DOING_AJAX' ) ) {
339		- wp_die( FrmAppHelper::kses( $message, array( 'a' ) ) ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
340		- }
341		-
342		- self::get_edit_vars( $id, array(), $message );
	232	+ return self::get_edit_vars( $id, array(), $message );
	233	+ }//end if
343	234	}
344	235
345	236	/**
346		- * @since 6.25.1
	237	+ * Check if the value at the end of the form was included.
	238	+ * If it's missing, it means other values at the end of the form
	239	+ * were likely not saved either.
347	240	*
348		- * @return string
	241	+ * @since 3.06.01
349	242	*/
350		- private static function get_form_too_long_docs_url() {
351		- $utm = array(
352		- 'campaign' => 'builder',
353		- 'content' => 'form-too-long',
354		- );
355		- return FrmAppHelper::admin_upgrade_link( $utm, 'knowledgebase/i-have-a-long-form-why-did-the-options-at-the-end-of-the-form-stop-saving/' );
	243	+ private static function is_too_long( $values ) {
	244	+ return ( ! isset( $values['frm_end'] ) ) || empty( $values['frm_end'] );
356	245	}
357	246
358	247	/**
359		- * Remove the draft flag from any new fields from this current session.
	248	+ * Redirect to the url for creating from a template
	249	+ * Also delete the current form
360	250	*
361		- * @since 6.8
362		- *
363		- * @param int $form_id
364		- *
365		- * @return void
	251	+ * @since 2.0
	252	+ * @deprecated 3.06
366	253	*/
367		- private static function maybe_remove_draft_option_from_fields( $form_id ) {
368		- $draft_field_ids_csv = FrmAppHelper::get_post_param( 'draft_fields', '', 'sanitize_text_field' );
	254	+ public static function _create_from_template() {
	255	+ _deprecated_function( __FUNCTION__, '3.06' );
369	256
370		- if ( ! $draft_field_ids_csv ) {
371		- // If the draft_fields input is empty there are no new fields in the session.
372		- return;
373		- }
	257	+ FrmAppHelper::permission_check( 'frm_edit_forms' );
	258	+ check_ajax_referer( 'frm_ajax', 'nonce' );
374	259
375		- $draft_field_ids = array_filter( explode( ',', $draft_field_ids_csv ), 'is_numeric' );
	260	+ $current_form = FrmAppHelper::get_param( 'this_form', '', 'get', 'absint' );
	261	+ $template_id = FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
376	262
377		- if ( ! $draft_field_ids ) {
378		- // Exit early if the draft fields input is invalid. It should be a CSV of integer values.
379		- return;
	263	+ if ( $current_form ) {
	264	+ FrmForm::destroy( $current_form );
380	265	}
381	266
382		- $draft_field_rows = FrmFieldsHelper::get_draft_field_results( $form_id, $draft_field_ids );
383		-
384		- foreach ( $draft_field_rows as $row ) {
385		- $row->field_options['draft'] = 0;
386		- FrmField::update( $row->id, array( 'field_options' => $row->field_options ) );
387		- }
	267	+ echo esc_url_raw( admin_url( 'admin.php?page=formidable&frm_action=duplicate&id=' . absint( $template_id ) ) );
	268	+ wp_die();
388	269	}
389	270
390		- /**
391		- * Check if the value at the end of the form was included.
392		- * If it's missing, it means other values at the end of the form
393		- * were likely not saved either.
394		- *
395		- * @since 3.06.01
396		- *
397		- * @param array $values
398		- *
399		- * @return bool
400		- */
401		- private static function is_too_long( $values ) {
402		- return empty( $values['frm_end'] );
403		- }
404		-
405	271	public static function duplicate() {
406	272	FrmAppHelper::permission_check( 'frm_edit_forms' );
407	273	$nonce = FrmAppHelper::simple_get( '_wpnonce' );
408	274
		@@ -417,10 +283,10 @@
417	283	$message = 'form_duplicate_error';
418	284
419	285	if ( $form ) {
420	286	$new_template = FrmAppHelper::simple_get( 'new_template' ) ? '&new_template=true' : '';
421		- $url = admin_url( 'admin.php?page=formidable&frm_action=edit&id=' . absint( $form ) . $new_template );
422		- $message = 'form_duplicated';
	287	+ $url = admin_url( 'admin.php?page=formidable&frm_action=edit&id=' . absint( $form ) . $new_template );
	288	+ $message = 'form_duplicated';
423	289	}
424	290
425	291	$url .= '&message=' . $message;
426	292
		@@ -428,26 +294,20 @@
428	294	exit();
429	295	}
430	296
431	297	/**
432		- * @return string|null
	298	+ * @return string
433	299	*/
434	300	public static function page_preview() {
435	301	$params = FrmForm::list_page_params();
436		-
437		- if ( ! $params['form'] || is_numeric( $params['form'] ) ) {
438		- return null;
	302	+ if ( ! $params['form'] ) {
	303	+ return;
439	304	}
440	305
441		- self::maybe_block_preview( $params['form'] );
442		-
443	306	$form = FrmForm::getOne( $params['form'] );
444		-
445		- if ( ! $form ) {
446		- return null;
	307	+ if ( $form ) {
	308	+ return self::show_form( $form->id, '', 'auto', 'auto' );
447	309	}
448		-
449		- return self::show_form( $form->id, '', 'auto', 'auto' );
450	310	}
451	311
452	312	/**
453	313	* @since 3.0
		@@ -454,19 +314,9 @@
454	314	*
455	315	* @return void
456	316	*/
457	317	public static function show_page_preview() {
458		- $preview = self::page_preview();
459		-
460		- if ( is_null( $preview ) ) {
461		- wp_die(
462		- '<h1>' . esc_html__( 'Form key is invalid', 'formidable' ) . '</h1>',
463		- '<p>' . esc_html__( 'Form key is invalid', 'formidable' ) . '</p>',
464		- 404
465		- );
466		- }
467		-
468		- echo $preview; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
	318	+ echo self::page_preview(); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
469	319	}
470	320
471	321	/**
472	322	* @return void
		@@ -477,19 +327,9 @@
477	327
478	328	global $frm_vars;
479	329	$frm_vars['preview'] = true;
480	330
481		- // print_emoji_styles is deprecated.
482		- remove_action( 'wp_print_styles', 'print_emoji_styles' );
483		-
484		- if ( FrmTestModeController::should_add_test_mode_container() ) {
485		- do_action( 'frm_test_mode_init' );
486		- add_action( 'wp_enqueue_scripts', 'FrmTestModeController::register_and_enqueue_required_scripts' );
487		- add_filter( 'frm_filter_final_form', 'FrmTestModeController::maybe_add_test_mode_container', 99 );
488		- }
489		-
490	331	$include_theme = FrmAppHelper::get_param( 'theme', '', 'get', 'absint' );
491		-
492	332	if ( $include_theme ) {
493	333	self::set_preview_query();
494	334	self::load_theme_preview();
495	335	} else {
		@@ -512,9 +352,8 @@
512	352	'post_type' => 'page',
513	353	);
514	354
515	355	$page_for_posts = get_option( 'page_for_posts' );
516		-
517	356	if ( is_numeric( $page_for_posts ) ) {
518	357	// Avoid querying for the "Posts Page" or "Blog Page" so we don't display 10 forms.
519	358	$page_query['post__not_in'] = array( $page_for_posts );
520	359	}
		@@ -519,15 +358,13 @@
519	358	$page_query['post__not_in'] = array( $page_for_posts );
520	359	}
521	360
522	361	$random_page = get_posts( $page_query );
523		-
524	362	if ( ! $random_page ) {
525	363	return;
526	364	}
527	365
528	366	$random_page = reset( $random_page );
529		-
530	367	if ( ! is_a( $random_page, 'WP_Post' ) ) {
531	368	// The return type can also be int.
532	369	return;
533	370	}
		@@ -549,9 +386,8 @@
549	386	*
550	387	* @since 5.5.2
551	388	*
552	389	* @param WP_Post $page The page object.
553		- *
554	390	* @return void
555	391	*/
556	392	private static function set_post_global( $page ) {
557	393	global $post;
		@@ -559,10 +395,8 @@
559	395	}
560	396
561	397	/**
562	398	* @since 3.0
563		- *
564		- * @return void
565	399	*/
566	400	private static function load_theme_preview() {
567	401	add_filter( 'wp_title', 'FrmFormsController::preview_title', 9999 );
568	402	add_filter( 'the_title', 'FrmFormsController::preview_page_title', 9999 );
		@@ -570,16 +404,14 @@
570	404	add_action( 'loop_no_results', 'FrmFormsController::show_page_preview' );
571	405	add_filter( 'is_active_sidebar', '__return_false' );
572	406	FrmStylesController::enqueue_css( 'enqueue', true );
573	407
574		- if ( false !== get_template_part( 'page' ) ) {
575		- return;
	408	+ if ( false === get_template_part( 'page' ) ) {
	409	+ if ( function_exists( 'wp_is_block_theme' ) && wp_is_block_theme() ) {
	410	+ add_filter( 'body_class', 'FrmFormsController::preview_block_theme_body_classnames' );
	411	+ }
	412	+ self::fallback_when_page_template_part_is_not_supported_by_theme();
576	413	}
577		-
578		- if ( function_exists( 'wp_is_block_theme' ) && wp_is_block_theme() ) {
579		- add_filter( 'body_class', 'FrmFormsController::preview_block_theme_body_classnames' );
580		- }
581		- self::fallback_when_page_template_part_is_not_supported_by_theme();
582	414	}
583	415
584	416	/**
585	417	* Add padding to the body for block themes.
		@@ -586,9 +418,8 @@
586	418	*
587	419	* @since 6.5.2
588	420	*
589	421	* @param array $classes The body classes list.
590		- *
591	422	* @return array
592	423	*/
593	424	public static function preview_block_theme_body_classnames( $classes ) {
594	425	$classes[] = 'has-global-padding';
		@@ -597,41 +428,31 @@
597	428
598	429	/**
599	430	* Not every theme supports get_template_part( 'page' ).
600	431	* When this is not supported, false is returned, and we can handle a fallback.
601		- *
602		- * @return void
603	432	*/
604	433	private static function fallback_when_page_template_part_is_not_supported_by_theme() {
605		- if ( ! have_posts() ) {
606		- return;
607		- }
	434	+ if ( have_posts() ) {
	435	+ the_post();
	436	+ self::get_template( 'header' );
608	437
609		- the_post();
610		- self::get_template( 'header' );
	438	+ // add some generic class names to the container to add some natural padding to the content.
	439	+ // .entry-content catches the WordPress TwentyTwenty theme.
	440	+ // .container catches Customizr content.
	441	+ echo '<div class="container entry-content">';
	442	+ the_content();
	443	+ echo '</div>';
611	444
612		- // Add some generic class names to the container to add some natural padding to the content.
613		- // .entry-content catches the WordPress TwentyTwenty theme.
614		- // .container catches Customizr content.
615		- echo '<div class="container entry-content">';
616		- the_content();
617		- echo '</div>';
618		-
619		- // Prevent extra unexpected forms in the footer.
620		- // For some reason this happens in the Twenty Twenty Five theme.
621		- add_filter( 'frm_filter_final_form', '__return_empty_string' );
622		-
623		- self::get_template( 'footer' );
	445	+ self::get_template( 'footer' );
	446	+ }
624	447	}
625	448
626	449	/**
627	450	* Calls core function to get a template part if it doesn't cause deprecation warnings. Otherwise skips the deprecation function call
628		- * and renders required html fragments calling required functions.
	451	+ * and renders required html fragements calling required functions.
629	452	*
630	453	* @since 6.7.1
631		- *
632	454	* @param string $template
633		- *
634	455	* @return void
635	456	*/
636	457	private static function get_template( $template ) {
637	458	if ( self::should_try_getting_template( $template ) ) {
		@@ -652,11 +473,9 @@
652	473	/**
653	474	* Returns true if calling a template function doesn't trigger deprecation warnings.
654	475	*
655	476	* @since 6.7.1
656		- *
657	477	* @param string $template
658		- *
659	478	* @return bool
660	479	*/
661	480	private static function should_try_getting_template( $template ) {
662	481	$stylesheet_path = get_stylesheet_directory();
		@@ -670,25 +489,21 @@
670	489	/**
671	490	* Set the page title for the theme preview page
672	491	*
673	492	* @since 3.0
674		- *
675		- * @param string $title
676		- *
677		- * @return string
678	493	*/
679	494	public static function preview_page_title( $title ) {
680		- return in_the_loop() ? self::preview_title( $title ) : $title;
	495	+ if ( in_the_loop() ) {
	496	+ $title = self::preview_title( $title );
	497	+ }
	498	+
	499	+ return $title;
681	500	}
682	501
683	502	/**
684		- * Set the page title for the theme preview page.
	503	+ * Set the page title for the theme preview page
685	504	*
686	505	* @since 3.0
687		- *
688		- * @param string $title
689		- *
690		- * @return string
691	506	*/
692	507	public static function preview_title( $title ) {
693	508	return __( 'Form Preview', 'formidable' );
694	509	}
		@@ -698,9 +513,8 @@
698	513	*
699	514	* @since 3.0
700	515	*
701	516	* @param string $content
702		- *
703	517	* @return string
704	518	*/
705	519	public static function preview_content( $content ) {
706	520	if ( in_the_loop() ) {
		@@ -715,92 +529,23 @@
715	529	/**
716	530	* @since 3.0
717	531	*/
718	532	private static function load_direct_preview() {
	533	+ header( 'Content-Type: text/html; charset=' . get_option( 'blog_charset' ) );
	534	+
719	535	$key = FrmAppHelper::simple_get( 'form', 'sanitize_title' );
720		-
721		- // phpcs:ignore Universal.Operators.StrictComparisons
722	536	if ( $key == '' ) {
723	537	$key = FrmAppHelper::get_post_param( 'form', '', 'sanitize_title' );
724	538	}
725	539
726		- if ( ! $key ) {
727		- $error = __( 'Form key is missing', 'formidable' );
728		- wp_die(
729		- '<h1>' . esc_html( $error ) . '</h1>',
730		- '<p>' . esc_html( $error ) . '</p>',
731		- 404
732		- );
733		- }
734		-
735		- self::maybe_block_preview( $key );
736		-
737	540	$form = FrmForm::getAll( array( 'form_key' => $key ), '', 1 );
738		-
739		- if ( ! $form ) {
740		- $error = __( 'Form does not exist', 'formidable' );
741		- wp_die(
742		- '<h1>' . esc_html( $error ) . '</h1>',
743		- '<p>' . esc_html( $error ) . '</p>',
744		- 404
745		- );
	541	+ if ( empty( $form ) ) {
	542	+ $form = FrmForm::getAll( array(), '', 1 );
746	543	}
747	544
748		- header( 'Content-Type: text/html; charset=' . get_option( 'blog_charset' ) );
749		-
750		- self::fix_deprecated_null_param_warning();
751		-
752		- require FrmAppHelper::plugin_path() . '/classes/views/frm-entries/direct.php';
	545	+ require( FrmAppHelper::plugin_path() . '/classes/views/frm-entries/direct.php' );
753	546	}
754	547
755		- /**
756		- * Block the form preview for the contact form by default if the user cannot view forms.
757		- * This is to prevent the contact form being exploited.
758		- * Since this form is added by default and every site uses the same key, it is too easy
759		- * to guess this form.
760		- *
761		- * @since 6.20
762		- *
763		- * @param string $form_key Form key.
764		- *
765		- * @return void
766		- */
767		- public static function maybe_block_preview( $form_key ) {
768		- if ( ! FrmFormsHelper::should_block_preview( $form_key ) ) {
769		- return;
770		- }
771		-
772		- $error = __( 'You do not have permission to view this form', 'formidable' );
773		- wp_die(
774		- '<h1>' . esc_html( $error ) . '</h1>',
775		- '<p>' . esc_html( $error ) . '</p>',
776		- 403
777		- );
778		- }
779		-
780		- /**
781		- * Some themes have a null $src value.
782		- * This function adds a filter to ensure that $src is not null.
783		- * WP will call str_starts_with with the null value triggering a deprecated message otherwise.
784		- *
785		- * @since 6.10
786		- *
787		- * @return void
788		- */
789		- private static function fix_deprecated_null_param_warning() {
790		- add_filter(
791		- 'script_loader_src',
792		- /**
793		- * @param string|null $src
794		- *
795		- * @return string
796		- */
797		- function ( $src ) {
798		- return is_null( $src ) ? '' : $src;
799		- }
800		- );
801		- }
802		-
803	548	public static function untrash() {
804	549	self::change_form_status( 'untrash' );
805	550	}
806	551
		@@ -805,9 +550,8 @@
805	550	}
806	551
807	552	/**
808	553	* @param array $ids
809		- *
810	554	* @return string
811	555	*/
812	556	public static function bulk_untrash( $ids ) {
813	557	FrmAppHelper::permission_check( 'frm_edit_forms' );
		@@ -819,9 +563,11 @@
819	563	return '';
820	564	}
821	565
822	566	/* translators: %1$s: Number of forms */
823		- return sprintf( _n( '%1$s form restored from the Trash.', '%1$s forms restored from the Trash.', $count, 'formidable' ), $count );
	567	+ $message = sprintf( _n( '%1$s form restored from the Trash.', '%1$s forms restored from the Trash.', $count, 'formidable' ), $count );
	568	+
	569	+ return $message;
824	570	}
825	571
826	572	/**
827	573	* @since 3.06
		@@ -866,11 +612,10 @@
866	612	// Check nonce url.
867	613	check_admin_referer( $status . '_form_' . $params['id'] );
868	614
869	615	$count = 0;
870		-
871	616	if ( FrmForm::set_status( $params['id'], $available_status[ $status ]['new_status'] ) ) {
872		- ++$count;
	617	+ $count ++;
873	618	}
874	619
875	620	$form_type = FrmAppHelper::get_simple_request(
876	621	array(
		@@ -882,9 +627,9 @@
882	627	/* translators: %1$s: Number of forms */
883	628	$available_status['untrash']['message'] = sprintf( _n( '%1$s form restored from the Trash.', '%1$s forms restored from the Trash.', $count, 'formidable' ), $count );
884	629
885	630	/* translators: %1$s: Number of forms, %2$s: Start link HTML, %3$s: End link HTML */
886		- $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>' ); // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong
	631	+ $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>' );
887	632
888	633	$message = $available_status[ $status ]['message'];
889	634
890	635	self::display_forms_list( $params, $message );
		@@ -889,28 +634,18 @@
889	634
890	635	self::display_forms_list( $params, $message );
891	636	}
892	637
893		- /**
894		- * @param array $ids
895		- *
896		- * @return string
897		- */
898	638	public static function bulk_trash( $ids ) {
899	639	FrmAppHelper::permission_check( 'frm_delete_forms' );
900	640
901	641	$count = 0;
902		-
903	642	foreach ( $ids as $id ) {
904	643	if ( FrmForm::trash( $id ) ) {
905		- ++$count;
	644	+ $count ++;
906	645	}
907	646	}
908	647
909		- if ( ! $count ) {
910		- return '';
911		- }
912		-
913	648	$current_page = FrmAppHelper::get_simple_request(
914	649	array(
915	650	'param' => 'form_type',
916	651	'type' => 'request',
		@@ -915,16 +650,17 @@
915	650	'param' => 'form_type',
916	651	'type' => 'request',
917	652	)
918	653	);
919		-
920		- return sprintf(
	654	+ $message = sprintf(
921	655	/* translators: %1$s: Number of forms, %2$s: Start link HTML, %3$s: End link HTML */
922	656	_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' ),
923	657	$count,
924		- '<a href="' . esc_url( wp_nonce_url( '?page=formidable&frm_action=list&action=bulk_untrash&form_type=' . $current_page . '&item-action=' . implode( ',', $ids ), 'bulk-toplevel_page_formidable' ) ) . '">', // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong
	658	+ '<a href="' . esc_url( wp_nonce_url( '?page=formidable&frm_action=list&action=bulk_untrash&form_type=' . $current_page . '&item-action=' . implode( ',', $ids ), 'bulk-toplevel_page_formidable' ) ) . '">',
925	659	'</a>'
926	660	);
	661	+
	662	+ return $message;
927	663	}
928	664
929	665	public static function destroy() {
930	666	FrmAppHelper::permission_check( 'frm_delete_forms' );
		@@ -934,11 +670,10 @@
934	670	// Check nonce url.
935	671	check_admin_referer( 'destroy_form_' . $params['id'] );
936	672
937	673	$count = 0;
938		-
939	674	if ( FrmForm::destroy( $params['id'] ) ) {
940		- ++$count;
	675	+ $count ++;
941	676	}
942	677
943	678	/* translators: %1$s: Number of forms */
944	679	$message = sprintf( _n( '%1$s Form Permanently Deleted', '%1$s Forms Permanently Deleted', $count, 'formidable' ), $count );
		@@ -945,23 +680,16 @@
945	680
946	681	self::display_forms_list( $params, $message );
947	682	}
948	683
949		- /**
950		- * @param array $ids
951		- *
952		- * @return string
953		- */
954	684	public static function bulk_destroy( $ids ) {
955	685	FrmAppHelper::permission_check( 'frm_delete_forms' );
956	686
957	687	$count = 0;
958		-
959	688	foreach ( $ids as $id ) {
960	689	$d = FrmForm::destroy( $id );
961		-
962	690	if ( $d ) {
963		- ++$count;
	691	+ $count ++;
964	692	}
965	693	}
966	694
967	695	if ( $count ) {
		@@ -977,16 +705,17 @@
977	705	*/
978	706	public static function delete_all() {
979	707	// Check nonce url.
980	708	$permission_error = FrmAppHelper::permission_nonce_error( 'frm_delete_forms', '_wpnonce', 'bulk-toplevel_page_formidable' );
981		-
982	709	if ( $permission_error !== false ) {
983	710	self::display_forms_list( array(), '', array( $permission_error ) );
	711	+
984	712	return;
985	713	}
986	714
987	715	$count = FrmForm::scheduled_delete( time() );
988	716	$url = remove_query_arg( array( 'delete_all' ) );
	717	+
989	718	$url .= '&message=forms_permanently_deleted&forms_deleted=' . $count;
990	719
991	720	wp_safe_redirect( $url );
992	721	die();
		@@ -1003,9 +732,9 @@
1003	732
1004	733	$new_values = self::get_modal_values();
1005	734	$new_values['form_key'] = $new_values['name'];
1006	735	$new_values['options'] = array(
1007		- 'antispam' => 1,
	736	+ 'antispam' => 1,
1008	737	'on_submit_migrated' => 1,
1009	738	);
1010	739
1011	740	/**
		@@ -1024,9 +753,8 @@
1024	753	* @param int $form_id
1025	754	*/
1026	755	do_action( 'frm_build_new_form', $form_id );
1027	756
1028		- self::create_submit_button_field( $form_id );
1029	757	self::create_default_on_submit_action( $form_id );
1030	758	self::create_default_email_action( $form_id );
1031	759
1032	760	$response = array(
		@@ -1040,10 +768,8 @@
1040	768	/**
1041	769	* Before creating a new form, get the name and description from the modal.
1042	770	*
1043	771	* @since 4.0
1044		- *
1045		- * @return array<string,string>
1046	772	*/
1047	773	public static function get_modal_values() {
1048	774	$name = FrmAppHelper::get_param( 'name', '', 'post', 'sanitize_text_field' );
1049	775	$desc = FrmAppHelper::get_param( 'desc', '', 'post', 'sanitize_textarea_field' );
		@@ -1058,26 +784,18 @@
1058	784	* Inserts Formidable button
1059	785	* Hook exists since 2.5.0
1060	786	*
1061	787	* @since 2.0.15
1062		- *
1063		- * @return void
1064	788	*/
1065	789	public static function insert_form_button() {
1066		- if ( ! current_user_can( 'frm_view_forms' ) ) {
1067		- return;
1068		- }
1069		-
1070		- // Store the result in memory and re-use it when this function is called multiple times.
1071		- // This helps speed up the form builder when there are a lot of HTML fields, where this
1072		- // Button is inserted once per HTML field.
1073		- // In a form with 66 HTML fields, this saves 0.5 seconds on page load time, tested locally.
1074		- if ( ! isset( self::$formidable_tinymce_button ) ) {
	790	+ if ( current_user_can( 'frm_view_forms' ) ) {
1075	791	FrmAppHelper::load_admin_wide_js();
1076		- $icon = apply_filters( 'frm_media_icon', FrmAppHelper::svg_logo() );
1077		- 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( FrmAppHelper::get_menu_name() ) . '</a>'; // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong
	792	+ $menu_name = FrmAppHelper::get_menu_name();
	793	+ $icon = apply_filters( 'frm_media_icon', FrmAppHelper::svg_logo() );
	794	+ 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' ) . '">' .
	795	+ FrmAppHelper::kses( $icon, 'all' ) . // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
	796	+ ' ' . esc_html( $menu_name ) . '</a>';
1078	797	}
1079		- echo self::$formidable_tinymce_button; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
1080	798	}
1081	799
1082	800	/**
1083	801	* @return void
		@@ -1098,21 +816,17 @@
1098	816	$shortcodes = apply_filters( 'frm_popup_shortcodes', $shortcodes );
1099	817
1100	818	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/insert_form_popup.php';
1101	819
1102		- if ( ! FrmAppHelper::is_form_builder_page() || class_exists( '_WP_Editors', false ) ) {
1103		- return;
	820	+ if ( FrmAppHelper::is_form_builder_page() && ! class_exists( '_WP_Editors', false ) ) {
	821	+ // initialize a wysiwyg so we have usable settings defined in tinyMCEPreInit.mceInit
	822	+ require ABSPATH . WPINC . '/class-wp-editor.php';
	823	+ ?>
	824	+ <div class="frm_hidden">
	825	+ <?php wp_editor( '', 'frm_description_placeholder', array() ); ?>
	826	+ </div>
	827	+ <?php
1104	828	}
1105		-
1106		- // Initialize a wysiwyg so we have usable settings defined in tinyMCEPreInit.mceInit
1107		- require ABSPATH . WPINC . '/class-wp-editor.php';
1108		- // phpcs:disable Generic.WhiteSpace.ScopeIndent
1109		- ?>
1110		- <div class="frm_hidden">
1111		- <?php wp_editor( '', 'frm_description_placeholder', array() ); ?>
1112		- </div>
1113		- <?php
1114		- // phpcs:enable Generic.WhiteSpace.ScopeIndent
1115	829	}
1116	830
1117	831	/**
1118	832	* Check the page being loaded, determine if this is a page that should include the form popup.
		@@ -1124,9 +838,8 @@
1124	838	private static function should_insert_form_popup() {
1125	839	if ( FrmAppHelper::is_form_builder_page() ) {
1126	840	return true;
1127	841	}
1128		-
1129	842	$page = basename( FrmAppHelper::get_server_value( 'PHP_SELF' ) );
1130	843	return in_array( $page, array( 'post.php', 'page.php', 'page-new.php', 'post-new.php' ), true );
1131	844	}
1132	845
		@@ -1134,10 +847,9 @@
1134	847	FrmAppHelper::permission_check( 'frm_view_forms' );
1135	848	check_ajax_referer( 'frm_ajax', 'nonce' );
1136	849
1137	850	$shortcode = FrmAppHelper::get_post_param( 'shortcode', '', 'sanitize_text_field' );
1138		-
1139		- if ( ! $shortcode ) {
	851	+ if ( empty( $shortcode ) ) {
1140	852	wp_die();
1141	853	}
1142	854
1143	855	echo '<div id="sc-opts-' . esc_attr( $shortcode ) . '" class="frm_shortcode_option">';
		@@ -1162,18 +874,17 @@
1162	874	'label' => __( 'Minimize form HTML', 'formidable' ),
1163	875	),
1164	876	);
1165	877	}
1166		-
1167	878	$opts = apply_filters( 'frm_sc_popup_opts', $opts, $shortcode );
1168	879
1169	880	if ( isset( $opts['form_id'] ) && is_string( $opts['form_id'] ) ) {
1170		- // Allow other shortcodes to use the required form id option
	881	+ // allow other shortcodes to use the required form id option
1171	882	$form_id = $opts['form_id'];
1172	883	unset( $opts['form_id'] );
1173	884	}
1174	885
1175		- include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/shortcode_opts.php';
	886	+ include( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/shortcode_opts.php' );
1176	887
1177	888	echo '</div>';
1178	889
1179	890	wp_die();
		@@ -1184,9 +895,8 @@
1184	895	*
1185	896	* @param array $params
1186	897	* @param string $message
1187	898	* @param array $errors
1188		- *
1189	899	* @return void
1190	900	*/
1191	901	public static function display_forms_list( $params = array(), $message = '', $errors = array() ) {
1192	902	FrmAppHelper::permission_check( 'frm_view_forms' );
		@@ -1203,44 +913,33 @@
1203	913	* @param string $table_class Class name for List Helper.
1204	914	*/
1205	915	$table_class = apply_filters( 'frm_forms_list_class', 'FrmFormsListHelper' );
1206	916	$wp_list_table = new $table_class( compact( 'params' ) );
1207		- $pagenum = $wp_list_table->get_pagenum();
1208	917
	918	+ $pagenum = $wp_list_table->get_pagenum();
	919	+
1209	920	$wp_list_table->prepare_items();
1210	921
1211	922	$total_pages = $wp_list_table->get_pagination_arg( 'total_pages' );
1212		-
1213	923	if ( $pagenum > $total_pages && $total_pages > 0 ) {
1214		- wp_safe_redirect( esc_url_raw( add_query_arg( 'paged', $total_pages ) ) );
	924	+ wp_redirect( esc_url_raw( add_query_arg( 'paged', $total_pages ) ) );
1215	925	die();
1216	926	}
1217	927
1218		- $error = FrmInbox::check_for_error();
1219		-
1220		- if ( $error ) {
1221		- $show_messages = array( $error['subject'] . '. ' . $error['message'] );
1222		- }
1223		-
1224	928	require FrmAppHelper::plugin_path() . '/classes/views/frm-forms/list.php';
1225	929	}
1226	930
1227	931	/**
1228	932	* @param array<string,string> $columns
1229		- *
1230	933	* @return array<string,string>
1231	934	*/
1232	935	public static function get_columns( $columns ) {
1233		- $columns['cb'] = '<input type="checkbox" />';
1234		- $columns['name'] = esc_html__( 'Form Title', 'formidable' );
1235		- $columns['entries'] = esc_html__( 'Entries', 'formidable' );
1236		- $columns['id'] = 'ID';
1237		- $columns['form_key'] = esc_html__( 'Key', 'formidable' );
1238		-
1239		- if ( 'trash' !== FrmAppHelper::simple_get( 'form_type' ) ) {
1240		- $columns['shortcode'] = esc_html__( 'Actions', 'formidable' );
1241		- }
1242		-
	936	+ $columns['cb'] = '<input type="checkbox" />';
	937	+ $columns['name'] = esc_html__( 'Form Title', 'formidable' );
	938	+ $columns['entries'] = esc_html__( 'Entries', 'formidable' );
	939	+ $columns['id'] = 'ID';
	940	+ $columns['form_key'] = esc_html__( 'Key', 'formidable' );
	941	+ $columns['shortcode'] = esc_html__( 'Actions', 'formidable' );
1243	942	$columns['created_at'] = esc_html__( 'Date', 'formidable' );
1244	943
1245	944	add_screen_option(
1246	945	'per_page',
		@@ -1253,11 +952,8 @@
1253	952
1254	953	return $columns;
1255	954	}
1256	955
1257		- /**
1258		- * @return array<string,string>
1259		- */
1260	956	public static function get_sortable_columns() {
1261	957	return array(
1262	958	'id' => 'id',
1263	959	'name' => 'name',
		@@ -1268,9 +964,8 @@
1268	964	}
1269	965
1270	966	/**
1271	967	* @param mixed $hidden_columns
1272		- *
1273	968	* @return array
1274	969	*/
1275	970	public static function hidden_columns( $hidden_columns ) {
1276	971	if ( ! is_array( $hidden_columns ) ) {
		@@ -1291,39 +986,24 @@
1291	986
1292	987	return $hidden_columns;
1293	988	}
1294	989
1295		- /**
1296		- * @param mixed $save
1297		- * @param string $option
1298		- * @param int|string $value
1299		- *
1300		- * @return mixed
1301		- */
1302	990	public static function save_per_page( $save, $option, $value ) {
1303		- if ( $option === 'formidable_page_formidable_per_page' ) {
1304		- return (int) $value;
	991	+ if ( $option == 'formidable_page_formidable_per_page' ) {
	992	+ $save = (int) $value;
1305	993	}
1306	994
1307	995	return $save;
1308	996	}
1309	997
1310		- /**
1311		- * @param int|string $id
1312		- * @param array $errors
1313		- * @param string $message
1314		- * @param bool $create_link
1315		- *
1316		- * @return void
1317		- */
1318	998	private static function get_edit_vars( $id, $errors = array(), $message = '', $create_link = false ) {
1319	999	global $frm_vars;
1320	1000
1321		- $form = FrmForm::getOne( $id );
	1001	+ $form = FrmForm::getOne( $id );
1322	1002	$error_args = array(
1323		- 'title' => __( 'You can\'t edit the form', 'formidable' ),
1324		- 'body' => __( 'You are trying to edit a form that does not exist', 'formidable' ),
1325		- 'cancel_url' => admin_url( 'admin.php?page=formidable' ),
	1003	+ 'title' => __( 'You can\'t edit the form', 'formidable' ),
	1004	+ 'body' => __( 'You are trying to edit a form that does not exist', 'formidable' ),
	1005	+ 'cancel_url' => admin_url( 'admin.php?page=formidable' ),
1326	1006	'continue_url' => add_query_arg(
1327	1007	array(
1328	1008	'page' => 'formidable',
1329	1009	)
		@@ -1328,9 +1008,8 @@
1328	1008	'page' => 'formidable',
1329	1009	)
1330	1010	),
1331	1011	);
1332		-
1333	1012	if ( ! $form ) {
1334	1013	FrmAppController::show_error_modal( $error_args );
1335	1014	return;
1336	1015	}
		@@ -1335,10 +1014,10 @@
1335	1014	return;
1336	1015	}
1337	1016
1338	1017	if ( 'trash' === $form->status ) {
1339		- $error_args['body'] = __( 'The form you\'re trying to edit is in trash. You must restore it first before you can make changes', 'formidable' );
1340		- $error_args['continue_url'] = add_query_arg(
	1018	+ $error_args['body'] = __( 'The form you\'re trying to edit is in trash. You must restore it first before you can make changes', 'formidable' );
	1019	+ $error_args['continue_url'] = add_query_arg(
1341	1020	array(
1342	1021	'page' => 'formidable',
1343	1022	'_wpnonce' => wp_create_nonce( 'untrash_form_' . $id ),
1344	1023	'form_type' => 'trash',
		@@ -1352,18 +1031,18 @@
1352	1031	}
1353	1032
1354	1033	if ( $form->parent_form_id ) {
1355	1034	/* translators: %1$s: Start link HTML, %2$s: End link HTML */
1356		- 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>' ) ); // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong
	1035	+ 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>' ) );
1357	1036	}
1358	1037
1359	1038	$frm_field_selection = FrmField::field_selection();
1360		- $fields = FrmField::get_all_for_form( $form->id );
1361	1039
	1040	+ $fields = FrmField::get_all_for_form( $form->id );
	1041	+
1362	1042	// Automatically add end section fields if they don't exist (2.0 migration).
1363	1043	$reset_fields = false;
1364	1044	FrmFormsHelper::auto_add_end_section_fields( $form, $fields, $reset_fields );
1365		- FrmSubmitHelper::maybe_create_submit_field( $form, $fields, $reset_fields );
1366	1045
1367	1046	if ( $reset_fields ) {
1368	1047	$fields = FrmField::get_all_for_form( $form->id, '', 'exclude' );
1369	1048	}
		@@ -1383,30 +1062,25 @@
1383	1062	*/
1384	1063	$values['fields'] = apply_filters( 'frm_fields_in_form_builder', $fields, compact( 'form' ) );
1385	1064
1386	1065	$edit_message = __( 'Form was successfully updated.', 'formidable' );
1387		-
1388		- if ( $form->is_template && $message === $edit_message ) {
	1066	+ if ( $form->is_template && $message == $edit_message ) {
1389	1067	$message = __( 'Template was successfully updated.', 'formidable' );
1390	1068	}
1391	1069
1392	1070	self::maybe_update_form_builder_message( $message );
1393	1071
1394		- $has_fields = ! empty( $values['fields'] ) && ! FrmSubmitHelper::only_contains_submit_field( $values['fields'] );
	1072	+ $all_templates = FrmForm::getAll( array( 'is_template' => 1 ), 'name' );
	1073	+ $has_fields = isset( $values['fields'] ) && ! empty( $values['fields'] );
1395	1074
1396	1075	if ( defined( 'DOING_AJAX' ) ) {
1397	1076	wp_die();
	1077	+ } else {
	1078	+ require( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/edit.php' );
1398	1079	}
1399		-
1400		- require FrmAppHelper::plugin_path() . '/classes/views/frm-forms/edit.php';
1401	1080	}
1402	1081
1403		- /**
1404		- * @param array $fields
1405		- *
1406		- * @return array
1407		- */
1408		- public static function update_form_builder_fields( $fields ) {
	1082	+ public static function update_form_builder_fields( $fields, $form ) {
1409	1083	foreach ( $fields as $field ) {
1410	1084	$field->do_not_include_icons = true;
1411	1085	}
1412	1086	return $fields;
		@@ -1411,13 +1085,8 @@
1411	1085	}
1412	1086	return $fields;
1413	1087	}
1414	1088
1415		- /**
1416		- * @param string $message
1417		- *
1418		- * @return void
1419		- */
1420	1089	public static function maybe_update_form_builder_message( &$message ) {
1421	1090	if ( 'form_duplicated' === FrmAppHelper::simple_get( 'message' ) ) {
1422	1091	$message = __( 'Form was Successfully Copied', 'formidable' );
1423	1092	}
		@@ -1422,22 +1091,13 @@
1422	1091	$message = __( 'Form was Successfully Copied', 'formidable' );
1423	1092	}
1424	1093	}
1425	1094
1426		- /**
1427		- * @param int|string $id
1428		- * @param array $errors
1429		- * @param array|string $args
1430		- *
1431		- * @return void
1432		- */
1433	1095	public static function get_settings_vars( $id, $errors = array(), $args = array() ) {
1434	1096	FrmAppHelper::permission_check( 'frm_edit_forms' );
1435	1097
1436	1098	global $frm_vars;
1437	1099
1438		- self::maybe_print_media_templates();
1439		-
1440	1100	if ( ! is_array( $args ) ) {
1441	1101	// For reverse compatibility.
1442	1102	$args = array(
1443	1103	'message' => $args,
		@@ -1450,12 +1110,13 @@
1450	1110	);
1451	1111	$args = array_merge( $defaults, $args );
1452	1112	$message = $args['message'];
1453	1113	$warnings = $args['warnings'];
1454		- $form = FrmForm::getOne( $id );
1455		- $fields = FrmField::get_all_for_form( $id );
1456		- $values = FrmAppHelper::setup_edit_vars( $form, 'forms', $fields, true );
1457	1114
	1115	+ $form = FrmForm::getOne( $id );
	1116	+ $fields = FrmField::get_all_for_form( $id );
	1117	+ $values = FrmAppHelper::setup_edit_vars( $form, 'forms', $fields, true );
	1118	+
1458	1119	/**
1459	1120	* Allows changing fields in the form settings.
1460	1121	*
1461	1122	* @since 5.0.04
		@@ -1469,42 +1130,17 @@
1469	1130
1470	1131	$sections = self::get_settings_tabs( $values );
1471	1132	$current = FrmAppHelper::simple_get( 't', 'sanitize_title', 'advanced_settings' );
1472	1133
1473		- require FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings.php';
	1134	+ require( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings.php' );
1474	1135	}
1475	1136
1476	1137	/**
1477		- * 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.
1478		- *
1479		- * @since 6.10
1480		- *
1481		- * @return void
1482		- */
1483		- private static function maybe_print_media_templates() {
1484		- if ( FrmAppHelper::pro_is_included() ) {
1485		- // This issue does not exist when Pro is active so exit early.
1486		- return;
1487		- }
1488		-
1489		- add_action(
1490		- 'wp_enqueue_editor',
1491		- function () {
1492		- wp_print_media_templates();
1493		- }
1494		- );
1495		- }
1496		-
1497		- /**
1498	1138	* @since 4.0
1499		- *
1500		- * @param array $atts
1501		- *
1502		- * @return void
1503	1139	*/
1504	1140	public static function form_publish_button( $atts ) {
1505	1141	$values = $atts['values'];
1506		- include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/_publish_box.php';
	1142	+ include( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/_publish_box.php' );
1507	1143	}
1508	1144
1509	1145	/**
1510	1146	* Get a list of all the settings tabs for the form settings page.
		@@ -1511,9 +1147,8 @@
1511	1147	*
1512	1148	* @since 4.0
1513	1149	*
1514	1150	* @param array $values
1515		- *
1516	1151	* @return array
1517	1152	*/
1518	1153	private static function get_settings_tabs( $values ) {
1519	1154	$sections = array(
		@@ -1519,20 +1154,20 @@
1519	1154	$sections = array(
1520	1155	'advanced' => array(
1521	1156	'name' => __( 'General', 'formidable' ),
1522	1157	'title' => __( 'General Form Settings', 'formidable' ),
1523		- 'function' => array( self::class, 'advanced_settings' ),
1524		- 'icon' => 'frmfont frm_settings_icon',
	1158	+ 'function' => array( __CLASS__, 'advanced_settings' ),
	1159	+ 'icon' => 'frm_icon_font frm_settings_icon',
1525	1160	),
1526	1161	'email' => array(
1527	1162	'name' => __( 'Actions & Notifications', 'formidable' ),
1528	1163	'function' => array( 'FrmFormActionsController', 'email_settings' ),
1529	1164	'id' => 'frm_notification_settings',
1530		- 'icon' => 'frmfont frm_mail_bulk_icon',
	1165	+ 'icon' => 'frm_icon_font frm_mail_bulk_icon',
1531	1166	),
1532	1167	'permissions' => array(
1533	1168	'name' => __( 'Form Permissions', 'formidable' ),
1534		- 'icon' => 'frmfont frm_lock_closed_icon',
	1169	+ 'icon' => 'frm_icon_font frm_lock_icon',
1535	1170	'html_class' => 'frm_show_upgrade_tab frm_noallow',
1536	1171	'data' => array(
1537	1172	'medium' => 'permissions',
1538	1173	'upgrade' => __( 'Form Permissions', 'formidable' ),
		@@ -1537,37 +1172,35 @@
1537	1172	'medium' => 'permissions',
1538	1173	'upgrade' => __( 'Form Permissions', 'formidable' ),
1539	1174	'message' => __( 'Allow editing, protect forms and files, limit entries, and save drafts. Upgrade to get form and entry permissions.', 'formidable' ),
1540	1175	'screenshot' => 'permissions.png',
1541		- 'learn-more' => FrmAppHelper::get_doc_url( 'general-form-settings/#kb-form-permissions', 'form-permissions-settings' ),
1542	1176	),
1543	1177	),
1544		- 'scheduling' => array(
	1178	+ 'scheduling' => array(
1545	1179	'name' => __( 'Form Scheduling', 'formidable' ),
1546		- 'icon' => 'frmfont frm_calendar_icon',
	1180	+ 'icon' => 'frm_icon_font frm_calendar_icon',
1547	1181	'html_class' => 'frm_show_upgrade_tab frm_noallow',
1548	1182	'data' => array(
1549	1183	'medium' => 'scheduling',
1550	1184	'upgrade' => __( 'Form scheduling settings', 'formidable' ),
1551	1185	'screenshot' => 'scheduling.png',
1552		- 'learn-more' => FrmAppHelper::get_doc_url( 'general-form-settings/#kb-form-scheduling', 'form-scheduling-settings' ),
1553	1186	),
1554	1187	),
1555	1188	'buttons' => array(
1556	1189	'name' => __( 'Buttons', 'formidable' ),
1557		- 'class' => self::class,
	1190	+ 'class' => __CLASS__,
1558	1191	'function' => 'buttons_settings',
1559		- 'icon' => 'frmfont frm_button_icon',
	1192	+ 'icon' => 'frm_icon_font frm_button_icon',
1560	1193	),
1561	1194	'landing' => array(
1562	1195	'name' => __( 'Form Landing Page', 'formidable' ),
1563		- 'icon' => 'frmfont frm_file_text_icon',
	1196	+ 'icon' => 'frm_icon_font frm_file_text_icon',
1564	1197	'html_class' => 'frm_show_upgrade_tab frm_noallow',
1565	1198	'data' => FrmAppHelper::get_landing_page_upgrade_data_params(),
1566	1199	),
1567	1200	'chat' => array(
1568	1201	'name' => __( 'Conversational Forms', 'formidable' ),
1569		- 'icon' => 'frmfont frm_chat_forms_icon',
	1202	+ 'icon' => 'frm_icon_font frm_chat_forms_icon',
1570	1203	'html_class' => 'frm_show_upgrade_tab frm_noallow',
1571	1204	'data' => FrmAppHelper::get_upgrade_data_params(
1572	1205	'chat',
1573	1206	array(
		@@ -1573,15 +1206,14 @@
1573	1206	array(
1574	1207	'upgrade' => __( 'Conversational Forms', 'formidable' ),
1575	1208	'message' => __( 'Ask one question at a time for automated conversations.', 'formidable' ),
1576	1209	'screenshot' => 'chat.png',
1577		- 'learn-more' => FrmAppHelper::get_doc_url( 'conversational-forms', 'conversational-forms-settings', false ),
1578	1210	)
1579	1211	),
1580	1212	),
1581		- 'abandonment' => array(
	1213	+ 'abandonment' => array(
1582	1214	'name' => __( 'Form Abandonment', 'formidable' ),
1583		- 'icon' => 'frmfont frm_abandoned_icon',
	1215	+ 'icon' => 'frm_icon_font frm_abandoned_icon',
1584	1216	'html_class' => 'frm_show_upgrade_tab frm_noallow',
1585	1217	'data' => FrmAppHelper::get_upgrade_data_params(
1586	1218	'abandonment',
1587	1219	array(
		@@ -1587,31 +1219,37 @@
1587	1219	array(
1588	1220	'upgrade' => __( 'Form abandonment settings', 'formidable' ),
1589	1221	'message' => __( 'Unlock the power of data capture to boost lead generation and master the art of form optimization.', 'formidable' ),
1590	1222	'screenshot' => 'abandonment.png',
1591		- 'learn-more' => FrmAppHelper::get_doc_url( 'features/form-abandonment-wordpress-plugin', 'form-abandonment-settings', false ),
1592	1223	)
1593	1224	),
1594	1225	),
1595	1226	'html' => array(
1596	1227	'name' => __( 'Customize HTML', 'formidable' ),
1597		- 'class' => self::class,
	1228	+ 'class' => __CLASS__,
1598	1229	'function' => 'html_settings',
1599		- 'icon' => 'frmfont frm_code_icon',
	1230	+ 'icon' => 'frm_icon_font frm_code_icon',
1600	1231	),
1601	1232	);
1602	1233
1603		- if ( ! has_action( 'frm_add_form_style_tab_options' ) && ! has_action( 'frm_add_form_button_options' ) ) {
1604		- unset( $sections['buttons'] );
	1234	+ foreach ( array( 'landing', 'chat', 'abandonment' ) as $feature ) {
	1235	+ if ( ! FrmAppHelper::show_new_feature( $feature ) ) {
	1236	+ unset( $sections[ $feature ] );
	1237	+ }
1605	1238	}
1606	1239
1607	1240	$sections = apply_filters( 'frm_add_form_settings_section', $sections, $values );
1608	1241
	1242	+ if ( FrmAppHelper::pro_is_installed() && ! FrmAppHelper::meets_min_pro_version( '4.0' ) ) {
	1243	+ // Prevent settings from showing in 2 spots.
	1244	+ unset( $sections['permissions'], $sections['scheduling'] );
	1245	+ }
	1246	+
1609	1247	foreach ( $sections as $key => $section ) {
1610	1248	$defaults = array(
1611	1249	'html_class' => '',
1612	1250	'name' => ucfirst( $key ),
1613		- 'icon' => 'frmfont frm_settings_icon',
	1251	+ 'icon' => 'frm_icon_font frm_settings_icon',
1614	1252	);
1615	1253
1616	1254	$section = array_merge( $defaults, $section );
1617	1255
		@@ -1617,9 +1255,8 @@
1617	1255
1618	1256	if ( ! isset( $section['anchor'] ) ) {
1619	1257	$section['anchor'] = $key;
1620	1258	}
1621		-
1622	1259	$section['anchor'] .= '_settings';
1623	1260
1624	1261	if ( ! isset( $section['title'] ) ) {
1625	1262	$section['title'] = $section['name'];
		@@ -1638,26 +1275,23 @@
1638	1275	/**
1639	1276	* @since 4.0
1640	1277	*
1641	1278	* @param array $values
1642		- *
1643		- * @return void
1644	1279	*/
1645	1280	public static function advanced_settings( $values ) {
1646	1281	$first_h3 = 'frm_first_h3';
	1282	+
1647	1283	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings-advanced.php';
1648	1284	}
1649	1285
1650	1286	/**
1651	1287	* @param array $values
1652		- *
1653		- * @return void
1654	1288	*/
1655	1289	public static function render_spam_settings( $values ) {
1656	1290	if ( function_exists( 'akismet_http_post' ) ) {
1657	1291	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/spam-settings/akismet.php';
1658	1292	}
1659		- include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/spam-settings/stopforumspam.php';
	1293	+ include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/spam-settings/honeypot.php';
1660	1294	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/spam-settings/antispam.php';
1661	1295	}
1662	1296
1663	1297	/**
		@@ -1663,13 +1297,16 @@
1663	1297	/**
1664	1298	* @since 4.0
1665	1299	*
1666	1300	* @param array $values
1667		- *
1668		- * @return void
1669	1301	*/
1670	1302	public static function buttons_settings( $values ) {
1671		- include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings-buttons.php';
	1303	+ $styles = apply_filters( 'frm_get_style_opts', array() );
	1304	+
	1305	+ $frm_settings = FrmAppHelper::get_settings();
	1306	+ $no_global_style = $frm_settings->load_style === 'none';
	1307	+
	1308	+ include( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings-buttons.php' );
1672	1309	}
1673	1310
1674	1311	/**
1675	1312	* @since 4.0
		@@ -1674,13 +1311,11 @@
1674	1311	/**
1675	1312	* @since 4.0
1676	1313	*
1677	1314	* @param array $values
1678		- *
1679		- * @return void
1680	1315	*/
1681	1316	public static function html_settings( $values ) {
1682		- include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings-html.php';
	1317	+ include( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings-html.php' );
1683	1318	}
1684	1319
1685	1320	/**
1686	1321	* Replace old Submit Button href with new href to avoid errors in Chrome
		@@ -1686,11 +1321,9 @@
1686	1321	* Replace old Submit Button href with new href to avoid errors in Chrome
1687	1322	*
1688	1323	* @since 2.03.08
1689	1324	*
1690		- * @param array|bool $values
1691		- *
1692		- * @return void
	1325	+ * @param array|boolean $values
1693	1326	*/
1694	1327	private static function clean_submit_html( &$values ) {
1695	1328	if ( is_array( $values ) && isset( $values['submit_html'] ) ) {
1696	1329	$values['submit_html'] = str_replace( 'javascript:void(0)', '#', $values['submit_html'] );
		@@ -1711,18 +1344,9 @@
1711	1344
1712	1345	return $classes;
1713	1346	}
1714	1347
1715		- /**
1716		- * @since 6.27 Added $template_path parameter.
1717		- *
1718		- * @param int|string $form_id
1719		- * @param string $class
1720		- * @param string $template_path The path to a template file to use instead of the default.
1721		- *
1722		- * @return void
1723		- */
1724		- public static function mb_tags_box( $form_id, $class = '', $template_path = 'default' ) {
	1348	+ public static function mb_tags_box( $form_id, $class = '' ) {
1725	1349	$fields = FrmField::get_all_for_form( $form_id, '', 'include' );
1726	1350
1727	1351	/**
1728	1352	* Allows modifying the list of fields in the tags box.
		@@ -1731,30 +1355,23 @@
1731	1355	*
1732	1356	* @param array $fields The list of fields.
1733	1357	* @param array $args The arguments. Contains `form_id`.
1734	1358	*/
1735		- $fields = apply_filters( 'frm_fields_in_tags_box', $fields, compact( 'form_id' ) );
1736		- $linked_forms = array();
1737		- $col = 'one';
1738		- $settings_tab = FrmAppHelper::is_admin_page( 'formidable' );
	1359	+ $fields = apply_filters( 'frm_fields_in_tags_box', $fields, compact( 'form_id' ) );
	1360	+ $linked_forms = array();
	1361	+ $col = 'one';
	1362	+ $settings_tab = FrmAppHelper::is_admin_page( 'formidable' ) ? true : false;
	1363	+
1739	1364	$cond_shortcodes = apply_filters( 'frm_conditional_shortcodes', array() );
1740	1365	$entry_shortcodes = self::get_shortcode_helpers( $settings_tab );
	1366	+
1741	1367	$advanced_helpers = self::advanced_helpers( compact( 'fields', 'form_id' ) );
1742	1368
1743		- if ( 'default' === $template_path || ! file_exists( $template_path ) ) {
1744		- include FrmAppHelper::plugin_path() . '/classes/views/shared/mb_adv_info.php';
1745		- return;
1746		- }
1747		-
1748		- include $template_path;
	1369	+ include( FrmAppHelper::plugin_path() . '/classes/views/shared/mb_adv_info.php' );
1749	1370	}
1750	1371
1751	1372	/**
1752	1373	* @since 3.04.01
1753		- *
1754		- * @param array $atts
1755		- *
1756		- * @return array
1757	1374	*/
1758	1375	private static function advanced_helpers( $atts ) {
1759	1376	$advanced_helpers = array(
1760	1377	'default' => array(
		@@ -1763,12 +1380,10 @@
1763	1380	),
1764	1381	);
1765	1382
1766	1383	$user_fields = self::user_shortcodes();
1767		-
1768		- if ( $user_fields ) {
	1384	+ if ( ! empty( $user_fields ) ) {
1769	1385	$user_helpers = array();
1770		-
1771	1386	foreach ( $user_fields as $uk => $uf ) {
1772	1387	$user_helpers[ '|user_id| show="' . $uk . '"' ] = $uf;
1773	1388	unset( $uk, $uf );
1774	1389	}
		@@ -1773,9 +1388,9 @@
1773	1388	unset( $uk, $uf );
1774	1389	}
1775	1390
1776	1391	$advanced_helpers['user_id'] = array(
1777		- 'codes' => $user_helpers,
	1392	+ 'codes' => $user_helpers,
1778	1393	);
1779	1394	}
1780	1395
1781	1396	/**
		@@ -1793,10 +1408,8 @@
1793	1408	* Get an array of the options to display in the advanced tab
1794	1409	* of the customization panel
1795	1410	*
1796	1411	* @since 2.0.6
1797		- *
1798		- * @return array
1799	1412	*/
1800	1413	private static function get_advanced_shortcodes() {
1801	1414	$adv_shortcodes = array(
1802	1415	'x sep=", "' => array(
		@@ -1813,18 +1426,17 @@
1813	1426	'label' => __( 'No Auto P', 'formidable' ),
1814	1427	'title' => __( 'Do not automatically add any paragraphs or line breaks', 'formidable' ),
1815	1428	),
1816	1429	);
	1430	+ $adv_shortcodes = apply_filters( 'frm_advanced_shortcodes', $adv_shortcodes );
1817	1431
1818	1432	// __( 'Leave blank instead of defaulting to User Login', 'formidable' ) : blank=1
1819	1433
1820		- return apply_filters( 'frm_advanced_shortcodes', $adv_shortcodes );
	1434	+ return $adv_shortcodes;
1821	1435	}
1822	1436
1823	1437	/**
1824	1438	* @since 3.04.01
1825		- *
1826		- * @return array
1827	1439	*/
1828	1440	private static function user_shortcodes() {
1829	1441	$options = array(
1830	1442	'ID' => __( 'User ID', 'formidable' ),
		@@ -1843,12 +1455,8 @@
1843	1455	/**
1844	1456	* Get an array of the helper shortcodes to display in the customization panel
1845	1457	*
1846	1458	* @since 2.0.6
1847		- *
1848		- * @param bool $settings_tab
1849		- *
1850		- * @return array
1851	1459	*/
1852	1460	private static function get_shortcode_helpers( $settings_tab ) {
1853	1461	$entry_shortcodes = array(
1854	1462	'id' => __( 'Entry ID', 'formidable' ),
		@@ -1859,27 +1467,30 @@
1859	1467	'updated-at' => __( 'Entry updated', 'formidable' ),
1860	1468	'' => '',
1861	1469	'siteurl' => __( 'Site URL', 'formidable' ),
1862	1470	'sitename' => __( 'Site Name', 'formidable' ),
1863		- 'form_name' => __( 'Form Name', 'formidable' ),
1864	1471	);
1865	1472
1866		- $entry_shortcodes = array_merge( FrmShortcodeHelper::get_contextual_shortcode_values(), $entry_shortcodes );
1867		-
1868	1473	if ( ! FrmAppHelper::pro_is_installed() ) {
1869	1474	unset( $entry_shortcodes['post_id'] );
1870	1475	}
1871	1476
	1477	+ if ( $settings_tab ) {
	1478	+ $entry_shortcodes['default-message'] = __( 'Default Msg', 'formidable' );
	1479	+ $entry_shortcodes['default-html'] = __( 'Default HTML', 'formidable' );
	1480	+ $entry_shortcodes['default-plain'] = __( 'Default Plain', 'formidable' );
	1481	+ $entry_shortcodes['form_name'] = __( 'Form Name', 'formidable' );
	1482	+ }
	1483	+
1872	1484	/**
1873	1485	* Use this hook to add or remove buttons in the helpers section
1874	1486	* in the customization panel
1875	1487	*
1876	1488	* @since 2.0.6
1877		- *
1878		- * @param array $entry_shortcodes
1879		- * @param bool $settings_tab
1880	1489	*/
1881		- return apply_filters( 'frm_helper_shortcodes', $entry_shortcodes, $settings_tab );
	1490	+ $entry_shortcodes = apply_filters( 'frm_helper_shortcodes', $entry_shortcodes, $settings_tab );
	1491	+
	1492	+ return $entry_shortcodes;
1882	1493	}
1883	1494
1884	1495	/**
1885	1496	* Insert the form class setting into the form.
		@@ -1884,9 +1495,8 @@
1884	1495	/**
1885	1496	* Insert the form class setting into the form.
1886	1497	*
1887	1498	* @param stdClass $form
1888		- *
1889	1499	* @return void
1890	1500	*/
1891	1501	public static function form_classes( $form ) {
1892	1502	if ( isset( $form->options['form_class'] ) ) {
		@@ -1897,9 +1507,9 @@
1897	1507	echo ' frm_js_validate ';
1898	1508	self::add_js_validate_form_to_global_vars( $form );
1899	1509	}
1900	1510
1901		- if ( FrmForm::is_ajax_on( $form ) ) {
	1511	+ if ( ! FrmFormsHelper::should_use_pro_for_ajax_submit() && FrmForm::is_ajax_on( $form ) ) {
1902	1512	echo ' frm_ajax_submit ';
1903	1513	}
1904	1514	}
1905	1515
		@@ -1909,9 +1519,8 @@
1909	1519	* @param stdClass $form
1910	1520	*/
1911	1521	public static function add_js_validate_form_to_global_vars( $form ) {
1912	1522	global $frm_vars;
1913		-
1914	1523	if ( ! isset( $frm_vars['js_validate_forms'] ) ) {
1915	1524	$frm_vars['js_validate_forms'] = array();
1916	1525	}
1917	1526	$frm_vars['js_validate_forms'][ $form->id ] = $form;
		@@ -1922,11 +1531,11 @@
1922	1531	check_ajax_referer( 'frm_ajax', 'nonce' );
1923	1532
1924	1533	echo FrmEntriesController::show_entry_shortcode( // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
1925	1534	array(
1926		- 'form_id' => FrmAppHelper::get_post_param( 'form_id', '', 'absint' ), // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
	1535	+ 'form_id' => FrmAppHelper::get_post_param( 'form_id', '', 'absint' ),
1927	1536	'default_email' => true,
1928		- 'plain_text' => FrmAppHelper::get_post_param( 'plain_text', '', 'absint' ), // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
	1537	+ 'plain_text' => FrmAppHelper::get_post_param( 'plain_text', '', 'absint' ),
1929	1538	)
1930	1539	);
1931	1540	wp_die();
1932	1541	}
		@@ -1932,11 +1541,10 @@
1932	1541	}
1933	1542
1934	1543	/**
1935	1544	* @param string $content
1936		- * @param int|stdClass|string $form
1937		- * @param false|int|stdClass|string $entry
1938		- *
	1545	+ * @param stdClass|string|int $form
	1546	+ * @param stdClass|string|int|false $entry
1939	1547	* @return string
1940	1548	*/
1941	1549	public static function filter_content( $content, $form, $entry = false ) {
1942	1550	$content = self::replace_form_name_shortcodes( $content, $form );
		@@ -1941,9 +1549,8 @@
1941	1549	public static function filter_content( $content, $form, $entry = false ) {
1942	1550	$content = self::replace_form_name_shortcodes( $content, $form );
1943	1551
1944	1552	self::get_entry_by_param( $entry );
1945		-
1946	1553	if ( ! $entry ) {
1947	1554	return $content;
1948	1555	}
1949	1556
		@@ -1950,19 +1557,12 @@
1950	1557	if ( is_object( $form ) ) {
1951	1558	$form = $form->id;
1952	1559	}
1953	1560
1954		- /*
1955		- * Repeater actions adds `parent_entry` to `$entry` store the parent entry data. If `parent_entry` is not empty,
1956		- * use the parent form ID instead of repeater form ID to fix the parent form field shortcodes doesn't work.
1957		- */
1958		- if ( ! empty( $entry->parent_entry ) ) {
1959		- $form = $entry->parent_entry->form_id;
1960		- }
1961		-
1962	1561	$shortcodes = FrmFieldsHelper::get_shortcodes( $content, $form );
	1562	+ $content = apply_filters( 'frm_replace_content_shortcodes', $content, $entry, $shortcodes );
1963	1563
1964		- return apply_filters( 'frm_replace_content_shortcodes', $content, $entry, $shortcodes );
	1564	+ return $content;
1965	1565	}
1966	1566
1967	1567	/**
1968	1568	* Replace any [form_name] shortcodes in a string.
		@@ -1968,12 +1568,11 @@
1968	1568	* Replace any [form_name] shortcodes in a string.
1969	1569	*
1970	1570	* @since 5.5
1971	1571	*
1972		- * @param array|string $string
1973		- * @param int|stdClass|string $form
1974		- *
1975		- * @return array|string
	1572	+ * @param string|array $string
	1573	+ * @param stdClass|string|int $form
	1574	+ * @return string|array
1976	1575	*/
1977	1576	public static function replace_form_name_shortcodes( $string, $form ) {
1978	1577	if ( ! is_string( $string ) ) {
1979	1578	return $string;
		@@ -1978,9 +1577,9 @@
1978	1577	if ( ! is_string( $string ) ) {
1979	1578	return $string;
1980	1579	}
1981	1580
1982		- if ( ! str_contains( $string, '[form_name]' ) ) {
	1581	+ if ( false === strpos( $string, '[form_name]' ) ) {
1983	1582	return $string;
1984	1583	}
1985	1584
1986	1585	if ( ! is_object( $form ) ) {
		@@ -1991,40 +1590,25 @@
1991	1590	return str_replace( '[form_name]', $form_name, $string );
1992	1591	}
1993	1592
1994	1593	/**
1995		- * @param false|int|stdClass|string $entry
1996		- *
	1594	+ * @param stdClass|string|int|false $entry
1997	1595	* @return void
1998	1596	*/
1999	1597	private static function get_entry_by_param( &$entry ) {
2000		- if ( $entry && is_object( $entry ) ) {
2001		- return;
2002		- }
	1598	+ if ( ! $entry || ! is_object( $entry ) ) {
	1599	+ if ( ! $entry || ! is_numeric( $entry ) ) {
	1600	+ $entry = FrmAppHelper::get_post_param( 'id', false, 'sanitize_title' );
	1601	+ }
2003	1602
2004		- if ( ! $entry || ! is_numeric( $entry ) ) {
2005		- $entry = FrmAppHelper::get_post_param( 'id', false, 'sanitize_title' );
	1603	+ FrmEntry::maybe_get_entry( $entry );
2006	1604	}
2007		-
2008		- FrmEntry::maybe_get_entry( $entry );
2009	1605	}
2010	1606
2011		- /**
2012		- * @param string $content
2013		- * @param false|object $entry
2014		- * @param array $shortcodes
2015		- *
2016		- * @return string
2017		- */
2018	1607	public static function replace_content_shortcodes( $content, $entry, $shortcodes ) {
2019	1608	return FrmFieldsHelper::replace_content_shortcodes( $content, $entry, $shortcodes );
2020	1609	}
2021	1610
2022		- /**
2023		- * @param array $errors
2024		- *
2025		- * @return array
2026		- */
2027	1611	public static function process_bulk_form_actions( $errors ) {
2028	1612	if ( ! $_REQUEST ) {
2029	1613	return $errors;
2030	1614	}
		@@ -2029,30 +1613,29 @@
2029	1613	return $errors;
2030	1614	}
2031	1615
2032	1616	$bulkaction = FrmAppHelper::get_param( 'action', '', 'get', 'sanitize_text_field' );
2033		-
2034		- // phpcs:ignore Universal.Operators.StrictComparisons
2035	1617	if ( $bulkaction == - 1 ) {
2036	1618	$bulkaction = FrmAppHelper::get_param( 'action2', '', 'get', 'sanitize_title' );
2037	1619	}
2038	1620
2039		- if ( $bulkaction && str_starts_with( $bulkaction, 'bulk_' ) ) {
	1621	+ if ( ! empty( $bulkaction ) && strpos( $bulkaction, 'bulk_' ) === 0 ) {
2040	1622	FrmAppHelper::remove_get_action();
	1623	+
2041	1624	$bulkaction = str_replace( 'bulk_', '', $bulkaction );
2042	1625	}
2043	1626
2044	1627	$ids = FrmAppHelper::get_param( 'item-action', '', 'get', 'sanitize_text_field' );
	1628	+ if ( empty( $ids ) ) {
	1629	+ $errors[] = __( 'No forms were specified', 'formidable' );
2045	1630
2046		- if ( ! $ids ) {
2047		- $errors[] = __( 'No forms were specified', 'formidable' );
2048	1631	return $errors;
2049	1632	}
2050	1633
2051	1634	$permission_error = FrmAppHelper::permission_nonce_error( '', '_wpnonce', 'bulk-toplevel_page_formidable' );
2052		-
2053	1635	if ( $permission_error !== false ) {
2054	1636	$errors[] = $permission_error;
	1637	+
2055	1638	return $errors;
2056	1639	}
2057	1640
2058	1641	if ( ! is_array( $ids ) ) {
		@@ -2069,9 +1652,9 @@
2069	1652	case 'untrash':
2070	1653	$message = self::bulk_untrash( $ids );
2071	1654	}
2072	1655
2073		- if ( ! empty( $message ) ) {
	1656	+ if ( isset( $message ) && ! empty( $message ) ) {
2074	1657	$errors['message'] = $message;
2075	1658	}
2076	1659
2077	1660	return $errors;
		@@ -2076,24 +1659,9 @@
2076	1659
2077	1660	return $errors;
2078	1661	}
2079	1662
2080		- /**
2081		- * Includes html that shows a message when the device is too small to use Formidable Forms admin pages.
2082		- *
2083		- * @since 6.20
2084		- *
2085		- * @return void
2086		- */
2087		- public static function include_device_too_small_message() {
2088		- if ( ! FrmAppHelper::is_formidable_admin() ) {
2089		- return;
2090		- }
2091		-
2092		- include FrmAppHelper::plugin_path() . '/classes/views/shared/small-device-message.php';
2093		- }
2094		-
2095		- public static function route() { // phpcs:ignore Generic.Metrics.CyclomaticComplexity.MaxExceeded
	1663	+ public static function route() {
2096	1664	$action = isset( $_REQUEST['frm_action'] ) ? 'frm_action' : 'action';
2097	1665	$vars = array();
2098	1666	FrmAppHelper::include_svg();
2099	1667
		@@ -2103,28 +1671,25 @@
2103	1671	// Javascript needs to be allowed in some field settings.
2104	1672	// phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized, WordPress.Security.NonceVerification.Missing
2105	1673	$json_vars = htmlspecialchars_decode( nl2br( str_replace( '&quot;', '"', wp_unslash( $_POST['frm_compact_fields'] ) ) ) );
2106	1674	$json_vars = json_decode( $json_vars, true );
	1675	+ if ( empty( $json_vars ) ) {
	1676	+ // json decoding failed so we should return an error message.
	1677	+ $action = FrmAppHelper::get_param( $action, '', 'get', 'sanitize_title' );
	1678	+ if ( 'edit' == $action ) {
	1679	+ $action = 'update';
	1680	+ }
2107	1681
2108		- if ( $json_vars ) {
	1682	+ add_filter( 'frm_validate_form', 'FrmFormsController::json_error' );
	1683	+ } else {
2109	1684	$vars = FrmAppHelper::json_to_array( $json_vars );
2110	1685	$action = $vars[ $action ];
2111	1686	unset( $_REQUEST['frm_compact_fields'], $_POST['frm_compact_fields'] ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
2112	1687	$_REQUEST = array_merge( $_REQUEST, $vars ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
2113	1688	$_POST = array_merge( $_POST, $_REQUEST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
2114		- } else {
2115		- // Json decoding failed so we should return an error message.
2116		- $action = FrmAppHelper::get_param( $action, '', 'get', 'sanitize_title' );
2117		-
2118		- if ( 'edit' === $action ) {
2119		- $action = 'update';
2120		- }
2121		-
2122		- add_filter( 'frm_validate_form', 'FrmFormsController::json_error' );
2123	1689	}
2124	1690	} else {
2125	1691	$action = FrmAppHelper::get_param( $action, '', 'get', 'sanitize_title' );
2126		-
2127	1692	if ( isset( $_REQUEST['delete_all'] ) ) {
2128	1693	// Override the action for this page.
2129	1694	$action = 'delete_all';
2130	1695	}
		@@ -2133,8 +1698,10 @@
2133	1698	add_action( 'frm_load_form_hooks', 'FrmHooksController::trigger_load_form_hooks' );
2134	1699	FrmAppHelper::trigger_hook_load( 'form' );
2135	1700
2136	1701	switch ( $action ) {
	1702	+ case 'new':
	1703	+ return self::new_form( $vars );
2137	1704	case 'create':
2138	1705	case 'edit':
2139	1706	case 'update':
2140	1707	case 'trash':
		@@ -2143,39 +1710,33 @@
2143	1710	case 'settings':
2144	1711	case 'update_settings':
2145	1712	return self::$action( $vars );
2146	1713	case 'lite-reports':
2147		- self::no_reports( $vars );
2148		- return null;
	1714	+ return self::no_reports( $vars );
2149	1715	case 'views':
2150		- self::no_views( $vars );
2151		- return null;
	1716	+ return self::no_views( $vars );
2152	1717	default:
2153	1718	do_action( 'frm_form_action_' . $action );
2154		-
2155	1719	if ( apply_filters( 'frm_form_stop_action_' . $action, false ) ) {
2156		- return null;
	1720	+ return;
2157	1721	}
2158	1722
2159	1723	$action = FrmAppHelper::get_param( 'action', '', 'get', 'sanitize_text_field' );
2160		-
2161		- // phpcs:ignore Universal.Operators.StrictComparisons
2162	1724	if ( $action == - 1 ) {
2163	1725	$action = FrmAppHelper::get_param( 'action2', '', 'get', 'sanitize_title' );
2164	1726	}
2165	1727
2166		- if ( str_starts_with( $action, 'bulk_' ) ) {
	1728	+ if ( strpos( $action, 'bulk_' ) === 0 ) {
2167	1729	FrmAppHelper::remove_get_action();
2168	1730
2169	1731	self::list_form();
2170		- return null;
	1732	+ return;
2171	1733	}
2172	1734
2173	1735	$message = FrmAppHelper::get_param( 'message' );
2174		-
2175	1736	if ( 'form_duplicate_error' === $message ) {
2176	1737	self::display_forms_list( array(), '', array( __( 'There was a problem duplicating the form', 'formidable' ) ) );
2177		- return null;
	1738	+ return;
2178	1739	}
2179	1740
2180	1741	if ( 'forms_permanently_deleted' === $message ) {
2181	1742	$count = FrmAppHelper::get_param( 'forms_deleted', 0, 'get', 'absint' );
		@@ -2181,14 +1742,14 @@
2181	1742	$count = FrmAppHelper::get_param( 'forms_deleted', 0, 'get', 'absint' );
2182	1743	/* translators: %1$s: Number of forms */
2183	1744	$message = sprintf( _n( '%1$s form permanently deleted.', '%1$s forms permanently deleted.', $count, 'formidable' ), $count );
2184	1745	self::display_forms_list( array(), $message, '' );
2185		- return null;
	1746	+ return;
2186	1747	}
2187	1748
2188	1749	self::display_forms_list();
2189	1750
2190		- return null;
	1751	+ return;
2191	1752	}//end switch
2192	1753	}
2193	1754
2194	1755	/**
		@@ -2207,44 +1768,29 @@
2207	1768
2208	1769	// Get posted data
2209	1770	$form_id = FrmAppHelper::get_post_param( 'form_id', '', 'absint' );
2210	1771	$name = FrmAppHelper::get_post_param( 'form_name', '', 'sanitize_text_field' );
2211		- $form = FrmForm::getOne( $form_id );
2212	1772
2213		- if ( ! $form ) {
2214		- wp_send_json_error( __( 'Form not found', 'formidable' ) );
2215		- }
	1773	+ // Update the form name and form key.
	1774	+ $form_key = FrmAppHelper::get_unique_key( sanitize_title( $name ), 'frm_forms', 'form_key' );
	1775	+ FrmForm::update( $form_id, compact( 'name', 'form_key' ) );
2216	1776
2217		- if ( $name === $form->name ) {
2218		- // Nothing to change so exit early.
2219		- wp_send_json_success();
2220		- }
	1777	+ wp_send_json_success( compact( 'form_key' ) );
	1778	+ }
2221	1779
2222		- $to_update = array(
2223		- 'name' => $name,
2224		- );
	1780	+ public static function json_error( $errors ) {
	1781	+ $errors['json'] = __( 'Abnormal HTML characters prevented your form from saving correctly', 'formidable' );
2225	1782
2226		- if ( '' === $name ) {
2227		- $form_key = $form->form_key;
2228		- } else {
2229		- // Only update form_key if name is not empty.
2230		- $form_key = FrmAppHelper::get_unique_key( sanitize_title( $name ), 'frm_forms', 'form_key' );
2231		- $to_update['form_key'] = $form_key;
2232		- }
2233		-
2234		- FrmForm::update( $form_id, $to_update );
2235		-
2236		- wp_send_json_success( compact( 'form_key' ) );
	1783	+ return $errors;
2237	1784	}
2238	1785
2239	1786	/**
2240		- * @param array $errors
	1787	+ * Education for premium features.
2241	1788	*
2242		- * @return array
	1789	+ * @since 4.05
2243	1790	*/
2244		- public static function json_error( $errors ) {
2245		- $errors['json'] = __( 'Abnormal HTML characters prevented your form from saving correctly', 'formidable' );
2246		- return $errors;
	1791	+ public static function add_form_style_tab_options() {
	1792	+ include( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/add_form_style_options.php' );
2247	1793	}
2248	1794
2249	1795	/**
2250	1796	* Add education about views.
		@@ -2249,12 +1795,8 @@
2249	1795	/**
2250	1796	* Add education about views.
2251	1797	*
2252	1798	* @since 4.07
2253		- *
2254		- * @param array $values
2255		- *
2256		- * @return void
2257	1799	*/
2258	1800	public static function no_views( $values = array() ) {
2259	1801	FrmAppHelper::include_svg();
2260	1802	$id = FrmAppHelper::get_param( 'form', '', 'get', 'absint' );
		@@ -2266,12 +1808,8 @@
2266	1808	/**
2267	1809	* Add education about reports.
2268	1810	*
2269	1811	* @since 4.07
2270		- *
2271		- * @param array $values
2272		- *
2273		- * @return void
2274	1812	*/
2275	1813	public static function no_reports( $values = array() ) {
2276	1814	$id = FrmAppHelper::get_param( 'form', '', 'get', 'absint' );
2277	1815	$form = $id ? FrmForm::getOne( $id ) : false;
		@@ -2296,9 +1834,10 @@
2296	1834	/**
2297	1835	* @since 4.05.02
2298	1836	*/
2299	1837	private static function move_menu_to_footer() {
2300		- if ( empty( FrmAppHelper::get_settings()->admin_bar ) ) {
	1838	+ $settings = FrmAppHelper::get_settings();
	1839	+ if ( empty( $settings->admin_bar ) ) {
2301	1840	remove_action( 'wp_body_open', 'wp_admin_bar_render', 0 );
2302	1841	}
2303	1842	}
2304	1843
		@@ -2303,15 +1842,13 @@
2303	1842	}
2304	1843
2305	1844	public static function admin_bar_configure() {
2306	1845	global $frm_vars;
2307		-
2308	1846	if ( empty( $frm_vars['forms_loaded'] ) ) {
2309	1847	return;
2310	1848	}
2311	1849
2312	1850	$actions = array();
2313		-
2314	1851	foreach ( $frm_vars['forms_loaded'] as $form ) {
2315	1852	if ( is_object( $form ) ) {
2316	1853	$actions[ $form->id ] = $form->name;
2317	1854	}
		@@ -2317,9 +1854,9 @@
2317	1854	}
2318	1855	unset( $form );
2319	1856	}
2320	1857
2321		- if ( ! $actions ) {
	1858	+ if ( empty( $actions ) ) {
2322	1859	return;
2323	1860	}
2324	1861
2325	1862	self::add_menu_to_admin_bar();
		@@ -2345,12 +1882,8 @@
2345	1882	}
2346	1883
2347	1884	/**
2348	1885	* @since 2.05.07
2349		- *
2350		- * @param array $actions
2351		- *
2352		- * @return void
2353	1886	*/
2354	1887	private static function add_forms_to_admin_bar( $actions ) {
2355	1888	global $wp_admin_bar;
2356	1889
		@@ -2356,13 +1889,14 @@
2356	1889
2357	1890	asort( $actions );
2358	1891
2359	1892	foreach ( $actions as $form_id => $name ) {
	1893	+
2360	1894	$wp_admin_bar->add_node(
2361	1895	array(
2362	1896	'parent' => 'frm-forms',
2363	1897	'id' => 'edit_form_' . $form_id,
2364		- 'title' => $name ? $name : FrmFormsHelper::get_no_title_text(),
	1898	+ 'title' => empty( $name ) ? __( '(no title)', 'formidable' ) : $name,
2365	1899	'href' => FrmForm::get_edit_link( $form_id ),
2366	1900	)
2367	1901	);
2368	1902	}
		@@ -2371,16 +1905,14 @@
2371	1905	/**
2372	1906	* The formidable shortcode
2373	1907	*
2374	1908	* @param array $atts The params from the shortcode.
2375		- *
2376	1909	* @return string
2377	1910	*/
2378	1911	public static function get_form_shortcode( $atts ) {
2379	1912	global $frm_vars;
2380		-
2381		- if ( ! empty( $frm_vars['skip_shortcode'] ) ) {
2382		- $sc = '[formidable';
	1913	+ if ( isset( $frm_vars['skip_shortcode'] ) && $frm_vars['skip_shortcode'] ) {
	1914	+ $sc = '[formidable';
2383	1915	$sc .= FrmAppHelper::array_to_html_params( $atts );
2384	1916	return $sc . ']';
2385	1917	}
2386	1918
		@@ -2405,12 +1937,11 @@
2405	1937
2406	1938	/**
2407	1939	* @since 5.2.01
2408	1940	*
2409		- * @param false|int|string $id
2410		- * @param false|string $key
2411		- *
2412		- * @return false|stdClass
	1941	+ * @param string|int|false $id
	1942	+ * @param string|false $key
	1943	+ * @return stdClass|false
2413	1944	*/
2414	1945	private static function maybe_get_form_by_id_or_key( $id, $key ) {
2415	1946	if ( ! $id ) {
2416	1947	$id = $key;
		@@ -2418,14 +1949,13 @@
2418	1949	return self::maybe_get_form_to_show( $id );
2419	1950	}
2420	1951
2421	1952	/**
2422		- * @param false|int|string $id
2423		- * @param false|string $key
2424		- * @param bool|int|string $title may be 'auto', true, false, 'true', 'false', 'yes', '1', 1, '0', 0.
2425		- * @param bool|int|string $description may be 'auto', true, false, 'true', 'false', 'yes', '1', 1, '0', 0.
	1953	+ * @param string|int|false $id
	1954	+ * @param string|false $key
	1955	+ * @param string|int|bool $title may be 'auto', true, false, 'true', 'false', 'yes', '1', 1, '0', 0.
	1956	+ * @param string|int|bool $description may be 'auto', true, false, 'true', 'false', 'yes', '1', 1, '0', 0.
2426	1957	* @param array $atts
2427		- *
2428	1958	* @return string
2429	1959	*/
2430	1960	public static function show_form( $id = '', $key = '', $title = false, $description = false, $atts = array() ) {
2431	1961	$form = self::maybe_get_form_by_id_or_key( $id, $key );
		@@ -2446,13 +1976,14 @@
2446	1976
2447	1977	add_action( 'frm_load_form_hooks', 'FrmHooksController::trigger_load_form_hooks' );
2448	1978	FrmAppHelper::trigger_hook_load( 'form', $form );
2449	1979
2450		- $form = apply_filters( 'frm_pre_display_form', $form );
	1980	+ $form = apply_filters( 'frm_pre_display_form', $form );
	1981	+
2451	1982	$frm_settings = FrmAppHelper::get_settings( array( 'current_form' => $form->id ) );
2452	1983
2453	1984	if ( self::is_viewable_draft_form( $form ) ) {
2454		- // Don't show a draft form on a page
	1985	+ // don't show a draft form on a page
2455	1986	$form = __( 'Please select a valid form', 'formidable' );
2456	1987	} elseif ( ! FrmForm::is_visible_to_user( $form ) ) {
2457	1988	$form = do_shortcode( $frm_settings->login_msg );
2458	1989	} else {
		@@ -2471,19 +2002,17 @@
2471	2002	return $form;
2472	2003	}
2473	2004
2474	2005	/**
2475		- * @param false|int|string $id
2476		- *
2477		- * @return false|stdClass
	2006	+ * @param string|int|false $id
	2007	+ * @return stdClass|false
2478	2008	*/
2479	2009	private static function maybe_get_form_to_show( $id ) {
2480	2010	$form = false;
2481	2011
2482		- if ( $id ) {
	2012	+ if ( ! empty( $id ) ) {
2483	2013	// Form id or key is set.
2484	2014	$form = FrmForm::getOne( $id );
2485		-
2486	2015	if ( ! $form || $form->parent_form_id || $form->status === 'trash' ) {
2487	2016	$form = false;
2488	2017	}
2489	2018	}
		@@ -2490,25 +2019,12 @@
2490	2019
2491	2020	return $form;
2492	2021	}
2493	2022
2494		- /**
2495		- * @param object $form
2496		- *
2497		- * @return bool
2498		- */
2499	2023	private static function is_viewable_draft_form( $form ) {
2500	2024	return $form->status === 'draft' && current_user_can( 'frm_edit_forms' ) && ! FrmAppHelper::is_preview_page();
2501	2025	}
2502	2026
2503		- /**
2504		- * @param object $form
2505		- * @param bool $title
2506		- * @param bool $description
2507		- * @param array $atts
2508		- *
2509		- * @return string
2510		- */
2511	2027	public static function get_form( $form, $title, $description, $atts = array() ) {
2512	2028	ob_start();
2513	2029
2514	2030	do_action( 'frm_before_get_form', $atts );
		@@ -2515,9 +2031,10 @@
2515	2031
2516	2032	self::get_form_contents( $form, $title, $description, $atts );
2517	2033	self::enqueue_scripts( FrmForm::get_params( $form ) );
2518	2034
2519		- $contents = ob_get_clean();
	2035	+ $contents = ob_get_contents();
	2036	+ ob_end_clean();
2520	2037
2521	2038	self::maybe_minimize_form( $atts, $contents );
2522	2039
2523	2040	return $contents;
		@@ -2522,25 +2039,12 @@
2522	2039
2523	2040	return $contents;
2524	2041	}
2525	2042
2526		- /**
2527		- * @param array $params
2528		- *
2529		- * @return void
2530		- */
2531	2043	public static function enqueue_scripts( $params ) {
2532	2044	do_action( 'frm_enqueue_form_scripts', $params );
2533	2045	}
2534	2046
2535		- /**
2536		- * @param object $form
2537		- * @param bool $title
2538		- * @param bool $description
2539		- * @param array $atts
2540		- *
2541		- * @return void
2542		- */
2543	2047	public static function get_form_contents( $form, $title, $description, $atts ) {
2544	2048	$params = FrmForm::get_params( $form );
2545	2049	$errors = self::get_saved_errors( $form, $params );
2546	2050	$fields = FrmFieldsHelper::get_form_fields( $form->id, $errors );
		@@ -2547,10 +2051,9 @@
2547	2051	$reset = false;
2548	2052	$pass_args = compact( 'form', 'fields', 'errors', 'title', 'description', 'reset' );
2549	2053
2550	2054	$pass_args['action'] = $params['action'];
2551		- // phpcs:ignore WordPress.Security.NonceVerification.Missing, Universal.Operators.StrictComparisons
2552		- $handle_process_here = $params['action'] === 'create' && $params['posted_form_id'] == $form->id && $_POST;
	2055	+ $handle_process_here = $params['action'] === 'create' && $params['posted_form_id'] == $form->id && $_POST; // phpcs:ignore WordPress.Security.NonceVerification.Missing
2553	2056
2554	2057	if ( ! $handle_process_here ) {
2555	2058	FrmFormState::set_initial_value( 'title', $title );
2556	2059	FrmFormState::set_initial_value( 'description', $description );
		@@ -2555,21 +2058,22 @@
2555	2058	FrmFormState::set_initial_value( 'title', $title );
2556	2059	FrmFormState::set_initial_value( 'description', $description );
2557	2060
2558	2061	do_action( 'frm_display_form_action', $params, $fields, $form, $title, $description );
2559		-
2560	2062	if ( apply_filters( 'frm_continue_to_new', true, $form->id, $params['action'] ) ) {
2561	2063	self::show_form_after_submit( $pass_args );
2562	2064	}
2563		- } elseif ( $errors ) {
	2065	+ } elseif ( ! empty( $errors ) ) {
2564	2066	self::show_form_after_submit( $pass_args );
	2067	+
2565	2068	} else {
	2069	+
2566	2070	do_action( 'frm_validate_form_creation', $params, $fields, $form, $title, $description );
2567	2071
2568	2072	if ( apply_filters( 'frm_continue_to_create', true, $form->id ) ) {
2569		- $entry_id = self::just_created_entry( $form->id );
2570		- $pass_args['entry_id'] = $entry_id;
2571		- $pass_args['reset'] = true;
	2073	+ $entry_id = self::just_created_entry( $form->id );
	2074	+ $pass_args['entry_id'] = $entry_id;
	2075	+ $pass_args['reset'] = true;
2572	2076
2573	2077	self::run_on_submit_actions( $pass_args );
2574	2078
2575	2079	do_action(
		@@ -2586,19 +2090,13 @@
2586	2090	/**
2587	2091	* If the form was processed earlier (init), get the generated errors
2588	2092	*
2589	2093	* @since 2.05
2590		- *
2591		- * @param object $form
2592		- * @param array $params
2593		- *
2594		- * @return array
2595	2094	*/
2596	2095	private static function get_saved_errors( $form, $params ) {
2597	2096	global $frm_vars;
2598	2097
2599		- // phpcs:ignore WordPress.Security.NonceVerification.Missing, Universal.Operators.StrictComparisons
2600		- if ( $params['posted_form_id'] == $form->id && $_POST && isset( $frm_vars['created_entries'][ $form->id ] ) ) {
	2098	+ if ( $params['posted_form_id'] == $form->id && $_POST && isset( $frm_vars['created_entries'][ $form->id ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
2601	2099	$errors = $frm_vars['created_entries'][ $form->id ]['errors'];
2602	2100	} else {
2603	2101	$errors = array();
2604	2102	}
		@@ -2615,16 +2113,13 @@
2615	2113	}
2616	2114
2617	2115	/**
2618	2116	* @since 2.2.7
2619		- *
2620		- * @param int|string $form_id
2621		- *
2622		- * @return int
2623	2117	*/
2624	2118	public static function just_created_entry( $form_id ) {
2625	2119	global $frm_vars;
2626		- 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; // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong
	2120	+
	2121	+ 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;
2627	2122	}
2628	2123
2629	2124	/**
2630	2125	* Gets confirmation method.
		@@ -2637,19 +2132,17 @@
2637	2132	*
2638	2133	* @type object $form Form object.
2639	2134	* @type int $entry_id Entry ID.
2640	2135	* }
2641		- *
2642		- * @return array|string
	2136	+ * @return string|array
2643	2137	*/
2644	2138	private static function get_confirmation_method( $atts ) {
2645	2139	$action = FrmOnSubmitHelper::current_event( $atts );
2646	2140	$opt = 'update' === $action ? 'edit_action' : 'success_action';
2647		- $method = ! empty( $atts['form']->options[ $opt ] ) ? $atts['form']->options[ $opt ] : 'message';
	2141	+ $method = ( isset( $atts['form']->options[ $opt ] ) && ! empty( $atts['form']->options[ $opt ] ) ) ? $atts['form']->options[ $opt ] : 'message';
2648	2142
2649	2143	if ( ! empty( $atts['entry_id'] ) ) {
2650	2144	$met_actions = self::get_met_on_submit_actions( $atts, $action );
2651		-
2652	2145	if ( $met_actions ) {
2653	2146	$method = $met_actions;
2654	2147	}
2655	2148	}
		@@ -2655,22 +2148,15 @@
2655	2148	}
2656	2149
2657	2150	$method = apply_filters( 'frm_success_filter', $method, $atts['form'], $action );
2658	2151
2659		- if ( $method !== 'message' && ( ! $atts['entry_id'] || ! is_numeric( $atts['entry_id'] ) ) ) {
2660		- return 'message';
	2152	+ if ( $method != 'message' && ( ! $atts['entry_id'] || ! is_numeric( $atts['entry_id'] ) ) ) {
	2153	+ $method = 'message';
2661	2154	}
2662	2155
2663	2156	return $method;
2664	2157	}
2665	2158
2666		- /**
2667		- * @param object $form
2668		- * @param array $params
2669		- * @param array $args
2670		- *
2671		- * @return void
2672		- */
2673	2159	public static function maybe_trigger_redirect( $form, $params, $args ) {
2674	2160	if ( ! isset( $params['id'] ) ) {
2675	2161	global $frm_vars;
2676	2162	$params['id'] = $frm_vars['created_entries'][ $form->id ]['entry_id'];
		@@ -2697,12 +2183,14 @@
2697	2183	* @param array $params See {@see FrmFormsController::maybe_trigger_redirect()}.
2698	2184	* @param array $args See {@see FrmFormsController::maybe_trigger_redirect()}.
2699	2185	*/
2700	2186	public static function maybe_trigger_redirect_with_action( $conf_method, $form, $params, $args ) {
2701		- if ( is_array( $conf_method ) && 1 === count( $conf_method ) && 'redirect' === FrmOnSubmitHelper::get_action_type( $conf_method[0] ) && empty( $conf_method[0]->post_content['redirect_delay'] ) ) { // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong
2702		- $event = FrmOnSubmitHelper::current_event( $params );
2703		- FrmOnSubmitHelper::populate_on_submit_data( $form->options, $conf_method[0], $event );
2704		- $conf_method = 'redirect';
	2187	+ if ( is_array( $conf_method ) && 1 === count( $conf_method ) ) {
	2188	+ if ( 'redirect' === FrmOnSubmitHelper::get_action_type( $conf_method[0] ) ) {
	2189	+ $event = FrmOnSubmitHelper::current_event( $params );
	2190	+ FrmOnSubmitHelper::populate_on_submit_data( $form->options, $conf_method[0], $event );
	2191	+ $conf_method = 'redirect';
	2192	+ }
2705	2193	}
2706	2194
2707	2195	if ( 'redirect' === $conf_method ) {
2708	2196	self::trigger_redirect( $form, $params, $args );
		@@ -2708,15 +2196,8 @@
2708	2196	self::trigger_redirect( $form, $params, $args );
2709	2197	}
2710	2198	}
2711	2199
2712		- /**
2713		- * @param object $form
2714		- * @param array $params
2715		- * @param array $args
2716		- *
2717		- * @return void
2718		- */
2719	2200	public static function trigger_redirect( $form, $params, $args ) {
2720	2201	$success_args = array(
2721	2202	'action' => $params['action'],
2722	2203	'conf_method' => 'redirect',
		@@ -2754,9 +2235,9 @@
2754	2235	unset( $extra_args['form'] );
2755	2236
2756	2237	do_action( 'frm_success_action', $args['conf_method'], $args['form'], $args['form']->options, $args['entry_id'], $extra_args );
2757	2238
2758		- $opt = ! isset( $args['action'] ) || $args['action'] === 'create' ? 'success' : 'edit';
	2239	+ $opt = ( ! isset( $args['action'] ) || $args['action'] === 'create' ) ? 'success' : 'edit';
2759	2240
2760	2241	$args['success_opt'] = $opt;
2761	2242	$args['ajax'] = ! empty( $frm_vars['ajax'] );
2762	2243
		@@ -2775,9 +2256,8 @@
2775	2256	* @since 6.0
2776	2257	*
2777	2258	* @param array $args See {@see FrmFormsController::run_success_action()}.
2778	2259	* @param string $event Form event. Default is `create`.
2779		- *
2780	2260	* @return array Array of actions that meet the conditional logics.
2781	2261	*/
2782	2262	public static function get_met_on_submit_actions( $args, $event = 'create' ) {
2783	2263	if ( ! FrmOnSubmitHelper::form_has_migrated( $args['form'] ) ) {
		@@ -2783,16 +2263,16 @@
2783	2263	if ( ! FrmOnSubmitHelper::form_has_migrated( $args['form'] ) ) {
2784	2264	return array();
2785	2265	}
2786	2266
2787		- // If a redirect action has already opened the URL in a new tab, we show the default message in the current tab.
	2267	+ // If a redirect action has already opened the URL in a new tab, we show the default message in the currect tab.
2788	2268	if ( ! empty( self::$redirected_in_new_tab[ $args['form']->id ] ) ) {
2789	2269	return array( FrmOnSubmitHelper::get_fallback_action_after_open_in_new_tab( $event ) );
2790	2270	}
2791	2271
2792		- $entry = FrmEntry::getOne( $args['entry_id'], true );
2793		- $actions = FrmOnSubmitHelper::get_actions( $args['form']->id );
2794		- $met_actions = array();
	2272	+ $entry = FrmEntry::getOne( $args['entry_id'], true );
	2273	+ $actions = FrmOnSubmitHelper::get_actions( $args['form']->id );
	2274	+ $met_actions = array();
2795	2275	$has_redirect = false;
2796	2276
2797	2277	foreach ( $actions as $action ) {
2798	2278	if ( ! in_array( $event, $action->post_content['event'], true ) ) {
		@@ -2804,11 +2284,13 @@
2804	2284	}
2805	2285
2806	2286	$action_type = FrmOnSubmitHelper::get_action_type( $action );
2807	2287
2808		- if ( 'redirect' === $action_type && $has_redirect ) {
2809		- // Do not process because we run the first redirect action only.
2810		- continue;
	2288	+ if ( 'redirect' === $action_type ) {
	2289	+ if ( $has_redirect ) {
	2290	+ // Do not process because we run the first redirect action only.
	2291	+ continue;
	2292	+ }
2811	2293	}
2812	2294
2813	2295	if ( ! self::is_valid_on_submit_action( $action, $args, $event ) ) {
2814	2296	continue;
		@@ -2833,10 +2315,10 @@
2833	2315	* @param array $args See {@see FrmFormsController::run_success_action()}. `$args['event']` is also added.
2834	2316	*/
2835	2317	$met_actions = apply_filters( 'frm_get_met_on_submit_actions', $met_actions, $args );
2836	2318
2837		- if ( ! $met_actions ) {
2838		- return array( FrmOnSubmitHelper::get_fallback_action( $event ) );
	2319	+ if ( empty( $met_actions ) ) {
	2320	+ $met_actions = array( FrmOnSubmitHelper::get_fallback_action( $event ) );
2839	2321	}
2840	2322
2841	2323	return $met_actions;
2842	2324	}
		@@ -2848,9 +2330,8 @@
2848	2330	*
2849	2331	* @param object $action Form action object.
2850	2332	* @param array $args See {@see FrmFormsController::run_success_action()}.
2851	2333	* @param string $event Form event. Default is `create`.
2852		- *
2853	2334	* @return bool
2854	2335	*/
2855	2336	private static function is_valid_on_submit_action( $action, $args, $event = 'create' ) {
2856	2337	$action_type = FrmOnSubmitHelper::get_action_type( $action );
		@@ -2872,9 +2353,8 @@
2872	2353	return false;
2873	2354	}
2874	2355
2875	2356	$page = get_post( $action->post_content['success_page_id'] );
2876		-
2877	2357	if ( ! $page || 'trash' === $page->post_status ) {
2878	2358	return false;
2879	2359	}
2880	2360	}
		@@ -2896,9 +2376,8 @@
2896	2376	'entry_id' => $args['entry_id'],
2897	2377	'action' => FrmOnSubmitHelper::current_event( $args ),
2898	2378	)
2899	2379	);
2900		-
2901	2380	if ( ! is_array( $args['conf_method'] ) ) {
2902	2381	self::run_success_action( $args );
2903	2382	return;
2904	2383	}
		@@ -2925,9 +2404,8 @@
2925	2404	* @param array $args See {@see FrmFormsController::run_success_action()}.
2926	2405	*/
2927	2406	public static function run_multi_on_submit_actions( $args ) {
2928	2407	$redirect_action = null;
2929		-
2930	2408	foreach ( $args['conf_method'] as $action ) {
2931	2409	if ( 'redirect' === FrmOnSubmitHelper::get_action_type( $action ) ) {
2932	2410	// We catch the redirect action to run it last.
2933	2411	$redirect_action = $action;
		@@ -2938,15 +2416,13 @@
2938	2416
2939	2417	unset( $action );
2940	2418	}
2941	2419
2942		- if ( ! $redirect_action ) {
2943		- return;
	2420	+ if ( $redirect_action ) {
	2421	+ // Show script to delay the redirection.
	2422	+ $args['force_delay_redirect'] = true;
	2423	+ self::run_single_on_submit_action( $args, $redirect_action );
2944	2424	}
2945		-
2946		- // Show script to delay the redirection.
2947		- $args['force_delay_redirect'] = true;
2948		- self::run_single_on_submit_action( $args, $redirect_action );
2949	2425	}
2950	2426
2951	2427	/**
2952	2428	* Runs single On Submit action.
		@@ -2967,9 +2443,8 @@
2967	2443	* @since 6.0
2968	2444	*
2969	2445	* @param array $args See {@see FrmFormsController::run_success_action()}.
2970	2446	* @param object $action On Submit action object.
2971		- *
2972	2447	* @return array
2973	2448	*/
2974	2449	private static function get_run_success_action_args( $args, $action ) {
2975	2450	$new_args = $args;
		@@ -2975,9 +2450,10 @@
2975	2450	$new_args = $args;
2976	2451
2977	2452	FrmOnSubmitHelper::populate_on_submit_data( $new_args['form']->options, $action, $args['action'] );
2978	2453
2979		- $opt = 'update' === $args['action'] ? 'edit_' : 'success_';
	2454	+ $opt = 'update' === $args['action'] ? 'edit_' : 'success_';
	2455	+
2980	2456	$new_args['conf_method'] = $new_args['form']->options[ $opt . 'action' ];
2981	2457
2982	2458	/**
2983	2459	* Filters the run success action args.
		@@ -2992,18 +2468,12 @@
2992	2468	}
2993	2469
2994	2470	/**
2995	2471	* @since 3.0
2996		- *
2997		- * @param array $args
2998		- *
2999		- * @return void
3000	2472	*/
3001	2473	private static function load_page_after_submit( $args ) {
3002	2474	global $post;
3003	2475	$opt = $args['success_opt'];
3004		-
3005		- // phpcs:ignore Universal.Operators.StrictComparisons
3006	2476	if ( ! $post || $args['form']->options[ $opt . '_page_id' ] != $post->ID ) {
3007	2477	$page = get_post( $args['form']->options[ $opt . '_page_id' ] );
3008	2478	$old_post = $post;
3009	2479	$post = $page;
		@@ -3027,9 +2497,8 @@
3027	2497	}
3028	2498
3029	2499	/**
3030	2500	* @since 3.0
3031		- *
3032	2501	* @param array $args See {@see FrmFormsController::run_success_action()}.
3033	2502	*/
3034	2503	private static function redirect_after_submit( $args ) {
3035	2504	add_filter( 'frm_use_wpautop', '__return_false' );
		@@ -3043,10 +2512,11 @@
3043	2512	FrmEntriesController::delete_entry_before_redirect( $success_url, $args['form'], $args );
3044	2513
3045	2514	add_filter( 'frm_redirect_url', 'FrmEntriesController::prepare_redirect_url' );
3046	2515	$success_url = apply_filters( 'frm_redirect_url', $success_url, $args['form'], $args );
3047		- $doing_ajax = FrmAppHelper::doing_ajax();
3048	2516
	2517	+ $doing_ajax = FrmAppHelper::doing_ajax();
	2518	+
3049	2519	if ( ! empty( $args['ajax'] ) && $doing_ajax && empty( $args['force_delay_redirect'] ) ) {
3050	2520	// Is AJAX submit and there is just one Redirect action runs.
3051	2521	echo json_encode( self::get_ajax_redirect_response_data( $args + compact( 'success_url' ) ) );
3052	2522	wp_die();
		@@ -3051,9 +2521,9 @@
3051	2521	echo json_encode( self::get_ajax_redirect_response_data( $args + compact( 'success_url' ) ) );
3052	2522	wp_die();
3053	2523	}
3054	2524
3055		- if ( ! headers_sent() && empty( $args['force_delay_redirect'] ) && empty( $args['form']->options['redirect_delay'] ) ) {
	2525	+ if ( ! headers_sent() && empty( $args['force_delay_redirect'] ) ) {
3056	2526	// Not AJAX submit, no headers sent, and there is just one Redirect action runs.
3057	2527	if ( ! empty( $args['form']->options['open_in_new_tab'] ) ) {
3058	2528	self::print_open_in_new_tab_js_with_fallback_handler( $success_url, $args );
3059	2529	self::$redirected_in_new_tab[ $args['form']->id ] = 1;
		@@ -3095,51 +2565,31 @@
3095	2565	*
3096	2566	* @since 6.3.1
3097	2567	*
3098	2568	* @param array $args See {@see FrmFormsController::run_success_action()}.
3099		- *
3100	2569	* @return array
3101	2570	*/
3102	2571	private static function get_ajax_redirect_response_data( $args ) {
3103		- $response_data = array(
3104		- 'redirect' => $args['success_url'],
3105		- 'content' => '',
3106		- );
3107		- $unset_content = true;
	2572	+ $response_data = array( 'redirect' => $args['success_url'] );
3108	2573
3109		- if ( ! empty( $args['form']->options['redirect_delay'] ) ) {
3110		- $response_data['delay'] = $args['form']->options['redirect_delay_time'];
3111		- $response_data['content'] .= self::get_redirect_message( $args['success_url'], $args['form']->options['redirect_delay_msg'], $args );
3112		- $unset_content = false;
3113		- }
3114		-
3115	2574	if ( ! empty( $args['form']->options['open_in_new_tab'] ) ) {
3116	2575	$response_data['openInNewTab'] = 1;
3117	2576
3118		- // Only show open in new tab text if there is no delay.
3119		- if ( empty( $response_data['content'] ) ) {
3120		- $args['message'] = FrmOnSubmitHelper::get_default_new_tab_msg();
	2577	+ $args['message'] = FrmOnSubmitHelper::get_default_new_tab_msg();
3121	2578
3122		- $args['form']->options['success_msg'] = $args['message'];
3123		- $args['form']->options['edit_msg'] = $args['message'];
	2579	+ $args['form']->options['success_msg'] = $args['message'];
	2580	+ $args['form']->options['edit_msg'] = $args['message'];
	2581	+ if ( ! isset( $args['fields'] ) ) {
	2582	+ $args['fields'] = FrmField::get_all_for_form( $args['form']->id );
	2583	+ }
3124	2584
3125		- if ( ! isset( $args['fields'] ) ) {
3126		- $args['fields'] = FrmField::get_all_for_form( $args['form']->id );
3127		- }
	2585	+ $args['message'] = self::prepare_submit_message( $args['form'], $args['entry_id'], $args );
3128	2586
3129		- $args['message'] = self::prepare_submit_message( $args['form'], $args['entry_id'], $args );
	2587	+ ob_start();
	2588	+ self::show_lone_success_messsage( $args );
	2589	+ $response_data['content'] = ob_get_clean();
3130	2590
3131		- ob_start();
3132		- self::show_lone_success_message( $args );
3133		- $response_data['content'] .= ob_get_clean();
3134		- $unset_content = false;
3135		- }//end if
3136		-
3137	2591	$response_data['fallbackMsg'] = self::get_redirect_fallback_message( $args['success_url'], $args );
3138		- }//end if
3139		-
3140		- if ( $unset_content && '' === $response_data['content'] ) {
3141		- unset( $response_data['content'] );
3142	2592	}
3143	2593
3144	2594	return $response_data;
3145	2595	}
		@@ -3151,9 +2601,9 @@
3151	2601	*
3152	2602	* @param array $args See {@see FrmFormsController::run_success_action()}.
3153	2603	*/
3154	2604	private static function redirect_after_submit_using_js( $args ) {
3155		- $success_msg = $args['form']->options['redirect_delay_msg'];
	2605	+ $success_msg = FrmOnSubmitHelper::get_default_redirect_msg();
3156	2606	$redirect_msg = self::get_redirect_message( $args['success_url'], $success_msg, $args );
3157	2607	$success_url = esc_url_raw( $args['success_url'] );
3158	2608
3159	2609	/**
		@@ -3160,11 +2610,11 @@
3160	2610	* Filters the delay time before redirecting when On Submit Redirect action is delayed.
3161	2611	*
3162	2612	* @since 6.0
3163	2613	*
3164		- * @param int $delay_time Delay time in milliseconds.
	2614	+ * @param int $delay_time Delay time in miliseconds.
3165	2615	*/
3166		- $delay_time = apply_filters( 'frm_redirect_delay_time', 1000 * $args['form']->options['redirect_delay_time'] );
	2616	+ $delay_time = apply_filters( 'frm_redirect_delay_time', 8000 );
3167	2617
3168	2618	if ( ! empty( $args['form']->options['open_in_new_tab'] ) ) {
3169	2619	$redirect_js = 'window.open("' . $success_url . '", "_blank")';
3170	2620	} else {
		@@ -3174,15 +2624,13 @@
3174	2624	add_filter( 'frm_use_wpautop', '__return_true' );
3175	2625
3176	2626	echo FrmAppHelper::maybe_kses( $redirect_msg ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
3177	2627	echo '<script>';
3178		-
3179	2628	if ( empty( $args['doing_ajax'] ) ) {
3180	2629	// Not AJAX submit, delay JS until window.load.
3181	2630	echo 'window.onload=function(){';
3182	2631	}
3183	2632	echo 'setTimeout(function(){' . $redirect_js . '}, ' . intval( $delay_time ) . ');'; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
3184		-
3185	2633	if ( empty( $args['doing_ajax'] ) ) {
3186	2634	echo '};';
3187	2635	}
3188	2636	echo '</script>';
		@@ -3195,16 +2643,11 @@
3195	2643	* @param string $success_msg
3196	2644	* @param array $args
3197	2645	*/
3198	2646	private static function get_redirect_message( $success_url, $success_msg, $args ) {
3199		- $success_msg = apply_filters( 'frm_content', $success_msg, $args['form'], $args['entry_id'] );
3200		- $success_msg = do_shortcode( FrmAppHelper::use_wpautop( $success_msg ) );
3201		-
3202		- // phpcs:disable Generic.WhiteSpace.ScopeIndent
3203		- $redirect_msg = '<div class="' . esc_attr( FrmFormsHelper::get_form_style_class( $args['form'] ) ) . '"><div class="frm-redirect-msg" role="status">' . $success_msg . '<br/>' . // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong
	2647	+ $redirect_msg = '<div class="' . esc_attr( FrmFormsHelper::get_form_style_class( $args['form'] ) ) . '"><div class="frm-redirect-msg" role="status">' . $success_msg . '<br/>' .
3204	2648	self::get_redirect_fallback_message( $success_url, $args ) .
3205	2649	'</div></div>';
3206		- // phpcs:enable Generic.WhiteSpace.ScopeIndent
3207	2650
3208	2651	$redirect_args = array(
3209	2652	'entry_id' => $args['entry_id'],
3210	2653	'form_id' => $args['form']->id,
		@@ -3220,14 +2663,12 @@
3220	2663	* @since 6.3.1
3221	2664	*
3222	2665	* @param string $success_url Redirect URL.
3223	2666	* @param array $args Contains `form` object.
3224		- *
3225	2667	* @return string
3226	2668	*/
3227	2669	private static function get_redirect_fallback_message( $success_url, $args ) {
3228	2670	$target = '';
3229		-
3230	2671	if ( ! empty( $args['form']->options['open_in_new_tab'] ) ) {
3231	2672	$target = ' target="_blank"';
3232	2673	}
3233	2674
		@@ -3242,12 +2683,8 @@
3242	2683	/**
3243	2684	* Prepare to show the success message and empty form after submit
3244	2685	*
3245	2686	* @since 2.05
3246		- *
3247		- * @param array $atts
3248		- *
3249		- * @return void
3250	2687	*/
3251	2688	public static function show_message_after_save( $atts ) {
3252	2689	$atts['message'] = self::prepare_submit_message( $atts['form'], $atts['entry_id'], $atts );
3253	2690
		@@ -3253,9 +2690,8 @@
3253	2690
3254	2691	if ( ! isset( $atts['form']->options['show_form'] ) || $atts['form']->options['show_form'] ) {
3255	2692	if ( isset( $atts['action'] ) && 'update' === $atts['action'] && is_callable( array( 'FrmProEntriesController', 'show_front_end_form_with_entry' ) ) ) {
3256	2693	$entry = FrmEntry::getOne( $atts['entry_id'] );
3257		-
3258	2694	if ( $entry ) {
3259	2695	// This is copied from the Pro plugin.
3260	2696	$atts['conf_message'] = FrmProEntriesController::confirmation( 'message', $atts['form'], $atts['form']->options, $entry->id, $atts );
3261	2697	$atts['show_form'] = FrmProEntriesController::is_form_displayed_after_edit( $atts['form'] );
		@@ -3264,9 +2700,9 @@
3264	2700	} else {
3265	2701	self::show_form_after_submit( $atts );
3266	2702	}
3267	2703	} else {
3268		- self::show_lone_success_message( $atts );
	2704	+ self::show_lone_success_messsage( $atts );
3269	2705	}
3270	2706	}
3271	2707
3272	2708	/**
		@@ -3272,12 +2708,8 @@
3272	2708	/**
3273	2709	* Show an empty form
3274	2710	*
3275	2711	* @since 2.05
3276		- *
3277		- * @param array $args
3278		- *
3279		- * @return void
3280	2712	*/
3281	2713	private static function show_form_after_submit( $args ) {
3282	2714	self::fill_atts_for_form_display( $args );
3283	2715
		@@ -3296,11 +2728,12 @@
3296	2728	}
3297	2729	unset( $args );
3298	2730
3299	2731	$include_form_tag = apply_filters( 'frm_include_form_tag', true, $form );
3300		- $frm_settings = FrmAppHelper::get_settings();
3301		- $submit = $form->options['submit_value'] ?? $frm_settings->submit_value;
3302	2732
	2733	+ $frm_settings = FrmAppHelper::get_settings();
	2734	+ $submit = isset( $form->options['submit_value'] ) ? $form->options['submit_value'] : $frm_settings->submit_value;
	2735	+
3303	2736	global $frm_vars;
3304	2737	self::maybe_load_css( $form, $values['custom_style'], $frm_vars['load_css'] );
3305	2738
3306	2739	$message_placement = self::message_placement( $form, $message );
		@@ -3308,36 +2741,27 @@
3308	2741	include FrmAppHelper::plugin_path() . '/classes/views/frm-entries/new.php';
3309	2742	}
3310	2743
3311	2744	/**
3312		- * Gets message placement.
	2745	+ * @return string - 'before', 'after', or 'submit'
3313	2746	*
3314	2747	* @since 4.05.02
3315		- * @since 6.26 This method changed from `private` to `public`.
3316		- *
3317		- * @param object $form Form object.
3318		- * @param string $message The message.
3319		- *
3320		- * @return string Accepts 'before', 'after', or 'submit'.
3321	2748	*/
3322		- public static function message_placement( $form, $message ) {
	2749	+ private static function message_placement( $form, $message ) {
3323	2750	$place = 'before';
3324	2751
3325	2752	if ( $message && isset( $form->options['form_class'] ) ) {
3326		- if ( str_contains( $form->options['form_class'], 'frm_below_success' ) ) {
	2753	+ if ( strpos( $form->options['form_class'], 'frm_below_success' ) !== false ) {
3327	2754	$place = 'after';
3328		- } elseif ( str_contains( $form->options['form_class'], 'frm_inline_success' ) ) {
	2755	+ } elseif ( strpos( $form->options['form_class'], 'frm_inline_success' ) !== false ) {
3329	2756	$place = 'submit';
3330	2757	}
3331	2758	}
3332	2759
3333	2760	/**
3334		- * Filter the message placement.
	2761	+ * @return string - 'before' or 'after'
3335	2762	*
3336	2763	* @since 4.05.02
3337		- *
3338		- * @param string $place Accepts 'before', 'after', or 'submit'.
3339		- * @param array $args Args.
3340	2764	*/
3341	2765	return apply_filters( 'frm_message_placement', $place, compact( 'form', 'message' ) );
3342	2766	}
3343	2767
		@@ -3344,12 +2768,8 @@
3344	2768	/**
3345	2769	* Get all the values needed on the new.php entry page
3346	2770	*
3347	2771	* @since 2.05
3348		- *
3349		- * @param array $args
3350		- *
3351		- * @return void
3352	2772	*/
3353	2773	private static function fill_atts_for_form_display( &$args ) {
3354	2774	if ( ! isset( $args['title'] ) && isset( $args['show_title'] ) ) {
3355	2775	$args['title'] = $args['show_title'];
		@@ -3374,24 +2794,21 @@
3374	2794	/**
3375	2795	* Show the success message without the form
3376	2796	*
3377	2797	* @since 2.05
3378		- *
3379		- * @param array $atts
3380		- *
3381		- * @return void
3382	2798	*/
3383		- private static function show_lone_success_message( $atts ) {
	2799	+ private static function show_lone_success_messsage( $atts ) {
3384	2800	global $frm_vars;
3385	2801	$values = FrmEntriesHelper::setup_new_vars( $atts['fields'], $atts['form'], true );
3386	2802	self::maybe_load_css( $atts['form'], $values['custom_style'], $frm_vars['load_css'] );
3387	2803
3388	2804	$include_extra_container = 'frm_forms' . FrmFormsHelper::get_form_style_class( $values );
3389		- $errors = array();
3390		- $form = $atts['form'];
3391		- $message = $atts['message'];
3392	2805
3393		- include FrmAppHelper::plugin_path() . '/classes/views/frm-entries/errors.php';
	2806	+ $errors = array();
	2807	+ $form = $atts['form'];
	2808	+ $message = $atts['message'];
	2809	+
	2810	+ include( FrmAppHelper::plugin_path() . '/classes/views/frm-entries/errors.php' );
3394	2811	}
3395	2812
3396	2813	/**
3397	2814	* Prepare the success message before it's shown
		@@ -3398,20 +2815,19 @@
3398	2815	*
3399	2816	* @since 2.05
3400	2817	* @since 6.0.x Added the third parameter.
3401	2818	*
3402		- * @param object $form Form object.
3403		- * @param int|string $entry_id Entry ID.
3404		- * @param array $args See {@see FrmFormsController::run_success_action()}.
3405		- *
	2819	+ * @param object $form Form object.
	2820	+ * @param int $entry_id Entry ID.
	2821	+ * @param array $args See {@see FrmFormsController::run_success_action()}.
3406	2822	* @return string
3407	2823	*/
3408	2824	private static function prepare_submit_message( $form, $entry_id, $args = array() ) {
3409	2825	$frm_settings = FrmAppHelper::get_settings( array( 'current_form' => $form->id ) );
3410		- $opt = $args['success_opt'] ?? 'success';
	2826	+ $opt = isset( $args['success_opt'] ) ? $args['success_opt'] : 'success';
3411	2827
3412	2828	if ( $entry_id && is_numeric( $entry_id ) ) {
3413		- $message = $form->options[ $opt . '_msg' ] ?? $frm_settings->success_msg;
	2829	+ $message = isset( $form->options[ $opt . '_msg' ] ) ? $form->options[ $opt . '_msg' ] : $frm_settings->success_msg;
3414	2830	$class = 'frm_message';
3415	2831	} else {
3416	2832	$message = $frm_settings->failed_msg;
3417	2833	$class = FrmFormsHelper::form_error_class();
		@@ -3428,9 +2844,9 @@
3428	2844	public static function front_head() {
3429	2845	$version = FrmAppHelper::plugin_version();
3430	2846	$suffix = FrmAppHelper::js_suffix();
3431	2847
3432		- if ( $suffix && self::has_combo_js_file() ) {
	2848	+ if ( ! empty( $suffix ) && self::has_combo_js_file() ) {
3433	2849	wp_register_script( 'formidable', FrmAppHelper::plugin_url() . '/js/frm.min.js', array( 'jquery' ), $version, true );
3434	2850	} else {
3435	2851	wp_register_script( 'formidable', FrmAppHelper::plugin_url() . "/js/formidable{$suffix}.js", array( 'jquery' ), $version, true );
3436	2852	}
		@@ -3437,9 +2853,9 @@
3437	2853
3438	2854	add_filter( 'script_loader_tag', 'FrmFormsController::defer_script_loading', 10, 2 );
3439	2855
3440	2856	if ( FrmAppHelper::is_admin() ) {
3441		- // Don't load this in back-end
	2857	+ // don't load this in back-end
3442	2858	return;
3443	2859	}
3444	2860
3445	2861	FrmAppHelper::localize_script( 'front' );
		@@ -3452,15 +2868,8 @@
3452	2868	public static function has_combo_js_file() {
3453	2869	return is_readable( FrmAppHelper::plugin_path() . '/js/frm.min.js' );
3454	2870	}
3455	2871
3456		- /**
3457		- * @param object $form
3458		- * @param int|string $this_load
3459		- * @param bool $global_load
3460		- *
3461		- * @return void
3462		- */
3463	2872	public static function maybe_load_css( $form, $this_load, $global_load ) {
3464	2873	$load_css = FrmForm::is_form_loaded( $form, $this_load, $global_load );
3465	2874
3466	2875	if ( ! $load_css ) {
		@@ -3490,9 +2899,8 @@
3490	2899	return;
3491	2900	}
3492	2901
3493	2902	global $wp_styles;
3494		-
3495	2903	if ( is_array( $wp_styles->queue ) && in_array( 'formidable', $wp_styles->queue, true ) ) {
3496	2904	wp_print_styles( 'formidable' );
3497	2905	}
3498	2906	}
		@@ -3507,57 +2915,32 @@
3507	2915	private static function should_load_late() {
3508	2916	return ! function_exists( 'aioseo' );
3509	2917	}
3510	2918
3511		- /**
3512		- * @param string $tag
3513		- * @param string $handle
3514		- *
3515		- * @return string
3516		- */
3517	2919	public static function defer_script_loading( $tag, $handle ) {
3518		- if ( 'captcha-api' === $handle && ! str_contains( $tag, 'defer' ) ) {
3519		- return str_replace( ' src', ' defer="defer" async="async" src', $tag );
	2920	+ if ( 'captcha-api' == $handle && ! strpos( $tag, 'defer' ) ) {
	2921	+ $tag = str_replace( ' src', ' defer="defer" async="async" src', $tag );
3520	2922	}
3521	2923
3522	2924	return $tag;
3523	2925	}
3524	2926
3525		- /**
3526		- * @param string $location
3527		- *
3528		- * @return void
3529		- */
3530	2927	public static function footer_js( $location = 'footer' ) {
3531	2928	global $frm_vars;
3532	2929
3533	2930	FrmStylesController::enqueue_css();
3534	2931
3535		- if ( FrmAppHelper::is_admin() || $location === 'header' || empty( $frm_vars['forms_loaded'] ) ) {
3536		- return;
	2932	+ if ( ! FrmAppHelper::is_admin() && $location != 'header' && ! empty( $frm_vars['forms_loaded'] ) ) {
	2933	+ // load formidable js
	2934	+ wp_enqueue_script( 'formidable' );
3537	2935	}
3538		-
3539		- // Load formidable js
3540		- wp_enqueue_script( 'formidable' );
3541		-
3542		- FrmHoneypot::maybe_print_honeypot_js();
3543		-
3544		- if ( ! method_exists( 'FrmProFormsHelper', 'load_currency_js' ) ) {
3545		- // Load currency JS if Pro is not installed.
3546		- FrmFormsHelper::load_currency_js();
3547		- }
3548	2936	}
3549	2937
3550	2938	/**
3551	2939	* @since 2.0.8
3552		- *
3553		- * @param array $atts
3554		- * @param string $content
3555		- *
3556		- * @return void
3557	2940	*/
3558	2941	private static function maybe_minimize_form( $atts, &$content ) {
3559		- // Check if minimizing is turned on
	2942	+ // check if minimizing is turned on
3560	2943	if ( self::is_minification_on( $atts ) ) {
3561	2944	$content = str_replace( array( "\r\n", "\r", "\n", "\t", ' ' ), '', $content );
3562	2945	}
3563	2946	}
		@@ -3563,15 +2946,12 @@
3563	2946	}
3564	2947
3565	2948	/**
3566	2949	* @since 2.0.8
3567		- *
3568		- * @param array $atts
3569		- *
3570		- * @return bool
	2950	+ * @return boolean
3571	2951	*/
3572	2952	private static function is_minification_on( $atts ) {
3573		- return ! empty( $atts['minimize'] );
	2953	+ return isset( $atts['minimize'] ) && ! empty( $atts['minimize'] );
3574	2954	}
3575	2955
3576	2956	/**
3577	2957	* @since 5.0.16
		@@ -3579,13 +2959,11 @@
3579	2959	* @return void
3580	2960	*/
3581	2961	public static function landing_page_preview_option() {
3582	2962	$dir = apply_filters( 'frm_landing_page_preview_option', false );
3583		-
3584	2963	if ( false === $dir || ! file_exists( $dir . 'landing-page-preview-option.php' ) ) {
3585	2964	$dir = self::get_form_views_path();
3586	2965	}
3587		-
3588	2966	include $dir . 'landing-page-preview-option.php';
3589	2967	}
3590	2968
3591	2969	/**
		@@ -3611,15 +2989,13 @@
3611	2989
3612	2990	check_ajax_referer( 'frm_ajax', 'nonce' );
3613	2991
3614	2992	$type = FrmAppHelper::get_post_param( 'type', '', 'sanitize_text_field' );
3615		-
3616	2993	if ( ! $type || ! in_array( $type, array( 'form', 'view' ), true ) ) {
3617	2994	die( 0 );
3618	2995	}
3619	2996
3620	2997	$object_id = FrmAppHelper::get_post_param( 'object_id', '', 'absint' );
3621		-
3622	2998	if ( ! $object_id ) {
3623	2999	die( 0 );
3624	3000	}
3625	3001
		@@ -3631,15 +3007,13 @@
3631	3007	$postarr['post_content'] = apply_filters( 'frm_create_page_with_' . $type . '_shortcode_content', '', $object_id );
3632	3008	}
3633	3009
3634	3010	$name = FrmAppHelper::get_post_param( 'name', '', 'sanitize_text_field' );
3635		-
3636	3011	if ( $name ) {
3637	3012	$postarr['post_title'] = $name;
3638	3013	}
3639	3014
3640	3015	$success = wp_insert_post( $postarr );
3641		-
3642	3016	if ( ! is_numeric( $success ) || ! $success ) {
3643	3017	die( 0 );
3644	3018	}
3645	3019
		@@ -3653,9 +3027,8 @@
3653	3027	/**
3654	3028	* @since 5.3
3655	3029	*
3656	3030	* @param int $form_id
3657		- *
3658	3031	* @return string
3659	3032	*/
3660	3033	private static function get_page_shortcode_content_for_form( $form_id ) {
3661	3034	$shortcode = '[formidable id="' . $form_id . '"]';
		@@ -3675,10 +3048,10 @@
3675	3048	}
3676	3049
3677	3050	check_ajax_referer( 'frm_ajax', 'nonce' );
3678	3051
3679		- $html = FrmAppHelper::clip(
3680		- function () {
	3052	+ $html = FrmAppHelper::clip(
	3053	+ function() {
3681	3054	FrmAppHelper::maybe_autocomplete_pages_options(
3682	3055	array(
3683	3056	'field_name' => 'frm_page_dropdown',
3684	3057	'page_id' => '',
		@@ -3686,12 +3059,13 @@
3686	3059	)
3687	3060	);
3688	3061	}
3689	3062	);
	3063	+ $post_type_object = get_post_type_object( 'page' );
3690	3064	wp_send_json(
3691	3065	array(
3692	3066	'html' => $html,
3693		- 'edit_page_url' => admin_url( sprintf( get_post_type_object( 'page' )->_edit_link . '&action=edit', 0 ) ),
	3067	+ 'edit_page_url' => admin_url( sprintf( $post_type_object->_edit_link . '&action=edit', 0 ) ),
3694	3068	)
3695	3069	);
3696	3070	}
3697	3071
		@@ -3696,14 +3070,89 @@
3696	3070	}
3697	3071
3698	3072	/**
3699	3073	* @deprecated 4.0
	3074	+ */
	3075	+ public static function new_form( $values = array() ) {
	3076	+ FrmDeprecated::new_form( $values );
	3077	+ }
	3078	+
	3079	+ /**
	3080	+ * @deprecated 4.0
	3081	+ */
	3082	+ public static function create( $values = array() ) {
	3083	+ _deprecated_function( __METHOD__, '4.0', 'FrmFormsController::update' );
	3084	+ self::update( $values );
	3085	+ }
	3086	+
	3087	+ /**
	3088	+ * @deprecated 3.0
	3089	+ * @codeCoverageIgnore
	3090	+ */
	3091	+ public static function bulk_create_template( $ids ) {
	3092	+ return FrmDeprecated::bulk_create_template( $ids );
	3093	+ }
	3094	+
	3095	+ /**
	3096	+ * @deprecated 3.0
	3097	+ * @codeCoverageIgnore
	3098	+ */
	3099	+ public static function edit_key() {
	3100	+ FrmDeprecated::edit_key();
	3101	+ }
	3102	+
	3103	+ /**
	3104	+ * @deprecated 3.0
	3105	+ * @codeCoverageIgnore
	3106	+ */
	3107	+ public static function edit_description() {
	3108	+ FrmDeprecated::edit_description();
	3109	+ }
	3110	+
	3111	+ /**
	3112	+ * @deprecated 4.08
	3113	+ * @since 3.06
	3114	+ */
	3115	+ public static function add_new() {
	3116	+ _deprecated_function( __FUNCTION__, '4.08' );
	3117	+ }
	3118	+
	3119	+ /**
	3120	+ * Create a custom template from a form
3700	3121	*
3701		- * @param array $values
	3122	+ * @since 3.06
	3123	+ * @deprecated 6.7
	3124	+ */
	3125	+ public static function build_template() {
	3126	+ _deprecated_function( __METHOD__, '6.7' );
	3127	+ }
	3128	+
	3129	+ /**
	3130	+ * @deprecated 6.7
3702	3131	*
	3132	+ * @return bool
	3133	+ */
	3134	+ public static function expired() {
	3135	+ _deprecated_function( __METHOD__, '6.7' );
	3136	+ return FrmAddonsController::is_license_expired();
	3137	+ }
	3138	+
	3139	+ /**
	3140	+ * Get data from api before rendering it so that we can flag the modal as expired
	3141	+ *
	3142	+ * @deprecated 6.7
	3143	+ *
3703	3144	* @return void
3704	3145	*/
3705		- public static function create( $values = array() ) {
3706		- _deprecated_function( __METHOD__, '4.0', 'FrmFormsController::update' );
3707		- self::update( $values );
	3146	+ public static function before_list_templates() {
	3147	+ _deprecated_function( __METHOD__, '6.7' );
	3148	+ }
	3149	+
	3150	+ /**
	3151	+ * @deprecated 6.7
	3152	+ *
	3153	+ * @return void
	3154	+ */
	3155	+ public static function list_templates() {
	3156	+ _deprecated_function( __METHOD__, '6.7' );
3708	3157	}
3709	3158	}