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 "