Index: openacs-4/packages/acs-subsite/lib/subsites.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/lib/subsites.tcl,v
diff -u -N -r1.13 -r1.14
--- openacs-4/packages/acs-subsite/lib/subsites.tcl	17 May 2004 15:14:52 -0000	1.13
+++ openacs-4/packages/acs-subsite/lib/subsites.tcl	7 Mar 2005 21:02:15 -0000	1.14
@@ -1,10 +1,13 @@
+# @param admin_p - generate admin action links.
+
 set pretty_name [_ acs-subsite.subsite]
 set pretty_plural [_ acs-subsite.subsites]
 
 set admin_p [permission::permission_p -object_id [ad_conn package_id] -privilege admin -party_id [ad_conn untrusted_user_id]]
 
-set actions [list]
-if { $admin_p } {
+set actions {}
+if {[info exists admin_p] 
+    && $admin_p } {
     lappend actions [_ acs-subsite.Create_new_subsite] "[subsite::get_element -element url]admin/subsite-add" {}
 }
 
@@ -45,40 +48,7 @@
 
 set untrusted_user_id [ad_conn untrusted_user_id]
 
-db_multirow -extend { url join_url request_url } subsites select_subsites {
-    select p.package_id,
-           p.instance_name,
-           n.node_id, 
-           n.name,
-           :subsite_url || n.name as url,
-           (select count(*)
-            from   group_approved_member_map m
-            where  m.rel_type = 'membership_rel'
-            and    m.group_id = ag.group_id) as num_members,
-           (select min(r2.member_state)
-            from   group_member_map m2,
-                   membership_rels r2
-            where  m2.group_id = ag.group_id
-            and    m2.member_id = :untrusted_user_id
-            and    r2.rel_id = m2.rel_id) as member_state,
-           g.group_id,
-           g.join_policy
-    from   site_nodes n,
-           apm_packages p,
-           application_groups ag,
-           groups g
-    where  n.parent_id = :subsite_node_id
-    and    p.package_id = n.object_id
-    and    p.package_key = 'acs-subsite'
-    and    ag.package_id = p.package_id
-    and    g.group_id = ag.group_id
-    and    (exists (select 1 
-                   from   all_object_party_privilege_map perm 
-                   where  perm.object_id = p.package_id
-                   and    perm.privilege = 'read'
-                   and    perm.party_id = :untrusted_user_id) or g.join_policy != 'closed')
-    order  by upper(instance_name)
-} {
+db_multirow -extend { url join_url request_url } subsites select_subsites {*SQL*} {
     set join_url [export_vars -base "${subsite_url}register/user-join" { group_id { return_url [ad_return_url] } }]
     set url $subsite_url$name
 }