Ticket #6915: 6915.01.patch

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

@@ -2772 +2772 @@
  * @since 2.5.0
  *
  * @param string $email_type Unique identifier for a particular type of email.
+ * @param array  $r {
+ *     Array of extra parameters.
+ *     @type string $to Required. The email address of the email recipient.
+ * }
  * @return BP_Email|WP_Error BP_Email object, or WP_Error if there was a problem.
  */
-function bp_get_email( $email_type ) {
+function bp_get_email( $email_type, $r = array() ) {
         $switched = false;
 
         // Switch to the root blog, where the email posts live.
@@ -2830 +2834 @@
         $post  = apply_filters( 'bp_get_email_post', $post[0], $email_type, $args, $post );
         $email = new BP_Email( $email_type );
 
+        // Set the 'To:' email address if passed.
+        if ( ! empty( $r['to'] ) ) {
+                $email->set_to( $r['to'] );
+        }
 
         /*
          * Set some email properties for convenience.
@@ -2907 +2915 @@
          * Build the email.
          */
 
-        $email = bp_get_email( $email_type );
+        $email = bp_get_email( $email_type, array(
+                'to' => $to
+        ) );
+
         if ( is_wp_error( $email ) ) {
                 return $email;
         }
 
         // From, subject, content are set automatically.
-        $email->set_to( $to );
         $email->set_tokens( $args['tokens'] );
 
         $status = $email->validate();
@@ -3064 +3074 @@
 }
 
 /**
+ * Check if the email is being sent to a singular user.
+ *
+ * Meant to be used inside email templates only.
+ *
+ * @since 2.5.0
+ */
+function bp_email_is_recipient_to_singular_user() {
+        if ( empty( buddypress()->core->email->to ) ) {
+                return false;
+        }
+
+        $to = buddypress()->core->email->to;
+
+        // More than one user in the 'To:' field, so bail!
+        if ( isset( $to[1] ) ) {
+                return false;
+        }
+
+        $user_id = email_exists( $to[0]->get_address() );
+        if ( ! empty( $user_id ) && bp_is_user_active( $user_id ) ) {
+                return true;
+        } else {
+                return false;
+        }
+}
+
+/**
  * Replace all tokens in the input text with appropriate values.
  *
  * Intended for use with the email system introduced in BuddyPress 2.5.0.

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

@@ -732 +732 @@
                                 ->set_content_html( $this->post_object->post_content )
                                 ->set_content_plaintext( $this->post_object->post_excerpt );
 
+                        // Stash some variables so we can check them in the email template.
+                        buddypress()->core->email = new stdClass;
+                        buddypress()->core->email->to = $this->get_to();
+
                         ob_start();
 
                         // Load the template.
@@ -744 +748 @@
                         $this->set_template( ob_get_contents() );
 
                         ob_end_clean();
+
+                        // Clean up!
+                        unset( buddypress()->core->email );
                 }
 
                 return $this;

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

@@ -1079 +1079 @@
                 return false;
         }
 
+        // Check if account is still pending.
+        $user = get_user_by( 'ID', $user_id );
+        if ( 2 === (int) $user->status ) {
+                return false;
+        }
+
         // Assume true if not spam or deleted.
         return true;
 }

src/bp-templates/bp-legacy/buddypress/assets/emails/single-bp-email.php

@@ -172 +172 @@
                                 <tr>
                                         <td style="padding: 20px; width: 100%; font-size: <?php echo esc_attr( $settings['footer_text_size'] . 'px' ); ?>; font-family: sans-serif; mso-height-rule: exactly; line-height: <?php echo esc_attr( floor( $settings['footer_text_size'] * 1.618 ) . 'px' ) ?>; text-align: left; color: <?php echo esc_attr( $settings['footer_text_color'] ); ?>;" class="footer_text_color footer_text_size">
                                                 <span class="footer_text"><?php echo nl2br( stripslashes( $settings['footer_text'] ) ); ?></span>
-                                                <br><br>
-                                                <a href="{{{unsubscribe}}}" style="text-decoration: underline;"><?php _ex( 'unsubscribe', 'email', 'buddypress' ); ?></a>
+
+                                                <?php if ( bp_email_is_recipient_to_singular_user() ) : ?>
+                                                        <br><br>
+                                                        <a href="{{{unsubscribe}}}" style="text-decoration: underline;"><?php _ex( 'unsubscribe', 'email', 'buddypress' ); ?></a>
+                                                <?php endif; ?>
                                         </td>
                                 </tr>
                         </table>