Index: openacs-4/packages/acs-subsite/www/register/login-include.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/Attic/login-include.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/acs-subsite/www/register/login-include.tcl	29 Aug 2003 12:47:21 -0000	1.3
+++ openacs-4/packages/acs-subsite/www/register/login-include.tcl	3 Sep 2003 09:51:58 -0000	1.4
@@ -3,15 +3,15 @@
 # Expects:
 #   subsite_id - optional, defaults to nearest subsite
 #   return_url - optional, defaults to Your Account
-#   
+# Optional:
+#   authority_id
+#   username
+#
 
 if { ![exists_and_not_null package_id] } {
     set subsite_id [subsite::get_element -element object_id]
 }
 
-
-
-
 # Persistent login
 # The logic is: 
 #  1. Allowed if allowed both site-wide (on acs-kernel) and on the subsite
@@ -43,17 +43,11 @@
 set token [sec_get_token $token_id]
 set hash [ns_sha1 "$time$token_id$token"]
 
+set authority_options [auth::authority::get_authority_options]
 
-# TODO: Move this into a library proc
-set authority_options [db_list_of_lists select_authorities {
-    select pretty_name, authority_id
-    from   auth_authorities
-    where  enabled_p = 't'
-    and    auth_impl_id is not null
-    order  by sort_order
-}]
+set forgotten_pwd_url [export_vars -base [auth::password::get_forgotten_url] { username authority_id }]
 
-set forgotten_pwd_url [auth::password::get_forgotten_url]
+set register_url "[subsite::get_element -element url]register/user-new"
 
 ad_form -name login -html { style "margin: 0px;" } -form {
     {return_url:text(hidden)}