Index: openacs-4/packages/acs-subsite/www/register/email-confirm.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/email-confirm.adp,v diff -u -r1.8 -r1.9 --- openacs-4/packages/acs-subsite/www/register/email-confirm.adp 3 Sep 2003 15:05:36 -0000 1.8 +++ openacs-4/packages/acs-subsite/www/register/email-confirm.adp 10 Sep 2003 17:01:39 -0000 1.9 @@ -14,8 +14,6 @@ -

#acs-subsite.lt_Note_If_youve_forgott_1#.

- Index: openacs-4/packages/acs-subsite/www/register/email-confirm.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/email-confirm.tcl,v diff -u -r1.6 -r1.7 --- openacs-4/packages/acs-subsite/www/register/email-confirm.tcl 3 Sep 2003 19:48:05 -0000 1.6 +++ openacs-4/packages/acs-subsite/www/register/email-confirm.tcl 10 Sep 2003 17:01:39 -0000 1.7 @@ -6,16 +6,19 @@ user_id:integer } -if { [string equal $token [auth::get_user_secret_token -user_id $user_id]] } { - ad_return_error [_ acs-subsite.lt_Couldnt_find_your_rec] [_ acs-subsite.lt_Row_id_row_id_is_not_] - return +ns_log Notice "LARS: Token = $token ; should be = [auth::get_user_secret_token -user_id $user_id]" + +if { ![string equal $token [auth::get_user_secret_token -user_id $user_id]] } { + # TODO: Fix + set message "Bad token" + ad_returnredirect [export_vars -base "[subsite::get_element -element url]register/account-closed" { message }] + ad_script_abort } auth::set_email_verified -user_id $user_id acs_user::get -user_id $user_id -array user_info -set export_vars [export_vars -form { email }] -set email $user_info(email) +set export_vars [export_vars -form { { username $user_info(username) } }] set site_link [ad_site_home_link] set system_name [ad_system_name]