← All changes | classes/controllers/FrmFormsController.php +254 -625 6.32 → 6.23 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	}
		@@ -47,15 +45,8 @@
47	45	add_filter( 'manage_toplevel_page_formidable_columns', 'FrmFormsController::get_columns', 0 );
48	46	add_filter( 'manage_toplevel_page_formidable_sortable_columns', 'FrmFormsController::get_sortable_columns' );
49	47	}
50	48
51		- /**
52		- * Runs on admin head of the formidable forms page.
53		- *
54		- * @since 6.32 This adds screen options.
55		- *
56		- * @return void
57		- */
58	49	public static function head() {
59	50	if ( wp_is_mobile() ) {
60	51	wp_enqueue_script( 'jquery-touch-punch' );
61	52	}
		@@ -73,12 +64,12 @@
73	64	*/
74	65	public static function logic_tip() {
75	66	$images_url = FrmAppHelper::plugin_url() . '/images/';
76	67	$data_message = __( 'Only show the fields you need and create branching forms. Upgrade to get conditional logic and question branching.', 'formidable' );
77		- $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
78		- 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">';
79	70	esc_html_e( 'Conditional Logic', 'formidable' );
80		- 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' ) );
81	72	echo '</a>';
82	73	}
83	74
84	75	/**
		@@ -85,15 +76,12 @@
85	76	* By default, Divi processes form shortcodes on the edit post page.
86	77	* Now that won't do.
87	78	*
88	79	* @since 3.01
89		- *
90		- * @param array $shortcodes List of shortcodes to process.
91		- *
92		- * @return array
93	80	*/
94	81	public static function prevent_divi_conflict( $shortcodes ) {
95	82	$shortcodes[] = 'formidable';
	83	+
96	84	return $shortcodes;
97	85	}
98	86
99	87	/**
		@@ -104,14 +92,12 @@
104	92
105	93	$message = '';
106	94	$params = FrmForm::list_page_params();
107	95	$errors = self::process_bulk_form_actions( array() );
108		-
109	96	if ( isset( $errors['message'] ) ) {
110	97	$message = $errors['message'];
111	98	unset( $errors['message'] );
112	99	}
113		-
114	100	$errors = apply_filters( 'frm_admin_list_form_action', $errors );
115	101
116	102	self::display_forms_list( $params, $message, $errors );
117	103	}
		@@ -121,14 +107,12 @@
121	107	*
122	108	* @since 2.02.11
123	109	*
124	110	* @param int|object $form
125		- *
126	111	* @return void
127	112	*/
128	113	private static function create_default_email_action( $form ) {
129	114	FrmForm::maybe_get_form( $form );
130		-
131	115	if ( ! is_object( $form ) ) {
132	116	return;
133	117	}
134	118
		@@ -133,17 +117,15 @@
133	117	}
134	118
135	119	$create_email = apply_filters( 'frm_create_default_email_action', true, $form );
136	120
137		- if ( ! $create_email ) {
138		- return;
	121	+ if ( $create_email ) {
	122	+ /**
	123	+ * @var FrmFormAction
	124	+ */
	125	+ $action_control = FrmFormActionsController::get_form_actions( 'email' );
	126	+ $action_control->create( $form->id );
139	127	}
140		-
141		- /**
142		- * @var FrmFormAction
143		- */
144		- $action_control = FrmFormActionsController::get_form_actions( 'email' );
145		- $action_control->create( $form->id );
146	128	}
147	129
148	130	/**
149	131	* Create the default On submit action
		@@ -150,14 +132,12 @@
150	132	*
151	133	* @since 6.0.0
152	134	*
153	135	* @param int|object $form Form object or ID.
154		- *
155	136	* @return void
156	137	*/
157	138	private static function create_default_on_submit_action( $form ) {
158	139	FrmForm::maybe_get_form( $form );
159		-
160	140	if ( ! is_object( $form ) ) {
161	141	return;
162	142	}
163	143
		@@ -170,17 +150,15 @@
170	150	* @param object $form Form object.
171	151	*/
172	152	$create = apply_filters( 'frm_create_default_on_submit_action', true, $form );
173	153
174		- if ( ! $create ) {
175		- return;
	154	+ if ( $create ) {
	155	+ /**
	156	+ * @var FrmFormAction
	157	+ */
	158	+ $action_control = FrmFormActionsController::get_form_actions( FrmOnSubmitAction::$slug );
	159	+ $action_control->create( $form->id );
176	160	}
177		-
178		- /**
179		- * @var FrmFormAction
180		- */
181		- $action_control = FrmFormActionsController::get_form_actions( FrmOnSubmitAction::$slug );
182		- $action_control->create( $form->id );
183	161	}
184	162
185	163	/**
186	164	* Creates submit button field.
		@@ -187,14 +165,12 @@
187	165	*
188	166	* @since 6.9
189	167	*
190	168	* @param int|object $form Form ID or object.
191		- *
192	169	* @return void
193	170	*/
194	171	private static function create_submit_button_field( $form ) {
195	172	FrmForm::maybe_get_form( $form );
196		-
197	173	if ( ! is_object( $form ) ) {
198	174	return;
199	175	}
200	176
		@@ -217,10 +193,8 @@
217	193	);
218	194	}
219	195
220	196	/**
221		- * @param array|false $values
222		- *
223	197	* @return void
224	198	*/
225	199	public static function edit( $values = false ) {
226	200	FrmAppHelper::permission_check( 'frm_edit_forms' );
		@@ -232,9 +206,8 @@
232	206
233	207	/**
234	208	* @param mixed $id
235	209	* @param string $message
236		- *
237	210	* @return void
238	211	*/
239	212	public static function settings( $id = false, $message = '' ) {
240	213	FrmAppHelper::permission_check( 'frm_edit_forms' );
		@@ -262,9 +235,10 @@
262	235	FrmAppController::show_error_modal( $error_args );
263	236	return;
264	237	}
265	238
266		- $id = FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
	239	+ $id = FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
	240	+
267	241	$errors = FrmForm::validate( $_POST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
268	242	$warnings = FrmFormsHelper::check_for_warnings( $_POST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
269	243
270	244	if ( count( $errors ) > 0 ) {
		@@ -273,14 +247,13 @@
273	247	}
274	248
275	249	do_action( 'frm_before_update_form_settings', $id );
276	250
277		- $antispam_was_on = self::antispam_was_on( $id ); // phpcs:ignore Formidable.CodeAnalysis.InlineSingleUseVariable
	251	+ $antispam_was_on = self::antispam_was_on( $id );
278	252
279	253	FrmForm::update( $id, $_POST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
280	254
281	255	$antispam_is_on = ! empty( $_POST['options']['antispam'] ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
282		-
283	256	if ( $antispam_is_on !== $antispam_was_on ) {
284	257	FrmAntiSpam::clear_caches();
285	258	}
286	259
		@@ -290,9 +263,8 @@
290	263	}
291	264
292	265	/**
293	266	* @param int $form_id
294		- *
295	267	* @return bool
296	268	*/
297	269	private static function antispam_was_on( $form_id ) {
298	270	$form = FrmForm::getOne( $form_id );
		@@ -299,14 +271,12 @@
299	271	return ! empty( $form->options['antispam'] );
300	272	}
301	273
302	274	/**
303		- * @param array $values
304		- *
305	275	* @return void
306	276	*/
307	277	public static function update( $values = array() ) {
308		- if ( ! $values ) {
	278	+ if ( empty( $values ) ) {
309	279	$values = $_POST; // phpcs:ignore WordPress.Security.NonceVerification.Missing
310	280	}
311	281
312	282	// Set radio button and checkbox meta equal to "other" value.
		@@ -315,9 +285,8 @@
315	285	}
316	286
317	287	$errors = FrmForm::validate( $values );
318	288	$permission_error = FrmAppHelper::permission_nonce_error( 'frm_edit_forms', 'frm_save_form', 'frm_save_form_nonce' );
319		-
320	289	if ( $permission_error !== false ) {
321	290	$errors['form'] = $permission_error;
322	291	}
323	292
		@@ -336,9 +305,9 @@
336	305	if ( self::is_too_long( $values ) ) {
337	306	$message .= '<br/> ' . sprintf(
338	307	/* translators: %1$s: Start link HTML, %2$s: end link HTML */
339	308	__( 'However, your form is very long and may be %1$sreaching server limits%2$s.', 'formidable' ),
340		- '<a href="' . esc_url( self::get_form_too_long_docs_url() ) . '" target="_blank" rel="noopener">',
	309	+ '<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">',
341	310	'</a>'
342	311	);
343	312	}
344	313
		@@ -349,32 +318,17 @@
349	318	self::get_edit_vars( $id, array(), $message );
350	319	}
351	320
352	321	/**
353		- * @since 6.25.1
354		- *
355		- * @return string
356		- */
357		- private static function get_form_too_long_docs_url() {
358		- $utm = array(
359		- 'campaign' => 'builder',
360		- 'content' => 'form-too-long',
361		- );
362		- return FrmAppHelper::admin_upgrade_link( $utm, 'knowledgebase/i-have-a-long-form-why-did-the-options-at-the-end-of-the-form-stop-saving/' );
363		- }
364		-
365		- /**
366	322	* Remove the draft flag from any new fields from this current session.
367	323	*
368	324	* @since 6.8
369	325	*
370	326	* @param int $form_id
371		- *
372	327	* @return void
373	328	*/
374	329	private static function maybe_remove_draft_option_from_fields( $form_id ) {
375	330	$draft_field_ids_csv = FrmAppHelper::get_post_param( 'draft_fields', '', 'sanitize_text_field' );
376		-
377	331	if ( ! $draft_field_ids_csv ) {
378	332	// If the draft_fields input is empty there are no new fields in the session.
379	333	return;
380	334	}
		@@ -379,9 +333,8 @@
379	333	return;
380	334	}
381	335
382	336	$draft_field_ids = array_filter( explode( ',', $draft_field_ids_csv ), 'is_numeric' );
383		-
384	337	if ( ! $draft_field_ids ) {
385	338	// Exit early if the draft fields input is invalid. It should be a CSV of integer values.
386	339	return;
387	340	}
		@@ -386,9 +339,8 @@
386	339	return;
387	340	}
388	341
389	342	$draft_field_rows = FrmFieldsHelper::get_draft_field_results( $form_id, $draft_field_ids );
390		-
391	343	foreach ( $draft_field_rows as $row ) {
392	344	$row->field_options['draft'] = 0;
393	345	FrmField::update( $row->id, array( 'field_options' => $row->field_options ) );
394	346	}
		@@ -400,10 +352,8 @@
400	352	* were likely not saved either.
401	353	*
402	354	* @since 3.06.01
403	355	*
404		- * @param array $values
405		- *
406	356	* @return bool
407	357	*/
408	358	private static function is_too_long( $values ) {
409	359	return empty( $values['frm_end'] );
		@@ -439,9 +389,8 @@
439	389	* @return string|null
440	390	*/
441	391	public static function page_preview() {
442	392	$params = FrmForm::list_page_params();
443		-
444	393	if ( ! $params['form'] || is_numeric( $params['form'] ) ) {
445	394	return null;
446	395	}
447	396
		@@ -447,9 +396,8 @@
447	396
448	397	self::maybe_block_preview( $params['form'] );
449	398
450	399	$form = FrmForm::getOne( $params['form'] );
451		-
452	400	if ( ! $form ) {
453	401	return null;
454	402	}
455	403
		@@ -462,9 +410,8 @@
462	410	* @return void
463	411	*/
464	412	public static function show_page_preview() {
465	413	$preview = self::page_preview();
466		-
467	414	if ( is_null( $preview ) ) {
468	415	wp_die(
469	416	'<h1>' . esc_html__( 'Form key is invalid', 'formidable' ) . '</h1>',
470	417	'<p>' . esc_html__( 'Form key is invalid', 'formidable' ) . '</p>',
		@@ -487,16 +434,9 @@
487	434
488	435	// print_emoji_styles is deprecated.
489	436	remove_action( 'wp_print_styles', 'print_emoji_styles' );
490	437
491		- if ( FrmTestModeController::should_add_test_mode_container() ) {
492		- do_action( 'frm_test_mode_init' );
493		- add_action( 'wp_enqueue_scripts', 'FrmTestModeController::register_and_enqueue_required_scripts' );
494		- add_filter( 'frm_filter_final_form', 'FrmTestModeController::maybe_add_test_mode_container', 99 );
495		- }
496		-
497	438	$include_theme = FrmAppHelper::get_param( 'theme', '', 'get', 'absint' );
498		-
499	439	if ( $include_theme ) {
500	440	self::set_preview_query();
501	441	self::load_theme_preview();
502	442	} else {
		@@ -519,9 +459,8 @@
519	459	'post_type' => 'page',
520	460	);
521	461
522	462	$page_for_posts = get_option( 'page_for_posts' );
523		-
524	463	if ( is_numeric( $page_for_posts ) ) {
525	464	// Avoid querying for the "Posts Page" or "Blog Page" so we don't display 10 forms.
526	465	$page_query['post__not_in'] = array( $page_for_posts );
527	466	}
		@@ -526,15 +465,13 @@
526	465	$page_query['post__not_in'] = array( $page_for_posts );
527	466	}
528	467
529	468	$random_page = get_posts( $page_query );
530		-
531	469	if ( ! $random_page ) {
532	470	return;
533	471	}
534	472
535	473	$random_page = reset( $random_page );
536		-
537	474	if ( ! is_a( $random_page, 'WP_Post' ) ) {
538	475	// The return type can also be int.
539	476	return;
540	477	}
		@@ -556,9 +493,8 @@
556	493	*
557	494	* @since 5.5.2
558	495	*
559	496	* @param WP_Post $page The page object.
560		- *
561	497	* @return void
562	498	*/
563	499	private static function set_post_global( $page ) {
564	500	global $post;
		@@ -577,16 +513,14 @@
577	513	add_action( 'loop_no_results', 'FrmFormsController::show_page_preview' );
578	514	add_filter( 'is_active_sidebar', '__return_false' );
579	515	FrmStylesController::enqueue_css( 'enqueue', true );
580	516
581		- if ( false !== get_template_part( 'page' ) ) {
582		- return;
	517	+ if ( false === get_template_part( 'page' ) ) {
	518	+ if ( function_exists( 'wp_is_block_theme' ) && wp_is_block_theme() ) {
	519	+ add_filter( 'body_class', 'FrmFormsController::preview_block_theme_body_classnames' );
	520	+ }
	521	+ self::fallback_when_page_template_part_is_not_supported_by_theme();
583	522	}
584		-
585		- if ( function_exists( 'wp_is_block_theme' ) && wp_is_block_theme() ) {
586		- add_filter( 'body_class', 'FrmFormsController::preview_block_theme_body_classnames' );
587		- }
588		- self::fallback_when_page_template_part_is_not_supported_by_theme();
589	523	}
590	524
591	525	/**
592	526	* Add padding to the body for block themes.
		@@ -593,9 +527,8 @@
593	527	*
594	528	* @since 6.5.2
595	529	*
596	530	* @param array $classes The body classes list.
597		- *
598	531	* @return array
599	532	*/
600	533	public static function preview_block_theme_body_classnames( $classes ) {
601	534	$classes[] = 'has-global-padding';
		@@ -608,27 +541,25 @@
608	541	*
609	542	* @return void
610	543	*/
611	544	private static function fallback_when_page_template_part_is_not_supported_by_theme() {
612		- if ( ! have_posts() ) {
613		- return;
614		- }
	545	+ if ( have_posts() ) {
	546	+ the_post();
	547	+ self::get_template( 'header' );
615	548
616		- the_post();
617		- self::get_template( 'header' );
	549	+ // add some generic class names to the container to add some natural padding to the content.
	550	+ // .entry-content catches the WordPress TwentyTwenty theme.
	551	+ // .container catches Customizr content.
	552	+ echo '<div class="container entry-content">';
	553	+ the_content();
	554	+ echo '</div>';
618	555
619		- // Add some generic class names to the container to add some natural padding to the content.
620		- // .entry-content catches the WordPress TwentyTwenty theme.
621		- // .container catches Customizr content.
622		- echo '<div class="container entry-content">';
623		- the_content();
624		- echo '</div>';
	556	+ // Prevent extra unexpected forms in the footer.
	557	+ // For some reason this happens in the Twenty Twenty Five theme.
	558	+ add_filter( 'frm_filter_final_form', '__return_empty_string' );
625	559
626		- // Prevent extra unexpected forms in the footer.
627		- // For some reason this happens in the Twenty Twenty Five theme.
628		- add_filter( 'frm_filter_final_form', '__return_empty_string' );
629		-
630		- self::get_template( 'footer' );
	560	+ self::get_template( 'footer' );
	561	+ }
631	562	}
632	563
633	564	/**
634	565	* Calls core function to get a template part if it doesn't cause deprecation warnings. Otherwise skips the deprecation function call
		@@ -634,11 +565,9 @@
634	565	* Calls core function to get a template part if it doesn't cause deprecation warnings. Otherwise skips the deprecation function call
635	566	* and renders required html fragments calling required functions.
636	567	*
637	568	* @since 6.7.1
638		- *
639	569	* @param string $template
640		- *
641	570	* @return void
642	571	*/
643	572	private static function get_template( $template ) {
644	573	if ( self::should_try_getting_template( $template ) ) {
		@@ -659,11 +588,9 @@
659	588	/**
660	589	* Returns true if calling a template function doesn't trigger deprecation warnings.
661	590	*
662	591	* @since 6.7.1
663		- *
664	592	* @param string $template
665		- *
666	593	* @return bool
667	594	*/
668	595	private static function should_try_getting_template( $template ) {
669	596	$stylesheet_path = get_stylesheet_directory();
		@@ -677,15 +604,15 @@
677	604	/**
678	605	* Set the page title for the theme preview page
679	606	*
680	607	* @since 3.0
681		- *
682		- * @param string $title
683		- *
684		- * @return string
685	608	*/
686	609	public static function preview_page_title( $title ) {
687		- return in_the_loop() ? self::preview_title( $title ) : $title;
	610	+ if ( in_the_loop() ) {
	611	+ $title = self::preview_title( $title );
	612	+ }
	613	+
	614	+ return $title;
688	615	}
689	616
690	617	/**
691	618	* Set the page title for the theme preview page.
		@@ -692,9 +619,8 @@
692	619	*
693	620	* @since 3.0
694	621	*
695	622	* @param string $title
696		- *
697	623	* @return string
698	624	*/
699	625	public static function preview_title( $title ) {
700	626	return __( 'Form Preview', 'formidable' );
		@@ -705,9 +631,8 @@
705	631	*
706	632	* @since 3.0
707	633	*
708	634	* @param string $content
709		- *
710	635	* @return string
711	636	*/
712	637	public static function preview_content( $content ) {
713	638	if ( in_the_loop() ) {
		@@ -723,10 +648,8 @@
723	648	* @since 3.0
724	649	*/
725	650	private static function load_direct_preview() {
726	651	$key = FrmAppHelper::simple_get( 'form', 'sanitize_title' );
727		-
728		- // phpcs:ignore Universal.Operators.StrictComparisons
729	652	if ( $key == '' ) {
730	653	$key = FrmAppHelper::get_post_param( 'form', '', 'sanitize_title' );
731	654	}
732	655
		@@ -741,9 +664,8 @@
741	664
742	665	self::maybe_block_preview( $key );
743	666
744	667	$form = FrmForm::getAll( array( 'form_key' => $key ), '', 1 );
745		-
746	668	if ( ! $form ) {
747	669	$error = __( 'Form does not exist', 'formidable' );
748	670	wp_die(
749	671	'<h1>' . esc_html( $error ) . '</h1>',
		@@ -767,22 +689,19 @@
767	689	*
768	690	* @since 6.20
769	691	*
770	692	* @param string $form_key Form key.
771		- *
772	693	* @return void
773	694	*/
774	695	public static function maybe_block_preview( $form_key ) {
775		- if ( ! FrmFormsHelper::should_block_preview( $form_key ) ) {
776		- return;
	696	+ if ( FrmFormsHelper::should_block_preview( $form_key ) ) {
	697	+ $error = __( 'You do not have permission to view this form', 'formidable' );
	698	+ wp_die(
	699	+ '<h1>' . esc_html( $error ) . '</h1>',
	700	+ '<p>' . esc_html( $error ) . '</p>',
	701	+ 403
	702	+ );
777	703	}
778		-
779		- $error = __( 'You do not have permission to view this form', 'formidable' );
780		- wp_die(
781		- '<h1>' . esc_html( $error ) . '</h1>',
782		- '<p>' . esc_html( $error ) . '</p>',
783		- 403
784		- );
785	704	}
786	705
787	706	/**
788	707	* Some themes have a null $src value.
		@@ -797,13 +716,15 @@
797	716	add_filter(
798	717	'script_loader_src',
799	718	/**
800	719	* @param string|null $src
801		- *
802	720	* @return string
803	721	*/
804	722	function ( $src ) {
805		- return is_null( $src ) ? '' : $src;
	723	+ if ( is_null( $src ) ) {
	724	+ $src = '';
	725	+ }
	726	+ return $src;
806	727	}
807	728	);
808	729	}
809	730
		@@ -812,9 +733,8 @@
812	733	}
813	734
814	735	/**
815	736	* @param array $ids
816		- *
817	737	* @return string
818	738	*/
819	739	public static function bulk_untrash( $ids ) {
820	740	FrmAppHelper::permission_check( 'frm_edit_forms' );
		@@ -826,9 +746,11 @@
826	746	return '';
827	747	}
828	748
829	749	/* translators: %1$s: Number of forms */
830		- return sprintf( _n( '%1$s form restored from the Trash.', '%1$s forms restored from the Trash.', $count, 'formidable' ), $count );
	750	+ $message = sprintf( _n( '%1$s form restored from the Trash.', '%1$s forms restored from the Trash.', $count, 'formidable' ), $count );
	751	+
	752	+ return $message;
831	753	}
832	754
833	755	/**
834	756	* @since 3.06
		@@ -873,9 +795,8 @@
873	795	// Check nonce url.
874	796	check_admin_referer( $status . '_form_' . $params['id'] );
875	797
876	798	$count = 0;
877		-
878	799	if ( FrmForm::set_status( $params['id'], $available_status[ $status ]['new_status'] ) ) {
879	800	++$count;
880	801	}
881	802
		@@ -889,9 +810,9 @@
889	810	/* translators: %1$s: Number of forms */
890	811	$available_status['untrash']['message'] = sprintf( _n( '%1$s form restored from the Trash.', '%1$s forms restored from the Trash.', $count, 'formidable' ), $count );
891	812
892	813	/* translators: %1$s: Number of forms, %2$s: Start link HTML, %3$s: End link HTML */
893		- $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
	814	+ $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>' );
894	815
895	816	$message = $available_status[ $status ]['message'];
896	817
897	818	self::display_forms_list( $params, $message );
		@@ -898,9 +819,8 @@
898	819	}
899	820
900	821	/**
901	822	* @param array $ids
902		- *
903	823	* @return string
904	824	*/
905	825	public static function bulk_trash( $ids ) {
906	826	FrmAppHelper::permission_check( 'frm_delete_forms' );
		@@ -905,9 +825,8 @@
905	825	public static function bulk_trash( $ids ) {
906	826	FrmAppHelper::permission_check( 'frm_delete_forms' );
907	827
908	828	$count = 0;
909		-
910	829	foreach ( $ids as $id ) {
911	830	if ( FrmForm::trash( $id ) ) {
912	831	++$count;
913	832	}
		@@ -922,16 +841,17 @@
922	841	'param' => 'form_type',
923	842	'type' => 'request',
924	843	)
925	844	);
926		-
927		- return sprintf(
	845	+ $message = sprintf(
928	846	/* translators: %1$s: Number of forms, %2$s: Start link HTML, %3$s: End link HTML */
929	847	_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' ),
930	848	$count,
931		- '<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
	849	+ '<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' ) ) . '">',
932	850	'</a>'
933	851	);
	852	+
	853	+ return $message;
934	854	}
935	855
936	856	public static function destroy() {
937	857	FrmAppHelper::permission_check( 'frm_delete_forms' );
		@@ -941,9 +861,8 @@
941	861	// Check nonce url.
942	862	check_admin_referer( 'destroy_form_' . $params['id'] );
943	863
944	864	$count = 0;
945		-
946	865	if ( FrmForm::destroy( $params['id'] ) ) {
947	866	++$count;
948	867	}
949	868
		@@ -954,9 +873,8 @@
954	873	}
955	874
956	875	/**
957	876	* @param array $ids
958		- *
959	877	* @return string
960	878	*/
961	879	public static function bulk_destroy( $ids ) {
962	880	FrmAppHelper::permission_check( 'frm_delete_forms' );
		@@ -961,12 +879,10 @@
961	879	public static function bulk_destroy( $ids ) {
962	880	FrmAppHelper::permission_check( 'frm_delete_forms' );
963	881
964	882	$count = 0;
965		-
966	883	foreach ( $ids as $id ) {
967	884	$d = FrmForm::destroy( $id );
968		-
969	885	if ( $d ) {
970	886	++$count;
971	887	}
972	888	}
		@@ -984,18 +900,19 @@
984	900	*/
985	901	public static function delete_all() {
986	902	// Check nonce url.
987	903	$permission_error = FrmAppHelper::permission_nonce_error( 'frm_delete_forms', '_wpnonce', 'bulk-toplevel_page_formidable' );
988		-
989	904	if ( $permission_error !== false ) {
990	905	self::display_forms_list( array(), '', array( $permission_error ) );
	906	+
991	907	return;
992	908	}
993	909
994	910	$count = FrmForm::scheduled_delete( time() );
995	911	$url = remove_query_arg( array( 'delete_all' ) );
996		- $url .= '&message=forms_permanently_deleted&forms_deleted=' . $count;
997	912
	913	+ $url .= '&message=forms_permanently_deleted&forms_deleted=' . $count;
	914	+
998	915	wp_safe_redirect( $url );
999	916	die();
1000	917	}
1001	918
		@@ -1069,22 +986,21 @@
1069	986	*
1070	987	* @return void
1071	988	*/
1072	989	public static function insert_form_button() {
1073		- if ( ! current_user_can( 'frm_view_forms' ) ) {
1074		- return;
	990	+ if ( current_user_can( 'frm_view_forms' ) ) {
	991	+ // Store the result in memory and re-use it when this function is called multiple times.
	992	+ // This helps speed up the form builder when there are a lot of HTML fields, where this
	993	+ // button is inserted once per HTML field.
	994	+ // In a form with 66 HTML fields, this saves 0.5 seconds on page load time, tested locally.
	995	+ if ( ! isset( self::$formidable_tinymce_button ) ) {
	996	+ FrmAppHelper::load_admin_wide_js();
	997	+ $menu_name = FrmAppHelper::get_menu_name();
	998	+ $icon = apply_filters( 'frm_media_icon', FrmAppHelper::svg_logo() );
	999	+ 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>';
	1000	+ }
	1001	+ echo self::$formidable_tinymce_button; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
1075	1002	}
1076		-
1077		- // Store the result in memory and re-use it when this function is called multiple times.
1078		- // This helps speed up the form builder when there are a lot of HTML fields, where this
1079		- // Button is inserted once per HTML field.
1080		- // In a form with 66 HTML fields, this saves 0.5 seconds on page load time, tested locally.
1081		- if ( ! isset( self::$formidable_tinymce_button ) ) {
1082		- FrmAppHelper::load_admin_wide_js();
1083		- $icon = apply_filters( 'frm_media_icon', FrmAppHelper::svg_logo() );
1084		- self::$formidable_tinymce_button = '<a href="#TB_inline?width=50&height=50&inlineId=frm_insert_form" class="thickbox button add_media frm_insert_form" title="' . esc_attr__( 'Add forms and content', 'formidable' ) . '">' . FrmAppHelper::kses( $icon, 'all' ) . ' ' . esc_html( FrmAppHelper::get_menu_name() ) . '</a>'; // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong
1085		- }
1086		- echo self::$formidable_tinymce_button; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
1087	1003	}
1088	1004
1089	1005	/**
1090	1006	* @return void
		@@ -1105,21 +1021,17 @@
1105	1021	$shortcodes = apply_filters( 'frm_popup_shortcodes', $shortcodes );
1106	1022
1107	1023	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/insert_form_popup.php';
1108	1024
1109		- if ( ! FrmAppHelper::is_form_builder_page() || class_exists( '_WP_Editors', false ) ) {
1110		- return;
	1025	+ if ( FrmAppHelper::is_form_builder_page() && ! class_exists( '_WP_Editors', false ) ) {
	1026	+ // initialize a wysiwyg so we have usable settings defined in tinyMCEPreInit.mceInit
	1027	+ require ABSPATH . WPINC . '/class-wp-editor.php';
	1028	+ ?>
	1029	+ <div class="frm_hidden">
	1030	+ <?php wp_editor( '', 'frm_description_placeholder', array() ); ?>
	1031	+ </div>
	1032	+ <?php
1111	1033	}
1112		-
1113		- // Initialize a wysiwyg so we have usable settings defined in tinyMCEPreInit.mceInit
1114		- require ABSPATH . WPINC . '/class-wp-editor.php';
1115		- // phpcs:disable Generic.WhiteSpace.ScopeIndent
1116		- ?>
1117		- <div class="frm_hidden">
1118		- <?php wp_editor( '', 'frm_description_placeholder', array() ); ?>
1119		- </div>
1120		- <?php
1121		- // phpcs:enable Generic.WhiteSpace.ScopeIndent
1122	1034	}
1123	1035
1124	1036	/**
1125	1037	* Check the page being loaded, determine if this is a page that should include the form popup.
		@@ -1131,9 +1043,8 @@
1131	1043	private static function should_insert_form_popup() {
1132	1044	if ( FrmAppHelper::is_form_builder_page() ) {
1133	1045	return true;
1134	1046	}
1135		-
1136	1047	$page = basename( FrmAppHelper::get_server_value( 'PHP_SELF' ) );
1137	1048	return in_array( $page, array( 'post.php', 'page.php', 'page-new.php', 'post-new.php' ), true );
1138	1049	}
1139	1050
		@@ -1141,10 +1052,9 @@
1141	1052	FrmAppHelper::permission_check( 'frm_view_forms' );
1142	1053	check_ajax_referer( 'frm_ajax', 'nonce' );
1143	1054
1144	1055	$shortcode = FrmAppHelper::get_post_param( 'shortcode', '', 'sanitize_text_field' );
1145		-
1146		- if ( ! $shortcode ) {
	1056	+ if ( empty( $shortcode ) ) {
1147	1057	wp_die();
1148	1058	}
1149	1059
1150	1060	echo '<div id="sc-opts-' . esc_attr( $shortcode ) . '" class="frm_shortcode_option">';
		@@ -1169,13 +1079,12 @@
1169	1079	'label' => __( 'Minimize form HTML', 'formidable' ),
1170	1080	),
1171	1081	);
1172	1082	}
1173		-
1174	1083	$opts = apply_filters( 'frm_sc_popup_opts', $opts, $shortcode );
1175	1084
1176	1085	if ( isset( $opts['form_id'] ) && is_string( $opts['form_id'] ) ) {
1177		- // Allow other shortcodes to use the required form id option
	1086	+ // allow other shortcodes to use the required form id option
1178	1087	$form_id = $opts['form_id'];
1179	1088	unset( $opts['form_id'] );
1180	1089	}
1181	1090
		@@ -1191,9 +1100,8 @@
1191	1100	*
1192	1101	* @param array $params
1193	1102	* @param string $message
1194	1103	* @param array $errors
1195		- *
1196	1104	* @return void
1197	1105	*/
1198	1106	public static function display_forms_list( $params = array(), $message = '', $errors = array() ) {
1199	1107	FrmAppHelper::permission_check( 'frm_view_forms' );
		@@ -1210,21 +1118,21 @@
1210	1118	* @param string $table_class Class name for List Helper.
1211	1119	*/
1212	1120	$table_class = apply_filters( 'frm_forms_list_class', 'FrmFormsListHelper' );
1213	1121	$wp_list_table = new $table_class( compact( 'params' ) );
1214		- $pagenum = $wp_list_table->get_pagenum();
1215	1122
	1123	+ $pagenum = $wp_list_table->get_pagenum();
	1124	+
1216	1125	$wp_list_table->prepare_items();
1217	1126
1218	1127	$total_pages = $wp_list_table->get_pagination_arg( 'total_pages' );
1219		-
1220	1128	if ( $pagenum > $total_pages && $total_pages > 0 ) {
1221		- wp_safe_redirect( esc_url_raw( add_query_arg( 'paged', $total_pages ) ) );
	1129	+ wp_redirect( esc_url_raw( add_query_arg( 'paged', $total_pages ) ) );
1222	1130	die();
1223	1131	}
1224	1132
1225		- $error = FrmInbox::check_for_error();
1226		-
	1133	+ $inbox = new FrmInbox();
	1134	+ $error = $inbox->check_for_error();
1227	1135	if ( $error ) {
1228	1136	$show_messages = array( $error['subject'] . '. ' . $error['message'] );
1229	1137	}
1230	1138
		@@ -1232,9 +1140,8 @@
1232	1140	}
1233	1141
1234	1142	/**
1235	1143	* @param array<string,string> $columns
1236		- *
1237	1144	* @return array<string,string>
1238	1145	*/
1239	1146	public static function get_columns( $columns ) {
1240	1147	$columns['cb'] = '<input type="checkbox" />';
		@@ -1239,27 +1146,15 @@
1239	1146	public static function get_columns( $columns ) {
1240	1147	$columns['cb'] = '<input type="checkbox" />';
1241	1148	$columns['name'] = esc_html__( 'Form Title', 'formidable' );
1242	1149	$columns['entries'] = esc_html__( 'Entries', 'formidable' );
1243		- $columns['views'] = esc_html__( 'Views', 'formidable' );
1244	1150	$columns['id'] = 'ID';
1245	1151	$columns['form_key'] = esc_html__( 'Key', 'formidable' );
1246		-
1247		- if ( 'trash' !== FrmAppHelper::simple_get( 'form_type' ) && has_filter( 'frm_form_list_actions' ) ) {
1248		- // If there is any filters added, keep this column.
	1152	+ if ( 'trash' !== FrmAppHelper::simple_get( 'form_type' ) ) {
1249	1153	$columns['shortcode'] = esc_html__( 'Actions', 'formidable' );
1250	1154	}
1251		-
1252	1155	$columns['created_at'] = esc_html__( 'Date', 'formidable' );
1253	1156
1254		- if ( 'trash' !== FrmAppHelper::simple_get( 'form_type' ) ) {
1255		- $columns['embeds'] = esc_html__( 'Embeds', 'formidable' );
1256		- $columns['settings'] = '<div class="frm-forms-list-settings-btn-wrapper"><a href="#" class="frm-forms-list-settings-btn">';
1257		- $columns['settings'] .= FrmAppHelper::icon_by_class( 'frmfont frm_settings_icon', array( 'echo' => false ) );
1258		- $columns['settings'] .= '<span class="screen-reader-text">' . esc_html__( 'List settings', 'formidable' ) . '</span>';
1259		- $columns['settings'] .= '</a></div>';
1260		- }
1261		-
1262	1157	add_screen_option(
1263	1158	'per_page',
1264	1159	array(
1265	1160	'label' => __( 'Forms', 'formidable' ),
		@@ -1285,9 +1180,8 @@
1285	1180	}
1286	1181
1287	1182	/**
1288	1183	* @param mixed $hidden_columns
1289		- *
1290	1184	* @return array
1291	1185	*/
1292	1186	public static function hidden_columns( $hidden_columns ) {
1293	1187	if ( ! is_array( $hidden_columns ) ) {
		@@ -1308,18 +1202,11 @@
1308	1202
1309	1203	return $hidden_columns;
1310	1204	}
1311	1205
1312		- /**
1313		- * @param mixed $save
1314		- * @param string $option
1315		- * @param int|string $value
1316		- *
1317		- * @return mixed
1318		- */
1319	1206	public static function save_per_page( $save, $option, $value ) {
1320	1207	if ( $option === 'formidable_page_formidable_per_page' ) {
1321		- return (int) $value;
	1208	+ $save = (int) $value;
1322	1209	}
1323	1210
1324	1211	return $save;
1325	1212	}
		@@ -1328,9 +1215,8 @@
1328	1215	* @param int|string $id
1329	1216	* @param array $errors
1330	1217	* @param string $message
1331	1218	* @param bool $create_link
1332		- *
1333	1219	* @return void
1334	1220	*/
1335	1221	private static function get_edit_vars( $id, $errors = array(), $message = '', $create_link = false ) {
1336	1222	global $frm_vars;
		@@ -1345,9 +1231,8 @@
1345	1231	'page' => 'formidable',
1346	1232	)
1347	1233	),
1348	1234	);
1349		-
1350	1235	if ( ! $form ) {
1351	1236	FrmAppController::show_error_modal( $error_args );
1352	1237	return;
1353	1238	}
		@@ -1369,14 +1254,15 @@
1369	1254	}
1370	1255
1371	1256	if ( $form->parent_form_id ) {
1372	1257	/* translators: %1$s: Start link HTML, %2$s: End link HTML */
1373		- 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
	1258	+ 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>' ) );
1374	1259	}
1375	1260
1376	1261	$frm_field_selection = FrmField::field_selection();
1377		- $fields = FrmField::get_all_for_form( $form->id );
1378	1262
	1263	+ $fields = FrmField::get_all_for_form( $form->id );
	1264	+
1379	1265	// Automatically add end section fields if they don't exist (2.0 migration).
1380	1266	$reset_fields = false;
1381	1267	FrmFormsHelper::auto_add_end_section_fields( $form, $fields, $reset_fields );
1382	1268	FrmSubmitHelper::maybe_create_submit_field( $form, $fields, $reset_fields );
		@@ -1400,10 +1286,9 @@
1400	1286	*/
1401	1287	$values['fields'] = apply_filters( 'frm_fields_in_form_builder', $fields, compact( 'form' ) );
1402	1288
1403	1289	$edit_message = __( 'Form was successfully updated.', 'formidable' );
1404		-
1405		- if ( $form->is_template && $message === $edit_message ) {
	1290	+ if ( $form->is_template && $message == $edit_message ) {
1406	1291	$message = __( 'Template was successfully updated.', 'formidable' );
1407	1292	}
1408	1293
1409	1294	self::maybe_update_form_builder_message( $message );
		@@ -1418,12 +1303,11 @@
1418	1303	}
1419	1304
1420	1305	/**
1421	1306	* @param array $fields
1422		- *
1423	1307	* @return array
1424	1308	*/
1425		- public static function update_form_builder_fields( $fields ) {
	1309	+ public static function update_form_builder_fields( $fields, $form ) {
1426	1310	foreach ( $fields as $field ) {
1427	1311	$field->do_not_include_icons = true;
1428	1312	}
1429	1313	return $fields;
		@@ -1428,13 +1312,8 @@
1428	1312	}
1429	1313	return $fields;
1430	1314	}
1431	1315
1432		- /**
1433		- * @param string $message
1434		- *
1435		- * @return void
1436		- */
1437	1316	public static function maybe_update_form_builder_message( &$message ) {
1438	1317	if ( 'form_duplicated' === FrmAppHelper::simple_get( 'message' ) ) {
1439	1318	$message = __( 'Form was Successfully Copied', 'formidable' );
1440	1319	}
		@@ -1443,9 +1322,8 @@
1443	1322	/**
1444	1323	* @param int|string $id
1445	1324	* @param array $errors
1446	1325	* @param array|string $args
1447		- *
1448	1326	* @return void
1449	1327	*/
1450	1328	public static function get_settings_vars( $id, $errors = array(), $args = array() ) {
1451	1329	FrmAppHelper::permission_check( 'frm_edit_forms' );
		@@ -1467,12 +1345,13 @@
1467	1345	);
1468	1346	$args = array_merge( $defaults, $args );
1469	1347	$message = $args['message'];
1470	1348	$warnings = $args['warnings'];
1471		- $form = FrmForm::getOne( $id );
1472		- $fields = FrmField::get_all_for_form( $id );
1473		- $values = FrmAppHelper::setup_edit_vars( $form, 'forms', $fields, true );
1474	1349
	1350	+ $form = FrmForm::getOne( $id );
	1351	+ $fields = FrmField::get_all_for_form( $id );
	1352	+ $values = FrmAppHelper::setup_edit_vars( $form, 'forms', $fields, true );
	1353	+
1475	1354	/**
1476	1355	* Allows changing fields in the form settings.
1477	1356	*
1478	1357	* @since 5.0.04
		@@ -1512,12 +1391,8 @@
1512	1391	}
1513	1392
1514	1393	/**
1515	1394	* @since 4.0
1516		- *
1517		- * @param array $atts
1518		- *
1519		- * @return void
1520	1395	*/
1521	1396	public static function form_publish_button( $atts ) {
1522	1397	$values = $atts['values'];
1523	1398	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/_publish_box.php';
		@@ -1528,9 +1403,8 @@
1528	1403	*
1529	1404	* @since 4.0
1530	1405	*
1531	1406	* @param array $values
1532		- *
1533	1407	* @return array
1534	1408	*/
1535	1409	private static function get_settings_tabs( $values ) {
1536	1410	$sections = array(
		@@ -1536,20 +1410,20 @@
1536	1410	$sections = array(
1537	1411	'advanced' => array(
1538	1412	'name' => __( 'General', 'formidable' ),
1539	1413	'title' => __( 'General Form Settings', 'formidable' ),
1540		- 'function' => array( self::class, 'advanced_settings' ),
1541		- 'icon' => 'frmfont frm_small_settings_icon',
	1414	+ 'function' => array( __CLASS__, 'advanced_settings' ),
	1415	+ 'icon' => 'frm_icon_font frm_settings_icon',
1542	1416	),
1543	1417	'email' => array(
1544	1418	'name' => __( 'Actions & Notifications', 'formidable' ),
1545	1419	'function' => array( 'FrmFormActionsController', 'email_settings' ),
1546	1420	'id' => 'frm_notification_settings',
1547		- 'icon' => 'frmfont frm_notification_check_icon',
	1421	+ 'icon' => 'frm_icon_font frm_mail_bulk_icon',
1548	1422	),
1549	1423	'permissions' => array(
1550	1424	'name' => __( 'Form Permissions', 'formidable' ),
1551		- 'icon' => 'frmfont frm_lock_closed2_icon',
	1425	+ 'icon' => 'frm_icon_font frm_lock_closed_icon',
1552	1426	'html_class' => 'frm_show_upgrade_tab frm_noallow',
1553	1427	'data' => array(
1554	1428	'medium' => 'permissions',
1555	1429	'upgrade' => __( 'Form Permissions', 'formidable' ),
		@@ -1554,37 +1428,35 @@
1554	1428	'medium' => 'permissions',
1555	1429	'upgrade' => __( 'Form Permissions', 'formidable' ),
1556	1430	'message' => __( 'Allow editing, protect forms and files, limit entries, and save drafts. Upgrade to get form and entry permissions.', 'formidable' ),
1557	1431	'screenshot' => 'permissions.png',
1558		- 'learn-more' => FrmAppHelper::get_doc_url( 'general-form-settings/#kb-form-permissions', 'form-permissions-settings' ),
1559	1432	),
1560	1433	),
1561	1434	'scheduling' => array(
1562	1435	'name' => __( 'Form Scheduling', 'formidable' ),
1563		- 'icon' => 'frmfont frm_schedule_icon',
	1436	+ 'icon' => 'frm_icon_font frm_calendar_icon',
1564	1437	'html_class' => 'frm_show_upgrade_tab frm_noallow',
1565	1438	'data' => array(
1566	1439	'medium' => 'scheduling',
1567	1440	'upgrade' => __( 'Form scheduling settings', 'formidable' ),
1568	1441	'screenshot' => 'scheduling.png',
1569		- 'learn-more' => FrmAppHelper::get_doc_url( 'general-form-settings/#kb-form-scheduling', 'form-scheduling-settings' ),
1570	1442	),
1571	1443	),
1572	1444	'buttons' => array(
1573	1445	'name' => __( 'Buttons', 'formidable' ),
1574		- 'class' => self::class,
	1446	+ 'class' => __CLASS__,
1575	1447	'function' => 'buttons_settings',
1576		- 'icon' => 'frmfont frm-buttons-style',
	1448	+ 'icon' => 'frm_icon_font frm_button_icon',
1577	1449	),
1578	1450	'landing' => array(
1579	1451	'name' => __( 'Form Landing Page', 'formidable' ),
1580		- 'icon' => 'frmfont frm_cross_device_icon',
	1452	+ 'icon' => 'frm_icon_font frm_file_text_icon',
1581	1453	'html_class' => 'frm_show_upgrade_tab frm_noallow',
1582	1454	'data' => FrmAppHelper::get_landing_page_upgrade_data_params(),
1583	1455	),
1584	1456	'chat' => array(
1585	1457	'name' => __( 'Conversational Forms', 'formidable' ),
1586		- 'icon' => 'frmfont frm_chat_bubbles_icon',
	1458	+ 'icon' => 'frm_icon_font frm_chat_forms_icon',
1587	1459	'html_class' => 'frm_show_upgrade_tab frm_noallow',
1588	1460	'data' => FrmAppHelper::get_upgrade_data_params(
1589	1461	'chat',
1590	1462	array(
		@@ -1590,15 +1462,14 @@
1590	1462	array(
1591	1463	'upgrade' => __( 'Conversational Forms', 'formidable' ),
1592	1464	'message' => __( 'Ask one question at a time for automated conversations.', 'formidable' ),
1593	1465	'screenshot' => 'chat.png',
1594		- 'learn-more' => FrmAppHelper::get_doc_url( 'conversational-forms', 'conversational-forms-settings', false ),
1595	1466	)
1596	1467	),
1597	1468	),
1598	1469	'abandonment' => array(
1599	1470	'name' => __( 'Form Abandonment', 'formidable' ),
1600		- 'icon' => 'frmfont frm_abandoned_icon',
	1471	+ 'icon' => 'frm_icon_font frm_abandoned_icon',
1601	1472	'html_class' => 'frm_show_upgrade_tab frm_noallow',
1602	1473	'data' => FrmAppHelper::get_upgrade_data_params(
1603	1474	'abandonment',
1604	1475	array(
		@@ -1604,17 +1475,16 @@
1604	1475	array(
1605	1476	'upgrade' => __( 'Form abandonment settings', 'formidable' ),
1606	1477	'message' => __( 'Unlock the power of data capture to boost lead generation and master the art of form optimization.', 'formidable' ),
1607	1478	'screenshot' => 'abandonment.png',
1608		- 'learn-more' => FrmAppHelper::get_doc_url( 'features/form-abandonment-wordpress-plugin', 'form-abandonment-settings', false ),
1609	1479	)
1610	1480	),
1611	1481	),
1612	1482	'html' => array(
1613	1483	'name' => __( 'Customize HTML', 'formidable' ),
1614		- 'class' => self::class,
	1484	+ 'class' => __CLASS__,
1615	1485	'function' => 'html_settings',
1616		- 'icon' => 'frmfont frm_code2_icon',
	1486	+ 'icon' => 'frm_icon_font frm_code_icon',
1617	1487	),
1618	1488	);
1619	1489
1620	1490	if ( ! has_action( 'frm_add_form_style_tab_options' ) && ! has_action( 'frm_add_form_button_options' ) ) {
		@@ -1620,8 +1490,14 @@
1620	1490	if ( ! has_action( 'frm_add_form_style_tab_options' ) && ! has_action( 'frm_add_form_button_options' ) ) {
1621	1491	unset( $sections['buttons'] );
1622	1492	}
1623	1493
	1494	+ foreach ( array( 'landing', 'chat', 'abandonment' ) as $feature ) {
	1495	+ if ( ! FrmAppHelper::show_new_feature( $feature ) ) {
	1496	+ unset( $sections[ $feature ] );
	1497	+ }
	1498	+ }
	1499	+
1624	1500	$sections = apply_filters( 'frm_add_form_settings_section', $sections, $values );
1625	1501
1626	1502	foreach ( $sections as $key => $section ) {
1627	1503	$defaults = array(
		@@ -1626,9 +1502,9 @@
1626	1502	foreach ( $sections as $key => $section ) {
1627	1503	$defaults = array(
1628	1504	'html_class' => '',
1629	1505	'name' => ucfirst( $key ),
1630		- 'icon' => 'frmfont frm_settings_icon',
	1506	+ 'icon' => 'frm_icon_font frm_settings_icon',
1631	1507	);
1632	1508
1633	1509	$section = array_merge( $defaults, $section );
1634	1510
		@@ -1634,9 +1510,8 @@
1634	1510
1635	1511	if ( ! isset( $section['anchor'] ) ) {
1636	1512	$section['anchor'] = $key;
1637	1513	}
1638		-
1639	1514	$section['anchor'] .= '_settings';
1640	1515
1641	1516	if ( ! isset( $section['title'] ) ) {
1642	1517	$section['title'] = $section['name'];
		@@ -1655,19 +1530,18 @@
1655	1530	/**
1656	1531	* @since 4.0
1657	1532	*
1658	1533	* @param array $values
1659		- *
1660	1534	* @return void
1661	1535	*/
1662	1536	public static function advanced_settings( $values ) {
1663	1537	$first_h3 = 'frm_first_h3';
	1538	+
1664	1539	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings-advanced.php';
1665	1540	}
1666	1541
1667	1542	/**
1668	1543	* @param array $values
1669		- *
1670	1544	* @return void
1671	1545	*/
1672	1546	public static function render_spam_settings( $values ) {
1673	1547	if ( function_exists( 'akismet_http_post' ) ) {
		@@ -1680,9 +1554,8 @@
1680	1554	/**
1681	1555	* @since 4.0
1682	1556	*
1683	1557	* @param array $values
1684		- *
1685	1558	* @return void
1686	1559	*/
1687	1560	public static function buttons_settings( $values ) {
1688	1561	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings-buttons.php';
		@@ -1691,9 +1564,8 @@
1691	1564	/**
1692	1565	* @since 4.0
1693	1566	*
1694	1567	* @param array $values
1695		- *
1696	1568	* @return void
1697	1569	*/
1698	1570	public static function html_settings( $values ) {
1699	1571	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings-html.php';
		@@ -1704,9 +1576,8 @@
1704	1576	*
1705	1577	* @since 2.03.08
1706	1578	*
1707	1579	* @param array|bool $values
1708		- *
1709	1580	* @return void
1710	1581	*/
1711	1582	private static function clean_submit_html( &$values ) {
1712	1583	if ( is_array( $values ) && isset( $values['submit_html'] ) ) {
		@@ -1729,17 +1600,13 @@
1729	1600	return $classes;
1730	1601	}
1731	1602
1732	1603	/**
1733		- * @since 6.27 Added $template_path parameter.
1734		- *
1735	1604	* @param int|string $form_id
1736	1605	* @param string $class
1737		- * @param string $template_path The path to a template file to use instead of the default.
1738		- *
1739	1606	* @return void
1740	1607	*/
1741		- public static function mb_tags_box( $form_id, $class = '', $template_path = 'default' ) {
	1608	+ public static function mb_tags_box( $form_id, $class = '' ) {
1742	1609	$fields = FrmField::get_all_for_form( $form_id, '', 'include' );
1743	1610
1744	1611	/**
1745	1612	* Allows modifying the list of fields in the tags box.
		@@ -1748,30 +1615,23 @@
1748	1615	*
1749	1616	* @param array $fields The list of fields.
1750	1617	* @param array $args The arguments. Contains `form_id`.
1751	1618	*/
1752		- $fields = apply_filters( 'frm_fields_in_tags_box', $fields, compact( 'form_id' ) );
1753		- $linked_forms = array();
1754		- $col = 'one';
1755		- $settings_tab = FrmAppHelper::is_admin_page( 'formidable' );
	1619	+ $fields = apply_filters( 'frm_fields_in_tags_box', $fields, compact( 'form_id' ) );
	1620	+ $linked_forms = array();
	1621	+ $col = 'one';
	1622	+ $settings_tab = FrmAppHelper::is_admin_page( 'formidable' );
	1623	+
1756	1624	$cond_shortcodes = apply_filters( 'frm_conditional_shortcodes', array() );
1757	1625	$entry_shortcodes = self::get_shortcode_helpers( $settings_tab );
	1626	+
1758	1627	$advanced_helpers = self::advanced_helpers( compact( 'fields', 'form_id' ) );
1759	1628
1760		- if ( 'default' === $template_path || ! file_exists( $template_path ) ) {
1761		- include FrmAppHelper::plugin_path() . '/classes/views/shared/mb_adv_info.php';
1762		- return;
1763		- }
1764		-
1765		- include $template_path;
	1629	+ include FrmAppHelper::plugin_path() . '/classes/views/shared/mb_adv_info.php';
1766	1630	}
1767	1631
1768	1632	/**
1769	1633	* @since 3.04.01
1770		- *
1771		- * @param array $atts
1772		- *
1773		- * @return array
1774	1634	*/
1775	1635	private static function advanced_helpers( $atts ) {
1776	1636	$advanced_helpers = array(
1777	1637	'default' => array(
		@@ -1780,12 +1640,10 @@
1780	1640	),
1781	1641	);
1782	1642
1783	1643	$user_fields = self::user_shortcodes();
1784		-
1785	1644	if ( $user_fields ) {
1786	1645	$user_helpers = array();
1787		-
1788	1646	foreach ( $user_fields as $uk => $uf ) {
1789	1647	$user_helpers[ '|user_id| show="' . $uk . '"' ] = $uf;
1790	1648	unset( $uk, $uf );
1791	1649	}
		@@ -1810,10 +1668,8 @@
1810	1668	* Get an array of the options to display in the advanced tab
1811	1669	* of the customization panel
1812	1670	*
1813	1671	* @since 2.0.6
1814		- *
1815		- * @return array
1816	1672	*/
1817	1673	private static function get_advanced_shortcodes() {
1818	1674	$adv_shortcodes = array(
1819	1675	'x sep=", "' => array(
		@@ -1830,18 +1686,17 @@
1830	1686	'label' => __( 'No Auto P', 'formidable' ),
1831	1687	'title' => __( 'Do not automatically add any paragraphs or line breaks', 'formidable' ),
1832	1688	),
1833	1689	);
	1690	+ $adv_shortcodes = apply_filters( 'frm_advanced_shortcodes', $adv_shortcodes );
1834	1691
1835	1692	// __( 'Leave blank instead of defaulting to User Login', 'formidable' ) : blank=1
1836	1693
1837		- return apply_filters( 'frm_advanced_shortcodes', $adv_shortcodes );
	1694	+ return $adv_shortcodes;
1838	1695	}
1839	1696
1840	1697	/**
1841	1698	* @since 3.04.01
1842		- *
1843		- * @return array
1844	1699	*/
1845	1700	private static function user_shortcodes() {
1846	1701	$options = array(
1847	1702	'ID' => __( 'User ID', 'formidable' ),
		@@ -1860,12 +1715,8 @@
1860	1715	/**
1861	1716	* Get an array of the helper shortcodes to display in the customization panel
1862	1717	*
1863	1718	* @since 2.0.6
1864		- *
1865		- * @param bool $settings_tab
1866		- *
1867		- * @return array
1868	1719	*/
1869	1720	private static function get_shortcode_helpers( $settings_tab ) {
1870	1721	$entry_shortcodes = array(
1871	1722	'id' => __( 'Entry ID', 'formidable' ),
		@@ -1880,9 +1731,8 @@
1880	1731	'form_name' => __( 'Form Name', 'formidable' ),
1881	1732	);
1882	1733
1883	1734	$entry_shortcodes = array_merge( FrmShortcodeHelper::get_contextual_shortcode_values(), $entry_shortcodes );
1884		-
1885	1735	if ( ! FrmAppHelper::pro_is_installed() ) {
1886	1736	unset( $entry_shortcodes['post_id'] );
1887	1737	}
1888	1738
		@@ -1890,13 +1740,12 @@
1890	1740	* Use this hook to add or remove buttons in the helpers section
1891	1741	* in the customization panel
1892	1742	*
1893	1743	* @since 2.0.6
1894		- *
1895		- * @param array $entry_shortcodes
1896		- * @param bool $settings_tab
1897	1744	*/
1898		- return apply_filters( 'frm_helper_shortcodes', $entry_shortcodes, $settings_tab );
	1745	+ $entry_shortcodes = apply_filters( 'frm_helper_shortcodes', $entry_shortcodes, $settings_tab );
	1746	+
	1747	+ return $entry_shortcodes;
1899	1748	}
1900	1749
1901	1750	/**
1902	1751	* Insert the form class setting into the form.
		@@ -1901,9 +1750,8 @@
1901	1750	/**
1902	1751	* Insert the form class setting into the form.
1903	1752	*
1904	1753	* @param stdClass $form
1905		- *
1906	1754	* @return void
1907	1755	*/
1908	1756	public static function form_classes( $form ) {
1909	1757	if ( isset( $form->options['form_class'] ) ) {
		@@ -1926,9 +1774,8 @@
1926	1774	* @param stdClass $form
1927	1775	*/
1928	1776	public static function add_js_validate_form_to_global_vars( $form ) {
1929	1777	global $frm_vars;
1930		-
1931	1778	if ( ! isset( $frm_vars['js_validate_forms'] ) ) {
1932	1779	$frm_vars['js_validate_forms'] = array();
1933	1780	}
1934	1781	$frm_vars['js_validate_forms'][ $form->id ] = $form;
		@@ -1951,9 +1798,8 @@
1951	1798	/**
1952	1799	* @param string $content
1953	1800	* @param int|stdClass|string $form
1954	1801	* @param false|int|stdClass|string $entry
1955		- *
1956	1802	* @return string
1957	1803	*/
1958	1804	public static function filter_content( $content, $form, $entry = false ) {
1959	1805	$content = self::replace_form_name_shortcodes( $content, $form );
		@@ -1958,9 +1804,8 @@
1958	1804	public static function filter_content( $content, $form, $entry = false ) {
1959	1805	$content = self::replace_form_name_shortcodes( $content, $form );
1960	1806
1961	1807	self::get_entry_by_param( $entry );
1962		-
1963	1808	if ( ! $entry ) {
1964	1809	return $content;
1965	1810	}
1966	1811
		@@ -1976,10 +1821,11 @@
1976	1821	$form = $entry->parent_entry->form_id;
1977	1822	}
1978	1823
1979	1824	$shortcodes = FrmFieldsHelper::get_shortcodes( $content, $form );
	1825	+ $content = apply_filters( 'frm_replace_content_shortcodes', $content, $entry, $shortcodes );
1980	1826
1981		- return apply_filters( 'frm_replace_content_shortcodes', $content, $entry, $shortcodes );
	1827	+ return $content;
1982	1828	}
1983	1829
1984	1830	/**
1985	1831	* Replace any [form_name] shortcodes in a string.
		@@ -1987,9 +1833,8 @@
1987	1833	* @since 5.5
1988	1834	*
1989	1835	* @param array|string $string
1990	1836	* @param int|stdClass|string $form
1991		- *
1992	1837	* @return array|string
1993	1838	*/
1994	1839	public static function replace_form_name_shortcodes( $string, $form ) {
1995	1840	if ( ! is_string( $string ) ) {
		@@ -1995,9 +1840,9 @@
1995	1840	if ( ! is_string( $string ) ) {
1996	1841	return $string;
1997	1842	}
1998	1843
1999		- if ( ! str_contains( $string, '[form_name]' ) ) {
	1844	+ if ( false === strpos( $string, '[form_name]' ) ) {
2000	1845	return $string;
2001	1846	}
2002	1847
2003	1848	if ( ! is_object( $form ) ) {
		@@ -2009,30 +1854,20 @@
2009	1854	}
2010	1855
2011	1856	/**
2012	1857	* @param false|int|stdClass|string $entry
2013		- *
2014	1858	* @return void
2015	1859	*/
2016	1860	private static function get_entry_by_param( &$entry ) {
2017		- if ( $entry && is_object( $entry ) ) {
2018		- return;
2019		- }
	1861	+ if ( ! $entry || ! is_object( $entry ) ) {
	1862	+ if ( ! $entry || ! is_numeric( $entry ) ) {
	1863	+ $entry = FrmAppHelper::get_post_param( 'id', false, 'sanitize_title' );
	1864	+ }
2020	1865
2021		- if ( ! $entry || ! is_numeric( $entry ) ) {
2022		- $entry = FrmAppHelper::get_post_param( 'id', false, 'sanitize_title' );
	1866	+ FrmEntry::maybe_get_entry( $entry );
2023	1867	}
2024		-
2025		- FrmEntry::maybe_get_entry( $entry );
2026	1868	}
2027	1869
2028		- /**
2029		- * @param string $content
2030		- * @param false|object $entry
2031		- * @param array $shortcodes
2032		- *
2033		- * @return string
2034		- */
2035	1870	public static function replace_content_shortcodes( $content, $entry, $shortcodes ) {
2036	1871	return FrmFieldsHelper::replace_content_shortcodes( $content, $entry, $shortcodes );
2037	1872	}
2038	1873
		@@ -2037,9 +1872,8 @@
2037	1872	}
2038	1873
2039	1874	/**
2040	1875	* @param array $errors
2041		- *
2042	1876	* @return array
2043	1877	*/
2044	1878	public static function process_bulk_form_actions( $errors ) {
2045	1879	if ( ! $_REQUEST ) {
		@@ -2046,30 +1880,29 @@
2046	1880	return $errors;
2047	1881	}
2048	1882
2049	1883	$bulkaction = FrmAppHelper::get_param( 'action', '', 'get', 'sanitize_text_field' );
2050		-
2051		- // phpcs:ignore Universal.Operators.StrictComparisons
2052	1884	if ( $bulkaction == - 1 ) {
2053	1885	$bulkaction = FrmAppHelper::get_param( 'action2', '', 'get', 'sanitize_title' );
2054	1886	}
2055	1887
2056		- if ( $bulkaction && str_starts_with( $bulkaction, 'bulk_' ) ) {
	1888	+ if ( ! empty( $bulkaction ) && strpos( $bulkaction, 'bulk_' ) === 0 ) {
2057	1889	FrmAppHelper::remove_get_action();
	1890	+
2058	1891	$bulkaction = str_replace( 'bulk_', '', $bulkaction );
2059	1892	}
2060	1893
2061	1894	$ids = FrmAppHelper::get_param( 'item-action', '', 'get', 'sanitize_text_field' );
	1895	+ if ( empty( $ids ) ) {
	1896	+ $errors[] = __( 'No forms were specified', 'formidable' );
2062	1897
2063		- if ( ! $ids ) {
2064		- $errors[] = __( 'No forms were specified', 'formidable' );
2065	1898	return $errors;
2066	1899	}
2067	1900
2068	1901	$permission_error = FrmAppHelper::permission_nonce_error( '', '_wpnonce', 'bulk-toplevel_page_formidable' );
2069		-
2070	1902	if ( $permission_error !== false ) {
2071	1903	$errors[] = $permission_error;
	1904	+
2072	1905	return $errors;
2073	1906	}
2074	1907
2075	1908	if ( ! is_array( $ids ) ) {
		@@ -2097,9 +1930,8 @@
2097	1930	/**
2098	1931	* Includes html that shows a message when the device is too small to use Formidable Forms admin pages.
2099	1932	*
2100	1933	* @since 6.20
2101		- *
2102	1934	* @return void
2103	1935	*/
2104	1936	public static function include_device_too_small_message() {
2105	1937	if ( ! FrmAppHelper::is_formidable_admin() ) {
		@@ -2108,13 +1940,12 @@
2108	1940
2109	1941	include FrmAppHelper::plugin_path() . '/classes/views/shared/small-device-message.php';
2110	1942	}
2111	1943
2112		- public static function route() { // phpcs:ignore Generic.Metrics.CyclomaticComplexity.MaxExceeded
	1944	+ public static function route() {
2113	1945	$action = isset( $_REQUEST['frm_action'] ) ? 'frm_action' : 'action';
2114	1946	$vars = array();
2115	1947	FrmAppHelper::include_svg();
2116		-
2117	1948	if ( isset( $_POST['frm_compact_fields'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
2118	1949	FrmAppHelper::permission_check( 'frm_edit_forms' );
2119	1950
2120	1951	// Javascript needs to be allowed in some field settings.
		@@ -2120,28 +1951,25 @@
2120	1951	// Javascript needs to be allowed in some field settings.
2121	1952	// phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized, WordPress.Security.NonceVerification.Missing
2122	1953	$json_vars = htmlspecialchars_decode( nl2br( str_replace( '&quot;', '"', wp_unslash( $_POST['frm_compact_fields'] ) ) ) );
2123	1954	$json_vars = json_decode( $json_vars, true );
	1955	+ if ( empty( $json_vars ) ) {
	1956	+ // json decoding failed so we should return an error message.
	1957	+ $action = FrmAppHelper::get_param( $action, '', 'get', 'sanitize_title' );
	1958	+ if ( 'edit' === $action ) {
	1959	+ $action = 'update';
	1960	+ }
2124	1961
2125		- if ( $json_vars ) {
	1962	+ add_filter( 'frm_validate_form', 'FrmFormsController::json_error' );
	1963	+ } else {
2126	1964	$vars = FrmAppHelper::json_to_array( $json_vars );
2127	1965	$action = $vars[ $action ];
2128	1966	unset( $_REQUEST['frm_compact_fields'], $_POST['frm_compact_fields'] ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
2129	1967	$_REQUEST = array_merge( $_REQUEST, $vars ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
2130	1968	$_POST = array_merge( $_POST, $_REQUEST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
2131		- } else {
2132		- // Json decoding failed so we should return an error message.
2133		- $action = FrmAppHelper::get_param( $action, '', 'get', 'sanitize_title' );
2134		-
2135		- if ( 'edit' === $action ) {
2136		- $action = 'update';
2137		- }
2138		-
2139		- add_filter( 'frm_validate_form', 'FrmFormsController::json_error' );
2140	1969	}
2141	1970	} else {
2142	1971	$action = FrmAppHelper::get_param( $action, '', 'get', 'sanitize_title' );
2143		-
2144	1972	if ( isset( $_REQUEST['delete_all'] ) ) {
2145	1973	// Override the action for this page.
2146	1974	$action = 'delete_all';
2147	1975	}
		@@ -2161,38 +1989,34 @@
2161	1989	case 'update_settings':
2162	1990	return self::$action( $vars );
2163	1991	case 'lite-reports':
2164	1992	self::no_reports( $vars );
2165		- return null;
	1993	+ return;
2166	1994	case 'views':
2167	1995	self::no_views( $vars );
2168		- return null;
	1996	+ return;
2169	1997	default:
2170	1998	do_action( 'frm_form_action_' . $action );
2171		-
2172	1999	if ( apply_filters( 'frm_form_stop_action_' . $action, false ) ) {
2173		- return null;
	2000	+ return;
2174	2001	}
2175	2002
2176	2003	$action = FrmAppHelper::get_param( 'action', '', 'get', 'sanitize_text_field' );
2177		-
2178		- // phpcs:ignore Universal.Operators.StrictComparisons
2179	2004	if ( $action == - 1 ) {
2180	2005	$action = FrmAppHelper::get_param( 'action2', '', 'get', 'sanitize_title' );
2181	2006	}
2182	2007
2183		- if ( str_starts_with( $action, 'bulk_' ) ) {
	2008	+ if ( strpos( $action, 'bulk_' ) === 0 ) {
2184	2009	FrmAppHelper::remove_get_action();
2185	2010
2186	2011	self::list_form();
2187		- return null;
	2012	+ return;
2188	2013	}
2189	2014
2190	2015	$message = FrmAppHelper::get_param( 'message' );
2191		-
2192	2016	if ( 'form_duplicate_error' === $message ) {
2193	2017	self::display_forms_list( array(), '', array( __( 'There was a problem duplicating the form', 'formidable' ) ) );
2194		- return null;
	2018	+ return;
2195	2019	}
2196	2020
2197	2021	if ( 'forms_permanently_deleted' === $message ) {
2198	2022	$count = FrmAppHelper::get_param( 'forms_deleted', 0, 'get', 'absint' );
		@@ -2198,14 +2022,14 @@
2198	2022	$count = FrmAppHelper::get_param( 'forms_deleted', 0, 'get', 'absint' );
2199	2023	/* translators: %1$s: Number of forms */
2200	2024	$message = sprintf( _n( '%1$s form permanently deleted.', '%1$s forms permanently deleted.', $count, 'formidable' ), $count );
2201	2025	self::display_forms_list( array(), $message, '' );
2202		- return null;
	2026	+ return;
2203	2027	}
2204	2028
2205	2029	self::display_forms_list();
2206	2030
2207		- return null;
	2031	+ return;
2208	2032	}//end switch
2209	2033	}
2210	2034
2211	2035	/**
		@@ -2224,44 +2048,19 @@
2224	2048
2225	2049	// Get posted data
2226	2050	$form_id = FrmAppHelper::get_post_param( 'form_id', '', 'absint' );
2227	2051	$name = FrmAppHelper::get_post_param( 'form_name', '', 'sanitize_text_field' );
2228		- $form = FrmForm::getOne( $form_id );
2229	2052
2230		- if ( ! $form ) {
2231		- wp_send_json_error( __( 'Form not found', 'formidable' ) );
2232		- }
	2053	+ // Update the form name and form key.
	2054	+ $form_key = FrmAppHelper::get_unique_key( sanitize_title( $name ), 'frm_forms', 'form_key' );
	2055	+ FrmForm::update( $form_id, compact( 'name', 'form_key' ) );
2233	2056
2234		- if ( $name === $form->name ) {
2235		- // Nothing to change so exit early.
2236		- $form_key = $form->form_key;
2237		- wp_send_json_success( compact( 'form_key' ) );
2238		- }
2239		-
2240		- $to_update = array(
2241		- 'name' => $name,
2242		- );
2243		-
2244		- if ( '' === $name ) {
2245		- $form_key = $form->form_key;
2246		- } else {
2247		- // Only update form_key if name is not empty.
2248		- $form_key = FrmAppHelper::get_unique_key( sanitize_title( $name ), 'frm_forms', 'form_key' );
2249		- $to_update['form_key'] = $form_key;
2250		- }
2251		-
2252		- FrmForm::update( $form_id, $to_update );
2253		-
2254	2057	wp_send_json_success( compact( 'form_key' ) );
2255	2058	}
2256	2059
2257		- /**
2258		- * @param array $errors
2259		- *
2260		- * @return array
2261		- */
2262	2060	public static function json_error( $errors ) {
2263	2061	$errors['json'] = __( 'Abnormal HTML characters prevented your form from saving correctly', 'formidable' );
	2062	+
2264	2063	return $errors;
2265	2064	}
2266	2065
2267	2066	/**
		@@ -2268,10 +2067,8 @@
2268	2067	* Add education about views.
2269	2068	*
2270	2069	* @since 4.07
2271	2070	*
2272		- * @param array $values
2273		- *
2274	2071	* @return void
2275	2072	*/
2276	2073	public static function no_views( $values = array() ) {
2277	2074	FrmAppHelper::include_svg();
		@@ -2285,10 +2082,8 @@
2285	2082	* Add education about reports.
2286	2083	*
2287	2084	* @since 4.07
2288	2085	*
2289		- * @param array $values
2290		- *
2291	2086	* @return void
2292	2087	*/
2293	2088	public static function no_reports( $values = array() ) {
2294	2089	$id = FrmAppHelper::get_param( 'form', '', 'get', 'absint' );
		@@ -2314,9 +2109,10 @@
2314	2109	/**
2315	2110	* @since 4.05.02
2316	2111	*/
2317	2112	private static function move_menu_to_footer() {
2318		- if ( empty( FrmAppHelper::get_settings()->admin_bar ) ) {
	2113	+ $settings = FrmAppHelper::get_settings();
	2114	+ if ( empty( $settings->admin_bar ) ) {
2319	2115	remove_action( 'wp_body_open', 'wp_admin_bar_render', 0 );
2320	2116	}
2321	2117	}
2322	2118
		@@ -2321,15 +2117,13 @@
2321	2117	}
2322	2118
2323	2119	public static function admin_bar_configure() {
2324	2120	global $frm_vars;
2325		-
2326	2121	if ( empty( $frm_vars['forms_loaded'] ) ) {
2327	2122	return;
2328	2123	}
2329	2124
2330	2125	$actions = array();
2331		-
2332	2126	foreach ( $frm_vars['forms_loaded'] as $form ) {
2333	2127	if ( is_object( $form ) ) {
2334	2128	$actions[ $form->id ] = $form->name;
2335	2129	}
		@@ -2335,9 +2129,9 @@
2335	2129	}
2336	2130	unset( $form );
2337	2131	}
2338	2132
2339		- if ( ! $actions ) {
	2133	+ if ( empty( $actions ) ) {
2340	2134	return;
2341	2135	}
2342	2136
2343	2137	self::add_menu_to_admin_bar();
		@@ -2363,12 +2157,8 @@
2363	2157	}
2364	2158
2365	2159	/**
2366	2160	* @since 2.05.07
2367		- *
2368		- * @param array $actions
2369		- *
2370		- * @return void
2371	2161	*/
2372	2162	private static function add_forms_to_admin_bar( $actions ) {
2373	2163	global $wp_admin_bar;
2374	2164
		@@ -2374,13 +2164,14 @@
2374	2164
2375	2165	asort( $actions );
2376	2166
2377	2167	foreach ( $actions as $form_id => $name ) {
	2168	+
2378	2169	$wp_admin_bar->add_node(
2379	2170	array(
2380	2171	'parent' => 'frm-forms',
2381	2172	'id' => 'edit_form_' . $form_id,
2382		- 'title' => $name ? $name : FrmFormsHelper::get_no_title_text(),
	2173	+ 'title' => empty( $name ) ? FrmFormsHelper::get_no_title_text() : $name,
2383	2174	'href' => FrmForm::get_edit_link( $form_id ),
2384	2175	)
2385	2176	);
2386	2177	}
		@@ -2389,14 +2180,12 @@
2389	2180	/**
2390	2181	* The formidable shortcode
2391	2182	*
2392	2183	* @param array $atts The params from the shortcode.
2393		- *
2394	2184	* @return string
2395	2185	*/
2396	2186	public static function get_form_shortcode( $atts ) {
2397	2187	global $frm_vars;
2398		-
2399	2188	if ( ! empty( $frm_vars['skip_shortcode'] ) ) {
2400	2189	$sc = '[formidable';
2401	2190	$sc .= FrmAppHelper::array_to_html_params( $atts );
2402	2191	return $sc . ']';
		@@ -2425,9 +2214,8 @@
2425	2214	* @since 5.2.01
2426	2215	*
2427	2216	* @param false|int|string $id
2428	2217	* @param false|string $key
2429		- *
2430	2218	* @return false|stdClass
2431	2219	*/
2432	2220	private static function maybe_get_form_by_id_or_key( $id, $key ) {
2433	2221	if ( ! $id ) {
		@@ -2441,9 +2229,8 @@
2441	2229	* @param false|string $key
2442	2230	* @param bool|int|string $title may be 'auto', true, false, 'true', 'false', 'yes', '1', 1, '0', 0.
2443	2231	* @param bool|int|string $description may be 'auto', true, false, 'true', 'false', 'yes', '1', 1, '0', 0.
2444	2232	* @param array $atts
2445		- *
2446	2233	* @return string
2447	2234	*/
2448	2235	public static function show_form( $id = '', $key = '', $title = false, $description = false, $atts = array() ) {
2449	2236	$form = self::maybe_get_form_by_id_or_key( $id, $key );
		@@ -2464,13 +2251,14 @@
2464	2251
2465	2252	add_action( 'frm_load_form_hooks', 'FrmHooksController::trigger_load_form_hooks' );
2466	2253	FrmAppHelper::trigger_hook_load( 'form', $form );
2467	2254
2468		- $form = apply_filters( 'frm_pre_display_form', $form );
	2255	+ $form = apply_filters( 'frm_pre_display_form', $form );
	2256	+
2469	2257	$frm_settings = FrmAppHelper::get_settings( array( 'current_form' => $form->id ) );
2470	2258
2471	2259	if ( self::is_viewable_draft_form( $form ) ) {
2472		- // Don't show a draft form on a page
	2260	+ // don't show a draft form on a page
2473	2261	$form = __( 'Please select a valid form', 'formidable' );
2474	2262	} elseif ( ! FrmForm::is_visible_to_user( $form ) ) {
2475	2263	$form = do_shortcode( $frm_settings->login_msg );
2476	2264	} else {
		@@ -2490,18 +2278,16 @@
2490	2278	}
2491	2279
2492	2280	/**
2493	2281	* @param false|int|string $id
2494		- *
2495	2282	* @return false|stdClass
2496	2283	*/
2497	2284	private static function maybe_get_form_to_show( $id ) {
2498	2285	$form = false;
2499	2286
2500		- if ( $id ) {
	2287	+ if ( ! empty( $id ) ) {
2501	2288	// Form id or key is set.
2502	2289	$form = FrmForm::getOne( $id );
2503		-
2504	2290	if ( ! $form || $form->parent_form_id || $form->status === 'trash' ) {
2505	2291	$form = false;
2506	2292	}
2507	2293	}
		@@ -2508,25 +2294,12 @@
2508	2294
2509	2295	return $form;
2510	2296	}
2511	2297
2512		- /**
2513		- * @param object $form
2514		- *
2515		- * @return bool
2516		- */
2517	2298	private static function is_viewable_draft_form( $form ) {
2518	2299	return $form->status === 'draft' && current_user_can( 'frm_edit_forms' ) && ! FrmAppHelper::is_preview_page();
2519	2300	}
2520	2301
2521		- /**
2522		- * @param object $form
2523		- * @param bool $title
2524		- * @param bool $description
2525		- * @param array $atts
2526		- *
2527		- * @return string
2528		- */
2529	2302	public static function get_form( $form, $title, $description, $atts = array() ) {
2530	2303	ob_start();
2531	2304
2532	2305	do_action( 'frm_before_get_form', $atts );
		@@ -2533,9 +2306,10 @@
2533	2306
2534	2307	self::get_form_contents( $form, $title, $description, $atts );
2535	2308	self::enqueue_scripts( FrmForm::get_params( $form ) );
2536	2309
2537		- $contents = ob_get_clean();
	2310	+ $contents = ob_get_contents();
	2311	+ ob_end_clean();
2538	2312
2539	2313	self::maybe_minimize_form( $atts, $contents );
2540	2314
2541	2315	return $contents;
		@@ -2540,25 +2314,12 @@
2540	2314
2541	2315	return $contents;
2542	2316	}
2543	2317
2544		- /**
2545		- * @param array $params
2546		- *
2547		- * @return void
2548		- */
2549	2318	public static function enqueue_scripts( $params ) {
2550	2319	do_action( 'frm_enqueue_form_scripts', $params );
2551	2320	}
2552	2321
2553		- /**
2554		- * @param object $form
2555		- * @param bool $title
2556		- * @param bool $description
2557		- * @param array $atts
2558		- *
2559		- * @return void
2560		- */
2561	2322	public static function get_form_contents( $form, $title, $description, $atts ) {
2562	2323	$params = FrmForm::get_params( $form );
2563	2324	$errors = self::get_saved_errors( $form, $params );
2564	2325	$fields = FrmFieldsHelper::get_form_fields( $form->id, $errors );
		@@ -2565,10 +2326,9 @@
2565	2326	$reset = false;
2566	2327	$pass_args = compact( 'form', 'fields', 'errors', 'title', 'description', 'reset' );
2567	2328
2568	2329	$pass_args['action'] = $params['action'];
2569		- // phpcs:ignore WordPress.Security.NonceVerification.Missing, Universal.Operators.StrictComparisons
2570		- $handle_process_here = $params['action'] === 'create' && $params['posted_form_id'] == $form->id && $_POST;
	2330	+ $handle_process_here = $params['action'] === 'create' && $params['posted_form_id'] == $form->id && $_POST; // phpcs:ignore WordPress.Security.NonceVerification.Missing
2571	2331
2572	2332	if ( ! $handle_process_here ) {
2573	2333	FrmFormState::set_initial_value( 'title', $title );
2574	2334	FrmFormState::set_initial_value( 'description', $description );
		@@ -2573,15 +2333,16 @@
2573	2333	FrmFormState::set_initial_value( 'title', $title );
2574	2334	FrmFormState::set_initial_value( 'description', $description );
2575	2335
2576	2336	do_action( 'frm_display_form_action', $params, $fields, $form, $title, $description );
2577		-
2578	2337	if ( apply_filters( 'frm_continue_to_new', true, $form->id, $params['action'] ) ) {
2579	2338	self::show_form_after_submit( $pass_args );
2580	2339	}
2581		- } elseif ( $errors ) {
	2340	+ } elseif ( ! empty( $errors ) ) {
2582	2341	self::show_form_after_submit( $pass_args );
	2342	+
2583	2343	} else {
	2344	+
2584	2345	do_action( 'frm_validate_form_creation', $params, $fields, $form, $title, $description );
2585	2346
2586	2347	if ( apply_filters( 'frm_continue_to_create', true, $form->id ) ) {
2587	2348	$entry_id = self::just_created_entry( $form->id );
		@@ -2604,19 +2365,13 @@
2604	2365	/**
2605	2366	* If the form was processed earlier (init), get the generated errors
2606	2367	*
2607	2368	* @since 2.05
2608		- *
2609		- * @param object $form
2610		- * @param array $params
2611		- *
2612		- * @return array
2613	2369	*/
2614	2370	private static function get_saved_errors( $form, $params ) {
2615	2371	global $frm_vars;
2616	2372
2617		- // phpcs:ignore WordPress.Security.NonceVerification.Missing, Universal.Operators.StrictComparisons
2618		- if ( $params['posted_form_id'] == $form->id && $_POST && isset( $frm_vars['created_entries'][ $form->id ] ) ) {
	2373	+ if ( $params['posted_form_id'] == $form->id && $_POST && isset( $frm_vars['created_entries'][ $form->id ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
2619	2374	$errors = $frm_vars['created_entries'][ $form->id ]['errors'];
2620	2375	} else {
2621	2376	$errors = array();
2622	2377	}
		@@ -2633,16 +2388,13 @@
2633	2388	}
2634	2389
2635	2390	/**
2636	2391	* @since 2.2.7
2637		- *
2638		- * @param int|string $form_id
2639		- *
2640		- * @return int
2641	2392	*/
2642	2393	public static function just_created_entry( $form_id ) {
2643	2394	global $frm_vars;
2644		- 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
	2395	+
	2396	+ 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;
2645	2397	}
2646	2398
2647	2399	/**
2648	2400	* Gets confirmation method.
		@@ -2655,9 +2407,8 @@
2655	2407	*
2656	2408	* @type object $form Form object.
2657	2409	* @type int $entry_id Entry ID.
2658	2410	* }
2659		- *
2660	2411	* @return array|string
2661	2412	*/
2662	2413	private static function get_confirmation_method( $atts ) {
2663	2414	$action = FrmOnSubmitHelper::current_event( $atts );
		@@ -2665,9 +2416,8 @@
2665	2416	$method = ! empty( $atts['form']->options[ $opt ] ) ? $atts['form']->options[ $opt ] : 'message';
2666	2417
2667	2418	if ( ! empty( $atts['entry_id'] ) ) {
2668	2419	$met_actions = self::get_met_on_submit_actions( $atts, $action );
2669		-
2670	2420	if ( $met_actions ) {
2671	2421	$method = $met_actions;
2672	2422	}
2673	2423	}
		@@ -2674,21 +2424,14 @@
2674	2424
2675	2425	$method = apply_filters( 'frm_success_filter', $method, $atts['form'], $action );
2676	2426
2677	2427	if ( $method !== 'message' && ( ! $atts['entry_id'] || ! is_numeric( $atts['entry_id'] ) ) ) {
2678		- return 'message';
	2428	+ $method = 'message';
2679	2429	}
2680	2430
2681	2431	return $method;
2682	2432	}
2683	2433
2684		- /**
2685		- * @param object $form
2686		- * @param array $params
2687		- * @param array $args
2688		- *
2689		- * @return void
2690		- */
2691	2434	public static function maybe_trigger_redirect( $form, $params, $args ) {
2692	2435	if ( ! isset( $params['id'] ) ) {
2693	2436	global $frm_vars;
2694	2437	$params['id'] = $frm_vars['created_entries'][ $form->id ]['entry_id'];
		@@ -2715,12 +2458,14 @@
2715	2458	* @param array $params See {@see FrmFormsController::maybe_trigger_redirect()}.
2716	2459	* @param array $args See {@see FrmFormsController::maybe_trigger_redirect()}.
2717	2460	*/
2718	2461	public static function maybe_trigger_redirect_with_action( $conf_method, $form, $params, $args ) {
2719		- if ( is_array( $conf_method ) && 1 === count( $conf_method ) && 'redirect' === FrmOnSubmitHelper::get_action_type( $conf_method[0] ) && empty( $conf_method[0]->post_content['redirect_delay'] ) ) { // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong
2720		- $event = FrmOnSubmitHelper::current_event( $params );
2721		- FrmOnSubmitHelper::populate_on_submit_data( $form->options, $conf_method[0], $event );
2722		- $conf_method = 'redirect';
	2462	+ if ( is_array( $conf_method ) && 1 === count( $conf_method ) ) {
	2463	+ if ( 'redirect' === FrmOnSubmitHelper::get_action_type( $conf_method[0] ) && empty( $conf_method[0]->post_content['redirect_delay'] ) ) {
	2464	+ $event = FrmOnSubmitHelper::current_event( $params );
	2465	+ FrmOnSubmitHelper::populate_on_submit_data( $form->options, $conf_method[0], $event );
	2466	+ $conf_method = 'redirect';
	2467	+ }
2723	2468	}
2724	2469
2725	2470	if ( 'redirect' === $conf_method ) {
2726	2471	self::trigger_redirect( $form, $params, $args );
		@@ -2726,15 +2471,8 @@
2726	2471	self::trigger_redirect( $form, $params, $args );
2727	2472	}
2728	2473	}
2729	2474
2730		- /**
2731		- * @param object $form
2732		- * @param array $params
2733		- * @param array $args
2734		- *
2735		- * @return void
2736		- */
2737	2475	public static function trigger_redirect( $form, $params, $args ) {
2738	2476	$success_args = array(
2739	2477	'action' => $params['action'],
2740	2478	'conf_method' => 'redirect',
		@@ -2793,9 +2531,8 @@
2793	2531	* @since 6.0
2794	2532	*
2795	2533	* @param array $args See {@see FrmFormsController::run_success_action()}.
2796	2534	* @param string $event Form event. Default is `create`.
2797		- *
2798	2535	* @return array Array of actions that meet the conditional logics.
2799	2536	*/
2800	2537	public static function get_met_on_submit_actions( $args, $event = 'create' ) {
2801	2538	if ( ! FrmOnSubmitHelper::form_has_migrated( $args['form'] ) ) {
		@@ -2822,11 +2559,13 @@
2822	2559	}
2823	2560
2824	2561	$action_type = FrmOnSubmitHelper::get_action_type( $action );
2825	2562
2826		- if ( 'redirect' === $action_type && $has_redirect ) {
2827		- // Do not process because we run the first redirect action only.
2828		- continue;
	2563	+ if ( 'redirect' === $action_type ) {
	2564	+ if ( $has_redirect ) {
	2565	+ // Do not process because we run the first redirect action only.
	2566	+ continue;
	2567	+ }
2829	2568	}
2830	2569
2831	2570	if ( ! self::is_valid_on_submit_action( $action, $args, $event ) ) {
2832	2571	continue;
		@@ -2851,10 +2590,10 @@
2851	2590	* @param array $args See {@see FrmFormsController::run_success_action()}. `$args['event']` is also added.
2852	2591	*/
2853	2592	$met_actions = apply_filters( 'frm_get_met_on_submit_actions', $met_actions, $args );
2854	2593
2855		- if ( ! $met_actions ) {
2856		- return array( FrmOnSubmitHelper::get_fallback_action( $event ) );
	2594	+ if ( empty( $met_actions ) ) {
	2595	+ $met_actions = array( FrmOnSubmitHelper::get_fallback_action( $event ) );
2857	2596	}
2858	2597
2859	2598	return $met_actions;
2860	2599	}
		@@ -2866,9 +2605,8 @@
2866	2605	*
2867	2606	* @param object $action Form action object.
2868	2607	* @param array $args See {@see FrmFormsController::run_success_action()}.
2869	2608	* @param string $event Form event. Default is `create`.
2870		- *
2871	2609	* @return bool
2872	2610	*/
2873	2611	private static function is_valid_on_submit_action( $action, $args, $event = 'create' ) {
2874	2612	$action_type = FrmOnSubmitHelper::get_action_type( $action );
		@@ -2890,9 +2628,8 @@
2890	2628	return false;
2891	2629	}
2892	2630
2893	2631	$page = get_post( $action->post_content['success_page_id'] );
2894		-
2895	2632	if ( ! $page || 'trash' === $page->post_status ) {
2896	2633	return false;
2897	2634	}
2898	2635	}
		@@ -2914,9 +2651,8 @@
2914	2651	'entry_id' => $args['entry_id'],
2915	2652	'action' => FrmOnSubmitHelper::current_event( $args ),
2916	2653	)
2917	2654	);
2918		-
2919	2655	if ( ! is_array( $args['conf_method'] ) ) {
2920	2656	self::run_success_action( $args );
2921	2657	return;
2922	2658	}
		@@ -2943,9 +2679,8 @@
2943	2679	* @param array $args See {@see FrmFormsController::run_success_action()}.
2944	2680	*/
2945	2681	public static function run_multi_on_submit_actions( $args ) {
2946	2682	$redirect_action = null;
2947		-
2948	2683	foreach ( $args['conf_method'] as $action ) {
2949	2684	if ( 'redirect' === FrmOnSubmitHelper::get_action_type( $action ) ) {
2950	2685	// We catch the redirect action to run it last.
2951	2686	$redirect_action = $action;
		@@ -2956,15 +2691,13 @@
2956	2691
2957	2692	unset( $action );
2958	2693	}
2959	2694
2960		- if ( ! $redirect_action ) {
2961		- return;
	2695	+ if ( $redirect_action ) {
	2696	+ // Show script to delay the redirection.
	2697	+ $args['force_delay_redirect'] = true;
	2698	+ self::run_single_on_submit_action( $args, $redirect_action );
2962	2699	}
2963		-
2964		- // Show script to delay the redirection.
2965		- $args['force_delay_redirect'] = true;
2966		- self::run_single_on_submit_action( $args, $redirect_action );
2967	2700	}
2968	2701
2969	2702	/**
2970	2703	* Runs single On Submit action.
		@@ -2985,9 +2718,8 @@
2985	2718	* @since 6.0
2986	2719	*
2987	2720	* @param array $args See {@see FrmFormsController::run_success_action()}.
2988	2721	* @param object $action On Submit action object.
2989		- *
2990	2722	* @return array
2991	2723	*/
2992	2724	private static function get_run_success_action_args( $args, $action ) {
2993	2725	$new_args = $args;
		@@ -2993,9 +2725,10 @@
2993	2725	$new_args = $args;
2994	2726
2995	2727	FrmOnSubmitHelper::populate_on_submit_data( $new_args['form']->options, $action, $args['action'] );
2996	2728
2997		- $opt = 'update' === $args['action'] ? 'edit_' : 'success_';
	2729	+ $opt = 'update' === $args['action'] ? 'edit_' : 'success_';
	2730	+
2998	2731	$new_args['conf_method'] = $new_args['form']->options[ $opt . 'action' ];
2999	2732
3000	2733	/**
3001	2734	* Filters the run success action args.
		@@ -3010,18 +2743,12 @@
3010	2743	}
3011	2744
3012	2745	/**
3013	2746	* @since 3.0
3014		- *
3015		- * @param array $args
3016		- *
3017		- * @return void
3018	2747	*/
3019	2748	private static function load_page_after_submit( $args ) {
3020	2749	global $post;
3021	2750	$opt = $args['success_opt'];
3022		-
3023		- // phpcs:ignore Universal.Operators.StrictComparisons
3024	2751	if ( ! $post || $args['form']->options[ $opt . '_page_id' ] != $post->ID ) {
3025	2752	$page = get_post( $args['form']->options[ $opt . '_page_id' ] );
3026	2753	$old_post = $post;
3027	2754	$post = $page;
		@@ -3045,9 +2772,8 @@
3045	2772	}
3046	2773
3047	2774	/**
3048	2775	* @since 3.0
3049		- *
3050	2776	* @param array $args See {@see FrmFormsController::run_success_action()}.
3051	2777	*/
3052	2778	private static function redirect_after_submit( $args ) {
3053	2779	add_filter( 'frm_use_wpautop', '__return_false' );
		@@ -3061,10 +2787,11 @@
3061	2787	FrmEntriesController::delete_entry_before_redirect( $success_url, $args['form'], $args );
3062	2788
3063	2789	add_filter( 'frm_redirect_url', 'FrmEntriesController::prepare_redirect_url' );
3064	2790	$success_url = apply_filters( 'frm_redirect_url', $success_url, $args['form'], $args );
3065		- $doing_ajax = FrmAppHelper::doing_ajax();
3066	2791
	2792	+ $doing_ajax = FrmAppHelper::doing_ajax();
	2793	+
3067	2794	if ( ! empty( $args['ajax'] ) && $doing_ajax && empty( $args['force_delay_redirect'] ) ) {
3068	2795	// Is AJAX submit and there is just one Redirect action runs.
3069	2796	echo json_encode( self::get_ajax_redirect_response_data( $args + compact( 'success_url' ) ) );
3070	2797	wp_die();
		@@ -3113,9 +2840,8 @@
3113	2840	*
3114	2841	* @since 6.3.1
3115	2842	*
3116	2843	* @param array $args See {@see FrmFormsController::run_success_action()}.
3117		- *
3118	2844	* @return array
3119	2845	*/
3120	2846	private static function get_ajax_redirect_response_data( $args ) {
3121	2847	$response_data = array(
		@@ -3138,9 +2864,8 @@
3138	2864	$args['message'] = FrmOnSubmitHelper::get_default_new_tab_msg();
3139	2865
3140	2866	$args['form']->options['success_msg'] = $args['message'];
3141	2867	$args['form']->options['edit_msg'] = $args['message'];
3142		-
3143	2868	if ( ! isset( $args['fields'] ) ) {
3144	2869	$args['fields'] = FrmField::get_all_for_form( $args['form']->id );
3145	2870	}
3146	2871
		@@ -3192,15 +2917,13 @@
3192	2917	add_filter( 'frm_use_wpautop', '__return_true' );
3193	2918
3194	2919	echo FrmAppHelper::maybe_kses( $redirect_msg ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
3195	2920	echo '<script>';
3196		-
3197	2921	if ( empty( $args['doing_ajax'] ) ) {
3198	2922	// Not AJAX submit, delay JS until window.load.
3199	2923	echo 'window.onload=function(){';
3200	2924	}
3201	2925	echo 'setTimeout(function(){' . $redirect_js . '}, ' . intval( $delay_time ) . ');'; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
3202		-
3203	2926	if ( empty( $args['doing_ajax'] ) ) {
3204	2927	echo '};';
3205	2928	}
3206	2929	echo '</script>';
		@@ -3213,16 +2936,13 @@
3213	2936	* @param string $success_msg
3214	2937	* @param array $args
3215	2938	*/
3216	2939	private static function get_redirect_message( $success_url, $success_msg, $args ) {
3217		- $success_msg = apply_filters( 'frm_content', $success_msg, $args['form'], $args['entry_id'] );
3218		- $success_msg = do_shortcode( FrmAppHelper::use_wpautop( $success_msg ) );
3219		-
3220		- // phpcs:disable Generic.WhiteSpace.ScopeIndent
3221		- $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
	2940	+ $success_msg = apply_filters( 'frm_content', $success_msg, $args['form'], $args['entry_id'] );
	2941	+ $success_msg = do_shortcode( FrmAppHelper::use_wpautop( $success_msg ) );
	2942	+ $redirect_msg = '<div class="' . esc_attr( FrmFormsHelper::get_form_style_class( $args['form'] ) ) . '"><div class="frm-redirect-msg" role="status">' . $success_msg . '<br/>' .
3222	2943	self::get_redirect_fallback_message( $success_url, $args ) .
3223	2944	'</div></div>';
3224		- // phpcs:enable Generic.WhiteSpace.ScopeIndent
3225	2945
3226	2946	$redirect_args = array(
3227	2947	'entry_id' => $args['entry_id'],
3228	2948	'form_id' => $args['form']->id,
		@@ -3238,14 +2958,12 @@
3238	2958	* @since 6.3.1
3239	2959	*
3240	2960	* @param string $success_url Redirect URL.
3241	2961	* @param array $args Contains `form` object.
3242		- *
3243	2962	* @return string
3244	2963	*/
3245	2964	private static function get_redirect_fallback_message( $success_url, $args ) {
3246	2965	$target = '';
3247		-
3248	2966	if ( ! empty( $args['form']->options['open_in_new_tab'] ) ) {
3249	2967	$target = ' target="_blank"';
3250	2968	}
3251	2969
		@@ -3260,12 +2978,8 @@
3260	2978	/**
3261	2979	* Prepare to show the success message and empty form after submit
3262	2980	*
3263	2981	* @since 2.05
3264		- *
3265		- * @param array $atts
3266		- *
3267		- * @return void
3268	2982	*/
3269	2983	public static function show_message_after_save( $atts ) {
3270	2984	$atts['message'] = self::prepare_submit_message( $atts['form'], $atts['entry_id'], $atts );
3271	2985
		@@ -3271,9 +2985,8 @@
3271	2985
3272	2986	if ( ! isset( $atts['form']->options['show_form'] ) || $atts['form']->options['show_form'] ) {
3273	2987	if ( isset( $atts['action'] ) && 'update' === $atts['action'] && is_callable( array( 'FrmProEntriesController', 'show_front_end_form_with_entry' ) ) ) {
3274	2988	$entry = FrmEntry::getOne( $atts['entry_id'] );
3275		-
3276	2989	if ( $entry ) {
3277	2990	// This is copied from the Pro plugin.
3278	2991	$atts['conf_message'] = FrmProEntriesController::confirmation( 'message', $atts['form'], $atts['form']->options, $entry->id, $atts );
3279	2992	$atts['show_form'] = FrmProEntriesController::is_form_displayed_after_edit( $atts['form'] );
		@@ -3290,12 +3003,8 @@
3290	3003	/**
3291	3004	* Show an empty form
3292	3005	*
3293	3006	* @since 2.05
3294		- *
3295		- * @param array $args
3296		- *
3297		- * @return void
3298	3007	*/
3299	3008	private static function show_form_after_submit( $args ) {
3300	3009	self::fill_atts_for_form_display( $args );
3301	3010
		@@ -3314,11 +3023,12 @@
3314	3023	}
3315	3024	unset( $args );
3316	3025
3317	3026	$include_form_tag = apply_filters( 'frm_include_form_tag', true, $form );
3318		- $frm_settings = FrmAppHelper::get_settings();
3319		- $submit = $form->options['submit_value'] ?? $frm_settings->submit_value;
3320	3027
	3028	+ $frm_settings = FrmAppHelper::get_settings();
	3029	+ $submit = isset( $form->options['submit_value'] ) ? $form->options['submit_value'] : $frm_settings->submit_value;
	3030	+
3321	3031	global $frm_vars;
3322	3032	self::maybe_load_css( $form, $values['custom_style'], $frm_vars['load_css'] );
3323	3033
3324	3034	$message_placement = self::message_placement( $form, $message );
		@@ -3326,36 +3036,25 @@
3326	3036	include FrmAppHelper::plugin_path() . '/classes/views/frm-entries/new.php';
3327	3037	}
3328	3038
3329	3039	/**
3330		- * Gets message placement.
3331		- *
3332	3040	* @since 4.05.02
3333		- * @since 6.26 This method changed from `private` to `public`.
3334		- *
3335		- * @param object $form Form object.
3336		- * @param string $message The message.
3337		- *
3338		- * @return string Accepts 'before', 'after', or 'submit'.
	3041	+ * @return string - 'before', 'after', or 'submit'
3339	3042	*/
3340		- public static function message_placement( $form, $message ) {
	3043	+ private static function message_placement( $form, $message ) {
3341	3044	$place = 'before';
3342	3045
3343	3046	if ( $message && isset( $form->options['form_class'] ) ) {
3344		- if ( str_contains( $form->options['form_class'], 'frm_below_success' ) ) {
	3047	+ if ( strpos( $form->options['form_class'], 'frm_below_success' ) !== false ) {
3345	3048	$place = 'after';
3346		- } elseif ( str_contains( $form->options['form_class'], 'frm_inline_success' ) ) {
	3049	+ } elseif ( strpos( $form->options['form_class'], 'frm_inline_success' ) !== false ) {
3347	3050	$place = 'submit';
3348	3051	}
3349	3052	}
3350	3053
3351	3054	/**
3352		- * Filter the message placement.
3353		- *
3354	3055	* @since 4.05.02
3355		- *
3356		- * @param string $place Accepts 'before', 'after', or 'submit'.
3357		- * @param array $args Args.
	3056	+ * @return string - 'before' or 'after'
3358	3057	*/
3359	3058	return apply_filters( 'frm_message_placement', $place, compact( 'form', 'message' ) );
3360	3059	}
3361	3060
		@@ -3362,12 +3061,8 @@
3362	3061	/**
3363	3062	* Get all the values needed on the new.php entry page
3364	3063	*
3365	3064	* @since 2.05
3366		- *
3367		- * @param array $args
3368		- *
3369		- * @return void
3370	3065	*/
3371	3066	private static function fill_atts_for_form_display( &$args ) {
3372	3067	if ( ! isset( $args['title'] ) && isset( $args['show_title'] ) ) {
3373	3068	$args['title'] = $args['show_title'];
		@@ -3392,12 +3087,8 @@
3392	3087	/**
3393	3088	* Show the success message without the form
3394	3089	*
3395	3090	* @since 2.05
3396		- *
3397		- * @param array $atts
3398		- *
3399		- * @return void
3400	3091	*/
3401	3092	private static function show_lone_success_message( $atts ) {
3402	3093	global $frm_vars;
3403	3094	$values = FrmEntriesHelper::setup_new_vars( $atts['fields'], $atts['form'], true );
		@@ -3403,12 +3094,13 @@
3403	3094	$values = FrmEntriesHelper::setup_new_vars( $atts['fields'], $atts['form'], true );
3404	3095	self::maybe_load_css( $atts['form'], $values['custom_style'], $frm_vars['load_css'] );
3405	3096
3406	3097	$include_extra_container = 'frm_forms' . FrmFormsHelper::get_form_style_class( $values );
3407		- $errors = array();
3408		- $form = $atts['form'];
3409		- $message = $atts['message'];
3410	3098
	3099	+ $errors = array();
	3100	+ $form = $atts['form'];
	3101	+ $message = $atts['message'];
	3102	+
3411	3103	include FrmAppHelper::plugin_path() . '/classes/views/frm-entries/errors.php';
3412	3104	}
3413	3105
3414	3106	/**
		@@ -3416,20 +3108,19 @@
3416	3108	*
3417	3109	* @since 2.05
3418	3110	* @since 6.0.x Added the third parameter.
3419	3111	*
3420		- * @param object $form Form object.
3421		- * @param int|string $entry_id Entry ID.
3422		- * @param array $args See {@see FrmFormsController::run_success_action()}.
3423		- *
	3112	+ * @param object $form Form object.
	3113	+ * @param int $entry_id Entry ID.
	3114	+ * @param array $args See {@see FrmFormsController::run_success_action()}.
3424	3115	* @return string
3425	3116	*/
3426	3117	private static function prepare_submit_message( $form, $entry_id, $args = array() ) {
3427	3118	$frm_settings = FrmAppHelper::get_settings( array( 'current_form' => $form->id ) );
3428		- $opt = $args['success_opt'] ?? 'success';
	3119	+ $opt = isset( $args['success_opt'] ) ? $args['success_opt'] : 'success';
3429	3120
3430	3121	if ( $entry_id && is_numeric( $entry_id ) ) {
3431		- $message = $form->options[ $opt . '_msg' ] ?? $frm_settings->success_msg;
	3122	+ $message = isset( $form->options[ $opt . '_msg' ] ) ? $form->options[ $opt . '_msg' ] : $frm_settings->success_msg;
3432	3123	$class = 'frm_message';
3433	3124	} else {
3434	3125	$message = $frm_settings->failed_msg;
3435	3126	$class = FrmFormsHelper::form_error_class();
		@@ -3446,9 +3137,9 @@
3446	3137	public static function front_head() {
3447	3138	$version = FrmAppHelper::plugin_version();
3448	3139	$suffix = FrmAppHelper::js_suffix();
3449	3140
3450		- if ( $suffix && self::has_combo_js_file() ) {
	3141	+ if ( ! empty( $suffix ) && self::has_combo_js_file() ) {
3451	3142	wp_register_script( 'formidable', FrmAppHelper::plugin_url() . '/js/frm.min.js', array( 'jquery' ), $version, true );
3452	3143	} else {
3453	3144	wp_register_script( 'formidable', FrmAppHelper::plugin_url() . "/js/formidable{$suffix}.js", array( 'jquery' ), $version, true );
3454	3145	}
		@@ -3455,9 +3146,9 @@
3455	3146
3456	3147	add_filter( 'script_loader_tag', 'FrmFormsController::defer_script_loading', 10, 2 );
3457	3148
3458	3149	if ( FrmAppHelper::is_admin() ) {
3459		- // Don't load this in back-end
	3150	+ // don't load this in back-end
3460	3151	return;
3461	3152	}
3462	3153
3463	3154	FrmAppHelper::localize_script( 'front' );
		@@ -3470,15 +3161,8 @@
3470	3161	public static function has_combo_js_file() {
3471	3162	return is_readable( FrmAppHelper::plugin_path() . '/js/frm.min.js' );
3472	3163	}
3473	3164
3474		- /**
3475		- * @param object $form
3476		- * @param int|string $this_load
3477		- * @param bool $global_load
3478		- *
3479		- * @return void
3480		- */
3481	3165	public static function maybe_load_css( $form, $this_load, $global_load ) {
3482	3166	$load_css = FrmForm::is_form_loaded( $form, $this_load, $global_load );
3483	3167
3484	3168	if ( ! $load_css ) {
		@@ -3508,9 +3192,8 @@
3508	3192	return;
3509	3193	}
3510	3194
3511	3195	global $wp_styles;
3512		-
3513	3196	if ( is_array( $wp_styles->queue ) && in_array( 'formidable', $wp_styles->queue, true ) ) {
3514	3197	wp_print_styles( 'formidable' );
3515	3198	}
3516	3199	}
		@@ -3525,57 +3208,34 @@
3525	3208	private static function should_load_late() {
3526	3209	return ! function_exists( 'aioseo' );
3527	3210	}
3528	3211
3529		- /**
3530		- * @param string $tag
3531		- * @param string $handle
3532		- *
3533		- * @return string
3534		- */
3535	3212	public static function defer_script_loading( $tag, $handle ) {
3536		- if ( 'captcha-api' === $handle && ! str_contains( $tag, 'defer' ) ) {
3537		- return str_replace( ' src', ' defer="defer" async="async" src', $tag );
	3213	+ if ( 'captcha-api' == $handle && ! strpos( $tag, 'defer' ) ) {
	3214	+ $tag = str_replace( ' src', ' defer="defer" async="async" src', $tag );
3538	3215	}
3539	3216
3540	3217	return $tag;
3541	3218	}
3542	3219
3543		- /**
3544		- * @param string $location
3545		- *
3546		- * @return void
3547		- */
3548	3220	public static function footer_js( $location = 'footer' ) {
3549	3221	global $frm_vars;
3550	3222
3551	3223	FrmStylesController::enqueue_css();
3552	3224
3553		- if ( FrmAppHelper::is_admin() || $location === 'header' || empty( $frm_vars['forms_loaded'] ) ) {
3554		- return;
3555		- }
	3225	+ if ( ! FrmAppHelper::is_admin() && $location !== 'header' && ! empty( $frm_vars['forms_loaded'] ) ) {
	3226	+ // load formidable js
	3227	+ wp_enqueue_script( 'formidable' );
3556	3228
3557		- // Load formidable js
3558		- wp_enqueue_script( 'formidable' );
3559		-
3560		- FrmHoneypot::maybe_print_honeypot_js();
3561		-
3562		- if ( ! method_exists( 'FrmProFormsHelper', 'load_currency_js' ) ) {
3563		- // Load currency JS if Pro is not installed.
3564		- FrmFormsHelper::load_currency_js();
	3229	+ FrmHoneypot::maybe_print_honeypot_js();
3565	3230	}
3566	3231	}
3567	3232
3568	3233	/**
3569	3234	* @since 2.0.8
3570		- *
3571		- * @param array $atts
3572		- * @param string $content
3573		- *
3574		- * @return void
3575	3235	*/
3576	3236	private static function maybe_minimize_form( $atts, &$content ) {
3577		- // Check if minimizing is turned on
	3237	+ // check if minimizing is turned on
3578	3238	if ( self::is_minification_on( $atts ) ) {
3579	3239	$content = str_replace( array( "\r\n", "\r", "\n", "\t", ' ' ), '', $content );
3580	3240	}
3581	3241	}
		@@ -3581,11 +3241,8 @@
3581	3241	}
3582	3242
3583	3243	/**
3584	3244	* @since 2.0.8
3585		- *
3586		- * @param array $atts
3587		- *
3588	3245	* @return bool
3589	3246	*/
3590	3247	private static function is_minification_on( $atts ) {
3591	3248	return ! empty( $atts['minimize'] );
		@@ -3597,13 +3254,11 @@
3597	3254	* @return void
3598	3255	*/
3599	3256	public static function landing_page_preview_option() {
3600	3257	$dir = apply_filters( 'frm_landing_page_preview_option', false );
3601		-
3602	3258	if ( false === $dir || ! file_exists( $dir . 'landing-page-preview-option.php' ) ) {
3603	3259	$dir = self::get_form_views_path();
3604	3260	}
3605		-
3606	3261	include $dir . 'landing-page-preview-option.php';
3607	3262	}
3608	3263
3609	3264	/**
		@@ -3629,15 +3284,13 @@
3629	3284
3630	3285	check_ajax_referer( 'frm_ajax', 'nonce' );
3631	3286
3632	3287	$type = FrmAppHelper::get_post_param( 'type', '', 'sanitize_text_field' );
3633		-
3634	3288	if ( ! $type || ! in_array( $type, array( 'form', 'view' ), true ) ) {
3635	3289	die( 0 );
3636	3290	}
3637	3291
3638	3292	$object_id = FrmAppHelper::get_post_param( 'object_id', '', 'absint' );
3639		-
3640	3293	if ( ! $object_id ) {
3641	3294	die( 0 );
3642	3295	}
3643	3296
		@@ -3649,15 +3302,13 @@
3649	3302	$postarr['post_content'] = apply_filters( 'frm_create_page_with_' . $type . '_shortcode_content', '', $object_id );
3650	3303	}
3651	3304
3652	3305	$name = FrmAppHelper::get_post_param( 'name', '', 'sanitize_text_field' );
3653		-
3654	3306	if ( $name ) {
3655	3307	$postarr['post_title'] = $name;
3656	3308	}
3657	3309
3658	3310	$success = wp_insert_post( $postarr );
3659		-
3660	3311	if ( ! is_numeric( $success ) || ! $success ) {
3661	3312	die( 0 );
3662	3313	}
3663	3314
		@@ -3671,9 +3322,8 @@
3671	3322	/**
3672	3323	* @since 5.3
3673	3324	*
3674	3325	* @param int $form_id
3675		- *
3676	3326	* @return string
3677	3327	*/
3678	3328	private static function get_page_shortcode_content_for_form( $form_id ) {
3679	3329	$shortcode = '[formidable id="' . $form_id . '"]';
		@@ -3693,9 +3343,9 @@
3693	3343	}
3694	3344
3695	3345	check_ajax_referer( 'frm_ajax', 'nonce' );
3696	3346
3697		- $html = FrmAppHelper::clip(
	3347	+ $html = FrmAppHelper::clip(
3698	3348	function () {
3699	3349	FrmAppHelper::maybe_autocomplete_pages_options(
3700	3350	array(
3701	3351	'field_name' => 'frm_page_dropdown',
		@@ -3704,55 +3354,34 @@
3704	3354	)
3705	3355	);
3706	3356	}
3707	3357	);
	3358	+ $post_type_object = get_post_type_object( 'page' );
3708	3359	wp_send_json(
3709	3360	array(
3710	3361	'html' => $html,
3711		- 'edit_page_url' => admin_url( sprintf( get_post_type_object( 'page' )->_edit_link . '&action=edit', 0 ) ),
	3362	+ 'edit_page_url' => admin_url( sprintf( $post_type_object->_edit_link . '&action=edit', 0 ) ),
3712	3363	)
3713	3364	);
3714	3365	}
3715	3366
3716	3367	/**
3717		- * Prints necessary templates for the forms list page.
3718		- *
3719		- * @since 6.32
3720		- *
3721		- * @return void
	3368	+ * @deprecated 4.0
3722	3369	*/
3723		- public static function print_forms_list_templates() {
3724		- if ( ! FrmAppHelper::on_form_listing_page() ) {
3725		- return;
3726		- }
3727		-
3728		- $screen = get_current_screen();
3729		-
3730		- if ( ! $screen ) {
3731		- return;
3732		- }
3733		-
3734		- $columns = get_column_headers( $screen );
3735		- $hidden = get_hidden_columns( $screen );
3736		- $skip_cols = array( 'cb', 'name', 'settings' );
3737		- $per_page = get_user_option( 'formidable_page_formidable_per_page' );
3738		- $show_screen_options = $screen->show_screen_options();
3739		-
3740		- if ( $per_page < 1 ) {
3741		- $per_page = 20;
3742		- }
3743		-
3744		- include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/forms-list-settings.php';
	3370	+ public static function create( $values = array() ) {
	3371	+ _deprecated_function( __METHOD__, '4.0', 'FrmFormsController::update' );
	3372	+ self::update( $values );
3745	3373	}
3746	3374
3747	3375	/**
3748		- * @deprecated 4.0
	3376	+ * Education for premium features.
3749	3377	*
3750		- * @param array $values
	3378	+ * @since 4.05
	3379	+ * @deprecated 6.16.3
3751	3380	*
3752	3381	* @return void
3753	3382	*/
3754		- public static function create( $values = array() ) {
3755		- _deprecated_function( __METHOD__, '4.0', 'FrmFormsController::update' );
3756		- self::update( $values );
	3383	+ public static function add_form_style_tab_options() {
	3384	+ _deprecated_function( __METHOD__, '6.16.3' );
	3385	+ include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/add_form_style_options.php';
3757	3386	}
3758	3387	}