← All changes | classes/controllers/FrmFormsController.php +253 -684 6.28 → 6.12 View file →

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