Index: openacs-4/packages/acs-admin/www/users/member-state-change-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/Attic/member-state-change-oracle.xql,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/acs-admin/www/users/member-state-change-oracle.xql	30 Sep 2003 12:10:01 -0000	1.6
+++ openacs-4/packages/acs-admin/www/users/member-state-change-oracle.xql	8 Nov 2010 23:09:10 -0000	1.7
@@ -9,8 +9,7 @@
                    member_state as member_state_old,
                    first_names || ' ' || last_name as name,
                    email,
-                   rel_id,
-                   rownum as row_id
+                   rel_id
             from cc_users
             where user_id = :user_id
         </querytext>
Index: openacs-4/packages/acs-admin/www/users/member-state-change-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/Attic/member-state-change-postgresql.xql,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/acs-admin/www/users/member-state-change-postgresql.xql	15 Feb 2002 02:01:14 -0000	1.7
+++ openacs-4/packages/acs-admin/www/users/member-state-change-postgresql.xql	8 Nov 2010 23:09:10 -0000	1.8
@@ -8,7 +8,7 @@
       select u.email_verified_p as email_verified_p_old,
           mr.member_state as member_state_old,
           per.first_names || ' ' || per.last_name as name,
-          part.email, mr.rel_id, u.oid as row_id
+          part.email, mr.rel_id
       from users u
       JOIN parties part on (part.party_id = u.user_id)
         JOIN persons per on (per.person_id = u.user_id)
Index: openacs-4/packages/acs-admin/www/users/member-state-change.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/member-state-change.tcl,v
diff -u -r1.13 -r1.14
--- openacs-4/packages/acs-admin/www/users/member-state-change.tcl	28 May 2007 15:51:27 -0000	1.13
+++ openacs-4/packages/acs-admin/www/users/member-state-change.tcl	8 Nov 2010 23:09:10 -0000	1.14
@@ -18,16 +18,7 @@
     return_url:onevalue
 }
 
-if {![db_0or1row get_states {
-    select email_verified_p as email_verified_p_old,
-           member_state as member_state_old,
-           first_names || ' ' || last_name as name,
-           email,
-           rel_id,
-           row_id
-    from cc_users
-    where user_id = :user_id
-}]} {
+if {![db_0or1row get_states {}]} {
     # The user is not in there
     ad_return_complaint 1 "Invalid User: the user is not in the system"
     return
@@ -65,7 +56,7 @@
     }
     "f" {
 	set action "Require Email from $name"
-	set email_message "Your email in [ad_system_name] needs approval. please go to [ad_url]/register/email-confirm?[export_url_vars row_id]"
+	set email_message "Your email in [ad_system_name] needs approval. please go to [ad_url]/register/email-confirm"
     }
 }
 
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/acs-authentication/tcl/authentication-procs-oracle.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/acs-authentication/tcl/authentication-procs-postgresql.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/acs-authentication/tcl/authentication-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-authentication/tcl/authentication-procs.tcl,v
diff -u -r1.86 -r1.87
--- openacs-4/packages/acs-authentication/tcl/authentication-procs.tcl	15 Feb 2010 22:46:05 -0000	1.86
+++ openacs-4/packages/acs-authentication/tcl/authentication-procs.tcl	8 Nov 2010 23:09:10 -0000	1.87
@@ -1415,7 +1415,7 @@
 } {
     Get a secret token for the user. Can be used for email verification purposes. 
 } {
-    return [db_string select_secret_token {}]
+    return [ns_sha1 "${user_id}[sec_get_token 1]"]
 }
 
 ad_proc -private auth::send_email_verification_email {