Index: openacs-4/packages/acs-subsite/www/register/email-password-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/Attic/email-password-2.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-subsite/www/register/email-password-2.tcl	14 Apr 2002 04:34:36 -0000	1.3
+++ openacs-4/packages/acs-subsite/www/register/email-password-2.tcl	15 Apr 2002 22:40:50 -0000	1.4
@@ -50,8 +50,9 @@
 }
 
 if {!$validated_p} {
-    # Unauthorized Access
-    ad_return_error "Unauthorized Access" "The validation didn't match what we had.  Either press back on the browser and retype it in, or <a href=\"/register\">go back to the login page</a>."
+    ad_return_error \
+        "Unauthorized Access" \
+        "The validation didn't match what we had. Either press back on the browser and retype it in, or <a href=\"/register\">go back to the login page</a>."
     return
 }
 
@@ -64,19 +65,31 @@
 set system_owner [ad_system_owner]
 set system_name [ad_system_name]
 
-# Send email
-if [catch {ns_sendmail $email $system_owner "Your forgotten password on $system_name" "Here's how you can log in at [ad_url]:
+set subject "Your forgotten password on $system_name"
+set body "Please follow the following link to reset your password:
 
-Username:  $email
-Password:  $password
+[ad_url]/user/password-update?[export_vars {{password_old $password}}]
 
-"} errmsg] {
-    ad_return_error "Error sending mail" "Now we're really in trouble because we got an error trying to send you email:
+"
+
+# Send email
+if [catch {ns_sendmail $email $system_owner $subject $body} errmsg] {
+    ad_return_error \
+        "Error sending mail" \
+        "Now we're really in trouble because we got this error:
 <blockquote>
   <pre>
     $errmsg
   </pre>
 </blockquote>
+when trying to send you the following email:
+<blockquote>
+  <pre>
+Subject: $subject
+
+$body
+  </pre>
+</blockquote>
 "
     return
 }