Index: openacs-4/packages/acs-admin/www/install/install-3.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/install/install-3.tcl,v
diff -u -r1.11 -r1.11.2.1
--- openacs-4/packages/acs-admin/www/install/install-3.tcl	7 Aug 2017 23:47:45 -0000	1.11
+++ openacs-4/packages/acs-admin/www/install/install-3.tcl	13 Jan 2020 16:21:05 -0000	1.11.2.1
@@ -92,22 +92,22 @@
     if { [info exists version(download_url)] && $version(download_url) ne "" } {
         ns_write [subst {
             <p>Transferring $version(download_url) ...
-            <script nonce='$::__csp_nonce'>window.scrollTo(0,document.body.scrollHeight);</script>
+            <script nonce='[security::csp::nonce]'>window.scrollTo(0,document.body.scrollHeight);</script>
         }]
         set spec_file [apm_load_apm_file -url $version(download_url)]
         if { $spec_file eq "" } {
             set msg "Error downloading package $package_key from $version(download_url). Installing package failed."
             ns_write [subst {
                 <p>$msg
-                <script nonce='$::__csp_nonce'>window.scrollTo(0,document.body.scrollHeight);</script>
+                <script nonce='[security::csp::nonce]'>window.scrollTo(0,document.body.scrollHeight);</script>
             }]
             ns_log Error $msg
             set success_p 0
             continue
         }
         ns_write [subst {
             Done<br>
-            <script nonce='$::__csp_nonce'>window.scrollTo(0,document.body.scrollHeight);</script>
+            <script nonce='[security::csp::nonce]'>window.scrollTo(0,document.body.scrollHeight);</script>
         }]
         set package_path "[apm_workspace_install_dir]/$package_key"
     } else {
@@ -152,7 +152,7 @@
 
     ns_write [subst {
 	<p>Installing $package_key ...<br>
-	<script nonce='$::__csp_nonce'>window.scrollTo(0,document.body.scrollHeight);</script>
+	<script nonce='[security::csp::nonce]'>window.scrollTo(0,document.body.scrollHeight);</script>
     }]
     
     # Install the package -- this actually copies the files into the
@@ -224,9 +224,9 @@
         #
         ns_ictl markfordelete
     }
-    ns_write {
-	<script nonce='$::__csp_nonce'>window.scrollTo(0,document.body.scrollHeight);</script>
-    }
+    ns_write [subst {
+	<script nonce='[security::csp::nonce]'>window.scrollTo(0,document.body.scrollHeight);</script>
+    }]
 }
 
 #####
Index: openacs-4/packages/acs-admin/www/apm/package-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/package-add.tcl,v
diff -u -r1.16 -r1.16.2.1
--- openacs-4/packages/acs-admin/www/apm/package-add.tcl	5 Aug 2018 21:10:39 -0000	1.16
+++ openacs-4/packages/acs-admin/www/apm/package-add.tcl	13 Jan 2020 16:23:13 -0000	1.16.2.1
@@ -23,7 +23,7 @@
 set body [subst {
 <form name='$form_name' action='package-add-2' method='post'>
 [export_vars -form {package_id version_id}] 
-<script type="text/javascript" nonce='$::__csp_nonce'>
+<script type="text/javascript" nonce='[security::csp::nonce]'>
 function updateURLs() {
     // Update the package and version URL, if the package key and/or version name change.
     var form = document.getElementsByName('$form_name')\[0\];
Index: openacs-4/packages/acs-admin/www/apm/version-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-edit.tcl,v
diff -u -r1.14.2.1 -r1.14.2.2
--- openacs-4/packages/acs-admin/www/apm/version-edit.tcl	13 Mar 2019 09:45:46 -0000	1.14.2.1
+++ openacs-4/packages/acs-admin/www/apm/version-edit.tcl	13 Jan 2020 16:24:41 -0000	1.14.2.2
@@ -38,7 +38,7 @@
     set version_uri_suffix [string range $version_uri $version_name_index+[string length $version_name] end]
 
     append body [subst {
-<script type="text/javascript" nonce='$::__csp_nonce'>
+<script type="text/javascript" nonce='[security::csp::nonce]'>
 function updateVersionURL() {
     var form = document.forms\[0\];
     form.version_uri.value = "$version_uri_prefix" + form.version_name.value + "$version_uri_suffix";
@@ -48,7 +48,7 @@
 }
 
 append body [subst {
-<script type="text/javascript" nonce='$::__csp_nonce'>
+<script type="text/javascript" nonce='[security::csp::nonce]'>
 function checkMailto(element) {
     // If it looks like an email address without a mailto: (contains an @ but
     // no colon) then prepend 'mailto:'.
Index: openacs-4/packages/acs-admin/www/apm/packages-install-4.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/packages-install-4.tcl,v
diff -u -r1.20 -r1.20.2.1
--- openacs-4/packages/acs-admin/www/apm/packages-install-4.tcl	7 Aug 2017 23:47:45 -0000	1.20
+++ openacs-4/packages/acs-admin/www/apm/packages-install-4.tcl	13 Jan 2020 16:26:31 -0000	1.20.2.1
@@ -24,7 +24,7 @@
 
 ns_write [subst {
     <h2>Installing packages...</h2>
-    <script nonce='$::__csp_nonce'>var myInterval = setInterval(function(){window.scrollTo(0,document.body.scrollHeight)}, 300);
+    <script nonce='[security::csp::nonce]'>var myInterval = setInterval(function(){window.scrollTo(0,document.body.scrollHeight)}, 300);
     </script>
     <p>
     <ul>
@@ -110,7 +110,7 @@
         # probably check for such dependencies and continue if there are none.
         ns_write [subst {
 	    </ul>
-	    <script nonce='$::__csp_nonce'>window.scrollTo(0,document.body.scrollHeight);clearInterval(myInterval);
+	    <script nonce='[security::csp::nonce]'>window.scrollTo(0,document.body.scrollHeight);clearInterval(myInterval);
             </script>
 	}]
         ad_script_abort
@@ -133,7 +133,7 @@
     }
 }
 ns_write [subst {
-    <script nonce='$::__csp_nonce'>window.scrollTo(0,document.body.scrollHeight);clearInterval(myInterval);</script>
+    <script nonce='[security::csp::nonce]'>window.scrollTo(0,document.body.scrollHeight);clearInterval(myInterval);</script>
 }]
 
 # Local variables:
Index: openacs-4/packages/acs-tcl/tcl/defs-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/defs-procs.tcl,v
diff -u -r1.81.2.5 -r1.81.2.6
--- openacs-4/packages/acs-tcl/tcl/defs-procs.tcl	3 Jan 2020 07:36:22 -0000	1.81.2.5
+++ openacs-4/packages/acs-tcl/tcl/defs-procs.tcl	13 Jan 2020 16:29:11 -0000	1.81.2.6
@@ -647,7 +647,7 @@
     @see ad_progress_bar_begin
 } {
     util_user_message -message $message_after_redirect
-    ns_write "<script type='text/javascript' nonce='$::__csp_nonce'>window.location='$url';</script>"
+    ns_write "<script type='text/javascript' nonce='[security::csp::nonce]'>window.location='$url';</script>"
     ns_conn close
 }
 
Index: openacs-4/packages/acs-templating/tcl/richtext-or-file-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/richtext-or-file-procs.tcl,v
diff -u -r1.13 -r1.13.2.1
--- openacs-4/packages/acs-templating/tcl/richtext-or-file-procs.tcl	6 Dec 2018 21:24:17 -0000	1.13
+++ openacs-4/packages/acs-templating/tcl/richtext-or-file-procs.tcl	13 Jan 2020 16:30:28 -0000	1.13.2.1
@@ -291,7 +291,7 @@
       }
 
       if { $storage_type eq "" || $storage_type eq "text" } {
-          append output [subst {<script type="text/javascript" nonce='$::__csp_nonce'><!--}] \
+          append output [subst {<script type="text/javascript" nonce='[security::csp::nonce]'><!--}] \
               \n {acs_RichText_WriteButtons();  //--></script>} \
               [textarea_internal "$element(id).text" attributes $text] \
               [subst {<br>Format: \