← All changes | classes/controllers/FrmFormsController.php +573 -1815 6.27 → 5.2.02 View file →

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