← All changes | classes/models/FrmSettings.php +21 -104 6.4 → 5.1 View file →

		@@ -2,9 +2,8 @@
2	2	if ( ! defined( 'ABSPATH' ) ) {
3	3	die( 'You are not allowed to call this page directly.' );
4	4	}
5	5
6		-#[\AllowDynamicProperties]
7	6	class FrmSettings {
8	7	public $option_name = 'frm_options';
9	8	public $menu;
10	9	public $mu_menu;
		@@ -27,11 +26,8 @@
27	26	public $email_to;
28	27	public $load_style;
29	28	public $custom_style;
30	29
31		- public $active_captcha;
32		- public $hcaptcha_pubkey;
33		- public $hcaptcha_privkey;
34	30	public $pubkey;
35	31	public $privkey;
36	32	public $re_lang;
37	33	public $re_type;
		@@ -38,19 +34,11 @@
38	34	public $re_msg;
39	35	public $re_multi;
40	36
41	37	public $no_ips;
42		- public $custom_header_ip;
43	38	public $current_form = 0;
44	39	public $tracking;
45	40
46		- /**
47		- * @since 6.0
48		- *
49		- * @var string|false|null
50		- */
51		- public $custom_css;
52		-
53	41	public function __construct( $args = array() ) {
54	42	if ( ! defined( 'ABSPATH' ) ) {
55	43	die( 'You are not allowed to call this page directly.' );
56	44	}
		@@ -119,26 +107,17 @@
119	107	'failed_msg' => __( 'We\'re sorry. It looks like you\'ve already submitted that.', 'formidable' ),
120	108	'submit_value' => __( 'Submit', 'formidable' ),
121	109	'login_msg' => __( 'You do not have permission to view this form.', 'formidable' ),
122	110	'admin_permission' => __( 'You do not have permission to do that', 'formidable' ),
123		- 'new_tab_msg' => __( 'The page has been opened in a new tab.', 'formidable' ),
124	111
125		- 'email_to' => '[admin_email]',
126		- 'no_ips' => 0,
127		- 'custom_header_ip' => false, // Use false by default. We show a warning when this is unset. Once global settings have been saved, this gets saved
128		- 'tracking' => FrmAppHelper::pro_is_installed(),
129		-
130		- // Normally custom CSS is a string. A false value is used when nothing has been set.
131		- // When it is false, we try to use the old custom_key value from the default style's post_content array.
132		- 'custom_css' => false,
	112	+ 'email_to' => '[admin_email]',
	113	+ 'no_ips' => 0,
	114	+ 'tracking' => FrmAppHelper::pro_is_installed(),
133	115	);
134	116	}
135	117
136		- /**
137		- * @return void
138		- */
139	118	private function set_default_options() {
140		- $this->fill_captcha_settings();
	119	+ $this->fill_recaptcha_settings();
141	120
142	121	if ( ! isset( $this->load_style ) ) {
143	122	if ( ! isset( $this->custom_style ) ) {
144	123	$this->custom_style = true;
		@@ -166,9 +145,8 @@
166	145	}
167	146
168	147	/**
169	148	* @param array $params
170		- * @return void
171	149	*/
172	150	public function fill_with_defaults( $params = array() ) {
173	151	$settings = $this->default_options();
174	152	$filter_html = ! FrmAppHelper::allow_unfiltered_html();
		@@ -173,9 +151,9 @@
173	151	$settings = $this->default_options();
174	152	$filter_html = ! FrmAppHelper::allow_unfiltered_html();
175	153
176	154	if ( $filter_html ) {
177		- $filter_keys = array( 'failed_msg', 'blank_msg', 'invalid_msg', 'admin_permission', 'unique_msg', 'success_msg', 'submit_value', 'login_msg', 'menu' );
	155	+ $filter_keys = array( 'failed_msg', 'blank_msg', 'invalid_msg', 'unique_msg', 'success_msg', 'submit_value', 'login_msg', 'menu' );
178	156	if ( ! empty( $params['additional_filter_keys'] ) ) {
179	157	$filter_keys = array_merge( $filter_keys, $params['additional_filter_keys'] );
180	158	}
181	159	} else {
		@@ -192,54 +170,20 @@
192	170	if ( $setting === 'menu' && empty( $this->{$setting} ) ) {
193	171	$this->{$setting} = $default;
194	172	}
195	173
196		- $this->{$setting} = $this->maybe_sanitize_global_setting( $this->{$setting}, $setting, $filter_keys );
197		- unset( $setting, $default );
198		- }
199		- }
200		-
201		- /**
202		- * Handle sanitizing for a target global setting key.
203		- *
204		- * @since 6.0
205		- *
206		- * @param mixed $value The unsanitized global setting value.
207		- * @param string $key The key of the global setting being saved.
208		- * @param array $filter_keys These keys that are filtered with kses.
209		- * @return mixed
210		- */
211		- private function maybe_sanitize_global_setting( $value, $key, $filter_keys ) {
212		- if ( 'custom_css' === $key ) {
213		- if ( false === $value ) {
214		- // Avoid changing the false default value to an empty string.
215		- return $value;
	174	+ if ( $filter_html && in_array( $setting, $filter_keys, true ) ) {
	175	+ $this->{$setting} = FrmAppHelper::kses( $this->{$setting}, 'all' );
216	176	}
217		- return sanitize_textarea_field( $value );
218		- }
219	177
220		- if ( in_array( $key, $filter_keys, true ) ) {
221		- return FrmAppHelper::kses( $value, 'all' );
	178	+ unset( $setting, $default );
222	179	}
223		-
224		- return $value;
225	180	}
226	181
227		- /**
228		- * @return void
229		- */
230		- private function fill_captcha_settings() {
231		- if ( ! isset( $this->active_captcha ) ) {
232		- $this->active_captcha = 'recaptcha';
233		- }
	182	+ private function fill_recaptcha_settings() {
	183	+ $privkey = '';
	184	+ $re_lang = '';
234	185
235		- $privkey = '';
236		- $re_lang = '';
237		-
238		- if ( ! isset( $this->hcaptcha_privkey ) ) {
239		- $this->hcaptcha_privkey = '';
240		- }
241		-
242	186	if ( ! isset( $this->pubkey ) ) {
243	187	// get the options from the database
244	188	$recaptcha_opt = is_multisite() ? get_site_option( 'recaptcha' ) : get_option( 'recaptcha' );
245	189	$this->pubkey = isset( $recaptcha_opt['pubkey'] ) ? $recaptcha_opt['pubkey'] : '';
		@@ -247,9 +191,9 @@
247	191	$re_lang = isset( $recaptcha_opt['re_lang'] ) ? $recaptcha_opt['re_lang'] : $re_lang;
248	192	}
249	193
250	194	if ( ! isset( $this->re_msg ) || empty( $this->re_msg ) ) {
251		- $this->re_msg = __( 'The CAPTCHA was not entered correctly', 'formidable' );
	195	+ $this->re_msg = __( 'The reCAPTCHA was not entered correctly', 'formidable' );
252	196	}
253	197
254	198	if ( ! isset( $this->privkey ) ) {
255	199	$this->privkey = $privkey;
		@@ -271,15 +215,12 @@
271	215	/**
272	216	* Get values that may be shown on the front-end without an override in the form settings.
273	217	*
274	218	* @since 3.06.01
275		- *
276		- * @return string[]
277	219	*/
278	220	public function translatable_strings() {
279	221	return array(
280	222	'invalid_msg',
281		- 'admin_permission',
282	223	'failed_msg',
283	224	'login_msg',
284	225	);
285	226	}
		@@ -287,10 +228,8 @@
287	228	/**
288	229	* Allow strings to be filtered when a specific form may be displaying them.
289	230	*
290	231	* @since 3.06.01
291		- *
292		- * @return void
293	232	*/
294	233	public function maybe_filter_for_form( $args ) {
295	234	if ( isset( $args['current_form'] ) && is_numeric( $args['current_form'] ) ) {
296	235	$this->current_form = $args['current_form'];
		@@ -300,21 +239,12 @@
300	239	}
301	240	}
302	241	}
303	242
304		- /**
305		- * @param array $params
306		- * @param array $errors
307		- */
308	243	public function validate( $params, $errors ) {
309	244	return apply_filters( 'frm_validate_settings', $errors, $params );
310	245	}
311	246
312		- /**
313		- * @param array $params
314		- *
315		- * @return void
316		- */
317	247	public function update( $params ) {
318	248	$this->fill_with_defaults( $params );
319	249	$this->update_settings( $params );
320	250
		@@ -328,38 +258,28 @@
328	258
329	259	do_action( 'frm_update_settings', $params );
330	260
331	261	if ( function_exists( 'get_filesystem_method' ) ) {
332		- // Save styling settings in case fallback setting changes.
	262	+ // save styling settings in case fallback setting changes
333	263	$frm_style = new FrmStyle();
334	264	$frm_style->update( 'default' );
335	265	}
336	266	}
337	267
338		- /**
339		- * @return void
340		- */
341	268	private function update_settings( $params ) {
342		- $this->active_captcha = $params['frm_active_captcha'];
343		- $this->hcaptcha_pubkey = trim( $params['frm_hcaptcha_pubkey'] );
344		- $this->hcaptcha_privkey = trim( $params['frm_hcaptcha_privkey'] );
345		- $this->pubkey = trim( $params['frm_pubkey'] );
346		- $this->privkey = trim( $params['frm_privkey'] );
347		- $this->re_type = $params['frm_re_type'];
348		- $this->re_lang = $params['frm_re_lang'];
349		- $this->re_threshold = floatval( $params['frm_re_threshold'] );
350		- $this->load_style = $params['frm_load_style'];
351		- $this->custom_css = $params['frm_custom_css'];
	269	+ $this->pubkey = trim( $params['frm_pubkey'] );
	270	+ $this->privkey = $params['frm_privkey'];
	271	+ $this->re_type = $params['frm_re_type'];
	272	+ $this->re_lang = $params['frm_re_lang'];
	273	+ $this->re_threshold = floatval( $params['frm_re_threshold'] );
	274	+ $this->load_style = $params['frm_load_style'];
352	275
353		- $checkboxes = array( 'mu_menu', 're_multi', 'use_html', 'jquery_css', 'accordion_js', 'fade_form', 'no_ips', 'custom_header_ip', 'tracking', 'admin_bar' );
	276	+ $checkboxes = array( 'mu_menu', 're_multi', 'use_html', 'jquery_css', 'accordion_js', 'fade_form', 'no_ips', 'tracking', 'admin_bar' );
354	277	foreach ( $checkboxes as $set ) {
355		- $this->$set = isset( $params[ 'frm_' . $set ] ) ? absint( $params[ 'frm_' . $set ] ) : 0;
	278	+ $this->$set = isset( $params[ 'frm_' . $set ] ) ? $params[ 'frm_' . $set ] : 0;
356	279	}
357	280	}
358	281
359		- /**
360		- * @return void
361		- */
362	282	private function update_roles( $params ) {
363	283	global $wp_roles;
364	284
365	285	$frm_roles = FrmAppHelper::frm_capabilities();
		@@ -381,11 +301,8 @@
381	301	}
382	302	}
383	303	}
384	304
385		- /**
386		- * @return void
387		- */
388	305	public function store() {
389	306	// Save the posted value in the database
390	307
391	308	update_option( 'frm_options', $this );