| @@ -1,8 +1,9 @@ | ||
| 1 | 1 | <?php |
| 2 | 2 | if ( ! defined( 'ABSPATH' ) ) { |
| 3 | 3 | die( 'You are not allowed to call this page directly.' ); |
| 4 | 4 | } |
| 5 | + | |
| 5 | 6 | $is_gdpr_enabled = FrmAppHelper::is_gdpr_enabled(); |
| 6 | 7 | |
| 7 | 8 | ?> |
| 8 | 9 | <div class="frm_license_box"> |
| @@ -32,10 +33,8 @@ | ||
| 32 | 33 | <input class="frm_with_left_label frm8" type="text" name="frm_from_email" id="frm_from_email" value="<?php echo esc_attr( $frm_settings->from_email ); ?>" /> |
| 33 | 34 | </p> |
| 34 | 35 | |
| 35 | 36 | <?php |
| 36 | -ob_start(); | |
| 37 | - | |
| 38 | 37 | /** |
| 39 | 38 | * Trigger an action so Pro can display additional General settings in the Other section. |
| 40 | 39 | * |
| 41 | 40 | * @param FrmSettings $frm_settings |
| @@ -41,13 +40,9 @@ | ||
| 41 | 40 | * @param FrmSettings $frm_settings |
| 42 | 41 | */ |
| 43 | 42 | do_action( 'frm_settings_form', $frm_settings ); |
| 44 | 43 | |
| 45 | -$more_html = ob_get_clean(); | |
| 46 | -echo $more_html; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped | |
| 47 | - | |
| 48 | -FrmSettingsController::maybe_render_currency_selector( $frm_settings, $more_html ); | |
| 49 | -unset( $more_html ); | |
| 44 | +FrmSettingsController::maybe_render_currency_selector( $frm_settings ); | |
| 50 | 45 | ?> |
| 51 | 46 | |
| 52 | 47 | <div class="clear"></div> |
| 53 | 48 | |
| @@ -58,12 +53,15 @@ | ||
| 58 | 53 | |
| 59 | 54 | <h3><?php esc_html_e( 'GDPR', 'formidable' ); ?></h3> |
| 60 | 55 | <?php |
| 61 | 56 | $gdpr_options_wrapper_params = array( 'class' => 'frm_gdpr_options' ); |
| 57 | + | |
| 62 | 58 | if ( ! $is_gdpr_enabled ) { |
| 63 | 59 | $gdpr_options_wrapper_params['class'] .= ' frm_hidden'; |
| 64 | 60 | } |
| 61 | + | |
| 65 | 62 | $custom_header_ip_wrapper_params = array( 'class' => 'frm_custom_header_ip_cont frm_gdpr_options' ); |
| 63 | + | |
| 66 | 64 | if ( $frm_settings->no_ips || ! $is_gdpr_enabled ) { |
| 67 | 65 | $custom_header_ip_wrapper_params['class'] .= ' frm_hidden'; |
| 68 | 66 | } |
| 69 | 67 | ?> |
