watchdog('user',t('Password reset instructions mailed to %name at %email.',array('%name'=>'<em>'.$account->name.'</em>','%email'=>'<em>'.$account->mail.'</em>')));
...
...
@@ -1277,7 +1217,7 @@ function user_register_submit($form_id, $form_values) {
// The first user may login immediately, and receives a customized welcome e-mail.
if($account->uid==1){
user_mail($mail,t('Drupal user account details for %s',array('%s'=>$name)),strtr(t("%username,\n\nYou may now login to %uri using the following username and password:\n\n username: %username\n password: %password\n\n%edit_uri\n\n--drupal"),$variables),"From: $from\nReply-to: $from\nX-Mailer: Drupal\nReturn-path: $from\nErrors-to: $from");
drupal_mail('user-register-admin',$mail,t('Drupal user account details for %s',array('%s'=>$name)),strtr(t("%username,\n\nYou may now login to %uri using the following username and password:\n\n username: %username\n password: %password\n\n%edit_uri\n\n--drupal"),$variables),$from);
drupal_set_message(t('<p>Welcome to Drupal. You are user #1, which gives you full and immediate access. All future registrants will receive their passwords via e-mail, so please make sure your website e-mail address is set properly under the general settings on the <a href="%settings">settings page</a>.</p><p> Your password is <strong>%pass</strong>. You may change your password below.</p>',array('%pass'=>$pass,'%settings'=>url('admin/settings'))));
user_authenticate($account->name,trim($pass));
...
...
@@ -1296,7 +1236,7 @@ function user_register_submit($form_id, $form_values) {
user_mail(variable_get('site_mail',ini_get('sendmail_from')),$subject,t("%u has applied for an account.\n\n%uri",array('%u'=>$account->name,'%uri'=>url("user/$account->uid/edit",NULL,NULL,TRUE))),"From: $from\nReply-to: $from\nX-Mailer: Drupal\nReturn-path: $from\nErrors-to: $from");
drupal_mail('user-register-approval-admin',$from,$subject,t("%u has applied for an account.\n\n%uri",array('%u'=>$account->name,'%uri'=>url("user/$account->uid/edit",NULL,NULL,TRUE))),$from);
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, your password and further instructions have been sent to your e-mail address.'));
watchdog('user',t('Password reset instructions mailed to %name at %email.',array('%name'=>'<em>'.$account->name.'</em>','%email'=>'<em>'.$account->mail.'</em>')));
...
...
@@ -1277,7 +1217,7 @@ function user_register_submit($form_id, $form_values) {
// The first user may login immediately, and receives a customized welcome e-mail.
if($account->uid==1){
user_mail($mail,t('Drupal user account details for %s',array('%s'=>$name)),strtr(t("%username,\n\nYou may now login to %uri using the following username and password:\n\n username: %username\n password: %password\n\n%edit_uri\n\n--drupal"),$variables),"From: $from\nReply-to: $from\nX-Mailer: Drupal\nReturn-path: $from\nErrors-to: $from");
drupal_mail('user-register-admin',$mail,t('Drupal user account details for %s',array('%s'=>$name)),strtr(t("%username,\n\nYou may now login to %uri using the following username and password:\n\n username: %username\n password: %password\n\n%edit_uri\n\n--drupal"),$variables),$from);
drupal_set_message(t('<p>Welcome to Drupal. You are user #1, which gives you full and immediate access. All future registrants will receive their passwords via e-mail, so please make sure your website e-mail address is set properly under the general settings on the <a href="%settings">settings page</a>.</p><p> Your password is <strong>%pass</strong>. You may change your password below.</p>',array('%pass'=>$pass,'%settings'=>url('admin/settings'))));
user_authenticate($account->name,trim($pass));
...
...
@@ -1296,7 +1236,7 @@ function user_register_submit($form_id, $form_values) {
user_mail(variable_get('site_mail',ini_get('sendmail_from')),$subject,t("%u has applied for an account.\n\n%uri",array('%u'=>$account->name,'%uri'=>url("user/$account->uid/edit",NULL,NULL,TRUE))),"From: $from\nReply-to: $from\nX-Mailer: Drupal\nReturn-path: $from\nErrors-to: $from");
drupal_mail('user-register-approval-admin',$from,$subject,t("%u has applied for an account.\n\n%uri",array('%u'=>$account->name,'%uri'=>url("user/$account->uid/edit",NULL,NULL,TRUE))),$from);
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, your password and further instructions have been sent to your e-mail address.'));