Changeset 1395

Show
Ignore:
Timestamp:
07/22/08 17:41:46 (5 months ago)
Author:
donncha
Message:

Confirm addition of new users. fixes #630

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/wp-admin/users.php

    r1341 r1395  
    265265                                $location = 'users.php?update=add_existing'; 
    266266                        } else { 
    267                                 add_user_to_blog('', $user_id, $_REQUEST[ 'new_role' ]); 
    268                                 do_action( "added_existing_user", $user_id ); 
     267                                $newuser_key = substr( md5( $user_id ), 0, 5 ); 
     268                                add_option( 'new_user_' . $newuser_key, array( 'user_id' => $user_id, 'email' => $user->user_email, 'role' => $_REQUEST[ 'new_role' ] ) ); 
     269                                wp_mail( $new_user_email, sprintf( __( '[%s] Joining confirmation' ), get_option( 'blogname' ) ), "Hi,\n\nYou have been invited to join '" . get_option( 'blogname' ) . "' at\n" . site_url() . "\nPlease click the following link to confirm the invite:\n" . site_url( "/newbloguser/$newuser_key/" ) ); 
    269270                                $location = 'users.php?update=add'; 
    270271                        } 

  • trunk/wp-includes/wpmu-functions.php

    r1392 r1395  
    19511951} 
    19521952add_filter( 'mce_buttons_2', 'remove_tinymce_media_button' ); 
     1953 
     1954function add_existing_user_to_blog() { 
     1955        if( false !== strpos( $_SERVER[ 'REQUEST_URI' ], '/newbloguser/' ) ) { 
     1956                $parts = explode( '/', $_SERVER[ 'REQUEST_URI' ] ); 
     1957                $key = array_pop( $parts ); 
     1958                if( $key == '' ) 
     1959                        $key = array_pop( $parts ); 
     1960                $details = get_option( "new_user_" . $key ); 
     1961                if( is_array( $details ) ) { 
     1962                        add_user_to_blog( '', $details[ 'user_id' ], $details[ 'role' ] ); 
     1963                        do_action( "added_existing_user", $details[ 'user_id' ] ); 
     1964                        wp_die( 'You have been added to this blog. Please visit the <a href="' . site_url() . '">homepage</a> or <a href="' . site_url( '/wp-admin/' ) . '">login</a> using your username and password.' ); 
     1965                } 
     1966        } 
     1967} 
     1968add_action( 'init', 'add_existing_user_to_blog' ); 
    19531969?>