Diff for /loncom/interface/resetpw.pm between versions 1.22.2.3 and 1.23.2.2.2.3

version 1.22.2.3, 2010/11/29 19:25:53 version 1.23.2.2.2.3, 2012/02/14 15:48:55
Line 80  sub handler { Line 80  sub handler {
     }      }
     &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',
                                               'uname','useremail','referrer']);
           
     my @emailtypes = ('permanentemail','critnotification','notification');      my @emailtypes = ('permanentemail','critnotification','notification');
     my $uname = &unescape($env{'form.uname'});      my $uname = $env{'form.uname'};
     my $useremail = $env{'form.useremail'};      my $useremail = $env{'form.useremail'};
     my $udom = $env{'form.udom'};      my $udom = $env{'form.udom'};
     my $token = $env{'form.token'};      my $token = $env{'form.token'};
Line 106  sub handler { Line 107  sub handler {
                  text => 'Result'});                   text => 'Result'});
         }          }
     }      }
     my $args = {no_inline_link         => 1,      my $args = {bread_crumbs           => $brcrum,
                 bread_crumbs           => $brcrum,                  bread_crumbs_component => $bread_crumbs_component,
                 bread_crumbs_component => $bread_crumbs_component};                 'no_inline_link'        => 1};
     $r->print(&Apache::loncommon::start_page('Reset password','',$args));      $r->print(&Apache::loncommon::start_page('Reset password','',$args));
     $r->print('<h3>'.&mt('Reset forgotten LON-CAPA password').'</h3>');      $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);
     } elsif ($uname && $udom) {      } elsif ($uname && $udom && ($env{'form.referrer'} ne 'createaccount')) {
         my $domdesc = &Apache::lonnet::domain($udom,'description');          my $domdesc = &Apache::lonnet::domain($udom,'description');
         my $homeserver = &Apache::lonnet::homeserver($uname,$udom);          my $homeserver = &Apache::lonnet::homeserver($uname,$udom);
         if ($homeserver eq 'no_host') {          if ($homeserver eq 'no_host') {
Line 184  sub handler { Line 185  sub handler {
                                      $contact_name,$contact_email);                                       $contact_name,$contact_email);
         }          }
     } else {      } else {
         $output = &get_uname($defdom);          $output = &get_uname($defdom,$uname,$useremail);
     }      }
     $r->print($output);      $r->print($output);
     $r->print(&Apache::loncommon::end_page());      $r->print(&Apache::loncommon::end_page());
Line 192  sub handler { Line 193  sub handler {
 }  }
   
 sub get_uname {  sub get_uname {
     my ($defdom) = @_;      my ($defdom,$uname,$useremail) = @_;
     my %lt = &Apache::lonlocal::texthash(      my %lt = &Apache::lonlocal::texthash(
                                          unam => 'LON-CAPA username',                                           unam => 'username',
                                          udom => 'LON-CAPA domain',                                           udom => 'domain',
                                          uemail => 'E-mail address in LON-CAPA',                                           uemail => 'E-mail address in LON-CAPA',
                                          proc => 'Proceed');                                           proc => 'Proceed');
       my %value;
       if ($env{'form.referrer'} eq 'createaccount') {
           $value{'uname'} = $uname;
           $value{'useremail'} = $useremail;
       }
       if ($env{'form.referrer'} eq 'createaccount') {
           $value{'uname'} = $uname;
           $value{'useremail'} = $useremail;
       }
     my $msg = '<br />'.&mt('To be able to reset a forgotten password:')      my $msg = '<br />'.&mt('To be able to reset a forgotten password:')
            .'<ul><li>'.&mt('An e-mail address must have previously been associated with your LON-CAPA username.').'</li>'             .'<ul><li>'.&mt('An e-mail address must have previously been associated with your [_1] username.','Mechanics Online').'</li>'
            .'<li>'.&mt('You must be able to access e-mail sent to the e-mail address associated with your WebCenter account.').'</li></ul><br />'             .'<li>'.&mt('You must be able to access e-mail sent to the e-mail address associated with your [_1] account.','Mechanics Online').'</li></ul><br />'
            .&mt('In most cases the GCI WebCenter username is the same as your e-mail address, in which case you will enter the same information twice. ').'<br />';             .&mt('In most cases the [_1] username is the same as your e-mail address, in which case you will enter the same information twice.','Mechanics Online').'<br /><br />';
     $msg .= '<form name="forgotpw" method="post" action="/adm/resetpw">'.      $msg .= '<form name="forgotpw" method="post" action="/adm/resetpw">'.
             &Apache::lonhtmlcommon::start_pick_box().              &Apache::lonhtmlcommon::start_pick_box().
             &Apache::lonhtmlcommon::row_title('LON-CAPA '.$lt{'unam'}).              &Apache::lonhtmlcommon::row_title('Mechanics Online '.$lt{'unam'}).
             '<input type="text" name="uname" size="30" />'.              '<input type="text" name="uname" size="30" value="'.$value{'uname'}.'" />'.
             '<input type="hidden" name="udom" value="'.$defdom.'" />'.              '<input type="hidden" name="udom" value="'.$defdom.'" />'.
             &Apache::lonhtmlcommon::row_closure(1).              &Apache::lonhtmlcommon::row_closure(1).
             &Apache::lonhtmlcommon::row_title($lt{'uemail'}).              &Apache::lonhtmlcommon::row_title($lt{'uemail'}).
             '<input type="text" name="useremail" size="30" />'.              '<input type="text" name="useremail" size="30" value="'.$value{'useremail'}.'" />'.
             &Apache::lonhtmlcommon::end_pick_box().              &Apache::lonhtmlcommon::end_pick_box().
             '<br /><br /><input type="submit" name="resetter" value="'.$lt{'proc'}.'" /></form>'."\n";              '<br /><br /><input type="submit" name="resetter" value="'.$lt{'proc'}.'" /></form>'."\n";
     return $msg;      return $msg;
Line 241  sub send_token { Line 250  sub send_token {
         if ($result eq 'ok') {          if ($result eq 'ok') {
             $msg .= &mt('An e-mail 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 />'.&mt('The link included in the message will be valid for the next [_1]two[_2] hours.','<b>','</b>');              $msg .= &mt('An e-mail 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 />'.&mt('The link included in the message will be valid for the next [_1]two[_2] hours.','<b>','</b>');
         } else {          } else {
             $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);              $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 [_1] ([_2]) for assistance.',$contact_name,$contact_email);          $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;
 }  }
   
 sub send_mail {  sub send_mail {
     my ($domdesc,$email,$mailmsg,$contact_name,$contact_email) = @_;      my ($domdesc,$email,$mailmsg,$contact_name,$contact_email,$subject) = @_;
       if ($subject eq '') {
           $subject = &mt('Your LON-CAPA account');
       }
     my $outcome;      my $outcome;
     my $requestmail = "To: $email\n".      my $requestmail = "To: $email\n".
                       "From: $contact_name <$contact_email>\n".                        "From: $contact_name <$contact_email>\n".
                       "Subject: ".&mt('Your LON-CAPA account')."\n".                        "Subject: $subject\n".
                         "Content-type: text/plain\;charset=UTF-8\n".
                       "\n\n".$mailmsg."\n\n".                        "\n\n".$mailmsg."\n\n".
                       &mt('[_1] LON-CAPA support team',$domdesc)."\n".                        &mt('[_1] LON-CAPA support team',$domdesc)."\n".
                       "$contact_email\n";                        "$contact_email\n";
Line 370  sub reset_passwd { Line 383  sub reset_passwd {
             } 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 />'.                  $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 />'.
                           '<p>'.&mt('Please enter the username and domain of the LON-CAPA account, and the associated e-mail address, for which you are setting a password.').'<br />'.                            '<p>'.&mt('Please enter the username and domain of the LON-CAPA account, and the associated e-mail address, for which you are setting a password.').'<br />'.
                           &mt('In most cases the GCI WebCenter username is the same as your e-mail address, in which case you will enter the same information twice.').'</p>'.                            &mt('In most cases the [_1] username is the same as your e-mail address, in which case you will enter the same information twice.','Mechanics Online').'</p>'.
                           '<p>'.&mt('The new password must contain at least 7 characters.').' '.                            '<p>'.&mt('The new password must contain at least 7 characters.').' '.
                           &mt('Your new password will be sent to the LON-CAPA server in an encrypted form.').'<br /></p>');                            &mt('Your new password will be sent to the LON-CAPA server in an encrypted form.').'<br /></p>');
                 &Apache::lonpreferences::passwordchanger($r,'','reset_by_email',$token);                  &Apache::lonpreferences::passwordchanger($r,'','reset_by_email',$token);

Removed from v.1.22.2.3  
changed lines
  Added in v.1.23.2.2.2.3


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