--- loncom/interface/resetpw.pm	2010/12/06 02:40:45	1.22.2.5
+++ loncom/interface/resetpw.pm	2012/02/14 15:48:55	1.23.2.2.2.3
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Allow access to password changing via a token sent to user's e-mail. 
 #
-# $Id: resetpw.pm,v 1.22.2.5 2010/12/06 02:40:45 raeburn Exp $
+# $Id: resetpw.pm,v 1.23.2.2.2.3 2012/02/14 15:48:55 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -107,9 +107,9 @@ sub handler {
                  text => 'Result'});
         }
     }
-    my $args = {no_inline_link         => 1,
-                bread_crumbs           => $brcrum,
-                bread_crumbs_component => $bread_crumbs_component};
+    my $args = {bread_crumbs           => $brcrum,
+                bread_crumbs_component => $bread_crumbs_component,
+               'no_inline_link'        => 1};
     $r->print(&Apache::loncommon::start_page('Reset password','',$args));
     $r->print('<h3>'.&mt('Reset forgotten LON-CAPA password').'</h3>');
     my $output;
@@ -195,8 +195,8 @@ sub handler {
 sub get_uname {
     my ($defdom,$uname,$useremail) = @_;
     my %lt = &Apache::lonlocal::texthash(
-                                         unam => 'LON-CAPA username',
-                                         udom => 'LON-CAPA domain',
+                                         unam => 'username',
+                                         udom => 'domain',
                                          uemail => 'E-mail address in LON-CAPA',
                                          proc => 'Proceed');
     my %value;
@@ -204,14 +204,17 @@ sub get_uname {
         $value{'uname'} = $uname;
         $value{'useremail'} = $useremail;
     }
-    my $inventory = uc($defdom);
+    if ($env{'form.referrer'} eq 'createaccount') {
+        $value{'uname'} = $uname;
+        $value{'useremail'} = $useremail;
+    }
     my $msg = '<br />'.&mt('To be able to reset a forgotten password:')
-           .'<ul><li>'.&mt('An e-mail address must have previously been associated with your LON-CAPA username.').'</li>'
-           .'<li>'.&mt('You must be able to access e-mail sent to the e-mail address associated with your WebCenter account.').'</li></ul><br />'
-           .&mt('In most cases the [_1] WebCenter username is the same as your e-mail address, in which case you will enter the same information twice.',$inventory).'<br /><br />';
+           .'<ul><li>'.&mt('An e-mail address must have previously been associated with your [_1] username.','Mechanics Online').'</li>'
+           .'<li>'.&mt('You must be able to access e-mail sent to the e-mail address associated with your [_1] account.','Mechanics Online').'</li></ul><br />'
+           .&mt('In most cases the [_1] username is the same as your e-mail address, in which case you will enter the same information twice.','Mechanics Online').'<br /><br />';
     $msg .= '<form name="forgotpw" method="post" action="/adm/resetpw">'.
             &Apache::lonhtmlcommon::start_pick_box().
-            &Apache::lonhtmlcommon::row_title($lt{'unam'}).
+            &Apache::lonhtmlcommon::row_title('Mechanics Online '.$lt{'unam'}).
             '<input type="text" name="uname" size="30" value="'.$value{'uname'}.'" />'.
             '<input type="hidden" name="udom" value="'.$defdom.'" />'.
             &Apache::lonhtmlcommon::row_closure(1).
@@ -247,20 +250,24 @@ sub send_token {
         if ($result eq 'ok') {
             $msg .= &mt('An e-mail sent to the e-mail address associated with your LON-CAPA account includes the web address for the link you should use to complete the reset process.').'<br /><br />'.&mt('The link included in the message will be valid for the next [_1]two[_2] hours.','<b>','</b>');
         } else {
-            $msg .= &mt('An error occurred when sending a message to the e-mail address associated with your LON-CAPA account. Please contact the [_1] ([_2]) for assistance.',$contact_name,$contact_email);
+            $msg .= &mt("An error occurred when sending a message to the e-mail address associated with your LON-CAPA account. Please contact the [_1] ([_2]) for assistance.",$contact_name,$contact_email);
         }
     } else {
-        $msg .= &mt('An error occurred creating a token required for the password reset process. Please contact the [_1] ([_2]) for assistance.',$contact_name,$contact_email);
+        $msg .= &mt("An error occurred creating a token required for the password reset process. Please contact the [_1] ([_2]) for assistance.",$contact_name,$contact_email);
     }
     return $msg;
 }
 
 sub send_mail {
-    my ($domdesc,$email,$mailmsg,$contact_name,$contact_email) = @_;
+    my ($domdesc,$email,$mailmsg,$contact_name,$contact_email,$subject) = @_;
+    if ($subject eq '') {
+        $subject = &mt('Your LON-CAPA account');
+    }
     my $outcome;
     my $requestmail = "To: $email\n".
                       "From: $contact_name <$contact_email>\n".
-                      "Subject: ".&mt('Your LON-CAPA account')."\n".
+                      "Subject: $subject\n".
+                      "Content-type: text/plain\;charset=UTF-8\n".
                       "\n\n".$mailmsg."\n\n".
                       &mt('[_1] LON-CAPA support team',$domdesc)."\n".
                       "$contact_email\n";
@@ -318,7 +325,6 @@ sub reset_passwd {
         ($data{'email'}  =~ /^[^\@]+\@[^\@]+\.[^\@\.]+$/) && 
         ($data{'temppasswd'} =~/^\w+$/)) {
         my $reqtime = &Apache::lonlocal::locallocaltime($data{'time'});
-        my $inventory = uc($data{'domain'});
         if ($now - $data{'time'} < 7200) {
             if ($env{'form.action'} eq 'verify_and_change_pass') {
                 my $homeserver = &Apache::lonnet::homeserver($env{'form.uname'},$env{'form.udom'});
@@ -377,7 +383,7 @@ sub reset_passwd {
             } else {
                 $r->print(&mt('The token included in an e-mail sent to you [_1] has been verified, so you may now proceed to reset the password for your LON-CAPA account.',$reqtime).'<br />'.
                           '<p>'.&mt('Please enter the username and domain of the LON-CAPA account, and the associated e-mail address, for which you are setting a password.').'<br />'.
-                          &mt('In most cases the [_1] WebCenter username is the same as your e-mail address, in which case you will enter the same information twice.',$inventory).'</p>'.
+                          &mt('In most cases the [_1] username is the same as your e-mail address, in which case you will enter the same information twice.','Mechanics Online').'</p>'.
                           '<p>'.&mt('The new password must contain at least 7 characters.').' '.
                           &mt('Your new password will be sent to the LON-CAPA server in an encrypted form.').'<br /></p>');
                 &Apache::lonpreferences::passwordchanger($r,'','reset_by_email',$token);