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.3 -r1.4
--- openacs-4/packages/acs-subsite/www/register/awaiting-email-verification.tcl	14 Feb 2002 00:53:10 -0000	1.3
+++ openacs-4/packages/acs-subsite/www/register/awaiting-email-verification.tcl	18 Sep 2002 12:16:48 -0000	1.4
@@ -14,10 +14,9 @@
     from cc_users
     where user_id = :user_id and
     email_verified_p = 'f' }]} { 
-    ns_log Notice "Couldn't find $user_id in /register/awaiting-email-verification.tcl"
-
+    ns_log Notice "Couldn't find $user_id in /register/awaiting-email-verification"
     ad_return_error "Couldn't find your record" "User id $user_id is not found in the need email verification state."
-    return
+    ad_script_abort
 }
 
 
@@ -30,20 +29,20 @@
 where user_id = :user_id" 
     if {$member_state == "approved"} {
 	# we don't require administration approval to get to get authorized
-	ad_returnredirect "index.tcl?[export_url_vars email]"
-        return
+	ad_returnredirect "index?[export_url_vars email]"
+        ad_script_abort
     } else {
-        ad_returnredirect "awaiting-approval.tcl?[export_url_vars user_id]"
-        return
+        ad_returnredirect "awaiting-approval?[export_url_vars user_id]"
+        ad_script_abort
     }
 }
 
 db_release_unused_handles
 
-# we are waiting for the user to verify their email
+# we are waiting for the user to verify their email -- return template
 
 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 row_id]"
+# Send them the mail for them 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?[export_url_vars row_id]"