← All changes | classes/controllers/FrmFormsController.php +644 -1816 6.3 → 3.06.06 View file →

		@@ -1,12 +1,9 @@
1	1	<?php
2		-if ( ! defined( 'ABSPATH' ) ) {
3		- die( 'You are not allowed to call this page directly.' );
4		-}
5	2
6	3	class FrmFormsController {
7	4
8		- public static function menu() {
	5	+ public static function menu() {
9	6	$menu_label = __( 'Forms', 'formidable' );
10	7	if ( ! FrmAppHelper::pro_is_installed() ) {
11	8	$menu_label .= ' (Lite)';
12	9	}
		@@ -12,12 +9,13 @@
12	9	}
13	10	add_submenu_page( 'formidable', 'Formidable | ' . $menu_label, $menu_label, 'frm_view_forms', 'formidable', 'FrmFormsController::route' );
14	11
15	12	self::maybe_load_listing_hooks();
16		- }
	13	+ }
17	14
18	15	public static function maybe_load_listing_hooks() {
19		- if ( ! FrmAppHelper::on_form_listing_page() ) {
	16	+ $action = FrmAppHelper::simple_get( 'frm_action', 'sanitize_title' );
	17	+ if ( ! empty( $action ) && ! in_array( $action, array( 'list', 'trash', 'untrash', 'destroy' ) ) ) {
20	18	return;
21	19	}
22	20
23	21	add_filter( 'get_user_option_managetoplevel_page_formidablecolumnshidden', 'FrmFormsController::hidden_columns' );
		@@ -25,35 +23,22 @@
25	23	add_filter( 'manage_toplevel_page_formidable_columns', 'FrmFormsController::get_columns', 0 );
26	24	add_filter( 'manage_toplevel_page_formidable_sortable_columns', 'FrmFormsController::get_sortable_columns' );
27	25	}
28	26
29		- public static function head() {
30		- if ( wp_is_mobile() ) {
31		- wp_enqueue_script( 'jquery-touch-punch' );
32		- }
33		- }
	27	+ public static function head() {
	28	+ wp_enqueue_script( 'formidable-editinplace' );
34	29
	30	+ if ( wp_is_mobile() ) {
	31	+ wp_enqueue_script( 'jquery-touch-punch' );
	32	+ }
	33	+ }
	34	+
35	35	public static function register_widgets() {
36		- require_once FrmAppHelper::plugin_path() . '/classes/widgets/FrmShowForm.php';
	36	+ require_once( FrmAppHelper::plugin_path() . '/classes/widgets/FrmShowForm.php' );
37	37	register_widget( 'FrmShowForm' );
38	38	}
39	39
40	40	/**
41		- * Show a message about conditional logic
42		- *
43		- * @since 4.06.03
44		- */
45		- public static function logic_tip() {
46		- $images_url = FrmAppHelper::plugin_url() . '/images/';
47		- $data_message = __( 'Only show the fields you need and create branching forms. Upgrade to get conditional logic and question branching.', 'formidable' );
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 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">';
50		- esc_html_e( 'Conditional Logic', 'formidable' );
51		- FrmAppHelper::icon_by_class( 'frmfont frm_arrowdown6_icon', array( 'aria-hidden' => 'true' ) );
52		- echo '</a>';
53		- }
54		-
55		- /**
56	41	* By default, Divi processes form shortcodes on the edit post page.
57	42	* Now that won't do.
58	43	*
59	44	* @since 3.01
		@@ -59,21 +44,17 @@
59	44	* @since 3.01
60	45	*/
61	46	public static function prevent_divi_conflict( $shortcodes ) {
62	47	$shortcodes[] = 'formidable';
63		-
64	48	return $shortcodes;
65	49	}
66	50
67		- /**
68		- * @return void
69		- */
70	51	public static function list_form() {
71	52	FrmAppHelper::permission_check( 'frm_view_forms' );
72	53
73	54	$message = '';
74		- $params = FrmForm::list_page_params();
75		- $errors = self::process_bulk_form_actions( array() );
	55	+ $params = FrmForm::list_page_params();
	56	+ $errors = self::process_bulk_form_actions( array() );
76	57	if ( isset( $errors['message'] ) ) {
77	58	$message = $errors['message'];
78	59	unset( $errors['message'] );
79	60	}
		@@ -78,134 +59,159 @@
78	59	unset( $errors['message'] );
79	60	}
80	61	$errors = apply_filters( 'frm_admin_list_form_action', $errors );
81	62
82		- self::display_forms_list( $params, $message, $errors );
	63	+ return self::display_forms_list( $params, $message, $errors );
83	64	}
84	65
85	66	/**
86		- * Create the default email action
	67	+ * Choose which type of form to create
87	68	*
88		- * @since 2.02.11
89		- *
90		- * @param object|int $form
	69	+ * @since 3.06
91	70	*/
92		- private static function create_default_email_action( $form ) {
93		- FrmForm::maybe_get_form( $form );
94		- $create_email = apply_filters( 'frm_create_default_email_action', true, $form );
	71	+ public static function add_new() {
	72	+ require( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/add-new.php' );
	73	+ }
95	74
96		- if ( $create_email ) {
97		- $action_control = FrmFormActionsController::get_form_actions( 'email' );
98		- $action_control->create( $form->id );
99		- }
100		- }
	75	+ public static function new_form( $values = array() ) {
	76	+ FrmAppHelper::permission_check( 'frm_edit_forms' );
101	77
	78	+ global $frm_vars;
	79	+
	80	+ $action = isset( $_REQUEST['frm_action'] ) ? 'frm_action' : 'action';
	81	+ $action = empty( $values ) ? FrmAppHelper::get_param( $action, '', 'get', 'sanitize_title' ) : $values[ $action ];
	82	+
	83	+ if ( $action == 'create' ) {
	84	+ self::create( $values );
	85	+ return;
	86	+ } else if ( $action == 'new' ) {
	87	+ $frm_field_selection = FrmField::field_selection();
	88	+ $values = FrmFormsHelper::setup_new_vars( $values );
	89	+ $id = FrmForm::create( $values );
	90	+ $form = FrmForm::getOne( $id );
	91	+
	92	+ self::create_default_email_action( $form );
	93	+
	94	+ $all_templates = FrmForm::getAll( array( 'is_template' => 1 ), 'name' );
	95	+
	96	+ $values['id'] = $id;
	97	+ require( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/new.php' );
	98	+ }
	99	+ }
	100	+
102	101	/**
103		- * Create the default On submit action
	102	+ * Create the default email action
104	103	*
105		- * @since 6.0.0
	104	+ * @since 2.02.11
106	105	*
107		- * @param object|int $form Form object or ID.
	106	+ * @param object $form
108	107	*/
109		- private static function create_default_on_submit_action( $form ) {
110		- FrmForm::maybe_get_form( $form );
	108	+ private static function create_default_email_action( $form ) {
	109	+ $create_email = apply_filters( 'frm_create_default_email_action', true, $form );
111	110
112		- /**
113		- * Enable or disable the default On Submit action.
114		- *
115		- * @since 6.0.0
116		- *
117		- * @param bool $create Set to `false` if you want to disable.
118		- * @param object $form Form object.
119		- */
120		- $create = apply_filters( 'frm_create_default_on_submit_action', true, $form );
	111	+ if ( $create_email ) {
	112	+ $action_control = FrmFormActionsController::get_form_actions( 'email' );
	113	+ $action_control->create( $form->id );
	114	+ }
	115	+ }
121	116
122		- if ( $create ) {
123		- $action_control = FrmFormActionsController::get_form_actions( FrmOnSubmitAction::$slug );
124		- $action_control->create( $form->id );
125		- }
126		- }
	117	+ public static function create( $values = array() ) {
	118	+ FrmAppHelper::permission_check( 'frm_edit_forms' );
127	119
128		- public static function edit( $values = false ) {
	120	+ global $frm_vars;
	121	+ if ( empty( $values ) ) {
	122	+ $values = $_POST;
	123	+ }
	124	+
	125	+ //Set radio button and checkbox meta equal to "other" value
	126	+ if ( FrmAppHelper::pro_is_installed() ) {
	127	+ $values = FrmProEntry::mod_other_vals( $values, 'back' );
	128	+ }
	129	+
	130	+ $id = isset( $values['id'] ) ? absint( $values['id'] ) : FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
	131	+
	132	+ if ( ! current_user_can( 'frm_edit_forms' ) || ( $_POST && ( ! isset( $values['frm_save_form'] ) || ! wp_verify_nonce( $values['frm_save_form'], 'frm_save_form_nonce' ) ) ) ) {
	133	+ $frm_settings = FrmAppHelper::get_settings();
	134	+ $errors = array( 'form' => $frm_settings->admin_permission );
	135	+ } else {
	136	+ $errors = FrmForm::validate( $values );
	137	+ }
	138	+
	139	+ if ( count( $errors ) > 0 ) {
	140	+ $hide_preview = true;
	141	+ $frm_field_selection = FrmField::field_selection();
	142	+ $form = FrmForm::getOne( $id );
	143	+ $fields = FrmField::get_all_for_form( $id );
	144	+
	145	+ $values = FrmAppHelper::setup_edit_vars( $form, 'forms', '', true );
	146	+ $values['fields'] = $fields;
	147	+ $all_templates = FrmForm::getAll( array( 'is_template' => 1 ), 'name' );
	148	+
	149	+ require( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/new.php' );
	150	+ } else {
	151	+ FrmForm::update( $id, $values, true );
	152	+ $url = admin_url( 'admin.php?page=formidable&frm_action=settings&id=' . $id );
	153	+ die( FrmAppHelper::js_redirect( $url ) ); // WPCS: XSS ok.
	154	+ }
	155	+ }
	156	+
	157	+ public static function edit( $values = false ) {
129	158	FrmAppHelper::permission_check( 'frm_edit_forms' );
130	159
131	160	$id = isset( $values['id'] ) ? absint( $values['id'] ) : FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
132		-
133	161	return self::get_edit_vars( $id );
134		- }
	162	+ }
135	163
136		- public static function settings( $id = false, $message = '' ) {
	164	+ public static function settings( $id = false, $message = '' ) {
137	165	FrmAppHelper::permission_check( 'frm_edit_forms' );
138	166
139	167	if ( ! $id || ! is_numeric( $id ) ) {
140	168	$id = FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
141		- }
142		-
143		- FrmOnSubmitHelper::maybe_migrate_submit_settings_to_action( $id );
144		-
	169	+ }
145	170	return self::get_settings_vars( $id, array(), $message );
146		- }
	171	+ }
147	172
148		- public static function update_settings() {
	173	+ public static function update_settings() {
149	174	FrmAppHelper::permission_check( 'frm_edit_forms' );
150	175
151	176	$id = FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
152	177
153		- $errors = FrmForm::validate( $_POST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
154		- $warnings = FrmFormsHelper::check_for_warnings( $_POST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
155		-
	178	+ $errors = FrmForm::validate( $_POST );
156	179	if ( count( $errors ) > 0 ) {
157		- return self::get_settings_vars( $id, $errors, compact( 'warnings' ) );
	180	+ return self::get_settings_vars( $id, $errors );
158	181	}
159	182
160	183	do_action( 'frm_before_update_form_settings', $id );
161	184
162		- $antispam_was_on = self::antispam_was_on( $id );
	185	+ FrmForm::update( $id, $_POST );
163	186
164		- FrmForm::update( $id, $_POST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
	187	+ $message = __( 'Settings Successfully Updated', 'formidable' );
	188	+ return self::get_settings_vars( $id, array(), $message );
	189	+ }
165	190
166		- $antispam_is_on = ! empty( $_POST['options']['antispam'] ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
167		- if ( $antispam_is_on !== $antispam_was_on ) {
168		- FrmAntiSpam::clear_caches();
169		- }
170		-
171		- $message = __( 'Settings Successfully Updated', 'formidable' );
172		-
173		- return self::get_settings_vars( $id, array(), compact( 'message', 'warnings' ) );
174		- }
175		-
176		- /**
177		- * @param int $form_id
178		- * @return bool
179		- */
180		- private static function antispam_was_on( $form_id ) {
181		- $form = FrmForm::getOne( $form_id );
182		- return ! empty( $form->options['antispam'] );
183		- }
184		-
185	191	public static function update( $values = array() ) {
186	192	if ( empty( $values ) ) {
187		- $values = $_POST; // phpcs:ignore WordPress.Security.NonceVerification.Missing
188		- }
	193	+ $values = $_POST;
	194	+ }
189	195
190		- // Set radio button and checkbox meta equal to "other" value.
191		- if ( FrmAppHelper::pro_is_installed() ) {
192		- $values = FrmProEntry::mod_other_vals( $values, 'back' );
193		- }
	196	+ //Set radio button and checkbox meta equal to "other" value
	197	+ if ( FrmAppHelper::pro_is_installed() ) {
	198	+ $values = FrmProEntry::mod_other_vals( $values, 'back' );
	199	+ }
194	200
195		- $errors = FrmForm::validate( $values );
196		- $permission_error = FrmAppHelper::permission_nonce_error( 'frm_edit_forms', 'frm_save_form', 'frm_save_form_nonce' );
197		- if ( $permission_error !== false ) {
198		- $errors['form'] = $permission_error;
199		- }
	201	+ $errors = FrmForm::validate( $values );
	202	+ $permission_error = FrmAppHelper::permission_nonce_error( 'frm_edit_forms', 'frm_save_form', 'frm_save_form_nonce' );
	203	+ if ( $permission_error !== false ) {
	204	+ $errors['form'] = $permission_error;
	205	+ }
200	206
201	207	$id = isset( $values['id'] ) ? absint( $values['id'] ) : FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
202	208
203	209	if ( count( $errors ) > 0 ) {
204		- return self::get_edit_vars( $id, $errors );
	210	+ return self::get_edit_vars( $id, $errors );
205	211	} else {
206		- FrmForm::update( $id, $values );
207		- $message = __( 'Form was successfully updated.', 'formidable' );
	212	+ FrmForm::update( $id, $values );
	213	+ $message = __( 'Form was Successfully Updated', 'formidable' );
208	214
209	215	if ( self::is_too_long( $values ) ) {
210	216	$message .= '<br/> ' . sprintf(
211	217	/* translators: %1$s: Start link HTML, %2$s: end link HTML */
		@@ -214,15 +220,14 @@
214	220	'</a>'
215	221	);
216	222	}
217	223
218		- if ( defined( 'DOING_AJAX' ) ) {
219		- wp_die( FrmAppHelper::kses( $message, array( 'a' ) ) ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
220		- }
221		-
	224	+ if ( defined( 'DOING_AJAX' ) ) {
	225	+ wp_die( esc_html( $message ) );
	226	+ }
222	227	return self::get_edit_vars( $id, array(), $message );
223		- }
224		- }
	228	+ }
	229	+ }
225	230
226	231	/**
227	232	* Check if the value at the end of the form was included.
228	233	* If it's missing, it means other values at the end of the form
		@@ -247,9 +252,9 @@
247	252	FrmAppHelper::permission_check( 'frm_edit_forms' );
248	253	check_ajax_referer( 'frm_ajax', 'nonce' );
249	254
250	255	$current_form = FrmAppHelper::get_param( 'this_form', '', 'get', 'absint' );
251		- $template_id = FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
	256	+ $template_id = FrmAppHelper::get_param( 'id', '', 'get', 'absint' );
252	257
253	258	if ( $current_form ) {
254	259	FrmForm::destroy( $current_form );
255	260	}
		@@ -257,65 +262,48 @@
257	262	echo esc_url_raw( admin_url( 'admin.php?page=formidable&frm_action=duplicate&id=' . absint( $template_id ) ) );
258	263	wp_die();
259	264	}
260	265
261		- public static function duplicate() {
	266	+ public static function duplicate() {
262	267	FrmAppHelper::permission_check( 'frm_edit_forms' );
263		- $nonce = FrmAppHelper::simple_get( '_wpnonce' );
264	268
265		- if ( ! wp_verify_nonce( $nonce ) ) {
266		- $frm_settings = FrmAppHelper::get_settings();
267		- wp_die( esc_html( $frm_settings->admin_permission ) );
268		- }
	269	+ $params = FrmForm::list_page_params();
	270	+ $form = FrmForm::duplicate( $params['id'], $params['template'], true );
	271	+ $message = $params['template'] ? __( 'Form template was Successfully Created', 'formidable' ) : __( 'Form was Successfully Copied', 'formidable' );
	272	+ if ( $form ) {
	273	+ return self::get_edit_vars( $form, array(), $message, true );
	274	+ } else {
	275	+ return self::display_forms_list( $params, __( 'There was a problem creating the new template.', 'formidable' ) );
	276	+ }
	277	+ }
269	278
270		- $params = FrmForm::list_page_params();
271		- $form = FrmForm::duplicate( $params['id'], $params['template'], true );
272		- $url = admin_url( 'admin.php?page=formidable' );
273		- $message = 'form_duplicate_error';
274		-
275		- if ( $form ) {
276		- $url = admin_url( 'admin.php?page=formidable&frm_action=edit&id=' . absint( $form ) );
277		- $message = 'form_duplicated';
278		- }
279		-
280		- $url .= '&message=' . $message;
281		-
282		- wp_safe_redirect( $url );
283		- exit();
284		- }
285		-
286		- /**
287		- * @return string
288		- */
289		- public static function page_preview() {
	279	+ public static function page_preview() {
290	280	$params = FrmForm::list_page_params();
291		- if ( ! $params['form'] ) {
292		- return;
293		- }
	281	+ if ( ! $params['form'] ) {
	282	+ return;
	283	+ }
294	284
295		- $form = FrmForm::getOne( $params['form'] );
	285	+ $form = FrmForm::getOne( $params['form'] );
296	286	if ( $form ) {
297		- return self::show_form( $form->id, '', 'auto', 'auto' );
	287	+ return self::show_form( $form->id, '', true, true );
298	288	}
299		- }
	289	+ }
300	290
301	291	/**
302	292	* @since 3.0
303	293	*/
304	294	public static function show_page_preview() {
305		- echo self::page_preview(); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
	295	+ echo self::page_preview(); // WPCS: XSS ok.
306	296	}
307	297
308		- /**
309		- * @return void
310		- */
311		- public static function preview() {
312		- do_action( 'frm_wp' );
313		- FrmAppHelper::set_current_screen_and_hook_suffix();
	298	+ public static function preview() {
	299	+ do_action( 'frm_wp' );
314	300
315		- global $frm_vars;
316		- $frm_vars['preview'] = true;
	301	+ global $frm_vars;
	302	+ $frm_vars['preview'] = true;
317	303
	304	+ self::load_wp();
	305	+
318	306	$include_theme = FrmAppHelper::get_param( 'theme', '', 'get', 'absint' );
319	307	if ( $include_theme ) {
320	308	self::set_preview_query();
321	309	self::load_theme_preview();
		@@ -326,58 +314,42 @@
326	314	wp_die();
327	315	}
328	316
329	317	/**
330		- * Set the page global to any available page (except for the Blog Page).
331		- *
332		- * @return void
	318	+ * @since 3.0
333	319	*/
334		- private static function set_preview_query() {
335		- $page_query = array(
336		- 'numberposts' => 1,
337		- 'orderby' => 'date',
338		- 'order' => 'ASC',
339		- 'post_type' => 'page',
340		- );
341		-
342		- $page_for_posts = get_option( 'page_for_posts' );
343		- if ( is_numeric( $page_for_posts ) ) {
344		- // Avoid querying for the "Posts Page" or "Blog Page" so we don't display 10 forms.
345		- $page_query['post__not_in'] = array( $page_for_posts );
	320	+ private static function load_wp() {
	321	+ if ( ! defined( 'ABSPATH' ) && ! defined( 'XMLRPC_REQUEST' ) ) {
	322	+ global $wp;
	323	+ $root = dirname( dirname( dirname( dirname( __FILE__ ) ) ) );
	324	+ include_once( $root . '/wp-config.php' );
	325	+ $wp->init();
	326	+ $wp->register_globals();
346	327	}
	328	+ }
347	329
348		- $random_page = get_posts( $page_query );
349		- if ( ! $random_page ) {
350		- return;
351		- }
352		-
353		- $random_page = reset( $random_page );
354		- query_posts(
	330	+ private static function set_preview_query() {
	331	+ $random_page = get_posts(
355	332	array(
356		- 'post_type' => 'page',
357		- 'page_id' => $random_page->ID,
	333	+ 'numberposts' => 1,
	334	+ 'orderby' => 'date',
	335	+ 'order' => 'ASC',
	336	+ 'post_type' => 'page',
358	337	)
359	338	);
360	339
361		- // Fixes Pro issue #3004. Prevent an undefined $post object.
362		- // Otherwise WordPress themes will trigger a warning "Attempt to read property "comment_count" on null".
363		- self::set_post_global( $random_page );
	340	+ if ( ! empty( $random_page ) ) {
	341	+ $random_page = reset( $random_page );
	342	+ query_posts(
	343	+ array(
	344	+ 'post_type' => 'page',
	345	+ 'page_id' => $random_page->ID,
	346	+ )
	347	+ );
	348	+ }
364	349	}
365	350
366	351	/**
367		- * Set the WP $post global object. Used for in-theme preview when defining a page.
368		- *
369		- * @since 5.5.2
370		- *
371		- * @param WP_Post $post
372		- * @return void
373		- */
374		- private static function set_post_global( $page ) {
375		- global $post;
376		- $post = $page; // phpcs:ignore WordPress.WP.GlobalVariablesOverride
377		- }
378		-
379		- /**
380	352	* @since 3.0
381	353	*/
382	354	private static function load_theme_preview() {
383	355	add_filter( 'wp_title', 'FrmFormsController::preview_title', 9999 );
		@@ -384,32 +356,11 @@
384	356	add_filter( 'the_title', 'FrmFormsController::preview_page_title', 9999 );
385	357	add_filter( 'the_content', 'FrmFormsController::preview_content', 9999 );
386	358	add_action( 'loop_no_results', 'FrmFormsController::show_page_preview' );
387	359	add_filter( 'is_active_sidebar', '__return_false' );
388		- FrmStylesController::enqueue_css( 'enqueue', true );
389		-
390		- if ( false === get_template_part( 'page' ) ) {
391		- self::fallback_when_page_template_part_is_not_supported_by_theme();
392		- }
	360	+ get_template_part( 'page' );
393	361	}
394	362
395		- /**
396		- * Not every theme supports get_template_part( 'page' ).
397		- * When this is not supported, false is returned, and we can handle a fallback.
398		- */
399		- private static function fallback_when_page_template_part_is_not_supported_by_theme() {
400		- if ( have_posts() ) {
401		- the_post();
402		- get_header( '' );
403		- // add some generic class names to the container to add some natural padding to the content.
404		- // .entry-content catches the WordPress TwentyTwenty theme.
405		- // .container catches Customizr content.
406		- echo '<div class="container entry-content">';
407		- the_content();
408		- echo '</div>';
409		- get_footer();
410		- }
411		- }
412	363
413	364	/**
414	365	* Set the page title for the theme preview page
415	366	*
		@@ -418,9 +369,8 @@
418	369	public static function preview_page_title( $title ) {
419	370	if ( in_the_loop() ) {
420	371	$title = self::preview_title( $title );
421	372	}
422		-
423	373	return $title;
424	374	}
425	375
426	376	/**
		@@ -440,9 +390,8 @@
440	390	public static function preview_content( $content ) {
441	391	if ( in_the_loop() ) {
442	392	$content = self::show_page_preview();
443	393	}
444		-
445	394	return $content;
446	395	}
447	396
448	397	/**
		@@ -463,32 +412,21 @@
463	412
464	413	require( FrmAppHelper::plugin_path() . '/classes/views/frm-entries/direct.php' );
465	414	}
466	415
467		- public static function untrash() {
	416	+ public static function untrash() {
468	417	self::change_form_status( 'untrash' );
469		- }
	418	+ }
470	419
471		- /**
472		- * @param array $ids
473		- * @return string
474		- */
475	420	public static function bulk_untrash( $ids ) {
476	421	FrmAppHelper::permission_check( 'frm_edit_forms' );
477	422
478		- $count = FrmForm::set_status( $ids, 'published' );
	423	+ $count = FrmForm::set_status( $ids, 'published' );
479	424
480		- if ( ! $count ) {
481		- // Don't show "0 forms restored" on refresh.
482		- return '';
483		- }
	425	+ $message = sprintf( _n( '%1$s form restored from the Trash.', '%1$s forms restored from the Trash.', $count, 'formidable' ), 1 );
	426	+ return $message;
	427	+ }
484	428
485		- /* translators: %1$s: Number of forms */
486		- $message = sprintf( _n( '%1$s form restored from the Trash.', '%1$s forms restored from the Trash.', $count, 'formidable' ), $count );
487		-
488		- return $message;
489		- }
490		-
491	429	/**
492	430	* @since 3.06
493	431	*/
494	432	public static function ajax_trash() {
		@@ -498,16 +436,16 @@
498	436	FrmForm::set_status( $form_id, 'trash' );
499	437	wp_die();
500	438	}
501	439
502		- public static function trash() {
	440	+ public static function trash() {
503	441	self::change_form_status( 'trash' );
504		- }
	442	+ }
505	443
506	444	/**
507	445	* @param string $status
508	446	*
509		- * @return void
	447	+ * @return int The number of forms changed
510	448	*/
511	449	public static function change_form_status( $status ) {
512	450	$available_status = array(
513	451	'untrash' => array(
		@@ -532,24 +470,21 @@
532	470	check_admin_referer( $status . '_form_' . $params['id'] );
533	471
534	472	$count = 0;
535	473	if ( FrmForm::set_status( $params['id'], $available_status[ $status ]['new_status'] ) ) {
536		- $count ++;
	474	+ $count++;
537	475	}
538	476
539	477	$form_type = FrmAppHelper::get_simple_request(
540	478	array(
541	479	'param' => 'form_type',
542		- 'type' => 'request',
	480	+ 'type' => 'request',
543	481	)
544	482	);
545	483
546		- /* translators: %1$s: Number of forms */
547	484	$available_status['untrash']['message'] = sprintf( _n( '%1$s form restored from the Trash.', '%1$s forms restored from the Trash.', $count, 'formidable' ), $count );
	485	+ $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>' );
548	486
549		- /* translators: %1$s: Number of forms, %2$s: Start link HTML, %3$s: End link HTML */
550		- $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>' );
551		-
552	487	$message = $available_status[ $status ]['message'];
553	488
554	489	self::display_forms_list( $params, $message );
555	490	}
		@@ -556,23 +491,22 @@
556	491
557	492	public static function bulk_trash( $ids ) {
558	493	FrmAppHelper::permission_check( 'frm_delete_forms' );
559	494
560		- $count = 0;
561		- foreach ( $ids as $id ) {
562		- if ( FrmForm::trash( $id ) ) {
563		- $count ++;
564		- }
565		- }
	495	+ $count = 0;
	496	+ foreach ( $ids as $id ) {
	497	+ if ( FrmForm::trash( $id ) ) {
	498	+ $count++;
	499	+ }
	500	+ }
566	501
567	502	$current_page = FrmAppHelper::get_simple_request(
568	503	array(
569	504	'param' => 'form_type',
570		- 'type' => 'request',
	505	+ 'type' => 'request',
571	506	)
572	507	);
573		- $message = sprintf(
574		- /* translators: %1$s: Number of forms, %2$s: Start link HTML, %3$s: End link HTML */
	508	+ $message = sprintf(
575	509	_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' ),
576	510	$count,
577	511	'<a href="' . esc_url( wp_nonce_url( '?page=formidable&frm_action=list&action=bulk_untrash&form_type=' . $current_page . '&item-action=' . implode( ',', $ids ), 'bulk-toplevel_page_formidable' ) ) . '">',
578	512	'</a>'
		@@ -577,109 +511,60 @@
577	511	'<a href="' . esc_url( wp_nonce_url( '?page=formidable&frm_action=list&action=bulk_untrash&form_type=' . $current_page . '&item-action=' . implode( ',', $ids ), 'bulk-toplevel_page_formidable' ) ) . '">',
578	512	'</a>'
579	513	);
580	514
581		- return $message;
582		- }
	515	+ return $message;
	516	+ }
583	517
584		- public static function destroy() {
	518	+ public static function destroy() {
585	519	FrmAppHelper::permission_check( 'frm_delete_forms' );
586	520
587	521	$params = FrmForm::list_page_params();
588	522
589		- // Check nonce url.
	523	+ //check nonce url
590	524	check_admin_referer( 'destroy_form_' . $params['id'] );
591	525
592		- $count = 0;
593		- if ( FrmForm::destroy( $params['id'] ) ) {
594		- $count ++;
595		- }
	526	+ $count = 0;
	527	+ if ( FrmForm::destroy( $params['id'] ) ) {
	528	+ $count++;
	529	+ }
596	530
597		- /* translators: %1$s: Number of forms */
598		- $message = sprintf( _n( '%1$s Form Permanently Deleted', '%1$s Forms Permanently Deleted', $count, 'formidable' ), $count );
	531	+ $message = sprintf( _n( '%1$s form permanently deleted.', '%1$s forms permanently deleted.', $count, 'formidable' ), $count );
599	532
600	533	self::display_forms_list( $params, $message );
601		- }
	534	+ }
602	535
603	536	public static function bulk_destroy( $ids ) {
604	537	FrmAppHelper::permission_check( 'frm_delete_forms' );
605	538
606		- $count = 0;
607		- foreach ( $ids as $id ) {
608		- $d = FrmForm::destroy( $id );
609		- if ( $d ) {
610		- $count ++;
611		- }
612		- }
	539	+ $count = 0;
	540	+ foreach ( $ids as $id ) {
	541	+ $d = FrmForm::destroy( $id );
	542	+ if ( $d ) {
	543	+ $count++;
	544	+ }
	545	+ }
613	546
614		- /* translators: %1$s: Number of forms */
615	547	$message = sprintf( _n( '%1$s form permanently deleted.', '%1$s forms permanently deleted.', $count, 'formidable' ), $count );
616	548
617		- return $message;
618		- }
	549	+ return $message;
	550	+ }
619	551
620		- private static function delete_all() {
621		- // Check nonce url.
	552	+ private static function delete_all() {
	553	+ //check nonce url
622	554	$permission_error = FrmAppHelper::permission_nonce_error( 'frm_delete_forms', '_wpnonce', 'bulk-toplevel_page_formidable' );
623		- if ( $permission_error !== false ) {
	555	+ if ( $permission_error !== false ) {
624	556	self::display_forms_list( array(), '', array( $permission_error ) );
	557	+ return;
	558	+ }
625	559
626		- return;
627		- }
628		-
629		- $count = FrmForm::scheduled_delete( time() );
630		-
631		- /* translators: %1$s: Number of forms */
	560	+ $count = FrmForm::scheduled_delete( time() );
632	561	$message = sprintf( _n( '%1$s form permanently deleted.', '%1$s forms permanently deleted.', $count, 'formidable' ), $count );
633	562
634	563	self::display_forms_list( array(), $message );
635		- }
	564	+ }
636	565
637	566	/**
638		- * Create a new form from the modal.
639		- *
640		- * @since 4.0
641		- */
642		- public static function build_new_form() {
643		- FrmAppHelper::permission_check( 'frm_edit_forms' );
644		- check_ajax_referer( 'frm_ajax', 'nonce' );
645		-
646		- $new_values = self::get_modal_values();
647		- $new_values['form_key'] = $new_values['name'];
648		- $new_values['options'] = array(
649		- 'antispam' => 1,
650		- 'on_submit_migrated' => 1,
651		- );
652		-
653		- /**
654		- * Allows changing form values before creating from the modal.
655		- *
656		- * @since 5.4
657		- *
658		- * @param array $values Form values.
659		- */
660		- $new_values = apply_filters( 'frm_new_form_values', $new_values );
661		-
662		- $form_id = FrmForm::create( $new_values );
663		- /**
664		- * @since 5.3
665		- *
666		- * @param int $form_id
667		- */
668		- do_action( 'frm_build_new_form', $form_id );
669		-
670		- self::create_default_on_submit_action( $form_id );
671		- self::create_default_email_action( $form_id );
672		-
673		- $response = array(
674		- 'redirect' => FrmForm::get_edit_link( $form_id ),
675		- );
676		-
677		- echo wp_json_encode( $response );
678		- wp_die();
679		- }
680		-
681		- /**
682	567	* Create a custom template from a form
683	568	*
684	569	* @since 3.06
685	570	*/
		@@ -690,14 +575,21 @@
690	575	check_ajax_referer( 'frm_ajax', 'nonce' );
691	576
692	577	$form_id = FrmAppHelper::get_param( 'xml', '', 'post', 'absint' );
693	578	$new_form_id = FrmForm::duplicate( $form_id, 1, true );
694		- if ( ! $new_form_id ) {
	579	+ if ( empty( $new_form_id ) ) {
695	580	$response = array(
696	581	'message' => __( 'There was an error creating a template.', 'formidable' ),
697	582	);
698	583	} else {
699		- $new_values = self::get_modal_values();
	584	+ // Update the new form name and description.
	585	+ $name = FrmAppHelper::get_param( 'name', '', 'post', 'sanitize_text_field' );
	586	+ $desc = FrmAppHelper::get_param( 'desc', '', 'post', 'sanitize_textarea_field' );
	587	+
	588	+ $new_values = array(
	589	+ 'name' => $name,
	590	+ 'description' => $desc,
	591	+ );
700	592	$query_results = $wpdb->update( $wpdb->prefix . 'frm_forms', $new_values, array( 'id' => $new_form_id ) );
701	593	if ( $query_results ) {
702	594	FrmForm::clear_form_cache();
703	595	}
		@@ -702,9 +594,9 @@
702	594	FrmForm::clear_form_cache();
703	595	}
704	596
705	597	$response = array(
706		- 'redirect' => admin_url( 'admin.php?page=formidable&frm_action=duplicate&id=' . $new_form_id ) . '&_wpnonce=' . wp_create_nonce(),
	598	+ 'redirect' => admin_url( 'admin.php?page=formidable&frm_action=list_templates' ),
707	599	);
708	600	}
709	601
710	602	echo wp_json_encode( $response );
		@@ -711,117 +603,76 @@
711	603	wp_die();
712	604	}
713	605
714	606	/**
715		- * Before creating a new form, get the name and description from the modal.
716		- *
717		- * @since 4.0
718		- */
719		- private static function get_modal_values() {
720		- $name = FrmAppHelper::get_param( 'name', '', 'post', 'sanitize_text_field' );
721		- $desc = FrmAppHelper::get_param( 'desc', '', 'post', 'sanitize_textarea_field' );
722		-
723		- return array(
724		- 'name' => $name,
725		- 'description' => $desc,
726		- );
727		- }
728		-
729		- /**
730		- * Inserts Formidable button
731		- * Hook exists since 2.5.0
732		- *
733		- * @since 2.0.15
734		- */
	607	+ * Inserts Formidable button
	608	+ * Hook exists since 2.5.0
	609	+ *
	610	+ * @since 2.0.15
	611	+ */
735	612	public static function insert_form_button() {
736	613	if ( current_user_can( 'frm_view_forms' ) ) {
737		- FrmAppHelper::load_admin_wide_js();
738	614	$menu_name = FrmAppHelper::get_menu_name();
739		- $icon = apply_filters( 'frm_media_icon', FrmAppHelper::svg_logo() );
	615	+ $icon = apply_filters( 'frm_media_icon', FrmAppHelper::svg_logo() );
740	616	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' ) . '">' .
741		- FrmAppHelper::kses( $icon, 'all' ) . // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
742		- ' ' . esc_html( $menu_name ) . '</a>';
	617	+ FrmAppHelper::kses( $icon, 'all' ) .
	618	+ ' ' . esc_html( $menu_name ) . '</a>'; // WPCS: XSS ok.
743	619	}
744	620	}
745	621
746		- /**
747		- * @return void
748		- */
749		- public static function insert_form_popup() {
750		- if ( ! self::should_insert_form_popup() ) {
751		- return;
752		- }
	622	+ public static function insert_form_popup() {
	623	+ $page = basename( FrmAppHelper::get_server_value( 'PHP_SELF' ) );
	624	+ if ( ! in_array( $page, array( 'post.php', 'page.php', 'page-new.php', 'post-new.php' ) ) ) {
	625	+ return;
	626	+ }
753	627
754		- FrmAppHelper::load_admin_wide_js();
	628	+ FrmAppHelper::load_admin_wide_js();
755	629
756		- $shortcodes = array(
	630	+ $shortcodes = array(
757	631	'formidable' => array(
758	632	'name' => __( 'Form', 'formidable' ),
759	633	'label' => __( 'Insert a Form', 'formidable' ),
760	634	),
761		- );
	635	+ );
	636	+
762	637	$shortcodes = apply_filters( 'frm_popup_shortcodes', $shortcodes );
763	638
764		- include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/insert_form_popup.php';
	639	+ include( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/insert_form_popup.php' );
	640	+ }
765	641
766		- if ( FrmAppHelper::is_form_builder_page() && ! class_exists( '_WP_Editors', false ) ) {
767		- // initialize a wysiwyg so we have usable settings defined in tinyMCEPreInit.mceInit
768		- require ABSPATH . WPINC . '/class-wp-editor.php';
769		- ?>
770		- <div class="frm_hidden">
771		- <?php wp_editor( '', 'frm_description_placeholder', array() ); ?>
772		- </div>
773		- <?php
774		- }
775		- }
776		-
777		- /**
778		- * Check the page being loaded, determine if this is a page that should include the form popup.
779		- *
780		- * @since 5.0.14
781		- *
782		- * @return bool
783		- */
784		- private static function should_insert_form_popup() {
785		- if ( FrmAppHelper::is_form_builder_page() ) {
786		- return true;
787		- }
788		- $page = basename( FrmAppHelper::get_server_value( 'PHP_SELF' ) );
789		- return in_array( $page, array( 'post.php', 'page.php', 'page-new.php', 'post-new.php' ), true );
790		- }
791		-
792		- public static function get_shortcode_opts() {
	642	+ public static function get_shortcode_opts() {
793	643	FrmAppHelper::permission_check( 'frm_view_forms' );
794		- check_ajax_referer( 'frm_ajax', 'nonce' );
	644	+ check_ajax_referer( 'frm_ajax', 'nonce' );
795	645
796	646	$shortcode = FrmAppHelper::get_post_param( 'shortcode', '', 'sanitize_text_field' );
797	647	if ( empty( $shortcode ) ) {
798		- wp_die();
799		- }
	648	+ wp_die();
	649	+ }
800	650
801	651	echo '<div id="sc-opts-' . esc_attr( $shortcode ) . '" class="frm_shortcode_option">';
802	652	echo '<input type="radio" name="frmsc" value="' . esc_attr( $shortcode ) . '" id="sc-' . esc_attr( $shortcode ) . '" class="frm_hidden" />';
803	653
804		- $form_id = '';
805		- $opts = array();
	654	+ $form_id = '';
	655	+ $opts = array();
806	656	switch ( $shortcode ) {
807		- case 'formidable':
808		- $opts = array(
809		- 'form_id' => 'id',
810		- 'title' => array(
	657	+ case 'formidable':
	658	+ $opts = array(
	659	+ 'form_id' => 'id',
	660	+ //'key' => ',
	661	+ 'title' => array(
811	662	'val' => 1,
812	663	'label' => __( 'Display form title', 'formidable' ),
813	664	),
814		- 'description' => array(
	665	+ 'description' => array(
815	666	'val' => 1,
816	667	'label' => __( 'Display form description', 'formidable' ),
817	668	),
818		- 'minimize' => array(
	669	+ 'minimize' => array(
819	670	'val' => 1,
820	671	'label' => __( 'Minimize form HTML', 'formidable' ),
821	672	),
822		- );
823		- }
	673	+ );
	674	+ }
824	675	$opts = apply_filters( 'frm_sc_popup_opts', $opts, $shortcode );
825	676
826	677	if ( isset( $opts['form_id'] ) && is_string( $opts['form_id'] ) ) {
827	678	// allow other shortcodes to use the required form id option
		@@ -830,64 +681,62 @@
830	681	}
831	682
832	683	include( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/shortcode_opts.php' );
833	684
834		- echo '</div>';
	685	+ echo '</div>';
835	686
836		- wp_die();
837		- }
	687	+ wp_die();
	688	+ }
838	689
839		- /**
840		- * Display list of forms in a table.
841		- *
842		- * @param array $params
843		- * @param string $message
844		- * @param array $errors
845		- * @return void
846		- */
847	690	public static function display_forms_list( $params = array(), $message = '', $errors = array() ) {
848		- FrmAppHelper::permission_check( 'frm_view_forms' );
	691	+ FrmAppHelper::permission_check( 'frm_view_forms' );
849	692
850		- global $wpdb, $frm_vars;
	693	+ global $wpdb, $frm_vars;
851	694
852		- if ( ! $params ) {
	695	+ if ( empty( $params ) ) {
853	696	$params = FrmForm::list_page_params();
854		- }
	697	+ }
855	698
856		- /**
857		- * @since 5.3.1
858		- *
859		- * @param string $table_class Class name for List Helper.
860		- */
861		- $table_class = apply_filters( 'frm_forms_list_class', 'FrmFormsListHelper' );
862		- $wp_list_table = new $table_class( compact( 'params' ) );
	699	+ $wp_list_table = new FrmFormsListHelper( compact( 'params' ) );
863	700
864		- $pagenum = $wp_list_table->get_pagenum();
	701	+ $pagenum = $wp_list_table->get_pagenum();
865	702
866		- $wp_list_table->prepare_items();
	703	+ $wp_list_table->prepare_items();
867	704
868		- $total_pages = $wp_list_table->get_pagination_arg( 'total_pages' );
869		- if ( $pagenum > $total_pages && $total_pages > 0 ) {
	705	+ $total_pages = $wp_list_table->get_pagination_arg( 'total_pages' );
	706	+ if ( $pagenum > $total_pages && $total_pages > 0 ) {
870	707	wp_redirect( esc_url_raw( add_query_arg( 'paged', $total_pages ) ) );
871		- die();
872		- }
	708	+ die();
	709	+ }
873	710
874		- require FrmAppHelper::plugin_path() . '/classes/views/frm-forms/list.php';
875		- }
	711	+ require( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/list.php' );
	712	+ }
876	713
877		- /**
878		- * @param array<string,string> $columns
879		- * @return array<string,string>
880		- */
881	714	public static function get_columns( $columns ) {
882		- $columns['cb'] = '<input type="checkbox" />';
883		- $columns['name'] = __( 'Form Title', 'formidable' );
884		- $columns['entries'] = __( 'Entries', 'formidable' );
885		- $columns['id'] = 'ID';
886		- $columns['form_key'] = __( 'Key', 'formidable' );
887		- $columns['shortcode'] = __( 'Actions', 'formidable' );
888		- $columns['created_at'] = __( 'Date', 'formidable' );
	715	+ $columns['cb'] = '<input type="checkbox" />';
	716	+ $columns['id'] = 'ID';
889	717
	718	+ $type = FrmAppHelper::get_simple_request(
	719	+ array(
	720	+ 'param' => 'form_type',
	721	+ 'type' => 'request',
	722	+ 'default' => 'published',
	723	+ )
	724	+ );
	725	+
	726	+ if ( 'template' == $type ) {
	727	+ $columns['name'] = __( 'Template Name', 'formidable' );
	728	+ $columns['type'] = __( 'Type', 'formidable' );
	729	+ $columns['form_key'] = __( 'Key', 'formidable' );
	730	+ } else {
	731	+ $columns['name'] = __( 'Form Title', 'formidable' );
	732	+ $columns['entries'] = __( 'Entries', 'formidable' );
	733	+ $columns['form_key'] = __( 'Key', 'formidable' );
	734	+ $columns['shortcode'] = __( 'Shortcodes', 'formidable' );
	735	+ }
	736	+
	737	+ $columns['created_at'] = __( 'Date', 'formidable' );
	738	+
890	739	add_screen_option(
891	740	'per_page',
892	741	array(
893	742	'label' => __( 'Forms', 'formidable' ),
		@@ -895,30 +744,22 @@
895	744	'option' => 'formidable_page_formidable_per_page',
896	745	)
897	746	);
898	747
899		- return $columns;
	748	+ return $columns;
900	749	}
901	750
902	751	public static function get_sortable_columns() {
903	752	return array(
904		- 'id' => 'id',
905		- 'name' => 'name',
906		- 'description' => 'description',
907		- 'form_key' => 'form_key',
908		- 'created_at' => 'created_at',
	753	+ 'id' => 'id',
	754	+ 'name' => 'name',
	755	+ 'description' => 'description',
	756	+ 'form_key' => 'form_key',
	757	+ 'created_at' => 'created_at',
909	758	);
910	759	}
911	760
912		- /**
913		- * @param mixed $hidden_columns
914		- * @return array
915		- */
916	761	public static function hidden_columns( $hidden_columns ) {
917		- if ( ! is_array( $hidden_columns ) ) {
918		- $hidden_columns = array();
919		- }
920		-
921	762	$type = FrmAppHelper::get_simple_request(
922	763	array(
923	764	'param' => 'form_type',
924	765	'type' => 'request',
		@@ -933,125 +774,45 @@
933	774	return $hidden_columns;
934	775	}
935	776
936	777	public static function save_per_page( $save, $option, $value ) {
937		- if ( $option == 'formidable_page_formidable_per_page' ) {
938		- $save = (int) $value;
939		- }
	778	+ if ( $option == 'formidable_page_formidable_per_page' ) {
	779	+ $save = (int) $value;
	780	+ }
	781	+ return $save;
	782	+ }
940	783
941		- return $save;
942		- }
943		-
944	784	/**
945		- * @return bool
946		- */
947		- public static function expired() {
948		- global $frm_expired;
949		- return $frm_expired;
950		- }
951		-
952		- /**
953		- * Get data from api before rendering it so that we can flag the modal as expired
	785	+ * Show the template listing page
954	786	*
955		- * @return void
	787	+ * @since 3.06
956	788	*/
957		- public static function before_list_templates() {
958		- global $frm_templates;
959		- global $frm_expired;
960		- global $frm_license_type;
	789	+ private static function list_templates() {
	790	+ wp_enqueue_script( 'jquery-ui-dialog' );
	791	+ wp_enqueue_style( 'jquery-ui-dialog' );
961	792
962		- $api = new FrmFormTemplateApi();
963		- $frm_templates = $api->get_api_info();
964		- $expired = false;
965		- $license_type = '';
966		- if ( isset( $frm_templates['error'] ) ) {
967		- $error = $frm_templates['error']['message'];
968		- $error = str_replace( 'utm_medium=addons', 'utm_medium=form-templates', $error );
969		- $expired = 'expired' === $frm_templates['error']['code'];
970		- $license_type = isset( $frm_templates['error']['type'] ) ? $frm_templates['error']['type'] : '';
971		- unset( $frm_templates['error'] );
972		- }
	793	+ $where = apply_filters( 'frm_forms_dropdown', array(), '' );
	794	+ $forms = FrmForm::get_published_forms( $where );
973	795
974		- $frm_expired = $expired;
975		- $frm_license_type = $license_type;
976		- }
	796	+ $api = new FrmFormTemplateApi();
	797	+ $templates = $api->get_api_info();
	798	+ self::add_user_templates( $templates );
977	799
978		- /**
979		- * @return void
980		- */
981		- public static function list_templates() {
982		- global $frm_templates;
983		- global $frm_license_type;
984		-
985		- $templates = $frm_templates;
986		- $custom_templates = array();
987		- $templates_by_category = array();
988		-
989		- self::add_user_templates( $custom_templates );
990		-
991		- foreach ( $templates as $template ) {
992		- if ( ! isset( $template['categories'] ) ) {
993		- continue;
994		- }
995		-
996		- foreach ( $template['categories'] as $category ) {
997		- if ( ! isset( $templates_by_category[ $category ] ) ) {
998		- $templates_by_category[ $category ] = array();
999		- }
1000		-
1001		- $templates_by_category[ $category ][] = $template;
1002		- }
	800	+ $error = '';
	801	+ $expired = false;
	802	+ if ( isset( $templates['error'] ) ) {
	803	+ $error = $templates['error']['message'];
	804	+ $error = str_replace( 'utm_medium=addons', 'utm_medium=form-templates', $error );
	805	+ $expired = ( $templates['error']['code'] === 'expired' );
	806	+ unset( $templates['error'] );
1003	807	}
1004		- unset( $template );
1005	808
1006		- // Subcategories that are included elsewhere.
1007		- $redundant_cats = array( 'PayPal', 'Stripe', 'Twilio' );
	809	+ $pricing = FrmAppHelper::admin_upgrade_link( 'form-templates' );
	810	+ $plans = array( 'free', 'Personal', 'Business', 'Elite' );
1008	811
1009		- $categories = array_keys( $templates_by_category );
1010		- $categories = array_diff( $categories, FrmFormsHelper::ignore_template_categories() );
1011		- $categories = array_diff( $categories, $redundant_cats );
1012		- sort( $categories );
1013		-
1014		- array_walk(
1015		- $custom_templates,
1016		- function( &$template ) {
1017		- $template['custom'] = true;
1018		- }
1019		- );
1020		-
1021		- $my_templates_translation = __( 'My Templates', 'formidable' );
1022		- $categories = array_merge( array( $my_templates_translation ), $categories );
1023		- $pricing = FrmAppHelper::admin_upgrade_link( 'form-templates' );
1024		- $license_type = $frm_license_type;
1025		- $args = compact( 'pricing', 'license_type' );
1026		- $where = apply_filters( 'frm_forms_dropdown', array(), '' );
1027		- $forms = FrmForm::get_published_forms( $where );
1028		- $view_path = FrmAppHelper::plugin_path() . '/classes/views/frm-forms/';
1029		-
1030		- $templates_by_category[ $my_templates_translation ] = $custom_templates;
1031		-
1032		- unset( $pricing, $license_type, $where );
1033		- wp_enqueue_script( 'accordion' ); // register accordion for template groups
1034		- require $view_path . 'list-templates.php';
	812	+ require( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/list-templates.php' );
1035	813	}
1036	814
1037		- /**
1038		- * @since 4.03.01
1039		- */
1040		- private static function get_template_categories( $templates ) {
1041		- $categories = array();
1042		- foreach ( $templates as $template ) {
1043		- if ( isset( $template['categories'] ) ) {
1044		- $categories = array_merge( $categories, $template['categories'] );
1045		- }
1046		- }
1047		- $exclude_cats = FrmFormsHelper::ignore_template_categories();
1048		- $categories = array_unique( $categories );
1049		- $categories = array_diff( $categories, $exclude_cats );
1050		- sort( $categories );
1051		- return $categories;
1052		- }
1053		-
1054	815	private static function add_user_templates( &$templates ) {
1055	816	$user_templates = array(
1056	817	'is_template' => 1,
1057	818	'default_template' => 0,
		@@ -1062,9 +823,9 @@
1062	823	'id' => $template->id,
1063	824	'name' => $template->name,
1064	825	'key' => $template->form_key,
1065	826	'description' => $template->description,
1066		- 'url' => wp_nonce_url( admin_url( 'admin.php?page=formidable&frm_action=duplicate&id=' . absint( $template->id ) ) ),
	827	+ 'url' => admin_url( 'admin.php?page=formidable&frm_action=duplicate&id=' . absint( $template->id ) ),
1067	828	'released' => $template->created_at,
1068	829	'installed' => 1,
1069	830	);
1070	831	array_unshift( $templates, $template );
		@@ -1072,290 +833,79 @@
1072	833	}
1073	834	}
1074	835
1075	836	private static function get_edit_vars( $id, $errors = array(), $message = '', $create_link = false ) {
1076		- global $frm_vars;
	837	+ global $frm_vars;
1077	838
1078		- $form = FrmForm::getOne( $id );
1079		- if ( ! $form ) {
1080		- wp_die( esc_html__( 'You are trying to edit a form that does not exist.', 'formidable' ) );
1081		- }
	839	+ $form = FrmForm::getOne( $id );
	840	+ if ( ! $form ) {
	841	+ wp_die( esc_html__( 'You are trying to edit a form that does not exist.', 'formidable' ) );
	842	+ }
1082	843
1083		- if ( $form->parent_form_id ) {
1084		- /* translators: %1$s: Start link HTML, %2$s: End link HTML */
1085		- 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>' ) );
1086		- }
	844	+ if ( $form->parent_form_id ) {
	845	+ 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( admin_url( 'admin.php?page=formidable&frm_action=edit&id=' . $form->parent_form_id ) ) . '">', '</a>' ) );
	846	+ }
1087	847
1088	848	$frm_field_selection = FrmField::field_selection();
1089		-
1090	849	$fields = FrmField::get_all_for_form( $form->id );
1091	850
1092		- // Automatically add end section fields if they don't exist (2.0 migration).
1093		- $reset_fields = false;
1094		- FrmFormsHelper::auto_add_end_section_fields( $form, $fields, $reset_fields );
	851	+ // Automatically add end section fields if they don't exist (2.0 migration)
	852	+ $reset_fields = false;
	853	+ FrmFormsHelper::auto_add_end_section_fields( $form, $fields, $reset_fields );
1095	854
1096		- if ( $reset_fields ) {
1097		- $fields = FrmField::get_all_for_form( $form->id, '', 'exclude' );
1098		- }
	855	+ if ( $reset_fields ) {
	856	+ $fields = FrmField::get_all_for_form( $form->id, '', 'exclude' );
	857	+ }
1099	858
1100		- unset( $reset_fields );
	859	+ unset( $end_section_values, $last_order, $open, $reset_fields );
1101	860
1102		- $args = array( 'parent_form_id' => $form->id );
	861	+ $args = array( 'parent_form_id' => $form->id );
1103	862	$values = FrmAppHelper::setup_edit_vars( $form, 'forms', '', true, array(), $args );
	863	+ $values['fields'] = $fields;
1104	864
1105		- /**
1106		- * Allows modifying the list of fields in the form builder.
1107		- *
1108		- * @since 5.0.04
1109		- *
1110		- * @param object[] $fields Array of fields.
1111		- * @param array $args The arguments. Contains `form`.
1112		- */
1113		- $values['fields'] = apply_filters( 'frm_fields_in_form_builder', $fields, compact( 'form' ) );
	865	+ $edit_message = __( 'Form was Successfully Updated', 'formidable' );
	866	+ if ( $form->is_template && $message == $edit_message ) {
	867	+ $message = __( 'Template was Successfully Updated', 'formidable' );
	868	+ }
1114	869
1115		- $edit_message = __( 'Form was successfully updated.', 'formidable' );
1116		- if ( $form->is_template && $message == $edit_message ) {
1117		- $message = __( 'Template was successfully updated.', 'formidable' );
1118		- }
1119		-
1120		- self::maybe_update_form_builder_message( $message );
1121		-
1122	870	$all_templates = FrmForm::getAll( array( 'is_template' => 1 ), 'name' );
1123		- $has_fields = isset( $values['fields'] ) && ! empty( $values['fields'] );
1124	871
1125	872	if ( defined( 'DOING_AJAX' ) ) {
1126		- wp_die();
1127		- } else {
	873	+ wp_die();
	874	+ } else if ( $create_link ) {
	875	+ require( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/new.php' );
	876	+ } else {
1128	877	require( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/edit.php' );
1129		- }
1130		- }
	878	+ }
	879	+ }
1131	880
1132		- public static function update_form_builder_fields( $fields, $form ) {
1133		- foreach ( $fields as $field ) {
1134		- $field->do_not_include_icons = true;
1135		- }
1136		- return $fields;
1137		- }
1138		-
1139		- public static function maybe_update_form_builder_message( &$message ) {
1140		- if ( 'form_duplicated' === FrmAppHelper::simple_get( 'message' ) ) {
1141		- $message = __( 'Form was Successfully Copied', 'formidable' );
1142		- }
1143		- }
1144		-
1145		- public static function get_settings_vars( $id, $errors = array(), $args = array() ) {
	881	+ public static function get_settings_vars( $id, $errors = array(), $message = '' ) {
1146	882	FrmAppHelper::permission_check( 'frm_edit_forms' );
1147	883
1148		- global $frm_vars;
	884	+ global $frm_vars;
1149	885
1150		- if ( ! is_array( $args ) ) {
1151		- // For reverse compatibility.
1152		- $args = array(
1153		- 'message' => $args,
1154		- );
1155		- }
	886	+ $form = FrmForm::getOne( $id );
1156	887
1157		- $defaults = array(
1158		- 'message' => '',
1159		- 'warnings' => array(),
1160		- );
1161		- $args = array_merge( $defaults, $args );
1162		- $message = $args['message'];
1163		- $warnings = $args['warnings'];
1164		-
1165		- $form = FrmForm::getOne( $id );
1166	888	$fields = FrmField::get_all_for_form( $id );
1167	889	$values = FrmAppHelper::setup_edit_vars( $form, 'forms', $fields, true );
1168	890
1169		- /**
1170		- * Allows changing fields in the form settings.
1171		- *
1172		- * @since 5.0.04
1173		- *
1174		- * @param array $fields Array of fields.
1175		- * @param array $args The arguments. Contains `form`.
1176		- */
1177		- $values['fields'] = apply_filters( 'frm_fields_in_settings', $values['fields'], compact( 'form' ) );
1178		-
1179	891	self::clean_submit_html( $values );
1180	892
1181		- $sections = self::get_settings_tabs( $values );
1182		- $current = FrmAppHelper::simple_get( 't', 'sanitize_title', 'advanced_settings' );
	893	+ $action_controls = FrmFormActionsController::get_form_actions();
1183	894
1184		- require( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings.php' );
1185		- }
	895	+ $sections = apply_filters( 'frm_add_form_settings_section', array(), $values );
	896	+ $pro_feature = FrmAppHelper::pro_is_installed() ? '' : ' class="pro_feature"';
1186	897
1187		- /**
1188		- * @since 4.0
1189		- */
1190		- public static function form_publish_button( $atts ) {
1191		- $values = $atts['values'];
1192		- include( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/_publish_box.php' );
1193		- }
	898	+ $styles = apply_filters( 'frm_get_style_opts', array() );
1194	899
1195		- /**
1196		- * Get a list of all the settings tabs for the form settings page.
1197		- *
1198		- * @since 4.0
1199		- *
1200		- * @param array $values
1201		- * @return array
1202		- */
1203		- private static function get_settings_tabs( $values ) {
1204		- $sections = array(
1205		- 'advanced' => array(
1206		- 'name' => __( 'General', 'formidable' ),
1207		- 'title' => __( 'General Form Settings', 'formidable' ),
1208		- 'function' => array( __CLASS__, 'advanced_settings' ),
1209		- 'icon' => 'frm_icon_font frm_settings_icon',
1210		- ),
1211		- 'email' => array(
1212		- 'name' => __( 'Actions & Notifications', 'formidable' ),
1213		- 'function' => array( 'FrmFormActionsController', 'email_settings' ),
1214		- 'id' => 'frm_notification_settings',
1215		- 'icon' => 'frm_icon_font frm_mail_bulk_icon',
1216		- ),
1217		- 'permissions' => array(
1218		- 'name' => __( 'Form Permissions', 'formidable' ),
1219		- 'icon' => 'frm_icon_font frm_lock_icon',
1220		- 'html_class' => 'frm_show_upgrade_tab frm_noallow',
1221		- 'data' => array(
1222		- 'medium' => 'permissions',
1223		- 'upgrade' => __( 'Form Permissions', 'formidable' ),
1224		- 'message' => __( 'Allow editing, protect forms and files, limit entries, and save drafts. Upgrade to get form and entry permissions.', 'formidable' ),
1225		- 'screenshot' => 'permissions.png',
1226		- ),
1227		- ),
1228		- 'scheduling' => array(
1229		- 'name' => __( 'Form Scheduling', 'formidable' ),
1230		- 'icon' => 'frm_icon_font frm_calendar_icon',
1231		- 'html_class' => 'frm_show_upgrade_tab frm_noallow',
1232		- 'data' => array(
1233		- 'medium' => 'scheduling',
1234		- 'upgrade' => __( 'Form scheduling settings', 'formidable' ),
1235		- 'screenshot' => 'scheduling.png',
1236		- ),
1237		- ),
1238		- 'buttons' => array(
1239		- 'name' => __( 'Buttons', 'formidable' ),
1240		- 'class' => __CLASS__,
1241		- 'function' => 'buttons_settings',
1242		- 'icon' => 'frm_icon_font frm_button_icon',
1243		- ),
1244		- 'landing' => array(
1245		- 'name' => __( 'Form Landing Page', 'formidable' ),
1246		- 'icon' => 'frm_icon_font frm_file_text_icon',
1247		- 'html_class' => 'frm_show_upgrade_tab frm_noallow',
1248		- 'data' => FrmAppHelper::get_landing_page_upgrade_data_params(),
1249		- ),
1250		- 'chat' => array(
1251		- 'name' => __( 'Conversational Forms', 'formidable' ),
1252		- 'icon' => 'frm_icon_font frm_chat_forms_icon',
1253		- 'html_class' => 'frm_show_upgrade_tab frm_noallow',
1254		- 'data' => FrmAppHelper::get_upgrade_data_params(
1255		- 'chat',
1256		- array(
1257		- 'upgrade' => __( 'Conversational Forms', 'formidable' ),
1258		- 'message' => __( 'Ask one question at a time for automated conversations.', 'formidable' ),
1259		- 'screenshot' => 'chat.png',
1260		- )
1261		- ),
1262		- ),
1263		- 'html' => array(
1264		- 'name' => __( 'Customize HTML', 'formidable' ),
1265		- 'class' => __CLASS__,
1266		- 'function' => 'html_settings',
1267		- 'icon' => 'frm_icon_font frm_code_icon',
1268		- ),
1269		- );
1270		-
1271		- foreach ( array( 'landing', 'chat' ) as $feature ) {
1272		- if ( ! FrmAppHelper::show_new_feature( $feature ) ) {
1273		- unset( $sections[ $feature ] );
1274		- }
1275		- }
1276		-
1277		- $sections = apply_filters( 'frm_add_form_settings_section', $sections, $values );
1278		-
1279		- if ( FrmAppHelper::pro_is_installed() && ! FrmAppHelper::meets_min_pro_version( '4.0' ) ) {
1280		- // Prevent settings from showing in 2 spots.
1281		- unset( $sections['permissions'], $sections['scheduling'] );
1282		- }
1283		-
1284		- foreach ( $sections as $key => $section ) {
1285		- $defaults = array(
1286		- 'html_class' => '',
1287		- 'name' => ucfirst( $key ),
1288		- 'icon' => 'frm_icon_font frm_settings_icon',
1289		- );
1290		-
1291		- $section = array_merge( $defaults, $section );
1292		-
1293		- if ( ! isset( $section['anchor'] ) ) {
1294		- $section['anchor'] = $key;
1295		- }
1296		- $section['anchor'] .= '_settings';
1297		-
1298		- if ( ! isset( $section['title'] ) ) {
1299		- $section['title'] = $section['name'];
1300		- }
1301		-
1302		- if ( ! isset( $section['id'] ) ) {
1303		- $section['id'] = $section['anchor'];
1304		- }
1305		-
1306		- $sections[ $key ] = $section;
1307		- }
1308		-
1309		- return $sections;
1310		- }
1311		-
1312		- /**
1313		- * @since 4.0
1314		- *
1315		- * @param array $values
1316		- */
1317		- public static function advanced_settings( $values ) {
1318	900	$first_h3 = 'frm_first_h3';
1319	901
1320		- include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings-advanced.php';
1321		- }
	902	+ FrmAppController::include_upgrade_overlay();
1322	903
1323		- /**
1324		- * @param array $values
1325		- */
1326		- public static function render_spam_settings( $values ) {
1327		- if ( function_exists( 'akismet_http_post' ) ) {
1328		- include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/spam-settings/akismet.php';
1329		- }
1330		- include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/spam-settings/honeypot.php';
1331		- include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/spam-settings/antispam.php';
1332		- }
	904	+ require( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings.php' );
	905	+ }
1333	906
1334	907	/**
1335		- * @since 4.0
1336		- *
1337		- * @param array $values
1338		- */
1339		- public static function buttons_settings( $values ) {
1340		- $styles = apply_filters( 'frm_get_style_opts', array() );
1341		-
1342		- $frm_settings = FrmAppHelper::get_settings();
1343		- $no_global_style = $frm_settings->load_style === 'none';
1344		-
1345		- include( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings-buttons.php' );
1346		- }
1347		-
1348		- /**
1349		- * @since 4.0
1350		- *
1351		- * @param array $values
1352		- */
1353		- public static function html_settings( $values ) {
1354		- include( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings-html.php' );
1355		- }
1356		-
1357		- /**
1358	908	* Replace old Submit Button href with new href to avoid errors in Chrome
1359	909	*
1360	910	* @since 2.03.08
1361	911	*
		@@ -1366,46 +916,21 @@
1366	916	$values['submit_html'] = str_replace( 'javascript:void(0)', '#', $values['submit_html'] );
1367	917	}
1368	918	}
1369	919
1370		- /**
1371		- * Updates classes used in submit and prev buttons to avoid conflict with twenty twenty-one theme.
1372		- *
1373		- * @param array $classes
1374		- *
1375		- * @return array
1376		- */
1377		- public static function update_button_classes( $classes ) {
1378		- if ( function_exists( 'twenty_twenty_one_setup' ) ) {
1379		- $classes[] = 'has-text-color has-background';
1380		- }
1381		-
1382		- return $classes;
1383		- }
1384		-
1385		- public static function mb_tags_box( $form_id, $class = '' ) {
	920	+ public static function mb_tags_box( $form_id, $class = '' ) {
1386	921	$fields = FrmField::get_all_for_form( $form_id, '', 'include' );
1387		-
1388		- /**
1389		- * Allows modifying the list of fields in the tags box.
1390		- *
1391		- * @since 5.0.04
1392		- *
1393		- * @param array $fields The list of fields.
1394		- * @param array $args The arguments. Contains `form_id`.
1395		- */
1396		- $fields = apply_filters( 'frm_fields_in_tags_box', $fields, compact( 'form_id' ) );
1397		- $linked_forms = array();
1398		- $col = 'one';
	922	+ $linked_forms = array();
	923	+ $col = 'one';
1399	924	$settings_tab = FrmAppHelper::is_admin_page( 'formidable' ) ? true : false;
1400	925
1401		- $cond_shortcodes = apply_filters( 'frm_conditional_shortcodes', array() );
	926	+ $cond_shortcodes = apply_filters( 'frm_conditional_shortcodes', array() );
1402	927	$entry_shortcodes = self::get_shortcode_helpers( $settings_tab );
1403	928
1404	929	$advanced_helpers = self::advanced_helpers( compact( 'fields', 'form_id' ) );
1405	930
1406	931	include( FrmAppHelper::plugin_path() . '/classes/views/shared/mb_adv_info.php' );
1407		- }
	932	+ }
1408	933
1409	934	/**
1410	935	* @since 3.04.01
1411	936	*/
		@@ -1411,9 +936,9 @@
1411	936	*/
1412	937	private static function advanced_helpers( $atts ) {
1413	938	$advanced_helpers = array(
1414	939	'default' => array(
1415		- 'heading' => __( 'Customize field values with the following parameters.', 'formidable' ),
	940	+ 'heading' => __( 'Customize the field values with the following parameters. Click to see a sample.', 'formidable' ),
1416	941	'codes' => self::get_advanced_shortcodes(),
1417	942	),
1418	943	);
1419	944
		@@ -1425,8 +950,9 @@
1425	950	unset( $uk, $uf );
1426	951	}
1427	952
1428	953	$advanced_helpers['user_id'] = array(
	954	+ 'heading' => __( 'Insert user information', 'formidable' ),
1429	955	'codes' => $user_helpers,
1430	956	);
1431	957	}
1432	958
		@@ -1433,10 +959,8 @@
1433	959	/**
1434	960	* Add extra helper shortcodes on the Advanced tab in form settings and views
1435	961	*
1436	962	* @since 3.04.01
1437		- *
1438		- * @param array $advanced_helpers
1439	963	* @param array $atts - Includes fields and form_id
1440	964	*/
1441	965	return apply_filters( 'frm_advanced_helpers', $advanced_helpers, $atts );
1442	966	}
		@@ -1452,14 +976,10 @@
1452	976	'x sep=", "' => array(
1453	977	'label' => __( 'Separator', 'formidable' ),
1454	978	'title' => __( 'Use a different separator for checkbox fields', 'formidable' ),
1455	979	),
1456		- 'x format="d-m-Y"' => array(
1457		- 'label' => __( 'Date Format', 'formidable' ),
1458		- ),
1459		- 'x show="field_label"' => array(
1460		- 'label' => __( 'Field Label', 'formidable' ),
1461		- ),
	980	+ 'x format="d-m-Y"' => __( 'Date Format', 'formidable' ),
	981	+ 'x show="field_label"' => __( 'Field Label', 'formidable' ),
1462	982	'x wpautop=0' => array(
1463	983	'label' => __( 'No Auto P', 'formidable' ),
1464	984	'title' => __( 'Do not automatically add any paragraphs or line breaks', 'formidable' ),
1465	985	),
		@@ -1464,9 +984,8 @@
1464	984	'title' => __( 'Do not automatically add any paragraphs or line breaks', 'formidable' ),
1465	985	),
1466	986	);
1467	987	$adv_shortcodes = apply_filters( 'frm_advanced_shortcodes', $adv_shortcodes );
1468		-
1469	988	// __( 'Leave blank instead of defaulting to User Login', 'formidable' ) : blank=1
1470	989
1471	990	return $adv_shortcodes;
1472	991	}
		@@ -1475,18 +994,17 @@
1475	994	* @since 3.04.01
1476	995	*/
1477	996	private static function user_shortcodes() {
1478	997	$options = array(
1479		- 'ID' => __( 'User ID', 'formidable' ),
1480		- 'first_name' => __( 'First Name', 'formidable' ),
1481		- 'last_name' => __( 'Last Name', 'formidable' ),
1482		- 'display_name' => __( 'Display Name', 'formidable' ),
1483		- 'user_login' => __( 'User Login', 'formidable' ),
1484		- 'user_email' => __( 'Email', 'formidable' ),
1485		- 'avatar' => __( 'Avatar', 'formidable' ),
1486		- 'author_link' => __( 'Author Link', 'formidable' ),
	998	+ 'ID' => __( 'User ID', 'formidable' ),
	999	+ 'first_name' => __( 'First Name', 'formidable' ),
	1000	+ 'last_name' => __( 'Last Name', 'formidable' ),
	1001	+ 'display_name' => __( 'Display Name', 'formidable' ),
	1002	+ 'user_login' => __( 'User Login', 'formidable' ),
	1003	+ 'user_email' => __( 'Email', 'formidable' ),
	1004	+ 'avatar' => __( 'Avatar', 'formidable' ),
	1005	+ 'author_link' => __( 'Author Link', 'formidable' ),
1487	1006	);
1488		-
1489	1007	return apply_filters( 'frm_user_shortcodes', $options );
1490	1008	}
1491	1009
1492	1010	/**
		@@ -1495,18 +1013,18 @@
1495	1013	* @since 2.0.6
1496	1014	*/
1497	1015	private static function get_shortcode_helpers( $settings_tab ) {
1498	1016	$entry_shortcodes = array(
1499		- 'id' => __( 'Entry ID', 'formidable' ),
1500		- 'key' => __( 'Entry Key', 'formidable' ),
1501		- 'post_id' => __( 'Post ID', 'formidable' ),
1502		- 'ip' => __( 'User IP', 'formidable' ),
	1017	+ 'id' => __( 'Entry ID', 'formidable' ),
	1018	+ 'key' => __( 'Entry Key', 'formidable' ),
	1019	+ 'post_id' => __( 'Post ID', 'formidable' ),
	1020	+ 'ip' => __( 'User IP', 'formidable' ),
1503	1021	'created-at' => __( 'Entry created', 'formidable' ),
1504	1022	'updated-at' => __( 'Entry updated', 'formidable' ),
1505		- '' => '',
1506		- 'siteurl' => __( 'Site URL', 'formidable' ),
1507		- 'sitename' => __( 'Site Name', 'formidable' ),
1508		- );
	1023	+ '' => '',
	1024	+ 'siteurl' => __( 'Site URL', 'formidable' ),
	1025	+ 'sitename' => __( 'Site Name', 'formidable' ),
	1026	+ );
1509	1027
1510	1028	if ( ! FrmAppHelper::pro_is_installed() ) {
1511	1029	unset( $entry_shortcodes['post_id'] );
1512	1030	}
		@@ -1512,11 +1030,10 @@
1512	1030	}
1513	1031
1514	1032	if ( $settings_tab ) {
1515	1033	$entry_shortcodes['default-message'] = __( 'Default Msg', 'formidable' );
1516		- $entry_shortcodes['default-html'] = __( 'Default HTML', 'formidable' );
1517		- $entry_shortcodes['default-plain'] = __( 'Default Plain', 'formidable' );
1518		- $entry_shortcodes['form_name'] = __( 'Form Name', 'formidable' );
	1034	+ $entry_shortcodes['default-html'] = __( 'Default HTML', 'formidable' );
	1035	+ $entry_shortcodes['default-plain'] = __( 'Default Plain', 'formidable' );
1519	1036	}
1520	1037
1521	1038	/**
1522	1039	* Use this hook to add or remove buttons in the helpers section
		@@ -1529,12 +1046,9 @@
1529	1046	return $entry_shortcodes;
1530	1047	}
1531	1048
1532	1049	/**
1533		- * Insert the form class setting into the form.
1534		- *
1535		- * @param stdClass $form
1536		- * @return void
	1050	+ * Insert the form class setting into the form
1537	1051	*/
1538	1052	public static function form_classes( $form ) {
1539	1053	if ( isset( $form->options['form_class'] ) ) {
1540	1054	echo esc_attr( sanitize_text_field( $form->options['form_class'] ) );
		@@ -1539,36 +1053,18 @@
1539	1053	if ( isset( $form->options['form_class'] ) ) {
1540	1054	echo esc_attr( sanitize_text_field( $form->options['form_class'] ) );
1541	1055	}
1542	1056
1543		- if ( ! empty( $form->options['js_validate'] ) ) {
	1057	+ if ( isset( $form->options['js_validate'] ) && $form->options['js_validate'] ) {
1544	1058	echo ' frm_js_validate ';
1545		- self::add_js_validate_form_to_global_vars( $form );
1546	1059	}
1547		-
1548		- if ( ! FrmFormsHelper::should_use_pro_for_ajax_submit() && FrmForm::is_ajax_on( $form ) ) {
1549		- echo ' frm_ajax_submit ';
1550		- }
1551	1060	}
1552	1061
1553		- /**
1554		- * @since 5.0.03
1555		- *
1556		- * @param stdClass $form
1557		- */
1558		- public static function add_js_validate_form_to_global_vars( $form ) {
1559		- global $frm_vars;
1560		- if ( ! isset( $frm_vars['js_validate_forms'] ) ) {
1561		- $frm_vars['js_validate_forms'] = array();
1562		- }
1563		- $frm_vars['js_validate_forms'][ $form->id ] = $form;
1564		- }
1565		-
1566	1062	public static function get_email_html() {
1567	1063	FrmAppHelper::permission_check( 'frm_view_forms' );
1568	1064	check_ajax_referer( 'frm_ajax', 'nonce' );
1569	1065
1570		- echo FrmEntriesController::show_entry_shortcode( // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
	1066	+ echo FrmEntriesController::show_entry_shortcode( // WPCS: XSS ok.
1571	1067	array(
1572	1068	'form_id' => FrmAppHelper::get_post_param( 'form_id', '', 'absint' ),
1573	1069	'default_email' => true,
1574	1070	'plain_text' => FrmAppHelper::get_post_param( 'plain_text', '', 'absint' ),
		@@ -1576,58 +1072,24 @@
1576	1072	);
1577	1073	wp_die();
1578	1074	}
1579	1075
1580		- /**
1581		- * @param string $content
1582		- * @param stdClass|string|int $form
1583		- * @param stdClass|string|int|false $entry
1584		- * @return string
1585		- */
1586		- public static function filter_content( $content, $form, $entry = false ) {
1587		- $content = self::replace_form_name_shortcodes( $content, $form );
1588		-
	1076	+ public static function filter_content( $content, $form, $entry = false ) {
1589	1077	self::get_entry_by_param( $entry );
1590		- if ( ! $entry ) {
1591		- return $content;
1592		- }
	1078	+ if ( ! $entry ) {
	1079	+ return $content;
	1080	+ }
1593	1081
1594		- if ( is_object( $form ) ) {
1595		- $form = $form->id;
1596		- }
	1082	+ if ( is_object( $form ) ) {
	1083	+ $form = $form->id;
	1084	+ }
1597	1085
1598		- $shortcodes = FrmFieldsHelper::get_shortcodes( $content, $form );
1599		- $content = apply_filters( 'frm_replace_content_shortcodes', $content, $entry, $shortcodes );
	1086	+ $shortcodes = FrmFieldsHelper::get_shortcodes( $content, $form );
	1087	+ $content = apply_filters( 'frm_replace_content_shortcodes', $content, $entry, $shortcodes );
1600	1088
1601		- return $content;
1602		- }
	1089	+ return $content;
	1090	+ }
1603	1091
1604		- /**
1605		- * Replace any [form_name] shortcodes in a string.
1606		- *
1607		- * @since 5.5
1608		- *
1609		- * @param string $string
1610		- * @param stdClass|string|int $form
1611		- * @return string
1612		- */
1613		- public static function replace_form_name_shortcodes( $string, $form ) {
1614		- if ( false === strpos( $string, '[form_name]' ) ) {
1615		- return $string;
1616		- }
1617		-
1618		- if ( ! is_object( $form ) ) {
1619		- $form = FrmForm::getOne( $form );
1620		- }
1621		-
1622		- $form_name = is_object( $form ) ? $form->name : '';
1623		- return str_replace( '[form_name]', $form_name, $string );
1624		- }
1625		-
1626		- /**
1627		- * @param stdClass|string|int|false $entry
1628		- * @return void
1629		- */
1630	1092	private static function get_entry_by_param( &$entry ) {
1631	1093	if ( ! $entry || ! is_object( $entry ) ) {
1632	1094	if ( ! $entry || ! is_numeric( $entry ) ) {
1633	1095	$entry = FrmAppHelper::get_post_param( 'id', false, 'sanitize_title' );
		@@ -1636,218 +1098,155 @@
1636	1098	FrmEntry::maybe_get_entry( $entry );
1637	1099	}
1638	1100	}
1639	1101
1640		- public static function replace_content_shortcodes( $content, $entry, $shortcodes ) {
1641		- return FrmFieldsHelper::replace_content_shortcodes( $content, $entry, $shortcodes );
1642		- }
	1102	+ public static function replace_content_shortcodes( $content, $entry, $shortcodes ) {
	1103	+ return FrmFieldsHelper::replace_content_shortcodes( $content, $entry, $shortcodes );
	1104	+ }
1643	1105
1644		- public static function process_bulk_form_actions( $errors ) {
1645		- if ( ! $_REQUEST ) {
1646		- return $errors;
1647		- }
	1106	+ public static function process_bulk_form_actions( $errors ) {
	1107	+ if ( ! $_REQUEST ) {
	1108	+ return $errors;
	1109	+ }
1648	1110
1649	1111	$bulkaction = FrmAppHelper::get_param( 'action', '', 'get', 'sanitize_text_field' );
1650		- if ( $bulkaction == - 1 ) {
	1112	+ if ( $bulkaction == -1 ) {
1651	1113	$bulkaction = FrmAppHelper::get_param( 'action2', '', 'get', 'sanitize_title' );
1652		- }
	1114	+ }
1653	1115
1654		- if ( ! empty( $bulkaction ) && strpos( $bulkaction, 'bulk_' ) === 0 ) {
1655		- FrmAppHelper::remove_get_action();
	1116	+ if ( ! empty( $bulkaction ) && strpos( $bulkaction, 'bulk_' ) === 0 ) {
	1117	+ FrmAppHelper::remove_get_action();
1656	1118
1657		- $bulkaction = str_replace( 'bulk_', '', $bulkaction );
1658		- }
	1119	+ $bulkaction = str_replace( 'bulk_', '', $bulkaction );
	1120	+ }
1659	1121
1660	1122	$ids = FrmAppHelper::get_param( 'item-action', '', 'get', 'sanitize_text_field' );
1661		- if ( empty( $ids ) ) {
1662		- $errors[] = __( 'No forms were specified', 'formidable' );
	1123	+ if ( empty( $ids ) ) {
	1124	+ $errors[] = __( 'No forms were specified', 'formidable' );
	1125	+ return $errors;
	1126	+ }
1663	1127
1664		- return $errors;
1665		- }
	1128	+ $permission_error = FrmAppHelper::permission_nonce_error( '', '_wpnonce', 'bulk-toplevel_page_formidable' );
	1129	+ if ( $permission_error !== false ) {
	1130	+ $errors[] = $permission_error;
	1131	+ return $errors;
	1132	+ }
1666	1133
1667		- $permission_error = FrmAppHelper::permission_nonce_error( '', '_wpnonce', 'bulk-toplevel_page_formidable' );
1668		- if ( $permission_error !== false ) {
1669		- $errors[] = $permission_error;
	1134	+ if ( ! is_array( $ids ) ) {
	1135	+ $ids = explode( ',', $ids );
	1136	+ }
1670	1137
1671		- return $errors;
1672		- }
1673		-
1674		- if ( ! is_array( $ids ) ) {
1675		- $ids = explode( ',', $ids );
1676		- }
1677		-
1678		- switch ( $bulkaction ) {
1679		- case 'delete':
1680		- $message = self::bulk_destroy( $ids );
	1138	+ switch ( $bulkaction ) {
	1139	+ case 'delete':
	1140	+ $message = self::bulk_destroy( $ids );
1681	1141	break;
1682		- case 'trash':
1683		- $message = self::bulk_trash( $ids );
	1142	+ case 'trash':
	1143	+ $message = self::bulk_trash( $ids );
1684	1144	break;
1685		- case 'untrash':
1686		- $message = self::bulk_untrash( $ids );
1687		- }
	1145	+ case 'untrash':
	1146	+ $message = self::bulk_untrash( $ids );
	1147	+ }
1688	1148
1689		- if ( isset( $message ) && ! empty( $message ) ) {
	1149	+ if ( isset( $message ) && ! empty( $message ) ) {
1690	1150	$errors['message'] = $message;
1691		- }
	1151	+ }
1692	1152
1693		- return $errors;
1694		- }
	1153	+ return $errors;
	1154	+ }
1695	1155
1696		- public static function route() {
	1156	+ public static function route() {
1697	1157	$action = isset( $_REQUEST['frm_action'] ) ? 'frm_action' : 'action';
1698		- $vars = array();
1699		- FrmAppHelper::include_svg();
1700		-
1701		- if ( isset( $_POST['frm_compact_fields'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
	1158	+ $vars = array();
	1159	+ if ( isset( $_POST['frm_compact_fields'] ) ) {
1702	1160	FrmAppHelper::permission_check( 'frm_edit_forms' );
1703	1161
1704		- // Javascript needs to be allowed in some field settings.
1705		- // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized, WordPress.Security.NonceVerification.Missing
1706		- $json_vars = htmlspecialchars_decode( nl2br( str_replace( '&quot;', '"', wp_unslash( $_POST['frm_compact_fields'] ) ) ) );
	1162	+ $json_vars = htmlspecialchars_decode( nl2br( stripslashes( str_replace( '&quot;', '\\\"', $_POST['frm_compact_fields'] ) ) ) );
1707	1163	$json_vars = json_decode( $json_vars, true );
1708	1164	if ( empty( $json_vars ) ) {
1709		- // json decoding failed so we should return an error message.
	1165	+ // json decoding failed so we should return an error message
1710	1166	$action = FrmAppHelper::get_param( $action, '', 'get', 'sanitize_title' );
1711		- if ( 'edit' == $action ) {
1712		- $action = 'update';
1713		- }
	1167	+ if ( 'edit' == $action ) {
	1168	+ $action = 'update';
	1169	+ }
1714	1170
1715	1171	add_filter( 'frm_validate_form', 'FrmFormsController::json_error' );
1716		- } else {
1717		- $vars = FrmAppHelper::json_to_array( $json_vars );
1718		- $action = $vars[ $action ];
1719		- unset( $_REQUEST['frm_compact_fields'], $_POST['frm_compact_fields'] ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
1720		- $_REQUEST = array_merge( $_REQUEST, $vars ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
1721		- $_POST = array_merge( $_POST, $_REQUEST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
1722		- }
1723		- } else {
	1172	+ } else {
	1173	+ $vars = FrmAppHelper::json_to_array( $json_vars );
	1174	+ $action = $vars[ $action ];
	1175	+ unset( $_REQUEST['frm_compact_fields'], $_POST['frm_compact_fields'] );
	1176	+ $_REQUEST = array_merge( $_REQUEST, $vars );
	1177	+ $_POST = array_merge( $_POST, $_REQUEST );
	1178	+ }
	1179	+ } else {
1724	1180	$action = FrmAppHelper::get_param( $action, '', 'get', 'sanitize_title' );
1725		- if ( isset( $_REQUEST['delete_all'] ) ) {
1726		- // Override the action for this page.
1727		- $action = 'delete_all';
1728		- }
1729		- }
	1181	+ if ( isset( $_REQUEST['delete_all'] ) ) {
	1182	+ // override the action for this page
	1183	+ $action = 'delete_all';
	1184	+ }
	1185	+ }
1730	1186
1731	1187	add_action( 'frm_load_form_hooks', 'FrmHooksController::trigger_load_form_hooks' );
1732		- FrmAppHelper::trigger_hook_load( 'form' );
	1188	+ FrmAppHelper::trigger_hook_load( 'form' );
1733	1189
1734		- switch ( $action ) {
1735		- case 'new':
	1190	+ switch ( $action ) {
	1191	+ case 'new':
1736	1192	return self::new_form( $vars );
1737		- case 'create':
1738		- case 'edit':
1739		- case 'update':
1740		- case 'trash':
1741		- case 'untrash':
1742		- case 'destroy':
1743		- case 'delete_all':
1744		- case 'settings':
1745		- case 'update_settings':
	1193	+ case 'add_new':
	1194	+ case 'list_templates':
	1195	+ case 'create':
	1196	+ case 'edit':
	1197	+ case 'update':
	1198	+ case 'duplicate':
	1199	+ case 'trash':
	1200	+ case 'untrash':
	1201	+ case 'destroy':
	1202	+ case 'delete_all':
	1203	+ case 'settings':
	1204	+ case 'update_settings':
1746	1205	return self::$action( $vars );
1747		- case 'lite-reports':
1748		- return self::no_reports( $vars );
1749		- case 'views':
1750		- return self::no_views( $vars );
1751		- default:
	1206	+ default:
1752	1207	do_action( 'frm_form_action_' . $action );
1753	1208	if ( apply_filters( 'frm_form_stop_action_' . $action, false ) ) {
1754		- return;
1755		- }
	1209	+ return;
	1210	+ }
1756	1211
1757	1212	$action = FrmAppHelper::get_param( 'action', '', 'get', 'sanitize_text_field' );
1758		- if ( $action == - 1 ) {
	1213	+ if ( $action == -1 ) {
1759	1214	$action = FrmAppHelper::get_param( 'action2', '', 'get', 'sanitize_title' );
1760		- }
	1215	+ }
1761	1216
1762	1217	if ( strpos( $action, 'bulk_' ) === 0 ) {
1763		- FrmAppHelper::remove_get_action();
	1218	+ FrmAppHelper::remove_get_action();
	1219	+ return self::list_form();
	1220	+ }
1764	1221
1765		- self::list_form();
1766		- return;
1767		- }
	1222	+ return self::display_forms_list();
	1223	+ }
	1224	+ }
1768	1225
1769		- $message = FrmAppHelper::get_param( 'message' );
1770		- if ( 'form_duplicate_error' === $message ) {
1771		- self::display_forms_list( array(), '', array( __( 'There was a problem duplicating the form', 'formidable' ) ) );
1772		- return;
1773		- }
	1226	+ public static function json_error( $errors ) {
	1227	+ $errors['json'] = __( 'Abnormal HTML characters prevented your form from saving correctly', 'formidable' );
	1228	+ return $errors;
	1229	+ }
1774	1230
1775		- self::display_forms_list();
1776	1231
1777		- return;
1778		- }
1779		- }
1780		-
1781		- public static function json_error( $errors ) {
1782		- $errors['json'] = __( 'Abnormal HTML characters prevented your form from saving correctly', 'formidable' );
1783		-
1784		- return $errors;
1785		- }
1786		-
1787		- /**
1788		- * Education for premium features.
1789		- *
1790		- * @since 4.05
1791		- */
1792		- public static function add_form_style_tab_options() {
1793		- include( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/add_form_style_options.php' );
1794		- }
1795		-
1796		- /**
1797		- * Add education about views.
1798		- *
1799		- * @since 4.07
1800		- */
1801		- public static function no_views( $values = array() ) {
1802		- FrmAppHelper::include_svg();
1803		- $id = FrmAppHelper::get_param( 'form', '', 'get', 'absint' );
1804		- $form = $id ? FrmForm::getOne( $id ) : false;
1805		-
1806		- include FrmAppHelper::plugin_path() . '/classes/views/shared/views-info.php';
1807		- }
1808		-
1809		- /**
1810		- * Add education about reports.
1811		- *
1812		- * @since 4.07
1813		- */
1814		- public static function no_reports( $values = array() ) {
1815		- $id = FrmAppHelper::get_param( 'form', '', 'get', 'absint' );
1816		- $form = $id ? FrmForm::getOne( $id ) : false;
1817		-
1818		- include FrmAppHelper::plugin_path() . '/classes/views/shared/reports-info.php';
1819		- }
1820		-
1821		- /* FRONT-END FORMS */
1822		- public static function admin_bar_css() {
	1232	+ /* FRONT-END FORMS */
	1233	+ public static function admin_bar_css() {
1823	1234	if ( is_admin() || ! current_user_can( 'frm_edit_forms' ) ) {
1824		- return;
1825		- }
	1235	+ return;
	1236	+ }
1826	1237
1827		- self::move_menu_to_footer();
1828		-
1829	1238	add_action( 'wp_before_admin_bar_render', 'FrmFormsController::admin_bar_configure' );
1830	1239	FrmAppHelper::load_font_style();
1831	1240	}
1832	1241
1833		- /**
1834		- * @since 4.05.02
1835		- */
1836		- private static function move_menu_to_footer() {
1837		- $settings = FrmAppHelper::get_settings();
1838		- if ( empty( $settings->admin_bar ) ) {
1839		- remove_action( 'wp_body_open', 'wp_admin_bar_render', 0 );
1840		- }
1841		- }
1842		-
1843	1242	public static function admin_bar_configure() {
1844		- global $frm_vars;
	1243	+ global $frm_vars;
1845	1244	if ( empty( $frm_vars['forms_loaded'] ) ) {
1846		- return;
1847		- }
	1245	+ return;
	1246	+ }
1848	1247
1849		- $actions = array();
	1248	+ $actions = array();
1850	1249	foreach ( $frm_vars['forms_loaded'] as $form ) {
1851	1250	if ( is_object( $form ) ) {
1852	1251	$actions[ $form->id ] = $form->name;
1853	1252	}
		@@ -1891,101 +1290,75 @@
1891	1290	foreach ( $actions as $form_id => $name ) {
1892	1291
1893	1292	$wp_admin_bar->add_node(
1894	1293	array(
1895		- 'parent' => 'frm-forms',
1896		- 'id' => 'edit_form_' . $form_id,
1897		- 'title' => empty( $name ) ? __( '(no title)', 'formidable' ) : $name,
1898		- 'href' => FrmForm::get_edit_link( $form_id ),
	1294	+ 'parent' => 'frm-forms',
	1295	+ 'id' => 'edit_form_' . $form_id,
	1296	+ 'title' => empty( $name ) ? __( '(no title)', 'formidable' ) : $name,
	1297	+ 'href' => admin_url( 'admin.php?page=formidable&frm_action=edit&id=' . $form_id ),
1899	1298	)
1900	1299	);
1901	1300	}
1902	1301	}
1903	1302
1904		- /**
1905		- * The formidable shortcode
1906		- *
1907		- * @param array $atts The params from the shortcode.
1908		- * @return string
1909		- */
	1303	+ //formidable shortcode
1910	1304	public static function get_form_shortcode( $atts ) {
1911		- global $frm_vars;
	1305	+ global $frm_vars;
1912	1306	if ( isset( $frm_vars['skip_shortcode'] ) && $frm_vars['skip_shortcode'] ) {
1913		- $sc = '[formidable';
1914		- $sc .= FrmAppHelper::array_to_html_params( $atts );
	1307	+ $sc = '[formidable';
	1308	+ if ( ! empty( $atts ) ) {
	1309	+ foreach ( $atts as $k => $v ) {
	1310	+ $sc .= ' ' . $k . '="' . esc_attr( $v ) . '"';
	1311	+ }
	1312	+ }
1915	1313	return $sc . ']';
1916		- }
	1314	+ }
1917	1315
1918	1316	$shortcode_atts = shortcode_atts(
1919	1317	array(
1920		- 'id' => '',
1921		- 'key' => '',
1922		- 'title' => 'auto',
1923		- 'description' => 'auto',
1924		- 'readonly' => false,
1925		- 'entry_id' => false,
1926		- 'fields' => array(),
	1318	+ 'id' => '',
	1319	+ 'key' => '',
	1320	+ 'title' => false,
	1321	+ 'description' => false,
	1322	+ 'readonly' => false,
	1323	+ 'entry_id' => false,
	1324	+ 'fields' => array(),
1927	1325	'exclude_fields' => array(),
1928		- 'minimize' => false,
	1326	+ 'minimize' => false,
1929	1327	),
1930	1328	$atts
1931	1329	);
1932	1330	do_action( 'formidable_shortcode_atts', $shortcode_atts, $atts );
1933	1331
1934		- return self::show_form( $shortcode_atts['id'], $shortcode_atts['key'], $shortcode_atts['title'], $shortcode_atts['description'], $atts );
1935		- }
	1332	+ return self::show_form( $shortcode_atts['id'], $shortcode_atts['key'], $shortcode_atts['title'], $shortcode_atts['description'], $atts );
	1333	+ }
1936	1334
1937		- /**
1938		- * @since 5.2.01
1939		- *
1940		- * @param string|int|false $id
1941		- * @param string|false $key
1942		- * @return stdClass|false
1943		- */
1944		- private static function maybe_get_form_by_id_or_key( $id, $key ) {
1945		- if ( ! $id ) {
1946		- $id = $key;
1947		- }
1948		- return self::maybe_get_form_to_show( $id );
1949		- }
	1335	+ public static function show_form( $id = '', $key = '', $title = false, $description = false, $atts = array() ) {
	1336	+ if ( empty( $id ) ) {
	1337	+ $id = $key;
	1338	+ }
1950	1339
1951		- /**
1952		- * @param string|int|false $id
1953		- * @param string|false $key
1954		- * @param string|int|bool $title may be 'auto', true, false, 'true', 'false', 'yes', '1', 1, '0', 0.
1955		- * @param string|int|bool $description may be 'auto', true, false, 'true', 'false', 'yes', '1', 1, '0', 0.
1956		- * @param array $atts
1957		- * @return string
1958		- */
1959		- public static function show_form( $id = '', $key = '', $title = false, $description = false, $atts = array() ) {
1960		- $form = self::maybe_get_form_by_id_or_key( $id, $key );
	1340	+ $form = self::maybe_get_form_to_show( $id );
	1341	+ if ( ! $form ) {
	1342	+ return __( 'Please select a valid form', 'formidable' );
	1343	+ }
1961	1344
1962		- if ( ! $form ) {
1963		- return __( 'Please select a valid form', 'formidable' );
1964		- }
1965		-
1966		- if ( 'auto' === $title ) {
1967		- $title = ! empty( $form->options['show_title'] );
1968		- }
1969		-
1970		- if ( 'auto' === $description ) {
1971		- $description = ! empty( $form->options['show_description'] );
1972		- }
1973		-
1974	1345	FrmAppController::maybe_update_styles();
1975	1346
1976	1347	add_action( 'frm_load_form_hooks', 'FrmHooksController::trigger_load_form_hooks' );
1977		- FrmAppHelper::trigger_hook_load( 'form', $form );
	1348	+ FrmAppHelper::trigger_hook_load( 'form', $form );
1978	1349
1979		- $form = apply_filters( 'frm_pre_display_form', $form );
	1350	+ $form = apply_filters( 'frm_pre_display_form', $form );
1980	1351
1981		- $frm_settings = FrmAppHelper::get_settings( array( 'current_form' => $form->id ) );
	1352	+ $frm_settings = FrmAppHelper::get_settings( array( 'current_form' => $form->id ) );
1982	1353
1983	1354	if ( self::is_viewable_draft_form( $form ) ) {
1984	1355	// don't show a draft form on a page
1985	1356	$form = __( 'Please select a valid form', 'formidable' );
1986		- } elseif ( ! FrmForm::is_visible_to_user( $form ) ) {
	1357	+ } else if ( self::user_should_login( $form ) ) {
1987	1358	$form = do_shortcode( $frm_settings->login_msg );
	1359	+ } else if ( self::user_has_permission_to_view( $form ) ) {
	1360	+ $form = do_shortcode( $frm_settings->login_msg );
1988	1361	} else {
1989	1362	do_action( 'frm_pre_get_form', $form );
1990	1363	$form = self::get_form( $form, $title, $description, $atts );
1991	1364
		@@ -1998,20 +1371,16 @@
1998	1371	$form = apply_filters( 'frm_filter_final_form', $form );
1999	1372	}
2000	1373
2001	1374	return $form;
2002		- }
	1375	+ }
2003	1376
2004		- /**
2005		- * @param string|int|false $id
2006		- * @return stdClass|false
2007		- */
2008	1377	private static function maybe_get_form_to_show( $id ) {
2009	1378	$form = false;
2010	1379
2011		- if ( ! empty( $id ) ) { // form id or key is set
	1380	+ if ( ! empty( $id ) ) { // no form id or key set
2012	1381	$form = FrmForm::getOne( $id );
2013		- if ( ! $form || $form->parent_form_id || $form->status === 'trash' ) {
	1382	+ if ( ! $form || $form->parent_form_id || $form->status == 'trash' ) {
2014	1383	$form = false;
2015	1384	}
2016	1385	}
2017	1386
		@@ -2018,26 +1387,36 @@
2018	1387	return $form;
2019	1388	}
2020	1389
2021	1390	private static function is_viewable_draft_form( $form ) {
2022		- return $form->status === 'draft' && current_user_can( 'frm_edit_forms' ) && ! FrmAppHelper::is_preview_page();
	1391	+ global $post;
	1392	+ $frm_settings = FrmAppHelper::get_settings();
	1393	+ return $form->status == 'draft' && current_user_can( 'frm_edit_forms' ) && ! FrmAppHelper::is_preview_page();
2023	1394	}
2024	1395
2025		- public static function get_form( $form, $title, $description, $atts = array() ) {
	1396	+ private static function user_should_login( $form ) {
	1397	+ return $form->logged_in && ! is_user_logged_in();
	1398	+ }
	1399	+
	1400	+ private static function user_has_permission_to_view( $form ) {
	1401	+ return $form->logged_in && get_current_user_id() && isset( $form->options['logged_in_role'] ) && $form->options['logged_in_role'] != '' && ! FrmAppHelper::user_has_permission( $form->options['logged_in_role'] );
	1402	+ }
	1403	+
	1404	+ public static function get_form( $form, $title, $description, $atts = array() ) {
2026	1405	ob_start();
2027	1406
2028	1407	do_action( 'frm_before_get_form', $atts );
2029	1408
2030		- self::get_form_contents( $form, $title, $description, $atts );
	1409	+ self::get_form_contents( $form, $title, $description, $atts );
2031	1410	self::enqueue_scripts( FrmForm::get_params( $form ) );
2032	1411
2033		- $contents = ob_get_contents();
2034		- ob_end_clean();
	1412	+ $contents = ob_get_contents();
	1413	+ ob_end_clean();
2035	1414
2036	1415	self::maybe_minimize_form( $atts, $contents );
2037	1416
2038		- return $contents;
2039		- }
	1417	+ return $contents;
	1418	+ }
2040	1419
2041	1420	public static function enqueue_scripts( $params ) {
2042	1421	do_action( 'frm_enqueue_form_scripts', $params );
2043	1422	}
		@@ -2042,21 +1421,17 @@
2042	1421	do_action( 'frm_enqueue_form_scripts', $params );
2043	1422	}
2044	1423
2045	1424	public static function get_form_contents( $form, $title, $description, $atts ) {
2046		- $params = FrmForm::get_params( $form );
2047		- $errors = self::get_saved_errors( $form, $params );
2048		- $fields = FrmFieldsHelper::get_form_fields( $form->id, $errors );
2049		- $reset = false;
	1425	+ $params = FrmForm::get_params( $form );
	1426	+ $errors = self::get_saved_errors( $form, $params );
	1427	+ $fields = FrmFieldsHelper::get_form_fields( $form->id, $errors );
	1428	+ $reset = false;
2050	1429	$pass_args = compact( 'form', 'fields', 'errors', 'title', 'description', 'reset' );
2051	1430
2052		- $pass_args['action'] = $params['action'];
2053		- $handle_process_here = $params['action'] === 'create' && $params['posted_form_id'] == $form->id && $_POST; // phpcs:ignore WordPress.Security.NonceVerification.Missing
	1431	+ $handle_process_here = $params['action'] == 'create' && $params['posted_form_id'] == $form->id && $_POST;
2054	1432
2055	1433	if ( ! $handle_process_here ) {
2056		- FrmFormState::set_initial_value( 'title', $title );
2057		- FrmFormState::set_initial_value( 'description', $description );
2058		-
2059	1434	do_action( 'frm_display_form_action', $params, $fields, $form, $title, $description );
2060	1435	if ( apply_filters( 'frm_continue_to_new', true, $form->id, $params['action'] ) ) {
2061	1436	self::show_form_after_submit( $pass_args );
2062	1437	}
		@@ -2067,13 +1442,14 @@
2067	1442
2068	1443	do_action( 'frm_validate_form_creation', $params, $fields, $form, $title, $description );
2069	1444
2070	1445	if ( apply_filters( 'frm_continue_to_create', true, $form->id ) ) {
2071		- $entry_id = self::just_created_entry( $form->id );
2072		- $pass_args['entry_id'] = $entry_id;
2073		- $pass_args['reset'] = true;
	1446	+ $entry_id = self::just_created_entry( $form->id );
	1447	+ $pass_args['entry_id'] = $entry_id;
	1448	+ $pass_args['reset'] = true;
	1449	+ $pass_args['conf_method'] = self::get_confirmation_method( compact( 'form', 'entry_id' ) );
2074	1450
2075		- self::run_on_submit_actions( $pass_args );
	1451	+ self::run_success_action( $pass_args );
2076	1452
2077	1453	do_action(
2078	1454	'frm_after_entry_processed',
2079	1455	array(
		@@ -2092,23 +1468,14 @@
2092	1468	*/
2093	1469	private static function get_saved_errors( $form, $params ) {
2094	1470	global $frm_vars;
2095	1471
2096		- if ( $params['posted_form_id'] == $form->id && $_POST && isset( $frm_vars['created_entries'][ $form->id ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
	1472	+ if ( $params['posted_form_id'] == $form->id && $_POST && isset( $frm_vars['created_entries'][ $form->id ] ) ) {
2097	1473	$errors = $frm_vars['created_entries'][ $form->id ]['errors'];
2098	1474	} else {
2099	1475	$errors = array();
2100	1476	}
2101		-
2102		- /**
2103		- * Allows modifying the generated errors if the form was processed earlier.
2104		- *
2105		- * @since 5.2.03
2106		- *
2107		- * @param array $errors Errors data. Is empty array if no errors found.
2108		- * @param array $params Form params. See {@see FrmForm::get_params()}.
2109		- */
2110		- return apply_filters( 'frm_saved_errors', $errors, $params );
	1477	+ return $errors;
2111	1478	}
2112	1479
2113	1480	/**
2114	1481	* @since 2.2.7
		@@ -2114,40 +1481,19 @@
2114	1481	* @since 2.2.7
2115	1482	*/
2116	1483	public static function just_created_entry( $form_id ) {
2117	1484	global $frm_vars;
2118		-
2119	1485	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;
2120	1486	}
2121	1487
2122	1488	/**
2123		- * Gets confirmation method.
2124		- *
2125	1489	* @since 3.0
2126		- * @since 6.0 This method can return an array of met On Submit actions.
2127		- *
2128		- * @param array $atts {
2129		- * Atts.
2130		- *
2131		- * @type object $form Form object.
2132		- * @type int $entry_id Entry ID.
2133		- * }
2134		- * @return string|array
2135	1490	*/
2136	1491	private static function get_confirmation_method( $atts ) {
2137		- $action = FrmOnSubmitHelper::current_event( $atts );
2138		- $opt = 'update' === $action ? 'edit_action' : 'success_action';
	1492	+ $opt = 'success_action';
2139	1493	$method = ( isset( $atts['form']->options[ $opt ] ) && ! empty( $atts['form']->options[ $opt ] ) ) ? $atts['form']->options[ $opt ] : 'message';
	1494	+ $method = apply_filters( 'frm_success_filter', $method, $atts['form'], 'create' );
2140	1495
2141		- if ( ! empty( $atts['entry_id'] ) ) {
2142		- $met_actions = self::get_met_on_submit_actions( $atts, $action );
2143		- if ( $met_actions ) {
2144		- $method = $met_actions;
2145		- }
2146		- }
2147		-
2148		- $method = apply_filters( 'frm_success_filter', $method, $atts['form'], $action );
2149		-
2150	1496	if ( $method != 'message' && ( ! $atts['entry_id'] || ! is_numeric( $atts['entry_id'] ) ) ) {
2151	1497	$method = 'message';
2152	1498	}
2153	1499
		@@ -2163,34 +1509,11 @@
2163	1509	$conf_method = self::get_confirmation_method(
2164	1510	array(
2165	1511	'form' => $form,
2166	1512	'entry_id' => $params['id'],
2167		- 'action' => FrmOnSubmitHelper::current_event( $params ),
2168	1513	)
2169	1514	);
2170	1515
2171		- self::maybe_trigger_redirect_with_action( $conf_method, $form, $params, $args );
2172		- }
2173		-
2174		- /**
2175		- * Maybe trigger redirect with the new Confirmation action.
2176		- *
2177		- * @since 6.1.1
2178		- *
2179		- * @param array|string $conf_method Array of confirmation actions or the action type string.
2180		- * @param object $form Form object.
2181		- * @param array $params See {@see FrmFormsController::maybe_trigger_redirect()}.
2182		- * @param array $args See {@see FrmFormsController::maybe_trigger_redirect()}.
2183		- */
2184		- public static function maybe_trigger_redirect_with_action( $conf_method, $form, $params, $args ) {
2185		- if ( is_array( $conf_method ) && 1 === count( $conf_method ) ) {
2186		- if ( 'redirect' === FrmOnSubmitHelper::get_action_type( $conf_method[0] ) ) {
2187		- $event = FrmOnSubmitHelper::current_event( $params );
2188		- FrmOnSubmitHelper::populate_on_submit_data( $form->options, $conf_method[0], $event );
2189		- $conf_method = 'redirect';
2190		- }
2191		- }
2192		-
2193	1516	if ( 'redirect' === $conf_method ) {
2194	1517	self::trigger_redirect( $form, $params, $args );
2195	1518	}
2196	1519	}
		@@ -2213,36 +1536,20 @@
2213	1536	/**
2214	1537	* Used when the success action is not 'message'
2215	1538	*
2216	1539	* @since 2.05
2217		- * @since 6.0 `$args['force_delay_redirect']` is added.
2218		- *
2219		- * @param array $args {
2220		- * The args.
2221		- *
2222		- * @type string $conf_method The method.
2223		- * @type object $form Form object.
2224		- * @type int $entry_id Entry ID.
2225		- * @type string $action The action event. Accepts `create` or `update`.
2226		- * @type array $fields The array of fields.
2227		- * @type int $force_delay_redirect Force to show the message before redirecting in case redirect method runs.
2228		- * }
2229	1540	*/
2230	1541	public static function run_success_action( $args ) {
2231		- global $frm_vars;
2232	1542	$extra_args = $args;
2233	1543	unset( $extra_args['form'] );
2234	1544
2235	1545	do_action( 'frm_success_action', $args['conf_method'], $args['form'], $args['form']->options, $args['entry_id'], $extra_args );
2236	1546
2237		- $opt = ( ! isset( $args['action'] ) || $args['action'] === 'create' ) ? 'success' : 'edit';
2238		-
	1547	+ $opt = ( ! isset( $args['action'] ) || $args['action'] == 'create' ) ? 'success' : 'edit';
2239	1548	$args['success_opt'] = $opt;
2240		- $args['ajax'] = ! empty( $frm_vars['ajax'] );
2241		-
2242		- if ( $args['conf_method'] === 'page' && is_numeric( $args['form']->options[ $opt . '_page_id' ] ) ) {
	1549	+ if ( $args['conf_method'] == 'page' && is_numeric( $args['form']->options[ $opt . '_page_id' ] ) ) {
2243	1550	self::load_page_after_submit( $args );
2244		- } elseif ( $args['conf_method'] === 'redirect' ) {
	1551	+ } elseif ( $args['conf_method'] == 'redirect' ) {
2245	1552	self::redirect_after_submit( $args );
2246	1553	} else {
2247	1554	self::show_message_after_save( $args );
2248	1555	}
		@@ -2248,219 +1555,8 @@
2248	1555	}
2249	1556	}
2250	1557
2251	1558	/**
2252		- * Gets met On Submit actions.
2253		- *
2254		- * @since 6.0
2255		- *
2256		- * @param array $args See {@see FrmFormsController::run_success_action()}.
2257		- * @param string $event Form event. Default is `create`.
2258		- * @return array Array of actions that meet the conditional logics.
2259		- */
2260		- public static function get_met_on_submit_actions( $args, $event = 'create' ) {
2261		- if ( ! FrmOnSubmitHelper::form_has_migrated( $args['form'] ) ) {
2262		- return array();
2263		- }
2264		-
2265		- $entry = FrmEntry::getOne( $args['entry_id'], true );
2266		- $actions = FrmOnSubmitHelper::get_actions( $args['form']->id );
2267		- $met_actions = array();
2268		- $has_redirect = false;
2269		-
2270		- foreach ( $actions as $action ) {
2271		- if ( ! in_array( $event, $action->post_content['event'], true ) ) {
2272		- continue;
2273		- }
2274		-
2275		- if ( FrmFormAction::action_conditions_met( $action, $entry ) ) {
2276		- continue;
2277		- }
2278		-
2279		- $action_type = FrmOnSubmitHelper::get_action_type( $action );
2280		-
2281		- if ( 'redirect' === $action_type ) {
2282		- if ( $has_redirect ) { // Do not process because we run the first redirect action only.
2283		- continue;
2284		- }
2285		- }
2286		-
2287		- if ( ! self::is_valid_on_submit_action( $action, $args, $event ) ) {
2288		- continue;
2289		- }
2290		-
2291		- if ( 'redirect' === $action_type ) {
2292		- $has_redirect = true;
2293		- }
2294		-
2295		- $met_actions[] = $action;
2296		- unset( $action );
2297		- }
2298		-
2299		- $args['event'] = $event;
2300		-
2301		- /**
2302		- * Filters the On Submit actions that meet the conditional logics.
2303		- *
2304		- * @since 6.0
2305		- *
2306		- * @param array $met_actions Actions that meet the conditional logics.
2307		- * @param array $args See {@see FrmFormsController::run_success_action()}. `$args['event']` is also added.
2308		- */
2309		- $met_actions = apply_filters( 'frm_get_met_on_submit_actions', $met_actions, $args );
2310		-
2311		- if ( empty( $met_actions ) ) {
2312		- $met_actions = array( FrmOnSubmitHelper::get_fallback_action( $event ) );
2313		- }
2314		-
2315		- return $met_actions;
2316		- }
2317		-
2318		- /**
2319		- * Checks if a Confirmation action has the valid data.
2320		- *
2321		- * @since 6.1.2
2322		- *
2323		- * @param object $action Form action object.
2324		- * @param array $args See {@see FrmFormsController::run_success_action()}.
2325		- * @param string $event Form event. Default is `create`.
2326		- * @return bool
2327		- */
2328		- private static function is_valid_on_submit_action( $action, $args, $event = 'create' ) {
2329		- $action_type = FrmOnSubmitHelper::get_action_type( $action );
2330		-
2331		- if ( 'redirect' === $action_type ) {
2332		- // Run through frm_redirect_url filter. This is used for the valid action check.
2333		- $action->post_content['success_url'] = apply_filters(
2334		- 'frm_redirect_url',
2335		- $action->post_content['success_url'],
2336		- $args['form'],
2337		- $args + array( 'action' => $event )
2338		- );
2339		-
2340		- return ! empty( $action->post_content['success_url'] );
2341		- }
2342		-
2343		- if ( 'page' === $action_type ) {
2344		- if ( empty( $action->post_content['success_page_id'] ) ) {
2345		- return false;
2346		- }
2347		-
2348		- $page = get_post( $action->post_content['success_page_id'] );
2349		- if ( ! $page || 'trash' === $page->post_status ) {
2350		- return false;
2351		- }
2352		- }
2353		-
2354		- return true;
2355		- }
2356		-
2357		- /**
2358		- * Runs On Submit actions.
2359		- *
2360		- * @since 6.0
2361		- *
2362		- * @param array $args See inside {@see FrmFormsController::get_form_contents()} method.
2363		- */
2364		- public static function run_on_submit_actions( $args ) {
2365		- $args['conf_method'] = self::get_confirmation_method(
2366		- array(
2367		- 'form' => $args['form'],
2368		- 'entry_id' => $args['entry_id'],
2369		- 'action' => FrmOnSubmitHelper::current_event( $args ),
2370		- )
2371		- );
2372		- if ( ! is_array( $args['conf_method'] ) ) {
2373		- self::run_success_action( $args );
2374		- return;
2375		- }
2376		-
2377		- // If conf_method is an array, run On Submit actions.
2378		- if ( ! $args['conf_method'] ) {
2379		- // Use default message.
2380		- FrmOnSubmitHelper::populate_on_submit_data( $args['form']->options );
2381		- self::run_success_action( $args );
2382		- } elseif ( 1 === count( $args['conf_method'] ) ) {
2383		- FrmOnSubmitHelper::populate_on_submit_data( $args['form']->options, reset( $args['conf_method'] ) );
2384		- $args['conf_method'] = $args['form']->options['success_action'];
2385		- self::run_success_action( $args );
2386		- } else {
2387		- self::run_multi_on_submit_actions( $args );
2388		- }
2389		- }
2390		-
2391		- /**
2392		- * Runs multiple success actions.
2393		- *
2394		- * @since 6.0
2395		- *
2396		- * @param array $args See {@see FrmFormsController::run_success_action()}.
2397		- */
2398		- public static function run_multi_on_submit_actions( $args ) {
2399		- $redirect_action = null;
2400		- foreach ( $args['conf_method'] as $action ) {
2401		- if ( 'redirect' === FrmOnSubmitHelper::get_action_type( $action ) ) {
2402		- // We catch the redirect action to run it last.
2403		- $redirect_action = $action;
2404		- continue;
2405		- }
2406		-
2407		- self::run_single_on_submit_action( $args, $action );
2408		-
2409		- unset( $action );
2410		- }
2411		-
2412		- if ( $redirect_action ) {
2413		- // Show script to delay the redirection.
2414		- $args['force_delay_redirect'] = true;
2415		- self::run_single_on_submit_action( $args, $redirect_action );
2416		- }
2417		- }
2418		-
2419		- /**
2420		- * Runs single On Submit action.
2421		- *
2422		- * @since 6.0
2423		- *
2424		- * @param array $args See {@see FrmFormsController::run_success_action()}.
2425		- * @param object $action On Submit action object.
2426		- */
2427		- public static function run_single_on_submit_action( $args, $action ) {
2428		- $new_args = self::get_run_success_action_args( $args, $action );
2429		- self::run_success_action( $new_args );
2430		- }
2431		-
2432		- /**
2433		- * Gets run_success_action() args from the On Submit action.
2434		- *
2435		- * @since 6.0
2436		- *
2437		- * @param array $args See {@see FrmFormsController::run_success_action()}.
2438		- * @param object $action On Submit action object.
2439		- * @return array
2440		- */
2441		- private static function get_run_success_action_args( $args, $action ) {
2442		- $new_args = $args;
2443		-
2444		- FrmOnSubmitHelper::populate_on_submit_data( $new_args['form']->options, $action, $args['action'] );
2445		-
2446		- $opt = 'update' === $args['action'] ? 'edit_' : 'success_';
2447		-
2448		- $new_args['conf_method'] = $new_args['form']->options[ $opt . 'action' ];
2449		-
2450		- /**
2451		- * Filters the run success action args.
2452		- *
2453		- * @since 6.0
2454		- *
2455		- * @param array $new_args The new args.
2456		- * @param array $args The old args. See {@see FrmFormsController::run_success_action()}.
2457		- * @param object $action On Submit action object.
2458		- */
2459		- return apply_filters( 'frm_get_run_success_action_args', $new_args, $args, $action );
2460		- }
2461		-
2462		- /**
2463	1559	* @since 3.0
2464	1560	*/
2465	1561	private static function load_page_after_submit( $args ) {
2466	1562	global $post;
		@@ -2465,26 +1561,13 @@
2465	1561	private static function load_page_after_submit( $args ) {
2466	1562	global $post;
2467	1563	$opt = $args['success_opt'];
2468	1564	if ( ! $post || $args['form']->options[ $opt . '_page_id' ] != $post->ID ) {
2469		- $page = get_post( $args['form']->options[ $opt . '_page_id' ] );
	1565	+ $page = get_post( $args['form']->options[ $opt . '_page_id' ] );
2470	1566	$old_post = $post;
2471		- $post = $page;
2472		- $content = apply_filters( 'frm_content', $page->post_content, $args['form'], $args['entry_id'] );
2473		-
2474		- // Fix the On Submit page content doesn't show when previewing In theme.
2475		- $has_preview_filter = has_filter( 'the_content', 'FrmFormsController::preview_content' );
2476		-
2477		- if ( $has_preview_filter ) {
2478		- remove_filter( 'the_content', 'FrmFormsController::preview_content', 9999 );
2479		- }
2480		-
2481		- echo apply_filters( 'the_content', $content ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
2482		-
2483		- if ( $has_preview_filter ) {
2484		- add_filter( 'the_content', 'FrmFormsController::preview_content', 9999 );
2485		- }
2486		-
	1567	+ $post = $page;
	1568	+ $content = apply_filters( 'frm_content', $page->post_content, $args['form'], $args['entry_id'] );
	1569	+ echo apply_filters( 'the_content', $content ); // WPCS: XSS ok.
2487	1570	$post = $old_post;
2488	1571	}
2489	1572	}
2490	1573
		@@ -2489,18 +1572,23 @@
2489	1572	}
2490	1573
2491	1574	/**
2492	1575	* @since 3.0
2493		- * @param array $args See {@see FrmFormsController::run_success_action()}.
2494	1576	*/
2495	1577	private static function redirect_after_submit( $args ) {
	1578	+ global $frm_vars;
	1579	+
2496	1580	add_filter( 'frm_use_wpautop', '__return_false' );
2497	1581
2498		- $opt = $args['success_opt'];
	1582	+ $opt = $args['success_opt'];
2499	1583	$success_url = trim( $args['form']->options[ $opt . '_url' ] );
2500	1584	$success_url = apply_filters( 'frm_content', $success_url, $args['form'], $args['entry_id'] );
2501	1585	$success_url = do_shortcode( $success_url );
2502	1586
	1587	+ $success_msg = isset( $args['form']->options[ $opt . '_msg' ] ) ? $args['form']->options[ $opt . '_msg' ] : __( 'Please wait while you are redirected.', 'formidable' );
	1588	+
	1589	+ $redirect_msg = self::get_redirect_message( $success_url, $success_msg, $args );
	1590	+
2503	1591	$args['id'] = $args['entry_id'];
2504	1592	FrmEntriesController::delete_entry_before_redirect( $success_url, $args['form'], $args );
2505	1593
2506	1594	add_filter( 'frm_redirect_url', 'FrmEntriesController::prepare_redirect_url' );
		@@ -2507,66 +1595,30 @@
2507	1595	$success_url = apply_filters( 'frm_redirect_url', $success_url, $args['form'], $args );
2508	1596
2509	1597	$doing_ajax = FrmAppHelper::doing_ajax();
2510	1598
2511		- if ( ! empty( $args['ajax'] ) && $doing_ajax && empty( $args['force_delay_redirect'] ) ) { // Is AJAX submit and there is just one Redirect action runs.
	1599	+ if ( isset( $args['ajax'] ) && $args['ajax'] && $doing_ajax ) {
2512	1600	echo json_encode( array( 'redirect' => $success_url ) );
2513	1601	wp_die();
2514		- }
2515		-
2516		- if ( ! headers_sent() && empty( $args['force_delay_redirect'] ) ) { // Not AJAX submit, no headers sent, and there is just one Redirect action runs.
	1602	+ } elseif ( ! headers_sent() ) {
2517	1603	wp_redirect( esc_url_raw( $success_url ) );
2518	1604	die(); // do not use wp_die or redirect fails
2519		- }
	1605	+ } else {
	1606	+ add_filter( 'frm_use_wpautop', '__return_true' );
2520	1607
2521		- // Redirect with a delay.
2522		- self::redirect_after_submit_using_js( $args + compact( 'success_url', 'doing_ajax' ) );
2523		- }
2524		-
2525		- /**
2526		- * Redirects after submitting using JS. This is used when showing message before redirecting.
2527		- *
2528		- * @since 6.0
2529		- *
2530		- * @param array $args See {@see FrmFormsController::run_success_action()}.
2531		- */
2532		- private static function redirect_after_submit_using_js( $args ) {
2533		- $success_msg = FrmOnSubmitHelper::get_default_redirect_msg();
2534		- $redirect_msg = self::get_redirect_message( $args['success_url'], $success_msg, $args );
2535		-
2536		- /**
2537		- * Filters the delay time before redirecting when On Submit Redirect action is delayed.
2538		- *
2539		- * @since 6.0
2540		- *
2541		- * @param int $delay_time Delay time in miliseconds.
2542		- */
2543		- $delay_time = apply_filters( 'frm_redirect_delay_time', 8000 );
2544		-
2545		- add_filter( 'frm_use_wpautop', '__return_true' );
2546		-
2547		- echo FrmAppHelper::maybe_kses( $redirect_msg ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
2548		- echo '<script>';
2549		- if ( empty( $args['doing_ajax'] ) ) { // Not AJAX submit, delay JS until window.load.
2550		- echo 'window.onload=function(){';
	1608	+ echo $redirect_msg; // WPCS: XSS ok.
	1609	+ echo "<script type='text/javascript'>window.onload = function(){setTimeout(window.location='" . esc_url_raw( $success_url ) . "', 8000);}</script>";
2551	1610	}
2552		- echo 'setTimeout(function(){window.location="' . esc_url_raw( $args['success_url'] ) . '";}, ' . intval( $delay_time ) . ');';
2553		- if ( empty( $args['doing_ajax'] ) ) {
2554		- echo '};';
2555		- }
2556		- echo '</script>';
2557	1611	}
2558	1612
2559	1613	/**
2560	1614	* @since 3.0
2561		- *
2562	1615	* @param string $success_url
2563	1616	* @param string $success_msg
2564	1617	* @param array $args
2565	1618	*/
2566	1619	private static function get_redirect_message( $success_url, $success_msg, $args ) {
2567		- $redirect_msg = '<div class="' . esc_attr( FrmFormsHelper::get_form_style_class( $args['form'] ) ) . '"><div class="frm-redirect-msg" role="status">' . $success_msg . '<br/>' .
2568		- /* translators: %1$s: Start link HTML, %2$s: End link HTML */
	1620	+ $redirect_msg = '<div class="' . esc_attr( FrmFormsHelper::get_form_style_class( $args['form'] ) ) . '"><div class="frm-redirect-msg frm_message">' . $success_msg . '<br/>' .
2569	1621	sprintf( __( '%1$sClick here%2$s if you are not automatically redirected.', 'formidable' ), '<a href="' . esc_url( $success_url ) . '">', '</a>' ) .
2570	1622	'</div></div>';
2571	1623
2572	1624	$redirect_args = array(
		@@ -2573,9 +1625,8 @@
2573	1625	'entry_id' => $args['entry_id'],
2574	1626	'form_id' => $args['form']->id,
2575	1627	'form' => $args['form'],
2576	1628	);
2577		-
2578	1629	return apply_filters( 'frm_redirect_msg', $redirect_msg, $redirect_args );
2579	1630	}
2580	1631
2581	1632	/**
		@@ -2583,22 +1634,12 @@
2583	1634	*
2584	1635	* @since 2.05
2585	1636	*/
2586	1637	public static function show_message_after_save( $atts ) {
2587		- $atts['message'] = self::prepare_submit_message( $atts['form'], $atts['entry_id'], $atts );
	1638	+ $atts['message'] = self::prepare_submit_message( $atts['form'], $atts['entry_id'] );
2588	1639
2589	1640	if ( ! isset( $atts['form']->options['show_form'] ) || $atts['form']->options['show_form'] ) {
2590		- if ( isset( $atts['action'] ) && 'update' === $atts['action'] && is_callable( array( 'FrmProEntriesController', 'show_front_end_form_with_entry' ) ) ) {
2591		- $entry = FrmEntry::getOne( $atts['entry_id'] );
2592		- if ( $entry ) {
2593		- // This is copied from the Pro plugin.
2594		- $atts['conf_message'] = FrmProEntriesController::confirmation( 'message', $atts['form'], $atts['form']->options, $entry->id, $atts );
2595		- $atts['show_form'] = FrmProEntriesController::is_form_displayed_after_edit( $atts['form'] );
2596		- FrmProEntriesController::show_front_end_form_with_entry( $entry, $atts );
2597		- }
2598		- } else {
2599		- self::show_form_after_submit( $atts );
2600		- }
	1641	+ self::show_form_after_submit( $atts );
2601	1642	} else {
2602	1643	self::show_lone_success_messsage( $atts );
2603	1644	}
2604	1645	}
		@@ -2610,18 +1651,16 @@
2610	1651	*/
2611	1652	private static function show_form_after_submit( $args ) {
2612	1653	self::fill_atts_for_form_display( $args );
2613	1654
2614		- $errors = $args['errors'];
2615		- $message = $args['message'];
2616		- $form = $args['form'];
2617		- $title = $args['title'];
	1655	+ $errors = $args['errors'];
	1656	+ $message = $args['message'];
	1657	+ $form = $args['form'];
	1658	+ $title = $args['title'];
2618	1659	$description = $args['description'];
2619	1660
2620	1661	if ( empty( $args['fields'] ) ) {
2621		- $values = array(
2622		- 'custom_style' => FrmAppHelper::custom_style_value( array() ),
2623		- );
	1662	+ $values = array();
2624	1663	} else {
2625	1664	$values = FrmEntriesHelper::setup_new_vars( $args['fields'], $form, $args['reset'] );
2626	1665	}
2627	1666	unset( $args );
		@@ -2628,66 +1667,29 @@
2628	1667
2629	1668	$include_form_tag = apply_filters( 'frm_include_form_tag', true, $form );
2630	1669
2631	1670	$frm_settings = FrmAppHelper::get_settings();
2632		- $submit = isset( $form->options['submit_value'] ) ? $form->options['submit_value'] : $frm_settings->submit_value;
	1671	+ $submit = isset( $form->options['submit_value'] ) ? $form->options['submit_value'] : $frm_settings->submit_value;
2633	1672
2634		- global $frm_vars;
2635		- self::maybe_load_css( $form, $values['custom_style'], $frm_vars['load_css'] );
2636		-
2637		- $message_placement = self::message_placement( $form, $message );
2638		-
2639		- include FrmAppHelper::plugin_path() . '/classes/views/frm-entries/new.php';
	1673	+ include( FrmAppHelper::plugin_path() . '/classes/views/frm-entries/new.php' );
2640	1674	}
2641	1675
2642	1676	/**
2643		- * @return string - 'before', 'after', or 'submit'
2644		- *
2645		- * @since 4.05.02
2646		- */
2647		- private static function message_placement( $form, $message ) {
2648		- $place = 'before';
2649		-
2650		- if ( $message && isset( $form->options['form_class'] ) ) {
2651		- if ( strpos( $form->options['form_class'], 'frm_below_success' ) !== false ) {
2652		- $place = 'after';
2653		- } elseif ( strpos( $form->options['form_class'], 'frm_inline_success' ) !== false ) {
2654		- $place = 'submit';
2655		- }
2656		- }
2657		-
2658		- /**
2659		- * @return string - 'before' or 'after'
2660		- *
2661		- * @since 4.05.02
2662		- */
2663		- return apply_filters( 'frm_message_placement', $place, compact( 'form', 'message' ) );
2664		- }
2665		-
2666		- /**
2667	1677	* Get all the values needed on the new.php entry page
2668	1678	*
2669	1679	* @since 2.05
2670	1680	*/
2671	1681	private static function fill_atts_for_form_display( &$args ) {
2672		- if ( ! isset( $args['title'] ) && isset( $args['show_title'] ) ) {
2673		- $args['title'] = $args['show_title'];
2674		- }
2675		-
2676		- if ( ! isset( $args['description'] ) && isset( $args['show_description'] ) ) {
2677		- $args['description'] = $args['show_description'];
2678		- }
2679		-
2680	1682	$defaults = array(
2681		- 'errors' => array(),
2682		- 'message' => '',
2683		- 'fields' => array(),
2684		- 'form' => array(),
2685		- 'title' => true,
	1683	+ 'errors' => array(),
	1684	+ 'message' => '',
	1685	+ 'fields' => array(),
	1686	+ 'form' => array(),
	1687	+ 'title' => true,
2686	1688	'description' => false,
2687		- 'reset' => false,
	1689	+ 'reset' => false,
2688	1690	);
2689		- $args = wp_parse_args( $args, $defaults );
	1691	+ $args = wp_parse_args( $args, $defaults );
2690	1692	}
2691	1693
2692	1694	/**
2693	1695	* Show the success message without the form
		@@ -2699,11 +1701,10 @@
2699	1701	$values = FrmEntriesHelper::setup_new_vars( $atts['fields'], $atts['form'], true );
2700	1702	self::maybe_load_css( $atts['form'], $values['custom_style'], $frm_vars['load_css'] );
2701	1703
2702	1704	$include_extra_container = 'frm_forms' . FrmFormsHelper::get_form_style_class( $values );
2703		-
2704		- $errors = array();
2705		- $form = $atts['form'];
	1705	+ $errors = array();
	1706	+ $form = $atts['form'];
2706	1707	$message = $atts['message'];
2707	1708
2708	1709	include( FrmAppHelper::plugin_path() . '/classes/views/frm-entries/errors.php' );
2709	1710	}
		@@ -2711,38 +1712,27 @@
2711	1712	/**
2712	1713	* Prepare the success message before it's shown
2713	1714	*
2714	1715	* @since 2.05
2715		- * @since 6.0.x Added the third parameter.
2716		- *
2717		- * @param object $form Form object.
2718		- * @param int $entry_id Entry ID.
2719		- * @param array $args See {@see FrmFormsController::run_success_action()}.
2720		- * @return string
2721	1716	*/
2722		- private static function prepare_submit_message( $form, $entry_id, $args = array() ) {
	1717	+ private static function prepare_submit_message( $form, $entry_id ) {
2723	1718	$frm_settings = FrmAppHelper::get_settings( array( 'current_form' => $form->id ) );
2724		- $opt = isset( $args['success_opt'] ) ? $args['success_opt'] : 'success';
2725	1719
2726	1720	if ( $entry_id && is_numeric( $entry_id ) ) {
2727		- $message = isset( $form->options[ $opt . '_msg' ] ) ? $form->options[ $opt . '_msg' ] : $frm_settings->success_msg;
2728		- $class = 'frm_message';
	1721	+ $message = isset( $form->options['success_msg'] ) ? $form->options['success_msg'] : $frm_settings->success_msg;
	1722	+ $class = 'frm_message';
2729	1723	} else {
2730	1724	$message = $frm_settings->failed_msg;
2731		- $class = FrmFormsHelper::form_error_class();
	1725	+ $class = FrmFormsHelper::form_error_class();
2732	1726	}
2733	1727
2734	1728	$message = FrmFormsHelper::get_success_message( compact( 'message', 'form', 'entry_id', 'class' ) );
2735		-
2736	1729	return apply_filters( 'frm_main_feedback', $message, $form, $entry_id );
2737	1730	}
2738	1731
2739		- /**
2740		- * @return void
2741		- */
2742	1732	public static function front_head() {
2743	1733	$version = FrmAppHelper::plugin_version();
2744		- $suffix = FrmAppHelper::js_suffix();
	1734	+ $suffix = FrmAppHelper::js_suffix();
2745	1735
2746	1736	if ( ! empty( $suffix ) && self::has_combo_js_file() ) {
2747	1737	wp_register_script( 'formidable', FrmAppHelper::plugin_url() . '/js/frm.min.js', array( 'jquery' ), $version, true );
2748	1738	} else {
		@@ -2769,58 +1759,20 @@
2769	1759
2770	1760	public static function maybe_load_css( $form, $this_load, $global_load ) {
2771	1761	$load_css = FrmForm::is_form_loaded( $form, $this_load, $global_load );
2772	1762
2773		- if ( ! $load_css ) {
2774		- return;
	1763	+ if ( $load_css ) {
	1764	+ global $frm_vars;
	1765	+ self::footer_js( 'header' );
	1766	+ $frm_vars['css_loaded'] = true;
2775	1767	}
2776		-
2777		- global $frm_vars;
2778		- self::footer_js( 'header' );
2779		- $frm_vars['css_loaded'] = true;
2780		-
2781		- self::load_late_css();
2782	1768	}
2783	1769
2784		- /**
2785		- * If css is loaded only on applicable pages, include it before the form loads
2786		- * to prevent a flash of unstyled form.
2787		- *
2788		- * @since 4.01
2789		- *
2790		- * @return void
2791		- */
2792		- private static function load_late_css() {
2793		- $frm_settings = FrmAppHelper::get_settings();
2794		- $late_css = $frm_settings->load_style === 'dynamic';
2795		-
2796		- if ( ! $late_css || ! self::should_load_late() ) {
2797		- return;
2798		- }
2799		-
2800		- global $wp_styles;
2801		- if ( is_array( $wp_styles->queue ) && in_array( 'formidable', $wp_styles->queue, true ) ) {
2802		- wp_print_styles( 'formidable' );
2803		- }
2804		- }
2805		-
2806		- /**
2807		- * Avoid late load if All in One SEO is active because it prevents CSS from loading entirely.
2808		- *
2809		- * @since 5.2.03
2810		- *
2811		- * @return bool
2812		- */
2813		- private static function should_load_late() {
2814		- return ! function_exists( 'aioseo' );
2815		- }
2816		-
2817	1770	public static function defer_script_loading( $tag, $handle ) {
2818		- if ( 'captcha-api' == $handle && ! strpos( $tag, 'defer' ) ) {
2819		- $tag = str_replace( ' src', ' defer="defer" async="async" src', $tag );
	1771	+ if ( 'recaptcha-api' == $handle && ! strpos( $tag, 'defer' ) ) {
	1772	+ $tag = str_replace( ' src', ' defer="defer" async="async" src', $tag );
2820	1773	}
2821		-
2822		- return $tag;
	1774	+ return $tag;
2823	1775	}
2824	1776
2825	1777	public static function footer_js( $location = 'footer' ) {
2826	1778	global $frm_vars;
		@@ -2827,9 +1779,9 @@
2827	1779
2828	1780	FrmStylesController::enqueue_css();
2829	1781
2830	1782	if ( ! FrmAppHelper::is_admin() && $location != 'header' && ! empty( $frm_vars['forms_loaded'] ) ) {
2831		- // load formidable js
	1783	+ //load formidable js
2832	1784	wp_enqueue_script( 'formidable' );
2833	1785	}
2834	1786	}
2835	1787
		@@ -2851,145 +1803,29 @@
2851	1803	return isset( $atts['minimize'] ) && ! empty( $atts['minimize'] );
2852	1804	}
2853	1805
2854	1806	/**
2855		- * @since 5.0.16
2856		- *
2857		- * @return void
	1807	+ * @deprecated 1.07.05
	1808	+ * @codeCoverageIgnore
2858	1809	*/
2859		- public static function landing_page_preview_option() {
2860		- $dir = apply_filters( 'frm_landing_page_preview_option', false );
2861		- if ( false === $dir || ! file_exists( $dir . 'landing-page-preview-option.php' ) ) {
2862		- $dir = self::get_form_views_path();
2863		- }
2864		- include $dir . 'landing-page-preview-option.php';
	1810	+ public static function add_default_templates( $path, $default = true, $template = true ) {
	1811	+ FrmDeprecated::add_default_templates( $path, $default, $template );
2865	1812	}
2866	1813
2867	1814	/**
2868		- * @since 5.0.16
2869		- *
2870		- * @return string
	1815	+ * @deprecated 3.0
	1816	+ * @codeCoverageIgnore
2871	1817	*/
2872		- private static function get_form_views_path() {
2873		- return FrmAppHelper::plugin_path() . '/classes/views/frm-forms/';
	1818	+ public static function bulk_create_template( $ids ) {
	1819	+ return FrmDeprecated::bulk_create_template( $ids );
2874	1820	}
2875	1821
2876	1822	/**
2877		- * Create a page with an embedded formidable Gutenberg block.
2878		- *
2879		- * @since 5.2
2880		- *
2881		- * @return never
2882		- */
2883		- public static function create_page_with_shortcode() {
2884		- if ( ! current_user_can( 'publish_posts' ) ) {
2885		- die( 0 );
2886		- }
2887		-
2888		- check_ajax_referer( 'frm_ajax', 'nonce' );
2889		-
2890		- $type = FrmAppHelper::get_post_param( 'type', '', 'sanitize_text_field' );
2891		- if ( ! $type || ! in_array( $type, array( 'form', 'view' ), true ) ) {
2892		- die( 0 );
2893		- }
2894		-
2895		- $object_id = FrmAppHelper::get_post_param( 'object_id', '', 'absint' );
2896		- if ( ! $object_id ) {
2897		- die( 0 );
2898		- }
2899		-
2900		- $postarr = array( 'post_type' => 'page' );
2901		-
2902		- if ( 'form' === $type ) {
2903		- $postarr['post_content'] = self::get_page_shortcode_content_for_form( $object_id );
2904		- } else {
2905		- $postarr['post_content'] = apply_filters( 'frm_create_page_with_' . $type . '_shortcode_content', '', $object_id );
2906		- }
2907		-
2908		- $name = FrmAppHelper::get_post_param( 'name', '', 'sanitize_text_field' );
2909		- if ( $name ) {
2910		- $postarr['post_title'] = $name;
2911		- }
2912		-
2913		- $success = wp_insert_post( $postarr );
2914		- if ( ! is_numeric( $success ) || ! $success ) {
2915		- die( 0 );
2916		- }
2917		-
2918		- wp_send_json(
2919		- array(
2920		- 'redirect' => get_edit_post_link( $success, 'redirect' ),
2921		- )
2922		- );
2923		- }
2924		-
2925		- /**
2926		- * @since 5.3
2927		- *
2928		- * @param string $content
2929		- * @param int $form_id
2930		- * @return string
2931		- */
2932		- private static function get_page_shortcode_content_for_form( $form_id ) {
2933		- $shortcode = '[formidable id="' . $form_id . '"]';
2934		- $html_comment_start = '<!-- wp:formidable/simple-form {"formId":"' . $form_id . '"} -->';
2935		- $html_comment_end = '<!-- /wp:formidable/simple-form -->';
2936		- return $html_comment_start . '<div>' . $shortcode . '</div>' . $html_comment_end;
2937		- }
2938		-
2939		- /**
2940		- * Get page dropdown for AJAX request for embedding form in an existing page.
2941		- *
2942		- * @return never
2943		- */
2944		- public static function get_page_dropdown() {
2945		- if ( ! current_user_can( 'publish_posts' ) ) {
2946		- die( 0 );
2947		- }
2948		-
2949		- check_ajax_referer( 'frm_ajax', 'nonce' );
2950		-
2951		- $html = FrmAppHelper::clip(
2952		- function() {
2953		- FrmAppHelper::maybe_autocomplete_pages_options(
2954		- array(
2955		- 'field_name' => 'frm_page_dropdown',
2956		- 'page_id' => '',
2957		- 'placeholder' => __( 'Select a Page', 'formidable' ),
2958		- )
2959		- );
2960		- }
2961		- );
2962		- $post_type_object = get_post_type_object( 'page' );
2963		- wp_send_json(
2964		- array(
2965		- 'html' => $html,
2966		- 'edit_page_url' => admin_url( sprintf( $post_type_object->_edit_link . '&action=edit', 0 ) ),
2967		- )
2968		- );
2969		- }
2970		-
2971		- /**
2972		- * @deprecated 4.0
2973		- */
2974		- public static function new_form( $values = array() ) {
2975		- FrmDeprecated::new_form( $values );
2976		- }
2977		-
2978		- /**
2979		- * @deprecated 4.0
2980		- */
2981		- public static function create( $values = array() ) {
2982		- _deprecated_function( __METHOD__, '4.0', 'FrmFormsController::update' );
2983		- self::update( $values );
2984		- }
2985		-
2986		- /**
2987		- * @deprecated 3.0
	1823	+ * @deprecated 2.03
2988	1824	* @codeCoverageIgnore
2989	1825	*/
2990		- public static function bulk_create_template( $ids ) {
2991		- return FrmDeprecated::bulk_create_template( $ids );
	1826	+ public static function register_pro_scripts() {
	1827	+ FrmDeprecated::register_pro_scripts();
2992	1828	}
2993	1829
2994	1830	/**
2995	1831	* @deprecated 3.0
		@@ -3004,14 +1840,6 @@
3004	1840	* @codeCoverageIgnore
3005	1841	*/
3006	1842	public static function edit_description() {
3007	1843	FrmDeprecated::edit_description();
3008		- }
3009		-
3010		- /**
3011		- * @deprecated 4.08
3012		- * @since 3.06
3013		- */
3014		- public static function add_new() {
3015		- _deprecated_function( __FUNCTION__, '4.08' );
3016	1844	}
3017	1845	}