Index: openacs-4/packages/acs-subsite/lib/user-info.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/lib/user-info.adp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/acs-subsite/lib/user-info.adp 12 Sep 2003 13:25:19 -0000 1.1 @@ -0,0 +1 @@ + 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 --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/acs-subsite/lib/user-info.tcl 12 Sep 2003 13:25:19 -0000 1.1 @@ -0,0 +1,94 @@ +# +# Expects: +# user_id:optional +# return_url:optional +# + +ad_maybe_redirect_for_registration + +if { ![exists_and_not_null user_id] } { + set user_id [ad_conn user_id] +} else { + permission::require_permission -object_id $user_id -privilege admin +} + +if { ![exists_and_not_null return_url] } { + set return_url [ad_conn url] +} + +set action_url "[subsite::get_element -element url]user/basic-info-update" + +acs_user::get -array user -include_bio + +ad_form -name user_info -cancel_url $return_url -action $action_url -mode display -form { + {return_url:text(hidden),optional {value $return_url}} + {username:text(inform) + {label "Username"} + } + {first_names:text + {label "First names"} + {html {size 50}} + } + {last_name:text + {label "Last Name"} + {html {size 50}} + } + {email:text + {label "Email"} + {html {size 50}} + } + {screen_name:text,optional + {label "Screen name"} + {html {size 50}} + } + {url:text,optional + {label "Home Page"} + {html {size 50}} + } + {bio:text(textarea),optional + {label "About yourself"} + {html {rows 8 cols 60}} + } +} -on_request { + foreach var { first_names last_name email username screen_name url bio } { + set $var $user($var) + } +} -on_submit { + db_transaction { + person::update \ + -person_id $user_id \ + -first_names $first_names \ + -last_name $last_name + + party::update \ + -party_id $user_id \ + -email $email \ + -url $url + + acs_user::update \ + -user_id $user_id \ + -screen_name $screen_name + + person::update_bio \ + -person_id $user_id \ + -bio $bio + } +} -after_submit { + ad_returnredirect $return_url + ad_script_abort +} + +# TODO: Validate email: [util_email_valid_p $email] +# TODO: Validate email unique + +# LARS HACK: Make the URL and email elements real links +if { ![form is_valid user_info] } { + element set_properties user_info email -display_value "[element get_value user_info email]" + if {![string match -nocase "http://*" [element get_value user_info url]]} { + element set_properties user_info url -display_value \ + "[element get_value user_info url]" + } else { + element set_properties user_info url -display_value \ + "[element get_value user_info url]" + } +} 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.9 -r1.10 --- openacs-4/packages/acs-subsite/www/pvt/home.adp 30 Aug 2003 19:17:16 -0000 1.9 +++ openacs-4/packages/acs-subsite/www/pvt/home.adp 12 Sep 2003 13:25:19 -0000 1.10 @@ -5,7 +5,7 @@

#acs-subsite.Basic_Information#

- +

Index: openacs-4/packages/acs-subsite/www/pvt/home.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/pvt/home.tcl,v diff -u -r1.13 -r1.14 --- openacs-4/packages/acs-subsite/www/pvt/home.tcl 4 Sep 2003 08:42:58 -0000 1.13 +++ openacs-4/packages/acs-subsite/www/pvt/home.tcl 12 Sep 2003 13:25:19 -0000 1.14 @@ -43,81 +43,9 @@ set portrait_upload_url [export_vars -base "../user/portrait/upload" { { return_url [ad_return_url] } }] -ad_form -name user_info -cancel_url [ad_conn url] -mode display -form { - {username:text(inform) - {label "Username"} - } - {first_names:text - {label "First names"} - {html {size 50}} - } - {last_name:text - {label "Last Name"} - {html {size 50}} - } - {email:text - {label "Email"} - {html {size 50}} - } - {screen_name:text,optional - {label "Screen name"} - {html {size 50}} - } - {url:text,optional - {label "Home Page"} - {html {size 50}} - } - {bio:text(textarea),optional - {label "About yourself"} - {html {rows 8 cols 60}} - } -} -on_request { - foreach var { first_names last_name email username screen_name url bio } { - set $var $user($var) - } -} -on_submit { - db_transaction { - person::update \ - -person_id $user_id \ - -first_names $first_names \ - -last_name $last_name - - party::update \ - -party_id $user_id \ - -email $email \ - -url $url - - acs_user::update \ - -user_id $user_id \ - -screen_name $screen_name +# Can't find out whether there's a request or not +set form_request_p 1 - person::update_bio \ - -person_id $user_id \ - -bio $bio - } -} -after_submit { - ad_returnredirect [ad_conn url] - ad_script_abort -} - -# TODO: Validate email: [util_email_valid_p $email] -# TODO: Validate email unique - -# LARS HACK: Make the URL and email elements real links -if { ![form is_valid user_info] } { - element set_properties user_info email -display_value "[element get_value user_info email]" - if {![string match -nocase "http://*" [element get_value user_info url]]} { - element set_properties user_info url -display_value \ - "[element get_value user_info url]" - } else { - element set_properties user_info url -display_value \ - "[element get_value user_info url]" - } -} - -# The template needs to know if this is a request -set form_request_p [expr [form is_request user_info] && [empty_string_p [form get_action user_info]]] - if [ad_parameter SolicitPortraitP "user-info" 0] { # we have portraits for some users if ![db_0or1row get_portrait_info " Index: openacs-4/packages/acs-subsite/www/user/basic-info-update.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/basic-info-update.adp,v diff -u -r1.6 -r1.7 --- openacs-4/packages/acs-subsite/www/user/basic-info-update.adp 28 Aug 2003 09:41:42 -0000 1.6 +++ openacs-4/packages/acs-subsite/www/user/basic-info-update.adp 12 Sep 2003 13:25:20 -0000 1.7 @@ -1,41 +1,5 @@ -Update Basic Information -in @site_link;noquote@ -Update Information + @page_title@ + @context;noquote@ -

-@export_vars;noquote@ - - - - - - - - - - - - - - - - -
Name: -
email address:
Personal URL:
screen name:
Biography:
- -

- -

- - - -Upload a Portrait - - - - -On @portrait_publish_date@, you uploaded @portrait_title@. - - - + Index: openacs-4/packages/acs-subsite/www/user/basic-info-update.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/basic-info-update.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/acs-subsite/www/user/basic-info-update.tcl 28 Aug 2003 09:41:42 -0000 1.3 +++ openacs-4/packages/acs-subsite/www/user/basic-info-update.tcl 12 Sep 2003 13:25:20 -0000 1.4 @@ -6,47 +6,17 @@ @creation-date Unknown @cvs-id $Id$ } { - - { return_url "" } - { user_id "" } -} -properties { - site_link:onevalue - export_vars:onevalue - first_names:onevalue - last_name:onevalue - screen_name:onevalue - url:onevalue - email:onevalue - bio:onevalue + {return_url ""} + {user_id ""} } -set current_user_id [ad_verify_and_get_user_id] +set page_title "Update Basic Information" -if [empty_string_p $user_id] { - set user_id $current_user_id +if { ![exists_and_not_null user_id] } { + set context [list [list [ad_pvt_home] [ad_pvt_home_name]] $page_title] +} else { + set context [list $page_title] } -ad_require_permission $user_id "write" -db_1row general_info {} -set bio [person::get_bio -person_id $user_id] - -db_release_unused_handles - -set site_link [ad_site_home_link] -set export_vars [export_form_vars return_url user_id] - -# moved from acs-subsite/www/pvt/home.tcl -if [ad_parameter SolicitPortraitP "user-info" 0] { - # we have portraits for some users - if ![db_0or1row get_portrait_info ""] { - set portrait_state "upload" - } else { - set portrait_state "show" - set portrait_publish_date [util_AnsiDatetoPrettyDate $publish_date] - } -} else { - set portrait_state "none" -} -