// The first user may login immediately, and receives a customized welcome e-mail.
if($account->uid==1){
drupal_set_message(t('Welcome to Drupal. You are now logged in as user #1, which gives you full control over your website.'));
if(variable_get('user_email_verification',TRUE)){
drupal_set_message(t('</p><p> Your password is <strong>%pass</strong>. You may change your password below.</p>',array('%pass'=>$pass)));
}
$form_state['values']+=$merge_data;
user_authenticate(array_merge($form_state));
$form_state['redirect']='user/1/edit';
// Add plain text password into user account to generate mail tokens.
$account->password=$pass;
if($admin&&!$notify){
drupal_set_message(t('Created a new user account for <a href="@url">%name</a>. No e-mail has been sent.',array('@url'=>url("user/$account->uid"),'%name'=>$account->name)));
drupal_set_message(t('Registration successful. You are now logged in.'));
$form_state['redirect']='';
return;
}
else{
// Add plain text password into user account to generate mail tokens.
$account->password=$pass;
if($admin&&!$notify){
drupal_set_message(t('Created a new user account for <a href="@url">%name</a>. No e-mail has been sent.',array('@url'=>url("user/$account->uid"),'%name'=>$account->name)));
drupal_set_message(t('Password and further instructions have been e-mailed to the new user <a href="@url">%name</a>.',array('@url'=>url("user/$account->uid"),'%name'=>$account->name)));
}
else{
drupal_set_message(t('Your password and further instructions have been sent to your e-mail address.'));
$form_state['redirect']='';
return;
}
elseif($account->status||$notify){
// Create new user account, no administrator approval required.
drupal_set_message(t('Password and further instructions have been e-mailed to the new user <a href="@url">%name</a>.',array('@url'=>url("user/$account->uid"),'%name'=>$account->name)));
}
else{
// Create new user account, administrator approval required.
drupal_set_message(t('Thank you for applying for an account. Your account is currently pending approval by the site administrator.<br />In the meantime, a welcome message with further instructions has been sent to your e-mail address.'));
drupal_set_message(t('Your password and further instructions have been sent to your e-mail address.'));
$form_state['redirect']='';
return;
}
}
else{
// Create new user account, administrator approval required.
drupal_set_message(t('Thank you for applying for an account. Your account is currently pending approval by the site administrator.<br />In the meantime, a welcome message with further instructions has been sent to your e-mail address.'));
@@ -5,109 +5,130 @@ class UserRegistrationTestCase extends DrupalWebTestCase {
publicstaticfunctiongetInfo(){
returnarray(
'name'=>'User registration',
'description'=>'Registers a user, fails login, resets password, successfully logs in with the one time password, fails password change, changes password, logs out, successfully logs in with the new password, visits profile page.',
'description'=>'Test registration of user under different configurations.',
'group'=>'User'
);
}
/**
* Registers a user, fails login, resets password, successfully logs in with the one time password,
* changes password, logs out, successfully logs in with the new password, visits profile page.
*
* Assumes that the profile module is disabled.
*/
functiontestUserRegistration(){
// Set user registration to "Visitors can create accounts and no administrator approval is required."
functiontestRegistrationWithEmailVerification(){
// Require e-mail verification.
variable_set('user_email_verification',TRUE);
// Set registration to administrator only.
variable_set('user_register',0);
$this->drupalGet('user/register');
$this->assertResponse(403,t('Registration page is inaccessible when only administrators can create accounts.'));
// Allow registration by site visitors without administrator approval.
variable_set('user_register',1);
// Enable user-configurable time zones, and set the default time zone to Brussels time.
$this->assertTrue($new_user->status,t('New account is active after registration.'));
// Allow registration by site visitors, but require administrator approval.
variable_set('user_register',2);
$edit=array();
$edit['name']=$name;
$edit['pass']='foo';
$this->drupalPost('user',$edit,t('Log in'));
$this->assertText(t('Sorry, unrecognized username or password. Have you forgotten your password?'),t('Invalid login attempt failed.'));
// Login using password reset page.
$url=user_pass_reset_url($user);
$this->drupalGet($url);
$this->assertText(t('This login can be used only once.'),t('Login can be used only once.'));
$this->drupalPost(NULL,NULL,t('Log in'));
$this->assertText(t('You have just used your one-time login link. It is no longer necessary to use this link to login. Please change your password.'),t('This link is no longer valid.'));
// Check password type validation
$edit['name']=$name=$this->randomName();
$edit['mail']=$mail=$edit['name'].'@example.com';
$this->drupalPost('user/register',$edit,t('Create new account'));
$this->assertText(t('Registration successful. You are now logged in.'),t('Users are logged in after registering.'));
$this->drupalLogout();
// Allow registration by site visitors, but require administrator approval.
variable_set('user_register',2);
$edit=array();
$edit['name']=$user->name;
$edit['pass']=$new_pass;
$this->drupalPost('user',$edit,t('Log in'));
$this->assertText(t('Log out'),t('Logged in.'));
$edit['name']=$name=$this->randomName();
$edit['mail']=$mail=$edit['name'].'@example.com';
$edit['pass[pass1]']=$pass=$this->randomName();
$edit['pass[pass2]']=$pass;
$this->drupalPost('user/register',$edit,t('Create new account'));
$this->assertText(t('Thank you for applying for an account. Your account is currently pending approval by the site administrator.'),t('Users are notified of pending approval'));
