← All changes | classes/controllers/FrmSettingsController.php +52 -133 6.25 → 6.7.2 View file →

		@@ -4,17 +4,8 @@
4	4	}
5	5
6	6	class FrmSettingsController {
7	7
8		- /**
9		- * Payments sections are removed from the top level and added to a payments section.
10		- *
11		- * @since 6.22.1
12		- *
13		- * @var array
14		- */
15		- private static $removed_payments_sections = array();
16		-
17	8	public static function menu() {
18	9	// Make sure admins can see the menu items
19	10	FrmAppHelper::force_capability( 'frm_change_settings' );
20	11
		@@ -29,9 +20,9 @@
29	20	public static function license_box() {
30	21	if ( ! current_user_can( 'activate_plugins' ) ) {
31	22	return;
32	23	}
33		- include FrmAppHelper::plugin_path() . '/classes/views/frm-settings/license_box.php';
	24	+ include( FrmAppHelper::plugin_path() . '/classes/views/frm-settings/license_box.php' );
34	25	}
35	26
36	27	public static function display_form( $errors = array(), $message = '' ) {
37	28	global $frm_vars;
		@@ -43,13 +34,9 @@
43	34
44	35	$sections = self::get_settings_tabs();
45	36	$current = FrmAppHelper::simple_get( 't', 'sanitize_title', 'general_settings' );
46	37
47		- if ( in_array( $current, array( 'stripe_settings', 'square_settings', 'authorize_net_settings', 'paypal_settings' ), true ) ) {
48		- $current = 'payments_settings';
49		- }
50		-
51		- require FrmAppHelper::plugin_path() . '/classes/views/frm-settings/form.php';
	38	+ require( FrmAppHelper::plugin_path() . '/classes/views/frm-settings/form.php' );
52	39	}
53	40
54	41	/**
55	42	* Get sections to use for Global Settings.
		@@ -57,33 +44,27 @@
57	44	* @return array<array>
58	45	*/
59	46	private static function get_settings_tabs() {
60	47	$sections = array(
61		- 'general' => array(
62		- 'class' => self::class,
	48	+ 'general' => array(
	49	+ 'class' => __CLASS__,
63	50	'function' => 'general_settings',
64	51	'name' => __( 'General Settings', 'formidable' ),
65	52	'icon' => 'frm_icon_font frm_settings_icon',
66	53	),
67		- 'messages' => array(
68		- 'class' => self::class,
	54	+ 'messages' => array(
	55	+ 'class' => __CLASS__,
69	56	'function' => 'message_settings',
70	57	'name' => __( 'Message Defaults', 'formidable' ),
71	58	'icon' => 'frm_icon_font frm_stamp_icon',
72	59	),
73		- 'permissions' => array(
74		- 'class' => self::class,
	60	+ 'permissions' => array(
	61	+ 'class' => __CLASS__,
75	62	'function' => 'permission_settings',
76	63	'name' => __( 'Permissions', 'formidable' ),
77	64	'icon' => 'frm_icon_font frm_lock_icon',
78	65	),
79		- 'payments' => array(
80		- 'name' => __( 'Payments', 'formidable' ),
81		- 'icon' => 'frm_icon_font frm_simple_cc_icon',
82		- 'class' => self::class,
83		- 'function' => 'payments_settings',
84		- ),
85		- 'custom_css' => array(
	66	+ 'custom_css' => array(
86	67	'class' => 'FrmStylesController',
87	68	'function' => 'custom_css',
88	69	'name' => __( 'Custom CSS', 'formidable' ),
89	70	'icon' => 'frm_icon_font frm_code_icon',
		@@ -93,21 +74,15 @@
93	74	'function' => 'manage',
94	75	'name' => __( 'Manage Styles', 'formidable' ),
95	76	'icon' => 'frm_icon_font frm_pallet_icon',
96	77	),
97		- 'captcha' => array(
98		- 'class' => self::class,
	78	+ 'captcha' => array(
	79	+ 'class' => __CLASS__,
99	80	'function' => 'captcha_settings',
100		- 'name' => __( 'Captcha/Spam', 'formidable' ),
	81	+ 'name' => __( 'Captcha', 'formidable' ),
101	82	'icon' => 'frm_icon_font frm_shield_check_icon',
102	83	),
103		- 'email' => array(
104		- 'class' => self::class,
105		- 'function' => 'email_settings',
106		- 'name' => __( 'Email', 'formidable' ),
107		- 'icon' => 'frm_icon_font frm_email_icon',
108		- ),
109		- 'white_label' => array(
	84	+ 'white_label' => array(
110	85	'name' => __( 'White Labeling', 'formidable' ),
111	86	'icon' => 'frm_icon_font frm_ghost_icon',
112	87	'html_class' => 'frm_show_upgrade_tab frm_noallow',
113	88	'data' => array(
		@@ -115,9 +90,9 @@
115	90	'upgrade' => __( 'White labeling options', 'formidable' ),
116	91	'screenshot' => 'white-label.png',
117	92	),
118	93	),
119		- 'inbox' => array(
	94	+ 'inbox' => array(
120	95	'name' => __( 'Inbox', 'formidable' ),
121	96	'icon' => 'frm_icon_font frm_email_icon',
122	97	'html_class' => 'frm_show_upgrade_tab frm_noallow',
123	98	'data' => array(
		@@ -153,14 +128,13 @@
153	128	/**
154	129	* @param array<array> $sections
155	130	*/
156	131	$sections = apply_filters( 'frm_add_settings_section', $sections );
157		- self::remove_payments_sections( $sections );
158	132
159	133	$sections['misc'] = array(
160	134	'name' => __( 'Miscellaneous', 'formidable' ),
161	135	'icon' => 'frm_icon_font frm_shuffle_icon',
162		- 'class' => self::class,
	136	+ 'class' => __CLASS__,
163	137	'function' => 'misc_settings',
164	138	);
165	139
166	140	foreach ( $sections as $key => $section ) {
		@@ -189,49 +163,8 @@
189	163
190	164	return $sections;
191	165	}
192	166
193		- /**
194		- * Remove the payments sections (PayPal, Square, Stripe, Authorize.Net)
195		- * and show them all on the payments section in separate tabs.
196		- *
197		- * @since 6.22.1
198		- *
199		- * @param array $sections
200		- * @return void
201		- */
202		- private static function remove_payments_sections( &$sections ) {
203		- $payment_section_keys = array( 'paypal', 'square', 'stripe', 'authorize_net' );
204		-
205		- foreach ( $sections as $key => $section ) {
206		- if ( in_array( $key, $payment_section_keys, true ) ) {
207		- self::$removed_payments_sections[ $key ] = $section;
208		- unset( $sections[ $key ] );
209		- }
210		- }
211		-
212		- uksort( self::$removed_payments_sections, array( self::class, 'payment_sections_sort_callback' ) );
213		- }
214		-
215		- /**
216		- * Sort the payments sections (PayPal, Square, Stripe, Authorize.Net)
217		- *
218		- * @since 6.22.1
219		- *
220		- * @param string $a
221		- * @param string $b
222		- * @return int
223		- */
224		- private static function payment_sections_sort_callback( $a, $b ) {
225		- $order = array( 'stripe', 'square', 'paypal', 'authorize_net' );
226		- $first_key = array_search( $a, $order );
227		- $second_key = array_search( $b, $order );
228		- if ( false === $first_key || false === $second_key ) {
229		- return 0;
230		- }
231		- return $first_key - $second_key;
232		- }
233		-
234	167	public static function load_settings_tab() {
235	168	FrmAppHelper::permission_check( 'frm_change_settings' );
236	169	check_ajax_referer( 'frm_ajax', 'nonce' );
237	170
		@@ -245,9 +178,9 @@
245	178
246	179	if ( isset( $section['class'] ) ) {
247	180	call_user_func( array( $section['class'], $section['function'] ) );
248	181	} else {
249		- call_user_func( ( $section['function'] ?? $section ) );
	182	+ call_user_func( ( isset( $section['function'] ) ? $section['function'] : $section ) );
250	183	}
251	184	wp_die();
252	185	}
253	186
		@@ -273,10 +206,11 @@
273	206	* @param string $more_html
274	207	* @return void
275	208	*/
276	209	public static function maybe_render_currency_selector( $frm_settings, $more_html ) {
277		- if ( is_callable( 'FrmProSettingsController::add_currency_settings' ) ) {
278		- FrmProSettingsController::add_currency_settings();
	210	+ if ( false !== strpos( $more_html, 'id="frm_currency"' ) ) {
	211	+ // Avoid rendering the Currency setting if it gets rendered from the frm_settings_form hook.
	212	+ // This is for backward compatibility. If Pro is outdated there won't be two currency dropdowns.
279	213	return;
280	214	}
281	215
282	216	$currencies = FrmCurrencyHelper::get_currencies();
		@@ -288,9 +222,9 @@
288	222	*/
289	223	public static function message_settings() {
290	224	$frm_settings = FrmAppHelper::get_settings();
291	225
292		- include FrmAppHelper::plugin_path() . '/classes/views/frm-settings/messages.php';
	226	+ include( FrmAppHelper::plugin_path() . '/classes/views/frm-settings/messages.php' );
293	227	}
294	228
295	229	/**
296	230	* @since 4.0
		@@ -298,23 +232,12 @@
298	232	public static function captcha_settings() {
299	233	$frm_settings = FrmAppHelper::get_settings();
300	234	$captcha_lang = FrmAppHelper::locales( 'captcha' );
301	235
302		- include FrmAppHelper::plugin_path() . '/classes/views/frm-settings/captcha/captcha.php';
	236	+ include( FrmAppHelper::plugin_path() . '/classes/views/frm-settings/captcha/captcha.php' );
303	237	}
304	238
305	239	/**
306		- * Shows email settings.
307		- *
308		- * @since 6.25
309		- */
310		- public static function email_settings() {
311		- $frm_settings = FrmAppHelper::get_settings();
312		-
313		- include FrmAppHelper::plugin_path() . '/classes/views/frm-settings/email/email-styles.php';
314		- }
315		-
316		- /**
317	240	* @since 4.0
318	241	*/
319	242	public static function permission_settings() {
320	243	$frm_settings = FrmAppHelper::get_settings();
		@@ -319,24 +242,11 @@
319	242	public static function permission_settings() {
320	243	$frm_settings = FrmAppHelper::get_settings();
321	244	$frm_roles = FrmAppHelper::frm_capabilities();
322	245
323		- include FrmAppHelper::plugin_path() . '/classes/views/frm-settings/permissions.php';
	246	+ include( FrmAppHelper::plugin_path() . '/classes/views/frm-settings/permissions.php' );
324	247	}
325	248
326		- public static function payments_settings() {
327		- $payment_sections = self::$removed_payments_sections;
328		-
329		- $tab = FrmAppHelper::simple_get( 't', 'sanitize_title', 'general_settings' );
330		- if ( $tab && in_array( $tab, array( 'stripe_settings', 'square_settings', 'authorize_net_settings', 'paypal_settings' ), true ) ) {
331		- $tab = str_replace( '_settings', '', $tab );
332		- } else {
333		- $tab = 'stripe';
334		- }
335		-
336		- include FrmAppHelper::plugin_path() . '/classes/views/frm-settings/payments.php';
337		- }
338		-
339	249	/**
340	250	* @since 4.0
341	251	*/
342	252	public static function misc_settings() {
		@@ -341,15 +251,15 @@
341	251	*/
342	252	public static function misc_settings() {
343	253	$frm_settings = FrmAppHelper::get_settings();
344	254
345		- include FrmAppHelper::plugin_path() . '/classes/views/frm-settings/misc.php';
	255	+ include( FrmAppHelper::plugin_path() . '/classes/views/frm-settings/misc.php' );
346	256	}
347	257
348	258	/**
349	259	* Save form data submitted from the Global settings page.
350	260	*
351		- * @param bool|string $stop_load
	261	+ * @param string|bool $stop_load
352	262	*
353	263	* @return void
354	264	*/
355	265	public static function process_form( $stop_load = false ) {
		@@ -359,10 +269,10 @@
359	269	$process_form = FrmAppHelper::get_post_param( 'process_form', '', 'sanitize_text_field' );
360	270
361	271	if ( ! wp_verify_nonce( $process_form, 'process_form_nonce' ) ) {
362	272	$error_args = array(
363		- 'title' => __( 'Verification failed', 'formidable' ),
364		- 'body' => $frm_settings->admin_permission,
	273	+ 'title' => __( 'Verification failed', 'formidable' ),
	274	+ 'body' => $frm_settings->admin_permission,
365	275	'cancel_text' => __( 'Cancel', 'formidable' ),
366	276	);
367	277	FrmAppController::show_error_modal( $error_args );
368	278	return;
		@@ -406,9 +316,9 @@
406	316	$action = isset( $_REQUEST['frm_action'] ) ? 'frm_action' : 'action';
407	317	$action = FrmAppHelper::get_param( $action, '', 'get', 'sanitize_title' );
408	318	FrmAppHelper::include_svg();
409	319
410		- if ( $action === 'process-form' ) {
	320	+ if ( $action == 'process-form' ) {
411	321	self::process_form( $stop_load );
412	322	} elseif ( $stop_load != 'stop_load' ) {
413	323	self::display_form();
414	324	}
		@@ -419,13 +329,32 @@
419	329	*
420	330	* @since 3.04.02
421	331	*/
422	332	public static function settings_cta( $view ) {
	333	+
423	334	if ( get_option( 'frm_lite_settings_upgrade', false ) ) {
424	335	return;
425	336	}
426	337
427		- include FrmAppHelper::plugin_path() . '/classes/views/frm-settings/settings_cta.php';
	338	+ $features = array(
	339	+ __( 'Extra form features like file uploads, pagination, etc', 'formidable' ),
	340	+ __( 'Repeaters & cascading fields for advanced forms', 'formidable' ),
	341	+ __( 'Flexibly view, search, edit, and delete entries anywhere', 'formidable' ),
	342	+ __( 'Display entries with virtually limitless Formidable views', 'formidable' ),
	343	+ __( 'Create surveys & polls', 'formidable' ),
	344	+ __( 'WordPress user registration and login forms', 'formidable' ),
	345	+ __( 'Create Stripe, PayPal or Authorize.net payment forms', 'formidable' ),
	346	+ __( 'Powerful conditional logic for smart forms', 'formidable' ),
	347	+ __( 'Integrations with 1000+ marketing & payment services', 'formidable' ),
	348	+ __( 'Collect digital signatures', 'formidable' ),
	349	+ __( 'Accept user-submitted content with Post submissions', 'formidable' ),
	350	+ __( 'Email routing', 'formidable' ),
	351	+ __( 'Create calculator forms', 'formidable' ),
	352	+ __( 'Save draft entries and return later', 'formidable' ),
	353	+ __( 'Analyze form data with graphs & stats', 'formidable' ),
	354	+ );
	355	+
	356	+ include( FrmAppHelper::plugin_path() . '/classes/views/frm-settings/settings_cta.php' );
428	357	}
429	358
430	359	/**
431	360	* Dismiss upgrade notice at the bottom on the plugin settings pages.
		@@ -432,9 +361,8 @@
432	361	*
433	362	* @since 3.04.02
434	363	*/
435	364	public static function settings_cta_dismiss() {
436		- check_ajax_referer( 'frm_ajax', 'nonce' );
437	365	FrmAppHelper::permission_check( 'frm_change_settings' );
438	366
439	367	update_option( 'frm_lite_settings_upgrade', time(), 'no' );
440	368
		@@ -451,9 +379,9 @@
451	379	check_ajax_referer( 'frm_ajax', 'nonce' );
452	380
453	381	global $wpdb;
454	382
455		- $term = FrmAppHelper::get_param( 'term', '', 'get', 'sanitize_text_field' );
	383	+ $term = FrmAppHelper::get_param( 'term', '', 'get', 'sanitize_text_field' );
456	384	$post_type = FrmAppHelper::get_param( 'post_type', 'page', 'get', 'sanitize_text_field' );
457	385
458	386	$where = array(
459	387	'post_status' => 'publish',
		@@ -479,20 +407,11 @@
479	407	wp_send_json( $results );
480	408	}
481	409
482	410	/**
483		- * Shows a fake color picker.
484		- *
485		- * @since 6.25
486		- *
487		- * @param string $color Color value.
	411	+ * @deprecated 6.0 use FrmSettingsController::captcha_settings().
488	412	*/
489		- public static function fake_color_picker( $color ) {
490		- ?>
491		- <div class="wp-picker-container">
492		- <button type="button" class="button wp-color-result" aria-expanded="false" aria-disabled="true" tabindex="-1" style="background-color:<?php echo esc_attr( $color ); ?>;">
493		- <span class="wp-color-result-text" style="color:#a7aaad;"><?php esc_html_e( 'Select Color', 'formidable' ); ?></span>
494		- </button>
495		- </div>
496		- <?php
	413	+ public static function recaptcha_settings() {
	414	+ _deprecated_function( __FUNCTION__, '6.0', 'FrmSettingsController::captcha_settings()' );
	415	+ self::captcha_settings();
497	416	}
498	417	}