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.33 -r1.34
--- openacs-4/packages/acs-subsite/acs-subsite.info	16 Sep 2002 22:16:52 -0000	1.33
+++ openacs-4/packages/acs-subsite/acs-subsite.info	20 Sep 2002 22:28:53 -0000	1.34
@@ -644,7 +644,7 @@
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="textcolor"  default="black" description="This setting sets the textcolor for the default master template that all HTML content is returned through."/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="bgcolor"  default="white" description="this setting sets the background color for the default-master template that all HTML content is returned in."/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="RestrictEntireServerToRegisteredUsersP"  default="0" description="do we want to restrict the entire server to registered users (unused 09/18/2000)"/>
-            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="RestrictToSSL"  default="admin/*" description="URLs we want restricted to SSL. Note that this only takes effect if you have an SSL listener configured on your AOLserver."/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="RestrictToSSL"  default="admin/*" description="URLs we want restricted to SSL. Note that this only takes effect if you have an SSL listener configured on your AOLserver and kernel parameter RegisterRestrictToSSLFilters is set to 1 (its default)."/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="ShowContextBarP"  default="0" description="Should context bars appear on pages?"/>
         </parameters>
 
Index: openacs-4/packages/acs-subsite/www/register/email-password-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/Attic/email-password-2.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/acs-subsite/www/register/email-password-2.tcl	10 Sep 2002 22:22:12 -0000	1.8
+++ openacs-4/packages/acs-subsite/www/register/email-password-2.tcl	20 Sep 2002 22:28:54 -0000	1.9
@@ -56,7 +56,7 @@
     return
 }
 
-set require_question_p [ad_parameter "RequireQuestionForPasswordResetP"]
+set require_question_p [ad_parameter "RequireQuestionForPasswordResetP" security 0]
 
 # generate a random password
 set password [ad_generate_random_string]
Index: openacs-4/packages/acs-subsite/www/register/login-expired.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/Attic/login-expired.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-subsite/www/register/login-expired.adp	6 Sep 2002 21:50:09 -0000	1.3
+++ openacs-4/packages/acs-subsite/www/register/login-expired.adp	20 Sep 2002 22:28:54 -0000	1.4
@@ -1,7 +1,7 @@
 <master>
 <property name=title>Login Expired</property>
 
-<p>The login page has expired. Please <a href="./index">login</a> again.</p>
+<p>The login page has expired. Please <a href="./index?">login</a> again.</p>
 
 <table cellpadding=5 cellspacing=1 border=1>
   <tr>
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.3 -r1.4
--- openacs-4/packages/acs-subsite/www/shared/community-member.tcl	6 Sep 2002 21:50:11 -0000	1.3
+++ openacs-4/packages/acs-subsite/www/shared/community-member.tcl	20 Sep 2002 22:28:55 -0000	1.4
@@ -26,6 +26,13 @@
     user_contributions:multirow
 }
 
+#See if this page has been overrided by a parameter in kernel 
+set community_member_url [ad_parameter -package_id [ad_acs_kernel_id] CommunityMemberURL "/shared/community-member"]
+if { $community_member_url != "/shared/community-member" } {
+    ad_returnredirect "$community_member_url?user_id=$user_id"
+    ad_script_abort
+}
+
 set verified_user_id [ad_verify_and_get_user_id]
 
 if { [empty_string_p $user_id] } {
Index: openacs-4/packages/acs-subsite/www/user/basic-info-update-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/Attic/basic-info-update-2.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-subsite/www/user/basic-info-update-2.tcl	18 Sep 2002 12:16:52 -0000	1.5
+++ openacs-4/packages/acs-subsite/www/user/basic-info-update-2.tcl	20 Sep 2002 22:28:56 -0000	1.6
@@ -5,11 +5,11 @@
     @creation-date Unknown
     @cvs-id $Id$
 } {
-    first_names
-    last_name
-    email
-    {url ""}
-    {screen_name ""}
+    first_names:trim
+    last_name:trim
+    email:trim
+    {url:trim ""}
+    {screen_name:trim ""}
     {bio ""}
     {return_url ""}
     {user_id ""}
Index: openacs-4/packages/acs-subsite/www/user/basic-info-update.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/basic-info-update.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/user/basic-info-update.tcl	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/user/basic-info-update.tcl	20 Sep 2002 22:28:56 -0000	1.2
@@ -28,19 +28,9 @@
 
 ad_require_permission $user_id "write"
 
-db_1row general_info "select first_names, last_name, email, url, screen_name
-           from cc_users 
-          where user_id=:user_id"
+db_1row general_info {}
 
-set bio [db_string biography "
-select attr_value
-from acs_attribute_values
-where object_id = :user_id
-and attribute_id =
-   (select attribute_id
-    from acs_attributes
-    where object_type = 'person'
-    and attribute_name = 'bio')" -default ""]
+set bio [db_string biography {} -default ""]
 
 db_release_unused_handles
 
Index: openacs-4/packages/acs-subsite/www/user/basic-info-update.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/Attic/basic-info-update.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/user/basic-info-update.xql	1 May 2001 21:21:15 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/user/basic-info-update.xql	20 Sep 2002 22:28:56 -0000	1.2
@@ -3,9 +3,11 @@
 
 <fullquery name="general_info">      
       <querytext>
-      select first_names, last_name, email, url, screen_name
-           from cc_users 
-          where user_id=:user_id
+      select first_names, last_name, email, 
+      case when url is null then 'http://' else url end as url,
+      screen_name
+      from cc_users 
+      where user_id=:user_id
       </querytext>
 </fullquery>