diff --git a/checkin_notes b/checkin_notes index f406bdaf25..0b0020946b 100755 --- a/checkin_notes +++ b/checkin_notes @@ -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) diff --git a/db/boinc_db.h b/db/boinc_db.h index b2bf6d2e90..e06da23d46 100755 --- a/db/boinc_db.h +++ b/db/boinc_db.h @@ -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(); }; diff --git a/doc/project_options.php b/doc/project_options.php index 7530835292..3c80d62528 100644 --- a/doc/project_options.php +++ b/doc/project_options.php @@ -169,11 +169,10 @@ list_option("fuh_debug_level", list_end(); echo "

Credit

+(See also the command-line options of the validator). "; echo html_text(" [ X ] -[ X ] "); list_start(); list_option("fp_benchmark_weight", diff --git a/doc/projects.inc b/doc/projects.inc index dc6380bfb0..4c3685cf36 100644 --- a/doc/projects.inc +++ b/doc/projects.inc @@ -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/", diff --git a/html/inc/db_ops.inc b/html/inc/db_ops.inc index e1a80cfc40..ff2cbb752f 100644 --- a/html/inc/db_ops.inc +++ b/html/inc/db_ops.inc @@ -1244,7 +1244,6 @@ function show_user($user) { row("Hosts", "id&detail=low\">click"); 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(); } diff --git a/html/inc/email.inc b/html/inc/email.inc index a17a13de8d..63e75e9183 100644 --- a/html/inc/email.inc +++ b/html/inc/email.inc @@ -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: // diff --git a/html/user/am_set_info.php b/html/user/am_set_info.php index fa81613f4c..faa7566f09 100644 --- a/html/user/am_set_info.php +++ b/html/user/am_set_info.php @@ -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()); diff --git a/html/user/edit_email_action.php b/html/user/edit_email_action.php index d7636123b4..1d362964ab 100644 --- a/html/user/edit_email_action.php +++ b/html/user/edit_email_action.php @@ -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. -

- We have sent an email message to that address. -

- 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 diff --git a/html/user/validate_email.php b/html/user/validate_email.php deleted file mode 100644 index 46631066af..0000000000 --- a/html/user/validate_email.php +++ /dev/null @@ -1,33 +0,0 @@ -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(); - -?>