Changeset 2635

Timestamp:

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

Author:

apeatling

Message:

Fixes #1854

Location:

trunk

Files:

• bp-core.php (modified) (1 diff)
• bp-core/bp-core-activation.php (modified) (5 diffs)
• bp-themes/bp-default/functions.php (modified) (1 diff)
• bp-themes/bp-default/registration/activate.php (modified) (1 diff)
• bp-xprofile/bp-xprofile-templatetags.php (modified) (1 diff)

trunk/bp-core.php

@@ -2053 +2053 @@
         global $bp;
 
-        if ( false === strpos( wp_get_referer(), 'wp-login.php' ) && empty( $_REQUEST['nr'] ) )
+        if ( false === strpos( wp_get_referer(), 'wp-login.php' ) && false === strpos( wp_get_referer(), 'activate' ) && empty( $_REQUEST['nr'] ) )
                 return wp_get_referer();
 

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 );
 
 ?>

trunk/bp-themes/bp-default/functions.php

@@ -208 +208 @@
 function bp_dtheme_show_notice() { ?>
         <div id="message" class="updated fade">
-                <p><?php printf( __( 'Theme activated! This theme contains <a href="%s">customization options</a> and <a href="%s">custom header image</a> support. <a href="%s">Sidebar widgets</a> are also supported.', 'buddypress' ), admin_url( 'themes.php?page=theme-options-page' ), admin_url( 'themes.php?page=custom-header' ), admin_url( 'widgets.php' ) ) ?></p>
+                <p><?php printf( __( 'Theme activated! This theme contains <a href="%s">custom header image</a> support and <a href="%s">sidebar widgets</a>.', 'buddypress' ), admin_url( 'themes.php?page=custom-header' ), admin_url( 'widgets.php' ) ) ?></p>
         </div>
 

trunk/bp-themes/bp-default/registration/activate.php

@@ -18 +18 @@
                                 <?php do_action( 'bp_before_activate_content' ) ?>
 
-                                <p><?php _e( 'Your account was activated successfully! You can now log in with the username and password you provided when you signed up.', 'buddypress' ) ?></p>
-
+                                <?php if ( isset( $_GET['e'] ) ) : ?>
+                                        <p><?php _e( 'Your account was activated successfully! Your account details have been sent to you in a separate email.', 'buddypress' ) ?></p>
+                                <?php else : ?>
+                                        <p><?php _e( 'Your account was activated successfully! You can now log in with the username and password you provided when you signed up.', 'buddypress' ) ?></p>
+                                <?php endif; ?>
 
                         <?php else : ?>

trunk/bp-xprofile/bp-xprofile-templatetags.php

@@ -454 +454 @@
 
                                 /* Check for updated posted values, but errors preventing them from being saved first time */
-                                if ( isset( $_POST['field_' . $field->id . '_day'] ) && $day != $_POST['field_' . $field->id . '_day'] ) {
-                                        if ( !empty( $_POST['field_' . $field->id . '_day'] ) )
+                                if ( !empty( $_POST['field_' . $field->id . '_day'] ) ) {
+                                        if ( $day != $_POST['field_' . $field->id . '_day'] )
                                                 $day = $_POST['field_' . $field->id . '_day'];
                                 }
 
-                                if ( isset( $_POST['field_' . $field->id . '_month'] ) && $month != $_POST['field_' . $field->id . '_month'] ) {
-                                        if ( !empty( $_POST['field_' . $field->id . '_month'] ) )
+                                if ( !empty( $_POST['field_' . $field->id . '_month'] ) ) {
+                                        if ( $month != $_POST['field_' . $field->id . '_month'] )
                                                 $month = $_POST['field_' . $field->id . '_month'];
                                 }
 
-                                if ( isset( $_POST['field_' . $field->id . '_year'] ) && $year != date("j", $_POST['field_' . $field->id . '_year'] ) ) {
-                                        if ( !empty( $_POST['field_' . $field->id . '_year'] ) )
+                                if ( !empty( $_POST['field_' . $field->id . '_year'] ) ) {
+                                        if ( $year != date( "j", $_POST['field_' . $field->id . '_year'] ) )
                                                 $year = $_POST['field_' . $field->id . '_year'];
                                 }