← All changes | classes/controllers/FrmFormsController.php +619 -1506 6.35 → 6.2 View file →

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