Index: openacs-4/contrib/obsolete-packages/mp3-jukebox/www/vote.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/mp3-jukebox/www/vote.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/obsolete-packages/mp3-jukebox/www/vote.tcl	17 Oct 2001 19:44:08 -0000	1.1
+++ openacs-4/contrib/obsolete-packages/mp3-jukebox/www/vote.tcl	18 Sep 2002 12:14:19 -0000	1.2
@@ -31,7 +31,7 @@
     set complaint "Your vote was not valid.  Please back up using the back button on your browser and try again."
     ad_return_error "Error" "$complaint"
 
-    return -code return
+    ad_script_abort
 
 }
 
@@ -52,7 +52,7 @@
     set complaint " The database did not accept your input. 
 	See details for the error message below\n\n\t<p><b>$errmsg</b>"
     ad_return_error "Database Error" "$complaint" 
-    return -code return
+    ad_script_abort
 	
 } else {
 
Index: openacs-4/contrib/obsolete-packages/mp3-jukebox/www/admin/mp3-edit-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/mp3-jukebox/www/admin/mp3-edit-2.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/obsolete-packages/mp3-jukebox/www/admin/mp3-edit-2.tcl	17 Oct 2001 19:44:08 -0000	1.1
+++ openacs-4/contrib/obsolete-packages/mp3-jukebox/www/admin/mp3-edit-2.tcl	18 Sep 2002 12:14:20 -0000	1.2
@@ -71,12 +71,12 @@
     set complaint " The database did not accept your input. 
 	See details for the error message below\n\n\t<p><b>$errmsg</b>"
     ad_return_error "Database Error" "$complaint" 
-    return -code return
-	
+    ad_script_abort
+
 } else {
-	
+
     ad_returnredirect index
-	
+
 }    
 
 
Index: openacs-4/contrib/obsolete-packages/mp3-jukebox/www/admin/order-choose.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/mp3-jukebox/www/admin/order-choose.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/mp3-jukebox/www/admin/order-choose.tcl	5 Sep 2002 10:41:44 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/mp3-jukebox/www/admin/order-choose.tcl	18 Sep 2002 12:14:20 -0000	1.3
@@ -39,7 +39,7 @@
     order by sort_key
 " {} if_no_rows {
     ad_returnredirect playlist-item-add-2?playlist_id=$playlist_id&insert_after_id=-1&mp3_id=$new_mp3
-    return -code return
+    ad_script_abort
 }
 
 ad_return_template
\ No newline at end of file
Index: openacs-4/contrib/obsolete-packages/mp3-jukebox/www/admin/playlist-create-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/mp3-jukebox/www/admin/playlist-create-2.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/obsolete-packages/mp3-jukebox/www/admin/playlist-create-2.tcl	17 Oct 2001 19:44:08 -0000	1.1
+++ openacs-4/contrib/obsolete-packages/mp3-jukebox/www/admin/playlist-create-2.tcl	18 Sep 2002 12:14:20 -0000	1.2
@@ -50,7 +50,7 @@
     set complaint " The database did not accept your input. 
 	See details for the error message below\n\n\t<p><b>$errmsg</b>"
     ad_return_error "Database Error" "$complaint" 
-    return -code return
+    ad_script_abort
 	
 } else {
 	
Index: openacs-4/contrib/obsolete-packages/mp3-jukebox/www/admin/playlist-edit-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/mp3-jukebox/www/admin/playlist-edit-2.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/mp3-jukebox/www/admin/playlist-edit-2.tcl	5 Sep 2002 10:41:44 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/mp3-jukebox/www/admin/playlist-edit-2.tcl	18 Sep 2002 12:14:20 -0000	1.3
@@ -54,13 +54,13 @@
     set complaint " The database did not accept your input. 
 	See details for the error message below\n\n\t<p><b>$errmsg</b>"
         ad_return_error "Database Error" "$complaint" 
-	return -code return
+    ad_script_abort
 	
-    } else {
+} else {
 	
-	ad_returnredirect one-playlist?playlist_id=$playlist_id
-	
-    }    
+    ad_returnredirect one-playlist?playlist_id=$playlist_id
+    
+}    
 
 
 
Index: openacs-4/contrib/obsolete-packages/mp3-jukebox/www/admin/playlist-item-add-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/mp3-jukebox/www/admin/playlist-item-add-2.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/obsolete-packages/mp3-jukebox/www/admin/playlist-item-add-2.tcl	17 Oct 2001 19:44:08 -0000	1.1
+++ openacs-4/contrib/obsolete-packages/mp3-jukebox/www/admin/playlist-item-add-2.tcl	18 Sep 2002 12:14:20 -0000	1.2
@@ -46,7 +46,7 @@
     set complaint " The database did not accept your input. 
 	See details for the error message below\n\n\t<p><b>$errmsg</b>"
     ad_return_error "Database Error" "$complaint" 
-    return -code return
+    ad_script_abort
 	
 } else {
 
Index: openacs-4/contrib/obsolete-packages/mp3-jukebox/www/admin/playlist-item-remove.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/mp3-jukebox/www/admin/playlist-item-remove.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/obsolete-packages/mp3-jukebox/www/admin/playlist-item-remove.tcl	17 Oct 2001 19:44:08 -0000	1.1
+++ openacs-4/contrib/obsolete-packages/mp3-jukebox/www/admin/playlist-item-remove.tcl	18 Sep 2002 12:14:20 -0000	1.2
@@ -28,7 +28,7 @@
     set complaint " The database did not accept your input. 
 	See details for the error message below\n\n\t<p><b>$errmsg</b>"
     ad_return_error "Database Error" "$complaint" 
-    return -code return
+    ad_script_abort
 	
 } else {
 
Index: openacs-4/contrib/obsolete-packages/mp3-jukebox/www/admin/swap.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/mp3-jukebox/www/admin/swap.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/obsolete-packages/mp3-jukebox/www/admin/swap.tcl	17 Oct 2001 19:44:08 -0000	1.1
+++ openacs-4/contrib/obsolete-packages/mp3-jukebox/www/admin/swap.tcl	18 Sep 2002 12:14:20 -0000	1.2
@@ -34,7 +34,7 @@
     set complaint " The database did not accept your input. 
 	See details for the error message below\n\n\t<p><b>$errmsg</b>"
     ad_return_error "Database Error" "$complaint" 
-    return -code return
+    ad_script_abort
 	
 } else {
 
Index: openacs-4/packages/acs-ldap-authentication/www/examples/user-login.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-ldap-authentication/www/examples/user-login.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-ldap-authentication/www/examples/user-login.tcl	20 Apr 2001 20:51:09 -0000	1.1
+++ openacs-4/packages/acs-ldap-authentication/www/examples/user-login.tcl	18 Sep 2002 12:08:20 -0000	1.2
@@ -15,14 +15,14 @@
     # 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
 }
 
 set user_id [ldap_check_password $email $password]
 if [empty_string_p $user_id] {
     # The user is in the database, but has provided an incorrect password.
-    ad_returnredirect "bad-password.tcl?user_id=$user_id"
+    ad_returnredirect "bad-password?user_id=$user_id"
+    ad_script_abort
 }
 
 
@@ -31,4 +31,4 @@
 ad_user_login -forever=$persistent_cookie_p $user_id
 
 ad_returnredirect $return_url
-return
+ad_script_abort
Index: openacs-4/packages/acs-ldap-authentication/www/examples/user-new-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-ldap-authentication/www/examples/user-new-2.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-ldap-authentication/www/examples/user-new-2.tcl	20 Apr 2001 20:51:09 -0000	1.1
+++ openacs-4/packages/acs-ldap-authentication/www/examples/user-new-2.tcl	18 Sep 2002 12:08:20 -0000	1.2
@@ -65,7 +65,7 @@
 
 if {$exception_count > 0} {
     ad_return_complaint $exception_count $exception_text
-    return
+    ad_script_abort
 }
 
 set double_click_p 0
@@ -77,13 +77,13 @@
     set result [ldap_add_user_to_server $dn $first_names $last_name $email $password]
     if [empty_string_p $result] {
         ad_return_error "User Creation Failed" "We were unable to create your user record in the ldap database."
-        return
+        ad_script_abort
     }
     set user_id [ldap_user_new -dn $dn $email $first_names $last_name $password $question \
             $answer $url $email_verified_p $member_state $user_id]
     if { !$user_id } {
 	ad_return_error "User Creation Failed" "We were unable to create your user record in the database."
-        return
+        ad_script_abort
     }
 }
 
Index: openacs-4/packages/acs-tcl/tcl/admin-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/admin-procs.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/acs-tcl/tcl/admin-procs.tcl	10 Sep 2002 22:22:14 -0000	1.7
+++ openacs-4/packages/acs-tcl/tcl/admin-procs.tcl	18 Sep 2002 12:10:44 -0000	1.8
@@ -68,8 +68,10 @@
 	    set redir "https://$host:$ssl_port$url"
 	}
 	ad_returnredirect $redir
+        ad_script_abort
     } else {
 	ad_return_forbidden "Please use HTTPS" "Sorry, you must use HTTPS to access this page."
+        ad_script_abort
     }
     
     return "filter_return"
Index: openacs-4/packages/acs-tcl/tcl/form-processing-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/form-processing-procs.tcl,v
diff -u -r1.14 -r1.15
--- openacs-4/packages/acs-tcl/tcl/form-processing-procs.tcl	15 Sep 2002 22:51:29 -0000	1.14
+++ openacs-4/packages/acs-tcl/tcl/form-processing-procs.tcl	18 Sep 2002 12:10:44 -0000	1.15
@@ -82,18 +82,16 @@
             values
               (:key, :value)"
         ad_returnredirect "somewhere"
-        return
+        ad_script_abort
     } -edit_data {
         db_dml do_update "
             update my_table
             set value = :value
             where my_table_key = :key"
         ad_returnredirect "somewhere"
-        return
+        ad_script_abort
     }
 
-    ad_return_template
-
     </pre></blockquote>
 
     <p>
Index: openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl,v
diff -u -r1.22 -r1.23
--- openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl	17 Sep 2002 20:09:41 -0000	1.22
+++ openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl	18 Sep 2002 12:10:44 -0000	1.23
@@ -505,7 +505,7 @@
 	    if { $query != "" } {
 		set query "?[export_entire_form_as_url_vars]"
 	    }
-	    ns_returnredirect "[ns_conn location][ns_conn url]$query"
+	    ad_returnredirect "[ns_conn location][ns_conn url]$query"
 	    return "filter_return"
 	}
     }
Index: openacs-4/packages/acs-tcl/tcl/table-display-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/Attic/table-display-procs.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/acs-tcl/tcl/table-display-procs.tcl	2 Sep 2002 13:20:39 -0000	1.6
+++ openacs-4/packages/acs-tcl/tcl/table-display-procs.tcl	18 Sep 2002 12:10:44 -0000	1.7
@@ -934,7 +934,7 @@
             set pre {&}
         }
         ad_returnredirect $redirect
-        return -code return
+        ad_script_abort
     }
     
     # we have a form so stuff in the ones we dont find.
Index: openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl,v
diff -u -r1.16 -r1.17
--- openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl	15 Sep 2002 22:10:50 -0000	1.16
+++ openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl	18 Sep 2002 12:10:44 -0000	1.17
@@ -391,6 +391,7 @@
     }
 
     ad_returnredirect $return_url
+    # should this be ad_script_abort?  Should check how its being used.
     return
 }
 
Index: openacs-4/packages/adserver/tcl/adserver-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/adserver/tcl/adserver-procs.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/adserver/tcl/adserver-procs.tcl	30 Jan 2002 11:25:25 -0000	1.1
+++ openacs-4/packages/adserver/tcl/adserver-procs.tcl	18 Sep 2002 12:11:27 -0000	1.2
@@ -489,7 +489,7 @@
     [ad_acs_adserver_pageroot]/$BaseImagePath/$ad_url
 
     the return pathname can be returned using ns_returnfile AND not
-    ns_returnredirect
+    ad_returnredirect
 
  } {
 
Index: openacs-4/packages/adserver/www/adhref.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/adserver/www/adhref.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/adserver/www/adhref.tcl	10 Sep 2002 22:22:19 -0000	1.2
+++ openacs-4/packages/adserver/www/adhref.tcl	18 Sep 2002 12:11:28 -0000	1.3
@@ -27,7 +27,7 @@
         ad_parameter -package_id [ad_acs_adserver_id] DefaultAdTargetURL adserver /
     } [adserver_cache_refresh]]
     ad_returnredirect $target
-    return
+    ad_script_abort
 }
 
 set target_url [db_string adv_url_query "
@@ -40,13 +40,13 @@
         ad_parameter -package_id [ad_acs_adserver_id] DefaultAdTargetURL adserver /
     } [adserver_cache_refresh]]
     ad_returnredirect $target
-    return
+    ad_script_abort
 } 
 
 ad_returnredirect $target_url
 
 if { [info exists suppress_logging_p] && $suppress_logging_p == 1 } {
-    return
+    ad_script_abort
 }
 
 ns_conn close
Index: openacs-4/packages/adserver/www/adimg.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/adserver/www/adimg.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/adserver/www/adimg.tcl	10 Sep 2002 22:22:19 -0000	1.2
+++ openacs-4/packages/adserver/www/adimg.tcl	18 Sep 2002 12:11:28 -0000	1.3
@@ -85,11 +85,10 @@
 }
 
 if { [info exists suppress_logging_p] && $suppress_logging_p == 1 } {
-    return
+    ad_script_abort
 }
 
 # we've returned to the user but let's keep this thread alive to log
-
 ns_conn close
 
 if {$display_default_banner_p == 0} {
Index: openacs-4/packages/adserver/www/admin/add-adv-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/adserver/www/admin/add-adv-2.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/adserver/www/admin/add-adv-2.tcl	10 Sep 2002 22:22:20 -0000	1.2
+++ openacs-4/packages/adserver/www/admin/add-adv-2.tcl	18 Sep 2002 12:11:29 -0000	1.3
@@ -51,6 +51,7 @@
 
 if { $insert_succ_p } {
     ad_returnredirect one-adv?[export_url_vars adv_key]
+    ad_script_abort
 } else {
     set title "Adding ad failed"
     set admin_link "
@@ -69,7 +70,8 @@
     ad with the same ad key. 
     <p> Please use the back button on your browser and change the ad key.
     "
-    ad_return_template default
 
 }
 
+ad_return_template default
+
Index: openacs-4/packages/adserver/www/admin/add-adv-group-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/adserver/www/admin/add-adv-group-2.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/adserver/www/admin/add-adv-group-2.tcl	10 Sep 2002 22:22:20 -0000	1.2
+++ openacs-4/packages/adserver/www/admin/add-adv-group-2.tcl	18 Sep 2002 12:11:29 -0000	1.3
@@ -46,6 +46,7 @@
 
 if { $insert_succ_p } {
     ad_returnredirect "one-adv-group?[export_url_vars group_key]"
+    ad_script_abort
 } else {
     set title "Adding group failed"
     set admin_link "
@@ -66,7 +67,8 @@
     <p> Please use the back button on your browser and change the group name.
     "
 
-    ad_return_template default
 }
 
+ad_return_template default
 
+
Index: openacs-4/packages/bookmarks/tcl/bookmarks-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/tcl/bookmarks-procs.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/bookmarks/tcl/bookmarks-procs.tcl	10 Sep 2002 22:22:25 -0000	1.3
+++ openacs-4/packages/bookmarks/tcl/bookmarks-procs.tcl	18 Sep 2002 12:13:16 -0000	1.4
@@ -69,7 +69,7 @@
 	
 	if {$dbclick_p == "1"} {   
 	    ad_returnredirect $return_url
-	    return
+            ad_script_abort
 	} else {
 
 	    upvar \#[template::adp_level] n_errors n_errors
@@ -81,7 +81,7 @@
 	      uplevel \#[template::adp_level] {
   		ad_return_template "complaint"
   	    }
-	    return -code return
+            ad_script_abort
 	}
 }
 
Index: openacs-4/packages/bookmarks/www/bookmark-add-import.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmark-add-import.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/bookmarks/www/bookmark-add-import.tcl	10 Sep 2002 22:22:26 -0000	1.4
+++ openacs-4/packages/bookmarks/www/bookmark-add-import.tcl	18 Sep 2002 12:13:17 -0000	1.5
@@ -63,7 +63,7 @@
 set user_id [ad_conn user_id]
 if { $user_id == "0" } {
     ad_returnredirect "/register/?return_url=$this_url_urlenc"
-    return
+    ad_script_abort
 }
 
 set full_bookmark_add_url "[ad_parameter -package_id [ad_acs_kernel_id] SystemURL][ad_conn package_url]bookmark-add-import"
Index: openacs-4/packages/bookmarks/www/bookmark-add-one.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmark-add-one.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/bookmarks/www/bookmark-add-one.tcl	10 Sep 2002 22:22:26 -0000	1.3
+++ openacs-4/packages/bookmarks/www/bookmark-add-one.tcl	18 Sep 2002 12:13:17 -0000	1.4
@@ -110,7 +110,7 @@
 set user_id [ad_conn user_id]
 if { $user_id == "0" } {
     ad_returnredirect "/register/?return_url=$this_url_urlenc"
-    return
+    ad_script_abort
 }
 
 
@@ -128,11 +128,12 @@
 # ask for a confirmation
 if { $url_unreachable_p == "f" && $user_provided_title_p == "t"} {
     ad_returnredirect "bookmark-add-one-2?[export_url_vars return_url local_title complete_url bookmark_id meta_description meta_keywords url_title viewed_user_id parent_id]"
-    return
-} else {
-    ad_return_template
-}
+    ad_script_abort
+} 
+  
+ad_return_template
 
 
 
 
+
Index: openacs-4/packages/bookmarks/www/bookmarks-import.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmarks-import.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/bookmarks/www/bookmarks-import.tcl	10 Sep 2002 22:22:26 -0000	1.5
+++ openacs-4/packages/bookmarks/www/bookmarks-import.tcl	18 Sep 2002 12:13:17 -0000	1.6
@@ -50,18 +50,19 @@
 if { [info exists error_list] } {
     set n_errors [llength $error_list]
     ad_return_template "complaint"
+    ad_script_abort
 }
 
 
 
 # Let's check for a doubleclick first
 if { [db_string dbclick_check "
-select count(bookmark_id) as n_existing
-from   bm_bookmarks 
-where  bookmark_id = :bookmark_id"] != 0 } {
+ select count(bookmark_id) as n_existing
+ from   bm_bookmarks 
+ where  bookmark_id = :bookmark_id"] != 0 } {
     # must have doubleclicked
     ad_returnredirect $return_url
-    return
+    ad_script_abort
 }
 
 set page_title "Import Statistics"
@@ -132,7 +133,7 @@
 		    </pre>
 		    </blockquote>"]
 		    ad_return_template "error"
-		    return 
+                    ad_script_abort
 		} else {
 		    # success in inserting folder into bm_bookmarks
 		    lappend import_list "Inserting folder \"$local_title\""
@@ -245,10 +246,11 @@
 			    </pre>
 			    </blockquote>"]
 			    ad_return_template "error" 
-			    return 
+                            ad_script_abort
 			} else { 
 			    # assume this was a double click
 			    ad_returnredirect $return_url
+                            ad_script_abort
 			} 
 		    } else {
 			# insert into bm_bookmarks succeeded
@@ -270,5 +272,3 @@
     lappend import_list "Hmmm...the file seemed ok, but nothing was imported. Sorry!"
 }
 
-
-ad_return_template
Index: openacs-4/packages/calendar/www/cal-item-create.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/Attic/cal-item-create.tcl,v
diff -u -r1.14 -r1.15
--- openacs-4/packages/calendar/www/cal-item-create.tcl	16 Apr 2002 05:30:24 -0000	1.14
+++ openacs-4/packages/calendar/www/cal-item-create.tcl	18 Sep 2002 12:12:03 -0000	1.15
@@ -101,6 +101,7 @@
 	
     if { [empty_string_p $calendar_id] } {
 	ad_return_complaint 1 "You need to supply a calendar"
+        ad_script_abort
     }
 
     # now we make sure that the user has the permission 
@@ -130,9 +131,10 @@
 if {$recurrence_p} {
     # We must ask for recurrence information
     ad_returnredirect "cal-item-create-recurrence?cal_item_id=$cal_item_id&return_url=[ns_urlencode $return_url]"
-    return
+    ad_script_abort
 }
 
 # set the date to be the date of the event
-set date [calendar_make_date [array get event_date]]
 ad_returnredirect "${return_url}"
+ad_script_abort
+set date [calendar_make_date [array get event_date]]
Index: openacs-4/packages/calendar/www/cal-item-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/cal-item-delete.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/calendar/www/cal-item-delete.tcl	10 Sep 2002 22:22:31 -0000	1.2
+++ openacs-4/packages/calendar/www/cal-item-delete.tcl	18 Sep 2002 12:12:03 -0000	1.3
@@ -12,7 +12,7 @@
 
 if {!$confirm_p} {
     ad_returnredirect "cal-item-delete-confirm?cal_item_id=$cal_item_id"
-    return
+    ad_script_abort
 }
 
 calendar::item::delete -cal_item_id $cal_item_id
Index: openacs-4/packages/calendar/www/admin/cal-item-permissions.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/admin/Attic/cal-item-permissions.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/calendar/www/admin/cal-item-permissions.tcl	18 Sep 2001 05:57:46 -0000	1.2
+++ openacs-4/packages/calendar/www/admin/cal-item-permissions.tcl	18 Sep 2002 12:12:04 -0000	1.3
@@ -91,7 +91,7 @@
     
    set action view
    ad_returnredirect "cal-item-permissions?[export_url_vars cal_item_id party_id action]"
-
+    ad_script_abort
 # delete
 } elseif { [string equal $action "revoke"] } {
     ad_require_permission $user_id calendar_admin
@@ -100,7 +100,7 @@
     
     set action "view"
     ad_returnredirect "cal-item-permissions?[export_url_vars cal_item_id party_id action]"
-
+    ad_script_abort
 # add user
 } elseif { [string equal $action "add" ] } {
 
@@ -131,7 +131,6 @@
 
 
 
-ad_return_template
 
 
 
@@ -145,6 +144,3 @@
 
 
 
-
-
-
Index: openacs-4/packages/calendar/www/admin/calendar-permissions.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/admin/Attic/calendar-permissions.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/calendar/www/admin/calendar-permissions.tcl	23 Apr 2001 23:09:38 -0000	1.1
+++ openacs-4/packages/calendar/www/admin/calendar-permissions.tcl	18 Sep 2002 12:12:04 -0000	1.2
@@ -80,14 +80,16 @@
 	calendar_assign_permissions $calendar_id $party_id "calendar_show"
     }
     
-   set action view
-   ad_returnredirect "calendar-permissions?[export_url_vars calendar_id party_id action]"
+    set action view
+    ad_returnredirect "calendar-permissions?[export_url_vars calendar_id party_id action]"
+    ad_script_abort
 
 # revoke
 } elseif { [string equal $action "revoke"] } {
     
     calendar_assign_permissions $calendar_id $party_id $permission "revoke"
     ad_returnredirect "calendar-permissions?[export_url_vars calendar_id party_id]"
+    ad_script_abort
 
 # add user
 } elseif { [string equal $action "add" ] } {
Index: openacs-4/packages/calendar/www/admin/calendar-preferences.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/admin/Attic/calendar-preferences.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/calendar/www/admin/calendar-preferences.tcl	23 Apr 2001 23:09:38 -0000	1.1
+++ openacs-4/packages/calendar/www/admin/calendar-preferences.tcl	18 Sep 2002 12:12:04 -0000	1.2
@@ -103,7 +103,7 @@
 
     set action view
     ad_returnredirect "calendar-preferences?[export_url_vars action]"
-
+    ad_script_abort
 } 
 
 ad_return_template
Index: openacs-4/packages/file-manager/www/file-edit-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-manager/www/file-edit-2.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/file-manager/www/file-edit-2.tcl	10 Sep 2002 22:22:54 -0000	1.3
+++ openacs-4/packages/file-manager/www/file-edit-2.tcl	18 Sep 2002 12:12:43 -0000	1.4
@@ -15,7 +15,7 @@
 
 if [empty_string_p $message] {
     ad_return_complaint 1 "<li> You must enter a log message"
-    return
+    ad_script_abort
 }
 
 # check to see if this is an adp page
@@ -27,7 +27,7 @@
 	<P> We're sorry, but files edited with the file manager cannot
 	have functions in them for security reasons. Only HTML and 
 	<%= \$variable %> style code may be used."
-	return
+        ad_script_abort
     }
 }
 
@@ -70,9 +70,9 @@
     $errmsg
   </pre>
   "
-  return
+  ad_script_abort
 }
 
 ad_returnredirect "file-list?path=[file dirname $path]"
-return
 
+
Index: openacs-4/packages/file-manager/www/file-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-manager/www/file-edit.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/file-manager/www/file-edit.tcl	10 Sep 2002 22:22:54 -0000	1.2
+++ openacs-4/packages/file-manager/www/file-edit.tcl	18 Sep 2002 12:12:43 -0000	1.3
@@ -12,7 +12,7 @@
 
 if [string match "image/*" [ns_guesstype [file tail $path]]] {
     ad_returnredirect file-upload?path=$path
-    return
+    ad_script_abort
 }
 
 # wrapper for reading a file
Index: openacs-4/packages/file-manager/www/file-mkdir-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-manager/www/file-mkdir-2.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/file-manager/www/file-mkdir-2.tcl	10 Sep 2002 22:22:54 -0000	1.2
+++ openacs-4/packages/file-manager/www/file-mkdir-2.tcl	18 Sep 2002 12:12:43 -0000	1.3
@@ -27,7 +27,7 @@
 
 if {$errcnt} {
     ad_return_complaint $errcnt $errmsg
-    return
+    ad_script_abort
 }
 
 if [catch {
@@ -41,9 +41,9 @@
     
 } errmsg] {
     ad_return_complaint 1 "<li> The follow error occured: <br> $errmsg"
-    return
+    ad_script_abort
 }
 
 ad_returnredirect "file-list?path=[file dirname $path]"
-return
 
+
Index: openacs-4/packages/file-manager/www/file-upload-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-manager/www/file-upload-2.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/file-manager/www/file-upload-2.tcl	10 Sep 2002 22:22:54 -0000	1.2
+++ openacs-4/packages/file-manager/www/file-upload-2.tcl	18 Sep 2002 12:12:43 -0000	1.3
@@ -19,7 +19,7 @@
 
 if ![fm_valid_filename_p $title] {
     ad_return_complaint "<li>Invalid file name (no spaces, & or /'s)"
-    return
+    ad_script_abort
 }
 
 if {![empty_string_p $title] && [empty_string_p [file ext $title]]} {
@@ -55,15 +55,15 @@
 	
 	<pre>$errmsg</pre>
 	"
-	return
+        ad_script_abort
     }
     
     if {[fm_adp_function_p $text]} {
 	ad_return_error "Permission Denied" "
 	<P>We're sorry, but files edited with the file manager cannot
 	have functions in them for security reasons. Only HTML and 
 	<%= \$variable %> style code may be used."
-	return
+        ad_script_abort
     }
 } elseif [regexp {text} $file_type] {
 
@@ -81,7 +81,7 @@
 	
 	<pre>$errmsg</pre>
 	"
-	return
+        ad_script_abort
     }
     
     # for Windows
@@ -121,5 +121,4 @@
 }
 
 ad_returnredirect "file-list?path=[file dirname $path]"
-return
 
Index: openacs-4/packages/file-storage/www/file-add-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/Attic/file-add-2.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/file-storage/www/file-add-2.tcl	29 Jul 2002 03:53:15 -0000	1.5
+++ openacs-4/packages/file-storage/www/file-add-2.tcl	18 Sep 2002 12:09:59 -0000	1.6
@@ -97,7 +97,7 @@
  
        ad_return_complaint 1 "You probably clicked on the Add button more than once. Check if the file is properly loaded on the <a href=\"index?folder_id?$folder_id\">folder</a> you wan, or you can use the Back button to return and re-enter the version file."      
 
-    return
+       ad_script_abort
 }
 
 
Index: openacs-4/packages/file-storage/www/file-copy-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/Attic/file-copy-2.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/file-storage/www/file-copy-2.tcl	24 Sep 2001 19:56:07 -0000	1.6
+++ openacs-4/packages/file-storage/www/file-copy-2.tcl	18 Sep 2002 12:09:59 -0000	1.7
@@ -51,7 +51,7 @@
 
 #    <pre>$errmsg</pre>
 
-    return
+    ad_script_abort
 }
 
 ad_returnredirect "?folder_id=$parent_id"
Index: openacs-4/packages/file-storage/www/file-edit-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/Attic/file-edit-2.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/file-storage/www/file-edit-2.tcl	22 Sep 2001 05:48:01 -0000	1.2
+++ openacs-4/packages/file-storage/www/file-edit-2.tcl	18 Sep 2002 12:09:59 -0000	1.3
@@ -39,7 +39,7 @@
 	<pre>$errmsg</pre>"
     }
 
-    return
+    ad_script_abort
 }
 
 ad_returnredirect "file?file_id=$file_id"
Index: openacs-4/packages/file-storage/www/file-move-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/Attic/file-move-2.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/file-storage/www/file-move-2.tcl	19 Jul 2002 23:17:15 -0000	1.5
+++ openacs-4/packages/file-storage/www/file-move-2.tcl	18 Sep 2002 12:09:59 -0000	1.6
@@ -68,7 +68,7 @@
     #	<pre>$errmsg</pre>"
     #}
     
-    return
+    ad_script_abort
 }
 
 ad_returnredirect "?folder_id=$parent_id"
Index: openacs-4/packages/file-storage/www/folder-create-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/Attic/folder-create-2.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/file-storage/www/folder-create-2.tcl	25 Sep 2001 16:53:24 -0000	1.2
+++ openacs-4/packages/file-storage/www/folder-create-2.tcl	18 Sep 2002 12:09:59 -0000	1.3
@@ -53,14 +53,15 @@
     #from   cr_items
     #where  name = :name
     #and    parent_id = :parent_id"] {
-	ad_return_complaint 1 "Either there is already a folder with the name \"$folder_name\" or you clicked on the button more than once.  You can use the Back button to return and choose a new name, or <a href=\"index?folder_id=$parent_id\">return to the directory listing</a> to see if your folder is there."
+    
+    ad_return_complaint 1 "Either there is already a folder with the name \"$folder_name\" or you clicked on the button more than once.  You can use the Back button to return and choose a new name, or <a href=\"index?folder_id=$parent_id\">return to the directory listing</a> to see if your folder is there."
     #} else {
 #	ad_return_complaint 1 "We got an error that we couldn't readily identify.  Please let the system owner know about this.
 #
 #	<pre>$errmsg</pre>"
 #    }
     
-    return
+     ad_script_abort
 }
 
 
Index: openacs-4/packages/news/www/item-create-3.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news/www/item-create-3.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/news/www/item-create-3.tcl	5 Sep 2002 10:49:47 -0000	1.4
+++ openacs-4/packages/news/www/item-create-3.tcl	18 Sep 2002 12:08:49 -0000	1.5
@@ -108,7 +108,8 @@
 	# case: user submitted news item, is returned to a Thank-you page
 	set title "News item submitted"
 	set context [list $title]
-	ad_return_template item-create-thankyou }
+	ad_return_template item-create-thankyou 
+    }
 
 } else {    
     # case: administrator returned to index page
Index: openacs-4/packages/news/www/admin/approve-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news/www/admin/approve-2.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/news/www/admin/approve-2.tcl	20 Apr 2001 20:51:14 -0000	1.1
+++ openacs-4/packages/news/www/admin/approve-2.tcl	18 Sep 2002 12:08:50 -0000	1.2
@@ -34,7 +34,7 @@
     if { [dt_interval_check $archive_date_ansi $publish_date_ansi] >= 0 } {
 	ad_return_error "Scheduling Error" \
 		"The archive date must be AFTER the release date."
-	return 
+        ad_script_abort
     }                     
 
 }
Index: openacs-4/packages/news/www/admin/process.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news/www/admin/process.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/news/www/admin/process.tcl	5 Sep 2002 10:49:47 -0000	1.2
+++ openacs-4/packages/news/www/admin/process.tcl	18 Sep 2002 12:08:51 -0000	1.3
@@ -38,7 +38,7 @@
 if {[string equal "publish" $action]} {
     
     ad_returnredirect "approve?[export_url_vars n_items]"
-    return
+    ad_script_abort
 }
 
 set title "Confirm Action: $action"
Index: openacs-4/packages/news/www/admin/revision-add-3.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news/www/admin/revision-add-3.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/news/www/admin/revision-add-3.tcl	16 Oct 2001 10:10:19 -0000	1.3
+++ openacs-4/packages/news/www/admin/revision-add-3.tcl	18 Sep 2002 12:08:51 -0000	1.4
@@ -79,7 +79,7 @@
     set complaint " The database did not accept your input. 
     See details for the error message below\n\n\t<p><b>$errmsg</b>"
     ad_return_error "Database Error" "$complaint" 
-    return -code return
+    ad_script_abort
 	
 } else {
 	
Index: openacs-4/packages/press/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/press/www/index.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/press/www/index.tcl	5 Sep 2002 13:12:12 -0000	1.2
+++ openacs-4/packages/press/www/index.tcl	18 Sep 2002 12:07:26 -0000	1.3
@@ -33,7 +33,7 @@
 
 if ![ad_permission_p $package_id press_read] {
     ad_returnredirect unauthorized
-    return
+    ad_script_abort
 }
 
 # Provide administrators with a link to the local admin pages
Index: openacs-4/packages/press/www/admin/one-item-approve-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/press/www/admin/one-item-approve-2.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/press/www/admin/one-item-approve-2.tcl	10 Sep 2002 22:23:17 -0000	1.2
+++ openacs-4/packages/press/www/admin/one-item-approve-2.tcl	18 Sep 2002 12:07:28 -0000	1.3
@@ -31,7 +31,7 @@
 
 if { [dt_interval_check $release_date $archive_date] < 0 } {
     ad_return_error "Scheduling Error" "The archive date must be AFTER the release date."
-    return
+    ad_script_abort
 }                                                
 
 set item_id [db_string revision_root \
Index: openacs-4/packages/press/www/admin/one-item-revision-update.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/press/www/admin/one-item-revision-update.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/press/www/admin/one-item-revision-update.tcl	20 Apr 2001 20:51:22 -0000	1.1
+++ openacs-4/packages/press/www/admin/one-item-revision-update.tcl	18 Sep 2002 12:07:28 -0000	1.2
@@ -20,4 +20,4 @@
     end;
 }
 
-ns_returnredirect "one-item-admin?item_id=$item_id"
+ad_returnredirect "one-item-admin?item_id=$item_id"
Index: openacs-4/packages/press/www/admin/template-ae-3.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/press/www/admin/template-ae-3.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/press/www/admin/template-ae-3.tcl	20 Apr 2001 20:51:22 -0000	1.1
+++ openacs-4/packages/press/www/admin/template-ae-3.tcl	18 Sep 2002 12:07:28 -0000	1.2
@@ -37,6 +37,7 @@
 
     default {
 	ad_return_error "Invalid Action" "Valid actions are edit, create"
+        ad_script_abort
     }
 }
 
Index: openacs-4/packages/site-wide-search/www/search-form.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/site-wide-search/www/search-form.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/site-wide-search/www/search-form.tcl	20 Apr 2001 20:51:25 -0000	1.1
+++ openacs-4/packages/site-wide-search/www/search-form.tcl	18 Sep 2002 12:04:47 -0000	1.2
@@ -46,7 +46,7 @@
 
 if {[template::form is_submission search_form]} {
     ad_returnredirect "search?[export_entire_form_as_url_vars]"
-    return
+    ad_script_abort
 }
 
 ad_return_template
Index: openacs-4/packages/wp-slim/www/attach.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/attach.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/wp-slim/www/attach.tcl	19 Nov 2001 19:34:23 -0000	1.5
+++ openacs-4/packages/wp-slim/www/attach.tcl	18 Sep 2002 12:07:02 -0000	1.6
@@ -42,7 +42,7 @@
 
 if { $exception_count > 0 } {
     ad_return_complaint $exception_count $exception_text
-    return
+    ad_script_abort
 }
 
 if {[string equal $mime_type "*/*"]} {
@@ -67,7 +67,7 @@
 <li>Double-clicking the \"Add\" button on the previous page.
 </ul><p>Here is the actual error message:<blockquote><pre>$errmsg</pre></blockquote>"
 
-    return
+    ad_script_abort
 }
 
 
Index: openacs-4/packages/wp-slim/www/delete-presentation-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/delete-presentation-2.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/wp-slim/www/delete-presentation-2.tcl	20 Apr 2001 20:51:24 -0000	1.1
+++ openacs-4/packages/wp-slim/www/delete-presentation-2.tcl	18 Sep 2002 12:07:02 -0000	1.2
@@ -24,7 +24,7 @@
     }
 } else {
     ad_return_error "Bad Password" "Wrong password."
-    return
+    ad_script_abort
 }
 
 ad_returnredirect ""
\ No newline at end of file
Index: openacs-4/packages/wp-slim/www/display-change.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/display-change.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/wp-slim/www/display-change.tcl	15 Nov 2001 01:47:13 -0000	1.3
+++ openacs-4/packages/wp-slim/www/display-change.tcl	18 Sep 2002 12:07:02 -0000	1.4
@@ -31,7 +31,7 @@
 if { ![empty_string_p $display] } {
     if { [cr_registered_type_for_mime_type $mime_type] != "image" } {
 	ad_return_complaint 1 "<li>The file is neither a .gif file nor a .jpg file. Therefore we cannot display it as an image."
-	return
+        ad_script_abort
     }
     db_dml display_change ""
 }