Index: openacs-4/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/www/Attic/index.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/www/index.tcl	29 Aug 2003 12:47:38 -0000	1.6
+++ openacs-4/www/index.tcl	4 Sep 2003 07:48:39 -0000	1.7
@@ -10,20 +10,8 @@
     @cvs-id $Id$
 
 } {
-    { email "" }
-} -properties {
-    system_name:onevalue
-    form_vars:onevalue
-    allow_persistent_login_p:onevalue
-    remember_password:onevalue
-    node:multirow
-    name:onevalue
-    email:onevalue
-    home_url:onevalue
-    home_url_name:onevalue
-    acs_version:onevalue
-    acs_root_dir:onevalue
-    focus:onevalue
+    {username ""}
+    {authority_id ""}
 }
 
 # DRB: vertical applications like dotLRN can set the IndexRedirectUrl parameter to force the user
@@ -35,40 +23,11 @@
     ad_script_abort
 }
 
-set user_id [ad_get_user_id]
-if { $user_id == 0 } {
-    set user_id ""
-}
+set user_id [ad_conn user_id]
 
-set focus ""
-if { [empty_string_p $user_id] } {  
-    set focus "login.username"
-}
-
-# One common problem with login is that people can hit the back button
-# after a user logs out and relogin by using the cached password in
-# the browser. We generate a unique hashed timestamp so that users
-# cannot use the back button.
-
-set time [ns_time]
-set token_id [sec_get_random_cached_token_id]
-set token [sec_get_token $token_id]
-set hash [ns_sha1 "$time$token_id$token"]
-
-set system_name [ad_system_name]
-set return_url "/"
-set form_vars [export_form_vars return_url time token_id hash]
-
-set allow_persistent_login_p [ad_parameter -package_id [ad_acs_kernel_id] AllowPersistentLoginP security 1]
-if {[ad_parameter -package_id [ad_acs_kernel_id] DefaultPersistentLoginP security 0]} {
-    set remember_password "checked=\"checked\""
-} else {
-    set remember_password ""
-}
-
 db_multirow nodes site_nodes {}
 
-if { ![empty_string_p $user_id]} {
+if { $user_id != 0 } {
     # The user is loged in.
     if {[db_0or1row user_name_select {
 	select first_names || ' ' || last_name as name, email
@@ -82,6 +41,8 @@
     set requires_registration_p_clause ""
 }
 
+set system_name [ad_system_name]
+
 set acs_version [ad_acs_version]
 
 set acs_root_dir [acs_root_dir]