--- loncom/interface/resetpw.pm 2010/09/19 15:04:40 1.22.2.2 +++ loncom/interface/resetpw.pm 2012/02/08 15:19:46 1.23.2.2.2.1 @@ -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.2.2.2.1 2012/02/08 15:19:46 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -69,26 +69,53 @@ 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']); + &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 $start_page = - &Apache::loncommon::start_page('Reset password','', - { - 'no_inline_link' => 1,}); - $r->print($start_page); + 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 = {bread_crumbs => $brcrum, + bread_crumbs_component => $bread_crumbs_component, + 'no_inline_link' => 1}; + $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) { + } 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') { @@ -158,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()); @@ -166,34 +193,35 @@ sub handler { } sub get_uname { - my ($defdom) = @_; + my ($defdom,$uname,$useremail) = @_; 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 %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 GCI WebCenter username is the same as your e-mail address, in which case you will enter the same information twice. ').'
'; - $msg .= ' -
- - - - - - - - - - - -
'.$lt{'unam'}.': -
'.$lt{'uemail'}.':

-
-
'."\n"; + .'
' + .&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.','Learn Physics').'

'; + $msg .= '
'. + &Apache::lonhtmlcommon::start_pick_box(). + &Apache::lonhtmlcommon::row_title('Learn Physics '.$lt{'unam'}). + ''. + ''. + &Apache::lonhtmlcommon::row_closure(1). + &Apache::lonhtmlcommon::row_title($lt{'uemail'}). + ''. + &Apache::lonhtmlcommon::end_pick_box(). + '

'."\n"; return $msg; } @@ -216,16 +244,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.').'

'.&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; } @@ -236,6 +264,7 @@ sub send_mail { my $requestmail = "To: $email\n". "From: $contact_name <$contact_email>\n". "Subject: ".&mt('Your LON-CAPA account')."\n". + "Content-type: text/plain\;charset=UTF-8\n". "\n\n".$mailmsg."\n\n". &mt('[_1] LON-CAPA support team',$domdesc)."\n". "$contact_email\n"; @@ -253,8 +282,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.'); @@ -265,6 +294,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.' @@ -350,7 +380,7 @@ sub reset_passwd { } 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('In most cases the [_1] username is the same as your e-mail address, in which case you will enter the same information twice.','Learn Physics').'

'. '

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