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.11 -r1.12
--- openacs-4/packages/acs-subsite/www/pvt/home.adp	15 Sep 2003 10:31:25 -0000	1.11
+++ openacs-4/packages/acs-subsite/www/pvt/home.adp	19 Sep 2003 15:00:44 -0000	1.12
@@ -7,29 +7,39 @@
 
 <include src="/packages/acs-subsite/lib/user-info">
 
-<if @form_request_p@ true>
+<if @account_status@ eq "closed">
   <p>
-    <b>&raquo;</b> <a href="../user/password-update">#acs-subsite.Change_my_Password#</a>
+    <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>
+</if>
 
+<p>
+  <b>&raquo;</b> <a href="../user/password-update">#acs-subsite.Change_my_Password#</a>
+</p>
+
+<p>
+  <b>&raquo;</b> <a href="@community_member_url@">What other people see when they click your name</a>
+</p>
+
+<if @account_status@ ne "closed">
   <p>
-    <b>&raquo;</b> <a href="@community_member_url@">What other people see when they click your name</a>
+    <b>&raquo;</b> <a href="unsubscribe-2">Close your account</a> 
   </p>
+</if>
 
+<if @portrait_state@ eq upload>
+  <h2>#acs-subsite.Your_Portrait#</h2>
   <p>
-    <b>&raquo;</b> <a href="unsubscribe">#acs-subsite.Unsubscribe#</a> (#acs-subsite.lt_for_a_period_of_vacat#)
+    #acs-subsite.lt_Show_everyone_else_at#  <a href="@portrait_upload_url@">#acs-subsite.upload_a_portrait#</a>
   </p>
-
-  <if @portrait_state@ eq upload>
-    <h2>#acs-subsite.Your_Portrait#</h2>
-    <p>
-      #acs-subsite.lt_Show_everyone_else_at#  <a href="@portrait_upload_url@">#acs-subsite.upload_a_portrait#</a>
-    </p>
-  </if>
-  <if @portrait_state@ eq show>
-    <h2>#acs-subsite.Your_Portrait#</h2>
-    <p>
-      #acs-subsite.lt_On_portrait_publish_d#.
-    </p>
-  </if>
 </if>
+<if @portrait_state@ eq show>
+  <h2>#acs-subsite.Your_Portrait#</h2>
+  <p>
+    #acs-subsite.lt_On_portrait_publish_d#.
+  </p>
+</if>
+
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.14 -r1.15
--- openacs-4/packages/acs-subsite/www/pvt/home.tcl	12 Sep 2003 13:25:19 -0000	1.14
+++ openacs-4/packages/acs-subsite/www/pvt/home.tcl	19 Sep 2003 15:00:44 -0000	1.15
@@ -21,11 +21,12 @@
     pvt_home_url:onevalue
 }
 
-ad_maybe_redirect_for_registration
+set user_id [auth::require_login -account_status closed]
 
-set user_id [ad_conn user_id]
+acs_user::get -array user -include_bio -user_id $user_id
 
-acs_user::get -array user -include_bio
+set account_status [ad_conn account_status]
+set login_url [ad_get_login_url]
 
 set page_title [ad_pvt_home_name]
 
@@ -43,9 +44,6 @@
 
 set portrait_upload_url [export_vars -base "../user/portrait/upload" { { return_url [ad_return_url] } }]
 
-# Can't find out whether there's a request or not
-set form_request_p 1
-
 if [ad_parameter SolicitPortraitP "user-info" 0] {
     # we have portraits for some users 
     if ![db_0or1row get_portrait_info "
Index: openacs-4/packages/acs-subsite/www/pvt/unsubscribe-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/pvt/unsubscribe-2.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-subsite/www/pvt/unsubscribe-2.adp	6 Sep 2002 21:50:08 -0000	1.3
+++ openacs-4/packages/acs-subsite/www/pvt/unsubscribe-2.adp	19 Sep 2003 15:00:44 -0000	1.4
@@ -1,7 +1,10 @@
 <master>
-<property name="title">Account Deleted</property>
+  <property name="title">@page_title;noquote@</property>
+  <property name="context">@context;noquote@</property>
 
-Your account at @system_name@ has been marked as "deleted".
+<p> Your account at @system_name@ has been closed. </p>
 
+<p> You can always re-open it by <a href="@login_url@">logging back in</a> later. </p>
 
 
+
Index: openacs-4/packages/acs-subsite/www/pvt/unsubscribe-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/pvt/unsubscribe-2.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/pvt/unsubscribe-2.tcl	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/pvt/unsubscribe-2.tcl	19 Sep 2003 15:00:44 -0000	1.2
@@ -6,18 +6,15 @@
     system_name:onevalue
 }
 
-set user_id [ad_get_user_id]
-set rel_id [db_string rel_id "select rel_id
-from group_member_map
-where group_id = acs.magic_object_id('registered_users')
-  and member_id = :user_id"]
+auth::require_login
 
+set page_title "Account Closed"
+set context [list [list [ad_pvt_home] [ad_pvt_home_name]] $page_title]
 
-db_exec_plsql unused "
-begin
-  membership_rel.deleted( rel_id => :rel_id );
-end;"
+acs_user::delete -user_id [ad_conn user_id]
 
 set system_name [ad_system_name]
 
-ad_return_template
+set login_url [ad_get_login_url]
+
+auth::verify_account_status