mirror of https://github.com/BOINC/boinc.git
*** empty log message ***
svn path=/trunk/boinc/; revision=11723
This commit is contained in:
David Anderson
parent
80c401e946
commit
f4953d1829
|
|
@ -13695,3 +13695,18 @@ David 25 Dec 2006
|
|||
boinc_cmd.C
|
||||
gui_rpc_client.h
|
||||
gui_rpc_client_ops.C
|
||||
|
||||
David 27 Dec 2006
|
||||
- deprecate the email_validated field of user table.
|
||||
This isn't used for anything, and confuses users.
|
||||
|
||||
db/
|
||||
boinc_db.h
|
||||
html/
|
||||
inc/
|
||||
db_ops.inc
|
||||
email.inc
|
||||
user/
|
||||
am_set_info.php
|
||||
edit_email_action.php
|
||||
validate_email.php (removed)
|
||||
|
|
|
|||
|
|
@ -157,7 +157,7 @@ struct USER {
|
|||
bool has_profile;
|
||||
char cross_project_id[256];
|
||||
char passwd_hash[256];
|
||||
bool email_validated;
|
||||
bool email_validated; // deprecated
|
||||
int donated;
|
||||
void clear();
|
||||
};
|
||||
|
|
|
|||
|
|
@ -169,11 +169,10 @@ list_option("fuh_debug_level",
|
|||
list_end();
|
||||
echo "
|
||||
<h3>Credit</h3>
|
||||
(See also the command-line options of the <a href=validate.php>validator</a>).
|
||||
";
|
||||
echo html_text("
|
||||
[ <fp_benchmark_weight> X </fp_benchmark_weight> ]
|
||||
[ <max_claimed_credit>X</max_claimed_credit ]
|
||||
[ <grant_claimed_credit/> ]
|
||||
");
|
||||
list_start();
|
||||
list_option("fp_benchmark_weight",
|
||||
|
|
|
|||
|
|
@ -19,14 +19,14 @@ $biomed = array(
|
|||
"To predict protein structure and function from genetic sequences, using the \'Brownian Dynamics\' (BD) method. This method enables us to simulate more efficiently than conventional methods.",
|
||||
"tanpaku.jpg"
|
||||
),
|
||||
array(
|
||||
"Predictor@home",
|
||||
"http://predictor.scripps.edu",
|
||||
"Scripps Research Institute",
|
||||
"Biology",
|
||||
"Protein structure prediction starts from a sequence of amino acids and attempts to predict the folded, functioning, form of the protein. Predicting the structure of an unknown protein is a critical problem in enabling structure-based drug design to treat new and existing diseases.",
|
||||
"predictor.jpg"
|
||||
),
|
||||
// array(
|
||||
// "Predictor@home",
|
||||
// "http://predictor.scripps.edu",
|
||||
// "Scripps Research Institute",
|
||||
// "Biology",
|
||||
// "Protein structure prediction starts from a sequence of amino acids and attempts to predict the folded, functioning, form of the protein. Predicting the structure of an unknown protein is a critical problem in enabling structure-based drug design to treat new and existing diseases.",
|
||||
// "predictor.jpg"
|
||||
// ),
|
||||
array(
|
||||
"Rosetta@home",
|
||||
"http://boinc.bakerlab.org/rosetta/",
|
||||
|
|
|
|||
|
|
@ -1244,7 +1244,6 @@ function show_user($user) {
|
|||
row("Hosts", "<a href=\"db_action.php?table=host&userid=$user->id&detail=low\">click</a>");
|
||||
row("Cross project ID", $user->cross_project_id);
|
||||
row("Password Hash", $user->passwd_hash);
|
||||
row("Email Validated", $user->email_validated);
|
||||
row("Donated", $user->donated);
|
||||
end_table();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -47,18 +47,6 @@ function send_email($user, $subject, $body, $body_html=null) {
|
|||
}
|
||||
}
|
||||
|
||||
function send_verify_email($old, $new, $user) {
|
||||
$x = md5($new.$user->authenticator);
|
||||
mail(
|
||||
$new,
|
||||
PROJECT." account email change",
|
||||
"The email address of your " . PROJECT . " account has been changed from $old to $new.
|
||||
To validate the new address, visit the URL:
|
||||
".URL_BASE."validate_email.php?u=$user->id&x=$x
|
||||
"
|
||||
);
|
||||
}
|
||||
|
||||
// Send an email describing an account to the user.
|
||||
// There are a few scenarios:
|
||||
//
|
||||
|
|
|
|||
|
|
@ -124,9 +124,6 @@ if (strlen($query)) {
|
|||
$query = "update user set $query seti_id=seti_id where id=$user->id";
|
||||
$result = mysql_query($query);
|
||||
if ($result) {
|
||||
if ($old_email_addr) {
|
||||
send_verify_email($old_email_addr, $email_addr, $user);
|
||||
}
|
||||
success("");
|
||||
} else {
|
||||
xml_error(-1, "database error: ".mysql_error());
|
||||
|
|
|
|||
|
|
@ -35,18 +35,12 @@ if (!is_valid_email_addr($email_addr)) {
|
|||
echo "Invalid password.";
|
||||
} else {
|
||||
$passwd_hash = md5($passwd.$email_addr);
|
||||
$query = "update user set email_addr='$email_addr', passwd_hash='$passwd_hash', email_validated=0 where id=$user->id";
|
||||
$query = "update user set email_addr='$email_addr', passwd_hash='$passwd_hash' where id=$user->id";
|
||||
$result = mysql_query($query);
|
||||
if ($result) {
|
||||
echo "
|
||||
The email address of your account is now
|
||||
$email_addr.
|
||||
<p>
|
||||
We have sent an email message to that address.
|
||||
<p>
|
||||
To validate the new address, visit the link in the email.
|
||||
The email address of your account is now $email_addr.
|
||||
";
|
||||
send_verify_email($user->email_addr, $email_addr, $user);
|
||||
} else {
|
||||
echo "
|
||||
We can't update your email address
|
||||
|
|
|
|||
|
|
@ -1,33 +0,0 @@
|
|||
<?php
|
||||
|
||||
require_once("../inc/db.inc");
|
||||
require_once("../inc/util.inc");
|
||||
|
||||
db_init();
|
||||
$user = get_logged_in_user();
|
||||
|
||||
$x = process_user_text(get_str("x"));
|
||||
$u = process_user_text(get_int("u"));
|
||||
|
||||
$user = lookup_user_id($u);
|
||||
if (!$user) {
|
||||
error_page("No such user.\n");
|
||||
}
|
||||
|
||||
$x2 = md5($user->email_addr.$user->authenticator);
|
||||
if ($x2 != $x) {
|
||||
error_page("Error in URL data - can't validate email address");
|
||||
}
|
||||
|
||||
$result = mysql_query("update user set email_validated=1 where id=$user->id");
|
||||
if (!$result) {
|
||||
error_page("Database update failed - please try again later.");
|
||||
}
|
||||
|
||||
page_head("Validate email address");
|
||||
echo "
|
||||
The email address of your account has been validated.
|
||||
";
|
||||
page_tail();
|
||||
|
||||
?>
|
||||
Loading…
Reference in New Issue