← All changes | classes/controllers/FrmFormsController.php +507 -1185 6.27 → 6.2.3 View file →

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