Ticket #2265: revalidation.diff

src/bp-settings/bp-settings-actions.php

@@ -89 +89 @@
                                 }
 
                                 // Yay we made it!
+                                //Code taked from WordPress
                                 if ( false === $email_error ) {
-                                        $update_user->user_email = $user_email;
-                                        $email_changed = true;
+                                        $hash = md5( $_POST['email'] . time() . mt_rand() );
+                        $new_user_email = array(
+                                        'hash' => $hash,
+                                        'newemail' => $_POST['email']
+                                        );
+                        update_option( bp_displayed_user_id() . '_new_email', $new_user_email );
+        
+                        $email_text = __( 'Dear user,
+        
+You recently requested to have the email address on your account changed.
+If this is correct, please click on the following link to change it:
+###ADMIN_URL###
+        
+You can safely ignore and delete this email if you do not want to
+take this action.
+        
+This email has been sent to ###EMAIL###
+        
+Regards,
+All at ###SITENAME###
+###SITEURL###', 'buddypress' );
+        
+                        /**
+                         * Filter the email text sent when a user changes emails.
+                         *
+                         * The following strings have a special meaning and will get replaced dynamically:
+                         * ###ADMIN_URL### The link to click on to confirm the email change. Required otherwise this functunalty is will break.
+                         * ###EMAIL### The new email.
+                         * ###SITENAME### The name of the site.
+                         * ###SITEURL### The URL to the site.
+                         *
+                         * @since MU
+                         *
+                         * @param string $email_text     Text in the email.
+                         * @param string $new_user_email New user email that the current user has changed to.
+                         */
+                        $content = apply_filters( 'bp_new_user_email_content', $email_text, $new_user_email );
+        
+                        $content = str_replace( '###ADMIN_URL###', esc_url( bp_displayed_user_domain() . bp_get_settings_slug() . '/?newuseremail=' .$hash ), $content );
+                        $content = str_replace( '###EMAIL###', $_POST['email'], $content);
+                        $content = str_replace( '###SITENAME###', get_site_option( 'site_name' ), $content );
+                        $content = str_replace( '###SITEURL###', network_home_url(), $content );
+        
+                        wp_mail( $_POST['email'], sprintf( __( '[%s] New Email Address' ), wp_specialchars_decode( get_option( 'blogname' ) ) ), $content );
+                        $_POST['email'] = $current_user->user_email;
+                        $email_changed = true;
                                 }
 
                         // No change
@@ -355 +400 @@
         }
 }
 add_action( 'bp_actions', 'bp_settings_action_delete_account' );
+
+function bp_user_update_email(){
+
+        global $wpdb, $bp;
+        if ( ( isset( $_GET[ 'newuseremail' ] ) ) && ( bp_current_component() == 'settings' ) ) {
+                                        $new_email = get_option( bp_displayed_user_id() . '_new_email' );
+                                        if ( $new_email[ 'hash' ] == $_GET[ 'newuseremail' ] ) {
+                                        $user = new stdClass;
+                                                $user->ID = bp_displayed_user_id();
+                                                $user->user_name = bp_core_get_username($user->ID);
+                                                $user->user_email = esc_html( trim( $new_email[ 'newemail' ] ) );
+                                                if ( $wpdb->get_var( $wpdb->prepare( "SELECT user_login FROM {$wpdb->signups} WHERE user_login = %s", $user->user_name ) ) )
+                                                                $wpdb->query( $wpdb->prepare( "UPDATE {$wpdb->signups} SET user_email = %s WHERE user_login = %s", $user->user_email, $user->user_name ) );
+                                                wp_update_user( $user );
+                                                $email_changed = true;
+                                                delete_option( bp_displayed_user_id() . '_new_email' );
+                                                wp_redirect( esc_url( bp_displayed_user_domain() . bp_get_settings_slug() . '/?emailupdated=OK') );
+                                                die();
+                                                }
+        } elseif ( !empty( $_GET['dismiss'] ) && bp_is_my_profile() && ( bp_displayed_user_id() . '_new_email' == $_GET['dismiss'] ) ) {
+                delete_option( bp_displayed_user_id() . '_new_email' );
+                wp_redirect( add_query_arg( array('updated' => 'true'), esc_url( bp_displayed_user_domain() . bp_get_settings_slug() . '/') ) );
+                die();
+        }
+}
+
+add_action ('init', 'bp_user_update_email');

src/bp-templates/bp-legacy/buddypress/members/single/settings/general.php

@@ -11 +11 @@
 
         <label for="email"><?php _e( 'Account Email', 'buddypress' ); ?></label>
         <input type="text" name="email" id="email" value="<?php echo bp_get_displayed_user_email(); ?>" class="settings-input" />
-
+        <?php   
+if ( bp_is_my_profile() ) {
+                                                $new_email = get_option( bp_displayed_user_id() . '_new_email' );
+                                                if ( $new_email && $new_email['newemail'] != bp_get_displayed_user_email() ) { ?>
+                                                <div id="message" class="bp-template-notice error">
+                                                        <p><?php printf( __('There is a pending change of your e-mail to <code>%1$s</code>. <a href="%2$s">Cancel</a>'), $new_email['newemail'], esc_url( bp_displayed_user_domain() . bp_get_settings_slug() . '/?dismiss=' . bp_displayed_user_id() . '_new_email' ) ); ?></p>
+                                                </div>
+                                        <?php }
+                                                if ( isset( $_GET[ 'emailupdated' ] ) ) { ?>
+                                                <div id="message" class="bp-template-notice updated">
+                                                        <p><?php printf( __('Email updates successfully'), 'buddypress' ); ?></p>
+                                                </div>
+                                        <?php }
+}?>
         <label for="pass1"><?php _e( 'Change Password <span>(leave blank for no change)</span>', 'buddypress' ); ?></label>
         <input type="password" name="pass1" id="pass1" size="16" value="" class="settings-input small" /> &nbsp;<?php _e( 'New Password', 'buddypress' ); ?><br />
         <input type="password" name="pass2" id="pass2" size="16" value="" class="settings-input small" /> &nbsp;<?php _e( 'Repeat New Password', 'buddypress' ); ?>

src/bp-themes/bp-default/members/single/settings/general.php

@@ -61 +61 @@
 
                                         <label for="email"><?php _e( 'Account Email', 'buddypress' ); ?></label>
                                         <input type="text" name="email" id="email" value="<?php echo bp_get_displayed_user_email(); ?>" class="settings-input" />
-
+                                        <?php   
+if ( bp_is_my_profile() ) {
+                                                $new_email = get_option( bp_displayed_user_id() . '_new_email' );
+                                                if ( $new_email && $new_email['newemail'] != bp_get_displayed_user_email() ) { ?>
+                                                <div id="message" class="bp-template-notice error">
+                                                        <p><?php printf( __('There is a pending change of your e-mail to <code>%1$s</code>. <a href="%2$s">Cancel</a>'), $new_email['newemail'], esc_url( self_admin_url( bp_displayed_user_domain() . bp_get_settings_slug() . '/?dismiss=' . bp_displayed_user_id() . '_new_email' ) ) ); ?></p>
+                                                </div>
+                                        <?php }
+                                                if ( isset( $_GET[ 'emailupdated' ] ) ) { ?>
+                                                <div id="message" class="bp-template-notice updated">
+                                                        <p><?php printf( __('Email updates successfully'), 'buddypress' ); ?></p>
+                                                </div>
+                                        <?php }
+}?>
                                         <label for="pass1"><?php _e( 'Change Password <span>(leave blank for no change)</span>', 'buddypress' ); ?></label>
                                         <input type="password" name="pass1" id="pass1" size="16" value="" class="settings-input small" /> &nbsp;<?php _e( 'New Password', 'buddypress' ); ?><br />
                                         <input type="password" name="pass2" id="pass2" size="16" value="" class="settings-input small" /> &nbsp;<?php _e( 'Repeat New Password', 'buddypress' ); ?>