← All changes | classes/controllers/FrmFormsController.php +593 -1998 6.30 → 5.0.14 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,45 +121,30 @@
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
270		- $antispam_was_on = self::antispam_was_on( $id ); // phpcs:ignore Formidable.CodeAnalysis.InlineSingleUseVariable
	142	+ $antispam_was_on = self::antispam_was_on( $id );
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,26 +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		- $icon = apply_filters( 'frm_media_icon', FrmAppHelper::svg_logo() );
1077		- self::$formidable_tinymce_button = '<a href="#TB_inline?width=50&height=50&inlineId=frm_insert_form" class="thickbox button add_media frm_insert_form" title="' . esc_attr__( 'Add forms and content', 'formidable' ) . '">' . FrmAppHelper::kses( $icon, 'all' ) . ' ' . esc_html( FrmAppHelper::get_menu_name() ) . '</a>'; // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong
	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>';
1078	651	}
1079		- echo self::$formidable_tinymce_button; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
1080	652	}
1081	653
1082	654	/**
1083	655	* @return void
		@@ -1098,27 +670,23 @@
1098	670	$shortcodes = apply_filters( 'frm_popup_shortcodes', $shortcodes );
1099	671
1100	672	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/insert_form_popup.php';
1101	673
1102		- if ( ! FrmAppHelper::is_form_builder_page() || class_exists( '_WP_Editors', false ) ) {
1103		- 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
1104	682	}
1105		-
1106		- // Initialize a wysiwyg so we have usable settings defined in tinyMCEPreInit.mceInit
1107		- require ABSPATH . WPINC . '/class-wp-editor.php';
1108		- // phpcs:disable Generic.WhiteSpace.ScopeIndent
1109		- ?>
1110		- <div class="frm_hidden">
1111		- <?php wp_editor( '', 'frm_description_placeholder', array() ); ?>
1112		- </div>
1113		- <?php
1114		- // phpcs:enable Generic.WhiteSpace.ScopeIndent
1115	683	}
1116	684
1117	685	/**
1118	686	* Check the page being loaded, determine if this is a page that should include the form popup.
1119	687	*
1120		- * @since 5.0.14
	688	+ * @since x.x
1121	689	*
1122	690	* @return bool
1123	691	*/
1124	692	private static function should_insert_form_popup() {
		@@ -1124,9 +692,8 @@
1124	692	private static function should_insert_form_popup() {
1125	693	if ( FrmAppHelper::is_form_builder_page() ) {
1126	694	return true;
1127	695	}
1128		-
1129	696	$page = basename( FrmAppHelper::get_server_value( 'PHP_SELF' ) );
1130	697	return in_array( $page, array( 'post.php', 'page.php', 'page-new.php', 'post-new.php' ), true );
1131	698	}
1132	699
		@@ -1134,10 +701,9 @@
1134	701	FrmAppHelper::permission_check( 'frm_view_forms' );
1135	702	check_ajax_referer( 'frm_ajax', 'nonce' );
1136	703
1137	704	$shortcode = FrmAppHelper::get_post_param( 'shortcode', '', 'sanitize_text_field' );
1138		-
1139		- if ( ! $shortcode ) {
	705	+ if ( empty( $shortcode ) ) {
1140	706	wp_die();
1141	707	}
1142	708
1143	709	echo '<div id="sc-opts-' . esc_attr( $shortcode ) . '" class="frm_shortcode_option">';
		@@ -1162,18 +728,17 @@
1162	728	'label' => __( 'Minimize form HTML', 'formidable' ),
1163	729	),
1164	730	);
1165	731	}
1166		-
1167	732	$opts = apply_filters( 'frm_sc_popup_opts', $opts, $shortcode );
1168	733
1169	734	if ( isset( $opts['form_id'] ) && is_string( $opts['form_id'] ) ) {
1170		- // Allow other shortcodes to use the required form id option
	735	+ // allow other shortcodes to use the required form id option
1171	736	$form_id = $opts['form_id'];
1172	737	unset( $opts['form_id'] );
1173	738	}
1174	739
1175		- include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/shortcode_opts.php';
	740	+ include( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/shortcode_opts.php' );
1176	741
1177	742	echo '</div>';
1178	743
1179	744	wp_die();
		@@ -1178,70 +743,56 @@
1178	743
1179	744	wp_die();
1180	745	}
1181	746
1182		- /**
1183		- * Display list of forms in a table.
1184		- *
1185		- * @param array $params
1186		- * @param string $message
1187		- * @param array $errors
1188		- *
1189		- * @return void
1190		- */
1191	747	public static function display_forms_list( $params = array(), $message = '', $errors = array() ) {
1192	748	FrmAppHelper::permission_check( 'frm_view_forms' );
1193	749
1194	750	global $wpdb, $frm_vars;
1195	751
1196		- if ( ! $params ) {
	752	+ if ( empty( $params ) ) {
1197	753	$params = FrmForm::list_page_params();
1198	754	}
1199	755
1200		- /**
1201		- * @since 5.3.1
1202		- *
1203		- * @param string $table_class Class name for List Helper.
1204		- */
1205		- $table_class = apply_filters( 'frm_forms_list_class', 'FrmFormsListHelper' );
1206		- $wp_list_table = new $table_class( compact( 'params' ) );
1207		- $pagenum = $wp_list_table->get_pagenum();
	756	+ $wp_list_table = new FrmFormsListHelper( compact( 'params' ) );
1208	757
	758	+ $pagenum = $wp_list_table->get_pagenum();
	759	+
1209	760	$wp_list_table->prepare_items();
1210	761
1211	762	$total_pages = $wp_list_table->get_pagination_arg( 'total_pages' );
1212		-
1213	763	if ( $pagenum > $total_pages && $total_pages > 0 ) {
1214		- wp_safe_redirect( esc_url_raw( add_query_arg( 'paged', $total_pages ) ) );
	764	+ wp_redirect( esc_url_raw( add_query_arg( 'paged', $total_pages ) ) );
1215	765	die();
1216	766	}
1217	767
1218		- $error = FrmInbox::check_for_error();
1219		-
1220		- if ( $error ) {
1221		- $show_messages = array( $error['subject'] . '. ' . $error['message'] );
1222		- }
1223		-
1224		- require FrmAppHelper::plugin_path() . '/classes/views/frm-forms/list.php';
	768	+ require( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/list.php' );
1225	769	}
1226	770
1227		- /**
1228		- * @param array<string,string> $columns
1229		- *
1230		- * @return array<string,string>
1231		- */
1232	771	public static function get_columns( $columns ) {
1233		- $columns['cb'] = '<input type="checkbox" />';
1234		- $columns['name'] = esc_html__( 'Form Title', 'formidable' );
1235		- $columns['entries'] = esc_html__( 'Entries', 'formidable' );
1236		- $columns['id'] = 'ID';
1237		- $columns['form_key'] = esc_html__( 'Key', 'formidable' );
	772	+ $columns['cb'] = '<input type="checkbox" />';
	773	+ $columns['id'] = 'ID';
1238	774
1239		- if ( 'trash' !== FrmAppHelper::simple_get( 'form_type' ) ) {
1240		- $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' );
1241	792	}
1242	793
1243		- $columns['created_at'] = esc_html__( 'Date', 'formidable' );
	794	+ $columns['created_at'] = __( 'Date', 'formidable' );
1244	795
1245	796	add_screen_option(
1246	797	'per_page',
1247	798	array(
		@@ -1253,11 +804,8 @@
1253	804
1254	805	return $columns;
1255	806	}
1256	807
1257		- /**
1258		- * @return array<string,string>
1259		- */
1260	808	public static function get_sortable_columns() {
1261	809	return array(
1262	810	'id' => 'id',
1263	811	'name' => 'name',
		@@ -1266,18 +814,9 @@
1266	814	'created_at' => 'created_at',
1267	815	);
1268	816	}
1269	817
1270		- /**
1271		- * @param mixed $hidden_columns
1272		- *
1273		- * @return array
1274		- */
1275	818	public static function hidden_columns( $hidden_columns ) {
1276		- if ( ! is_array( $hidden_columns ) ) {
1277		- $hidden_columns = array();
1278		- }
1279		-
1280	819	$type = FrmAppHelper::get_simple_request(
1281	820	array(
1282	821	'param' => 'form_type',
1283	822	'type' => 'request',
		@@ -1291,18 +830,11 @@
1291	830
1292	831	return $hidden_columns;
1293	832	}
1294	833
1295		- /**
1296		- * @param mixed $save
1297		- * @param string $option
1298		- * @param int|string $value
1299		- *
1300		- * @return mixed
1301		- */
1302	834	public static function save_per_page( $save, $option, $value ) {
1303		- if ( $option === 'formidable_page_formidable_per_page' ) {
1304		- return (int) $value;
	835	+ if ( $option == 'formidable_page_formidable_per_page' ) {
	836	+ $save = (int) $value;
1305	837	}
1306	838
1307	839	return $save;
1308	840	}
		@@ -1307,63 +839,153 @@
1307	839	return $save;
1308	840	}
1309	841
1310	842	/**
1311		- * @param int|string $id
1312		- * @param array $errors
1313		- * @param string $message
1314		- * @param bool $create_link
1315		- *
1316		- * @return void
	843	+ * @return bool
1317	844	*/
1318		- private static function get_edit_vars( $id, $errors = array(), $message = '', $create_link = false ) {
1319		- global $frm_vars;
	845	+ public static function expired() {
	846	+ global $frm_expired;
	847	+ return $frm_expired;
	848	+ }
1320	849
1321		- $form = FrmForm::getOne( $id );
1322		- $error_args = array(
1323		- 'title' => __( 'You can\'t edit the form', 'formidable' ),
1324		- 'body' => __( 'You are trying to edit a form that does not exist', 'formidable' ),
1325		- 'cancel_url' => admin_url( 'admin.php?page=formidable' ),
1326		- 'continue_url' => add_query_arg(
1327		- array(
1328		- 'page' => 'formidable',
1329		- )
1330		- ),
	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	+ }
1331	912	);
1332	913
1333		- if ( ! $form ) {
1334		- FrmAppController::show_error_modal( $error_args );
1335		- 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	+ }
1336	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	+ }
1337	946
1338		- if ( 'trash' === $form->status ) {
1339		- $error_args['body'] = __( 'The form you\'re trying to edit is in trash. You must restore it first before you can make changes', 'formidable' );
1340		- $error_args['continue_url'] = add_query_arg(
1341		- array(
1342		- 'page' => 'formidable',
1343		- '_wpnonce' => wp_create_nonce( 'untrash_form_' . $id ),
1344		- 'form_type' => 'trash',
1345		- 'frm_action' => 'untrash',
1346		- 'id' => $id,
1347		- )
	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,
1348	962	);
1349		- $error_args['continue_text'] = __( 'Restore form', 'formidable' );
1350		- FrmAppController::show_error_modal( $error_args );
1351		- return;
	963	+ array_unshift( $templates, $template );
	964	+ unset( $template );
1352	965	}
	966	+ }
1353	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	+
1354	976	if ( $form->parent_form_id ) {
1355	977	/* translators: %1$s: Start link HTML, %2$s: End link HTML */
1356		- 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>' ) );
1357	979	}
1358	980
1359	981	$frm_field_selection = FrmField::field_selection();
1360		- $fields = FrmField::get_all_for_form( $form->id );
1361	982
	983	+ $fields = FrmField::get_all_for_form( $form->id );
	984	+
1362	985	// Automatically add end section fields if they don't exist (2.0 migration).
1363	986	$reset_fields = false;
1364	987	FrmFormsHelper::auto_add_end_section_fields( $form, $fields, $reset_fields );
1365		- FrmSubmitHelper::maybe_create_submit_field( $form, $fields, $reset_fields );
1366	988
1367	989	if ( $reset_fields ) {
1368	990	$fields = FrmField::get_all_for_form( $form->id, '', 'exclude' );
1369	991	}
		@@ -1383,61 +1005,27 @@
1383	1005	*/
1384	1006	$values['fields'] = apply_filters( 'frm_fields_in_form_builder', $fields, compact( 'form' ) );
1385	1007
1386	1008	$edit_message = __( 'Form was successfully updated.', 'formidable' );
1387		-
1388		- if ( $form->is_template && $message === $edit_message ) {
	1009	+ if ( $form->is_template && $message == $edit_message ) {
1389	1010	$message = __( 'Template was successfully updated.', 'formidable' );
1390	1011	}
1391	1012
1392		- 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'] );
1393	1015
1394		- $has_fields = ! empty( $values['fields'] ) && ! FrmSubmitHelper::only_contains_submit_field( $values['fields'] );
1395		-
1396	1016	if ( defined( 'DOING_AJAX' ) ) {
1397	1017	wp_die();
	1018	+ } else {
	1019	+ require( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/edit.php' );
1398	1020	}
1399		-
1400		- require FrmAppHelper::plugin_path() . '/classes/views/frm-forms/edit.php';
1401	1021	}
1402	1022
1403		- /**
1404		- * @param array $fields
1405		- *
1406		- * @return array
1407		- */
1408		- public static function update_form_builder_fields( $fields ) {
1409		- foreach ( $fields as $field ) {
1410		- $field->do_not_include_icons = true;
1411		- }
1412		- return $fields;
1413		- }
1414		-
1415		- /**
1416		- * @param string $message
1417		- *
1418		- * @return void
1419		- */
1420		- public static function maybe_update_form_builder_message( &$message ) {
1421		- if ( 'form_duplicated' === FrmAppHelper::simple_get( 'message' ) ) {
1422		- $message = __( 'Form was Successfully Copied', 'formidable' );
1423		- }
1424		- }
1425		-
1426		- /**
1427		- * @param int|string $id
1428		- * @param array $errors
1429		- * @param array|string $args
1430		- *
1431		- * @return void
1432		- */
1433	1023	public static function get_settings_vars( $id, $errors = array(), $args = array() ) {
1434	1024	FrmAppHelper::permission_check( 'frm_edit_forms' );
1435	1025
1436	1026	global $frm_vars;
1437	1027
1438		- self::maybe_print_media_templates();
1439		-
1440	1028	if ( ! is_array( $args ) ) {
1441	1029	// For reverse compatibility.
1442	1030	$args = array(
1443	1031	'message' => $args,
		@@ -1450,12 +1038,13 @@
1450	1038	);
1451	1039	$args = array_merge( $defaults, $args );
1452	1040	$message = $args['message'];
1453	1041	$warnings = $args['warnings'];
1454		- $form = FrmForm::getOne( $id );
1455		- $fields = FrmField::get_all_for_form( $id );
1456		- $values = FrmAppHelper::setup_edit_vars( $form, 'forms', $fields, true );
1457	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	+
1458	1047	/**
1459	1048	* Allows changing fields in the form settings.
1460	1049	*
1461	1050	* @since 5.0.04
		@@ -1469,42 +1058,17 @@
1469	1058
1470	1059	$sections = self::get_settings_tabs( $values );
1471	1060	$current = FrmAppHelper::simple_get( 't', 'sanitize_title', 'advanced_settings' );
1472	1061
1473		- require FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings.php';
	1062	+ require( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings.php' );
1474	1063	}
1475	1064
1476	1065	/**
1477		- * 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.
1478		- *
1479		- * @since 6.10
1480		- *
1481		- * @return void
1482		- */
1483		- private static function maybe_print_media_templates() {
1484		- if ( FrmAppHelper::pro_is_included() ) {
1485		- // This issue does not exist when Pro is active so exit early.
1486		- return;
1487		- }
1488		-
1489		- add_action(
1490		- 'wp_enqueue_editor',
1491		- function () {
1492		- wp_print_media_templates();
1493		- }
1494		- );
1495		- }
1496		-
1497		- /**
1498	1066	* @since 4.0
1499		- *
1500		- * @param array $atts
1501		- *
1502		- * @return void
1503	1067	*/
1504	1068	public static function form_publish_button( $atts ) {
1505	1069	$values = $atts['values'];
1506		- include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/_publish_box.php';
	1070	+ include( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/_publish_box.php' );
1507	1071	}
1508	1072
1509	1073	/**
1510	1074	* Get a list of all the settings tabs for the form settings page.
		@@ -1511,9 +1075,8 @@
1511	1075	*
1512	1076	* @since 4.0
1513	1077	*
1514	1078	* @param array $values
1515		- *
1516	1079	* @return array
1517	1080	*/
1518	1081	private static function get_settings_tabs( $values ) {
1519	1082	$sections = array(
		@@ -1519,99 +1082,62 @@
1519	1082	$sections = array(
1520	1083	'advanced' => array(
1521	1084	'name' => __( 'General', 'formidable' ),
1522	1085	'title' => __( 'General Form Settings', 'formidable' ),
1523		- 'function' => array( self::class, 'advanced_settings' ),
1524		- 'icon' => 'frmfont frm_settings_icon',
	1086	+ 'function' => array( __CLASS__, 'advanced_settings' ),
	1087	+ 'icon' => 'frm_icon_font frm_settings_icon',
1525	1088	),
1526	1089	'email' => array(
1527	1090	'name' => __( 'Actions & Notifications', 'formidable' ),
1528	1091	'function' => array( 'FrmFormActionsController', 'email_settings' ),
1529	1092	'id' => 'frm_notification_settings',
1530		- 'icon' => 'frmfont frm_mail_bulk_icon',
	1093	+ 'icon' => 'frm_icon_font frm_mail_bulk_icon',
1531	1094	),
1532	1095	'permissions' => array(
1533		- 'name' => __( 'Form Permissions', 'formidable' ),
1534		- 'icon' => 'frmfont frm_lock_closed_icon',
1535		- 'html_class' => 'frm_show_upgrade_tab frm_noallow',
1536		- 'data' => array(
1537		- 'medium' => 'permissions',
1538		- 'upgrade' => __( 'Form Permissions', 'formidable' ),
1539		- 'message' => __( 'Allow editing, protect forms and files, limit entries, and save drafts. Upgrade to get form and entry permissions.', 'formidable' ),
1540		- 'screenshot' => 'permissions.png',
1541		- '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' ),
1542	1103	),
1543	1104	),
1544		- 'scheduling' => array(
1545		- 'name' => __( 'Form Scheduling', 'formidable' ),
1546		- 'icon' => 'frmfont frm_calendar_icon',
1547		- 'html_class' => 'frm_show_upgrade_tab frm_noallow',
1548		- 'data' => array(
1549		- 'medium' => 'scheduling',
1550		- 'upgrade' => __( 'Form scheduling settings', 'formidable' ),
1551		- 'screenshot' => 'scheduling.png',
1552		- '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' ),
1553	1112	),
1554	1113	),
1555	1114	'buttons' => array(
1556		- 'name' => __( 'Buttons', 'formidable' ),
1557		- 'class' => self::class,
	1115	+ 'name' => __( 'Styling & Buttons', 'formidable' ),
	1116	+ 'class' => __CLASS__,
1558	1117	'function' => 'buttons_settings',
1559		- 'icon' => 'frmfont frm_button_icon',
	1118	+ 'icon' => 'frm_icon_font frm_pallet_icon',
1560	1119	),
1561		- 'landing' => array(
1562		- 'name' => __( 'Form Landing Page', 'formidable' ),
1563		- 'icon' => 'frmfont frm_file_text_icon',
1564		- 'html_class' => 'frm_show_upgrade_tab frm_noallow',
1565		- 'data' => FrmAppHelper::get_landing_page_upgrade_data_params(),
1566		- ),
1567		- 'chat' => array(
1568		- 'name' => __( 'Conversational Forms', 'formidable' ),
1569		- 'icon' => 'frmfont frm_chat_forms_icon',
1570		- 'html_class' => 'frm_show_upgrade_tab frm_noallow',
1571		- 'data' => FrmAppHelper::get_upgrade_data_params(
1572		- 'chat',
1573		- array(
1574		- 'upgrade' => __( 'Conversational Forms', 'formidable' ),
1575		- 'message' => __( 'Ask one question at a time for automated conversations.', 'formidable' ),
1576		- 'screenshot' => 'chat.png',
1577		- 'learn-more' => FrmAppHelper::get_doc_url( 'conversational-forms', 'conversational-forms-settings', false ),
1578		- )
1579		- ),
1580		- ),
1581		- 'abandonment' => array(
1582		- 'name' => __( 'Form Abandonment', 'formidable' ),
1583		- 'icon' => 'frmfont frm_abandoned_icon',
1584		- 'html_class' => 'frm_show_upgrade_tab frm_noallow',
1585		- 'data' => FrmAppHelper::get_upgrade_data_params(
1586		- 'abandonment',
1587		- array(
1588		- 'upgrade' => __( 'Form abandonment settings', 'formidable' ),
1589		- 'message' => __( 'Unlock the power of data capture to boost lead generation and master the art of form optimization.', 'formidable' ),
1590		- 'screenshot' => 'abandonment.png',
1591		- 'learn-more' => FrmAppHelper::get_doc_url( 'features/form-abandonment-wordpress-plugin', 'form-abandonment-settings', false ),
1592		- )
1593		- ),
1594		- ),
1595	1120	'html' => array(
1596	1121	'name' => __( 'Customize HTML', 'formidable' ),
1597		- 'class' => self::class,
	1122	+ 'class' => __CLASS__,
1598	1123	'function' => 'html_settings',
1599		- 'icon' => 'frmfont frm_code_icon',
	1124	+ 'icon' => 'frm_icon_font frm_code_icon',
1600	1125	),
1601	1126	);
1602	1127
1603		- if ( ! has_action( 'frm_add_form_style_tab_options' ) && ! has_action( 'frm_add_form_button_options' ) ) {
1604		- unset( $sections['buttons'] );
	1128	+ $sections = apply_filters( 'frm_add_form_settings_section', $sections, $values );
	1129	+
	1130	+ if ( FrmAppHelper::pro_is_installed() && ! FrmAppHelper::meets_min_pro_version( '4.0' ) ) {
	1131	+ // Prevent settings from showing in 2 spots.
	1132	+ unset( $sections['permissions'], $sections['scheduling'] );
1605	1133	}
1606	1134
1607		- $sections = apply_filters( 'frm_add_form_settings_section', $sections, $values );
1608		-
1609	1135	foreach ( $sections as $key => $section ) {
1610	1136	$defaults = array(
1611	1137	'html_class' => '',
1612	1138	'name' => ucfirst( $key ),
1613		- 'icon' => 'frmfont frm_settings_icon',
	1139	+ 'icon' => 'frm_icon_font frm_settings_icon',
1614	1140	);
1615	1141
1616	1142	$section = array_merge( $defaults, $section );
1617	1143
		@@ -1617,9 +1143,8 @@
1617	1143
1618	1144	if ( ! isset( $section['anchor'] ) ) {
1619	1145	$section['anchor'] = $key;
1620	1146	}
1621		-
1622	1147	$section['anchor'] .= '_settings';
1623	1148
1624	1149	if ( ! isset( $section['title'] ) ) {
1625	1150	$section['title'] = $section['name'];
		@@ -1629,9 +1154,9 @@
1629	1154	$section['id'] = $section['anchor'];
1630	1155	}
1631	1156
1632	1157	$sections[ $key ] = $section;
1633		- }//end foreach
	1158	+ }
1634	1159
1635	1160	return $sections;
1636	1161	}
1637	1162
		@@ -1638,26 +1163,23 @@
1638	1163	/**
1639	1164	* @since 4.0
1640	1165	*
1641	1166	* @param array $values
1642		- *
1643		- * @return void
1644	1167	*/
1645	1168	public static function advanced_settings( $values ) {
1646	1169	$first_h3 = 'frm_first_h3';
	1170	+
1647	1171	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings-advanced.php';
1648	1172	}
1649	1173
1650	1174	/**
1651	1175	* @param array $values
1652		- *
1653		- * @return void
1654	1176	*/
1655		- public static function render_spam_settings( $values ) {
	1177	+ private static function render_spam_settings( $values ) {
1656	1178	if ( function_exists( 'akismet_http_post' ) ) {
1657	1179	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/spam-settings/akismet.php';
1658	1180	}
1659		- include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/spam-settings/stopforumspam.php';
	1181	+ include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/spam-settings/honeypot.php';
1660	1182	include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/spam-settings/antispam.php';
1661	1183	}
1662	1184
1663	1185	/**
		@@ -1663,13 +1185,16 @@
1663	1185	/**
1664	1186	* @since 4.0
1665	1187	*
1666	1188	* @param array $values
1667		- *
1668		- * @return void
1669	1189	*/
1670	1190	public static function buttons_settings( $values ) {
1671		- include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings-buttons.php';
	1191	+ $styles = apply_filters( 'frm_get_style_opts', array() );
	1192	+
	1193	+ $frm_settings = FrmAppHelper::get_settings();
	1194	+ $no_global_style = $frm_settings->load_style === 'none';
	1195	+
	1196	+ include( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings-buttons.php' );
1672	1197	}
1673	1198
1674	1199	/**
1675	1200	* @since 4.0
		@@ -1674,13 +1199,11 @@
1674	1199	/**
1675	1200	* @since 4.0
1676	1201	*
1677	1202	* @param array $values
1678		- *
1679		- * @return void
1680	1203	*/
1681	1204	public static function html_settings( $values ) {
1682		- include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings-html.php';
	1205	+ include( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings-html.php' );
1683	1206	}
1684	1207
1685	1208	/**
1686	1209	* Replace old Submit Button href with new href to avoid errors in Chrome
		@@ -1686,11 +1209,9 @@
1686	1209	* Replace old Submit Button href with new href to avoid errors in Chrome
1687	1210	*
1688	1211	* @since 2.03.08
1689	1212	*
1690		- * @param array|bool $values
1691		- *
1692		- * @return void
	1213	+ * @param array|boolean $values
1693	1214	*/
1694	1215	private static function clean_submit_html( &$values ) {
1695	1216	if ( is_array( $values ) && isset( $values['submit_html'] ) ) {
1696	1217	$values['submit_html'] = str_replace( 'javascript:void(0)', '#', $values['submit_html'] );
		@@ -1696,33 +1217,9 @@
1696	1217	$values['submit_html'] = str_replace( 'javascript:void(0)', '#', $values['submit_html'] );
1697	1218	}
1698	1219	}
1699	1220
1700		- /**
1701		- * Updates classes used in submit and prev buttons to avoid conflict with twenty twenty-one theme.
1702		- *
1703		- * @param array $classes
1704		- *
1705		- * @return array
1706		- */
1707		- public static function update_button_classes( $classes ) {
1708		- if ( function_exists( 'twenty_twenty_one_setup' ) ) {
1709		- $classes[] = 'has-text-color has-background';
1710		- }
1711		-
1712		- return $classes;
1713		- }
1714		-
1715		- /**
1716		- * @since 6.27 Added $template_path parameter.
1717		- *
1718		- * @param int|string $form_id
1719		- * @param string $class
1720		- * @param string $template_path The path to a template file to use instead of the default.
1721		- *
1722		- * @return void
1723		- */
1724		- public static function mb_tags_box( $form_id, $class = '', $template_path = 'default' ) {
	1221	+ public static function mb_tags_box( $form_id, $class = '' ) {
1725	1222	$fields = FrmField::get_all_for_form( $form_id, '', 'include' );
1726	1223
1727	1224	/**
1728	1225	* Allows modifying the list of fields in the tags box.
		@@ -1731,30 +1228,23 @@
1731	1228	*
1732	1229	* @param array $fields The list of fields.
1733	1230	* @param array $args The arguments. Contains `form_id`.
1734	1231	*/
1735		- $fields = apply_filters( 'frm_fields_in_tags_box', $fields, compact( 'form_id' ) );
1736		- $linked_forms = array();
1737		- $col = 'one';
1738		- $settings_tab = FrmAppHelper::is_admin_page( 'formidable' );
	1232	+ $fields = apply_filters( 'frm_fields_in_tags_box', $fields, compact( 'form_id' ) );
	1233	+ $linked_forms = array();
	1234	+ $col = 'one';
	1235	+ $settings_tab = FrmAppHelper::is_admin_page( 'formidable' ) ? true : false;
	1236	+
1739	1237	$cond_shortcodes = apply_filters( 'frm_conditional_shortcodes', array() );
1740	1238	$entry_shortcodes = self::get_shortcode_helpers( $settings_tab );
	1239	+
1741	1240	$advanced_helpers = self::advanced_helpers( compact( 'fields', 'form_id' ) );
1742	1241
1743		- if ( 'default' === $template_path || ! file_exists( $template_path ) ) {
1744		- include FrmAppHelper::plugin_path() . '/classes/views/shared/mb_adv_info.php';
1745		- return;
1746		- }
1747		-
1748		- include $template_path;
	1242	+ include( FrmAppHelper::plugin_path() . '/classes/views/shared/mb_adv_info.php' );
1749	1243	}
1750	1244
1751	1245	/**
1752	1246	* @since 3.04.01
1753		- *
1754		- * @param array $atts
1755		- *
1756		- * @return array
1757	1247	*/
1758	1248	private static function advanced_helpers( $atts ) {
1759	1249	$advanced_helpers = array(
1760	1250	'default' => array(
		@@ -1763,12 +1253,10 @@
1763	1253	),
1764	1254	);
1765	1255
1766	1256	$user_fields = self::user_shortcodes();
1767		-
1768		- if ( $user_fields ) {
	1257	+ if ( ! empty( $user_fields ) ) {
1769	1258	$user_helpers = array();
1770		-
1771	1259	foreach ( $user_fields as $uk => $uf ) {
1772	1260	$user_helpers[ '|user_id| show="' . $uk . '"' ] = $uf;
1773	1261	unset( $uk, $uf );
1774	1262	}
		@@ -1773,9 +1261,9 @@
1773	1261	unset( $uk, $uf );
1774	1262	}
1775	1263
1776	1264	$advanced_helpers['user_id'] = array(
1777		- 'codes' => $user_helpers,
	1265	+ 'codes' => $user_helpers,
1778	1266	);
1779	1267	}
1780	1268
1781	1269	/**
		@@ -1782,9 +1270,8 @@
1782	1270	* Add extra helper shortcodes on the Advanced tab in form settings and views
1783	1271	*
1784	1272	* @since 3.04.01
1785	1273	*
1786		- * @param array $advanced_helpers
1787	1274	* @param array $atts - Includes fields and form_id
1788	1275	*/
1789	1276	return apply_filters( 'frm_advanced_helpers', $advanced_helpers, $atts );
1790	1277	}
		@@ -1793,10 +1280,8 @@
1793	1280	* Get an array of the options to display in the advanced tab
1794	1281	* of the customization panel
1795	1282	*
1796	1283	* @since 2.0.6
1797		- *
1798		- * @return array
1799	1284	*/
1800	1285	private static function get_advanced_shortcodes() {
1801	1286	$adv_shortcodes = array(
1802	1287	'x sep=", "' => array(
		@@ -1813,18 +1298,17 @@
1813	1298	'label' => __( 'No Auto P', 'formidable' ),
1814	1299	'title' => __( 'Do not automatically add any paragraphs or line breaks', 'formidable' ),
1815	1300	),
1816	1301	);
	1302	+ $adv_shortcodes = apply_filters( 'frm_advanced_shortcodes', $adv_shortcodes );
1817	1303
1818	1304	// __( 'Leave blank instead of defaulting to User Login', 'formidable' ) : blank=1
1819	1305
1820		- return apply_filters( 'frm_advanced_shortcodes', $adv_shortcodes );
	1306	+ return $adv_shortcodes;
1821	1307	}
1822	1308
1823	1309	/**
1824	1310	* @since 3.04.01
1825		- *
1826		- * @return array
1827	1311	*/
1828	1312	private static function user_shortcodes() {
1829	1313	$options = array(
1830	1314	'ID' => __( 'User ID', 'formidable' ),
		@@ -1843,12 +1327,8 @@
1843	1327	/**
1844	1328	* Get an array of the helper shortcodes to display in the customization panel
1845	1329	*
1846	1330	* @since 2.0.6
1847		- *
1848		- * @param bool $settings_tab
1849		- *
1850		- * @return array
1851	1331	*/
1852	1332	private static function get_shortcode_helpers( $settings_tab ) {
1853	1333	$entry_shortcodes = array(
1854	1334	'id' => __( 'Entry ID', 'formidable' ),
		@@ -1859,35 +1339,33 @@
1859	1339	'updated-at' => __( 'Entry updated', 'formidable' ),
1860	1340	'' => '',
1861	1341	'siteurl' => __( 'Site URL', 'formidable' ),
1862	1342	'sitename' => __( 'Site Name', 'formidable' ),
1863		- 'form_name' => __( 'Form Name', 'formidable' ),
1864	1343	);
1865	1344
1866		- $entry_shortcodes = array_merge( FrmShortcodeHelper::get_contextual_shortcode_values(), $entry_shortcodes );
1867		-
1868	1345	if ( ! FrmAppHelper::pro_is_installed() ) {
1869	1346	unset( $entry_shortcodes['post_id'] );
1870	1347	}
1871	1348
	1349	+ if ( $settings_tab ) {
	1350	+ $entry_shortcodes['default-message'] = __( 'Default Msg', 'formidable' );
	1351	+ $entry_shortcodes['default-html'] = __( 'Default HTML', 'formidable' );
	1352	+ $entry_shortcodes['default-plain'] = __( 'Default Plain', 'formidable' );
	1353	+ }
	1354	+
1872	1355	/**
1873	1356	* Use this hook to add or remove buttons in the helpers section
1874	1357	* in the customization panel
1875	1358	*
1876	1359	* @since 2.0.6
1877		- *
1878		- * @param array $entry_shortcodes
1879		- * @param bool $settings_tab
1880	1360	*/
1881		- return apply_filters( 'frm_helper_shortcodes', $entry_shortcodes, $settings_tab );
	1361	+ $entry_shortcodes = apply_filters( 'frm_helper_shortcodes', $entry_shortcodes, $settings_tab );
	1362	+
	1363	+ return $entry_shortcodes;
1882	1364	}
1883	1365
1884	1366	/**
1885		- * Insert the form class setting into the form.
1886		- *
1887		- * @param stdClass $form
1888		- *
1889		- * @return void
	1367	+ * Insert the form class setting into the form
1890	1368	*/
1891	1369	public static function form_classes( $form ) {
1892	1370	if ( isset( $form->options['form_class'] ) ) {
1893	1371	echo esc_attr( sanitize_text_field( $form->options['form_class'] ) );
		@@ -1896,12 +1374,8 @@
1896	1374	if ( ! empty( $form->options['js_validate'] ) ) {
1897	1375	echo ' frm_js_validate ';
1898	1376	self::add_js_validate_form_to_global_vars( $form );
1899	1377	}
1900		-
1901		- if ( FrmForm::is_ajax_on( $form ) ) {
1902		- echo ' frm_ajax_submit ';
1903		- }
1904	1378	}
1905	1379
1906	1380	/**
1907	1381	* @since 5.0.03
		@@ -1909,9 +1383,8 @@
1909	1383	* @param stdClass $form
1910	1384	*/
1911	1385	public static function add_js_validate_form_to_global_vars( $form ) {
1912	1386	global $frm_vars;
1913		-
1914	1387	if ( ! isset( $frm_vars['js_validate_forms'] ) ) {
1915	1388	$frm_vars['js_validate_forms'] = array();
1916	1389	}
1917	1390	$frm_vars['js_validate_forms'][ $form->id ] = $form;
		@@ -1922,28 +1395,18 @@
1922	1395	check_ajax_referer( 'frm_ajax', 'nonce' );
1923	1396
1924	1397	echo FrmEntriesController::show_entry_shortcode( // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
1925	1398	array(
1926		- 'form_id' => FrmAppHelper::get_post_param( 'form_id', '', 'absint' ), // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
	1399	+ 'form_id' => FrmAppHelper::get_post_param( 'form_id', '', 'absint' ),
1927	1400	'default_email' => true,
1928		- 'plain_text' => FrmAppHelper::get_post_param( 'plain_text', '', 'absint' ), // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
	1401	+ 'plain_text' => FrmAppHelper::get_post_param( 'plain_text', '', 'absint' ),
1929	1402	)
1930	1403	);
1931	1404	wp_die();
1932	1405	}
1933	1406
1934		- /**
1935		- * @param string $content
1936		- * @param int|stdClass|string $form
1937		- * @param false|int|stdClass|string $entry
1938		- *
1939		- * @return string
1940		- */
1941	1407	public static function filter_content( $content, $form, $entry = false ) {
1942		- $content = self::replace_form_name_shortcodes( $content, $form );
1943		-
1944	1408	self::get_entry_by_param( $entry );
1945		-
1946	1409	if ( ! $entry ) {
1947	1410	return $content;
1948	1411	}
1949	1412
		@@ -1950,81 +1413,28 @@
1950	1413	if ( is_object( $form ) ) {
1951	1414	$form = $form->id;
1952	1415	}
1953	1416
1954		- /*
1955		- * Repeater actions adds `parent_entry` to `$entry` store the parent entry data. If `parent_entry` is not empty,
1956		- * use the parent form ID instead of repeater form ID to fix the parent form field shortcodes doesn't work.
1957		- */
1958		- if ( ! empty( $entry->parent_entry ) ) {
1959		- $form = $entry->parent_entry->form_id;
1960		- }
1961		-
1962	1417	$shortcodes = FrmFieldsHelper::get_shortcodes( $content, $form );
	1418	+ $content = apply_filters( 'frm_replace_content_shortcodes', $content, $entry, $shortcodes );
1963	1419
1964		- return apply_filters( 'frm_replace_content_shortcodes', $content, $entry, $shortcodes );
	1420	+ return $content;
1965	1421	}
1966	1422
1967		- /**
1968		- * Replace any [form_name] shortcodes in a string.
1969		- *
1970		- * @since 5.5
1971		- *
1972		- * @param array|string $string
1973		- * @param int|stdClass|string $form
1974		- *
1975		- * @return array|string
1976		- */
1977		- public static function replace_form_name_shortcodes( $string, $form ) {
1978		- if ( ! is_string( $string ) ) {
1979		- return $string;
1980		- }
1981		-
1982		- if ( ! str_contains( $string, '[form_name]' ) ) {
1983		- return $string;
1984		- }
1985		-
1986		- if ( ! is_object( $form ) ) {
1987		- $form = FrmForm::getOne( $form );
1988		- }
1989		-
1990		- $form_name = is_object( $form ) ? $form->name : '';
1991		- return str_replace( '[form_name]', $form_name, $string );
1992		- }
1993		-
1994		- /**
1995		- * @param false|int|stdClass|string $entry
1996		- *
1997		- * @return void
1998		- */
1999	1423	private static function get_entry_by_param( &$entry ) {
2000		- if ( $entry && is_object( $entry ) ) {
2001		- return;
2002		- }
	1424	+ if ( ! $entry || ! is_object( $entry ) ) {
	1425	+ if ( ! $entry || ! is_numeric( $entry ) ) {
	1426	+ $entry = FrmAppHelper::get_post_param( 'id', false, 'sanitize_title' );
	1427	+ }
2003	1428
2004		- if ( ! $entry || ! is_numeric( $entry ) ) {
2005		- $entry = FrmAppHelper::get_post_param( 'id', false, 'sanitize_title' );
	1429	+ FrmEntry::maybe_get_entry( $entry );
2006	1430	}
2007		-
2008		- FrmEntry::maybe_get_entry( $entry );
2009	1431	}
2010	1432
2011		- /**
2012		- * @param string $content
2013		- * @param false|object $entry
2014		- * @param array $shortcodes
2015		- *
2016		- * @return string
2017		- */
2018	1433	public static function replace_content_shortcodes( $content, $entry, $shortcodes ) {
2019	1434	return FrmFieldsHelper::replace_content_shortcodes( $content, $entry, $shortcodes );
2020	1435	}
2021	1436
2022		- /**
2023		- * @param array $errors
2024		- *
2025		- * @return array
2026		- */
2027	1437	public static function process_bulk_form_actions( $errors ) {
2028	1438	if ( ! $_REQUEST ) {
2029	1439	return $errors;
2030	1440	}
		@@ -2029,30 +1439,29 @@
2029	1439	return $errors;
2030	1440	}
2031	1441
2032	1442	$bulkaction = FrmAppHelper::get_param( 'action', '', 'get', 'sanitize_text_field' );
2033		-
2034		- // phpcs:ignore Universal.Operators.StrictComparisons
2035	1443	if ( $bulkaction == - 1 ) {
2036	1444	$bulkaction = FrmAppHelper::get_param( 'action2', '', 'get', 'sanitize_title' );
2037	1445	}
2038	1446
2039		- if ( $bulkaction && str_starts_with( $bulkaction, 'bulk_' ) ) {
	1447	+ if ( ! empty( $bulkaction ) && strpos( $bulkaction, 'bulk_' ) === 0 ) {
2040	1448	FrmAppHelper::remove_get_action();
	1449	+
2041	1450	$bulkaction = str_replace( 'bulk_', '', $bulkaction );
2042	1451	}
2043	1452
2044	1453	$ids = FrmAppHelper::get_param( 'item-action', '', 'get', 'sanitize_text_field' );
	1454	+ if ( empty( $ids ) ) {
	1455	+ $errors[] = __( 'No forms were specified', 'formidable' );
2045	1456
2046		- if ( ! $ids ) {
2047		- $errors[] = __( 'No forms were specified', 'formidable' );
2048	1457	return $errors;
2049	1458	}
2050	1459
2051	1460	$permission_error = FrmAppHelper::permission_nonce_error( '', '_wpnonce', 'bulk-toplevel_page_formidable' );
2052		-
2053	1461	if ( $permission_error !== false ) {
2054	1462	$errors[] = $permission_error;
	1463	+
2055	1464	return $errors;
2056	1465	}
2057	1466
2058	1467	if ( ! is_array( $ids ) ) {
		@@ -2069,9 +1478,9 @@
2069	1478	case 'untrash':
2070	1479	$message = self::bulk_untrash( $ids );
2071	1480	}
2072	1481
2073		- if ( ! empty( $message ) ) {
	1482	+ if ( isset( $message ) && ! empty( $message ) ) {
2074	1483	$errors['message'] = $message;
2075	1484	}
2076	1485
2077	1486	return $errors;
		@@ -2076,24 +1485,9 @@
2076	1485
2077	1486	return $errors;
2078	1487	}
2079	1488
2080		- /**
2081		- * Includes html that shows a message when the device is too small to use Formidable Forms admin pages.
2082		- *
2083		- * @since 6.20
2084		- *
2085		- * @return void
2086		- */
2087		- public static function include_device_too_small_message() {
2088		- if ( ! FrmAppHelper::is_formidable_admin() ) {
2089		- return;
2090		- }
2091		-
2092		- include FrmAppHelper::plugin_path() . '/classes/views/shared/small-device-message.php';
2093		- }
2094		-
2095		- public static function route() { // phpcs:ignore Generic.Metrics.CyclomaticComplexity.MaxExceeded
	1489	+ public static function route() {
2096	1490	$action = isset( $_REQUEST['frm_action'] ) ? 'frm_action' : 'action';
2097	1491	$vars = array();
2098	1492	FrmAppHelper::include_svg();
2099	1493
		@@ -2103,148 +1497,86 @@
2103	1497	// Javascript needs to be allowed in some field settings.
2104	1498	// phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized, WordPress.Security.NonceVerification.Missing
2105	1499	$json_vars = htmlspecialchars_decode( nl2br( str_replace( '&quot;', '"', wp_unslash( $_POST['frm_compact_fields'] ) ) ) );
2106	1500	$json_vars = json_decode( $json_vars, true );
	1501	+ if ( empty( $json_vars ) ) {
	1502	+ // json decoding failed so we should return an error message.
	1503	+ $action = FrmAppHelper::get_param( $action, '', 'get', 'sanitize_title' );
	1504	+ if ( 'edit' == $action ) {
	1505	+ $action = 'update';
	1506	+ }
2107	1507
2108		- if ( $json_vars ) {
	1508	+ add_filter( 'frm_validate_form', 'FrmFormsController::json_error' );
	1509	+ } else {
2109	1510	$vars = FrmAppHelper::json_to_array( $json_vars );
2110	1511	$action = $vars[ $action ];
2111	1512	unset( $_REQUEST['frm_compact_fields'], $_POST['frm_compact_fields'] ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
2112	1513	$_REQUEST = array_merge( $_REQUEST, $vars ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
2113	1514	$_POST = array_merge( $_POST, $_REQUEST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
2114		- } else {
2115		- // Json decoding failed so we should return an error message.
2116		- $action = FrmAppHelper::get_param( $action, '', 'get', 'sanitize_title' );
2117		-
2118		- if ( 'edit' === $action ) {
2119		- $action = 'update';
2120		- }
2121		-
2122		- add_filter( 'frm_validate_form', 'FrmFormsController::json_error' );
2123	1515	}
2124	1516	} else {
2125	1517	$action = FrmAppHelper::get_param( $action, '', 'get', 'sanitize_title' );
2126		-
2127	1518	if ( isset( $_REQUEST['delete_all'] ) ) {
2128	1519	// Override the action for this page.
2129	1520	$action = 'delete_all';
2130	1521	}
2131		- }//end if
	1522	+ }
2132	1523
2133	1524	add_action( 'frm_load_form_hooks', 'FrmHooksController::trigger_load_form_hooks' );
2134	1525	FrmAppHelper::trigger_hook_load( 'form' );
2135	1526
2136	1527	switch ( $action ) {
	1528	+ case 'new':
	1529	+ return self::new_form( $vars );
2137	1530	case 'create':
2138	1531	case 'edit':
2139	1532	case 'update':
	1533	+ case 'duplicate':
2140	1534	case 'trash':
2141	1535	case 'untrash':
2142	1536	case 'destroy':
	1537	+ case 'delete_all':
2143	1538	case 'settings':
2144	1539	case 'update_settings':
2145	1540	return self::$action( $vars );
2146	1541	case 'lite-reports':
2147		- self::no_reports( $vars );
2148		- return null;
	1542	+ return self::no_reports( $vars );
2149	1543	case 'views':
2150		- self::no_views( $vars );
2151		- return null;
	1544	+ return self::no_views( $vars );
2152	1545	default:
2153	1546	do_action( 'frm_form_action_' . $action );
2154		-
2155	1547	if ( apply_filters( 'frm_form_stop_action_' . $action, false ) ) {
2156		- return null;
	1548	+ return;
2157	1549	}
2158	1550
2159	1551	$action = FrmAppHelper::get_param( 'action', '', 'get', 'sanitize_text_field' );
2160		-
2161		- // phpcs:ignore Universal.Operators.StrictComparisons
2162	1552	if ( $action == - 1 ) {
2163	1553	$action = FrmAppHelper::get_param( 'action2', '', 'get', 'sanitize_title' );
2164	1554	}
2165	1555
2166		- if ( str_starts_with( $action, 'bulk_' ) ) {
	1556	+ if ( strpos( $action, 'bulk_' ) === 0 ) {
2167	1557	FrmAppHelper::remove_get_action();
2168	1558
2169		- self::list_form();
2170		- return null;
	1559	+ return self::list_form();
2171	1560	}
2172	1561
2173		- $message = FrmAppHelper::get_param( 'message' );
2174		-
2175		- if ( 'form_duplicate_error' === $message ) {
2176		- self::display_forms_list( array(), '', array( __( 'There was a problem duplicating the form', 'formidable' ) ) );
2177		- return null;
2178		- }
2179		-
2180		- if ( 'forms_permanently_deleted' === $message ) {
2181		- $count = FrmAppHelper::get_param( 'forms_deleted', 0, 'get', 'absint' );
2182		- /* translators: %1$s: Number of forms */
2183		- $message = sprintf( _n( '%1$s form permanently deleted.', '%1$s forms permanently deleted.', $count, 'formidable' ), $count );
2184		- self::display_forms_list( array(), $message, '' );
2185		- return null;
2186		- }
2187		-
2188		- self::display_forms_list();
2189		-
2190		- return null;
2191		- }//end switch
	1562	+ return self::display_forms_list();
	1563	+ }
2192	1564	}
2193	1565
2194		- /**
2195		- * Rename a form.
2196		- *
2197		- * Handles the AJAX request for renaming a form.
2198		- *
2199		- * @since 6.7
2200		- *
2201		- * @return void
2202		- */
2203		- public static function rename_form() {
2204		- // Check permission and nonce
2205		- FrmAppHelper::permission_check( 'frm_edit_forms' );
2206		- check_ajax_referer( 'frm_ajax', 'nonce' );
	1566	+ public static function json_error( $errors ) {
	1567	+ $errors['json'] = __( 'Abnormal HTML characters prevented your form from saving correctly', 'formidable' );
2207	1568
2208		- // Get posted data
2209		- $form_id = FrmAppHelper::get_post_param( 'form_id', '', 'absint' );
2210		- $name = FrmAppHelper::get_post_param( 'form_name', '', 'sanitize_text_field' );
2211		- $form = FrmForm::getOne( $form_id );
2212		-
2213		- if ( ! $form ) {
2214		- wp_send_json_error( __( 'Form not found', 'formidable' ) );
2215		- }
2216		-
2217		- if ( $name === $form->name ) {
2218		- // Nothing to change so exit early.
2219		- wp_send_json_success();
2220		- }
2221		-
2222		- $to_update = array(
2223		- 'name' => $name,
2224		- );
2225		-
2226		- if ( '' === $name ) {
2227		- $form_key = $form->form_key;
2228		- } else {
2229		- // Only update form_key if name is not empty.
2230		- $form_key = FrmAppHelper::get_unique_key( sanitize_title( $name ), 'frm_forms', 'form_key' );
2231		- $to_update['form_key'] = $form_key;
2232		- }
2233		-
2234		- FrmForm::update( $form_id, $to_update );
2235		-
2236		- wp_send_json_success( compact( 'form_key' ) );
	1569	+ return $errors;
2237	1570	}
2238	1571
2239	1572	/**
2240		- * @param array $errors
	1573	+ * Education for premium features.
2241	1574	*
2242		- * @return array
	1575	+ * @since 4.05
2243	1576	*/
2244		- public static function json_error( $errors ) {
2245		- $errors['json'] = __( 'Abnormal HTML characters prevented your form from saving correctly', 'formidable' );
2246		- return $errors;
	1577	+ public static function add_form_style_tab_options() {
	1578	+ include( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/add_form_style_options.php' );
2247	1579	}
2248	1580
2249	1581	/**
2250	1582	* Add education about views.
		@@ -2249,12 +1581,8 @@
2249	1581	/**
2250	1582	* Add education about views.
2251	1583	*
2252	1584	* @since 4.07
2253		- *
2254		- * @param array $values
2255		- *
2256		- * @return void
2257	1585	*/
2258	1586	public static function no_views( $values = array() ) {
2259	1587	FrmAppHelper::include_svg();
2260	1588	$id = FrmAppHelper::get_param( 'form', '', 'get', 'absint' );
		@@ -2266,12 +1594,8 @@
2266	1594	/**
2267	1595	* Add education about reports.
2268	1596	*
2269	1597	* @since 4.07
2270		- *
2271		- * @param array $values
2272		- *
2273		- * @return void
2274	1598	*/
2275	1599	public static function no_reports( $values = array() ) {
2276	1600	$id = FrmAppHelper::get_param( 'form', '', 'get', 'absint' );
2277	1601	$form = $id ? FrmForm::getOne( $id ) : false;
		@@ -2278,11 +1602,9 @@
2278	1602
2279	1603	include FrmAppHelper::plugin_path() . '/classes/views/shared/reports-info.php';
2280	1604	}
2281	1605
2282		- /**
2283		- * FRONT-END FORMS.
2284		- */
	1606	+ /* FRONT-END FORMS */
2285	1607	public static function admin_bar_css() {
2286	1608	if ( is_admin() || ! current_user_can( 'frm_edit_forms' ) ) {
2287	1609	return;
2288	1610	}
		@@ -2296,9 +1618,10 @@
2296	1618	/**
2297	1619	* @since 4.05.02
2298	1620	*/
2299	1621	private static function move_menu_to_footer() {
2300		- if ( empty( FrmAppHelper::get_settings()->admin_bar ) ) {
	1622	+ $settings = FrmAppHelper::get_settings();
	1623	+ if ( empty( $settings->admin_bar ) ) {
2301	1624	remove_action( 'wp_body_open', 'wp_admin_bar_render', 0 );
2302	1625	}
2303	1626	}
2304	1627
		@@ -2303,15 +1626,13 @@
2303	1626	}
2304	1627
2305	1628	public static function admin_bar_configure() {
2306	1629	global $frm_vars;
2307		-
2308	1630	if ( empty( $frm_vars['forms_loaded'] ) ) {
2309	1631	return;
2310	1632	}
2311	1633
2312	1634	$actions = array();
2313		-
2314	1635	foreach ( $frm_vars['forms_loaded'] as $form ) {
2315	1636	if ( is_object( $form ) ) {
2316	1637	$actions[ $form->id ] = $form->name;
2317	1638	}
		@@ -2317,9 +1638,9 @@
2317	1638	}
2318	1639	unset( $form );
2319	1640	}
2320	1641
2321		- if ( ! $actions ) {
	1642	+ if ( empty( $actions ) ) {
2322	1643	return;
2323	1644	}
2324	1645
2325	1646	self::add_menu_to_admin_bar();
		@@ -2345,12 +1666,8 @@
2345	1666	}
2346	1667
2347	1668	/**
2348	1669	* @since 2.05.07
2349		- *
2350		- * @param array $actions
2351		- *
2352		- * @return void
2353	1670	*/
2354	1671	private static function add_forms_to_admin_bar( $actions ) {
2355	1672	global $wp_admin_bar;
2356	1673
		@@ -2356,13 +1673,14 @@
2356	1673
2357	1674	asort( $actions );
2358	1675
2359	1676	foreach ( $actions as $form_id => $name ) {
	1677	+
2360	1678	$wp_admin_bar->add_node(
2361	1679	array(
2362	1680	'parent' => 'frm-forms',
2363	1681	'id' => 'edit_form_' . $form_id,
2364		- 'title' => $name ? $name : FrmFormsHelper::get_no_title_text(),
	1682	+ 'title' => empty( $name ) ? __( '(no title)', 'formidable' ) : $name,
2365	1683	'href' => FrmForm::get_edit_link( $form_id ),
2366	1684	)
2367	1685	);
2368	1686	}
		@@ -2371,16 +1689,13 @@
2371	1689	/**
2372	1690	* The formidable shortcode
2373	1691	*
2374	1692	* @param array $atts The params from the shortcode.
2375		- *
2376		- * @return string
2377	1693	*/
2378	1694	public static function get_form_shortcode( $atts ) {
2379	1695	global $frm_vars;
2380		-
2381		- if ( ! empty( $frm_vars['skip_shortcode'] ) ) {
2382		- $sc = '[formidable';
	1696	+ if ( isset( $frm_vars['skip_shortcode'] ) && $frm_vars['skip_shortcode'] ) {
	1697	+ $sc = '[formidable';
2383	1698	$sc .= FrmAppHelper::array_to_html_params( $atts );
2384	1699	return $sc . ']';
2385	1700	}
2386	1701
		@@ -2387,10 +1702,10 @@
2387	1702	$shortcode_atts = shortcode_atts(
2388	1703	array(
2389	1704	'id' => '',
2390	1705	'key' => '',
2391		- 'title' => 'auto',
2392		- 'description' => 'auto',
	1706	+ 'title' => false,
	1707	+ 'description' => false,
2393	1708	'readonly' => false,
2394	1709	'entry_id' => false,
2395	1710	'fields' => array(),
2396	1711	'exclude_fields' => array(),
		@@ -2402,57 +1717,29 @@
2402	1717
2403	1718	return self::show_form( $shortcode_atts['id'], $shortcode_atts['key'], $shortcode_atts['title'], $shortcode_atts['description'], $atts );
2404	1719	}
2405	1720
2406		- /**
2407		- * @since 5.2.01
2408		- *
2409		- * @param false|int|string $id
2410		- * @param false|string $key
2411		- *
2412		- * @return false|stdClass
2413		- */
2414		- private static function maybe_get_form_by_id_or_key( $id, $key ) {
2415		- if ( ! $id ) {
	1721	+ public static function show_form( $id = '', $key = '', $title = false, $description = false, $atts = array() ) {
	1722	+ if ( empty( $id ) ) {
2416	1723	$id = $key;
2417	1724	}
2418		- return self::maybe_get_form_to_show( $id );
2419		- }
2420	1725
2421		- /**
2422		- * @param false|int|string $id
2423		- * @param false|string $key
2424		- * @param bool|int|string $title may be 'auto', true, false, 'true', 'false', 'yes', '1', 1, '0', 0.
2425		- * @param bool|int|string $description may be 'auto', true, false, 'true', 'false', 'yes', '1', 1, '0', 0.
2426		- * @param array $atts
2427		- *
2428		- * @return string
2429		- */
2430		- public static function show_form( $id = '', $key = '', $title = false, $description = false, $atts = array() ) {
2431		- $form = self::maybe_get_form_by_id_or_key( $id, $key );
2432		-
	1726	+ $form = self::maybe_get_form_to_show( $id );
2433	1727	if ( ! $form ) {
2434	1728	return __( 'Please select a valid form', 'formidable' );
2435	1729	}
2436	1730
2437		- if ( 'auto' === $title ) {
2438		- $title = ! empty( $form->options['show_title'] );
2439		- }
2440		-
2441		- if ( 'auto' === $description ) {
2442		- $description = ! empty( $form->options['show_description'] );
2443		- }
2444		-
2445	1731	FrmAppController::maybe_update_styles();
2446	1732
2447	1733	add_action( 'frm_load_form_hooks', 'FrmHooksController::trigger_load_form_hooks' );
2448	1734	FrmAppHelper::trigger_hook_load( 'form', $form );
2449	1735
2450		- $form = apply_filters( 'frm_pre_display_form', $form );
	1736	+ $form = apply_filters( 'frm_pre_display_form', $form );
	1737	+
2451	1738	$frm_settings = FrmAppHelper::get_settings( array( 'current_form' => $form->id ) );
2452	1739
2453	1740	if ( self::is_viewable_draft_form( $form ) ) {
2454		- // Don't show a draft form on a page
	1741	+ // don't show a draft form on a page
2455	1742	$form = __( 'Please select a valid form', 'formidable' );
2456	1743	} elseif ( ! FrmForm::is_visible_to_user( $form ) ) {
2457	1744	$form = do_shortcode( $frm_settings->login_msg );
2458	1745	} else {
		@@ -2470,21 +1757,14 @@
2470	1757
2471	1758	return $form;
2472	1759	}
2473	1760
2474		- /**
2475		- * @param false|int|string $id
2476		- *
2477		- * @return false|stdClass
2478		- */
2479	1761	private static function maybe_get_form_to_show( $id ) {
2480	1762	$form = false;
2481	1763
2482		- if ( $id ) {
2483		- // Form id or key is set.
	1764	+ if ( ! empty( $id ) ) { // no form id or key set
2484	1765	$form = FrmForm::getOne( $id );
2485		-
2486		- if ( ! $form || $form->parent_form_id || $form->status === 'trash' ) {
	1766	+ if ( ! $form || $form->parent_form_id || $form->status == 'trash' ) {
2487	1767	$form = false;
2488	1768	}
2489	1769	}
2490	1770
		@@ -2490,25 +1770,12 @@
2490	1770
2491	1771	return $form;
2492	1772	}
2493	1773
2494		- /**
2495		- * @param object $form
2496		- *
2497		- * @return bool
2498		- */
2499	1774	private static function is_viewable_draft_form( $form ) {
2500	1775	return $form->status === 'draft' && current_user_can( 'frm_edit_forms' ) && ! FrmAppHelper::is_preview_page();
2501	1776	}
2502	1777
2503		- /**
2504		- * @param object $form
2505		- * @param bool $title
2506		- * @param bool $description
2507		- * @param array $atts
2508		- *
2509		- * @return string
2510		- */
2511	1778	public static function get_form( $form, $title, $description, $atts = array() ) {
2512	1779	ob_start();
2513	1780
2514	1781	do_action( 'frm_before_get_form', $atts );
		@@ -2515,9 +1782,10 @@
2515	1782
2516	1783	self::get_form_contents( $form, $title, $description, $atts );
2517	1784	self::enqueue_scripts( FrmForm::get_params( $form ) );
2518	1785
2519		- $contents = ob_get_clean();
	1786	+ $contents = ob_get_contents();
	1787	+ ob_end_clean();
2520	1788
2521	1789	self::maybe_minimize_form( $atts, $contents );
2522	1790
2523	1791	return $contents;
		@@ -2522,25 +1790,12 @@
2522	1790
2523	1791	return $contents;
2524	1792	}
2525	1793
2526		- /**
2527		- * @param array $params
2528		- *
2529		- * @return void
2530		- */
2531	1794	public static function enqueue_scripts( $params ) {
2532	1795	do_action( 'frm_enqueue_form_scripts', $params );
2533	1796	}
2534	1797
2535		- /**
2536		- * @param object $form
2537		- * @param bool $title
2538		- * @param bool $description
2539		- * @param array $atts
2540		- *
2541		- * @return void
2542		- */
2543	1798	public static function get_form_contents( $form, $title, $description, $atts ) {
2544	1799	$params = FrmForm::get_params( $form );
2545	1800	$errors = self::get_saved_errors( $form, $params );
2546	1801	$fields = FrmFieldsHelper::get_form_fields( $form->id, $errors );
		@@ -2546,32 +1801,29 @@
2546	1801	$fields = FrmFieldsHelper::get_form_fields( $form->id, $errors );
2547	1802	$reset = false;
2548	1803	$pass_args = compact( 'form', 'fields', 'errors', 'title', 'description', 'reset' );
2549	1804
2550		- $pass_args['action'] = $params['action'];
2551		- // phpcs:ignore WordPress.Security.NonceVerification.Missing, Universal.Operators.StrictComparisons
2552		- $handle_process_here = $params['action'] === 'create' && $params['posted_form_id'] == $form->id && $_POST;
	1805	+ $handle_process_here = $params['action'] === 'create' && $params['posted_form_id'] == $form->id && $_POST; // phpcs:ignore WordPress.Security.NonceVerification.Missing
2553	1806
2554	1807	if ( ! $handle_process_here ) {
2555		- FrmFormState::set_initial_value( 'title', $title );
2556		- FrmFormState::set_initial_value( 'description', $description );
2557		-
2558	1808	do_action( 'frm_display_form_action', $params, $fields, $form, $title, $description );
2559		-
2560	1809	if ( apply_filters( 'frm_continue_to_new', true, $form->id, $params['action'] ) ) {
2561	1810	self::show_form_after_submit( $pass_args );
2562	1811	}
2563		- } elseif ( $errors ) {
	1812	+ } elseif ( ! empty( $errors ) ) {
2564	1813	self::show_form_after_submit( $pass_args );
	1814	+
2565	1815	} else {
	1816	+
2566	1817	do_action( 'frm_validate_form_creation', $params, $fields, $form, $title, $description );
2567	1818
2568	1819	if ( apply_filters( 'frm_continue_to_create', true, $form->id ) ) {
2569		- $entry_id = self::just_created_entry( $form->id );
2570		- $pass_args['entry_id'] = $entry_id;
2571		- $pass_args['reset'] = true;
	1820	+ $entry_id = self::just_created_entry( $form->id );
	1821	+ $pass_args['entry_id'] = $entry_id;
	1822	+ $pass_args['reset'] = true;
	1823	+ $pass_args['conf_method'] = self::get_confirmation_method( compact( 'form', 'entry_id' ) );
2572	1824
2573		- self::run_on_submit_actions( $pass_args );
	1825	+ self::run_success_action( $pass_args );
2574	1826
2575	1827	do_action(
2576	1828	'frm_after_entry_processed',
2577	1829	array(
		@@ -2579,9 +1831,9 @@
2579	1831	'form' => $form,
2580	1832	)
2581	1833	);
2582	1834	}
2583		- }//end if
	1835	+ }
2584	1836	}
2585	1837
2586	1838	/**
2587	1839	* If the form was processed earlier (init), get the generated errors
		@@ -2586,91 +1838,45 @@
2586	1838	/**
2587	1839	* If the form was processed earlier (init), get the generated errors
2588	1840	*
2589	1841	* @since 2.05
2590		- *
2591		- * @param object $form
2592		- * @param array $params
2593		- *
2594		- * @return array
2595	1842	*/
2596	1843	private static function get_saved_errors( $form, $params ) {
2597	1844	global $frm_vars;
2598	1845
2599		- // phpcs:ignore WordPress.Security.NonceVerification.Missing, Universal.Operators.StrictComparisons
2600		- if ( $params['posted_form_id'] == $form->id && $_POST && isset( $frm_vars['created_entries'][ $form->id ] ) ) {
	1846	+ if ( $params['posted_form_id'] == $form->id && $_POST && isset( $frm_vars['created_entries'][ $form->id ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
2601	1847	$errors = $frm_vars['created_entries'][ $form->id ]['errors'];
2602	1848	} else {
2603	1849	$errors = array();
2604	1850	}
2605	1851
2606		- /**
2607		- * Allows modifying the generated errors if the form was processed earlier.
2608		- *
2609		- * @since 5.2.03
2610		- *
2611		- * @param array $errors Errors data. Is empty array if no errors found.
2612		- * @param array $params Form params. See {@see FrmForm::get_params()}.
2613		- */
2614		- return apply_filters( 'frm_saved_errors', $errors, $params );
	1852	+ return $errors;
2615	1853	}
2616	1854
2617	1855	/**
2618	1856	* @since 2.2.7
2619		- *
2620		- * @param int|string $form_id
2621		- *
2622		- * @return int
2623	1857	*/
2624	1858	public static function just_created_entry( $form_id ) {
2625	1859	global $frm_vars;
2626		- 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
	1860	+
	1861	+ 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;
2627	1862	}
2628	1863
2629	1864	/**
2630		- * Gets confirmation method.
2631		- *
2632	1865	* @since 3.0
2633		- * @since 6.0 This method can return an array of met On Submit actions.
2634		- *
2635		- * @param array $atts {
2636		- * Atts.
2637		- *
2638		- * @type object $form Form object.
2639		- * @type int $entry_id Entry ID.
2640		- * }
2641		- *
2642		- * @return array|string
2643	1866	*/
2644	1867	private static function get_confirmation_method( $atts ) {
2645		- $action = FrmOnSubmitHelper::current_event( $atts );
2646		- $opt = 'update' === $action ? 'edit_action' : 'success_action';
2647		- $method = ! empty( $atts['form']->options[ $opt ] ) ? $atts['form']->options[ $opt ] : 'message';
	1868	+ $opt = 'success_action';
	1869	+ $method = ( isset( $atts['form']->options[ $opt ] ) && ! empty( $atts['form']->options[ $opt ] ) ) ? $atts['form']->options[ $opt ] : 'message';
	1870	+ $method = apply_filters( 'frm_success_filter', $method, $atts['form'], 'create' );
2648	1871
2649		- if ( ! empty( $atts['entry_id'] ) ) {
2650		- $met_actions = self::get_met_on_submit_actions( $atts, $action );
2651		-
2652		- if ( $met_actions ) {
2653		- $method = $met_actions;
2654		- }
	1872	+ if ( $method != 'message' && ( ! $atts['entry_id'] || ! is_numeric( $atts['entry_id'] ) ) ) {
	1873	+ $method = 'message';
2655	1874	}
2656	1875
2657		- $method = apply_filters( 'frm_success_filter', $method, $atts['form'], $action );
2658		-
2659		- if ( $method !== 'message' && ( ! $atts['entry_id'] || ! is_numeric( $atts['entry_id'] ) ) ) {
2660		- return 'message';
2661		- }
2662		-
2663	1876	return $method;
2664	1877	}
2665	1878
2666		- /**
2667		- * @param object $form
2668		- * @param array $params
2669		- * @param array $args
2670		- *
2671		- * @return void
2672		- */
2673	1879	public static function maybe_trigger_redirect( $form, $params, $args ) {
2674	1880	if ( ! isset( $params['id'] ) ) {
2675	1881	global $frm_vars;
2676	1882	$params['id'] = $frm_vars['created_entries'][ $form->id ]['entry_id'];
		@@ -2679,44 +1885,16 @@
2679	1885	$conf_method = self::get_confirmation_method(
2680	1886	array(
2681	1887	'form' => $form,
2682	1888	'entry_id' => $params['id'],
2683		- 'action' => FrmOnSubmitHelper::current_event( $params ),
2684	1889	)
2685	1890	);
2686	1891
2687		- self::maybe_trigger_redirect_with_action( $conf_method, $form, $params, $args );
2688		- }
2689		-
2690		- /**
2691		- * Maybe trigger redirect with the new Confirmation action.
2692		- *
2693		- * @since 6.1.1
2694		- *
2695		- * @param array|string $conf_method Array of confirmation actions or the action type string.
2696		- * @param object $form Form object.
2697		- * @param array $params See {@see FrmFormsController::maybe_trigger_redirect()}.
2698		- * @param array $args See {@see FrmFormsController::maybe_trigger_redirect()}.
2699		- */
2700		- public static function maybe_trigger_redirect_with_action( $conf_method, $form, $params, $args ) {
2701		- 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
2702		- $event = FrmOnSubmitHelper::current_event( $params );
2703		- FrmOnSubmitHelper::populate_on_submit_data( $form->options, $conf_method[0], $event );
2704		- $conf_method = 'redirect';
2705		- }
2706		-
2707	1892	if ( 'redirect' === $conf_method ) {
2708	1893	self::trigger_redirect( $form, $params, $args );
2709	1894	}
2710	1895	}
2711	1896
2712		- /**
2713		- * @param object $form
2714		- * @param array $params
2715		- * @param array $args
2716		- *
2717		- * @return void
2718		- */
2719	1897	public static function trigger_redirect( $form, $params, $args ) {
2720	1898	$success_args = array(
2721	1899	'action' => $params['action'],
2722	1900	'conf_method' => 'redirect',
		@@ -2734,33 +1912,18 @@
2734	1912	/**
2735	1913	* Used when the success action is not 'message'
2736	1914	*
2737	1915	* @since 2.05
2738		- * @since 6.0 `$args['force_delay_redirect']` is added.
2739		- *
2740		- * @param array $args {
2741		- * The args.
2742		- *
2743		- * @type string $conf_method The method.
2744		- * @type object $form Form object.
2745		- * @type int $entry_id Entry ID.
2746		- * @type string $action The action event. Accepts `create` or `update`.
2747		- * @type array $fields The array of fields.
2748		- * @type int $force_delay_redirect Force to show the message before redirecting in case redirect method runs.
2749		- * }
2750	1916	*/
2751	1917	public static function run_success_action( $args ) {
2752		- global $frm_vars;
2753	1918	$extra_args = $args;
2754	1919	unset( $extra_args['form'] );
2755	1920
2756	1921	do_action( 'frm_success_action', $args['conf_method'], $args['form'], $args['form']->options, $args['entry_id'], $extra_args );
2757	1922
2758		- $opt = ! isset( $args['action'] ) || $args['action'] === 'create' ? 'success' : 'edit';
	1923	+ $opt = ( ! isset( $args['action'] ) || $args['action'] === 'create' ) ? 'success' : 'edit';
2759	1924
2760	1925	$args['success_opt'] = $opt;
2761		- $args['ajax'] = ! empty( $frm_vars['ajax'] );
2762		-
2763	1926	if ( $args['conf_method'] === 'page' && is_numeric( $args['form']->options[ $opt . '_page_id' ] ) ) {
2764	1927	self::load_page_after_submit( $args );
2765	1928	} elseif ( $args['conf_method'] === 'redirect' ) {
2766	1929	self::redirect_after_submit( $args );
		@@ -2769,270 +1932,29 @@
2769	1932	}
2770	1933	}
2771	1934
2772	1935	/**
2773		- * Gets met On Submit actions.
2774		- *
2775		- * @since 6.0
2776		- *
2777		- * @param array $args See {@see FrmFormsController::run_success_action()}.
2778		- * @param string $event Form event. Default is `create`.
2779		- *
2780		- * @return array Array of actions that meet the conditional logics.
2781		- */
2782		- public static function get_met_on_submit_actions( $args, $event = 'create' ) {
2783		- if ( ! FrmOnSubmitHelper::form_has_migrated( $args['form'] ) ) {
2784		- return array();
2785		- }
2786		-
2787		- // If a redirect action has already opened the URL in a new tab, we show the default message in the current tab.
2788		- if ( ! empty( self::$redirected_in_new_tab[ $args['form']->id ] ) ) {
2789		- return array( FrmOnSubmitHelper::get_fallback_action_after_open_in_new_tab( $event ) );
2790		- }
2791		-
2792		- $entry = FrmEntry::getOne( $args['entry_id'], true );
2793		- $actions = FrmOnSubmitHelper::get_actions( $args['form']->id );
2794		- $met_actions = array();
2795		- $has_redirect = false;
2796		-
2797		- foreach ( $actions as $action ) {
2798		- if ( ! in_array( $event, $action->post_content['event'], true ) ) {
2799		- continue;
2800		- }
2801		-
2802		- if ( FrmFormAction::action_conditions_met( $action, $entry ) ) {
2803		- continue;
2804		- }
2805		-
2806		- $action_type = FrmOnSubmitHelper::get_action_type( $action );
2807		-
2808		- if ( 'redirect' === $action_type && $has_redirect ) {
2809		- // Do not process because we run the first redirect action only.
2810		- continue;
2811		- }
2812		-
2813		- if ( ! self::is_valid_on_submit_action( $action, $args, $event ) ) {
2814		- continue;
2815		- }
2816		-
2817		- if ( 'redirect' === $action_type ) {
2818		- $has_redirect = true;
2819		- }
2820		-
2821		- $met_actions[] = $action;
2822		- unset( $action );
2823		- }//end foreach
2824		-
2825		- $args['event'] = $event;
2826		-
2827		- /**
2828		- * Filters the On Submit actions that meet the conditional logics.
2829		- *
2830		- * @since 6.0
2831		- *
2832		- * @param array $met_actions Actions that meet the conditional logics.
2833		- * @param array $args See {@see FrmFormsController::run_success_action()}. `$args['event']` is also added.
2834		- */
2835		- $met_actions = apply_filters( 'frm_get_met_on_submit_actions', $met_actions, $args );
2836		-
2837		- if ( ! $met_actions ) {
2838		- return array( FrmOnSubmitHelper::get_fallback_action( $event ) );
2839		- }
2840		-
2841		- return $met_actions;
2842		- }
2843		-
2844		- /**
2845		- * Checks if a Confirmation action has the valid data.
2846		- *
2847		- * @since 6.1.2
2848		- *
2849		- * @param object $action Form action object.
2850		- * @param array $args See {@see FrmFormsController::run_success_action()}.
2851		- * @param string $event Form event. Default is `create`.
2852		- *
2853		- * @return bool
2854		- */
2855		- private static function is_valid_on_submit_action( $action, $args, $event = 'create' ) {
2856		- $action_type = FrmOnSubmitHelper::get_action_type( $action );
2857		-
2858		- if ( 'redirect' === $action_type ) {
2859		- // Run through frm_redirect_url filter. This is used for the valid action check.
2860		- $action->post_content['success_url'] = apply_filters(
2861		- 'frm_redirect_url',
2862		- $action->post_content['success_url'],
2863		- $args['form'],
2864		- $args + array( 'action' => $event )
2865		- );
2866		-
2867		- return ! empty( $action->post_content['success_url'] );
2868		- }
2869		-
2870		- if ( 'page' === $action_type ) {
2871		- if ( empty( $action->post_content['success_page_id'] ) ) {
2872		- return false;
2873		- }
2874		-
2875		- $page = get_post( $action->post_content['success_page_id'] );
2876		-
2877		- if ( ! $page || 'trash' === $page->post_status ) {
2878		- return false;
2879		- }
2880		- }
2881		-
2882		- return true;
2883		- }
2884		-
2885		- /**
2886		- * Runs On Submit actions.
2887		- *
2888		- * @since 6.0
2889		- *
2890		- * @param array $args See inside {@see FrmFormsController::get_form_contents()} method.
2891		- */
2892		- public static function run_on_submit_actions( $args ) {
2893		- $args['conf_method'] = self::get_confirmation_method(
2894		- array(
2895		- 'form' => $args['form'],
2896		- 'entry_id' => $args['entry_id'],
2897		- 'action' => FrmOnSubmitHelper::current_event( $args ),
2898		- )
2899		- );
2900		-
2901		- if ( ! is_array( $args['conf_method'] ) ) {
2902		- self::run_success_action( $args );
2903		- return;
2904		- }
2905		-
2906		- // If conf_method is an array, run On Submit actions.
2907		- if ( ! $args['conf_method'] ) {
2908		- // Use default message.
2909		- FrmOnSubmitHelper::populate_on_submit_data( $args['form']->options );
2910		- self::run_success_action( $args );
2911		- } elseif ( 1 === count( $args['conf_method'] ) ) {
2912		- FrmOnSubmitHelper::populate_on_submit_data( $args['form']->options, reset( $args['conf_method'] ) );
2913		- $args['conf_method'] = $args['form']->options['success_action'];
2914		- self::run_success_action( $args );
2915		- } else {
2916		- self::run_multi_on_submit_actions( $args );
2917		- }
2918		- }
2919		-
2920		- /**
2921		- * Runs multiple success actions.
2922		- *
2923		- * @since 6.0
2924		- *
2925		- * @param array $args See {@see FrmFormsController::run_success_action()}.
2926		- */
2927		- public static function run_multi_on_submit_actions( $args ) {
2928		- $redirect_action = null;
2929		-
2930		- foreach ( $args['conf_method'] as $action ) {
2931		- if ( 'redirect' === FrmOnSubmitHelper::get_action_type( $action ) ) {
2932		- // We catch the redirect action to run it last.
2933		- $redirect_action = $action;
2934		- continue;
2935		- }
2936		-
2937		- self::run_single_on_submit_action( $args, $action );
2938		-
2939		- unset( $action );
2940		- }
2941		-
2942		- if ( ! $redirect_action ) {
2943		- return;
2944		- }
2945		-
2946		- // Show script to delay the redirection.
2947		- $args['force_delay_redirect'] = true;
2948		- self::run_single_on_submit_action( $args, $redirect_action );
2949		- }
2950		-
2951		- /**
2952		- * Runs single On Submit action.
2953		- *
2954		- * @since 6.0
2955		- *
2956		- * @param array $args See {@see FrmFormsController::run_success_action()}.
2957		- * @param object $action On Submit action object.
2958		- */
2959		- public static function run_single_on_submit_action( $args, $action ) {
2960		- $new_args = self::get_run_success_action_args( $args, $action );
2961		- self::run_success_action( $new_args );
2962		- }
2963		-
2964		- /**
2965		- * Gets run_success_action() args from the On Submit action.
2966		- *
2967		- * @since 6.0
2968		- *
2969		- * @param array $args See {@see FrmFormsController::run_success_action()}.
2970		- * @param object $action On Submit action object.
2971		- *
2972		- * @return array
2973		- */
2974		- private static function get_run_success_action_args( $args, $action ) {
2975		- $new_args = $args;
2976		-
2977		- FrmOnSubmitHelper::populate_on_submit_data( $new_args['form']->options, $action, $args['action'] );
2978		-
2979		- $opt = 'update' === $args['action'] ? 'edit_' : 'success_';
2980		- $new_args['conf_method'] = $new_args['form']->options[ $opt . 'action' ];
2981		-
2982		- /**
2983		- * Filters the run success action args.
2984		- *
2985		- * @since 6.0
2986		- *
2987		- * @param array $new_args The new args.
2988		- * @param array $args The old args. See {@see FrmFormsController::run_success_action()}.
2989		- * @param object $action On Submit action object.
2990		- */
2991		- return apply_filters( 'frm_get_run_success_action_args', $new_args, $args, $action );
2992		- }
2993		-
2994		- /**
2995	1936	* @since 3.0
2996		- *
2997		- * @param array $args
2998		- *
2999		- * @return void
3000	1937	*/
3001	1938	private static function load_page_after_submit( $args ) {
3002	1939	global $post;
3003	1940	$opt = $args['success_opt'];
3004		-
3005		- // phpcs:ignore Universal.Operators.StrictComparisons
3006	1941	if ( ! $post || $args['form']->options[ $opt . '_page_id' ] != $post->ID ) {
3007	1942	$page = get_post( $args['form']->options[ $opt . '_page_id' ] );
3008	1943	$old_post = $post;
3009	1944	$post = $page;
3010	1945	$content = apply_filters( 'frm_content', $page->post_content, $args['form'], $args['entry_id'] );
3011		-
3012		- // Fix the On Submit page content doesn't show when previewing In theme.
3013		- $has_preview_filter = has_filter( 'the_content', 'FrmFormsController::preview_content' );
3014		-
3015		- if ( $has_preview_filter ) {
3016		- remove_filter( 'the_content', 'FrmFormsController::preview_content', 9999 );
3017		- }
3018		-
3019	1946	echo apply_filters( 'the_content', $content ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
3020		-
3021		- if ( $has_preview_filter ) {
3022		- add_filter( 'the_content', 'FrmFormsController::preview_content', 9999 );
3023		- }
3024		-
3025	1947	$post = $old_post;
3026		- }//end if
	1948	+ }
3027	1949	}
3028	1950
3029	1951	/**
3030	1952	* @since 3.0
3031		- *
3032		- * @param array $args See {@see FrmFormsController::run_success_action()}.
3033	1953	*/
3034	1954	private static function redirect_after_submit( $args ) {
	1955	+ global $frm_vars;
	1956	+
3035	1957	add_filter( 'frm_use_wpautop', '__return_false' );
3036	1958
3037	1959	$opt = $args['success_opt'];
3038	1960	$success_url = trim( $args['form']->options[ $opt . '_url' ] );
		@@ -3038,155 +1960,31 @@
3038	1960	$success_url = trim( $args['form']->options[ $opt . '_url' ] );
3039	1961	$success_url = apply_filters( 'frm_content', $success_url, $args['form'], $args['entry_id'] );
3040	1962	$success_url = do_shortcode( $success_url );
3041	1963
	1964	+ $success_msg = isset( $args['form']->options[ $opt . '_msg' ] ) ? $args['form']->options[ $opt . '_msg' ] : __( 'Please wait while you are redirected.', 'formidable' );
	1965	+
	1966	+ $redirect_msg = self::get_redirect_message( $success_url, $success_msg, $args );
	1967	+
3042	1968	$args['id'] = $args['entry_id'];
3043	1969	FrmEntriesController::delete_entry_before_redirect( $success_url, $args['form'], $args );
3044	1970
3045	1971	add_filter( 'frm_redirect_url', 'FrmEntriesController::prepare_redirect_url' );
3046	1972	$success_url = apply_filters( 'frm_redirect_url', $success_url, $args['form'], $args );
3047		- $doing_ajax = FrmAppHelper::doing_ajax();
3048	1973
3049		- if ( ! empty( $args['ajax'] ) && $doing_ajax && empty( $args['force_delay_redirect'] ) ) {
3050		- // Is AJAX submit and there is just one Redirect action runs.
3051		- echo json_encode( self::get_ajax_redirect_response_data( $args + compact( 'success_url' ) ) );
	1974	+ $doing_ajax = FrmAppHelper::doing_ajax();
	1975	+
	1976	+ if ( isset( $args['ajax'] ) && $args['ajax'] && $doing_ajax ) {
	1977	+ echo json_encode( array( 'redirect' => $success_url ) );
3052	1978	wp_die();
3053		- }
3054		-
3055		- if ( ! headers_sent() && empty( $args['force_delay_redirect'] ) && empty( $args['form']->options['redirect_delay'] ) ) {
3056		- // Not AJAX submit, no headers sent, and there is just one Redirect action runs.
3057		- if ( ! empty( $args['form']->options['open_in_new_tab'] ) ) {
3058		- self::print_open_in_new_tab_js_with_fallback_handler( $success_url, $args );
3059		- self::$redirected_in_new_tab[ $args['form']->id ] = 1;
3060		- return;
3061		- }
3062		-
	1979	+ } elseif ( ! headers_sent() ) {
3063	1980	wp_redirect( esc_url_raw( $success_url ) );
3064		- // Do not use wp_die or redirect fails.
3065		- die();
3066		- }
3067		-
3068		- // Redirect with a delay.
3069		- self::redirect_after_submit_using_js( $args + compact( 'success_url', 'doing_ajax' ) );
3070		- }
3071		-
3072		- /**
3073		- * Prints open in new tab js with fallback handler.
3074		- *
3075		- * @since 6.3.1
3076		- *
3077		- * @param string $success_url Success URL.
3078		- * @param array $args See {@see FrmFormsController::redirect_after_submit()}.
3079		- */
3080		- private static function print_open_in_new_tab_js_with_fallback_handler( $success_url, $args ) {
3081		- echo '<script>var newTab = window.open("' . esc_url_raw( $success_url ) . '", "_blank");';
3082		- echo 'if ( ! newTab ) {';
3083		-
3084		- $data = array(
3085		- 'formId' => intval( $args['form']->id ),
3086		- 'message' => self::get_redirect_fallback_message( $success_url, $args ),
3087		- );
3088		- // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
3089		- echo 'frmShowNewTabFallback = ' . FrmAppHelper::maybe_json_encode( $data ) . ';';
3090		- echo '}</script>';
3091		- }
3092		-
3093		- /**
3094		- * Gets response data for redirect action when AJAX submitting.
3095		- *
3096		- * @since 6.3.1
3097		- *
3098		- * @param array $args See {@see FrmFormsController::run_success_action()}.
3099		- *
3100		- * @return array
3101		- */
3102		- private static function get_ajax_redirect_response_data( $args ) {
3103		- $response_data = array(
3104		- 'redirect' => $args['success_url'],
3105		- 'content' => '',
3106		- );
3107		- $unset_content = true;
3108		-
3109		- if ( ! empty( $args['form']->options['redirect_delay'] ) ) {
3110		- $response_data['delay'] = $args['form']->options['redirect_delay_time'];
3111		- $response_data['content'] .= self::get_redirect_message( $args['success_url'], $args['form']->options['redirect_delay_msg'], $args );
3112		- $unset_content = false;
3113		- }
3114		-
3115		- if ( ! empty( $args['form']->options['open_in_new_tab'] ) ) {
3116		- $response_data['openInNewTab'] = 1;
3117		-
3118		- // Only show open in new tab text if there is no delay.
3119		- if ( empty( $response_data['content'] ) ) {
3120		- $args['message'] = FrmOnSubmitHelper::get_default_new_tab_msg();
3121		-
3122		- $args['form']->options['success_msg'] = $args['message'];
3123		- $args['form']->options['edit_msg'] = $args['message'];
3124		-
3125		- if ( ! isset( $args['fields'] ) ) {
3126		- $args['fields'] = FrmField::get_all_for_form( $args['form']->id );
3127		- }
3128		-
3129		- $args['message'] = self::prepare_submit_message( $args['form'], $args['entry_id'], $args );
3130		-
3131		- ob_start();
3132		- self::show_lone_success_message( $args );
3133		- $response_data['content'] .= ob_get_clean();
3134		- $unset_content = false;
3135		- }//end if
3136		-
3137		- $response_data['fallbackMsg'] = self::get_redirect_fallback_message( $args['success_url'], $args );
3138		- }//end if
3139		-
3140		- if ( $unset_content && '' === $response_data['content'] ) {
3141		- unset( $response_data['content'] );
3142		- }
3143		-
3144		- return $response_data;
3145		- }
3146		-
3147		- /**
3148		- * Redirects after submitting using JS. This is used when showing message before redirecting.
3149		- *
3150		- * @since 6.0
3151		- *
3152		- * @param array $args See {@see FrmFormsController::run_success_action()}.
3153		- */
3154		- private static function redirect_after_submit_using_js( $args ) {
3155		- $success_msg = $args['form']->options['redirect_delay_msg'];
3156		- $redirect_msg = self::get_redirect_message( $args['success_url'], $success_msg, $args );
3157		- $success_url = esc_url_raw( $args['success_url'] );
3158		-
3159		- /**
3160		- * Filters the delay time before redirecting when On Submit Redirect action is delayed.
3161		- *
3162		- * @since 6.0
3163		- *
3164		- * @param int $delay_time Delay time in milliseconds.
3165		- */
3166		- $delay_time = apply_filters( 'frm_redirect_delay_time', 1000 * $args['form']->options['redirect_delay_time'] );
3167		-
3168		- if ( ! empty( $args['form']->options['open_in_new_tab'] ) ) {
3169		- $redirect_js = 'window.open("' . $success_url . '", "_blank")';
	1981	+ die(); // do not use wp_die or redirect fails
3170	1982	} else {
3171		- $redirect_js = 'window.location="' . $success_url . '";';
	1983	+ add_filter( 'frm_use_wpautop', '__return_true' );
	1984	+ echo FrmAppHelper::maybe_kses( $redirect_msg ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
	1985	+ echo "<script type='text/javascript'>window.onload = function(){setTimeout(window.location='" . esc_url_raw( $success_url ) . "', 8000);}</script>";
3172	1986	}
3173		-
3174		- add_filter( 'frm_use_wpautop', '__return_true' );
3175		-
3176		- echo FrmAppHelper::maybe_kses( $redirect_msg ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
3177		- echo '<script>';
3178		-
3179		- if ( empty( $args['doing_ajax'] ) ) {
3180		- // Not AJAX submit, delay JS until window.load.
3181		- echo 'window.onload=function(){';
3182		- }
3183		- echo 'setTimeout(function(){' . $redirect_js . '}, ' . intval( $delay_time ) . ');'; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
3184		-
3185		- if ( empty( $args['doing_ajax'] ) ) {
3186		- echo '};';
3187		- }
3188		- echo '</script>';
3189	1987	}
3190	1988
3191	1989	/**
3192	1990	* @since 3.0
		@@ -3192,19 +1990,15 @@
3192	1990	* @since 3.0
3193	1991	*
3194	1992	* @param string $success_url
3195	1993	* @param string $success_msg
3196		- * @param array $args
	1994	+ * @param array $args
3197	1995	*/
3198	1996	private static function get_redirect_message( $success_url, $success_msg, $args ) {
3199		- $success_msg = apply_filters( 'frm_content', $success_msg, $args['form'], $args['entry_id'] );
3200		- $success_msg = do_shortcode( FrmAppHelper::use_wpautop( $success_msg ) );
3201		-
3202		- // phpcs:disable Generic.WhiteSpace.ScopeIndent
3203		- $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
3204		- self::get_redirect_fallback_message( $success_url, $args ) .
	1997	+ $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/>' .
	1998	+ /* translators: %1$s: Start link HTML, %2$s: End link HTML */
	1999	+ sprintf( __( '%1$sClick here%2$s if you are not automatically redirected.', 'formidable' ), '<a href="' . esc_url( $success_url ) . '">', '</a>' ) .
3205	2000	'</div></div>';
3206		- // phpcs:enable Generic.WhiteSpace.ScopeIndent
3207	2001
3208	2002	$redirect_args = array(
3209	2003	'entry_id' => $args['entry_id'],
3210	2004	'form_id' => $args['form']->id,
		@@ -3214,59 +2008,19 @@
3214	2008	return apply_filters( 'frm_redirect_msg', $redirect_msg, $redirect_args );
3215	2009	}
3216	2010
3217	2011	/**
3218		- * Gets fallback message when redirecting failed.
3219		- *
3220		- * @since 6.3.1
3221		- *
3222		- * @param string $success_url Redirect URL.
3223		- * @param array $args Contains `form` object.
3224		- *
3225		- * @return string
3226		- */
3227		- private static function get_redirect_fallback_message( $success_url, $args ) {
3228		- $target = '';
3229		-
3230		- if ( ! empty( $args['form']->options['open_in_new_tab'] ) ) {
3231		- $target = ' target="_blank"';
3232		- }
3233		-
3234		- return sprintf(
3235		- /* translators: %1$s: Start link HTML, %2$s: End link HTML */
3236		- __( '%1$sClick here%2$s if you are not automatically redirected.', 'formidable' ),
3237		- '<a href="' . esc_url( $success_url ) . '"' . $target . '>',
3238		- '</a>'
3239		- );
3240		- }
3241		-
3242		- /**
3243	2012	* Prepare to show the success message and empty form after submit
3244	2013	*
3245	2014	* @since 2.05
3246		- *
3247		- * @param array $atts
3248		- *
3249		- * @return void
3250	2015	*/
3251	2016	public static function show_message_after_save( $atts ) {
3252		- $atts['message'] = self::prepare_submit_message( $atts['form'], $atts['entry_id'], $atts );
	2017	+ $atts['message'] = self::prepare_submit_message( $atts['form'], $atts['entry_id'] );
3253	2018
3254	2019	if ( ! isset( $atts['form']->options['show_form'] ) || $atts['form']->options['show_form'] ) {
3255		- if ( isset( $atts['action'] ) && 'update' === $atts['action'] && is_callable( array( 'FrmProEntriesController', 'show_front_end_form_with_entry' ) ) ) {
3256		- $entry = FrmEntry::getOne( $atts['entry_id'] );
3257		-
3258		- if ( $entry ) {
3259		- // This is copied from the Pro plugin.
3260		- $atts['conf_message'] = FrmProEntriesController::confirmation( 'message', $atts['form'], $atts['form']->options, $entry->id, $atts );
3261		- $atts['show_form'] = FrmProEntriesController::is_form_displayed_after_edit( $atts['form'] );
3262		- FrmProEntriesController::show_front_end_form_with_entry( $entry, $atts );
3263		- }
3264		- } else {
3265		- self::show_form_after_submit( $atts );
3266		- }
	2020	+ self::show_form_after_submit( $atts );
3267	2021	} else {
3268		- self::show_lone_success_message( $atts );
	2022	+ self::show_lone_success_messsage( $atts );
3269	2023	}
3270	2024	}
3271	2025
3272	2026	/**
		@@ -3272,12 +2026,8 @@
3272	2026	/**
3273	2027	* Show an empty form
3274	2028	*
3275	2029	* @since 2.05
3276		- *
3277		- * @param array $args
3278		- *
3279		- * @return void
3280	2030	*/
3281	2031	private static function show_form_after_submit( $args ) {
3282	2032	self::fill_atts_for_form_display( $args );
3283	2033
		@@ -3296,11 +2046,12 @@
3296	2046	}
3297	2047	unset( $args );
3298	2048
3299	2049	$include_form_tag = apply_filters( 'frm_include_form_tag', true, $form );
3300		- $frm_settings = FrmAppHelper::get_settings();
3301		- $submit = $form->options['submit_value'] ?? $frm_settings->submit_value;
3302	2050
	2051	+ $frm_settings = FrmAppHelper::get_settings();
	2052	+ $submit = isset( $form->options['submit_value'] ) ? $form->options['submit_value'] : $frm_settings->submit_value;
	2053	+
3303	2054	global $frm_vars;
3304	2055	self::maybe_load_css( $form, $values['custom_style'], $frm_vars['load_css'] );
3305	2056
3306	2057	$message_placement = self::message_placement( $form, $message );
		@@ -3308,36 +2059,27 @@
3308	2059	include FrmAppHelper::plugin_path() . '/classes/views/frm-entries/new.php';
3309	2060	}
3310	2061
3311	2062	/**
3312		- * Gets message placement.
	2063	+ * @return string - 'before', 'after', or 'submit'
3313	2064	*
3314	2065	* @since 4.05.02
3315		- * @since 6.26 This method changed from `private` to `public`.
3316		- *
3317		- * @param object $form Form object.
3318		- * @param string $message The message.
3319		- *
3320		- * @return string Accepts 'before', 'after', or 'submit'.
3321	2066	*/
3322		- public static function message_placement( $form, $message ) {
	2067	+ private static function message_placement( $form, $message ) {
3323	2068	$place = 'before';
3324	2069
3325	2070	if ( $message && isset( $form->options['form_class'] ) ) {
3326		- if ( str_contains( $form->options['form_class'], 'frm_below_success' ) ) {
	2071	+ if ( strpos( $form->options['form_class'], 'frm_below_success' ) !== false ) {
3327	2072	$place = 'after';
3328		- } elseif ( str_contains( $form->options['form_class'], 'frm_inline_success' ) ) {
	2073	+ } elseif ( strpos( $form->options['form_class'], 'frm_inline_success' ) !== false ) {
3329	2074	$place = 'submit';
3330	2075	}
3331	2076	}
3332	2077
3333	2078	/**
3334		- * Filter the message placement.
	2079	+ * @return string - 'before' or 'after'
3335	2080	*
3336	2081	* @since 4.05.02
3337		- *
3338		- * @param string $place Accepts 'before', 'after', or 'submit'.
3339		- * @param array $args Args.
3340	2082	*/
3341	2083	return apply_filters( 'frm_message_placement', $place, compact( 'form', 'message' ) );
3342	2084	}
3343	2085
		@@ -3344,22 +2086,10 @@
3344	2086	/**
3345	2087	* Get all the values needed on the new.php entry page
3346	2088	*
3347	2089	* @since 2.05
3348		- *
3349		- * @param array $args
3350		- *
3351		- * @return void
3352	2090	*/
3353	2091	private static function fill_atts_for_form_display( &$args ) {
3354		- if ( ! isset( $args['title'] ) && isset( $args['show_title'] ) ) {
3355		- $args['title'] = $args['show_title'];
3356		- }
3357		-
3358		- if ( ! isset( $args['description'] ) && isset( $args['show_description'] ) ) {
3359		- $args['description'] = $args['show_description'];
3360		- }
3361		-
3362	2092	$defaults = array(
3363	2093	'errors' => array(),
3364	2094	'message' => '',
3365	2095	'fields' => array(),
		@@ -3374,24 +2104,21 @@
3374	2104	/**
3375	2105	* Show the success message without the form
3376	2106	*
3377	2107	* @since 2.05
3378		- *
3379		- * @param array $atts
3380		- *
3381		- * @return void
3382	2108	*/
3383		- private static function show_lone_success_message( $atts ) {
	2109	+ private static function show_lone_success_messsage( $atts ) {
3384	2110	global $frm_vars;
3385	2111	$values = FrmEntriesHelper::setup_new_vars( $atts['fields'], $atts['form'], true );
3386	2112	self::maybe_load_css( $atts['form'], $values['custom_style'], $frm_vars['load_css'] );
3387	2113
3388	2114	$include_extra_container = 'frm_forms' . FrmFormsHelper::get_form_style_class( $values );
3389		- $errors = array();
3390		- $form = $atts['form'];
3391		- $message = $atts['message'];
3392	2115
3393		- include FrmAppHelper::plugin_path() . '/classes/views/frm-entries/errors.php';
	2116	+ $errors = array();
	2117	+ $form = $atts['form'];
	2118	+ $message = $atts['message'];
	2119	+
	2120	+ include( FrmAppHelper::plugin_path() . '/classes/views/frm-entries/errors.php' );
3394	2121	}
3395	2122
3396	2123	/**
3397	2124	* Prepare the success message before it's shown
		@@ -3396,22 +2123,14 @@
3396	2123	/**
3397	2124	* Prepare the success message before it's shown
3398	2125	*
3399	2126	* @since 2.05
3400		- * @since 6.0.x Added the third parameter.
3401		- *
3402		- * @param object $form Form object.
3403		- * @param int|string $entry_id Entry ID.
3404		- * @param array $args See {@see FrmFormsController::run_success_action()}.
3405		- *
3406		- * @return string
3407	2127	*/
3408		- private static function prepare_submit_message( $form, $entry_id, $args = array() ) {
	2128	+ private static function prepare_submit_message( $form, $entry_id ) {
3409	2129	$frm_settings = FrmAppHelper::get_settings( array( 'current_form' => $form->id ) );
3410		- $opt = $args['success_opt'] ?? 'success';
3411	2130
3412	2131	if ( $entry_id && is_numeric( $entry_id ) ) {
3413		- $message = $form->options[ $opt . '_msg' ] ?? $frm_settings->success_msg;
	2132	+ $message = isset( $form->options['success_msg'] ) ? $form->options['success_msg'] : $frm_settings->success_msg;
3414	2133	$class = 'frm_message';
3415	2134	} else {
3416	2135	$message = $frm_settings->failed_msg;
3417	2136	$class = FrmFormsHelper::form_error_class();
		@@ -3421,16 +2140,13 @@
3421	2140
3422	2141	return apply_filters( 'frm_main_feedback', $message, $form, $entry_id );
3423	2142	}
3424	2143
3425		- /**
3426		- * @return void
3427		- */
3428	2144	public static function front_head() {
3429	2145	$version = FrmAppHelper::plugin_version();
3430	2146	$suffix = FrmAppHelper::js_suffix();
3431	2147
3432		- if ( $suffix && self::has_combo_js_file() ) {
	2148	+ if ( ! empty( $suffix ) && self::has_combo_js_file() ) {
3433	2149	wp_register_script( 'formidable', FrmAppHelper::plugin_url() . '/js/frm.min.js', array( 'jquery' ), $version, true );
3434	2150	} else {
3435	2151	wp_register_script( 'formidable', FrmAppHelper::plugin_url() . "/js/formidable{$suffix}.js", array( 'jquery' ), $version, true );
3436	2152	}
		@@ -3437,9 +2153,9 @@
3437	2153
3438	2154	add_filter( 'script_loader_tag', 'FrmFormsController::defer_script_loading', 10, 2 );
3439	2155
3440	2156	if ( FrmAppHelper::is_admin() ) {
3441		- // Don't load this in back-end
	2157	+ // don't load this in back-end
3442	2158	return;
3443	2159	}
3444	2160
3445	2161	FrmAppHelper::localize_script( 'front' );
		@@ -3452,15 +2168,8 @@
3452	2168	public static function has_combo_js_file() {
3453	2169	return is_readable( FrmAppHelper::plugin_path() . '/js/frm.min.js' );
3454	2170	}
3455	2171
3456		- /**
3457		- * @param object $form
3458		- * @param int|string $this_load
3459		- * @param bool $global_load
3460		- *
3461		- * @return void
3462		- */
3463	2172	public static function maybe_load_css( $form, $this_load, $global_load ) {
3464	2173	$load_css = FrmForm::is_form_loaded( $form, $this_load, $global_load );
3465	2174
3466	2175	if ( ! $load_css ) {
		@@ -3478,86 +2187,46 @@
3478	2187	* If css is loaded only on applicable pages, include it before the form loads
3479	2188	* to prevent a flash of unstyled form.
3480	2189	*
3481	2190	* @since 4.01
3482		- *
3483		- * @return void
3484	2191	*/
3485	2192	private static function load_late_css() {
3486	2193	$frm_settings = FrmAppHelper::get_settings();
3487		- $late_css = $frm_settings->load_style === 'dynamic';
3488		-
3489		- if ( ! $late_css || ! self::should_load_late() ) {
	2194	+ $late_css = $frm_settings->load_style === 'dynamic';
	2195	+ if ( ! $late_css ) {
3490	2196	return;
3491	2197	}
3492	2198
3493	2199	global $wp_styles;
3494		-
3495		- if ( is_array( $wp_styles->queue ) && in_array( 'formidable', $wp_styles->queue, true ) ) {
	2200	+ if ( is_array( $wp_styles->queue ) && in_array( 'formidable', $wp_styles->queue ) ) {
3496	2201	wp_print_styles( 'formidable' );
3497	2202	}
3498	2203	}
3499	2204
3500		- /**
3501		- * Avoid late load if All in One SEO is active because it prevents CSS from loading entirely.
3502		- *
3503		- * @since 5.2.03
3504		- *
3505		- * @return bool
3506		- */
3507		- private static function should_load_late() {
3508		- return ! function_exists( 'aioseo' );
3509		- }
3510		-
3511		- /**
3512		- * @param string $tag
3513		- * @param string $handle
3514		- *
3515		- * @return string
3516		- */
3517	2205	public static function defer_script_loading( $tag, $handle ) {
3518		- if ( 'captcha-api' === $handle && ! str_contains( $tag, 'defer' ) ) {
3519		- return str_replace( ' src', ' defer="defer" async="async" src', $tag );
	2206	+ if ( 'recaptcha-api' == $handle && ! strpos( $tag, 'defer' ) ) {
	2207	+ $tag = str_replace( ' src', ' defer="defer" async="async" src', $tag );
3520	2208	}
3521	2209
3522	2210	return $tag;
3523	2211	}
3524	2212
3525		- /**
3526		- * @param string $location
3527		- *
3528		- * @return void
3529		- */
3530	2213	public static function footer_js( $location = 'footer' ) {
3531	2214	global $frm_vars;
3532	2215
3533	2216	FrmStylesController::enqueue_css();
3534	2217
3535		- if ( FrmAppHelper::is_admin() || $location === 'header' || empty( $frm_vars['forms_loaded'] ) ) {
3536		- return;
	2218	+ if ( ! FrmAppHelper::is_admin() && $location != 'header' && ! empty( $frm_vars['forms_loaded'] ) ) {
	2219	+ // load formidable js
	2220	+ wp_enqueue_script( 'formidable' );
3537	2221	}
3538		-
3539		- // Load formidable js
3540		- wp_enqueue_script( 'formidable' );
3541		-
3542		- FrmHoneypot::maybe_print_honeypot_js();
3543		-
3544		- if ( ! method_exists( 'FrmProFormsHelper', 'load_currency_js' ) ) {
3545		- // Load currency JS if Pro is not installed.
3546		- FrmFormsHelper::load_currency_js();
3547		- }
3548	2222	}
3549	2223
3550	2224	/**
3551	2225	* @since 2.0.8
3552		- *
3553		- * @param array $atts
3554		- * @param string $content
3555		- *
3556		- * @return void
3557	2226	*/
3558	2227	private static function maybe_minimize_form( $atts, &$content ) {
3559		- // Check if minimizing is turned on
	2228	+ // check if minimizing is turned on
3560	2229	if ( self::is_minification_on( $atts ) ) {
3561	2230	$content = str_replace( array( "\r\n", "\r", "\n", "\t", ' ' ), '', $content );
3562	2231	}
3563	2232	}
		@@ -3563,147 +2232,73 @@
3563	2232	}
3564	2233
3565	2234	/**
3566	2235	* @since 2.0.8
3567		- *
3568		- * @param array $atts
3569		- *
3570		- * @return bool
	2236	+ * @return boolean
3571	2237	*/
3572	2238	private static function is_minification_on( $atts ) {
3573		- return ! empty( $atts['minimize'] );
	2239	+ return isset( $atts['minimize'] ) && ! empty( $atts['minimize'] );
3574	2240	}
3575	2241
3576	2242	/**
3577		- * @since 5.0.16
3578		- *
3579		- * @return void
	2243	+ * @deprecated 4.0
3580	2244	*/
3581		- public static function landing_page_preview_option() {
3582		- $dir = apply_filters( 'frm_landing_page_preview_option', false );
	2245	+ public static function new_form( $values = array() ) {
	2246	+ FrmDeprecated::new_form( $values );
	2247	+ }
3583	2248
3584		- if ( false === $dir || ! file_exists( $dir . 'landing-page-preview-option.php' ) ) {
3585		- $dir = self::get_form_views_path();
3586		- }
	2249	+ /**
	2250	+ * @deprecated 4.0
	2251	+ */
	2252	+ public static function create( $values = array() ) {
	2253	+ _deprecated_function( __METHOD__, '4.0', 'FrmFormsController::update' );
	2254	+ self::update( $values );
	2255	+ }
3587	2256
3588		- include $dir . 'landing-page-preview-option.php';
	2257	+ /**
	2258	+ * @deprecated 1.07.05
	2259	+ * @codeCoverageIgnore
	2260	+ */
	2261	+ public static function add_default_templates( $path, $default = true, $template = true ) {
	2262	+ FrmDeprecated::add_default_templates( $path, $default, $template );
3589	2263	}
3590	2264
3591	2265	/**
3592		- * @since 5.0.16
3593		- *
3594		- * @return string
	2266	+ * @deprecated 3.0
	2267	+ * @codeCoverageIgnore
3595	2268	*/
3596		- private static function get_form_views_path() {
3597		- return FrmAppHelper::plugin_path() . '/classes/views/frm-forms/';
	2269	+ public static function bulk_create_template( $ids ) {
	2270	+ return FrmDeprecated::bulk_create_template( $ids );
3598	2271	}
3599	2272
3600	2273	/**
3601		- * Create a page with an embedded formidable Gutenberg block.
3602		- *
3603		- * @since 5.2
3604		- *
3605		- * @return void
	2274	+ * @deprecated 2.03
	2275	+ * @codeCoverageIgnore
3606	2276	*/
3607		- public static function create_page_with_shortcode() {
3608		- if ( ! current_user_can( 'publish_posts' ) ) {
3609		- die( 0 );
3610		- }
3611		-
3612		- check_ajax_referer( 'frm_ajax', 'nonce' );
3613		-
3614		- $type = FrmAppHelper::get_post_param( 'type', '', 'sanitize_text_field' );
3615		-
3616		- if ( ! $type || ! in_array( $type, array( 'form', 'view' ), true ) ) {
3617		- die( 0 );
3618		- }
3619		-
3620		- $object_id = FrmAppHelper::get_post_param( 'object_id', '', 'absint' );
3621		-
3622		- if ( ! $object_id ) {
3623		- die( 0 );
3624		- }
3625		-
3626		- $postarr = array( 'post_type' => 'page' );
3627		-
3628		- if ( 'form' === $type ) {
3629		- $postarr['post_content'] = self::get_page_shortcode_content_for_form( $object_id );
3630		- } else {
3631		- $postarr['post_content'] = apply_filters( 'frm_create_page_with_' . $type . '_shortcode_content', '', $object_id );
3632		- }
3633		-
3634		- $name = FrmAppHelper::get_post_param( 'name', '', 'sanitize_text_field' );
3635		-
3636		- if ( $name ) {
3637		- $postarr['post_title'] = $name;
3638		- }
3639		-
3640		- $success = wp_insert_post( $postarr );
3641		-
3642		- if ( ! is_numeric( $success ) || ! $success ) {
3643		- die( 0 );
3644		- }
3645		-
3646		- wp_send_json(
3647		- array(
3648		- 'redirect' => get_edit_post_link( $success, 'redirect' ),
3649		- )
3650		- );
	2277	+ public static function register_pro_scripts() {
	2278	+ FrmDeprecated::register_pro_scripts();
3651	2279	}
3652	2280
3653	2281	/**
3654		- * @since 5.3
3655		- *
3656		- * @param int $form_id
3657		- *
3658		- * @return string
	2282	+ * @deprecated 3.0
	2283	+ * @codeCoverageIgnore
3659	2284	*/
3660		- private static function get_page_shortcode_content_for_form( $form_id ) {
3661		- $shortcode = '[formidable id="' . $form_id . '"]';
3662		- $html_comment_start = '<!-- wp:formidable/simple-form {"formId":"' . $form_id . '"} -->';
3663		- $html_comment_end = '<!-- /wp:formidable/simple-form -->';
3664		- return $html_comment_start . '<div>' . $shortcode . '</div>' . $html_comment_end;
	2285	+ public static function edit_key() {
	2286	+ FrmDeprecated::edit_key();
3665	2287	}
3666	2288
3667	2289	/**
3668		- * Get page dropdown for AJAX request for embedding form in an existing page.
3669		- *
3670		- * @return void
	2290	+ * @deprecated 3.0
	2291	+ * @codeCoverageIgnore
3671	2292	*/
3672		- public static function get_page_dropdown() {
3673		- if ( ! current_user_can( 'publish_posts' ) ) {
3674		- die( 0 );
3675		- }
3676		-
3677		- check_ajax_referer( 'frm_ajax', 'nonce' );
3678		-
3679		- $html = FrmAppHelper::clip(
3680		- function () {
3681		- FrmAppHelper::maybe_autocomplete_pages_options(
3682		- array(
3683		- 'field_name' => 'frm_page_dropdown',
3684		- 'page_id' => '',
3685		- 'placeholder' => __( 'Select a Page', 'formidable' ),
3686		- )
3687		- );
3688		- }
3689		- );
3690		- wp_send_json(
3691		- array(
3692		- 'html' => $html,
3693		- 'edit_page_url' => admin_url( sprintf( get_post_type_object( 'page' )->_edit_link . '&action=edit', 0 ) ),
3694		- )
3695		- );
	2293	+ public static function edit_description() {
	2294	+ FrmDeprecated::edit_description();
3696	2295	}
3697	2296
3698	2297	/**
3699		- * @deprecated 4.0
3700		- *
3701		- * @param array $values
3702		- *
3703		- * @return void
	2298	+ * @deprecated 4.08
	2299	+ * @since 3.06
3704	2300	*/
3705		- public static function create( $values = array() ) {
3706		- _deprecated_function( __METHOD__, '4.0', 'FrmFormsController::update' );
3707		- self::update( $values );
	2301	+ public static function add_new() {
	2302	+ _deprecated_function( __FUNCTION__, '4.08' );
3708	2303	}
3709	2304	}