Index: openacs-4/packages/dotlrn/www/community-member.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/community-member.tcl,v
diff -u -r1.18 -r1.19
--- openacs-4/packages/dotlrn/www/community-member.tcl	8 Aug 2006 21:26:24 -0000	1.18
+++ openacs-4/packages/dotlrn/www/community-member.tcl	3 Apr 2009 12:13:49 -0000	1.19
@@ -25,7 +25,6 @@
     {community_id ""}
     {return_url ""}
 } -properties {
-    context_bar:onevalue
     portal_id:onevalue
     member_state:onevalue
     first_names:onevalue
@@ -52,107 +51,37 @@
 
 auth::require_login
 
-set verified_user_id [ad_verify_and_get_user_id]
+acs_user::get -user_id $user_id -array user -include_bio
 
-set user_info_sql {
-    select first_names,
-           last_name,
-           email,
-           priv_email,
-           url as homepage_url,
-           creation_date,
-           member_state
-    from cc_users
-    where user_id = :user_id
+foreach name {first_names last_name} {
+    set $name $user($name)
 }
 
-
-if {![db_0or1row user_information $user_info_sql]} {
-    ad_return_error "[_ dotlrn.No_user_found]" [_ dotlrn.no_community_member_with_id [list user_id $user_id]]
-    ad_script_abort
+if { $return_url eq "" } {
+    set return_url [ad_return_url]
 }
 
-set bio [db_string biography {
-    select attr_value
-    from acs_attribute_values
-    where object_id = :user_id
-    and attribute_id = (select attribute_id
-                        from acs_attributes
-                        where object_type = 'person'
-                        and attribute_name = 'bio')
-} -default ""]
+set context [list [_ dotlrn.Community_member]]
+set system_name [ad_system_name]
+set pretty_creation_date [lc_time_fmt $user(creation_date) "%q"]
+set pretty_email [email_image::get_user_email -user_id $user_id -transparent 1 -return_url $return_url]
 
-set weblog_p 0
-#set to check if you are using forums
-if {[apm_package_installed_p "forums"]} {
-    set forums_package_id  [site_node_apm_integration::get_child_package_id  -package_key "forums"]
-    set forums_url "[dotlrn_community::get_url -package_id $forums_package_id]/forum-view"
+set login_export_vars "return_url=[ns_urlencode [acs_community_member_url -user_id $user_id]]"
 
-    db_multirow forums forums {select name, forum_id, to_char(o.last_modified, 'Mon DD, YYYY') as lastest_post from forums_forums_enabled f, acs_objects o where o.object_id = forum_id 
-    and o.creation_user = :user_id and f.package_id = :forums_package_id}
-    set forums_p 1
-}
+# Portrait
 
-set portrait_p 0
-if {[ad_parameter "show_portrait_p" dotlrn] && 0} {
-    set portrait_p 1
-    set inline_portrait_state ""
-    set portrait_export_vars [export_vars user_id]
+set portrait_p [db_0or1row get_item_id {
+    select c.live_revision, c.item_id,
+           cr.description as caption
+    from acs_rels a, cr_items c, cr_revisions cr
+    where a.object_id_two = c.item_id
+      and a.object_id_one = :user_id
+      and a.rel_type = 'user_portrait_rel'
+      and cr.revision_id = c.live_revision}]
 
-    set user_portrait_sql {
-        select images.width,
-               images.height,
-               cr_revisions.title,
-               cr_revisions.description,
-               cr_revisions.publish_date
-        from acs_rels,
-             cr_items,
-             cr_revisions,
-             images
-        where acs_rels.object_id_two = cr_items.item_id
-        and cr_items.live_revision = cr_revisions.revision_id
-        and cr_revisions.revision_id = images.image_id
-        and acs_rels.object_id_one = :user_id
-        and acs_rels.rel_type = 'user_portrait_rel'
-    }
-
-    if {[db_0or1row portrait_info $user_portrait_sql]} {
-        if {![empty_string_p $width] && $width < 300 } {
-            set inline_portrait_state "inline"
-        } else {
-            set inline_portrait_state "link"
-        }
-    }
+if { $portrait_p } {
+    set img_src [export_vars -base "[subsite::get_element -element url]shared/portrait-bits.tcl" { user_id item_id {size thumbnail}}]
+    set portrait_url [export_vars -base "[subsite::get_element -element url]shared/portrait" { user_id return_url }]
 }
 
-set show_email_p 0
-#if { $priv_email <= [ad_privacy_threshold] } {
-#    set show_email_p 1
-#}
-
-db_multirow user_contributions user_contributions {}
-
-set folder_id [dotlrn_fs::get_user_shared_folder -user_id $user_id]
-
-set scope_fs_url "/packages/file-storage/www/folder-chunk"
-set n_past_days ""
-#set url "[site_node_object_map::get_url -object_id $folder_id]index?folder_id=$folder_id&n_past_days=99999"
-
-set context_bar [ad_context_bar "[_ dotlrn.Community_member]"]
-set context [list "Member Page"]
-set system_name [ad_system_name]
-set pretty_creation_date [lc_time_fmt $creation_date "%q"]
-set login_export_vars "return_url=[ns_urlencode [acs_community_member_url -user_id $user_id]]"
-
-set return_url_2 [ad_return_url]
-if {[empty_string_p $return_url]} {
-    set return_url [get_referrer]
-    if {[regexp {\?} $return_url_2]} {
-        append return_url_2 "&return_url=$return_url"
-    } else {
-        append return_url_2 "?return_url=$return_url"
-    }
-}
-
 ad_return_template
-