← All changes | classes/controllers/FrmFormsController.php +378 -915 6.27 → 6.7.2 View file →

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