--- loncom/interface/resetpw.pm 2010/12/24 21:21:51 1.23.2.2 +++ loncom/interface/resetpw.pm 2010/03/22 20:11:22 1.24 @@ -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.24 2010/03/22 20:11:22 droeschl Exp $ # # Copyright Michigan State University Board of Trustees # @@ -69,15 +69,6 @@ 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']); @@ -86,28 +77,9 @@ sub handler { my $uname = &unescape($env{'form.uname'}); my $udom = $env{'form.udom'}; my $token = $env{'form.token'}; - 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)); + my $start_page = + &Apache::loncommon::start_page('Reset password'); + $r->print($start_page); $r->print('

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

'); my $output; if ($token) { @@ -185,18 +157,23 @@ sub get_uname { .'
  • '.&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 .= '
    '. - &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_closure(1). - &Apache::lonhtmlcommon::row_title($lt{'uemail'}). - ''. - &Apache::lonhtmlcommon::end_pick_box(). - '

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

    +
    +
    +|; return $msg; } @@ -219,7 +196,7 @@ 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)." \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 $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 $result = &send_mail($domdesc,$email,$mailmsg,$contact_name, $contact_email); if ($result eq 'ok') { @@ -239,7 +216,6 @@ 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"; @@ -257,8 +233,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.'); @@ -269,7 +245,6 @@ 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.'