--- mail_edit_user.inc.orig 2008-07-06 19:02:15.000000000 -0400 +++ mail_edit_user.inc 2009-03-06 23:30:09.000000000 -0500 @@ -2,30 +2,32 @@ // $Id: mail_edit_user.inc,v 1.1.2.1 2008/07/06 23:02:15 litwol Exp $ //hook_mailkeys function user_mailkeys() { return array( 'register_admin_created' => t(' Welcome message for user created by the admin'),//has password 'register_no_approval_required' => t(' Welcome message when user self-registers'),//has password 'register_pending_approval' => t(' Welcome message, user pending admin approval'),//has password + 'register_pending_approval_admin' => t(' Message to admin, user is pending'),//has password 'password_reset' => t(' Password recovery request'), 'status_activated' => t(' Account activated'), 'status_blocked' => t(' Account blocked'), 'status_deleted' => t(' Account deleted'), ); } //hook_mail_edit_tokens_list($mailkey, $options = array()) function user_mail_edit_tokens_list($mailkey, $options = array()) { $tokens = array(); switch ($mailkey) { case 'register_admin_created': case 'register_no_approval_required': case 'register_pending_approval': + case 'register_pending_approval_admin'; $tokens['!password'] = "User's raw password"; case 'password_reset': case 'status_activated': case 'status_blocked': case 'status_deleted': $tokens['!username']= "User's username"; $tokens['!site']= 'Site name'; $tokens['!login_url']= 'One time login URL for password reset';