Changeset 2635 for trunk/bp-core/bp-core-activation.php

Timestamp:

02/08/2010 04:24:52 PM (16 years ago)

Author:

apeatling

Message:

Fixes #1854

File:

• trunk/bp-core/bp-core-activation.php (modified) (5 diffs)

trunk/bp-core/bp-core-activation.php

@@ -83 +83 @@
  * email address is no longer necessary. It's also a terrible idea security wise.
  *
+ * The only exception to this is when an admin has generated an account for a user.
+ *
  * This will only disable the email if a custom registration template is being used.
  */
@@ -91 +93 @@
         return false;
 }
-add_filter( 'wpmu_welcome_user_notification', 'bp_core_disable_welcome_email' );
+if ( !is_admin() && empty( $_GET['e'] ) )
+        add_filter( 'wpmu_welcome_user_notification', 'bp_core_disable_welcome_email' );
 
 // Notify user of signup success.
@@ -116 +119 @@
         return false;
 }
-add_filter( 'wpmu_signup_blog_notification', 'bp_core_activation_signup_blog_notification', 1, 7 );
+if ( !is_admin() )
+        add_filter( 'wpmu_signup_blog_notification', 'bp_core_activation_signup_blog_notification', 1, 7 );
 
 function bp_core_activation_signup_user_notification( $user, $user_email, $key, $meta ) {
@@ -128 +132 @@
                 $admin_email = 'support@' . $_SERVER['SERVER_NAME'];
 
+        /* If this is an admin generated activation, add a param to email the user login details */
+        if ( is_admin() )
+                $email = '&e=1';
+
         $from_name = ( '' == get_site_option( "site_name" ) ) ? 'WordPress' : wp_specialchars( get_site_option( "site_name" ) );
         $message_headers = "MIME-Version: 1.0\n" . "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
-        $message = sprintf( __( "Thanks for registering! To complete the activation of your account please click the following link:\n\n%s\n\n", 'buddypress' ), $activate_url, clean_url("http://{$domain}{$path}" ) );
+        $message = sprintf( __( "Thanks for registering! To complete the activation of your account please click the following link:\n\n%s\n\n", 'buddypress' ), $activate_url . $email, clean_url("http://{$domain}{$path}" ) );
         $subject = '[' . $from_name . '] ' . __( 'Activate Your Account', 'buddypress' );
 
@@ -138 +146 @@
         return false;
 }
-add_filter( 'wpmu_signup_user_notification', 'bp_core_activation_signup_user_notification', 1, 4 );
+if ( !is_admin() || ( is_admin() && empty( $_POST['noconfirmation'] ) ) )
+        add_filter( 'wpmu_signup_user_notification', 'bp_core_activation_signup_user_notification', 1, 4 );
 
 ?>