← All changes | classes/controllers/FrmFormsController.php +479 -1675 6.26 → 5.3.2 View file →

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