Diff for /loncom/interface/resetpw.pm between versions 1.8 and 1.11

version 1.8, 2008/01/25 16:46:50 version 1.11, 2008/11/28 18:28:52
Line 41  sub handler { Line 41  sub handler {
     if ($r->header_only) {      if ($r->header_only) {
         return OK;          return OK;
     }      }
     my $start_page =  
         &Apache::loncommon::start_page('Reset password','',  
                                            {  
                                              'no_inline_link'   => 1,});  
     $r->print($start_page);  
     my $contact_name = &mt('LON-CAPA helpdesk');      my $contact_name = &mt('LON-CAPA helpdesk');
     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');
Line 58  sub handler { Line 53  sub handler {
     my $uname = &unescape($env{'form.uname'});      my $uname = &unescape($env{'form.uname'});
     my $udom = $env{'form.udom'};      my $udom = $env{'form.udom'};
     my $token = $env{'form.token'};      my $token = $env{'form.token'};
     $r->print(&mt('<h3>'.&mt('Reset forgotten LON-CAPA password').'</h3>'));      my $start_page =
           &Apache::loncommon::start_page('Reset password','',
                                              {
                                                'no_inline_link'   => 1,});
       $r->print($start_page);
       $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);
Line 150  sub get_uname { Line 150  sub get_uname {
 sub send_token {  sub send_token {
     my ($uname,$udom,$email,$server,$domdesc,$contact_name,      my ($uname,$udom,$email,$server,$domdesc,$contact_name,
         $contact_email) = @_;          $contact_email) = @_;
     my $msg = &mt('Thank you for your request to reset the password for your      my $msg = &mt('Thank you for your request to reset the password for your LON-CAPA account.').'<br /><br />';
         LON-CAPA account.').'<br /><br />';  
   
     my $now = time;      my $now = time;
     my $temppasswd = &create_passwd();      my $temppasswd = &create_passwd();
Line 165  sub send_token { Line 164  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 ".localtime(time)." for a reset of the ".          my $mailmsg = "A request was submitted on ".&Apache::lonlocal::locallocaltime(time)." for a reset of the ".
              "password for your LON-CAPA account.".               "password for your LON-CAPA account.".
              "To complete this process please open a web browser and enter the following ".               "To complete this process please open a web browser and enter the following ".
              "URL in the address/location box: ".&Apache::lonnet::absolute_url()."/adm/resetpw?token=$esc_token";               "URL in the address/location box: ".&Apache::lonnet::absolute_url()."/adm/resetpw?token=$esc_token";
Line 242  sub reset_passwd { Line 241  sub reset_passwd {
         ($data{'domain'} ne '') &&           ($data{'domain'} ne '') && 
         ($data{'email'}  =~ /^[^\@]+\@[^\@]+\.[^\@\.]+$/) &&           ($data{'email'}  =~ /^[^\@]+\@[^\@]+\.[^\@\.]+$/) && 
         ($data{'temppasswd'} =~/^\w+$/)) {          ($data{'temppasswd'} =~/^\w+$/)) {
         my $reqtime = localtime($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 $change_failed =                   my $change_failed = 
     &Apache::lonpreferences::verify_and_change_password($r,'reset_by_email',$token);      &Apache::lonpreferences::verify_and_change_password($r,'reset_by_email',$token);
                 if (!$change_failed) {                  if (!$change_failed) {
                     my $delete = &Apache::lonnet::tmpdel($token);                      my $delete = &Apache::lonnet::tmpdel($token);
                     my $now = localtime(time);                      my $now = &Apache::lonlocal::locallocaltime(time);
                     my $domdesc =                       my $domdesc = 
  &Apache::lonnet::domain($data{'domain'},'description');   &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";

Removed from v.1.8  
changed lines
  Added in v.1.11


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