From 483e8707ac618e5c339fd6d2c5c07b5e3274c9fe Mon Sep 17 00:00:00 2001 From: David Anderson Date: Wed, 25 Mar 2015 16:42:00 -0700 Subject: [PATCH] In reset-password email, use URL_BASE rather than master URL --- html/inc/email.inc | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/html/inc/email.inc b/html/inc/email.inc index 946764280f..65a22c0c61 100644 --- a/html/inc/email.inc +++ b/html/inc/email.inc @@ -22,9 +22,6 @@ require_once("../inc/util.inc"); require_once("../project/project.inc"); -$config = get_config(); -$master_url = parse_config($config, ""); - // send an email, using PHPMailer or not. // function send_email($user, $subject, $body, $body_html=null) { @@ -67,7 +64,6 @@ function send_email($user, $subject, $body, $body_html=null) { // 3) the user requested account key for existing account // function send_auth_email($user) { - global $master_url; $body = ""; $now = time(); @@ -77,14 +73,14 @@ function send_auth_email($user) { $body = "This email was sent in response to a request on the ".PROJECT." web site. To log in to your ".PROJECT." account, visit: -".$master_url."login_action.php?id=$user->id&t=$now&h=$x +".URL_BASE."login_action.php?id=$user->id&t=$now&h=$x (This link is valid for 1 day). After logging in, you can change your account's password or email address. "; $body .= " For further information and assistance with ".PROJECT.", visit -$master_url +".URL_BASE." "; return send_email($user, $subject, $body);