Index: openacs-4/packages/acs-subsite/www/user/password-update.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/password-update.tcl,v
diff -u -N -r1.9 -r1.10
--- openacs-4/packages/acs-subsite/www/user/password-update.tcl	10 Sep 2002 22:22:14 -0000	1.9
+++ openacs-4/packages/acs-subsite/www/user/password-update.tcl	28 Aug 2003 09:41:42 -0000	1.10
@@ -7,6 +7,7 @@
     {user_id ""}
     {return_url ""}
     {password_old ""}
+    {expired_p:boolean "0"}
 } -properties {
     first_names:onevalue
     last_name:onevalue
@@ -19,6 +20,13 @@
     set user_id [ad_verify_and_get_user_id]
 }
 
+# We have a special provision here for expired passwords
+# The user will not be logged in, but we're supposed to log them in after we're done
+# We use template::util::is_true in order to be liberal in the input we accept
+set expired_p [template::util::is_true $expired_p]
+
+set system_name [ad_system_name]
+
 set admin_p [permission::permission_p -object_id $user_id -privilege admin]
 
 if {!$admin_p} {
@@ -29,4 +37,12 @@
 
 set site_link [ad_site_home_link]
 
+set export_vars [export_vars -form { user_id return_url }]
+
+if { !$admin_p && [empty_string_p $password_old] } {
+    set focus "pwd.password_old"
+} else {
+    set focus "pwd.password_1"
+}
+
 ad_return_template