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.26 -r1.27 --- openacs-4/packages/acs-subsite/catalog/acs-subsite.en_US.ISO-8859-1.xml 25 Sep 2003 16:07:41 -0000 1.26 +++ openacs-4/packages/acs-subsite/catalog/acs-subsite.en_US.ISO-8859-1.xml 25 Sep 2003 16:31:24 -0000 1.27 @@ -2,10 +2,21 @@ About You + No, take me back to %pvt_home_name% + Confirm Closing Your Account + Yes, please close my account <p>Your account is currently closed.</p> <p>If you wish, we can <a href="%restore_url%">reopen your account</a>.</p> + + <p> + <font color="red"> + <b> Your account is currently closed. </b> + </font> + <a href="%login_url%">Log in</a> again to see what you can do about it. + </p&;gt; + Your account at %system_name% has been reopened. Welcome back. Account Reopened again @@ -20,6 +31,18 @@ Change my Password Check Your Inbox Children + +<p> Please confirm that you would like to close your account at %system_name%. </p> + +<p> Closing your account means that we will no longer send you email +notifications, nor will you show up in lists of members at +%system_name%. Your contributions to the community, however, will be +preserved, as they're part of the community's history. </p> + +<p> Note that you may reopen your account at any time, siply by +logging in again. </p> + + Close your account Confirm Current Password Current users: @@ -142,10 +165,10 @@ New registration at %system_url% If you keep getting thrown back here, it is probably because your browser does not accept cookies. We're sorry for the inconvenience but it really is impossible to program a system like this without keeping track of who is posting what. Note: If you've forgotten your password, <a href="@email_password_url@">ask this server to email it -to @email@ +to %email% Note: If you've forgotten your password, <a href="email-password?user_id=%user_id%">ask this server to email it - to @email@ + to %email% Note that you can erase your saved email address and password by choosing the "log out" option from your workspace. Now we're really in trouble because we got this error: @@ -222,6 +245,7 @@ is confirmed. Once you login, you can change your password. Welcome to %system_name%. Please begin the registration process by entering a valid email address and a password for signing into the system. We will direct you to another form to complete your registration. Welcome to %system_name% + What other people see when they click your name What we tell other users about you when trying to send you the following email: When you get your email, go back 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.12 -r1.13 --- openacs-4/packages/acs-subsite/www/pvt/home.adp 19 Sep 2003 15:00:44 -0000 1.12 +++ openacs-4/packages/acs-subsite/www/pvt/home.adp 25 Sep 2003 16:31:24 -0000 1.13 @@ -8,25 +8,20 @@ -

- - Your account is currently closed. - - Log in again to see what you can do about it. -

+ #acs-subsite.Account_closed_workspace_msg#

» #acs-subsite.Change_my_Password#

- » What other people see when they click your name + » #acs-subsite.lt_What_other_people_see#

- » Close your account + » #acs-subsite.Close_your_account#

Index: openacs-4/packages/acs-subsite/www/pvt/unsubscribe.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/pvt/unsubscribe.adp,v diff -u -r1.7 -r1.8 --- openacs-4/packages/acs-subsite/www/pvt/unsubscribe.adp 1 Sep 2003 11:41:01 -0000 1.7 +++ openacs-4/packages/acs-subsite/www/pvt/unsubscribe.adp 25 Sep 2003 16:31:24 -0000 1.8 @@ -1,46 +1,14 @@ -Confirm Unsubscribe -@context@ +@page_title;noquote@ +@context;noquote@ +#acs-subsite.Close_account_explanation# -

Confirm that you'd like to unsubscribe from @site_link;noquote@.

- - - -You are current marked as being on vacation until @pretty_no_alerts_until_date@. If you'd like to start receiving email alerts again, just tell us that you're back. - -
    - - - - -If you are interested in this community but wish to stop receiving -email then you might want to - - -

    + » #acs-subsite.Account_close_confirm_no_label# +

    -However, if you've totally lost interest in this community or topic, -then you can ask the server to mark your -account as deleted. - Index: openacs-4/packages/acs-subsite/www/pvt/unsubscribe.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/pvt/unsubscribe.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/acs-subsite/www/pvt/unsubscribe.tcl 1 Sep 2003 11:41:01 -0000 1.4 +++ openacs-4/packages/acs-subsite/www/pvt/unsubscribe.tcl 25 Sep 2003 16:31:24 -0000 1.5 @@ -1,35 +1,14 @@ ad_page_contract { @cvs-id $Id$ -} {} -properties { - site_link:onevalue - on_vacation_p:onevalue - pretty_no_alerts_until_date:onevalue - date_entry_widget:onevalue - parameter_enabled_p:onevalue - dont_spam_me_p:onevalue - context:onevalue } -set user_id [ad_maybe_redirect_for_registration] +set user_id [auth::get_user_id -account_status closed] -db_1row vacation_time "select no_alerts_until, acs_user.receives_alerts_p(:user_id) as on_vacation_p -from users -where user_id = :user_id" +set system_name [ad_system_name] -set site_link [ad_site_home_link] +set page_title "Confirm Closing Your Account" +set context [list [list [ad_pvt_home] [ad_pvt_home_name]] $page_title] -set context [list [list [ad_pvt_home] "Your Account"] "Confirm Unsubscribe"] - -set pretty_no_alerts_until_date [lc_time_fmt $no_alerts_until "%q"] -set date_entry_widget [ad_dateentrywidget_default_to_today on_vacation_until] - -if [db_0or1row nospam "select dont_spam_me_p -from user_preferences -where user_id = :user_id"] { - set parameter_enabled_p 1 -} else { - set parameter_enabled_p 0 -} - -ad_return_template +set pvt_home [ad_pvt_home] +set pvt_home_name [ad_pvt_home_name]