← All changes | classes/controllers/FrmFormsController.php +474 -1148 6.32.1 → 6.7 View file →

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