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.5 -r1.6
--- openacs-4/packages/acs-subsite/www/register/email-confirm.tcl	3 Sep 2003 15:05:36 -0000	1.5
+++ openacs-4/packages/acs-subsite/www/register/email-confirm.tcl	3 Sep 2003 19:48:05 -0000	1.6
@@ -2,21 +2,20 @@
     @cvs-id $Id$
 
 } {
-    row_id:notnull,trim
-    user_id
+    token:notnull,trim
+    user_id:integer
 }
 
-set token [auth::get_user_secret_token -user_id $user_id]
-
-if { [string equal $token $row_id] } {
-    ad_return_error "[_ acs-subsite.lt_Couldnt_find_your_rec]" "[_ acs-subsite.lt_Row_id_row_id_is_not_]"
+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
 } 
 
-auth::confirm_email -user_id $user_id
+auth::set_email_verified -user_id $user_id
+
 acs_user::get -user_id $user_id -array user_info
 
-set export_vars [export_form_vars email]
+set export_vars [export_vars -form { email }]
 set email $user_info(email)
 set site_link [ad_site_home_link]
 set system_name [ad_system_name]