[BACK]Return to lonpreferences.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonpreferences.pm between versions 1.196.4.26 and 1.196.4.28

version 1.196.4.26, 2020/02/09 05:36:27 version 1.196.4.28, 2021/12/14 00:30:54
Line 627  sub icon_options { Line 627  sub icon_options {
 }  }
   
 sub icon_previews {  sub icon_previews {
      my %icon_text = (       my %icon_text = &Apache::lonlocal::texthash (
                       annotate => 'Notes',                        annotate => 'Notes',
                       wishlist => 'Stored Links',                        wishlist => 'Stored Links',
                       catalog  => 'Info',                        catalog  => 'Info',
Line 636  sub icon_previews { Line 636  sub icon_previews {
                       printout => 'Print',                        printout => 'Print',
                      );                       );
     my %inlinetools = (      my %inlinetools = (
         printout => "s&8&3&prt.png&$icon_text{'printout'}&printout[_1]&gopost('/adm/printout',currentURL)&Prepare a printable document",          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()&Save a link for this resource in your personal Stored Links repository",          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)&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)&Provide feedback messages or contribute to the course discussion about 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()&Make notes and annotations 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()&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);      my @toolsorder = qw(annotate wishlist evaluate feedback printout catalog);
     return (\%inlinetools,\@toolsorder);      return (\%inlinetools,\@toolsorder);
Line 1230  sub passwordchanger { Line 1230  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 1245  sub passwordchanger { Line 1246  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 1267  sub passwordchanger { Line 1268  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 1588  sub server_form { Line 1589  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 1611  sub verify_and_change_password { Line 1612  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.196.4.26  
changed lines
  Added in v.1.196.4.28

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