Index: openacs-4/packages/acs-subsite/www/register/index.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/index.adp,v diff -u -r1.9 -r1.10 --- openacs-4/packages/acs-subsite/www/register/index.adp 29 Aug 2003 12:47:21 -0000 1.9 +++ openacs-4/packages/acs-subsite/www/register/index.adp 3 Sep 2003 09:51:58 -0000 1.10 @@ -3,4 +3,4 @@ login.username {#acs-subsite.Log_In#} - + Index: openacs-4/packages/acs-subsite/www/register/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/index.tcl,v diff -u -r1.6 -r1.7 --- openacs-4/packages/acs-subsite/www/register/index.tcl 29 Aug 2003 12:47:21 -0000 1.6 +++ openacs-4/packages/acs-subsite/www/register/index.tcl 3 Sep 2003 09:51:58 -0000 1.7 @@ -2,6 +2,8 @@ Prompt the user for email and password. @cvs-id $Id$ } { + {authority_id ""} + {username ""} {return_url ""} } Index: openacs-4/packages/acs-subsite/www/register/login-include.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/Attic/login-include.adp,v diff -u -r1.3 -r1.4 --- openacs-4/packages/acs-subsite/www/register/login-include.adp 29 Aug 2003 12:47:21 -0000 1.3 +++ openacs-4/packages/acs-subsite/www/register/login-include.adp 3 Sep 2003 09:51:58 -0000 1.4 @@ -1,6 +1,7 @@ - Forgot your password? + Forgot your password?
+Register Index: openacs-4/packages/acs-subsite/www/register/login-include.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/Attic/login-include.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/acs-subsite/www/register/login-include.tcl 29 Aug 2003 12:47:21 -0000 1.3 +++ openacs-4/packages/acs-subsite/www/register/login-include.tcl 3 Sep 2003 09:51:58 -0000 1.4 @@ -3,15 +3,15 @@ # Expects: # subsite_id - optional, defaults to nearest subsite # return_url - optional, defaults to Your Account -# +# Optional: +# authority_id +# username +# if { ![exists_and_not_null package_id] } { set subsite_id [subsite::get_element -element object_id] } - - - # Persistent login # The logic is: # 1. Allowed if allowed both site-wide (on acs-kernel) and on the subsite @@ -43,17 +43,11 @@ set token [sec_get_token $token_id] set hash [ns_sha1 "$time$token_id$token"] +set authority_options [auth::authority::get_authority_options] -# TODO: Move this into a library proc -set authority_options [db_list_of_lists select_authorities { - select pretty_name, authority_id - from auth_authorities - where enabled_p = 't' - and auth_impl_id is not null - order by sort_order -}] +set forgotten_pwd_url [export_vars -base [auth::password::get_forgotten_url] { username authority_id }] -set forgotten_pwd_url [auth::password::get_forgotten_url] +set register_url "[subsite::get_element -element url]register/user-new" ad_form -name login -html { style "margin: 0px;" } -form { {return_url:text(hidden)} Index: openacs-4/packages/acs-subsite/www/register/recover-password.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/recover-password.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-subsite/www/register/recover-password.adp 3 Sep 2003 08:34:44 -0000 1.1 +++ openacs-4/packages/acs-subsite/www/register/recover-password.adp 3 Sep 2003 09:51:58 -0000 1.2 @@ -3,7 +3,7 @@ @context@ @focus@ - + @recover_info.password_message@ Index: openacs-4/packages/acs-subsite/www/register/recover-password.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/recover-password.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-subsite/www/register/recover-password.tcl 3 Sep 2003 08:34:44 -0000 1.1 +++ openacs-4/packages/acs-subsite/www/register/recover-password.tcl 3 Sep 2003 09:51:58 -0000 1.2 @@ -14,18 +14,37 @@ set focus "" # Display form to collect username and authority -set list_of_authorities [auth::authority::get_authority_options] +set authority_options [auth::authority::get_authority_options] -ad_form -name recover_password -form { - {authority_id:integer(select) - {label "Authority"} - {options $list_of_authorities} +if { [llength $authority_options] > 1 } { + ad_form -name recover_password -form { + {authority_id:integer(select) + {label "Authority"} + {options $authority_options} + {value $authority_id} + } } +} else { + ad_form -name recover_password -form { + {authority_id:integer(hidden) + {value $authority_id} + } + } + +} + +ad_form -extend -name recover_password -form { {username:text {label "Username"} - } + {value $username} + } } -on_submit { + if { ![exists_and_not_null authority_id] } { + # Will be defaulted to local authority + set authority_id "" + } + array set recover_info [auth::password::recover_password \ -authority_id $authority_id \ -username $username] @@ -37,7 +56,7 @@ } } -if { [llength $list_of_authorities] > 1 } { +if { [llength $authority_options] > 1 } { set focus "recover_password.authority_id" } else { set focus "recover_password.username" @@ -46,7 +65,8 @@ set form_valid_p [form is_valid recover_password] set form_submitted_p [form is_submission recover_password] -if { [exists_and_not_null authority_id] && [exists_and_not_null username] && !$form_submitted_p } { + +if { [exists_and_not_null username] && !$form_submitted_p } { array set recover_info [auth::password::recover_password \ -authority_id $authority_id \ -username $username]