--- loncom/interface/resetpw.pm 2009/10/09 00:26:40 1.22 +++ loncom/interface/resetpw.pm 2010/11/29 19:25:53 1.22.2.3 @@ -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 2009/10/09 00:26:40 raeburn Exp $ +# $Id: resetpw.pm,v 1.22.2.3 2010/11/29 19:25:53 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -69,28 +69,67 @@ sub handler { my $contact_email = $r->dir_config('lonSupportEMail'); my $server = $r->dir_config('lonHostID'); my $defdom = &Apache::lonnet::default_login_domain(); + my $handle = &Apache::lonnet::check_for_valid_session($r); + my $lonidsdir=$r->dir_config('lonIDsDir'); + if ($handle ne '') { + if ($handle=~/^publicuser\_/) { + unlink($r->dir_config('lonIDsDir')."/$handle.id"); + } else { + &Apache::lonnet::transfer_profile_to_env($lonidsdir,$handle); + } + } &Apache::lonacc::get_posted_cgi($r); &Apache::lonlocal::get_language_handle($r); &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['token']); 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 $start_page = - &Apache::loncommon::start_page('Reset password','', - { - 'no_inline_link' => 1,}); - $r->print($start_page); + my $case_change; + my $brcrum = []; + my $bread_crumbs_component = 'Forgotten Password'; + if ($token) { + push (@{$brcrum}, + {href => '/adm/resetpw', + text => 'Update Password'}); + + $bread_crumbs_component = 'Reset Password'; + } else { + push (@{$brcrum}, + {href => '/adm/resetpw', + text => 'Account Information'}); + if ($uname && $udom) { + push (@{$brcrum}, + {href => '/adm/resetpw', + text => 'Result'}); + } + } + my $args = {no_inline_link => 1, + bread_crumbs => $brcrum, + bread_crumbs_component => $bread_crumbs_component}; + $r->print(&Apache::loncommon::start_page('Reset password','',$args)); $r->print('

'.&mt('Reset forgotten LON-CAPA password').'

'); my $output; if ($token) { $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); @@ -109,8 +148,15 @@ sub handler { } foreach my $item (@items) { if ($item =~ /^[^\@]+\@[^\@]+\.[^\@\.]+$/) { - unless(grep(/^\Q$item\E$/,@allemails)) { - push(@allemails,$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); + } } } } @@ -148,34 +194,25 @@ sub handler { sub get_uname { my ($defdom) = @_; my %lt = &Apache::lonlocal::texthash( - unam => 'username', - udom => 'domain', + unam => 'LON-CAPA username', + udom => 'LON-CAPA domain', uemail => 'E-mail address in LON-CAPA', proc => 'Proceed'); - 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:') + my $msg = '
'.&mt('To be able to reset a forgotten password:') .''; - $msg .= qq| -
- - - - - - - - -
-
LON-CAPA $lt{'unam'}:
LON-CAPA $lt{'udom'}: |; - $msg .= &Apache::loncommon::select_dom_form($defdom,'udom'); - $msg .= qq|
$lt{'uemail'}:

-
-
-|; + .'
  • '.&mt('You must be able to access e-mail sent to the e-mail address associated with your WebCenter account.').'

    • ' + .&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 .= '
    '. + &Apache::lonhtmlcommon::start_pick_box(). + &Apache::lonhtmlcommon::row_title('LON-CAPA '.$lt{'unam'}). + ''. + ''. + &Apache::lonhtmlcommon::row_closure(1). + &Apache::lonhtmlcommon::row_title($lt{'uemail'}). + ''. + &Apache::lonhtmlcommon::end_pick_box(). + '

    '."\n"; return $msg; } @@ -198,16 +235,16 @@ sub send_token { my $esc_token = &escape($token); my $showtime = &Apache::lonlocal::locallocaltime(time); my $reseturl = &Apache::lonnet::absolute_url().'/adm/resetpw?token='.$esc_token; - my $mailmsg = &mt('A request was submitted on [_1] for reset of the password for your LON-CAPA account.',$showtime).' '.&mt('To complete this process please open a web browser and enter the following URL in the address/location box: [_1]',$reseturl); + my $mailmsg = &mt('A request was submitted on [_1] for reset of the password for your LON-CAPA account.',$showtime)." \n".&mt('To complete this process please open a web browser and enter the following URL in the address/location box: [_1]',"\n\n".$reseturl); 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.

    The link included in the message will be valid for the next two 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.').'

    '.&mt('The link included in the message will be valid for the next [_1]two[_2] 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; } @@ -235,8 +272,8 @@ sub invalid_state { my ($error,$domdesc,$contact_name,$contact_email) = @_; my $msg; if ($error eq 'invalid') { - $msg = &mt('The username you provided was not verified as a valid username in the LON-CAPA system for the [_1] domain.',$domdesc) - .' '.&mt('Please [_1]go back[_2] and try again.','',''); + $msg = '

    '.&mt('The username you provided was not verified as a valid username in the LON-CAPA system for the [_1] domain.',$domdesc) + .'

    '.&mt('Please [_1]go back[_2] and try again.','',''); } else { if ($error eq 'baduseremail') { $msg = &mt('The e-mail address you provided does not appear to be a valid address.'); @@ -247,6 +284,7 @@ sub invalid_state { } elsif ($error eq 'authentication') { $msg = &mt('The username you provided uses an authentication type which can not be reset directly via LON-CAPA.'); } + $msg = '

    '.$msg.'

    '; if ($contact_email ne '') { my $escuri = &HTML::Entities::encode('/adm/resetpw','&<>"'); $msg .= '
    '.&mt('You may wish to contact the [_1]LON-CAPA helpdesk[_2] for the [_3] domain.' @@ -276,6 +314,19 @@ 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; @@ -317,8 +368,11 @@ 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).'

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

    '); &Apache::lonpreferences::passwordchanger($r,'','reset_by_email',$token); } } else {