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.21
--- 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	3 Sep 2024 15:37:29 -0000	1.21
@@ -7,7 +7,7 @@
     @cvs-id $Id$
 } {
     {sql_file:multiple ""}
-    {mount_packages:multiple ""} 
+    {mount_packages:multiple ""}
     {mount_path:array ""}
 }
 
@@ -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>
@@ -44,36 +44,36 @@
     set package_path [pkg_info_path $pkg_info]
 
     if { [catch {
-	array set version [apm_read_package_info_file $spec_file]
+        array set version [apm_read_package_info_file $spec_file]
     } errmsg] } {
-	ns_write "<li> Unable to install the [pkg_info_key $pkg_info] package because its specification
-	file is invalid: <blockquote><pre>[ns_quotehtml $errmsg]</pre></blockquote>"
-	continue
+        ns_write "<li> Unable to install the [pkg_info_key $pkg_info] package because its specification
+        file is invalid: <blockquote><pre>[ns_quotehtml $errmsg]</pre></blockquote>"
+        continue
     }
 
     set package_key $version(package.key)
 
     if {[apm_package_version_installed_p $package_key $version(name)] } {
-	#ns_log notice "===== ALREADY installed $package_key"
-	# Already installed.
-	continue
+        #ns_log notice "===== ALREADY installed $package_key"
+        # Already installed.
+        continue
     }
 
     set version_files $version(files)
 
     set data_model_files [list]
     # Find the correct data model files for this package.
     foreach file $sql_files {
-	if {[lindex $file 2] eq $package_key } {
-	    # Pass on the file path and its type.
-	    lappend data_model_files $file
-	}
+        if {[lindex $file 2] eq $package_key } {
+            # Pass on the file path and its type.
+            lappend data_model_files $file
+        }
     }
 
     # Mount path of package
     if { $package_key in $mount_packages
-	 && [info exists mount_path($package_key)] 
-	 && $mount_path($package_key) ne "" 
+         && [info exists mount_path($package_key)]
+         && $mount_path($package_key) ne ""
      } {
         set selected_mount_path $mount_path($package_key)
     } else {
@@ -87,32 +87,33 @@
     set enable_p 1
 
     if {[catch {
-	ns_log notice "===== INSTALL $package_key"
-	set version_id [apm_package_install \
-			    -enable=$enable_p \
-			    -package_path $package_path \
-			    -callback apm_ns_write_callback \
-			    -load_data_model \
-			    -data_model_files $data_model_files \
-			    -mount_path $selected_mount_path \
-			    $spec_file]
-	ns_log notice "===== INSTALL $package_key DONE"
+        ns_log notice "===== INSTALL $package_key"
+        set version_id [apm_package_install \
+                            -enable=$enable_p \
+                            -package_path $package_path \
+                            -callback apm_ns_write_callback \
+                            -load_data_model \
+                            -data_model_files $data_model_files \
+                            -mount_path $selected_mount_path \
+                            $spec_file]
+        ns_log notice "===== INSTALL $package_key DONE"
 
     } errorMsg]} {
-	ns_write "Error: $errorMsg\n"
-	ns_write [ns_quotehtml $::errorInfo]
-	set version_id 0
+        ns_write "Error: $errorMsg<br>\n<pre>"
+        ns_write [ns_quotehtml $::errorInfo]
+        ns_write "</pre>\n"
+        set version_id 0
     }
 
     if { $version_id == 0 } {
         # Installation of the package failed and we shouldn't continue with installation
         # as there might be packages depending on the failed package. Ideally we should
         # 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);
+            </ul>
+            <script nonce='[security::csp::nonce]'>window.scrollTo(0,document.body.scrollHeight);clearInterval(myInterval);
             </script>
-	}]
+        }]
         ad_script_abort
     }
 
@@ -121,19 +122,19 @@
 
 if {$installed_count < 1} {
     ns_write {
-	</ul>
-	All packages in this directory have already been installed.
-	Please return to the <a href="index">index</a>.<p>
+        </ul>
+        All packages in this directory have already been installed.
+        Please return to the <a href="index">index</a>.<p>
     }
 } else {
     ns_write {</ul><p>
-	Done installing packages.
-	<p>You should restart the server now to make installed and upgraded packages available.</p>
+        Done installing packages.
+        <p>You should restart the server now to make installed and upgraded packages available.</p>
         <p><a href="../server-restart" class="button">Click here</a> to restart the server now.</p>
     }
 }
 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: