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.13 -r1.14
--- openacs-4/packages/acs-authentication/tcl/local-procs.tcl	12 Sep 2003 13:00:31 -0000	1.13
+++ openacs-4/packages/acs-authentication/tcl/local-procs.tcl	16 Sep 2003 13:07:42 -0000	1.14
@@ -81,7 +81,7 @@
         contract_name "auth_authentication"
         owner "acs-authentication"
         name "local"
-        pretty_name "Local Authentication"
+        pretty_name "Local"
         aliases {
             Authenticate auth::local::authentication::Authenticate
             GetParameters auth::local::authentication::GetParameters
@@ -113,7 +113,6 @@
     
     set authority_id [auth::authority::local]
 
-
     set user_id [acs_user::get_by_username -username $username]
     if { [empty_string_p $user_id] } {
         set result(auth_status) "no_account"
@@ -162,7 +161,7 @@
         contract_name "auth_password"
         owner "acs-authentication"
         name "local"
-        pretty_name "Local Password"
+        pretty_name "Local"
         aliases {
             CanChangePassword auth::local::password::CanChangePassword
             ChangePassword auth::local::password::ChangePassword
@@ -246,6 +245,31 @@
 
     set result(password_status) "ok"
 
+    if { [parameter::get -parameter EmailAccountOwnerOnPasswordChangeP -package_id [ad_acs_kernel_id] -default 1] } {
+        acs_user::get -username $username -array user
+
+        set system_name [ad_system_name]
+        set pvt_home_name [ad_pvt_home_name]
+        set password_update_link_text [_ acs-subsite.Change_my_Password]
+        
+        if { [auth::UseEmailForLoginP] } {
+            set account_id_label [_ acs-subsite.Email]
+            set account_id $user(email)
+        } else {
+            set account_id_label [_ acs-subsite.Username]
+            set account_id $user(username)
+        }
+
+        set subject [_ acs-subsite.Password_changed_subject]
+        set body [_ acs-subsite.Password_changed_body]
+
+        ns_sendmail \
+            $user(email) \
+            [ad_outgoing_sender] \
+            $subject \
+            $body
+    }
+    
     return [array get result]
 }
 
@@ -321,7 +345,7 @@
         contract_name "auth_registration"
         owner "acs-authentication"
         name "local"
-        pretty_name "Local Registration"
+        pretty_name "Local"
         aliases {
             GetElements auth::local::registration::GetElements
             Register auth::local::registration::Register
@@ -343,7 +367,12 @@
     Implements the GetElements operation of the auth_register
     service contract for the local account implementation.
 } {
-    set result(required) { username email first_names last_name }
+    set result(required) {}
+    if { ![auth::UseEmailForLoginP] } {
+        set result(required) username 
+    }
+
+    set result(required) [concat $result(required) { email first_names last_name }]
     set result(optional) { screen_name url }
 
     if { ![parameter::get -parameter RegistrationProvidesRandomPasswordP -default 0] } {
@@ -394,8 +423,9 @@
 
     # Set user's password
     set user_id [acs_user::get_by_username -username $username]
+    ns_log Notice "LARS: Setting user_id $user_id's password to $password -- username = $username"
     ad_change_password $user_id $password
-    
+
     # Used in messages below
     set system_name [ad_system_name]
     set system_url [ad_url]