' + .&mt('Thank you for your request to reset the password for your LON-CAPA account.') + .'
'; my $now = time; my $temppasswd = &create_passwd(); @@ -196,16 +225,27 @@ 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('An error occurred when sending a message to the e-mail address' + .' associated with your LON-CAPA account.') + .'
' + .&display_actions($contact_email,$domdesc); + } } 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.') + .'
' + .&display_actions($contact_email,$domdesc); } return $msg; } @@ -216,6 +256,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"; @@ -233,8 +274,12 @@ 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.'') + .'
'; + $msg .= &display_actions($contact_email,$domdesc); } else { if ($error eq 'baduseremail') { $msg = &mt('The e-mail address you provided does not appear to be a valid address.'); @@ -245,13 +290,8 @@ 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.'); } - if ($contact_email ne '') { - my $escuri = &HTML::Entities::encode('/adm/resetpw','&<>"'); - $msg .= ''.$msg.'
' + .&display_actions($contact_email,$domdesc); } return $msg; } @@ -289,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 .= '' + .&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); @@ -320,20 +376,31 @@ 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.')
+ .'
'
+ .&mt('Please contact the [_1] - ([_2]) for assistance.',
+ $contact_name,''.$contact_email.'')
+ .'
' + .&mt('You may wish to send an e-mail to the' + .' server administrator: [_1] for the [_2] domain.', + ''.$Apache::lonnet::perlvar{'AdmEMail'}.'', + ''.$domdesc.'') + .'
'; + } + + return &Apache::lonhtmlcommon::actionbox(\@msg).$msg2; + +} + 1;