Diff for /loncom/interface/resetpw.pm between versions 1.23.2.2 and 1.23.2.2.2.2

version 1.23.2.2, 2010/12/24 21:21:51 version 1.23.2.2.2.2, 2012/02/14 00:34:48
Line 80  sub handler { Line 80  sub handler {
     }      }
     &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 = &unescape($env{'form.uname'});      my $uname = $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 $brcrum = [];      my $brcrum = [];
     my $bread_crumbs_component = 'Forgotten Password';      my $bread_crumbs_component = 'Forgotten Password';
     if ($token) {      if ($token) {
Line 112  sub handler { Line 115  sub handler {
     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) {      } elsif ($uname && $udom && ($env{'form.referrer'} ne 'createaccount')) {
         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 135  sub handler { Line 149  sub handler {
                     }                      }
                     foreach my $item (@items) {                      foreach my $item (@items) {
                         if ($item =~ /^[^\@]+\@[^\@]+\.[^\@\.]+$/) {                          if ($item =~ /^[^\@]+\@[^\@]+\.[^\@\.]+$/) {
                             unless(grep(/^\Q$item\E$/,@allemails)) {                               if ($case_change) {
                                 push(@allemails,$item);                                  my $lcitem = lc($item);
                                   unless(grep(/^\Q$lcitem\E$/,@allemails)) {
                                       push(@allemails,$lcitem);
                                   }
                               } else {
                                   unless(grep(/^\Q$item\E$/,@allemails)) { 
                                       push(@allemails,$item);
                                   }
                             }                              }
                         }                          }
                     }                      }
Line 164  sub handler { Line 185  sub handler {
                                      $contact_name,$contact_email);                                       $contact_name,$contact_email);
         }          }
     } else {      } else {
         $output = &get_uname($defdom);          $output = &get_uname($defdom,$uname,$useremail);
     }      }
     $r->print($output);      $r->print($output);
     $r->print(&Apache::loncommon::end_page());      $r->print(&Apache::loncommon::end_page());
Line 172  sub handler { Line 193  sub handler {
 }  }
   
 sub get_uname {  sub get_uname {
     my ($defdom) = @_;      my ($defdom,$uname,$useremail) = @_;
     my %lt = &Apache::lonlocal::texthash(      my %lt = &Apache::lonlocal::texthash(
                                          unam => 'username',                                           unam => 'username',
                                          udom => 'domain',                                           udom => 'domain',
                                          uemail => 'E-mail address in LON-CAPA',                                           uemail => 'E-mail address in LON-CAPA',
                                          proc => 'Proceed');                                           proc => 'Proceed');
       my %value;
     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.');      if ($env{'form.referrer'} eq 'createaccount') {
     $msg .= '<br /><br />'.&mt('Three conditions must be met:')          $value{'uname'} = $uname;
            .'<ul><li>'.&mt('An e-mail address must have previously been associated with your LON-CAPA username.').'</li>'          $value{'useremail'} = $useremail;
            .'<li>'.&mt('You must be able to access e-mail sent to that address.').'</li>'      }
            .'<li>'.&mt('Your LON-CAPA account must be of a type for which LON-CAPA can reset a password.')      if ($env{'form.referrer'} eq 'createaccount') {
            .'</ul>';          $value{'uname'} = $uname;
           $value{'useremail'} = $useremail;
       }
       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 [_1] username.','Mechanics Online').'</li>'
              .'<li>'.&mt('You must be able to access e-mail sent to the e-mail address associated with your [_1] account.','Mechanics Online').'</li></ul><br />'
              .&mt('In most cases the [_1] username is the same as your e-mail address, in which case you will enter the same information twice.','Mechanics Online').'<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('LON-CAPA '.$lt{'unam'}).              &Apache::lonhtmlcommon::row_title('Mechanics Online '.$lt{'unam'}).
             '<input type="text" name="uname" size="20" />'.              '<input type="text" name="uname" size="30" value="'.$value{'uname'}.'" />'.
             &Apache::lonhtmlcommon::row_closure(1).              '<input type="hidden" name="udom" value="'.$defdom.'" />'.
             &Apache::lonhtmlcommon::row_title('LON-CAPA '.$lt{'udom'}).  
             &Apache::loncommon::select_dom_form($defdom,'udom').  
             &Apache::lonhtmlcommon::row_closure(1).              &Apache::lonhtmlcommon::row_closure(1).
             &Apache::lonhtmlcommon::row_title($lt{'uemail'}).              &Apache::lonhtmlcommon::row_title($lt{'uemail'}).
             '<input type="text" name="useremail" size="30" />'.              '<input type="text" name="useremail" size="30" value="'.$value{'useremail'}.'" />'.
             &Apache::lonhtmlcommon::end_pick_box().              &Apache::lonhtmlcommon::end_pick_box().
             '<br /><br /><input type="submit" name="resetter" value="'.$lt{'proc'}.'" /></form>';              '<br /><br /><input type="submit" name="resetter" value="'.$lt{'proc'}.'" /></form>'."\n";
     return $msg;      return $msg;
 }  }
   
Line 223  sub send_token { Line 248  sub send_token {
         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 />The link included in the message will be valid for the next <b>two</b> hours.");              $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>');
         } 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);
         }          }
Line 299  sub reset_passwd { Line 324  sub reset_passwd {
         my $reqtime = &Apache::lonlocal::locallocaltime($data{'time'});          my $reqtime = &Apache::lonlocal::locallocaltime($data{'time'});
         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 340  sub reset_passwd { Line 378  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 /><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 />'.
                 $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 />');                            '<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 [_1] username is the same as your e-mail address, in which case you will enter the same information twice.','Mechanics Online').'</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.23.2.2  
changed lines
  Added in v.1.23.2.2.2.2


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