Fisheye: Tag 1.6 refers to a dead (removed) revision in file `openacs-4/packages/acs-subsite/www/register/awaiting-approval.adp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.5 refers to a dead (removed) revision in file `openacs-4/packages/acs-subsite/www/register/awaiting-approval.tcl'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.3 refers to a dead (removed) revision in file `openacs-4/packages/acs-subsite/www/register/awaiting-approval.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.3 refers to a dead (removed) revision in file `openacs-4/packages/acs-subsite/www/register/awaiting-email-verification-oracle.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.5 refers to a dead (removed) revision in file `openacs-4/packages/acs-subsite/www/register/awaiting-email-verification-postgresql.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.6 refers to a dead (removed) revision in file `openacs-4/packages/acs-subsite/www/register/awaiting-email-verification.adp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.6 refers to a dead (removed) revision in file `openacs-4/packages/acs-subsite/www/register/awaiting-email-verification.tcl'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/acs-subsite/www/register/awaiting-email-verification.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.7 refers to a dead (removed) revision in file `openacs-4/packages/acs-subsite/www/register/bad-password.adp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.5 refers to a dead (removed) revision in file `openacs-4/packages/acs-subsite/www/register/bad-password.tcl'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.6 refers to a dead (removed) revision in file `openacs-4/packages/acs-subsite/www/register/banned-user.adp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.4 refers to a dead (removed) revision in file `openacs-4/packages/acs-subsite/www/register/banned-user.tcl'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/acs-subsite/www/register/banned-user.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.6 refers to a dead (removed) revision in file `openacs-4/packages/acs-subsite/www/register/deleted-user.adp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.4 refers to a dead (removed) revision in file `openacs-4/packages/acs-subsite/www/register/deleted-user.tcl'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/acs-subsite/www/register/deleted-user.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/acs-subsite/www/register/email-confirm-oracle.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/acs-subsite/www/register/email-confirm-postgresql.xql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/acs-subsite/www/register/email-confirm.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/email-confirm.tcl,v diff -u -r1.7 -r1.8 --- openacs-4/packages/acs-subsite/www/register/email-confirm.tcl 10 Sep 2003 17:01:39 -0000 1.7 +++ openacs-4/packages/acs-subsite/www/register/email-confirm.tcl 19 Sep 2003 14:50:04 -0000 1.8 @@ -6,10 +6,7 @@ user_id:integer } -ns_log Notice "LARS: Token = $token ; should be = [auth::get_user_secret_token -user_id $user_id]" - if { ![string equal $token [auth::get_user_secret_token -user_id $user_id]] } { - # TODO: Fix set message "Bad token" ad_returnredirect [export_vars -base "[subsite::get_element -element url]register/account-closed" { message }] ad_script_abort Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/acs-subsite/www/register/email-confirm.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.3 refers to a dead (removed) revision in file `openacs-4/packages/acs-subsite/www/register/email-for-password-2.tcl'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.6 refers to a dead (removed) revision in file `openacs-4/packages/acs-subsite/www/register/email-for-password.adp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.7 refers to a dead (removed) revision in file `openacs-4/packages/acs-subsite/www/register/email-password-2.adp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.11 refers to a dead (removed) revision in file `openacs-4/packages/acs-subsite/www/register/email-password-2.tcl'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.4 refers to a dead (removed) revision in file `openacs-4/packages/acs-subsite/www/register/email-password-2.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.7 refers to a dead (removed) revision in file `openacs-4/packages/acs-subsite/www/register/email-password-3.adp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.5 refers to a dead (removed) revision in file `openacs-4/packages/acs-subsite/www/register/email-password-3.tcl'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.4 refers to a dead (removed) revision in file `openacs-4/packages/acs-subsite/www/register/email-password-3.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.7 refers to a dead (removed) revision in file `openacs-4/packages/acs-subsite/www/register/email-password.adp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.6 refers to a dead (removed) revision in file `openacs-4/packages/acs-subsite/www/register/email-password.tcl'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.3 refers to a dead (removed) revision in file `openacs-4/packages/acs-subsite/www/register/email-password.xql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/acs-subsite/www/register/restore-user.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/restore-user.adp,v diff -u -r1.6 -r1.7 --- openacs-4/packages/acs-subsite/www/register/restore-user.adp 15 Aug 2003 21:18:12 -0000 1.6 +++ openacs-4/packages/acs-subsite/www/register/restore-user.adp 19 Sep 2003 14:45:39 -0000 1.7 @@ -1,20 +1,11 @@ -#acs-subsite.lt_Your_Account_is_Resto# -#acs-subsite.lt_Your_Account_is_Resto# + @page_title;noquote@ + @context;noquote@

#acs-subsite.lt_Your_Account_at_site_#

-

#acs-subsite.lt_You_can_log_in_now_us# - -

-@export_vars;noquote@ -#acs-subsite.Password# - -
-

-

-#acs-subsite.lt_Note_If_youve_forgott#. + » Continue

Index: openacs-4/packages/acs-subsite/www/register/restore-user.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/restore-user.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/acs-subsite/www/register/restore-user.tcl 7 Nov 2002 18:06:57 -0000 1.3 +++ openacs-4/packages/acs-subsite/www/register/restore-user.tcl 19 Sep 2003 14:45:39 -0000 1.4 @@ -2,50 +2,34 @@ The page restores a user from the deleted state. @cvs-id $Id$ } { - user_id:naturalnum -} -properties { - site_link:onevalue - export_vars:onevalue - email:onevalue + {return_url {[ad_pvt_home]}} } -if {![db_0or1row user_state_info { - select member_state, email, rel_id from cc_users where user_id = :user_id -}]} { - ad_return_error "[_ acs-subsite.lt_Couldnt_find_your_rec]" "[_ acs-subsite.lt_User_id_user_id_is_no_3]" - return -} +set page_title [_ acs-subsite.lt_Your_Account_is_Resto] +set context [list [list [ad_pvt_home] [ad_pvt_home_name]] $page_title] -if { $member_state == "deleted" } { - - # they presumably deleted themselves - # Note that the only transition allowed if from deleted - # to authorized. No other states may be restored +# We do require authentication, though their account will be closed +set user_id [auth::require_login -account_status closed] - db_dml member_state_authorized_transistion { - update membership_rels - set member_state = 'approved' - where rel_id = :rel_id +set member_state [acs_user::get_element -user_id $user_id -element member_state] + +switch $member_state { + deleted { + + # They presumably deleted themselves + # Note that the only transition allowed if from deleted + # to authorized. No other states may be restored + + acs_user::approve -user_id $user_id + } + approved { + # May be a double-click } - -} else { - ad_return_error "[_ acs-subsite.lt_Problem_with_authenti]" "[_ acs-subsite.lt_There_was_a_problem_w]" + default { + ad_return_error "[_ acs-subsite.lt_Problem_with_authenti]" "[_ acs-subsite.lt_There_was_a_problem_w]" + } } -set site_link [ad_site_home_link] +auth::verify_account_status -# One common problem with login is that people can hit the back button -# after a user logs out and relogin by using the cached password in -# the browser. We generate a unique hashed timestamp so that users -# cannot use the back button. - -set time [ns_time] -set token_id [sec_get_random_cached_token_id] -set token [sec_get_token $token_id] -set hash [ns_sha1 "$time$token_id$token"] - -set export_vars [export_form_vars return_url time token_id hash email] - -set email_password_url "email-password.tcl?user_id=$user_id" - -ad_return_template +set site_link [ad_site_home_link] Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/acs-subsite/www/register/restore-user.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.3 refers to a dead (removed) revision in file `openacs-4/packages/acs-subsite/www/register/user-login-oracle.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.3 refers to a dead (removed) revision in file `openacs-4/packages/acs-subsite/www/register/user-login-postgresql.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.5 refers to a dead (removed) revision in file `openacs-4/packages/acs-subsite/www/register/user-login.tcl'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.5 refers to a dead (removed) revision in file `openacs-4/packages/acs-subsite/www/register/user-login.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/acs-subsite/www/register/user-new-2-oracle.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.3 refers to a dead (removed) revision in file `openacs-4/packages/acs-subsite/www/register/user-new-2-postgresql.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.7 refers to a dead (removed) revision in file `openacs-4/packages/acs-subsite/www/register/user-new-2.adp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.13 refers to a dead (removed) revision in file `openacs-4/packages/acs-subsite/www/register/user-new-2.tcl'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.3 refers to a dead (removed) revision in file `openacs-4/packages/acs-subsite/www/register/user-new-2.xql'. Fisheye: No comparison available. Pass `N' to diff?