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

Diff for /loncom/interface/lonpreferences.pm between versions 1.143 and 1.144

version 1.143, 2009/02/19 16:12:21 version 1.144, 2009/02/23 20:25:44
Line 1215  sub passwordchanger { Line 1215  sub passwordchanger {
     Apache::lonhtmlcommon::add_breadcrumb(      Apache::lonhtmlcommon::add_breadcrumb(
  { href => '/adm/preferences?action=changepass',   { href => '/adm/preferences?action=changepass',
                   text => 'Change Password'});                    text => 'Change Password'});
     $r->print(Apache::loncommon::start_page('Change Password'));      unless ($caller eq 'reset_by_email') {
     $r->print(Apache::lonhtmlcommon::breadcrumbs('Change Password'));          $r->print(Apache::loncommon::start_page('Change Password'));
           $r->print(Apache::lonhtmlcommon::breadcrumbs('Change Password'));
       }
     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 1552  ENDERROR Line 1554  ENDERROR
     # Inform the user the password has (not?) been changed      # Inform the user the password has (not?) been changed
     my $message;      my $message;
     if ($result =~ /^ok$/) {      if ($result =~ /^ok$/) {
         $message = &mt('The password for [_1] was successfully changed',$user);          $message = &mt('The password for [_1] was successfully changed.',$user);
         print_main_menu($r, $message);          if ($caller eq 'reset_by_email') {
               $r->print($message.'<br />');
           } else {
               &print_main_menu($r, $message);
           }
 # $r->print("<h3>".&mt('The password for [_1] was successfully changed',$user)."</h3>");  # $r->print("<h3>".&mt('The password for [_1] was successfully changed',$user)."</h3>");
     } else {      } else {
  # error error: run in circles, scream and shout   # error error: run in circles, scream and shout
         $message = &mt("The password for [_1] was not changed",$user)          $message = &mt("The password for [_1] was not changed.",$user).' '.
  .&mt('Please make sure your old password was entered correctly.');   .&mt('Please make sure your old password was entered correctly.');
         print_main_menu($r, $message);          unless ($caller eq 'reset_by_email') {
               &print_main_menu($r, $message);
           }
 #        $r->print("<h3><span class='LC_error'>".&mt("The password for [_1] was not changed",$user)."</span></h3>".  #        $r->print("<h3><span class='LC_error'>".&mt("The password for [_1] was not changed",$user)."</span></h3>".
 #                  &mt('Please make sure your old password was entered correctly.'));  #                  &mt('Please make sure your old password was entered correctly.'));
         return 1;          return 1;
Removed from v.1.143  
changed lines
  Added in v.1.144

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