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