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 -N -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>
+    }]
 }
 
 #####