Index: openacs-4/packages/acs-subsite/www/admin/site-map/mount.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/mount.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/site-map/mount.tcl	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/site-map/mount.tcl	21 Jun 2002 19:08:33 -0000	1.2
@@ -15,68 +15,33 @@
 
 doc_body_append "[ad_header "Mount A Package Instance"]
 
-Please select one of the following packages to mount on [db_string url {
-  select site_node.url(:node_id) from dual
-}].
-<p />
+Please select one of the following packages to mount on [site_node::get_url -node_id $node_id].
+<p>
 The package instances are not mounted anywhere else:
 
 <ul>
 "
 
-db_foreach packages_unmounted_select {
-  select package_id, acs_object.name(package_id) as name
-  from
-  apm_packages
-  where (acs_permission.permission_p(package_id, :user_id, 'read') = 't' or
-         acs_permission.permission_p(package_id, acs.magic_object_id('the_public'), 'read') = 't')
-        and apm_package.singleton_p(package_key) = 0
-        and not exists (select 1
-                           from site_nodes
-                           where object_id = package_id)  
-
-  order by name
-} {
+db_foreach packages_unmounted_select {} {
   doc_body_append "<li><a href=mount-2?[export_url_vars expand:multiple root_id node_id package_id]>$name</a>"
 }
 
 doc_body_append "</ul> These instances are already mounted
 elsewhere. Selecting one of them will create an additional location
 for the same application: <ul>"
 
-db_foreach packages_mounted_select {
-  select package_id, acs_object.name(package_id) as name
-  from
-  apm_packages
-  where (acs_permission.permission_p(package_id, :user_id, 'read') = 't' or
-         acs_permission.permission_p(package_id, acs.magic_object_id('the_public'), 'read') = 't')
-        and exists (select 1
-                       from site_nodes
-                       where object_id = package_id)  
-  order by name
-} {
+db_foreach packages_mounted_select {} {
   doc_body_append "<li><a href=mount-2?[export_url_vars expand:multiple root_id node_id package_id]>$name</a>"
 }
 
-doc_body_append "</ul> 
+doc_body_append "</ul>
 
 The packages are centralized services and are
-probably not meant to be mounted anywhere: 
+probably not meant to be mounted anywhere:
 
 <ul>"
 
-db_foreach packages_singleton_select {
-  select package_id, acs_object.name(package_id) as name
-  from
-  apm_packages
-  where (acs_permission.permission_p(package_id, :user_id, 'read') = 't' or
-         acs_permission.permission_p(package_id, acs.magic_object_id('the_public'), 'read') = 't')
-        and apm_package.singleton_p(package_key) = 1
-        and not exists (select 1
-                           from site_nodes
-                           where object_id = package_id)  
-  order by name
-} {
+db_foreach packages_singleton_select {} {
   doc_body_append "<li><a href=mount-2?[export_url_vars expand:multiple root_id node_id package_id]>$name</a>"
 }