Index: openacs-4/packages/acs-subsite/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/index.adp,v
diff -u -r1.19 -r1.20
--- openacs-4/packages/acs-subsite/www/index.adp	30 Dec 2003 22:03:57 -0000	1.19
+++ openacs-4/packages/acs-subsite/www/index.adp	30 Jan 2004 15:17:05 -0000	1.20
@@ -29,28 +29,26 @@
           <a href="members/" class="button">#acs-subsite.Members#</a>
         </if>
 
-        <if @user_id@ ne 0>
-            <if @main_site_p@ false>  
-              <if @group_member_p@ true>
-                <a href="group-leave" class="button" title="#acs-subsite.Leave_this_subsite#">#acs-subsite.Leave_subsite#</a>
-              </if>
-              <else>
-                <if @can_join_p@ true>
-                  <if @group_join_policy@ eq "open">
-                    <a href="register/user-join" class="button" title="#acs-subsite.Join_this_subsite">#acs-subsite.Join_subsite#</a>
-                  </if>
-                  <else>
-                    <a href="register/user-join" class="button" title="#acs-subsite.Req_membership_subs#">#acs-subsite.Request_membership#</a>
-                  </else>
-                </if>
-              </else>
+        <if @untrusted_user_id@ ne 0>
+          <if @main_site_p@ false>  
+            <if @group_member_p@ true>
+              <a href="group-leave" class="button" title="#acs-subsite.Leave_this_subsite#">#acs-subsite.Leave_subsite#</a>
             </if>
-            <if @admin_p@ true> 
-              <a href="admin/" class="button" title="#acs-subsite.Administer_subsite#">#acs-kernel.common_Administration#</a>
-            </if>
-          </div>
+            <else>
+              <if @can_join_p@ true>
+                <if @group_join_policy@ eq "open">
+                  <a href="register/user-join" class="button" title="#acs-subsite.Join_this_subsite">#acs-subsite.Join_subsite#</a>
+                </if>
+                <else>
+                  <a href="register/user-join" class="button" title="#acs-subsite.Req_membership_subs#">#acs-subsite.Request_membership#</a>
+                </else>
+              </if>
+            </else>
+          </if>
         </if>
-
+        <if @admin_p@ true> 
+          <a href="admin/" class="button" title="#acs-subsite.Administer_subsite#">#acs-kernel.common_Administration#</a>
+        </if>
       </div>
     </td>
   </tr>
Index: openacs-4/packages/acs-subsite/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/index.tcl,v
diff -u -r1.18 -r1.19
--- openacs-4/packages/acs-subsite/www/index.tcl	24 Jan 2004 16:43:37 -0000	1.18
+++ openacs-4/packages/acs-subsite/www/index.tcl	30 Jan 2004 15:17:05 -0000	1.19
@@ -35,6 +35,7 @@
 set admin_p [permission::permission_p -object_id $package_id -party_id [ad_conn untrusted_user_id] -privilege admin]
 
 set user_id [ad_conn user_id]
+set untrusted_user_id [ad_conn untrusted_user_id]
 
 set subsite_name [ad_conn instance_name]