← All changes | classes/controllers/FrmFormsController.php +605 -1963 6.29 → 5.1 View file →

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