| @@ -4,92 +4,31 @@ | ||
| 4 | 4 | } |
| 5 | 5 | |
| 6 | 6 | #[\AllowDynamicProperties] |
| 7 | 7 | class FrmSettings { |
| 8 | - | |
| 9 | - /** | |
| 10 | - * @var string | |
| 11 | - */ | |
| 12 | 8 | public $option_name = 'frm_options'; |
| 13 | - | |
| 14 | - /** | |
| 15 | - * @var int | |
| 16 | - */ | |
| 17 | 9 | public $menu; |
| 18 | - | |
| 19 | - /** | |
| 20 | - * @var int | |
| 21 | - */ | |
| 22 | 10 | public $mu_menu; |
| 23 | - | |
| 24 | - /** | |
| 25 | - * @var int | |
| 26 | - */ | |
| 11 | + public $use_html; | |
| 12 | + public $jquery_css; | |
| 13 | + public $accordion_js; | |
| 27 | 14 | public $fade_form; |
| 28 | - | |
| 29 | - /** | |
| 30 | - * @var bool | |
| 31 | - */ | |
| 15 | + public $old_css; | |
| 32 | 16 | public $admin_bar; |
| 33 | 17 | |
| 34 | - /** | |
| 35 | - * @var string | |
| 36 | - */ | |
| 37 | 18 | public $success_msg; |
| 38 | - | |
| 39 | - /** | |
| 40 | - * @var string | |
| 41 | - */ | |
| 42 | 19 | public $blank_msg; |
| 43 | - | |
| 44 | - /** | |
| 45 | - * @var string | |
| 46 | - */ | |
| 47 | 20 | public $unique_msg; |
| 48 | - | |
| 49 | - /** | |
| 50 | - * @var string | |
| 51 | - */ | |
| 52 | 21 | public $invalid_msg; |
| 53 | - | |
| 54 | - /** | |
| 55 | - * @var string | |
| 56 | - */ | |
| 57 | 22 | public $failed_msg; |
| 58 | - | |
| 59 | - /** | |
| 60 | - * @var string | |
| 61 | - */ | |
| 62 | 23 | public $submit_value; |
| 63 | - | |
| 64 | - /** | |
| 65 | - * @var string | |
| 66 | - */ | |
| 67 | 24 | public $login_msg; |
| 68 | - | |
| 69 | - /** | |
| 70 | - * @var string | |
| 71 | - */ | |
| 72 | 25 | public $admin_permission; |
| 73 | 26 | |
| 74 | - /** | |
| 75 | - * @var string | |
| 76 | - */ | |
| 77 | 27 | public $email_to; |
| 78 | - | |
| 79 | - /** | |
| 80 | - * @var string|null | |
| 81 | - */ | |
| 82 | 28 | public $load_style; |
| 83 | - | |
| 84 | - /** | |
| 85 | - * @var bool|int|null | |
| 86 | - */ | |
| 87 | 29 | public $custom_style; |
| 88 | 30 | |
| 89 | - /** | |
| 90 | - * @var string|null | |
| 91 | - */ | |
| 92 | 31 | public $active_captcha; |
| 93 | 32 | |
| 94 | 33 | /** |
| 95 | 34 | * Settings for reCAPTCHA. |
| @@ -103,35 +42,14 @@ | ||
| 103 | 42 | /** |
| 104 | 43 | * @var string|null |
| 105 | 44 | */ |
| 106 | 45 | public $privkey; |
| 107 | - | |
| 108 | - /** | |
| 109 | - * @var string|null | |
| 110 | - */ | |
| 111 | 46 | public $re_lang; |
| 112 | - | |
| 113 | - /** | |
| 114 | - * @var string|null | |
| 115 | - */ | |
| 116 | 47 | public $re_type; |
| 117 | - | |
| 118 | - /** | |
| 119 | - * @var string | |
| 120 | - */ | |
| 121 | 48 | public $re_msg; |
| 122 | - | |
| 123 | - /** | |
| 124 | - * @var bool | |
| 125 | - */ | |
| 126 | 49 | public $re_multi; |
| 127 | 50 | |
| 128 | 51 | /** |
| 129 | - * @var float|string|null | |
| 130 | - */ | |
| 131 | - public $re_threshold; | |
| 132 | - | |
| 133 | - /** | |
| 134 | 52 | * Settings for hCaptcha. |
| 135 | 53 | */ |
| 136 | 54 | |
| 137 | 55 | /** |
| @@ -157,51 +75,16 @@ | ||
| 157 | 75 | * @var string|null |
| 158 | 76 | */ |
| 159 | 77 | public $turnstile_privkey; |
| 160 | 78 | |
| 161 | - /** | |
| 162 | - * @var bool | |
| 163 | - */ | |
| 164 | 79 | public $no_ips; |
| 165 | - | |
| 166 | - /** | |
| 167 | - * @var string | |
| 168 | - */ | |
| 169 | 80 | public $custom_header_ip; |
| 170 | - | |
| 171 | - /** | |
| 172 | - * @var int | |
| 173 | - */ | |
| 174 | 81 | public $current_form = 0; |
| 175 | - | |
| 176 | - /** | |
| 177 | - * @var bool|int | |
| 178 | - */ | |
| 179 | 82 | public $tracking; |
| 180 | - | |
| 181 | - /** | |
| 182 | - * @var bool | |
| 183 | - */ | |
| 184 | 83 | public $summary_emails; |
| 185 | - | |
| 186 | - /** | |
| 187 | - * @var string | |
| 188 | - */ | |
| 189 | 84 | public $summary_emails_recipients; |
| 190 | 85 | |
| 191 | - /** | |
| 192 | - * @var string|null | |
| 193 | - */ | |
| 194 | 86 | public $default_email; |
| 195 | - | |
| 196 | - /** | |
| 197 | - * @var string | |
| 198 | - */ | |
| 199 | - public $from_email; | |
| 200 | - | |
| 201 | - /** | |
| 202 | - * @var string|null | |
| 203 | - */ | |
| 204 | 87 | public $currency; |
| 205 | 88 | |
| 206 | 89 | /** |
| 207 | 90 | * @since 6.0 |
| @@ -209,43 +92,8 @@ | ||
| 209 | 92 | * @var false|string|null |
| 210 | 93 | */ |
| 211 | 94 | public $custom_css; |
| 212 | 95 | |
| 213 | - /** | |
| 214 | - * @var int | |
| 215 | - */ | |
| 216 | - public $honeypot; | |
| 217 | - | |
| 218 | - /** | |
| 219 | - * @var bool | |
| 220 | - */ | |
| 221 | - public $wp_spam_check; | |
| 222 | - | |
| 223 | - /** | |
| 224 | - * @var bool | |
| 225 | - */ | |
| 226 | - public $denylist_check; | |
| 227 | - | |
| 228 | - /** | |
| 229 | - * @since 6.25.1 | |
| 230 | - * | |
| 231 | - * @var int|null 1 if installed after welcome tour update, null otherwise. | |
| 232 | - */ | |
| 233 | - public $installed_after_welcome_tour_update; | |
| 234 | - | |
| 235 | - /** | |
| 236 | - * @var string | |
| 237 | - */ | |
| 238 | - public $disallowed_words; | |
| 239 | - | |
| 240 | - /** | |
| 241 | - * @var string | |
| 242 | - */ | |
| 243 | - public $allowed_words; | |
| 244 | - | |
| 245 | - /** | |
| 246 | - * @param array $args | |
| 247 | - */ | |
| 248 | 96 | public function __construct( $args = array() ) { |
| 249 | 97 | if ( ! defined( 'ABSPATH' ) ) { |
| 250 | 98 | die( 'You are not allowed to call this page directly.' ); |
| 251 | 99 | } |
| @@ -265,13 +113,8 @@ | ||
| 265 | 113 | |
| 266 | 114 | $this->maybe_filter_for_form( $args ); |
| 267 | 115 | } |
| 268 | 116 | |
| 269 | - /** | |
| 270 | - * @param false|object $settings | |
| 271 | - * | |
| 272 | - * @return object | |
| 273 | - */ | |
| 274 | 117 | private function translate_settings( $settings ) { |
| 275 | 118 | if ( $settings ) { |
| 276 | 119 | // Workaround for W3 total cache conflict. |
| 277 | 120 | return unserialize( serialize( $settings ) ); |
| @@ -279,9 +122,9 @@ | ||
| 279 | 122 | |
| 280 | 123 | // If unserializing didn't work. |
| 281 | 124 | $settings = $this; |
| 282 | 125 | |
| 283 | - update_option( $this->option_name, $settings, true ); | |
| 126 | + update_option( $this->option_name, $settings, 'yes' ); | |
| 284 | 127 | |
| 285 | 128 | return $settings; |
| 286 | 129 | } |
| 287 | 130 | |
| @@ -291,9 +134,13 @@ | ||
| 291 | 134 | public function default_options() { |
| 292 | 135 | return array( |
| 293 | 136 | 'menu' => apply_filters( 'frm_default_menu', 'Formidable' ), |
| 294 | 137 | 'mu_menu' => 0, |
| 138 | + 'use_html' => true, | |
| 139 | + 'jquery_css' => false, | |
| 140 | + 'accordion_js' => false, | |
| 295 | 141 | 'fade_form' => false, |
| 142 | + 'old_css' => false, | |
| 296 | 143 | 'admin_bar' => false, |
| 297 | 144 | |
| 298 | 145 | 're_multi' => 1, |
| 299 | 146 | |
| @@ -309,12 +156,11 @@ | ||
| 309 | 156 | 'admin_permission' => __( 'You do not have permission to do that', 'formidable' ), |
| 310 | 157 | 'new_tab_msg' => __( 'The page has been opened in a new tab.', 'formidable' ), |
| 311 | 158 | |
| 312 | 159 | 'email_to' => '[admin_email]', |
| 313 | - 'enable_gdpr' => 0, | |
| 314 | - 'no_gdpr_cookies' => 0, | |
| 315 | 160 | 'no_ips' => 0, |
| 316 | - 'custom_header_ip' => 0, | |
| 161 | + // Use false by default. We show a warning when this is unset. Once global settings have been saved, this gets saved. | |
| 162 | + 'custom_header_ip' => false, | |
| 317 | 163 | 'tracking' => FrmAppHelper::pro_is_installed(), |
| 318 | 164 | // Only enable this by default for the main site. |
| 319 | 165 | 'summary_emails' => get_current_blog_id() === get_main_site_id(), |
| 320 | 166 | 'summary_emails_recipients' => '[admin_email]', |
| @@ -321,14 +167,8 @@ | ||
| 321 | 167 | |
| 322 | 168 | // Normally custom CSS is a string. A false value is used when nothing has been set. |
| 323 | 169 | // When it is false, we try to use the old custom_key value from the default style's post_content array. |
| 324 | 170 | 'custom_css' => false, |
| 325 | - 'honeypot' => 1, | |
| 326 | - 'wp_spam_check' => 0, | |
| 327 | - 'denylist_check' => 0, | |
| 328 | - 'disallowed_words' => '', | |
| 329 | - 'allowed_words' => '', | |
| 330 | - 'email_style' => 'classic', | |
| 331 | 171 | ); |
| 332 | 172 | } |
| 333 | 173 | |
| 334 | 174 | /** |
| @@ -348,10 +188,9 @@ | ||
| 348 | 188 | $this->fill_with_defaults(); |
| 349 | 189 | |
| 350 | 190 | if ( is_multisite() && is_admin() ) { |
| 351 | 191 | $mu_menu = get_site_option( 'frm_admin_menu_name' ); |
| 352 | - | |
| 353 | - if ( $mu_menu && $mu_menu ) { | |
| 192 | + if ( $mu_menu && ! empty( $mu_menu ) ) { | |
| 354 | 193 | $this->menu = $mu_menu; |
| 355 | 194 | $this->mu_menu = 1; |
| 356 | 195 | } |
| 357 | 196 | } |
| @@ -356,9 +195,8 @@ | ||
| 356 | 195 | } |
| 357 | 196 | } |
| 358 | 197 | |
| 359 | 198 | $frm_roles = FrmAppHelper::frm_capabilities( 'pro' ); |
| 360 | - | |
| 361 | 199 | foreach ( $frm_roles as $frm_role => $frm_role_description ) { |
| 362 | 200 | if ( ! isset( $this->$frm_role ) ) { |
| 363 | 201 | $this->$frm_role = 'administrator'; |
| 364 | 202 | } |
| @@ -374,9 +212,8 @@ | ||
| 374 | 212 | } |
| 375 | 213 | |
| 376 | 214 | /** |
| 377 | 215 | * @param array $params |
| 378 | - * | |
| 379 | 216 | * @return void |
| 380 | 217 | */ |
| 381 | 218 | public function fill_with_defaults( $params = array() ) { |
| 382 | 219 | $settings = $this->default_options(); |
| @@ -383,9 +220,8 @@ | ||
| 383 | 220 | $filter_html = ! FrmAppHelper::allow_unfiltered_html(); |
| 384 | 221 | |
| 385 | 222 | if ( $filter_html ) { |
| 386 | 223 | $filter_keys = array( 'failed_msg', 'blank_msg', 'invalid_msg', 'admin_permission', 'unique_msg', 'success_msg', 'submit_value', 'login_msg', 'menu' ); |
| 387 | - | |
| 388 | 224 | if ( ! empty( $params['additional_filter_keys'] ) ) { |
| 389 | 225 | $filter_keys = array_merge( $filter_keys, $params['additional_filter_keys'] ); |
| 390 | 226 | } |
| 391 | 227 | } else { |
| @@ -415,9 +251,8 @@ | ||
| 415 | 251 | * |
| 416 | 252 | * @param mixed $value The unsanitized global setting value. |
| 417 | 253 | * @param string $key The key of the global setting being saved. |
| 418 | 254 | * @param array $filter_keys These keys that are filtered with kses. |
| 419 | - * | |
| 420 | 255 | * @return mixed |
| 421 | 256 | */ |
| 422 | 257 | private function maybe_sanitize_global_setting( $value, $key, $filter_keys ) { |
| 423 | 258 | if ( 'custom_css' === $key ) { |
| @@ -424,9 +259,8 @@ | ||
| 424 | 259 | if ( false === $value ) { |
| 425 | 260 | // Avoid changing the false default value to an empty string. |
| 426 | 261 | return $value; |
| 427 | 262 | } |
| 428 | - | |
| 429 | 263 | return sanitize_textarea_field( $value ); |
| 430 | 264 | } |
| 431 | 265 | |
| 432 | 266 | if ( in_array( $key, $filter_keys, true ) ) { |
| @@ -457,14 +291,14 @@ | ||
| 457 | 291 | |
| 458 | 292 | if ( ! isset( $this->pubkey ) ) { |
| 459 | 293 | // Get the options from the database. |
| 460 | 294 | $recaptcha_opt = is_multisite() ? get_site_option( 'recaptcha' ) : get_option( 'recaptcha' ); |
| 461 | - $this->pubkey = $recaptcha_opt['pubkey'] ?? ''; | |
| 462 | - $privkey = $recaptcha_opt['privkey'] ?? $privkey; | |
| 463 | - $re_lang = $recaptcha_opt['re_lang'] ?? $re_lang; | |
| 295 | + $this->pubkey = isset( $recaptcha_opt['pubkey'] ) ? $recaptcha_opt['pubkey'] : ''; | |
| 296 | + $privkey = isset( $recaptcha_opt['privkey'] ) ? $recaptcha_opt['privkey'] : $privkey; | |
| 297 | + $re_lang = isset( $recaptcha_opt['re_lang'] ) ? $recaptcha_opt['re_lang'] : $re_lang; | |
| 464 | 298 | } |
| 465 | 299 | |
| 466 | - if ( ! $this->re_msg ) { | |
| 300 | + if ( empty( $this->re_msg ) ) { | |
| 467 | 301 | $this->re_msg = __( 'The CAPTCHA was not entered correctly', 'formidable' ); |
| 468 | 302 | } |
| 469 | 303 | |
| 470 | 304 | if ( ! isset( $this->privkey ) ) { |
| @@ -504,30 +338,23 @@ | ||
| 504 | 338 | * Allow strings to be filtered when a specific form may be displaying them. |
| 505 | 339 | * |
| 506 | 340 | * @since 3.06.01 |
| 507 | 341 | * |
| 508 | - * @param array $args | |
| 509 | - * | |
| 510 | 342 | * @return void |
| 511 | 343 | */ |
| 512 | 344 | public function maybe_filter_for_form( $args ) { |
| 513 | - if ( ! isset( $args['current_form'] ) || ! is_numeric( $args['current_form'] ) ) { | |
| 514 | - return; | |
| 345 | + if ( isset( $args['current_form'] ) && is_numeric( $args['current_form'] ) ) { | |
| 346 | + $this->current_form = $args['current_form']; | |
| 347 | + foreach ( $this->translatable_strings() as $string ) { | |
| 348 | + $this->{$string} = apply_filters( 'frm_global_setting', $this->{$string}, $string, $this ); | |
| 349 | + $this->{$string} = apply_filters( 'frm_global_' . $string, $this->{$string}, $this ); | |
| 350 | + } | |
| 515 | 351 | } |
| 516 | - | |
| 517 | - $this->current_form = $args['current_form']; | |
| 518 | - | |
| 519 | - foreach ( $this->translatable_strings() as $string ) { | |
| 520 | - $this->{$string} = apply_filters( 'frm_global_setting', $this->{$string}, $string, $this ); | |
| 521 | - $this->{$string} = apply_filters( 'frm_global_' . $string, $this->{$string}, $this ); | |
| 522 | - } | |
| 523 | 352 | } |
| 524 | 353 | |
| 525 | 354 | /** |
| 526 | 355 | * @param array $params |
| 527 | 356 | * @param array $errors |
| 528 | - * | |
| 529 | - * @return array | |
| 530 | 357 | */ |
| 531 | 358 | public function validate( $params, $errors ) { |
| 532 | 359 | return apply_filters( 'frm_validate_settings', $errors, $params ); |
| 533 | 360 | } |
| @@ -550,20 +377,17 @@ | ||
| 550 | 377 | $this->update_roles( $params ); |
| 551 | 378 | |
| 552 | 379 | do_action( 'frm_update_settings', $params ); |
| 553 | 380 | |
| 554 | - if ( ! function_exists( 'get_filesystem_method' ) ) { | |
| 555 | - return; | |
| 381 | + if ( function_exists( 'get_filesystem_method' ) ) { | |
| 382 | + // Save styling settings in case fallback setting changes. | |
| 383 | + $frm_style = new FrmStyle(); | |
| 384 | + $frm_style->update( 'default' ); | |
| 556 | 385 | } |
| 557 | - | |
| 558 | - // Save styling settings in case fallback setting changes. | |
| 559 | - $frm_style = new FrmStyle(); | |
| 560 | - $frm_style->update( 'default' ); | |
| 561 | 386 | } |
| 562 | 387 | |
| 563 | 388 | /** |
| 564 | 389 | * @param array $params |
| 565 | - * | |
| 566 | 390 | * @return void |
| 567 | 391 | */ |
| 568 | 392 | private function update_settings( $params ) { |
| 569 | 393 | $this->active_captcha = $params['frm_active_captcha']; |
| @@ -578,27 +402,11 @@ | ||
| 578 | 402 | $this->turnstile_privkey = trim( $params['frm_turnstile_privkey'] ); |
| 579 | 403 | $this->load_style = $params['frm_load_style']; |
| 580 | 404 | $this->custom_css = $params['frm_custom_css']; |
| 581 | 405 | $this->default_email = $params['frm_default_email']; |
| 582 | - $this->from_email = $params['frm_from_email']; | |
| 583 | 406 | $this->currency = $params['frm_currency']; |
| 584 | 407 | |
| 585 | - $checkboxes = array( | |
| 586 | - 'mu_menu', | |
| 587 | - 're_multi', | |
| 588 | - 'fade_form', | |
| 589 | - 'no_ips', | |
| 590 | - 'no_gdpr_cookies', | |
| 591 | - 'enable_gdpr', | |
| 592 | - 'custom_header_ip', | |
| 593 | - 'tracking', | |
| 594 | - 'admin_bar', | |
| 595 | - 'summary_emails', | |
| 596 | - 'honeypot', | |
| 597 | - 'wp_spam_check', | |
| 598 | - 'denylist_check', | |
| 599 | - ); | |
| 600 | - | |
| 408 | + $checkboxes = array( 'mu_menu', 're_multi', 'use_html', 'jquery_css', 'accordion_js', 'fade_form', 'no_ips', 'custom_header_ip', 'tracking', 'admin_bar', 'summary_emails' ); | |
| 601 | 409 | foreach ( $checkboxes as $set ) { |
| 602 | 410 | $this->$set = isset( $params[ 'frm_' . $set ] ) ? absint( $params[ 'frm_' . $set ] ) : 0; |
| 603 | 411 | } |
| 604 | 412 | } |
| @@ -603,10 +411,8 @@ | ||
| 603 | 411 | } |
| 604 | 412 | } |
| 605 | 413 | |
| 606 | 414 | /** |
| 607 | - * @param array $params | |
| 608 | - * | |
| 609 | 415 | * @return void |
| 610 | 416 | */ |
| 611 | 417 | private function update_roles( $params ) { |
| 612 | 418 | global $wp_roles; |
| @@ -612,11 +418,10 @@ | ||
| 612 | 418 | global $wp_roles; |
| 613 | 419 | |
| 614 | 420 | $frm_roles = FrmAppHelper::frm_capabilities(); |
| 615 | 421 | $roles = get_editable_roles(); |
| 616 | - | |
| 617 | 422 | foreach ( $frm_roles as $frm_role => $frm_role_description ) { |
| 618 | - $this->$frm_role = (array) ( $params[ $frm_role ] ?? 'administrator' ); | |
| 423 | + $this->$frm_role = (array) ( isset( $params[ $frm_role ] ) ? $params[ $frm_role ] : 'administrator' ); | |
| 619 | 424 | |
| 620 | 425 | // Make sure administrators always have permissions |
| 621 | 426 | if ( ! in_array( 'administrator', $this->$frm_role, true ) ) { |
| 622 | 427 | array_push( $this->$frm_role, 'administrator' ); |
| @@ -622,9 +427,9 @@ | ||
| 622 | 427 | array_push( $this->$frm_role, 'administrator' ); |
| 623 | 428 | } |
| 624 | 429 | |
| 625 | 430 | foreach ( $roles as $role => $details ) { |
| 626 | - if ( in_array( $role, $this->$frm_role, true ) ) { | |
| 431 | + if ( in_array( $role, $this->$frm_role ) ) { | |
| 627 | 432 | $wp_roles->add_cap( $role, $frm_role ); |
| 628 | 433 | } else { |
| 629 | 434 | $wp_roles->remove_cap( $role, $frm_role ); |
| 630 | 435 | } |
| @@ -639,9 +444,8 @@ | ||
| 639 | 444 | * |
| 640 | 445 | * @param string $key The setting key to update. |
| 641 | 446 | * @param mixed $value The new value for the setting. |
| 642 | 447 | * @param string $sanitize The name of the sanitization function to apply to the new value. |
| 643 | - * | |
| 644 | 448 | * @return bool True on success, false on failure. |
| 645 | 449 | */ |
| 646 | 450 | public function update_setting( $key, $value, $sanitize ) { |
| 647 | 451 | if ( ! property_exists( $this, $key ) || ! is_callable( $sanitize ) ) { |
