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

Diff for /loncom/interface/resetpw.pm between versions 1.22.2.2 and 1.22.2.3

version 1.22.2.2, 2010/09/19 15:04:40 version 1.22.2.3, 2010/11/29 19:25:53
Line 69  sub handler { Line 69  sub handler {
     my $contact_email =  $r->dir_config('lonSupportEMail');      my $contact_email =  $r->dir_config('lonSupportEMail');
     my $server = $r->dir_config('lonHostID');      my $server = $r->dir_config('lonHostID');
     my $defdom = &Apache::lonnet::default_login_domain();      my $defdom = &Apache::lonnet::default_login_domain();
       my $handle = &Apache::lonnet::check_for_valid_session($r);
       my $lonidsdir=$r->dir_config('lonIDsDir');
       if ($handle ne '') {
           if ($handle=~/^publicuser\_/) {
               unlink($r->dir_config('lonIDsDir')."/$handle.id");
           } else {
               &Apache::lonnet::transfer_profile_to_env($lonidsdir,$handle);
           }
       }
     &Apache::lonacc::get_posted_cgi($r);      &Apache::lonacc::get_posted_cgi($r);
     &Apache::lonlocal::get_language_handle($r);      &Apache::lonlocal::get_language_handle($r);
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['token']);      &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['token']);
Line 79  sub handler { Line 88  sub handler {
     my $udom = $env{'form.udom'};      my $udom = $env{'form.udom'};
     my $token = $env{'form.token'};      my $token = $env{'form.token'};
     my $case_change;      my $case_change;
     my $start_page =      my $brcrum = [];
         &Apache::loncommon::start_page('Reset password','',      my $bread_crumbs_component = 'Forgotten Password';
                                            {      if ($token) {
                                              'no_inline_link'   => 1,});          push (@{$brcrum},
     $r->print($start_page);              {href => '/adm/resetpw',
                text => 'Update Password'});
   
           $bread_crumbs_component = 'Reset Password';
       } else {
           push (@{$brcrum},
               {href => '/adm/resetpw',
                text => 'Account Information'});
           if ($uname && $udom) {
               push (@{$brcrum},
                   {href => '/adm/resetpw',
                    text => 'Result'});
           }
       }
       my $args = {no_inline_link         => 1,
                   bread_crumbs           => $brcrum,
                   bread_crumbs_component => $bread_crumbs_component};
       $r->print(&Apache::loncommon::start_page('Reset password','',$args));
     $r->print('<h3>'.&mt('Reset forgotten LON-CAPA password').'</h3>');      $r->print('<h3>'.&mt('Reset forgotten LON-CAPA password').'</h3>');
     my $output;      my $output;
     if ($token) {      if ($token) {
Line 177  sub get_uname { Line 203  sub get_uname {
            .'<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 />';             .&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 />';
     $msg .= '      $msg .= '<form name="forgotpw" method="post" action="/adm/resetpw">'.
 <form name="forgotpw" method="post">              &Apache::lonhtmlcommon::start_pick_box().
 <table>              &Apache::lonhtmlcommon::row_title('LON-CAPA '.$lt{'unam'}).
  <tr>              '<input type="text" name="uname" size="30" />'.
   <td align="left">'.$lt{'unam'}.':</td>              '<input type="hidden" name="udom" value="'.$defdom.'" />'.
   <td><input type="text" name="uname" size="30" />              &Apache::lonhtmlcommon::row_closure(1).
       <input type="hidden" name="udom" value="'.$defdom.'" /></td>              &Apache::lonhtmlcommon::row_title($lt{'uemail'}).
  </tr>              '<input type="text" name="useremail" size="30" />'.
  <tr>              &Apache::lonhtmlcommon::end_pick_box().
   <td align="left">'.$lt{'uemail'}.':</td>              '<br /><br /><input type="submit" name="resetter" value="'.$lt{'proc'}.'" /></form>'."\n";
   <td><input type="text" name="useremail" size="30" /></td>  
  </tr>  
  <tr><td colspan="2" align="left"><br />  
     <input type="submit" value="'.$lt{'proc'}.'" /></td>  
  </tr>  
 </table>  
 </form>'."\n";  
     return $msg;      return $msg;
 }  }
   
Line 216  sub send_token { Line 235  sub send_token {
         my $esc_token = &escape($token);          my $esc_token = &escape($token);
         my $showtime = &Apache::lonlocal::locallocaltime(time);          my $showtime = &Apache::lonlocal::locallocaltime(time);
         my $reseturl = &Apache::lonnet::absolute_url().'/adm/resetpw?token='.$esc_token;          my $reseturl = &Apache::lonnet::absolute_url().'/adm/resetpw?token='.$esc_token;
         my $mailmsg = &mt('A request was submitted on [_1] for reset of the password for your LON-CAPA account.',$showtime).' '.&mt('To complete this process please open a web browser and enter the following URL in the address/location box: [_1]',$reseturl);          my $mailmsg = &mt('A request was submitted on [_1] for reset of the password for your LON-CAPA account.',$showtime)." \n".&mt('To complete this process please open a web browser and enter the following URL in the address/location box: [_1]',"\n\n".$reseturl);
         my $result = &send_mail($domdesc,$email,$mailmsg,$contact_name,          my $result = &send_mail($domdesc,$email,$mailmsg,$contact_name,
                                 $contact_email);                                  $contact_email);
         if ($result eq 'ok') {          if ($result eq 'ok') {
Line 253  sub invalid_state { Line 272  sub invalid_state {
     my ($error,$domdesc,$contact_name,$contact_email) = @_;      my ($error,$domdesc,$contact_name,$contact_email) = @_;
     my $msg;      my $msg;
     if ($error eq 'invalid') {      if ($error eq 'invalid') {
         $msg = &mt('The username you provided was not verified as a valid username in the LON-CAPA system for the [_1] domain.',$domdesc)          $msg = '<p class="LC_warning">'.&mt('The username you provided was not verified as a valid username in the LON-CAPA system for the [_1] domain.',$domdesc)
               .' '.&mt('Please [_1]go back[_2] and try again.','<a href="javascript:history.go(-1)"><u>','</u></a>');                .'</p>'.&mt('Please [_1]go back[_2] and try again.','<a href="javascript:history.go(-1)"><u>','</u></a>');
     } else {      } else {
         if ($error eq 'baduseremail') {          if ($error eq 'baduseremail') {
             $msg = &mt('The e-mail address you provided does not appear to be a valid address.');              $msg = &mt('The e-mail address you provided does not appear to be a valid address.');
Line 265  sub invalid_state { Line 284  sub invalid_state {
         } elsif ($error eq 'authentication') {          } elsif ($error eq 'authentication') {
             $msg = &mt('The username you provided uses an authentication type which can not be reset directly via LON-CAPA.');              $msg = &mt('The username you provided uses an authentication type which can not be reset directly via LON-CAPA.');
         }          }
           $msg = '<p class="LC_warning">'.$msg.'</p>';
         if ($contact_email ne '') {          if ($contact_email ne '') {
             my $escuri = &HTML::Entities::encode('/adm/resetpw','&<>"');              my $escuri = &HTML::Entities::encode('/adm/resetpw','&<>"');
             $msg .= '<br /> '.&mt('You may wish to contact the [_1]LON-CAPA helpdesk[_2] for the [_3] domain.'              $msg .= '<br /> '.&mt('You may wish to contact the [_1]LON-CAPA helpdesk[_2] for the [_3] domain.'
Removed from v.1.22.2.2  
changed lines
  Added in v.1.22.2.3

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