Ticket #4676: 4676.01.patch

bp-members/bp-members-functions.php

@@ -1726 +1726 @@
         // the user exists; now do a check to see if the user has activated their account or not
         // NOTE: this is only applicable for single site WordPress installs!
         // if unactivated, stop the login now!
-        if ( is_a( $user, 'WP_User' ) && 2 == $user->user_status )
-                return new WP_Error( 'bp_account_not_activated', __( '<strong>ERROR</strong>: Your account has not been activated. Check your email for the activation link.', 'buddypress' ) );
+        if ( is_a( $user, 'WP_User' ) && 2 == $user->user_status ) {
+                $resend_url_params = array(
+                        'action' => 'bp-resend-activation',
+                        'user'   => $user->user_login,
+                );
+
+                $resend_url = wp_nonce_url(
+                        add_query_arg( $resend_url_params, wp_login_url() ),
+                        'bp-resend-activation'
+                );
+
+                $resend_string = '<br /><br />' .  sprintf( __( 'If you have not received an email yet, <a href="%s">click here to resend it</a>.', 'buddypress' ), $resend_url );
+
+                return new WP_Error( 'bp_account_not_activated', __( '<strong>ERROR</strong>: Your account has not been activated. Check your email for the activation link.', 'buddypress' ) . $resend_string );
+        }
 
         // user has activated their account! all clear!
         return $user;
@@ -1735 +1748 @@
 add_filter( 'authenticate', 'bp_core_signup_disable_inactive', 30 );
 
 /**
+ * On the login screen, resends the activation email for a user.
+ *
+ * @since BuddyPress (2.0.0)
+ *
+ * @see bp_core_signup_disable_inactive()
+ */
+function bp_members_login_resend_activation_email() {
+        global $error;
+
+        if ( empty( $_GET['user'] ) || empty( $_GET['_wpnonce'] ) ) {
+                return;
+        }
+
+        // verify nonce
+        if ( ! wp_verify_nonce( $_GET['_wpnonce'], 'bp-resend-activation' ) ) {
+                die( 'Security check' );
+        }
+
+        // fetch the signup ID
+        // note: this is different than the user ID
+        $signup_query = BP_Signup::get( array(
+                'user_login' => $_GET['user']
+        ) );
+
+        // no match, stop now!
+        if ( empty( $signup_query['signups'][0] ) ) {
+                return;
+        }
+
+        // resend the activation email
+        // also updates the 'last sent' and '# of emails sent' values
+        $resend = BP_Signup::resend( array( $signup_query['signups'][0]->signup_id ) );
+
+        // add feedback message
+        if ( ! empty( $resend['errors'] ) ) {
+                $error = __( '<strong>ERROR</strong>: Your account has already been activated.', 'buddypress' );
+        } else {
+                $error = __( 'Activation email resent!', 'buddypress' );
+        }
+}
+add_action( 'login_form_bp-resend-activation', 'bp_members_login_resend_activation_email' );
+
+/**
  * Kill the wp-signup.php if custom registration signup templates are present
  */
 function bp_core_wpsignup_redirect() {