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.8 -r1.9
--- openacs-4/packages/acs-authentication/tcl/authentication-procs.tcl	29 Aug 2003 12:25:10 -0000	1.8
+++ openacs-4/packages/acs-authentication/tcl/authentication-procs.tcl	29 Aug 2003 14:51:38 -0000	1.9
@@ -656,10 +656,11 @@
     {-authority_id:required}
     {-username:required}
 } { 
-    Handles forgotten passwords.  Attempts to retrieve a password; if not possibe, attempts to reset a password.  If it succeeds, it emails the user.  For all outcomes, it returns a message to be displayed.
+    Handles forgotten passwords.  Attempts to retrieve a password; if not possibe, 
+    attempts to reset a password.  If it succeeds, it emails the user.  For all 
+    outcomes, it returns a message to be displayed.
 
     @param authority_id The ID of the authority that the user is trying to log into.
-
     @param username The username that the user's trying to log in with.
 
     @return Array list with the following entries:
@@ -671,6 +672,7 @@
 } {
 
     set forgotten_url [auth::password::get_forgotten_url \
+                           -remote_only \
                            -authority_id $authority_id \
                            -username $username]
 
@@ -759,7 +761,7 @@
                 set can_retrieve_p [auth::password::can_retrieve_p -authority_id $authority_id]
                 set can_reset_p [auth::password::can_reset_p -authority_id $authority_id]
                 if { $can_retrieve_p || $can_reset_p } {
-                    set forgotten_pwd_url "[subsite::get_element -element url]register/forgotten-password?[export_vars { authority_id username }]"
+                    set forgotten_pwd_url "[subsite::get_element -element url]register/recover-password?[export_vars { authority_id username }]"
                 }
             }
         }
@@ -865,15 +867,6 @@
                           -authority_id $authority_id \
                           -username $username]
 
-    if { [catch {auth::password::email_password \
-                     -username $username \
-                     -authority_id $authority_id \
-                     -password $result(password)} errmsg] } {
-
-        set result(password_status) "reset_error"
-        set result(password_message) [auth::password::get_email_error_msg $errmsg]
-    }
-
     return [array get result]
 }
 
@@ -913,7 +906,7 @@
     }]
         
     # Send email
-    ns_sendmail $email $system_owner $subject $body
+    ns_sendmail $user_email $system_owner $subject $body
 }
 
 ad_proc -private auth::password::get_email_error_msg { errmsg } {
Index: openacs-4/packages/acs-authentication/tcl/authority-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-authentication/tcl/authority-procs.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-authentication/tcl/authority-procs.tcl	27 Aug 2003 13:10:15 -0000	1.3
+++ openacs-4/packages/acs-authentication/tcl/authority-procs.tcl	29 Aug 2003 14:53:26 -0000	1.4
@@ -272,3 +272,11 @@
 } {
     db_exec_plsql delete_authority {}
 }
+
+ad_proc -public auth::authority::get_authority_options {} {
+    Returns options (value label pairs) for building the authority HTML select box.
+
+    @author Simon Carstensen
+} {
+    return [db_list_of_lists select_authorities {}]
+}
Index: openacs-4/packages/acs-authentication/tcl/authority-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-authentication/tcl/authority-procs.xql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-authentication/tcl/authority-procs.xql	29 Aug 2003 14:54:00 -0000	1.1
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+
+<queryset>
+
+    <fullquery name="auth::authority::get_authority_options.select_authorities">
+        <querytext>
+             select pretty_name,
+                    authority_id
+             from   auth_authorities
+             where  enabled_p = 't'
+        </querytext>
+    </fullquery>
+
+</queryset>