← All changes | classes/controllers/FrmFormsController.php +286 -938 6.35 → 6.16 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,29 +107,20 @@
121	107	*
122	108	* @since 2.02.11
123	109	*
124	110	* @param int|object $form
125		- *
126		- * @return void
127	111	*/
128	112	private static function create_default_email_action( $form ) {
129	113	FrmForm::maybe_get_form( $form );
130		-
131		- if ( ! is_object( $form ) ) {
132		- return;
133		- }
134		-
135	114	$create_email = apply_filters( 'frm_create_default_email_action', true, $form );
136	115
137		- if ( ! $create_email ) {
138		- return;
	116	+ if ( $create_email ) {
	117	+ /**
	118	+ * @var FrmFormAction
	119	+ */
	120	+ $action_control = FrmFormActionsController::get_form_actions( 'email' );
	121	+ $action_control->create( $form->id );
139	122	}
140		-
141		- /**
142		- * @var FrmFormAction
143		- */
144		- $action_control = FrmFormActionsController::get_form_actions( 'email' );
145		- $action_control->create( $form->id );
146	123	}
147	124
148	125	/**
149	126	* Create the default On submit action
		@@ -150,18 +127,12 @@
150	127	*
151	128	* @since 6.0.0
152	129	*
153	130	* @param int|object $form Form object or ID.
154		- *
155		- * @return void
156	131	*/
157	132	private static function create_default_on_submit_action( $form ) {
158	133	FrmForm::maybe_get_form( $form );
159	134
160		- if ( ! is_object( $form ) ) {
161		- return;
162		- }
163		-
164	135	/**
165	136	* Enable or disable the default On Submit action.
166	137	*
167	138	* @since 6.0.0
		@@ -170,17 +141,15 @@
170	141	* @param object $form Form object.
171	142	*/
172	143	$create = apply_filters( 'frm_create_default_on_submit_action', true, $form );
173	144
174		- if ( ! $create ) {
175		- return;
	145	+ if ( $create ) {
	146	+ /**
	147	+ * @var FrmFormAction
	148	+ */
	149	+ $action_control = FrmFormActionsController::get_form_actions( FrmOnSubmitAction::$slug );
	150	+ $action_control->create( $form->id );
176	151	}
177		-
178		- /**
179		- * @var FrmFormAction
180		- */
181		- $action_control = FrmFormActionsController::get_form_actions( FrmOnSubmitAction::$slug );
182		- $action_control->create( $form->id );
183	152	}
184	153
185	154	/**
186	155	* Creates submit button field.
		@@ -187,18 +156,12 @@
187	156	*
188	157	* @since 6.9
189	158	*
190	159	* @param int|object $form Form ID or object.
191		- *
192		- * @return void
193	160	*/
194	161	private static function create_submit_button_field( $form ) {
195	162	FrmForm::maybe_get_form( $form );
196	163
197		- if ( ! is_object( $form ) ) {
198		- return;
199		- }
200		-
201	164	if ( FrmSubmitHelper::get_submit_field( $form->id ) ) {
202	165	// Do not create submit button field if it exists.
203	166	return;
204	167	}
		@@ -206,9 +169,9 @@
206	169	FrmField::create(
207	170	array(
208	171	'type' => FrmSubmitHelper::FIELD_TYPE,
209	172	'name' => __( 'Submit', 'formidable' ),
210		- 'field_order' => FrmSubmitHelper::DEFAULT_ORDER,
	173	+ 'field_order' => 9999,
211	174	'form_id' => $form->id,
212	175	'field_options' => FrmFieldsHelper::get_default_field_options( FrmSubmitHelper::FIELD_TYPE ),
213	176	'description' => '',
214	177	'default_value' => '',
		@@ -217,10 +180,8 @@
217	180	);
218	181	}
219	182
220	183	/**
221		- * @param array|false $values
222		- *
223	184	* @return void
224	185	*/
225	186	public static function edit( $values = false ) {
226	187	FrmAppHelper::permission_check( 'frm_edit_forms' );
		@@ -232,9 +193,8 @@
232	193
233	194	/**
234	195	* @param mixed $id
235	196	* @param string $message
236		- *
237	197	* @return void
238	198	*/
239	199	public static function settings( $id = false, $message = '' ) {
240	200	FrmAppHelper::permission_check( 'frm_edit_forms' );
		@@ -262,9 +222,10 @@
262	222	FrmAppController::show_error_modal( $error_args );
263	223	return;
264	224	}
265	225
266		- $id = FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
	226	+ $id = FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
	227	+
267	228	$errors = FrmForm::validate( $_POST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
268	229	$warnings = FrmFormsHelper::check_for_warnings( $_POST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
269	230
270	231	if ( count( $errors ) > 0 ) {
		@@ -273,22 +234,17 @@
273	234	}
274	235
275	236	do_action( 'frm_before_update_form_settings', $id );
276	237
277		- $antispam_was_on = self::antispam_was_on( $id ); // phpcs:ignore Formidable.CodeAnalysis.InlineSingleUseVariable
	238	+ $antispam_was_on = self::antispam_was_on( $id );
278	239
279	240	FrmForm::update( $id, $_POST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
280	241
281	242	$antispam_is_on = ! empty( $_POST['options']['antispam'] ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
282		-
283	243	if ( $antispam_is_on !== $antispam_was_on ) {
284	244	FrmAntiSpam::clear_caches();
285	245	}
286	246
287		- // Handle captcha field inclusion
288		- $include_captcha = isset( $_POST['frm_include_captcha'] ) && '1' === $_POST['frm_include_captcha']; // phpcs:ignore WordPress.Security.NonceVerification.Missing
289		- self::handle_captcha_field( $id, $include_captcha );
290		-
291	247	$message = __( 'Settings Successfully Updated', 'formidable' );
292	248
293	249	self::get_settings_vars( $id, array(), compact( 'message', 'warnings' ) );
294	250	}
		@@ -294,9 +250,8 @@
294	250	}
295	251
296	252	/**
297	253	* @param int $form_id
298		- *
299	254	* @return bool
300	255	*/
301	256	private static function antispam_was_on( $form_id ) {
302	257	$form = FrmForm::getOne( $form_id );
		@@ -303,52 +258,12 @@
303	258	return ! empty( $form->options['antispam'] );
304	259	}
305	260
306	261	/**
307		- * Handle captcha field inclusion in form
308		- *
309		- * @since 6.33
310		- *
311		- * @param int $form_id Form ID.
312		- * @param bool $include_captcha Whether to include captcha field.
313		- *
314	262	* @return void
315	263	*/
316		- private static function handle_captcha_field( $form_id, $include_captcha ) {
317		- $form_fields = FrmField::get_all_for_form( $form_id, '', 'exclude' );
318		- $captcha_field_id = 0;
319		- $submit_field_order = 0;
320		-
321		- foreach ( $form_fields as $field ) {
322		- if ( 'captcha' === $field->type ) {
323		- $captcha_field_id = $field->id;
324		- break;
325		- }
326		-
327		- if ( 'submit' === $field->type ) {
328		- $submit_field_order = $field->field_order;
329		- }
330		- }
331		-
332		- if ( $include_captcha && ! $captcha_field_id ) {
333		- // Create captcha field just before submit button
334		- $field_values = FrmFieldsHelper::setup_new_vars( 'captcha', $form_id );
335		- $field_values['name'] = __( 'Captcha', 'formidable' );
336		- $field_values['field_order'] = $submit_field_order > 0 ? $submit_field_order - 1 : 0;
337		- FrmField::create( $field_values );
338		- } elseif ( ! $include_captcha && $captcha_field_id ) {
339		- // Delete captcha field
340		- FrmField::destroy( $captcha_field_id );
341		- }
342		- }
343		-
344		- /**
345		- * @param array $values
346		- *
347		- * @return void
348		- */
349	264	public static function update( $values = array() ) {
350		- if ( ! $values ) {
	265	+ if ( empty( $values ) ) {
351	266	$values = $_POST; // phpcs:ignore WordPress.Security.NonceVerification.Missing
352	267	}
353	268
354	269	// Set radio button and checkbox meta equal to "other" value.
		@@ -357,9 +272,8 @@
357	272	}
358	273
359	274	$errors = FrmForm::validate( $values );
360	275	$permission_error = FrmAppHelper::permission_nonce_error( 'frm_edit_forms', 'frm_save_form', 'frm_save_form_nonce' );
361		-
362	276	if ( $permission_error !== false ) {
363	277	$errors['form'] = $permission_error;
364	278	}
365	279
		@@ -378,9 +292,9 @@
378	292	if ( self::is_too_long( $values ) ) {
379	293	$message .= '<br/> ' . sprintf(
380	294	/* translators: %1$s: Start link HTML, %2$s: end link HTML */
381	295	__( 'However, your form is very long and may be %1$sreaching server limits%2$s.', 'formidable' ),
382		- '<a href="' . esc_url( self::get_form_too_long_docs_url() ) . '" target="_blank" rel="noopener">',
	296	+ '<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">',
383	297	'</a>'
384	298	);
385	299	}
386	300
		@@ -391,32 +305,17 @@
391	305	self::get_edit_vars( $id, array(), $message );
392	306	}
393	307
394	308	/**
395		- * @since 6.25.1
396		- *
397		- * @return string
398		- */
399		- private static function get_form_too_long_docs_url() {
400		- $utm = array(
401		- 'campaign' => 'builder',
402		- 'content' => 'form-too-long',
403		- );
404		- return FrmAppHelper::admin_upgrade_link( $utm, 'knowledgebase/i-have-a-long-form-why-did-the-options-at-the-end-of-the-form-stop-saving/' );
405		- }
406		-
407		- /**
408	309	* Remove the draft flag from any new fields from this current session.
409	310	*
410	311	* @since 6.8
411	312	*
412	313	* @param int $form_id
413		- *
414	314	* @return void
415	315	*/
416	316	private static function maybe_remove_draft_option_from_fields( $form_id ) {
417	317	$draft_field_ids_csv = FrmAppHelper::get_post_param( 'draft_fields', '', 'sanitize_text_field' );
418		-
419	318	if ( ! $draft_field_ids_csv ) {
420	319	// If the draft_fields input is empty there are no new fields in the session.
421	320	return;
422	321	}
		@@ -421,9 +320,8 @@
421	320	return;
422	321	}
423	322
424	323	$draft_field_ids = array_filter( explode( ',', $draft_field_ids_csv ), 'is_numeric' );
425		-
426	324	if ( ! $draft_field_ids ) {
427	325	// Exit early if the draft fields input is invalid. It should be a CSV of integer values.
428	326	return;
429	327	}
		@@ -428,9 +326,8 @@
428	326	return;
429	327	}
430	328
431	329	$draft_field_rows = FrmFieldsHelper::get_draft_field_results( $form_id, $draft_field_ids );
432		-
433	330	foreach ( $draft_field_rows as $row ) {
434	331	$row->field_options['draft'] = 0;
435	332	FrmField::update( $row->id, array( 'field_options' => $row->field_options ) );
436	333	}
		@@ -442,10 +339,8 @@
442	339	* were likely not saved either.
443	340	*
444	341	* @since 3.06.01
445	342	*
446		- * @param array $values
447		- *
448	343	* @return bool
449	344	*/
450	345	private static function is_too_long( $values ) {
451	346	return empty( $values['frm_end'] );
		@@ -481,17 +376,13 @@
481	376	* @return string|null
482	377	*/
483	378	public static function page_preview() {
484	379	$params = FrmForm::list_page_params();
485		-
486		- if ( ! $params['form'] || is_numeric( $params['form'] ) ) {
	380	+ if ( ! $params['form'] ) {
487	381	return null;
488	382	}
489	383
490		- self::maybe_block_preview( $params['form'] );
491		-
492	384	$form = FrmForm::getOne( $params['form'] );
493		-
494	385	if ( ! $form ) {
495	386	return null;
496	387	}
497	388
		@@ -503,19 +394,9 @@
503	394	*
504	395	* @return void
505	396	*/
506	397	public static function show_page_preview() {
507		- $preview = self::page_preview();
508		-
509		- if ( is_null( $preview ) ) {
510		- wp_die(
511		- '<h1>' . esc_html__( 'Form key is invalid', 'formidable' ) . '</h1>',
512		- '<p>' . esc_html__( 'Form key is invalid', 'formidable' ) . '</p>',
513		- 404
514		- );
515		- }
516		-
517		- echo $preview; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
	398	+ echo self::page_preview(); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
518	399	}
519	400
520	401	/**
521	402	* @return void
		@@ -526,19 +407,9 @@
526	407
527	408	global $frm_vars;
528	409	$frm_vars['preview'] = true;
529	410
530		- // print_emoji_styles is deprecated.
531		- remove_action( 'wp_print_styles', 'print_emoji_styles' );
532		-
533		- if ( FrmTestModeController::should_add_test_mode_container() ) {
534		- do_action( 'frm_test_mode_init' );
535		- add_action( 'wp_enqueue_scripts', 'FrmTestModeController::register_and_enqueue_required_scripts' );
536		- add_filter( 'frm_filter_final_form', 'FrmTestModeController::maybe_add_test_mode_container', 99 );
537		- }
538		-
539	411	$include_theme = FrmAppHelper::get_param( 'theme', '', 'get', 'absint' );
540		-
541	412	if ( $include_theme ) {
542	413	self::set_preview_query();
543	414	self::load_theme_preview();
544	415	} else {
		@@ -561,9 +432,8 @@
561	432	'post_type' => 'page',
562	433	);
563	434
564	435	$page_for_posts = get_option( 'page_for_posts' );
565		-
566	436	if ( is_numeric( $page_for_posts ) ) {
567	437	// Avoid querying for the "Posts Page" or "Blog Page" so we don't display 10 forms.
568	438	$page_query['post__not_in'] = array( $page_for_posts );
569	439	}
		@@ -568,15 +438,13 @@
568	438	$page_query['post__not_in'] = array( $page_for_posts );
569	439	}
570	440
571	441	$random_page = get_posts( $page_query );
572		-
573	442	if ( ! $random_page ) {
574	443	return;
575	444	}
576	445
577	446	$random_page = reset( $random_page );
578		-
579	447	if ( ! is_a( $random_page, 'WP_Post' ) ) {
580	448	// The return type can also be int.
581	449	return;
582	450	}
		@@ -598,9 +466,8 @@
598	466	*
599	467	* @since 5.5.2
600	468	*
601	469	* @param WP_Post $page The page object.
602		- *
603	470	* @return void
604	471	*/
605	472	private static function set_post_global( $page ) {
606	473	global $post;
		@@ -619,16 +486,14 @@
619	486	add_action( 'loop_no_results', 'FrmFormsController::show_page_preview' );
620	487	add_filter( 'is_active_sidebar', '__return_false' );
621	488	FrmStylesController::enqueue_css( 'enqueue', true );
622	489
623		- if ( false !== get_template_part( 'page' ) ) {
624		- return;
	490	+ if ( false === get_template_part( 'page' ) ) {
	491	+ if ( function_exists( 'wp_is_block_theme' ) && wp_is_block_theme() ) {
	492	+ add_filter( 'body_class', 'FrmFormsController::preview_block_theme_body_classnames' );
	493	+ }
	494	+ self::fallback_when_page_template_part_is_not_supported_by_theme();
625	495	}
626		-
627		- if ( function_exists( 'wp_is_block_theme' ) && wp_is_block_theme() ) {
628		- add_filter( 'body_class', 'FrmFormsController::preview_block_theme_body_classnames' );
629		- }
630		- self::fallback_when_page_template_part_is_not_supported_by_theme();
631	496	}
632	497
633	498	/**
634	499	* Add padding to the body for block themes.
		@@ -635,9 +500,8 @@
635	500	*
636	501	* @since 6.5.2
637	502	*
638	503	* @param array $classes The body classes list.
639		- *
640	504	* @return array
641	505	*/
642	506	public static function preview_block_theme_body_classnames( $classes ) {
643	507	$classes[] = 'has-global-padding';
		@@ -650,27 +514,21 @@
650	514	*
651	515	* @return void
652	516	*/
653	517	private static function fallback_when_page_template_part_is_not_supported_by_theme() {
654		- if ( ! have_posts() ) {
655		- return;
656		- }
	518	+ if ( have_posts() ) {
	519	+ the_post();
	520	+ self::get_template( 'header' );
657	521
658		- the_post();
659		- self::get_template( 'header' );
	522	+ // add some generic class names to the container to add some natural padding to the content.
	523	+ // .entry-content catches the WordPress TwentyTwenty theme.
	524	+ // .container catches Customizr content.
	525	+ echo '<div class="container entry-content">';
	526	+ the_content();
	527	+ echo '</div>';
660	528
661		- // Add some generic class names to the container to add some natural padding to the content.
662		- // .entry-content catches the WordPress TwentyTwenty theme.
663		- // .container catches Customizr content.
664		- echo '<div class="container entry-content">';
665		- the_content();
666		- echo '</div>';
667		-
668		- // Prevent extra unexpected forms in the footer.
669		- // For some reason this happens in the Twenty Twenty Five theme.
670		- add_filter( 'frm_filter_final_form', '__return_empty_string' );
671		-
672		- self::get_template( 'footer' );
	529	+ self::get_template( 'footer' );
	530	+ }
673	531	}
674	532
675	533	/**
676	534	* Calls core function to get a template part if it doesn't cause deprecation warnings. Otherwise skips the deprecation function call
		@@ -676,11 +534,9 @@
676	534	* Calls core function to get a template part if it doesn't cause deprecation warnings. Otherwise skips the deprecation function call
677	535	* and renders required html fragments calling required functions.
678	536	*
679	537	* @since 6.7.1
680		- *
681	538	* @param string $template
682		- *
683	539	* @return void
684	540	*/
685	541	private static function get_template( $template ) {
686	542	if ( self::should_try_getting_template( $template ) ) {
		@@ -701,11 +557,9 @@
701	557	/**
702	558	* Returns true if calling a template function doesn't trigger deprecation warnings.
703	559	*
704	560	* @since 6.7.1
705		- *
706	561	* @param string $template
707		- *
708	562	* @return bool
709	563	*/
710	564	private static function should_try_getting_template( $template ) {
711	565	$stylesheet_path = get_stylesheet_directory();
		@@ -719,15 +573,15 @@
719	573	/**
720	574	* Set the page title for the theme preview page
721	575	*
722	576	* @since 3.0
723		- *
724		- * @param string $title
725		- *
726		- * @return string
727	577	*/
728	578	public static function preview_page_title( $title ) {
729		- return in_the_loop() ? self::preview_title( $title ) : $title;
	579	+ if ( in_the_loop() ) {
	580	+ $title = self::preview_title( $title );
	581	+ }
	582	+
	583	+ return $title;
730	584	}
731	585
732	586	/**
733	587	* Set the page title for the theme preview page.
		@@ -734,9 +588,8 @@
734	588	*
735	589	* @since 3.0
736	590	*
737	591	* @param string $title
738		- *
739	592	* @return string
740	593	*/
741	594	public static function preview_title( $title ) {
742	595	return __( 'Form Preview', 'formidable' );
		@@ -747,9 +600,8 @@
747	600	*
748	601	* @since 3.0
749	602	*
750	603	* @param string $content
751		- *
752	604	* @return string
753	605	*/
754	606	public static function preview_content( $content ) {
755	607	if ( in_the_loop() ) {
		@@ -764,39 +616,23 @@
764	616	/**
765	617	* @since 3.0
766	618	*/
767	619	private static function load_direct_preview() {
	620	+ header( 'Content-Type: text/html; charset=' . get_option( 'blog_charset' ) );
	621	+
	622	+ // print_emoji_styles is deprecated.
	623	+ remove_action( 'wp_print_styles', 'print_emoji_styles' );
	624	+
768	625	$key = FrmAppHelper::simple_get( 'form', 'sanitize_title' );
769		-
770		- // phpcs:ignore Universal.Operators.StrictComparisons
771	626	if ( $key == '' ) {
772	627	$key = FrmAppHelper::get_post_param( 'form', '', 'sanitize_title' );
773	628	}
774	629
775		- if ( ! $key ) {
776		- $error = __( 'Form key is missing', 'formidable' );
777		- wp_die(
778		- '<h1>' . esc_html( $error ) . '</h1>',
779		- '<p>' . esc_html( $error ) . '</p>',
780		- 404
781		- );
782		- }
783		-
784		- self::maybe_block_preview( $key );
785		-
786	630	$form = FrmForm::getAll( array( 'form_key' => $key ), '', 1 );
787		-
788		- if ( ! $form ) {
789		- $error = __( 'Form does not exist', 'formidable' );
790		- wp_die(
791		- '<h1>' . esc_html( $error ) . '</h1>',
792		- '<p>' . esc_html( $error ) . '</p>',
793		- 404
794		- );
	631	+ if ( empty( $form ) ) {
	632	+ $form = FrmForm::getAll( array(), '', 1 );
795	633	}
796	634
797		- header( 'Content-Type: text/html; charset=' . get_option( 'blog_charset' ) );
798		-
799	635	self::fix_deprecated_null_param_warning();
800	636
801	637	require FrmAppHelper::plugin_path() . '/classes/views/frm-entries/direct.php';
802	638	}
		@@ -801,33 +637,8 @@
801	637	require FrmAppHelper::plugin_path() . '/classes/views/frm-entries/direct.php';
802	638	}
803	639
804	640	/**
805		- * Block the form preview for the contact form by default if the user cannot view forms.
806		- * This is to prevent the contact form being exploited.
807		- * Since this form is added by default and every site uses the same key, it is too easy
808		- * to guess this form.
809		- *
810		- * @since 6.20
811		- *
812		- * @param string $form_key Form key.
813		- *
814		- * @return void
815		- */
816		- public static function maybe_block_preview( $form_key ) {
817		- if ( ! FrmFormsHelper::should_block_preview( $form_key ) ) {
818		- return;
819		- }
820		-
821		- $error = __( 'You do not have permission to view this form', 'formidable' );
822		- wp_die(
823		- '<h1>' . esc_html( $error ) . '</h1>',
824		- '<p>' . esc_html( $error ) . '</p>',
825		- 403
826		- );
827		- }
828		-
829		- /**
830	641	* Some themes have a null $src value.
831	642	* This function adds a filter to ensure that $src is not null.
832	643	* WP will call str_starts_with with the null value triggering a deprecated message otherwise.
833	644	*
		@@ -839,13 +650,15 @@
839	650	add_filter(
840	651	'script_loader_src',
841	652	/**
842	653	* @param string|null $src
843		- *
844	654	* @return string
845	655	*/
846	656	function ( $src ) {
847		- return is_null( $src ) ? '' : $src;
	657	+ if ( is_null( $src ) ) {
	658	+ $src = '';
	659	+ }
	660	+ return $src;
848	661	}
849	662	);
850	663	}
851	664
		@@ -854,9 +667,8 @@
854	667	}
855	668
856	669	/**
857	670	* @param array $ids
858		- *
859	671	* @return string
860	672	*/
861	673	public static function bulk_untrash( $ids ) {
862	674	FrmAppHelper::permission_check( 'frm_edit_forms' );
		@@ -868,9 +680,11 @@
868	680	return '';
869	681	}
870	682
871	683	/* translators: %1$s: Number of forms */
872		- return sprintf( _n( '%1$s form restored from the Trash.', '%1$s forms restored from the Trash.', $count, 'formidable' ), $count );
	684	+ $message = sprintf( _n( '%1$s form restored from the Trash.', '%1$s forms restored from the Trash.', $count, 'formidable' ), $count );
	685	+
	686	+ return $message;
873	687	}
874	688
875	689	/**
876	690	* @since 3.06
		@@ -915,9 +729,8 @@
915	729	// Check nonce url.
916	730	check_admin_referer( $status . '_form_' . $params['id'] );
917	731
918	732	$count = 0;
919		-
920	733	if ( FrmForm::set_status( $params['id'], $available_status[ $status ]['new_status'] ) ) {
921	734	++$count;
922	735	}
923	736
		@@ -931,9 +744,9 @@
931	744	/* translators: %1$s: Number of forms */
932	745	$available_status['untrash']['message'] = sprintf( _n( '%1$s form restored from the Trash.', '%1$s forms restored from the Trash.', $count, 'formidable' ), $count );
933	746
934	747	/* translators: %1$s: Number of forms, %2$s: Start link HTML, %3$s: End link HTML */
935		- $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
	748	+ $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>' );
936	749
937	750	$message = $available_status[ $status ]['message'];
938	751
939	752	self::display_forms_list( $params, $message );
		@@ -940,9 +753,8 @@
940	753	}
941	754
942	755	/**
943	756	* @param array $ids
944		- *
945	757	* @return string
946	758	*/
947	759	public static function bulk_trash( $ids ) {
948	760	FrmAppHelper::permission_check( 'frm_delete_forms' );
		@@ -947,9 +759,8 @@
947	759	public static function bulk_trash( $ids ) {
948	760	FrmAppHelper::permission_check( 'frm_delete_forms' );
949	761
950	762	$count = 0;
951		-
952	763	foreach ( $ids as $id ) {
953	764	if ( FrmForm::trash( $id ) ) {
954	765	++$count;
955	766	}
		@@ -954,12 +765,8 @@
954	765	++$count;
955	766	}
956	767	}
957	768
958		- if ( ! $count ) {
959		- return '';
960		- }
961		-
962	769	$current_page = FrmAppHelper::get_simple_request(
963	770	array(
964	771	'param' => 'form_type',
965	772	'type' => 'request',
		@@ -964,16 +771,17 @@
964	771	'param' => 'form_type',
965	772	'type' => 'request',
966	773	)
967	774	);
968		-
969		- return sprintf(
	775	+ $message = sprintf(
970	776	/* translators: %1$s: Number of forms, %2$s: Start link HTML, %3$s: End link HTML */
971	777	_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' ),
972	778	$count,
973		- '<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
	779	+ '<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' ) ) . '">',
974	780	'</a>'
975	781	);
	782	+
	783	+ return $message;
976	784	}
977	785
978	786	public static function destroy() {
979	787	FrmAppHelper::permission_check( 'frm_delete_forms' );
		@@ -983,9 +791,8 @@
983	791	// Check nonce url.
984	792	check_admin_referer( 'destroy_form_' . $params['id'] );
985	793
986	794	$count = 0;
987		-
988	795	if ( FrmForm::destroy( $params['id'] ) ) {
989	796	++$count;
990	797	}
991	798
		@@ -996,9 +803,8 @@
996	803	}
997	804
998	805	/**
999	806	* @param array $ids
1000		- *
1001	807	* @return string
1002	808	*/
1003	809	public static function bulk_destroy( $ids ) {
1004	810	FrmAppHelper::permission_check( 'frm_delete_forms' );
		@@ -1003,12 +809,10 @@
1003	809	public static function bulk_destroy( $ids ) {
1004	810	FrmAppHelper::permission_check( 'frm_delete_forms' );
1005	811
1006	812	$count = 0;
1007		-
1008	813	foreach ( $ids as $id ) {
1009	814	$d = FrmForm::destroy( $id );
1010		-
1011	815	if ( $d ) {
1012	816	++$count;
1013	817	}
1014	818	}
		@@ -1026,18 +830,19 @@
1026	830	*/
1027	831	public static function delete_all() {
1028	832	// Check nonce url.
1029	833	$permission_error = FrmAppHelper::permission_nonce_error( 'frm_delete_forms', '_wpnonce', 'bulk-toplevel_page_formidable' );
1030		-
1031	834	if ( $permission_error !== false ) {
1032	835	self::display_forms_list( array(), '', array( $permission_error ) );
	836	+
1033	837	return;
1034	838	}
1035	839
1036	840	$count = FrmForm::scheduled_delete( time() );
1037	841	$url = remove_query_arg( array( 'delete_all' ) );
1038		- $url .= '&message=forms_permanently_deleted&forms_deleted=' . $count;
1039	842
	843	+ $url .= '&message=forms_permanently_deleted&forms_deleted=' . $count;
	844	+
1040	845	wp_safe_redirect( $url );
1041	846	die();
1042	847	}
1043	848
		@@ -1111,22 +916,21 @@
1111	916	*
1112	917	* @return void
1113	918	*/
1114	919	public static function insert_form_button() {
1115		- if ( ! current_user_can( 'frm_view_forms' ) ) {
1116		- return;
	920	+ if ( current_user_can( 'frm_view_forms' ) ) {
	921	+ // Store the result in memory and re-use it when this function is called multiple times.
	922	+ // This helps speed up the form builder when there are a lot of HTML fields, where this
	923	+ // button is inserted once per HTML field.
	924	+ // In a form with 66 HTML fields, this saves 0.5 seconds on page load time, tested locally.
	925	+ if ( ! isset( self::$formidable_tinymce_button ) ) {
	926	+ FrmAppHelper::load_admin_wide_js();
	927	+ $menu_name = FrmAppHelper::get_menu_name();
	928	+ $icon = apply_filters( 'frm_media_icon', FrmAppHelper::svg_logo() );
	929	+ 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>';
	930	+ }
	931	+ echo self::$formidable_tinymce_button; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
1117	932	}
1118		-
1119		- // Store the result in memory and re-use it when this function is called multiple times.
1120		- // This helps speed up the form builder when there are a lot of HTML fields, where this
1121		- // Button is inserted once per HTML field.
1122		- // In a form with 66 HTML fields, this saves 0.5 seconds on page load time, tested locally.
1123		- if ( ! isset( self::$formidable_tinymce_button ) ) {
1124		- FrmAppHelper::load_admin_wide_js();
1125		- $icon = apply_filters( 'frm_media_icon', FrmAppHelper::svg_logo() );
1126		- 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
1127		- }
1128		- echo self::$formidable_tinymce_button; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
1129	933	}
1130	934
1131	935	/**
1132	936	* @return void
		@@ -1147,21 +951,17 @@
1147	951	$shortcodes = apply_filters( 'frm_popup_shortcodes', $shortcodes );
1148	952
1149	953	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/insert_form_popup.php';
1150	954
1151		- if ( ! FrmAppHelper::is_form_builder_page() || class_exists( '_WP_Editors', false ) ) {
1152		- return;
	955	+ if ( FrmAppHelper::is_form_builder_page() && ! class_exists( '_WP_Editors', false ) ) {
	956	+ // initialize a wysiwyg so we have usable settings defined in tinyMCEPreInit.mceInit
	957	+ require ABSPATH . WPINC . '/class-wp-editor.php';
	958	+ ?>
	959	+ <div class="frm_hidden">
	960	+ <?php wp_editor( '', 'frm_description_placeholder', array() ); ?>
	961	+ </div>
	962	+ <?php
1153	963	}
1154		-
1155		- // Initialize a wysiwyg so we have usable settings defined in tinyMCEPreInit.mceInit
1156		- require ABSPATH . WPINC . '/class-wp-editor.php';
1157		- // phpcs:disable Generic.WhiteSpace.ScopeIndent
1158		- ?>
1159		- <div class="frm_hidden">
1160		- <?php wp_editor( '', 'frm_description_placeholder', array() ); ?>
1161		- </div>
1162		- <?php
1163		- // phpcs:enable Generic.WhiteSpace.ScopeIndent
1164	964	}
1165	965
1166	966	/**
1167	967	* Check the page being loaded, determine if this is a page that should include the form popup.
		@@ -1173,9 +973,8 @@
1173	973	private static function should_insert_form_popup() {
1174	974	if ( FrmAppHelper::is_form_builder_page() ) {
1175	975	return true;
1176	976	}
1177		-
1178	977	$page = basename( FrmAppHelper::get_server_value( 'PHP_SELF' ) );
1179	978	return in_array( $page, array( 'post.php', 'page.php', 'page-new.php', 'post-new.php' ), true );
1180	979	}
1181	980
		@@ -1183,10 +982,9 @@
1183	982	FrmAppHelper::permission_check( 'frm_view_forms' );
1184	983	check_ajax_referer( 'frm_ajax', 'nonce' );
1185	984
1186	985	$shortcode = FrmAppHelper::get_post_param( 'shortcode', '', 'sanitize_text_field' );
1187		-
1188		- if ( ! $shortcode ) {
	986	+ if ( empty( $shortcode ) ) {
1189	987	wp_die();
1190	988	}
1191	989
1192	990	echo '<div id="sc-opts-' . esc_attr( $shortcode ) . '" class="frm_shortcode_option">';
		@@ -1211,13 +1009,12 @@
1211	1009	'label' => __( 'Minimize form HTML', 'formidable' ),
1212	1010	),
1213	1011	);
1214	1012	}
1215		-
1216	1013	$opts = apply_filters( 'frm_sc_popup_opts', $opts, $shortcode );
1217	1014
1218	1015	if ( isset( $opts['form_id'] ) && is_string( $opts['form_id'] ) ) {
1219		- // Allow other shortcodes to use the required form id option
	1016	+ // allow other shortcodes to use the required form id option
1220	1017	$form_id = $opts['form_id'];
1221	1018	unset( $opts['form_id'] );
1222	1019	}
1223	1020
		@@ -1233,9 +1030,8 @@
1233	1030	*
1234	1031	* @param array $params
1235	1032	* @param string $message
1236	1033	* @param array $errors
1237		- *
1238	1034	* @return void
1239	1035	*/
1240	1036	public static function display_forms_list( $params = array(), $message = '', $errors = array() ) {
1241	1037	FrmAppHelper::permission_check( 'frm_view_forms' );
		@@ -1252,56 +1048,35 @@
1252	1048	* @param string $table_class Class name for List Helper.
1253	1049	*/
1254	1050	$table_class = apply_filters( 'frm_forms_list_class', 'FrmFormsListHelper' );
1255	1051	$wp_list_table = new $table_class( compact( 'params' ) );
1256		- $pagenum = $wp_list_table->get_pagenum();
1257	1052
	1053	+ $pagenum = $wp_list_table->get_pagenum();
	1054	+
1258	1055	$wp_list_table->prepare_items();
1259	1056
1260	1057	$total_pages = $wp_list_table->get_pagination_arg( 'total_pages' );
1261		-
1262	1058	if ( $pagenum > $total_pages && $total_pages > 0 ) {
1263		- wp_safe_redirect( esc_url_raw( add_query_arg( 'paged', $total_pages ) ) );
	1059	+ wp_redirect( esc_url_raw( add_query_arg( 'paged', $total_pages ) ) );
1264	1060	die();
1265	1061	}
1266	1062
1267		- $error = FrmInbox::check_for_error();
1268		-
1269		- if ( $error ) {
1270		- $show_messages = array( $error['subject'] . '. ' . $error['message'] );
1271		- }
1272		-
1273	1063	require FrmAppHelper::plugin_path() . '/classes/views/frm-forms/list.php';
1274	1064	}
1275	1065
1276	1066	/**
1277	1067	* @param array<string,string> $columns
1278		- *
1279	1068	* @return array<string,string>
1280	1069	*/
1281	1070	public static function get_columns( $columns ) {
1282		- $columns['cb'] = '<input type="checkbox" />';
1283		- $columns['name'] = esc_html__( 'Form Title', 'formidable' );
1284		- $columns['entries'] = esc_html__( 'Entries', 'formidable' );
1285		- $columns['views'] = esc_html__( 'Views', 'formidable' );
1286		- $columns['id'] = 'ID';
1287		- $columns['form_key'] = esc_html__( 'Key', 'formidable' );
1288		-
1289		- if ( 'trash' !== FrmAppHelper::simple_get( 'form_type' ) && has_filter( 'frm_form_list_actions' ) ) {
1290		- // If there is any filters added, keep this column.
1291		- $columns['shortcode'] = esc_html__( 'Actions', 'formidable' );
1292		- }
1293		-
	1071	+ $columns['cb'] = '<input type="checkbox" />';
	1072	+ $columns['name'] = esc_html__( 'Form Title', 'formidable' );
	1073	+ $columns['entries'] = esc_html__( 'Entries', 'formidable' );
	1074	+ $columns['id'] = 'ID';
	1075	+ $columns['form_key'] = esc_html__( 'Key', 'formidable' );
	1076	+ $columns['shortcode'] = esc_html__( 'Actions', 'formidable' );
1294	1077	$columns['created_at'] = esc_html__( 'Date', 'formidable' );
1295	1078
1296		- if ( 'trash' !== FrmAppHelper::simple_get( 'form_type' ) ) {
1297		- $columns['embeds'] = esc_html__( 'Embeds', 'formidable' );
1298		- $columns['settings'] = '<div class="frm-forms-list-settings-btn-wrapper"><a href="#" class="frm-forms-list-settings-btn">';
1299		- $columns['settings'] .= FrmAppHelper::icon_by_class( 'frmfont frm_settings_icon', array( 'echo' => false ) );
1300		- $columns['settings'] .= '<span class="screen-reader-text">' . esc_html__( 'List settings', 'formidable' ) . '</span>';
1301		- $columns['settings'] .= '</a></div>';
1302		- }
1303		-
1304	1079	add_screen_option(
1305	1080	'per_page',
1306	1081	array(
1307	1082	'label' => __( 'Forms', 'formidable' ),
		@@ -1327,9 +1102,8 @@
1327	1102	}
1328	1103
1329	1104	/**
1330	1105	* @param mixed $hidden_columns
1331		- *
1332	1106	* @return array
1333	1107	*/
1334	1108	public static function hidden_columns( $hidden_columns ) {
1335	1109	if ( ! is_array( $hidden_columns ) ) {
		@@ -1350,18 +1124,11 @@
1350	1124
1351	1125	return $hidden_columns;
1352	1126	}
1353	1127
1354		- /**
1355		- * @param mixed $save
1356		- * @param string $option
1357		- * @param int|string $value
1358		- *
1359		- * @return mixed
1360		- */
1361	1128	public static function save_per_page( $save, $option, $value ) {
1362	1129	if ( $option === 'formidable_page_formidable_per_page' ) {
1363		- return (int) $value;
	1130	+ $save = (int) $value;
1364	1131	}
1365	1132
1366	1133	return $save;
1367	1134	}
		@@ -1370,9 +1137,8 @@
1370	1137	* @param int|string $id
1371	1138	* @param array $errors
1372	1139	* @param string $message
1373	1140	* @param bool $create_link
1374		- *
1375	1141	* @return void
1376	1142	*/
1377	1143	private static function get_edit_vars( $id, $errors = array(), $message = '', $create_link = false ) {
1378	1144	global $frm_vars;
		@@ -1387,9 +1153,8 @@
1387	1153	'page' => 'formidable',
1388	1154	)
1389	1155	),
1390	1156	);
1391		-
1392	1157	if ( ! $form ) {
1393	1158	FrmAppController::show_error_modal( $error_args );
1394	1159	return;
1395	1160	}
		@@ -1411,14 +1176,15 @@
1411	1176	}
1412	1177
1413	1178	if ( $form->parent_form_id ) {
1414	1179	/* translators: %1$s: Start link HTML, %2$s: End link HTML */
1415		- 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
	1180	+ 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>' ) );
1416	1181	}
1417	1182
1418	1183	$frm_field_selection = FrmField::field_selection();
1419		- $fields = FrmField::get_all_for_form( $form->id );
1420	1184
	1185	+ $fields = FrmField::get_all_for_form( $form->id );
	1186	+
1421	1187	// Automatically add end section fields if they don't exist (2.0 migration).
1422	1188	$reset_fields = false;
1423	1189	FrmFormsHelper::auto_add_end_section_fields( $form, $fields, $reset_fields );
1424	1190	FrmSubmitHelper::maybe_create_submit_field( $form, $fields, $reset_fields );
		@@ -1442,10 +1208,9 @@
1442	1208	*/
1443	1209	$values['fields'] = apply_filters( 'frm_fields_in_form_builder', $fields, compact( 'form' ) );
1444	1210
1445	1211	$edit_message = __( 'Form was successfully updated.', 'formidable' );
1446		-
1447		- if ( $form->is_template && $message === $edit_message ) {
	1212	+ if ( $form->is_template && $message == $edit_message ) {
1448	1213	$message = __( 'Template was successfully updated.', 'formidable' );
1449	1214	}
1450	1215
1451	1216	self::maybe_update_form_builder_message( $message );
		@@ -1460,12 +1225,11 @@
1460	1225	}
1461	1226
1462	1227	/**
1463	1228	* @param array $fields
1464		- *
1465	1229	* @return array
1466	1230	*/
1467		- public static function update_form_builder_fields( $fields ) {
	1231	+ public static function update_form_builder_fields( $fields, $form ) {
1468	1232	foreach ( $fields as $field ) {
1469	1233	$field->do_not_include_icons = true;
1470	1234	}
1471	1235	return $fields;
		@@ -1470,13 +1234,8 @@
1470	1234	}
1471	1235	return $fields;
1472	1236	}
1473	1237
1474		- /**
1475		- * @param string $message
1476		- *
1477		- * @return void
1478		- */
1479	1238	public static function maybe_update_form_builder_message( &$message ) {
1480	1239	if ( 'form_duplicated' === FrmAppHelper::simple_get( 'message' ) ) {
1481	1240	$message = __( 'Form was Successfully Copied', 'formidable' );
1482	1241	}
		@@ -1485,9 +1244,8 @@
1485	1244	/**
1486	1245	* @param int|string $id
1487	1246	* @param array $errors
1488	1247	* @param array|string $args
1489		- *
1490	1248	* @return void
1491	1249	*/
1492	1250	public static function get_settings_vars( $id, $errors = array(), $args = array() ) {
1493	1251	FrmAppHelper::permission_check( 'frm_edit_forms' );
		@@ -1509,12 +1267,13 @@
1509	1267	);
1510	1268	$args = array_merge( $defaults, $args );
1511	1269	$message = $args['message'];
1512	1270	$warnings = $args['warnings'];
1513		- $form = FrmForm::getOne( $id );
1514		- $fields = FrmField::get_all_for_form( $id );
1515		- $values = FrmAppHelper::setup_edit_vars( $form, 'forms', $fields, true );
1516	1271
	1272	+ $form = FrmForm::getOne( $id );
	1273	+ $fields = FrmField::get_all_for_form( $id );
	1274	+ $values = FrmAppHelper::setup_edit_vars( $form, 'forms', $fields, true );
	1275	+
1517	1276	/**
1518	1277	* Allows changing fields in the form settings.
1519	1278	*
1520	1279	* @since 5.0.04
		@@ -1554,12 +1313,8 @@
1554	1313	}
1555	1314
1556	1315	/**
1557	1316	* @since 4.0
1558		- *
1559		- * @param array $atts
1560		- *
1561		- * @return void
1562	1317	*/
1563	1318	public static function form_publish_button( $atts ) {
1564	1319	$values = $atts['values'];
1565	1320	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/_publish_box.php';
		@@ -1570,9 +1325,8 @@
1570	1325	*
1571	1326	* @since 4.0
1572	1327	*
1573	1328	* @param array $values
1574		- *
1575	1329	* @return array
1576	1330	*/
1577	1331	private static function get_settings_tabs( $values ) {
1578	1332	$sections = array(
		@@ -1578,25 +1332,20 @@
1578	1332	$sections = array(
1579	1333	'advanced' => array(
1580	1334	'name' => __( 'General', 'formidable' ),
1581	1335	'title' => __( 'General Form Settings', 'formidable' ),
1582		- 'function' => array( self::class, 'advanced_settings' ),
1583		- 'icon' => 'frmfont frm_small_settings_icon',
	1336	+ 'function' => array( __CLASS__, 'advanced_settings' ),
	1337	+ 'icon' => 'frm_icon_font frm_settings_icon',
1584	1338	),
1585	1339	'email' => array(
1586	1340	'name' => __( 'Actions & Notifications', 'formidable' ),
1587	1341	'function' => array( 'FrmFormActionsController', 'email_settings' ),
1588	1342	'id' => 'frm_notification_settings',
1589		- 'icon' => 'frmfont frm_notification_check_icon',
	1343	+ 'icon' => 'frm_icon_font frm_mail_bulk_icon',
1590	1344	),
1591		- 'spam' => array(
1592		- 'name' => __( 'Spam', 'formidable' ),
1593		- 'function' => array( self::class, 'spam_settings' ),
1594		- 'icon' => 'frmfont frm_shield_check2_icon',
1595		- ),
1596	1345	'permissions' => array(
1597	1346	'name' => __( 'Form Permissions', 'formidable' ),
1598		- 'icon' => 'frmfont frm_lock_closed2_icon',
	1347	+ 'icon' => 'frm_icon_font frm_lock_closed_icon',
1599	1348	'html_class' => 'frm_show_upgrade_tab frm_noallow',
1600	1349	'data' => array(
1601	1350	'medium' => 'permissions',
1602	1351	'upgrade' => __( 'Form Permissions', 'formidable' ),
		@@ -1601,37 +1350,35 @@
1601	1350	'medium' => 'permissions',
1602	1351	'upgrade' => __( 'Form Permissions', 'formidable' ),
1603	1352	'message' => __( 'Allow editing, protect forms and files, limit entries, and save drafts. Upgrade to get form and entry permissions.', 'formidable' ),
1604	1353	'screenshot' => 'permissions.png',
1605		- 'learn-more' => FrmAppHelper::get_doc_url( 'general-form-settings/#kb-form-permissions', 'form-permissions-settings' ),
1606	1354	),
1607	1355	),
1608	1356	'scheduling' => array(
1609	1357	'name' => __( 'Form Scheduling', 'formidable' ),
1610		- 'icon' => 'frmfont frm_schedule_icon',
	1358	+ 'icon' => 'frm_icon_font frm_calendar_icon',
1611	1359	'html_class' => 'frm_show_upgrade_tab frm_noallow',
1612	1360	'data' => array(
1613	1361	'medium' => 'scheduling',
1614	1362	'upgrade' => __( 'Form scheduling settings', 'formidable' ),
1615	1363	'screenshot' => 'scheduling.png',
1616		- 'learn-more' => FrmAppHelper::get_doc_url( 'general-form-settings/#kb-form-scheduling', 'form-scheduling-settings' ),
1617	1364	),
1618	1365	),
1619	1366	'buttons' => array(
1620	1367	'name' => __( 'Buttons', 'formidable' ),
1621		- 'class' => self::class,
	1368	+ 'class' => __CLASS__,
1622	1369	'function' => 'buttons_settings',
1623		- 'icon' => 'frmfont frm-buttons-style',
	1370	+ 'icon' => 'frm_icon_font frm_button_icon',
1624	1371	),
1625	1372	'landing' => array(
1626	1373	'name' => __( 'Form Landing Page', 'formidable' ),
1627		- 'icon' => 'frmfont frm_cross_device_icon',
	1374	+ 'icon' => 'frm_icon_font frm_file_text_icon',
1628	1375	'html_class' => 'frm_show_upgrade_tab frm_noallow',
1629	1376	'data' => FrmAppHelper::get_landing_page_upgrade_data_params(),
1630	1377	),
1631	1378	'chat' => array(
1632	1379	'name' => __( 'Conversational Forms', 'formidable' ),
1633		- 'icon' => 'frmfont frm_chat_bubbles_icon',
	1380	+ 'icon' => 'frm_icon_font frm_chat_forms_icon',
1634	1381	'html_class' => 'frm_show_upgrade_tab frm_noallow',
1635	1382	'data' => FrmAppHelper::get_upgrade_data_params(
1636	1383	'chat',
1637	1384	array(
		@@ -1637,15 +1384,14 @@
1637	1384	array(
1638	1385	'upgrade' => __( 'Conversational Forms', 'formidable' ),
1639	1386	'message' => __( 'Ask one question at a time for automated conversations.', 'formidable' ),
1640	1387	'screenshot' => 'chat.png',
1641		- 'learn-more' => FrmAppHelper::get_doc_url( 'conversational-forms', 'conversational-forms-settings', false ),
1642	1388	)
1643	1389	),
1644	1390	),
1645	1391	'abandonment' => array(
1646	1392	'name' => __( 'Form Abandonment', 'formidable' ),
1647		- 'icon' => 'frmfont frm_abandoned_icon',
	1393	+ 'icon' => 'frm_icon_font frm_abandoned_icon',
1648	1394	'html_class' => 'frm_show_upgrade_tab frm_noallow',
1649	1395	'data' => FrmAppHelper::get_upgrade_data_params(
1650	1396	'abandonment',
1651	1397	array(
		@@ -1651,22 +1397,23 @@
1651	1397	array(
1652	1398	'upgrade' => __( 'Form abandonment settings', 'formidable' ),
1653	1399	'message' => __( 'Unlock the power of data capture to boost lead generation and master the art of form optimization.', 'formidable' ),
1654	1400	'screenshot' => 'abandonment.png',
1655		- 'learn-more' => FrmAppHelper::get_doc_url( 'features/form-abandonment-wordpress-plugin', 'form-abandonment-settings', false ),
1656	1401	)
1657	1402	),
1658	1403	),
1659	1404	'html' => array(
1660	1405	'name' => __( 'Customize HTML', 'formidable' ),
1661		- 'class' => self::class,
	1406	+ 'class' => __CLASS__,
1662	1407	'function' => 'html_settings',
1663		- 'icon' => 'frmfont frm_code2_icon',
	1408	+ 'icon' => 'frm_icon_font frm_code_icon',
1664	1409	),
1665	1410	);
1666	1411
1667		- if ( ! has_action( 'frm_add_form_style_tab_options' ) && ! has_action( 'frm_add_form_button_options' ) ) {
1668		- unset( $sections['buttons'] );
	1412	+ foreach ( array( 'landing', 'chat', 'abandonment' ) as $feature ) {
	1413	+ if ( ! FrmAppHelper::show_new_feature( $feature ) ) {
	1414	+ unset( $sections[ $feature ] );
	1415	+ }
1669	1416	}
1670	1417
1671	1418	$sections = apply_filters( 'frm_add_form_settings_section', $sections, $values );
1672	1419
		@@ -1673,9 +1420,9 @@
1673	1420	foreach ( $sections as $key => $section ) {
1674	1421	$defaults = array(
1675	1422	'html_class' => '',
1676	1423	'name' => ucfirst( $key ),
1677		- 'icon' => 'frmfont frm_settings_icon',
	1424	+ 'icon' => 'frm_icon_font frm_settings_icon',
1678	1425	);
1679	1426
1680	1427	$section = array_merge( $defaults, $section );
1681	1428
		@@ -1681,9 +1428,8 @@
1681	1428
1682	1429	if ( ! isset( $section['anchor'] ) ) {
1683	1430	$section['anchor'] = $key;
1684	1431	}
1685		-
1686	1432	$section['anchor'] .= '_settings';
1687	1433
1688	1434	if ( ! isset( $section['title'] ) ) {
1689	1435	$section['title'] = $section['name'];
		@@ -1702,25 +1448,26 @@
1702	1448	/**
1703	1449	* @since 4.0
1704	1450	*
1705	1451	* @param array $values
1706		- *
1707	1452	* @return void
1708	1453	*/
1709	1454	public static function advanced_settings( $values ) {
1710	1455	$first_h3 = 'frm_first_h3';
	1456	+
1711	1457	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings-advanced.php';
1712	1458	}
1713	1459
1714	1460	/**
1715		- * @since 6.33
1716		- *
1717	1461	* @param array $values
1718		- *
1719	1462	* @return void
1720	1463	*/
1721		- public static function spam_settings( $values ) {
1722		- include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/spam-settings.php';
	1464	+ public static function render_spam_settings( $values ) {
	1465	+ if ( function_exists( 'akismet_http_post' ) ) {
	1466	+ include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/spam-settings/akismet.php';
	1467	+ }
	1468	+ include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/spam-settings/honeypot.php';
	1469	+ include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/spam-settings/antispam.php';
1723	1470	}
1724	1471
1725	1472	/**
1726	1473	* @since 4.0
		@@ -1725,9 +1472,8 @@
1725	1472	/**
1726	1473	* @since 4.0
1727	1474	*
1728	1475	* @param array $values
1729		- *
1730	1476	* @return void
1731	1477	*/
1732	1478	public static function buttons_settings( $values ) {
1733	1479	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings-buttons.php';
		@@ -1736,9 +1482,8 @@
1736	1482	/**
1737	1483	* @since 4.0
1738	1484	*
1739	1485	* @param array $values
1740		- *
1741	1486	* @return void
1742	1487	*/
1743	1488	public static function html_settings( $values ) {
1744	1489	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings-html.php';
		@@ -1749,9 +1494,8 @@
1749	1494	*
1750	1495	* @since 2.03.08
1751	1496	*
1752	1497	* @param array|bool $values
1753		- *
1754	1498	* @return void
1755	1499	*/
1756	1500	private static function clean_submit_html( &$values ) {
1757	1501	if ( is_array( $values ) && isset( $values['submit_html'] ) ) {
		@@ -1774,17 +1518,13 @@
1774	1518	return $classes;
1775	1519	}
1776	1520
1777	1521	/**
1778		- * @since 6.27 Added $template_path parameter.
1779		- *
1780	1522	* @param int|string $form_id
1781	1523	* @param string $class
1782		- * @param string $template_path The path to a template file to use instead of the default.
1783		- *
1784	1524	* @return void
1785	1525	*/
1786		- public static function mb_tags_box( $form_id, $class = '', $template_path = 'default' ) {
	1526	+ public static function mb_tags_box( $form_id, $class = '' ) {
1787	1527	$fields = FrmField::get_all_for_form( $form_id, '', 'include' );
1788	1528
1789	1529	/**
1790	1530	* Allows modifying the list of fields in the tags box.
		@@ -1793,30 +1533,23 @@
1793	1533	*
1794	1534	* @param array $fields The list of fields.
1795	1535	* @param array $args The arguments. Contains `form_id`.
1796	1536	*/
1797		- $fields = apply_filters( 'frm_fields_in_tags_box', $fields, compact( 'form_id' ) );
1798		- $linked_forms = array();
1799		- $col = 'one';
1800		- $settings_tab = FrmAppHelper::is_admin_page( 'formidable' );
	1537	+ $fields = apply_filters( 'frm_fields_in_tags_box', $fields, compact( 'form_id' ) );
	1538	+ $linked_forms = array();
	1539	+ $col = 'one';
	1540	+ $settings_tab = FrmAppHelper::is_admin_page( 'formidable' );
	1541	+
1801	1542	$cond_shortcodes = apply_filters( 'frm_conditional_shortcodes', array() );
1802		- $entry_shortcodes = self::get_shortcode_helpers( $settings_tab, $form_id );
	1543	+ $entry_shortcodes = self::get_shortcode_helpers( $settings_tab );
	1544	+
1803	1545	$advanced_helpers = self::advanced_helpers( compact( 'fields', 'form_id' ) );
1804	1546
1805		- if ( 'default' === $template_path || ! file_exists( $template_path ) ) {
1806		- include FrmAppHelper::plugin_path() . '/classes/views/shared/mb_adv_info.php';
1807		- return;
1808		- }
1809		-
1810		- include $template_path;
	1547	+ include FrmAppHelper::plugin_path() . '/classes/views/shared/mb_adv_info.php';
1811	1548	}
1812	1549
1813	1550	/**
1814	1551	* @since 3.04.01
1815		- *
1816		- * @param array $atts
1817		- *
1818		- * @return array
1819	1552	*/
1820	1553	private static function advanced_helpers( $atts ) {
1821	1554	$advanced_helpers = array(
1822	1555	'default' => array(
		@@ -1825,12 +1558,10 @@
1825	1558	),
1826	1559	);
1827	1560
1828	1561	$user_fields = self::user_shortcodes();
1829		-
1830	1562	if ( $user_fields ) {
1831	1563	$user_helpers = array();
1832		-
1833	1564	foreach ( $user_fields as $uk => $uf ) {
1834	1565	$user_helpers[ '|user_id| show="' . $uk . '"' ] = $uf;
1835	1566	unset( $uk, $uf );
1836	1567	}
		@@ -1851,132 +1582,12 @@
1851	1582	return apply_filters( 'frm_advanced_helpers', $advanced_helpers, $atts );
1852	1583	}
1853	1584
1854	1585	/**
1855		- * Adds a shortcode for each part of a multi-part field to the field shortcode list,
1856		- * so a single part can be used on its own, like [25 show=first] for a Name field.
1857		- *
1858		- * @since 6.35
1859		- *
1860		- * @param array $atts Includes 'field'.
1861		- *
1862		- * @return void
1863		- */
1864		- public static function field_part_shortcodes( $atts ) {
1865		- $field = $atts['field'];
1866		-
1867		- foreach ( self::get_field_parts( $field ) as $part => $label ) {
1868		- FrmFormsHelper::insert_opt_html(
1869		- array(
1870		- 'id' => $field->id . ' show=' . $part,
1871		- 'key' => $field->field_key . ' show=' . $part,
1872		- // Keep the part label and the option out of the truncated text so they stay readable.
1873		- 'key_label' => $field->field_key,
1874		- 'key_suffix' => ' show=' . $part,
1875		- 'name' => $field->name,
1876		- 'name_suffix' => ' (' . $label . ')',
1877		- 'type' => $field->type,
1878		- 'class' => 'frm-customize-list dropdown-item',
1879		- )
1880		- );
1881		- unset( $part, $label );
1882		- }
1883		- }
1884		-
1885		- /**
1886		- * Gets the parts of a multi-part field that can be shown on their own with a show= shortcode option.
1887		- *
1888		- * @since 6.35
1889		- *
1890		- * @param stdClass $field
1891		- *
1892		- * @return array Part labels keyed by the show= option value.
1893		- */
1894		- private static function get_field_parts( $field ) {
1895		- $parts = array();
1896		-
1897		- if ( 'name' === $field->type ) {
1898		- $parts = self::get_name_field_parts( $field );
1899		- } elseif ( 'address' === $field->type ) {
1900		- $parts = self::get_address_field_parts( $field );
1901		- }
1902		-
1903		- /**
1904		- * Allows add-ons to add the parts of their own multi-part fields.
1905		- *
1906		- * @since 6.35
1907		- *
1908		- * @param array $parts Part labels keyed by the show= option value.
1909		- * @param stdClass $field The field the parts belong to.
1910		- */
1911		- return apply_filters( 'frm_field_parts_for_shortcodes', $parts, $field );
1912		- }
1913		-
1914		- /**
1915		- * Gets the parts of a Name field that are in use. Only the parts included in the
1916		- * selected name layout hold a value, so the rest would always show as blank.
1917		- *
1918		- * @since 6.35
1919		- *
1920		- * @param stdClass $field
1921		- *
1922		- * @return array Part labels keyed by the show= option value, in layout order.
1923		- */
1924		- private static function get_name_field_parts( $field ) {
1925		- $labels = array(
1926		- 'first' => __( 'First', 'formidable' ),
1927		- 'middle' => __( 'Middle', 'formidable' ),
1928		- 'last' => __( 'Last', 'formidable' ),
1929		- );
1930		- $layout = FrmField::get_option( $field, 'name_layout' );
1931		-
1932		- if ( ! $layout ) {
1933		- $layout = 'first_last';
1934		- }
1935		-
1936		- // The layout option names the parts in use, in display order, like first_middle_last.
1937		- $parts = array();
1938		-
1939		- foreach ( explode( '_', $layout ) as $part ) {
1940		- if ( isset( $labels[ $part ] ) ) {
1941		- $parts[ $part ] = $labels[ $part ];
1942		- }
1943		- unset( $part );
1944		- }
1945		-
1946		- return $parts;
1947		- }
1948		-
1949		- /**
1950		- * Gets the parts of an Address field that are in use. The address type decides which
1951		- * parts are on the form, so the rest would always show as blank.
1952		- *
1953		- * @since 6.35
1954		- *
1955		- * @param stdClass $field
1956		- *
1957		- * @return array Part labels keyed by the show= option value.
1958		- */
1959		- private static function get_address_field_parts( $field ) {
1960		- $parts = FrmFieldAddress::get_part_labels();
1961		- $address_type = FrmField::get_option( $field, 'address_type' );
1962		-
1963		- if ( in_array( $address_type, array( 'us', 'generic' ), true ) ) {
1964		- unset( $parts['country'] );
1965		- } elseif ( 'europe' === $address_type ) {
1966		- unset( $parts['state'] );
1967		- }
1968		-
1969		- return $parts;
1970		- }
1971		-
1972		- /**
1973	1586	* Get an array of the options to display in the advanced tab
1974	1587	* of the customization panel
1975	1588	*
1976	1589	* @since 2.0.6
1977		- *
1978		- * @return array
1979	1590	*/
1980	1591	private static function get_advanced_shortcodes() {
1981	1592	$adv_shortcodes = array(
1982	1593	'x sep=", "' => array(
		@@ -1993,18 +1604,17 @@
1993	1604	'label' => __( 'No Auto P', 'formidable' ),
1994	1605	'title' => __( 'Do not automatically add any paragraphs or line breaks', 'formidable' ),
1995	1606	),
1996	1607	);
	1608	+ $adv_shortcodes = apply_filters( 'frm_advanced_shortcodes', $adv_shortcodes );
1997	1609
1998	1610	// __( 'Leave blank instead of defaulting to User Login', 'formidable' ) : blank=1
1999	1611
2000		- return apply_filters( 'frm_advanced_shortcodes', $adv_shortcodes );
	1612	+ return $adv_shortcodes;
2001	1613	}
2002	1614
2003	1615	/**
2004	1616	* @since 3.04.01
2005		- *
2006		- * @return array
2007	1617	*/
2008	1618	private static function user_shortcodes() {
2009	1619	$options = array(
2010	1620	'ID' => __( 'User ID', 'formidable' ),
		@@ -2023,15 +1633,10 @@
2023	1633	/**
2024	1634	* Get an array of the helper shortcodes to display in the customization panel
2025	1635	*
2026	1636	* @since 2.0.6
2027		- *
2028		- * @param bool $settings_tab
2029		- * @param int $form_id
2030		- *
2031		- * @return array
2032	1637	*/
2033		- private static function get_shortcode_helpers( $settings_tab, $form_id = 0 ) {
	1638	+ private static function get_shortcode_helpers( $settings_tab ) {
2034	1639	$entry_shortcodes = array(
2035	1640	'id' => __( 'Entry ID', 'formidable' ),
2036	1641	'key' => __( 'Entry Key', 'formidable' ),
2037	1642	'post_id' => __( 'Post ID', 'formidable' ),
		@@ -2040,28 +1645,30 @@
2040	1645	'updated-at' => __( 'Entry updated', 'formidable' ),
2041	1646	'' => '',
2042	1647	'siteurl' => __( 'Site URL', 'formidable' ),
2043	1648	'sitename' => __( 'Site Name', 'formidable' ),
2044		- 'form_name' => __( 'Form Name', 'formidable' ),
2045	1649	);
2046	1650
2047		- $entry_shortcodes = array_merge( FrmShortcodeHelper::get_contextual_shortcode_values(), $entry_shortcodes );
2048		-
2049	1651	if ( ! FrmAppHelper::pro_is_installed() ) {
2050	1652	unset( $entry_shortcodes['post_id'] );
2051	1653	}
2052	1654
	1655	+ if ( $settings_tab ) {
	1656	+ $entry_shortcodes['default-message'] = __( 'Default Msg', 'formidable' );
	1657	+ $entry_shortcodes['default-html'] = __( 'Default HTML', 'formidable' );
	1658	+ $entry_shortcodes['default-plain'] = __( 'Default Plain', 'formidable' );
	1659	+ $entry_shortcodes['form_name'] = __( 'Form Name', 'formidable' );
	1660	+ }
	1661	+
2053	1662	/**
2054	1663	* Use this hook to add or remove buttons in the helpers section
2055	1664	* in the customization panel
2056	1665	*
2057	1666	* @since 2.0.6
2058		- *
2059		- * @param array $entry_shortcodes
2060		- * @param bool $settings_tab
2061		- * @param int $form_id
2062	1667	*/
2063		- return apply_filters( 'frm_helper_shortcodes', $entry_shortcodes, $settings_tab, $form_id );
	1668	+ $entry_shortcodes = apply_filters( 'frm_helper_shortcodes', $entry_shortcodes, $settings_tab );
	1669	+
	1670	+ return $entry_shortcodes;
2064	1671	}
2065	1672
2066	1673	/**
2067	1674	* Insert the form class setting into the form.
		@@ -2066,9 +1673,8 @@
2066	1673	/**
2067	1674	* Insert the form class setting into the form.
2068	1675	*
2069	1676	* @param stdClass $form
2070		- *
2071	1677	* @return void
2072	1678	*/
2073	1679	public static function form_classes( $form ) {
2074	1680	if ( isset( $form->options['form_class'] ) ) {
		@@ -2079,9 +1685,9 @@
2079	1685	echo ' frm_js_validate ';
2080	1686	self::add_js_validate_form_to_global_vars( $form );
2081	1687	}
2082	1688
2083		- if ( FrmForm::is_ajax_on( $form ) ) {
	1689	+ if ( ! FrmFormsHelper::should_use_pro_for_ajax_submit() && FrmForm::is_ajax_on( $form ) ) {
2084	1690	echo ' frm_ajax_submit ';
2085	1691	}
2086	1692	}
2087	1693
		@@ -2091,9 +1697,8 @@
2091	1697	* @param stdClass $form
2092	1698	*/
2093	1699	public static function add_js_validate_form_to_global_vars( $form ) {
2094	1700	global $frm_vars;
2095		-
2096	1701	if ( ! isset( $frm_vars['js_validate_forms'] ) ) {
2097	1702	$frm_vars['js_validate_forms'] = array();
2098	1703	}
2099	1704	$frm_vars['js_validate_forms'][ $form->id ] = $form;
		@@ -2116,9 +1721,8 @@
2116	1721	/**
2117	1722	* @param string $content
2118	1723	* @param int|stdClass|string $form
2119	1724	* @param false|int|stdClass|string $entry
2120		- *
2121	1725	* @return string
2122	1726	*/
2123	1727	public static function filter_content( $content, $form, $entry = false ) {
2124	1728	$content = self::replace_form_name_shortcodes( $content, $form );
		@@ -2123,9 +1727,8 @@
2123	1727	public static function filter_content( $content, $form, $entry = false ) {
2124	1728	$content = self::replace_form_name_shortcodes( $content, $form );
2125	1729
2126	1730	self::get_entry_by_param( $entry );
2127		-
2128	1731	if ( ! $entry ) {
2129	1732	return $content;
2130	1733	}
2131	1734
		@@ -2141,10 +1744,11 @@
2141	1744	$form = $entry->parent_entry->form_id;
2142	1745	}
2143	1746
2144	1747	$shortcodes = FrmFieldsHelper::get_shortcodes( $content, $form );
	1748	+ $content = apply_filters( 'frm_replace_content_shortcodes', $content, $entry, $shortcodes );
2145	1749
2146		- return apply_filters( 'frm_replace_content_shortcodes', $content, $entry, $shortcodes );
	1750	+ return $content;
2147	1751	}
2148	1752
2149	1753	/**
2150	1754	* Replace any [form_name] shortcodes in a string.
		@@ -2152,9 +1756,8 @@
2152	1756	* @since 5.5
2153	1757	*
2154	1758	* @param array|string $string
2155	1759	* @param int|stdClass|string $form
2156		- *
2157	1760	* @return array|string
2158	1761	*/
2159	1762	public static function replace_form_name_shortcodes( $string, $form ) {
2160	1763	if ( ! is_string( $string ) ) {
		@@ -2160,9 +1763,9 @@
2160	1763	if ( ! is_string( $string ) ) {
2161	1764	return $string;
2162	1765	}
2163	1766
2164		- if ( ! str_contains( $string, '[form_name]' ) ) {
	1767	+ if ( false === strpos( $string, '[form_name]' ) ) {
2165	1768	return $string;
2166	1769	}
2167	1770
2168	1771	if ( ! is_object( $form ) ) {
		@@ -2174,30 +1777,20 @@
2174	1777	}
2175	1778
2176	1779	/**
2177	1780	* @param false|int|stdClass|string $entry
2178		- *
2179	1781	* @return void
2180	1782	*/
2181	1783	private static function get_entry_by_param( &$entry ) {
2182		- if ( $entry && is_object( $entry ) ) {
2183		- return;
2184		- }
	1784	+ if ( ! $entry || ! is_object( $entry ) ) {
	1785	+ if ( ! $entry || ! is_numeric( $entry ) ) {
	1786	+ $entry = FrmAppHelper::get_post_param( 'id', false, 'sanitize_title' );
	1787	+ }
2185	1788
2186		- if ( ! $entry || ! is_numeric( $entry ) ) {
2187		- $entry = FrmAppHelper::get_post_param( 'id', false, 'sanitize_title' );
	1789	+ FrmEntry::maybe_get_entry( $entry );
2188	1790	}
2189		-
2190		- FrmEntry::maybe_get_entry( $entry );
2191	1791	}
2192	1792
2193		- /**
2194		- * @param string $content
2195		- * @param false|object $entry
2196		- * @param array $shortcodes
2197		- *
2198		- * @return string
2199		- */
2200	1793	public static function replace_content_shortcodes( $content, $entry, $shortcodes ) {
2201	1794	return FrmFieldsHelper::replace_content_shortcodes( $content, $entry, $shortcodes );
2202	1795	}
2203	1796
		@@ -2202,9 +1795,8 @@
2202	1795	}
2203	1796
2204	1797	/**
2205	1798	* @param array $errors
2206		- *
2207	1799	* @return array
2208	1800	*/
2209	1801	public static function process_bulk_form_actions( $errors ) {
2210	1802	if ( ! $_REQUEST ) {
		@@ -2211,30 +1803,29 @@
2211	1803	return $errors;
2212	1804	}
2213	1805
2214	1806	$bulkaction = FrmAppHelper::get_param( 'action', '', 'get', 'sanitize_text_field' );
2215		-
2216		- // phpcs:ignore Universal.Operators.StrictComparisons
2217	1807	if ( $bulkaction == - 1 ) {
2218	1808	$bulkaction = FrmAppHelper::get_param( 'action2', '', 'get', 'sanitize_title' );
2219	1809	}
2220	1810
2221		- if ( $bulkaction && str_starts_with( $bulkaction, 'bulk_' ) ) {
	1811	+ if ( ! empty( $bulkaction ) && strpos( $bulkaction, 'bulk_' ) === 0 ) {
2222	1812	FrmAppHelper::remove_get_action();
	1813	+
2223	1814	$bulkaction = str_replace( 'bulk_', '', $bulkaction );
2224	1815	}
2225	1816
2226	1817	$ids = FrmAppHelper::get_param( 'item-action', '', 'get', 'sanitize_text_field' );
	1818	+ if ( empty( $ids ) ) {
	1819	+ $errors[] = __( 'No forms were specified', 'formidable' );
2227	1820
2228		- if ( ! $ids ) {
2229		- $errors[] = __( 'No forms were specified', 'formidable' );
2230	1821	return $errors;
2231	1822	}
2232	1823
2233	1824	$permission_error = FrmAppHelper::permission_nonce_error( '', '_wpnonce', 'bulk-toplevel_page_formidable' );
2234		-
2235	1825	if ( $permission_error !== false ) {
2236	1826	$errors[] = $permission_error;
	1827	+
2237	1828	return $errors;
2238	1829	}
2239	1830
2240	1831	if ( ! is_array( $ids ) ) {
		@@ -2258,24 +1849,9 @@
2258	1849
2259	1850	return $errors;
2260	1851	}
2261	1852
2262		- /**
2263		- * Includes html that shows a message when the device is too small to use Formidable Forms admin pages.
2264		- *
2265		- * @since 6.20
2266		- *
2267		- * @return void
2268		- */
2269		- public static function include_device_too_small_message() {
2270		- if ( ! FrmAppHelper::is_formidable_admin() ) {
2271		- return;
2272		- }
2273		-
2274		- include FrmAppHelper::plugin_path() . '/classes/views/shared/small-device-message.php';
2275		- }
2276		-
2277		- public static function route() { // phpcs:ignore Generic.Metrics.CyclomaticComplexity.MaxExceeded
	1853	+ public static function route() {
2278	1854	$action = isset( $_REQUEST['frm_action'] ) ? 'frm_action' : 'action';
2279	1855	$vars = array();
2280	1856	FrmAppHelper::include_svg();
2281	1857
		@@ -2285,28 +1861,25 @@
2285	1861	// Javascript needs to be allowed in some field settings.
2286	1862	// phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized, WordPress.Security.NonceVerification.Missing
2287	1863	$json_vars = htmlspecialchars_decode( nl2br( str_replace( '&quot;', '"', wp_unslash( $_POST['frm_compact_fields'] ) ) ) );
2288	1864	$json_vars = json_decode( $json_vars, true );
	1865	+ if ( empty( $json_vars ) ) {
	1866	+ // json decoding failed so we should return an error message.
	1867	+ $action = FrmAppHelper::get_param( $action, '', 'get', 'sanitize_title' );
	1868	+ if ( 'edit' === $action ) {
	1869	+ $action = 'update';
	1870	+ }
2289	1871
2290		- if ( $json_vars ) {
	1872	+ add_filter( 'frm_validate_form', 'FrmFormsController::json_error' );
	1873	+ } else {
2291	1874	$vars = FrmAppHelper::json_to_array( $json_vars );
2292	1875	$action = $vars[ $action ];
2293	1876	unset( $_REQUEST['frm_compact_fields'], $_POST['frm_compact_fields'] ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
2294	1877	$_REQUEST = array_merge( $_REQUEST, $vars ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
2295	1878	$_POST = array_merge( $_POST, $_REQUEST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
2296		- } else {
2297		- // Json decoding failed so we should return an error message.
2298		- $action = FrmAppHelper::get_param( $action, '', 'get', 'sanitize_title' );
2299		-
2300		- if ( 'edit' === $action ) {
2301		- $action = 'update';
2302		- }
2303		-
2304		- add_filter( 'frm_validate_form', 'FrmFormsController::json_error' );
2305	1879	}
2306	1880	} else {
2307	1881	$action = FrmAppHelper::get_param( $action, '', 'get', 'sanitize_title' );
2308		-
2309	1882	if ( isset( $_REQUEST['delete_all'] ) ) {
2310	1883	// Override the action for this page.
2311	1884	$action = 'delete_all';
2312	1885	}
		@@ -2326,38 +1899,34 @@
2326	1899	case 'update_settings':
2327	1900	return self::$action( $vars );
2328	1901	case 'lite-reports':
2329	1902	self::no_reports( $vars );
2330		- return null;
	1903	+ return;
2331	1904	case 'views':
2332	1905	self::no_views( $vars );
2333		- return null;
	1906	+ return;
2334	1907	default:
2335	1908	do_action( 'frm_form_action_' . $action );
2336		-
2337	1909	if ( apply_filters( 'frm_form_stop_action_' . $action, false ) ) {
2338		- return null;
	1910	+ return;
2339	1911	}
2340	1912
2341	1913	$action = FrmAppHelper::get_param( 'action', '', 'get', 'sanitize_text_field' );
2342		-
2343		- // phpcs:ignore Universal.Operators.StrictComparisons
2344	1914	if ( $action == - 1 ) {
2345	1915	$action = FrmAppHelper::get_param( 'action2', '', 'get', 'sanitize_title' );
2346	1916	}
2347	1917
2348		- if ( str_starts_with( $action, 'bulk_' ) ) {
	1918	+ if ( strpos( $action, 'bulk_' ) === 0 ) {
2349	1919	FrmAppHelper::remove_get_action();
2350	1920
2351	1921	self::list_form();
2352		- return null;
	1922	+ return;
2353	1923	}
2354	1924
2355	1925	$message = FrmAppHelper::get_param( 'message' );
2356		-
2357	1926	if ( 'form_duplicate_error' === $message ) {
2358	1927	self::display_forms_list( array(), '', array( __( 'There was a problem duplicating the form', 'formidable' ) ) );
2359		- return null;
	1928	+ return;
2360	1929	}
2361	1930
2362	1931	if ( 'forms_permanently_deleted' === $message ) {
2363	1932	$count = FrmAppHelper::get_param( 'forms_deleted', 0, 'get', 'absint' );
		@@ -2363,14 +1932,14 @@
2363	1932	$count = FrmAppHelper::get_param( 'forms_deleted', 0, 'get', 'absint' );
2364	1933	/* translators: %1$s: Number of forms */
2365	1934	$message = sprintf( _n( '%1$s form permanently deleted.', '%1$s forms permanently deleted.', $count, 'formidable' ), $count );
2366	1935	self::display_forms_list( array(), $message, '' );
2367		- return null;
	1936	+ return;
2368	1937	}
2369	1938
2370	1939	self::display_forms_list();
2371	1940
2372		- return null;
	1941	+ return;
2373	1942	}//end switch
2374	1943	}
2375	1944
2376	1945	/**
		@@ -2389,45 +1958,30 @@
2389	1958
2390	1959	// Get posted data
2391	1960	$form_id = FrmAppHelper::get_post_param( 'form_id', '', 'absint' );
2392	1961	$name = FrmAppHelper::get_post_param( 'form_name', '', 'sanitize_text_field' );
2393		- $form = FrmForm::getOne( $form_id );
2394	1962
2395		- if ( ! $form ) {
2396		- wp_send_json_error( __( 'Form not found', 'formidable' ) );
2397		- }
	1963	+ // Update the form name and form key.
	1964	+ $form_key = FrmAppHelper::get_unique_key( sanitize_title( $name ), 'frm_forms', 'form_key' );
	1965	+ FrmForm::update( $form_id, compact( 'name', 'form_key' ) );
2398	1966
2399		- if ( $name === $form->name ) {
2400		- // Nothing to change so exit early.
2401		- $form_key = $form->form_key;
2402		- wp_send_json_success( compact( 'form_key' ) );
2403		- }
	1967	+ wp_send_json_success( compact( 'form_key' ) );
	1968	+ }
2404	1969
2405		- $to_update = array(
2406		- 'name' => $name,
2407		- );
	1970	+ public static function json_error( $errors ) {
	1971	+ $errors['json'] = __( 'Abnormal HTML characters prevented your form from saving correctly', 'formidable' );
2408	1972
2409		- if ( '' === $name ) {
2410		- $form_key = $form->form_key;
2411		- } else {
2412		- // Only update form_key if name is not empty.
2413		- $form_key = FrmAppHelper::get_unique_key( sanitize_title( $name ), 'frm_forms', 'form_key' );
2414		- $to_update['form_key'] = $form_key;
2415		- }
2416		-
2417		- FrmForm::update( $form_id, $to_update );
2418		-
2419		- wp_send_json_success( compact( 'form_key' ) );
	1973	+ return $errors;
2420	1974	}
2421	1975
2422	1976	/**
2423		- * @param array $errors
	1977	+ * Education for premium features.
2424	1978	*
2425		- * @return array
	1979	+ * @since 4.05
	1980	+ * @return void
2426	1981	*/
2427		- public static function json_error( $errors ) {
2428		- $errors['json'] = __( 'Abnormal HTML characters prevented your form from saving correctly', 'formidable' );
2429		- return $errors;
	1982	+ public static function add_form_style_tab_options() {
	1983	+ include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/add_form_style_options.php';
2430	1984	}
2431	1985
2432	1986	/**
2433	1987	* Add education about views.
		@@ -2433,10 +1987,8 @@
2433	1987	* Add education about views.
2434	1988	*
2435	1989	* @since 4.07
2436	1990	*
2437		- * @param array $values
2438		- *
2439	1991	* @return void
2440	1992	*/
2441	1993	public static function no_views( $values = array() ) {
2442	1994	FrmAppHelper::include_svg();
		@@ -2450,10 +2002,8 @@
2450	2002	* Add education about reports.
2451	2003	*
2452	2004	* @since 4.07
2453	2005	*
2454		- * @param array $values
2455		- *
2456	2006	* @return void
2457	2007	*/
2458	2008	public static function no_reports( $values = array() ) {
2459	2009	$id = FrmAppHelper::get_param( 'form', '', 'get', 'absint' );
		@@ -2479,9 +2029,10 @@
2479	2029	/**
2480	2030	* @since 4.05.02
2481	2031	*/
2482	2032	private static function move_menu_to_footer() {
2483		- if ( empty( FrmAppHelper::get_settings()->admin_bar ) ) {
	2033	+ $settings = FrmAppHelper::get_settings();
	2034	+ if ( empty( $settings->admin_bar ) ) {
2484	2035	remove_action( 'wp_body_open', 'wp_admin_bar_render', 0 );
2485	2036	}
2486	2037	}
2487	2038
		@@ -2486,15 +2037,13 @@
2486	2037	}
2487	2038
2488	2039	public static function admin_bar_configure() {
2489	2040	global $frm_vars;
2490		-
2491	2041	if ( empty( $frm_vars['forms_loaded'] ) ) {
2492	2042	return;
2493	2043	}
2494	2044
2495	2045	$actions = array();
2496		-
2497	2046	foreach ( $frm_vars['forms_loaded'] as $form ) {
2498	2047	if ( is_object( $form ) ) {
2499	2048	$actions[ $form->id ] = $form->name;
2500	2049	}
		@@ -2500,9 +2049,9 @@
2500	2049	}
2501	2050	unset( $form );
2502	2051	}
2503	2052
2504		- if ( ! $actions ) {
	2053	+ if ( empty( $actions ) ) {
2505	2054	return;
2506	2055	}
2507	2056
2508	2057	self::add_menu_to_admin_bar();
		@@ -2528,12 +2077,8 @@
2528	2077	}
2529	2078
2530	2079	/**
2531	2080	* @since 2.05.07
2532		- *
2533		- * @param array $actions
2534		- *
2535		- * @return void
2536	2081	*/
2537	2082	private static function add_forms_to_admin_bar( $actions ) {
2538	2083	global $wp_admin_bar;
2539	2084
		@@ -2539,13 +2084,14 @@
2539	2084
2540	2085	asort( $actions );
2541	2086
2542	2087	foreach ( $actions as $form_id => $name ) {
	2088	+
2543	2089	$wp_admin_bar->add_node(
2544	2090	array(
2545	2091	'parent' => 'frm-forms',
2546	2092	'id' => 'edit_form_' . $form_id,
2547		- 'title' => $name ? $name : FrmFormsHelper::get_no_title_text(),
	2093	+ 'title' => empty( $name ) ? __( '(no title)', 'formidable' ) : $name,
2548	2094	'href' => FrmForm::get_edit_link( $form_id ),
2549	2095	)
2550	2096	);
2551	2097	}
		@@ -2554,14 +2100,12 @@
2554	2100	/**
2555	2101	* The formidable shortcode
2556	2102	*
2557	2103	* @param array $atts The params from the shortcode.
2558		- *
2559	2104	* @return string
2560	2105	*/
2561	2106	public static function get_form_shortcode( $atts ) {
2562	2107	global $frm_vars;
2563		-
2564	2108	if ( ! empty( $frm_vars['skip_shortcode'] ) ) {
2565	2109	$sc = '[formidable';
2566	2110	$sc .= FrmAppHelper::array_to_html_params( $atts );
2567	2111	return $sc . ']';
		@@ -2590,9 +2134,8 @@
2590	2134	* @since 5.2.01
2591	2135	*
2592	2136	* @param false|int|string $id
2593	2137	* @param false|string $key
2594		- *
2595	2138	* @return false|stdClass
2596	2139	*/
2597	2140	private static function maybe_get_form_by_id_or_key( $id, $key ) {
2598	2141	if ( ! $id ) {
		@@ -2606,9 +2149,8 @@
2606	2149	* @param false|string $key
2607	2150	* @param bool|int|string $title may be 'auto', true, false, 'true', 'false', 'yes', '1', 1, '0', 0.
2608	2151	* @param bool|int|string $description may be 'auto', true, false, 'true', 'false', 'yes', '1', 1, '0', 0.
2609	2152	* @param array $atts
2610		- *
2611	2153	* @return string
2612	2154	*/
2613	2155	public static function show_form( $id = '', $key = '', $title = false, $description = false, $atts = array() ) {
2614	2156	$form = self::maybe_get_form_by_id_or_key( $id, $key );
		@@ -2629,13 +2171,14 @@
2629	2171
2630	2172	add_action( 'frm_load_form_hooks', 'FrmHooksController::trigger_load_form_hooks' );
2631	2173	FrmAppHelper::trigger_hook_load( 'form', $form );
2632	2174
2633		- $form = apply_filters( 'frm_pre_display_form', $form );
	2175	+ $form = apply_filters( 'frm_pre_display_form', $form );
	2176	+
2634	2177	$frm_settings = FrmAppHelper::get_settings( array( 'current_form' => $form->id ) );
2635	2178
2636	2179	if ( self::is_viewable_draft_form( $form ) ) {
2637		- // Don't show a draft form on a page
	2180	+ // don't show a draft form on a page
2638	2181	$form = __( 'Please select a valid form', 'formidable' );
2639	2182	} elseif ( ! FrmForm::is_visible_to_user( $form ) ) {
2640	2183	$form = do_shortcode( $frm_settings->login_msg );
2641	2184	} else {
		@@ -2655,18 +2198,16 @@
2655	2198	}
2656	2199
2657	2200	/**
2658	2201	* @param false|int|string $id
2659		- *
2660	2202	* @return false|stdClass
2661	2203	*/
2662	2204	private static function maybe_get_form_to_show( $id ) {
2663	2205	$form = false;
2664	2206
2665		- if ( $id ) {
	2207	+ if ( ! empty( $id ) ) {
2666	2208	// Form id or key is set.
2667	2209	$form = FrmForm::getOne( $id );
2668		-
2669	2210	if ( ! $form || $form->parent_form_id || $form->status === 'trash' ) {
2670	2211	$form = false;
2671	2212	}
2672	2213	}
		@@ -2673,25 +2214,12 @@
2673	2214
2674	2215	return $form;
2675	2216	}
2676	2217
2677		- /**
2678		- * @param object $form
2679		- *
2680		- * @return bool
2681		- */
2682	2218	private static function is_viewable_draft_form( $form ) {
2683	2219	return $form->status === 'draft' && current_user_can( 'frm_edit_forms' ) && ! FrmAppHelper::is_preview_page();
2684	2220	}
2685	2221
2686		- /**
2687		- * @param object $form
2688		- * @param bool $title
2689		- * @param bool $description
2690		- * @param array $atts
2691		- *
2692		- * @return string
2693		- */
2694	2222	public static function get_form( $form, $title, $description, $atts = array() ) {
2695	2223	ob_start();
2696	2224
2697	2225	do_action( 'frm_before_get_form', $atts );
		@@ -2698,9 +2226,10 @@
2698	2226
2699	2227	self::get_form_contents( $form, $title, $description, $atts );
2700	2228	self::enqueue_scripts( FrmForm::get_params( $form ) );
2701	2229
2702		- $contents = ob_get_clean();
	2230	+ $contents = ob_get_contents();
	2231	+ ob_end_clean();
2703	2232
2704	2233	self::maybe_minimize_form( $atts, $contents );
2705	2234
2706	2235	return $contents;
		@@ -2705,25 +2234,12 @@
2705	2234
2706	2235	return $contents;
2707	2236	}
2708	2237
2709		- /**
2710		- * @param array $params
2711		- *
2712		- * @return void
2713		- */
2714	2238	public static function enqueue_scripts( $params ) {
2715	2239	do_action( 'frm_enqueue_form_scripts', $params );
2716	2240	}
2717	2241
2718		- /**
2719		- * @param object $form
2720		- * @param bool $title
2721		- * @param bool $description
2722		- * @param array $atts
2723		- *
2724		- * @return void
2725		- */
2726	2242	public static function get_form_contents( $form, $title, $description, $atts ) {
2727	2243	$params = FrmForm::get_params( $form );
2728	2244	$errors = self::get_saved_errors( $form, $params );
2729	2245	$fields = FrmFieldsHelper::get_form_fields( $form->id, $errors );
		@@ -2730,10 +2246,9 @@
2730	2246	$reset = false;
2731	2247	$pass_args = compact( 'form', 'fields', 'errors', 'title', 'description', 'reset' );
2732	2248
2733	2249	$pass_args['action'] = $params['action'];
2734		- // phpcs:ignore WordPress.Security.NonceVerification.Missing, Universal.Operators.StrictComparisons
2735		- $handle_process_here = $params['action'] === 'create' && $params['posted_form_id'] == $form->id && $_POST;
	2250	+ $handle_process_here = $params['action'] === 'create' && $params['posted_form_id'] == $form->id && $_POST; // phpcs:ignore WordPress.Security.NonceVerification.Missing
2736	2251
2737	2252	if ( ! $handle_process_here ) {
2738	2253	FrmFormState::set_initial_value( 'title', $title );
2739	2254	FrmFormState::set_initial_value( 'description', $description );
		@@ -2738,15 +2253,16 @@
2738	2253	FrmFormState::set_initial_value( 'title', $title );
2739	2254	FrmFormState::set_initial_value( 'description', $description );
2740	2255
2741	2256	do_action( 'frm_display_form_action', $params, $fields, $form, $title, $description );
2742		-
2743	2257	if ( apply_filters( 'frm_continue_to_new', true, $form->id, $params['action'] ) ) {
2744	2258	self::show_form_after_submit( $pass_args );
2745	2259	}
2746		- } elseif ( $errors ) {
	2260	+ } elseif ( ! empty( $errors ) ) {
2747	2261	self::show_form_after_submit( $pass_args );
	2262	+
2748	2263	} else {
	2264	+
2749	2265	do_action( 'frm_validate_form_creation', $params, $fields, $form, $title, $description );
2750	2266
2751	2267	if ( apply_filters( 'frm_continue_to_create', true, $form->id ) ) {
2752	2268	$entry_id = self::just_created_entry( $form->id );
		@@ -2769,19 +2285,13 @@
2769	2285	/**
2770	2286	* If the form was processed earlier (init), get the generated errors
2771	2287	*
2772	2288	* @since 2.05
2773		- *
2774		- * @param object $form
2775		- * @param array $params
2776		- *
2777		- * @return array
2778	2289	*/
2779	2290	private static function get_saved_errors( $form, $params ) {
2780	2291	global $frm_vars;
2781	2292
2782		- // phpcs:ignore WordPress.Security.NonceVerification.Missing, Universal.Operators.StrictComparisons
2783		- if ( $params['posted_form_id'] == $form->id && $_POST && isset( $frm_vars['created_entries'][ $form->id ] ) ) {
	2293	+ if ( $params['posted_form_id'] == $form->id && $_POST && isset( $frm_vars['created_entries'][ $form->id ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
2784	2294	$errors = $frm_vars['created_entries'][ $form->id ]['errors'];
2785	2295	} else {
2786	2296	$errors = array();
2787	2297	}
		@@ -2798,16 +2308,13 @@
2798	2308	}
2799	2309
2800	2310	/**
2801	2311	* @since 2.2.7
2802		- *
2803		- * @param int|string $form_id
2804		- *
2805		- * @return int
2806	2312	*/
2807	2313	public static function just_created_entry( $form_id ) {
2808	2314	global $frm_vars;
2809		- 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
	2315	+
	2316	+ 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;
2810	2317	}
2811	2318
2812	2319	/**
2813	2320	* Gets confirmation method.
		@@ -2820,9 +2327,8 @@
2820	2327	*
2821	2328	* @type object $form Form object.
2822	2329	* @type int $entry_id Entry ID.
2823	2330	* }
2824		- *
2825	2331	* @return array|string
2826	2332	*/
2827	2333	private static function get_confirmation_method( $atts ) {
2828	2334	$action = FrmOnSubmitHelper::current_event( $atts );
		@@ -2830,9 +2336,8 @@
2830	2336	$method = ! empty( $atts['form']->options[ $opt ] ) ? $atts['form']->options[ $opt ] : 'message';
2831	2337
2832	2338	if ( ! empty( $atts['entry_id'] ) ) {
2833	2339	$met_actions = self::get_met_on_submit_actions( $atts, $action );
2834		-
2835	2340	if ( $met_actions ) {
2836	2341	$method = $met_actions;
2837	2342	}
2838	2343	}
		@@ -2839,21 +2344,14 @@
2839	2344
2840	2345	$method = apply_filters( 'frm_success_filter', $method, $atts['form'], $action );
2841	2346
2842	2347	if ( $method !== 'message' && ( ! $atts['entry_id'] || ! is_numeric( $atts['entry_id'] ) ) ) {
2843		- return 'message';
	2348	+ $method = 'message';
2844	2349	}
2845	2350
2846	2351	return $method;
2847	2352	}
2848	2353
2849		- /**
2850		- * @param object $form
2851		- * @param array $params
2852		- * @param array $args
2853		- *
2854		- * @return void
2855		- */
2856	2354	public static function maybe_trigger_redirect( $form, $params, $args ) {
2857	2355	if ( ! isset( $params['id'] ) ) {
2858	2356	global $frm_vars;
2859	2357	$params['id'] = $frm_vars['created_entries'][ $form->id ]['entry_id'];
		@@ -2880,12 +2378,14 @@
2880	2378	* @param array $params See {@see FrmFormsController::maybe_trigger_redirect()}.
2881	2379	* @param array $args See {@see FrmFormsController::maybe_trigger_redirect()}.
2882	2380	*/
2883	2381	public static function maybe_trigger_redirect_with_action( $conf_method, $form, $params, $args ) {
2884		- 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
2885		- $event = FrmOnSubmitHelper::current_event( $params );
2886		- FrmOnSubmitHelper::populate_on_submit_data( $form->options, $conf_method[0], $event );
2887		- $conf_method = 'redirect';
	2382	+ if ( is_array( $conf_method ) && 1 === count( $conf_method ) ) {
	2383	+ if ( 'redirect' === FrmOnSubmitHelper::get_action_type( $conf_method[0] ) ) {
	2384	+ $event = FrmOnSubmitHelper::current_event( $params );
	2385	+ FrmOnSubmitHelper::populate_on_submit_data( $form->options, $conf_method[0], $event );
	2386	+ $conf_method = 'redirect';
	2387	+ }
2888	2388	}
2889	2389
2890	2390	if ( 'redirect' === $conf_method ) {
2891	2391	self::trigger_redirect( $form, $params, $args );
		@@ -2891,15 +2391,8 @@
2891	2391	self::trigger_redirect( $form, $params, $args );
2892	2392	}
2893	2393	}
2894	2394
2895		- /**
2896		- * @param object $form
2897		- * @param array $params
2898		- * @param array $args
2899		- *
2900		- * @return void
2901		- */
2902	2395	public static function trigger_redirect( $form, $params, $args ) {
2903	2396	$success_args = array(
2904	2397	'action' => $params['action'],
2905	2398	'conf_method' => 'redirect',
		@@ -2958,9 +2451,8 @@
2958	2451	* @since 6.0
2959	2452	*
2960	2453	* @param array $args See {@see FrmFormsController::run_success_action()}.
2961	2454	* @param string $event Form event. Default is `create`.
2962		- *
2963	2455	* @return array Array of actions that meet the conditional logics.
2964	2456	*/
2965	2457	public static function get_met_on_submit_actions( $args, $event = 'create' ) {
2966	2458	if ( ! FrmOnSubmitHelper::form_has_migrated( $args['form'] ) ) {
		@@ -2987,11 +2479,13 @@
2987	2479	}
2988	2480
2989	2481	$action_type = FrmOnSubmitHelper::get_action_type( $action );
2990	2482
2991		- if ( 'redirect' === $action_type && $has_redirect ) {
2992		- // Do not process because we run the first redirect action only.
2993		- continue;
	2483	+ if ( 'redirect' === $action_type ) {
	2484	+ if ( $has_redirect ) {
	2485	+ // Do not process because we run the first redirect action only.
	2486	+ continue;
	2487	+ }
2994	2488	}
2995	2489
2996	2490	if ( ! self::is_valid_on_submit_action( $action, $args, $event ) ) {
2997	2491	continue;
		@@ -3016,10 +2510,10 @@
3016	2510	* @param array $args See {@see FrmFormsController::run_success_action()}. `$args['event']` is also added.
3017	2511	*/
3018	2512	$met_actions = apply_filters( 'frm_get_met_on_submit_actions', $met_actions, $args );
3019	2513
3020		- if ( ! $met_actions ) {
3021		- return array( FrmOnSubmitHelper::get_fallback_action( $event ) );
	2514	+ if ( empty( $met_actions ) ) {
	2515	+ $met_actions = array( FrmOnSubmitHelper::get_fallback_action( $event ) );
3022	2516	}
3023	2517
3024	2518	return $met_actions;
3025	2519	}
		@@ -3031,9 +2525,8 @@
3031	2525	*
3032	2526	* @param object $action Form action object.
3033	2527	* @param array $args See {@see FrmFormsController::run_success_action()}.
3034	2528	* @param string $event Form event. Default is `create`.
3035		- *
3036	2529	* @return bool
3037	2530	*/
3038	2531	private static function is_valid_on_submit_action( $action, $args, $event = 'create' ) {
3039	2532	$action_type = FrmOnSubmitHelper::get_action_type( $action );
		@@ -3055,9 +2548,8 @@
3055	2548	return false;
3056	2549	}
3057	2550
3058	2551	$page = get_post( $action->post_content['success_page_id'] );
3059		-
3060	2552	if ( ! $page || 'trash' === $page->post_status ) {
3061	2553	return false;
3062	2554	}
3063	2555	}
		@@ -3079,9 +2571,8 @@
3079	2571	'entry_id' => $args['entry_id'],
3080	2572	'action' => FrmOnSubmitHelper::current_event( $args ),
3081	2573	)
3082	2574	);
3083		-
3084	2575	if ( ! is_array( $args['conf_method'] ) ) {
3085	2576	self::run_success_action( $args );
3086	2577	return;
3087	2578	}
		@@ -3108,9 +2599,8 @@
3108	2599	* @param array $args See {@see FrmFormsController::run_success_action()}.
3109	2600	*/
3110	2601	public static function run_multi_on_submit_actions( $args ) {
3111	2602	$redirect_action = null;
3112		-
3113	2603	foreach ( $args['conf_method'] as $action ) {
3114	2604	if ( 'redirect' === FrmOnSubmitHelper::get_action_type( $action ) ) {
3115	2605	// We catch the redirect action to run it last.
3116	2606	$redirect_action = $action;
		@@ -3121,15 +2611,13 @@
3121	2611
3122	2612	unset( $action );
3123	2613	}
3124	2614
3125		- if ( ! $redirect_action ) {
3126		- return;
	2615	+ if ( $redirect_action ) {
	2616	+ // Show script to delay the redirection.
	2617	+ $args['force_delay_redirect'] = true;
	2618	+ self::run_single_on_submit_action( $args, $redirect_action );
3127	2619	}
3128		-
3129		- // Show script to delay the redirection.
3130		- $args['force_delay_redirect'] = true;
3131		- self::run_single_on_submit_action( $args, $redirect_action );
3132	2620	}
3133	2621
3134	2622	/**
3135	2623	* Runs single On Submit action.
		@@ -3150,9 +2638,8 @@
3150	2638	* @since 6.0
3151	2639	*
3152	2640	* @param array $args See {@see FrmFormsController::run_success_action()}.
3153	2641	* @param object $action On Submit action object.
3154		- *
3155	2642	* @return array
3156	2643	*/
3157	2644	private static function get_run_success_action_args( $args, $action ) {
3158	2645	$new_args = $args;
		@@ -3158,9 +2645,10 @@
3158	2645	$new_args = $args;
3159	2646
3160	2647	FrmOnSubmitHelper::populate_on_submit_data( $new_args['form']->options, $action, $args['action'] );
3161	2648
3162		- $opt = 'update' === $args['action'] ? 'edit_' : 'success_';
	2649	+ $opt = 'update' === $args['action'] ? 'edit_' : 'success_';
	2650	+
3163	2651	$new_args['conf_method'] = $new_args['form']->options[ $opt . 'action' ];
3164	2652
3165	2653	/**
3166	2654	* Filters the run success action args.
		@@ -3175,18 +2663,12 @@
3175	2663	}
3176	2664
3177	2665	/**
3178	2666	* @since 3.0
3179		- *
3180		- * @param array $args
3181		- *
3182		- * @return void
3183	2667	*/
3184	2668	private static function load_page_after_submit( $args ) {
3185	2669	global $post;
3186	2670	$opt = $args['success_opt'];
3187		-
3188		- // phpcs:ignore Universal.Operators.StrictComparisons
3189	2671	if ( ! $post || $args['form']->options[ $opt . '_page_id' ] != $post->ID ) {
3190	2672	$page = get_post( $args['form']->options[ $opt . '_page_id' ] );
3191	2673	$old_post = $post;
3192	2674	$post = $page;
		@@ -3210,9 +2692,8 @@
3210	2692	}
3211	2693
3212	2694	/**
3213	2695	* @since 3.0
3214		- *
3215	2696	* @param array $args See {@see FrmFormsController::run_success_action()}.
3216	2697	*/
3217	2698	private static function redirect_after_submit( $args ) {
3218	2699	add_filter( 'frm_use_wpautop', '__return_false' );
		@@ -3226,10 +2707,11 @@
3226	2707	FrmEntriesController::delete_entry_before_redirect( $success_url, $args['form'], $args );
3227	2708
3228	2709	add_filter( 'frm_redirect_url', 'FrmEntriesController::prepare_redirect_url' );
3229	2710	$success_url = apply_filters( 'frm_redirect_url', $success_url, $args['form'], $args );
3230		- $doing_ajax = FrmAppHelper::doing_ajax();
3231	2711
	2712	+ $doing_ajax = FrmAppHelper::doing_ajax();
	2713	+
3232	2714	if ( ! empty( $args['ajax'] ) && $doing_ajax && empty( $args['force_delay_redirect'] ) ) {
3233	2715	// Is AJAX submit and there is just one Redirect action runs.
3234	2716	echo json_encode( self::get_ajax_redirect_response_data( $args + compact( 'success_url' ) ) );
3235	2717	wp_die();
		@@ -3234,9 +2716,9 @@
3234	2716	echo json_encode( self::get_ajax_redirect_response_data( $args + compact( 'success_url' ) ) );
3235	2717	wp_die();
3236	2718	}
3237	2719
3238		- if ( ! headers_sent() && empty( $args['force_delay_redirect'] ) && empty( $args['form']->options['redirect_delay'] ) ) {
	2720	+ if ( ! headers_sent() && empty( $args['force_delay_redirect'] ) ) {
3239	2721	// Not AJAX submit, no headers sent, and there is just one Redirect action runs.
3240	2722	if ( ! empty( $args['form']->options['open_in_new_tab'] ) ) {
3241	2723	self::print_open_in_new_tab_js_with_fallback_handler( $success_url, $args );
3242	2724	self::$redirected_in_new_tab[ $args['form']->id ] = 1;
		@@ -3278,51 +2760,31 @@
3278	2760	*
3279	2761	* @since 6.3.1
3280	2762	*
3281	2763	* @param array $args See {@see FrmFormsController::run_success_action()}.
3282		- *
3283	2764	* @return array
3284	2765	*/
3285	2766	private static function get_ajax_redirect_response_data( $args ) {
3286		- $response_data = array(
3287		- 'redirect' => $args['success_url'],
3288		- 'content' => '',
3289		- );
3290		- $unset_content = true;
	2767	+ $response_data = array( 'redirect' => $args['success_url'] );
3291	2768
3292		- if ( ! empty( $args['form']->options['redirect_delay'] ) ) {
3293		- $response_data['delay'] = $args['form']->options['redirect_delay_time'];
3294		- $response_data['content'] .= self::get_redirect_message( $args['success_url'], $args['form']->options['redirect_delay_msg'], $args );
3295		- $unset_content = false;
3296		- }
3297		-
3298	2769	if ( ! empty( $args['form']->options['open_in_new_tab'] ) ) {
3299	2770	$response_data['openInNewTab'] = 1;
3300	2771
3301		- // Only show open in new tab text if there is no delay.
3302		- if ( empty( $response_data['content'] ) ) {
3303		- $args['message'] = FrmOnSubmitHelper::get_default_new_tab_msg();
	2772	+ $args['message'] = FrmOnSubmitHelper::get_default_new_tab_msg();
3304	2773
3305		- $args['form']->options['success_msg'] = $args['message'];
3306		- $args['form']->options['edit_msg'] = $args['message'];
	2774	+ $args['form']->options['success_msg'] = $args['message'];
	2775	+ $args['form']->options['edit_msg'] = $args['message'];
	2776	+ if ( ! isset( $args['fields'] ) ) {
	2777	+ $args['fields'] = FrmField::get_all_for_form( $args['form']->id );
	2778	+ }
3307	2779
3308		- if ( ! isset( $args['fields'] ) ) {
3309		- $args['fields'] = FrmField::get_all_for_form( $args['form']->id );
3310		- }
	2780	+ $args['message'] = self::prepare_submit_message( $args['form'], $args['entry_id'], $args );
3311	2781
3312		- $args['message'] = self::prepare_submit_message( $args['form'], $args['entry_id'], $args );
	2782	+ ob_start();
	2783	+ self::show_lone_success_message( $args );
	2784	+ $response_data['content'] = ob_get_clean();
3313	2785
3314		- ob_start();
3315		- self::show_lone_success_message( $args );
3316		- $response_data['content'] .= ob_get_clean();
3317		- $unset_content = false;
3318		- }//end if
3319		-
3320	2786	$response_data['fallbackMsg'] = self::get_redirect_fallback_message( $args['success_url'], $args );
3321		- }//end if
3322		-
3323		- if ( $unset_content && '' === $response_data['content'] ) {
3324		- unset( $response_data['content'] );
3325	2787	}
3326	2788
3327	2789	return $response_data;
3328	2790	}
		@@ -3334,9 +2796,9 @@
3334	2796	*
3335	2797	* @param array $args See {@see FrmFormsController::run_success_action()}.
3336	2798	*/
3337	2799	private static function redirect_after_submit_using_js( $args ) {
3338		- $success_msg = $args['form']->options['redirect_delay_msg'];
	2800	+ $success_msg = FrmOnSubmitHelper::get_default_redirect_msg();
3339	2801	$redirect_msg = self::get_redirect_message( $args['success_url'], $success_msg, $args );
3340	2802	$success_url = esc_url_raw( $args['success_url'] );
3341	2803
3342	2804	/**
		@@ -3345,9 +2807,9 @@
3345	2807	* @since 6.0
3346	2808	*
3347	2809	* @param int $delay_time Delay time in milliseconds.
3348	2810	*/
3349		- $delay_time = apply_filters( 'frm_redirect_delay_time', 1000 * $args['form']->options['redirect_delay_time'] );
	2811	+ $delay_time = apply_filters( 'frm_redirect_delay_time', 8000 );
3350	2812
3351	2813	if ( ! empty( $args['form']->options['open_in_new_tab'] ) ) {
3352	2814	$redirect_js = 'window.open("' . $success_url . '", "_blank")';
3353	2815	} else {
		@@ -3357,15 +2819,13 @@
3357	2819	add_filter( 'frm_use_wpautop', '__return_true' );
3358	2820
3359	2821	echo FrmAppHelper::maybe_kses( $redirect_msg ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
3360	2822	echo '<script>';
3361		-
3362	2823	if ( empty( $args['doing_ajax'] ) ) {
3363	2824	// Not AJAX submit, delay JS until window.load.
3364	2825	echo 'window.onload=function(){';
3365	2826	}
3366	2827	echo 'setTimeout(function(){' . $redirect_js . '}, ' . intval( $delay_time ) . ');'; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
3367		-
3368	2828	if ( empty( $args['doing_ajax'] ) ) {
3369	2829	echo '};';
3370	2830	}
3371	2831	echo '</script>';
		@@ -3378,16 +2838,11 @@
3378	2838	* @param string $success_msg
3379	2839	* @param array $args
3380	2840	*/
3381	2841	private static function get_redirect_message( $success_url, $success_msg, $args ) {
3382		- $success_msg = apply_filters( 'frm_content', $success_msg, $args['form'], $args['entry_id'] );
3383		- $success_msg = do_shortcode( FrmAppHelper::use_wpautop( $success_msg ) );
3384		-
3385		- // phpcs:disable Generic.WhiteSpace.ScopeIndent
3386		- $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
	2842	+ $redirect_msg = '<div class="' . esc_attr( FrmFormsHelper::get_form_style_class( $args['form'] ) ) . '"><div class="frm-redirect-msg" role="status">' . $success_msg . '<br/>' .
3387	2843	self::get_redirect_fallback_message( $success_url, $args ) .
3388	2844	'</div></div>';
3389		- // phpcs:enable Generic.WhiteSpace.ScopeIndent
3390	2845
3391	2846	$redirect_args = array(
3392	2847	'entry_id' => $args['entry_id'],
3393	2848	'form_id' => $args['form']->id,
		@@ -3403,14 +2858,12 @@
3403	2858	* @since 6.3.1
3404	2859	*
3405	2860	* @param string $success_url Redirect URL.
3406	2861	* @param array $args Contains `form` object.
3407		- *
3408	2862	* @return string
3409	2863	*/
3410	2864	private static function get_redirect_fallback_message( $success_url, $args ) {
3411	2865	$target = '';
3412		-
3413	2866	if ( ! empty( $args['form']->options['open_in_new_tab'] ) ) {
3414	2867	$target = ' target="_blank"';
3415	2868	}
3416	2869
		@@ -3425,12 +2878,8 @@
3425	2878	/**
3426	2879	* Prepare to show the success message and empty form after submit
3427	2880	*
3428	2881	* @since 2.05
3429		- *
3430		- * @param array $atts
3431		- *
3432		- * @return void
3433	2882	*/
3434	2883	public static function show_message_after_save( $atts ) {
3435	2884	$atts['message'] = self::prepare_submit_message( $atts['form'], $atts['entry_id'], $atts );
3436	2885
		@@ -3436,9 +2885,8 @@
3436	2885
3437	2886	if ( ! isset( $atts['form']->options['show_form'] ) || $atts['form']->options['show_form'] ) {
3438	2887	if ( isset( $atts['action'] ) && 'update' === $atts['action'] && is_callable( array( 'FrmProEntriesController', 'show_front_end_form_with_entry' ) ) ) {
3439	2888	$entry = FrmEntry::getOne( $atts['entry_id'] );
3440		-
3441	2889	if ( $entry ) {
3442	2890	// This is copied from the Pro plugin.
3443	2891	$atts['conf_message'] = FrmProEntriesController::confirmation( 'message', $atts['form'], $atts['form']->options, $entry->id, $atts );
3444	2892	$atts['show_form'] = FrmProEntriesController::is_form_displayed_after_edit( $atts['form'] );
		@@ -3455,12 +2903,8 @@
3455	2903	/**
3456	2904	* Show an empty form
3457	2905	*
3458	2906	* @since 2.05
3459		- *
3460		- * @param array $args
3461		- *
3462		- * @return void
3463	2907	*/
3464	2908	private static function show_form_after_submit( $args ) {
3465	2909	self::fill_atts_for_form_display( $args );
3466	2910
		@@ -3479,11 +2923,12 @@
3479	2923	}
3480	2924	unset( $args );
3481	2925
3482	2926	$include_form_tag = apply_filters( 'frm_include_form_tag', true, $form );
3483		- $frm_settings = FrmAppHelper::get_settings();
3484		- $submit = $form->options['submit_value'] ?? $frm_settings->submit_value;
3485	2927
	2928	+ $frm_settings = FrmAppHelper::get_settings();
	2929	+ $submit = isset( $form->options['submit_value'] ) ? $form->options['submit_value'] : $frm_settings->submit_value;
	2930	+
3486	2931	global $frm_vars;
3487	2932	self::maybe_load_css( $form, $values['custom_style'], $frm_vars['load_css'] );
3488	2933
3489	2934	$message_placement = self::message_placement( $form, $message );
		@@ -3491,36 +2936,25 @@
3491	2936	include FrmAppHelper::plugin_path() . '/classes/views/frm-entries/new.php';
3492	2937	}
3493	2938
3494	2939	/**
3495		- * Gets message placement.
3496		- *
3497	2940	* @since 4.05.02
3498		- * @since 6.26 This method changed from `private` to `public`.
3499		- *
3500		- * @param object $form Form object.
3501		- * @param string $message The message.
3502		- *
3503		- * @return string Accepts 'before', 'after', or 'submit'.
	2941	+ * @return string - 'before', 'after', or 'submit'
3504	2942	*/
3505		- public static function message_placement( $form, $message ) {
	2943	+ private static function message_placement( $form, $message ) {
3506	2944	$place = 'before';
3507	2945
3508	2946	if ( $message && isset( $form->options['form_class'] ) ) {
3509		- if ( str_contains( $form->options['form_class'], 'frm_below_success' ) ) {
	2947	+ if ( strpos( $form->options['form_class'], 'frm_below_success' ) !== false ) {
3510	2948	$place = 'after';
3511		- } elseif ( str_contains( $form->options['form_class'], 'frm_inline_success' ) ) {
	2949	+ } elseif ( strpos( $form->options['form_class'], 'frm_inline_success' ) !== false ) {
3512	2950	$place = 'submit';
3513	2951	}
3514	2952	}
3515	2953
3516	2954	/**
3517		- * Filter the message placement.
3518		- *
3519	2955	* @since 4.05.02
3520		- *
3521		- * @param string $place Accepts 'before', 'after', or 'submit'.
3522		- * @param array $args Args.
	2956	+ * @return string - 'before' or 'after'
3523	2957	*/
3524	2958	return apply_filters( 'frm_message_placement', $place, compact( 'form', 'message' ) );
3525	2959	}
3526	2960
		@@ -3527,12 +2961,8 @@
3527	2961	/**
3528	2962	* Get all the values needed on the new.php entry page
3529	2963	*
3530	2964	* @since 2.05
3531		- *
3532		- * @param array $args
3533		- *
3534		- * @return void
3535	2965	*/
3536	2966	private static function fill_atts_for_form_display( &$args ) {
3537	2967	if ( ! isset( $args['title'] ) && isset( $args['show_title'] ) ) {
3538	2968	$args['title'] = $args['show_title'];
		@@ -3557,12 +2987,8 @@
3557	2987	/**
3558	2988	* Show the success message without the form
3559	2989	*
3560	2990	* @since 2.05
3561		- *
3562		- * @param array $atts
3563		- *
3564		- * @return void
3565	2991	*/
3566	2992	private static function show_lone_success_message( $atts ) {
3567	2993	global $frm_vars;
3568	2994	$values = FrmEntriesHelper::setup_new_vars( $atts['fields'], $atts['form'], true );
		@@ -3568,12 +2994,13 @@
3568	2994	$values = FrmEntriesHelper::setup_new_vars( $atts['fields'], $atts['form'], true );
3569	2995	self::maybe_load_css( $atts['form'], $values['custom_style'], $frm_vars['load_css'] );
3570	2996
3571	2997	$include_extra_container = 'frm_forms' . FrmFormsHelper::get_form_style_class( $values );
3572		- $errors = array();
3573		- $form = $atts['form'];
3574		- $message = $atts['message'];
3575	2998
	2999	+ $errors = array();
	3000	+ $form = $atts['form'];
	3001	+ $message = $atts['message'];
	3002	+
3576	3003	include FrmAppHelper::plugin_path() . '/classes/views/frm-entries/errors.php';
3577	3004	}
3578	3005
3579	3006	/**
		@@ -3581,20 +3008,19 @@
3581	3008	*
3582	3009	* @since 2.05
3583	3010	* @since 6.0.x Added the third parameter.
3584	3011	*
3585		- * @param object $form Form object.
3586		- * @param int|string $entry_id Entry ID.
3587		- * @param array $args See {@see FrmFormsController::run_success_action()}.
3588		- *
	3012	+ * @param object $form Form object.
	3013	+ * @param int $entry_id Entry ID.
	3014	+ * @param array $args See {@see FrmFormsController::run_success_action()}.
3589	3015	* @return string
3590	3016	*/
3591	3017	private static function prepare_submit_message( $form, $entry_id, $args = array() ) {
3592	3018	$frm_settings = FrmAppHelper::get_settings( array( 'current_form' => $form->id ) );
3593		- $opt = $args['success_opt'] ?? 'success';
	3019	+ $opt = isset( $args['success_opt'] ) ? $args['success_opt'] : 'success';
3594	3020
3595	3021	if ( $entry_id && is_numeric( $entry_id ) ) {
3596		- $message = $form->options[ $opt . '_msg' ] ?? $frm_settings->success_msg;
	3022	+ $message = isset( $form->options[ $opt . '_msg' ] ) ? $form->options[ $opt . '_msg' ] : $frm_settings->success_msg;
3597	3023	$class = 'frm_message';
3598	3024	} else {
3599	3025	$message = $frm_settings->failed_msg;
3600	3026	$class = FrmFormsHelper::form_error_class();
		@@ -3611,9 +3037,9 @@
3611	3037	public static function front_head() {
3612	3038	$version = FrmAppHelper::plugin_version();
3613	3039	$suffix = FrmAppHelper::js_suffix();
3614	3040
3615		- if ( $suffix && self::has_combo_js_file() ) {
	3041	+ if ( ! empty( $suffix ) && self::has_combo_js_file() ) {
3616	3042	wp_register_script( 'formidable', FrmAppHelper::plugin_url() . '/js/frm.min.js', array( 'jquery' ), $version, true );
3617	3043	} else {
3618	3044	wp_register_script( 'formidable', FrmAppHelper::plugin_url() . "/js/formidable{$suffix}.js", array( 'jquery' ), $version, true );
3619	3045	}
		@@ -3620,9 +3046,9 @@
3620	3046
3621	3047	add_filter( 'script_loader_tag', 'FrmFormsController::defer_script_loading', 10, 2 );
3622	3048
3623	3049	if ( FrmAppHelper::is_admin() ) {
3624		- // Don't load this in back-end
	3050	+ // don't load this in back-end
3625	3051	return;
3626	3052	}
3627	3053
3628	3054	FrmAppHelper::localize_script( 'front' );
		@@ -3635,15 +3061,8 @@
3635	3061	public static function has_combo_js_file() {
3636	3062	return is_readable( FrmAppHelper::plugin_path() . '/js/frm.min.js' );
3637	3063	}
3638	3064
3639		- /**
3640		- * @param object $form
3641		- * @param int|string $this_load
3642		- * @param bool $global_load
3643		- *
3644		- * @return void
3645		- */
3646	3065	public static function maybe_load_css( $form, $this_load, $global_load ) {
3647	3066	$load_css = FrmForm::is_form_loaded( $form, $this_load, $global_load );
3648	3067
3649	3068	if ( ! $load_css ) {
		@@ -3673,9 +3092,8 @@
3673	3092	return;
3674	3093	}
3675	3094
3676	3095	global $wp_styles;
3677		-
3678	3096	if ( is_array( $wp_styles->queue ) && in_array( 'formidable', $wp_styles->queue, true ) ) {
3679	3097	wp_print_styles( 'formidable' );
3680	3098	}
3681	3099	}
		@@ -3690,57 +3108,32 @@
3690	3108	private static function should_load_late() {
3691	3109	return ! function_exists( 'aioseo' );
3692	3110	}
3693	3111
3694		- /**
3695		- * @param string $tag
3696		- * @param string $handle
3697		- *
3698		- * @return string
3699		- */
3700	3112	public static function defer_script_loading( $tag, $handle ) {
3701		- if ( 'captcha-api' === $handle && ! str_contains( $tag, 'defer' ) ) {
3702		- return str_replace( ' src', ' defer="defer" async="async" src', $tag );
	3113	+ if ( 'captcha-api' == $handle && ! strpos( $tag, 'defer' ) ) {
	3114	+ $tag = str_replace( ' src', ' defer="defer" async="async" src', $tag );
3703	3115	}
3704	3116
3705	3117	return $tag;
3706	3118	}
3707	3119
3708		- /**
3709		- * @param string $location
3710		- *
3711		- * @return void
3712		- */
3713	3120	public static function footer_js( $location = 'footer' ) {
3714	3121	global $frm_vars;
3715	3122
3716	3123	FrmStylesController::enqueue_css();
3717	3124
3718		- if ( FrmAppHelper::is_admin() || $location === 'header' || empty( $frm_vars['forms_loaded'] ) ) {
3719		- return;
	3125	+ if ( ! FrmAppHelper::is_admin() && $location !== 'header' && ! empty( $frm_vars['forms_loaded'] ) ) {
	3126	+ // load formidable js
	3127	+ wp_enqueue_script( 'formidable' );
3720	3128	}
3721		-
3722		- // Load formidable js
3723		- wp_enqueue_script( 'formidable' );
3724		-
3725		- FrmHoneypot::maybe_print_honeypot_js();
3726		-
3727		- if ( ! method_exists( 'FrmProFormsHelper', 'load_currency_js' ) ) {
3728		- // Load currency JS if Pro is not installed.
3729		- FrmFormsHelper::load_currency_js();
3730		- }
3731	3129	}
3732	3130
3733	3131	/**
3734	3132	* @since 2.0.8
3735		- *
3736		- * @param array $atts
3737		- * @param string $content
3738		- *
3739		- * @return void
3740	3133	*/
3741	3134	private static function maybe_minimize_form( $atts, &$content ) {
3742		- // Check if minimizing is turned on
	3135	+ // check if minimizing is turned on
3743	3136	if ( self::is_minification_on( $atts ) ) {
3744	3137	$content = str_replace( array( "\r\n", "\r", "\n", "\t", ' ' ), '', $content );
3745	3138	}
3746	3139	}
		@@ -3746,11 +3139,8 @@
3746	3139	}
3747	3140
3748	3141	/**
3749	3142	* @since 2.0.8
3750		- *
3751		- * @param array $atts
3752		- *
3753	3143	* @return bool
3754	3144	*/
3755	3145	private static function is_minification_on( $atts ) {
3756	3146	return ! empty( $atts['minimize'] );
		@@ -3762,13 +3152,11 @@
3762	3152	* @return void
3763	3153	*/
3764	3154	public static function landing_page_preview_option() {
3765	3155	$dir = apply_filters( 'frm_landing_page_preview_option', false );
3766		-
3767	3156	if ( false === $dir || ! file_exists( $dir . 'landing-page-preview-option.php' ) ) {
3768	3157	$dir = self::get_form_views_path();
3769	3158	}
3770		-
3771	3159	include $dir . 'landing-page-preview-option.php';
3772	3160	}
3773	3161
3774	3162	/**
		@@ -3794,15 +3182,13 @@
3794	3182
3795	3183	check_ajax_referer( 'frm_ajax', 'nonce' );
3796	3184
3797	3185	$type = FrmAppHelper::get_post_param( 'type', '', 'sanitize_text_field' );
3798		-
3799	3186	if ( ! $type || ! in_array( $type, array( 'form', 'view' ), true ) ) {
3800	3187	die( 0 );
3801	3188	}
3802	3189
3803	3190	$object_id = FrmAppHelper::get_post_param( 'object_id', '', 'absint' );
3804		-
3805	3191	if ( ! $object_id ) {
3806	3192	die( 0 );
3807	3193	}
3808	3194
		@@ -3814,15 +3200,13 @@
3814	3200	$postarr['post_content'] = apply_filters( 'frm_create_page_with_' . $type . '_shortcode_content', '', $object_id );
3815	3201	}
3816	3202
3817	3203	$name = FrmAppHelper::get_post_param( 'name', '', 'sanitize_text_field' );
3818		-
3819	3204	if ( $name ) {
3820	3205	$postarr['post_title'] = $name;
3821	3206	}
3822	3207
3823	3208	$success = wp_insert_post( $postarr );
3824		-
3825	3209	if ( ! is_numeric( $success ) || ! $success ) {
3826	3210	die( 0 );
3827	3211	}
3828	3212
		@@ -3836,9 +3220,8 @@
3836	3220	/**
3837	3221	* @since 5.3
3838	3222	*
3839	3223	* @param int $form_id
3840		- *
3841	3224	* @return string
3842	3225	*/
3843	3226	private static function get_page_shortcode_content_for_form( $form_id ) {
3844	3227	$shortcode = '[formidable id="' . $form_id . '"]';
		@@ -3858,9 +3241,9 @@
3858	3241	}
3859	3242
3860	3243	check_ajax_referer( 'frm_ajax', 'nonce' );
3861	3244
3862		- $html = FrmAppHelper::clip(
	3245	+ $html = FrmAppHelper::clip(
3863	3246	function () {
3864	3247	FrmAppHelper::maybe_autocomplete_pages_options(
3865	3248	array(
3866	3249	'field_name' => 'frm_page_dropdown',
		@@ -3869,53 +3252,19 @@
3869	3252	)
3870	3253	);
3871	3254	}
3872	3255	);
	3256	+ $post_type_object = get_post_type_object( 'page' );
3873	3257	wp_send_json(
3874	3258	array(
3875	3259	'html' => $html,
3876		- 'edit_page_url' => admin_url( sprintf( get_post_type_object( 'page' )->_edit_link . '&action=edit', 0 ) ),
	3260	+ 'edit_page_url' => admin_url( sprintf( $post_type_object->_edit_link . '&action=edit', 0 ) ),
3877	3261	)
3878	3262	);
3879	3263	}
3880	3264
3881	3265	/**
3882		- * Prints necessary templates for the forms list page.
3883		- *
3884		- * @since 6.32
3885		- *
3886		- * @return void
3887		- */
3888		- public static function print_forms_list_templates() {
3889		- if ( ! FrmAppHelper::on_form_listing_page() ) {
3890		- return;
3891		- }
3892		-
3893		- $screen = get_current_screen();
3894		-
3895		- if ( ! $screen ) {
3896		- return;
3897		- }
3898		-
3899		- $columns = get_column_headers( $screen );
3900		- $hidden = get_hidden_columns( $screen );
3901		- $skip_cols = array( 'cb', 'name', 'settings' );
3902		- $per_page = get_user_option( 'formidable_page_formidable_per_page' );
3903		- $show_screen_options = $screen->show_screen_options();
3904		-
3905		- if ( $per_page < 1 ) {
3906		- $per_page = 20;
3907		- }
3908		-
3909		- include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/forms-list-settings.php';
3910		- }
3911		-
3912		- /**
3913	3266	* @deprecated 4.0
3914		- *
3915		- * @param array $values
3916		- *
3917		- * @return void
3918	3267	*/
3919	3268	public static function create( $values = array() ) {
3920	3269	_deprecated_function( __METHOD__, '4.0', 'FrmFormsController::update' );
3921	3270	self::update( $values );
		@@ -3921,14 +3270,13 @@
3921	3270	self::update( $values );
3922	3271	}
3923	3272
3924	3273	/**
3925		- * @deprecated 6.33
	3274	+ * @deprecated 6.7
3926	3275	*
3927		- * @param array $values
3928		- *
3929		- * @return void
	3276	+ * @return bool
3930	3277	*/
3931		- public static function render_spam_settings( $values ) {
3932		- _deprecated_function( __METHOD__, '6.33' );
	3278	+ public static function expired() {
	3279	+ _deprecated_function( __METHOD__, '6.7' );
	3280	+ return FrmAddonsController::is_license_expired();
3933	3281	}
3934	3282	}