--- loncom/interface/resetpw.pm	2021/05/04 18:47:36	1.49
+++ loncom/interface/resetpw.pm	2025/02/14 22:42:05	1.53
@@ -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.49 2021/05/04 18:47:36 raeburn Exp $
+# $Id: resetpw.pm,v 1.53 2025/02/14 22:42:05 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -115,6 +115,7 @@ sub handler {
         }
     }
     my %passwdconf = &Apache::lonnet::get_passwdconf($dom_in_effect);
+    my $clientip = &Apache::lonnet::get_requestor_ip($r);
     my $token = $env{'form.token'};
     my $useremail = $env{'form.useremail'};
     if (($udom ne '') && (!$otherinst) && (!$token)) {
@@ -288,12 +289,13 @@ END
         $js.= "\n".'<script src="https://www.google.com/recaptcha/api.js"></script>'."\n";
     }
     my $header = &Apache::loncommon::start_page('Reset password',$js,$args).
-                 '<h2>'.&mt('Reset forgotten LON-CAPA password').'</h2>';
+                 '<div class="LC_landmark" role="banner">'.
+                 '<h2 class="LC_heading_2">'.&mt('Reset forgotten LON-CAPA password').'</h2></div>';
     my $output;
     if ($token) {
-        $r->print($header);
-        &reset_passwd($r,$token,$contact_name,$contact_email,\%passwdconf);
-        $r->print(&Apache::loncommon::end_page());
+        $r->print($header.'<div class="LC_landmark" role="main">');
+        &reset_passwd($r,$token,$contact_name,$contact_email,$clientip,\%passwdconf);
+        $r->print('</div>'.&Apache::loncommon::end_page());
         return OK;
     } elsif ($udom) {
         if (!$domdesc) {
@@ -327,7 +329,7 @@ END
                 my $authtype = &Apache::lonnet::queryauthenticate($uname,$udom);
                 if ($authtype =~ /^internal/) {
                     my ($blocked,$blocktext) =
-                        &Apache::loncommon::blocking_status('passwd',$uname,$udom);
+                        &Apache::loncommon::blocking_status('passwd',$clientip,$uname,$udom);
                     if ($blocked) {
                         $output = '<p class="LC_warning">'.$blocktext.'</p>'
                                   .&display_actions($contact_email,$domdesc);
@@ -417,7 +419,7 @@ END
     } else {
         $output = &get_uname($server,$defdom,\%passwdconf);
     }
-    $r->print($header.$output);
+    $r->print($header.'<div class="LC_landmark" role="main">'.$output.'</div>');
     $r->print(&Apache::loncommon::end_page());
     return OK;
 }
@@ -441,21 +443,21 @@ sub get_uname {
             $msg .= $contents;
         }
     }
-    $msg .= '<p>'.&mt('Three conditions must be met:')
+    $msg .= '<p>'.&mt('Three conditions must be met:').'</p>'
            .'<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 that address.').'</li>'
            .'<li>'.&mt('Your LON-CAPA account must be of a type for which LON-CAPA can reset a password.')
-           .'</ul></p>';
+           .'</ul>';
     my $onchange = 'javascript:verifyDomain(this,this.form);';
     $msg .= '<form name="forgotpw" method="post" action="/adm/resetpw" onsubmit="return validInfo();">'.
             &Apache::lonhtmlcommon::start_pick_box().
-            &Apache::lonhtmlcommon::row_title($lt{'udom'}).
-            &Apache::loncommon::select_dom_form($defdom,'udom',undef,undef,$onchange).
+            &Apache::lonhtmlcommon::row_title('<label for="udom">'.$lt{'udom'}).'</label>').
+            &Apache::loncommon::select_dom_form($defdom,'udom',undef,undef,$onchange,'','','','udom').
             &Apache::lonhtmlcommon::row_closure(1).
-            &Apache::lonhtmlcommon::row_title($lt{'unam'}).
+            &Apache::lonhtmlcommon::row_title('<label for="uname">'.$lt{'unam'}.'</label>').
             '<input type="text" name="uname" size="20" autocapitalize="off" autocorrect="off" />'.
             &Apache::lonhtmlcommon::row_closure(1).
-            &Apache::lonhtmlcommon::row_title($lt{'uemail'}).
+            &Apache::lonhtmlcommon::row_title('<label for="useremail">'.$lt{'uemail'}.'</label>').
             '<input type="text" name="useremail" size="30" autocapitalize="off" autocorrect="off" />'.
             &Apache::lonhtmlcommon::row_closure(1);
     unless ($passwdconf->{'captcha'} eq 'notused') {
@@ -604,7 +606,7 @@ sub homeserver_redirect {
 }
 
 sub reset_passwd {
-    my ($r,$token,$contact_name,$contact_email,$passwdconf) = @_;
+    my ($r,$token,$contact_name,$contact_email,$clientip,$passwdconf) = @_;
     return unless (ref($passwdconf) eq 'HASH');
     my %data = &Apache::lonnet::tmpget($token);
     my $now = time;
@@ -625,7 +627,7 @@ sub reset_passwd {
         }
         my $reqtime = &Apache::lonlocal::locallocaltime($data{'time'});
         my ($blocked,$blocktext) =
-            &Apache::loncommon::blocking_status('passwd',$data{'username'},$data{'domain'});
+            &Apache::loncommon::blocking_status('passwd',$clientip,$data{'username'},$data{'domain'});
         if ($blocked) {
             $r->print('<p class="LC_warning">'.$blocktext.'</p>');
             return;