Index: openacs.org-dev/packages/ecommerce/www/register/user-login.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/packages/ecommerce/www/register/user-login.tcl,v
diff -u -r1.1.1.1 -r1.1.1.2
--- openacs.org-dev/packages/ecommerce/www/register/user-login.tcl	9 Jul 2002 17:35:08 -0000	1.1.1.1
+++ openacs.org-dev/packages/ecommerce/www/register/user-login.tcl	8 Oct 2002 15:47:10 -0000	1.1.1.2
@@ -3,7 +3,7 @@
     Accepts an email from the user and attempts to log the user in.
 
     @author Multiple
-    @cvs-id user-login.tcl,v 1.5 2000/11/15 09:12:22 ashah Exp
+    @cvs-id $Id$
 } {
     email:notnull
     {return_url [ad_pvt_home]}
@@ -28,10 +28,10 @@
     # although this technically is not an expired login, we'll
     # just use it anyway.
     ad_returnredirect "login-expired"
-    return
+    ad_script_abort
 } elseif { $time < [ns_time] - [ad_parameter -package_id [ad_acs_kernel_id] LoginExpirationTime security 600] } {
     ad_returnredirect "login-expired"
-    return
+    ad_script_abort
 }
 
 # Obtain the user ID corresponding to the provided email address.
@@ -47,7 +47,7 @@
     ad_set_client_property -persistent "f" register password $password
     ad_returnredirect "user-new?[ad_export_vars { email return_url persistent_cookie_p }]"
 
-    return
+    ad_script_abort
 }
 
 
@@ -57,7 +57,7 @@
     "approved" {
 	if { $email_verified_p == "f" } {
 	    ad_returnredirect "awaiting-email-verification?user_id=$user_id"
-	    return
+            ad_script_abort
 	}
 	if { [ad_check_password $user_id $password] } {
 	    # The user has provided a correct, non-empty password. Log
@@ -81,29 +81,29 @@
 		ec_create_new_session_if_necessary
 	    }
 	    ad_returnredirect $return_url
-	    return
+	    ad_script_abort
 	}
     }
     "banned" { 
 	ad_returnredirect "banned-user?user_id=$user_id" 
-	return
+	ad_script_abort
     }
     "deleted" {  
 	ad_returnredirect "deleted-user?user_id=$user_id" 
-	return
+	ad_script_abort
     }
     "rejected" {
 	ad_returnredirect "awaiting-approval?user_id=$user_id"
-	return
+	ad_script_abort
     }
     "" {
 	ad_returnredirect "awaiting-approval?user_id=$user_id"
-	return
+	ad_script_abort
     }
     default {
 	ns_log Warning "Problem with registration state machine on user-login.tcl"
 	ad_return_error "Problem with login" "There was a problem authenticating the account: $user_id. Most likely, the database contains users with no user_state."
-	return
+	ad_script_abort
     }
 }