--- loncom/interface/lonpreferences.pm	2021/03/06 13:42:55	1.237
+++ loncom/interface/lonpreferences.pm	2021/11/30 15:55:37	1.239
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Preferences
 #
-# $Id: lonpreferences.pm,v 1.237 2021/03/06 13:42:55 raeburn Exp $
+# $Id: lonpreferences.pm,v 1.239 2021/11/30 15:55:37 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -638,10 +638,10 @@ sub icon_previews {
     my %inlinetools = (
         printout => "s&8&3&prt.png&$icon_text{'printout'}&printout[_1]&gopost('/adm/printout',currentURL)&".&mt('Prepare a printable document'),
         wishlist => "s&9&1&wishlist-link.png&$icon_text{'wishlist'}&wishlistlink[_2]&set_wishlistlink()&".&mt('Save a link for this resource in your personal Stored Links repository'),
-        evaluate => "s&8&1&eval.png&$icon_text{'evaluate'}&this[_1]&gopost('/adm/evaluate',currentURL,1)&".&mt(Provide my evaluation of this resource'),
+        evaluate => "s&8&1&eval.png&$icon_text{'evaluate'}&this[_1]&gopost('/adm/evaluate',currentURL,1)&".&mt('Provide my evaluation of this resource'),
         feedback => "s&8&2&fdbk.png&$icon_text{'feedback'}&discuss[_1]&gopost('/adm/feedback',currentURL,1)&".&mt('Provide feedback messages or contribute to the course discussion about this resource'),
         annotate => "s&9&3&anot.png&$icon_text{'annotate'}&tations[_1]&annotate()&".&mt('Make notes and annotations about this resource'),
-        catalog  => "s&6&3&catalog.png&$icon_text{'catalog'}&info[_1]&catalog_info()&".&mt('Show Metadata),
+        catalog  => "s&6&3&catalog.png&$icon_text{'catalog'}&info[_1]&catalog_info()&".&mt('Show Metadata'),
     );
     my @toolsorder = qw(annotate wishlist evaluate feedback printout catalog);
     return (\%inlinetools,\@toolsorder);
@@ -1265,7 +1265,8 @@ sub passwordchanger {
     # This function is a bit of a mess....
     # Passwords are encrypted using londes.js (DES encryption)
     $errormessage = ($errormessage || '');
-    my ($user,$domain,$currentpass);
+    my ($user,$domain,$currentpass,$clientip);
+    $clientip = &Apache::lonnet::get_requestor_ip($r);
     &Apache::lonhtmlcommon::add_breadcrumb(
 		{ href => '/adm/preferences?action=changepass',
                   text => 'Change Password'});
@@ -1280,7 +1281,7 @@ sub passwordchanger {
             $caller = 'preferences';
         }
         my ($blocked,$blocktext) =
-            &Apache::loncommon::blocking_status('passwd');
+            &Apache::loncommon::blocking_status('passwd',$clientip);
         if ($blocked) {
             $r->print('<p class="LC_warning">'.$blocktext.'</p>');
             return;
@@ -1302,7 +1303,7 @@ sub passwordchanger {
                 $domain = $data{'domain'};
                 $currentpass = $data{'temppasswd'};
                 my ($blocked,$blocktext) =
-                    &Apache::loncommon::blocking_status('passwd',$user,$domain);
+                    &Apache::loncommon::blocking_status('passwd',$clientip,$user,$domain);
                 if ($blocked) {
                     $r->print('<p class="LC_warning">'.$blocktext.'</p>');
                     return;
@@ -1623,7 +1624,7 @@ sub server_form {
 
 sub verify_and_change_password {
     my ($r,$caller,$mailtoken,$timelimit,$extrafields,$ended) = @_;
-    my ($user,$domain,$homeserver);
+    my ($user,$domain,$homeserver,$clientip);
     if ($caller eq 'reset_by_email') {
         $user       = $env{'form.uname'};
         $domain     = $env{'form.udom'};
@@ -1646,8 +1647,9 @@ sub verify_and_change_password {
         $domain     = $env{'user.domain'};
         $homeserver = $env{'user.home'};
     }
+    $clientip = &Apache::lonnet::get_requestor_ip($r);
     my ($blocked,$blocktext) =
-        &Apache::loncommon::blocking_status('passwd',$user,$domain);
+        &Apache::loncommon::blocking_status('passwd',$clientip,$user,$domain);
     if ($blocked) {
         $r->print('<p class="LC_warning">'.$blocktext.'</p>');
         if ($caller eq 'reset_by_email') {