Diff for /loncom/interface/resetpw.pm between versions 1.3 and 1.7

version 1.3, 2006/11/10 02:03:49 version 1.7, 2007/09/10 17:18:09
Line 63  sub handler { Line 63  sub handler {
     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) {
         my $domdesc = $Apache::lonnet::domaindescription{$udom};          my $domdesc = &Apache::lonnet::domain($udom,'description');
         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'};              my $useremail = $env{'form.useremail'};
Line 72  sub handler { Line 72  sub handler {
                                          $contact_name,$contact_email);                                           $contact_name,$contact_email);
             } else {              } else {
                 my %userinfo =                   my %userinfo = 
             &Apache::lonnet::get('environment',\@emailtypes,$udom,$uname);      &Apache::lonnet::get('environment',\@emailtypes,
    $udom,$uname);
                 my $email = '';                  my $email = '';
                 my $emailtarget;                  my $emailtarget;
                 foreach my $type (@emailtypes) {                  foreach my $type (@emailtypes) {
Line 127  sub get_uname { Line 128  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="10"  /> </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="20"  /></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="button" value="$lt{'proc'}" onClick="document.forgotpw.submit()"></td></tr>
 </table>  </table>
Line 169  sub send_token { Line 170  sub send_token {
         if ($result eq 'ok') {          if ($result eq 'ok') {
             $msg .= &mt("An e-mail message 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 message 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 .= ("An error occurred when sending a message to the e-mail address associated with your LON-CAPA account. Please contact the $contact_name ($contact_email) for assistance.");              $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 $contact_name ($contact_email) for assistance.");          $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 215  sub invalid_state { Line 216  sub invalid_state {
             my $escuri = &HTML::Entities::encode('/adm/resetpw','&<>"');              my $escuri = &HTML::Entities::encode('/adm/resetpw','&<>"');
             $msg .= '<br />'.&mt(' You may wish to contact the <a href="/adm/helpdesk?origurl=[_1]">LON-CAPA helpdesk</a> for the [_2] domain.',$escuri,$domdesc);              $msg .= '<br />'.&mt(' You may wish to contact the <a href="/adm/helpdesk?origurl=[_1]">LON-CAPA helpdesk</a> for the [_2] domain.',$escuri,$domdesc);
         } else {          } else {
             $msg .= '<br />'.&mt(' You may wish to send an e-mail to the server administrator: [_1] for the [_2] domain.',Apache::lonnet::perlvar{'AdminEmail'},$domdesc);              $msg .= '<br />'.&mt(' You may wish to send an e-mail to the server administrator: [_1] for the [_2] domain.',$Apache::lonnet::perlvar{'AdminEmail'},$domdesc);
         }          }
     }      }
     return $msg;      return $msg;
Line 244  sub reset_passwd { Line 245  sub reset_passwd {
                     my $delete = &Apache::lonnet::tmpdel($token);                      my $delete = &Apache::lonnet::tmpdel($token);
                     my $now = localtime(time);                      my $now = localtime(time);
                     my $domdesc =                       my $domdesc = 
                         $Apache::lonnet::domaindescription{$data{'domain'}};   &Apache::lonnet::domain($data{'domain'},'description');
                     my $mailmsg = &mt('The password for your LON-CAPA account in the [_1] domain was changed [_2] from IP address: [_3].  If you did not perform this change or authorize it, please contact the [_4] ([_5]).',$domdesc,$now,$ENV{'REMOTE_ADDR'},$contact_name,$contact_email)."\n";                      my $mailmsg = &mt('The password for your LON-CAPA account in the [_1] domain was changed [_2] from IP address: [_3].  If you did not perform this change or authorize it, please contact the [_4] ([_5]).',$domdesc,$now,$ENV{'REMOTE_ADDR'},$contact_name,$contact_email)."\n";
                     my $result = &send_mail($domdesc,$data{'email'},$mailmsg,                      my $result = &send_mail($domdesc,$data{'email'},$mailmsg,
                                             $contact_name,$contact_email);                                              $contact_name,$contact_email);
Line 253  sub reset_passwd { Line 254  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 />'.&mt('<a href="/adm/login">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] - (<a href="mailto:[_2]">[_2]</a>) for assistance.',$contact_name,$contact_email);
                 }                  }

Removed from v.1.3  
changed lines
  Added in v.1.7


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