← All changes | classes/controllers/FrmFormsController.php +616 -1327 6.32.1 → 6.2 View file →

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