Index: openacs-4/packages/acs-subsite/lib/subsites-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/lib/subsites-oracle.xql,v
diff -u -N
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-subsite/lib/subsites-oracle.xql 2 Jul 2016 11:35:43 -0000 1.1.2.1
@@ -0,0 +1,43 @@
+
+
+
+
+
+
+ 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 in ('[join [subsite::package_keys] {','}]')
+ and ag.package_id = p.package_id
+ and g.group_id = ag.group_id
+ and (exists (select 1
+ from acs_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 lower(instance_name)
+
+
+
+
+
Index: openacs-4/packages/acs-subsite/lib/subsites-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/lib/subsites-postgresql.xql,v
diff -u -N
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-subsite/lib/subsites-postgresql.xql 2 Jul 2016 11:35:43 -0000 1.1.2.1
@@ -0,0 +1,40 @@
+
+
+
+
+
+
+ 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 in ('[join [subsite::package_keys] {','}]')
+ and ag.package_id = p.package_id
+ and g.group_id = ag.group_id
+ and (acs_permission__permission_p(p.package_id, :untrusted_user_id, 'read')
+ or g.join_policy != 'closed')
+ order by lower(instance_name)
+
+
+
+
+
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.15.10.1 -r1.15.10.2
--- openacs-4/packages/acs-subsite/lib/subsites.tcl 10 Sep 2015 08:21:34 -0000 1.15.10.1
+++ openacs-4/packages/acs-subsite/lib/subsites.tcl 2 Jul 2016 11:35:43 -0000 1.15.10.2
@@ -3,7 +3,10 @@
set pretty_name [_ acs-subsite.subsite]
set pretty_plural [_ acs-subsite.subsites]
-set admin_p [permission::permission_p -object_id [ad_conn subsite_id] -privilege admin -party_id [ad_conn untrusted_user_id]]
+set admin_p [permission::permission_p \
+ -object_id [ad_conn subsite_id] \
+ -privilege admin \
+ -party_id [ad_conn untrusted_user_id]]
set actions {}
if {[info exists admin_p]
Index: openacs-4/packages/acs-subsite/lib/subsites.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/lib/subsites.xql,v
diff -u -N
--- openacs-4/packages/acs-subsite/lib/subsites.xql 1 Jul 2016 13:47:06 -0000 1.3.18.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,43 +0,0 @@
-
-
-
-
-
-
- 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 in ('[join [subsite::package_keys] {','}]')
- and ag.package_id = p.package_id
- and g.group_id = ag.group_id
- and (exists (select 1
- from acs_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 lower(instance_name)
-
-
-
-
-