← All changes | classes/controllers/FrmFormsController.php +452 -1110 6.34 → 6.7.2 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		- );
385		- }
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 );
	232	+ return self::get_edit_vars( $id, array(), $message );
	233	+ }//end if
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,26 +294,20 @@
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,19 +314,9 @@
503	314	*
504	315	* @return void
505	316	*/
506	317	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
	318	+ echo self::page_preview(); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
518	319	}
519	320
520	321	/**
521	322	* @return void
		@@ -526,19 +327,9 @@
526	327
527	328	global $frm_vars;
528	329	$frm_vars['preview'] = true;
529	330
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	331	$include_theme = FrmAppHelper::get_param( 'theme', '', 'get', 'absint' );
540		-
541	332	if ( $include_theme ) {
542	333	self::set_preview_query();
543	334	self::load_theme_preview();
544	335	} else {
		@@ -561,9 +352,8 @@
561	352	'post_type' => 'page',
562	353	);
563	354
564	355	$page_for_posts = get_option( 'page_for_posts' );
565		-
566	356	if ( is_numeric( $page_for_posts ) ) {
567	357	// Avoid querying for the "Posts Page" or "Blog Page" so we don't display 10 forms.
568	358	$page_query['post__not_in'] = array( $page_for_posts );
569	359	}
		@@ -568,15 +358,13 @@
568	358	$page_query['post__not_in'] = array( $page_for_posts );
569	359	}
570	360
571	361	$random_page = get_posts( $page_query );
572		-
573	362	if ( ! $random_page ) {
574	363	return;
575	364	}
576	365
577	366	$random_page = reset( $random_page );
578		-
579	367	if ( ! is_a( $random_page, 'WP_Post' ) ) {
580	368	// The return type can also be int.
581	369	return;
582	370	}
		@@ -598,9 +386,8 @@
598	386	*
599	387	* @since 5.5.2
600	388	*
601	389	* @param WP_Post $page The page object.
602		- *
603	390	* @return void
604	391	*/
605	392	private static function set_post_global( $page ) {
606	393	global $post;
		@@ -608,10 +395,8 @@
608	395	}
609	396
610	397	/**
611	398	* @since 3.0
612		- *
613		- * @return void
614	399	*/
615	400	private static function load_theme_preview() {
616	401	add_filter( 'wp_title', 'FrmFormsController::preview_title', 9999 );
617	402	add_filter( 'the_title', 'FrmFormsController::preview_page_title', 9999 );
		@@ -619,16 +404,14 @@
619	404	add_action( 'loop_no_results', 'FrmFormsController::show_page_preview' );
620	405	add_filter( 'is_active_sidebar', '__return_false' );
621	406	FrmStylesController::enqueue_css( 'enqueue', true );
622	407
623		- if ( false !== get_template_part( 'page' ) ) {
624		- return;
	408	+ if ( false === get_template_part( 'page' ) ) {
	409	+ if ( function_exists( 'wp_is_block_theme' ) && wp_is_block_theme() ) {
	410	+ add_filter( 'body_class', 'FrmFormsController::preview_block_theme_body_classnames' );
	411	+ }
	412	+ self::fallback_when_page_template_part_is_not_supported_by_theme();
625	413	}
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	414	}
632	415
633	416	/**
634	417	* Add padding to the body for block themes.
		@@ -635,9 +418,8 @@
635	418	*
636	419	* @since 6.5.2
637	420	*
638	421	* @param array $classes The body classes list.
639		- *
640	422	* @return array
641	423	*/
642	424	public static function preview_block_theme_body_classnames( $classes ) {
643	425	$classes[] = 'has-global-padding';
		@@ -646,41 +428,31 @@
646	428
647	429	/**
648	430	* Not every theme supports get_template_part( 'page' ).
649	431	* When this is not supported, false is returned, and we can handle a fallback.
650		- *
651		- * @return void
652	432	*/
653	433	private static function fallback_when_page_template_part_is_not_supported_by_theme() {
654		- if ( ! have_posts() ) {
655		- return;
656		- }
	434	+ if ( have_posts() ) {
	435	+ the_post();
	436	+ self::get_template( 'header' );
657	437
658		- the_post();
659		- self::get_template( 'header' );
	438	+ // add some generic class names to the container to add some natural padding to the content.
	439	+ // .entry-content catches the WordPress TwentyTwenty theme.
	440	+ // .container catches Customizr content.
	441	+ echo '<div class="container entry-content">';
	442	+ the_content();
	443	+ echo '</div>';
660	444
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' );
	445	+ self::get_template( 'footer' );
	446	+ }
673	447	}
674	448
675	449	/**
676	450	* 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.
	451	+ * and renders required html fragements calling required functions.
678	452	*
679	453	* @since 6.7.1
680		- *
681	454	* @param string $template
682		- *
683	455	* @return void
684	456	*/
685	457	private static function get_template( $template ) {
686	458	if ( self::should_try_getting_template( $template ) ) {
		@@ -701,11 +473,9 @@
701	473	/**
702	474	* Returns true if calling a template function doesn't trigger deprecation warnings.
703	475	*
704	476	* @since 6.7.1
705		- *
706	477	* @param string $template
707		- *
708	478	* @return bool
709	479	*/
710	480	private static function should_try_getting_template( $template ) {
711	481	$stylesheet_path = get_stylesheet_directory();
		@@ -719,25 +489,21 @@
719	489	/**
720	490	* Set the page title for the theme preview page
721	491	*
722	492	* @since 3.0
723		- *
724		- * @param string $title
725		- *
726		- * @return string
727	493	*/
728	494	public static function preview_page_title( $title ) {
729		- return in_the_loop() ? self::preview_title( $title ) : $title;
	495	+ if ( in_the_loop() ) {
	496	+ $title = self::preview_title( $title );
	497	+ }
	498	+
	499	+ return $title;
730	500	}
731	501
732	502	/**
733		- * Set the page title for the theme preview page.
	503	+ * Set the page title for the theme preview page
734	504	*
735	505	* @since 3.0
736		- *
737		- * @param string $title
738		- *
739		- * @return string
740	506	*/
741	507	public static function preview_title( $title ) {
742	508	return __( 'Form Preview', 'formidable' );
743	509	}
		@@ -747,9 +513,8 @@
747	513	*
748	514	* @since 3.0
749	515	*
750	516	* @param string $content
751		- *
752	517	* @return string
753	518	*/
754	519	public static function preview_content( $content ) {
755	520	if ( in_the_loop() ) {
		@@ -764,92 +529,23 @@
764	529	/**
765	530	* @since 3.0
766	531	*/
767	532	private static function load_direct_preview() {
	533	+ header( 'Content-Type: text/html; charset=' . get_option( 'blog_charset' ) );
	534	+
768	535	$key = FrmAppHelper::simple_get( 'form', 'sanitize_title' );
769		-
770		- // phpcs:ignore Universal.Operators.StrictComparisons
771	536	if ( $key == '' ) {
772	537	$key = FrmAppHelper::get_post_param( 'form', '', 'sanitize_title' );
773	538	}
774	539
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	540	$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		- );
	541	+ if ( empty( $form ) ) {
	542	+ $form = FrmForm::getAll( array(), '', 1 );
795	543	}
796	544
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';
	545	+ require( FrmAppHelper::plugin_path() . '/classes/views/frm-entries/direct.php' );
802	546	}
803	547
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	548	public static function untrash() {
853	549	self::change_form_status( 'untrash' );
854	550	}
855	551
		@@ -854,9 +550,8 @@
854	550	}
855	551
856	552	/**
857	553	* @param array $ids
858		- *
859	554	* @return string
860	555	*/
861	556	public static function bulk_untrash( $ids ) {
862	557	FrmAppHelper::permission_check( 'frm_edit_forms' );
		@@ -868,9 +563,11 @@
868	563	return '';
869	564	}
870	565
871	566	/* 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 );
	567	+ $message = sprintf( _n( '%1$s form restored from the Trash.', '%1$s forms restored from the Trash.', $count, 'formidable' ), $count );
	568	+
	569	+ return $message;
873	570	}
874	571
875	572	/**
876	573	* @since 3.06
		@@ -915,11 +612,10 @@
915	612	// Check nonce url.
916	613	check_admin_referer( $status . '_form_' . $params['id'] );
917	614
918	615	$count = 0;
919		-
920	616	if ( FrmForm::set_status( $params['id'], $available_status[ $status ]['new_status'] ) ) {
921		- ++$count;
	617	+ $count ++;
922	618	}
923	619
924	620	$form_type = FrmAppHelper::get_simple_request(
925	621	array(
		@@ -931,9 +627,9 @@
931	627	/* translators: %1$s: Number of forms */
932	628	$available_status['untrash']['message'] = sprintf( _n( '%1$s form restored from the Trash.', '%1$s forms restored from the Trash.', $count, 'formidable' ), $count );
933	629
934	630	/* 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
	631	+ $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	632
937	633	$message = $available_status[ $status ]['message'];
938	634
939	635	self::display_forms_list( $params, $message );
		@@ -938,28 +634,18 @@
938	634
939	635	self::display_forms_list( $params, $message );
940	636	}
941	637
942		- /**
943		- * @param array $ids
944		- *
945		- * @return string
946		- */
947	638	public static function bulk_trash( $ids ) {
948	639	FrmAppHelper::permission_check( 'frm_delete_forms' );
949	640
950	641	$count = 0;
951		-
952	642	foreach ( $ids as $id ) {
953	643	if ( FrmForm::trash( $id ) ) {
954		- ++$count;
	644	+ $count ++;
955	645	}
956	646	}
957	647
958		- if ( ! $count ) {
959		- return '';
960		- }
961		-
962	648	$current_page = FrmAppHelper::get_simple_request(
963	649	array(
964	650	'param' => 'form_type',
965	651	'type' => 'request',
		@@ -964,16 +650,17 @@
964	650	'param' => 'form_type',
965	651	'type' => 'request',
966	652	)
967	653	);
968		-
969		- return sprintf(
	654	+ $message = sprintf(
970	655	/* translators: %1$s: Number of forms, %2$s: Start link HTML, %3$s: End link HTML */
971	656	_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	657	$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
	658	+ '<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	659	'</a>'
975	660	);
	661	+
	662	+ return $message;
976	663	}
977	664
978	665	public static function destroy() {
979	666	FrmAppHelper::permission_check( 'frm_delete_forms' );
		@@ -983,11 +670,10 @@
983	670	// Check nonce url.
984	671	check_admin_referer( 'destroy_form_' . $params['id'] );
985	672
986	673	$count = 0;
987		-
988	674	if ( FrmForm::destroy( $params['id'] ) ) {
989		- ++$count;
	675	+ $count ++;
990	676	}
991	677
992	678	/* translators: %1$s: Number of forms */
993	679	$message = sprintf( _n( '%1$s Form Permanently Deleted', '%1$s Forms Permanently Deleted', $count, 'formidable' ), $count );
		@@ -994,23 +680,16 @@
994	680
995	681	self::display_forms_list( $params, $message );
996	682	}
997	683
998		- /**
999		- * @param array $ids
1000		- *
1001		- * @return string
1002		- */
1003	684	public static function bulk_destroy( $ids ) {
1004	685	FrmAppHelper::permission_check( 'frm_delete_forms' );
1005	686
1006	687	$count = 0;
1007		-
1008	688	foreach ( $ids as $id ) {
1009	689	$d = FrmForm::destroy( $id );
1010		-
1011	690	if ( $d ) {
1012		- ++$count;
	691	+ $count ++;
1013	692	}
1014	693	}
1015	694
1016	695	if ( $count ) {
		@@ -1026,16 +705,17 @@
1026	705	*/
1027	706	public static function delete_all() {
1028	707	// Check nonce url.
1029	708	$permission_error = FrmAppHelper::permission_nonce_error( 'frm_delete_forms', '_wpnonce', 'bulk-toplevel_page_formidable' );
1030		-
1031	709	if ( $permission_error !== false ) {
1032	710	self::display_forms_list( array(), '', array( $permission_error ) );
	711	+
1033	712	return;
1034	713	}
1035	714
1036	715	$count = FrmForm::scheduled_delete( time() );
1037	716	$url = remove_query_arg( array( 'delete_all' ) );
	717	+
1038	718	$url .= '&message=forms_permanently_deleted&forms_deleted=' . $count;
1039	719
1040	720	wp_safe_redirect( $url );
1041	721	die();
		@@ -1052,9 +732,9 @@
1052	732
1053	733	$new_values = self::get_modal_values();
1054	734	$new_values['form_key'] = $new_values['name'];
1055	735	$new_values['options'] = array(
1056		- 'antispam' => 1,
	736	+ 'antispam' => 1,
1057	737	'on_submit_migrated' => 1,
1058	738	);
1059	739
1060	740	/**
		@@ -1073,9 +753,8 @@
1073	753	* @param int $form_id
1074	754	*/
1075	755	do_action( 'frm_build_new_form', $form_id );
1076	756
1077		- self::create_submit_button_field( $form_id );
1078	757	self::create_default_on_submit_action( $form_id );
1079	758	self::create_default_email_action( $form_id );
1080	759
1081	760	$response = array(
		@@ -1089,10 +768,8 @@
1089	768	/**
1090	769	* Before creating a new form, get the name and description from the modal.
1091	770	*
1092	771	* @since 4.0
1093		- *
1094		- * @return array<string,string>
1095	772	*/
1096	773	public static function get_modal_values() {
1097	774	$name = FrmAppHelper::get_param( 'name', '', 'post', 'sanitize_text_field' );
1098	775	$desc = FrmAppHelper::get_param( 'desc', '', 'post', 'sanitize_textarea_field' );
		@@ -1107,26 +784,18 @@
1107	784	* Inserts Formidable button
1108	785	* Hook exists since 2.5.0
1109	786	*
1110	787	* @since 2.0.15
1111		- *
1112		- * @return void
1113	788	*/
1114	789	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 ) ) {
	790	+ if ( current_user_can( 'frm_view_forms' ) ) {
1124	791	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
	792	+ $menu_name = FrmAppHelper::get_menu_name();
	793	+ $icon = apply_filters( 'frm_media_icon', FrmAppHelper::svg_logo() );
	794	+ 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' ) . '">' .
	795	+ FrmAppHelper::kses( $icon, 'all' ) . // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
	796	+ ' ' . esc_html( $menu_name ) . '</a>';
1127	797	}
1128		- echo self::$formidable_tinymce_button; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
1129	798	}
1130	799
1131	800	/**
1132	801	* @return void
		@@ -1147,21 +816,17 @@
1147	816	$shortcodes = apply_filters( 'frm_popup_shortcodes', $shortcodes );
1148	817
1149	818	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/insert_form_popup.php';
1150	819
1151		- if ( ! FrmAppHelper::is_form_builder_page() || class_exists( '_WP_Editors', false ) ) {
1152		- return;
	820	+ if ( FrmAppHelper::is_form_builder_page() && ! class_exists( '_WP_Editors', false ) ) {
	821	+ // initialize a wysiwyg so we have usable settings defined in tinyMCEPreInit.mceInit
	822	+ require ABSPATH . WPINC . '/class-wp-editor.php';
	823	+ ?>
	824	+ <div class="frm_hidden">
	825	+ <?php wp_editor( '', 'frm_description_placeholder', array() ); ?>
	826	+ </div>
	827	+ <?php
1153	828	}
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	829	}
1165	830
1166	831	/**
1167	832	* Check the page being loaded, determine if this is a page that should include the form popup.
		@@ -1173,9 +838,8 @@
1173	838	private static function should_insert_form_popup() {
1174	839	if ( FrmAppHelper::is_form_builder_page() ) {
1175	840	return true;
1176	841	}
1177		-
1178	842	$page = basename( FrmAppHelper::get_server_value( 'PHP_SELF' ) );
1179	843	return in_array( $page, array( 'post.php', 'page.php', 'page-new.php', 'post-new.php' ), true );
1180	844	}
1181	845
		@@ -1183,10 +847,9 @@
1183	847	FrmAppHelper::permission_check( 'frm_view_forms' );
1184	848	check_ajax_referer( 'frm_ajax', 'nonce' );
1185	849
1186	850	$shortcode = FrmAppHelper::get_post_param( 'shortcode', '', 'sanitize_text_field' );
1187		-
1188		- if ( ! $shortcode ) {
	851	+ if ( empty( $shortcode ) ) {
1189	852	wp_die();
1190	853	}
1191	854
1192	855	echo '<div id="sc-opts-' . esc_attr( $shortcode ) . '" class="frm_shortcode_option">';
		@@ -1211,18 +874,17 @@
1211	874	'label' => __( 'Minimize form HTML', 'formidable' ),
1212	875	),
1213	876	);
1214	877	}
1215		-
1216	878	$opts = apply_filters( 'frm_sc_popup_opts', $opts, $shortcode );
1217	879
1218	880	if ( isset( $opts['form_id'] ) && is_string( $opts['form_id'] ) ) {
1219		- // Allow other shortcodes to use the required form id option
	881	+ // allow other shortcodes to use the required form id option
1220	882	$form_id = $opts['form_id'];
1221	883	unset( $opts['form_id'] );
1222	884	}
1223	885
1224		- include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/shortcode_opts.php';
	886	+ include( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/shortcode_opts.php' );
1225	887
1226	888	echo '</div>';
1227	889
1228	890	wp_die();
		@@ -1233,9 +895,8 @@
1233	895	*
1234	896	* @param array $params
1235	897	* @param string $message
1236	898	* @param array $errors
1237		- *
1238	899	* @return void
1239	900	*/
1240	901	public static function display_forms_list( $params = array(), $message = '', $errors = array() ) {
1241	902	FrmAppHelper::permission_check( 'frm_view_forms' );
		@@ -1252,56 +913,35 @@
1252	913	* @param string $table_class Class name for List Helper.
1253	914	*/
1254	915	$table_class = apply_filters( 'frm_forms_list_class', 'FrmFormsListHelper' );
1255	916	$wp_list_table = new $table_class( compact( 'params' ) );
1256		- $pagenum = $wp_list_table->get_pagenum();
1257	917
	918	+ $pagenum = $wp_list_table->get_pagenum();
	919	+
1258	920	$wp_list_table->prepare_items();
1259	921
1260	922	$total_pages = $wp_list_table->get_pagination_arg( 'total_pages' );
1261		-
1262	923	if ( $pagenum > $total_pages && $total_pages > 0 ) {
1263		- wp_safe_redirect( esc_url_raw( add_query_arg( 'paged', $total_pages ) ) );
	924	+ wp_redirect( esc_url_raw( add_query_arg( 'paged', $total_pages ) ) );
1264	925	die();
1265	926	}
1266	927
1267		- $error = FrmInbox::check_for_error();
1268		-
1269		- if ( $error ) {
1270		- $show_messages = array( $error['subject'] . '. ' . $error['message'] );
1271		- }
1272		-
1273	928	require FrmAppHelper::plugin_path() . '/classes/views/frm-forms/list.php';
1274	929	}
1275	930
1276	931	/**
1277	932	* @param array<string,string> $columns
1278		- *
1279	933	* @return array<string,string>
1280	934	*/
1281	935	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		-
	936	+ $columns['cb'] = '<input type="checkbox" />';
	937	+ $columns['name'] = esc_html__( 'Form Title', 'formidable' );
	938	+ $columns['entries'] = esc_html__( 'Entries', 'formidable' );
	939	+ $columns['id'] = 'ID';
	940	+ $columns['form_key'] = esc_html__( 'Key', 'formidable' );
	941	+ $columns['shortcode'] = esc_html__( 'Actions', 'formidable' );
1294	942	$columns['created_at'] = esc_html__( 'Date', 'formidable' );
1295	943
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	944	add_screen_option(
1305	945	'per_page',
1306	946	array(
1307	947	'label' => __( 'Forms', 'formidable' ),
		@@ -1312,11 +952,8 @@
1312	952
1313	953	return $columns;
1314	954	}
1315	955
1316		- /**
1317		- * @return array<string,string>
1318		- */
1319	956	public static function get_sortable_columns() {
1320	957	return array(
1321	958	'id' => 'id',
1322	959	'name' => 'name',
		@@ -1327,9 +964,8 @@
1327	964	}
1328	965
1329	966	/**
1330	967	* @param mixed $hidden_columns
1331		- *
1332	968	* @return array
1333	969	*/
1334	970	public static function hidden_columns( $hidden_columns ) {
1335	971	if ( ! is_array( $hidden_columns ) ) {
		@@ -1350,39 +986,24 @@
1350	986
1351	987	return $hidden_columns;
1352	988	}
1353	989
1354		- /**
1355		- * @param mixed $save
1356		- * @param string $option
1357		- * @param int|string $value
1358		- *
1359		- * @return mixed
1360		- */
1361	990	public static function save_per_page( $save, $option, $value ) {
1362		- if ( $option === 'formidable_page_formidable_per_page' ) {
1363		- return (int) $value;
	991	+ if ( $option == 'formidable_page_formidable_per_page' ) {
	992	+ $save = (int) $value;
1364	993	}
1365	994
1366	995	return $save;
1367	996	}
1368	997
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	998	private static function get_edit_vars( $id, $errors = array(), $message = '', $create_link = false ) {
1378	999	global $frm_vars;
1379	1000
1380		- $form = FrmForm::getOne( $id );
	1001	+ $form = FrmForm::getOne( $id );
1381	1002	$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' ),
	1003	+ 'title' => __( 'You can\'t edit the form', 'formidable' ),
	1004	+ 'body' => __( 'You are trying to edit a form that does not exist', 'formidable' ),
	1005	+ 'cancel_url' => admin_url( 'admin.php?page=formidable' ),
1385	1006	'continue_url' => add_query_arg(
1386	1007	array(
1387	1008	'page' => 'formidable',
1388	1009	)
		@@ -1387,9 +1008,8 @@
1387	1008	'page' => 'formidable',
1388	1009	)
1389	1010	),
1390	1011	);
1391		-
1392	1012	if ( ! $form ) {
1393	1013	FrmAppController::show_error_modal( $error_args );
1394	1014	return;
1395	1015	}
		@@ -1394,10 +1014,10 @@
1394	1014	return;
1395	1015	}
1396	1016
1397	1017	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(
	1018	+ $error_args['body'] = __( 'The form you\'re trying to edit is in trash. You must restore it first before you can make changes', 'formidable' );
	1019	+ $error_args['continue_url'] = add_query_arg(
1400	1020	array(
1401	1021	'page' => 'formidable',
1402	1022	'_wpnonce' => wp_create_nonce( 'untrash_form_' . $id ),
1403	1023	'form_type' => 'trash',
		@@ -1411,18 +1031,18 @@
1411	1031	}
1412	1032
1413	1033	if ( $form->parent_form_id ) {
1414	1034	/* 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
	1035	+ 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	1036	}
1417	1037
1418	1038	$frm_field_selection = FrmField::field_selection();
1419		- $fields = FrmField::get_all_for_form( $form->id );
1420	1039
	1040	+ $fields = FrmField::get_all_for_form( $form->id );
	1041	+
1421	1042	// Automatically add end section fields if they don't exist (2.0 migration).
1422	1043	$reset_fields = false;
1423	1044	FrmFormsHelper::auto_add_end_section_fields( $form, $fields, $reset_fields );
1424		- FrmSubmitHelper::maybe_create_submit_field( $form, $fields, $reset_fields );
1425	1045
1426	1046	if ( $reset_fields ) {
1427	1047	$fields = FrmField::get_all_for_form( $form->id, '', 'exclude' );
1428	1048	}
		@@ -1442,30 +1062,25 @@
1442	1062	*/
1443	1063	$values['fields'] = apply_filters( 'frm_fields_in_form_builder', $fields, compact( 'form' ) );
1444	1064
1445	1065	$edit_message = __( 'Form was successfully updated.', 'formidable' );
1446		-
1447		- if ( $form->is_template && $message === $edit_message ) {
	1066	+ if ( $form->is_template && $message == $edit_message ) {
1448	1067	$message = __( 'Template was successfully updated.', 'formidable' );
1449	1068	}
1450	1069
1451	1070	self::maybe_update_form_builder_message( $message );
1452	1071
1453		- $has_fields = ! empty( $values['fields'] ) && ! FrmSubmitHelper::only_contains_submit_field( $values['fields'] );
	1072	+ $all_templates = FrmForm::getAll( array( 'is_template' => 1 ), 'name' );
	1073	+ $has_fields = isset( $values['fields'] ) && ! empty( $values['fields'] );
1454	1074
1455	1075	if ( defined( 'DOING_AJAX' ) ) {
1456	1076	wp_die();
	1077	+ } else {
	1078	+ require( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/edit.php' );
1457	1079	}
1458		-
1459		- require FrmAppHelper::plugin_path() . '/classes/views/frm-forms/edit.php';
1460	1080	}
1461	1081
1462		- /**
1463		- * @param array $fields
1464		- *
1465		- * @return array
1466		- */
1467		- public static function update_form_builder_fields( $fields ) {
	1082	+ public static function update_form_builder_fields( $fields, $form ) {
1468	1083	foreach ( $fields as $field ) {
1469	1084	$field->do_not_include_icons = true;
1470	1085	}
1471	1086	return $fields;
		@@ -1470,13 +1085,8 @@
1470	1085	}
1471	1086	return $fields;
1472	1087	}
1473	1088
1474		- /**
1475		- * @param string $message
1476		- *
1477		- * @return void
1478		- */
1479	1089	public static function maybe_update_form_builder_message( &$message ) {
1480	1090	if ( 'form_duplicated' === FrmAppHelper::simple_get( 'message' ) ) {
1481	1091	$message = __( 'Form was Successfully Copied', 'formidable' );
1482	1092	}
		@@ -1481,22 +1091,13 @@
1481	1091	$message = __( 'Form was Successfully Copied', 'formidable' );
1482	1092	}
1483	1093	}
1484	1094
1485		- /**
1486		- * @param int|string $id
1487		- * @param array $errors
1488		- * @param array|string $args
1489		- *
1490		- * @return void
1491		- */
1492	1095	public static function get_settings_vars( $id, $errors = array(), $args = array() ) {
1493	1096	FrmAppHelper::permission_check( 'frm_edit_forms' );
1494	1097
1495	1098	global $frm_vars;
1496	1099
1497		- self::maybe_print_media_templates();
1498		-
1499	1100	if ( ! is_array( $args ) ) {
1500	1101	// For reverse compatibility.
1501	1102	$args = array(
1502	1103	'message' => $args,
		@@ -1509,12 +1110,13 @@
1509	1110	);
1510	1111	$args = array_merge( $defaults, $args );
1511	1112	$message = $args['message'];
1512	1113	$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	1114
	1115	+ $form = FrmForm::getOne( $id );
	1116	+ $fields = FrmField::get_all_for_form( $id );
	1117	+ $values = FrmAppHelper::setup_edit_vars( $form, 'forms', $fields, true );
	1118	+
1517	1119	/**
1518	1120	* Allows changing fields in the form settings.
1519	1121	*
1520	1122	* @since 5.0.04
		@@ -1528,42 +1130,17 @@
1528	1130
1529	1131	$sections = self::get_settings_tabs( $values );
1530	1132	$current = FrmAppHelper::simple_get( 't', 'sanitize_title', 'advanced_settings' );
1531	1133
1532		- require FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings.php';
	1134	+ require( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings.php' );
1533	1135	}
1534	1136
1535	1137	/**
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	1138	* @since 4.0
1558		- *
1559		- * @param array $atts
1560		- *
1561		- * @return void
1562	1139	*/
1563	1140	public static function form_publish_button( $atts ) {
1564	1141	$values = $atts['values'];
1565		- include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/_publish_box.php';
	1142	+ include( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/_publish_box.php' );
1566	1143	}
1567	1144
1568	1145	/**
1569	1146	* Get a list of all the settings tabs for the form settings page.
		@@ -1570,9 +1147,8 @@
1570	1147	*
1571	1148	* @since 4.0
1572	1149	*
1573	1150	* @param array $values
1574		- *
1575	1151	* @return array
1576	1152	*/
1577	1153	private static function get_settings_tabs( $values ) {
1578	1154	$sections = array(
		@@ -1578,25 +1154,20 @@
1578	1154	$sections = array(
1579	1155	'advanced' => array(
1580	1156	'name' => __( 'General', 'formidable' ),
1581	1157	'title' => __( 'General Form Settings', 'formidable' ),
1582		- 'function' => array( self::class, 'advanced_settings' ),
1583		- 'icon' => 'frmfont frm_small_settings_icon',
	1158	+ 'function' => array( __CLASS__, 'advanced_settings' ),
	1159	+ 'icon' => 'frm_icon_font frm_settings_icon',
1584	1160	),
1585	1161	'email' => array(
1586	1162	'name' => __( 'Actions & Notifications', 'formidable' ),
1587	1163	'function' => array( 'FrmFormActionsController', 'email_settings' ),
1588	1164	'id' => 'frm_notification_settings',
1589		- 'icon' => 'frmfont frm_notification_check_icon',
	1165	+ 'icon' => 'frm_icon_font frm_mail_bulk_icon',
1590	1166	),
1591		- 'spam' => array(
1592		- 'name' => __( 'Spam', 'formidable' ),
1593		- 'function' => array( self::class, 'spam_settings' ),
1594		- 'icon' => 'frmfont frm_shield_check2_icon',
1595		- ),
1596	1167	'permissions' => array(
1597	1168	'name' => __( 'Form Permissions', 'formidable' ),
1598		- 'icon' => 'frmfont frm_lock_closed2_icon',
	1169	+ 'icon' => 'frm_icon_font frm_lock_icon',
1599	1170	'html_class' => 'frm_show_upgrade_tab frm_noallow',
1600	1171	'data' => array(
1601	1172	'medium' => 'permissions',
1602	1173	'upgrade' => __( 'Form Permissions', 'formidable' ),
		@@ -1601,37 +1172,35 @@
1601	1172	'medium' => 'permissions',
1602	1173	'upgrade' => __( 'Form Permissions', 'formidable' ),
1603	1174	'message' => __( 'Allow editing, protect forms and files, limit entries, and save drafts. Upgrade to get form and entry permissions.', 'formidable' ),
1604	1175	'screenshot' => 'permissions.png',
1605		- 'learn-more' => FrmAppHelper::get_doc_url( 'general-form-settings/#kb-form-permissions', 'form-permissions-settings' ),
1606	1176	),
1607	1177	),
1608		- 'scheduling' => array(
	1178	+ 'scheduling' => array(
1609	1179	'name' => __( 'Form Scheduling', 'formidable' ),
1610		- 'icon' => 'frmfont frm_schedule_icon',
	1180	+ 'icon' => 'frm_icon_font frm_calendar_icon',
1611	1181	'html_class' => 'frm_show_upgrade_tab frm_noallow',
1612	1182	'data' => array(
1613	1183	'medium' => 'scheduling',
1614	1184	'upgrade' => __( 'Form scheduling settings', 'formidable' ),
1615	1185	'screenshot' => 'scheduling.png',
1616		- 'learn-more' => FrmAppHelper::get_doc_url( 'general-form-settings/#kb-form-scheduling', 'form-scheduling-settings' ),
1617	1186	),
1618	1187	),
1619	1188	'buttons' => array(
1620	1189	'name' => __( 'Buttons', 'formidable' ),
1621		- 'class' => self::class,
	1190	+ 'class' => __CLASS__,
1622	1191	'function' => 'buttons_settings',
1623		- 'icon' => 'frmfont frm-buttons-style',
	1192	+ 'icon' => 'frm_icon_font frm_button_icon',
1624	1193	),
1625	1194	'landing' => array(
1626	1195	'name' => __( 'Form Landing Page', 'formidable' ),
1627		- 'icon' => 'frmfont frm_cross_device_icon',
	1196	+ 'icon' => 'frm_icon_font frm_file_text_icon',
1628	1197	'html_class' => 'frm_show_upgrade_tab frm_noallow',
1629	1198	'data' => FrmAppHelper::get_landing_page_upgrade_data_params(),
1630	1199	),
1631	1200	'chat' => array(
1632	1201	'name' => __( 'Conversational Forms', 'formidable' ),
1633		- 'icon' => 'frmfont frm_chat_bubbles_icon',
	1202	+ 'icon' => 'frm_icon_font frm_chat_forms_icon',
1634	1203	'html_class' => 'frm_show_upgrade_tab frm_noallow',
1635	1204	'data' => FrmAppHelper::get_upgrade_data_params(
1636	1205	'chat',
1637	1206	array(
		@@ -1637,15 +1206,14 @@
1637	1206	array(
1638	1207	'upgrade' => __( 'Conversational Forms', 'formidable' ),
1639	1208	'message' => __( 'Ask one question at a time for automated conversations.', 'formidable' ),
1640	1209	'screenshot' => 'chat.png',
1641		- 'learn-more' => FrmAppHelper::get_doc_url( 'conversational-forms', 'conversational-forms-settings', false ),
1642	1210	)
1643	1211	),
1644	1212	),
1645		- 'abandonment' => array(
	1213	+ 'abandonment' => array(
1646	1214	'name' => __( 'Form Abandonment', 'formidable' ),
1647		- 'icon' => 'frmfont frm_abandoned_icon',
	1215	+ 'icon' => 'frm_icon_font frm_abandoned_icon',
1648	1216	'html_class' => 'frm_show_upgrade_tab frm_noallow',
1649	1217	'data' => FrmAppHelper::get_upgrade_data_params(
1650	1218	'abandonment',
1651	1219	array(
		@@ -1651,31 +1219,37 @@
1651	1219	array(
1652	1220	'upgrade' => __( 'Form abandonment settings', 'formidable' ),
1653	1221	'message' => __( 'Unlock the power of data capture to boost lead generation and master the art of form optimization.', 'formidable' ),
1654	1222	'screenshot' => 'abandonment.png',
1655		- 'learn-more' => FrmAppHelper::get_doc_url( 'features/form-abandonment-wordpress-plugin', 'form-abandonment-settings', false ),
1656	1223	)
1657	1224	),
1658	1225	),
1659	1226	'html' => array(
1660	1227	'name' => __( 'Customize HTML', 'formidable' ),
1661		- 'class' => self::class,
	1228	+ 'class' => __CLASS__,
1662	1229	'function' => 'html_settings',
1663		- 'icon' => 'frmfont frm_code2_icon',
	1230	+ 'icon' => 'frm_icon_font frm_code_icon',
1664	1231	),
1665	1232	);
1666	1233
1667		- if ( ! has_action( 'frm_add_form_style_tab_options' ) && ! has_action( 'frm_add_form_button_options' ) ) {
1668		- unset( $sections['buttons'] );
	1234	+ foreach ( array( 'landing', 'chat', 'abandonment' ) as $feature ) {
	1235	+ if ( ! FrmAppHelper::show_new_feature( $feature ) ) {
	1236	+ unset( $sections[ $feature ] );
	1237	+ }
1669	1238	}
1670	1239
1671	1240	$sections = apply_filters( 'frm_add_form_settings_section', $sections, $values );
1672	1241
	1242	+ if ( FrmAppHelper::pro_is_installed() && ! FrmAppHelper::meets_min_pro_version( '4.0' ) ) {
	1243	+ // Prevent settings from showing in 2 spots.
	1244	+ unset( $sections['permissions'], $sections['scheduling'] );
	1245	+ }
	1246	+
1673	1247	foreach ( $sections as $key => $section ) {
1674	1248	$defaults = array(
1675	1249	'html_class' => '',
1676	1250	'name' => ucfirst( $key ),
1677		- 'icon' => 'frmfont frm_settings_icon',
	1251	+ 'icon' => 'frm_icon_font frm_settings_icon',
1678	1252	);
1679	1253
1680	1254	$section = array_merge( $defaults, $section );
1681	1255
		@@ -1681,9 +1255,8 @@
1681	1255
1682	1256	if ( ! isset( $section['anchor'] ) ) {
1683	1257	$section['anchor'] = $key;
1684	1258	}
1685		-
1686	1259	$section['anchor'] .= '_settings';
1687	1260
1688	1261	if ( ! isset( $section['title'] ) ) {
1689	1262	$section['title'] = $section['name'];
		@@ -1702,25 +1275,24 @@
1702	1275	/**
1703	1276	* @since 4.0
1704	1277	*
1705	1278	* @param array $values
1706		- *
1707		- * @return void
1708	1279	*/
1709	1280	public static function advanced_settings( $values ) {
1710	1281	$first_h3 = 'frm_first_h3';
	1282	+
1711	1283	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings-advanced.php';
1712	1284	}
1713	1285
1714	1286	/**
1715		- * @since 6.33
1716		- *
1717	1287	* @param array $values
1718		- *
1719		- * @return void
1720	1288	*/
1721		- public static function spam_settings( $values ) {
1722		- include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/spam-settings.php';
	1289	+ public static function render_spam_settings( $values ) {
	1290	+ if ( function_exists( 'akismet_http_post' ) ) {
	1291	+ include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/spam-settings/akismet.php';
	1292	+ }
	1293	+ include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/spam-settings/honeypot.php';
	1294	+ include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/spam-settings/antispam.php';
1723	1295	}
1724	1296
1725	1297	/**
1726	1298	* @since 4.0
		@@ -1725,13 +1297,16 @@
1725	1297	/**
1726	1298	* @since 4.0
1727	1299	*
1728	1300	* @param array $values
1729		- *
1730		- * @return void
1731	1301	*/
1732	1302	public static function buttons_settings( $values ) {
1733		- include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings-buttons.php';
	1303	+ $styles = apply_filters( 'frm_get_style_opts', array() );
	1304	+
	1305	+ $frm_settings = FrmAppHelper::get_settings();
	1306	+ $no_global_style = $frm_settings->load_style === 'none';
	1307	+
	1308	+ include( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings-buttons.php' );
1734	1309	}
1735	1310
1736	1311	/**
1737	1312	* @since 4.0
		@@ -1736,13 +1311,11 @@
1736	1311	/**
1737	1312	* @since 4.0
1738	1313	*
1739	1314	* @param array $values
1740		- *
1741		- * @return void
1742	1315	*/
1743	1316	public static function html_settings( $values ) {
1744		- include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings-html.php';
	1317	+ include( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings-html.php' );
1745	1318	}
1746	1319
1747	1320	/**
1748	1321	* Replace old Submit Button href with new href to avoid errors in Chrome
		@@ -1748,11 +1321,9 @@
1748	1321	* Replace old Submit Button href with new href to avoid errors in Chrome
1749	1322	*
1750	1323	* @since 2.03.08
1751	1324	*
1752		- * @param array|bool $values
1753		- *
1754		- * @return void
	1325	+ * @param array|boolean $values
1755	1326	*/
1756	1327	private static function clean_submit_html( &$values ) {
1757	1328	if ( is_array( $values ) && isset( $values['submit_html'] ) ) {
1758	1329	$values['submit_html'] = str_replace( 'javascript:void(0)', '#', $values['submit_html'] );
		@@ -1773,18 +1344,9 @@
1773	1344
1774	1345	return $classes;
1775	1346	}
1776	1347
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' ) {
	1348	+ public static function mb_tags_box( $form_id, $class = '' ) {
1787	1349	$fields = FrmField::get_all_for_form( $form_id, '', 'include' );
1788	1350
1789	1351	/**
1790	1352	* Allows modifying the list of fields in the tags box.
		@@ -1793,30 +1355,23 @@
1793	1355	*
1794	1356	* @param array $fields The list of fields.
1795	1357	* @param array $args The arguments. Contains `form_id`.
1796	1358	*/
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' );
	1359	+ $fields = apply_filters( 'frm_fields_in_tags_box', $fields, compact( 'form_id' ) );
	1360	+ $linked_forms = array();
	1361	+ $col = 'one';
	1362	+ $settings_tab = FrmAppHelper::is_admin_page( 'formidable' ) ? true : false;
	1363	+
1801	1364	$cond_shortcodes = apply_filters( 'frm_conditional_shortcodes', array() );
1802		- $entry_shortcodes = self::get_shortcode_helpers( $settings_tab, $form_id );
	1365	+ $entry_shortcodes = self::get_shortcode_helpers( $settings_tab );
	1366	+
1803	1367	$advanced_helpers = self::advanced_helpers( compact( 'fields', 'form_id' ) );
1804	1368
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;
	1369	+ include( FrmAppHelper::plugin_path() . '/classes/views/shared/mb_adv_info.php' );
1811	1370	}
1812	1371
1813	1372	/**
1814	1373	* @since 3.04.01
1815		- *
1816		- * @param array $atts
1817		- *
1818		- * @return array
1819	1374	*/
1820	1375	private static function advanced_helpers( $atts ) {
1821	1376	$advanced_helpers = array(
1822	1377	'default' => array(
		@@ -1825,12 +1380,10 @@
1825	1380	),
1826	1381	);
1827	1382
1828	1383	$user_fields = self::user_shortcodes();
1829		-
1830		- if ( $user_fields ) {
	1384	+ if ( ! empty( $user_fields ) ) {
1831	1385	$user_helpers = array();
1832		-
1833	1386	foreach ( $user_fields as $uk => $uf ) {
1834	1387	$user_helpers[ '|user_id| show="' . $uk . '"' ] = $uf;
1835	1388	unset( $uk, $uf );
1836	1389	}
		@@ -1835,9 +1388,9 @@
1835	1388	unset( $uk, $uf );
1836	1389	}
1837	1390
1838	1391	$advanced_helpers['user_id'] = array(
1839		- 'codes' => $user_helpers,
	1392	+ 'codes' => $user_helpers,
1840	1393	);
1841	1394	}
1842	1395
1843	1396	/**
		@@ -1855,10 +1408,8 @@
1855	1408	* Get an array of the options to display in the advanced tab
1856	1409	* of the customization panel
1857	1410	*
1858	1411	* @since 2.0.6
1859		- *
1860		- * @return array
1861	1412	*/
1862	1413	private static function get_advanced_shortcodes() {
1863	1414	$adv_shortcodes = array(
1864	1415	'x sep=", "' => array(
		@@ -1875,18 +1426,17 @@
1875	1426	'label' => __( 'No Auto P', 'formidable' ),
1876	1427	'title' => __( 'Do not automatically add any paragraphs or line breaks', 'formidable' ),
1877	1428	),
1878	1429	);
	1430	+ $adv_shortcodes = apply_filters( 'frm_advanced_shortcodes', $adv_shortcodes );
1879	1431
1880	1432	// __( 'Leave blank instead of defaulting to User Login', 'formidable' ) : blank=1
1881	1433
1882		- return apply_filters( 'frm_advanced_shortcodes', $adv_shortcodes );
	1434	+ return $adv_shortcodes;
1883	1435	}
1884	1436
1885	1437	/**
1886	1438	* @since 3.04.01
1887		- *
1888		- * @return array
1889	1439	*/
1890	1440	private static function user_shortcodes() {
1891	1441	$options = array(
1892	1442	'ID' => __( 'User ID', 'formidable' ),
		@@ -1905,15 +1455,10 @@
1905	1455	/**
1906	1456	* Get an array of the helper shortcodes to display in the customization panel
1907	1457	*
1908	1458	* @since 2.0.6
1909		- *
1910		- * @param bool $settings_tab
1911		- * @param int $form_id
1912		- *
1913		- * @return array
1914	1459	*/
1915		- private static function get_shortcode_helpers( $settings_tab, $form_id = 0 ) {
	1460	+ private static function get_shortcode_helpers( $settings_tab ) {
1916	1461	$entry_shortcodes = array(
1917	1462	'id' => __( 'Entry ID', 'formidable' ),
1918	1463	'key' => __( 'Entry Key', 'formidable' ),
1919	1464	'post_id' => __( 'Post ID', 'formidable' ),
		@@ -1922,28 +1467,30 @@
1922	1467	'updated-at' => __( 'Entry updated', 'formidable' ),
1923	1468	'' => '',
1924	1469	'siteurl' => __( 'Site URL', 'formidable' ),
1925	1470	'sitename' => __( 'Site Name', 'formidable' ),
1926		- 'form_name' => __( 'Form Name', 'formidable' ),
1927	1471	);
1928	1472
1929		- $entry_shortcodes = array_merge( FrmShortcodeHelper::get_contextual_shortcode_values(), $entry_shortcodes );
1930		-
1931	1473	if ( ! FrmAppHelper::pro_is_installed() ) {
1932	1474	unset( $entry_shortcodes['post_id'] );
1933	1475	}
1934	1476
	1477	+ if ( $settings_tab ) {
	1478	+ $entry_shortcodes['default-message'] = __( 'Default Msg', 'formidable' );
	1479	+ $entry_shortcodes['default-html'] = __( 'Default HTML', 'formidable' );
	1480	+ $entry_shortcodes['default-plain'] = __( 'Default Plain', 'formidable' );
	1481	+ $entry_shortcodes['form_name'] = __( 'Form Name', 'formidable' );
	1482	+ }
	1483	+
1935	1484	/**
1936	1485	* Use this hook to add or remove buttons in the helpers section
1937	1486	* in the customization panel
1938	1487	*
1939	1488	* @since 2.0.6
1940		- *
1941		- * @param array $entry_shortcodes
1942		- * @param bool $settings_tab
1943		- * @param int $form_id
1944	1489	*/
1945		- return apply_filters( 'frm_helper_shortcodes', $entry_shortcodes, $settings_tab, $form_id );
	1490	+ $entry_shortcodes = apply_filters( 'frm_helper_shortcodes', $entry_shortcodes, $settings_tab );
	1491	+
	1492	+ return $entry_shortcodes;
1946	1493	}
1947	1494
1948	1495	/**
1949	1496	* Insert the form class setting into the form.
		@@ -1948,9 +1495,8 @@
1948	1495	/**
1949	1496	* Insert the form class setting into the form.
1950	1497	*
1951	1498	* @param stdClass $form
1952		- *
1953	1499	* @return void
1954	1500	*/
1955	1501	public static function form_classes( $form ) {
1956	1502	if ( isset( $form->options['form_class'] ) ) {
		@@ -1961,9 +1507,9 @@
1961	1507	echo ' frm_js_validate ';
1962	1508	self::add_js_validate_form_to_global_vars( $form );
1963	1509	}
1964	1510
1965		- if ( FrmForm::is_ajax_on( $form ) ) {
	1511	+ if ( ! FrmFormsHelper::should_use_pro_for_ajax_submit() && FrmForm::is_ajax_on( $form ) ) {
1966	1512	echo ' frm_ajax_submit ';
1967	1513	}
1968	1514	}
1969	1515
		@@ -1973,9 +1519,8 @@
1973	1519	* @param stdClass $form
1974	1520	*/
1975	1521	public static function add_js_validate_form_to_global_vars( $form ) {
1976	1522	global $frm_vars;
1977		-
1978	1523	if ( ! isset( $frm_vars['js_validate_forms'] ) ) {
1979	1524	$frm_vars['js_validate_forms'] = array();
1980	1525	}
1981	1526	$frm_vars['js_validate_forms'][ $form->id ] = $form;
		@@ -1986,11 +1531,11 @@
1986	1531	check_ajax_referer( 'frm_ajax', 'nonce' );
1987	1532
1988	1533	echo FrmEntriesController::show_entry_shortcode( // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
1989	1534	array(
1990		- 'form_id' => FrmAppHelper::get_post_param( 'form_id', '', 'absint' ), // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
	1535	+ 'form_id' => FrmAppHelper::get_post_param( 'form_id', '', 'absint' ),
1991	1536	'default_email' => true,
1992		- 'plain_text' => FrmAppHelper::get_post_param( 'plain_text', '', 'absint' ), // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
	1537	+ 'plain_text' => FrmAppHelper::get_post_param( 'plain_text', '', 'absint' ),
1993	1538	)
1994	1539	);
1995	1540	wp_die();
1996	1541	}
		@@ -1996,11 +1541,10 @@
1996	1541	}
1997	1542
1998	1543	/**
1999	1544	* @param string $content
2000		- * @param int|stdClass|string $form
2001		- * @param false|int|stdClass|string $entry
2002		- *
	1545	+ * @param stdClass|string|int $form
	1546	+ * @param stdClass|string|int|false $entry
2003	1547	* @return string
2004	1548	*/
2005	1549	public static function filter_content( $content, $form, $entry = false ) {
2006	1550	$content = self::replace_form_name_shortcodes( $content, $form );
		@@ -2005,9 +1549,8 @@
2005	1549	public static function filter_content( $content, $form, $entry = false ) {
2006	1550	$content = self::replace_form_name_shortcodes( $content, $form );
2007	1551
2008	1552	self::get_entry_by_param( $entry );
2009		-
2010	1553	if ( ! $entry ) {
2011	1554	return $content;
2012	1555	}
2013	1556
		@@ -2014,19 +1557,12 @@
2014	1557	if ( is_object( $form ) ) {
2015	1558	$form = $form->id;
2016	1559	}
2017	1560
2018		- /*
2019		- * Repeater actions adds `parent_entry` to `$entry` store the parent entry data. If `parent_entry` is not empty,
2020		- * use the parent form ID instead of repeater form ID to fix the parent form field shortcodes doesn't work.
2021		- */
2022		- if ( ! empty( $entry->parent_entry ) ) {
2023		- $form = $entry->parent_entry->form_id;
2024		- }
2025		-
2026	1561	$shortcodes = FrmFieldsHelper::get_shortcodes( $content, $form );
	1562	+ $content = apply_filters( 'frm_replace_content_shortcodes', $content, $entry, $shortcodes );
2027	1563
2028		- return apply_filters( 'frm_replace_content_shortcodes', $content, $entry, $shortcodes );
	1564	+ return $content;
2029	1565	}
2030	1566
2031	1567	/**
2032	1568	* Replace any [form_name] shortcodes in a string.
		@@ -2032,12 +1568,11 @@
2032	1568	* Replace any [form_name] shortcodes in a string.
2033	1569	*
2034	1570	* @since 5.5
2035	1571	*
2036		- * @param array|string $string
2037		- * @param int|stdClass|string $form
2038		- *
2039		- * @return array|string
	1572	+ * @param string|array $string
	1573	+ * @param stdClass|string|int $form
	1574	+ * @return string|array
2040	1575	*/
2041	1576	public static function replace_form_name_shortcodes( $string, $form ) {
2042	1577	if ( ! is_string( $string ) ) {
2043	1578	return $string;
		@@ -2042,9 +1577,9 @@
2042	1577	if ( ! is_string( $string ) ) {
2043	1578	return $string;
2044	1579	}
2045	1580
2046		- if ( ! str_contains( $string, '[form_name]' ) ) {
	1581	+ if ( false === strpos( $string, '[form_name]' ) ) {
2047	1582	return $string;
2048	1583	}
2049	1584
2050	1585	if ( ! is_object( $form ) ) {
		@@ -2055,40 +1590,25 @@
2055	1590	return str_replace( '[form_name]', $form_name, $string );
2056	1591	}
2057	1592
2058	1593	/**
2059		- * @param false|int|stdClass|string $entry
2060		- *
	1594	+ * @param stdClass|string|int|false $entry
2061	1595	* @return void
2062	1596	*/
2063	1597	private static function get_entry_by_param( &$entry ) {
2064		- if ( $entry && is_object( $entry ) ) {
2065		- return;
2066		- }
	1598	+ if ( ! $entry || ! is_object( $entry ) ) {
	1599	+ if ( ! $entry || ! is_numeric( $entry ) ) {
	1600	+ $entry = FrmAppHelper::get_post_param( 'id', false, 'sanitize_title' );
	1601	+ }
2067	1602
2068		- if ( ! $entry || ! is_numeric( $entry ) ) {
2069		- $entry = FrmAppHelper::get_post_param( 'id', false, 'sanitize_title' );
	1603	+ FrmEntry::maybe_get_entry( $entry );
2070	1604	}
2071		-
2072		- FrmEntry::maybe_get_entry( $entry );
2073	1605	}
2074	1606
2075		- /**
2076		- * @param string $content
2077		- * @param false|object $entry
2078		- * @param array $shortcodes
2079		- *
2080		- * @return string
2081		- */
2082	1607	public static function replace_content_shortcodes( $content, $entry, $shortcodes ) {
2083	1608	return FrmFieldsHelper::replace_content_shortcodes( $content, $entry, $shortcodes );
2084	1609	}
2085	1610
2086		- /**
2087		- * @param array $errors
2088		- *
2089		- * @return array
2090		- */
2091	1611	public static function process_bulk_form_actions( $errors ) {
2092	1612	if ( ! $_REQUEST ) {
2093	1613	return $errors;
2094	1614	}
		@@ -2093,30 +1613,29 @@
2093	1613	return $errors;
2094	1614	}
2095	1615
2096	1616	$bulkaction = FrmAppHelper::get_param( 'action', '', 'get', 'sanitize_text_field' );
2097		-
2098		- // phpcs:ignore Universal.Operators.StrictComparisons
2099	1617	if ( $bulkaction == - 1 ) {
2100	1618	$bulkaction = FrmAppHelper::get_param( 'action2', '', 'get', 'sanitize_title' );
2101	1619	}
2102	1620
2103		- if ( $bulkaction && str_starts_with( $bulkaction, 'bulk_' ) ) {
	1621	+ if ( ! empty( $bulkaction ) && strpos( $bulkaction, 'bulk_' ) === 0 ) {
2104	1622	FrmAppHelper::remove_get_action();
	1623	+
2105	1624	$bulkaction = str_replace( 'bulk_', '', $bulkaction );
2106	1625	}
2107	1626
2108	1627	$ids = FrmAppHelper::get_param( 'item-action', '', 'get', 'sanitize_text_field' );
	1628	+ if ( empty( $ids ) ) {
	1629	+ $errors[] = __( 'No forms were specified', 'formidable' );
2109	1630
2110		- if ( ! $ids ) {
2111		- $errors[] = __( 'No forms were specified', 'formidable' );
2112	1631	return $errors;
2113	1632	}
2114	1633
2115	1634	$permission_error = FrmAppHelper::permission_nonce_error( '', '_wpnonce', 'bulk-toplevel_page_formidable' );
2116		-
2117	1635	if ( $permission_error !== false ) {
2118	1636	$errors[] = $permission_error;
	1637	+
2119	1638	return $errors;
2120	1639	}
2121	1640
2122	1641	if ( ! is_array( $ids ) ) {
		@@ -2133,9 +1652,9 @@
2133	1652	case 'untrash':
2134	1653	$message = self::bulk_untrash( $ids );
2135	1654	}
2136	1655
2137		- if ( ! empty( $message ) ) {
	1656	+ if ( isset( $message ) && ! empty( $message ) ) {
2138	1657	$errors['message'] = $message;
2139	1658	}
2140	1659
2141	1660	return $errors;
		@@ -2140,24 +1659,9 @@
2140	1659
2141	1660	return $errors;
2142	1661	}
2143	1662
2144		- /**
2145		- * Includes html that shows a message when the device is too small to use Formidable Forms admin pages.
2146		- *
2147		- * @since 6.20
2148		- *
2149		- * @return void
2150		- */
2151		- public static function include_device_too_small_message() {
2152		- if ( ! FrmAppHelper::is_formidable_admin() ) {
2153		- return;
2154		- }
2155		-
2156		- include FrmAppHelper::plugin_path() . '/classes/views/shared/small-device-message.php';
2157		- }
2158		-
2159		- public static function route() { // phpcs:ignore Generic.Metrics.CyclomaticComplexity.MaxExceeded
	1663	+ public static function route() {
2160	1664	$action = isset( $_REQUEST['frm_action'] ) ? 'frm_action' : 'action';
2161	1665	$vars = array();
2162	1666	FrmAppHelper::include_svg();
2163	1667
		@@ -2167,28 +1671,25 @@
2167	1671	// Javascript needs to be allowed in some field settings.
2168	1672	// phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized, WordPress.Security.NonceVerification.Missing
2169	1673	$json_vars = htmlspecialchars_decode( nl2br( str_replace( '&quot;', '"', wp_unslash( $_POST['frm_compact_fields'] ) ) ) );
2170	1674	$json_vars = json_decode( $json_vars, true );
	1675	+ if ( empty( $json_vars ) ) {
	1676	+ // json decoding failed so we should return an error message.
	1677	+ $action = FrmAppHelper::get_param( $action, '', 'get', 'sanitize_title' );
	1678	+ if ( 'edit' == $action ) {
	1679	+ $action = 'update';
	1680	+ }
2171	1681
2172		- if ( $json_vars ) {
	1682	+ add_filter( 'frm_validate_form', 'FrmFormsController::json_error' );
	1683	+ } else {
2173	1684	$vars = FrmAppHelper::json_to_array( $json_vars );
2174	1685	$action = $vars[ $action ];
2175	1686	unset( $_REQUEST['frm_compact_fields'], $_POST['frm_compact_fields'] ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
2176	1687	$_REQUEST = array_merge( $_REQUEST, $vars ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
2177	1688	$_POST = array_merge( $_POST, $_REQUEST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
2178		- } else {
2179		- // Json decoding failed so we should return an error message.
2180		- $action = FrmAppHelper::get_param( $action, '', 'get', 'sanitize_title' );
2181		-
2182		- if ( 'edit' === $action ) {
2183		- $action = 'update';
2184		- }
2185		-
2186		- add_filter( 'frm_validate_form', 'FrmFormsController::json_error' );
2187	1689	}
2188	1690	} else {
2189	1691	$action = FrmAppHelper::get_param( $action, '', 'get', 'sanitize_title' );
2190		-
2191	1692	if ( isset( $_REQUEST['delete_all'] ) ) {
2192	1693	// Override the action for this page.
2193	1694	$action = 'delete_all';
2194	1695	}
		@@ -2197,8 +1698,10 @@
2197	1698	add_action( 'frm_load_form_hooks', 'FrmHooksController::trigger_load_form_hooks' );
2198	1699	FrmAppHelper::trigger_hook_load( 'form' );
2199	1700
2200	1701	switch ( $action ) {
	1702	+ case 'new':
	1703	+ return self::new_form( $vars );
2201	1704	case 'create':
2202	1705	case 'edit':
2203	1706	case 'update':
2204	1707	case 'trash':
		@@ -2207,39 +1710,33 @@
2207	1710	case 'settings':
2208	1711	case 'update_settings':
2209	1712	return self::$action( $vars );
2210	1713	case 'lite-reports':
2211		- self::no_reports( $vars );
2212		- return null;
	1714	+ return self::no_reports( $vars );
2213	1715	case 'views':
2214		- self::no_views( $vars );
2215		- return null;
	1716	+ return self::no_views( $vars );
2216	1717	default:
2217	1718	do_action( 'frm_form_action_' . $action );
2218		-
2219	1719	if ( apply_filters( 'frm_form_stop_action_' . $action, false ) ) {
2220		- return null;
	1720	+ return;
2221	1721	}
2222	1722
2223	1723	$action = FrmAppHelper::get_param( 'action', '', 'get', 'sanitize_text_field' );
2224		-
2225		- // phpcs:ignore Universal.Operators.StrictComparisons
2226	1724	if ( $action == - 1 ) {
2227	1725	$action = FrmAppHelper::get_param( 'action2', '', 'get', 'sanitize_title' );
2228	1726	}
2229	1727
2230		- if ( str_starts_with( $action, 'bulk_' ) ) {
	1728	+ if ( strpos( $action, 'bulk_' ) === 0 ) {
2231	1729	FrmAppHelper::remove_get_action();
2232	1730
2233	1731	self::list_form();
2234		- return null;
	1732	+ return;
2235	1733	}
2236	1734
2237	1735	$message = FrmAppHelper::get_param( 'message' );
2238		-
2239	1736	if ( 'form_duplicate_error' === $message ) {
2240	1737	self::display_forms_list( array(), '', array( __( 'There was a problem duplicating the form', 'formidable' ) ) );
2241		- return null;
	1738	+ return;
2242	1739	}
2243	1740
2244	1741	if ( 'forms_permanently_deleted' === $message ) {
2245	1742	$count = FrmAppHelper::get_param( 'forms_deleted', 0, 'get', 'absint' );
		@@ -2245,14 +1742,14 @@
2245	1742	$count = FrmAppHelper::get_param( 'forms_deleted', 0, 'get', 'absint' );
2246	1743	/* translators: %1$s: Number of forms */
2247	1744	$message = sprintf( _n( '%1$s form permanently deleted.', '%1$s forms permanently deleted.', $count, 'formidable' ), $count );
2248	1745	self::display_forms_list( array(), $message, '' );
2249		- return null;
	1746	+ return;
2250	1747	}
2251	1748
2252	1749	self::display_forms_list();
2253	1750
2254		- return null;
	1751	+ return;
2255	1752	}//end switch
2256	1753	}
2257	1754
2258	1755	/**
		@@ -2271,45 +1768,29 @@
2271	1768
2272	1769	// Get posted data
2273	1770	$form_id = FrmAppHelper::get_post_param( 'form_id', '', 'absint' );
2274	1771	$name = FrmAppHelper::get_post_param( 'form_name', '', 'sanitize_text_field' );
2275		- $form = FrmForm::getOne( $form_id );
2276	1772
2277		- if ( ! $form ) {
2278		- wp_send_json_error( __( 'Form not found', 'formidable' ) );
2279		- }
	1773	+ // Update the form name and form key.
	1774	+ $form_key = FrmAppHelper::get_unique_key( sanitize_title( $name ), 'frm_forms', 'form_key' );
	1775	+ FrmForm::update( $form_id, compact( 'name', 'form_key' ) );
2280	1776
2281		- if ( $name === $form->name ) {
2282		- // Nothing to change so exit early.
2283		- $form_key = $form->form_key;
2284		- wp_send_json_success( compact( 'form_key' ) );
2285		- }
	1777	+ wp_send_json_success( compact( 'form_key' ) );
	1778	+ }
2286	1779
2287		- $to_update = array(
2288		- 'name' => $name,
2289		- );
	1780	+ public static function json_error( $errors ) {
	1781	+ $errors['json'] = __( 'Abnormal HTML characters prevented your form from saving correctly', 'formidable' );
2290	1782
2291		- if ( '' === $name ) {
2292		- $form_key = $form->form_key;
2293		- } else {
2294		- // Only update form_key if name is not empty.
2295		- $form_key = FrmAppHelper::get_unique_key( sanitize_title( $name ), 'frm_forms', 'form_key' );
2296		- $to_update['form_key'] = $form_key;
2297		- }
2298		-
2299		- FrmForm::update( $form_id, $to_update );
2300		-
2301		- wp_send_json_success( compact( 'form_key' ) );
	1783	+ return $errors;
2302	1784	}
2303	1785
2304	1786	/**
2305		- * @param array $errors
	1787	+ * Education for premium features.
2306	1788	*
2307		- * @return array
	1789	+ * @since 4.05
2308	1790	*/
2309		- public static function json_error( $errors ) {
2310		- $errors['json'] = __( 'Abnormal HTML characters prevented your form from saving correctly', 'formidable' );
2311		- return $errors;
	1791	+ public static function add_form_style_tab_options() {
	1792	+ include( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/add_form_style_options.php' );
2312	1793	}
2313	1794
2314	1795	/**
2315	1796	* Add education about views.
		@@ -2314,12 +1795,8 @@
2314	1795	/**
2315	1796	* Add education about views.
2316	1797	*
2317	1798	* @since 4.07
2318		- *
2319		- * @param array $values
2320		- *
2321		- * @return void
2322	1799	*/
2323	1800	public static function no_views( $values = array() ) {
2324	1801	FrmAppHelper::include_svg();
2325	1802	$id = FrmAppHelper::get_param( 'form', '', 'get', 'absint' );
		@@ -2331,12 +1808,8 @@
2331	1808	/**
2332	1809	* Add education about reports.
2333	1810	*
2334	1811	* @since 4.07
2335		- *
2336		- * @param array $values
2337		- *
2338		- * @return void
2339	1812	*/
2340	1813	public static function no_reports( $values = array() ) {
2341	1814	$id = FrmAppHelper::get_param( 'form', '', 'get', 'absint' );
2342	1815	$form = $id ? FrmForm::getOne( $id ) : false;
		@@ -2361,9 +1834,10 @@
2361	1834	/**
2362	1835	* @since 4.05.02
2363	1836	*/
2364	1837	private static function move_menu_to_footer() {
2365		- if ( empty( FrmAppHelper::get_settings()->admin_bar ) ) {
	1838	+ $settings = FrmAppHelper::get_settings();
	1839	+ if ( empty( $settings->admin_bar ) ) {
2366	1840	remove_action( 'wp_body_open', 'wp_admin_bar_render', 0 );
2367	1841	}
2368	1842	}
2369	1843
		@@ -2368,15 +1842,13 @@
2368	1842	}
2369	1843
2370	1844	public static function admin_bar_configure() {
2371	1845	global $frm_vars;
2372		-
2373	1846	if ( empty( $frm_vars['forms_loaded'] ) ) {
2374	1847	return;
2375	1848	}
2376	1849
2377	1850	$actions = array();
2378		-
2379	1851	foreach ( $frm_vars['forms_loaded'] as $form ) {
2380	1852	if ( is_object( $form ) ) {
2381	1853	$actions[ $form->id ] = $form->name;
2382	1854	}
		@@ -2382,9 +1854,9 @@
2382	1854	}
2383	1855	unset( $form );
2384	1856	}
2385	1857
2386		- if ( ! $actions ) {
	1858	+ if ( empty( $actions ) ) {
2387	1859	return;
2388	1860	}
2389	1861
2390	1862	self::add_menu_to_admin_bar();
		@@ -2410,12 +1882,8 @@
2410	1882	}
2411	1883
2412	1884	/**
2413	1885	* @since 2.05.07
2414		- *
2415		- * @param array $actions
2416		- *
2417		- * @return void
2418	1886	*/
2419	1887	private static function add_forms_to_admin_bar( $actions ) {
2420	1888	global $wp_admin_bar;
2421	1889
		@@ -2421,13 +1889,14 @@
2421	1889
2422	1890	asort( $actions );
2423	1891
2424	1892	foreach ( $actions as $form_id => $name ) {
	1893	+
2425	1894	$wp_admin_bar->add_node(
2426	1895	array(
2427	1896	'parent' => 'frm-forms',
2428	1897	'id' => 'edit_form_' . $form_id,
2429		- 'title' => $name ? $name : FrmFormsHelper::get_no_title_text(),
	1898	+ 'title' => empty( $name ) ? __( '(no title)', 'formidable' ) : $name,
2430	1899	'href' => FrmForm::get_edit_link( $form_id ),
2431	1900	)
2432	1901	);
2433	1902	}
		@@ -2436,16 +1905,14 @@
2436	1905	/**
2437	1906	* The formidable shortcode
2438	1907	*
2439	1908	* @param array $atts The params from the shortcode.
2440		- *
2441	1909	* @return string
2442	1910	*/
2443	1911	public static function get_form_shortcode( $atts ) {
2444	1912	global $frm_vars;
2445		-
2446		- if ( ! empty( $frm_vars['skip_shortcode'] ) ) {
2447		- $sc = '[formidable';
	1913	+ if ( isset( $frm_vars['skip_shortcode'] ) && $frm_vars['skip_shortcode'] ) {
	1914	+ $sc = '[formidable';
2448	1915	$sc .= FrmAppHelper::array_to_html_params( $atts );
2449	1916	return $sc . ']';
2450	1917	}
2451	1918
		@@ -2470,12 +1937,11 @@
2470	1937
2471	1938	/**
2472	1939	* @since 5.2.01
2473	1940	*
2474		- * @param false|int|string $id
2475		- * @param false|string $key
2476		- *
2477		- * @return false|stdClass
	1941	+ * @param string|int|false $id
	1942	+ * @param string|false $key
	1943	+ * @return stdClass|false
2478	1944	*/
2479	1945	private static function maybe_get_form_by_id_or_key( $id, $key ) {
2480	1946	if ( ! $id ) {
2481	1947	$id = $key;
		@@ -2483,14 +1949,13 @@
2483	1949	return self::maybe_get_form_to_show( $id );
2484	1950	}
2485	1951
2486	1952	/**
2487		- * @param false|int|string $id
2488		- * @param false|string $key
2489		- * @param bool|int|string $title may be 'auto', true, false, 'true', 'false', 'yes', '1', 1, '0', 0.
2490		- * @param bool|int|string $description may be 'auto', true, false, 'true', 'false', 'yes', '1', 1, '0', 0.
	1953	+ * @param string|int|false $id
	1954	+ * @param string|false $key
	1955	+ * @param string|int|bool $title may be 'auto', true, false, 'true', 'false', 'yes', '1', 1, '0', 0.
	1956	+ * @param string|int|bool $description may be 'auto', true, false, 'true', 'false', 'yes', '1', 1, '0', 0.
2491	1957	* @param array $atts
2492		- *
2493	1958	* @return string
2494	1959	*/
2495	1960	public static function show_form( $id = '', $key = '', $title = false, $description = false, $atts = array() ) {
2496	1961	$form = self::maybe_get_form_by_id_or_key( $id, $key );
		@@ -2511,13 +1976,14 @@
2511	1976
2512	1977	add_action( 'frm_load_form_hooks', 'FrmHooksController::trigger_load_form_hooks' );
2513	1978	FrmAppHelper::trigger_hook_load( 'form', $form );
2514	1979
2515		- $form = apply_filters( 'frm_pre_display_form', $form );
	1980	+ $form = apply_filters( 'frm_pre_display_form', $form );
	1981	+
2516	1982	$frm_settings = FrmAppHelper::get_settings( array( 'current_form' => $form->id ) );
2517	1983
2518	1984	if ( self::is_viewable_draft_form( $form ) ) {
2519		- // Don't show a draft form on a page
	1985	+ // don't show a draft form on a page
2520	1986	$form = __( 'Please select a valid form', 'formidable' );
2521	1987	} elseif ( ! FrmForm::is_visible_to_user( $form ) ) {
2522	1988	$form = do_shortcode( $frm_settings->login_msg );
2523	1989	} else {
		@@ -2536,19 +2002,17 @@
2536	2002	return $form;
2537	2003	}
2538	2004
2539	2005	/**
2540		- * @param false|int|string $id
2541		- *
2542		- * @return false|stdClass
	2006	+ * @param string|int|false $id
	2007	+ * @return stdClass|false
2543	2008	*/
2544	2009	private static function maybe_get_form_to_show( $id ) {
2545	2010	$form = false;
2546	2011
2547		- if ( $id ) {
	2012	+ if ( ! empty( $id ) ) {
2548	2013	// Form id or key is set.
2549	2014	$form = FrmForm::getOne( $id );
2550		-
2551	2015	if ( ! $form || $form->parent_form_id || $form->status === 'trash' ) {
2552	2016	$form = false;
2553	2017	}
2554	2018	}
		@@ -2555,25 +2019,12 @@
2555	2019
2556	2020	return $form;
2557	2021	}
2558	2022
2559		- /**
2560		- * @param object $form
2561		- *
2562		- * @return bool
2563		- */
2564	2023	private static function is_viewable_draft_form( $form ) {
2565	2024	return $form->status === 'draft' && current_user_can( 'frm_edit_forms' ) && ! FrmAppHelper::is_preview_page();
2566	2025	}
2567	2026
2568		- /**
2569		- * @param object $form
2570		- * @param bool $title
2571		- * @param bool $description
2572		- * @param array $atts
2573		- *
2574		- * @return string
2575		- */
2576	2027	public static function get_form( $form, $title, $description, $atts = array() ) {
2577	2028	ob_start();
2578	2029
2579	2030	do_action( 'frm_before_get_form', $atts );
		@@ -2580,9 +2031,10 @@
2580	2031
2581	2032	self::get_form_contents( $form, $title, $description, $atts );
2582	2033	self::enqueue_scripts( FrmForm::get_params( $form ) );
2583	2034
2584		- $contents = ob_get_clean();
	2035	+ $contents = ob_get_contents();
	2036	+ ob_end_clean();
2585	2037
2586	2038	self::maybe_minimize_form( $atts, $contents );
2587	2039
2588	2040	return $contents;
		@@ -2587,25 +2039,12 @@
2587	2039
2588	2040	return $contents;
2589	2041	}
2590	2042
2591		- /**
2592		- * @param array $params
2593		- *
2594		- * @return void
2595		- */
2596	2043	public static function enqueue_scripts( $params ) {
2597	2044	do_action( 'frm_enqueue_form_scripts', $params );
2598	2045	}
2599	2046
2600		- /**
2601		- * @param object $form
2602		- * @param bool $title
2603		- * @param bool $description
2604		- * @param array $atts
2605		- *
2606		- * @return void
2607		- */
2608	2047	public static function get_form_contents( $form, $title, $description, $atts ) {
2609	2048	$params = FrmForm::get_params( $form );
2610	2049	$errors = self::get_saved_errors( $form, $params );
2611	2050	$fields = FrmFieldsHelper::get_form_fields( $form->id, $errors );
		@@ -2612,10 +2051,9 @@
2612	2051	$reset = false;
2613	2052	$pass_args = compact( 'form', 'fields', 'errors', 'title', 'description', 'reset' );
2614	2053
2615	2054	$pass_args['action'] = $params['action'];
2616		- // phpcs:ignore WordPress.Security.NonceVerification.Missing, Universal.Operators.StrictComparisons
2617		- $handle_process_here = $params['action'] === 'create' && $params['posted_form_id'] == $form->id && $_POST;
	2055	+ $handle_process_here = $params['action'] === 'create' && $params['posted_form_id'] == $form->id && $_POST; // phpcs:ignore WordPress.Security.NonceVerification.Missing
2618	2056
2619	2057	if ( ! $handle_process_here ) {
2620	2058	FrmFormState::set_initial_value( 'title', $title );
2621	2059	FrmFormState::set_initial_value( 'description', $description );
		@@ -2620,21 +2058,22 @@
2620	2058	FrmFormState::set_initial_value( 'title', $title );
2621	2059	FrmFormState::set_initial_value( 'description', $description );
2622	2060
2623	2061	do_action( 'frm_display_form_action', $params, $fields, $form, $title, $description );
2624		-
2625	2062	if ( apply_filters( 'frm_continue_to_new', true, $form->id, $params['action'] ) ) {
2626	2063	self::show_form_after_submit( $pass_args );
2627	2064	}
2628		- } elseif ( $errors ) {
	2065	+ } elseif ( ! empty( $errors ) ) {
2629	2066	self::show_form_after_submit( $pass_args );
	2067	+
2630	2068	} else {
	2069	+
2631	2070	do_action( 'frm_validate_form_creation', $params, $fields, $form, $title, $description );
2632	2071
2633	2072	if ( apply_filters( 'frm_continue_to_create', true, $form->id ) ) {
2634		- $entry_id = self::just_created_entry( $form->id );
2635		- $pass_args['entry_id'] = $entry_id;
2636		- $pass_args['reset'] = true;
	2073	+ $entry_id = self::just_created_entry( $form->id );
	2074	+ $pass_args['entry_id'] = $entry_id;
	2075	+ $pass_args['reset'] = true;
2637	2076
2638	2077	self::run_on_submit_actions( $pass_args );
2639	2078
2640	2079	do_action(
		@@ -2651,19 +2090,13 @@
2651	2090	/**
2652	2091	* If the form was processed earlier (init), get the generated errors
2653	2092	*
2654	2093	* @since 2.05
2655		- *
2656		- * @param object $form
2657		- * @param array $params
2658		- *
2659		- * @return array
2660	2094	*/
2661	2095	private static function get_saved_errors( $form, $params ) {
2662	2096	global $frm_vars;
2663	2097
2664		- // phpcs:ignore WordPress.Security.NonceVerification.Missing, Universal.Operators.StrictComparisons
2665		- if ( $params['posted_form_id'] == $form->id && $_POST && isset( $frm_vars['created_entries'][ $form->id ] ) ) {
	2098	+ if ( $params['posted_form_id'] == $form->id && $_POST && isset( $frm_vars['created_entries'][ $form->id ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
2666	2099	$errors = $frm_vars['created_entries'][ $form->id ]['errors'];
2667	2100	} else {
2668	2101	$errors = array();
2669	2102	}
		@@ -2680,16 +2113,13 @@
2680	2113	}
2681	2114
2682	2115	/**
2683	2116	* @since 2.2.7
2684		- *
2685		- * @param int|string $form_id
2686		- *
2687		- * @return int
2688	2117	*/
2689	2118	public static function just_created_entry( $form_id ) {
2690	2119	global $frm_vars;
2691		- 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
	2120	+
	2121	+ 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;
2692	2122	}
2693	2123
2694	2124	/**
2695	2125	* Gets confirmation method.
		@@ -2702,19 +2132,17 @@
2702	2132	*
2703	2133	* @type object $form Form object.
2704	2134	* @type int $entry_id Entry ID.
2705	2135	* }
2706		- *
2707		- * @return array|string
	2136	+ * @return string|array
2708	2137	*/
2709	2138	private static function get_confirmation_method( $atts ) {
2710	2139	$action = FrmOnSubmitHelper::current_event( $atts );
2711	2140	$opt = 'update' === $action ? 'edit_action' : 'success_action';
2712		- $method = ! empty( $atts['form']->options[ $opt ] ) ? $atts['form']->options[ $opt ] : 'message';
	2141	+ $method = ( isset( $atts['form']->options[ $opt ] ) && ! empty( $atts['form']->options[ $opt ] ) ) ? $atts['form']->options[ $opt ] : 'message';
2713	2142
2714	2143	if ( ! empty( $atts['entry_id'] ) ) {
2715	2144	$met_actions = self::get_met_on_submit_actions( $atts, $action );
2716		-
2717	2145	if ( $met_actions ) {
2718	2146	$method = $met_actions;
2719	2147	}
2720	2148	}
		@@ -2720,22 +2148,15 @@
2720	2148	}
2721	2149
2722	2150	$method = apply_filters( 'frm_success_filter', $method, $atts['form'], $action );
2723	2151
2724		- if ( $method !== 'message' && ( ! $atts['entry_id'] || ! is_numeric( $atts['entry_id'] ) ) ) {
2725		- return 'message';
	2152	+ if ( $method != 'message' && ( ! $atts['entry_id'] || ! is_numeric( $atts['entry_id'] ) ) ) {
	2153	+ $method = 'message';
2726	2154	}
2727	2155
2728	2156	return $method;
2729	2157	}
2730	2158
2731		- /**
2732		- * @param object $form
2733		- * @param array $params
2734		- * @param array $args
2735		- *
2736		- * @return void
2737		- */
2738	2159	public static function maybe_trigger_redirect( $form, $params, $args ) {
2739	2160	if ( ! isset( $params['id'] ) ) {
2740	2161	global $frm_vars;
2741	2162	$params['id'] = $frm_vars['created_entries'][ $form->id ]['entry_id'];
		@@ -2762,12 +2183,14 @@
2762	2183	* @param array $params See {@see FrmFormsController::maybe_trigger_redirect()}.
2763	2184	* @param array $args See {@see FrmFormsController::maybe_trigger_redirect()}.
2764	2185	*/
2765	2186	public static function maybe_trigger_redirect_with_action( $conf_method, $form, $params, $args ) {
2766		- 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
2767		- $event = FrmOnSubmitHelper::current_event( $params );
2768		- FrmOnSubmitHelper::populate_on_submit_data( $form->options, $conf_method[0], $event );
2769		- $conf_method = 'redirect';
	2187	+ if ( is_array( $conf_method ) && 1 === count( $conf_method ) ) {
	2188	+ if ( 'redirect' === FrmOnSubmitHelper::get_action_type( $conf_method[0] ) ) {
	2189	+ $event = FrmOnSubmitHelper::current_event( $params );
	2190	+ FrmOnSubmitHelper::populate_on_submit_data( $form->options, $conf_method[0], $event );
	2191	+ $conf_method = 'redirect';
	2192	+ }
2770	2193	}
2771	2194
2772	2195	if ( 'redirect' === $conf_method ) {
2773	2196	self::trigger_redirect( $form, $params, $args );
		@@ -2773,15 +2196,8 @@
2773	2196	self::trigger_redirect( $form, $params, $args );
2774	2197	}
2775	2198	}
2776	2199
2777		- /**
2778		- * @param object $form
2779		- * @param array $params
2780		- * @param array $args
2781		- *
2782		- * @return void
2783		- */
2784	2200	public static function trigger_redirect( $form, $params, $args ) {
2785	2201	$success_args = array(
2786	2202	'action' => $params['action'],
2787	2203	'conf_method' => 'redirect',
		@@ -2819,9 +2235,9 @@
2819	2235	unset( $extra_args['form'] );
2820	2236
2821	2237	do_action( 'frm_success_action', $args['conf_method'], $args['form'], $args['form']->options, $args['entry_id'], $extra_args );
2822	2238
2823		- $opt = ! isset( $args['action'] ) || $args['action'] === 'create' ? 'success' : 'edit';
	2239	+ $opt = ( ! isset( $args['action'] ) || $args['action'] === 'create' ) ? 'success' : 'edit';
2824	2240
2825	2241	$args['success_opt'] = $opt;
2826	2242	$args['ajax'] = ! empty( $frm_vars['ajax'] );
2827	2243
		@@ -2840,9 +2256,8 @@
2840	2256	* @since 6.0
2841	2257	*
2842	2258	* @param array $args See {@see FrmFormsController::run_success_action()}.
2843	2259	* @param string $event Form event. Default is `create`.
2844		- *
2845	2260	* @return array Array of actions that meet the conditional logics.
2846	2261	*/
2847	2262	public static function get_met_on_submit_actions( $args, $event = 'create' ) {
2848	2263	if ( ! FrmOnSubmitHelper::form_has_migrated( $args['form'] ) ) {
		@@ -2848,16 +2263,16 @@
2848	2263	if ( ! FrmOnSubmitHelper::form_has_migrated( $args['form'] ) ) {
2849	2264	return array();
2850	2265	}
2851	2266
2852		- // If a redirect action has already opened the URL in a new tab, we show the default message in the current tab.
	2267	+ // If a redirect action has already opened the URL in a new tab, we show the default message in the currect tab.
2853	2268	if ( ! empty( self::$redirected_in_new_tab[ $args['form']->id ] ) ) {
2854	2269	return array( FrmOnSubmitHelper::get_fallback_action_after_open_in_new_tab( $event ) );
2855	2270	}
2856	2271
2857		- $entry = FrmEntry::getOne( $args['entry_id'], true );
2858		- $actions = FrmOnSubmitHelper::get_actions( $args['form']->id );
2859		- $met_actions = array();
	2272	+ $entry = FrmEntry::getOne( $args['entry_id'], true );
	2273	+ $actions = FrmOnSubmitHelper::get_actions( $args['form']->id );
	2274	+ $met_actions = array();
2860	2275	$has_redirect = false;
2861	2276
2862	2277	foreach ( $actions as $action ) {
2863	2278	if ( ! in_array( $event, $action->post_content['event'], true ) ) {
		@@ -2869,11 +2284,13 @@
2869	2284	}
2870	2285
2871	2286	$action_type = FrmOnSubmitHelper::get_action_type( $action );
2872	2287
2873		- if ( 'redirect' === $action_type && $has_redirect ) {
2874		- // Do not process because we run the first redirect action only.
2875		- continue;
	2288	+ if ( 'redirect' === $action_type ) {
	2289	+ if ( $has_redirect ) {
	2290	+ // Do not process because we run the first redirect action only.
	2291	+ continue;
	2292	+ }
2876	2293	}
2877	2294
2878	2295	if ( ! self::is_valid_on_submit_action( $action, $args, $event ) ) {
2879	2296	continue;
		@@ -2898,10 +2315,10 @@
2898	2315	* @param array $args See {@see FrmFormsController::run_success_action()}. `$args['event']` is also added.
2899	2316	*/
2900	2317	$met_actions = apply_filters( 'frm_get_met_on_submit_actions', $met_actions, $args );
2901	2318
2902		- if ( ! $met_actions ) {
2903		- return array( FrmOnSubmitHelper::get_fallback_action( $event ) );
	2319	+ if ( empty( $met_actions ) ) {
	2320	+ $met_actions = array( FrmOnSubmitHelper::get_fallback_action( $event ) );
2904	2321	}
2905	2322
2906	2323	return $met_actions;
2907	2324	}
		@@ -2913,9 +2330,8 @@
2913	2330	*
2914	2331	* @param object $action Form action object.
2915	2332	* @param array $args See {@see FrmFormsController::run_success_action()}.
2916	2333	* @param string $event Form event. Default is `create`.
2917		- *
2918	2334	* @return bool
2919	2335	*/
2920	2336	private static function is_valid_on_submit_action( $action, $args, $event = 'create' ) {
2921	2337	$action_type = FrmOnSubmitHelper::get_action_type( $action );
		@@ -2937,9 +2353,8 @@
2937	2353	return false;
2938	2354	}
2939	2355
2940	2356	$page = get_post( $action->post_content['success_page_id'] );
2941		-
2942	2357	if ( ! $page || 'trash' === $page->post_status ) {
2943	2358	return false;
2944	2359	}
2945	2360	}
		@@ -2961,9 +2376,8 @@
2961	2376	'entry_id' => $args['entry_id'],
2962	2377	'action' => FrmOnSubmitHelper::current_event( $args ),
2963	2378	)
2964	2379	);
2965		-
2966	2380	if ( ! is_array( $args['conf_method'] ) ) {
2967	2381	self::run_success_action( $args );
2968	2382	return;
2969	2383	}
		@@ -2990,9 +2404,8 @@
2990	2404	* @param array $args See {@see FrmFormsController::run_success_action()}.
2991	2405	*/
2992	2406	public static function run_multi_on_submit_actions( $args ) {
2993	2407	$redirect_action = null;
2994		-
2995	2408	foreach ( $args['conf_method'] as $action ) {
2996	2409	if ( 'redirect' === FrmOnSubmitHelper::get_action_type( $action ) ) {
2997	2410	// We catch the redirect action to run it last.
2998	2411	$redirect_action = $action;
		@@ -3003,15 +2416,13 @@
3003	2416
3004	2417	unset( $action );
3005	2418	}
3006	2419
3007		- if ( ! $redirect_action ) {
3008		- return;
	2420	+ if ( $redirect_action ) {
	2421	+ // Show script to delay the redirection.
	2422	+ $args['force_delay_redirect'] = true;
	2423	+ self::run_single_on_submit_action( $args, $redirect_action );
3009	2424	}
3010		-
3011		- // Show script to delay the redirection.
3012		- $args['force_delay_redirect'] = true;
3013		- self::run_single_on_submit_action( $args, $redirect_action );
3014	2425	}
3015	2426
3016	2427	/**
3017	2428	* Runs single On Submit action.
		@@ -3032,9 +2443,8 @@
3032	2443	* @since 6.0
3033	2444	*
3034	2445	* @param array $args See {@see FrmFormsController::run_success_action()}.
3035	2446	* @param object $action On Submit action object.
3036		- *
3037	2447	* @return array
3038	2448	*/
3039	2449	private static function get_run_success_action_args( $args, $action ) {
3040	2450	$new_args = $args;
		@@ -3040,9 +2450,10 @@
3040	2450	$new_args = $args;
3041	2451
3042	2452	FrmOnSubmitHelper::populate_on_submit_data( $new_args['form']->options, $action, $args['action'] );
3043	2453
3044		- $opt = 'update' === $args['action'] ? 'edit_' : 'success_';
	2454	+ $opt = 'update' === $args['action'] ? 'edit_' : 'success_';
	2455	+
3045	2456	$new_args['conf_method'] = $new_args['form']->options[ $opt . 'action' ];
3046	2457
3047	2458	/**
3048	2459	* Filters the run success action args.
		@@ -3057,18 +2468,12 @@
3057	2468	}
3058	2469
3059	2470	/**
3060	2471	* @since 3.0
3061		- *
3062		- * @param array $args
3063		- *
3064		- * @return void
3065	2472	*/
3066	2473	private static function load_page_after_submit( $args ) {
3067	2474	global $post;
3068	2475	$opt = $args['success_opt'];
3069		-
3070		- // phpcs:ignore Universal.Operators.StrictComparisons
3071	2476	if ( ! $post || $args['form']->options[ $opt . '_page_id' ] != $post->ID ) {
3072	2477	$page = get_post( $args['form']->options[ $opt . '_page_id' ] );
3073	2478	$old_post = $post;
3074	2479	$post = $page;
		@@ -3092,9 +2497,8 @@
3092	2497	}
3093	2498
3094	2499	/**
3095	2500	* @since 3.0
3096		- *
3097	2501	* @param array $args See {@see FrmFormsController::run_success_action()}.
3098	2502	*/
3099	2503	private static function redirect_after_submit( $args ) {
3100	2504	add_filter( 'frm_use_wpautop', '__return_false' );
		@@ -3108,10 +2512,11 @@
3108	2512	FrmEntriesController::delete_entry_before_redirect( $success_url, $args['form'], $args );
3109	2513
3110	2514	add_filter( 'frm_redirect_url', 'FrmEntriesController::prepare_redirect_url' );
3111	2515	$success_url = apply_filters( 'frm_redirect_url', $success_url, $args['form'], $args );
3112		- $doing_ajax = FrmAppHelper::doing_ajax();
3113	2516
	2517	+ $doing_ajax = FrmAppHelper::doing_ajax();
	2518	+
3114	2519	if ( ! empty( $args['ajax'] ) && $doing_ajax && empty( $args['force_delay_redirect'] ) ) {
3115	2520	// Is AJAX submit and there is just one Redirect action runs.
3116	2521	echo json_encode( self::get_ajax_redirect_response_data( $args + compact( 'success_url' ) ) );
3117	2522	wp_die();
		@@ -3116,9 +2521,9 @@
3116	2521	echo json_encode( self::get_ajax_redirect_response_data( $args + compact( 'success_url' ) ) );
3117	2522	wp_die();
3118	2523	}
3119	2524
3120		- if ( ! headers_sent() && empty( $args['force_delay_redirect'] ) && empty( $args['form']->options['redirect_delay'] ) ) {
	2525	+ if ( ! headers_sent() && empty( $args['force_delay_redirect'] ) ) {
3121	2526	// Not AJAX submit, no headers sent, and there is just one Redirect action runs.
3122	2527	if ( ! empty( $args['form']->options['open_in_new_tab'] ) ) {
3123	2528	self::print_open_in_new_tab_js_with_fallback_handler( $success_url, $args );
3124	2529	self::$redirected_in_new_tab[ $args['form']->id ] = 1;
		@@ -3160,51 +2565,31 @@
3160	2565	*
3161	2566	* @since 6.3.1
3162	2567	*
3163	2568	* @param array $args See {@see FrmFormsController::run_success_action()}.
3164		- *
3165	2569	* @return array
3166	2570	*/
3167	2571	private static function get_ajax_redirect_response_data( $args ) {
3168		- $response_data = array(
3169		- 'redirect' => $args['success_url'],
3170		- 'content' => '',
3171		- );
3172		- $unset_content = true;
	2572	+ $response_data = array( 'redirect' => $args['success_url'] );
3173	2573
3174		- if ( ! empty( $args['form']->options['redirect_delay'] ) ) {
3175		- $response_data['delay'] = $args['form']->options['redirect_delay_time'];
3176		- $response_data['content'] .= self::get_redirect_message( $args['success_url'], $args['form']->options['redirect_delay_msg'], $args );
3177		- $unset_content = false;
3178		- }
3179		-
3180	2574	if ( ! empty( $args['form']->options['open_in_new_tab'] ) ) {
3181	2575	$response_data['openInNewTab'] = 1;
3182	2576
3183		- // Only show open in new tab text if there is no delay.
3184		- if ( empty( $response_data['content'] ) ) {
3185		- $args['message'] = FrmOnSubmitHelper::get_default_new_tab_msg();
	2577	+ $args['message'] = FrmOnSubmitHelper::get_default_new_tab_msg();
3186	2578
3187		- $args['form']->options['success_msg'] = $args['message'];
3188		- $args['form']->options['edit_msg'] = $args['message'];
	2579	+ $args['form']->options['success_msg'] = $args['message'];
	2580	+ $args['form']->options['edit_msg'] = $args['message'];
	2581	+ if ( ! isset( $args['fields'] ) ) {
	2582	+ $args['fields'] = FrmField::get_all_for_form( $args['form']->id );
	2583	+ }
3189	2584
3190		- if ( ! isset( $args['fields'] ) ) {
3191		- $args['fields'] = FrmField::get_all_for_form( $args['form']->id );
3192		- }
	2585	+ $args['message'] = self::prepare_submit_message( $args['form'], $args['entry_id'], $args );
3193	2586
3194		- $args['message'] = self::prepare_submit_message( $args['form'], $args['entry_id'], $args );
	2587	+ ob_start();
	2588	+ self::show_lone_success_messsage( $args );
	2589	+ $response_data['content'] = ob_get_clean();
3195	2590
3196		- ob_start();
3197		- self::show_lone_success_message( $args );
3198		- $response_data['content'] .= ob_get_clean();
3199		- $unset_content = false;
3200		- }//end if
3201		-
3202	2591	$response_data['fallbackMsg'] = self::get_redirect_fallback_message( $args['success_url'], $args );
3203		- }//end if
3204		-
3205		- if ( $unset_content && '' === $response_data['content'] ) {
3206		- unset( $response_data['content'] );
3207	2592	}
3208	2593
3209	2594	return $response_data;
3210	2595	}
		@@ -3216,9 +2601,9 @@
3216	2601	*
3217	2602	* @param array $args See {@see FrmFormsController::run_success_action()}.
3218	2603	*/
3219	2604	private static function redirect_after_submit_using_js( $args ) {
3220		- $success_msg = $args['form']->options['redirect_delay_msg'];
	2605	+ $success_msg = FrmOnSubmitHelper::get_default_redirect_msg();
3221	2606	$redirect_msg = self::get_redirect_message( $args['success_url'], $success_msg, $args );
3222	2607	$success_url = esc_url_raw( $args['success_url'] );
3223	2608
3224	2609	/**
		@@ -3225,11 +2610,11 @@
3225	2610	* Filters the delay time before redirecting when On Submit Redirect action is delayed.
3226	2611	*
3227	2612	* @since 6.0
3228	2613	*
3229		- * @param int $delay_time Delay time in milliseconds.
	2614	+ * @param int $delay_time Delay time in miliseconds.
3230	2615	*/
3231		- $delay_time = apply_filters( 'frm_redirect_delay_time', 1000 * $args['form']->options['redirect_delay_time'] );
	2616	+ $delay_time = apply_filters( 'frm_redirect_delay_time', 8000 );
3232	2617
3233	2618	if ( ! empty( $args['form']->options['open_in_new_tab'] ) ) {
3234	2619	$redirect_js = 'window.open("' . $success_url . '", "_blank")';
3235	2620	} else {
		@@ -3239,15 +2624,13 @@
3239	2624	add_filter( 'frm_use_wpautop', '__return_true' );
3240	2625
3241	2626	echo FrmAppHelper::maybe_kses( $redirect_msg ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
3242	2627	echo '<script>';
3243		-
3244	2628	if ( empty( $args['doing_ajax'] ) ) {
3245	2629	// Not AJAX submit, delay JS until window.load.
3246	2630	echo 'window.onload=function(){';
3247	2631	}
3248	2632	echo 'setTimeout(function(){' . $redirect_js . '}, ' . intval( $delay_time ) . ');'; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
3249		-
3250	2633	if ( empty( $args['doing_ajax'] ) ) {
3251	2634	echo '};';
3252	2635	}
3253	2636	echo '</script>';
		@@ -3260,16 +2643,11 @@
3260	2643	* @param string $success_msg
3261	2644	* @param array $args
3262	2645	*/
3263	2646	private static function get_redirect_message( $success_url, $success_msg, $args ) {
3264		- $success_msg = apply_filters( 'frm_content', $success_msg, $args['form'], $args['entry_id'] );
3265		- $success_msg = do_shortcode( FrmAppHelper::use_wpautop( $success_msg ) );
3266		-
3267		- // phpcs:disable Generic.WhiteSpace.ScopeIndent
3268		- $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
	2647	+ $redirect_msg = '<div class="' . esc_attr( FrmFormsHelper::get_form_style_class( $args['form'] ) ) . '"><div class="frm-redirect-msg" role="status">' . $success_msg . '<br/>' .
3269	2648	self::get_redirect_fallback_message( $success_url, $args ) .
3270	2649	'</div></div>';
3271		- // phpcs:enable Generic.WhiteSpace.ScopeIndent
3272	2650
3273	2651	$redirect_args = array(
3274	2652	'entry_id' => $args['entry_id'],
3275	2653	'form_id' => $args['form']->id,
		@@ -3285,14 +2663,12 @@
3285	2663	* @since 6.3.1
3286	2664	*
3287	2665	* @param string $success_url Redirect URL.
3288	2666	* @param array $args Contains `form` object.
3289		- *
3290	2667	* @return string
3291	2668	*/
3292	2669	private static function get_redirect_fallback_message( $success_url, $args ) {
3293	2670	$target = '';
3294		-
3295	2671	if ( ! empty( $args['form']->options['open_in_new_tab'] ) ) {
3296	2672	$target = ' target="_blank"';
3297	2673	}
3298	2674
		@@ -3307,12 +2683,8 @@
3307	2683	/**
3308	2684	* Prepare to show the success message and empty form after submit
3309	2685	*
3310	2686	* @since 2.05
3311		- *
3312		- * @param array $atts
3313		- *
3314		- * @return void
3315	2687	*/
3316	2688	public static function show_message_after_save( $atts ) {
3317	2689	$atts['message'] = self::prepare_submit_message( $atts['form'], $atts['entry_id'], $atts );
3318	2690
		@@ -3318,9 +2690,8 @@
3318	2690
3319	2691	if ( ! isset( $atts['form']->options['show_form'] ) || $atts['form']->options['show_form'] ) {
3320	2692	if ( isset( $atts['action'] ) && 'update' === $atts['action'] && is_callable( array( 'FrmProEntriesController', 'show_front_end_form_with_entry' ) ) ) {
3321	2693	$entry = FrmEntry::getOne( $atts['entry_id'] );
3322		-
3323	2694	if ( $entry ) {
3324	2695	// This is copied from the Pro plugin.
3325	2696	$atts['conf_message'] = FrmProEntriesController::confirmation( 'message', $atts['form'], $atts['form']->options, $entry->id, $atts );
3326	2697	$atts['show_form'] = FrmProEntriesController::is_form_displayed_after_edit( $atts['form'] );
		@@ -3329,9 +2700,9 @@
3329	2700	} else {
3330	2701	self::show_form_after_submit( $atts );
3331	2702	}
3332	2703	} else {
3333		- self::show_lone_success_message( $atts );
	2704	+ self::show_lone_success_messsage( $atts );
3334	2705	}
3335	2706	}
3336	2707
3337	2708	/**
		@@ -3337,12 +2708,8 @@
3337	2708	/**
3338	2709	* Show an empty form
3339	2710	*
3340	2711	* @since 2.05
3341		- *
3342		- * @param array $args
3343		- *
3344		- * @return void
3345	2712	*/
3346	2713	private static function show_form_after_submit( $args ) {
3347	2714	self::fill_atts_for_form_display( $args );
3348	2715
		@@ -3361,11 +2728,12 @@
3361	2728	}
3362	2729	unset( $args );
3363	2730
3364	2731	$include_form_tag = apply_filters( 'frm_include_form_tag', true, $form );
3365		- $frm_settings = FrmAppHelper::get_settings();
3366		- $submit = $form->options['submit_value'] ?? $frm_settings->submit_value;
3367	2732
	2733	+ $frm_settings = FrmAppHelper::get_settings();
	2734	+ $submit = isset( $form->options['submit_value'] ) ? $form->options['submit_value'] : $frm_settings->submit_value;
	2735	+
3368	2736	global $frm_vars;
3369	2737	self::maybe_load_css( $form, $values['custom_style'], $frm_vars['load_css'] );
3370	2738
3371	2739	$message_placement = self::message_placement( $form, $message );
		@@ -3373,36 +2741,27 @@
3373	2741	include FrmAppHelper::plugin_path() . '/classes/views/frm-entries/new.php';
3374	2742	}
3375	2743
3376	2744	/**
3377		- * Gets message placement.
	2745	+ * @return string - 'before', 'after', or 'submit'
3378	2746	*
3379	2747	* @since 4.05.02
3380		- * @since 6.26 This method changed from `private` to `public`.
3381		- *
3382		- * @param object $form Form object.
3383		- * @param string $message The message.
3384		- *
3385		- * @return string Accepts 'before', 'after', or 'submit'.
3386	2748	*/
3387		- public static function message_placement( $form, $message ) {
	2749	+ private static function message_placement( $form, $message ) {
3388	2750	$place = 'before';
3389	2751
3390	2752	if ( $message && isset( $form->options['form_class'] ) ) {
3391		- if ( str_contains( $form->options['form_class'], 'frm_below_success' ) ) {
	2753	+ if ( strpos( $form->options['form_class'], 'frm_below_success' ) !== false ) {
3392	2754	$place = 'after';
3393		- } elseif ( str_contains( $form->options['form_class'], 'frm_inline_success' ) ) {
	2755	+ } elseif ( strpos( $form->options['form_class'], 'frm_inline_success' ) !== false ) {
3394	2756	$place = 'submit';
3395	2757	}
3396	2758	}
3397	2759
3398	2760	/**
3399		- * Filter the message placement.
	2761	+ * @return string - 'before' or 'after'
3400	2762	*
3401	2763	* @since 4.05.02
3402		- *
3403		- * @param string $place Accepts 'before', 'after', or 'submit'.
3404		- * @param array $args Args.
3405	2764	*/
3406	2765	return apply_filters( 'frm_message_placement', $place, compact( 'form', 'message' ) );
3407	2766	}
3408	2767
		@@ -3409,12 +2768,8 @@
3409	2768	/**
3410	2769	* Get all the values needed on the new.php entry page
3411	2770	*
3412	2771	* @since 2.05
3413		- *
3414		- * @param array $args
3415		- *
3416		- * @return void
3417	2772	*/
3418	2773	private static function fill_atts_for_form_display( &$args ) {
3419	2774	if ( ! isset( $args['title'] ) && isset( $args['show_title'] ) ) {
3420	2775	$args['title'] = $args['show_title'];
		@@ -3439,24 +2794,21 @@
3439	2794	/**
3440	2795	* Show the success message without the form
3441	2796	*
3442	2797	* @since 2.05
3443		- *
3444		- * @param array $atts
3445		- *
3446		- * @return void
3447	2798	*/
3448		- private static function show_lone_success_message( $atts ) {
	2799	+ private static function show_lone_success_messsage( $atts ) {
3449	2800	global $frm_vars;
3450	2801	$values = FrmEntriesHelper::setup_new_vars( $atts['fields'], $atts['form'], true );
3451	2802	self::maybe_load_css( $atts['form'], $values['custom_style'], $frm_vars['load_css'] );
3452	2803
3453	2804	$include_extra_container = 'frm_forms' . FrmFormsHelper::get_form_style_class( $values );
3454		- $errors = array();
3455		- $form = $atts['form'];
3456		- $message = $atts['message'];
3457	2805
3458		- include FrmAppHelper::plugin_path() . '/classes/views/frm-entries/errors.php';
	2806	+ $errors = array();
	2807	+ $form = $atts['form'];
	2808	+ $message = $atts['message'];
	2809	+
	2810	+ include( FrmAppHelper::plugin_path() . '/classes/views/frm-entries/errors.php' );
3459	2811	}
3460	2812
3461	2813	/**
3462	2814	* Prepare the success message before it's shown
		@@ -3463,20 +2815,19 @@
3463	2815	*
3464	2816	* @since 2.05
3465	2817	* @since 6.0.x Added the third parameter.
3466	2818	*
3467		- * @param object $form Form object.
3468		- * @param int|string $entry_id Entry ID.
3469		- * @param array $args See {@see FrmFormsController::run_success_action()}.
3470		- *
	2819	+ * @param object $form Form object.
	2820	+ * @param int $entry_id Entry ID.
	2821	+ * @param array $args See {@see FrmFormsController::run_success_action()}.
3471	2822	* @return string
3472	2823	*/
3473	2824	private static function prepare_submit_message( $form, $entry_id, $args = array() ) {
3474	2825	$frm_settings = FrmAppHelper::get_settings( array( 'current_form' => $form->id ) );
3475		- $opt = $args['success_opt'] ?? 'success';
	2826	+ $opt = isset( $args['success_opt'] ) ? $args['success_opt'] : 'success';
3476	2827
3477	2828	if ( $entry_id && is_numeric( $entry_id ) ) {
3478		- $message = $form->options[ $opt . '_msg' ] ?? $frm_settings->success_msg;
	2829	+ $message = isset( $form->options[ $opt . '_msg' ] ) ? $form->options[ $opt . '_msg' ] : $frm_settings->success_msg;
3479	2830	$class = 'frm_message';
3480	2831	} else {
3481	2832	$message = $frm_settings->failed_msg;
3482	2833	$class = FrmFormsHelper::form_error_class();
		@@ -3493,9 +2844,9 @@
3493	2844	public static function front_head() {
3494	2845	$version = FrmAppHelper::plugin_version();
3495	2846	$suffix = FrmAppHelper::js_suffix();
3496	2847
3497		- if ( $suffix && self::has_combo_js_file() ) {
	2848	+ if ( ! empty( $suffix ) && self::has_combo_js_file() ) {
3498	2849	wp_register_script( 'formidable', FrmAppHelper::plugin_url() . '/js/frm.min.js', array( 'jquery' ), $version, true );
3499	2850	} else {
3500	2851	wp_register_script( 'formidable', FrmAppHelper::plugin_url() . "/js/formidable{$suffix}.js", array( 'jquery' ), $version, true );
3501	2852	}
		@@ -3502,9 +2853,9 @@
3502	2853
3503	2854	add_filter( 'script_loader_tag', 'FrmFormsController::defer_script_loading', 10, 2 );
3504	2855
3505	2856	if ( FrmAppHelper::is_admin() ) {
3506		- // Don't load this in back-end
	2857	+ // don't load this in back-end
3507	2858	return;
3508	2859	}
3509	2860
3510	2861	FrmAppHelper::localize_script( 'front' );
		@@ -3517,15 +2868,8 @@
3517	2868	public static function has_combo_js_file() {
3518	2869	return is_readable( FrmAppHelper::plugin_path() . '/js/frm.min.js' );
3519	2870	}
3520	2871
3521		- /**
3522		- * @param object $form
3523		- * @param int|string $this_load
3524		- * @param bool $global_load
3525		- *
3526		- * @return void
3527		- */
3528	2872	public static function maybe_load_css( $form, $this_load, $global_load ) {
3529	2873	$load_css = FrmForm::is_form_loaded( $form, $this_load, $global_load );
3530	2874
3531	2875	if ( ! $load_css ) {
		@@ -3555,9 +2899,8 @@
3555	2899	return;
3556	2900	}
3557	2901
3558	2902	global $wp_styles;
3559		-
3560	2903	if ( is_array( $wp_styles->queue ) && in_array( 'formidable', $wp_styles->queue, true ) ) {
3561	2904	wp_print_styles( 'formidable' );
3562	2905	}
3563	2906	}
		@@ -3572,57 +2915,32 @@
3572	2915	private static function should_load_late() {
3573	2916	return ! function_exists( 'aioseo' );
3574	2917	}
3575	2918
3576		- /**
3577		- * @param string $tag
3578		- * @param string $handle
3579		- *
3580		- * @return string
3581		- */
3582	2919	public static function defer_script_loading( $tag, $handle ) {
3583		- if ( 'captcha-api' === $handle && ! str_contains( $tag, 'defer' ) ) {
3584		- return str_replace( ' src', ' defer="defer" async="async" src', $tag );
	2920	+ if ( 'captcha-api' == $handle && ! strpos( $tag, 'defer' ) ) {
	2921	+ $tag = str_replace( ' src', ' defer="defer" async="async" src', $tag );
3585	2922	}
3586	2923
3587	2924	return $tag;
3588	2925	}
3589	2926
3590		- /**
3591		- * @param string $location
3592		- *
3593		- * @return void
3594		- */
3595	2927	public static function footer_js( $location = 'footer' ) {
3596	2928	global $frm_vars;
3597	2929
3598	2930	FrmStylesController::enqueue_css();
3599	2931
3600		- if ( FrmAppHelper::is_admin() || $location === 'header' || empty( $frm_vars['forms_loaded'] ) ) {
3601		- return;
	2932	+ if ( ! FrmAppHelper::is_admin() && $location != 'header' && ! empty( $frm_vars['forms_loaded'] ) ) {
	2933	+ // load formidable js
	2934	+ wp_enqueue_script( 'formidable' );
3602	2935	}
3603		-
3604		- // Load formidable js
3605		- wp_enqueue_script( 'formidable' );
3606		-
3607		- FrmHoneypot::maybe_print_honeypot_js();
3608		-
3609		- if ( ! method_exists( 'FrmProFormsHelper', 'load_currency_js' ) ) {
3610		- // Load currency JS if Pro is not installed.
3611		- FrmFormsHelper::load_currency_js();
3612		- }
3613	2936	}
3614	2937
3615	2938	/**
3616	2939	* @since 2.0.8
3617		- *
3618		- * @param array $atts
3619		- * @param string $content
3620		- *
3621		- * @return void
3622	2940	*/
3623	2941	private static function maybe_minimize_form( $atts, &$content ) {
3624		- // Check if minimizing is turned on
	2942	+ // check if minimizing is turned on
3625	2943	if ( self::is_minification_on( $atts ) ) {
3626	2944	$content = str_replace( array( "\r\n", "\r", "\n", "\t", ' ' ), '', $content );
3627	2945	}
3628	2946	}
		@@ -3628,15 +2946,12 @@
3628	2946	}
3629	2947
3630	2948	/**
3631	2949	* @since 2.0.8
3632		- *
3633		- * @param array $atts
3634		- *
3635		- * @return bool
	2950	+ * @return boolean
3636	2951	*/
3637	2952	private static function is_minification_on( $atts ) {
3638		- return ! empty( $atts['minimize'] );
	2953	+ return isset( $atts['minimize'] ) && ! empty( $atts['minimize'] );
3639	2954	}
3640	2955
3641	2956	/**
3642	2957	* @since 5.0.16
		@@ -3644,13 +2959,11 @@
3644	2959	* @return void
3645	2960	*/
3646	2961	public static function landing_page_preview_option() {
3647	2962	$dir = apply_filters( 'frm_landing_page_preview_option', false );
3648		-
3649	2963	if ( false === $dir || ! file_exists( $dir . 'landing-page-preview-option.php' ) ) {
3650	2964	$dir = self::get_form_views_path();
3651	2965	}
3652		-
3653	2966	include $dir . 'landing-page-preview-option.php';
3654	2967	}
3655	2968
3656	2969	/**
		@@ -3676,15 +2989,13 @@
3676	2989
3677	2990	check_ajax_referer( 'frm_ajax', 'nonce' );
3678	2991
3679	2992	$type = FrmAppHelper::get_post_param( 'type', '', 'sanitize_text_field' );
3680		-
3681	2993	if ( ! $type || ! in_array( $type, array( 'form', 'view' ), true ) ) {
3682	2994	die( 0 );
3683	2995	}
3684	2996
3685	2997	$object_id = FrmAppHelper::get_post_param( 'object_id', '', 'absint' );
3686		-
3687	2998	if ( ! $object_id ) {
3688	2999	die( 0 );
3689	3000	}
3690	3001
		@@ -3696,15 +3007,13 @@
3696	3007	$postarr['post_content'] = apply_filters( 'frm_create_page_with_' . $type . '_shortcode_content', '', $object_id );
3697	3008	}
3698	3009
3699	3010	$name = FrmAppHelper::get_post_param( 'name', '', 'sanitize_text_field' );
3700		-
3701	3011	if ( $name ) {
3702	3012	$postarr['post_title'] = $name;
3703	3013	}
3704	3014
3705	3015	$success = wp_insert_post( $postarr );
3706		-
3707	3016	if ( ! is_numeric( $success ) || ! $success ) {
3708	3017	die( 0 );
3709	3018	}
3710	3019
		@@ -3718,9 +3027,8 @@
3718	3027	/**
3719	3028	* @since 5.3
3720	3029	*
3721	3030	* @param int $form_id
3722		- *
3723	3031	* @return string
3724	3032	*/
3725	3033	private static function get_page_shortcode_content_for_form( $form_id ) {
3726	3034	$shortcode = '[formidable id="' . $form_id . '"]';
		@@ -3740,10 +3048,10 @@
3740	3048	}
3741	3049
3742	3050	check_ajax_referer( 'frm_ajax', 'nonce' );
3743	3051
3744		- $html = FrmAppHelper::clip(
3745		- function () {
	3052	+ $html = FrmAppHelper::clip(
	3053	+ function() {
3746	3054	FrmAppHelper::maybe_autocomplete_pages_options(
3747	3055	array(
3748	3056	'field_name' => 'frm_page_dropdown',
3749	3057	'page_id' => '',
		@@ -3751,66 +3059,100 @@
3751	3059	)
3752	3060	);
3753	3061	}
3754	3062	);
	3063	+ $post_type_object = get_post_type_object( 'page' );
3755	3064	wp_send_json(
3756	3065	array(
3757	3066	'html' => $html,
3758		- 'edit_page_url' => admin_url( sprintf( get_post_type_object( 'page' )->_edit_link . '&action=edit', 0 ) ),
	3067	+ 'edit_page_url' => admin_url( sprintf( $post_type_object->_edit_link . '&action=edit', 0 ) ),
3759	3068	)
3760	3069	);
3761	3070	}
3762	3071
3763	3072	/**
3764		- * Prints necessary templates for the forms list page.
3765		- *
3766		- * @since 6.32
3767		- *
3768		- * @return void
	3073	+ * @deprecated 4.0
3769	3074	*/
3770		- public static function print_forms_list_templates() {
3771		- if ( ! FrmAppHelper::on_form_listing_page() ) {
3772		- return;
3773		- }
	3075	+ public static function new_form( $values = array() ) {
	3076	+ FrmDeprecated::new_form( $values );
	3077	+ }
3774	3078
3775		- $screen = get_current_screen();
	3079	+ /**
	3080	+ * @deprecated 4.0
	3081	+ */
	3082	+ public static function create( $values = array() ) {
	3083	+ _deprecated_function( __METHOD__, '4.0', 'FrmFormsController::update' );
	3084	+ self::update( $values );
	3085	+ }
3776	3086
3777		- if ( ! $screen ) {
3778		- return;
3779		- }
	3087	+ /**
	3088	+ * @deprecated 3.0
	3089	+ * @codeCoverageIgnore
	3090	+ */
	3091	+ public static function bulk_create_template( $ids ) {
	3092	+ return FrmDeprecated::bulk_create_template( $ids );
	3093	+ }
3780	3094
3781		- $columns = get_column_headers( $screen );
3782		- $hidden = get_hidden_columns( $screen );
3783		- $skip_cols = array( 'cb', 'name', 'settings' );
3784		- $per_page = get_user_option( 'formidable_page_formidable_per_page' );
3785		- $show_screen_options = $screen->show_screen_options();
	3095	+ /**
	3096	+ * @deprecated 3.0
	3097	+ * @codeCoverageIgnore
	3098	+ */
	3099	+ public static function edit_key() {
	3100	+ FrmDeprecated::edit_key();
	3101	+ }
3786	3102
3787		- if ( $per_page < 1 ) {
3788		- $per_page = 20;
3789		- }
	3103	+ /**
	3104	+ * @deprecated 3.0
	3105	+ * @codeCoverageIgnore
	3106	+ */
	3107	+ public static function edit_description() {
	3108	+ FrmDeprecated::edit_description();
	3109	+ }
3790	3110
3791		- include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/forms-list-settings.php';
	3111	+ /**
	3112	+ * @deprecated 4.08
	3113	+ * @since 3.06
	3114	+ */
	3115	+ public static function add_new() {
	3116	+ _deprecated_function( __FUNCTION__, '4.08' );
3792	3117	}
3793	3118
3794	3119	/**
3795		- * @deprecated 4.0
	3120	+ * Create a custom template from a form
3796	3121	*
3797		- * @param array $values
	3122	+ * @since 3.06
	3123	+ * @deprecated 6.7
	3124	+ */
	3125	+ public static function build_template() {
	3126	+ _deprecated_function( __METHOD__, '6.7' );
	3127	+ }
	3128	+
	3129	+ /**
	3130	+ * @deprecated 6.7
3798	3131	*
	3132	+ * @return bool
	3133	+ */
	3134	+ public static function expired() {
	3135	+ _deprecated_function( __METHOD__, '6.7' );
	3136	+ return FrmAddonsController::is_license_expired();
	3137	+ }
	3138	+
	3139	+ /**
	3140	+ * Get data from api before rendering it so that we can flag the modal as expired
	3141	+ *
	3142	+ * @deprecated 6.7
	3143	+ *
3799	3144	* @return void
3800	3145	*/
3801		- public static function create( $values = array() ) {
3802		- _deprecated_function( __METHOD__, '4.0', 'FrmFormsController::update' );
3803		- self::update( $values );
	3146	+ public static function before_list_templates() {
	3147	+ _deprecated_function( __METHOD__, '6.7' );
3804	3148	}
3805	3149
3806	3150	/**
3807		- * @deprecated 6.33
	3151	+ * @deprecated 6.7
3808	3152	*
3809		- * @param array $values
3810		- *
3811	3153	* @return void
3812	3154	*/
3813		- public static function render_spam_settings( $values ) {
3814		- _deprecated_function( __METHOD__, '6.33' );
	3155	+ public static function list_templates() {
	3156	+ _deprecated_function( __METHOD__, '6.7' );
3815	3157	}
3816	3158	}