| @@ -12,11 +12,11 @@ | ||
| 12 | 12 | if ( $give_access_form_outputted ) { |
| 13 | 13 | return; |
| 14 | 14 | } |
| 15 | 15 | |
| 16 | +$is_form_required = true; | |
| 16 | 17 | $recaptcha_key = give_get_option( 'recaptcha_key' ); |
| 17 | 18 | $recaptcha_secret = give_get_option( 'recaptcha_secret' ); |
| 18 | - | |
| 19 | 19 | $enable_recaptcha = ( give_is_setting_enabled( give_get_option( 'enable_recaptcha' ) ) ) && ! empty( $recaptcha_key ) && ! empty( $recaptcha_secret ) ? true : false; |
| 20 | 20 | |
| 21 | 21 | // Email already sent? |
| 22 | 22 | if ( isset( $_POST['email-access-sent'] ) ) { |
| @@ -31,15 +31,16 @@ | ||
| 31 | 31 | * @return string $message Send notice message for email access. |
| 32 | 32 | */ |
| 33 | 33 | $message = (string) apply_filters( 'give_email_access_mail_send_notice', __( 'Please check your email and click on the link to access your complete donation history.', 'give' ) ); |
| 34 | 34 | |
| 35 | - Give()->notices->print_frontend_notice( | |
| 35 | + Give_Notices::print_frontend_notice( | |
| 36 | 36 | $message, |
| 37 | 37 | true, |
| 38 | 38 | 'success' |
| 39 | 39 | ); |
| 40 | 40 | |
| 41 | - return; | |
| 41 | + $is_form_required = false; | |
| 42 | + | |
| 42 | 43 | } elseif ( isset( $_POST['email-access-exhausted'] ) ) { |
| 43 | 44 | |
| 44 | 45 | $value = Give()->email_access->verify_throttle / 60; |
| 45 | 46 | |
| @@ -62,32 +63,33 @@ | ||
| 62 | 63 | $value |
| 63 | 64 | ); |
| 64 | 65 | |
| 65 | 66 | // Too many emails sent? |
| 66 | - Give()->notices->print_frontend_notice( | |
| 67 | + Give_Notices::print_frontend_notice( | |
| 67 | 68 | $message, |
| 68 | 69 | true, |
| 69 | 70 | 'error' |
| 70 | 71 | ); |
| 71 | 72 | |
| 72 | - return; | |
| 73 | + $is_form_required = false; | |
| 73 | 74 | } |
| 74 | 75 | |
| 76 | +if ( true === $is_form_required ) { | |
| 75 | 77 | |
| 76 | -/** | |
| 77 | - * Perform processing for email access form login. | |
| 78 | - * | |
| 79 | - * @since 1.8.17 | |
| 80 | - */ | |
| 81 | -do_action( 'give_email_access_form_login' ); | |
| 78 | + /** | |
| 79 | + * Perform processing for email access form login. | |
| 80 | + * | |
| 81 | + * @since 1.8.17 | |
| 82 | + */ | |
| 83 | + do_action( 'give_email_access_form_login' ); | |
| 82 | 84 | |
| 83 | -// Print any other messages & errors. | |
| 84 | -Give()->notices->render_frontend_notices(); | |
| 85 | + // Print any other messages & errors. | |
| 86 | + Give()->notices->render_frontend_notices(); | |
| 85 | 87 | |
| 86 | -?> | |
| 87 | - <div class="give-form"> | |
| 88 | - <form method="post" id="give-email-access-form"> | |
| 89 | - <p> | |
| 88 | + ?> | |
| 89 | + <div class="give-form"> | |
| 90 | + <form method="post" id="give-email-access-form"> | |
| 91 | + <p> | |
| 90 | 92 | <?php |
| 91 | 93 | /** |
| 92 | 94 | * Filter to modify email access welcome message |
| 93 | 95 | * |
| @@ -98,40 +100,41 @@ | ||
| 98 | 100 | * @return string $message email access welcome message |
| 99 | 101 | */ |
| 100 | 102 | echo esc_html( apply_filters( 'give_email_access_welcome_message', __( 'Please verify your email to access your donation history.', 'give' ) ) ); |
| 101 | 103 | ?> |
| 102 | - </p> | |
| 104 | + </p> | |
| 103 | 105 | |
| 104 | - <label for="give-email"><?php esc_attr_e( 'Donation Email:', 'give' ); ?></label> | |
| 105 | - <input id="give-email" type="email" name="give_email" value="" | |
| 106 | - placeholder="<?php esc_attr_e( 'Email Address', 'give' ); ?>"/> | |
| 107 | - <input type="hidden" name="_wpnonce" value="<?php echo wp_create_nonce( 'give' ); ?>"/> | |
| 108 | - <input type="hidden" name="give_action" value="email_access_form_login"/> | |
| 109 | - <input type="hidden" name="give_access_page" value="<?php the_ID(); ?>"/> | |
| 106 | + <label for="give-email"><?php esc_attr_e( 'Donation Email:', 'give' ); ?></label> | |
| 107 | + <input id="give-email" type="email" name="give_email" value="" | |
| 108 | + placeholder="<?php esc_attr_e( 'Email Address', 'give' ); ?>"/> | |
| 109 | + <input type="hidden" name="_wpnonce" value="<?php echo wp_create_nonce( 'give' ); ?>"/> | |
| 110 | + <input type="hidden" name="give_action" value="email_access_form_login"/> | |
| 111 | + <input type="hidden" name="give_access_page" value="<?php the_ID(); ?>"/> | |
| 110 | 112 | |
| 111 | 113 | <?php |
| 112 | 114 | // Enable reCAPTCHA? |
| 113 | 115 | if ( $enable_recaptcha ) : |
| 114 | 116 | ?> |
| 115 | - <script> | |
| 116 | - // IP verify for reCAPTCHA. | |
| 117 | - (function ($) { | |
| 118 | - $(function () { | |
| 119 | - $.getJSON('https://api.ipify.org?format=jsonp&callback=?', function (json) { | |
| 120 | - $('.give_ip').val(json.ip); | |
| 121 | - }); | |
| 122 | - }); | |
| 123 | - })(jQuery); | |
| 124 | - </script> | |
| 117 | + <script> | |
| 118 | + // IP verify for reCAPTCHA. | |
| 119 | + (function ($) { | |
| 120 | + $(function () { | |
| 121 | + $.getJSON('https://api.ipify.org?format=jsonp&callback=?', function (json) { | |
| 122 | + $('.give_ip').val(json.ip); | |
| 123 | + }); | |
| 124 | + }); | |
| 125 | + })(jQuery); | |
| 126 | + </script> | |
| 125 | 127 | |
| 126 | - <script src='https://www.google.com/recaptcha/api.js'></script> | |
| 127 | - <div class="g-recaptcha" data-sitekey="<?php echo $recaptcha_key; ?>"></div> | |
| 128 | - <input type="hidden" name="give_ip" class="give_ip" value=""/> | |
| 128 | + <script src='https://www.google.com/recaptcha/api.js'></script> | |
| 129 | + <div class="g-recaptcha" data-sitekey="<?php echo $recaptcha_key; ?>"></div> | |
| 130 | + <input type="hidden" name="give_ip" class="give_ip" value=""/> | |
| 129 | 131 | <?php endif; ?> |
| 130 | 132 | |
| 131 | - <input type="submit" class="give-submit" value="<?php esc_attr_e( 'Verify Email', 'give' ); ?>"/> | |
| 132 | - </form> | |
| 133 | - </div> | |
| 134 | -<?php | |
| 133 | + <input type="submit" class="give-submit" value="<?php esc_attr_e( 'Verify Email', 'give' ); ?>"/> | |
| 134 | + </form> | |
| 135 | + </div> | |
| 136 | + <?php | |
| 137 | +} | |
| 135 | 138 | |
| 136 | 139 | // The form has been output. |
| 137 | 140 | $give_access_form_outputted = true; |