Index: openacs-4/packages/acs-subsite/lib/login.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/lib/login.tcl,v
diff -u -N -r1.24 -r1.25
--- openacs-4/packages/acs-subsite/lib/login.tcl	13 Jan 2005 13:55:31 -0000	1.24
+++ openacs-4/packages/acs-subsite/lib/login.tcl	4 Jun 2006 00:45:41 -0000	1.25
@@ -80,13 +80,13 @@
 
 set forgotten_pwd_url [auth::password::get_forgotten_url -authority_id $authority_id -username $username -email $email]
 
-set register_url [export_vars -base "[subsite::get_element -element url]register/user-new" { return_url }]
+set register_url [export_vars -base "[subsite::get_url]register/user-new" { return_url }]
 if { [string equal $authority_id [auth::get_register_authority]] || [auth::UseEmailForLoginP] } {
     set register_url [export_vars -no_empty -base $register_url { username email }]
 }
 
 set login_button [list [list [_ acs-subsite.Log_In] ok]]
-ad_form -name login -html { style "margin: 0px;" } -show_required_p 0 -edit_buttons $login_button -action "/register/" -form {
+ad_form -name login -html { style "margin: 0px;" } -show_required_p 0 -edit_buttons $login_button -action "[subsite::get_url]register/" -form {
     {return_url:text(hidden)}
     {time:text(hidden)}
     {token_id:text(hidden)}
@@ -164,7 +164,7 @@
     set token [sec_get_token $token_id]
     set computed_hash [ns_sha1 "$time$token_id$token"]
     
-    set expiration_time [parameter::get -parameter LoginExpirationTime -package_id [ad_acs_kernel_id] -default 600]
+    set expiration_time [parameter::get -parameter LoginPageExpirationTime -package_id [ad_acs_kernel_id] -default 600]
     if { $expiration_time < 30 } { 
         # If expiration_time is less than 30 seconds, it's practically impossible to login
         # and you will have completely hosed login on your entire site