Index: openacs-4/packages/acs-subsite/lib/user-info.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/lib/user-info.tcl,v
diff -u -r1.15 -r1.16
--- openacs-4/packages/acs-subsite/lib/user-info.tcl	21 Mar 2005 22:16:24 -0000	1.15
+++ openacs-4/packages/acs-subsite/lib/user-info.tcl	11 Jun 2005 14:14:37 -0000	1.16
@@ -112,6 +112,29 @@
 }
 
 
+if {[apm_package_installed_p categories]} {
+    # get groups the user is in
+    set group_ids  [db_list get_groups {
+	select distinct groups.group_id
+	from groups, group_member_map gm
+	where groups.group_id = gm.group_id
+	and gm.member_id = :user_id
+    }]
+
+    foreach group_id $group_ids {
+	set element_name "category_ids$group_id"
+	if {$group_id < 0} {
+	    set element_name "category_ids[expr - $group_id]"
+	}
+
+	category::ad_form::add_widgets \
+	    -container_object_id $group_id \
+	    -categorized_object_id $user_id \
+	    -form_name user_info \
+	    -element_name $element_name
+    }
+}
+
 ad_form -extend -name user_info -form {
     {url:text,optional
         {label "[_ acs-subsite.Home_page]"}
@@ -147,6 +170,23 @@
                           -array user_info]
 
 
+    if {[apm_package_installed_p categories]} {
+	set cat_ids [list]
+	foreach group_id $group_ids {
+	    set element_name "category_ids$group_id"
+	    if {$group_id < 0} {
+		set element_name "category_ids[expr - $group_id]"
+	    }
+
+	    set cat_ids [concat $cat_ids \
+			     [category::ad_form::get_categories \
+				  -container_object_id $group_id \
+				  -element_name $element_name]]
+	}
+
+	category::map_object -remove_old -object_id $user_id $cat_ids
+    }
+
     # Handle authentication problems
     switch $result(update_status) {
         ok {
Index: openacs-4/packages/acs-subsite/www/admin/groups/one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/one.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-subsite/www/admin/groups/one.adp	30 Aug 2003 15:31:42 -0000	1.5
+++ openacs-4/packages/acs-subsite/www/admin/groups/one.adp	11 Jun 2005 14:14:37 -0000	1.6
@@ -27,6 +27,12 @@
      <if @admin_p@ eq "1">
          (<a href="change-join-policy?return_url=@return_url_enc@&group_id=@group_id@">edit</a>)
      </if>
+ <if @category_url@ not nil>
+  <p>
+  <li>Category trees: @category_trees@
+      (<a href="@category_url@cadmin/object-map?object_id=@group_id@">edit</a>)
+  </li>
+ </if>
 </ul>
 
  
Index: openacs-4/packages/acs-subsite/www/admin/groups/one.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/one.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-subsite/www/admin/groups/one.tcl	6 Sep 2002 21:49:59 -0000	1.4
+++ openacs-4/packages/acs-subsite/www/admin/groups/one.tcl	11 Jun 2005 14:14:37 -0000	1.5
@@ -59,4 +59,21 @@
 	-object_type $group_type \
 	$group_id
 
+if {[apm_package_installed_p categories]} {
+    set category_url [site_node::get_package_url -package_key categories]
+
+    set mapped_trees [category_tree::get_mapped_trees $group_id]
+    foreach mapped_tree $mapped_trees {
+	util_unlist $mapped_tree tree_id tree_name subtree_id
+	if {![empty_string_p $subtree_id]} {
+	    set tree_name "${tree_name}::[category::get_name $subtree_id]"
+	}
+	lappend category_trees $tree_name
+    }
+    if {[empty_string_p $mapped_trees]} {
+	set category_trees "None"
+    }
+    set category_trees [join $category_trees ,]
+}
+
 ad_return_template