Diff for /loncom/interface/resetpw.pm between versions 1.22.2.4 and 1.22.2.5

version 1.22.2.4, 2010/12/01 23:15:47 version 1.22.2.5, 2010/12/06 02:40:45
Line 204  sub get_uname { Line 204  sub get_uname {
         $value{'uname'} = $uname;          $value{'uname'} = $uname;
         $value{'useremail'} = $useremail;          $value{'useremail'} = $useremail;
     }      }
       my $inventory = uc($defdom);
     my $msg = '<br />'.&mt('To be able to reset a forgotten password:')      my $msg = '<br />'.&mt('To be able to reset a forgotten password:')
            .'<ul><li>'.&mt('An e-mail address must have previously been associated with your LON-CAPA username.').'</li>'             .'<ul><li>'.&mt('An e-mail address must have previously been associated with your LON-CAPA username.').'</li>'
            .'<li>'.&mt('You must be able to access e-mail sent to the e-mail address associated with your WebCenter account.').'</li></ul><br />'             .'<li>'.&mt('You must be able to access e-mail sent to the e-mail address associated with your WebCenter account.').'</li></ul><br />'
            .&mt('In most cases the GCI WebCenter username is the same as your e-mail address, in which case you will enter the same information twice. ').'<br /><br />';             .&mt('In most cases the [_1] WebCenter username is the same as your e-mail address, in which case you will enter the same information twice.',$inventory).'<br /><br />';
     $msg .= '<form name="forgotpw" method="post" action="/adm/resetpw">'.      $msg .= '<form name="forgotpw" method="post" action="/adm/resetpw">'.
             &Apache::lonhtmlcommon::start_pick_box().              &Apache::lonhtmlcommon::start_pick_box().
             &Apache::lonhtmlcommon::row_title($lt{'unam'}).              &Apache::lonhtmlcommon::row_title($lt{'unam'}).
Line 317  sub reset_passwd { Line 318  sub reset_passwd {
         ($data{'email'}  =~ /^[^\@]+\@[^\@]+\.[^\@\.]+$/) &&           ($data{'email'}  =~ /^[^\@]+\@[^\@]+\.[^\@\.]+$/) && 
         ($data{'temppasswd'} =~/^\w+$/)) {          ($data{'temppasswd'} =~/^\w+$/)) {
         my $reqtime = &Apache::lonlocal::locallocaltime($data{'time'});          my $reqtime = &Apache::lonlocal::locallocaltime($data{'time'});
           my $inventory = uc($data{'domain'});
         if ($now - $data{'time'} < 7200) {          if ($now - $data{'time'} < 7200) {
             if ($env{'form.action'} eq 'verify_and_change_pass') {              if ($env{'form.action'} eq 'verify_and_change_pass') {
                 my $homeserver = &Apache::lonnet::homeserver($env{'form.uname'},$env{'form.udom'});                  my $homeserver = &Apache::lonnet::homeserver($env{'form.uname'},$env{'form.udom'});
Line 375  sub reset_passwd { Line 377  sub reset_passwd {
             } else {              } else {
                 $r->print(&mt('The token included in an e-mail sent to you [_1] has been verified, so you may now proceed to reset the password for your LON-CAPA account.',$reqtime).'<br />'.                  $r->print(&mt('The token included in an e-mail sent to you [_1] has been verified, so you may now proceed to reset the password for your LON-CAPA account.',$reqtime).'<br />'.
                           '<p>'.&mt('Please enter the username and domain of the LON-CAPA account, and the associated e-mail address, for which you are setting a password.').'<br />'.                            '<p>'.&mt('Please enter the username and domain of the LON-CAPA account, and the associated e-mail address, for which you are setting a password.').'<br />'.
                           &mt('In most cases the GCI WebCenter username is the same as your e-mail address, in which case you will enter the same information twice.').'</p>'.                            &mt('In most cases the [_1] WebCenter username is the same as your e-mail address, in which case you will enter the same information twice.',$inventory).'</p>'.
                           '<p>'.&mt('The new password must contain at least 7 characters.').' '.                            '<p>'.&mt('The new password must contain at least 7 characters.').' '.
                           &mt('Your new password will be sent to the LON-CAPA server in an encrypted form.').'<br /></p>');                            &mt('Your new password will be sent to the LON-CAPA server in an encrypted form.').'<br /></p>');
                 &Apache::lonpreferences::passwordchanger($r,'','reset_by_email',$token);                  &Apache::lonpreferences::passwordchanger($r,'','reset_by_email',$token);

Removed from v.1.22.2.4  
changed lines
  Added in v.1.22.2.5


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