Index: openacs-4/packages/acs-admin/acs-admin.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/acs-admin.info,v
diff -u -r1.58.2.2 -r1.58.2.3
--- openacs-4/packages/acs-admin/acs-admin.info	14 Feb 2020 13:42:12 -0000	1.58.2.2
+++ openacs-4/packages/acs-admin/acs-admin.info	3 May 2020 16:46:05 -0000	1.58.2.3
@@ -9,7 +9,7 @@
     <implements-subsite-p>f</implements-subsite-p>
     <inherit-templates-p>t</inherit-templates-p>
 
-    <version name="5.10.0d9" url="http://openacs.org/repository/download/apm/acs-admin-5.10.0d9.apm">
+    <version name="5.10.0d10" url="http://openacs.org/repository/download/apm/acs-admin-5.10.0d10.apm">
         <owner url="mailto:dhogaza@pacifier.com">Don Baccus</owner>
         <summary>An interface for Site-wide administration of an OpenACS Installation.</summary>
         <release-date>2017-08-06</release-date>
@@ -20,9 +20,9 @@
         <license>GPL</license>
         <maturity>3</maturity>
 
-        <provides url="acs-admin" version="5.10.0d9"/>
+        <provides url="acs-admin" version="5.10.0d10"/>
         <requires url="acs-kernel" version="5.9.1"/>
-	<requires url="acs-tcl" version="5.10.0d14"/>
+	<requires url="acs-tcl" version="5.10.0d32"/>
 	<requires url="acs-templating" version="5.9.1"/>
         <requires url="acs-mail-lite" version="5.9.1"/>
 	<requires url="acs-authentication" version="5.10.0d2"/>
Index: openacs-4/packages/acs-admin/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/index.tcl,v
diff -u -r1.17 -r1.17.2.1
--- openacs-4/packages/acs-admin/www/index.tcl	7 Aug 2017 23:47:45 -0000	1.17
+++ openacs-4/packages/acs-admin/www/index.tcl	3 May 2020 16:46:05 -0000	1.17.2.1
@@ -6,61 +6,61 @@
 }
 
 set page_title [ad_conn instance_name]
-set package_keys '[join [subsite::package_keys] ',']'
+set package_ids [subsite::package_keys]
 set subsite_number [db_string count_subsites [subst {
     select count(p.package_id) from apm_packages p, site_nodes s
-    where  package_key in ($package_keys)
+    where  package_key in ([ns_dbquotelist $package_ids])
     and    s.object_id = p.package_id
 }]]
 
 db_multirow -extend { admin_url global_param_url } packages installed_packages {} {
     set package_type [db_string get_package_type {
-        select package_type from apm_package_types 
+        select package_type from apm_package_types
         where package_key = :package_key
     }]
     if {
-	[apm_package_installed_p $package_key]
+        [apm_package_installed_p $package_key]
         && $package_type ne "apm_service"
-	&& [file exists "[acs_package_root_dir $package_key]/www/sitewide-admin/"]
+        && [file exists "[acs_package_root_dir $package_key]/www/sitewide-admin/"]
     } {
         set admin_url "package/$package_key/"
     } else {
         set admin_url ""
     }
     if { ![db_0or1row global_params_exist {}]
-	 || $global_params == 0
+         || $global_params == 0
      } {
-	set global_param_url ""
+        set global_param_url ""
     } else {
-	set return_url [ad_conn url]
+        set return_url [ad_conn url]
         set global_param_url [export_vars -base /shared/parameters {package_key return_url {scope global}}]
     }
     if { $admin_url eq "" && $global_param_url eq "" } {
         continue
     }
-} 
+}
 
 template::list::create \
     -name packages \
     -multirow packages \
     -elements {
         pretty_name {
             label "Package"
-	    html {align left}
+            html {align left}
         }
         admin_url {
             label "Site-Wide Administration"
             link_html { title "Site-wide Administration" }
             link_url_col admin_url
             display_template {<if @packages.admin_url@ not nil>#acs-admin.Administration#</if>}
-	    html {align left}
+            html {align left}
         }
         global_param_url {
             label "Global Parameters"
             link_html {title "Manage Global Parameters" }
             link_url_col global_param_url
             display_template {<if @packages.global_param_url@ not nil>#acs-admin.Parameters#</if>}
-	    html {align left}
+            html {align left}
         }
     }
 
@@ -70,4 +70,3 @@
 #    tcl-indent-level: 4
 #    indent-tabs-mode: nil
 # End:
-
Index: openacs-4/packages/acs-admin/www/subsites.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/subsites.tcl,v
diff -u -r1.5 -r1.5.2.1
--- openacs-4/packages/acs-admin/www/subsites.tcl	26 Jun 2018 10:33:51 -0000	1.5
+++ openacs-4/packages/acs-admin/www/subsites.tcl	3 May 2020 16:46:05 -0000	1.5.2.1
@@ -7,10 +7,9 @@
 
 set page_title "Defined Subsites"
 set context [list $page_title]
-
-set package_keys '[join [subsite::package_keys] ',']'
+set package_ids [subsite::package_keys]
 set subsite_number [db_string count_subsites [subst {
-    select count(*) from apm_packages where package_key in ($package_keys)
+    select count(*) from apm_packages where package_key in ([ns_dbquotelist $package_ids])
 }]]
 
 if {$subsite_number > 500} {
@@ -30,18 +29,18 @@
                p.package_id
         from   site_nodes s, apm_packages p
         where  s.object_id = p.package_id
-        and    p.package_key in ($package_keys)        
+        and    p.package_key in ([ns_dbquotelist $package_ids])
     }] {
         set node [site_node::get -node_id $node_id]
         set path_pretty [dict get $node instance_name]
         set parent_id   [dict get $node parent_id]
         set node_url    [dict get $node url]
-        
+
         set admin_url "${node_url}admin/"
         set parameter_url [export_vars -base /shared/parameters {package_id {return_url "[ad_conn url]"}}]
         set theme [parameter::get -parameter ThemeKey -package_id $package_id]
         set theme_url ${admin_url}themes/
-        
+
         while { $parent_id ne "" } {
             set node [site_node::get -node_id $parent_id]
             set path_pretty "[dict get $node instance_name] > $path_pretty"
@@ -89,7 +88,7 @@
                 sub_class narrow
                 display_template {
                     <img src="/shared/images/Edit16.gif" height="16" width="16" alt="Manage sitemap" style="border:0">
-                    
+
                 }
                 link_url_eval {[export_vars -base /admin/site-map { {root_id $node_id} }]}
                 link_html { title "Manage sitemap" }