| @@ -41,9 +41,13 @@ | ||
| 41 | 41 | public $no_ips; |
| 42 | 42 | public $custom_header_ip; |
| 43 | 43 | public $current_form = 0; |
| 44 | 44 | public $tracking; |
| 45 | + public $summary_emails; | |
| 46 | + public $summary_emails_recipients; | |
| 45 | 47 | |
| 48 | + public $currency; | |
| 49 | + | |
| 46 | 50 | /** |
| 47 | 51 | * @since 6.0 |
| 48 | 52 | * |
| 49 | 53 | * @var string|false|null |
| @@ -71,9 +75,10 @@ | ||
| 71 | 75 | $this->maybe_filter_for_form( $args ); |
| 72 | 76 | } |
| 73 | 77 | |
| 74 | 78 | private function translate_settings( $settings ) { |
| 75 | - if ( $settings ) { //workaround for W3 total cache conflict | |
| 79 | + if ( $settings ) { | |
| 80 | + // Workaround for W3 total cache conflict. | |
| 76 | 81 | return unserialize( serialize( $settings ) ); |
| 77 | 82 | } |
| 78 | 83 | |
| 79 | 84 | $settings = get_option( $this->option_name ); |
| @@ -83,9 +88,10 @@ | ||
| 83 | 88 | return $settings; |
| 84 | 89 | } |
| 85 | 90 | |
| 86 | 91 | // If unserializing didn't work |
| 87 | - if ( $settings ) { //workaround for W3 total cache conflict | |
| 92 | + if ( $settings ) { | |
| 93 | + // Workaround for W3 total cache conflict. | |
| 88 | 94 | $settings = unserialize( serialize( $settings ) ); |
| 89 | 95 | } else { |
| 90 | 96 | $settings = $this; |
| 91 | 97 | } |
| @@ -119,13 +125,17 @@ | ||
| 119 | 125 | 'failed_msg' => __( 'We\'re sorry. It looks like you\'ve already submitted that.', 'formidable' ), |
| 120 | 126 | 'submit_value' => __( 'Submit', 'formidable' ), |
| 121 | 127 | 'login_msg' => __( 'You do not have permission to view this form.', 'formidable' ), |
| 122 | 128 | 'admin_permission' => __( 'You do not have permission to do that', 'formidable' ), |
| 129 | + 'new_tab_msg' => __( 'The page has been opened in a new tab.', 'formidable' ), | |
| 123 | 130 | |
| 124 | 131 | 'email_to' => '[admin_email]', |
| 125 | 132 | 'no_ips' => 0, |
| 126 | - '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 | |
| 133 | + // Use false by default. We show a warning when this is unset. Once global settings have been saved, this gets saved. | |
| 134 | + 'custom_header_ip' => false, | |
| 127 | 135 | 'tracking' => FrmAppHelper::pro_is_installed(), |
| 136 | + 'summary_emails' => 1, | |
| 137 | + 'summary_emails_recipients' => '[admin_email]', | |
| 128 | 138 | |
| 129 | 139 | // Normally custom CSS is a string. A false value is used when nothing has been set. |
| 130 | 140 | // When it is false, we try to use the old custom_key value from the default style's post_content array. |
| 131 | 141 | 'custom_css' => false, |
| @@ -161,8 +171,12 @@ | ||
| 161 | 171 | if ( ! isset( $this->$frm_role ) ) { |
| 162 | 172 | $this->$frm_role = 'administrator'; |
| 163 | 173 | } |
| 164 | 174 | } |
| 175 | + | |
| 176 | + if ( ! isset( $this->currency ) ) { | |
| 177 | + $this->currency = 'USD'; | |
| 178 | + } | |
| 165 | 179 | } |
| 166 | 180 | |
| 167 | 181 | /** |
| 168 | 182 | * @param array $params |
| @@ -339,18 +353,19 @@ | ||
| 339 | 353 | */ |
| 340 | 354 | private function update_settings( $params ) { |
| 341 | 355 | $this->active_captcha = $params['frm_active_captcha']; |
| 342 | 356 | $this->hcaptcha_pubkey = trim( $params['frm_hcaptcha_pubkey'] ); |
| 343 | - $this->hcaptcha_privkey = $params['frm_hcaptcha_privkey']; | |
| 357 | + $this->hcaptcha_privkey = trim( $params['frm_hcaptcha_privkey'] ); | |
| 344 | 358 | $this->pubkey = trim( $params['frm_pubkey'] ); |
| 345 | - $this->privkey = $params['frm_privkey']; | |
| 359 | + $this->privkey = trim( $params['frm_privkey'] ); | |
| 346 | 360 | $this->re_type = $params['frm_re_type']; |
| 347 | 361 | $this->re_lang = $params['frm_re_lang']; |
| 348 | 362 | $this->re_threshold = floatval( $params['frm_re_threshold'] ); |
| 349 | 363 | $this->load_style = $params['frm_load_style']; |
| 350 | 364 | $this->custom_css = $params['frm_custom_css']; |
| 365 | + $this->currency = $params['frm_currency']; | |
| 351 | 366 | |
| 352 | - $checkboxes = array( 'mu_menu', 're_multi', 'use_html', 'jquery_css', 'accordion_js', 'fade_form', 'no_ips', 'custom_header_ip', 'tracking', 'admin_bar' ); | |
| 367 | + $checkboxes = array( 'mu_menu', 're_multi', 'use_html', 'jquery_css', 'accordion_js', 'fade_form', 'no_ips', 'custom_header_ip', 'tracking', 'admin_bar', 'summary_emails' ); | |
| 353 | 368 | foreach ( $checkboxes as $set ) { |
| 354 | 369 | $this->$set = isset( $params[ 'frm_' . $set ] ) ? absint( $params[ 'frm_' . $set ] ) : 0; |
| 355 | 370 | } |
| 356 | 371 | } |
