Index: openacs-4/packages/acs-subsite/tcl/group-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/group-procs.tcl,v
diff -u -r1.25.2.10 -r1.25.2.11
--- openacs-4/packages/acs-subsite/tcl/group-procs.tcl	21 Oct 2005 19:04:52 -0000	1.25.2.10
+++ openacs-4/packages/acs-subsite/tcl/group-procs.tcl	14 Dec 2005 17:15:59 -0000	1.25.2.11
@@ -485,25 +485,22 @@
     { -user_id "" }
     { -group_name "" }
     { -group_id "" }
+    { -subsite_id "" }
     -cascade:boolean
 } {
     Return 1 if the user is a member of the group specified.
     You can specify a group name or group id.
     </p><p>
-    <strong>Note:</strong> The group name is <strong>not</strong> unique
-    by definition,
-    and if you call this function with a duplicate group name it 
-    <strong>will</strong> bomb!!! Using the group name as a parameter is
-    thus strongly discouraged unless you are really, really sure the 
-    name is unique.</p>
-    <p>
+    If there is more than one group with this name, it will use the first one.
+     <p>
     If cascade is true, check to see if the user is
     a member of the group by virtue of any other component group.
     (e.g. if group B is a component of group A then if a user
      is a member of group B then he is automatically a member of A
      also.)
     If cascade is false, then the user must have specifically
     been granted membership on the group in question.</p>
+    @param subsite_id Only useful when using group_name. Marks the subsite in which to search for the group_id that belongs to the group_name
 } {
     if { [empty_string_p $user_id] } {
 	set user_id [ad_conn user_id]
@@ -514,7 +511,7 @@
     }
 
     if { ![empty_string_p $group_name] } {
-	set group_id [db_string group_id_from_name {} -default {}]
+	set group_id [group::get_id -group_name $group_name -subsite_id $subsite_id]
 	if { [empty_string_p $group_id] } {
 	    return 0
 	}
@@ -526,7 +523,41 @@
     return [template::util::is_true $result]
 }
 
+ad_proc -public group::party_member_p {
+    -party_id
+    { -group_name "" }
+    { -group_id "" }
+    { -subsite_id "" }
+} {
+    Return 1 if the party is an approved member of the group specified.
+    You can specify a group name or group id.
+    </p><p>
+    <strong>Note:</strong> The group name is <strong>not</strong> unique
+    by definition,
+    and if you call this function with a duplicate group name it 
+    <strong>will</strong> bomb!!! Using the group name as a parameter is
+    thus strongly discouraged unless you are really, really sure the 
+    name is unique.</p>
+    <p>The party must have specifically
+    been granted membership on the group in question.</p>
+} {
 
+    if { [empty_string_p $group_name] && [empty_string_p $group_id] } {
+	return 0
+    }
+
+    if { ![empty_string_p $group_name] } {
+	set group_id [group::get_id -group_name $group_name -subsite_id $subsite_id]
+	if { [empty_string_p $group_id] } {
+	    return 0
+	}
+    }
+
+    set result [db_string party_is_member {} -default "f"]
+    
+    return [template::util::is_true $result]
+}
+
 ad_proc -public group::get_rel_segment {
     {-group_id:required}
     {-type:required}
Index: openacs-4/packages/acs-subsite/tcl/group-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/Attic/group-procs.xql,v
diff -u -r1.6.2.5 -r1.6.2.6
--- openacs-4/packages/acs-subsite/tcl/group-procs.xql	24 Sep 2005 09:09:00 -0000	1.6.2.5
+++ openacs-4/packages/acs-subsite/tcl/group-procs.xql	14 Dec 2005 17:15:59 -0000	1.6.2.6
@@ -94,4 +94,10 @@
       </querytext>
 </fullquery>
 
+<fullquery name="group::party_member_p.party_is_member">      
+      <querytext>
+	  select 1 from group_approved_member_map where member_id = :party_id and group_id = :group_id
+      </querytext>
+</fullquery>
+
 </queryset>