| @@ -44,9 +44,9 @@ | ||
| 44 | 44 | |
| 45 | 45 | $signup = ( is_multisite() ? $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->signups WHERE activation_key = %s", $key) ) : $wpdb->get_row( $wpdb->prepare( "SELECT * FROM ".$wpdb->base_prefix."signups WHERE activation_key = %s", $key ) ) ); |
| 46 | 46 | |
| 47 | 47 | if( empty( $signup ) ) |
| 48 | - return apply_filters( 'wppb_register_activate_user_error_message6', '<p class="error">'.__( 'Could not find registration. Contact administrator.', 'profile-builder' ).'</p>'); | |
| 48 | + return apply_filters( 'wppb_register_activate_user_error_message6', '<p class="error" role="alert">'.__( 'Could not find registration. Contact administrator.', 'profile-builder' ).'</p>'); | |
| 49 | 49 | |
| 50 | 50 | $user_login = ( ( isset( $wppb_general_settings['loginWith'] ) && ( $wppb_general_settings['loginWith'] == 'email' ) ) ? trim( $signup->user_email ) : trim( $signup->user_login ) ); |
| 51 | 51 | |
| 52 | 52 | $user_email = esc_sql( $signup->user_email ); |
| @@ -55,13 +55,13 @@ | ||
| 55 | 55 | |
| 56 | 56 | $user_id = ( ( isset( $wppb_general_settings['loginWith'] ) && ( $wppb_general_settings['loginWith'] == 'email' ) ) ? email_exists( $user_login ) : username_exists( $user_login ) ); |
| 57 | 57 | |
| 58 | 58 | if ( empty( $signup ) ) |
| 59 | - return apply_filters( 'wppb_register_activate_user_error_message1', '<p class="error">'.__( 'Invalid activation key!', 'profile-builder' ).'</p>'); | |
| 59 | + return apply_filters( 'wppb_register_activate_user_error_message1', '<p class="error" role="alert">'.__( 'Invalid activation key!', 'profile-builder' ).'</p>'); | |
| 60 | 60 | |
| 61 | 61 | if ( $signup->active ) |
| 62 | 62 | if ( empty( $signup->domain ) ) |
| 63 | - return apply_filters( 'wppb_register_activate_user_error_message2', '<p class="wppb-success">'.__( 'This username is now active!', 'profile-builder' ).'</p>', $user_id ); | |
| 63 | + return apply_filters( 'wppb_register_activate_user_error_message2', '<p class="wppb-success" role="alert">'.__( 'This username is now active!', 'profile-builder' ).'</p>', $user_id ); | |
| 64 | 64 | |
| 65 | 65 | $meta = unserialize( $signup->meta ); |
| 66 | 66 | |
| 67 | 67 | if( strcasecmp($login_after_register, 'Yes') === 0 ) { |
| @@ -79,12 +79,12 @@ | ||
| 79 | 79 | else |
| 80 | 80 | $user_already_exists = true; |
| 81 | 81 | |
| 82 | 82 | if ( ! $user_id ) |
| 83 | - return apply_filters( 'wppb_register_activate_user_error_message4', '<p class="error">'.__('Could not create user!', 'profile-builder').'</p>' ); | |
| 83 | + return apply_filters( 'wppb_register_activate_user_error_message4', '<p class="error" role="alert">'.__('Could not create user!', 'profile-builder').'</p>' ); | |
| 84 | 84 | |
| 85 | 85 | elseif ( isset( $user_already_exists ) && ( $user_already_exists == true ) ) |
| 86 | - return apply_filters( 'wppb_register_activate_user_error_message5', '<p class="error">'.__( 'This username is already activated!', 'profile-builder' ).'</p>' ); | |
| 86 | + return apply_filters( 'wppb_register_activate_user_error_message5', '<p class="error" role="alert">'.__( 'This username is already activated!', 'profile-builder' ).'</p>' ); | |
| 87 | 87 | |
| 88 | 88 | else{ |
| 89 | 89 | $inserted_user = ( is_multisite() ? $wpdb->update( $wpdb->signups, array( 'active' => 1, 'activated' => current_time( 'mysql', true ) ), array( 'activation_key' => $key ) ) : $wpdb->update( $wpdb->base_prefix.'signups', array( 'active' => 1, 'activated' => current_time( 'mysql', true ) ), array( 'activation_key' => $key ) ) ); |
| 90 | 90 | |
| @@ -120,10 +120,10 @@ | ||
| 120 | 120 | $redirect_delay = apply_filters( 'wppb_success_email_confirmation_redirect_delay', 3, $user_id ); |
| 121 | 121 | $redirect_message = wppb_build_redirect( $redirect_url, $redirect_delay, 'after_success_email_confirmation' ); |
| 122 | 122 | $redirect_message = apply_filters( 'wppb_ec_sucess_message_redirect', $redirect_message, $meta ); |
| 123 | 123 | |
| 124 | - $success_message = apply_filters( 'wppb_success_email_confirmation', '<p class="wppb-success">' . __( 'Your email was successfully confirmed.', 'profile-builder' ) . '</p><!-- .success -->', $user_id ); | |
| 125 | - $admin_approval_message = apply_filters( 'wppb_email_confirmation_with_admin_approval', '<p class="alert">' . __( 'Before you can access your account, an administrator needs to approve it. You will be notified via email.', 'profile-builder' ) . '</p>', $user_id ); | |
| 124 | + $success_message = apply_filters( 'wppb_success_email_confirmation', '<p class="wppb-success" role="alert">' . __( 'Your email was successfully confirmed.', 'profile-builder' ) . '</p><!-- .success -->', $user_id ); | |
| 125 | + $admin_approval_message = apply_filters( 'wppb_email_confirmation_with_admin_approval', '<p class="alert" role="alert">' . __( 'Before you can access your account, an administrator needs to approve it. You will be notified via email.', 'profile-builder' ) . '</p>', $user_id ); | |
| 126 | 126 | |
| 127 | 127 | $wppb_general_settings = get_option( 'wppb_general_settings', 'false' ); |
| 128 | 128 | |
| 129 | 129 | if ( wppb_get_admin_approval_option_value() === 'yes' ){ |
| @@ -165,9 +165,9 @@ | ||
| 165 | 165 | |
| 166 | 166 | return $success_message . ( ! empty ( $redirect_message ) ? $redirect_message : '' ); |
| 167 | 167 | } |
| 168 | 168 | } else { |
| 169 | - return apply_filters('wppb_register_failed_user_activation', '<p class="error">'. __('There was an error while trying to activate the user.', 'profile-builder') .'</p><!-- .error -->'); | |
| 169 | + return apply_filters('wppb_register_failed_user_activation', '<p class="error" role="alert">'. __('There was an error while trying to activate the user.', 'profile-builder') .'</p><!-- .error -->'); | |
| 170 | 170 | } |
| 171 | 171 | } |
| 172 | 172 | } |
| 173 | 173 | |
| @@ -172,14 +172,12 @@ | ||
| 172 | 172 | } |
| 173 | 173 | |
| 174 | 174 | //function that generates the redirect message when the user should be automatically logged in |
| 175 | 175 | function wppb_activate_signup_autologin_redirect_url( $user_id, $redirect_url, $redirect_delay ){ |
| 176 | - $nonce = wp_create_nonce( 'autologin-'. $user_id .'-'. (int)( time() / 60 ) ); | |
| 177 | - | |
| 178 | 176 | $redirect_url = remove_query_arg( 'activation_key' ,$redirect_url ); |
| 179 | 177 | |
| 180 | 178 | $redirect_url = apply_filters( 'wppb_login_after_reg_redirect_url', $redirect_url ); |
| 181 | - $redirect_url = add_query_arg( array( 'autologin' => 'true', 'uid' => $user_id, '_wpnonce' => $nonce ), $redirect_url ); | |
| 179 | + $redirect_url = add_query_arg( wppb_get_autologin_query_args( $user_id ), $redirect_url ); | |
| 182 | 180 | |
| 183 | 181 | return wppb_build_redirect( $redirect_url, $redirect_delay, 'after_success_email_confirmation' ); |
| 184 | 182 | } |
| 185 | 183 | |
| @@ -237,8 +235,8 @@ | ||
| 237 | 235 | $user_data = get_userdata( $user_id ); |
| 238 | 236 | |
| 239 | 237 | // CHECK FOR REDIRECT |
| 240 | 238 | if( isset( $_POST['redirect_to'] ) ) |
| 241 | - $_POST['redirect_to'] = apply_filters( 'wppb_after_registration_redirect_url', wppb_get_redirect_url( 'normal', 'after_registration', esc_url_raw( $_POST['redirect_to'] ), $user_data ) ); | |
| 239 | + $_POST['redirect_to'] = apply_filters( 'wppb_after_registration_redirect_url', wppb_get_redirect_url( 'normal', 'after_registration', wppb_sanitize_request_url( $_POST['redirect_to'] ), $user_data ) ); | |
| 242 | 240 | |
| 243 | 241 | } |
| 244 | -add_action( 'register_new_user', 'wppb_default_registration_redirect' ); | |
| 242 | +add_action( 'register_new_user', 'wppb_default_registration_redirect' ); | |
