Index: openacs-4/contrib/obsolete-packages/postcard/www/send-card.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/postcard/www/send-card.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/obsolete-packages/postcard/www/send-card.tcl	28 Aug 2002 07:51:18 -0000	1.3
+++ openacs-4/contrib/obsolete-packages/postcard/www/send-card.tcl	18 Sep 2002 12:02:33 -0000	1.4
@@ -39,6 +39,7 @@
 
 } on_error { # most likely a double click
     ad_returnredirect "."
+    # continue here to send mail!
 }
 
 
Index: openacs-4/contrib/obsolete-packages/ticket-tracker-lite/www/ticket.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/ticket-tracker-lite/www/ticket.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/contrib/obsolete-packages/ticket-tracker-lite/www/ticket.tcl	6 Sep 2002 13:28:00 -0000	1.5
+++ openacs-4/contrib/obsolete-packages/ticket-tracker-lite/www/ticket.tcl	18 Sep 2002 11:59:55 -0000	1.6
@@ -33,9 +33,11 @@
     where a.context_id = :package_id 
     and t.ticket_id = :ticket_id
     and t.area_id = a.area_id
-}] then { ad_returnredirect "ticket-none" }
+}] then {
+    ad_returnredirect "ticket-none" 
+    ad_script_abort
+}
 
-
 set title "Ticket $ticket_id"
 set context [list [list "prefs-ae?area_id=$area_id" "$area_name"] $title]
 
Index: openacs-4/packages/acs-admin/www/apm/packages-install-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/packages-install-2.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-admin/www/apm/packages-install-2.tcl	13 Mar 2002 22:50:53 -0000	1.4
+++ openacs-4/packages/acs-admin/www/apm/packages-install-2.tcl	18 Sep 2002 11:54:42 -0000	1.5
@@ -54,7 +54,7 @@
     ad_set_client_property -clob t apm pkg_enable_list $enable
 
     ad_returnredirect packages-install-3
-    return
+    ad_script_abort
 } else {
     ### Check failed.  Offer user an explanation and an ability to select unselect packages.
     doc_body_append "[apm_header "Package Installation"]
Index: openacs-4/packages/acs-admin/www/apm/version-disable.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-disable.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-admin/www/apm/version-disable.tcl	10 Sep 2002 22:21:59 -0000	1.2
+++ openacs-4/packages/acs-admin/www/apm/version-disable.tcl	18 Sep 2002 11:54:42 -0000	1.3
@@ -9,4 +9,4 @@
 
 apm_version_disable -callback apm_dummy_callback $version_id
 
-ns_returnredirect "version-view?version_id=$version_id"
+ad_returnredirect "version-view?version_id=$version_id"
Index: openacs-4/packages/acs-admin/www/apm/version-enable.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-enable.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-admin/www/apm/version-enable.tcl	10 Sep 2002 22:21:59 -0000	1.2
+++ openacs-4/packages/acs-admin/www/apm/version-enable.tcl	18 Sep 2002 11:54:42 -0000	1.3
@@ -12,4 +12,4 @@
 
 apm_version_enable -callback apm_dummy_callback $version_id
 
-ns_returnredirect "version-view?version_id=$version_id"
+ad_returnredirect "version-view?version_id=$version_id"
Index: openacs-4/packages/acs-admin/www/apm/version-generate-info.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-generate-info.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-admin/www/apm/version-generate-info.tcl	10 Sep 2002 22:21:59 -0000	1.2
+++ openacs-4/packages/acs-admin/www/apm/version-generate-info.tcl	18 Sep 2002 11:54:42 -0000	1.3
@@ -20,6 +20,7 @@
     }
 
     ad_returnredirect "version-view?version_id=$version_id"
+    ad_script_abort
 } else {
     ns_return 200 text/plain [apm_generate_package_spec $version_id]
 }
Index: openacs-4/packages/acs-api-browser/www/proc-search.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-api-browser/www/proc-search.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-api-browser/www/proc-search.tcl	10 Sep 2002 22:22:04 -0000	1.4
+++ openacs-4/packages/acs-api-browser/www/proc-search.tcl	18 Sep 2002 11:55:43 -0000	1.5
@@ -39,7 +39,7 @@
 ## Optimizes quick search
 if {$quick_view && [nsv_exists api_proc_doc $query_string]} {
     ad_returnredirect [api_proc_url $query_string]
-    return
+    ad_script_abort
 }
 
 ###########################
@@ -114,7 +114,7 @@
 
 if {$quick_view && ![empty_string_p $matches]} {
     ad_returnredirect [api_proc_url [lindex [lindex $matches 0] 0]]
-    return
+    ad_script_abort
 }
 
 set title "Procedure Search for: \"$query_string\""
Index: openacs-4/packages/acs-api-browser/www/tcl-doc-search.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-api-browser/www/tcl-doc-search.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-api-browser/www/tcl-doc-search.tcl	6 Sep 2002 21:49:54 -0000	1.3
+++ openacs-4/packages/acs-api-browser/www/tcl-doc-search.tcl	18 Sep 2002 11:55:43 -0000	1.4
@@ -23,11 +23,9 @@
     set search_for [string range $tcl_proc 0 $i]
     if { [regexp "<a href=\"(\[^>\]+)\">$search_for</a>" $tcl_docs_index_page match relative_url] } {
         ad_returnredirect "$tcl_docs_root$relative_url"
-        return
+        ad_script_abort
     } 
 }
 
 set title "Tcl API Procedure Search for: \"$tcl_proc\""
 set context [list "TCL API Search: $tcl_proc"]
-
-ad_return_template
Index: openacs-4/packages/acs-api-browser/www/tcl-proc-view.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-api-browser/www/tcl-proc-view.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-api-browser/www/tcl-proc-view.tcl	6 Sep 2002 21:49:54 -0000	1.3
+++ openacs-4/packages/acs-api-browser/www/tcl-proc-view.tcl	18 Sep 2002 11:55:43 -0000	1.4
@@ -21,12 +21,9 @@
     set search_for [string range $tcl_proc 0 $i]
     if { [regexp "<a href=(\[^>\]+#\[^>\]+)>$search_for</a>" $tcl_api_index_page match relative_url] } {
         ad_returnredirect "$tcl_api_root$relative_url"
-        return
+        ad_script_abort
     } 
 }
 
 set title "Tcl API Procedure Search for: \"$tcl_proc\""
 set context [list "TCL API Search: $tcl_proc"]
-
-ad_return_template
-
Index: openacs-4/packages/acs-bootstrap-installer/installer.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-bootstrap-installer/installer.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-bootstrap-installer/installer.tcl	13 Mar 2002 22:50:53 -0000	1.5
+++ openacs-4/packages/acs-bootstrap-installer/installer.tcl	18 Sep 2002 11:56:46 -0000	1.6
@@ -126,7 +126,7 @@
     }
 
     if { ![regexp {/([a-zA-Z0-9\-_]*)$} [ad_conn url] "" script] } {
-	ns_returnredirect "/"
+	ad_returnredirect "/"
 	return
     }
 
Index: openacs-4/packages/acs-bootstrap-installer/installer/create-administrator-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-bootstrap-installer/installer/Attic/create-administrator-2.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-bootstrap-installer/installer/create-administrator-2.tcl	9 Mar 2002 02:00:02 -0000	1.3
+++ openacs-4/packages/acs-bootstrap-installer/installer/create-administrator-2.tcl	18 Sep 2002 11:56:48 -0000	1.4
@@ -59,4 +59,4 @@
   }
 }
     
-ns_returnredirect "site-info?[ad_export_vars email]"
+ad_returnredirect "site-info?[ad_export_vars email]"
Index: openacs-4/packages/bug-tracker/www/admin/formwizard.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/admin/formwizard.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/bug-tracker/www/admin/formwizard.tcl	10 Sep 2002 22:22:28 -0000	1.3
+++ openacs-4/packages/bug-tracker/www/admin/formwizard.tcl	18 Sep 2002 12:03:59 -0000	1.4
@@ -15,7 +15,7 @@
 if {![empty_string_p $table_name] && ![db_0or1row table_name_check {
     select oid from pg_class where lower(relname) = lower(:table_name)
 }]} {
-    ns_returnredirect "formwizard"
+    ad_returnredirect "formwizard"
 }
 
 set form_name $table_name
Index: openacs-4/packages/cms/tcl/user-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/tcl/Attic/user-procs.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/cms/tcl/user-procs.tcl	15 Aug 2002 03:39:34 -0000	1.4
+++ openacs-4/packages/cms/tcl/user-procs.tcl	18 Sep 2002 12:04:14 -0000	1.5
@@ -5,7 +5,7 @@
   proc checkRegistration { url } {
     
     if { [getID] == 0 } { 
-      ns_returnredirect $url
+      ad_returnredirect $url
     }
   }
 
Index: openacs-4/packages/faq/www/admin/q_and_a-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/q_and_a-delete.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/faq/www/admin/q_and_a-delete.tcl	20 Apr 2001 20:51:10 -0000	1.1
+++ openacs-4/packages/faq/www/admin/q_and_a-delete.tcl	18 Sep 2002 12:02:20 -0000	1.2
@@ -25,4 +25,4 @@
     }
 }
 
-ad_returnredirect "one-faq.tcl?faq_id=$faq_id"
\ No newline at end of file
+ad_returnredirect "one-faq?faq_id=$faq_id"
Index: openacs-4/packages/postcard/www/send-card.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/postcard/www/send-card.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/postcard/www/send-card.tcl	28 Aug 2002 07:51:18 -0000	1.3
+++ openacs-4/packages/postcard/www/send-card.tcl	18 Sep 2002 12:02:33 -0000	1.4
@@ -39,6 +39,7 @@
 
 } on_error { # most likely a double click
     ad_returnredirect "."
+    # continue here to send mail!
 }
 
 
Index: openacs-4/packages/schema-browser/www/column-comments-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/schema-browser/www/column-comments-2.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/schema-browser/www/column-comments-2.tcl	10 Sep 2002 22:23:21 -0000	1.2
+++ openacs-4/packages/schema-browser/www/column-comments-2.tcl	18 Sep 2002 12:03:08 -0000	1.3
@@ -28,4 +28,4 @@
 
 db_dml comment_add "comment on column ${table_name}.$column_name is :comments"
 
-ad_returnredirect "index.tcl?[export_url_vars table_name]"
\ No newline at end of file
+ad_returnredirect "index?[export_url_vars table_name]"
Index: openacs-4/packages/search/www/search.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/search/www/search.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/search/www/search.tcl	6 Jul 2002 13:38:02 -0000	1.8
+++ openacs-4/packages/search/www/search.tcl	18 Sep 2002 12:04:29 -0000	1.9
@@ -64,7 +64,7 @@
     set object_type [acs_object_type $object_id]
     set url [acs_sc_call FtsContentProvider url [list $object_id] $object_type]
     ad_returnredirect $url
-    return
+    ad_script_abort
 }
 
 set elapsed [format "%.02f" [expr double(abs($tend - $t0)) / 1000.0]]
Index: openacs-4/packages/static-pages/www/page-visit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/static-pages/www/page-visit.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/static-pages/www/page-visit.tcl	30 Oct 2001 23:11:55 -0000	1.3
+++ openacs-4/packages/static-pages/www/page-visit.tcl	18 Sep 2002 12:03:33 -0000	1.4
@@ -12,6 +12,7 @@
 
 if { ![db_0or1row sp_path { select filename from static_pages where static_page_id = :page_id }] } {
     ad_return_error "Page not found" "The page requested could not be found."
+    ad_script_abort
 }
 
 # The filename must begin "[acs_root_dir]/www" to be valid.  These leading