Index: openacs-4/packages/acs-subsite/www/register/awaiting-email-verification-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/Attic/awaiting-email-verification-oracle.xql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/acs-subsite/www/register/awaiting-email-verification-oracle.xql 1 May 2001 21:20:18 -0000 1.1 +++ openacs-4/packages/acs-subsite/www/register/awaiting-email-verification-oracle.xql 14 Feb 2002 00:53:10 -0000 1.2 @@ -6,7 +6,7 @@ - select member_state, email, rowid + select member_state, email, rowid as row_id from cc_users where user_id = :user_id and email_verified_p = 'f' Index: openacs-4/packages/acs-subsite/www/register/awaiting-email-verification-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/Attic/awaiting-email-verification-postgresql.xql,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/acs-subsite/www/register/awaiting-email-verification-postgresql.xql 10 Feb 2002 22:11:31 -0000 1.3 +++ openacs-4/packages/acs-subsite/www/register/awaiting-email-verification-postgresql.xql 14 Feb 2002 00:53:10 -0000 1.4 @@ -6,12 +6,13 @@ - select mr.member_state, p.email, u.oid as rowid - from users u - JOIN parties p on (p.party_id = u.user_id) - LEFT JOIN membership_rels mr on (mr.rel_id = u.user_id) - where u.user_id = :user_id - and u.email_verified_p = 'f' + select mr.member_state, p.email, u.oid as row_id + from users u + JOIN parties p on (p.party_id = u.user_id) + LEFT JOIN membership_rels mr on (mr.rel_id = u.user_id) + where u.user_id = :user_id + and u.email_verified_p = 'f' + Index: openacs-4/packages/acs-subsite/www/register/awaiting-email-verification.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/Attic/awaiting-email-verification.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/acs-subsite/www/register/awaiting-email-verification.tcl 2 Sep 2001 17:35:57 -0000 1.2 +++ openacs-4/packages/acs-subsite/www/register/awaiting-email-verification.tcl 14 Feb 2002 00:53:10 -0000 1.3 @@ -10,7 +10,7 @@ } if {![db_0or1row register_user_state_properties { - select member_state, email, rowid + select member_state, email, row_id from cc_users where user_id = :user_id and email_verified_p = 'f' }]} { @@ -45,5 +45,5 @@ ad_return_template # the user has to come back and activate their account -ns_sendmail "$email" "[ad_parameter NewRegistrationEmailAddress "security"]" "Welcome to [ad_system_name]" "To confirm your registration, please go to [ad_parameter -package_id [ad_acs_kernel_id] SystemURL]/register/email-confirm.tcl?[export_url_vars rowid]" +ns_sendmail "$email" "[ad_parameter NewRegistrationEmailAddress "security"]" "Welcome to [ad_system_name]" "To confirm your registration, please go to [ad_parameter -package_id [ad_acs_kernel_id] SystemURL]/register/email-confirm.tcl?[export_url_vars row_id]"