Ticket #8139: 8139.07-just-new-parts.patch

src/bp-core/bp-core-filters.php

@@ -1074 +1074 @@
                         'user_id'           => $user_id,
                         'notification_type' => $email->get( 'type' ),
                 );
-                // If this email is not to a current member, include the nonmember's email address.
+
+                // If this email is not to a current member, include the nonmember's email address and the Inviter ID.
                 if ( ! $user_id ) {
                         $args['email_address'] = $tokens['recipient.email'];
+                        $args['member_id']     = bp_loggedin_user_id();
                 }
 
                 $link = bp_email_get_unsubscribe_link( $args );

src/bp-core/bp-core-functions.php

@@ -4027 +4027 @@
                 'description'   => __( 'A site member has sent a site invitation to the recipient.', 'buddypress' ),
                 'unsubscribe'   => array(
                         'meta_key'      => 'notification_bp_members_invite',
-                        'message'       => __( 'You will no longer receive emails when you are invited to join a site.', 'buddypress' ),
+                        'message'       => __( 'You will no longer receive emails when you are invited to join this site.', 'buddypress' ),
                 ),
         );
 
@@ -4071 +4071 @@
         $raw_user_id    = ! empty( $_GET['uid'] ) ? absint( $_GET['uid'] ) : 0;
         $raw_user_email = ! empty( $_GET['uem'] ) ? $_GET['uem'] : '';
         $raw_member_id  = ! empty( $_GET['mid'] ) ? absint( $_GET['mid'] ) : 0;
+        $redirect_to    = '';
 
         $new_hash = '';
         if ( ! empty( $raw_user_id ) ) {
@@ -4109 +4110 @@
         // This is an unsubscribe request from a nonmember.
         } else if ( $raw_user_email ) {
                 // Unsubscribe.
-                error_log( 'caught unsubscribe request {$raw_user_email}' );
-                $optout_args = array(
-                        'email_address' => $raw_user_email,
-                        'user_id'       => $raw_member_id,
-                        'email_type'    => $raw_email_type,
-                        'date_modified' => bp_core_current_time(),
-                );
-                $result      = bp_add_optout( $optout_args );
-                $redirect_to = home_url();
-                $result_msg  = $emails[ $raw_email_type ]['unsubscribe']['message'];
-                $unsub_msg   = __( 'You have been unsubscribed.', 'buddypress' );
+                if ( bp_user_has_opted_out() ) {
+                        $result_msg = $emails[ $raw_email_type ]['unsubscribe']['message'];
+                        $unsub_msg  = __( 'You have already unsubscribed from all communication from this site.', 'buddypress' );
+                } else {
+                        $optout_args = array(
+                                'email_address' => $raw_user_email,
+                                'user_id'       => $raw_member_id,
+                                'email_type'    => $raw_email_type,
+                                'date_modified' => bp_core_current_time(),
+                        );
+                        bp_add_optout( $optout_args );
+                        $result_msg = $emails[ $raw_email_type ]['unsubscribe']['message'];
+                        $unsub_msg  = __( 'You have been unsubscribed.', 'buddypress' );
+                }
 
         // This is an unsubscribe request from a current member.
         } else {
@@ -4141 +4145 @@
                 $unsub_msg  = __( 'You can change this or any other email notification preferences in your email settings.', 'buddypress' );
         }
 
-        $message = sprintf(
-                '%1$s <a href="%2$s">%3$s</a>',
-                $result_msg,
-                esc_url( $redirect_to ),
-                esc_html( $unsub_msg )
-        );
+        if ( $raw_user_id && $redirect_to ) {
+                $message = sprintf(
+                        '%1$s <a href="%2$s">%3$s</a>',
+                        $result_msg,
+                        esc_url( $redirect_to ),
+                        esc_html( $unsub_msg )
+                );
 
-        bp_core_add_message( $message );
+                // Template notices are only displayed on BP pages.
+                bp_core_add_message( $message );
+                bp_core_redirect( bp_core_get_user_domain( $raw_user_id ) );
 
-        $page_redirect = '';
-        if ( $raw_user_id  ) {
-                $page_redirect = bp_core_get_user_domain( $raw_user_id );
+                exit;
+        } else {
+                wp_die(
+                        sprintf( '%1$s %2$s', esc_html( $unsub_msg ), esc_html( $result_msg ) ),
+                        esc_html( $unsub_msg ),
+                        array(
+                                'link_url'  => home_url(),
+                                'link_text' => __( 'Go to website\'s home page.', 'buddypress' ),
+                        )
+                );
         }
-
-        bp_core_redirect( $page_redirect );
-
-        exit;
 }
 
 /**

src/bp-core/classes/class-bp-email.php

@@ -999 +999 @@
                         $retval = new WP_Error( 'missing_parameter', __CLASS__, $this );
                 }
 
+                // Has the user opted out of receiving any email from this site?
+                $recipient_address = array_shift( $this->get_to() )->get_address();
+                if ( bp_user_has_opted_out( $recipient_address ) ) {
+                        $retval = new WP_Error( 'user_has_opted_out', 'The email recipient has opted out from receiving communication from this site.', $this );
+                }
+
                 /**
                  * Filters whether the email passes basic validation checks.
                  *

src/bp-core/classes/class-bp-invitation.php

@@ -660 +660 @@
          *     Associative array of arguments. All arguments but $page and
          *     $per_page can be treated as filter values for get_where_sql()
          *     and get_query_clauses(). All items are optional.
-         *     @type int|array    $id                ID of invitation being updated.
+         *     @type int|array    $id                ID of invitation being fetched.
          *                                           Can be an array of IDs.
          *     @type int|array    $user_id           ID of user being queried. Can be an
          *                                           Can be an array of IDs.

src/bp-members/bp-members-filters.php

@@ -209 +209 @@
                 return $message;
         }
         $invite = bp_get_members_invitation_from_request();
-        if ( ! $invite->id ) {
+        if ( ! $invite->id || ! $invite->invitee_email ) {
                 return $message;
         }
 
-        // Fetch the display names of all inviters to personalize the welcome message.
-        $all_invites = bp_members_invitations_get_invites(
-                array(
+        // Check if the user is already a site member.
+        $maybe_user = get_user_by( 'email', $invite->invitee_email );
+
+        // This user is already a member
+        if ( $maybe_user ) {
+                $message = sprintf( __( 'Welcome! You are already a member of this site. Please <a href="%1s">log in</a> to continue. If you have forgotten your password, you can <a href="%2s">reset it</a>.', 'buddypress' ), wp_login_url( bp_get_root_domain() ), wp_lostpassword_url(  bp_get_root_domain() ) );
+        // This user can register!
+        } else {
+
+                // Fetch the display names of all inviters to personalize the welcome message.
+                $args = array(
                         'invitee_email' => $invite->invitee_email,
                         'invite_sent'   => 'sent',
-                )
-        );
-        $inviters = array();
-        foreach ( $all_invites as $inv ) {
-                $inviters[] = bp_core_get_user_displayname( $inv->inviter_id );
-        }
+                );
+                $all_invites = bp_members_invitations_get_invites( $all_args );
+                $inviters = array();
+                foreach ( $all_invites as $inv ) {
+                        $inviters[] = bp_core_get_user_displayname( $inv->inviter_id );
+                }
 
-        if ( ! empty( $inviters ) ) {
-                $message = sprintf( _n( 'Welcome! You&#8217;ve been invited to join the site by the following user: %s. ', 'Welcome! You&#8217;ve been invited to join the site by the following users: %s. ', count( $inviters ), 'buddypress' ), implode( ', ', $inviters ) );
-        } else {
-                $message = __( 'Welcome! You&#8217;ve been invited to join the site. ', 'buddypress' );
+                if ( ! empty( $inviters ) ) {
+                        $message = sprintf( _n( 'Welcome! You&#8217;ve been invited to join the site by the following user: %s. ', 'Welcome! You&#8217;ve been invited to join the site by the following users: %s. ', count( $inviters ), 'buddypress' ), implode( ', ', $inviters ) );
+                } else {
+                        $message = __( 'Welcome! You&#8217;ve been invited to join the site. ', 'buddypress' );
+                }
         }
+
         return $message;
 }
 
@@ -246 +256 @@
 function bp_members_invitations_get_modified_registration_disabled_message() {
         $message = '';
         if ( bp_get_members_invitations_allowed() ) {
-                $message = __( 'Member registration is allowed by invitation only.', 'buddypress' );
-                // Is the user trying to accept an invitation but something is wrong?
-                if ( ! empty( $_GET['inv'] ) ) {
-                        $message .= __( ' It looks like there is a problem with your invitation. Please try again.', 'buddypress' );
+
+                $invite = bp_get_members_invitation_from_request();
+                if ( ! $invite->id || ! $invite->invitee_email ) {
+                        return $message;
+                }
+
+                // Check if the user is already a site member.
+                $maybe_user = get_user_by( 'email', $invite->invitee_email );
+
+                if ( ! $maybe_user ) {
+                        $message = __( 'Member registration is allowed by invitation only.', 'buddypress' );
+                        // Is the user trying to accept an invitation but something is wrong?
+                        if ( ! empty( $_GET['inv'] ) ) {
+                                $message .= __( ' It looks like there is a problem with your invitation. Please try again.', 'buddypress' );
+                        }
+                } else if ( 'nouveau' === bp_get_theme_package_id() ) {
+                        $message = sprintf( __( 'Welcome! You are already a member of this site. Please <a href="%1s">log in</a> to continue. If you have forgotten your password, you can <a href="%2s">reset it</a>.', 'buddypress' ), wp_login_url( bp_get_root_domain() ), wp_lostpassword_url(  bp_get_root_domain() ) );
                 }
         }
         return $message;

src/bp-members/bp-members-functions.php

@@ -3538 +3538 @@
  */
 function bp_members_invitations_delete_invites( $args ) {
         $r = bp_parse_args( $args, array(
-                'id'            => 0,
+                'id'            => false,
                 'invitee_email' => '',
                 'network_id'    => get_current_network_id(),
                 'inviter_id'    => null,
                 'accepted'      => null,
                 'invite_sent'   => null
-        ), 'community_invitation_delete_invites' );
+        ), 'members_invitations_delete_invites' );
 
         $inv_args = array(
                 'id'            => $r['id'],
                 'invitee_email' => $r['invitee_email'],
                 'item_id'       => $r['network_id'],
                 'inviter_id'    => $r['inviter_id'],
+                'accepted'      => $r['accepted'],
+                'invite_sent'   => $r['invite_sent']
         );
 
         // Find the invitation(s).

src/bp-members/bp-members-invitations.php

@@ -139 +139 @@
 }
 add_action( 'bp_core_signup_user', 'bp_members_invitations_complete_signup', 10, 4 );
 
+/**
+ * Delete site membership invitations when an opt-out request is saved.
+ *
+ * @since 8.0.0
+ *
+ * @param BP_Optout $optout Characteristics of the opt-out just saved.
+ */
+function bp_members_invitations_delete_optedout_invites( $optout ) {
+
+        $args = array(
+                'invitee_email' => $optout->email_address,
+        );
+        bp_members_invitations_delete_invites( $args );
+}
+add_action( 'bp_optout_after_save', 'bp_members_invitations_delete_optedout_invites' );

src/bp-members/bp-members-notifications.php

@@ -21 +21 @@
  * @param string $action            The kind of notification being rendered.
  * @param int    $item_id           The primary item ID.
  * @param int    $secondary_item_id The secondary item ID.
- * @param int    $total_items       The total number of messaging-related notifications
+ * @param int    $total_items       The total number of members-related notifications
  *                                  waiting for the user.
  * @param string $format            'string' for BuddyBar-compatible notifications;
  *                                  'array' for WP Toolbar. Default: 'string'.
@@ -34 +34 @@
 
                         // Set up the string and the filter.
                         if ( (int) $total_items > 1 ) {
-                                $link = bp_get_members_directory_permalink();
-                                /* translators: %d: the number of new users */
-                                $text = sprintf( __( '%d members accepted your membership invitations', 'buddypress' ), (int) $total_items );
+                                $link   = bp_get_notifications_permalink();
                                 $amount = 'multiple';
+
+                                // This is the inviter whose invitation was accepted.
+                                if ( 0 !== (int) $secondary_item_id )  {
+                                        /* translators: %d: the number of new users */
+                                        $text = sprintf( __( '%d members accepted your membership invitations', 'buddypress' ), (int) $total_items );
+                                // This is someone who also invited that user to join.
+                                } else {
+                                        /* translators: %d: the number of new users */
+                                        $text = sprintf( __( '%d members are now members of the site', 'buddypress' ), (int) $total_items );
+                                }
                         } else {
-                                $link = bp_core_get_user_domain( $item_id );
-                                /* translators: %s: new user name */
-                                $text = sprintf( __( '%s accepted your membership invitation', 'buddypress' ),  bp_core_get_user_displayname( $item_id ) );
+                                $link   = add_query_arg( 'welcome', 1, bp_core_get_user_domain( $item_id ) );
                                 $amount = 'single';
-                        }
 
+                                // This is the inviter whose invitation was accepted.
+                                if ( 0 !== (int) $secondary_item_id )  {
+                                        /* translators: %s: new user name */
+                                        $text = sprintf( __( '%s accepted your membership invitation', 'buddypress' ),  bp_core_get_user_displayname( $item_id ) );                             // This is someone who also invited that user to join.
+                                } else {
+                                        /* translators: %s: new user name */
+                                        $text = sprintf( __( '%s is now a member of the site', 'buddypress' ),  bp_core_get_user_displayname( $item_id ) );
+                                }
+                        }
                         break;
         }
 
@@ -103 +117 @@
  */
 function bp_members_invitations_accepted_invitation_notification( $invite, $new_user, $inviter_id ) {
 
-        $res = bp_notifications_add_notification( array(
-                'user_id'           => $inviter_id,
-                'item_id'           => $new_user->ID,
-                'secondary_item_id' => $invite->id,
-                'component_name'    => buddypress()->members->id,
-                'component_action'  => 'accepted_invitation',
-                'date_notified'     => bp_core_current_time(),
-                'is_new'            => 1,
-        ) );
+        // Add "user is a member of the site" notification for other inviters.
+        $args = array(
+                'invitee_email' => $new_user->user_email,
+                'accepted'      => 'all',
+        );
+        $invites = bp_members_invitations_get_invites( $args );
+
+        if ( ! $invites ) {
+                return;
+        }
+        foreach ( $invites as $invite) {
+                // Include the id of the "accepted" invitation.
+                if ( $invite->inviter_id === $inviter_id ) {
+                        $secondary_item_id = $invite->id;
+                } else {
+                        // Else don't store the invite id, so we know this is not the primary.
+                        $secondary_item_id = 0;
+                }
+                $res = bp_notifications_add_notification( array(
+                        'user_id'           => $invite->inviter_id,
+                        'item_id'           => $new_user->ID,
+                        'secondary_item_id' => $secondary_item_id,
+                        'component_name'    => buddypress()->members->id,
+                        'component_action'  => 'accepted_invitation',
+                        'date_notified'     => bp_core_current_time(),
+                        'is_new'            => 1,
+                ) );
+        }
 }
 add_action( 'community_membership_invite_accepted', 'bp_members_invitations_accepted_invitation_notification', 10, 3 );
 
+/**
+ * Mark accepted invitation notifications as read when user visits new user profile.
+ *
+ *
+ * @since 8.0.0
+ */
+function bp_members_mark_read_accepted_invitation_notification() {
+        if ( false === is_singular() || false === is_user_logged_in() || ! bp_is_user() || empty( $_GET['welcome'] ) ) {
+                return;
+        }
+
+        // Mark notification as read.
+        BP_Notifications_Notification::update(
+                array(
+                        'is_new'  => false
+                ),
+                array(
+                        'user_id' => bp_loggedin_user_id(),
+                        'item_id' => bp_displayed_user_id(),
+                )
+        );
+}
+add_action( 'bp_screens', 'bp_members_mark_read_accepted_invitation_notification' );
+
 /**
  * Add Friends-related settings to the Settings > Notifications page.
  *
@@ -127 +184 @@
                 return;
         }
 
-        if ( ! $allow_acceptance_emails = bp_get_user_meta( bp_displayed_user_id(), 'notification_members_invitation_accepted', true ) )
+        if ( ! $allow_acceptance_emails = bp_get_user_meta( bp_displayed_user_id(), 'notification_members_invitation_accepted', true ) ) {
                 $allow_acceptance_emails = 'yes';
+        }
         ?>
 
         <table class="notification-settings" id="members-notification-settings">

src/bp-members/classes/class-bp-members-invitation-manager.php

@@ -112 +112 @@
                                 bp_update_user_meta( $new_user->ID, 'accepted_members_invitation', $invite->id );
 
                                 // We will mark all invitations to this user as "accepted."
-                                $args  = array(
-                                        'invitee_email' => $invite->invitee_email,
-                                        'item_id'       => get_current_network_id(),
-                                        'type'          => 'all'
-                                );
-                                $this->mark_accepted( $args );
+                                if ( ! empty( $invite->invitee_email )  ) {
+                                        $args  = array(
+                                                'invitee_email' => $invite->invitee_email,
+                                                'item_id'       => get_current_network_id(),
+                                                'type'          => 'all'
+                                        );
+                                        $this->mark_accepted( $args );
+                                }
 
                                 /**
                                  * Fires after a user has accepted a site membership invite.
                                  *
                                  * @since 8.0.0
                                  *
-                                 * @param BP_Invitation $invite    Invitation that was accepted.
+                                 * @param BP_Invitation $invite     Invitation that was accepted.
                                  * @param WP_user       $new_user   ID of the user who accepted the membership invite.
                                  * @param int           $inviter_id ID of the user who invited this user to the site.
                                  */

src/bp-members/screens/register.php

@@ -47 +47 @@
         if ( bp_get_members_invitations_allowed() ) {
                 // Check to see if there's a valid invitation.
                 $maybe_invite = bp_get_members_invitation_from_request();
-                if ( $maybe_invite->id ) {
-                        $active_invite = true;
+                if ( $maybe_invite->id && $maybe_invite->invitee_email ) {
+                        // Check if this user is already a member.
+                        $args = array(
+                                'invitee_email' => $maybe_invite->invitee_email,
+                                'accepted'      => 'accepted',
+                                'fields'        => 'ids',
+                        );
+                        $accepted_invites = bp_members_invitations_get_invites( $args );
+                        if ( ! $accepted_invites ) {
+                                $active_invite = true;
+                        }
                 }
         }
 

src/bp-members/screens/send-invites.php

@@ -67 +67 @@
         if ( bp_verify_nonce_request( 'bp_members_invitation_send_' . bp_displayed_user_id() ) && bp_members_invitations_invite_user( $invite_args ) ) {
                 bp_core_add_message( __( 'Invitation successfully sent!', 'buddypress' )          );
         } else {
-                bp_core_add_message( __( 'There was a problem sending that invitation.', 'buddypress' ), 'error' );
+                bp_core_add_message( __( 'There was a problem sending that invitation. The user could already be a member of the site or have chosen not to receive invitations from this site.', 'buddypress' ), 'error' );
         }
 
         // Redirect.

src/bp-templates/bp-legacy/buddypress-functions.php

@@ -2026 +2026 @@
 function bp_members_invitations_add_legacy_welcome_message() {
         $message = bp_members_invitations_get_registration_welcome_message();
         if ( $message ) {
-                echo '<p>' . esc_html( $message ) . '</p>';
+                echo '<p>' . $message . '</p>';
         }
 }
 add_action( 'bp_before_register_page', 'bp_members_invitations_add_legacy_welcome_message' );