--- loncom/interface/resetpw.pm	2019/08/30 00:09:39	1.46
+++ loncom/interface/resetpw.pm	2020/12/18 15:23:02	1.48
@@ -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.46 2019/08/30 00:09:39 raeburn Exp $
+# $Id: resetpw.pm,v 1.48 2020/12/18 15:23:02 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -482,7 +482,8 @@ sub send_token {
 
     my $now = time;
     my $temppasswd = &create_passwd();
-    my %info = ('ip'         => $ENV{'REMOTE_ADDR'},
+    my $ip = &Apache::lonnet::get_requestor_ip(); 
+    my %info = ('ip'         => $ip,
 		'time'       => $now,
 		'domain'     => $udom,
 		'username'   => $uname,
@@ -639,7 +640,9 @@ sub reset_passwd {
                             $invalidinfo = "||$env{'form.uname'}|| ||$env{'form.udom'}|| ";
                         }
                     } else {
-                        unless ((lc($env{'form.uname'}) eq lc($data{'username'})) && (lc($env{'form.udom'}) eq lc($data{'domain'}))) {
+                        if ((lc($env{'form.uname'}) eq lc($data{'username'})) && (lc($env{'form.udom'}) eq lc($data{'domain'}))) {
+                            $env{'form.uname'} = $data{'username'};
+                        } else {
                             $invalidinfo = "||$env{'form.uname'}|| ||$env{'form.udom'}|| ";
                         }
                     }
@@ -661,7 +664,53 @@ sub reset_passwd {
                 }
                 if ($invalidinfo) {
                     &Apache::lonnet::logthis("Forgot Password -- token data: ||$data{'username'}|| ||$data{'domain'}|| ||$data{'email'}|| differs from form: $invalidinfo");
-                    $r->print(&generic_failure_msg($contact_name,$contact_email));
+                    my $retry;
+                    $r->print(
+                              '<p class="LC_warning">'
+                             .&mt('A problem occurred when attempting to reset'
+                             .' the password for your account.').'</p>');
+                    if (($formfields{'username'}) && ($formfields{'email'})) {
+                        if ($needscase) {
+                            $r->print('<p>'
+                                     .&mt('Please verify you entered the correct username and e-mail address, '
+                                     .'including the correct lower and/or upper case letters')
+                                     .'</p>');
+                        } else {
+                            $r->print('<p>'
+                                     .&mt('Please verify you entered the correct username and e-mail address.')
+                                     .'</p>');
+                        }
+                        $retry = 1;
+                    } elsif ($formfields{'username'}) {
+                        if ($needscase) {
+                            $r->print('<p>'
+                                     .&mt('Please verify you entered the correct username, '
+                                     .'including the correct lower and/or upper case letters')
+                                     .'</p>');
+                        } else {
+                            $r->print('<p>'
+                                     .&mt('Please verify you entered the correct username.')
+                                     .'</p>');
+                        }
+                        $retry = 1;
+                    } elsif ($formfields{'email'}) {
+                        if ($needscase) {
+                            $r->print('<p>'
+                                     .&mt('Please verify you entered the correct e-mail address, '
+                                     .'including the correct lower and/or upper case letters')
+                                     .'</p>');
+                        } else {
+                            $r->print('<p>'
+                                     .&mt('Please verify you entered the correct e-mail address.')
+                                     .'</p>');
+                        }
+                        $retry = 1;
+                    }
+                    if ($retry) {
+                         &Apache::lonpreferences::passwordchanger($r,'','reset_by_email',$token,$timelimit,\%formfields);
+                    } else {
+                        $r->print(&generic_failure_msg($contact_name,$contact_email));
+                    }
                     unless ($formfields{'username'}) {
                         delete($env{'form.uname'});
                         delete($env{'form.udom'});
@@ -669,13 +718,14 @@ sub reset_passwd {
                     return;
                 }
                 my $change_failed =
-		    &Apache::lonpreferences::verify_and_change_password($r,'reset_by_email',$token);
+		    &Apache::lonpreferences::verify_and_change_password($r,'reset_by_email',$token,$timelimit,\%formfields);
                 if (!$change_failed) {
                     my $delete = &Apache::lonnet::tmpdel($token);
                     my $now = &Apache::lonlocal::locallocaltime(time);
                     my $domdesc = 
 			&Apache::lonnet::domain($data{'domain'},'description');
-                    my $mailmsg = &mt('The password for your LON-CAPA account in the [_1] domain was changed [_2] from IP address: [_3].  If you did not perform this change or authorize it, please contact the [_4] ([_5]).',$domdesc,$now,$ENV{'REMOTE_ADDR'},$contact_name,$contact_email)."\n";
+                    my $ip = &Apache::lonnet::get_requestor_ip();
+                    my $mailmsg = &mt('The password for your LON-CAPA account in the [_1] domain was changed [_2] from IP address: [_3].  If you did not perform this change or authorize it, please contact the [_4] ([_5]).',$domdesc,$now,$ip,$contact_name,$contact_email)."\n";
                     my $result = &send_mail($domdesc,$data{'email'},$mailmsg,
                                             $contact_name,$contact_email);
                     my $confirm_msg;
@@ -729,7 +779,8 @@ sub reset_passwd {
                          .'</p>'
                          .&display_actions($contact_email,$domdesc,$token)
                     );
-                } else {
+                } elsif (($change_failed eq 'internalerror') || ($change_failed eq 'missingtemp') ||
+                         ($change_failed eq 'error')) {
                     $r->print(&generic_failure_msg($contact_name,$contact_email));
                 }
                 unless ($formfields{'username'}) {
@@ -749,7 +800,20 @@ sub reset_passwd {
                     if ($needscase) {
                         $r->print(' '.&mt('User data entered must match LON-CAPA account information (including case).'));
                     }
-                    $r->print(' ');
+                    $r->print('<br />');
+                }
+                my ($min,$max,$minrule,$maxrule);
+                if ($passwdconf->{min}) {
+                    $min = $passwdconf->{min};
+                } else {
+                    $min = $Apache::lonnet::passwdmin;
+                }
+                if ($min) {
+                    $minrule = &mt('Minimum password length: [_1]',$min);
+                }
+                if ($passwdconf->{max}) {
+                    $max = $passwdconf->{max};
+                    $maxrule = &mt('Maximum password length: [_1]',$max);
                 }
                 if (ref($passwdconf->{chars}) eq 'ARRAY') {
                     my %rules;
@@ -766,9 +830,24 @@ sub reset_passwd {
                             $r->print('<li>'.$rulenames{$poss}.'</li>');
                         }
                     }
+                    if ($min) {
+                        $r->print('<li>'.$minrule.'</li>');
+                    }
+                    if ($max) {
+                        $r->print('<li>'.$maxrule.'</li>');
+                    }
                     $r->print('</ul>');
                 } else {
-                    $r->print(&mt('The new password must contain at least 7 characters.').' ');
+                    if ($min && $max) {
+                        $r->print(&mt('The new password must satisfy the following:').'<ul>'."\n".
+                                  '<li>'.$minrule.'</li>'."\n".
+                                  '<li>'.$maxrule.'</li>'."\n".
+                                  '</ul>'."\n");
+                    } elsif ($min) {
+                        $r->print($minrule.'<br />');
+                    } elsif ($max) {
+                        $r->print($maxrule.'<br />');
+                    }
                 }
                 $r->print(&mt('Your new password will be sent to the LON-CAPA server in an encrypted form.').'<br />');
                 &Apache::lonpreferences::passwordchanger($r,'','reset_by_email',$token,$timelimit,\%formfields);
@@ -776,7 +855,8 @@ sub reset_passwd {
         } else {
             $r->print(
                 '<p class="LC_warning">'
-               .&mt('Sorry, the token generated when you requested a password reset has expired. Please submit a [_1]new request[_2], and follow the link to the web page included in the new e-mail that will be sent to you, to allow you to enter a new password.'
+               .&mt('Sorry, the token generated when you requested a password reset has expired.').'<br />'
+               .&mt('Please submit a [_1]new request[_2], and follow the link to the web page included in the new e-mail that will be sent to you, to allow you to enter a new password.'
                     ,'<a href="/adm/resetpw">','</a>')
                .'</p>'
             );