--- loncom/interface/resetpw.pm 2010/12/24 21:21:51 1.23.2.2 +++ loncom/interface/resetpw.pm 2012/02/14 15:48:55 1.23.2.2.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.23.2.2 2010/12/24 21:21:51 raeburn Exp $ +# $Id: resetpw.pm,v 1.23.2.2.2.3 2012/02/14 15:48:55 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -80,12 +80,15 @@ sub handler { } &Apache::lonacc::get_posted_cgi($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 $uname = &unescape($env{'form.uname'}); + my $uname = $env{'form.uname'}; + my $useremail = $env{'form.useremail'}; my $udom = $env{'form.udom'}; my $token = $env{'form.token'}; + my $case_change; my $brcrum = []; my $bread_crumbs_component = 'Forgotten Password'; if ($token) { @@ -112,11 +115,22 @@ sub handler { my $output; if ($token) { $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 $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); @@ -135,8 +149,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); + } } } } @@ -164,7 +185,7 @@ sub handler { $contact_name,$contact_email); } } else { - $output = &get_uname($defdom); + $output = &get_uname($defdom,$uname,$useremail); } $r->print($output); $r->print(&Apache::loncommon::end_page()); @@ -172,31 +193,35 @@ sub handler { } sub get_uname { - my ($defdom) = @_; + my ($defdom,$uname,$useremail) = @_; my %lt = &Apache::lonlocal::texthash( unam => 'username', udom => '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 %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 = '
'.&mt('To be able to reset a forgotten password:') + .'
' + .&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').'

'; $msg .= '
'. &Apache::lonhtmlcommon::start_pick_box(). - &Apache::lonhtmlcommon::row_title('LON-CAPA '.$lt{'unam'}). - ''. - &Apache::lonhtmlcommon::row_closure(1). - &Apache::lonhtmlcommon::row_title('LON-CAPA '.$lt{'udom'}). - &Apache::loncommon::select_dom_form($defdom,'udom'). + &Apache::lonhtmlcommon::row_title('Mechanics Online '.$lt{'unam'}). + ''. + ''. &Apache::lonhtmlcommon::row_closure(1). &Apache::lonhtmlcommon::row_title($lt{'uemail'}). - ''. + ''. &Apache::lonhtmlcommon::end_pick_box(). - '

'; + '

'."\n"; return $msg; } @@ -223,7 +248,7 @@ 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.

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); } @@ -234,11 +259,14 @@ sub send_token { } 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 $requestmail = "To: $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". &mt('[_1] LON-CAPA support team',$domdesc)."\n". @@ -299,6 +327,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; @@ -340,8 +381,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 [_1] username is the same as your e-mail address, in which case you will enter the same information twice.','Mechanics Online').'

'. + '

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