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

Diff for /loncom/interface/resetpw.pm between versions 1.14 and 1.18

version 1.14, 2009/02/13 17:20:29 version 1.18, 2009/09/30 21:47:07
Line 76  sub handler { Line 76  sub handler {
                 my %userinfo =                   my %userinfo = 
     &Apache::lonnet::get('environment',\@emailtypes,      &Apache::lonnet::get('environment',\@emailtypes,
  $udom,$uname);   $udom,$uname);
                 my $email = '';                  my @allemails;
                 my $emailtarget;  
                 foreach my $type (@emailtypes) {                  foreach my $type (@emailtypes) {
                     $email = $userinfo{$type};                      my $email = $userinfo{$type};
                     if ($email =~ /[^\@]+\@[^\@]+/) {                      my @items;
                         $emailtarget = $type;                       if ($email =~ /,/) {
                         last;                          @items = split(',',$userinfo{$type});
                       } else {
                           @items = ($email);
                       }
                       foreach my $item (@items) {
                           if ($item =~ /^[^\@]+\@[^\@]+\.[^\@\.]+$/) {
                               unless(grep(/^\Q$item\E$/,@allemails)) { 
                                   push(@allemails,$item);
                               }
                           }
                     }                      }
                 }                  }
                 if ($email =~ /^[^\@]+\@[^\@]+\.[^\@\.]+$/) {                  if (@allemails > 0) {
                     if ($useremail eq $email) {                      if (grep(/^\Q$useremail\E$/,@allemails)) {
                         $output = &send_token($uname,$udom,$email,$server,                          $output = &send_token($uname,$udom,$useremail,$server,
                                               $domdesc,$contact_name,                                                $domdesc,$contact_name,
                                               $contact_email);                                                $contact_email);
                     } else {                      } else {
Line 134  sub get_uname { Line 142  sub get_uname {
 <table>  <table>
 <tr><td>  <tr><td>
 <tr><td align="left">LON-CAPA $lt{'unam'}:                      </td>  <tr><td align="left">LON-CAPA $lt{'unam'}:                      </td>
     <td><input type="text" name="uname" size="15"  /> </td></tr>      <td><input type="text" name="uname" size="15" /></td></tr>
 <tr><td align="left">LON-CAPA $lt{'udom'}:                      </td>  <tr><td align="left">LON-CAPA $lt{'udom'}:                      </td>
     <td>|;      <td>|;
     $msg .= &Apache::loncommon::select_dom_form($defdom,'udom');      $msg .= &Apache::loncommon::select_dom_form($defdom,'udom');
     $msg .= qq|</td></tr>      $msg .= qq|</td></tr>
 <tr><td align="left">$lt{'uemail'}:                             </td>  <tr><td align="left">$lt{'uemail'}:                             </td>
     <td><input type="text" name="useremail" size="30"  /></td></tr>      <td><input type="text" name="useremail" size="30" /></td></tr>
 <tr><td colspan="2" align="left"><br />  <tr><td colspan="2" align="left"><br />
     <input type="button" value="$lt{'proc'}" onClick="document.forgotpw.submit()"></td></tr>      <input type="submit" value="$lt{'proc'}" /></td></tr>
 </table>  </table>
 </form>  </form>
 |;  |;
Line 166  sub send_token { Line 174  sub send_token {
     my $token = &Apache::lonnet::tmpput(\%info,$server,'resetpw');      my $token = &Apache::lonnet::tmpput(\%info,$server,'resetpw');
     if ($token !~ /^error/ && $token ne 'no_such_host') {      if ($token !~ /^error/ && $token ne 'no_such_host') {
         my $esc_token = &escape($token);          my $esc_token = &escape($token);
         my $mailmsg = "A request was submitted on ".&Apache::lonlocal::locallocaltime(time)." for a reset of the ".          my $showtime = &Apache::lonlocal::locallocaltime(time);
              "password for your LON-CAPA account.".          my $reseturl = &Apache::lonnet::absolute_url().'/adm/resetpw?token='.$esc_token;
              "To complete this process please open a web browser and enter the following ".          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);
              "URL in the address/location box: ".&Apache::lonnet::absolute_url()."/adm/resetpw?token=$esc_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') {
Line 235  sub reset_passwd { Line 242  sub reset_passwd {
     my %data = &Apache::lonnet::tmpget($token);      my %data = &Apache::lonnet::tmpget($token);
     my $now = time;      my $now = time;
     if (keys(%data) == 0) {      if (keys(%data) == 0) {
         $msg = &mt('Sorry, the URL you provided to complete the reset of your password was invalid.  Either the token included in the URL has been deleted or the URL you provided was invalid. Please submit a <a href="/adm/resetpw">new request</a> for a password reset, and follow the link to the new URL included in the e-mail that will be sent to you, to allow you to enter a new password.');          $msg = &mt('Sorry, the URL you provided to complete the reset of your password was invalid. Either the token included in the URL has been deleted or the URL you provided was invalid. Please submit a [_1]new request[_2] for a password reset, and follow the link to the new URL included in the e-mail that will be sent to you, to allow you to enter a new password.'
                     ,'<a href="/adm/resetpw">','</a>');
         return $msg;          return $msg;
     }      }
     if (($data{'time'} =~ /^\d+$/) &&       if (($data{'time'} =~ /^\d+$/) && 
Line 261  sub reset_passwd { Line 269  sub reset_passwd {
                     } else {                      } else {
                         $msg .= &mt('An error occurred when sending e-mail to [_1] confirming setting of your new password.',$data{'email'});                          $msg .= &mt('An error occurred when sending e-mail to [_1] confirming setting of your new password.',$data{'email'});
                     }                      }
                     $msg .= '<br /><br />'.&mt('<a href="/adm/login">Go to the login page</a>.');                      $msg .= '<br /><br />'
                              .'<a href="/adm/login">'.&mt('Go to the login page').'</a>.';
                 } else {                  } else {
                     $msg .= &mt('A problem occurred when attempting to reset the password for your account.  Please contact the [_1] - (<a href="mailto:[_2]">[_2]</a>) for assistance.',$contact_name,$contact_email);                      $msg .= &mt('A problem occurred when attempting to reset the password for your account. Please contact the [_1] - ([_2]) for assistance.'
                                  ,$contact_name
                                  ,'<a href="mailto:'.$contact_email.'">'.$contact_email.'</a>');
                 }                  }
             } 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 /><br />');
Line 271  sub reset_passwd { Line 282  sub reset_passwd {
                 &Apache::lonpreferences::passwordchanger($r,'','reset_by_email',$token);                  &Apache::lonpreferences::passwordchanger($r,'','reset_by_email',$token);
             }              }
         } else {          } else {
             $msg = &mt('Sorry, the token generated when you requested a password reset has expired. Please submit a <a href="/adm/resetpw">new request</a>, and follow the link to the web page included in the new e-mail that will be sent to you, to allow you to enter a new password.');              $msg = &mt('Sorry, the token generated when you requested a password reset has expired. Please submit a [_1]new request[_2], and follow the link to the web page included in the new e-mail that will be sent to you, to allow you to enter a new password.'
                         ,'<a href="/adm/resetpw">','</a>');
         }          }
     } else {      } else {
         $msg .= &mt('Sorry, the URL generated when you requested reset of your password contained incomplete information. Please submit a <a href="/adm/resetpw">new request</a> for a password reset, and use the new URL that will be sent to your e-mail account to complete the process.');          $msg .= &mt('Sorry, the URL generated when you requested reset of your password contained incomplete information. Please submit a [_1]new request[_2] for a password reset, and use the new URL that will be sent to your e-mail account to complete the process.'
                      ,'<a href="/adm/resetpw">','</a>');
     }      }
     return $msg;      return $msg;
 }  }
Removed from v.1.14  
changed lines
  Added in v.1.18

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