← All changes | classes/controllers/FrmFormsController.php +624 -2105 6.35 → 5.2.02 View file →

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