← All changes | classes/controllers/FrmFormsController.php +614 -1275 6.29 → 6.2 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,33 +150,21 @@
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
		@@ -271,9 +172,8 @@
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,27 +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		- $menu_name = FrmAppHelper::get_menu_name();
1077		- $icon = apply_filters( 'frm_media_icon', FrmAppHelper::svg_logo() );
1078		- self::$formidable_tinymce_button = '<a href="#TB_inline?width=50&height=50&inlineId=frm_insert_form" class="thickbox button add_media frm_insert_form" title="' . esc_attr__( 'Add forms and content', 'formidable' ) . '">' . FrmAppHelper::kses( $icon, 'all' ) . ' ' . esc_html( $menu_name ) . '</a>'; // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong
	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>';
1079	752	}
1080		- echo self::$formidable_tinymce_button; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
1081	753	}
1082	754
1083	755	/**
1084	756	* @return void
		@@ -1099,21 +771,17 @@
1099	771	$shortcodes = apply_filters( 'frm_popup_shortcodes', $shortcodes );
1100	772
1101	773	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/insert_form_popup.php';
1102	774
1103		- if ( ! FrmAppHelper::is_form_builder_page() || class_exists( '_WP_Editors', false ) ) {
1104		- 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
1105	783	}
1106		-
1107		- // Initialize a wysiwyg so we have usable settings defined in tinyMCEPreInit.mceInit
1108		- require ABSPATH . WPINC . '/class-wp-editor.php';
1109		- // phpcs:disable Generic.WhiteSpace.ScopeIndent
1110		- ?>
1111		- <div class="frm_hidden">
1112		- <?php wp_editor( '', 'frm_description_placeholder', array() ); ?>
1113		- </div>
1114		- <?php
1115		- // phpcs:enable Generic.WhiteSpace.ScopeIndent
1116	784	}
1117	785
1118	786	/**
1119	787	* Check the page being loaded, determine if this is a page that should include the form popup.
		@@ -1125,9 +793,8 @@
1125	793	private static function should_insert_form_popup() {
1126	794	if ( FrmAppHelper::is_form_builder_page() ) {
1127	795	return true;
1128	796	}
1129		-
1130	797	$page = basename( FrmAppHelper::get_server_value( 'PHP_SELF' ) );
1131	798	return in_array( $page, array( 'post.php', 'page.php', 'page-new.php', 'post-new.php' ), true );
1132	799	}
1133	800
		@@ -1135,10 +802,9 @@
1135	802	FrmAppHelper::permission_check( 'frm_view_forms' );
1136	803	check_ajax_referer( 'frm_ajax', 'nonce' );
1137	804
1138	805	$shortcode = FrmAppHelper::get_post_param( 'shortcode', '', 'sanitize_text_field' );
1139		-
1140		- if ( ! $shortcode ) {
	806	+ if ( empty( $shortcode ) ) {
1141	807	wp_die();
1142	808	}
1143	809
1144	810	echo '<div id="sc-opts-' . esc_attr( $shortcode ) . '" class="frm_shortcode_option">';
		@@ -1163,18 +829,17 @@
1163	829	'label' => __( 'Minimize form HTML', 'formidable' ),
1164	830	),
1165	831	);
1166	832	}
1167		-
1168	833	$opts = apply_filters( 'frm_sc_popup_opts', $opts, $shortcode );
1169	834
1170	835	if ( isset( $opts['form_id'] ) && is_string( $opts['form_id'] ) ) {
1171		- // Allow other shortcodes to use the required form id option
	836	+ // allow other shortcodes to use the required form id option
1172	837	$form_id = $opts['form_id'];
1173	838	unset( $opts['form_id'] );
1174	839	}
1175	840
1176		- include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/shortcode_opts.php';
	841	+ include( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/shortcode_opts.php' );
1177	842
1178	843	echo '</div>';
1179	844
1180	845	wp_die();
		@@ -1185,9 +850,8 @@
1185	850	*
1186	851	* @param array $params
1187	852	* @param string $message
1188	853	* @param array $errors
1189		- *
1190	854	* @return void
1191	855	*/
1192	856	public static function display_forms_list( $params = array(), $message = '', $errors = array() ) {
1193	857	FrmAppHelper::permission_check( 'frm_view_forms' );
		@@ -1204,46 +868,35 @@
1204	868	* @param string $table_class Class name for List Helper.
1205	869	*/
1206	870	$table_class = apply_filters( 'frm_forms_list_class', 'FrmFormsListHelper' );
1207	871	$wp_list_table = new $table_class( compact( 'params' ) );
1208		- $pagenum = $wp_list_table->get_pagenum();
1209	872
	873	+ $pagenum = $wp_list_table->get_pagenum();
	874	+
1210	875	$wp_list_table->prepare_items();
1211	876
1212	877	$total_pages = $wp_list_table->get_pagination_arg( 'total_pages' );
1213		-
1214	878	if ( $pagenum > $total_pages && $total_pages > 0 ) {
1215		- wp_safe_redirect( esc_url_raw( add_query_arg( 'paged', $total_pages ) ) );
	879	+ wp_redirect( esc_url_raw( add_query_arg( 'paged', $total_pages ) ) );
1216	880	die();
1217	881	}
1218	882
1219		- $error = FrmInbox::check_for_error();
1220		-
1221		- if ( $error ) {
1222		- $show_messages = array( $error['subject'] . '. ' . $error['message'] );
1223		- }
1224		-
1225	883	require FrmAppHelper::plugin_path() . '/classes/views/frm-forms/list.php';
1226	884	}
1227	885
1228	886	/**
1229	887	* @param array<string,string> $columns
1230		- *
1231	888	* @return array<string,string>
1232	889	*/
1233	890	public static function get_columns( $columns ) {
1234		- $columns['cb'] = '<input type="checkbox" />';
1235		- $columns['name'] = esc_html__( 'Form Title', 'formidable' );
1236		- $columns['entries'] = esc_html__( 'Entries', 'formidable' );
1237		- $columns['id'] = 'ID';
1238		- $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' );
1239	898
1240		- if ( 'trash' !== FrmAppHelper::simple_get( 'form_type' ) ) {
1241		- $columns['shortcode'] = esc_html__( 'Actions', 'formidable' );
1242		- }
1243		-
1244		- $columns['created_at'] = esc_html__( 'Date', 'formidable' );
1245		-
1246	899	add_screen_option(
1247	900	'per_page',
1248	901	array(
1249	902	'label' => __( 'Forms', 'formidable' ),
		@@ -1254,11 +907,8 @@
1254	907
1255	908	return $columns;
1256	909	}
1257	910
1258		- /**
1259		- * @return array<string,string>
1260		- */
1261	911	public static function get_sortable_columns() {
1262	912	return array(
1263	913	'id' => 'id',
1264	914	'name' => 'name',
		@@ -1269,9 +919,8 @@
1269	919	}
1270	920
1271	921	/**
1272	922	* @param mixed $hidden_columns
1273		- *
1274	923	* @return array
1275	924	*/
1276	925	public static function hidden_columns( $hidden_columns ) {
1277	926	if ( ! is_array( $hidden_columns ) ) {
		@@ -1292,79 +941,167 @@
1292	941
1293	942	return $hidden_columns;
1294	943	}
1295	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	+
1296	953	/**
1297		- * @param mixed $save
1298		- * @param string $option
1299		- * @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
1300	963	*
1301		- * @return mixed
	964	+ * @return void
1302	965	*/
1303		- public static function save_per_page( $save, $option, $value ) {
1304		- if ( $option === 'formidable_page_formidable_per_page' ) {
1305		- 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'] );
1306	981	}
1307	982
1308		- return $save;
	983	+ $frm_expired = $expired;
	984	+ $frm_license_type = $license_type;
1309	985	}
1310	986
1311	987	/**
1312		- * @param int|string $id
1313		- * @param array $errors
1314		- * @param string $message
1315		- * @param bool $create_link
1316		- *
1317	988	* @return void
1318	989	*/
1319		- private static function get_edit_vars( $id, $errors = array(), $message = '', $create_link = false ) {
1320		- global $frm_vars;
	990	+ public static function list_templates() {
	991	+ global $frm_templates;
	992	+ global $frm_license_type;
1321	993
1322		- $form = FrmForm::getOne( $id );
1323		- $error_args = array(
1324		- 'title' => __( 'You can\'t edit the form', 'formidable' ),
1325		- 'body' => __( 'You are trying to edit a form that does not exist', 'formidable' ),
1326		- 'cancel_url' => admin_url( 'admin.php?page=formidable' ),
1327		- 'continue_url' => add_query_arg(
1328		- array(
1329		- 'page' => 'formidable',
1330		- )
1331		- ),
	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	+ }
1332	1028	);
1333	1029
1334		- if ( ! $form ) {
1335		- FrmAppController::show_error_modal( $error_args );
1336		- 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	+ }
1337	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	+ }
1338	1062
1339		- if ( 'trash' === $form->status ) {
1340		- $error_args['body'] = __( 'The form you\'re trying to edit is in trash. You must restore it first before you can make changes', 'formidable' );
1341		- $error_args['continue_url'] = add_query_arg(
1342		- array(
1343		- 'page' => 'formidable',
1344		- '_wpnonce' => wp_create_nonce( 'untrash_form_' . $id ),
1345		- 'form_type' => 'trash',
1346		- 'frm_action' => 'untrash',
1347		- 'id' => $id,
1348		- )
	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,
1349	1078	);
1350		- $error_args['continue_text'] = __( 'Restore form', 'formidable' );
1351		- FrmAppController::show_error_modal( $error_args );
1352		- return;
	1079	+ array_unshift( $templates, $template );
	1080	+ unset( $template );
1353	1081	}
	1082	+ }
1354	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	+
1355	1092	if ( $form->parent_form_id ) {
1356	1093	/* translators: %1$s: Start link HTML, %2$s: End link HTML */
1357		- 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>' ) );
1358	1095	}
1359	1096
1360	1097	$frm_field_selection = FrmField::field_selection();
1361		- $fields = FrmField::get_all_for_form( $form->id );
1362	1098
	1099	+ $fields = FrmField::get_all_for_form( $form->id );
	1100	+
1363	1101	// Automatically add end section fields if they don't exist (2.0 migration).
1364	1102	$reset_fields = false;
1365	1103	FrmFormsHelper::auto_add_end_section_fields( $form, $fields, $reset_fields );
1366		- FrmSubmitHelper::maybe_create_submit_field( $form, $fields, $reset_fields );
1367	1104
1368	1105	if ( $reset_fields ) {
1369	1106	$fields = FrmField::get_all_for_form( $form->id, '', 'exclude' );
1370	1107	}
		@@ -1384,30 +1121,25 @@
1384	1121	*/
1385	1122	$values['fields'] = apply_filters( 'frm_fields_in_form_builder', $fields, compact( 'form' ) );
1386	1123
1387	1124	$edit_message = __( 'Form was successfully updated.', 'formidable' );
1388		-
1389		- if ( $form->is_template && $message === $edit_message ) {
	1125	+ if ( $form->is_template && $message == $edit_message ) {
1390	1126	$message = __( 'Template was successfully updated.', 'formidable' );
1391	1127	}
1392	1128
1393	1129	self::maybe_update_form_builder_message( $message );
1394	1130
1395		- $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'] );
1396	1133
1397	1134	if ( defined( 'DOING_AJAX' ) ) {
1398	1135	wp_die();
	1136	+ } else {
	1137	+ require( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/edit.php' );
1399	1138	}
1400		-
1401		- require FrmAppHelper::plugin_path() . '/classes/views/frm-forms/edit.php';
1402	1139	}
1403	1140
1404		- /**
1405		- * @param array $fields
1406		- *
1407		- * @return array
1408		- */
1409		- public static function update_form_builder_fields( $fields ) {
	1141	+ public static function update_form_builder_fields( $fields, $form ) {
1410	1142	foreach ( $fields as $field ) {
1411	1143	$field->do_not_include_icons = true;
1412	1144	}
1413	1145	return $fields;
		@@ -1412,13 +1144,8 @@
1412	1144	}
1413	1145	return $fields;
1414	1146	}
1415	1147
1416		- /**
1417		- * @param string $message
1418		- *
1419		- * @return void
1420		- */
1421	1148	public static function maybe_update_form_builder_message( &$message ) {
1422	1149	if ( 'form_duplicated' === FrmAppHelper::simple_get( 'message' ) ) {
1423	1150	$message = __( 'Form was Successfully Copied', 'formidable' );
1424	1151	}
		@@ -1423,22 +1150,13 @@
1423	1150	$message = __( 'Form was Successfully Copied', 'formidable' );
1424	1151	}
1425	1152	}
1426	1153
1427		- /**
1428		- * @param int|string $id
1429		- * @param array $errors
1430		- * @param array|string $args
1431		- *
1432		- * @return void
1433		- */
1434	1154	public static function get_settings_vars( $id, $errors = array(), $args = array() ) {
1435	1155	FrmAppHelper::permission_check( 'frm_edit_forms' );
1436	1156
1437	1157	global $frm_vars;
1438	1158
1439		- self::maybe_print_media_templates();
1440		-
1441	1159	if ( ! is_array( $args ) ) {
1442	1160	// For reverse compatibility.
1443	1161	$args = array(
1444	1162	'message' => $args,
		@@ -1451,12 +1169,13 @@
1451	1169	);
1452	1170	$args = array_merge( $defaults, $args );
1453	1171	$message = $args['message'];
1454	1172	$warnings = $args['warnings'];
1455		- $form = FrmForm::getOne( $id );
1456		- $fields = FrmField::get_all_for_form( $id );
1457		- $values = FrmAppHelper::setup_edit_vars( $form, 'forms', $fields, true );
1458	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	+
1459	1178	/**
1460	1179	* Allows changing fields in the form settings.
1461	1180	*
1462	1181	* @since 5.0.04
		@@ -1470,42 +1189,17 @@
1470	1189
1471	1190	$sections = self::get_settings_tabs( $values );
1472	1191	$current = FrmAppHelper::simple_get( 't', 'sanitize_title', 'advanced_settings' );
1473	1192
1474		- require FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings.php';
	1193	+ require( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings.php' );
1475	1194	}
1476	1195
1477	1196	/**
1478		- * 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.
1479		- *
1480		- * @since 6.10
1481		- *
1482		- * @return void
1483		- */
1484		- private static function maybe_print_media_templates() {
1485		- if ( FrmAppHelper::pro_is_included() ) {
1486		- // This issue does not exist when Pro is active so exit early.
1487		- return;
1488		- }
1489		-
1490		- add_action(
1491		- 'wp_enqueue_editor',
1492		- function () {
1493		- wp_print_media_templates();
1494		- }
1495		- );
1496		- }
1497		-
1498		- /**
1499	1197	* @since 4.0
1500		- *
1501		- * @param array $atts
1502		- *
1503		- * @return void
1504	1198	*/
1505	1199	public static function form_publish_button( $atts ) {
1506	1200	$values = $atts['values'];
1507		- include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/_publish_box.php';
	1201	+ include( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/_publish_box.php' );
1508	1202	}
1509	1203
1510	1204	/**
1511	1205	* Get a list of all the settings tabs for the form settings page.
		@@ -1512,9 +1206,8 @@
1512	1206	*
1513	1207	* @since 4.0
1514	1208	*
1515	1209	* @param array $values
1516		- *
1517	1210	* @return array
1518	1211	*/
1519	1212	private static function get_settings_tabs( $values ) {
1520	1213	$sections = array(
		@@ -1520,20 +1213,20 @@
1520	1213	$sections = array(
1521	1214	'advanced' => array(
1522	1215	'name' => __( 'General', 'formidable' ),
1523	1216	'title' => __( 'General Form Settings', 'formidable' ),
1524		- 'function' => array( self::class, 'advanced_settings' ),
1525		- 'icon' => 'frmfont frm_settings_icon',
	1217	+ 'function' => array( __CLASS__, 'advanced_settings' ),
	1218	+ 'icon' => 'frm_icon_font frm_settings_icon',
1526	1219	),
1527	1220	'email' => array(
1528	1221	'name' => __( 'Actions & Notifications', 'formidable' ),
1529	1222	'function' => array( 'FrmFormActionsController', 'email_settings' ),
1530	1223	'id' => 'frm_notification_settings',
1531		- 'icon' => 'frmfont frm_mail_bulk_icon',
	1224	+ 'icon' => 'frm_icon_font frm_mail_bulk_icon',
1532	1225	),
1533	1226	'permissions' => array(
1534	1227	'name' => __( 'Form Permissions', 'formidable' ),
1535		- 'icon' => 'frmfont frm_lock_closed_icon',
	1228	+ 'icon' => 'frm_icon_font frm_lock_icon',
1536	1229	'html_class' => 'frm_show_upgrade_tab frm_noallow',
1537	1230	'data' => array(
1538	1231	'medium' => 'permissions',
1539	1232	'upgrade' => __( 'Form Permissions', 'formidable' ),
		@@ -1538,37 +1231,35 @@
1538	1231	'medium' => 'permissions',
1539	1232	'upgrade' => __( 'Form Permissions', 'formidable' ),
1540	1233	'message' => __( 'Allow editing, protect forms and files, limit entries, and save drafts. Upgrade to get form and entry permissions.', 'formidable' ),
1541	1234	'screenshot' => 'permissions.png',
1542		- 'learn-more' => FrmAppHelper::get_doc_url( 'general-form-settings/#kb-form-permissions', 'form-permissions-settings' ),
1543	1235	),
1544	1236	),
1545		- 'scheduling' => array(
	1237	+ 'scheduling' => array(
1546	1238	'name' => __( 'Form Scheduling', 'formidable' ),
1547		- 'icon' => 'frmfont frm_calendar_icon',
	1239	+ 'icon' => 'frm_icon_font frm_calendar_icon',
1548	1240	'html_class' => 'frm_show_upgrade_tab frm_noallow',
1549	1241	'data' => array(
1550	1242	'medium' => 'scheduling',
1551	1243	'upgrade' => __( 'Form scheduling settings', 'formidable' ),
1552	1244	'screenshot' => 'scheduling.png',
1553		- 'learn-more' => FrmAppHelper::get_doc_url( 'general-form-settings/#kb-form-scheduling', 'form-scheduling-settings' ),
1554	1245	),
1555	1246	),
1556	1247	'buttons' => array(
1557	1248	'name' => __( 'Buttons', 'formidable' ),
1558		- 'class' => self::class,
	1249	+ 'class' => __CLASS__,
1559	1250	'function' => 'buttons_settings',
1560		- 'icon' => 'frmfont frm_button_icon',
	1251	+ 'icon' => 'frm_icon_font frm_button_icon',
1561	1252	),
1562	1253	'landing' => array(
1563	1254	'name' => __( 'Form Landing Page', 'formidable' ),
1564		- 'icon' => 'frmfont frm_file_text_icon',
	1255	+ 'icon' => 'frm_icon_font frm_file_text_icon',
1565	1256	'html_class' => 'frm_show_upgrade_tab frm_noallow',
1566	1257	'data' => FrmAppHelper::get_landing_page_upgrade_data_params(),
1567	1258	),
1568	1259	'chat' => array(
1569	1260	'name' => __( 'Conversational Forms', 'formidable' ),
1570		- 'icon' => 'frmfont frm_chat_forms_icon',
	1261	+ 'icon' => 'frm_icon_font frm_chat_forms_icon',
1571	1262	'html_class' => 'frm_show_upgrade_tab frm_noallow',
1572	1263	'data' => FrmAppHelper::get_upgrade_data_params(
1573	1264	'chat',
1574	1265	array(
		@@ -1574,45 +1265,37 @@
1574	1265	array(
1575	1266	'upgrade' => __( 'Conversational Forms', 'formidable' ),
1576	1267	'message' => __( 'Ask one question at a time for automated conversations.', 'formidable' ),
1577	1268	'screenshot' => 'chat.png',
1578		- 'learn-more' => FrmAppHelper::get_doc_url( 'conversational-forms', 'conversational-forms-settings', false ),
1579	1269	)
1580	1270	),
1581	1271	),
1582		- 'abandonment' => array(
1583		- 'name' => __( 'Form Abandonment', 'formidable' ),
1584		- 'icon' => 'frmfont frm_abandoned_icon',
1585		- 'html_class' => 'frm_show_upgrade_tab frm_noallow',
1586		- 'data' => FrmAppHelper::get_upgrade_data_params(
1587		- 'abandonment',
1588		- array(
1589		- 'upgrade' => __( 'Form abandonment settings', 'formidable' ),
1590		- 'message' => __( 'Unlock the power of data capture to boost lead generation and master the art of form optimization.', 'formidable' ),
1591		- 'screenshot' => 'abandonment.png',
1592		- 'learn-more' => FrmAppHelper::get_doc_url( 'features/form-abandonment-wordpress-plugin', 'form-abandonment-settings', false ),
1593		- )
1594		- ),
1595		- ),
1596	1272	'html' => array(
1597	1273	'name' => __( 'Customize HTML', 'formidable' ),
1598		- 'class' => self::class,
	1274	+ 'class' => __CLASS__,
1599	1275	'function' => 'html_settings',
1600		- 'icon' => 'frmfont frm_code_icon',
	1276	+ 'icon' => 'frm_icon_font frm_code_icon',
1601	1277	),
1602	1278	);
1603	1279
1604		- if ( ! has_action( 'frm_add_form_style_tab_options' ) && ! has_action( 'frm_add_form_button_options' ) ) {
1605		- unset( $sections['buttons'] );
	1280	+ foreach ( array( 'landing', 'chat' ) as $feature ) {
	1281	+ if ( ! FrmAppHelper::show_new_feature( $feature ) ) {
	1282	+ unset( $sections[ $feature ] );
	1283	+ }
1606	1284	}
1607	1285
1608	1286	$sections = apply_filters( 'frm_add_form_settings_section', $sections, $values );
1609	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	+
1610	1293	foreach ( $sections as $key => $section ) {
1611	1294	$defaults = array(
1612	1295	'html_class' => '',
1613	1296	'name' => ucfirst( $key ),
1614		- 'icon' => 'frmfont frm_settings_icon',
	1297	+ 'icon' => 'frm_icon_font frm_settings_icon',
1615	1298	);
1616	1299
1617	1300	$section = array_merge( $defaults, $section );
1618	1301
		@@ -1618,9 +1301,8 @@
1618	1301
1619	1302	if ( ! isset( $section['anchor'] ) ) {
1620	1303	$section['anchor'] = $key;
1621	1304	}
1622		-
1623	1305	$section['anchor'] .= '_settings';
1624	1306
1625	1307	if ( ! isset( $section['title'] ) ) {
1626	1308	$section['title'] = $section['name'];
		@@ -1630,9 +1312,9 @@
1630	1312	$section['id'] = $section['anchor'];
1631	1313	}
1632	1314
1633	1315	$sections[ $key ] = $section;
1634		- }//end foreach
	1316	+ }
1635	1317
1636	1318	return $sections;
1637	1319	}
1638	1320
		@@ -1639,26 +1321,23 @@
1639	1321	/**
1640	1322	* @since 4.0
1641	1323	*
1642	1324	* @param array $values
1643		- *
1644		- * @return void
1645	1325	*/
1646	1326	public static function advanced_settings( $values ) {
1647	1327	$first_h3 = 'frm_first_h3';
	1328	+
1648	1329	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings-advanced.php';
1649	1330	}
1650	1331
1651	1332	/**
1652	1333	* @param array $values
1653		- *
1654		- * @return void
1655	1334	*/
1656	1335	public static function render_spam_settings( $values ) {
1657	1336	if ( function_exists( 'akismet_http_post' ) ) {
1658	1337	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/spam-settings/akismet.php';
1659	1338	}
1660		- 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';
1661	1340	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/spam-settings/antispam.php';
1662	1341	}
1663	1342
1664	1343	/**
		@@ -1664,13 +1343,16 @@
1664	1343	/**
1665	1344	* @since 4.0
1666	1345	*
1667	1346	* @param array $values
1668		- *
1669		- * @return void
1670	1347	*/
1671	1348	public static function buttons_settings( $values ) {
1672		- 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' );
1673	1355	}
1674	1356
1675	1357	/**
1676	1358	* @since 4.0
		@@ -1675,13 +1357,11 @@
1675	1357	/**
1676	1358	* @since 4.0
1677	1359	*
1678	1360	* @param array $values
1679		- *
1680		- * @return void
1681	1361	*/
1682	1362	public static function html_settings( $values ) {
1683		- include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings-html.php';
	1363	+ include( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings-html.php' );
1684	1364	}
1685	1365
1686	1366	/**
1687	1367	* Replace old Submit Button href with new href to avoid errors in Chrome
		@@ -1687,11 +1367,9 @@
1687	1367	* Replace old Submit Button href with new href to avoid errors in Chrome
1688	1368	*
1689	1369	* @since 2.03.08
1690	1370	*
1691		- * @param array|bool $values
1692		- *
1693		- * @return void
	1371	+ * @param array|boolean $values
1694	1372	*/
1695	1373	private static function clean_submit_html( &$values ) {
1696	1374	if ( is_array( $values ) && isset( $values['submit_html'] ) ) {
1697	1375	$values['submit_html'] = str_replace( 'javascript:void(0)', '#', $values['submit_html'] );
		@@ -1712,18 +1390,9 @@
1712	1390
1713	1391	return $classes;
1714	1392	}
1715	1393
1716		- /**
1717		- * @since 6.27 Added $template_path parameter.
1718		- *
1719		- * @param int|string $form_id
1720		- * @param string $class
1721		- * @param string $template_path The path to a template file to use instead of the default.
1722		- *
1723		- * @return void
1724		- */
1725		- public static function mb_tags_box( $form_id, $class = '', $template_path = 'default' ) {
	1394	+ public static function mb_tags_box( $form_id, $class = '' ) {
1726	1395	$fields = FrmField::get_all_for_form( $form_id, '', 'include' );
1727	1396
1728	1397	/**
1729	1398	* Allows modifying the list of fields in the tags box.
		@@ -1732,30 +1401,23 @@
1732	1401	*
1733	1402	* @param array $fields The list of fields.
1734	1403	* @param array $args The arguments. Contains `form_id`.
1735	1404	*/
1736		- $fields = apply_filters( 'frm_fields_in_tags_box', $fields, compact( 'form_id' ) );
1737		- $linked_forms = array();
1738		- $col = 'one';
1739		- $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	+
1740	1410	$cond_shortcodes = apply_filters( 'frm_conditional_shortcodes', array() );
1741	1411	$entry_shortcodes = self::get_shortcode_helpers( $settings_tab );
	1412	+
1742	1413	$advanced_helpers = self::advanced_helpers( compact( 'fields', 'form_id' ) );
1743	1414
1744		- if ( 'default' === $template_path || ! file_exists( $template_path ) ) {
1745		- include FrmAppHelper::plugin_path() . '/classes/views/shared/mb_adv_info.php';
1746		- return;
1747		- }
1748		-
1749		- include $template_path;
	1415	+ include( FrmAppHelper::plugin_path() . '/classes/views/shared/mb_adv_info.php' );
1750	1416	}
1751	1417
1752	1418	/**
1753	1419	* @since 3.04.01
1754		- *
1755		- * @param array $atts
1756		- *
1757		- * @return array
1758	1420	*/
1759	1421	private static function advanced_helpers( $atts ) {
1760	1422	$advanced_helpers = array(
1761	1423	'default' => array(
		@@ -1764,12 +1426,10 @@
1764	1426	),
1765	1427	);
1766	1428
1767	1429	$user_fields = self::user_shortcodes();
1768		-
1769		- if ( $user_fields ) {
	1430	+ if ( ! empty( $user_fields ) ) {
1770	1431	$user_helpers = array();
1771		-
1772	1432	foreach ( $user_fields as $uk => $uf ) {
1773	1433	$user_helpers[ '|user_id| show="' . $uk . '"' ] = $uf;
1774	1434	unset( $uk, $uf );
1775	1435	}
		@@ -1774,9 +1434,9 @@
1774	1434	unset( $uk, $uf );
1775	1435	}
1776	1436
1777	1437	$advanced_helpers['user_id'] = array(
1778		- 'codes' => $user_helpers,
	1438	+ 'codes' => $user_helpers,
1779	1439	);
1780	1440	}
1781	1441
1782	1442	/**
		@@ -1794,10 +1454,8 @@
1794	1454	* Get an array of the options to display in the advanced tab
1795	1455	* of the customization panel
1796	1456	*
1797	1457	* @since 2.0.6
1798		- *
1799		- * @return array
1800	1458	*/
1801	1459	private static function get_advanced_shortcodes() {
1802	1460	$adv_shortcodes = array(
1803	1461	'x sep=", "' => array(
		@@ -1814,18 +1472,17 @@
1814	1472	'label' => __( 'No Auto P', 'formidable' ),
1815	1473	'title' => __( 'Do not automatically add any paragraphs or line breaks', 'formidable' ),
1816	1474	),
1817	1475	);
	1476	+ $adv_shortcodes = apply_filters( 'frm_advanced_shortcodes', $adv_shortcodes );
1818	1477
1819	1478	// __( 'Leave blank instead of defaulting to User Login', 'formidable' ) : blank=1
1820	1479
1821		- return apply_filters( 'frm_advanced_shortcodes', $adv_shortcodes );
	1480	+ return $adv_shortcodes;
1822	1481	}
1823	1482
1824	1483	/**
1825	1484	* @since 3.04.01
1826		- *
1827		- * @return array
1828	1485	*/
1829	1486	private static function user_shortcodes() {
1830	1487	$options = array(
1831	1488	'ID' => __( 'User ID', 'formidable' ),
		@@ -1844,12 +1501,8 @@
1844	1501	/**
1845	1502	* Get an array of the helper shortcodes to display in the customization panel
1846	1503	*
1847	1504	* @since 2.0.6
1848		- *
1849		- * @param bool $settings_tab
1850		- *
1851		- * @return array
1852	1505	*/
1853	1506	private static function get_shortcode_helpers( $settings_tab ) {
1854	1507	$entry_shortcodes = array(
1855	1508	'id' => __( 'Entry ID', 'formidable' ),
		@@ -1860,27 +1513,30 @@
1860	1513	'updated-at' => __( 'Entry updated', 'formidable' ),
1861	1514	'' => '',
1862	1515	'siteurl' => __( 'Site URL', 'formidable' ),
1863	1516	'sitename' => __( 'Site Name', 'formidable' ),
1864		- 'form_name' => __( 'Form Name', 'formidable' ),
1865	1517	);
1866	1518
1867		- $entry_shortcodes = array_merge( FrmShortcodeHelper::get_contextual_shortcode_values(), $entry_shortcodes );
1868		-
1869	1519	if ( ! FrmAppHelper::pro_is_installed() ) {
1870	1520	unset( $entry_shortcodes['post_id'] );
1871	1521	}
1872	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	+
1873	1530	/**
1874	1531	* Use this hook to add or remove buttons in the helpers section
1875	1532	* in the customization panel
1876	1533	*
1877	1534	* @since 2.0.6
1878		- *
1879		- * @param array $entry_shortcodes
1880		- * @param bool $settings_tab
1881	1535	*/
1882		- 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;
1883	1539	}
1884	1540
1885	1541	/**
1886	1542	* Insert the form class setting into the form.
		@@ -1885,9 +1541,8 @@
1885	1541	/**
1886	1542	* Insert the form class setting into the form.
1887	1543	*
1888	1544	* @param stdClass $form
1889		- *
1890	1545	* @return void
1891	1546	*/
1892	1547	public static function form_classes( $form ) {
1893	1548	if ( isset( $form->options['form_class'] ) ) {
		@@ -1898,9 +1553,9 @@
1898	1553	echo ' frm_js_validate ';
1899	1554	self::add_js_validate_form_to_global_vars( $form );
1900	1555	}
1901	1556
1902		- if ( FrmForm::is_ajax_on( $form ) ) {
	1557	+ if ( ! FrmFormsHelper::should_use_pro_for_ajax_submit() && FrmForm::is_ajax_on( $form ) ) {
1903	1558	echo ' frm_ajax_submit ';
1904	1559	}
1905	1560	}
1906	1561
		@@ -1910,9 +1565,8 @@
1910	1565	* @param stdClass $form
1911	1566	*/
1912	1567	public static function add_js_validate_form_to_global_vars( $form ) {
1913	1568	global $frm_vars;
1914		-
1915	1569	if ( ! isset( $frm_vars['js_validate_forms'] ) ) {
1916	1570	$frm_vars['js_validate_forms'] = array();
1917	1571	}
1918	1572	$frm_vars['js_validate_forms'][ $form->id ] = $form;
		@@ -1923,11 +1577,11 @@
1923	1577	check_ajax_referer( 'frm_ajax', 'nonce' );
1924	1578
1925	1579	echo FrmEntriesController::show_entry_shortcode( // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
1926	1580	array(
1927		- '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' ),
1928	1582	'default_email' => true,
1929		- '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' ),
1930	1584	)
1931	1585	);
1932	1586	wp_die();
1933	1587	}
		@@ -1933,11 +1587,10 @@
1933	1587	}
1934	1588
1935	1589	/**
1936	1590	* @param string $content
1937		- * @param int|stdClass|string $form
1938		- * @param false|int|stdClass|string $entry
1939		- *
	1591	+ * @param stdClass|string|int $form
	1592	+ * @param stdClass|string|int|false $entry
1940	1593	* @return string
1941	1594	*/
1942	1595	public static function filter_content( $content, $form, $entry = false ) {
1943	1596	$content = self::replace_form_name_shortcodes( $content, $form );
		@@ -1942,9 +1595,8 @@
1942	1595	public static function filter_content( $content, $form, $entry = false ) {
1943	1596	$content = self::replace_form_name_shortcodes( $content, $form );
1944	1597
1945	1598	self::get_entry_by_param( $entry );
1946		-
1947	1599	if ( ! $entry ) {
1948	1600	return $content;
1949	1601	}
1950	1602
		@@ -1951,19 +1603,12 @@
1951	1603	if ( is_object( $form ) ) {
1952	1604	$form = $form->id;
1953	1605	}
1954	1606
1955		- /*
1956		- * Repeater actions adds `parent_entry` to `$entry` store the parent entry data. If `parent_entry` is not empty,
1957		- * use the parent form ID instead of repeater form ID to fix the parent form field shortcodes doesn't work.
1958		- */
1959		- if ( ! empty( $entry->parent_entry ) ) {
1960		- $form = $entry->parent_entry->form_id;
1961		- }
1962		-
1963	1607	$shortcodes = FrmFieldsHelper::get_shortcodes( $content, $form );
	1608	+ $content = apply_filters( 'frm_replace_content_shortcodes', $content, $entry, $shortcodes );
1964	1609
1965		- return apply_filters( 'frm_replace_content_shortcodes', $content, $entry, $shortcodes );
	1610	+ return $content;
1966	1611	}
1967	1612
1968	1613	/**
1969	1614	* Replace any [form_name] shortcodes in a string.
		@@ -1969,22 +1614,17 @@
1969	1614	* Replace any [form_name] shortcodes in a string.
1970	1615	*
1971	1616	* @since 5.5
1972	1617	*
1973		- * @param array|string $string
1974		- * @param int|stdClass|string $form
1975		- *
1976		- * @return array|string
	1618	+ * @param string $string
	1619	+ * @param stdClass|string|int $form
	1620	+ * @return string
1977	1621	*/
1978	1622	public static function replace_form_name_shortcodes( $string, $form ) {
1979		- if ( ! is_string( $string ) ) {
	1623	+ if ( false === strpos( $string, '[form_name]' ) ) {
1980	1624	return $string;
1981	1625	}
1982	1626
1983		- if ( ! str_contains( $string, '[form_name]' ) ) {
1984		- return $string;
1985		- }
1986		-
1987	1627	if ( ! is_object( $form ) ) {
1988	1628	$form = FrmForm::getOne( $form );
1989	1629	}
1990	1630
		@@ -1992,40 +1632,25 @@
1992	1632	return str_replace( '[form_name]', $form_name, $string );
1993	1633	}
1994	1634
1995	1635	/**
1996		- * @param false|int|stdClass|string $entry
1997		- *
	1636	+ * @param stdClass|string|int|false $entry
1998	1637	* @return void
1999	1638	*/
2000	1639	private static function get_entry_by_param( &$entry ) {
2001		- if ( $entry && is_object( $entry ) ) {
2002		- return;
2003		- }
	1640	+ if ( ! $entry || ! is_object( $entry ) ) {
	1641	+ if ( ! $entry || ! is_numeric( $entry ) ) {
	1642	+ $entry = FrmAppHelper::get_post_param( 'id', false, 'sanitize_title' );
	1643	+ }
2004	1644
2005		- if ( ! $entry || ! is_numeric( $entry ) ) {
2006		- $entry = FrmAppHelper::get_post_param( 'id', false, 'sanitize_title' );
	1645	+ FrmEntry::maybe_get_entry( $entry );
2007	1646	}
2008		-
2009		- FrmEntry::maybe_get_entry( $entry );
2010	1647	}
2011	1648
2012		- /**
2013		- * @param string $content
2014		- * @param false|object $entry
2015		- * @param array $shortcodes
2016		- *
2017		- * @return string
2018		- */
2019	1649	public static function replace_content_shortcodes( $content, $entry, $shortcodes ) {
2020	1650	return FrmFieldsHelper::replace_content_shortcodes( $content, $entry, $shortcodes );
2021	1651	}
2022	1652
2023		- /**
2024		- * @param array $errors
2025		- *
2026		- * @return array
2027		- */
2028	1653	public static function process_bulk_form_actions( $errors ) {
2029	1654	if ( ! $_REQUEST ) {
2030	1655	return $errors;
2031	1656	}
		@@ -2030,30 +1655,29 @@
2030	1655	return $errors;
2031	1656	}
2032	1657
2033	1658	$bulkaction = FrmAppHelper::get_param( 'action', '', 'get', 'sanitize_text_field' );
2034		-
2035		- // phpcs:ignore Universal.Operators.StrictComparisons
2036	1659	if ( $bulkaction == - 1 ) {
2037	1660	$bulkaction = FrmAppHelper::get_param( 'action2', '', 'get', 'sanitize_title' );
2038	1661	}
2039	1662
2040		- if ( $bulkaction && str_starts_with( $bulkaction, 'bulk_' ) ) {
	1663	+ if ( ! empty( $bulkaction ) && strpos( $bulkaction, 'bulk_' ) === 0 ) {
2041	1664	FrmAppHelper::remove_get_action();
	1665	+
2042	1666	$bulkaction = str_replace( 'bulk_', '', $bulkaction );
2043	1667	}
2044	1668
2045	1669	$ids = FrmAppHelper::get_param( 'item-action', '', 'get', 'sanitize_text_field' );
	1670	+ if ( empty( $ids ) ) {
	1671	+ $errors[] = __( 'No forms were specified', 'formidable' );
2046	1672
2047		- if ( ! $ids ) {
2048		- $errors[] = __( 'No forms were specified', 'formidable' );
2049	1673	return $errors;
2050	1674	}
2051	1675
2052	1676	$permission_error = FrmAppHelper::permission_nonce_error( '', '_wpnonce', 'bulk-toplevel_page_formidable' );
2053		-
2054	1677	if ( $permission_error !== false ) {
2055	1678	$errors[] = $permission_error;
	1679	+
2056	1680	return $errors;
2057	1681	}
2058	1682
2059	1683	if ( ! is_array( $ids ) ) {
		@@ -2070,9 +1694,9 @@
2070	1694	case 'untrash':
2071	1695	$message = self::bulk_untrash( $ids );
2072	1696	}
2073	1697
2074		- if ( ! empty( $message ) ) {
	1698	+ if ( isset( $message ) && ! empty( $message ) ) {
2075	1699	$errors['message'] = $message;
2076	1700	}
2077	1701
2078	1702	return $errors;
		@@ -2077,24 +1701,9 @@
2077	1701
2078	1702	return $errors;
2079	1703	}
2080	1704
2081		- /**
2082		- * Includes html that shows a message when the device is too small to use Formidable Forms admin pages.
2083		- *
2084		- * @since 6.20
2085		- *
2086		- * @return void
2087		- */
2088		- public static function include_device_too_small_message() {
2089		- if ( ! FrmAppHelper::is_formidable_admin() ) {
2090		- return;
2091		- }
2092		-
2093		- include FrmAppHelper::plugin_path() . '/classes/views/shared/small-device-message.php';
2094		- }
2095		-
2096		- public static function route() { // phpcs:ignore Generic.Metrics.CyclomaticComplexity.MaxExceeded
	1705	+ public static function route() {
2097	1706	$action = isset( $_REQUEST['frm_action'] ) ? 'frm_action' : 'action';
2098	1707	$vars = array();
2099	1708	FrmAppHelper::include_svg();
2100	1709
		@@ -2104,38 +1713,37 @@
2104	1713	// Javascript needs to be allowed in some field settings.
2105	1714	// phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized, WordPress.Security.NonceVerification.Missing
2106	1715	$json_vars = htmlspecialchars_decode( nl2br( str_replace( '&quot;', '"', wp_unslash( $_POST['frm_compact_fields'] ) ) ) );
2107	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	+ }
2108	1723
2109		- if ( $json_vars ) {
	1724	+ add_filter( 'frm_validate_form', 'FrmFormsController::json_error' );
	1725	+ } else {
2110	1726	$vars = FrmAppHelper::json_to_array( $json_vars );
2111	1727	$action = $vars[ $action ];
2112	1728	unset( $_REQUEST['frm_compact_fields'], $_POST['frm_compact_fields'] ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
2113	1729	$_REQUEST = array_merge( $_REQUEST, $vars ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
2114	1730	$_POST = array_merge( $_POST, $_REQUEST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
2115		- } else {
2116		- // Json decoding failed so we should return an error message.
2117		- $action = FrmAppHelper::get_param( $action, '', 'get', 'sanitize_title' );
2118		-
2119		- if ( 'edit' === $action ) {
2120		- $action = 'update';
2121		- }
2122		-
2123		- add_filter( 'frm_validate_form', 'FrmFormsController::json_error' );
2124	1731	}
2125	1732	} else {
2126	1733	$action = FrmAppHelper::get_param( $action, '', 'get', 'sanitize_title' );
2127		-
2128	1734	if ( isset( $_REQUEST['delete_all'] ) ) {
2129	1735	// Override the action for this page.
2130	1736	$action = 'delete_all';
2131	1737	}
2132		- }//end if
	1738	+ }
2133	1739
2134	1740	add_action( 'frm_load_form_hooks', 'FrmHooksController::trigger_load_form_hooks' );
2135	1741	FrmAppHelper::trigger_hook_load( 'form' );
2136	1742
2137	1743	switch ( $action ) {
	1744	+ case 'new':
	1745	+ return self::new_form( $vars );
2138	1746	case 'create':
2139	1747	case 'edit':
2140	1748	case 'update':
2141	1749	case 'trash':
		@@ -2140,112 +1748,59 @@
2140	1748	case 'update':
2141	1749	case 'trash':
2142	1750	case 'untrash':
2143	1751	case 'destroy':
	1752	+ case 'delete_all':
2144	1753	case 'settings':
2145	1754	case 'update_settings':
2146	1755	return self::$action( $vars );
2147	1756	case 'lite-reports':
2148		- self::no_reports( $vars );
2149		- return null;
	1757	+ return self::no_reports( $vars );
2150	1758	case 'views':
2151		- self::no_views( $vars );
2152		- return null;
	1759	+ return self::no_views( $vars );
2153	1760	default:
2154	1761	do_action( 'frm_form_action_' . $action );
2155		-
2156	1762	if ( apply_filters( 'frm_form_stop_action_' . $action, false ) ) {
2157		- return null;
	1763	+ return;
2158	1764	}
2159	1765
2160	1766	$action = FrmAppHelper::get_param( 'action', '', 'get', 'sanitize_text_field' );
2161		-
2162		- // phpcs:ignore Universal.Operators.StrictComparisons
2163	1767	if ( $action == - 1 ) {
2164	1768	$action = FrmAppHelper::get_param( 'action2', '', 'get', 'sanitize_title' );
2165	1769	}
2166	1770
2167		- if ( str_starts_with( $action, 'bulk_' ) ) {
	1771	+ if ( strpos( $action, 'bulk_' ) === 0 ) {
2168	1772	FrmAppHelper::remove_get_action();
2169	1773
2170	1774	self::list_form();
2171		- return null;
	1775	+ return;
2172	1776	}
2173	1777
2174	1778	$message = FrmAppHelper::get_param( 'message' );
2175		-
2176	1779	if ( 'form_duplicate_error' === $message ) {
2177	1780	self::display_forms_list( array(), '', array( __( 'There was a problem duplicating the form', 'formidable' ) ) );
2178		- return null;
	1781	+ return;
2179	1782	}
2180	1783
2181		- if ( 'forms_permanently_deleted' === $message ) {
2182		- $count = FrmAppHelper::get_param( 'forms_deleted', 0, 'get', 'absint' );
2183		- /* translators: %1$s: Number of forms */
2184		- $message = sprintf( _n( '%1$s form permanently deleted.', '%1$s forms permanently deleted.', $count, 'formidable' ), $count );
2185		- self::display_forms_list( array(), $message, '' );
2186		- return null;
2187		- }
2188		-
2189	1784	self::display_forms_list();
2190	1785
2191		- return null;
2192		- }//end switch
	1786	+ return;
	1787	+ }
2193	1788	}
2194	1789
2195		- /**
2196		- * Rename a form.
2197		- *
2198		- * Handles the AJAX request for renaming a form.
2199		- *
2200		- * @since 6.7
2201		- *
2202		- * @return void
2203		- */
2204		- public static function rename_form() {
2205		- // Check permission and nonce
2206		- FrmAppHelper::permission_check( 'frm_edit_forms' );
2207		- 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' );
2208	1792
2209		- // Get posted data
2210		- $form_id = FrmAppHelper::get_post_param( 'form_id', '', 'absint' );
2211		- $name = FrmAppHelper::get_post_param( 'form_name', '', 'sanitize_text_field' );
2212		- $form = FrmForm::getOne( $form_id );
2213		-
2214		- if ( ! $form ) {
2215		- wp_send_json_error( __( 'Form not found', 'formidable' ) );
2216		- }
2217		-
2218		- if ( $name === $form->name ) {
2219		- // Nothing to change so exit early.
2220		- wp_send_json_success();
2221		- }
2222		-
2223		- $to_update = array(
2224		- 'name' => $name,
2225		- );
2226		-
2227		- if ( '' === $name ) {
2228		- $form_key = $form->form_key;
2229		- } else {
2230		- // Only update form_key if name is not empty.
2231		- $form_key = FrmAppHelper::get_unique_key( sanitize_title( $name ), 'frm_forms', 'form_key' );
2232		- $to_update['form_key'] = $form_key;
2233		- }
2234		-
2235		- FrmForm::update( $form_id, $to_update );
2236		-
2237		- wp_send_json_success( compact( 'form_key' ) );
	1793	+ return $errors;
2238	1794	}
2239	1795
2240	1796	/**
2241		- * @param array $errors
	1797	+ * Education for premium features.
2242	1798	*
2243		- * @return array
	1799	+ * @since 4.05
2244	1800	*/
2245		- public static function json_error( $errors ) {
2246		- $errors['json'] = __( 'Abnormal HTML characters prevented your form from saving correctly', 'formidable' );
2247		- 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' );
2248	1803	}
2249	1804
2250	1805	/**
2251	1806	* Add education about views.
		@@ -2250,12 +1805,8 @@
2250	1805	/**
2251	1806	* Add education about views.
2252	1807	*
2253	1808	* @since 4.07
2254		- *
2255		- * @param array $values
2256		- *
2257		- * @return void
2258	1809	*/
2259	1810	public static function no_views( $values = array() ) {
2260	1811	FrmAppHelper::include_svg();
2261	1812	$id = FrmAppHelper::get_param( 'form', '', 'get', 'absint' );
		@@ -2267,12 +1818,8 @@
2267	1818	/**
2268	1819	* Add education about reports.
2269	1820	*
2270	1821	* @since 4.07
2271		- *
2272		- * @param array $values
2273		- *
2274		- * @return void
2275	1822	*/
2276	1823	public static function no_reports( $values = array() ) {
2277	1824	$id = FrmAppHelper::get_param( 'form', '', 'get', 'absint' );
2278	1825	$form = $id ? FrmForm::getOne( $id ) : false;
		@@ -2279,11 +1826,9 @@
2279	1826
2280	1827	include FrmAppHelper::plugin_path() . '/classes/views/shared/reports-info.php';
2281	1828	}
2282	1829
2283		- /**
2284		- * FRONT-END FORMS.
2285		- */
	1830	+ /* FRONT-END FORMS */
2286	1831	public static function admin_bar_css() {
2287	1832	if ( is_admin() || ! current_user_can( 'frm_edit_forms' ) ) {
2288	1833	return;
2289	1834	}
		@@ -2298,9 +1843,8 @@
2298	1843	* @since 4.05.02
2299	1844	*/
2300	1845	private static function move_menu_to_footer() {
2301	1846	$settings = FrmAppHelper::get_settings();
2302		-
2303	1847	if ( empty( $settings->admin_bar ) ) {
2304	1848	remove_action( 'wp_body_open', 'wp_admin_bar_render', 0 );
2305	1849	}
2306	1850	}
		@@ -2306,15 +1850,13 @@
2306	1850	}
2307	1851
2308	1852	public static function admin_bar_configure() {
2309	1853	global $frm_vars;
2310		-
2311	1854	if ( empty( $frm_vars['forms_loaded'] ) ) {
2312	1855	return;
2313	1856	}
2314	1857
2315	1858	$actions = array();
2316		-
2317	1859	foreach ( $frm_vars['forms_loaded'] as $form ) {
2318	1860	if ( is_object( $form ) ) {
2319	1861	$actions[ $form->id ] = $form->name;
2320	1862	}
		@@ -2320,9 +1862,9 @@
2320	1862	}
2321	1863	unset( $form );
2322	1864	}
2323	1865
2324		- if ( ! $actions ) {
	1866	+ if ( empty( $actions ) ) {
2325	1867	return;
2326	1868	}
2327	1869
2328	1870	self::add_menu_to_admin_bar();
		@@ -2348,12 +1890,8 @@
2348	1890	}
2349	1891
2350	1892	/**
2351	1893	* @since 2.05.07
2352		- *
2353		- * @param array $actions
2354		- *
2355		- * @return void
2356	1894	*/
2357	1895	private static function add_forms_to_admin_bar( $actions ) {
2358	1896	global $wp_admin_bar;
2359	1897
		@@ -2359,13 +1897,14 @@
2359	1897
2360	1898	asort( $actions );
2361	1899
2362	1900	foreach ( $actions as $form_id => $name ) {
	1901	+
2363	1902	$wp_admin_bar->add_node(
2364	1903	array(
2365	1904	'parent' => 'frm-forms',
2366	1905	'id' => 'edit_form_' . $form_id,
2367		- 'title' => $name ? $name : FrmFormsHelper::get_no_title_text(),
	1906	+ 'title' => empty( $name ) ? __( '(no title)', 'formidable' ) : $name,
2368	1907	'href' => FrmForm::get_edit_link( $form_id ),
2369	1908	)
2370	1909	);
2371	1910	}
		@@ -2374,16 +1913,14 @@
2374	1913	/**
2375	1914	* The formidable shortcode
2376	1915	*
2377	1916	* @param array $atts The params from the shortcode.
2378		- *
2379	1917	* @return string
2380	1918	*/
2381	1919	public static function get_form_shortcode( $atts ) {
2382	1920	global $frm_vars;
2383		-
2384		- if ( ! empty( $frm_vars['skip_shortcode'] ) ) {
2385		- $sc = '[formidable';
	1921	+ if ( isset( $frm_vars['skip_shortcode'] ) && $frm_vars['skip_shortcode'] ) {
	1922	+ $sc = '[formidable';
2386	1923	$sc .= FrmAppHelper::array_to_html_params( $atts );
2387	1924	return $sc . ']';
2388	1925	}
2389	1926
		@@ -2408,12 +1945,11 @@
2408	1945
2409	1946	/**
2410	1947	* @since 5.2.01
2411	1948	*
2412		- * @param false|int|string $id
2413		- * @param false|string $key
2414		- *
2415		- * @return false|stdClass
	1949	+ * @param string|int|false $id
	1950	+ * @param string|false $key
	1951	+ * @return stdClass|false
2416	1952	*/
2417	1953	private static function maybe_get_form_by_id_or_key( $id, $key ) {
2418	1954	if ( ! $id ) {
2419	1955	$id = $key;
		@@ -2421,14 +1957,13 @@
2421	1957	return self::maybe_get_form_to_show( $id );
2422	1958	}
2423	1959
2424	1960	/**
2425		- * @param false|int|string $id
2426		- * @param false|string $key
2427		- * @param bool|int|string $title may be 'auto', true, false, 'true', 'false', 'yes', '1', 1, '0', 0.
2428		- * @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.
2429	1965	* @param array $atts
2430		- *
2431	1966	* @return string
2432	1967	*/
2433	1968	public static function show_form( $id = '', $key = '', $title = false, $description = false, $atts = array() ) {
2434	1969	$form = self::maybe_get_form_by_id_or_key( $id, $key );
		@@ -2449,13 +1984,14 @@
2449	1984
2450	1985	add_action( 'frm_load_form_hooks', 'FrmHooksController::trigger_load_form_hooks' );
2451	1986	FrmAppHelper::trigger_hook_load( 'form', $form );
2452	1987
2453		- $form = apply_filters( 'frm_pre_display_form', $form );
	1988	+ $form = apply_filters( 'frm_pre_display_form', $form );
	1989	+
2454	1990	$frm_settings = FrmAppHelper::get_settings( array( 'current_form' => $form->id ) );
2455	1991
2456	1992	if ( self::is_viewable_draft_form( $form ) ) {
2457		- // Don't show a draft form on a page
	1993	+ // don't show a draft form on a page
2458	1994	$form = __( 'Please select a valid form', 'formidable' );
2459	1995	} elseif ( ! FrmForm::is_visible_to_user( $form ) ) {
2460	1996	$form = do_shortcode( $frm_settings->login_msg );
2461	1997	} else {
		@@ -2474,19 +2010,16 @@
2474	2010	return $form;
2475	2011	}
2476	2012
2477	2013	/**
2478		- * @param false|int|string $id
2479		- *
2480		- * @return false|stdClass
	2014	+ * @param string|int|false $id
	2015	+ * @return stdClass|false
2481	2016	*/
2482	2017	private static function maybe_get_form_to_show( $id ) {
2483	2018	$form = false;
2484	2019
2485		- if ( $id ) {
2486		- // Form id or key is set.
	2020	+ if ( ! empty( $id ) ) { // form id or key is set
2487	2021	$form = FrmForm::getOne( $id );
2488		-
2489	2022	if ( ! $form || $form->parent_form_id || $form->status === 'trash' ) {
2490	2023	$form = false;
2491	2024	}
2492	2025	}
		@@ -2493,25 +2026,12 @@
2493	2026
2494	2027	return $form;
2495	2028	}
2496	2029
2497		- /**
2498		- * @param object $form
2499		- *
2500		- * @return bool
2501		- */
2502	2030	private static function is_viewable_draft_form( $form ) {
2503	2031	return $form->status === 'draft' && current_user_can( 'frm_edit_forms' ) && ! FrmAppHelper::is_preview_page();
2504	2032	}
2505	2033
2506		- /**
2507		- * @param object $form
2508		- * @param bool $title
2509		- * @param bool $description
2510		- * @param array $atts
2511		- *
2512		- * @return string
2513		- */
2514	2034	public static function get_form( $form, $title, $description, $atts = array() ) {
2515	2035	ob_start();
2516	2036
2517	2037	do_action( 'frm_before_get_form', $atts );
		@@ -2518,9 +2038,10 @@
2518	2038
2519	2039	self::get_form_contents( $form, $title, $description, $atts );
2520	2040	self::enqueue_scripts( FrmForm::get_params( $form ) );
2521	2041
2522		- $contents = ob_get_clean();
	2042	+ $contents = ob_get_contents();
	2043	+ ob_end_clean();
2523	2044
2524	2045	self::maybe_minimize_form( $atts, $contents );
2525	2046
2526	2047	return $contents;
		@@ -2525,25 +2046,12 @@
2525	2046
2526	2047	return $contents;
2527	2048	}
2528	2049
2529		- /**
2530		- * @param array $params
2531		- *
2532		- * @return void
2533		- */
2534	2050	public static function enqueue_scripts( $params ) {
2535	2051	do_action( 'frm_enqueue_form_scripts', $params );
2536	2052	}
2537	2053
2538		- /**
2539		- * @param object $form
2540		- * @param bool $title
2541		- * @param bool $description
2542		- * @param array $atts
2543		- *
2544		- * @return void
2545		- */
2546	2054	public static function get_form_contents( $form, $title, $description, $atts ) {
2547	2055	$params = FrmForm::get_params( $form );
2548	2056	$errors = self::get_saved_errors( $form, $params );
2549	2057	$fields = FrmFieldsHelper::get_form_fields( $form->id, $errors );
		@@ -2550,10 +2058,9 @@
2550	2058	$reset = false;
2551	2059	$pass_args = compact( 'form', 'fields', 'errors', 'title', 'description', 'reset' );
2552	2060
2553	2061	$pass_args['action'] = $params['action'];
2554		- // phpcs:ignore WordPress.Security.NonceVerification.Missing, Universal.Operators.StrictComparisons
2555		- $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
2556	2063
2557	2064	if ( ! $handle_process_here ) {
2558	2065	FrmFormState::set_initial_value( 'title', $title );
2559	2066	FrmFormState::set_initial_value( 'description', $description );
		@@ -2558,21 +2065,22 @@
2558	2065	FrmFormState::set_initial_value( 'title', $title );
2559	2066	FrmFormState::set_initial_value( 'description', $description );
2560	2067
2561	2068	do_action( 'frm_display_form_action', $params, $fields, $form, $title, $description );
2562		-
2563	2069	if ( apply_filters( 'frm_continue_to_new', true, $form->id, $params['action'] ) ) {
2564	2070	self::show_form_after_submit( $pass_args );
2565	2071	}
2566		- } elseif ( $errors ) {
	2072	+ } elseif ( ! empty( $errors ) ) {
2567	2073	self::show_form_after_submit( $pass_args );
	2074	+
2568	2075	} else {
	2076	+
2569	2077	do_action( 'frm_validate_form_creation', $params, $fields, $form, $title, $description );
2570	2078
2571	2079	if ( apply_filters( 'frm_continue_to_create', true, $form->id ) ) {
2572		- $entry_id = self::just_created_entry( $form->id );
2573		- $pass_args['entry_id'] = $entry_id;
2574		- $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;
2575	2083
2576	2084	self::run_on_submit_actions( $pass_args );
2577	2085
2578	2086	do_action(
		@@ -2582,9 +2090,9 @@
2582	2090	'form' => $form,
2583	2091	)
2584	2092	);
2585	2093	}
2586		- }//end if
	2094	+ }
2587	2095	}
2588	2096
2589	2097	/**
2590	2098	* If the form was processed earlier (init), get the generated errors
		@@ -2589,19 +2097,13 @@
2589	2097	/**
2590	2098	* If the form was processed earlier (init), get the generated errors
2591	2099	*
2592	2100	* @since 2.05
2593		- *
2594		- * @param object $form
2595		- * @param array $params
2596		- *
2597		- * @return array
2598	2101	*/
2599	2102	private static function get_saved_errors( $form, $params ) {
2600	2103	global $frm_vars;
2601	2104
2602		- // phpcs:ignore WordPress.Security.NonceVerification.Missing, Universal.Operators.StrictComparisons
2603		- 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
2604	2106	$errors = $frm_vars['created_entries'][ $form->id ]['errors'];
2605	2107	} else {
2606	2108	$errors = array();
2607	2109	}
		@@ -2618,16 +2120,13 @@
2618	2120	}
2619	2121
2620	2122	/**
2621	2123	* @since 2.2.7
2622		- *
2623		- * @param int|string $form_id
2624		- *
2625		- * @return int
2626	2124	*/
2627	2125	public static function just_created_entry( $form_id ) {
2628	2126	global $frm_vars;
2629		- 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;
2630	2129	}
2631	2130
2632	2131	/**
2633	2132	* Gets confirmation method.
		@@ -2640,19 +2139,17 @@
2640	2139	*
2641	2140	* @type object $form Form object.
2642	2141	* @type int $entry_id Entry ID.
2643	2142	* }
2644		- *
2645		- * @return array|string
	2143	+ * @return string|array
2646	2144	*/
2647	2145	private static function get_confirmation_method( $atts ) {
2648	2146	$action = FrmOnSubmitHelper::current_event( $atts );
2649	2147	$opt = 'update' === $action ? 'edit_action' : 'success_action';
2650		- $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';
2651	2149
2652	2150	if ( ! empty( $atts['entry_id'] ) ) {
2653	2151	$met_actions = self::get_met_on_submit_actions( $atts, $action );
2654		-
2655	2152	if ( $met_actions ) {
2656	2153	$method = $met_actions;
2657	2154	}
2658	2155	}
		@@ -2658,22 +2155,15 @@
2658	2155	}
2659	2156
2660	2157	$method = apply_filters( 'frm_success_filter', $method, $atts['form'], $action );
2661	2158
2662		- if ( $method !== 'message' && ( ! $atts['entry_id'] || ! is_numeric( $atts['entry_id'] ) ) ) {
2663		- return 'message';
	2159	+ if ( $method != 'message' && ( ! $atts['entry_id'] || ! is_numeric( $atts['entry_id'] ) ) ) {
	2160	+ $method = 'message';
2664	2161	}
2665	2162
2666	2163	return $method;
2667	2164	}
2668	2165
2669		- /**
2670		- * @param object $form
2671		- * @param array $params
2672		- * @param array $args
2673		- *
2674		- * @return void
2675		- */
2676	2166	public static function maybe_trigger_redirect( $form, $params, $args ) {
2677	2167	if ( ! isset( $params['id'] ) ) {
2678	2168	global $frm_vars;
2679	2169	$params['id'] = $frm_vars['created_entries'][ $form->id ]['entry_id'];
		@@ -2700,12 +2190,14 @@
2700	2190	* @param array $params See {@see FrmFormsController::maybe_trigger_redirect()}.
2701	2191	* @param array $args See {@see FrmFormsController::maybe_trigger_redirect()}.
2702	2192	*/
2703	2193	public static function maybe_trigger_redirect_with_action( $conf_method, $form, $params, $args ) {
2704		- 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
2705		- $event = FrmOnSubmitHelper::current_event( $params );
2706		- FrmOnSubmitHelper::populate_on_submit_data( $form->options, $conf_method[0], $event );
2707		- $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	+ }
2708	2200	}
2709	2201
2710	2202	if ( 'redirect' === $conf_method ) {
2711	2203	self::trigger_redirect( $form, $params, $args );
		@@ -2711,15 +2203,8 @@
2711	2203	self::trigger_redirect( $form, $params, $args );
2712	2204	}
2713	2205	}
2714	2206
2715		- /**
2716		- * @param object $form
2717		- * @param array $params
2718		- * @param array $args
2719		- *
2720		- * @return void
2721		- */
2722	2207	public static function trigger_redirect( $form, $params, $args ) {
2723	2208	$success_args = array(
2724	2209	'action' => $params['action'],
2725	2210	'conf_method' => 'redirect',
		@@ -2757,9 +2242,9 @@
2757	2242	unset( $extra_args['form'] );
2758	2243
2759	2244	do_action( 'frm_success_action', $args['conf_method'], $args['form'], $args['form']->options, $args['entry_id'], $extra_args );
2760	2245
2761		- $opt = ! isset( $args['action'] ) || $args['action'] === 'create' ? 'success' : 'edit';
	2246	+ $opt = ( ! isset( $args['action'] ) || $args['action'] === 'create' ) ? 'success' : 'edit';
2762	2247
2763	2248	$args['success_opt'] = $opt;
2764	2249	$args['ajax'] = ! empty( $frm_vars['ajax'] );
2765	2250
		@@ -2778,9 +2263,8 @@
2778	2263	* @since 6.0
2779	2264	*
2780	2265	* @param array $args See {@see FrmFormsController::run_success_action()}.
2781	2266	* @param string $event Form event. Default is `create`.
2782		- *
2783	2267	* @return array Array of actions that meet the conditional logics.
2784	2268	*/
2785	2269	public static function get_met_on_submit_actions( $args, $event = 'create' ) {
2786	2270	if ( ! FrmOnSubmitHelper::form_has_migrated( $args['form'] ) ) {
		@@ -2786,16 +2270,11 @@
2786	2270	if ( ! FrmOnSubmitHelper::form_has_migrated( $args['form'] ) ) {
2787	2271	return array();
2788	2272	}
2789	2273
2790		- // If a redirect action has already opened the URL in a new tab, we show the default message in the current tab.
2791		- if ( ! empty( self::$redirected_in_new_tab[ $args['form']->id ] ) ) {
2792		- return array( FrmOnSubmitHelper::get_fallback_action_after_open_in_new_tab( $event ) );
2793		- }
2794		-
2795		- $entry = FrmEntry::getOne( $args['entry_id'], true );
2796		- $actions = FrmOnSubmitHelper::get_actions( $args['form']->id );
2797		- $met_actions = array();
	2274	+ $entry = FrmEntry::getOne( $args['entry_id'], true );
	2275	+ $actions = FrmOnSubmitHelper::get_actions( $args['form']->id );
	2276	+ $met_actions = array();
2798	2277	$has_redirect = false;
2799	2278
2800	2279	foreach ( $actions as $action ) {
2801	2280	if ( ! in_array( $event, $action->post_content['event'], true ) ) {
		@@ -2807,14 +2286,22 @@
2807	2286	}
2808	2287
2809	2288	$action_type = FrmOnSubmitHelper::get_action_type( $action );
2810	2289
2811		- if ( 'redirect' === $action_type && $has_redirect ) {
2812		- // Do not process because we run the first redirect action only.
2813		- 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	+ );
2814	2301	}
2815	2302
2816		- if ( ! self::is_valid_on_submit_action( $action, $args, $event ) ) {
	2303	+ if ( ! self::is_valid_on_submit_action( $action ) ) {
2817	2304	continue;
2818	2305	}
2819	2306
2820	2307	if ( 'redirect' === $action_type ) {
		@@ -2822,9 +2309,9 @@
2822	2309	}
2823	2310
2824	2311	$met_actions[] = $action;
2825	2312	unset( $action );
2826		- }//end foreach
	2313	+ }
2827	2314
2828	2315	$args['event'] = $event;
2829	2316
2830	2317	/**
		@@ -2836,10 +2323,10 @@
2836	2323	* @param array $args See {@see FrmFormsController::run_success_action()}. `$args['event']` is also added.
2837	2324	*/
2838	2325	$met_actions = apply_filters( 'frm_get_met_on_submit_actions', $met_actions, $args );
2839	2326
2840		- if ( ! $met_actions ) {
2841		- return array( FrmOnSubmitHelper::get_fallback_action( $event ) );
	2327	+ if ( empty( $met_actions ) ) {
	2328	+ $met_actions = array( FrmOnSubmitHelper::get_fallback_action( $event ) );
2842	2329	}
2843	2330
2844	2331	return $met_actions;
2845	2332	}
		@@ -2844,31 +2331,45 @@
2844	2331	return $met_actions;
2845	2332	}
2846	2333
2847	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	+ add_filter( 'frm_redirect_url', 'FrmEntriesController::prepare_redirect_url' );
	2356	+ return apply_filters( 'frm_redirect_url', $url, $form, $args );
	2357	+ }
	2358	+
	2359	+ /**
2848	2360	* Checks if a Confirmation action has the valid data.
2849	2361	*
2850	2362	* @since 6.1.2
2851	2363	*
2852	2364	* @param object $action Form action object.
2853		- * @param array $args See {@see FrmFormsController::run_success_action()}.
2854		- * @param string $event Form event. Default is `create`.
2855		- *
2856	2365	* @return bool
2857	2366	*/
2858		- private static function is_valid_on_submit_action( $action, $args, $event = 'create' ) {
	2367	+ private static function is_valid_on_submit_action( $action ) {
2859	2368	$action_type = FrmOnSubmitHelper::get_action_type( $action );
2860	2369
2861		- if ( 'redirect' === $action_type ) {
2862		- // Run through frm_redirect_url filter. This is used for the valid action check.
2863		- $action->post_content['success_url'] = apply_filters(
2864		- 'frm_redirect_url',
2865		- $action->post_content['success_url'],
2866		- $args['form'],
2867		- $args + array( 'action' => $event )
2868		- );
2869		-
2870		- return ! empty( $action->post_content['success_url'] );
	2370	+ if ( 'redirect' === $action_type && empty( $action->post_content['success_url'] ) ) {
	2371	+ return false;
2871	2372	}
2872	2373
2873	2374	if ( 'page' === $action_type ) {
2874	2375	if ( empty( $action->post_content['success_page_id'] ) ) {
		@@ -2875,9 +2376,8 @@
2875	2376	return false;
2876	2377	}
2877	2378
2878	2379	$page = get_post( $action->post_content['success_page_id'] );
2879		-
2880	2380	if ( ! $page || 'trash' === $page->post_status ) {
2881	2381	return false;
2882	2382	}
2883	2383	}
		@@ -2899,9 +2399,8 @@
2899	2399	'entry_id' => $args['entry_id'],
2900	2400	'action' => FrmOnSubmitHelper::current_event( $args ),
2901	2401	)
2902	2402	);
2903		-
2904	2403	if ( ! is_array( $args['conf_method'] ) ) {
2905	2404	self::run_success_action( $args );
2906	2405	return;
2907	2406	}
		@@ -2928,9 +2427,8 @@
2928	2427	* @param array $args See {@see FrmFormsController::run_success_action()}.
2929	2428	*/
2930	2429	public static function run_multi_on_submit_actions( $args ) {
2931	2430	$redirect_action = null;
2932		-
2933	2431	foreach ( $args['conf_method'] as $action ) {
2934	2432	if ( 'redirect' === FrmOnSubmitHelper::get_action_type( $action ) ) {
2935	2433	// We catch the redirect action to run it last.
2936	2434	$redirect_action = $action;
		@@ -2941,15 +2439,13 @@
2941	2439
2942	2440	unset( $action );
2943	2441	}
2944	2442
2945		- if ( ! $redirect_action ) {
2946		- return;
	2443	+ if ( $redirect_action ) {
	2444	+ // Show script to delay the redirection.
	2445	+ $args['force_delay_redirect'] = true;
	2446	+ self::run_single_on_submit_action( $args, $redirect_action );
2947	2447	}
2948		-
2949		- // Show script to delay the redirection.
2950		- $args['force_delay_redirect'] = true;
2951		- self::run_single_on_submit_action( $args, $redirect_action );
2952	2448	}
2953	2449
2954	2450	/**
2955	2451	* Runs single On Submit action.
		@@ -2970,9 +2466,8 @@
2970	2466	* @since 6.0
2971	2467	*
2972	2468	* @param array $args See {@see FrmFormsController::run_success_action()}.
2973	2469	* @param object $action On Submit action object.
2974		- *
2975	2470	* @return array
2976	2471	*/
2977	2472	private static function get_run_success_action_args( $args, $action ) {
2978	2473	$new_args = $args;
		@@ -2978,9 +2473,10 @@
2978	2473	$new_args = $args;
2979	2474
2980	2475	FrmOnSubmitHelper::populate_on_submit_data( $new_args['form']->options, $action, $args['action'] );
2981	2476
2982		- $opt = 'update' === $args['action'] ? 'edit_' : 'success_';
	2477	+ $opt = 'update' === $args['action'] ? 'edit_' : 'success_';
	2478	+
2983	2479	$new_args['conf_method'] = $new_args['form']->options[ $opt . 'action' ];
2984	2480
2985	2481	/**
2986	2482	* Filters the run success action args.
		@@ -2995,18 +2491,12 @@
2995	2491	}
2996	2492
2997	2493	/**
2998	2494	* @since 3.0
2999		- *
3000		- * @param array $args
3001		- *
3002		- * @return void
3003	2495	*/
3004	2496	private static function load_page_after_submit( $args ) {
3005	2497	global $post;
3006	2498	$opt = $args['success_opt'];
3007		-
3008		- // phpcs:ignore Universal.Operators.StrictComparisons
3009	2499	if ( ! $post || $args['form']->options[ $opt . '_page_id' ] != $post->ID ) {
3010	2500	$page = get_post( $args['form']->options[ $opt . '_page_id' ] );
3011	2501	$old_post = $post;
3012	2502	$post = $page;
		@@ -3025,14 +2515,13 @@
3025	2515	add_filter( 'the_content', 'FrmFormsController::preview_content', 9999 );
3026	2516	}
3027	2517
3028	2518	$post = $old_post;
3029		- }//end if
	2519	+ }
3030	2520	}
3031	2521
3032	2522	/**
3033	2523	* @since 3.0
3034		- *
3035	2524	* @param array $args See {@see FrmFormsController::run_success_action()}.
3036	2525	*/
3037	2526	private static function redirect_after_submit( $args ) {
3038	2527	add_filter( 'frm_use_wpautop', '__return_false' );
		@@ -3044,29 +2533,20 @@
3044	2533
3045	2534	$args['id'] = $args['entry_id'];
3046	2535	FrmEntriesController::delete_entry_before_redirect( $success_url, $args['form'], $args );
3047	2536
3048		- add_filter( 'frm_redirect_url', 'FrmEntriesController::prepare_redirect_url' );
3049		- $success_url = apply_filters( 'frm_redirect_url', $success_url, $args['form'], $args );
3050		- $doing_ajax = FrmAppHelper::doing_ajax();
	2537	+ $success_url = self::run_redirect_url_filter( $success_url, $args['form'], $args );
3051	2538
3052		- if ( ! empty( $args['ajax'] ) && $doing_ajax && empty( $args['force_delay_redirect'] ) ) {
3053		- // Is AJAX submit and there is just one Redirect action runs.
3054		- 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 ) );
3055	2543	wp_die();
3056	2544	}
3057	2545
3058		- if ( ! headers_sent() && empty( $args['force_delay_redirect'] ) && empty( $args['form']->options['redirect_delay'] ) ) {
3059		- // Not AJAX submit, no headers sent, and there is just one Redirect action runs.
3060		- if ( ! empty( $args['form']->options['open_in_new_tab'] ) ) {
3061		- self::print_open_in_new_tab_js_with_fallback_handler( $success_url, $args );
3062		- self::$redirected_in_new_tab[ $args['form']->id ] = 1;
3063		- return;
3064		- }
3065		-
	2546	+ if ( ! headers_sent() && empty( $args['force_delay_redirect'] ) ) { // Not AJAX submit, no headers sent, and there is just one Redirect action runs.
3066	2547	wp_redirect( esc_url_raw( $success_url ) );
3067		- // Do not use wp_die or redirect fails.
3068		- die();
	2548	+ die(); // do not use wp_die or redirect fails
3069	2549	}
3070	2550
3071	2551	// Redirect with a delay.
3072	2552	self::redirect_after_submit_using_js( $args + compact( 'success_url', 'doing_ajax' ) );
		@@ -3072,83 +2552,8 @@
3072	2552	self::redirect_after_submit_using_js( $args + compact( 'success_url', 'doing_ajax' ) );
3073	2553	}
3074	2554
3075	2555	/**
3076		- * Prints open in new tab js with fallback handler.
3077		- *
3078		- * @since 6.3.1
3079		- *
3080		- * @param string $success_url Success URL.
3081		- * @param array $args See {@see FrmFormsController::redirect_after_submit()}.
3082		- */
3083		- private static function print_open_in_new_tab_js_with_fallback_handler( $success_url, $args ) {
3084		- echo '<script>var newTab = window.open("' . esc_url_raw( $success_url ) . '", "_blank");';
3085		- echo 'if ( ! newTab ) {';
3086		-
3087		- $data = array(
3088		- 'formId' => intval( $args['form']->id ),
3089		- 'message' => self::get_redirect_fallback_message( $success_url, $args ),
3090		- );
3091		- // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
3092		- echo 'frmShowNewTabFallback = ' . FrmAppHelper::maybe_json_encode( $data ) . ';';
3093		- echo '}</script>';
3094		- }
3095		-
3096		- /**
3097		- * Gets response data for redirect action when AJAX submitting.
3098		- *
3099		- * @since 6.3.1
3100		- *
3101		- * @param array $args See {@see FrmFormsController::run_success_action()}.
3102		- *
3103		- * @return array
3104		- */
3105		- private static function get_ajax_redirect_response_data( $args ) {
3106		- $response_data = array(
3107		- 'redirect' => $args['success_url'],
3108		- 'content' => '',
3109		- );
3110		- $unset_content = true;
3111		-
3112		- if ( ! empty( $args['form']->options['redirect_delay'] ) ) {
3113		- $response_data['delay'] = $args['form']->options['redirect_delay_time'];
3114		- $response_data['content'] .= self::get_redirect_message( $args['success_url'], $args['form']->options['redirect_delay_msg'], $args );
3115		- $unset_content = false;
3116		- }
3117		-
3118		- if ( ! empty( $args['form']->options['open_in_new_tab'] ) ) {
3119		- $response_data['openInNewTab'] = 1;
3120		-
3121		- // Only show open in new tab text if there is no delay.
3122		- if ( empty( $response_data['content'] ) ) {
3123		- $args['message'] = FrmOnSubmitHelper::get_default_new_tab_msg();
3124		-
3125		- $args['form']->options['success_msg'] = $args['message'];
3126		- $args['form']->options['edit_msg'] = $args['message'];
3127		-
3128		- if ( ! isset( $args['fields'] ) ) {
3129		- $args['fields'] = FrmField::get_all_for_form( $args['form']->id );
3130		- }
3131		-
3132		- $args['message'] = self::prepare_submit_message( $args['form'], $args['entry_id'], $args );
3133		-
3134		- ob_start();
3135		- self::show_lone_success_message( $args );
3136		- $response_data['content'] .= ob_get_clean();
3137		- $unset_content = false;
3138		- }//end if
3139		-
3140		- $response_data['fallbackMsg'] = self::get_redirect_fallback_message( $args['success_url'], $args );
3141		- }//end if
3142		-
3143		- if ( $unset_content && '' === $response_data['content'] ) {
3144		- unset( $response_data['content'] );
3145		- }
3146		-
3147		- return $response_data;
3148		- }
3149		-
3150		- /**
3151	2556	* Redirects after submitting using JS. This is used when showing message before redirecting.
3152	2557	*
3153	2558	* @since 6.0
3154	2559	*
		@@ -3154,11 +2559,10 @@
3154	2559	*
3155	2560	* @param array $args See {@see FrmFormsController::run_success_action()}.
3156	2561	*/
3157	2562	private static function redirect_after_submit_using_js( $args ) {
3158		- $success_msg = $args['form']->options['redirect_delay_msg'];
	2563	+ $success_msg = FrmOnSubmitHelper::get_default_redirect_msg();
3159	2564	$redirect_msg = self::get_redirect_message( $args['success_url'], $success_msg, $args );
3160		- $success_url = esc_url_raw( $args['success_url'] );
3161	2565
3162	2566	/**
3163	2567	* Filters the delay time before redirecting when On Submit Redirect action is delayed.
3164	2568	*
		@@ -3163,29 +2567,20 @@
3163	2567	* Filters the delay time before redirecting when On Submit Redirect action is delayed.
3164	2568	*
3165	2569	* @since 6.0
3166	2570	*
3167		- * @param int $delay_time Delay time in milliseconds.
	2571	+ * @param int $delay_time Delay time in miliseconds.
3168	2572	*/
3169		- $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 );
3170	2574
3171		- if ( ! empty( $args['form']->options['open_in_new_tab'] ) ) {
3172		- $redirect_js = 'window.open("' . $success_url . '", "_blank")';
3173		- } else {
3174		- $redirect_js = 'window.location="' . $success_url . '";';
3175		- }
3176		-
3177	2575	add_filter( 'frm_use_wpautop', '__return_true' );
3178	2576
3179	2577	echo FrmAppHelper::maybe_kses( $redirect_msg ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
3180	2578	echo '<script>';
3181		-
3182		- if ( empty( $args['doing_ajax'] ) ) {
3183		- // Not AJAX submit, delay JS until window.load.
	2579	+ if ( empty( $args['doing_ajax'] ) ) { // Not AJAX submit, delay JS until window.load.
3184	2580	echo 'window.onload=function(){';
3185	2581	}
3186		- echo 'setTimeout(function(){' . $redirect_js . '}, ' . intval( $delay_time ) . ');'; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
3187		-
	2582	+ echo 'setTimeout(function(){window.location="' . esc_url_raw( $args['success_url'] ) . '";}, ' . intval( $delay_time ) . ');';
3188	2583	if ( empty( $args['doing_ajax'] ) ) {
3189	2584	echo '};';
3190	2585	}
3191	2586	echo '</script>';
		@@ -3195,19 +2590,15 @@
3195	2590	* @since 3.0
3196	2591	*
3197	2592	* @param string $success_url
3198	2593	* @param string $success_msg
3199		- * @param array $args
	2594	+ * @param array $args
3200	2595	*/
3201	2596	private static function get_redirect_message( $success_url, $success_msg, $args ) {
3202		- $success_msg = apply_filters( 'frm_content', $success_msg, $args['form'], $args['entry_id'] );
3203		- $success_msg = do_shortcode( FrmAppHelper::use_wpautop( $success_msg ) );
3204		-
3205		- // phpcs:disable Generic.WhiteSpace.ScopeIndent
3206		- $redirect_msg = '<div class="' . esc_attr( FrmFormsHelper::get_form_style_class( $args['form'] ) ) . '"><div class="frm-redirect-msg" role="status">' . $success_msg . '<br/>' . // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong
3207		- 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>' ) .
3208	2600	'</div></div>';
3209		- // phpcs:enable Generic.WhiteSpace.ScopeIndent
3210	2601
3211	2602	$redirect_args = array(
3212	2603	'entry_id' => $args['entry_id'],
3213	2604	'form_id' => $args['form']->id,
		@@ -3217,40 +2608,11 @@
3217	2608	return apply_filters( 'frm_redirect_msg', $redirect_msg, $redirect_args );
3218	2609	}
3219	2610
3220	2611	/**
3221		- * Gets fallback message when redirecting failed.
3222		- *
3223		- * @since 6.3.1
3224		- *
3225		- * @param string $success_url Redirect URL.
3226		- * @param array $args Contains `form` object.
3227		- *
3228		- * @return string
3229		- */
3230		- private static function get_redirect_fallback_message( $success_url, $args ) {
3231		- $target = '';
3232		-
3233		- if ( ! empty( $args['form']->options['open_in_new_tab'] ) ) {
3234		- $target = ' target="_blank"';
3235		- }
3236		-
3237		- return sprintf(
3238		- /* translators: %1$s: Start link HTML, %2$s: End link HTML */
3239		- __( '%1$sClick here%2$s if you are not automatically redirected.', 'formidable' ),
3240		- '<a href="' . esc_url( $success_url ) . '"' . $target . '>',
3241		- '</a>'
3242		- );
3243		- }
3244		-
3245		- /**
3246	2612	* Prepare to show the success message and empty form after submit
3247	2613	*
3248	2614	* @since 2.05
3249		- *
3250		- * @param array $atts
3251		- *
3252		- * @return void
3253	2615	*/
3254	2616	public static function show_message_after_save( $atts ) {
3255	2617	$atts['message'] = self::prepare_submit_message( $atts['form'], $atts['entry_id'], $atts );
3256	2618
		@@ -3256,9 +2618,8 @@
3256	2618
3257	2619	if ( ! isset( $atts['form']->options['show_form'] ) || $atts['form']->options['show_form'] ) {
3258	2620	if ( isset( $atts['action'] ) && 'update' === $atts['action'] && is_callable( array( 'FrmProEntriesController', 'show_front_end_form_with_entry' ) ) ) {
3259	2621	$entry = FrmEntry::getOne( $atts['entry_id'] );
3260		-
3261	2622	if ( $entry ) {
3262	2623	// This is copied from the Pro plugin.
3263	2624	$atts['conf_message'] = FrmProEntriesController::confirmation( 'message', $atts['form'], $atts['form']->options, $entry->id, $atts );
3264	2625	$atts['show_form'] = FrmProEntriesController::is_form_displayed_after_edit( $atts['form'] );
		@@ -3267,9 +2628,9 @@
3267	2628	} else {
3268	2629	self::show_form_after_submit( $atts );
3269	2630	}
3270	2631	} else {
3271		- self::show_lone_success_message( $atts );
	2632	+ self::show_lone_success_messsage( $atts );
3272	2633	}
3273	2634	}
3274	2635
3275	2636	/**
		@@ -3275,12 +2636,8 @@
3275	2636	/**
3276	2637	* Show an empty form
3277	2638	*
3278	2639	* @since 2.05
3279		- *
3280		- * @param array $args
3281		- *
3282		- * @return void
3283	2640	*/
3284	2641	private static function show_form_after_submit( $args ) {
3285	2642	self::fill_atts_for_form_display( $args );
3286	2643
		@@ -3299,11 +2656,12 @@
3299	2656	}
3300	2657	unset( $args );
3301	2658
3302	2659	$include_form_tag = apply_filters( 'frm_include_form_tag', true, $form );
3303		- $frm_settings = FrmAppHelper::get_settings();
3304		- $submit = $form->options['submit_value'] ?? $frm_settings->submit_value;
3305	2660
	2661	+ $frm_settings = FrmAppHelper::get_settings();
	2662	+ $submit = isset( $form->options['submit_value'] ) ? $form->options['submit_value'] : $frm_settings->submit_value;
	2663	+
3306	2664	global $frm_vars;
3307	2665	self::maybe_load_css( $form, $values['custom_style'], $frm_vars['load_css'] );
3308	2666
3309	2667	$message_placement = self::message_placement( $form, $message );
		@@ -3311,36 +2669,27 @@
3311	2669	include FrmAppHelper::plugin_path() . '/classes/views/frm-entries/new.php';
3312	2670	}
3313	2671
3314	2672	/**
3315		- * Gets message placement.
	2673	+ * @return string - 'before', 'after', or 'submit'
3316	2674	*
3317	2675	* @since 4.05.02
3318		- * @since 6.26 This method changed from `private` to `public`.
3319		- *
3320		- * @param object $form Form object.
3321		- * @param string $message The message.
3322		- *
3323		- * @return string Accepts 'before', 'after', or 'submit'.
3324	2676	*/
3325		- public static function message_placement( $form, $message ) {
	2677	+ private static function message_placement( $form, $message ) {
3326	2678	$place = 'before';
3327	2679
3328	2680	if ( $message && isset( $form->options['form_class'] ) ) {
3329		- if ( str_contains( $form->options['form_class'], 'frm_below_success' ) ) {
	2681	+ if ( strpos( $form->options['form_class'], 'frm_below_success' ) !== false ) {
3330	2682	$place = 'after';
3331		- } elseif ( str_contains( $form->options['form_class'], 'frm_inline_success' ) ) {
	2683	+ } elseif ( strpos( $form->options['form_class'], 'frm_inline_success' ) !== false ) {
3332	2684	$place = 'submit';
3333	2685	}
3334	2686	}
3335	2687
3336	2688	/**
3337		- * Filter the message placement.
	2689	+ * @return string - 'before' or 'after'
3338	2690	*
3339	2691	* @since 4.05.02
3340		- *
3341		- * @param string $place Accepts 'before', 'after', or 'submit'.
3342		- * @param array $args Args.
3343	2692	*/
3344	2693	return apply_filters( 'frm_message_placement', $place, compact( 'form', 'message' ) );
3345	2694	}
3346	2695
		@@ -3347,12 +2696,8 @@
3347	2696	/**
3348	2697	* Get all the values needed on the new.php entry page
3349	2698	*
3350	2699	* @since 2.05
3351		- *
3352		- * @param array $args
3353		- *
3354		- * @return void
3355	2700	*/
3356	2701	private static function fill_atts_for_form_display( &$args ) {
3357	2702	if ( ! isset( $args['title'] ) && isset( $args['show_title'] ) ) {
3358	2703	$args['title'] = $args['show_title'];
		@@ -3377,24 +2722,21 @@
3377	2722	/**
3378	2723	* Show the success message without the form
3379	2724	*
3380	2725	* @since 2.05
3381		- *
3382		- * @param array $atts
3383		- *
3384		- * @return void
3385	2726	*/
3386		- private static function show_lone_success_message( $atts ) {
	2727	+ private static function show_lone_success_messsage( $atts ) {
3387	2728	global $frm_vars;
3388	2729	$values = FrmEntriesHelper::setup_new_vars( $atts['fields'], $atts['form'], true );
3389	2730	self::maybe_load_css( $atts['form'], $values['custom_style'], $frm_vars['load_css'] );
3390	2731
3391	2732	$include_extra_container = 'frm_forms' . FrmFormsHelper::get_form_style_class( $values );
3392		- $errors = array();
3393		- $form = $atts['form'];
3394		- $message = $atts['message'];
3395	2733
3396		- 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' );
3397	2739	}
3398	2740
3399	2741	/**
3400	2742	* Prepare the success message before it's shown
		@@ -3401,20 +2743,19 @@
3401	2743	*
3402	2744	* @since 2.05
3403	2745	* @since 6.0.x Added the third parameter.
3404	2746	*
3405		- * @param object $form Form object.
3406		- * @param int|string $entry_id Entry ID.
3407		- * @param array $args See {@see FrmFormsController::run_success_action()}.
3408		- *
	2747	+ * @param object $form Form object.
	2748	+ * @param int $entry_id Entry ID.
	2749	+ * @param array $args See {@see FrmFormsController::run_success_action()}.
3409	2750	* @return string
3410	2751	*/
3411	2752	private static function prepare_submit_message( $form, $entry_id, $args = array() ) {
3412	2753	$frm_settings = FrmAppHelper::get_settings( array( 'current_form' => $form->id ) );
3413		- $opt = $args['success_opt'] ?? 'success';
	2754	+ $opt = isset( $args['success_opt'] ) ? $args['success_opt'] : 'success';
3414	2755
3415	2756	if ( $entry_id && is_numeric( $entry_id ) ) {
3416		- $message = $form->options[ $opt . '_msg' ] ?? $frm_settings->success_msg;
	2757	+ $message = isset( $form->options[ $opt . '_msg' ] ) ? $form->options[ $opt . '_msg' ] : $frm_settings->success_msg;
3417	2758	$class = 'frm_message';
3418	2759	} else {
3419	2760	$message = $frm_settings->failed_msg;
3420	2761	$class = FrmFormsHelper::form_error_class();
		@@ -3431,9 +2772,9 @@
3431	2772	public static function front_head() {
3432	2773	$version = FrmAppHelper::plugin_version();
3433	2774	$suffix = FrmAppHelper::js_suffix();
3434	2775
3435		- if ( $suffix && self::has_combo_js_file() ) {
	2776	+ if ( ! empty( $suffix ) && self::has_combo_js_file() ) {
3436	2777	wp_register_script( 'formidable', FrmAppHelper::plugin_url() . '/js/frm.min.js', array( 'jquery' ), $version, true );
3437	2778	} else {
3438	2779	wp_register_script( 'formidable', FrmAppHelper::plugin_url() . "/js/formidable{$suffix}.js", array( 'jquery' ), $version, true );
3439	2780	}
		@@ -3440,9 +2781,9 @@
3440	2781
3441	2782	add_filter( 'script_loader_tag', 'FrmFormsController::defer_script_loading', 10, 2 );
3442	2783
3443	2784	if ( FrmAppHelper::is_admin() ) {
3444		- // Don't load this in back-end
	2785	+ // don't load this in back-end
3445	2786	return;
3446	2787	}
3447	2788
3448	2789	FrmAppHelper::localize_script( 'front' );
		@@ -3455,15 +2796,8 @@
3455	2796	public static function has_combo_js_file() {
3456	2797	return is_readable( FrmAppHelper::plugin_path() . '/js/frm.min.js' );
3457	2798	}
3458	2799
3459		- /**
3460		- * @param object $form
3461		- * @param int|string $this_load
3462		- * @param bool $global_load
3463		- *
3464		- * @return void
3465		- */
3466	2800	public static function maybe_load_css( $form, $this_load, $global_load ) {
3467	2801	$load_css = FrmForm::is_form_loaded( $form, $this_load, $global_load );
3468	2802
3469	2803	if ( ! $load_css ) {
		@@ -3493,9 +2827,8 @@
3493	2827	return;
3494	2828	}
3495	2829
3496	2830	global $wp_styles;
3497		-
3498	2831	if ( is_array( $wp_styles->queue ) && in_array( 'formidable', $wp_styles->queue, true ) ) {
3499	2832	wp_print_styles( 'formidable' );
3500	2833	}
3501	2834	}
		@@ -3510,52 +2843,32 @@
3510	2843	private static function should_load_late() {
3511	2844	return ! function_exists( 'aioseo' );
3512	2845	}
3513	2846
3514		- /**
3515		- * @param string $tag
3516		- * @param string $handle
3517		- *
3518		- * @return string
3519		- */
3520	2847	public static function defer_script_loading( $tag, $handle ) {
3521		- if ( 'captcha-api' === $handle && ! str_contains( $tag, 'defer' ) ) {
3522		- return str_replace( ' src', ' defer="defer" async="async" src', $tag );
	2848	+ if ( 'captcha-api' == $handle && ! strpos( $tag, 'defer' ) ) {
	2849	+ $tag = str_replace( ' src', ' defer="defer" async="async" src', $tag );
3523	2850	}
3524	2851
3525	2852	return $tag;
3526	2853	}
3527	2854
3528		- /**
3529		- * @param string $location
3530		- *
3531		- * @return void
3532		- */
3533	2855	public static function footer_js( $location = 'footer' ) {
3534	2856	global $frm_vars;
3535	2857
3536	2858	FrmStylesController::enqueue_css();
3537	2859
3538		- if ( FrmAppHelper::is_admin() || $location === 'header' || empty( $frm_vars['forms_loaded'] ) ) {
3539		- return;
	2860	+ if ( ! FrmAppHelper::is_admin() && $location != 'header' && ! empty( $frm_vars['forms_loaded'] ) ) {
	2861	+ // load formidable js
	2862	+ wp_enqueue_script( 'formidable' );
3540	2863	}
3541		-
3542		- // Load formidable js
3543		- wp_enqueue_script( 'formidable' );
3544		-
3545		- FrmHoneypot::maybe_print_honeypot_js();
3546	2864	}
3547	2865
3548	2866	/**
3549	2867	* @since 2.0.8
3550		- *
3551		- * @param array $atts
3552		- * @param string $content
3553		- *
3554		- * @return void
3555	2868	*/
3556	2869	private static function maybe_minimize_form( $atts, &$content ) {
3557		- // Check if minimizing is turned on
	2870	+ // check if minimizing is turned on
3558	2871	if ( self::is_minification_on( $atts ) ) {
3559	2872	$content = str_replace( array( "\r\n", "\r", "\n", "\t", ' ' ), '', $content );
3560	2873	}
3561	2874	}
		@@ -3561,15 +2874,12 @@
3561	2874	}
3562	2875
3563	2876	/**
3564	2877	* @since 2.0.8
3565		- *
3566		- * @param array $atts
3567		- *
3568		- * @return bool
	2878	+ * @return boolean
3569	2879	*/
3570	2880	private static function is_minification_on( $atts ) {
3571		- return ! empty( $atts['minimize'] );
	2881	+ return isset( $atts['minimize'] ) && ! empty( $atts['minimize'] );
3572	2882	}
3573	2883
3574	2884	/**
3575	2885	* @since 5.0.16
		@@ -3577,13 +2887,11 @@
3577	2887	* @return void
3578	2888	*/
3579	2889	public static function landing_page_preview_option() {
3580	2890	$dir = apply_filters( 'frm_landing_page_preview_option', false );
3581		-
3582	2891	if ( false === $dir || ! file_exists( $dir . 'landing-page-preview-option.php' ) ) {
3583	2892	$dir = self::get_form_views_path();
3584	2893	}
3585		-
3586	2894	include $dir . 'landing-page-preview-option.php';
3587	2895	}
3588	2896
3589	2897	/**
		@@ -3599,9 +2907,9 @@
3599	2907	* Create a page with an embedded formidable Gutenberg block.
3600	2908	*
3601	2909	* @since 5.2
3602	2910	*
3603		- * @return void
	2911	+ * @return never
3604	2912	*/
3605	2913	public static function create_page_with_shortcode() {
3606	2914	if ( ! current_user_can( 'publish_posts' ) ) {
3607	2915	die( 0 );
		@@ -3609,15 +2917,13 @@
3609	2917
3610	2918	check_ajax_referer( 'frm_ajax', 'nonce' );
3611	2919
3612	2920	$type = FrmAppHelper::get_post_param( 'type', '', 'sanitize_text_field' );
3613		-
3614	2921	if ( ! $type || ! in_array( $type, array( 'form', 'view' ), true ) ) {
3615	2922	die( 0 );
3616	2923	}
3617	2924
3618	2925	$object_id = FrmAppHelper::get_post_param( 'object_id', '', 'absint' );
3619		-
3620	2926	if ( ! $object_id ) {
3621	2927	die( 0 );
3622	2928	}
3623	2929
		@@ -3629,15 +2935,13 @@
3629	2935	$postarr['post_content'] = apply_filters( 'frm_create_page_with_' . $type . '_shortcode_content', '', $object_id );
3630	2936	}
3631	2937
3632	2938	$name = FrmAppHelper::get_post_param( 'name', '', 'sanitize_text_field' );
3633		-
3634	2939	if ( $name ) {
3635	2940	$postarr['post_title'] = $name;
3636	2941	}
3637	2942
3638	2943	$success = wp_insert_post( $postarr );
3639		-
3640	2944	if ( ! is_numeric( $success ) || ! $success ) {
3641	2945	die( 0 );
3642	2946	}
3643	2947
		@@ -3650,10 +2954,10 @@
3650	2954
3651	2955	/**
3652	2956	* @since 5.3
3653	2957	*
3654		- * @param int $form_id
3655		- *
	2958	+ * @param string $content
	2959	+ * @param int $form_id
3656	2960	* @return string
3657	2961	*/
3658	2962	private static function get_page_shortcode_content_for_form( $form_id ) {
3659	2963	$shortcode = '[formidable id="' . $form_id . '"]';
		@@ -3664,9 +2968,9 @@
3664	2968
3665	2969	/**
3666	2970	* Get page dropdown for AJAX request for embedding form in an existing page.
3667	2971	*
3668		- * @return void
	2972	+ * @return never
3669	2973	*/
3670	2974	public static function get_page_dropdown() {
3671	2975	if ( ! current_user_can( 'publish_posts' ) ) {
3672	2976	die( 0 );
		@@ -3674,9 +2978,9 @@
3674	2978
3675	2979	check_ajax_referer( 'frm_ajax', 'nonce' );
3676	2980
3677	2981	$html = FrmAppHelper::clip(
3678		- function () {
	2982	+ function() {
3679	2983	FrmAppHelper::maybe_autocomplete_pages_options(
3680	2984	array(
3681	2985	'field_name' => 'frm_page_dropdown',
3682	2986	'page_id' => '',
		@@ -3695,14 +2999,49 @@
3695	2999	}
3696	3000
3697	3001	/**
3698	3002	* @deprecated 4.0
3699		- *
3700		- * @param array $values
3701		- *
3702		- * @return void
3703	3003	*/
	3004	+ public static function new_form( $values = array() ) {
	3005	+ FrmDeprecated::new_form( $values );
	3006	+ }
	3007	+
	3008	+ /**
	3009	+ * @deprecated 4.0
	3010	+ */
3704	3011	public static function create( $values = array() ) {
3705	3012	_deprecated_function( __METHOD__, '4.0', 'FrmFormsController::update' );
3706	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' );
3707	3046	}
3708	3047	}