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