Index: openacs-4/packages/acs-subsite/www/register/user-login.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/Attic/user-login.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/register/user-login.tcl	12 May 2002 20:57:02 -0000	1.2
+++ openacs-4/packages/acs-subsite/www/register/user-login.tcl	18 Sep 2002 12:16:48 -0000	1.3
@@ -23,10 +23,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.
@@ -41,8 +41,7 @@
     # The user is not in the database. Redirect to user-new.tcl so the user can register.
     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
 }
 
 
@@ -52,37 +51,37 @@
     "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
 	    # him/her in and redirect to return_url.
 	    ad_user_login -forever=$persistent_cookie_p $user_id
 	    
 	    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
     }
     "needs approval" {
 	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
     }
 }