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

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

version 1.22.2.3, 2010/11/29 19:25:53 version 1.22.2.4, 2010/12/01 23:15:47
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 114  sub handler { Line 115  sub handler {
     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 => 'LON-CAPA username',
                                          udom => 'LON-CAPA domain',                                           udom => 'LON-CAPA 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;
       }
     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 LON-CAPA username.').'</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 WebCenter account.').'</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 GCI WebCenter username is the same as your e-mail address, in which case you will enter the same information twice. ').'<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($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;
Removed from v.1.22.2.3  
changed lines
  Added in v.1.22.2.4

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