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 -r1.20 -r1.21
--- openacs-4/packages/acs-subsite/lib/login.tcl	11 Dec 2003 21:39:55 -0000	1.20
+++ openacs-4/packages/acs-subsite/lib/login.tcl	8 Feb 2004 17:20:48 -0000	1.21
@@ -26,7 +26,6 @@
     set email {}
 }
 
-set expired_p 0
 if { [empty_string_p $email] && [empty_string_p $username] && [ad_conn untrusted_user_id] != 0 } {
     acs_user::get -user_id [ad_conn untrusted_user_id] -array untrusted_user
     if { [auth::UseEmailForLoginP] } {
@@ -152,10 +151,16 @@
     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]
+    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
+        set expiration_time 30
+    }
+
     if { [string compare $hash $computed_hash] != 0 || \
-             $time < [ns_time] - [ad_parameter -package_id [ad_acs_kernel_id] LoginExpirationTime security 600] } {
-        set message [_ acs-subsite.Login_has_expired]
-        ad_returnredirect [export_vars -base [ad_conn url] { message return_url }]
+             $time < [ns_time] - $expiration_time } {
+        ad_returnredirect -message [_ acs-subsite.Login_has_expired] -- [export_vars -base [ad_conn url] { return_url }]
         ad_script_abort
     }
 
Index: openacs-4/packages/acs-subsite/www/register/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/index.adp,v
diff -u -r1.16 -r1.17
--- openacs-4/packages/acs-subsite/www/register/index.adp	17 Oct 2003 10:30:23 -0000	1.16
+++ openacs-4/packages/acs-subsite/www/register/index.adp	8 Feb 2004 17:20:48 -0000	1.17
@@ -2,13 +2,5 @@
   <property name="title">#acs-subsite.Log_In#</property>
   <property name="context">{#acs-subsite.Log_In#}</property>
 
-<if @expired_p@ true>
-  <div class="general-message">#acs-subsite.lt_Your_login_has_expire#</div>
-</if>
-
-<if @message@ not nil>
-  <div class="general-message">@message@</div>
-</if>
-
 <include src="/packages/acs-subsite/lib/login" return_url="@return_url;noquote@" no_frame_p="1" authority_id="@authority_id@" username="@username;noquote@" email="@email;noquote@" &="__adp_properties">
 
Index: openacs-4/packages/acs-subsite/www/register/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/index.tcl,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/acs-subsite/www/register/index.tcl	2 Oct 2003 12:42:14 -0000	1.10
+++ openacs-4/packages/acs-subsite/www/register/index.tcl	8 Feb 2004 17:20:48 -0000	1.11
@@ -5,11 +5,6 @@
     {authority_id ""}
     {username ""}
     {email ""}
-    {message ""}
     {return_url ""}
 }
 
-set expired_p 0
-if { [string equal [ad_conn auth_level] "expired"] } {
-    set expired_p 1
-}