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.6 -r1.7
--- openacs-4/packages/acs-admin/www/apm/version-generate-info.tcl	7 Aug 2017 23:47:45 -0000	1.6
+++ openacs-4/packages/acs-admin/www/apm/version-generate-info.tcl	19 Jan 2018 21:23:51 -0000	1.7
@@ -23,6 +23,7 @@
     ad_script_abort
 } else {
     ns_return 200 text/plain [apm_generate_package_spec $version_id]
+    ad_script_abort
 }
 
 
Index: openacs-4/packages/acs-admin/www/auth/batch-document-download.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/auth/batch-document-download.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-admin/www/auth/batch-document-download.tcl	7 Aug 2017 23:47:45 -0000	1.3
+++ openacs-4/packages/acs-admin/www/auth/batch-document-download.tcl	19 Jan 2018 21:23:51 -0000	1.4
@@ -13,6 +13,7 @@
 }]
 
 ns_return 200 text/plain $document
+ad_script_abort
 
 # Local variables:
 #    mode: tcl
Index: openacs-4/packages/acs-admin/www/users/session-history.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/Attic/session-history.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-admin/www/users/session-history.tcl	7 Aug 2017 23:47:45 -0000	1.5
+++ openacs-4/packages/acs-admin/www/users/session-history.tcl	19 Jan 2018 21:23:51 -0000	1.6
@@ -63,6 +63,7 @@
 "
 db_release_unused_handles
 ns_return 200 text/html $whole_page
+ad_script_abort
 
 # Local variables:
 #    mode: tcl
Index: openacs-4/packages/acs-admin/www/users/sessions-one-month.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/Attic/sessions-one-month.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-admin/www/users/sessions-one-month.tcl	7 Aug 2017 23:47:45 -0000	1.4
+++ openacs-4/packages/acs-admin/www/users/sessions-one-month.tcl	19 Jan 2018 21:23:51 -0000	1.5
@@ -51,6 +51,7 @@
 "
 db_release_unused_handles
 ns_return 200 text/html $whole_page
+ad_script_abort
 
 # Local variables:
 #    mode: tcl
Index: openacs-4/packages/acs-admin/www/users/sessions-registered-summary.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/Attic/sessions-registered-summary.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-admin/www/users/sessions-registered-summary.tcl	7 Aug 2017 23:47:45 -0000	1.3
+++ openacs-4/packages/acs-admin/www/users/sessions-registered-summary.tcl	19 Jan 2018 21:23:51 -0000	1.4
@@ -11,11 +11,11 @@
 
 # go_beyond_60_days_p (optional; default is to limit to 60 days)
 
-append whole_page "[ad_admin_header "Registered Sessions"]
+append whole_page "[ad_admin_header {Registered Sessions}]
 
 <h2>Registered Sessions</h2>
 
-[ad_context_bar [list "./" "Users"] "Registered Sessions"]
+[ad_context_bar [list ./ Users] {Registered Sessions}]
 
 <hr>
 
@@ -64,6 +64,7 @@
 [ad_admin_footer]
 "
 ns_return 200 text/html $whole_page
+ad_script_abort
 
 # Local variables:
 #    mode: tcl
Index: openacs-4/packages/acs-automated-testing/www/admin/clear.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-automated-testing/www/admin/clear.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-automated-testing/www/admin/clear.tcl	7 Aug 2017 23:47:46 -0000	1.5
+++ openacs-4/packages/acs-automated-testing/www/admin/clear.tcl	19 Jan 2018 21:23:51 -0000	1.6
@@ -15,6 +15,7 @@
 db_dml delete_testcase_tests_sql $sql
 
 ad_returnredirect "index?by_package_key=$package_key&by_category=$category&view_by=$view_by&quiet=$quiet"
+ad_script_abort
 
 # Local variables:
 #    mode: tcl
Index: openacs-4/packages/acs-automated-testing/www/admin/init-file-resource.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-automated-testing/www/admin/init-file-resource.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-automated-testing/www/admin/init-file-resource.tcl	7 Aug 2017 23:47:46 -0000	1.2
+++ openacs-4/packages/acs-automated-testing/www/admin/init-file-resource.tcl	19 Jan 2018 21:23:51 -0000	1.3
@@ -14,6 +14,7 @@
 apm_source $absolute_file_path
 
 ad_returnredirect $return_url
+ad_script_abort
 
 # Local variables:
 #    mode: tcl
Index: openacs-4/packages/acs-automated-testing/www/admin/rerun.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-automated-testing/www/admin/rerun.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/acs-automated-testing/www/admin/rerun.tcl	7 Aug 2017 23:47:46 -0000	1.7
+++ openacs-4/packages/acs-automated-testing/www/admin/rerun.tcl	19 Jan 2018 21:23:51 -0000	1.8
@@ -22,16 +22,19 @@
 	{by_package_key $package_key}
 	{by_category $category}
 	view_by quiet stress security_risk}]
+    ad_script_abort
 } else {
     if {$quiet} {
 	aa_runseries -quiet -testcase_id $testcase_id "" ""
     } else {
 	aa_runseries -testcase_id $testcase_id "" ""
     }
     ad_returnredirect "testcase?testcase_id=$testcase_id&package_key=$package_key&quiet=$quiet"
+    ad_script_abort
 }
 
 
+
 # Local variables:
 #    mode: tcl
 #    tcl-indent-level: 4
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.27 -r1.28
--- openacs-4/packages/acs-bootstrap-installer/installer.tcl	17 Dec 2017 20:36:03 -0000	1.27
+++ openacs-4/packages/acs-bootstrap-installer/installer.tcl	19 Jan 2018 21:23:51 -0000	1.28
@@ -214,6 +214,7 @@
 proc install_file_serve { path } {
     if {[file isdirectory $path] && [string index [ad_conn url] end] != "/" } {
         ad_returnredirect "[ad_conn url]/"
+        ad_script_abort
     } else {
         ns_log Debug "Installer serving $path"
         ad_try {
@@ -223,6 +224,7 @@
         your URL and try again."
         } trap {AD EXCEPTION redirect} {url} {
             ad_returnredirect $url
+            ad_script_abort
         } trap {AD EXCEPTION directory} {dir_index} {
             set new_file [file join $path "index.html"]
             if {[file exists $new_file]} {
Index: openacs-4/packages/acs-content-repository/www/admin/mime-types/unmap.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/www/admin/mime-types/unmap.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-content-repository/www/admin/mime-types/unmap.tcl	7 Aug 2017 23:47:47 -0000	1.2
+++ openacs-4/packages/acs-content-repository/www/admin/mime-types/unmap.tcl	19 Jan 2018 21:23:51 -0000	1.3
@@ -17,6 +17,7 @@
 db_dml extension_unmap {}
 
 ad_returnredirect $return_url
+ad_script_abort
 
 # Local variables:
 #    mode: tcl
Index: openacs-4/packages/acs-core-docs/www/files/tutorial/note-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/files/tutorial/note-delete.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-core-docs/www/files/tutorial/note-delete.tcl	7 Aug 2017 23:47:54 -0000	1.4
+++ openacs-4/packages/acs-core-docs/www/files/tutorial/note-delete.tcl	19 Jan 2018 21:23:51 -0000	1.5
@@ -15,7 +15,7 @@
 
 ad_returnredirect "."
 # stop running this code, since we're redirecting
-abort
+ad_script_abort
 
 # Local variables:
 #    mode: tcl
Index: openacs-4/packages/acs-developer-support/www/send.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-developer-support/www/send.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/acs-developer-support/www/send.tcl	7 Aug 2017 23:47:56 -0000	1.6
+++ openacs-4/packages/acs-developer-support/www/send.tcl	19 Jan 2018 21:23:51 -0000	1.7
@@ -31,6 +31,7 @@
         }
     }
 }
+ad_script_abort
 
 
 # Local variables:
Index: openacs-4/packages/acs-lang/www/admin/load-catalog-files.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/load-catalog-files.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/acs-lang/www/admin/load-catalog-files.tcl	7 Aug 2017 23:47:57 -0000	1.6
+++ openacs-4/packages/acs-lang/www/admin/load-catalog-files.tcl	19 Jan 2018 21:23:51 -0000	1.7
@@ -9,6 +9,7 @@
 lang::catalog::import
 
 ad_returnredirect "index"
+ad_script_abort
 
 # Local variables:
 #    mode: tcl
Index: openacs-4/packages/acs-lang/www/admin/message-conflict-resolve.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/message-conflict-resolve.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-lang/www/admin/message-conflict-resolve.tcl	7 Aug 2017 23:47:57 -0000	1.3
+++ openacs-4/packages/acs-lang/www/admin/message-conflict-resolve.tcl	19 Jan 2018 21:23:51 -0000	1.4
@@ -13,6 +13,7 @@
 lang::message::edit $package_key $message_key $locale [list conflict_p f]
 
 ad_returnredirect $return_url
+ad_script_abort
 
 # Local variables:
 #    mode: tcl
Index: openacs-4/packages/acs-lang/www/admin/message-conflict-revert.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/message-conflict-revert.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-lang/www/admin/message-conflict-revert.tcl	7 Aug 2017 23:47:57 -0000	1.3
+++ openacs-4/packages/acs-lang/www/admin/message-conflict-revert.tcl	19 Jan 2018 21:23:51 -0000	1.4
@@ -21,6 +21,7 @@
 }
 
 ad_returnredirect $return_url
+ad_script_abort
 
 # Local variables:
 #    mode: tcl
Index: openacs-4/packages/acs-lang/www/admin/reload-cache.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/reload-cache.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-lang/www/admin/reload-cache.tcl	7 Aug 2017 23:47:57 -0000	1.2
+++ openacs-4/packages/acs-lang/www/admin/reload-cache.tcl	19 Jan 2018 21:23:51 -0000	1.3
@@ -9,6 +9,7 @@
 lang::message::cache
 
 ad_returnredirect "index"
+ad_script_abort
 
 # Local variables:
 #    mode: tcl
Index: openacs-4/packages/acs-lang/www/admin/translator-mode-toggle.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/translator-mode-toggle.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-lang/www/admin/translator-mode-toggle.tcl	7 Aug 2017 23:47:57 -0000	1.3
+++ openacs-4/packages/acs-lang/www/admin/translator-mode-toggle.tcl	19 Jan 2018 21:23:51 -0000	1.4
@@ -11,8 +11,8 @@
 lang::util::translator_mode_set [expr {![lang::util::translator_mode_p]}] 
 
 ad_returnredirect $return_url
+ad_script_abort
 
-
 # Local variables:
 #    mode: tcl
 #    tcl-indent-level: 4
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.3 -r1.4
--- openacs-4/packages/acs-ldap-authentication/www/examples/user-new-2.tcl	29 Dec 2008 22:14:14 -0000	1.3
+++ openacs-4/packages/acs-ldap-authentication/www/examples/user-new-2.tcl	19 Jan 2018 21:23:51 -0000	1.4
@@ -93,3 +93,5 @@
 }
 
 ad_returnredirect $return_url
+ad_script_abort
+
Index: openacs-4/packages/acs-object-management/www/admin/view-attributes-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-object-management/www/admin/view-attributes-add.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-object-management/www/admin/view-attributes-add.tcl	27 Nov 2009 00:38:50 -0000	1.2
+++ openacs-4/packages/acs-object-management/www/admin/view-attributes-add.tcl	19 Jan 2018 21:23:51 -0000	1.3
@@ -14,4 +14,4 @@
 }
 
 ad_returnredirect $return_url
-
+ad_script_abort
Index: openacs-4/packages/acs-object-management/www/admin/view-attributes-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-object-management/www/admin/view-attributes-delete.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-object-management/www/admin/view-attributes-delete.tcl	27 Nov 2009 00:38:50 -0000	1.2
+++ openacs-4/packages/acs-object-management/www/admin/view-attributes-delete.tcl	19 Jan 2018 21:23:51 -0000	1.3
@@ -16,4 +16,4 @@
 }
 
 ad_returnredirect $return_url
-
+ad_script_abort
Index: openacs-4/packages/acs-object-management/www/admin/widget-remove.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-object-management/www/admin/widget-remove.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-object-management/www/admin/widget-remove.tcl	27 Nov 2009 00:38:50 -0000	1.1
+++ openacs-4/packages/acs-object-management/www/admin/widget-remove.tcl	19 Jan 2018 21:23:51 -0000	1.2
@@ -13,3 +13,5 @@
         -attribute_id $attribute_id
 
 ad_returnredirect $return_url
+ad_script_abort
+
Index: openacs-4/packages/acs-subsite/www/admin/themes/delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/themes/delete.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/admin/themes/delete.tcl	7 Aug 2017 23:47:58 -0000	1.2
+++ openacs-4/packages/acs-subsite/www/admin/themes/delete.tcl	19 Jan 2018 21:23:51 -0000	1.3
@@ -18,3 +18,4 @@
 subsite::delete_subsite_theme -key $theme
 
 ns_returnredirect "."
+ad_script_abort
Index: openacs-4/packages/acs-subsite/www/admin/themes/set.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/themes/set.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/admin/themes/set.tcl	7 Aug 2017 23:47:58 -0000	1.2
+++ openacs-4/packages/acs-subsite/www/admin/themes/set.tcl	19 Jan 2018 21:23:51 -0000	1.3
@@ -18,3 +18,4 @@
 subsite::set_theme -theme $theme
 
 ns_returnredirect "."
+ad_script_abort