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

version 1.11, 2008/11/28 18:28:52 version 1.11.4.1, 2009/10/09 17:39:35
Line 1 Line 1
 # The LearningOnline Network  # The LearningOnline Network
 # Allow access to password changing via a token sent to user's e-mail.   # Allow access to password changing via a token sent to user's e-mail. 
 #  #
   # $Id$
   #
 # Copyright Michigan State University Board of Trustees  # Copyright Michigan State University Board of Trustees
 #  #
 # This file is part of the LearningOnline Network with CAPA (LON-CAPA).  # This file is part of the LearningOnline Network with CAPA (LON-CAPA).
Line 24 Line 26
 # http://www.lon-capa.org/  # http://www.lon-capa.org/
 #  #
 #  #
   
   =pod
   
   =head1 NAME
   
   Apache::resetpw: reset user password.
   
   =head1 SYNOPSIS
   
   Handles resetting of forgotten passwords.
   
   This is part of the LearningOnline Network with CAPA project
   described at http://www.lon-capa.org.
   
   =head1 OVERVIEW
   
   A user with an e-mail address associated with his/her LON-CAPA username
   can reset a forgotten password, using a link sent to the e-mail address
   if the authentication type for the account is "internal".
   
   =cut
   
 package Apache::resetpw;  package Apache::resetpw;
   
 use strict;  use strict;
Line 44  sub handler { Line 68  sub handler {
     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');
     my $defdom = $r->dir_config('lonDefDomain');      my $defdom = &Apache::lonnet::default_login_domain();
     &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']);
Line 244  sub reset_passwd { Line 268  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') {
                   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);
                       return $msg;
                   }
                 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) {
Line 260  sub reset_passwd { Line 288  sub reset_passwd {
                         $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>.');
                   } elsif ($change_failed eq 'invalid_client') {
                       my $homeserver = &Apache::lonnet::homeserver($data{'username'},$data{'domain'});
                       if ($homeserver eq 'no_host') {
                           $msg .= &generic_failure_msg($contact_name,$contact_email);
                       } else {
                           my $protocol = $Apache::lonnet::protocol{$homeserver};
                           $protocol = 'http' if ($protocol ne 'https');
                           my $url = $protocol.'://'.&Apache::lonnet::hostname($homeserver).
                                     '/adm/resetpw';
                           my ($opentag,$closetag);
                           if ($url) {
                              $opentag = '<a href="'.$url.'">';
                              $closetag = '</a>';
                           }
                           $msg .= &mt('A problem occurred when attempting to reset the password for your account. Please try again from your [_1]home server[_2].',$opentag,$closetag);
                       }
                 } 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 .= &generic_failure_msg($contact_name,$contact_email);
                 }                  }
             } else {              } else {
                 $r->print(&mt('The token included in an email 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 email 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 277  sub reset_passwd { Line 321  sub reset_passwd {
     return $msg;      return $msg;
 }  }
   
   sub generic_failure_msg {
       my ($contact_name,$contact_email) = @_;
       return &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>');
   }
   
 sub create_passwd {  sub create_passwd {
     my $passwd = '';      my $passwd = '';
     my @letts = ("a".."z");      my @letts = ("a".."z");

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


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