Index: openacs-4/packages/acs-kernel/acs-kernel.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/acs-kernel.info,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/acs-kernel/acs-kernel.info	14 Jan 2002 11:13:11 -0000	1.8
+++ openacs-4/packages/acs-kernel/acs-kernel.info	22 Jan 2002 20:08:00 -0000	1.9
@@ -4,8 +4,8 @@
 <package key="acs-kernel" url="http://openacs.org/repository/apm/packages/acs-kernel/" type="apm_service">
     <package-name>ACS Kernel</package-name>
     <pretty-plural>ACS Kernel Services</pretty-plural>
-    <singleton-p>t</singleton-p>
     <initial-install-p>t</initial-install-p>
+    <singleton-p>t</singleton-p>
 
     <version name="4.2" url="http://openacs.org/repository/download/apm/acs-kernel-4.2.apm">
     <database-support>
@@ -128,7 +128,7 @@
             <file type="data_model_upgrade" path="upgrade-3.4-4.0/user-group-types.sql"/>
         </files>
         <parameters>
-	    <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="RestrictErrorsToAdminsP"  default="1" description="Whether we show errors to adminstrators only"/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="RestrictErrorsToAdminsP"  default="1" description="Whether we show errors to adminstrators only"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="HomeURL"  default="/pvt/home" description="the URL of the workspace link" section_name="system-information"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="HomeName"  default="Your Workspace" description="the name of the workspace link" section_name="system-information"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="SystemName"  default="yourdomain Network" description="the name of your system" section_name="system-information"/>
@@ -163,6 +163,8 @@
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="SessionRenew"  default="300" description="How much time do we let elapse before renewing a session cookie? This should be less than SessionTimeout." section_name="security"/>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="MaxSize"  default="200000" description="The size of the util_memoize cache, if using the ns_cache module." section_name="memoize"/>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="PrivacyControlEnabledP"  default="0" description="Whether we control privacy" section_name="privacy"/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="CommunityMemberURL"  default="/shared/community-member" description="the URL of the public community member page" section_name="system-information"/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="CommunityMemberAdminURL"  default="/admin/users/one" description="the URL of the admin community member page" section_name="system-information"/>
         </parameters>
 
     </version>
Index: openacs-4/packages/acs-subsite/www/pvt/home.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/pvt/home.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/pvt/home.adp	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/pvt/home.adp	22 Jan 2002 20:08:00 -0000	1.2
@@ -33,7 +33,7 @@
 <p>
 
 If you want to check what other users of this service are shown, visit
-<a href="/shared/community-member?@export_user_id@">@ad_url@/shared/community-member?@export_user_id@</a>.
+<%= [acs_community_member_link -user_id $user_id -label "${ad_url}[acs_community_member_url -user_id $user_id]"] %>
 
 <h4>Basic Information</h4>
 
Index: openacs-4/packages/acs-subsite/www/shared/community-member.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/shared/community-member.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/shared/community-member.tcl	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/shared/community-member.tcl	22 Jan 2002 20:08:00 -0000	1.2
@@ -129,6 +129,6 @@
 set context_bar [ad_context_bar_ws_or_index "Community member"]
 set system_name [ad_system_name]
 set pretty_creation_date [util_AnsiDatetoPrettyDate $creation_date]
-set login_export_vars "return_url=[ns_urlencode "/shared/community-member?user_id=$user_id"]"
+set login_export_vars "return_url=[ns_urlencode [acs_community_member_url -user_id $user_id]]"
 
 ad_return_template
Index: openacs-4/packages/acs-subsite/www/shared/portrait.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/shared/portrait.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/shared/portrait.tcl	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/shared/portrait.tcl	22 Jan 2002 20:08:00 -0000	1.2
@@ -41,8 +41,8 @@
     set widthheight_param ""
 }
 
-set context_bar [ad_context_bar_ws_or_index [list "/shared/community-member.tcl?[export_url_vars user_id]" "One Member"] "Portrait"]
+set context_bar [ad_context_bar_ws_or_index [list [acs_community_member_url -user_id $user_id] "One Member"] "Portrait"]
 set export_vars [export_url_vars user_id]
 set publish_date [util_AnsiDatetoPrettyDate $publish_date]
 
-ad_return_template
\ No newline at end of file
+ad_return_template
Index: openacs-4/packages/acs-tcl/tcl/defs-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/defs-procs.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/acs-tcl/tcl/defs-procs.tcl	16 Jan 2002 20:07:23 -0000	1.7
+++ openacs-4/packages/acs-tcl/tcl/defs-procs.tcl	22 Jan 2002 20:08:00 -0000	1.8
@@ -105,12 +105,62 @@
     return [ad_parameter -package_id [ad_acs_kernel_id] SystemURL]
 }
 
+ad_proc -public acs_community_member_url {
+    {-user_id:required}
+} {
+    return the url for the community member page of a particular user
+} {
+    return "[ad_parameter -package_id [ad_acs_kernel_id] CommunityMemberURL]?[export_vars user_id]"
+}
+
+ad_proc -public acs_community_member_link {
+    {-user_id:required}
+    {-label ""}
+} {
+    return the link of the community member page of a particular user
+} {
+    if {[empty_string_p $label]} {
+        set label [db_string select_community_member_link_label {
+            select persons.first_names || ' ' || persons.last_name
+            from persons
+            where person_id = :user_id
+        } -default $user_id]
+    }
+
+    return "<a href=\"[acs_community_member_url -user_id $user_id]\">$label</a>"
+}
+
 proc ad_present_user {user_id name} {
-    return "<a href=\"/shared/community-member?user_id=$user_id\">$name</a>"
+    return [acs_community_member_link -user_id $user_id -label $name]
 }
 
+ad_proc -public acs_community_member_admin_url {
+    {-user_id:required}
+} {
+    return the url for the community member admin page of a particular user
+} {
+    return "[ad_parameter -package_id [ad_acs_kernel_id] CommunityMemberAdminURL]?[export_vars user_id]"
+}
+
+ad_proc -public acs_community_member_admin_link {
+    {-user_id:required}
+    {-label ""}
+} {
+    return the link of the community member page of a particular user
+} {
+    if {[empty_string_p $label]} {
+        set label [db_string select_community_member_link_label {
+            select persons.first_names || ' ' || persons.last_name
+            from persons
+            where person_id = :user_id
+        } -default $user_id]
+    }
+
+    return "<a href=\"[acs_community_member_admin_url -user_id $user_id]\">$label</a>"
+}
+
 proc ad_admin_present_user {user_id name} {
-    return "<a href=\"/admin/users/one?user_id=$user_id\">$name</a>"
+    return [acs_community_member_admin_link -user_id $user_id -label $name]
 }
 
 ad_proc ad_header {