← All changes | classes/controllers/FrmFormsController.php +591 -1863 6.35 → 5.5.7 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	}
		@@ -47,15 +25,8 @@
47	25	add_filter( 'manage_toplevel_page_formidable_columns', 'FrmFormsController::get_columns', 0 );
48	26	add_filter( 'manage_toplevel_page_formidable_sortable_columns', 'FrmFormsController::get_sortable_columns' );
49	27	}
50	28
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	29	public static function head() {
59	30	if ( wp_is_mobile() ) {
60	31	wp_enqueue_script( 'jquery-touch-punch' );
61	32	}
		@@ -73,12 +44,12 @@
73	44	*/
74	45	public static function logic_tip() {
75	46	$images_url = FrmAppHelper::plugin_url() . '/images/';
76	47	$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' ) );
	48	+ $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' ) . '"/>';
	49	+ 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">';
	50	+ FrmAppHelper::icon_by_class( 'frmfont frm_swap_icon' );
	51	+ esc_html_e( 'Add Conditional Logic', 'formidable' );
81	52	echo '</a>';
82	53	}
83	54
84	55	/**
		@@ -85,15 +56,12 @@
85	56	* By default, Divi processes form shortcodes on the edit post page.
86	57	* Now that won't do.
87	58	*
88	59	* @since 3.01
89		- *
90		- * @param array $shortcodes List of shortcodes to process.
91		- *
92		- * @return array
93	60	*/
94	61	public static function prevent_divi_conflict( $shortcodes ) {
95	62	$shortcodes[] = 'formidable';
	63	+
96	64	return $shortcodes;
97	65	}
98	66
99	67	/**
		@@ -104,14 +72,12 @@
104	72
105	73	$message = '';
106	74	$params = FrmForm::list_page_params();
107	75	$errors = self::process_bulk_form_actions( array() );
108		-
109	76	if ( isset( $errors['message'] ) ) {
110	77	$message = $errors['message'];
111	78	unset( $errors['message'] );
112	79	}
113		-
114	80	$errors = apply_filters( 'frm_admin_list_form_action', $errors );
115	81
116	82	self::display_forms_list( $params, $message, $errors );
117	83	}
		@@ -120,123 +86,28 @@
120	86	* Create the default email action
121	87	*
122	88	* @since 2.02.11
123	89	*
124		- * @param int|object $form
125		- *
126		- * @return void
	90	+ * @param object|int $form
127	91	*/
128	92	private static function create_default_email_action( $form ) {
129	93	FrmForm::maybe_get_form( $form );
130		-
131		- if ( ! is_object( $form ) ) {
132		- return;
133		- }
134		-
135	94	$create_email = apply_filters( 'frm_create_default_email_action', true, $form );
136	95
137		- if ( ! $create_email ) {
138		- return;
	96	+ if ( $create_email ) {
	97	+ $action_control = FrmFormActionsController::get_form_actions( 'email' );
	98	+ $action_control->create( $form->id );
139	99	}
140		-
141		- /**
142		- * @var FrmFormAction
143		- */
144		- $action_control = FrmFormActionsController::get_form_actions( 'email' );
145		- $action_control->create( $form->id );
146	100	}
147	101
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	102	public static function edit( $values = false ) {
226	103	FrmAppHelper::permission_check( 'frm_edit_forms' );
227	104
228	105	$id = isset( $values['id'] ) ? absint( $values['id'] ) : FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
229	106
230		- self::get_edit_vars( $id );
	107	+ return self::get_edit_vars( $id );
231	108	}
232	109
233		- /**
234		- * @param mixed $id
235		- * @param string $message
236		- *
237		- * @return void
238		- */
239	110	public static function settings( $id = false, $message = '' ) {
240	111	FrmAppHelper::permission_check( 'frm_edit_forms' );
241	112
242	113	if ( ! $id || ! is_numeric( $id ) ) {
		@@ -242,61 +113,41 @@
242	113	if ( ! $id || ! is_numeric( $id ) ) {
243	114	$id = FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
244	115	}
245	116
246		- FrmOnSubmitHelper::maybe_migrate_submit_settings_to_action( $id );
247		-
248		- self::get_settings_vars( $id, array(), $message );
	117	+ return self::get_settings_vars( $id, array(), $message );
249	118	}
250	119
251	120	public static function update_settings() {
252	121	FrmAppHelper::permission_check( 'frm_edit_forms' );
253		- $process_form = FrmAppHelper::get_post_param( 'process_form', '', 'sanitize_text_field' );
254	122
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		- }
	123	+ $id = FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
265	124
266		- $id = FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
267		- $errors = FrmForm::validate( $_POST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
	125	+ $errors = FrmForm::validate( $_POST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
268	126	$warnings = FrmFormsHelper::check_for_warnings( $_POST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
269	127
270	128	if ( count( $errors ) > 0 ) {
271		- self::get_settings_vars( $id, $errors, compact( 'warnings' ) );
272		- return;
	129	+ return self::get_settings_vars( $id, $errors, compact( 'warnings' ) );
273	130	}
274	131
275	132	do_action( 'frm_before_update_form_settings', $id );
276	133
277		- $antispam_was_on = self::antispam_was_on( $id ); // phpcs:ignore Formidable.CodeAnalysis.InlineSingleUseVariable
	134	+ $antispam_was_on = self::antispam_was_on( $id );
278	135
279	136	FrmForm::update( $id, $_POST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
280	137
281	138	$antispam_is_on = ! empty( $_POST['options']['antispam'] ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
282		-
283	139	if ( $antispam_is_on !== $antispam_was_on ) {
284	140	FrmAntiSpam::clear_caches();
285	141	}
286	142
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	143	$message = __( 'Settings Successfully Updated', 'formidable' );
292	144
293		- self::get_settings_vars( $id, array(), compact( 'message', 'warnings' ) );
	145	+ return self::get_settings_vars( $id, array(), compact( 'message', 'warnings' ) );
294	146	}
295	147
296	148	/**
297	149	* @param int $form_id
298		- *
299	150	* @return bool
300	151	*/
301	152	private static function antispam_was_on( $form_id ) {
302	153	$form = FrmForm::getOne( $form_id );
		@@ -302,53 +153,10 @@
302	153	$form = FrmForm::getOne( $form_id );
303	154	return ! empty( $form->options['antispam'] );
304	155	}
305	156
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	157	public static function update( $values = array() ) {
350		- if ( ! $values ) {
	158	+ if ( empty( $values ) ) {
351	159	$values = $_POST; // phpcs:ignore WordPress.Security.NonceVerification.Missing
352	160	}
353	161
354	162	// Set radio button and checkbox meta equal to "other" value.
		@@ -357,9 +165,8 @@
357	165	}
358	166
359	167	$errors = FrmForm::validate( $values );
360	168	$permission_error = FrmAppHelper::permission_nonce_error( 'frm_edit_forms', 'frm_save_form', 'frm_save_form_nonce' );
361		-
362	169	if ( $permission_error !== false ) {
363	170	$errors['form'] = $permission_error;
364	171	}
365	172
		@@ -365,93 +172,65 @@
365	172
366	173	$id = isset( $values['id'] ) ? absint( $values['id'] ) : FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
367	174
368	175	if ( count( $errors ) > 0 ) {
369		- self::get_edit_vars( $id, $errors );
370		- return;
371		- }
	176	+ return self::get_edit_vars( $id, $errors );
	177	+ } else {
	178	+ FrmForm::update( $id, $values );
	179	+ $message = __( 'Form was successfully updated.', 'formidable' );
372	180
373		- self::maybe_remove_draft_option_from_fields( $id );
	181	+ if ( self::is_too_long( $values ) ) {
	182	+ $message .= '<br/> ' . sprintf(
	183	+ /* translators: %1$s: Start link HTML, %2$s: end link HTML */
	184	+ __( 'However, your form is very long and may be %1$sreaching server limits%2$s.', 'formidable' ),
	185	+ '<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">',
	186	+ '</a>'
	187	+ );
	188	+ }
374	189
375		- FrmForm::update( $id, $values );
376		- $message = __( 'Form was successfully updated.', 'formidable' );
	190	+ if ( defined( 'DOING_AJAX' ) ) {
	191	+ wp_die( FrmAppHelper::kses( $message, array( 'a' ) ) ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
	192	+ }
377	193
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		- );
	194	+ return self::get_edit_vars( $id, array(), $message );
385	195	}
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	196	}
393	197
394	198	/**
395		- * @since 6.25.1
	199	+ * Check if the value at the end of the form was included.
	200	+ * If it's missing, it means other values at the end of the form
	201	+ * were likely not saved either.
396	202	*
397		- * @return string
	203	+ * @since 3.06.01
398	204	*/
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/' );
	205	+ private static function is_too_long( $values ) {
	206	+ return ( ! isset( $values['frm_end'] ) ) || empty( $values['frm_end'] );
405	207	}
406	208
407	209	/**
408		- * Remove the draft flag from any new fields from this current session.
	210	+ * Redirect to the url for creating from a template
	211	+ * Also delete the current form
409	212	*
410		- * @since 6.8
411		- *
412		- * @param int $form_id
413		- *
414		- * @return void
	213	+ * @since 2.0
	214	+ * @deprecated 3.06
415	215	*/
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' );
	216	+ public static function _create_from_template() {
	217	+ _deprecated_function( __FUNCTION__, '3.06' );
418	218
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		- }
	219	+ FrmAppHelper::permission_check( 'frm_edit_forms' );
	220	+ check_ajax_referer( 'frm_ajax', 'nonce' );
423	221
424		- $draft_field_ids = array_filter( explode( ',', $draft_field_ids_csv ), 'is_numeric' );
	222	+ $current_form = FrmAppHelper::get_param( 'this_form', '', 'get', 'absint' );
	223	+ $template_id = FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
425	224
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;
	225	+ if ( $current_form ) {
	226	+ FrmForm::destroy( $current_form );
429	227	}
430	228
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		- }
	229	+ echo esc_url_raw( admin_url( 'admin.php?page=formidable&frm_action=duplicate&id=' . absint( $template_id ) ) );
	230	+ wp_die();
437	231	}
438	232
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	233	public static function duplicate() {
455	234	FrmAppHelper::permission_check( 'frm_edit_forms' );
456	235	$nonce = FrmAppHelper::simple_get( '_wpnonce' );
457	236
		@@ -465,11 +244,10 @@
465	244	$url = admin_url( 'admin.php?page=formidable' );
466	245	$message = 'form_duplicate_error';
467	246
468	247	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';
	248	+ $url = admin_url( 'admin.php?page=formidable&frm_action=edit&id=' . absint( $form ) );
	249	+ $message = 'form_duplicated';
472	250	}
473	251
474	252	$url .= '&message=' . $message;
475	253
		@@ -477,45 +255,27 @@
477	255	exit();
478	256	}
479	257
480	258	/**
481		- * @return string|null
	259	+ * @return string
482	260	*/
483	261	public static function page_preview() {
484	262	$params = FrmForm::list_page_params();
485		-
486		- if ( ! $params['form'] || is_numeric( $params['form'] ) ) {
487		- return null;
	263	+ if ( ! $params['form'] ) {
	264	+ return;
488	265	}
489	266
490		- self::maybe_block_preview( $params['form'] );
491		-
492	267	$form = FrmForm::getOne( $params['form'] );
493		-
494		- if ( ! $form ) {
495		- return null;
	268	+ if ( $form ) {
	269	+ return self::show_form( $form->id, '', 'auto', 'auto' );
496	270	}
497		-
498		- return self::show_form( $form->id, '', 'auto', 'auto' );
499	271	}
500	272
501	273	/**
502	274	* @since 3.0
503		- *
504		- * @return void
505	275	*/
506	276	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
	277	+ echo self::page_preview(); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
518	278	}
519	279
520	280	/**
521	281	* @return void
		@@ -526,19 +286,9 @@
526	286
527	287	global $frm_vars;
528	288	$frm_vars['preview'] = true;
529	289
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	290	$include_theme = FrmAppHelper::get_param( 'theme', '', 'get', 'absint' );
540		-
541	291	if ( $include_theme ) {
542	292	self::set_preview_query();
543	293	self::load_theme_preview();
544	294	} else {
		@@ -561,9 +311,8 @@
561	311	'post_type' => 'page',
562	312	);
563	313
564	314	$page_for_posts = get_option( 'page_for_posts' );
565		-
566	315	if ( is_numeric( $page_for_posts ) ) {
567	316	// Avoid querying for the "Posts Page" or "Blog Page" so we don't display 10 forms.
568	317	$page_query['post__not_in'] = array( $page_for_posts );
569	318	}
		@@ -568,20 +317,13 @@
568	317	$page_query['post__not_in'] = array( $page_for_posts );
569	318	}
570	319
571	320	$random_page = get_posts( $page_query );
572		-
573	321	if ( ! $random_page ) {
574	322	return;
575	323	}
576	324
577	325	$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	326	query_posts(
585	327	array(
586	328	'post_type' => 'page',
587	329	'page_id' => $random_page->ID,
		@@ -597,10 +339,9 @@
597	339	* Set the WP $post global object. Used for in-theme preview when defining a page.
598	340	*
599	341	* @since 5.5.2
600	342	*
601		- * @param WP_Post $page The page object.
602		- *
	343	+ * @param WP_Post $post
603	344	* @return void
604	345	*/
605	346	private static function set_post_global( $page ) {
606	347	global $post;
		@@ -608,10 +349,8 @@
608	349	}
609	350
610	351	/**
611	352	* @since 3.0
612		- *
613		- * @return void
614	353	*/
615	354	private static function load_theme_preview() {
616	355	add_filter( 'wp_title', 'FrmFormsController::preview_title', 9999 );
617	356	add_filter( 'the_title', 'FrmFormsController::preview_page_title', 9999 );
		@@ -619,144 +358,61 @@
619	358	add_action( 'loop_no_results', 'FrmFormsController::show_page_preview' );
620	359	add_filter( 'is_active_sidebar', '__return_false' );
621	360	FrmStylesController::enqueue_css( 'enqueue', true );
622	361
623		- if ( false !== get_template_part( 'page' ) ) {
624		- return;
	362	+ if ( false === get_template_part( 'page' ) ) {
	363	+ self::fallback_when_page_template_part_is_not_supported_by_theme();
625	364	}
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	365	}
632	366
633	367	/**
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	368	* Not every theme supports get_template_part( 'page' ).
649	369	* When this is not supported, false is returned, and we can handle a fallback.
650		- *
651		- * @return void
652	370	*/
653	371	private static function fallback_when_page_template_part_is_not_supported_by_theme() {
654		- if ( ! have_posts() ) {
655		- return;
	372	+ if ( have_posts() ) {
	373	+ the_post();
	374	+ get_header( '' );
	375	+ // add some generic class names to the container to add some natural padding to the content.
	376	+ // .entry-content catches the WordPress TwentyTwenty theme.
	377	+ // .container catches Customizr content.
	378	+ echo '<div class="container entry-content">';
	379	+ the_content();
	380	+ echo '</div>';
	381	+ get_footer();
656	382	}
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	383	}
674	384
675	385	/**
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.
	386	+ * Set the page title for the theme preview page
678	387	*
679		- * @since 6.7.1
680		- *
681		- * @param string $template
682		- *
683		- * @return void
	388	+ * @since 3.0
684	389	*/
685		- private static function get_template( $template ) {
686		- if ( self::should_try_getting_template( $template ) ) {
687		- call_user_func( 'get_' . $template );
688		- return;
	390	+ public static function preview_page_title( $title ) {
	391	+ if ( in_the_loop() ) {
	392	+ $title = self::preview_title( $title );
689	393	}
690	394
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		- }
	395	+ return $title;
699	396	}
700	397
701	398	/**
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	399	* Set the page title for the theme preview page
721	400	*
722	401	* @since 3.0
723		- *
724		- * @param string $title
725		- *
726		- * @return string
727	402	*/
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	403	public static function preview_title( $title ) {
742	404	return __( 'Form Preview', 'formidable' );
743	405	}
744	406
745	407	/**
746		- * Set the page content for the theme preview page.
	408	+ * Set the page content for the theme preview page
747	409	*
748	410	* @since 3.0
749		- *
750		- * @param string $content
751		- *
752		- * @return string
753	411	*/
754	412	public static function preview_content( $content ) {
755	413	if ( in_the_loop() ) {
756		- self::show_page_preview();
757		- // Clear the content for the page we're using.
758		- $content = '';
	414	+ $content = self::show_page_preview();
759	415	}
760	416
761	417	return $content;
762	418	}
		@@ -764,113 +420,36 @@
764	420	/**
765	421	* @since 3.0
766	422	*/
767	423	private static function load_direct_preview() {
	424	+ header( 'Content-Type: text/html; charset=' . get_option( 'blog_charset' ) );
	425	+
768	426	$key = FrmAppHelper::simple_get( 'form', 'sanitize_title' );
769		-
770		- // phpcs:ignore Universal.Operators.StrictComparisons
771	427	if ( $key == '' ) {
772	428	$key = FrmAppHelper::get_post_param( 'form', '', 'sanitize_title' );
773	429	}
774	430
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	431	$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		- );
	432	+ if ( empty( $form ) ) {
	433	+ $form = FrmForm::getAll( array(), '', 1 );
795	434	}
796	435
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';
	436	+ require( FrmAppHelper::plugin_path() . '/classes/views/frm-entries/direct.php' );
802	437	}
803	438
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	439	public static function untrash() {
853	440	self::change_form_status( 'untrash' );
854	441	}
855	442
856		- /**
857		- * @param array $ids
858		- *
859		- * @return string
860		- */
861	443	public static function bulk_untrash( $ids ) {
862	444	FrmAppHelper::permission_check( 'frm_edit_forms' );
863	445
864	446	$count = FrmForm::set_status( $ids, 'published' );
865	447
866		- if ( ! $count ) {
867		- // Don't show "0 forms restored" on refresh.
868		- return '';
869		- }
	448	+ /* translators: %1$s: Number of forms */
	449	+ $message = sprintf( _n( '%1$s form restored from the Trash.', '%1$s forms restored from the Trash.', $count, 'formidable' ), 1 );
870	450
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 );
	451	+ return $message;
873	452	}
874	453
875	454	/**
876	455	* @since 3.06
		@@ -911,15 +490,14 @@
911	490	FrmAppHelper::permission_check( $available_status[ $status ]['permission'] );
912	491
913	492	$params = FrmForm::list_page_params();
914	493
915		- // Check nonce url.
	494	+ //check nonce url
916	495	check_admin_referer( $status . '_form_' . $params['id'] );
917	496
918	497	$count = 0;
919		-
920	498	if ( FrmForm::set_status( $params['id'], $available_status[ $status ]['new_status'] ) ) {
921		- ++$count;
	499	+ $count ++;
922	500	}
923	501
924	502	$form_type = FrmAppHelper::get_simple_request(
925	503	array(
		@@ -931,9 +509,9 @@
931	509	/* translators: %1$s: Number of forms */
932	510	$available_status['untrash']['message'] = sprintf( _n( '%1$s form restored from the Trash.', '%1$s forms restored from the Trash.', $count, 'formidable' ), $count );
933	511
934	512	/* 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
	513	+ $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	514
937	515	$message = $available_status[ $status ]['message'];
938	516
939	517	self::display_forms_list( $params, $message );
		@@ -938,28 +516,18 @@
938	516
939	517	self::display_forms_list( $params, $message );
940	518	}
941	519
942		- /**
943		- * @param array $ids
944		- *
945		- * @return string
946		- */
947	520	public static function bulk_trash( $ids ) {
948	521	FrmAppHelper::permission_check( 'frm_delete_forms' );
949	522
950	523	$count = 0;
951		-
952	524	foreach ( $ids as $id ) {
953	525	if ( FrmForm::trash( $id ) ) {
954		- ++$count;
	526	+ $count ++;
955	527	}
956	528	}
957	529
958		- if ( ! $count ) {
959		- return '';
960		- }
961		-
962	530	$current_page = FrmAppHelper::get_simple_request(
963	531	array(
964	532	'param' => 'form_type',
965	533	'type' => 'request',
		@@ -964,16 +532,17 @@
964	532	'param' => 'form_type',
965	533	'type' => 'request',
966	534	)
967	535	);
968		-
969		- return sprintf(
	536	+ $message = sprintf(
970	537	/* translators: %1$s: Number of forms, %2$s: Start link HTML, %3$s: End link HTML */
971	538	_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	539	$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
	540	+ '<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	541	'</a>'
975	542	);
	543	+
	544	+ return $message;
976	545	}
977	546
978	547	public static function destroy() {
979	548	FrmAppHelper::permission_check( 'frm_delete_forms' );
		@@ -983,11 +552,10 @@
983	552	// Check nonce url.
984	553	check_admin_referer( 'destroy_form_' . $params['id'] );
985	554
986	555	$count = 0;
987		-
988	556	if ( FrmForm::destroy( $params['id'] ) ) {
989		- ++$count;
	557	+ $count ++;
990	558	}
991	559
992	560	/* translators: %1$s: Number of forms */
993	561	$message = sprintf( _n( '%1$s Form Permanently Deleted', '%1$s Forms Permanently Deleted', $count, 'formidable' ), $count );
		@@ -994,52 +562,40 @@
994	562
995	563	self::display_forms_list( $params, $message );
996	564	}
997	565
998		- /**
999		- * @param array $ids
1000		- *
1001		- * @return string
1002		- */
1003	566	public static function bulk_destroy( $ids ) {
1004	567	FrmAppHelper::permission_check( 'frm_delete_forms' );
1005	568
1006	569	$count = 0;
1007		-
1008	570	foreach ( $ids as $id ) {
1009	571	$d = FrmForm::destroy( $id );
1010		-
1011	572	if ( $d ) {
1012		- ++$count;
	573	+ $count ++;
1013	574	}
1014	575	}
1015	576
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		- }
	577	+ /* translators: %1$s: Number of forms */
	578	+ $message = sprintf( _n( '%1$s form permanently deleted.', '%1$s forms permanently deleted.', $count, 'formidable' ), $count );
1020	579
1021		- return '';
	580	+ return $message;
1022	581	}
1023	582
1024		- /**
1025		- * @since 6.7.1 Function went from private to public.
1026		- */
1027		- public static function delete_all() {
	583	+ private static function delete_all() {
1028	584	// Check nonce url.
1029	585	$permission_error = FrmAppHelper::permission_nonce_error( 'frm_delete_forms', '_wpnonce', 'bulk-toplevel_page_formidable' );
1030		-
1031	586	if ( $permission_error !== false ) {
1032	587	self::display_forms_list( array(), '', array( $permission_error ) );
	588	+
1033	589	return;
1034	590	}
1035	591
1036		- $count = FrmForm::scheduled_delete( time() );
1037		- $url = remove_query_arg( array( 'delete_all' ) );
1038		- $url .= '&message=forms_permanently_deleted&forms_deleted=' . $count;
	592	+ $count = FrmForm::scheduled_delete( time() );
1039	593
1040		- wp_safe_redirect( $url );
1041		- die();
	594	+ /* translators: %1$s: Number of forms */
	595	+ $message = sprintf( _n( '%1$s form permanently deleted.', '%1$s forms permanently deleted.', $count, 'formidable' ), $count );
	596	+
	597	+ self::display_forms_list( array(), $message );
1042	598	}
1043	599
1044	600	/**
1045	601	* Create a new form from the modal.
		@@ -1046,8 +602,10 @@
1046	602	*
1047	603	* @since 4.0
1048	604	*/
1049	605	public static function build_new_form() {
	606	+ global $wpdb;
	607	+
1050	608	FrmAppHelper::permission_check( 'frm_edit_forms' );
1051	609	check_ajax_referer( 'frm_ajax', 'nonce' );
1052	610
1053	611	$new_values = self::get_modal_values();
		@@ -1052,10 +610,9 @@
1052	610
1053	611	$new_values = self::get_modal_values();
1054	612	$new_values['form_key'] = $new_values['name'];
1055	613	$new_values['options'] = array(
1056		- 'antispam' => 1,
1057		- 'on_submit_migrated' => 1,
	614	+ 'antispam' => 1,
1058	615	);
1059	616
1060	617	/**
1061	618	* Allows changing form values before creating from the modal.
		@@ -1073,14 +630,12 @@
1073	630	* @param int $form_id
1074	631	*/
1075	632	do_action( 'frm_build_new_form', $form_id );
1076	633
1077		- self::create_submit_button_field( $form_id );
1078		- self::create_default_on_submit_action( $form_id );
1079	634	self::create_default_email_action( $form_id );
1080	635
1081	636	$response = array(
1082		- 'redirect' => FrmForm::get_edit_link( $form_id ) . '&new_template=true',
	637	+ 'redirect' => FrmForm::get_edit_link( $form_id ),
1083	638	);
1084	639
1085	640	echo wp_json_encode( $response );
1086	641	wp_die();
		@@ -1086,15 +641,46 @@
1086	641	wp_die();
1087	642	}
1088	643
1089	644	/**
	645	+ * Create a custom template from a form
	646	+ *
	647	+ * @since 3.06
	648	+ */
	649	+ public static function build_template() {
	650	+ global $wpdb;
	651	+
	652	+ FrmAppHelper::permission_check( 'frm_edit_forms' );
	653	+ check_ajax_referer( 'frm_ajax', 'nonce' );
	654	+
	655	+ $form_id = FrmAppHelper::get_param( 'xml', '', 'post', 'absint' );
	656	+ $new_form_id = FrmForm::duplicate( $form_id, 1, true );
	657	+ if ( ! $new_form_id ) {
	658	+ $response = array(
	659	+ 'message' => __( 'There was an error creating a template.', 'formidable' ),
	660	+ );
	661	+ } else {
	662	+ $new_values = self::get_modal_values();
	663	+ $query_results = $wpdb->update( $wpdb->prefix . 'frm_forms', $new_values, array( 'id' => $new_form_id ) );
	664	+ if ( $query_results ) {
	665	+ FrmForm::clear_form_cache();
	666	+ }
	667	+
	668	+ $response = array(
	669	+ 'redirect' => admin_url( 'admin.php?page=formidable&frm_action=duplicate&id=' . $new_form_id ) . '&_wpnonce=' . wp_create_nonce(),
	670	+ );
	671	+ }
	672	+
	673	+ echo wp_json_encode( $response );
	674	+ wp_die();
	675	+ }
	676	+
	677	+ /**
1090	678	* Before creating a new form, get the name and description from the modal.
1091	679	*
1092	680	* @since 4.0
1093		- *
1094		- * @return array<string,string>
1095	681	*/
1096		- public static function get_modal_values() {
	682	+ private static function get_modal_values() {
1097	683	$name = FrmAppHelper::get_param( 'name', '', 'post', 'sanitize_text_field' );
1098	684	$desc = FrmAppHelper::get_param( 'desc', '', 'post', 'sanitize_textarea_field' );
1099	685
1100	686	return array(
		@@ -1107,26 +693,18 @@
1107	693	* Inserts Formidable button
1108	694	* Hook exists since 2.5.0
1109	695	*
1110	696	* @since 2.0.15
1111		- *
1112		- * @return void
1113	697	*/
1114	698	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 ) ) {
	699	+ if ( current_user_can( 'frm_view_forms' ) ) {
1124	700	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
	701	+ $menu_name = FrmAppHelper::get_menu_name();
	702	+ $icon = apply_filters( 'frm_media_icon', FrmAppHelper::svg_logo() );
	703	+ 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' ) . '">' .
	704	+ FrmAppHelper::kses( $icon, 'all' ) . // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
	705	+ ' ' . esc_html( $menu_name ) . '</a>';
1127	706	}
1128		- echo self::$formidable_tinymce_button; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
1129	707	}
1130	708
1131	709	/**
1132	710	* @return void
		@@ -1147,21 +725,17 @@
1147	725	$shortcodes = apply_filters( 'frm_popup_shortcodes', $shortcodes );
1148	726
1149	727	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/insert_form_popup.php';
1150	728
1151		- if ( ! FrmAppHelper::is_form_builder_page() || class_exists( '_WP_Editors', false ) ) {
1152		- return;
	729	+ if ( FrmAppHelper::is_form_builder_page() && ! class_exists( '_WP_Editors', false ) ) {
	730	+ // initialize a wysiwyg so we have usable settings defined in tinyMCEPreInit.mceInit
	731	+ require ABSPATH . WPINC . '/class-wp-editor.php';
	732	+ ?>
	733	+ <div class="frm_hidden">
	734	+ <?php wp_editor( '', 'frm_description_placeholder', array() ); ?>
	735	+ </div>
	736	+ <?php
1153	737	}
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	738	}
1165	739
1166	740	/**
1167	741	* Check the page being loaded, determine if this is a page that should include the form popup.
		@@ -1173,9 +747,8 @@
1173	747	private static function should_insert_form_popup() {
1174	748	if ( FrmAppHelper::is_form_builder_page() ) {
1175	749	return true;
1176	750	}
1177		-
1178	751	$page = basename( FrmAppHelper::get_server_value( 'PHP_SELF' ) );
1179	752	return in_array( $page, array( 'post.php', 'page.php', 'page-new.php', 'post-new.php' ), true );
1180	753	}
1181	754
		@@ -1183,10 +756,9 @@
1183	756	FrmAppHelper::permission_check( 'frm_view_forms' );
1184	757	check_ajax_referer( 'frm_ajax', 'nonce' );
1185	758
1186	759	$shortcode = FrmAppHelper::get_post_param( 'shortcode', '', 'sanitize_text_field' );
1187		-
1188		- if ( ! $shortcode ) {
	760	+ if ( empty( $shortcode ) ) {
1189	761	wp_die();
1190	762	}
1191	763
1192	764	echo '<div id="sc-opts-' . esc_attr( $shortcode ) . '" class="frm_shortcode_option">';
		@@ -1211,18 +783,17 @@
1211	783	'label' => __( 'Minimize form HTML', 'formidable' ),
1212	784	),
1213	785	);
1214	786	}
1215		-
1216	787	$opts = apply_filters( 'frm_sc_popup_opts', $opts, $shortcode );
1217	788
1218	789	if ( isset( $opts['form_id'] ) && is_string( $opts['form_id'] ) ) {
1219		- // Allow other shortcodes to use the required form id option
	790	+ // allow other shortcodes to use the required form id option
1220	791	$form_id = $opts['form_id'];
1221	792	unset( $opts['form_id'] );
1222	793	}
1223	794
1224		- include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/shortcode_opts.php';
	795	+ include( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/shortcode_opts.php' );
1225	796
1226	797	echo '</div>';
1227	798
1228	799	wp_die();
		@@ -1233,9 +804,8 @@
1233	804	*
1234	805	* @param array $params
1235	806	* @param string $message
1236	807	* @param array $errors
1237		- *
1238	808	* @return void
1239	809	*/
1240	810	public static function display_forms_list( $params = array(), $message = '', $errors = array() ) {
1241	811	FrmAppHelper::permission_check( 'frm_view_forms' );
		@@ -1252,56 +822,51 @@
1252	822	* @param string $table_class Class name for List Helper.
1253	823	*/
1254	824	$table_class = apply_filters( 'frm_forms_list_class', 'FrmFormsListHelper' );
1255	825	$wp_list_table = new $table_class( compact( 'params' ) );
1256		- $pagenum = $wp_list_table->get_pagenum();
1257	826
	827	+ $pagenum = $wp_list_table->get_pagenum();
	828	+
1258	829	$wp_list_table->prepare_items();
1259	830
1260	831	$total_pages = $wp_list_table->get_pagination_arg( 'total_pages' );
1261		-
1262	832	if ( $pagenum > $total_pages && $total_pages > 0 ) {
1263		- wp_safe_redirect( esc_url_raw( add_query_arg( 'paged', $total_pages ) ) );
	833	+ wp_redirect( esc_url_raw( add_query_arg( 'paged', $total_pages ) ) );
1264	834	die();
1265	835	}
1266	836
1267		- $error = FrmInbox::check_for_error();
1268		-
1269		- if ( $error ) {
1270		- $show_messages = array( $error['subject'] . '. ' . $error['message'] );
1271		- }
1272		-
1273	837	require FrmAppHelper::plugin_path() . '/classes/views/frm-forms/list.php';
1274	838	}
1275	839
1276	840	/**
1277	841	* @param array<string,string> $columns
1278		- *
1279	842	* @return array<string,string>
1280	843	*/
1281	844	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' );
	845	+ $columns['cb'] = '<input type="checkbox" />';
	846	+ $columns['id'] = 'ID';
1288	847
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' );
	848	+ $type = FrmAppHelper::get_simple_request(
	849	+ array(
	850	+ 'param' => 'form_type',
	851	+ 'type' => 'request',
	852	+ 'default' => 'published',
	853	+ )
	854	+ );
	855	+
	856	+ if ( 'template' === $type ) {
	857	+ $columns['name'] = __( 'Template Name', 'formidable' );
	858	+ $columns['type'] = __( 'Type', 'formidable' );
	859	+ $columns['form_key'] = __( 'Key', 'formidable' );
	860	+ } else {
	861	+ $columns['name'] = __( 'Form Title', 'formidable' );
	862	+ $columns['entries'] = __( 'Entries', 'formidable' );
	863	+ $columns['form_key'] = __( 'Key', 'formidable' );
	864	+ $columns['shortcode'] = __( 'Actions', 'formidable' );
1292	865	}
1293	866
1294		- $columns['created_at'] = esc_html__( 'Date', 'formidable' );
	867	+ $columns['created_at'] = __( 'Date', 'formidable' );
1295	868
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	869	add_screen_option(
1305	870	'per_page',
1306	871	array(
1307	872	'label' => __( 'Forms', 'formidable' ),
		@@ -1312,11 +877,8 @@
1312	877
1313	878	return $columns;
1314	879	}
1315	880
1316		- /**
1317		- * @return array<string,string>
1318		- */
1319	881	public static function get_sortable_columns() {
1320	882	return array(
1321	883	'id' => 'id',
1322	884	'name' => 'name',
		@@ -1327,9 +889,8 @@
1327	889	}
1328	890
1329	891	/**
1330	892	* @param mixed $hidden_columns
1331		- *
1332	893	* @return array
1333	894	*/
1334	895	public static function hidden_columns( $hidden_columns ) {
1335	896	if ( ! is_array( $hidden_columns ) ) {
		@@ -1350,79 +911,167 @@
1350	911
1351	912	return $hidden_columns;
1352	913	}
1353	914
	915	+ public static function save_per_page( $save, $option, $value ) {
	916	+ if ( $option == 'formidable_page_formidable_per_page' ) {
	917	+ $save = (int) $value;
	918	+ }
	919	+
	920	+ return $save;
	921	+ }
	922	+
1354	923	/**
1355		- * @param mixed $save
1356		- * @param string $option
1357		- * @param int|string $value
	924	+ * @return bool
	925	+ */
	926	+ public static function expired() {
	927	+ global $frm_expired;
	928	+ return $frm_expired;
	929	+ }
	930	+
	931	+ /**
	932	+ * Get data from api before rendering it so that we can flag the modal as expired
1358	933	*
1359		- * @return mixed
	934	+ * @return void
1360	935	*/
1361		- public static function save_per_page( $save, $option, $value ) {
1362		- if ( $option === 'formidable_page_formidable_per_page' ) {
1363		- return (int) $value;
	936	+ public static function before_list_templates() {
	937	+ global $frm_templates;
	938	+ global $frm_expired;
	939	+ global $frm_license_type;
	940	+
	941	+ $api = new FrmFormTemplateApi();
	942	+ $frm_templates = $api->get_api_info();
	943	+ $expired = false;
	944	+ $license_type = '';
	945	+ if ( isset( $frm_templates['error'] ) ) {
	946	+ $error = $frm_templates['error']['message'];
	947	+ $error = str_replace( 'utm_medium=addons', 'utm_medium=form-templates', $error );
	948	+ $expired = 'expired' === $frm_templates['error']['code'];
	949	+ $license_type = isset( $frm_templates['error']['type'] ) ? $frm_templates['error']['type'] : '';
	950	+ unset( $frm_templates['error'] );
1364	951	}
1365	952
1366		- return $save;
	953	+ $frm_expired = $expired;
	954	+ $frm_license_type = $license_type;
1367	955	}
1368	956
1369	957	/**
1370		- * @param int|string $id
1371		- * @param array $errors
1372		- * @param string $message
1373		- * @param bool $create_link
1374		- *
1375	958	* @return void
1376	959	*/
1377		- private static function get_edit_vars( $id, $errors = array(), $message = '', $create_link = false ) {
1378		- global $frm_vars;
	960	+ public static function list_templates() {
	961	+ global $frm_templates;
	962	+ global $frm_license_type;
1379	963
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		- ),
	964	+ $templates = $frm_templates;
	965	+ $custom_templates = array();
	966	+ $templates_by_category = array();
	967	+
	968	+ self::add_user_templates( $custom_templates );
	969	+
	970	+ foreach ( $templates as $template ) {
	971	+ if ( ! isset( $template['categories'] ) ) {
	972	+ continue;
	973	+ }
	974	+
	975	+ foreach ( $template['categories'] as $category ) {
	976	+ if ( ! isset( $templates_by_category[ $category ] ) ) {
	977	+ $templates_by_category[ $category ] = array();
	978	+ }
	979	+
	980	+ $templates_by_category[ $category ][] = $template;
	981	+ }
	982	+ }
	983	+ unset( $template );
	984	+
	985	+ // Subcategories that are included elsewhere.
	986	+ $redundant_cats = array( 'PayPal', 'Stripe', 'Twilio' );
	987	+
	988	+ $categories = array_keys( $templates_by_category );
	989	+ $categories = array_diff( $categories, FrmFormsHelper::ignore_template_categories() );
	990	+ $categories = array_diff( $categories, $redundant_cats );
	991	+ sort( $categories );
	992	+
	993	+ array_walk(
	994	+ $custom_templates,
	995	+ function( &$template ) {
	996	+ $template['custom'] = true;
	997	+ }
1390	998	);
1391	999
1392		- if ( ! $form ) {
1393		- FrmAppController::show_error_modal( $error_args );
1394		- return;
	1000	+ $my_templates_translation = __( 'My Templates', 'formidable' );
	1001	+ $categories = array_merge( array( $my_templates_translation ), $categories );
	1002	+ $pricing = FrmAppHelper::admin_upgrade_link( 'form-templates' );
	1003	+ $license_type = $frm_license_type;
	1004	+ $args = compact( 'pricing', 'license_type' );
	1005	+ $where = apply_filters( 'frm_forms_dropdown', array(), '' );
	1006	+ $forms = FrmForm::get_published_forms( $where );
	1007	+ $view_path = FrmAppHelper::plugin_path() . '/classes/views/frm-forms/';
	1008	+
	1009	+ $templates_by_category[ $my_templates_translation ] = $custom_templates;
	1010	+
	1011	+ unset( $pricing, $license_type, $where );
	1012	+ wp_enqueue_script( 'accordion' ); // register accordion for template groups
	1013	+ require $view_path . 'list-templates.php';
	1014	+ }
	1015	+
	1016	+ /**
	1017	+ * @since 4.03.01
	1018	+ */
	1019	+ private static function get_template_categories( $templates ) {
	1020	+ $categories = array();
	1021	+ foreach ( $templates as $template ) {
	1022	+ if ( isset( $template['categories'] ) ) {
	1023	+ $categories = array_merge( $categories, $template['categories'] );
	1024	+ }
1395	1025	}
	1026	+ $exclude_cats = FrmFormsHelper::ignore_template_categories();
	1027	+ $categories = array_unique( $categories );
	1028	+ $categories = array_diff( $categories, $exclude_cats );
	1029	+ sort( $categories );
	1030	+ return $categories;
	1031	+ }
1396	1032
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		- )
	1033	+ private static function add_user_templates( &$templates ) {
	1034	+ $user_templates = array(
	1035	+ 'is_template' => 1,
	1036	+ 'default_template' => 0,
	1037	+ );
	1038	+ $user_templates = FrmForm::getAll( $user_templates, 'name' );
	1039	+ foreach ( $user_templates as $template ) {
	1040	+ $template = array(
	1041	+ 'id' => $template->id,
	1042	+ 'name' => $template->name,
	1043	+ 'key' => $template->form_key,
	1044	+ 'description' => $template->description,
	1045	+ 'url' => wp_nonce_url( admin_url( 'admin.php?page=formidable&frm_action=duplicate&id=' . absint( $template->id ) ) ),
	1046	+ 'released' => $template->created_at,
	1047	+ 'installed' => 1,
1407	1048	);
1408		- $error_args['continue_text'] = __( 'Restore form', 'formidable' );
1409		- FrmAppController::show_error_modal( $error_args );
1410		- return;
	1049	+ array_unshift( $templates, $template );
	1050	+ unset( $template );
1411	1051	}
	1052	+ }
1412	1053
	1054	+ private static function get_edit_vars( $id, $errors = array(), $message = '', $create_link = false ) {
	1055	+ global $frm_vars;
	1056	+
	1057	+ $form = FrmForm::getOne( $id );
	1058	+ if ( ! $form ) {
	1059	+ wp_die( esc_html__( 'You are trying to edit a form that does not exist.', 'formidable' ) );
	1060	+ }
	1061	+
1413	1062	if ( $form->parent_form_id ) {
1414	1063	/* 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
	1064	+ 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	1065	}
1417	1066
1418	1067	$frm_field_selection = FrmField::field_selection();
1419		- $fields = FrmField::get_all_for_form( $form->id );
1420	1068
	1069	+ $fields = FrmField::get_all_for_form( $form->id );
	1070	+
1421	1071	// Automatically add end section fields if they don't exist (2.0 migration).
1422	1072	$reset_fields = false;
1423	1073	FrmFormsHelper::auto_add_end_section_fields( $form, $fields, $reset_fields );
1424		- FrmSubmitHelper::maybe_create_submit_field( $form, $fields, $reset_fields );
1425	1074
1426	1075	if ( $reset_fields ) {
1427	1076	$fields = FrmField::get_all_for_form( $form->id, '', 'exclude' );
1428	1077	}
		@@ -1442,30 +1091,25 @@
1442	1091	*/
1443	1092	$values['fields'] = apply_filters( 'frm_fields_in_form_builder', $fields, compact( 'form' ) );
1444	1093
1445	1094	$edit_message = __( 'Form was successfully updated.', 'formidable' );
1446		-
1447		- if ( $form->is_template && $message === $edit_message ) {
	1095	+ if ( $form->is_template && $message == $edit_message ) {
1448	1096	$message = __( 'Template was successfully updated.', 'formidable' );
1449	1097	}
1450	1098
1451	1099	self::maybe_update_form_builder_message( $message );
1452	1100
1453		- $has_fields = ! empty( $values['fields'] ) && ! FrmSubmitHelper::only_contains_submit_field( $values['fields'] );
	1101	+ $all_templates = FrmForm::getAll( array( 'is_template' => 1 ), 'name' );
	1102	+ $has_fields = isset( $values['fields'] ) && ! empty( $values['fields'] );
1454	1103
1455	1104	if ( defined( 'DOING_AJAX' ) ) {
1456	1105	wp_die();
	1106	+ } else {
	1107	+ require( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/edit.php' );
1457	1108	}
1458		-
1459		- require FrmAppHelper::plugin_path() . '/classes/views/frm-forms/edit.php';
1460	1109	}
1461	1110
1462		- /**
1463		- * @param array $fields
1464		- *
1465		- * @return array
1466		- */
1467		- public static function update_form_builder_fields( $fields ) {
	1111	+ public static function update_form_builder_fields( $fields, $form ) {
1468	1112	foreach ( $fields as $field ) {
1469	1113	$field->do_not_include_icons = true;
1470	1114	}
1471	1115	return $fields;
		@@ -1470,13 +1114,8 @@
1470	1114	}
1471	1115	return $fields;
1472	1116	}
1473	1117
1474		- /**
1475		- * @param string $message
1476		- *
1477		- * @return void
1478		- */
1479	1118	public static function maybe_update_form_builder_message( &$message ) {
1480	1119	if ( 'form_duplicated' === FrmAppHelper::simple_get( 'message' ) ) {
1481	1120	$message = __( 'Form was Successfully Copied', 'formidable' );
1482	1121	}
		@@ -1481,22 +1120,13 @@
1481	1120	$message = __( 'Form was Successfully Copied', 'formidable' );
1482	1121	}
1483	1122	}
1484	1123
1485		- /**
1486		- * @param int|string $id
1487		- * @param array $errors
1488		- * @param array|string $args
1489		- *
1490		- * @return void
1491		- */
1492	1124	public static function get_settings_vars( $id, $errors = array(), $args = array() ) {
1493	1125	FrmAppHelper::permission_check( 'frm_edit_forms' );
1494	1126
1495	1127	global $frm_vars;
1496	1128
1497		- self::maybe_print_media_templates();
1498		-
1499	1129	if ( ! is_array( $args ) ) {
1500	1130	// For reverse compatibility.
1501	1131	$args = array(
1502	1132	'message' => $args,
		@@ -1509,12 +1139,13 @@
1509	1139	);
1510	1140	$args = array_merge( $defaults, $args );
1511	1141	$message = $args['message'];
1512	1142	$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	1143
	1144	+ $form = FrmForm::getOne( $id );
	1145	+ $fields = FrmField::get_all_for_form( $id );
	1146	+ $values = FrmAppHelper::setup_edit_vars( $form, 'forms', $fields, true );
	1147	+
1517	1148	/**
1518	1149	* Allows changing fields in the form settings.
1519	1150	*
1520	1151	* @since 5.0.04
		@@ -1528,42 +1159,17 @@
1528	1159
1529	1160	$sections = self::get_settings_tabs( $values );
1530	1161	$current = FrmAppHelper::simple_get( 't', 'sanitize_title', 'advanced_settings' );
1531	1162
1532		- require FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings.php';
	1163	+ require( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings.php' );
1533	1164	}
1534	1165
1535	1166	/**
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	1167	* @since 4.0
1558		- *
1559		- * @param array $atts
1560		- *
1561		- * @return void
1562	1168	*/
1563	1169	public static function form_publish_button( $atts ) {
1564	1170	$values = $atts['values'];
1565		- include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/_publish_box.php';
	1171	+ include( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/_publish_box.php' );
1566	1172	}
1567	1173
1568	1174	/**
1569	1175	* Get a list of all the settings tabs for the form settings page.
		@@ -1570,9 +1176,8 @@
1570	1176	*
1571	1177	* @since 4.0
1572	1178	*
1573	1179	* @param array $values
1574		- *
1575	1180	* @return array
1576	1181	*/
1577	1182	private static function get_settings_tabs( $values ) {
1578	1183	$sections = array(
		@@ -1578,25 +1183,20 @@
1578	1183	$sections = array(
1579	1184	'advanced' => array(
1580	1185	'name' => __( 'General', 'formidable' ),
1581	1186	'title' => __( 'General Form Settings', 'formidable' ),
1582		- 'function' => array( self::class, 'advanced_settings' ),
1583		- 'icon' => 'frmfont frm_small_settings_icon',
	1187	+ 'function' => array( __CLASS__, 'advanced_settings' ),
	1188	+ 'icon' => 'frm_icon_font frm_settings_icon',
1584	1189	),
1585	1190	'email' => array(
1586	1191	'name' => __( 'Actions & Notifications', 'formidable' ),
1587	1192	'function' => array( 'FrmFormActionsController', 'email_settings' ),
1588	1193	'id' => 'frm_notification_settings',
1589		- 'icon' => 'frmfont frm_notification_check_icon',
	1194	+ 'icon' => 'frm_icon_font frm_mail_bulk_icon',
1590	1195	),
1591		- 'spam' => array(
1592		- 'name' => __( 'Spam', 'formidable' ),
1593		- 'function' => array( self::class, 'spam_settings' ),
1594		- 'icon' => 'frmfont frm_shield_check2_icon',
1595		- ),
1596	1196	'permissions' => array(
1597	1197	'name' => __( 'Form Permissions', 'formidable' ),
1598		- 'icon' => 'frmfont frm_lock_closed2_icon',
	1198	+ 'icon' => 'frm_icon_font frm_lock_icon',
1599	1199	'html_class' => 'frm_show_upgrade_tab frm_noallow',
1600	1200	'data' => array(
1601	1201	'medium' => 'permissions',
1602	1202	'upgrade' => __( 'Form Permissions', 'formidable' ),
		@@ -1601,37 +1201,35 @@
1601	1201	'medium' => 'permissions',
1602	1202	'upgrade' => __( 'Form Permissions', 'formidable' ),
1603	1203	'message' => __( 'Allow editing, protect forms and files, limit entries, and save drafts. Upgrade to get form and entry permissions.', 'formidable' ),
1604	1204	'screenshot' => 'permissions.png',
1605		- 'learn-more' => FrmAppHelper::get_doc_url( 'general-form-settings/#kb-form-permissions', 'form-permissions-settings' ),
1606	1205	),
1607	1206	),
1608		- 'scheduling' => array(
	1207	+ 'scheduling' => array(
1609	1208	'name' => __( 'Form Scheduling', 'formidable' ),
1610		- 'icon' => 'frmfont frm_schedule_icon',
	1209	+ 'icon' => 'frm_icon_font frm_calendar_icon',
1611	1210	'html_class' => 'frm_show_upgrade_tab frm_noallow',
1612	1211	'data' => array(
1613	1212	'medium' => 'scheduling',
1614	1213	'upgrade' => __( 'Form scheduling settings', 'formidable' ),
1615	1214	'screenshot' => 'scheduling.png',
1616		- 'learn-more' => FrmAppHelper::get_doc_url( 'general-form-settings/#kb-form-scheduling', 'form-scheduling-settings' ),
1617	1215	),
1618	1216	),
1619	1217	'buttons' => array(
1620		- 'name' => __( 'Buttons', 'formidable' ),
1621		- 'class' => self::class,
	1218	+ 'name' => __( 'Styling & Buttons', 'formidable' ),
	1219	+ 'class' => __CLASS__,
1622	1220	'function' => 'buttons_settings',
1623		- 'icon' => 'frmfont frm-buttons-style',
	1221	+ 'icon' => 'frm_icon_font frm_pallet_icon',
1624	1222	),
1625	1223	'landing' => array(
1626	1224	'name' => __( 'Form Landing Page', 'formidable' ),
1627		- 'icon' => 'frmfont frm_cross_device_icon',
	1225	+ 'icon' => 'frm_icon_font frm_file_text_icon',
1628	1226	'html_class' => 'frm_show_upgrade_tab frm_noallow',
1629	1227	'data' => FrmAppHelper::get_landing_page_upgrade_data_params(),
1630	1228	),
1631	1229	'chat' => array(
1632	1230	'name' => __( 'Conversational Forms', 'formidable' ),
1633		- 'icon' => 'frmfont frm_chat_bubbles_icon',
	1231	+ 'icon' => 'frm_icon_font frm_chat_forms_icon',
1634	1232	'html_class' => 'frm_show_upgrade_tab frm_noallow',
1635	1233	'data' => FrmAppHelper::get_upgrade_data_params(
1636	1234	'chat',
1637	1235	array(
		@@ -1637,45 +1235,37 @@
1637	1235	array(
1638	1236	'upgrade' => __( 'Conversational Forms', 'formidable' ),
1639	1237	'message' => __( 'Ask one question at a time for automated conversations.', 'formidable' ),
1640	1238	'screenshot' => 'chat.png',
1641		- 'learn-more' => FrmAppHelper::get_doc_url( 'conversational-forms', 'conversational-forms-settings', false ),
1642	1239	)
1643	1240	),
1644	1241	),
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	1242	'html' => array(
1660	1243	'name' => __( 'Customize HTML', 'formidable' ),
1661		- 'class' => self::class,
	1244	+ 'class' => __CLASS__,
1662	1245	'function' => 'html_settings',
1663		- 'icon' => 'frmfont frm_code2_icon',
	1246	+ 'icon' => 'frm_icon_font frm_code_icon',
1664	1247	),
1665	1248	);
1666	1249
1667		- if ( ! has_action( 'frm_add_form_style_tab_options' ) && ! has_action( 'frm_add_form_button_options' ) ) {
1668		- unset( $sections['buttons'] );
	1250	+ foreach ( array( 'landing', 'chat' ) as $feature ) {
	1251	+ if ( ! FrmAppHelper::show_new_feature( $feature ) ) {
	1252	+ unset( $sections[ $feature ] );
	1253	+ }
1669	1254	}
1670	1255
1671	1256	$sections = apply_filters( 'frm_add_form_settings_section', $sections, $values );
1672	1257
	1258	+ if ( FrmAppHelper::pro_is_installed() && ! FrmAppHelper::meets_min_pro_version( '4.0' ) ) {
	1259	+ // Prevent settings from showing in 2 spots.
	1260	+ unset( $sections['permissions'], $sections['scheduling'] );
	1261	+ }
	1262	+
1673	1263	foreach ( $sections as $key => $section ) {
1674	1264	$defaults = array(
1675	1265	'html_class' => '',
1676	1266	'name' => ucfirst( $key ),
1677		- 'icon' => 'frmfont frm_settings_icon',
	1267	+ 'icon' => 'frm_icon_font frm_settings_icon',
1678	1268	);
1679	1269
1680	1270	$section = array_merge( $defaults, $section );
1681	1271
		@@ -1681,9 +1271,8 @@
1681	1271
1682	1272	if ( ! isset( $section['anchor'] ) ) {
1683	1273	$section['anchor'] = $key;
1684	1274	}
1685		-
1686	1275	$section['anchor'] .= '_settings';
1687	1276
1688	1277	if ( ! isset( $section['title'] ) ) {
1689	1278	$section['title'] = $section['name'];
		@@ -1693,9 +1282,9 @@
1693	1282	$section['id'] = $section['anchor'];
1694	1283	}
1695	1284
1696	1285	$sections[ $key ] = $section;
1697		- }//end foreach
	1286	+ }
1698	1287
1699	1288	return $sections;
1700	1289	}
1701	1290
		@@ -1702,25 +1291,24 @@
1702	1291	/**
1703	1292	* @since 4.0
1704	1293	*
1705	1294	* @param array $values
1706		- *
1707		- * @return void
1708	1295	*/
1709	1296	public static function advanced_settings( $values ) {
1710	1297	$first_h3 = 'frm_first_h3';
	1298	+
1711	1299	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings-advanced.php';
1712	1300	}
1713	1301
1714	1302	/**
1715		- * @since 6.33
1716		- *
1717	1303	* @param array $values
1718		- *
1719		- * @return void
1720	1304	*/
1721		- public static function spam_settings( $values ) {
1722		- include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/spam-settings.php';
	1305	+ private static function render_spam_settings( $values ) {
	1306	+ if ( function_exists( 'akismet_http_post' ) ) {
	1307	+ include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/spam-settings/akismet.php';
	1308	+ }
	1309	+ include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/spam-settings/honeypot.php';
	1310	+ include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/spam-settings/antispam.php';
1723	1311	}
1724	1312
1725	1313	/**
1726	1314	* @since 4.0
		@@ -1725,13 +1313,16 @@
1725	1313	/**
1726	1314	* @since 4.0
1727	1315	*
1728	1316	* @param array $values
1729		- *
1730		- * @return void
1731	1317	*/
1732	1318	public static function buttons_settings( $values ) {
1733		- include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings-buttons.php';
	1319	+ $styles = apply_filters( 'frm_get_style_opts', array() );
	1320	+
	1321	+ $frm_settings = FrmAppHelper::get_settings();
	1322	+ $no_global_style = $frm_settings->load_style === 'none';
	1323	+
	1324	+ include( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings-buttons.php' );
1734	1325	}
1735	1326
1736	1327	/**
1737	1328	* @since 4.0
		@@ -1736,13 +1327,11 @@
1736	1327	/**
1737	1328	* @since 4.0
1738	1329	*
1739	1330	* @param array $values
1740		- *
1741		- * @return void
1742	1331	*/
1743	1332	public static function html_settings( $values ) {
1744		- include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings-html.php';
	1333	+ include( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings-html.php' );
1745	1334	}
1746	1335
1747	1336	/**
1748	1337	* Replace old Submit Button href with new href to avoid errors in Chrome
		@@ -1748,11 +1337,9 @@
1748	1337	* Replace old Submit Button href with new href to avoid errors in Chrome
1749	1338	*
1750	1339	* @since 2.03.08
1751	1340	*
1752		- * @param array|bool $values
1753		- *
1754		- * @return void
	1341	+ * @param array|boolean $values
1755	1342	*/
1756	1343	private static function clean_submit_html( &$values ) {
1757	1344	if ( is_array( $values ) && isset( $values['submit_html'] ) ) {
1758	1345	$values['submit_html'] = str_replace( 'javascript:void(0)', '#', $values['submit_html'] );
		@@ -1773,18 +1360,9 @@
1773	1360
1774	1361	return $classes;
1775	1362	}
1776	1363
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' ) {
	1364	+ public static function mb_tags_box( $form_id, $class = '' ) {
1787	1365	$fields = FrmField::get_all_for_form( $form_id, '', 'include' );
1788	1366
1789	1367	/**
1790	1368	* Allows modifying the list of fields in the tags box.
		@@ -1793,30 +1371,23 @@
1793	1371	*
1794	1372	* @param array $fields The list of fields.
1795	1373	* @param array $args The arguments. Contains `form_id`.
1796	1374	*/
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' );
	1375	+ $fields = apply_filters( 'frm_fields_in_tags_box', $fields, compact( 'form_id' ) );
	1376	+ $linked_forms = array();
	1377	+ $col = 'one';
	1378	+ $settings_tab = FrmAppHelper::is_admin_page( 'formidable' ) ? true : false;
	1379	+
1801	1380	$cond_shortcodes = apply_filters( 'frm_conditional_shortcodes', array() );
1802		- $entry_shortcodes = self::get_shortcode_helpers( $settings_tab, $form_id );
	1381	+ $entry_shortcodes = self::get_shortcode_helpers( $settings_tab );
	1382	+
1803	1383	$advanced_helpers = self::advanced_helpers( compact( 'fields', 'form_id' ) );
1804	1384
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;
	1385	+ include( FrmAppHelper::plugin_path() . '/classes/views/shared/mb_adv_info.php' );
1811	1386	}
1812	1387
1813	1388	/**
1814	1389	* @since 3.04.01
1815		- *
1816		- * @param array $atts
1817		- *
1818		- * @return array
1819	1390	*/
1820	1391	private static function advanced_helpers( $atts ) {
1821	1392	$advanced_helpers = array(
1822	1393	'default' => array(
		@@ -1825,12 +1396,10 @@
1825	1396	),
1826	1397	);
1827	1398
1828	1399	$user_fields = self::user_shortcodes();
1829		-
1830		- if ( $user_fields ) {
	1400	+ if ( ! empty( $user_fields ) ) {
1831	1401	$user_helpers = array();
1832		-
1833	1402	foreach ( $user_fields as $uk => $uf ) {
1834	1403	$user_helpers[ '|user_id| show="' . $uk . '"' ] = $uf;
1835	1404	unset( $uk, $uf );
1836	1405	}
		@@ -1835,9 +1404,9 @@
1835	1404	unset( $uk, $uf );
1836	1405	}
1837	1406
1838	1407	$advanced_helpers['user_id'] = array(
1839		- 'codes' => $user_helpers,
	1408	+ 'codes' => $user_helpers,
1840	1409	);
1841	1410	}
1842	1411
1843	1412	/**
		@@ -1851,132 +1420,12 @@
1851	1420	return apply_filters( 'frm_advanced_helpers', $advanced_helpers, $atts );
1852	1421	}
1853	1422
1854	1423	/**
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	1424	* Get an array of the options to display in the advanced tab
1974	1425	* of the customization panel
1975	1426	*
1976	1427	* @since 2.0.6
1977		- *
1978		- * @return array
1979	1428	*/
1980	1429	private static function get_advanced_shortcodes() {
1981	1430	$adv_shortcodes = array(
1982	1431	'x sep=", "' => array(
		@@ -1993,18 +1442,17 @@
1993	1442	'label' => __( 'No Auto P', 'formidable' ),
1994	1443	'title' => __( 'Do not automatically add any paragraphs or line breaks', 'formidable' ),
1995	1444	),
1996	1445	);
	1446	+ $adv_shortcodes = apply_filters( 'frm_advanced_shortcodes', $adv_shortcodes );
1997	1447
1998	1448	// __( 'Leave blank instead of defaulting to User Login', 'formidable' ) : blank=1
1999	1449
2000		- return apply_filters( 'frm_advanced_shortcodes', $adv_shortcodes );
	1450	+ return $adv_shortcodes;
2001	1451	}
2002	1452
2003	1453	/**
2004	1454	* @since 3.04.01
2005		- *
2006		- * @return array
2007	1455	*/
2008	1456	private static function user_shortcodes() {
2009	1457	$options = array(
2010	1458	'ID' => __( 'User ID', 'formidable' ),
		@@ -2023,15 +1471,10 @@
2023	1471	/**
2024	1472	* Get an array of the helper shortcodes to display in the customization panel
2025	1473	*
2026	1474	* @since 2.0.6
2027		- *
2028		- * @param bool $settings_tab
2029		- * @param int $form_id
2030		- *
2031		- * @return array
2032	1475	*/
2033		- private static function get_shortcode_helpers( $settings_tab, $form_id = 0 ) {
	1476	+ private static function get_shortcode_helpers( $settings_tab ) {
2034	1477	$entry_shortcodes = array(
2035	1478	'id' => __( 'Entry ID', 'formidable' ),
2036	1479	'key' => __( 'Entry Key', 'formidable' ),
2037	1480	'post_id' => __( 'Post ID', 'formidable' ),
		@@ -2040,36 +1483,34 @@
2040	1483	'updated-at' => __( 'Entry updated', 'formidable' ),
2041	1484	'' => '',
2042	1485	'siteurl' => __( 'Site URL', 'formidable' ),
2043	1486	'sitename' => __( 'Site Name', 'formidable' ),
2044		- 'form_name' => __( 'Form Name', 'formidable' ),
2045	1487	);
2046	1488
2047		- $entry_shortcodes = array_merge( FrmShortcodeHelper::get_contextual_shortcode_values(), $entry_shortcodes );
2048		-
2049	1489	if ( ! FrmAppHelper::pro_is_installed() ) {
2050	1490	unset( $entry_shortcodes['post_id'] );
2051	1491	}
2052	1492
	1493	+ if ( $settings_tab ) {
	1494	+ $entry_shortcodes['default-message'] = __( 'Default Msg', 'formidable' );
	1495	+ $entry_shortcodes['default-html'] = __( 'Default HTML', 'formidable' );
	1496	+ $entry_shortcodes['default-plain'] = __( 'Default Plain', 'formidable' );
	1497	+ $entry_shortcodes['form_name'] = __( 'Form Name', 'formidable' );
	1498	+ }
	1499	+
2053	1500	/**
2054	1501	* Use this hook to add or remove buttons in the helpers section
2055	1502	* in the customization panel
2056	1503	*
2057	1504	* @since 2.0.6
2058		- *
2059		- * @param array $entry_shortcodes
2060		- * @param bool $settings_tab
2061		- * @param int $form_id
2062	1505	*/
2063		- return apply_filters( 'frm_helper_shortcodes', $entry_shortcodes, $settings_tab, $form_id );
	1506	+ $entry_shortcodes = apply_filters( 'frm_helper_shortcodes', $entry_shortcodes, $settings_tab );
	1507	+
	1508	+ return $entry_shortcodes;
2064	1509	}
2065	1510
2066	1511	/**
2067		- * Insert the form class setting into the form.
2068		- *
2069		- * @param stdClass $form
2070		- *
2071		- * @return void
	1512	+ * Insert the form class setting into the form
2072	1513	*/
2073	1514	public static function form_classes( $form ) {
2074	1515	if ( isset( $form->options['form_class'] ) ) {
2075	1516	echo esc_attr( sanitize_text_field( $form->options['form_class'] ) );
		@@ -2078,12 +1519,8 @@
2078	1519	if ( ! empty( $form->options['js_validate'] ) ) {
2079	1520	echo ' frm_js_validate ';
2080	1521	self::add_js_validate_form_to_global_vars( $form );
2081	1522	}
2082		-
2083		- if ( FrmForm::is_ajax_on( $form ) ) {
2084		- echo ' frm_ajax_submit ';
2085		- }
2086	1523	}
2087	1524
2088	1525	/**
2089	1526	* @since 5.0.03
		@@ -2091,9 +1528,8 @@
2091	1528	* @param stdClass $form
2092	1529	*/
2093	1530	public static function add_js_validate_form_to_global_vars( $form ) {
2094	1531	global $frm_vars;
2095		-
2096	1532	if ( ! isset( $frm_vars['js_validate_forms'] ) ) {
2097	1533	$frm_vars['js_validate_forms'] = array();
2098	1534	}
2099	1535	$frm_vars['js_validate_forms'][ $form->id ] = $form;
		@@ -2104,11 +1540,11 @@
2104	1540	check_ajax_referer( 'frm_ajax', 'nonce' );
2105	1541
2106	1542	echo FrmEntriesController::show_entry_shortcode( // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
2107	1543	array(
2108		- 'form_id' => FrmAppHelper::get_post_param( 'form_id', '', 'absint' ), // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
	1544	+ 'form_id' => FrmAppHelper::get_post_param( 'form_id', '', 'absint' ),
2109	1545	'default_email' => true,
2110		- 'plain_text' => FrmAppHelper::get_post_param( 'plain_text', '', 'absint' ), // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
	1546	+ 'plain_text' => FrmAppHelper::get_post_param( 'plain_text', '', 'absint' ),
2111	1547	)
2112	1548	);
2113	1549	wp_die();
2114	1550	}
		@@ -2114,11 +1550,10 @@
2114	1550	}
2115	1551
2116	1552	/**
2117	1553	* @param string $content
2118		- * @param int|stdClass|string $form
2119		- * @param false|int|stdClass|string $entry
2120		- *
	1554	+ * @param stdClass|string|int $form
	1555	+ * @param stdClass|string|int|false $entry
2121	1556	* @return string
2122	1557	*/
2123	1558	public static function filter_content( $content, $form, $entry = false ) {
2124	1559	$content = self::replace_form_name_shortcodes( $content, $form );
		@@ -2123,9 +1558,8 @@
2123	1558	public static function filter_content( $content, $form, $entry = false ) {
2124	1559	$content = self::replace_form_name_shortcodes( $content, $form );
2125	1560
2126	1561	self::get_entry_by_param( $entry );
2127		-
2128	1562	if ( ! $entry ) {
2129	1563	return $content;
2130	1564	}
2131	1565
		@@ -2132,19 +1566,12 @@
2132	1566	if ( is_object( $form ) ) {
2133	1567	$form = $form->id;
2134	1568	}
2135	1569
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	1570	$shortcodes = FrmFieldsHelper::get_shortcodes( $content, $form );
	1571	+ $content = apply_filters( 'frm_replace_content_shortcodes', $content, $entry, $shortcodes );
2145	1572
2146		- return apply_filters( 'frm_replace_content_shortcodes', $content, $entry, $shortcodes );
	1573	+ return $content;
2147	1574	}
2148	1575
2149	1576	/**
2150	1577	* Replace any [form_name] shortcodes in a string.
		@@ -2150,22 +1577,17 @@
2150	1577	* Replace any [form_name] shortcodes in a string.
2151	1578	*
2152	1579	* @since 5.5
2153	1580	*
2154		- * @param array|string $string
2155		- * @param int|stdClass|string $form
2156		- *
2157		- * @return array|string
	1581	+ * @param string $string
	1582	+ * @param stdClass|string|int $form
	1583	+ * @return string
2158	1584	*/
2159	1585	public static function replace_form_name_shortcodes( $string, $form ) {
2160		- if ( ! is_string( $string ) ) {
	1586	+ if ( false === strpos( $string, '[form_name]' ) ) {
2161	1587	return $string;
2162	1588	}
2163	1589
2164		- if ( ! str_contains( $string, '[form_name]' ) ) {
2165		- return $string;
2166		- }
2167		-
2168	1590	if ( ! is_object( $form ) ) {
2169	1591	$form = FrmForm::getOne( $form );
2170	1592	}
2171	1593
		@@ -2173,40 +1595,25 @@
2173	1595	return str_replace( '[form_name]', $form_name, $string );
2174	1596	}
2175	1597
2176	1598	/**
2177		- * @param false|int|stdClass|string $entry
2178		- *
	1599	+ * @param stdClass|string|int|false $entry
2179	1600	* @return void
2180	1601	*/
2181	1602	private static function get_entry_by_param( &$entry ) {
2182		- if ( $entry && is_object( $entry ) ) {
2183		- return;
2184		- }
	1603	+ if ( ! $entry || ! is_object( $entry ) ) {
	1604	+ if ( ! $entry || ! is_numeric( $entry ) ) {
	1605	+ $entry = FrmAppHelper::get_post_param( 'id', false, 'sanitize_title' );
	1606	+ }
2185	1607
2186		- if ( ! $entry || ! is_numeric( $entry ) ) {
2187		- $entry = FrmAppHelper::get_post_param( 'id', false, 'sanitize_title' );
	1608	+ FrmEntry::maybe_get_entry( $entry );
2188	1609	}
2189		-
2190		- FrmEntry::maybe_get_entry( $entry );
2191	1610	}
2192	1611
2193		- /**
2194		- * @param string $content
2195		- * @param false|object $entry
2196		- * @param array $shortcodes
2197		- *
2198		- * @return string
2199		- */
2200	1612	public static function replace_content_shortcodes( $content, $entry, $shortcodes ) {
2201	1613	return FrmFieldsHelper::replace_content_shortcodes( $content, $entry, $shortcodes );
2202	1614	}
2203	1615
2204		- /**
2205		- * @param array $errors
2206		- *
2207		- * @return array
2208		- */
2209	1616	public static function process_bulk_form_actions( $errors ) {
2210	1617	if ( ! $_REQUEST ) {
2211	1618	return $errors;
2212	1619	}
		@@ -2211,30 +1618,29 @@
2211	1618	return $errors;
2212	1619	}
2213	1620
2214	1621	$bulkaction = FrmAppHelper::get_param( 'action', '', 'get', 'sanitize_text_field' );
2215		-
2216		- // phpcs:ignore Universal.Operators.StrictComparisons
2217	1622	if ( $bulkaction == - 1 ) {
2218	1623	$bulkaction = FrmAppHelper::get_param( 'action2', '', 'get', 'sanitize_title' );
2219	1624	}
2220	1625
2221		- if ( $bulkaction && str_starts_with( $bulkaction, 'bulk_' ) ) {
	1626	+ if ( ! empty( $bulkaction ) && strpos( $bulkaction, 'bulk_' ) === 0 ) {
2222	1627	FrmAppHelper::remove_get_action();
	1628	+
2223	1629	$bulkaction = str_replace( 'bulk_', '', $bulkaction );
2224	1630	}
2225	1631
2226	1632	$ids = FrmAppHelper::get_param( 'item-action', '', 'get', 'sanitize_text_field' );
	1633	+ if ( empty( $ids ) ) {
	1634	+ $errors[] = __( 'No forms were specified', 'formidable' );
2227	1635
2228		- if ( ! $ids ) {
2229		- $errors[] = __( 'No forms were specified', 'formidable' );
2230	1636	return $errors;
2231	1637	}
2232	1638
2233	1639	$permission_error = FrmAppHelper::permission_nonce_error( '', '_wpnonce', 'bulk-toplevel_page_formidable' );
2234		-
2235	1640	if ( $permission_error !== false ) {
2236	1641	$errors[] = $permission_error;
	1642	+
2237	1643	return $errors;
2238	1644	}
2239	1645
2240	1646	if ( ! is_array( $ids ) ) {
		@@ -2251,9 +1657,9 @@
2251	1657	case 'untrash':
2252	1658	$message = self::bulk_untrash( $ids );
2253	1659	}
2254	1660
2255		- if ( ! empty( $message ) ) {
	1661	+ if ( isset( $message ) && ! empty( $message ) ) {
2256	1662	$errors['message'] = $message;
2257	1663	}
2258	1664
2259	1665	return $errors;
		@@ -2258,24 +1664,9 @@
2258	1664
2259	1665	return $errors;
2260	1666	}
2261	1667
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
	1668	+ public static function route() {
2278	1669	$action = isset( $_REQUEST['frm_action'] ) ? 'frm_action' : 'action';
2279	1670	$vars = array();
2280	1671	FrmAppHelper::include_svg();
2281	1672
		@@ -2285,38 +1676,37 @@
2285	1676	// Javascript needs to be allowed in some field settings.
2286	1677	// phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized, WordPress.Security.NonceVerification.Missing
2287	1678	$json_vars = htmlspecialchars_decode( nl2br( str_replace( '&quot;', '"', wp_unslash( $_POST['frm_compact_fields'] ) ) ) );
2288	1679	$json_vars = json_decode( $json_vars, true );
	1680	+ if ( empty( $json_vars ) ) {
	1681	+ // json decoding failed so we should return an error message.
	1682	+ $action = FrmAppHelper::get_param( $action, '', 'get', 'sanitize_title' );
	1683	+ if ( 'edit' == $action ) {
	1684	+ $action = 'update';
	1685	+ }
2289	1686
2290		- if ( $json_vars ) {
	1687	+ add_filter( 'frm_validate_form', 'FrmFormsController::json_error' );
	1688	+ } else {
2291	1689	$vars = FrmAppHelper::json_to_array( $json_vars );
2292	1690	$action = $vars[ $action ];
2293	1691	unset( $_REQUEST['frm_compact_fields'], $_POST['frm_compact_fields'] ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
2294	1692	$_REQUEST = array_merge( $_REQUEST, $vars ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
2295	1693	$_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	1694	}
2306	1695	} else {
2307	1696	$action = FrmAppHelper::get_param( $action, '', 'get', 'sanitize_title' );
2308		-
2309	1697	if ( isset( $_REQUEST['delete_all'] ) ) {
2310	1698	// Override the action for this page.
2311	1699	$action = 'delete_all';
2312	1700	}
2313		- }//end if
	1701	+ }
2314	1702
2315	1703	add_action( 'frm_load_form_hooks', 'FrmHooksController::trigger_load_form_hooks' );
2316	1704	FrmAppHelper::trigger_hook_load( 'form' );
2317	1705
2318	1706	switch ( $action ) {
	1707	+ case 'new':
	1708	+ return self::new_form( $vars );
2319	1709	case 'create':
2320	1710	case 'edit':
2321	1711	case 'update':
2322	1712	case 'trash':
		@@ -2321,113 +1711,59 @@
2321	1711	case 'update':
2322	1712	case 'trash':
2323	1713	case 'untrash':
2324	1714	case 'destroy':
	1715	+ case 'delete_all':
2325	1716	case 'settings':
2326	1717	case 'update_settings':
2327	1718	return self::$action( $vars );
2328	1719	case 'lite-reports':
2329		- self::no_reports( $vars );
2330		- return null;
	1720	+ return self::no_reports( $vars );
2331	1721	case 'views':
2332		- self::no_views( $vars );
2333		- return null;
	1722	+ return self::no_views( $vars );
2334	1723	default:
2335	1724	do_action( 'frm_form_action_' . $action );
2336		-
2337	1725	if ( apply_filters( 'frm_form_stop_action_' . $action, false ) ) {
2338		- return null;
	1726	+ return;
2339	1727	}
2340	1728
2341	1729	$action = FrmAppHelper::get_param( 'action', '', 'get', 'sanitize_text_field' );
2342		-
2343		- // phpcs:ignore Universal.Operators.StrictComparisons
2344	1730	if ( $action == - 1 ) {
2345	1731	$action = FrmAppHelper::get_param( 'action2', '', 'get', 'sanitize_title' );
2346	1732	}
2347	1733
2348		- if ( str_starts_with( $action, 'bulk_' ) ) {
	1734	+ if ( strpos( $action, 'bulk_' ) === 0 ) {
2349	1735	FrmAppHelper::remove_get_action();
2350	1736
2351	1737	self::list_form();
2352		- return null;
	1738	+ return;
2353	1739	}
2354	1740
2355	1741	$message = FrmAppHelper::get_param( 'message' );
2356		-
2357	1742	if ( 'form_duplicate_error' === $message ) {
2358	1743	self::display_forms_list( array(), '', array( __( 'There was a problem duplicating the form', 'formidable' ) ) );
2359		- return null;
	1744	+ return;
2360	1745	}
2361	1746
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	1747	self::display_forms_list();
2371	1748
2372		- return null;
2373		- }//end switch
	1749	+ return;
	1750	+ }
2374	1751	}
2375	1752
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' );
	1753	+ public static function json_error( $errors ) {
	1754	+ $errors['json'] = __( 'Abnormal HTML characters prevented your form from saving correctly', 'formidable' );
2389	1755
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' ) );
	1756	+ return $errors;
2420	1757	}
2421	1758
2422	1759	/**
2423		- * @param array $errors
	1760	+ * Education for premium features.
2424	1761	*
2425		- * @return array
	1762	+ * @since 4.05
2426	1763	*/
2427		- public static function json_error( $errors ) {
2428		- $errors['json'] = __( 'Abnormal HTML characters prevented your form from saving correctly', 'formidable' );
2429		- return $errors;
	1764	+ public static function add_form_style_tab_options() {
	1765	+ include( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/add_form_style_options.php' );
2430	1766	}
2431	1767
2432	1768	/**
2433	1769	* Add education about views.
		@@ -2432,12 +1768,8 @@
2432	1768	/**
2433	1769	* Add education about views.
2434	1770	*
2435	1771	* @since 4.07
2436		- *
2437		- * @param array $values
2438		- *
2439		- * @return void
2440	1772	*/
2441	1773	public static function no_views( $values = array() ) {
2442	1774	FrmAppHelper::include_svg();
2443	1775	$id = FrmAppHelper::get_param( 'form', '', 'get', 'absint' );
		@@ -2449,12 +1781,8 @@
2449	1781	/**
2450	1782	* Add education about reports.
2451	1783	*
2452	1784	* @since 4.07
2453		- *
2454		- * @param array $values
2455		- *
2456		- * @return void
2457	1785	*/
2458	1786	public static function no_reports( $values = array() ) {
2459	1787	$id = FrmAppHelper::get_param( 'form', '', 'get', 'absint' );
2460	1788	$form = $id ? FrmForm::getOne( $id ) : false;
		@@ -2461,11 +1789,9 @@
2461	1789
2462	1790	include FrmAppHelper::plugin_path() . '/classes/views/shared/reports-info.php';
2463	1791	}
2464	1792
2465		- /**
2466		- * FRONT-END FORMS.
2467		- */
	1793	+ /* FRONT-END FORMS */
2468	1794	public static function admin_bar_css() {
2469	1795	if ( is_admin() || ! current_user_can( 'frm_edit_forms' ) ) {
2470	1796	return;
2471	1797	}
		@@ -2479,9 +1805,10 @@
2479	1805	/**
2480	1806	* @since 4.05.02
2481	1807	*/
2482	1808	private static function move_menu_to_footer() {
2483		- if ( empty( FrmAppHelper::get_settings()->admin_bar ) ) {
	1809	+ $settings = FrmAppHelper::get_settings();
	1810	+ if ( empty( $settings->admin_bar ) ) {
2484	1811	remove_action( 'wp_body_open', 'wp_admin_bar_render', 0 );
2485	1812	}
2486	1813	}
2487	1814
		@@ -2486,15 +1813,13 @@
2486	1813	}
2487	1814
2488	1815	public static function admin_bar_configure() {
2489	1816	global $frm_vars;
2490		-
2491	1817	if ( empty( $frm_vars['forms_loaded'] ) ) {
2492	1818	return;
2493	1819	}
2494	1820
2495	1821	$actions = array();
2496		-
2497	1822	foreach ( $frm_vars['forms_loaded'] as $form ) {
2498	1823	if ( is_object( $form ) ) {
2499	1824	$actions[ $form->id ] = $form->name;
2500	1825	}
		@@ -2500,9 +1825,9 @@
2500	1825	}
2501	1826	unset( $form );
2502	1827	}
2503	1828
2504		- if ( ! $actions ) {
	1829	+ if ( empty( $actions ) ) {
2505	1830	return;
2506	1831	}
2507	1832
2508	1833	self::add_menu_to_admin_bar();
		@@ -2528,12 +1853,8 @@
2528	1853	}
2529	1854
2530	1855	/**
2531	1856	* @since 2.05.07
2532		- *
2533		- * @param array $actions
2534		- *
2535		- * @return void
2536	1857	*/
2537	1858	private static function add_forms_to_admin_bar( $actions ) {
2538	1859	global $wp_admin_bar;
2539	1860
		@@ -2539,13 +1860,14 @@
2539	1860
2540	1861	asort( $actions );
2541	1862
2542	1863	foreach ( $actions as $form_id => $name ) {
	1864	+
2543	1865	$wp_admin_bar->add_node(
2544	1866	array(
2545	1867	'parent' => 'frm-forms',
2546	1868	'id' => 'edit_form_' . $form_id,
2547		- 'title' => $name ? $name : FrmFormsHelper::get_no_title_text(),
	1869	+ 'title' => empty( $name ) ? __( '(no title)', 'formidable' ) : $name,
2548	1870	'href' => FrmForm::get_edit_link( $form_id ),
2549	1871	)
2550	1872	);
2551	1873	}
		@@ -2554,16 +1876,14 @@
2554	1876	/**
2555	1877	* The formidable shortcode
2556	1878	*
2557	1879	* @param array $atts The params from the shortcode.
2558		- *
2559	1880	* @return string
2560	1881	*/
2561	1882	public static function get_form_shortcode( $atts ) {
2562	1883	global $frm_vars;
2563		-
2564		- if ( ! empty( $frm_vars['skip_shortcode'] ) ) {
2565		- $sc = '[formidable';
	1884	+ if ( isset( $frm_vars['skip_shortcode'] ) && $frm_vars['skip_shortcode'] ) {
	1885	+ $sc = '[formidable';
2566	1886	$sc .= FrmAppHelper::array_to_html_params( $atts );
2567	1887	return $sc . ']';
2568	1888	}
2569	1889
		@@ -2588,12 +1908,11 @@
2588	1908
2589	1909	/**
2590	1910	* @since 5.2.01
2591	1911	*
2592		- * @param false|int|string $id
2593		- * @param false|string $key
2594		- *
2595		- * @return false|stdClass
	1912	+ * @param string|int|false $id
	1913	+ * @param string|false $key
	1914	+ * @return stdClass|false
2596	1915	*/
2597	1916	private static function maybe_get_form_by_id_or_key( $id, $key ) {
2598	1917	if ( ! $id ) {
2599	1918	$id = $key;
		@@ -2601,14 +1920,13 @@
2601	1920	return self::maybe_get_form_to_show( $id );
2602	1921	}
2603	1922
2604	1923	/**
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.
	1924	+ * @param string|int|false $id
	1925	+ * @param string|false $key
	1926	+ * @param string|int|bool $title may be 'auto', true, false, 'true', 'false', 'yes', '1', 1, '0', 0.
	1927	+ * @param string|int|bool $description may be 'auto', true, false, 'true', 'false', 'yes', '1', 1, '0', 0.
2609	1928	* @param array $atts
2610		- *
2611	1929	* @return string
2612	1930	*/
2613	1931	public static function show_form( $id = '', $key = '', $title = false, $description = false, $atts = array() ) {
2614	1932	$form = self::maybe_get_form_by_id_or_key( $id, $key );
		@@ -2629,13 +1947,14 @@
2629	1947
2630	1948	add_action( 'frm_load_form_hooks', 'FrmHooksController::trigger_load_form_hooks' );
2631	1949	FrmAppHelper::trigger_hook_load( 'form', $form );
2632	1950
2633		- $form = apply_filters( 'frm_pre_display_form', $form );
	1951	+ $form = apply_filters( 'frm_pre_display_form', $form );
	1952	+
2634	1953	$frm_settings = FrmAppHelper::get_settings( array( 'current_form' => $form->id ) );
2635	1954
2636	1955	if ( self::is_viewable_draft_form( $form ) ) {
2637		- // Don't show a draft form on a page
	1956	+ // don't show a draft form on a page
2638	1957	$form = __( 'Please select a valid form', 'formidable' );
2639	1958	} elseif ( ! FrmForm::is_visible_to_user( $form ) ) {
2640	1959	$form = do_shortcode( $frm_settings->login_msg );
2641	1960	} else {
		@@ -2654,19 +1973,16 @@
2654	1973	return $form;
2655	1974	}
2656	1975
2657	1976	/**
2658		- * @param false|int|string $id
2659		- *
2660		- * @return false|stdClass
	1977	+ * @param string|int|false $id
	1978	+ * @return stdClass|false
2661	1979	*/
2662	1980	private static function maybe_get_form_to_show( $id ) {
2663	1981	$form = false;
2664	1982
2665		- if ( $id ) {
2666		- // Form id or key is set.
	1983	+ if ( ! empty( $id ) ) { // form id or key is set
2667	1984	$form = FrmForm::getOne( $id );
2668		-
2669	1985	if ( ! $form || $form->parent_form_id || $form->status === 'trash' ) {
2670	1986	$form = false;
2671	1987	}
2672	1988	}
		@@ -2673,25 +1989,12 @@
2673	1989
2674	1990	return $form;
2675	1991	}
2676	1992
2677		- /**
2678		- * @param object $form
2679		- *
2680		- * @return bool
2681		- */
2682	1993	private static function is_viewable_draft_form( $form ) {
2683	1994	return $form->status === 'draft' && current_user_can( 'frm_edit_forms' ) && ! FrmAppHelper::is_preview_page();
2684	1995	}
2685	1996
2686		- /**
2687		- * @param object $form
2688		- * @param bool $title
2689		- * @param bool $description
2690		- * @param array $atts
2691		- *
2692		- * @return string
2693		- */
2694	1997	public static function get_form( $form, $title, $description, $atts = array() ) {
2695	1998	ob_start();
2696	1999
2697	2000	do_action( 'frm_before_get_form', $atts );
		@@ -2698,9 +2001,10 @@
2698	2001
2699	2002	self::get_form_contents( $form, $title, $description, $atts );
2700	2003	self::enqueue_scripts( FrmForm::get_params( $form ) );
2701	2004
2702		- $contents = ob_get_clean();
	2005	+ $contents = ob_get_contents();
	2006	+ ob_end_clean();
2703	2007
2704	2008	self::maybe_minimize_form( $atts, $contents );
2705	2009
2706	2010	return $contents;
		@@ -2705,25 +2009,12 @@
2705	2009
2706	2010	return $contents;
2707	2011	}
2708	2012
2709		- /**
2710		- * @param array $params
2711		- *
2712		- * @return void
2713		- */
2714	2013	public static function enqueue_scripts( $params ) {
2715	2014	do_action( 'frm_enqueue_form_scripts', $params );
2716	2015	}
2717	2016
2718		- /**
2719		- * @param object $form
2720		- * @param bool $title
2721		- * @param bool $description
2722		- * @param array $atts
2723		- *
2724		- * @return void
2725		- */
2726	2017	public static function get_form_contents( $form, $title, $description, $atts ) {
2727	2018	$params = FrmForm::get_params( $form );
2728	2019	$errors = self::get_saved_errors( $form, $params );
2729	2020	$fields = FrmFieldsHelper::get_form_fields( $form->id, $errors );
		@@ -2729,32 +2020,29 @@
2729	2020	$fields = FrmFieldsHelper::get_form_fields( $form->id, $errors );
2730	2021	$reset = false;
2731	2022	$pass_args = compact( 'form', 'fields', 'errors', 'title', 'description', 'reset' );
2732	2023
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;
	2024	+ $handle_process_here = $params['action'] === 'create' && $params['posted_form_id'] == $form->id && $_POST; // phpcs:ignore WordPress.Security.NonceVerification.Missing
2736	2025
2737	2026	if ( ! $handle_process_here ) {
2738		- FrmFormState::set_initial_value( 'title', $title );
2739		- FrmFormState::set_initial_value( 'description', $description );
2740		-
2741	2027	do_action( 'frm_display_form_action', $params, $fields, $form, $title, $description );
2742		-
2743	2028	if ( apply_filters( 'frm_continue_to_new', true, $form->id, $params['action'] ) ) {
2744	2029	self::show_form_after_submit( $pass_args );
2745	2030	}
2746		- } elseif ( $errors ) {
	2031	+ } elseif ( ! empty( $errors ) ) {
2747	2032	self::show_form_after_submit( $pass_args );
	2033	+
2748	2034	} else {
	2035	+
2749	2036	do_action( 'frm_validate_form_creation', $params, $fields, $form, $title, $description );
2750	2037
2751	2038	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;
	2039	+ $entry_id = self::just_created_entry( $form->id );
	2040	+ $pass_args['entry_id'] = $entry_id;
	2041	+ $pass_args['reset'] = true;
	2042	+ $pass_args['conf_method'] = self::get_confirmation_method( compact( 'form', 'entry_id' ) );
2755	2043
2756		- self::run_on_submit_actions( $pass_args );
	2044	+ self::run_success_action( $pass_args );
2757	2045
2758	2046	do_action(
2759	2047	'frm_after_entry_processed',
2760	2048	array(
		@@ -2762,9 +2050,9 @@
2762	2050	'form' => $form,
2763	2051	)
2764	2052	);
2765	2053	}
2766		- }//end if
	2054	+ }
2767	2055	}
2768	2056
2769	2057	/**
2770	2058	* If the form was processed earlier (init), get the generated errors
		@@ -2769,19 +2057,13 @@
2769	2057	/**
2770	2058	* If the form was processed earlier (init), get the generated errors
2771	2059	*
2772	2060	* @since 2.05
2773		- *
2774		- * @param object $form
2775		- * @param array $params
2776		- *
2777		- * @return array
2778	2061	*/
2779	2062	private static function get_saved_errors( $form, $params ) {
2780	2063	global $frm_vars;
2781	2064
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 ] ) ) {
	2065	+ if ( $params['posted_form_id'] == $form->id && $_POST && isset( $frm_vars['created_entries'][ $form->id ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
2784	2066	$errors = $frm_vars['created_entries'][ $form->id ]['errors'];
2785	2067	} else {
2786	2068	$errors = array();
2787	2069	}
		@@ -2798,62 +2080,30 @@
2798	2080	}
2799	2081
2800	2082	/**
2801	2083	* @since 2.2.7
2802		- *
2803		- * @param int|string $form_id
2804		- *
2805		- * @return int
2806	2084	*/
2807	2085	public static function just_created_entry( $form_id ) {
2808	2086	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
	2087	+
	2088	+ 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	2089	}
2811	2090
2812	2091	/**
2813		- * Gets confirmation method.
2814		- *
2815	2092	* @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	2093	*/
2827	2094	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';
	2095	+ $opt = 'success_action';
	2096	+ $method = ( isset( $atts['form']->options[ $opt ] ) && ! empty( $atts['form']->options[ $opt ] ) ) ? $atts['form']->options[ $opt ] : 'message';
	2097	+ $method = apply_filters( 'frm_success_filter', $method, $atts['form'], 'create' );
2831	2098
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		- }
	2099	+ if ( $method != 'message' && ( ! $atts['entry_id'] || ! is_numeric( $atts['entry_id'] ) ) ) {
	2100	+ $method = 'message';
2838	2101	}
2839	2102
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	2103	return $method;
2847	2104	}
2848	2105
2849		- /**
2850		- * @param object $form
2851		- * @param array $params
2852		- * @param array $args
2853		- *
2854		- * @return void
2855		- */
2856	2106	public static function maybe_trigger_redirect( $form, $params, $args ) {
2857	2107	if ( ! isset( $params['id'] ) ) {
2858	2108	global $frm_vars;
2859	2109	$params['id'] = $frm_vars['created_entries'][ $form->id ]['entry_id'];
		@@ -2862,44 +2112,16 @@
2862	2112	$conf_method = self::get_confirmation_method(
2863	2113	array(
2864	2114	'form' => $form,
2865	2115	'entry_id' => $params['id'],
2866		- 'action' => FrmOnSubmitHelper::current_event( $params ),
2867	2116	)
2868	2117	);
2869	2118
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	2119	if ( 'redirect' === $conf_method ) {
2891	2120	self::trigger_redirect( $form, $params, $args );
2892	2121	}
2893	2122	}
2894	2123
2895		- /**
2896		- * @param object $form
2897		- * @param array $params
2898		- * @param array $args
2899		- *
2900		- * @return void
2901		- */
2902	2124	public static function trigger_redirect( $form, $params, $args ) {
2903	2125	$success_args = array(
2904	2126	'action' => $params['action'],
2905	2127	'conf_method' => 'redirect',
		@@ -2917,33 +2139,18 @@
2917	2139	/**
2918	2140	* Used when the success action is not 'message'
2919	2141	*
2920	2142	* @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	2143	*/
2934	2144	public static function run_success_action( $args ) {
2935		- global $frm_vars;
2936	2145	$extra_args = $args;
2937	2146	unset( $extra_args['form'] );
2938	2147
2939	2148	do_action( 'frm_success_action', $args['conf_method'], $args['form'], $args['form']->options, $args['entry_id'], $extra_args );
2940	2149
2941		- $opt = ! isset( $args['action'] ) || $args['action'] === 'create' ? 'success' : 'edit';
	2150	+ $opt = ( ! isset( $args['action'] ) || $args['action'] === 'create' ) ? 'success' : 'edit';
2942	2151
2943	2152	$args['success_opt'] = $opt;
2944		- $args['ajax'] = ! empty( $frm_vars['ajax'] );
2945		-
2946	2153	if ( $args['conf_method'] === 'page' && is_numeric( $args['form']->options[ $opt . '_page_id' ] ) ) {
2947	2154	self::load_page_after_submit( $args );
2948	2155	} elseif ( $args['conf_method'] === 'redirect' ) {
2949	2156	self::redirect_after_submit( $args );
		@@ -2952,270 +2159,29 @@
2952	2159	}
2953	2160	}
2954	2161
2955	2162	/**
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	2163	* @since 3.0
3179		- *
3180		- * @param array $args
3181		- *
3182		- * @return void
3183	2164	*/
3184	2165	private static function load_page_after_submit( $args ) {
3185	2166	global $post;
3186	2167	$opt = $args['success_opt'];
3187		-
3188		- // phpcs:ignore Universal.Operators.StrictComparisons
3189	2168	if ( ! $post || $args['form']->options[ $opt . '_page_id' ] != $post->ID ) {
3190	2169	$page = get_post( $args['form']->options[ $opt . '_page_id' ] );
3191	2170	$old_post = $post;
3192	2171	$post = $page;
3193	2172	$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	2173	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	2174	$post = $old_post;
3209		- }//end if
	2175	+ }
3210	2176	}
3211	2177
3212	2178	/**
3213	2179	* @since 3.0
3214		- *
3215		- * @param array $args See {@see FrmFormsController::run_success_action()}.
3216	2180	*/
3217	2181	private static function redirect_after_submit( $args ) {
	2182	+ global $frm_vars;
	2183	+
3218	2184	add_filter( 'frm_use_wpautop', '__return_false' );
3219	2185
3220	2186	$opt = $args['success_opt'];
3221	2187	$success_url = trim( $args['form']->options[ $opt . '_url' ] );
		@@ -3221,155 +2187,31 @@
3221	2187	$success_url = trim( $args['form']->options[ $opt . '_url' ] );
3222	2188	$success_url = apply_filters( 'frm_content', $success_url, $args['form'], $args['entry_id'] );
3223	2189	$success_url = do_shortcode( $success_url );
3224	2190
	2191	+ $success_msg = isset( $args['form']->options[ $opt . '_msg' ] ) ? $args['form']->options[ $opt . '_msg' ] : __( 'Please wait while you are redirected.', 'formidable' );
	2192	+
	2193	+ $redirect_msg = self::get_redirect_message( $success_url, $success_msg, $args );
	2194	+
3225	2195	$args['id'] = $args['entry_id'];
3226	2196	FrmEntriesController::delete_entry_before_redirect( $success_url, $args['form'], $args );
3227	2197
3228	2198	add_filter( 'frm_redirect_url', 'FrmEntriesController::prepare_redirect_url' );
3229	2199	$success_url = apply_filters( 'frm_redirect_url', $success_url, $args['form'], $args );
3230		- $doing_ajax = FrmAppHelper::doing_ajax();
3231	2200
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' ) ) );
	2201	+ $doing_ajax = FrmAppHelper::doing_ajax();
	2202	+
	2203	+ if ( isset( $args['ajax'] ) && $args['ajax'] && $doing_ajax ) {
	2204	+ echo json_encode( array( 'redirect' => $success_url ) );
3235	2205	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		-
	2206	+ } elseif ( ! headers_sent() ) {
3246	2207	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")';
	2208	+ die(); // do not use wp_die or redirect fails
3353	2209	} else {
3354		- $redirect_js = 'window.location="' . $success_url . '";';
	2210	+ add_filter( 'frm_use_wpautop', '__return_true' );
	2211	+ echo FrmAppHelper::maybe_kses( $redirect_msg ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
	2212	+ echo "<script type='text/javascript'>window.onload = function(){setTimeout(window.location='" . esc_url_raw( $success_url ) . "', 8000);}</script>";
3355	2213	}
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	2214	}
3373	2215
3374	2216	/**
3375	2217	* @since 3.0
		@@ -3375,19 +2217,15 @@
3375	2217	* @since 3.0
3376	2218	*
3377	2219	* @param string $success_url
3378	2220	* @param string $success_msg
3379		- * @param array $args
	2221	+ * @param array $args
3380	2222	*/
3381	2223	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 ) .
	2224	+ $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/>' .
	2225	+ /* translators: %1$s: Start link HTML, %2$s: End link HTML */
	2226	+ sprintf( __( '%1$sClick here%2$s if you are not automatically redirected.', 'formidable' ), '<a href="' . esc_url( $success_url ) . '">', '</a>' ) .
3388	2227	'</div></div>';
3389		- // phpcs:enable Generic.WhiteSpace.ScopeIndent
3390	2228
3391	2229	$redirect_args = array(
3392	2230	'entry_id' => $args['entry_id'],
3393	2231	'form_id' => $args['form']->id,
		@@ -3397,59 +2235,19 @@
3397	2235	return apply_filters( 'frm_redirect_msg', $redirect_msg, $redirect_args );
3398	2236	}
3399	2237
3400	2238	/**
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	2239	* Prepare to show the success message and empty form after submit
3427	2240	*
3428	2241	* @since 2.05
3429		- *
3430		- * @param array $atts
3431		- *
3432		- * @return void
3433	2242	*/
3434	2243	public static function show_message_after_save( $atts ) {
3435		- $atts['message'] = self::prepare_submit_message( $atts['form'], $atts['entry_id'], $atts );
	2244	+ $atts['message'] = self::prepare_submit_message( $atts['form'], $atts['entry_id'] );
3436	2245
3437	2246	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		- }
	2247	+ self::show_form_after_submit( $atts );
3450	2248	} else {
3451		- self::show_lone_success_message( $atts );
	2249	+ self::show_lone_success_messsage( $atts );
3452	2250	}
3453	2251	}
3454	2252
3455	2253	/**
		@@ -3455,12 +2253,8 @@
3455	2253	/**
3456	2254	* Show an empty form
3457	2255	*
3458	2256	* @since 2.05
3459		- *
3460		- * @param array $args
3461		- *
3462		- * @return void
3463	2257	*/
3464	2258	private static function show_form_after_submit( $args ) {
3465	2259	self::fill_atts_for_form_display( $args );
3466	2260
		@@ -3479,11 +2273,12 @@
3479	2273	}
3480	2274	unset( $args );
3481	2275
3482	2276	$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	2277
	2278	+ $frm_settings = FrmAppHelper::get_settings();
	2279	+ $submit = isset( $form->options['submit_value'] ) ? $form->options['submit_value'] : $frm_settings->submit_value;
	2280	+
3486	2281	global $frm_vars;
3487	2282	self::maybe_load_css( $form, $values['custom_style'], $frm_vars['load_css'] );
3488	2283
3489	2284	$message_placement = self::message_placement( $form, $message );
		@@ -3491,36 +2286,27 @@
3491	2286	include FrmAppHelper::plugin_path() . '/classes/views/frm-entries/new.php';
3492	2287	}
3493	2288
3494	2289	/**
3495		- * Gets message placement.
	2290	+ * @return string - 'before', 'after', or 'submit'
3496	2291	*
3497	2292	* @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	2293	*/
3505		- public static function message_placement( $form, $message ) {
	2294	+ private static function message_placement( $form, $message ) {
3506	2295	$place = 'before';
3507	2296
3508	2297	if ( $message && isset( $form->options['form_class'] ) ) {
3509		- if ( str_contains( $form->options['form_class'], 'frm_below_success' ) ) {
	2298	+ if ( strpos( $form->options['form_class'], 'frm_below_success' ) !== false ) {
3510	2299	$place = 'after';
3511		- } elseif ( str_contains( $form->options['form_class'], 'frm_inline_success' ) ) {
	2300	+ } elseif ( strpos( $form->options['form_class'], 'frm_inline_success' ) !== false ) {
3512	2301	$place = 'submit';
3513	2302	}
3514	2303	}
3515	2304
3516	2305	/**
3517		- * Filter the message placement.
	2306	+ * @return string - 'before' or 'after'
3518	2307	*
3519	2308	* @since 4.05.02
3520		- *
3521		- * @param string $place Accepts 'before', 'after', or 'submit'.
3522		- * @param array $args Args.
3523	2309	*/
3524	2310	return apply_filters( 'frm_message_placement', $place, compact( 'form', 'message' ) );
3525	2311	}
3526	2312
		@@ -3527,22 +2313,10 @@
3527	2313	/**
3528	2314	* Get all the values needed on the new.php entry page
3529	2315	*
3530	2316	* @since 2.05
3531		- *
3532		- * @param array $args
3533		- *
3534		- * @return void
3535	2317	*/
3536	2318	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	2319	$defaults = array(
3546	2320	'errors' => array(),
3547	2321	'message' => '',
3548	2322	'fields' => array(),
		@@ -3557,24 +2331,21 @@
3557	2331	/**
3558	2332	* Show the success message without the form
3559	2333	*
3560	2334	* @since 2.05
3561		- *
3562		- * @param array $atts
3563		- *
3564		- * @return void
3565	2335	*/
3566		- private static function show_lone_success_message( $atts ) {
	2336	+ private static function show_lone_success_messsage( $atts ) {
3567	2337	global $frm_vars;
3568	2338	$values = FrmEntriesHelper::setup_new_vars( $atts['fields'], $atts['form'], true );
3569	2339	self::maybe_load_css( $atts['form'], $values['custom_style'], $frm_vars['load_css'] );
3570	2340
3571	2341	$include_extra_container = 'frm_forms' . FrmFormsHelper::get_form_style_class( $values );
3572		- $errors = array();
3573		- $form = $atts['form'];
3574		- $message = $atts['message'];
3575	2342
3576		- include FrmAppHelper::plugin_path() . '/classes/views/frm-entries/errors.php';
	2343	+ $errors = array();
	2344	+ $form = $atts['form'];
	2345	+ $message = $atts['message'];
	2346	+
	2347	+ include( FrmAppHelper::plugin_path() . '/classes/views/frm-entries/errors.php' );
3577	2348	}
3578	2349
3579	2350	/**
3580	2351	* Prepare the success message before it's shown
		@@ -3579,22 +2350,14 @@
3579	2350	/**
3580	2351	* Prepare the success message before it's shown
3581	2352	*
3582	2353	* @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	2354	*/
3591		- private static function prepare_submit_message( $form, $entry_id, $args = array() ) {
	2355	+ private static function prepare_submit_message( $form, $entry_id ) {
3592	2356	$frm_settings = FrmAppHelper::get_settings( array( 'current_form' => $form->id ) );
3593		- $opt = $args['success_opt'] ?? 'success';
3594	2357
3595	2358	if ( $entry_id && is_numeric( $entry_id ) ) {
3596		- $message = $form->options[ $opt . '_msg' ] ?? $frm_settings->success_msg;
	2359	+ $message = isset( $form->options['success_msg'] ) ? $form->options['success_msg'] : $frm_settings->success_msg;
3597	2360	$class = 'frm_message';
3598	2361	} else {
3599	2362	$message = $frm_settings->failed_msg;
3600	2363	$class = FrmFormsHelper::form_error_class();
		@@ -3604,16 +2367,13 @@
3604	2367
3605	2368	return apply_filters( 'frm_main_feedback', $message, $form, $entry_id );
3606	2369	}
3607	2370
3608		- /**
3609		- * @return void
3610		- */
3611	2371	public static function front_head() {
3612	2372	$version = FrmAppHelper::plugin_version();
3613	2373	$suffix = FrmAppHelper::js_suffix();
3614	2374
3615		- if ( $suffix && self::has_combo_js_file() ) {
	2375	+ if ( ! empty( $suffix ) && self::has_combo_js_file() ) {
3616	2376	wp_register_script( 'formidable', FrmAppHelper::plugin_url() . '/js/frm.min.js', array( 'jquery' ), $version, true );
3617	2377	} else {
3618	2378	wp_register_script( 'formidable', FrmAppHelper::plugin_url() . "/js/formidable{$suffix}.js", array( 'jquery' ), $version, true );
3619	2379	}
		@@ -3620,9 +2380,9 @@
3620	2380
3621	2381	add_filter( 'script_loader_tag', 'FrmFormsController::defer_script_loading', 10, 2 );
3622	2382
3623	2383	if ( FrmAppHelper::is_admin() ) {
3624		- // Don't load this in back-end
	2384	+ // don't load this in back-end
3625	2385	return;
3626	2386	}
3627	2387
3628	2388	FrmAppHelper::localize_script( 'front' );
		@@ -3635,15 +2395,8 @@
3635	2395	public static function has_combo_js_file() {
3636	2396	return is_readable( FrmAppHelper::plugin_path() . '/js/frm.min.js' );
3637	2397	}
3638	2398
3639		- /**
3640		- * @param object $form
3641		- * @param int|string $this_load
3642		- * @param bool $global_load
3643		- *
3644		- * @return void
3645		- */
3646	2399	public static function maybe_load_css( $form, $this_load, $global_load ) {
3647	2400	$load_css = FrmForm::is_form_loaded( $form, $this_load, $global_load );
3648	2401
3649	2402	if ( ! $load_css ) {
		@@ -3673,9 +2426,8 @@
3673	2426	return;
3674	2427	}
3675	2428
3676	2429	global $wp_styles;
3677		-
3678	2430	if ( is_array( $wp_styles->queue ) && in_array( 'formidable', $wp_styles->queue, true ) ) {
3679	2431	wp_print_styles( 'formidable' );
3680	2432	}
3681	2433	}
		@@ -3690,57 +2442,32 @@
3690	2442	private static function should_load_late() {
3691	2443	return ! function_exists( 'aioseo' );
3692	2444	}
3693	2445
3694		- /**
3695		- * @param string $tag
3696		- * @param string $handle
3697		- *
3698		- * @return string
3699		- */
3700	2446	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 );
	2447	+ if ( 'captcha-api' == $handle && ! strpos( $tag, 'defer' ) ) {
	2448	+ $tag = str_replace( ' src', ' defer="defer" async="async" src', $tag );
3703	2449	}
3704	2450
3705	2451	return $tag;
3706	2452	}
3707	2453
3708		- /**
3709		- * @param string $location
3710		- *
3711		- * @return void
3712		- */
3713	2454	public static function footer_js( $location = 'footer' ) {
3714	2455	global $frm_vars;
3715	2456
3716	2457	FrmStylesController::enqueue_css();
3717	2458
3718		- if ( FrmAppHelper::is_admin() || $location === 'header' || empty( $frm_vars['forms_loaded'] ) ) {
3719		- return;
	2459	+ if ( ! FrmAppHelper::is_admin() && $location != 'header' && ! empty( $frm_vars['forms_loaded'] ) ) {
	2460	+ // load formidable js
	2461	+ wp_enqueue_script( 'formidable' );
3720	2462	}
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	2463	}
3732	2464
3733	2465	/**
3734	2466	* @since 2.0.8
3735		- *
3736		- * @param array $atts
3737		- * @param string $content
3738		- *
3739		- * @return void
3740	2467	*/
3741	2468	private static function maybe_minimize_form( $atts, &$content ) {
3742		- // Check if minimizing is turned on
	2469	+ // check if minimizing is turned on
3743	2470	if ( self::is_minification_on( $atts ) ) {
3744	2471	$content = str_replace( array( "\r\n", "\r", "\n", "\t", ' ' ), '', $content );
3745	2472	}
3746	2473	}
		@@ -3746,15 +2473,12 @@
3746	2473	}
3747	2474
3748	2475	/**
3749	2476	* @since 2.0.8
3750		- *
3751		- * @param array $atts
3752		- *
3753		- * @return bool
	2477	+ * @return boolean
3754	2478	*/
3755	2479	private static function is_minification_on( $atts ) {
3756		- return ! empty( $atts['minimize'] );
	2480	+ return isset( $atts['minimize'] ) && ! empty( $atts['minimize'] );
3757	2481	}
3758	2482
3759	2483	/**
3760	2484	* @since 5.0.16
		@@ -3762,13 +2486,11 @@
3762	2486	* @return void
3763	2487	*/
3764	2488	public static function landing_page_preview_option() {
3765	2489	$dir = apply_filters( 'frm_landing_page_preview_option', false );
3766		-
3767	2490	if ( false === $dir || ! file_exists( $dir . 'landing-page-preview-option.php' ) ) {
3768	2491	$dir = self::get_form_views_path();
3769	2492	}
3770		-
3771	2493	include $dir . 'landing-page-preview-option.php';
3772	2494	}
3773	2495
3774	2496	/**
		@@ -3784,9 +2506,9 @@
3784	2506	* Create a page with an embedded formidable Gutenberg block.
3785	2507	*
3786	2508	* @since 5.2
3787	2509	*
3788		- * @return void
	2510	+ * @return never
3789	2511	*/
3790	2512	public static function create_page_with_shortcode() {
3791	2513	if ( ! current_user_can( 'publish_posts' ) ) {
3792	2514	die( 0 );
		@@ -3794,15 +2516,13 @@
3794	2516
3795	2517	check_ajax_referer( 'frm_ajax', 'nonce' );
3796	2518
3797	2519	$type = FrmAppHelper::get_post_param( 'type', '', 'sanitize_text_field' );
3798		-
3799	2520	if ( ! $type || ! in_array( $type, array( 'form', 'view' ), true ) ) {
3800	2521	die( 0 );
3801	2522	}
3802	2523
3803	2524	$object_id = FrmAppHelper::get_post_param( 'object_id', '', 'absint' );
3804		-
3805	2525	if ( ! $object_id ) {
3806	2526	die( 0 );
3807	2527	}
3808	2528
		@@ -3814,15 +2534,13 @@
3814	2534	$postarr['post_content'] = apply_filters( 'frm_create_page_with_' . $type . '_shortcode_content', '', $object_id );
3815	2535	}
3816	2536
3817	2537	$name = FrmAppHelper::get_post_param( 'name', '', 'sanitize_text_field' );
3818		-
3819	2538	if ( $name ) {
3820	2539	$postarr['post_title'] = $name;
3821	2540	}
3822	2541
3823	2542	$success = wp_insert_post( $postarr );
3824		-
3825	2543	if ( ! is_numeric( $success ) || ! $success ) {
3826	2544	die( 0 );
3827	2545	}
3828	2546
		@@ -3835,10 +2553,10 @@
3835	2553
3836	2554	/**
3837	2555	* @since 5.3
3838	2556	*
3839		- * @param int $form_id
3840		- *
	2557	+ * @param string $content
	2558	+ * @param int $form_id
3841	2559	* @return string
3842	2560	*/
3843	2561	private static function get_page_shortcode_content_for_form( $form_id ) {
3844	2562	$shortcode = '[formidable id="' . $form_id . '"]';
		@@ -3849,9 +2567,9 @@
3849	2567
3850	2568	/**
3851	2569	* Get page dropdown for AJAX request for embedding form in an existing page.
3852	2570	*
3853		- * @return void
	2571	+ * @return never
3854	2572	*/
3855	2573	public static function get_page_dropdown() {
3856	2574	if ( ! current_user_can( 'publish_posts' ) ) {
3857	2575	die( 0 );
		@@ -3858,10 +2576,10 @@
3858	2576	}
3859	2577
3860	2578	check_ajax_referer( 'frm_ajax', 'nonce' );
3861	2579
3862		- $html = FrmAppHelper::clip(
3863		- function () {
	2580	+ $html = FrmAppHelper::clip(
	2581	+ function() {
3864	2582	FrmAppHelper::maybe_autocomplete_pages_options(
3865	2583	array(
3866	2584	'field_name' => 'frm_page_dropdown',
3867	2585	'page_id' => '',
		@@ -3869,66 +2587,76 @@
3869	2587	)
3870	2588	);
3871	2589	}
3872	2590	);
	2591	+ $post_type_object = get_post_type_object( 'page' );
3873	2592	wp_send_json(
3874	2593	array(
3875	2594	'html' => $html,
3876		- 'edit_page_url' => admin_url( sprintf( get_post_type_object( 'page' )->_edit_link . '&action=edit', 0 ) ),
	2595	+ 'edit_page_url' => admin_url( sprintf( $post_type_object->_edit_link . '&action=edit', 0 ) ),
3877	2596	)
3878	2597	);
3879	2598	}
3880	2599
3881	2600	/**
3882		- * Prints necessary templates for the forms list page.
3883		- *
3884		- * @since 6.32
3885		- *
3886		- * @return void
	2601	+ * @deprecated 4.0
3887	2602	*/
3888		- public static function print_forms_list_templates() {
3889		- if ( ! FrmAppHelper::on_form_listing_page() ) {
3890		- return;
3891		- }
	2603	+ public static function new_form( $values = array() ) {
	2604	+ FrmDeprecated::new_form( $values );
	2605	+ }
3892	2606
3893		- $screen = get_current_screen();
	2607	+ /**
	2608	+ * @deprecated 4.0
	2609	+ */
	2610	+ public static function create( $values = array() ) {
	2611	+ _deprecated_function( __METHOD__, '4.0', 'FrmFormsController::update' );
	2612	+ self::update( $values );
	2613	+ }
3894	2614
3895		- if ( ! $screen ) {
3896		- return;
3897		- }
	2615	+ /**
	2616	+ * @deprecated 1.07.05
	2617	+ * @codeCoverageIgnore
	2618	+ */
	2619	+ public static function add_default_templates( $path, $default = true, $template = true ) {
	2620	+ FrmDeprecated::add_default_templates( $path, $default, $template );
	2621	+ }
3898	2622
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();
	2623	+ /**
	2624	+ * @deprecated 3.0
	2625	+ * @codeCoverageIgnore
	2626	+ */
	2627	+ public static function bulk_create_template( $ids ) {
	2628	+ return FrmDeprecated::bulk_create_template( $ids );
	2629	+ }
3904	2630
3905		- if ( $per_page < 1 ) {
3906		- $per_page = 20;
3907		- }
	2631	+ /**
	2632	+ * @deprecated 2.03
	2633	+ * @codeCoverageIgnore
	2634	+ */
	2635	+ public static function register_pro_scripts() {
	2636	+ FrmDeprecated::register_pro_scripts();
	2637	+ }
3908	2638
3909		- include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/forms-list-settings.php';
	2639	+ /**
	2640	+ * @deprecated 3.0
	2641	+ * @codeCoverageIgnore
	2642	+ */
	2643	+ public static function edit_key() {
	2644	+ FrmDeprecated::edit_key();
3910	2645	}
3911	2646
3912	2647	/**
3913		- * @deprecated 4.0
3914		- *
3915		- * @param array $values
3916		- *
3917		- * @return void
	2648	+ * @deprecated 3.0
	2649	+ * @codeCoverageIgnore
3918	2650	*/
3919		- public static function create( $values = array() ) {
3920		- _deprecated_function( __METHOD__, '4.0', 'FrmFormsController::update' );
3921		- self::update( $values );
	2651	+ public static function edit_description() {
	2652	+ FrmDeprecated::edit_description();
3922	2653	}
3923	2654
3924	2655	/**
3925		- * @deprecated 6.33
3926		- *
3927		- * @param array $values
3928		- *
3929		- * @return void
	2656	+ * @deprecated 4.08
	2657	+ * @since 3.06
3930	2658	*/
3931		- public static function render_spam_settings( $values ) {
3932		- _deprecated_function( __METHOD__, '6.33' );
	2659	+ public static function add_new() {
	2660	+ _deprecated_function( __FUNCTION__, '4.08' );
3933	2661	}
3934	2662	}