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

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

version 1.3, 2006/11/10 02:03:49 version 1.4, 2006/11/10 05:34:51
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 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 .= ("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 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.4

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