--- loncom/interface/resetpw.pm 2010/11/09 16:40:21 1.25 +++ loncom/interface/resetpw.pm 2012/10/02 18:08:12 1.28 @@ -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.25 2010/11/09 16:40:21 bisitz Exp $ +# $Id: resetpw.pm,v 1.28 2012/10/02 18:08:12 bisitz Exp $ # # Copyright Michigan State University Board of Trustees # @@ -66,9 +66,22 @@ sub handler { return OK; } my $contact_name = &mt('LON-CAPA helpdesk'); - my $contact_email = $r->dir_config('lonSupportEMail'); + my $origmail = $r->dir_config('lonSupportEMail'); my $server = $r->dir_config('lonHostID'); my $defdom = &Apache::lonnet::default_login_domain(); + my $contacts = + &Apache::loncommon::build_recipient_list(undef,'helpdeskmail', + $defdom,$origmail); + my ($contact_email) = split(',',$contacts); + 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']); @@ -77,9 +90,27 @@ sub handler { my $uname = &unescape($env{'form.uname'}); my $udom = $env{'form.udom'}; my $token = $env{'form.token'}; - my $start_page = - &Apache::loncommon::start_page('Reset password'); - $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}; + $r->print(&Apache::loncommon::start_page('Reset password','',$args)); $r->print('

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

'); my $output; if ($token) { @@ -157,23 +188,18 @@ 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 .= qq| -
    - - - - - - - - -
    -
    LON-CAPA $lt{'unam'}:
    LON-CAPA $lt{'udom'}: |; - $msg .= &Apache::loncommon::select_dom_form($defdom,'udom'); - $msg .= qq|
    $lt{'uemail'}:

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

    '; return $msg; } @@ -196,16 +222,28 @@ 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."); } 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; } @@ -234,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.'); @@ -246,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.' @@ -290,11 +329,21 @@ sub reset_passwd { my $result = &send_mail($domdesc,$data{'email'},$mailmsg, $contact_name,$contact_email); if ($result eq 'ok') { - $msg .= &mt('An e-mail confirming setting of the password for your LON-CAPA account has been sent to [_1].',$data{'email'}); + $msg .= + '

    ' + .&mt('An e-mail confirming setting of the password' + .' for your LON-CAPA account has been sent to [_1].' + ,$data{'email'}) + .'

    '; } else { - $msg .= &mt('An error occurred when sending e-mail to [_1] confirming setting of your new password.',$data{'email'}); + $msg .= + '

    ' + .&mt('An error occurred when sending e-mail to [_1]' + .' confirming setting of your new password.' + ,$data{'email'}) + .'

    '; } - $msg .= '

    ' + $msg .= '
    ' .''.&mt('Go to the login page').'.'; } elsif ($change_failed eq 'invalid_client') { my $homeserver = &Apache::lonnet::homeserver($data{'username'},$data{'domain'}); @@ -310,7 +359,13 @@ sub reset_passwd { $opentag = ''; $closetag = ''; } - $msg .= &mt('A problem occurred when attempting to reset the password for your account. Please try again from your [_1]home server[_2].',$opentag,$closetag); + $msg .= + '

    ' + .&mt('A problem occurred when attempting to reset' + .' the password for your account.' + .' Please try again from your [_1]home server[_2].' + ,$opentag,$closetag) + .'

    '; } } else { $msg .= &generic_failure_msg($contact_name,$contact_email); @@ -321,20 +376,30 @@ sub reset_passwd { &Apache::lonpreferences::passwordchanger($r,'','reset_by_email',$token); } } else { - $msg = &mt('Sorry, the token generated when you requested a password reset has expired. Please submit a [_1]new request[_2], and follow the link to the web page included in the new e-mail that will be sent to you, to allow you to enter a new password.' - ,'',''); + $msg = + '

    ' + .&mt('Sorry, the token generated when you requested a password reset has expired. Please submit a [_1]new request[_2], and follow the link to the web page included in the new e-mail that will be sent to you, to allow you to enter a new password.' + ,'','') + .'

    '; } } else { - $msg .= &mt('Sorry, the URL generated when you requested reset of your password contained incomplete information. Please submit a [_1]new request[_2] for a password reset, and use the new URL that will be sent to your e-mail account to complete the process.' - ,'',''); + $msg .= + '

    ' + .&mt('Sorry, the URL generated when you requested reset of your password contained incomplete information. Please submit a [_1]new request[_2] for a password reset, and use the new URL that will be sent to your e-mail account to complete the process.' + ,'','') + .'

    '; } return $msg; } sub generic_failure_msg { my ($contact_name,$contact_email) = @_; - return &mt('A problem occurred when attempting to reset the password for your account. Please contact the [_1] - ([_2]) for assistance.', - $contact_name,''.$contact_email.''); + return + '

    ' + .&mt('A problem occurred when attempting to reset the password for your account.' + .' Please contact the [_1] - ([_2]) for assistance.', + $contact_name,''.$contact_email.'') + .'

    '; } sub create_passwd {