Diff for /loncom/interface/lonpreferences.pm between versions 1.238 and 1.239

version 1.238, 2021/03/06 19:44:12 version 1.239, 2021/11/30 15:55:37
Line 1265  sub passwordchanger { Line 1265  sub passwordchanger {
     # This function is a bit of a mess....      # This function is a bit of a mess....
     # Passwords are encrypted using londes.js (DES encryption)      # Passwords are encrypted using londes.js (DES encryption)
     $errormessage = ($errormessage || '');      $errormessage = ($errormessage || '');
     my ($user,$domain,$currentpass);      my ($user,$domain,$currentpass,$clientip);
       $clientip = &Apache::lonnet::get_requestor_ip($r);
     &Apache::lonhtmlcommon::add_breadcrumb(      &Apache::lonhtmlcommon::add_breadcrumb(
  { href => '/adm/preferences?action=changepass',   { href => '/adm/preferences?action=changepass',
                   text => 'Change Password'});                    text => 'Change Password'});
Line 1280  sub passwordchanger { Line 1281  sub passwordchanger {
             $caller = 'preferences';              $caller = 'preferences';
         }          }
         my ($blocked,$blocktext) =          my ($blocked,$blocktext) =
             &Apache::loncommon::blocking_status('passwd');              &Apache::loncommon::blocking_status('passwd',$clientip);
         if ($blocked) {          if ($blocked) {
             $r->print('<p class="LC_warning">'.$blocktext.'</p>');              $r->print('<p class="LC_warning">'.$blocktext.'</p>');
             return;              return;
Line 1302  sub passwordchanger { Line 1303  sub passwordchanger {
                 $domain = $data{'domain'};                  $domain = $data{'domain'};
                 $currentpass = $data{'temppasswd'};                  $currentpass = $data{'temppasswd'};
                 my ($blocked,$blocktext) =                  my ($blocked,$blocktext) =
                     &Apache::loncommon::blocking_status('passwd',$user,$domain);                      &Apache::loncommon::blocking_status('passwd',$clientip,$user,$domain);
                 if ($blocked) {                  if ($blocked) {
                     $r->print('<p class="LC_warning">'.$blocktext.'</p>');                      $r->print('<p class="LC_warning">'.$blocktext.'</p>');
                     return;                      return;
Line 1623  sub server_form { Line 1624  sub server_form {
   
 sub verify_and_change_password {  sub verify_and_change_password {
     my ($r,$caller,$mailtoken,$timelimit,$extrafields,$ended) = @_;      my ($r,$caller,$mailtoken,$timelimit,$extrafields,$ended) = @_;
     my ($user,$domain,$homeserver);      my ($user,$domain,$homeserver,$clientip);
     if ($caller eq 'reset_by_email') {      if ($caller eq 'reset_by_email') {
         $user       = $env{'form.uname'};          $user       = $env{'form.uname'};
         $domain     = $env{'form.udom'};          $domain     = $env{'form.udom'};
Line 1646  sub verify_and_change_password { Line 1647  sub verify_and_change_password {
         $domain     = $env{'user.domain'};          $domain     = $env{'user.domain'};
         $homeserver = $env{'user.home'};          $homeserver = $env{'user.home'};
     }      }
       $clientip = &Apache::lonnet::get_requestor_ip($r);
     my ($blocked,$blocktext) =      my ($blocked,$blocktext) =
         &Apache::loncommon::blocking_status('passwd',$user,$domain);          &Apache::loncommon::blocking_status('passwd',$clientip,$user,$domain);
     if ($blocked) {      if ($blocked) {
         $r->print('<p class="LC_warning">'.$blocktext.'</p>');          $r->print('<p class="LC_warning">'.$blocktext.'</p>');
         if ($caller eq 'reset_by_email') {          if ($caller eq 'reset_by_email') {

Removed from v.1.238  
changed lines
  Added in v.1.239


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>