Changeset 2773

Timestamp:

02/23/2010 12:01:04 PM (15 years ago)

Author:

apeatling

Message:

Fixes #2043

Location:

branches/1.2

Files:

• bp-core/bp-core-activation.php (modified) (1 diff)
• bp-themes/bp-default/registration/register.php (modified) (2 diffs)

branches/1.2/bp-core/bp-core-activation.php

@@ -76 +76 @@
 add_action( 'wp', 'bp_core_screen_activation', 3 );
 
+/***
+ * bp_core_filter_user_welcome_email()
+ *
+ * Replace the generated password in the welcome email.
+ * This will not filter when the site admin registers a user.
+ */
+function bp_core_filter_user_welcome_email( $welcome_email ) {
+    /* Don't touch the email if we don't have a custom registration template */
+    if ( '' == locate_template( array( 'registration/register.php' ), false ) && '' == locate_template( array( 'register.php' ), false ) )
+        return $welcome_email;
+
+    return str_replace( 'PASSWORD', __( '[User Set]', 'buddypress' ), $welcome_email );
+}
+if ( !is_admin() && empty( $_GET['e'] ) )
+    add_filter( 'update_welcome_user_email', 'bp_core_filter_user_welcome_email' );
 
 /***
- * bp_core_disable_welcome_email()
+ * bp_core_filter_blog_welcome_email()
  *
- * Since the user now chooses their password, sending it over clear-text to an
- * 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.
+ * Replace the generated password in the welcome email.
+ * This will not filter when the site admin registers a user.
  */
-function bp_core_disable_welcome_email() {
+function bp_core_filter_blog_welcome_email( $welcome_email, $blog_id, $user_id, $password ) {
+    /* Don't touch the email if we don't have a custom registration template */
     if ( '' == locate_template( array( 'registration/register.php' ), false ) && '' == locate_template( array( 'register.php' ), false ) )
-        return true;
+        return $welcome_email;
 
-    return false;
+    return str_replace( $password, __( '[User Set]', 'buddypress' ), $welcome_email );
 }
 if ( !is_admin() && empty( $_GET['e'] ) )
-    add_filter( 'wpmu_welcome_user_notification', 'bp_core_disable_welcome_email' );
+    add_filter( 'update_welcome_email', 'bp_core_filter_blog_welcome_email', 10, 4 );
 
 // Notify user of signup success.

branches/1.2/bp-themes/bp-default/registration/register.php

@@ -175 +175 @@
                         <p><input type="checkbox" name="signup_with_blog" id="signup_with_blog" value="1"<?php if ( (int) bp_get_signup_with_blog_value() ) : ?> checked="checked"<?php endif; ?> /> <?php _e( 'Yes, I\'d like to create a new blog', 'buddypress' ) ?></p>
 
-                        <div id="blog-details">
+                        <div id="blog-details"<?php if ( (int) bp_get_signup_with_blog_value() ) : ?>class="show"<?php endif; ?>>
 
                             <label for="signup_blog_url"><?php _e( 'Blog URL', 'buddypress' ) ?> <?php _e( '(required)', 'buddypress' ) ?></label>
@@ -298 +298 @@
     <script type="text/javascript">
         jQuery(document).ready( function() {
-            if ( jQuery('div#blog-details').length )
+            if ( jQuery('div#blog-details').length && !jQuery('div#blog-details').hasClass('show') )
                 jQuery('div#blog-details').toggle();