Index: openacs-4/packages/dotlrn/www/control-panel.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/control-panel.tcl,v diff -u -r1.9.2.2 -r1.9.2.3 --- openacs-4/packages/dotlrn/www/control-panel.tcl 18 May 2006 19:24:28 -0000 1.9.2.2 +++ openacs-4/packages/dotlrn/www/control-panel.tcl 18 May 2006 19:53:42 -0000 1.9.2.3 @@ -31,6 +31,8 @@ referer:onevalue } + +set dotlrn_url [dotlrn::get_url] set portal_id [dotlrn::get_portal_id -user_id [ad_get_user_id]] # Make sure user is logged in @@ -57,39 +59,10 @@ set system_name [ad_system_name] -set portrait_upload_url [export_vars -base "../user/portrait/upload" { { return_url [ad_return_url] } }] - if { [llength [lang::system::get_locales]] > 1 } { set change_locale_url [apm_package_url_from_key "acs-lang"] } - - -if [ad_parameter SolicitPortraitP "user-info" 0] { - # we have portraits for some users - if ![db_0or1row get_portrait_info " - select cr.publish_date, nvl(cr.title,'your portrait') as portrait_title, - nvl(cr.description,'no description') as portrait_description - from cr_revisions cr, cr_items ci, acs_rels a - where cr.revision_id = ci.live_revision - and ci.item_id = a.object_id_two - and a.object_id_one = :user_id - and a.rel_type = 'user_portrait_rel' - "] { - set portrait_state "upload" - } else { - if { [empty_string_p $portrait_title] } { - set portrait_title "[_ acs-subsite.no_portrait_title_message]" - } - - set portrait_state "show" - set portrait_publish_date [lc_time_fmt $publish_date "%q"] - } -} else { - set portrait_state "none" -} - - set whos_online_url "[subsite::get_element -element url]shared/whos-online" set make_visible_url "[subsite::get_element -element url]shared/make-visible" set make_invisible_url "[subsite::get_element -element url]shared/make-invisible"