diff options
| -rw-r--r-- | includes/authentication.php | 6 | ||||
| -rw-r--r-- | login_register.php | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/includes/authentication.php b/includes/authentication.php index e1ff04d333..8dd7f894ff 100644 --- a/includes/authentication.php +++ b/includes/authentication.php @@ -331,7 +331,7 @@ function addMessage($message) { return false; } - $user_id_from=get_user_id($message['from']); + $user_id_from=get_user_by_email($message['from']); $user_id_to =get_user_id($message['to']); require_once WT_ROOT.'includes/functions/functions_mail.php'; @@ -362,9 +362,9 @@ function addMessage($message) { } else { $fromFullName = getUserFullName($user_id_from); if (!get_site_setting('SMTP_SIMPLE_MAIL')) - $from = hex4email($fromFullName, 'UTF-8'). " <".getUserEmail($user_id_from).">"; + $from = hex4email($fromFullName, 'UTF-8'). " <".$message['from'].">"; else - $from = getUserEmail($user_id_from); + $from = $message['from']; $email2 = i18n::translate('You sent the following message to a webtrees user:')."\r\n\r\n".$email2; } diff --git a/login_register.php b/login_register.php index c646185365..73f23fd0cf 100644 --- a/login_register.php +++ b/login_register.php @@ -402,7 +402,8 @@ switch ($action) { $mail_body .= i18n::translate('Hello Administrator ...') . "\r\n\r\n"; $mail_body .= i18n::translate('A prospective user has registered with webtrees at %s.', WT_SERVER_NAME.WT_SCRIPT_PATH) . "\r\n\r\n"; $mail_body .= i18n::translate('User name') . " " . $user_name . "\r\n"; - $mail_body .= i18n::translate('Real name') . " " . $user_realname . "\r\n\r\n"; + $mail_body .= i18n::translate('Real name') . " " . $user_realname . "\r\n"; + $mail_body .= i18n::translate('Email Address:') . " " . $user_email . "\r\n\r\n"; $mail_body .= i18n::translate('Comments').": " . $user_comments . "\r\n\r\n"; $mail_body .= i18n::translate('The user has been sent an e-mail with the information necessary to confirm the access request') . "\r\n\r\n"; if ($REQUIRE_ADMIN_AUTH_REGISTRATION) $mail_body .= i18n::translate('You will be informed by e-mail when this prospective user has confirmed the request. You can then complete the process by activating the user name. The new user will not be able to login until you activate the account.') . "\r\n"; |