Index: openacs-4/packages/acs-authentication/acs-authentication.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-authentication/acs-authentication.info,v
diff -u -r1.38 -r1.39
--- openacs-4/packages/acs-authentication/acs-authentication.info	27 Oct 2014 16:39:00 -0000	1.38
+++ openacs-4/packages/acs-authentication/acs-authentication.info	16 Jun 2015 07:13:27 -0000	1.39
@@ -7,7 +7,7 @@
     <initial-install-p>t</initial-install-p>
     <singleton-p>t</singleton-p>
     
-    <version name="5.9.0d1" url="http://openacs.org/repository/download/apm/acs-authentication-5.9.0d1.apm">
+    <version name="5.9.0d2" url="http://openacs.org/repository/download/apm/acs-authentication-5.9.0d2.apm">
         <owner url="mailto:lars@collaboraid.biz">Lars Pind</owner>
         <summary>Authentication, account management, and related functionality.</summary>
         <release-date>2013-09-08</release-date>
@@ -16,7 +16,7 @@
         <license url="http://www.gnu.org/copyleft/gpl.html">GPL version 2</license>
         <description format="text/html">Implements authentication-related security functions for OpenACS, including password, account and session management, bulk account creation etc.  Provides a contract based interface for different authentication methods such as PAM or LDAP based authentication.</description>
 
-        <provides url="acs-authentication" version="5.9.0d1"/>
+        <provides url="acs-authentication" version="5.9.0d2"/>
         <requires url="acs-kernel" version="5.9.0d1"/>
         <requires url="acs-service-contract" version="5.9.0d1"/>
         <requires url="acs-mail-lite" version="5.9.0d1"/>
Index: openacs-4/packages/acs-authentication/tcl/authentication-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-authentication/tcl/authentication-procs.tcl,v
diff -u -r1.88 -r1.89
--- openacs-4/packages/acs-authentication/tcl/authentication-procs.tcl	27 Oct 2014 16:39:01 -0000	1.88
+++ openacs-4/packages/acs-authentication/tcl/authentication-procs.tcl	16 Jun 2015 07:13:27 -0000	1.89
@@ -1303,7 +1303,7 @@
     if { $authority_id eq "" } {
         set authority_id [auth::authority::local]
     }
-    ns_log notice "auth::get_local_account authority_id = '${authority_id}' local = [auth::authority::local]"
+    #ns_log notice "auth::get_local_account authority_id = '${authority_id}' local = [auth::authority::local]"
     with_catch errmsg {
         acs_user::get -authority_id $authority_id -username $username -array user
         set account_found_p 1
Index: openacs-4/packages/acs-authentication/tcl/local-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-authentication/tcl/local-procs.tcl,v
diff -u -r1.38 -r1.39
--- openacs-4/packages/acs-authentication/tcl/local-procs.tcl	27 Oct 2014 16:39:01 -0000	1.38
+++ openacs-4/packages/acs-authentication/tcl/local-procs.tcl	16 Jun 2015 07:13:27 -0000	1.39
@@ -501,7 +501,7 @@
 
     # LARS TODO: Move this out of the local driver and into the auth framework
     # Send password confirmation email to user
-    if { [set email_reg_confirm_p [parameter::get -parameter EmailRegistrationConfirmationToUserP -package_id [ad_conn subsite_id] -default 0]] != -1 } {
+    if { [set email_reg_confirm_p [parameter::get -parameter EmailRegistrationConfirmationToUserP -package_id [ad_conn subsite_id] -default 1]] != 0 } {
 	if { $generated_pwd_p || \
 		 [parameter::get -parameter RegistrationProvidesRandomPasswordP -package_id [ad_conn subsite_id] -default 0] || \
 		 $email_reg_confirm_p } {
Index: openacs-4/packages/acs-core-docs/www/xml/kernel/ext-auth-design.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/kernel/ext-auth-design.xml,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-core-docs/www/xml/kernel/ext-auth-design.xml	27 Oct 2014 16:39:31 -0000	1.5
+++ openacs-4/packages/acs-core-docs/www/xml/kernel/ext-auth-design.xml	16 Jun 2015 07:13:27 -0000	1.6
@@ -1257,7 +1257,7 @@
     }
     # Send password/confirmail email to user
     if { [parameter::get -parameter RegistrationProvidesRandomPasswordP -default 0] || \
-             [parameter::get -parameter EmailRegistrationConfirmationToUserP -default 0] } {
+             [parameter::get -parameter EmailRegistrationConfirmationToUserP -default 1] } {
         with_catch errmsg {
             acs_mail_lite::send \
                 -to_addr $email \
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.116 -r1.117
--- openacs-4/packages/acs-subsite/acs-subsite.info	27 Oct 2014 16:39:45 -0000	1.116
+++ openacs-4/packages/acs-subsite/acs-subsite.info	16 Jun 2015 07:13:27 -0000	1.117
@@ -9,16 +9,16 @@
     <implements-subsite-p>t</implements-subsite-p>
     <inherit-templates-p>t</inherit-templates-p>
     
-    <version name="5.9.0d1" url="http://openacs.org/repository/download/apm/acs-subsite-5.9.0d1.apm">
+    <version name="5.9.0d2" url="http://openacs.org/repository/download/apm/acs-subsite-5.9.0d2.apm">
         <owner url="http://openacs.org">OpenACS</owner>
         <summary>Subsite</summary>
-        <release-date>2014-09-09</release-date>
+        <release-date>2015-06-16</release-date>
         <vendor url="http://openacs.org">OpenACS</vendor>
         <description format="text/html">Provides for creating subsites within the OpenACS Community System.  Aware of parties, groups, users, portraits.  Can be themed via a per subsite master template.</description>
         <license>GPL</license>
         <maturity>3</maturity>
 
-        <provides url="acs-subsite" version="5.9.0d1"/>
+        <provides url="acs-subsite" version="5.9.0d2"/>
         <requires url="acs-authentication" version="5.9.0d1"/>
         <requires url="acs-content-repository" version="5.9.0d1"/>
         <requires url="acs-kernel" version="5.8.0d4"/>
@@ -93,7 +93,7 @@
             <parameter scope="instance" datatype="string"  min_n_values="1"  max_n_values="1"  name="EmailChangedPasswordP"  default="0" description="if the admin changes the password, should it be mailed to the user" section_name="user-login"/>
             <parameter scope="instance" datatype="string"  min_n_values="1"  max_n_values="1"  name="EmailConfirmTemplate"  default="/packages/acs-subsite/lib/email-confirm" description="Template to use for the page the user comes to for verification of the email. Can be used to trigger additional events."/>
             <parameter scope="instance" datatype="string"  min_n_values="1"  max_n_values="1"  name="EmailForgottenPasswordP"  default="1" description="Email users forgotten passwords" section_name="user-login"/>
-            <parameter scope="instance" datatype="string"  min_n_values="1"  max_n_values="1"  name="EmailRegistrationConfirmationToUserP"  default="0" description="send confirmation email to user after registration. If value = 0 the email is still sent if registration is set to provide random passwords. Set to -1 to not send the email at all." section_name="user-login"/>
+            <parameter scope="instance" datatype="string"  min_n_values="1"  max_n_values="1"  name="EmailRegistrationConfirmationToUserP"  default="1" description="send confirmation email to user after registration." section_name="user-login"/>
             <parameter scope="instance" datatype="string"  min_n_values="1"  max_n_values="1"  name="GlobalURLStub"  default="/global" description="Where is the global directory for such things as file-not-found error messages"/>
             <parameter scope="instance" datatype="string"  min_n_values="1"  max_n_values="1"  name="IndexInternalRedirectUrl"  description="If non-blank and IndexRedirectUrl is blank, serve the given template rather than the default index template, but with an rp_internal_redirect. Value is relative to serverroot. Example: /packages/dotlrn/index"/>
             <parameter scope="instance" datatype="string"  min_n_values="1"  max_n_values="1"  name="IndexRedirectUrl"  description="A URL to redirect to instead of showing the subsite index page. Useful if you want to replace the index page with a page generated by portals, by edit-this-page, or to one of the applications installed at the subsite."/>
Index: openacs-4/packages/acs-subsite/sql/oracle/upgrade/upgrade-5.9.0d1-5.9.0d2.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/sql/oracle/upgrade/upgrade-5.9.0d1-5.9.0d2.sql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-subsite/sql/oracle/upgrade/upgrade-5.9.0d1-5.9.0d2.sql	16 Jun 2015 07:13:27 -0000	1.1
@@ -0,0 +1,24 @@
+-- Change default value to reflect new semantics found in code
+update apm_parameters
+   set default_value = '1',
+       description = 'send confirmation email to user after registration.'
+ where parameter_id =
+       (select parameter_id
+       	  from apm_parameters
+         where package_key = 'acs-subsite'
+	   and parameter_name = 'EmailRegistrationConfirmationToUserP')
+;
+
+-- Update all current values to reflect new semantics found in code
+update apm_parameter_values
+   set attr_value = (case attr_value
+       		     when '-1' then '0'
+		     when  '0' then '1'
+		     else           '1'
+		     end)
+ where parameter_id =
+       (select parameter_id
+       	  from apm_parameters
+         where package_key = 'acs-subsite'
+	   and parameter_name = 'EmailRegistrationConfirmationToUserP')
+;
Index: openacs-4/packages/acs-subsite/sql/postgresql/upgrade/upgrade-5.9.0d1-5.9.0d2.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/sql/postgresql/upgrade/upgrade-5.9.0d1-5.9.0d2.sql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-subsite/sql/postgresql/upgrade/upgrade-5.9.0d1-5.9.0d2.sql	16 Jun 2015 07:13:27 -0000	1.1
@@ -0,0 +1,25 @@
+-- Change default value to reflect new semantics found in code
+update apm_parameters
+   set default_value = '1',
+       description = 'send confirmation email to user after registration.'
+ where parameter_id =
+       (select parameter_id
+       	  from apm_parameters
+         where package_key = 'acs-subsite'
+	   and parameter_name = 'EmailRegistrationConfirmationToUserP')
+;
+
+-- Update all current values to reflect new semantics found in code
+update apm_parameter_values
+   set attr_value = (case attr_value
+       		     when '-1' then '0'
+		     when  '0' then '1'
+		     else           '1'
+		     end)
+ where parameter_id =
+       (select parameter_id
+       	  from apm_parameters
+         where package_key = 'acs-subsite'
+	   and parameter_name = 'EmailRegistrationConfirmationToUserP')
+;
+