[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.15 and 1.196.4.17

version 1.196.4.15, 2014/06/09 22:39:01 version 1.196.4.17, 2016/01/27 01:43:01
Line 789  sub lockwarning { Line 789  sub lockwarning {
     my $textbottom=&mt('Changing roles or logging out may result in data corruption.');      my $textbottom=&mt('Changing roles or logging out may result in data corruption.');
     my ($num,%which)=&Apache::lonnet::get_locks();      my ($num,%which)=&Apache::lonnet::get_locks();
     my $which='';      my $which='';
     foreach my $id (keys %which) {      foreach my $id (keys(%which)) {
        $which.='<li>'.$which{$id}.'</li>';         $which.='<li>'.$which{$id}.'</li>';
     }      }
     my $change=&mt('Override');      my $change=&mt('Override');
Line 1220  sub verify_and_change_colors { Line 1220  sub verify_and_change_colors {
     );      );
   
     my $message='';      my $message='';
     foreach my $item (keys %colortypes) {      foreach my $item (keys(%colortypes)) {
         my $color=$env{'form.'.$item};          my $color=$env{'form.'.$item};
         if (!($color =~ /^#/)) {          if (!($color =~ /^#/)) {
             $color = '#' . $color;              $color = '#' . $color;
Line 1263  sub passwordchanger { Line 1263  sub passwordchanger {
         $r->print(Apache::loncommon::start_page('Personal Data'));          $r->print(Apache::loncommon::start_page('Personal Data'));
         $r->print(Apache::lonhtmlcommon::breadcrumbs('Change Password'));          $r->print(Apache::lonhtmlcommon::breadcrumbs('Change Password'));
     }      }
       my ($blocked,$blocktext) =
           &Apache::loncommon::blocking_status('passwd');
       if ($blocked) {
           $r->print('<p class="LC_warning">'.$blocktext.'</p>');
           return;
       }
     if ((!defined($caller)) || ($caller eq 'preferences')) {      if ((!defined($caller)) || ($caller eq 'preferences')) {
         $user = $env{'user.name'};          $user = $env{'user.name'};
         $domain = $env{'user.domain'};          $domain = $env{'user.domain'};
Line 1491  sub server_form { Line 1497  sub server_form {
 sub verify_and_change_password {  sub verify_and_change_password {
     my ($r,$caller,$mailtoken) = @_;      my ($r,$caller,$mailtoken) = @_;
     my ($user,$domain,$homeserver);      my ($user,$domain,$homeserver);
       my ($blocked,$blocktext) =
           &Apache::loncommon::blocking_status('passwd');
       if ($blocked) {
           $r->print('<p class="LC_warning">'.$blocktext.'</p>');
           return;
       }
     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'};
Removed from v.1.196.4.15  
changed lines
  Added in v.1.196.4.17

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