← All changes | classes/controllers/FrmFormsController.php +406 -1017 6.27 → 6.7 View file →

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