← All changes | classes/controllers/FrmFormsController.php +619 -1281 6.31 → 6.2.1 View file →

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