Index: openacs-4/packages/acs-subsite/acs-subsite.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/acs-subsite.info,v diff -u -r1.51 -r1.52 --- openacs-4/packages/acs-subsite/acs-subsite.info 19 Sep 2003 16:13:25 -0000 1.51 +++ openacs-4/packages/acs-subsite/acs-subsite.info 24 Sep 2003 15:19:23 -0000 1.52 @@ -31,22 +31,21 @@ - + - - + - + Index: openacs-4/packages/acs-subsite/catalog/acs-subsite.en_US.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/catalog/acs-subsite.en_US.ISO-8859-1.xml,v diff -u -r1.23 -r1.24 --- openacs-4/packages/acs-subsite/catalog/acs-subsite.en_US.ISO-8859-1.xml 19 Sep 2003 15:00:32 -0000 1.23 +++ openacs-4/packages/acs-subsite/catalog/acs-subsite.en_US.ISO-8859-1.xml 24 Sep 2003 15:19:24 -0000 1.24 @@ -6,6 +6,8 @@ Answer: answer: at + Your account at %system_name% has been reopened. Welcome back. + Account Reopened Awaiting Approval Bad Password Basic Information @@ -186,18 +188,12 @@ You can't have a < in your last name because it will look like an HTML tag and confuse other users. You have encountered a problem with authentication. You have encountered a problem with authentication - Your Account at %site_link% is restored. - Your Account is Restored Your email has been confirmed. You may now log into %system_name%. Your email has been confirmed. You are now awaiting approval from the %system_name% administrator. Your email is confirmed Your forgotten password on %system_name% - Your registration is in the database now. A site administrator has -been notified of your request to use the system. Once you're -approved, you'll get an email message and you can return to -%site_link% to use the service. Your URL doesn't have the correct form. A valid URL would be something like "%valid_url_example%". Name: New Password @@ -234,6 +230,10 @@ question: Recover Password Register + +

Thank you for registering for %system_name%. An administrator has been notified of your request.

+

Once you're approved, you'll get an email message and you can return to start using %system_name%.

+ Revoke Checked Screen name screen name: 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 -r1.7 -r1.8 --- openacs-4/packages/acs-subsite/lib/user-info.tcl 22 Sep 2003 08:22:26 -0000 1.7 +++ openacs-4/packages/acs-subsite/lib/user-info.tcl 24 Sep 2003 15:19:24 -0000 1.8 @@ -10,14 +10,15 @@ if { ![exists_and_not_null user_id] } { set user_id [ad_conn untrusted_user_id] -} else { +} elseif { $user_id != [auth::get_user_id -account_status closed] } { 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 -user_id $user_id -array user -include_bio 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.7 -r1.8 --- openacs-4/packages/acs-subsite/www/register/restore-user.adp 19 Sep 2003 14:45:39 -0000 1.7 +++ openacs-4/packages/acs-subsite/www/register/restore-user.adp 24 Sep 2003 15:19:24 -0000 1.8 @@ -2,7 +2,7 @@ @page_title;noquote@ @context;noquote@ -

#acs-subsite.lt_Your_Account_at_site_#

+

#acs-subsite.Account_reopened_message#

» 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.4 -r1.5 --- openacs-4/packages/acs-subsite/www/register/restore-user.tcl 19 Sep 2003 14:45:39 -0000 1.4 +++ openacs-4/packages/acs-subsite/www/register/restore-user.tcl 24 Sep 2003 15:19:24 -0000 1.5 @@ -5,7 +5,7 @@ {return_url {[ad_pvt_home]}} } -set page_title [_ acs-subsite.lt_Your_Account_is_Resto] +set page_title [_ acs-subsite.Account_reopened_title] set context [list [list [ad_pvt_home] [ad_pvt_home_name]] $page_title] # We do require authentication, though their account will be closed @@ -32,4 +32,5 @@ auth::verify_account_status -set site_link [ad_site_home_link] +# Used in a message key +set system_name [ad_system_name] Index: openacs-4/packages/acs-subsite/www/register/user-new.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/user-new.tcl,v diff -u -r1.13 -r1.14 --- openacs-4/packages/acs-subsite/www/register/user-new.tcl 18 Sep 2003 13:44:30 -0000 1.13 +++ openacs-4/packages/acs-subsite/www/register/user-new.tcl 24 Sep 2003 15:19:24 -0000 1.14 @@ -20,23 +20,25 @@ security::require_secure_conn } -# TODO: log user out if currently logged in, if specified in the includeable chunk's parameters, e.g. not when creating accounts for other users +# TODO: Log user out if currently logged in, if specified in the includeable chunk's parameters, e.g. not when creating accounts for other users ad_user_logout +# TODO: Generate user_id for double-click ad_form -name register -form [auth::get_registration_form_elements] -on_request { # Populate elements from local variables } -on_submit { array set creation_info [auth::create_user \ + -verify_password_confirm \ + -username $username \ + -email $email \ -first_names $first_names \ -last_name $last_name \ - -email $email \ - -url $url \ - -username $username \ + -screen_name $screen_name \ -password $password \ -password_confirm $password_confirm \ - -verify_password_confirm \ + -url $url \ -secret_question $secret_question \ -secret_answer $secret_answer] Index: openacs-4/packages/acs-subsite/www/shared/community-member.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/shared/community-member.adp,v diff -u -r1.9 -r1.10 --- openacs-4/packages/acs-subsite/www/shared/community-member.adp 17 Sep 2003 14:25:54 -0000 1.9 +++ openacs-4/packages/acs-subsite/www/shared/community-member.adp 24 Sep 2003 15:19:24 -0000 1.10 @@ -61,7 +61,7 @@ - +

If you were to log in, you'd be able to get more information on your fellow community member.
Index: openacs-4/packages/acs-subsite/www/shared/community-member.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/shared/community-member.tcl,v diff -u -r1.10 -r1.11 --- openacs-4/packages/acs-subsite/www/shared/community-member.tcl 17 Sep 2003 14:25:54 -0000 1.10 +++ openacs-4/packages/acs-subsite/www/shared/community-member.tcl 24 Sep 2003 15:19:24 -0000 1.11 @@ -37,7 +37,8 @@ set site_wide_admin_p [acs_user::site_wide_admin_p] set admin_user_url [acs_community_member_admin_url -user_id $user_id] -set verified_user_id [ad_verify_and_get_user_id] +set verified_user_id [ad_conn user_id] +set untrusted_user_id [ad_conn untrusted_user_id] if { [empty_string_p $user_id] } { if { $verified_user_id == 0 } {