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

version 1.22.2.5, 2010/12/06 02:40:45 version 1.23, 2010/02/19 15:41:40
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']);
                                             'uname','useremail','referrer']);  
           
     my @emailtypes = ('permanentemail','critnotification','notification');      my @emailtypes = ('permanentemail','critnotification','notification');
     my $uname = $env{'form.uname'};      my $uname = &unescape($env{'form.uname'});
     my $useremail = $env{'form.useremail'};  
     my $udom = $env{'form.udom'};      my $udom = $env{'form.udom'};
     my $token = $env{'form.token'};      my $token = $env{'form.token'};
     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) {
         $output = &reset_passwd($r,$token,$contact_name,$contact_email);          $output = &reset_passwd($r,$token,$contact_name,$contact_email);
     } elsif ($uname && $udom && ($env{'form.referrer'} ne 'createaccount')) {      } elsif ($uname && $udom) {
         my $domdesc = &Apache::lonnet::domain($udom,'description');          my $domdesc = &Apache::lonnet::domain($udom,'description');
         my $homeserver = &Apache::lonnet::homeserver($uname,$udom);  
         if ($homeserver eq 'no_host') {  
             my $lc_uname =  lc($uname);  
             if ($lc_uname ne $uname) {  
                 $homeserver = &Apache::lonnet::homeserver($lc_uname,$udom);  
                 unless ($homeserver eq 'no_host') {  
                     $uname = $lc_uname;  
                     $useremail = lc($env{'form.useremail'});  
                     $case_change = 1;  
                 }  
             }  
         }  
         my $authtype = &Apache::lonnet::queryauthenticate($uname,$udom);          my $authtype = &Apache::lonnet::queryauthenticate($uname,$udom);
         if ($authtype =~ /^internal/) {          if ($authtype =~ /^internal/) {
               my $useremail = $env{'form.useremail'};
             if ($useremail !~ /^[^\@]+\@[^\@]+\.[^\@\.]+$/) {              if ($useremail !~ /^[^\@]+\@[^\@]+\.[^\@\.]+$/) {
                 $output = &invalid_state('baduseremail',$domdesc,                  $output = &invalid_state('baduseremail',$domdesc,
                                          $contact_name,$contact_email);                                           $contact_name,$contact_email);
Line 149  sub handler { Line 109  sub handler {
                     }                      }
                     foreach my $item (@items) {                      foreach my $item (@items) {
                         if ($item =~ /^[^\@]+\@[^\@]+\.[^\@\.]+$/) {                          if ($item =~ /^[^\@]+\@[^\@]+\.[^\@\.]+$/) {
                             if ($case_change) {                              unless(grep(/^\Q$item\E$/,@allemails)) { 
                                 my $lcitem = lc($item);                                  push(@allemails,$item);
                                 unless(grep(/^\Q$lcitem\E$/,@allemails)) {  
                                     push(@allemails,$lcitem);  
                                 }  
                             } else {  
                                 unless(grep(/^\Q$item\E$/,@allemails)) {   
                                     push(@allemails,$item);  
                                 }  
                             }                              }
                         }                          }
                     }                      }
Line 185  sub handler { Line 138  sub handler {
                                      $contact_name,$contact_email);                                       $contact_name,$contact_email);
         }          }
     } else {      } else {
         $output = &get_uname($defdom,$uname,$useremail);          $output = &get_uname($defdom);
     }      }
     $r->print($output);      $r->print($output);
     $r->print(&Apache::loncommon::end_page());      $r->print(&Apache::loncommon::end_page());
Line 193  sub handler { Line 146  sub handler {
 }  }
   
 sub get_uname {  sub get_uname {
     my ($defdom,$uname,$useremail) = @_;      my ($defdom) = @_;
     my %lt = &Apache::lonlocal::texthash(      my %lt = &Apache::lonlocal::texthash(
                                          unam => 'LON-CAPA username',                                           unam => 'username',
                                          udom => 'LON-CAPA domain',                                           udom => 'domain',
                                          uemail => 'E-mail address in LON-CAPA',                                           uemail => 'E-mail address in LON-CAPA',
                                          proc => 'Proceed');                                           proc => 'Proceed');
     my %value;  
     if ($env{'form.referrer'} eq 'createaccount') {      my $msg = &mt('If you use the same account for other campus services besides LON-CAPA, (e.g., e-mail, course registration, etc.), a separate centrally managed mechanism likely exists to reset a password. However, if your account is used for just LON-CAPA access you will probably be able to reset a password from this page.');
         $value{'uname'} = $uname;      $msg .= '<br /><br />'.&mt('Three conditions must be met:')
         $value{'useremail'} = $useremail;  
     }  
     my $inventory = uc($defdom);  
     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 that address.').'</li>'
            .&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 />';             .'<li>'.&mt('Your LON-CAPA account must be of a type for which LON-CAPA can reset a password.')
     $msg .= '<form name="forgotpw" method="post" action="/adm/resetpw">'.             .'</ul>';
             &Apache::lonhtmlcommon::start_pick_box().      $msg .= qq|
             &Apache::lonhtmlcommon::row_title($lt{'unam'}).  <form name="forgotpw" method="post">
             '<input type="text" name="uname" size="30" value="'.$value{'uname'}.'" />'.  <table>
             '<input type="hidden" name="udom" value="'.$defdom.'" />'.  <tr><td>
             &Apache::lonhtmlcommon::row_closure(1).  <tr><td align="left">LON-CAPA $lt{'unam'}:                      </td>
             &Apache::lonhtmlcommon::row_title($lt{'uemail'}).      <td><input type="text" name="uname" size="15" /></td></tr>
             '<input type="text" name="useremail" size="30" value="'.$value{'useremail'}.'" />'.  <tr><td align="left">LON-CAPA $lt{'udom'}:                      </td>
             &Apache::lonhtmlcommon::end_pick_box().      <td>|;
             '<br /><br /><input type="submit" name="resetter" value="'.$lt{'proc'}.'" /></form>'."\n";      $msg .= &Apache::loncommon::select_dom_form($defdom,'udom');
       $msg .= qq|</td></tr>
   <tr><td align="left">$lt{'uemail'}:                             </td>
       <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>
   |;
     return $msg;      return $msg;
 }  }
   
Line 241  sub send_token { Line 198  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)." \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 $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 $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') {
             $msg .= &mt('An e-mail sent to the e-mail address associated with your LON-CAPA account includes the web address for the link you should use to complete the reset process.').'<br /><br />'.&mt('The link included in the message will be valid for the next [_1]two[_2] hours.','<b>','</b>');              $msg .= &mt("An e-mail sent to the e-mail address associated with your LON-CAPA account includes the web address for the link you should use to complete the reset process.<br /><br />The link included in the message will be valid for the next <b>two</b> hours.");
         } else {          } else {
             $msg .= &mt('An error occurred when sending a message to the e-mail address associated with your LON-CAPA account. Please contact the [_1] ([_2]) for assistance.',$contact_name,$contact_email);              $msg .= &mt("An error occurred when sending a message to the e-mail address associated with your LON-CAPA account. Please contact the [_1] ([_2]) for assistance.",$contact_name,$contact_email);
         }          }
     } else {      } else {
         $msg .= &mt('An error occurred creating a token required for the password reset process. Please contact the [_1] ([_2]) for assistance.',$contact_name,$contact_email);          $msg .= &mt("An error occurred creating a token required for the password reset process. Please contact the [_1] ([_2]) for assistance.",$contact_name,$contact_email);
     }      }
     return $msg;      return $msg;
 }  }
Line 278  sub invalid_state { Line 235  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 = '<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)          $msg = &mt('The username you provided was not verified as a valid username in the LON-CAPA system for the [_1] domain.',$domdesc)
               .'</p>'.&mt('Please [_1]go back[_2] and try again.','<a href="javascript:history.go(-1)"><u>','</u></a>');                .' '.&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 290  sub invalid_state { Line 247  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.'
Line 318  sub reset_passwd { Line 274  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'});  
                 if ($homeserver eq 'no_host') {  
                     my $lc_uname =  lc($env{'form.uname'});  
                     if ($lc_uname ne $env{'form.uname'}) {  
                         $homeserver = &Apache::lonnet::homeserver($lc_uname,$env{'form.udom'});  
                         unless ($homeserver eq 'no_host') {  
                             if ($env{'form.uname'} eq $env{'form.email'}) {  
                                 $env{'form.email'} = $lc_uname;  
                             }  
                             $env{'form.uname'} = $lc_uname;  
                         }  
                     }  
                 }  
                 unless (($env{'form.uname'} eq $data{'username'}) && ($env{'form.udom'} eq $data{'domain'}) && ($env{'form.email'} eq $data{'email'})) {                  unless (($env{'form.uname'} eq $data{'username'}) && ($env{'form.udom'} eq $data{'domain'}) && ($env{'form.email'} eq $data{'email'})) {
                     $msg = &generic_failure_msg($contact_name,$contact_email);                      $msg = &generic_failure_msg($contact_name,$contact_email);
                     return $msg;                      return $msg;
Line 375  sub reset_passwd { Line 317  sub reset_passwd {
                     $msg .= &generic_failure_msg($contact_name,$contact_email);                      $msg .= &generic_failure_msg($contact_name,$contact_email);
                 }                  }
             } 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 /><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 />'.                  $r->print(&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. 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 />');
                           &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.').' '.  
                           &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);
             }              }
         } else {          } else {

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


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