--- loncom/interface/resetpw.pm 2010/09/19 15:04:40 1.22.2.2 +++ loncom/interface/resetpw.pm 2010/02/19 15:41:40 1.23 @@ -1,7 +1,7 @@ # The LearningOnline Network # Allow access to password changing via a token sent to user's e-mail. # -# $Id: resetpw.pm,v 1.22.2.2 2010/09/19 15:04:40 raeburn Exp $ +# $Id: resetpw.pm,v 1.23 2010/02/19 15:41:40 bisitz Exp $ # # Copyright Michigan State University Board of Trustees # @@ -75,10 +75,8 @@ sub handler { my @emailtypes = ('permanentemail','critnotification','notification'); my $uname = &unescape($env{'form.uname'}); - my $useremail = $env{'form.useremail'}; my $udom = $env{'form.udom'}; my $token = $env{'form.token'}; - my $case_change; my $start_page = &Apache::loncommon::start_page('Reset password','', { @@ -90,20 +88,9 @@ sub handler { $output = &reset_passwd($r,$token,$contact_name,$contact_email); } elsif ($uname && $udom) { my $domdesc = &Apache::lonnet::domain($udom,'description'); - my $homeserver = &Apache::lonnet::homeserver($uname,$udom); - if ($homeserver eq 'no_host') { - my $lc_uname = lc($uname); - if ($lc_uname ne $uname) { - $homeserver = &Apache::lonnet::homeserver($lc_uname,$udom); - unless ($homeserver eq 'no_host') { - $uname = $lc_uname; - $useremail = lc($env{'form.useremail'}); - $case_change = 1; - } - } - } my $authtype = &Apache::lonnet::queryauthenticate($uname,$udom); if ($authtype =~ /^internal/) { + my $useremail = $env{'form.useremail'}; if ($useremail !~ /^[^\@]+\@[^\@]+\.[^\@\.]+$/) { $output = &invalid_state('baduseremail',$domdesc, $contact_name,$contact_email); @@ -122,15 +109,8 @@ sub handler { } foreach my $item (@items) { if ($item =~ /^[^\@]+\@[^\@]+\.[^\@\.]+$/) { - if ($case_change) { - my $lcitem = lc($item); - unless(grep(/^\Q$lcitem\E$/,@allemails)) { - push(@allemails,$lcitem); - } - } else { - unless(grep(/^\Q$item\E$/,@allemails)) { - push(@allemails,$item); - } + unless(grep(/^\Q$item\E$/,@allemails)) { + push(@allemails,$item); } } } @@ -168,32 +148,34 @@ sub handler { sub get_uname { my ($defdom) = @_; my %lt = &Apache::lonlocal::texthash( - unam => 'LON-CAPA username', - udom => 'LON-CAPA domain', + unam => 'username', + udom => 'domain', uemail => 'E-mail address in LON-CAPA', proc => 'Proceed'); - my $msg = '
'.&mt('To be able to reset a forgotten password:') + my $msg = &mt('If you use the same account for other campus services besides LON-CAPA, (e.g., e-mail, course registration, etc.), a separate centrally managed mechanism likely exists to reset a password. However, if your account is used for just LON-CAPA access you will probably be able to reset a password from this page.'); + $msg .= '

'.&mt('Three conditions must be met:') .'
' - .&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. ').'
'; - $msg .= ' + .'
  • '.&mt('You must be able to access e-mail sent to that address.').'
    • ' + .'
  • '.&mt('Your LON-CAPA account must be of a type for which LON-CAPA can reset a password.') + .''; + $msg .= qq|
    - - - - - - - - - - + + + + + + +
    '.$lt{'unam'}.': -
    '.$lt{'uemail'}.':

    -
    +
    LON-CAPA $lt{'unam'}:
    LON-CAPA $lt{'udom'}: |; + $msg .= &Apache::loncommon::select_dom_form($defdom,'udom'); + $msg .= qq|
    $lt{'uemail'}:

    +
    -
    '."\n"; + +|; return $msg; } @@ -220,12 +202,12 @@ sub send_token { my $result = &send_mail($domdesc,$email,$mailmsg,$contact_name, $contact_email); 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.').'

    '.&mt('The link included in the message will be valid for the next [_1]two[_2] hours.','',''); + $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.

    The link included in the message will be valid for the next two hours."); } 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 { - $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; } @@ -294,19 +276,6 @@ sub reset_passwd { my $reqtime = &Apache::lonlocal::locallocaltime($data{'time'}); if ($now - $data{'time'} < 7200) { if ($env{'form.action'} eq 'verify_and_change_pass') { - my $homeserver = &Apache::lonnet::homeserver($env{'form.uname'},$env{'form.udom'}); - if ($homeserver eq 'no_host') { - my $lc_uname = lc($env{'form.uname'}); - if ($lc_uname ne $env{'form.uname'}) { - $homeserver = &Apache::lonnet::homeserver($lc_uname,$env{'form.udom'}); - unless ($homeserver eq 'no_host') { - if ($env{'form.uname'} eq $env{'form.email'}) { - $env{'form.email'} = $lc_uname; - } - $env{'form.uname'} = $lc_uname; - } - } - } 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; @@ -348,11 +317,8 @@ sub reset_passwd { $msg .= &generic_failure_msg($contact_name,$contact_email); } } 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).'
    '. - '

    '.&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.').'
    '. - &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.').'

    '. - '

    '.&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.').'

    '); + $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).'

    '); + $r->print(&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. 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.').'
    '); &Apache::lonpreferences::passwordchanger($r,'','reset_by_email',$token); } } else {