Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

In reset-password email, use URL_BASE rather than master URL

This commit is contained in:
David Anderson 2015-03-25 16:42:00 -07:00
parent 20875a10e4
commit 483e8707ac
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
html/inc/email.inc
View File

@ -22,9 +22,6 @@
require_once("../inc/util.inc"); require_once("../inc/util.inc");
require_once("../project/project.inc"); require_once("../project/project.inc");
$config = get_config();
$master_url = parse_config($config, "<master_url>");
// send an email, using PHPMailer or not. // send an email, using PHPMailer or not.
// //
function send_email($user, $subject, $body, $body_html=null) { 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 // 3) the user requested account key for existing account
// //
function send_auth_email($user) { function send_auth_email($user) {
global $master_url;
$body = ""; $body = "";
$now = time(); $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. $body = "This email was sent in response to a request on the ".PROJECT." web site.
To log in to your ".PROJECT." account, visit: 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). (This link is valid for 1 day).
After logging in, you can change your account's password or email address. After logging in, you can change your account's password or email address.
"; ";
$body .= " $body .= "
For further information and assistance with ".PROJECT.", visit For further information and assistance with ".PROJECT.", visit
$master_url ".URL_BASE."
"; ";
return send_email($user, $subject, $body); return send_email($user, $subject, $body);